From 5f47e032fe2b2e8f69fe623e0e25b8e45bb3950a Mon Sep 17 00:00:00 2001
From: Guido Günther <agx@sigxcpu.org>
Date: Wed, 8 Jun 2011 19:21:54 +0200
Subject: Use main window with menu instead of dialog

---
 src/ppm.ui | 146 ++++++++++++++++++++++++++++++++++++++++++-------------------
 1 file changed, 101 insertions(+), 45 deletions(-)

diff --git a/src/ppm.ui b/src/ppm.ui
index ddafd63..2c2f4a5 100644
--- a/src/ppm.ui
+++ b/src/ppm.ui
@@ -1,16 +1,74 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <requires lib="gtk+" version="2.16"/>
-  <!-- interface-naming-policy project-wide -->
-  <object class="GtkDialog" id="ppm_dialog">
-    <property name="border_width">5</property>
-    <property name="title" translatable="yes">Prepaid Manager</property>
-    <property name="type_hint">dialog</property>
-    <child internal-child="vbox">
-      <object class="GtkVBox" id="dialog-vbox1">
+  <object class="GtkWindow" id="ppm_dialog">
+    <property name="can_focus">False</property>
+    <child>
+      <object class="GtkVBox" id="vbox1">
         <property name="visible">True</property>
-        <property name="orientation">vertical</property>
-        <property name="spacing">2</property>
+        <property name="can_focus">False</property>
+        <child>
+          <object class="GtkMenuBar" id="menubar1">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <child>
+              <object class="GtkMenuItem" id="menu_filee">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="use_action_appearance">False</property>
+                <property name="label" translatable="yes">_File</property>
+                <property name="use_underline">True</property>
+                <child type="submenu">
+                  <object class="GtkMenu" id="menu_file">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <child>
+                      <object class="GtkImageMenuItem" id="menuitem_quit">
+                        <property name="label">gtk-quit</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="use_action_appearance">False</property>
+                        <property name="use_underline">True</property>
+                        <property name="use_stock">True</property>
+                        <signal name="activate" handler="on_close_clicked" swapped="no"/>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+              </object>
+            </child>
+            <child>
+              <object class="GtkMenuItem" id="menuitem_help">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="use_action_appearance">False</property>
+                <property name="label" translatable="yes">_Help</property>
+                <property name="use_underline">True</property>
+                <child type="submenu">
+                  <object class="GtkMenu" id="menu_help">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <child>
+                      <object class="GtkImageMenuItem" id="imagemenuitem_about">
+                        <property name="label">gtk-about</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="use_action_appearance">False</property>
+                        <property name="use_underline">True</property>
+                        <property name="use_stock">True</property>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
         <child>
           <object class="GtkNotebook" id="notebook1">
             <property name="visible">True</property>
@@ -18,6 +76,7 @@
             <child>
               <object class="GtkTable" id="table_balance">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="n_rows">3</property>
                 <property name="n_columns">3</property>
                 <property name="column_spacing">4</property>
@@ -25,6 +84,7 @@
                 <child>
                   <object class="GtkLabel" id="label_provider">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="label" translatable="yes">Provider:</property>
                   </object>
                   <packing>
@@ -37,6 +97,7 @@
                 <child>
                   <object class="GtkLabel" id="label_balance_provider_name">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="label" translatable="yes">unknown provider</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
@@ -55,8 +116,11 @@
                     <property name="label" translatable="yes">change</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
+                    <property name="has_tooltip">True</property>
+                    <property name="tooltip_markup" translatable="yes">Change provider</property>
                     <property name="tooltip_text" translatable="yes">Change provider</property>
-                    <signal name="clicked" handler="on_provider_change_clicked"/>
+                    <property name="use_action_appearance">False</property>
+                    <signal name="clicked" handler="on_provider_change_clicked" swapped="no"/>
                   </object>
                   <packing>
                     <property name="left_attach">2</property>
@@ -69,6 +133,7 @@
                 </child>
                 <child>
                   <object class="GtkLabel" id="label_balance_from">
+                    <property name="can_focus">False</property>
                     <property name="label" translatable="yes">Balance information from</property>
                   </object>
                   <packing>
@@ -82,6 +147,7 @@
                 </child>
                 <child>
                   <object class="GtkLabel" id="label_balance_timestamp">
+                    <property name="can_focus">False</property>
                     <property name="label" translatable="yes">unknown</property>
                   </object>
                   <packing>
@@ -97,6 +163,7 @@
                 <child>
                   <object class="GtkLabel" id="label_balance_info">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="label" translatable="yes">Balance unknown</property>
                     <property name="wrap">True</property>
                     <attributes>
@@ -119,8 +186,11 @@
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
+                    <property name="has_tooltip">True</property>
+                    <property name="tooltip_markup" translatable="yes">Check your prepaid cards balance.</property>
                     <property name="tooltip_text" translatable="yes">Check your prepaid cards balance.</property>
-                    <signal name="clicked" handler="on_balance_info_renew_clicked"/>
+                    <property name="use_action_appearance">False</property>
+                    <signal name="clicked" handler="on_balance_info_renew_clicked" swapped="no"/>
                   </object>
                   <packing>
                     <property name="left_attach">2</property>
@@ -141,6 +211,7 @@
             <child type="tab">
               <object class="GtkLabel" id="tab_balance">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">Balance</property>
               </object>
               <packing>
@@ -150,6 +221,7 @@
             <child>
               <object class="GtkTable" id="table_top_up">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="n_rows">3</property>
                 <property name="n_columns">3</property>
                 <property name="column_spacing">4</property>
@@ -157,6 +229,7 @@
                 <child>
                   <object class="GtkLabel" id="label_provider1">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="label" translatable="yes">Provider:</property>
                   </object>
                   <packing>
@@ -169,6 +242,7 @@
                 <child>
                   <object class="GtkLabel" id="label_topup_provider_name">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="label" translatable="yes">unknown provider</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
@@ -187,6 +261,7 @@
                     <property name="label" translatable="yes">change</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
+                    <property name="use_action_appearance">False</property>
                   </object>
                   <packing>
                     <property name="left_attach">2</property>
@@ -204,8 +279,11 @@
                     <property name="sensitive">False</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
+                    <property name="has_tooltip">True</property>
+                    <property name="tooltip_markup" translatable="yes">Top up your prepaid accounts balance</property>
                     <property name="tooltip_text" translatable="yes">Top up your prepaid accounts balance</property>
-                    <signal name="clicked" handler="on_balance_top_up_clicked"/>
+                    <property name="use_action_appearance">False</property>
+                    <signal name="clicked" handler="on_balance_top_up_clicked" swapped="no"/>
                   </object>
                   <packing>
                     <property name="left_attach">2</property>
@@ -222,9 +300,12 @@
                   <object class="GtkEntry" id="entry_code">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
+                    <property name="has_tooltip">True</property>
+                    <property name="tooltip_markup" translatable="yes">Enter code to top up credit to your prepaid card.</property>
                     <property name="tooltip_text" translatable="yes">Enter code to top up credit to your prepaid card.</property>
-                    <property name="invisible_char">&#x25CF;</property>
-                    <signal name="changed" handler="on_entry_code_insert"/>
+                    <property name="invisible_char">●</property>
+                    <property name="invisible_char_set">True</property>
+                    <signal name="changed" handler="on_entry_code_insert" swapped="no"/>
                   </object>
                   <packing>
                     <property name="left_attach">1</property>
@@ -239,6 +320,7 @@
                 <child>
                   <object class="GtkLabel" id="label_code">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="label" translatable="yes">Code:</property>
                   </object>
                   <packing>
@@ -253,7 +335,7 @@
                 <child>
                   <object class="GtkLabel" id="label_top_up_reply">
                     <property name="visible">True</property>
-                    <property name="label" translatable="no"></property>
+                    <property name="can_focus">False</property>
                   </object>
                   <packing>
                     <property name="right_attach">3</property>
@@ -273,6 +355,7 @@
             <child type="tab">
               <object class="GtkLabel" id="tab_top_up">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">Top up</property>
               </object>
               <packing>
@@ -281,40 +364,13 @@
               </packing>
             </child>
           </object>
-          <packing>
-            <property name="position">1</property>
-          </packing>
-        </child>
-        <child internal-child="action_area">
-          <object class="GtkHButtonBox" id="dialog-action_area1">
-            <property name="visible">True</property>
-            <property name="layout_style">end</property>
-            <child>
-              <object class="GtkButton" id="button_close">
-                <property name="label">gtk-close</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_close_clicked"/>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </object>
           <packing>
             <property name="expand">False</property>
-            <property name="pack_type">end</property>
-            <property name="position">0</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
           </packing>
         </child>
       </object>
     </child>
-    <action-widgets>
-      <action-widget response="0">button_close</action-widget>
-    </action-widgets>
   </object>
 </interface>
-- 
cgit v1.2.3