forked from pool/marble
63ca14ef58
- Add Fix-utm-enum-value.patch and reverse-apply it, this upstream commit causes a crash when adding bookmarks if switched to UTM view angles because the necessary handler functions for the dialog are not implemented yet (boo#1044747, kde#381872) - Add Fix-plain-map-and-political-map-showing-no-content.patch to fix the plain map and the political map being not displayed at all (kde#379297) Please forward to 42.3 as well if accepted. OBS-URL: https://build.opensuse.org/request/show/508101 OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/marble?expand=0&rev=137
40 lines
1.9 KiB
Diff
40 lines
1.9 KiB
Diff
From 7859bf1cc1fdaf07b70446b1530358bff7bf43e3 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Dennis=20Nienh=C3=BCser?= <nienhueser@kde.org>
|
|
Date: Tue, 29 Dec 2015 11:18:23 +0100
|
|
Subject: Fix utm enum value
|
|
|
|
---
|
|
src/lib/marble/EditBookmarkDialog.cpp | 2 +-
|
|
src/lib/marble/EditPlacemarkDialog.cpp | 2 +-
|
|
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/src/lib/marble/EditBookmarkDialog.cpp b/src/lib/marble/EditBookmarkDialog.cpp
|
|
index c9a87a8..6ee5e91 100644
|
|
--- a/src/lib/marble/EditBookmarkDialog.cpp
|
|
+++ b/src/lib/marble/EditBookmarkDialog.cpp
|
|
@@ -161,7 +161,7 @@ void EditBookmarkDialog::setMarbleWidget( MarbleWidget* widget )
|
|
const GeoDataCoordinates::Notation notation =
|
|
(defaultAngleUnit == DecimalDegree) ? GeoDataCoordinates::Decimal :
|
|
(defaultAngleUnit == DMSDegree) ? GeoDataCoordinates::DMS :
|
|
- /* else, UTM */ GeoDataCoordinates::DMS;
|
|
+ /* else, UTM */ GeoDataCoordinates::UTM;
|
|
d->m_ui.m_header->setNotation(notation);
|
|
|
|
d->m_manager = new ReverseGeocodingRunnerManager( d->m_widget->model(), this );
|
|
diff --git a/src/lib/marble/EditPlacemarkDialog.cpp b/src/lib/marble/EditPlacemarkDialog.cpp
|
|
index cfab9f1..ab8ad1f 100644
|
|
--- a/src/lib/marble/EditPlacemarkDialog.cpp
|
|
+++ b/src/lib/marble/EditPlacemarkDialog.cpp
|
|
@@ -134,7 +134,7 @@ EditPlacemarkDialog::EditPlacemarkDialog( GeoDataPlacemark *placemark,
|
|
const GeoDataCoordinates::Notation notation =
|
|
(defaultAngleUnit == DecimalDegree) ? GeoDataCoordinates::Decimal :
|
|
(defaultAngleUnit == DMSDegree) ? GeoDataCoordinates::DMS :
|
|
- /* else, UTM */ GeoDataCoordinates::DMS;
|
|
+ /* else, UTM */ GeoDataCoordinates::UTM;
|
|
d->m_header->setNotation( notation );
|
|
}
|
|
connect( d->m_header, SIGNAL(valueChanged()), this, SLOT(
|
|
--
|
|
cgit v0.11.2
|
|
|