[niepce] map: Port to libshumate 1.0.1
- From: Hubert Figuière <hub src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [niepce] map: Port to libshumate 1.0.1
- Date: Mon, 26 Sep 2022 22:45:47 +0000 (UTC)
commit 3d9745e510ab5d7391c54ba3076c3137a0a46452
Author: Hubert Figuiere <hub figuiere net>
Date: Mon Sep 26 17:38:05 2022 -0400
map: Port to libshumate 1.0.1
README | 2 +-
configure.ac | 2 +-
flatpak/org.gnome.Niepce.json | 4 ++--
src/fwk/toolkit/mapcontroller.cpp | 10 ++++------
4 files changed, 8 insertions(+), 10 deletions(-)
---
diff --git a/README b/README
index cad3d27e..16fc5314 100644
--- a/README
+++ b/README
@@ -31,7 +31,7 @@ glibmm 2.66
gtkmm 4.4
giomm
cairomm
-shumate 1.0.0.alpha1
+shumate 1.0.0
sqlite3
libxml2 > 2.5.0
boost 1.60
diff --git a/configure.ac b/configure.ac
index a4237907..f60c614c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -58,7 +58,7 @@ AC_LANG_CPLUSPLUS
AC_LANG_COMPILER_REQUIRE
dnl Framework requirements.
-PKG_CHECK_MODULES(FRAMEWORK, [glibmm-2.68 >= $LIBGLIBMM_VERSION giomm-2.68 >= $LIBGIOMM_VERSION gthread-2.0
gtkmm-4.0 >= $LIBGTKMM_VERSION sqlite3 >= $SQLITE_VERSION exempi-2.0 >= $EXEMPI_VERSION libxml-2.0 >=
$LIBXML2_VERSION shumate-1.0])
+PKG_CHECK_MODULES(FRAMEWORK, [glibmm-2.68 >= $LIBGLIBMM_VERSION giomm-2.68 >= $LIBGIOMM_VERSION gthread-2.0
gtkmm-4.0 >= $LIBGTKMM_VERSION sqlite3 >= $SQLITE_VERSION exempi-2.0 >= $EXEMPI_VERSION libxml-2.0 >=
$LIBXML2_VERSION shumate-1.0 >= 1.0.0])
dnl optional framework
PKG_CHECK_MODULES(GPHOTO, [libgphoto2 >= $LIBGPHOTO_VERSION libgphoto2_port])
diff --git a/flatpak/org.gnome.Niepce.json b/flatpak/org.gnome.Niepce.json
index 3d15da63..2cb09e9e 100644
--- a/flatpak/org.gnome.Niepce.json
+++ b/flatpak/org.gnome.Niepce.json
@@ -256,8 +256,8 @@
{
"type": "git",
"url": "https://gitlab.gnome.org/GNOME/libshumate/",
- "tag": "1.0.0.alpha.1",
- "commit": "36163e4809e31632b7e387b90396ff8b9a461eed"
+ "tag": "1.0.1",
+ "commit": "062c61815d2875beee19a1c704c473be8fabb3a7"
}
]
},
diff --git a/src/fwk/toolkit/mapcontroller.cpp b/src/fwk/toolkit/mapcontroller.cpp
index 4f9c46f5..ab110665 100644
--- a/src/fwk/toolkit/mapcontroller.cpp
+++ b/src/fwk/toolkit/mapcontroller.cpp
@@ -93,16 +93,14 @@ void MapController::centerOn(double lat, double longitude)
void MapController::zoomIn()
{
- ShumateViewport* viewport =
- shumate_simple_map_get_viewport(m_priv->m_map);
- shumate_viewport_zoom_in(viewport);
+ ShumateMap* map = shumate_simple_map_get_map(m_priv->m_map);
+ shumate_map_zoom_in(map);
}
void MapController::zoomOut()
{
- ShumateViewport* viewport =
- shumate_simple_map_get_viewport(m_priv->m_map);
- shumate_viewport_zoom_in(viewport);
+ ShumateMap* map = shumate_simple_map_get_map(m_priv->m_map);
+ shumate_map_zoom_in(map);
}
void MapController::setZoomLevel(double level)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]