From e86465e31f01a60a4a74590b766ce97e9854c26d Mon Sep 17 00:00:00 2001
From: Mike Lester <element3260@gmail.com>
Date: Wed, 27 Aug 2008 20:26:28 +0000
Subject: The status bar is now a single GtkStatusbar instead of a hpane'd
 label and (empty) Statusbar.

svn path=/trunk/netsurf/; revision=5211
---
 gtk/gtk_scaffolding.c |  10 +--
 gtk/res/netsurf.glade | 226 ++++++++++++++++++++------------------------------
 2 files changed, 93 insertions(+), 143 deletions(-)

(limited to 'gtk')

diff --git a/gtk/gtk_scaffolding.c b/gtk/gtk_scaffolding.c
index ca2385fbb..69b0c4f9a 100644
--- a/gtk/gtk_scaffolding.c
+++ b/gtk/gtk_scaffolding.c
@@ -68,7 +68,7 @@ struct gtk_scaffolding {
 	GtkNotebook		*notebook;
 	GtkEntry		*url_bar;
 	GtkEntryCompletion	*url_bar_completion;
-	GtkLabel		*status_bar;
+	GtkStatusbar		*status_bar;
 	GtkMenu			*edit_menu;
 	GtkMenuItem		*tabs_menu;
 	GtkToolbar		*tool_bar;
@@ -1040,7 +1040,7 @@ nsgtk_scaffolding *nsgtk_new_scaffolding(struct gui_window *toplevel)
 	g->notebook = GTK_NOTEBOOK(GET_WIDGET("notebook"));
 	g->url_bar = GTK_ENTRY(GET_WIDGET("URLBar"));
 	g->menu_bar = GTK_MENU_BAR(GET_WIDGET("menubar"));
-	g->status_bar = GTK_LABEL(GET_WIDGET("statusBar"));
+	g->status_bar = GTK_STATUSBAR(GET_WIDGET("statusbar"));
 	g->edit_menu = GTK_MENU(GET_WIDGET("menumain_edit"));
 	g->tabs_menu = GTK_MENU_ITEM(GET_WIDGET("menuitem_tabs"));
 	g->tool_bar = GTK_TOOLBAR(GET_WIDGET("toolbar"));
@@ -1053,7 +1053,6 @@ nsgtk_scaffolding *nsgtk_new_scaffolding(struct gui_window *toplevel)
 	g->stop_menu = GTK_MENU_ITEM(GET_WIDGET("stop"));
 	g->reload_menu = GTK_MENU_ITEM(GET_WIDGET("reload"));
 	g->throbber = GTK_IMAGE(GET_WIDGET("throbber"));
-	g->status_pane = GTK_PANED(GET_WIDGET("hpaned1"));
 	
 	g->preferences_dialog = NULL;
 	
@@ -1070,9 +1069,6 @@ nsgtk_scaffolding *nsgtk_new_scaffolding(struct gui_window *toplevel)
 
 	nsgtk_tab_init(g->notebook);
 
-	/* set the size of the hpane with status bar and h scrollbar */
-	gtk_paned_set_position(g->status_pane, option_toolbar_status_width);
-
 	/* set the URL entry box to expand, as we can't do this from within
 	 * glade because of the way it emulates toolbars.
 	 */
@@ -1255,7 +1251,7 @@ void gui_window_set_status(struct gui_window *_g, const char *text)
         struct gtk_scaffolding *g = nsgtk_get_scaffold(_g);
 	assert(g);
 	assert(g->status_bar);
-	gtk_label_set_text(g->status_bar, text);
+	gtk_statusbar_push(g->status_bar, 0, text);
 }
 
 void gui_window_set_url(struct gui_window *_g, const char *url)
diff --git a/gtk/res/netsurf.glade b/gtk/res/netsurf.glade
index cae1cc0d0..499433d1d 100644
--- a/gtk/res/netsurf.glade
+++ b/gtk/res/netsurf.glade
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
-<!--Generated with glade3 3.4.5 on Mon Aug 11 01:54:25 2008 -->
+<!--Generated with glade3 3.4.5 on Wed Aug 27 21:22:56 2008 -->
 <glade-interface>
   <widget class="GtkWindow" id="wndBrowser">
     <property name="title" translatable="yes">NetSurf</property>
@@ -106,7 +106,6 @@
                     <child>
                       <widget class="GtkMenuItem" id="export">
                         <property name="visible">True</property>
-                        <property name="sensitive">True</property>
                         <property name="tooltip" translatable="yes">Export the page to a different format.</property>
                         <property name="label" translatable="yes">Export</property>
                         <property name="use_underline">True</property>
@@ -142,7 +141,6 @@
                             <child>
                               <widget class="GtkMenuItem" id="export_pdf">
                                 <property name="visible">True</property>
-                                <property name="sensitive">True</property>
                                 <property name="tooltip" translatable="yes">Portable Document Format.</property>
                                 <property name="label" translatable="yes">PDF...</property>
                                 <property name="use_underline">True</property>
@@ -160,11 +158,10 @@
                     <child>
                       <widget class="GtkImageMenuItem" id="print_preview">
                         <property name="visible">True</property>
-                        <property name="sensitive">True</property>
                         <property name="tooltip" translatable="yes">Show how a print out might look like.</property>
                         <property name="label" translatable="yes">Print preview...</property>
                         <property name="use_underline">True</property>
-                        <accelerator key="P" modifiers="GDK_CONTROL_MASK | GDK_SHIFT_MASK" signal="activate"/>
+                        <accelerator key="P" modifiers="GDK_SHIFT_MASK | GDK_CONTROL_MASK" signal="activate"/>
                         <child internal-child="image">
                           <widget class="GtkImage" id="image558">
                             <property name="visible">True</property>
@@ -177,12 +174,11 @@
                     <child>
                       <widget class="GtkImageMenuItem" id="print">
                         <property name="visible">True</property>
-                        <property name="sensitive">True</property>
                         <property name="tooltip" translatable="yes">Produce a hardcopy on your printer.</property>
                         <property name="label" translatable="yes">Print...</property>
                         <property name="use_underline">True</property>
-			<accelerator key="P" signal="activate" modifiers="GDK_CONTROL_MASK"/>                        
-			<child internal-child="image">
+                        <accelerator key="P" modifiers="GDK_CONTROL_MASK" signal="activate"/>
+                        <child internal-child="image">
                           <widget class="GtkImage" id="image559">
                             <property name="visible">True</property>
                             <property name="stock">gtk-print</property>
@@ -843,103 +839,51 @@
           </packing>
         </child>
         <child>
-          <widget class="GtkTable" id="centreTable">
+          <widget class="GtkNotebook" id="notebook">
             <property name="visible">True</property>
-            <property name="n_rows">3</property>
-            <property name="n_columns">2</property>
+            <property name="can_focus">True</property>
+            <property name="show_tabs">False</property>
+            <property name="show_border">False</property>
+            <property name="scrollable">True</property>
+            <child>
+              <placeholder/>
+            </child>
             <child>
-              <widget class="GtkNotebook" id="notebook">
+              <widget class="GtkLabel" id="label1">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="show_tabs">False</property>
-                <property name="show_border">False</property>
-                <property name="scrollable">True</property>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <widget class="GtkLabel" id="label1">
-                    <property name="visible">True</property>
-                    <property name="label" translatable="yes">page 1</property>
-                  </widget>
-                  <packing>
-                    <property name="type">tab</property>
-                    <property name="tab_fill">False</property>
-                  </packing>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <widget class="GtkLabel" id="label2">
-                    <property name="visible">True</property>
-                    <property name="label" translatable="yes">page 2</property>
-                  </widget>
-                  <packing>
-                    <property name="type">tab</property>
-                    <property name="position">1</property>
-                    <property name="tab_fill">False</property>
-                  </packing>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
-                <child>
-                  <widget class="GtkLabel" id="label3">
-                    <property name="visible">True</property>
-                    <property name="label" translatable="yes">page 3</property>
-                  </widget>
-                  <packing>
-                    <property name="type">tab</property>
-                    <property name="position">2</property>
-                    <property name="tab_fill">False</property>
-                  </packing>
-                </child>
+                <property name="label" translatable="yes">page 1</property>
               </widget>
               <packing>
-                <property name="right_attach">2</property>
-                <property name="bottom_attach">2</property>
+                <property name="type">tab</property>
+                <property name="tab_fill">False</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkHPaned" id="hpaned1">
+              <placeholder/>
+            </child>
+            <child>
+              <widget class="GtkLabel" id="label2">
                 <property name="visible">True</property>
-                <child>
-                  <widget class="GtkLabel" id="statusBar">
-                    <property name="visible">True</property>
-                    <property name="xalign">0</property>
-                    <property name="xpad">4</property>
-                    <property name="label" translatable="yes">Status bar text goes here</property>
-                    <property name="selectable">True</property>
-                    <property name="ellipsize">PANGO_ELLIPSIZE_MIDDLE</property>
-                  </widget>
-                  <packing>
-                    <property name="resize">False</property>
-                    <property name="shrink">True</property>
-                  </packing>
-                </child>
-                <child>
-                  <placeholder/>
-                </child>
+                <property name="label" translatable="yes">page 2</property>
               </widget>
               <packing>
-                <property name="top_attach">2</property>
-                <property name="bottom_attach">3</property>
-                <property name="y_options">GTK_SHRINK</property>
+                <property name="type">tab</property>
+                <property name="position">1</property>
+                <property name="tab_fill">False</property>
               </packing>
             </child>
             <child>
-              <widget class="GtkStatusbar" id="statusbar1">
-                <property name="height_request">1</property>
+              <placeholder/>
+            </child>
+            <child>
+              <widget class="GtkLabel" id="label3">
                 <property name="visible">True</property>
+                <property name="label" translatable="yes">page 3</property>
               </widget>
               <packing>
-                <property name="left_attach">1</property>
-                <property name="right_attach">2</property>
-                <property name="top_attach">2</property>
-                <property name="bottom_attach">3</property>
-                <property name="x_options">GTK_FILL</property>
-                <property name="y_options">GTK_SHRINK | GTK_FILL</property>
+                <property name="type">tab</property>
+                <property name="position">2</property>
+                <property name="tab_fill">False</property>
               </packing>
             </child>
           </widget>
@@ -947,6 +891,16 @@
             <property name="position">2</property>
           </packing>
         </child>
+        <child>
+          <widget class="GtkStatusbar" id="statusbar">
+            <property name="visible">True</property>
+          </widget>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="position">3</property>
+          </packing>
+        </child>
       </widget>
     </child>
   </widget>
@@ -983,106 +937,106 @@
                 <property name="column_spacing">11</property>
                 <property name="row_spacing">10</property>
                 <child>
-                  <widget class="GtkEntry" id="entryLoginUser">
+                  <widget class="GtkLabel" id="labelLoginHost">
                     <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="has_focus">True</property>
-                    <property name="text" translatable="yes">sesame</property>
+                    <property name="xalign">0</property>
+                    <property name="label" translatable="yes">moo.yoo.com</property>
                   </widget>
                   <packing>
                     <property name="left_attach">1</property>
                     <property name="right_attach">2</property>
-                    <property name="top_attach">2</property>
-                    <property name="bottom_attach">3</property>
-                    <property name="y_options"></property>
+                    <property name="x_options">GTK_FILL</property>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkEntry" id="entryLoginPass">
+                  <widget class="GtkLabel" id="label57">
                     <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="visibility">False</property>
-                    <property name="activates_default">True</property>
-                    <property name="text" translatable="yes">opensesame</property>
+                    <property name="xalign">0</property>
+                    <property name="label" translatable="yes">Password</property>
                   </widget>
                   <packing>
-                    <property name="left_attach">1</property>
-                    <property name="right_attach">2</property>
                     <property name="top_attach">3</property>
                     <property name="bottom_attach">4</property>
-                    <property name="y_options"></property>
+                    <property name="x_options">GTK_FILL</property>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkLabel" id="labelLoginRealm">
+                  <widget class="GtkLabel" id="label56">
                     <property name="visible">True</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">my sekr3t area</property>
+                    <property name="label" translatable="yes">Username</property>
                   </widget>
                   <packing>
-                    <property name="left_attach">1</property>
-                    <property name="right_attach">2</property>
-                    <property name="top_attach">1</property>
-                    <property name="bottom_attach">2</property>
+                    <property name="top_attach">2</property>
+                    <property name="bottom_attach">3</property>
                     <property name="x_options">GTK_FILL</property>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkLabel" id="label55">
+                  <widget class="GtkLabel" id="label54">
                     <property name="visible">True</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Realm</property>
+                    <property name="label" translatable="yes">Host</property>
                   </widget>
                   <packing>
-                    <property name="top_attach">1</property>
-                    <property name="bottom_attach">2</property>
                     <property name="x_options">GTK_FILL</property>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkLabel" id="label54">
+                  <widget class="GtkLabel" id="label55">
                     <property name="visible">True</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Host</property>
+                    <property name="label" translatable="yes">Realm</property>
                   </widget>
                   <packing>
+                    <property name="top_attach">1</property>
+                    <property name="bottom_attach">2</property>
                     <property name="x_options">GTK_FILL</property>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkLabel" id="label56">
+                  <widget class="GtkLabel" id="labelLoginRealm">
                     <property name="visible">True</property>
                     <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Username</property>
+                    <property name="label" translatable="yes">my sekr3t area</property>
                   </widget>
                   <packing>
-                    <property name="top_attach">2</property>
-                    <property name="bottom_attach">3</property>
+                    <property name="left_attach">1</property>
+                    <property name="right_attach">2</property>
+                    <property name="top_attach">1</property>
+                    <property name="bottom_attach">2</property>
                     <property name="x_options">GTK_FILL</property>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkLabel" id="label57">
+                  <widget class="GtkEntry" id="entryLoginPass">
                     <property name="visible">True</property>
-                    <property name="xalign">0</property>
-                    <property name="label" translatable="yes">Password</property>
+                    <property name="can_focus">True</property>
+                    <property name="visibility">False</property>
+                    <property name="activates_default">True</property>
+                    <property name="text" translatable="yes">opensesame</property>
                   </widget>
                   <packing>
+                    <property name="left_attach">1</property>
+                    <property name="right_attach">2</property>
                     <property name="top_attach">3</property>
                     <property name="bottom_attach">4</property>
-                    <property name="x_options">GTK_FILL</property>
+                    <property name="y_options"></property>
                   </packing>
                 </child>
                 <child>
-                  <widget class="GtkLabel" id="labelLoginHost">
+                  <widget class="GtkEntry" id="entryLoginUser">
                     <property name="visible">True</property>
-                    <property name="xalign">0</property>
-                    <property name="label" translatable="yes">moo.yoo.com</property>
+                    <property name="can_focus">True</property>
+                    <property name="has_focus">True</property>
+                    <property name="text" translatable="yes">sesame</property>
                   </widget>
                   <packing>
                     <property name="left_attach">1</property>
                     <property name="right_attach">2</property>
-                    <property name="x_options">GTK_FILL</property>
+                    <property name="top_attach">2</property>
+                    <property name="bottom_attach">3</property>
+                    <property name="y_options"></property>
                   </packing>
                 </child>
               </widget>
@@ -1569,7 +1523,7 @@
       <widget class="GtkHBox" id="hbox1">
         <property name="visible">True</property>
         <child>
-          <widget class="GtkImage" id="image2">
+          <widget class="GtkImage" id="image1">
             <property name="visible">True</property>
             <property name="yalign">0.10000000149011612</property>
             <property name="xpad">12</property>
@@ -1600,7 +1554,7 @@
                 <property name="visible">True</property>
                 <property name="border_width">5</property>
                 <child>
-                  <widget class="GtkLabel" id="label1">
+                  <widget class="GtkLabel" id="label4">
                     <property name="visible">True</property>
                     <property name="label" translatable="yes">Owner password:</property>
                     <property name="width_chars">15</property>
@@ -1636,7 +1590,7 @@
                 <property name="visible">True</property>
                 <property name="border_width">5</property>
                 <child>
-                  <widget class="GtkLabel" id="label3">
+                  <widget class="GtkLabel" id="label5">
                     <property name="visible">True</property>
                     <property name="label" translatable="yes">Repeat password:</property>
                     <property name="width_chars">15</property>
@@ -1672,7 +1626,7 @@
                 <property name="visible">True</property>
                 <property name="border_width">5</property>
                 <child>
-                  <widget class="GtkLabel" id="label2">
+                  <widget class="GtkLabel" id="label6">
                     <property name="visible">True</property>
                     <property name="label" translatable="yes">User password:</property>
                     <property name="width_chars">15</property>
@@ -1708,7 +1662,7 @@
                 <property name="visible">True</property>
                 <property name="border_width">5</property>
                 <child>
-                  <widget class="GtkLabel" id="label4">
+                  <widget class="GtkLabel" id="label7">
                     <property name="visible">True</property>
                     <property name="label" translatable="yes">Repeat password:</property>
                     <property name="width_chars">15</property>
@@ -1755,7 +1709,7 @@
                       <widget class="GtkHBox" id="hbox7">
                         <property name="visible">True</property>
                         <child>
-                          <widget class="GtkImage" id="image3">
+                          <widget class="GtkImage" id="image7">
                             <property name="visible">True</property>
                             <property name="stock">gtk-ok</property>
                           </widget>
@@ -1765,7 +1719,7 @@
                           </packing>
                         </child>
                         <child>
-                          <widget class="GtkLabel" id="label6">
+                          <widget class="GtkLabel" id="label8">
                             <property name="visible">True</property>
                             <property name="label" translatable="yes">Set password</property>
                           </widget>
@@ -1790,7 +1744,7 @@
                           <widget class="GtkHBox" id="hbox6">
                             <property name="visible">True</property>
                             <child>
-                              <widget class="GtkImage" id="image1">
+                              <widget class="GtkImage" id="image8">
                                 <property name="visible">True</property>
                                 <property name="stock">gtk-cancel</property>
                               </widget>
@@ -1800,7 +1754,7 @@
                               </packing>
                             </child>
                             <child>
-                              <widget class="GtkLabel" id="label5">
+                              <widget class="GtkLabel" id="label9">
                                 <property name="visible">True</property>
                                 <property name="label" translatable="yes">No password</property>
                               </widget>
-- 
cgit v1.2.3