[gnome-maps] zoom-control: Convert to linked buttons

[Jonas Danielsson <jonasdn src gnome org>]

commit 419d0ba77eeeab93785bf77b91d7dad331aaf28b
Author: amishas157 <amishas157 gmail com>
Date:   Fri Oct 10 19:01:18 2014 +0530

    zoom-control: Convert to linked buttons
    
    https://bugzilla.gnome.org/show_bug.cgi?id=725851

 data/gnome-maps.css                 |   34 ++--------------------------------
 data/media/zoom-in-insensitive.png  |  Bin 1686 -> 0 bytes
 data/media/zoom-in.png              |  Bin 2210 -> 0 bytes
 data/media/zoom-out-insensitive.png |  Bin 2210 -> 0 bytes
 data/media/zoom-out.png             |  Bin 2210 -> 0 bytes
 src/gnome-maps.data.gresource.xml   |    4 ----
 src/zoom-control.ui                 |   29 ++++++++++++++++++++++-------
 src/zoomControl.js                  |    4 ++--
 8 files changed, 26 insertions(+), 45 deletions(-)
---
diff --git a/data/gnome-maps.css b/data/gnome-maps.css
index a3c6762..da276a8 100644
--- a/data/gnome-maps.css
+++ b/data/gnome-maps.css
@@ -20,43 +20,13 @@
     border-radius: 0px 0px 0px 0px;
 }
 
-.zoom-control {
-    background-color: transparent;
-}
-
-.zoom-control GtkButton {
-    background-repeat: no-repeat;
-    opacity: 0.65;
-    border-width: 0;
-    border-image-width: 0;
-}
-
-.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');
+    font-weight: bold;
 }
 
 #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-out-button:insensitive {
-    background-image: url('zoom-out-insensitive.png');
+    font-weight: bold;
 }
 
 #via-grid-container {
diff --git a/src/gnome-maps.data.gresource.xml b/src/gnome-maps.data.gresource.xml
index b6b2dc8..9efa996 100644
--- a/src/gnome-maps.data.gresource.xml
+++ b/src/gnome-maps.data.gresource.xml
@@ -15,10 +15,6 @@
     <file preprocess="xml-stripblanks">turn-point-bubble.ui</file>
     <file preprocess="xml-stripblanks">user-location-bubble.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>
     <file alias="maptype-aerial.png">../data/media/maptype-aerial.png</file>
     <file alias="maptype-street.png">../data/media/maptype-street.png</file>
     <file alias="direction-sharpleft">../data/media/direction-sharpleft.png</file>
diff --git a/src/zoom-control.ui b/src/zoom-control.ui
index 696d593..edaa34e 100644
--- a/src/zoom-control.ui
+++ b/src/zoom-control.ui
@@ -1,30 +1,45 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <!-- interface-requires gtk+ 3.10 -->
-  <object class= "GtkGrid" id="zoom-control">
+  <object class= "GtkBox" id="zoom-control">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <property name="orientation">vertical</property>
-    <property name="row_spacing">1</property>
     <style>
-      <class name="zoom-control" />
+      <class name="linked" />
     </style>
     <child>
       <object class="GtkButton" id="zoom-in-button">
         <property name="name">zoom-in-button</property>
         <property name="visible">True</property>
-        <property name="width-request">22></property>
-        <property name="height-request">23></property>
+        <property name="width-request">34</property>
+        <property name="height-request">34</property>
         <property name="can_focus">False</property>
+        <child>
+          <object class="GtkLabel" id="zoom-in-label">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="margin">0</property>
+            <property name="label">+</property>
+          </object>
+        </child>
       </object>
     </child>
     <child>
       <object class="GtkButton" id="zoom-out-button">
         <property name="name">zoom-out-button</property>
         <property name="visible">True</property>
-        <property name="width-request">22></property>
-        <property name="height-request">23></property>
+        <property name="width-request">34</property>
+        <property name="height-request">34</property>
         <property name="can_focus">False</property>
+        <child>
+          <object class="GtkLabel" id="zoom-out-label">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="margin">0</property>
+            <property name="label">-</property>
+          </object>
+        </child>
       </object>
     </child>
   </object>
diff --git a/src/zoomControl.js b/src/zoomControl.js
index 7081a49..d565593 100644
--- a/src/zoomControl.js
+++ b/src/zoomControl.js
@@ -31,8 +31,8 @@ const ZoomControl = new Lang.Class({
     _init: function (mapView) {
         this.parent({ halign: Gtk.Align.START,
                       valign: Gtk.Align.START,
-                      margin_top: 20,
-                      margin_start: 20,
+                      margin_top: 6,
+                      margin_start: 6,
                       visible: true });
 
         let ui = Utils.getUIObject('zoom-control', ['zoom-control',