[gtk+/wip/gbsneto/other-locations] placesview: clean up unneeded properties



commit ee313b0d5f0106e7db6819448b43a97a8ba6428e
Author: Georges Basile Stavracas Neto <georges stavracas gmail com>
Date:   Tue Jun 30 22:32:42 2015 -0300

    placesview: clean up unneeded properties
    
    This commit tries to fix some focus issues, as
    well as a good UI definition cleanup.

 gtk/ui/gtkplacesview.ui |   41 +++++++++++++++--------------------------
 1 files changed, 15 insertions(+), 26 deletions(-)
---
diff --git a/gtk/ui/gtkplacesview.ui b/gtk/ui/gtkplacesview.ui
index ef96b99..14024be 100644
--- a/gtk/ui/gtkplacesview.ui
+++ b/gtk/ui/gtkplacesview.ui
@@ -2,11 +2,9 @@
 <interface>
   <requires lib="gtk+" version="3.16"/>
   <object class="GtkPopover" id="recent_servers_popover">
-    <property name="can_focus">False</property>
     <child>
       <object class="GtkBox" id="box">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="border_width">12</property>
         <property name="orientation">vertical</property>
         <property name="spacing">12</property>
@@ -14,8 +12,10 @@
           <object class="GtkLabel" id="recent_servers_title_label">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes">&lt;b&gt;Recent Servers&lt;/b&gt;</property>
-            <property name="use_markup">True</property>
+            <property name="label" translatable="yes">Recent Servers</property>
+            <attributes>
+              <attribute name="weight" value="bold"/>
+            </attributes>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -39,7 +39,7 @@
                 <child>
                   <object class="GtkListBox" id="recent_servers_listbox">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can_focus">True</property>
                   </object>
                 </child>
               </object>
@@ -56,42 +56,38 @@
   </object>
   <template class="GtkPlacesView" parent="GtkBox">
     <property name="visible">True</property>
-    <property name="can_focus">False</property>
     <property name="orientation">vertical</property>
     <signal name="key-press-event" handler="on_key_press_event" object="GtkPlacesView" swapped="no" />
     <child>
       <object class="GtkScrolledWindow" id="scrolled_window">
         <property name="visible">True</property>
-        <property name="can_focus">True</property>
         <property name="hexpand">True</property>
         <property name="vexpand">True</property>
         <child>
           <object class="GtkViewport" id="viewport">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="shadow_type">none</property>
             <child>
               <object class="GtkBox" id="main_box">
                 <property name="visible">True</property>
-                <property name="can_focus">False</property>
                 <property name="hexpand">True</property>
                 <property name="orientation">vertical</property>
                 <child>
                   <object class="GtkBox" id="drives_box">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="orientation">vertical</property>
                     <child>
                       <object class="GtkLabel" id="drives_title_label">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <property name="margin_start">12</property>
                         <property name="margin_end">12</property>
                         <property name="margin_top">6</property>
                         <property name="margin_bottom">6</property>
-                        <property name="label" translatable="yes">&lt;b&gt;This Computer&lt;/b&gt;</property>
-                        <property name="use_markup">True</property>
+                        <property name="label" translatable="yes">This Computer</property>
                         <property name="xalign">0</property>
+                        <attributes>
+                          <attribute name="weight" value="bold"/>
+                        </attributes>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -102,7 +98,6 @@
                     <child>
                       <object class="GtkSeparator" id="separator1">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -113,7 +108,7 @@
                     <child>
                       <object class="GtkListBox" id="drives_listbox">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
+                        <property name="can_focus">True</property>
                         <property name="selection_mode">none</property>
                         <signal name="row-activated" handler="on_listbox_row_activated" 
object="GtkPlacesView" swapped="yes" />
                       </object>
@@ -133,21 +128,21 @@
                 <child>
                   <object class="GtkGrid" id="network_grid">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <property name="hexpand">True</property>
                     <property name="column_spacing">12</property>
                     <child>
                       <object class="GtkLabel" id="network_title_label">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <property name="margin_start">12</property>
                         <property name="margin_top">6</property>
                         <property name="margin_bottom">6</property>
                         <property name="hexpand">False</property>
-                        <property name="label" translatable="yes">&lt;b&gt;Network&lt;/b&gt;</property>
-                        <property name="use_markup">True</property>
+                        <property name="label" translatable="yes">Network</property>
                         <property name="ellipsize">end</property>
                         <property name="xalign">0</property>
+                        <attributes>
+                          <attribute name="weight" value="bold"/>
+                        </attributes>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
@@ -157,7 +152,6 @@
                     <child>
                       <object class="GtkSpinner" id="network_spinner">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <property name="halign">start</property>
                         <property name="hexpand">True</property>
                       </object>
@@ -169,7 +163,6 @@
                     <child>
                       <object class="GtkSeparator" id="separator2">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
                         <property name="hexpand">True</property>
                       </object>
                       <packing>
@@ -181,7 +174,7 @@
                     <child>
                       <object class="GtkListBox" id="network_listbox">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
+                        <property name="can_focus">True</property>
                         <property name="selection_mode">none</property>
                         <signal name="row-activated" handler="on_listbox_row_activated" 
object="GtkPlacesView" swapped="yes" />
                       </object>
@@ -215,12 +208,10 @@
     <child>
       <object class="GtkActionBar" id="actionbar">
         <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <property name="hexpand">True</property>
         <child>
           <object class="GtkLabel" id="connect_to_server_label">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">Connect to Server</property>
             <attributes>
               <attribute name="weight" value="bold"/>
@@ -243,7 +234,6 @@
         <child>
           <object class="GtkBox" id="address_box">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="hexpand">True</property>
             <child>
               <object class="GtkEntry" id="address_entry">
@@ -290,7 +280,6 @@
         <child>
           <object class="GtkLabel" id="address_label">
             <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="hexpand">True</property>
             <property name="label" translatable="yes">Address</property>
             <property name="xalign">1</property>


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