Adding rule hints to TreeView's and scrolledwindows

git-svn-id: file:///svnroot/gc-dialer/trunk@298 c39d3808-3fe2-4d86-a59f-b7f623ee9f21

diff --git a/src/dialcentral.glade b/src/dialcentral.glade
index 5f260f9..0532516 100644 (file)
--- a/src/dialcentral.glade
+++ b/src/dialcentral.glade
@@ -205,10 +205,10 @@
                         <property name="receives_default">False</property>
                         <property name="focus_on_click">False</property>
                         <signal name="clicked" handler="on_digit_clicked"/>
                         <property name="receives_default">False</property>
                         <property name="focus_on_click">False</property>
                         <signal name="clicked" handler="on_digit_clicked"/>

-                        <accelerator key="c" signal="clicked"/>
-                        <accelerator key="b" signal="clicked"/>
-                        <accelerator key="a" signal="clicked"/>

                         <accelerator key="2" signal="clicked"/>
                         <accelerator key="2" signal="clicked"/>

+                        <accelerator key="a" signal="clicked"/>
+                        <accelerator key="b" signal="clicked"/>
+                        <accelerator key="c" signal="clicked"/>

                         <child>
                           <widget class="GtkLabel" id="label10">
                             <property name="visible">True</property>
                         <child>
                           <widget class="GtkLabel" id="label10">
                             <property name="visible">True</property>

@@ -231,10 +231,10 @@
                         <property name="receives_default">False</property>
                         <property name="focus_on_click">False</property>
                         <signal name="clicked" handler="on_digit_clicked"/>
                         <property name="receives_default">False</property>
                         <property name="focus_on_click">False</property>
                         <signal name="clicked" handler="on_digit_clicked"/>

-                        <accelerator key="f" signal="clicked"/>
-                        <accelerator key="e" signal="clicked"/>
-                        <accelerator key="d" signal="clicked"/>

                         <accelerator key="3" signal="clicked"/>
                         <accelerator key="3" signal="clicked"/>

+                        <accelerator key="d" signal="clicked"/>
+                        <accelerator key="e" signal="clicked"/>
+                        <accelerator key="f" signal="clicked"/>

                         <child>
                           <widget class="GtkLabel" id="label11">
                             <property name="visible">True</property>
                         <child>
                           <widget class="GtkLabel" id="label11">
                             <property name="visible">True</property>

@@ -257,10 +257,10 @@
                         <property name="receives_default">False</property>
                         <property name="focus_on_click">False</property>
                         <signal name="clicked" handler="on_digit_clicked"/>
                         <property name="receives_default">False</property>
                         <property name="focus_on_click">False</property>
                         <signal name="clicked" handler="on_digit_clicked"/>

-                        <accelerator key="i" signal="clicked"/>
-                        <accelerator key="h" signal="clicked"/>
-                        <accelerator key="g" signal="clicked"/>

                         <accelerator key="4" signal="clicked"/>
                         <accelerator key="4" signal="clicked"/>

+                        <accelerator key="g" signal="clicked"/>
+                        <accelerator key="h" signal="clicked"/>
+                        <accelerator key="i" signal="clicked"/>

                         <child>
                           <widget class="GtkLabel" id="label13">
                             <property name="visible">True</property>
                         <child>
                           <widget class="GtkLabel" id="label13">
                             <property name="visible">True</property>

@@ -283,10 +283,10 @@
                         <property name="receives_default">False</property>
                         <property name="focus_on_click">False</property>
                         <signal name="clicked" handler="on_digit_clicked"/>
                         <property name="receives_default">False</property>
                         <property name="focus_on_click">False</property>
                         <signal name="clicked" handler="on_digit_clicked"/>

-                        <accelerator key="l" signal="clicked"/>
-                        <accelerator key="k" signal="clicked"/>
-                        <accelerator key="j" signal="clicked"/>

                         <accelerator key="5" signal="clicked"/>
                         <accelerator key="5" signal="clicked"/>

+                        <accelerator key="j" signal="clicked"/>
+                        <accelerator key="k" signal="clicked"/>
+                        <accelerator key="l" signal="clicked"/>

                         <child>
                           <widget class="GtkLabel" id="label14">
                             <property name="visible">True</property>
                         <child>
                           <widget class="GtkLabel" id="label14">
                             <property name="visible">True</property>

@@ -311,10 +311,10 @@
                         <property name="receives_default">False</property>
                         <property name="focus_on_click">False</property>
                         <signal name="clicked" handler="on_digit_clicked"/>
                         <property name="receives_default">False</property>
                         <property name="focus_on_click">False</property>
                         <signal name="clicked" handler="on_digit_clicked"/>

-                        <accelerator key="o" signal="clicked"/>
-                        <accelerator key="n" signal="clicked"/>
-                        <accelerator key="m" signal="clicked"/>

                         <accelerator key="6" signal="clicked"/>
                         <accelerator key="6" signal="clicked"/>

+                        <accelerator key="m" signal="clicked"/>
+                        <accelerator key="n" signal="clicked"/>
+                        <accelerator key="o" signal="clicked"/>

                         <child>
                           <widget class="GtkLabel" id="label15">
                             <property name="visible">True</property>
                         <child>
                           <widget class="GtkLabel" id="label15">
                             <property name="visible">True</property>

@@ -339,11 +339,11 @@
                         <property name="receives_default">False</property>
                         <property name="focus_on_click">False</property>
                         <signal name="clicked" handler="on_digit_clicked"/>
                         <property name="receives_default">False</property>
                         <property name="focus_on_click">False</property>
                         <signal name="clicked" handler="on_digit_clicked"/>

-                        <accelerator key="s" signal="clicked"/>
-                        <accelerator key="r" signal="clicked"/>
-                        <accelerator key="q" signal="clicked"/>
-                        <accelerator key="p" signal="clicked"/>

                         <accelerator key="7" signal="clicked"/>
                         <accelerator key="7" signal="clicked"/>

+                        <accelerator key="p" signal="clicked"/>
+                        <accelerator key="q" signal="clicked"/>
+                        <accelerator key="r" signal="clicked"/>
+                        <accelerator key="s" signal="clicked"/>

                         <child>
                           <widget class="GtkLabel" id="label16">
                             <property name="visible">True</property>
                         <child>
                           <widget class="GtkLabel" id="label16">
                             <property name="visible">True</property>

@@ -366,10 +366,10 @@
                         <property name="receives_default">False</property>
                         <property name="focus_on_click">False</property>
                         <signal name="clicked" handler="on_digit_clicked"/>
                         <property name="receives_default">False</property>
                         <property name="focus_on_click">False</property>
                         <signal name="clicked" handler="on_digit_clicked"/>

-                        <accelerator key="v" signal="clicked"/>
-                        <accelerator key="u" signal="clicked"/>
-                        <accelerator key="t" signal="clicked"/>

                         <accelerator key="8" signal="clicked"/>
                         <accelerator key="8" signal="clicked"/>

+                        <accelerator key="t" signal="clicked"/>
+                        <accelerator key="u" signal="clicked"/>
+                        <accelerator key="v" signal="clicked"/>

                         <child>
                           <widget class="GtkLabel" id="label17">
                             <property name="visible">True</property>
                         <child>
                           <widget class="GtkLabel" id="label17">
                             <property name="visible">True</property>

@@ -394,11 +394,11 @@
                         <property name="receives_default">False</property>
                         <property name="focus_on_click">False</property>
                         <signal name="clicked" handler="on_digit_clicked"/>
                         <property name="receives_default">False</property>
                         <property name="focus_on_click">False</property>
                         <signal name="clicked" handler="on_digit_clicked"/>

-                        <accelerator key="z" signal="clicked"/>
-                        <accelerator key="y" signal="clicked"/>
-                        <accelerator key="x" signal="clicked"/>
-                        <accelerator key="w" signal="clicked"/>

                         <accelerator key="9" signal="clicked"/>
                         <accelerator key="9" signal="clicked"/>

+                        <accelerator key="w" signal="clicked"/>
+                        <accelerator key="x" signal="clicked"/>
+                        <accelerator key="y" signal="clicked"/>
+                        <accelerator key="z" signal="clicked"/>

                         <child>
                           <widget class="GtkLabel" id="label18">
                             <property name="visible">True</property>
                         <child>
                           <widget class="GtkLabel" id="label18">
                             <property name="visible">True</property>

@@ -560,7 +560,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="headers_visible">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="headers_visible">False</property>

-                    <property name="enable_search">False</property>
+                    <property name="rules_hint">True</property>

                     <property name="fixed_height_mode">True</property>
                     <property name="enable_grid_lines">horizontal</property>
                     <property name="enable_tree_lines">True</property>
                     <property name="fixed_height_mode">True</property>
                     <property name="enable_grid_lines">horizontal</property>
                     <property name="enable_tree_lines">True</property>

@@ -588,9 +588,18 @@
               </packing>
             </child>
             <child>
               </packing>
             </child>
             <child>

-              <widget class="GtkTreeView" id="messages_view">
+              <widget class="GtkScrolledWindow" id="message_scrolledwindow">

                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>

+                <property name="hscrollbar_policy">never</property>
+                <property name="vscrollbar_policy">automatic</property>
+                <child>
+                  <widget class="GtkTreeView" id="messages_view">
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="rules_hint">True</property>
+                  </widget>
+                </child>

               </widget>
               <packing>
                 <property name="position">2</property>
               </widget>
               <packing>
                 <property name="position">2</property>

@@ -630,7 +639,7 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="headers_visible">False</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="headers_visible">False</property>

-                        <property name="enable_search">False</property>
+                        <property name="rules_hint">True</property>

                         <property name="fixed_height_mode">True</property>
                         <property name="enable_grid_lines">horizontal</property>
                         <property name="enable_tree_lines">True</property>
                         <property name="fixed_height_mode">True</property>
                         <property name="enable_grid_lines">horizontal</property>
                         <property name="enable_tree_lines">True</property>

@@ -887,7 +896,6 @@ Number:</property>
   <widget class="GtkDialog" id="phonetype_dialog">
     <property name="border_width">5</property>
     <property name="title" translatable="yes">Select Phone Type</property>
   <widget class="GtkDialog" id="phonetype_dialog">
     <property name="border_width">5</property>
     <property name="title" translatable="yes">Select Phone Type</property>

-    <property name="resizable">False</property>

     <property name="modal">True</property>
     <property name="window_position">center-on-parent</property>
     <property name="destroy_with_parent">True</property>
     <property name="modal">True</property>
     <property name="window_position">center-on-parent</property>
     <property name="destroy_with_parent">True</property>

@@ -901,10 +909,24 @@ Number:</property>
         <property name="visible">True</property>
         <property name="spacing">2</property>
         <child>
         <property name="visible">True</property>
         <property name="spacing">2</property>
         <child>

-          <widget class="GtkLabel" id="phoneSelectionMessage">
+          <widget class="GtkScrolledWindow" id="phoneSelectionMessage_scrolledwindow">

             <property name="visible">True</property>
             <property name="visible">True</property>

-            <property name="use_markup">True</property>
-            <property name="wrap">True</property>
+            <property name="can_focus">True</property>
+            <property name="hscrollbar_policy">never</property>
+            <property name="vscrollbar_policy">automatic</property>
+            <child>
+              <widget class="GtkViewport" id="phoneSelectionMessage_viewport">
+                <property name="visible">True</property>
+                <property name="resize_mode">queue</property>
+                <child>
+                  <widget class="GtkLabel" id="phoneSelectionMessage">
+                    <property name="visible">True</property>
+                    <property name="use_markup">True</property>
+                    <property name="wrap">True</property>
+                  </widget>
+                </child>
+              </widget>
+            </child>

           </widget>
           <packing>
             <property name="expand">False</property>
           </widget>
           <packing>
             <property name="expand">False</property>

@@ -912,11 +934,20 @@ Number:</property>
           </packing>
         </child>
         <child>
           </packing>
         </child>
         <child>

-          <widget class="GtkTreeView" id="phonetypes">
+          <widget class="GtkScrolledWindow" id="phonetypes_scrolledwindow">

             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>

-            <property name="rules_hint">True</property>
-            <signal name="row_activated" handler="on_phonetype_select"/>
+            <property name="hscrollbar_policy">never</property>
+            <property name="vscrollbar_policy">automatic</property>
+            <child>
+              <widget class="GtkTreeView" id="phonetypes">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="rules_hint">True</property>
+                <property name="enable_search">False</property>
+                <signal name="row_activated" handler="on_phonetype_select"/>
+              </widget>
+            </child>

           </widget>
           <packing>
             <property name="position">2</property>
           </widget>
           <packing>
             <property name="position">2</property>