[gnome-maps/wip/mlundblad/remove-dark-street-and-hybrid-aerial: 2/7] layersPopover: Remove hybrid aerial button
- From: Marcus Lundblad <mlundblad src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-maps/wip/mlundblad/remove-dark-street-and-hybrid-aerial: 2/7] layersPopover: Remove hybrid aerial button
- Date: Mon, 27 Jun 2022 10:12:47 +0000 (UTC)
commit 6321b95871917779f7a4c59a3d1cecb1c7bac807
Author: Marcus Lundblad <ml dfupdate se>
Date: Sun Jun 26 21:47:24 2022 +0200
layersPopover: Remove hybrid aerial button
Remove the checkbutton to show hybrid
aerial tiles.
data/ui/layers-popover.ui | 33 ---------------------------------
src/layersPopover.js | 13 -------------
2 files changed, 46 deletions(-)
---
diff --git a/data/ui/layers-popover.ui b/data/ui/layers-popover.ui
index f51f0d75..b423a7a3 100644
--- a/data/ui/layers-popover.ui
+++ b/data/ui/layers-popover.ui
@@ -48,39 +48,6 @@
<property name="top-attach">1</property>
</packing>
</child>
- <child>
- <object class="GtkRevealer" id="hybridAerialRevealer">
- <property name="can-focus">False</property>
- <property name="visible">True</property>
- <child>
- <object class="GtkBox">
- <property name="orientation">GTK_ORIENTATION_HORIZONTAL</property>
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <child>
- <object class="GtkLabel">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <property name="hexpand">True</property>
- <property name="halign">GTK_ALIGN_START</property>
- <property name="label" translatable="yes">Show Labels</property>
- </object>
- </child>
- <child>
- <object class="GtkCheckButton">
- <property name="visible">True</property>
- <property name="can-focus">True</property>
- <property name="action-name">win.hybrid-aerial</property>
- </object>
- </child>
- </object>
- </child>
- </object>
- <packing>
- <property name="left-attach">0</property>
- <property name="top-attach">2</property>
- </packing>
- </child>
<child>
<object class="GtkBox">
<property name="orientation">GTK_ORIENTATION_HORIZONTAL</property>
diff --git a/src/layersPopover.js b/src/layersPopover.js
index ed6815c5..7e95bd32 100644
--- a/src/layersPopover.js
+++ b/src/layersPopover.js
@@ -163,15 +163,6 @@ export class LayersPopover extends Gtk.Popover {
}
}
- _onHybridAerialChanged() {
- if (Service.getService().tiles.hybridAerial &&
- Application.settings.get('hybrid-aerial')) {
- this._setLayerPreviewImage('hybridAerial', true);
- } else {
- this._setLayerPreviewImage('aerial', true);
- }
- }
-
_setLayerPreviews() {
if (Service.getService().tiles.streetDark &&
Handy.StyleManager.get_default().dark) {
@@ -236,11 +227,8 @@ export class LayersPopover extends Gtk.Popover {
setMapType(mapType) {
if (mapType === MapView.MapType.STREET) {
this._streetLayerButton.active = true;
- this._hybridAerialRevealer.reveal_child = false;
} else if (mapType === MapView.MapType.AERIAL) {
this._aerialLayerButton.active = true;
- if (Service.getService().tiles.hybridAerial)
- this._hybridAerialRevealer.reveal_child = true;
}
}
@@ -265,7 +253,6 @@ GObject.registerClass({
'aerialLayerButton',
'streetLayerImage',
'aerialLayerImage',
- 'hybridAerialRevealer',
'layersListBox',
'loadLayerButton' ]
}, LayersPopover);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]