wip: new zoom control uiwip/zoom-ui

7 files changed, 12 insertions, 33 deletions

diff --git a/data/gnome-maps.css b/data/gnome-maps.css
index 22e8739e..c011c2a0 100644
--- a/data/gnome-maps.css
+++ b/data/gnome-maps.css
@@ -12,41 +12,22 @@
 	border-radius: 0px;
 }
 
-.zoom-control {
-    background-color: transparent;
-}
-
 .zoom-control GtkButton {
-    background-repeat: no-repeat;
-    opacity: 0.65;
-    border-width: 0;
-    border-image-width: 0;
+    background-color: @theme_bg_color;
+    border-color: @borders;
+    border: 1px solid;
+    border-radius: 0px;
 }
 
 .zoom-control GtkButton:hover {
-    opacity: 0.5;
-}
-
-#zoom-in-button {
-    background-image: url('zoom-in.png');
-    border-top-left-radius: 6px;
-    border-top-right-radius: 6px;
-    border-bottom-left-radius: 0px;
-    border-bottom-right-radius: 0px;
-}
-
-#zoom-in-button:insensitive {
-    background-image: url('zoom-in-insensitive.png');
+    background-color: shade (@theme_bg_color, 1.02);
 }
 
-#zoom-out-button {
-    background-image: url('zoom-out.png');
-    border-top-left-radius: 0px;
-    border-top-right-radius: 0px;
-    border-bottom-left-radius: 6px;
-    border-bottom-right-radius: 6px;
+.zoom-control GtkLabel {
+    color: @theme_fg_color;
+    font: 13;
 }
 
-#zoom-out-button:insensitive {
-    background-image: url('zoom-out-insensitive.png');
+.zoom-control GtkLabel:insensitive {
+    color: @insensitive_fg_color;
 }
diff --git a/data/media/zoom-in-insensitive.png b/data/media/zoom-in-insensitive.png
deleted file mode 100644
index 796f64b3..00000000
--- a/data/media/zoom-in-insensitive.png
+++ /dev/null
diff --git a/data/media/zoom-in.png b/data/media/zoom-in.png
deleted file mode 100644
index 77d71bb1..00000000
--- a/data/media/zoom-in.png
+++ /dev/null
diff --git a/data/media/zoom-out-insensitive.png b/data/media/zoom-out-insensitive.png
deleted file mode 100644
index 3ecddb90..00000000
--- a/data/media/zoom-out-insensitive.png
+++ /dev/null
diff --git a/data/media/zoom-out.png b/data/media/zoom-out.png
deleted file mode 100644
index 2794ac5a..00000000
--- a/data/media/zoom-out.png
+++ /dev/null
diff --git a/src/gnome-maps.data.gresource.xml b/src/gnome-maps.data.gresource.xml
index 6250d60c..a5c40d31 100644
--- a/src/gnome-maps.data.gresource.xml
+++ b/src/gnome-maps.data.gresource.xml
@@ -7,9 +7,5 @@
     <file preprocess="xml-stripblanks">search-popup.ui</file>
     <file preprocess="xml-stripblanks">context-menu.ui</file>
     <file alias="application.css">../data/gnome-maps.css</file>
-    <file alias="zoom-in.png">../data/media/zoom-in.png</file>
-    <file alias="zoom-out.png">../data/media/zoom-out.png</file>
-    <file alias="zoom-in-insensitive.png">../data/media/zoom-in-insensitive.png</file>
-    <file alias="zoom-out-insensitive.png">../data/media/zoom-out-insensitive.png</file>
   </gresource>
 </gresources>
diff --git a/src/zoom-control.ui b/src/zoom-control.ui
index ed86d12b..e041c229 100644
--- a/src/zoom-control.ui
+++ b/src/zoom-control.ui
@@ -15,6 +15,7 @@
         <property name="width-request">24></property>
         <property name="height-request">24></property>
         <property name="can_focus">False</property>
+        <property name="label">+</property>
       </object>
     </child>
     <child>
@@ -23,6 +24,7 @@
         <property name="width-request">24></property>
         <property name="height-request">24></property>
         <property name="can_focus">False</property>
+        <property name="label">−</property>
       </object>
     </child>
   </object>