merging branch

[gc-dialer] / src / dialcentral.glade

diff --git a/src/dialcentral.glade b/src/dialcentral.glade
index 58191fd..ba649d7 100644 (file)
--- a/src/dialcentral.glade
+++ b/src/dialcentral.glade
@@ -90,6 +90,27 @@
               </widget>
             </child>
             <child>
+              <widget class="GtkMenuItem" id="viewMenuItem">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">_View</property>
+                <property name="use_underline">True</property>
+                <child>
+                  <widget class="GtkMenu" id="menu3">
+                    <property name="visible">True</property>
+                    <child>
+                      <widget class="GtkImageMenuItem" id="refreshMenuItem">
+                        <property name="label">gtk-refresh</property>
+                        <property name="visible">True</property>
+                        <property name="use_underline">True</property>
+                        <property name="use_stock">True</property>
+                        <signal name="activate" handler="on_refresh"/>
+                      </widget>
+                    </child>
+                  </widget>
+                </child>
+              </widget>
+            </child>
+            <child>
               <widget class="GtkMenuItem" id="about">
                 <property name="visible">True</property>
                 <property name="label" translatable="yes">_About</property>
@@ -560,7 +581,7 @@
                     <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>
@@ -588,9 +609,18 @@
               </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="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>
@@ -630,7 +660,7 @@
                         <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>
@@ -887,7 +917,6 @@ Number:</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>
@@ -901,9 +930,24 @@ Number:</property>
         <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="use_markup">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>
@@ -911,11 +955,20 @@ Number:</property>
           </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="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>
@@ -968,10 +1021,11 @@ Number:</property>
             </child>
             <child>
               <widget class="GtkButton" id="cancel_button">
-                <property name="label" translatable="yes">Cancel</property>
+                <property name="label" translatable="yes">gtk-cancel</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
+                <property name="use_stock">True</property>
                 <signal name="clicked" handler="on_phonetype_cancel"/>
               </widget>
               <packing>
@@ -992,8 +1046,11 @@ Number:</property>
   </widget>
   <widget class="GtkDialog" id="smsDialog">
     <property name="border_width">5</property>
+    <property name="title" translatable="yes">Send SMS</property>
     <property name="modal">True</property>
     <property name="window_position">center</property>
+    <property name="default_width">800</property>
+    <property name="default_height">300</property>
     <property name="type_hint">normal</property>
     <property name="skip_taskbar_hint">True</property>
     <property name="skip_pager_hint">True</property>
@@ -1011,6 +1068,7 @@ Number:</property>
               <widget class="GtkLabel" id="smsMessage">
                 <property name="visible">True</property>
                 <property name="use_markup">True</property>
+                <property name="wrap">True</property>
               </widget>
               <packing>
                 <property name="expand">False</property>