[gnome-maps/wip/layers-popover: 4/6] New layer image icon. Replaced toggle button with radio button.



commit 5f6e2f6e3e9c190ee926787a27513f30a7e8c426
Author: Dario Di Nucci <linkin88mail gmail com>
Date:   Sun Mar 2 01:17:17 2014 +0100

    New layer image icon.
    Replaced toggle button with radio button.

 src/gnome-maps.data.gresource.xml |    2 ++
 src/layers-popup.ui               |   16 ++++++++++------
 src/mainWindow.js                 |    4 ----
 3 files changed, 12 insertions(+), 10 deletions(-)
---
diff --git a/src/gnome-maps.data.gresource.xml b/src/gnome-maps.data.gresource.xml
index 2c48565..3edf8c5 100644
--- a/src/gnome-maps.data.gresource.xml
+++ b/src/gnome-maps.data.gresource.xml
@@ -12,5 +12,7 @@
     <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-satellite.png">../data/media/maptype-satellite.png</file>
+    <file alias="maptype-street.png">../data/media/maptype-street.png</file>
   </gresource>
 </gresources>
diff --git a/src/layers-popup.ui b/src/layers-popup.ui
index 2dabef4..0c97813 100644
--- a/src/layers-popup.ui
+++ b/src/layers-popup.ui
@@ -5,7 +5,7 @@
     <property name="visible">True</property>
     <property name="can_focus">False</property>
     <child>
-      <object class="GtkToggleButton" id="street-layer-button">
+      <object class="GtkRadioButton" id="street-layer-button">
         <property name="visible">True</property>
         <property name="can-focus">True</property>
         <property name="valign">center</property>
@@ -13,14 +13,16 @@
         <property name="margin">2</property>
         <property name="action-name">win.map-type</property>
         <property name="action-target">"STREET"</property>
+        <property name="draw_indicator">False</property>
+        <property name="receives_default">True</property>
+        <property name="group">street-layer-button</property>
         <style>
           <class name="image-button"/>
         </style>
         <child>
           <object class="GtkImage" id="street-layer-image">
             <property name="visible">True</property>
-            <property name="icon-size">1</property>
-            <property name="icon-name">find-location-symbolic</property>
+            <property name="pixbuf">maptype-street.png</property>
           </object>
         </child>
       </object>
@@ -32,7 +34,7 @@
       </packing>
     </child>
     <child>
-      <object class="GtkToggleButton" id="satellite-layer-button">
+      <object class="GtkRadioButton" id="satellite-layer-button">
         <property name="visible">True</property>
         <property name="can-focus">True</property>
         <property name="valign">center</property>
@@ -40,14 +42,16 @@
         <property name="margin">2</property>
         <property name="action-name">win.map-type</property>
         <property name="action-target">"AERIAL"</property>>
+        <property name="draw_indicator">False</property>
+        <property name="receives_default">True</property>
+        <property name="group">street-layer-button</property>
         <style>
           <class name="image-button"/>
         </style>
         <child>
           <object class="GtkImage" id="satellite-layer-image">
             <property name="visible">True</property>
-            <property name="icon-size">1</property>
-            <property name="icon-name">find-location-symbolic</property>
+            <property name="pixbuf">maptype-satellite.png</property>
           </object>
         </child>
       </object>
diff --git a/src/mainWindow.js b/src/mainWindow.js
index 7e7cd18..e300222 100644
--- a/src/mainWindow.js
+++ b/src/mainWindow.js
@@ -118,10 +118,6 @@ const MainWindow = new Lang.Class({
                                   this._onSearchPopupSelected.bind(this));
         this.mapView.view.connect('button-press-event',
                                   this._searchPopup.hide.bind(this._searchPopup));
-        //this.mapView.view.connect('button-press-event', (function(){
-        //                          
-        //                          });
-                                  //this.mapView.grab_focus.bind(this.mapView));
         this._searchEntry.connect('changed',
                                   this._searchPopup.hide.bind(this._searchPopup));
         this._searchCompletion.set_model(this._placeStore);


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]