slight, marginal and trifling nsgtk beautification

svn path=/trunk/netsurf/; revision=10157

!NetSurf/Resources/en/Messages

@@ -367,6 +367,7 @@ HotlistFeatureRequest:NetSurf feature requests
 #
 
 GlobalHistory:Global history
+DomainAll:(All domains)
 DateToday:Today
 DateYesterday:Yesterday
 Date1Week:Last week
@@ -433,7 +434,7 @@ gtkOverwriteInfo:The file already exists in "%s".  Replacing it will overwrite i
 gtkFailed:Download failed
 gtkFileError:File error: %s
 gtkInfo:%s from %s is %s in size
-gtkSave:Save file as...
+gtkSave:Save file as…
 gtkSourceSave:Save source
 gtkSourceTabError:Error handling source data 
 gtkplainSave:Save plain text
@@ -455,16 +456,16 @@ gtkOpenFile:_Open File
 gtkOpenFileAccel:<ctrl>o
 gtkCloseWindow:_Close Window
 gtkCloseWindowAccel:<ctrl><shift>w
-gtkSavePage:Save Page..
+gtkSavePage:Save Page…
 gtkSavePageAccel:<ctrl>s
 gtkExport:Export
-gtkPlainText:Plain Text..
+gtkPlainText:Plain Text…
-gtkDrawFile:Drawfile..
+gtkDrawFile:Drawfile…
-gtkPostScript:PostScript..
+gtkPostScript:PostScript…
-gtkPDF:PDF..
+gtkPDF:PDF…
-gtkPrintPreview:Print Preview..
+gtkPrintPreview:Print Preview…
 gtkPrintPreviewAccel:<ctrl><shift>p
-gtkPrint:Print..
+gtkPrint:Print…
 gtkPrintAccel:<ctrl>p
 gtkQuitMenu:_Quit
 gtkQuitMenuAccel:<ctrl>q
@@ -478,7 +479,7 @@ gtkPasteAccel:<ctrl>v
 gtkDelete:_Delete
 gtkSelectAll:Select _All
 gtkSelectAllAccel:<ctrl>a
-gtkFind:_Find..
+gtkFind:_Find…
 gtkFindAccel:<ctrl>f
 gtkPreferences:P_references
 
@@ -518,14 +519,14 @@ gtkForward:_Forward
 gtkForwardAccel:<alt>Right
 gtkHome:_Home
 gtkHomeAccel:<alt>Down
-gtkLocalHistory:_Local History
+gtkLocalHistory:_Local History…
 gtkLocalHistoryAccel:<ctrl>h
-gtkGlobalHistory:_Global History
+gtkGlobalHistory:_Global History…
 gtkGlobalHistoryAccel:<ctrl><shift>h
-gtkAddBookMarks:_Add to Bookmarks..
+gtkAddBookMarks:_Add to Bookmarks…
-gtkShowBookMarks:_Show Bookmarks..
+gtkShowBookMarks:_Show Bookmarks…
 gtkShowBookMarksAccel:F6
-gtkOpenLocation:_Open Location..
+gtkOpenLocation:_Open Location…
 gtkOpenLocationAccel:<ctrl>l
 
 gtkNextTab:_Next tab
@@ -535,10 +536,10 @@ gtkPrevTabAccel:<ctrl>Left
 gtkCloseTab:_Close tab
 gtkCloseTabAccel:<ctrl>w
 
-gtkContents:_Contents
+gtkContents:_Contents…
-gtkGuide:User _guide
+gtkGuide:User _guide…
-gtkUserInformation:User _information
+gtkUserInformation:User _information…
-gtkAbout:_About
+gtkAbout:_About…
 
 
 gtkToolBarTitle:Toolbar custom button store

gtk/dialogs/gtk_about.c

@@ -55,7 +55,7 @@ static const gchar *description =
 static const gchar *url = "http://www.netsurf-browser.org/";
 static const gchar *url_label = "NetSurf Website";
 static const gchar *copyright =
-		"Copyright © 2003 - 2009 The NetSurf Developers";
+		"Copyright © 2003 - 2010 The NetSurf Developers";
 
 static void launch_url (GtkAboutDialog *about_dialog, const gchar *url,
 		gpointer data)

gtk/res/history.glade

@@ -1,13 +1,13 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0"?>
-<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
-<!--Generated with glade3 3.4.5 on Thu Aug  7 20:51:09 2008 -->
 <glade-interface>
+  <!-- interface-requires gtk+ 2.16 -->
+  <!-- interface-naming-policy toplevel-contextual -->
   <widget class="GtkWindow" id="wndHistory">
     <property name="title" translatable="yes">NetSurf Global History</property>
-    <property name="window_position">GTK_WIN_POS_CENTER</property>
+    <property name="window_position">center</property>
     <property name="default_width">600</property>
     <property name="default_height">500</property>
-    <property name="type_hint">GDK_WINDOW_TYPE_HINT_UTILITY</property>
+    <property name="type_hint">utility</property>
     <signal name="delete_event" handler="gtk_widget_hide"/>
     <child>
       <widget class="GtkVBox" id="vbox1">
@@ -36,6 +36,7 @@
                         <property name="expand">False</property>
                         <property name="fill">False</property>
                         <property name="padding">1</property>
+                        <property name="position">0</property>
                       </packing>
                     </child>
                     <child>
@@ -53,6 +54,7 @@ Number of Visits</property>
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">False</property>
+                    <property name="position">0</property>
                   </packing>
                 </child>
                 <child>
@@ -60,9 +62,9 @@ Number of Visits</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="border_width">1</property>
-                    <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                    <property name="hscrollbar_policy">automatic</property>
-                    <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                    <property name="vscrollbar_policy">automatic</property>
-                    <property name="shadow_type">GTK_SHADOW_IN</property>
+                    <property name="shadow_type">in</property>
                     <child>
                       <widget class="GtkTreeView" id="treeDomain">
                         <property name="visible">True</property>
@@ -91,7 +93,7 @@ Number of Visits</property>
                     <child>
                       <widget class="GtkLabel" id="label2">
                         <property name="visible">True</property>
-                        <property name="label" translatable="yes">&lt;b&gt;_Search:&lt;/b&gt;</property>
+                        <property name="label" translatable="yes">&lt;b&gt;_Search for&lt;/b&gt;</property>
                         <property name="use_markup">True</property>
                         <property name="use_underline">True</property>
                       </widget>
@@ -99,13 +101,14 @@ Number of Visits</property>
                         <property name="expand">False</property>
                         <property name="fill">False</property>
                         <property name="padding">1</property>
+                        <property name="position">0</property>
                       </packing>
                     </child>
                     <child>
                       <widget class="GtkEntry" id="entrySearch">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
-                        <property name="shadow_type">GTK_SHADOW_OUT</property>
+                        <property name="shadow_type">out</property>
                       </widget>
                       <packing>
                         <property name="position">1</property>
@@ -114,18 +117,18 @@ Number of Visits</property>
                     <child>
                       <widget class="GtkButton" id="buttonClearSearch">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="receives_default">True</property>
-                        <property name="relief">GTK_RELIEF_NONE</property>
+                        <property name="relief">none</property>
                         <property name="focus_on_click">False</property>
                         <property name="xalign">0</property>
                         <property name="yalign">0</property>
-                        <property name="response_id">0</property>
                         <child>
                           <widget class="GtkImage" id="image1">
                             <property name="visible">True</property>
                             <property name="tooltip" translatable="yes">Clear the search entry</property>
                             <property name="stock">gtk-clear</property>
-                            <property name="icon_size">1</property>
+                            <property name="icon-size">1</property>
                           </widget>
                         </child>
                       </widget>
@@ -139,6 +142,7 @@ Number of Visits</property>
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">False</property>
+                    <property name="position">0</property>
                   </packing>
                 </child>
                 <child>
@@ -146,9 +150,9 @@ Number of Visits</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="border_width">1</property>
-                    <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                    <property name="hscrollbar_policy">automatic</property>
-                    <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+                    <property name="vscrollbar_policy">automatic</property>
-                    <property name="shadow_type">GTK_SHADOW_IN</property>
+                    <property name="shadow_type">in</property>
                     <child>
                       <widget class="GtkTreeView" id="treeHistory">
                         <property name="visible">True</property>
@@ -169,6 +173,9 @@ Number of Visits</property>
               </packing>
             </child>
           </widget>
+          <packing>
+            <property name="position">0</property>
+          </packing>
         </child>
         <child>
           <widget class="GtkHBox" id="hbox3">
@@ -181,12 +188,13 @@ Number of Visits</property>
                 <property name="n_rows">3</property>
                 <property name="n_columns">2</property>
                 <property name="column_spacing">5</property>
+                <property name="row_spacing">5</property>
                 <child>
                   <widget class="GtkLabel" id="labelHistoryAddress">
                     <property name="visible">True</property>
                     <property name="xalign">0</property>
                     <property name="label" translatable="yes">http://netsurf.sf.net/</property>
-                    <property name="ellipsize">PANGO_ELLIPSIZE_MIDDLE</property>
+                    <property name="ellipsize">middle</property>
                   </widget>
                   <packing>
                     <property name="left_attach">1</property>
@@ -199,7 +207,7 @@ Number of Visits</property>
                     <property name="visible">True</property>
                     <property name="xalign">0</property>
                     <property name="label" translatable="yes">Fri Aug 09, 2006</property>
-                    <property name="ellipsize">PANGO_ELLIPSIZE_END</property>
+                    <property name="ellipsize">end</property>
                   </widget>
                   <packing>
                     <property name="left_attach">1</property>
@@ -214,7 +222,7 @@ Number of Visits</property>
                     <property name="visible">True</property>
                     <property name="xalign">0</property>
                     <property name="label" translatable="yes">2</property>
-                    <property name="ellipsize">PANGO_ELLIPSIZE_END</property>
+                    <property name="ellipsize">end</property>
                   </widget>
                   <packing>
                     <property name="left_attach">1</property>
@@ -228,53 +236,56 @@ Number of Visits</property>
                   <widget class="GtkLabel" id="label119">
                     <property name="visible">True</property>
                     <property name="xalign">1</property>
-                    <property name="label" translatable="yes">Number of visits:</property>
+                    <property name="label" translatable="yes">Number of visits</property>
                   </widget>
                   <packing>
                     <property name="top_attach">2</property>
                     <property name="bottom_attach">3</property>
                     <property name="x_options">GTK_FILL</property>
-                    <property name="y_options"></property>
+                    <property name="y_options">GTK_EXPAND</property>
                   </packing>
                 </child>
                 <child>
                   <widget class="GtkLabel" id="label118">
                     <property name="visible">True</property>
                     <property name="xalign">1</property>
-                    <property name="label" translatable="yes">Last visited:</property>
+                    <property name="label" translatable="yes">Last visited</property>
                   </widget>
                   <packing>
                     <property name="top_attach">1</property>
                     <property name="bottom_attach">2</property>
                     <property name="x_options">GTK_FILL</property>
-                    <property name="y_options"></property>
+                    <property name="y_options">GTK_EXPAND</property>
                   </packing>
                 </child>
                 <child>
                   <widget class="GtkLabel" id="label117">
                     <property name="visible">True</property>
                     <property name="xalign">1</property>
-                    <property name="label" translatable="yes">Address:</property>
+                    <property name="label" translatable="yes">Address</property>
                   </widget>
                   <packing>
                     <property name="x_options">GTK_FILL</property>
-                    <property name="y_options"></property>
+                    <property name="y_options">GTK_EXPAND</property>
                   </packing>
                 </child>
               </widget>
+              <packing>
+                <property name="position">0</property>
+              </packing>
             </child>
             <child>
               <widget class="GtkFrame" id="imageFrame">
                 <property name="label_xalign">1</property>
                 <property name="label_yalign">1</property>
-                <property name="shadow_type">GTK_SHADOW_IN</property>
+                <property name="shadow_type">in</property>
                 <child>
                   <widget class="GtkImage" id="imageThumbnail">
                     <property name="width_request">100</property>
                     <property name="height_request">86</property>
                     <property name="visible">True</property>
                     <property name="stock">gtk-file</property>
-                    <property name="icon_size">6</property>
+                    <property name="icon-size">6</property>
                   </widget>
                 </child>
                 <child>

gtk/res/netsurf.glade

@@ -1,16 +1,35 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
-<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
+<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
-<!--*- mode: xml -*-->
+
 <glade-interface>
+
 <widget class="GtkWindow" id="wndBrowser">
   <property name="title" translatable="yes">NetSurf</property>
+  <property name="type">GTK_WINDOW_TOPLEVEL</property>
   <property name="window_position">GTK_WIN_POS_CENTER</property>
+  <property name="modal">False</property>
+  <property name="resizable">True</property>
+  <property name="destroy_with_parent">False</property>
+  <property name="decorated">True</property>
+  <property name="skip_taskbar_hint">False</property>
+  <property name="skip_pager_hint">False</property>
+  <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
+  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+  <property name="focus_on_map">True</property>
+  <property name="urgency_hint">False</property>
+
   <child>
     <widget class="GtkVBox" id="vbox14">
       <property name="visible">True</property>
+      <property name="homogeneous">False</property>
+      <property name="spacing">0</property>
+
       <child>
 	<widget class="GtkMenuBar" id="menubar">
 	  <property name="visible">True</property>
+	  <property name="pack_direction">GTK_PACK_DIRECTION_LTR</property>
+	  <property name="child_pack_direction">GTK_PACK_DIRECTION_LTR</property>
+
 	  <child>
 	    <widget class="GtkMenuItem" id="menuitem_file">
 	      <property name="visible">True</property>
@@ -18,6 +37,7 @@
 	      <property name="use_underline">True</property>
 	    </widget>
 	  </child>
+
 	  <child>
 	    <widget class="GtkMenuItem" id="menuitem_edit">
 	      <property name="visible">True</property>
@@ -25,6 +45,7 @@
 	      <property name="use_underline">True</property>
 	    </widget>
 	  </child>
+
 	  <child>
 	    <widget class="GtkMenuItem" id="menuitem_view">
 	      <property name="visible">True</property>
@@ -32,6 +53,7 @@
 	      <property name="use_underline">True</property>
 	    </widget>
 	  </child>
+
 	  <child>
 	    <widget class="GtkMenuItem" id="menuitem_nav">
 	      <property name="visible">True</property>
@@ -39,6 +61,7 @@
 	      <property name="use_underline">True</property>
 	    </widget>
 	  </child>
+
 	  <child>
 	    <widget class="GtkMenuItem" id="menuitem_tabs">
 	      <property name="visible">True</property>
@@ -46,6 +69,7 @@
 	      <property name="use_underline">True</property>
 	    </widget>
 	  </child>
+
 	  <child>
 	    <widget class="GtkMenuItem" id="menuitem_help">
 	      <property name="visible">True</property>
@@ -55,40 +79,72 @@
 	  </child>
 	</widget>
 	<packing>
+	  <property name="padding">0</property>
 	  <property name="expand">False</property>
 	  <property name="fill">False</property>
 	</packing>
       </child>
+
       <child>
 	<widget class="GtkToolbar" id="toolbar">
 	  <property name="visible">True</property>
+	  <property name="orientation">GTK_ORIENTATION_HORIZONTAL</property>
 	  <property name="toolbar_style">GTK_TOOLBAR_BOTH_HORIZ</property>
+	  <property name="tooltips">True</property>
+	  <property name="show_arrow">True</property>
 	</widget>
 	<packing>
+	  <property name="padding">0</property>
 	  <property name="expand">False</property>
 	  <property name="fill">False</property>
-            <property name="position">1</property>
 	</packing>
       </child>
+
       <child>
 	<widget class="GtkToolbar" id="searchbar">
+	  <property name="orientation">GTK_ORIENTATION_HORIZONTAL</property>
+	  <property name="toolbar_style">GTK_TOOLBAR_BOTH</property>
+	  <property name="tooltips">True</property>
+	  <property name="show_arrow">True</property>
+
 	  <child>
 	    <widget class="GtkToolButton" id="closeSearchButton">
 	      <property name="visible">True</property>
 	      <property name="stock_id">gtk-close</property>
+	      <property name="visible_horizontal">True</property>
+	      <property name="visible_vertical">True</property>
+	      <property name="is_important">False</property>
 	    </widget>
 	    <packing>
 	      <property name="expand">False</property>
 	      <property name="homogeneous">False</property>
 	    </packing>
 	  </child>
+
 	  <child>
 	    <widget class="GtkToolItem" id="searchLabelItem">
 	      <property name="visible">True</property>
+	      <property name="visible_horizontal">True</property>
+	      <property name="visible_vertical">True</property>
+	      <property name="is_important">False</property>
+
 	      <child>
 		<widget class="GtkLabel" id="searchlabel">
 		  <property name="visible">True</property>
 		  <property name="label" translatable="yes">Match</property>
+		  <property name="use_underline">False</property>
+		  <property name="use_markup">False</property>
+		  <property name="justify">GTK_JUSTIFY_LEFT</property>
+		  <property name="wrap">False</property>
+		  <property name="selectable">False</property>
+		  <property name="xalign">0.5</property>
+		  <property name="yalign">0.5</property>
+		  <property name="xpad">4</property>
+		  <property name="ypad">0</property>
+		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		  <property name="width_chars">-1</property>
+		  <property name="single_line_mode">False</property>
+		  <property name="angle">0</property>
 		</widget>
 	      </child>
 	    </widget>
@@ -97,13 +153,25 @@
 	      <property name="homogeneous">False</property>
 	    </packing>
 	  </child>
+
 	  <child>
 	    <widget class="GtkToolItem" id="toolSearch">
 	      <property name="visible">True</property>
+	      <property name="visible_horizontal">True</property>
+	      <property name="visible_vertical">True</property>
+	      <property name="is_important">False</property>
+
 	      <child>
 		<widget class="GtkEntry" id="searchEntry">
 		  <property name="visible">True</property>
 		  <property name="can_focus">True</property>
+		  <property name="editable">True</property>
+		  <property name="visibility">True</property>
+		  <property name="max_length">0</property>
+		  <property name="text" translatable="yes"></property>
+		  <property name="has_frame">True</property>
+		  <property name="invisible_char">●</property>
+		  <property name="activates_default">False</property>
 		</widget>
 	      </child>
 	    </widget>
@@ -112,40 +180,57 @@
 	      <property name="homogeneous">False</property>
 	    </packing>
 	  </child>
+
 	  <child>
 	    <widget class="GtkToolButton" id="searchBackButton">
 	      <property name="visible">True</property>
-                <property name="label" translatable="yes">search _Back</property>
+	      <property name="label" translatable="yes">Search _Back</property>
 	      <property name="use_underline">True</property>
 	      <property name="stock_id">gtk-go-back</property>
+	      <property name="visible_horizontal">True</property>
+	      <property name="visible_vertical">True</property>
+	      <property name="is_important">False</property>
 	    </widget>
 	    <packing>
 	      <property name="expand">False</property>
 	      <property name="homogeneous">False</property>
 	    </packing>
 	  </child>
+
 	  <child>
 	    <widget class="GtkToolButton" id="searchForwardButton">
 	      <property name="visible">True</property>
-                <property name="label" translatable="yes">search _Forward</property>
+	      <property name="label" translatable="yes">Search _Forward</property>
 	      <property name="use_underline">True</property>
 	      <property name="stock_id">gtk-go-forward</property>
+	      <property name="visible_horizontal">True</property>
+	      <property name="visible_vertical">True</property>
+	      <property name="is_important">False</property>
 	    </widget>
 	    <packing>
 	      <property name="expand">False</property>
 	      <property name="homogeneous">False</property>
 	    </packing>
 	  </child>
+
 	  <child>
 	    <widget class="GtkToolItem" id="checkAllSearchItem">
 	      <property name="visible">True</property>
+	      <property name="visible_horizontal">True</property>
+	      <property name="visible_vertical">True</property>
+	      <property name="is_important">False</property>
+
 	      <child>
 		<widget class="GtkCheckButton" id="checkAllSearch">
 		  <property name="visible">True</property>
-                    <property name="can_focus">True</property>
 		  <property name="tooltip" translatable="yes">show all matches</property>
-                    <property name="label" translatable="yes">all      </property>
+		  <property name="can_focus">True</property>
-                    <property name="response_id">0</property>
+		  <property name="label" translatable="yes">All      </property>
+		  <property name="use_underline">True</property>
+		  <property name="relief">GTK_RELIEF_NORMAL</property>
+		  <property name="focus_on_click">True</property>
+		  <property name="active">False</property>
+		  <property name="inconsistent">False</property>
 		  <property name="draw_indicator">True</property>
 		</widget>
 	      </child>
@@ -155,17 +240,25 @@
 	      <property name="homogeneous">False</property>
 	    </packing>
 	  </child>
+
 	  <child>
 	    <widget class="GtkToolItem" id="caseSensItem">
 	      <property name="visible">True</property>
+	      <property name="visible_horizontal">True</property>
+	      <property name="visible_vertical">True</property>
+	      <property name="is_important">False</property>
+
 	      <child>
 		<widget class="GtkCheckButton" id="caseSensButton">
 		  <property name="visible">True</property>
-                    <property name="can_focus">True</property>
 		  <property name="tooltip" translatable="yes">Match case when searching</property>
-                    <property name="label" translatable="yes">case</property>
+		  <property name="can_focus">True</property>
+		  <property name="label" translatable="yes">Case</property>
+		  <property name="use_underline">True</property>
 		  <property name="relief">GTK_RELIEF_NONE</property>
-                    <property name="response_id">0</property>
+		  <property name="focus_on_click">True</property>
+		  <property name="active">False</property>
+		  <property name="inconsistent">False</property>
 		  <property name="draw_indicator">True</property>
 		</widget>
 	      </child>
@@ -177,63 +270,207 @@
 	  </child>
 	</widget>
 	<packing>
+	  <property name="padding">0</property>
 	  <property name="expand">False</property>
 	  <property name="fill">False</property>
-            <property name="position">2</property>
 	</packing>
       </child>
+
       <child>
 	<widget class="GtkNotebook" id="notebook">
 	  <property name="visible">True</property>
 	  <property name="show_tabs">False</property>
 	  <property name="show_border">False</property>
+	  <property name="tab_pos">GTK_POS_TOP</property>
 	  <property name="scrollable">True</property>
+	  <property name="enable_popup">False</property>
+
 	  <child>
 	    <placeholder/>
 	  </child>
+
 	  <child>
-              <placeholder/>
+	    <widget class="GtkLabel" id="label1">
+	      <property name="visible">True</property>
+	      <property name="label" translatable="yes"></property>
+	      <property name="use_underline">False</property>
+	      <property name="use_markup">False</property>
+	      <property name="justify">GTK_JUSTIFY_LEFT</property>
+	      <property name="wrap">False</property>
+	      <property name="selectable">False</property>
+	      <property name="xalign">0.5</property>
+	      <property name="yalign">0.5</property>
+	      <property name="xpad">0</property>
+	      <property name="ypad">0</property>
+	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+	      <property name="width_chars">-1</property>
+	      <property name="single_line_mode">False</property>
+	      <property name="angle">0</property>
+	    </widget>
 	    <packing>
 	      <property name="type">tab</property>
 	    </packing>
 	  </child>
+
 	  <child>
 	    <placeholder/>
 	  </child>
+
 	  <child>
-              <placeholder/>
+	    <widget class="GtkLabel" id="label2">
+	      <property name="visible">True</property>
+	      <property name="label" translatable="yes"></property>
+	      <property name="use_underline">False</property>
+	      <property name="use_markup">False</property>
+	      <property name="justify">GTK_JUSTIFY_LEFT</property>
+	      <property name="wrap">False</property>
+	      <property name="selectable">False</property>
+	      <property name="xalign">0.5</property>
+	      <property name="yalign">0.5</property>
+	      <property name="xpad">0</property>
+	      <property name="ypad">0</property>
+	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+	      <property name="width_chars">-1</property>
+	      <property name="single_line_mode">False</property>
+	      <property name="angle">0</property>
+	    </widget>
 	    <packing>
 	      <property name="type">tab</property>
 	    </packing>
 	  </child>
+
 	  <child>
 	    <placeholder/>
 	  </child>
+
+	  <child>
+	    <widget class="GtkLabel" id="label3">
+	      <property name="visible">True</property>
+	      <property name="label" translatable="yes"></property>
+	      <property name="use_underline">False</property>
+	      <property name="use_markup">False</property>
+	      <property name="justify">GTK_JUSTIFY_LEFT</property>
+	      <property name="wrap">False</property>
+	      <property name="selectable">False</property>
+	      <property name="xalign">0.5</property>
+	      <property name="yalign">0.5</property>
+	      <property name="xpad">0</property>
+	      <property name="ypad">0</property>
+	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+	      <property name="width_chars">-1</property>
+	      <property name="single_line_mode">False</property>
+	      <property name="angle">0</property>
+	    </widget>
+	    <packing>
+	      <property name="type">tab</property>
+	    </packing>
+	  </child>
+
 	  <child>
 	    <placeholder/>
+	  </child>
+
+	  <child>
+	    <widget class="GtkLabel" id="label4">
+	      <property name="visible">True</property>
+	      <property name="label" translatable="yes"></property>
+	      <property name="use_underline">False</property>
+	      <property name="use_markup">False</property>
+	      <property name="justify">GTK_JUSTIFY_LEFT</property>
+	      <property name="wrap">False</property>
+	      <property name="selectable">False</property>
+	      <property name="xalign">0.5</property>
+	      <property name="yalign">0.5</property>
+	      <property name="xpad">0</property>
+	      <property name="ypad">0</property>
+	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+	      <property name="width_chars">-1</property>
+	      <property name="single_line_mode">False</property>
+	      <property name="angle">0</property>
+	    </widget>
+	    <packing>
+	      <property name="type">tab</property>
+	    </packing>
+	  </child>
+
+	  <child>
+	    <placeholder/>
+	  </child>
+
+	  <child>
+	    <widget class="GtkLabel" id="label5">
+	      <property name="visible">True</property>
+	      <property name="label" translatable="yes"></property>
+	      <property name="use_underline">False</property>
+	      <property name="use_markup">False</property>
+	      <property name="justify">GTK_JUSTIFY_LEFT</property>
+	      <property name="wrap">False</property>
+	      <property name="selectable">False</property>
+	      <property name="xalign">0.5</property>
+	      <property name="yalign">0.5</property>
+	      <property name="xpad">0</property>
+	      <property name="ypad">0</property>
+	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+	      <property name="width_chars">-1</property>
+	      <property name="single_line_mode">False</property>
+	      <property name="angle">0</property>
+	    </widget>
+	    <packing>
+	      <property name="type">tab</property>
+	    </packing>
+	  </child>
+
+	  <child>
+	    <placeholder/>
+	  </child>
+
+	  <child>
+	    <widget class="GtkLabel" id="label6">
+	      <property name="visible">True</property>
+	      <property name="label" translatable="yes"></property>
+	      <property name="use_underline">False</property>
+	      <property name="use_markup">False</property>
+	      <property name="justify">GTK_JUSTIFY_LEFT</property>
+	      <property name="wrap">False</property>
+	      <property name="selectable">False</property>
+	      <property name="xalign">0.5</property>
+	      <property name="yalign">0.5</property>
+	      <property name="xpad">0</property>
+	      <property name="ypad">0</property>
+	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+	      <property name="width_chars">-1</property>
+	      <property name="single_line_mode">False</property>
+	      <property name="angle">0</property>
+	    </widget>
 	    <packing>
 	      <property name="type">tab</property>
 	    </packing>
 	  </child>
 	</widget>
 	<packing>
-            <property name="position">3</property>
+	  <property name="padding">0</property>
+	  <property name="expand">True</property>
+	  <property name="fill">True</property>
 	</packing>
       </child>
+
       <child>
 	<widget class="GtkStatusbar" id="statusbar">
 	  <property name="visible">True</property>
+	  <property name="has_resize_grip">True</property>
 	</widget>
 	<packing>
+	  <property name="padding">0</property>
 	  <property name="expand">False</property>
 	  <property name="fill">False</property>
-            <property name="position">4</property>
 	</packing>
       </child>
     </widget>
   </child>
 </widget>
+
 <widget class="GtkMenu" id="menuPopup">
+
   <child>
     <widget class="GtkMenuItem" id="menupopup_file">
       <property name="visible">True</property>
@@ -241,6 +478,7 @@
       <property name="use_underline">True</property>
     </widget>
   </child>
+
   <child>
     <widget class="GtkMenuItem" id="menupopup_edit">
       <property name="visible">True</property>
@@ -248,6 +486,7 @@
       <property name="use_underline">True</property>
     </widget>
   </child>
+
   <child>
     <widget class="GtkMenuItem" id="menupopup_view">
       <property name="visible">True</property>
@@ -255,6 +494,7 @@
       <property name="use_underline">True</property>
     </widget>
   </child>
+
   <child>
     <widget class="GtkMenuItem" id="menupopup_nav">
       <property name="visible">True</property>
@@ -262,6 +502,7 @@
       <property name="use_underline">True</property>
     </widget>
   </child>
+
   <child>
     <widget class="GtkMenuItem" id="menupopup_tabs">
       <property name="visible">True</property>
@@ -269,6 +510,7 @@
       <property name="use_underline">True</property>
     </widget>
   </child>
+
   <child>
     <widget class="GtkMenuItem" id="menupopup_help">
       <property name="visible">True</property>
@@ -276,11 +518,13 @@
       <property name="use_underline">True</property>
     </widget>
   </child>
+
   <child>
     <widget class="GtkSeparatorMenuItem" id="menupopup_sep">
       <property name="visible">True</property>
     </widget>
   </child>
+
   <child>
     <widget class="GtkMenuItem" id="open_link_in_focused_tab_popup">
       <property name="visible">True</property>
@@ -288,6 +532,7 @@
       <property name="use_underline">True</property>
     </widget>
   </child>
+
   <child>
     <widget class="GtkMenuItem" id="open_link_in_background_tab_popup">
       <property name="visible">True</property>
@@ -295,120 +540,166 @@
       <property name="use_underline">True</property>
     </widget>
   </child>
+
   <child>
     <widget class="GtkSeparatorMenuItem" id="sep2">
       <property name="visible">True</property>
     </widget>
   </child>
+
   <child>
     <widget class="GtkImageMenuItem" id="back_popup">
       <property name="visible">True</property>
       <property name="label" translatable="yes">_Back</property>
       <property name="use_underline">True</property>
+
       <child internal-child="image">
-          <widget class="GtkImage" id="image634">
+	<widget class="GtkImage" id="image646">
 	  <property name="visible">True</property>
 	  <property name="stock">gtk-go-back</property>
 	  <property name="icon_size">1</property>
+	  <property name="xalign">0.5</property>
+	  <property name="yalign">0.5</property>
+	  <property name="xpad">0</property>
+	  <property name="ypad">0</property>
 	</widget>
       </child>
     </widget>
   </child>
+
   <child>
     <widget class="GtkImageMenuItem" id="forward_popup">
       <property name="visible">True</property>
       <property name="label" translatable="yes">_Forward</property>
       <property name="use_underline">True</property>
+
       <child internal-child="image">
-          <widget class="GtkImage" id="image635">
+	<widget class="GtkImage" id="image647">
 	  <property name="visible">True</property>
 	  <property name="stock">gtk-go-forward</property>
 	  <property name="icon_size">1</property>
+	  <property name="xalign">0.5</property>
+	  <property name="yalign">0.5</property>
+	  <property name="xpad">0</property>
+	  <property name="ypad">0</property>
 	</widget>
       </child>
     </widget>
   </child>
+
   <child>
     <widget class="GtkSeparatorMenuItem" id="sep">
       <property name="visible">True</property>
     </widget>
   </child>
+
   <child>
     <widget class="GtkImageMenuItem" id="reload_popup">
       <property name="visible">True</property>
       <property name="label" translatable="yes">_Reload</property>
       <property name="use_underline">True</property>
+
       <child internal-child="image">
-          <widget class="GtkImage" id="image636">
+	<widget class="GtkImage" id="image648">
 	  <property name="visible">True</property>
 	  <property name="stock">gtk-refresh</property>
 	  <property name="icon_size">1</property>
+	  <property name="xalign">0.5</property>
+	  <property name="yalign">0.5</property>
+	  <property name="xpad">0</property>
+	  <property name="ypad">0</property>
 	</widget>
       </child>
     </widget>
   </child>
+
   <child>
     <widget class="GtkImageMenuItem" id="save_link_popup">
       <property name="visible">True</property>
-        <property name="label" translatable="yes">Save Lin_k As...</property>
+      <property name="label" translatable="yes">Save Lin_k As…</property>
       <property name="use_underline">True</property>
+
       <child internal-child="image">
-          <widget class="GtkImage" id="image637">
+	<widget class="GtkImage" id="image649">
 	  <property name="visible">True</property>
 	  <property name="stock">gtk-save-as</property>
 	  <property name="icon_size">1</property>
+	  <property name="xalign">0.5</property>
+	  <property name="yalign">0.5</property>
+	  <property name="xpad">0</property>
+	  <property name="ypad">0</property>
 	</widget>
       </child>
     </widget>
   </child>
+
   <child>
     <widget class="GtkImageMenuItem" id="cut_popup">
       <property name="visible">True</property>
       <property name="label" translatable="yes">Cu_t</property>
       <property name="use_underline">True</property>
+
       <child internal-child="image">
-          <widget class="GtkImage" id="image638">
+	<widget class="GtkImage" id="image650">
 	  <property name="visible">True</property>
 	  <property name="stock">gtk-cut</property>
 	  <property name="icon_size">1</property>
+	  <property name="xalign">0.5</property>
+	  <property name="yalign">0.5</property>
+	  <property name="xpad">0</property>
+	  <property name="ypad">0</property>
 	</widget>
       </child>
     </widget>
   </child>
+
   <child>
     <widget class="GtkImageMenuItem" id="copy_popup">
       <property name="visible">True</property>
       <property name="label" translatable="yes">_Copy</property>
       <property name="use_underline">True</property>
+
       <child internal-child="image">
-          <widget class="GtkImage" id="image639">
+	<widget class="GtkImage" id="image651">
 	  <property name="visible">True</property>
 	  <property name="stock">gtk-copy</property>
 	  <property name="icon_size">1</property>
+	  <property name="xalign">0.5</property>
+	  <property name="yalign">0.5</property>
+	  <property name="xpad">0</property>
+	  <property name="ypad">0</property>
 	</widget>
       </child>
     </widget>
   </child>
+
   <child>
     <widget class="GtkImageMenuItem" id="paste_popup">
       <property name="visible">True</property>
       <property name="label" translatable="yes">_Paste</property>
       <property name="use_underline">True</property>
+
       <child internal-child="image">
-          <widget class="GtkImage" id="image640">
+	<widget class="GtkImage" id="image652">
 	  <property name="visible">True</property>
 	  <property name="stock">gtk-paste</property>
 	  <property name="icon_size">1</property>
+	  <property name="xalign">0.5</property>
+	  <property name="yalign">0.5</property>
+	  <property name="xpad">0</property>
+	  <property name="ypad">0</property>
 	</widget>
       </child>
     </widget>
   </child>
+
   <child>
     <widget class="GtkMenuItem" id="customize_popup">
       <property name="visible">True</property>
-        <property name="label" translatable="yes">Customize..</property>
+      <property name="label" translatable="yes">Customise…</property>
       <property name="use_underline">True</property>
     </widget>
   </child>
 </widget>
+
 </glade-interface>

gtk/res/password.glade

@@ -1,250 +1,419 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
-<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
+<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
-<!--*- mode: xml -*-->
+
 <glade-interface>
+
 <widget class="GtkWindow" id="wndPDFPassword">
   <property name="title" translatable="yes">PDF Password</property>
-    <property name="modal">True</property>
+  <property name="type">GTK_WINDOW_TOPLEVEL</property>
   <property name="window_position">GTK_WIN_POS_CENTER</property>
+  <property name="modal">True</property>
+  <property name="resizable">True</property>
+  <property name="destroy_with_parent">False</property>
+  <property name="decorated">True</property>
+  <property name="skip_taskbar_hint">False</property>
+  <property name="skip_pager_hint">False</property>
+  <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
+  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+  <property name="focus_on_map">True</property>
+  <property name="urgency_hint">False</property>
+
   <child>
     <widget class="GtkHBox" id="hbox1">
       <property name="visible">True</property>
+      <property name="homogeneous">False</property>
+      <property name="spacing">0</property>
+
       <child>
 	<widget class="GtkImage" id="image1">
 	  <property name="visible">True</property>
-            <property name="yalign">0.10000000149011612</property>
-            <property name="xpad">12</property>
 	  <property name="icon_size">6</property>
 	  <property name="icon_name">gtk-dialog-authentication</property>
+	  <property name="xalign">0.5</property>
+	  <property name="yalign">0.10000000149</property>
+	  <property name="xpad">12</property>
+	  <property name="ypad">0</property>
 	</widget>
 	<packing>
+	  <property name="padding">0</property>
 	  <property name="expand">False</property>
 	  <property name="fill">False</property>
 	</packing>
       </child>
+
       <child>
 	<widget class="GtkVBox" id="vbox1">
-            <property name="visible">True</property>
 	  <property name="border_width">5</property>
-            <child>
-              <widget class="GtkLabel" id="labelInfo">
 	  <property name="visible">True</property>
-                <property name="xalign">0</property>
+	  <property name="homogeneous">False</property>
-                <property name="label" translatable="yes">Write and confirm passwords:</property>
+	  <property name="spacing">0</property>
-              </widget>
+
-              <packing>
-                <property name="expand">False</property>
-              </packing>
-            </child>
 	  <child>
 	    <widget class="GtkHBox" id="hbox2">
-                <property name="visible">True</property>
 	      <property name="border_width">5</property>
+	      <property name="visible">True</property>
+	      <property name="homogeneous">True</property>
+	      <property name="spacing">0</property>
+
 	      <child>
 		<widget class="GtkLabel" id="label4">
 		  <property name="visible">True</property>
-                    <property name="label" translatable="yes">Owner password:</property>
+		  <property name="label" translatable="yes">Owner password</property>
+		  <property name="use_underline">False</property>
+		  <property name="use_markup">False</property>
+		  <property name="justify">GTK_JUSTIFY_LEFT</property>
+		  <property name="wrap">False</property>
+		  <property name="selectable">False</property>
+		  <property name="xalign">0.899999976158</property>
+		  <property name="yalign">0.5</property>
+		  <property name="xpad">0</property>
+		  <property name="ypad">0</property>
+		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 		  <property name="width_chars">15</property>
+		  <property name="single_line_mode">False</property>
+		  <property name="angle">0</property>
 		</widget>
 		<packing>
+		  <property name="padding">0</property>
 		  <property name="expand">False</property>
-                    <property name="fill">False</property>
+		  <property name="fill">True</property>
 		</packing>
 	      </child>
+
 	      <child>
 		<widget class="GtkEntry" id="entryPDFOwnerPassword">
 		  <property name="visible">True</property>
 		  <property name="can_focus">True</property>
-                    <property name="max_length">20</property>
+		  <property name="editable">True</property>
 		  <property name="visibility">False</property>
+		  <property name="max_length">20</property>
+		  <property name="text" translatable="yes"></property>
+		  <property name="has_frame">True</property>
+		  <property name="invisible_char">●</property>
+		  <property name="activates_default">False</property>
 		  <property name="width_chars">20</property>
 		</widget>
 		<packing>
+		  <property name="padding">0</property>
 		  <property name="expand">False</property>
 		  <property name="fill">False</property>
-                    <property name="position">1</property>
 		</packing>
 	      </child>
 	    </widget>
 	    <packing>
+	      <property name="padding">0</property>
 	      <property name="expand">False</property>
 	      <property name="fill">False</property>
-                <property name="position">1</property>
 	    </packing>
 	  </child>
+
 	  <child>
 	    <widget class="GtkHBox" id="hbox3">
-                <property name="visible">True</property>
 	      <property name="border_width">5</property>
+	      <property name="visible">True</property>
+	      <property name="homogeneous">True</property>
+	      <property name="spacing">0</property>
+
 	      <child>
 		<widget class="GtkLabel" id="label5">
 		  <property name="visible">True</property>
-                    <property name="label" translatable="yes">Repeat password:</property>
+		  <property name="label" translatable="yes">Repeat password</property>
+		  <property name="use_underline">False</property>
+		  <property name="use_markup">False</property>
+		  <property name="justify">GTK_JUSTIFY_LEFT</property>
+		  <property name="wrap">False</property>
+		  <property name="selectable">False</property>
+		  <property name="xalign">0.899999976158</property>
+		  <property name="yalign">0.5</property>
+		  <property name="xpad">0</property>
+		  <property name="ypad">0</property>
+		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 		  <property name="width_chars">15</property>
+		  <property name="single_line_mode">False</property>
+		  <property name="angle">0</property>
 		</widget>
 		<packing>
+		  <property name="padding">0</property>
 		  <property name="expand">False</property>
-                    <property name="fill">False</property>
+		  <property name="fill">True</property>
 		</packing>
 	      </child>
+
 	      <child>
 		<widget class="GtkEntry" id="entryPDFOwnerPassword1">
 		  <property name="visible">True</property>
 		  <property name="can_focus">True</property>
-                    <property name="max_length">20</property>
+		  <property name="editable">True</property>
 		  <property name="visibility">False</property>
+		  <property name="max_length">20</property>
+		  <property name="text" translatable="yes"></property>
+		  <property name="has_frame">True</property>
+		  <property name="invisible_char">●</property>
+		  <property name="activates_default">False</property>
 		  <property name="width_chars">20</property>
 		</widget>
 		<packing>
+		  <property name="padding">0</property>
 		  <property name="expand">False</property>
 		  <property name="fill">False</property>
-                    <property name="position">1</property>
 		</packing>
 	      </child>
 	    </widget>
 	    <packing>
+	      <property name="padding">0</property>
 	      <property name="expand">False</property>
 	      <property name="fill">False</property>
-                <property name="position">2</property>
 	    </packing>
 	  </child>
+
 	  <child>
 	    <widget class="GtkHBox" id="hbox4">
-                <property name="visible">True</property>
 	      <property name="border_width">5</property>
+	      <property name="visible">True</property>
+	      <property name="homogeneous">True</property>
+	      <property name="spacing">0</property>
+
 	      <child>
 		<widget class="GtkLabel" id="label6">
 		  <property name="visible">True</property>
-                    <property name="label" translatable="yes">User password:</property>
+		  <property name="label" translatable="yes">User password</property>
+		  <property name="use_underline">False</property>
+		  <property name="use_markup">False</property>
+		  <property name="justify">GTK_JUSTIFY_LEFT</property>
+		  <property name="wrap">False</property>
+		  <property name="selectable">False</property>
+		  <property name="xalign">0.899999976158</property>
+		  <property name="yalign">0.5</property>
+		  <property name="xpad">0</property>
+		  <property name="ypad">0</property>
+		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 		  <property name="width_chars">15</property>
+		  <property name="single_line_mode">False</property>
+		  <property name="angle">0</property>
 		</widget>
 		<packing>
+		  <property name="padding">0</property>
 		  <property name="expand">False</property>
-                    <property name="fill">False</property>
+		  <property name="fill">True</property>
 		</packing>
 	      </child>
+
 	      <child>
 		<widget class="GtkEntry" id="entryPDFUserPassword">
 		  <property name="visible">True</property>
 		  <property name="can_focus">True</property>
-                    <property name="max_length">20</property>
+		  <property name="editable">True</property>
 		  <property name="visibility">False</property>
+		  <property name="max_length">20</property>
+		  <property name="text" translatable="yes"></property>
+		  <property name="has_frame">True</property>
+		  <property name="invisible_char">●</property>
+		  <property name="activates_default">False</property>
 		  <property name="width_chars">20</property>
 		</widget>
 		<packing>
+		  <property name="padding">0</property>
 		  <property name="expand">False</property>
 		  <property name="fill">False</property>
-                    <property name="position">1</property>
 		</packing>
 	      </child>
 	    </widget>
 	    <packing>
+	      <property name="padding">0</property>
 	      <property name="expand">False</property>
 	      <property name="fill">False</property>
-                <property name="position">3</property>
 	    </packing>
 	  </child>
+
 	  <child>
 	    <widget class="GtkHBox" id="hbox5">
-                <property name="visible">True</property>
 	      <property name="border_width">5</property>
+	      <property name="visible">True</property>
+	      <property name="homogeneous">True</property>
+	      <property name="spacing">0</property>
+
 	      <child>
 		<widget class="GtkLabel" id="label7">
 		  <property name="visible">True</property>
-                    <property name="label" translatable="yes">Repeat password:</property>
+		  <property name="label" translatable="yes">Repeat password</property>
+		  <property name="use_underline">False</property>
+		  <property name="use_markup">False</property>
+		  <property name="justify">GTK_JUSTIFY_LEFT</property>
+		  <property name="wrap">False</property>
+		  <property name="selectable">False</property>
+		  <property name="xalign">0.899999976158</property>
+		  <property name="yalign">0.5</property>
+		  <property name="xpad">0</property>
+		  <property name="ypad">0</property>
+		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
 		  <property name="width_chars">15</property>
+		  <property name="single_line_mode">False</property>
+		  <property name="angle">0</property>
 		</widget>
 		<packing>
+		  <property name="padding">0</property>
 		  <property name="expand">False</property>
-                    <property name="fill">False</property>
+		  <property name="fill">True</property>
 		</packing>
 	      </child>
+
 	      <child>
 		<widget class="GtkEntry" id="entryPDFUserPassword1">
 		  <property name="visible">True</property>
 		  <property name="can_focus">True</property>
-                    <property name="max_length">20</property>
+		  <property name="editable">True</property>
 		  <property name="visibility">False</property>
+		  <property name="max_length">20</property>
+		  <property name="text" translatable="yes"></property>
+		  <property name="has_frame">True</property>
+		  <property name="invisible_char">●</property>
+		  <property name="activates_default">False</property>
 		  <property name="width_chars">20</property>
 		</widget>
 		<packing>
+		  <property name="padding">0</property>
 		  <property name="expand">False</property>
 		  <property name="fill">False</property>
-                    <property name="position">1</property>
 		</packing>
 	      </child>
 	    </widget>
 	    <packing>
+	      <property name="padding">0</property>
 	      <property name="expand">False</property>
 	      <property name="fill">False</property>
-                <property name="position">4</property>
 	    </packing>
 	  </child>
+
 	  <child>
 	    <widget class="GtkHButtonBox" id="hbuttonbox1">
-                <property name="visible">True</property>
 	      <property name="border_width">5</property>
-                <property name="spacing">10</property>
+	      <property name="visible">True</property>
 	      <property name="layout_style">GTK_BUTTONBOX_END</property>
+	      <property name="spacing">10</property>
+
 	      <child>
 		<widget class="GtkButton" id="buttonPDFSetPassword">
 		  <property name="visible">True</property>
 		  <property name="can_focus">True</property>
-                    <property name="response_id">0</property>
+		  <property name="relief">GTK_RELIEF_NORMAL</property>
+		  <property name="focus_on_click">True</property>
+
 		  <child>
 		    <widget class="GtkHBox" id="hbox7">
 		      <property name="visible">True</property>
+		      <property name="homogeneous">False</property>
+		      <property name="spacing">0</property>
+
 		      <child>
 			<widget class="GtkImage" id="image7">
 			  <property name="visible">True</property>
-                            <property name="stock">gtk-ok</property>
+			  <property name="stock">gtk-dialog-authentication</property>
+			  <property name="icon_size">4</property>
+			  <property name="xalign">0.5</property>
+			  <property name="yalign">0.5</property>
+			  <property name="xpad">0</property>
+			  <property name="ypad">0</property>
 			</widget>
 			<packing>
+			  <property name="padding">0</property>
 			  <property name="expand">False</property>
 			  <property name="fill">False</property>
 			</packing>
 		      </child>
+
 		      <child>
 			<widget class="GtkLabel" id="label8">
 			  <property name="visible">True</property>
-                            <property name="label" translatable="yes">Set password</property>
+			  <property name="label" translatable="yes">Use these as passwords</property>
+			  <property name="use_underline">False</property>
+			  <property name="use_markup">False</property>
+			  <property name="justify">GTK_JUSTIFY_LEFT</property>
+			  <property name="wrap">False</property>
+			  <property name="selectable">False</property>
+			  <property name="xalign">0.5</property>
+			  <property name="yalign">0.5</property>
+			  <property name="xpad">0</property>
+			  <property name="ypad">0</property>
+			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			  <property name="width_chars">-1</property>
+			  <property name="single_line_mode">False</property>
+			  <property name="angle">0</property>
 			</widget>
 			<packing>
-                            <property name="position">1</property>
+			  <property name="padding">0</property>
+			  <property name="expand">True</property>
+			  <property name="fill">True</property>
 			</packing>
 		      </child>
 		    </widget>
 		  </child>
 		</widget>
 	      </child>
+
 	      <child>
 		<widget class="GtkButton" id="buttonPDFNoPassword">
 		  <property name="visible">True</property>
 		  <property name="can_focus">True</property>
-                    <property name="response_id">0</property>
+		  <property name="relief">GTK_RELIEF_NORMAL</property>
+		  <property name="focus_on_click">True</property>
+
 		  <child>
 		    <widget class="GtkAlignment" id="alignment1">
 		      <property name="visible">True</property>
+		      <property name="xalign">0.5</property>
+		      <property name="yalign">0.5</property>
+		      <property name="xscale">1</property>
+		      <property name="yscale">1</property>
+		      <property name="top_padding">0</property>
+		      <property name="bottom_padding">0</property>
+		      <property name="left_padding">0</property>
+		      <property name="right_padding">0</property>
+
 		      <child>
 			<widget class="GtkHBox" id="hbox6">
 			  <property name="visible">True</property>
+			  <property name="homogeneous">False</property>
+			  <property name="spacing">0</property>
+
 			  <child>
 			    <widget class="GtkImage" id="image8">
 			      <property name="visible">True</property>
 			      <property name="stock">gtk-cancel</property>
+			      <property name="icon_size">4</property>
+			      <property name="xalign">0.5</property>
+			      <property name="yalign">0.5</property>
+			      <property name="xpad">0</property>
+			      <property name="ypad">0</property>
 			    </widget>
 			    <packing>
+			      <property name="padding">0</property>
 			      <property name="expand">False</property>
 			      <property name="fill">False</property>
 			    </packing>
 			  </child>
+
 			  <child>
 			    <widget class="GtkLabel" id="label9">
 			      <property name="visible">True</property>
-                                <property name="label" translatable="yes">No password</property>
+			      <property name="label" translatable="yes">Do not set any passwords</property>
+			      <property name="use_underline">False</property>
+			      <property name="use_markup">False</property>
+			      <property name="justify">GTK_JUSTIFY_LEFT</property>
+			      <property name="wrap">False</property>
+			      <property name="selectable">False</property>
+			      <property name="xalign">0.5</property>
+			      <property name="yalign">0.5</property>
+			      <property name="xpad">0</property>
+			      <property name="ypad">0</property>
+			      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+			      <property name="width_chars">-1</property>
+			      <property name="single_line_mode">False</property>
+			      <property name="angle">0</property>
 			    </widget>
 			    <packing>
-                                <property name="position">1</property>
+			      <property name="padding">0</property>
+			      <property name="expand">True</property>
+			      <property name="fill">True</property>
 			    </packing>
 			  </child>
 			</widget>
@@ -252,23 +421,23 @@
 		    </widget>
 		  </child>
 		</widget>
-                  <packing>
-                    <property name="position">1</property>
-                  </packing>
 	      </child>
 	    </widget>
 	    <packing>
+	      <property name="padding">0</property>
 	      <property name="expand">False</property>
 	      <property name="fill">False</property>
-                <property name="position">5</property>
 	    </packing>
 	  </child>
 	</widget>
 	<packing>
-            <property name="position">1</property>
+	  <property name="padding">0</property>
+	  <property name="expand">True</property>
+	  <property name="fill">True</property>
 	</packing>
       </child>
     </widget>
   </child>
 </widget>
+
 </glade-interface>

gtk/res/toolbar.glade

@@ -1,35 +1,75 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
-<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
+<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
-<!--Generated with glade3 3.4.5 on Tue Jun  9 08:21:40 2009 -->
+
 <glade-interface>
+
 <widget class="GtkWindow" id="toolbarwindow">
   <property name="width_request">700</property>
   <property name="height_request">450</property>
+  <property name="title" translatable="yes"></property>
+  <property name="type">GTK_WINDOW_TOPLEVEL</property>
+  <property name="window_position">GTK_WIN_POS_NONE</property>
+  <property name="modal">False</property>
+  <property name="resizable">True</property>
+  <property name="destroy_with_parent">False</property>
+  <property name="decorated">True</property>
+  <property name="skip_taskbar_hint">False</property>
+  <property name="skip_pager_hint">False</property>
+  <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
+  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+  <property name="focus_on_map">True</property>
+  <property name="urgency_hint">False</property>
+
   <child>
     <widget class="GtkVBox" id="windowvbox">
       <property name="visible">True</property>
+      <property name="homogeneous">False</property>
+      <property name="spacing">0</property>
+
       <child>
 	<widget class="GtkLabel" id="toolbarlabel">
 	  <property name="visible">True</property>
-            <property name="label" translatable="yes">move items from store to toolbar       rearrange items in toolbar       move items from toolbar to store</property>
+	  <property name="label" translatable="yes">Move items from store to toolbar       Rearrange items in toolbar       Move items from toolbar to store</property>
+	  <property name="use_underline">False</property>
+	  <property name="use_markup">False</property>
+	  <property name="justify">GTK_JUSTIFY_LEFT</property>
+	  <property name="wrap">False</property>
+	  <property name="selectable">False</property>
+	  <property name="xalign">0.5</property>
+	  <property name="yalign">0.5</property>
+	  <property name="xpad">0</property>
+	  <property name="ypad">0</property>
+	  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+	  <property name="width_chars">-1</property>
+	  <property name="single_line_mode">False</property>
+	  <property name="angle">0</property>
 	</widget>
 	<packing>
+	  <property name="padding">0</property>
 	  <property name="expand">False</property>
+	  <property name="fill">True</property>
 	</packing>
       </child>
+
       <child>
 	<widget class="GtkScrolledWindow" id="scrolledwindow1">
 	  <property name="visible">True</property>
-            <property name="can_focus">False</property>
 	  <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
 	  <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+	  <property name="shadow_type">GTK_SHADOW_NONE</property>
+	  <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+
 	  <child>
 	    <widget class="GtkViewport" id="viewport1">
 	      <property name="visible">True</property>
-                <property name="resize_mode">GTK_RESIZE_QUEUE</property>
+	      <property name="shadow_type">GTK_SHADOW_IN</property>
+
 	      <child>
 		<widget class="GtkVBox" id="widgetvbox">
 		  <property name="visible">True</property>
+		  <property name="homogeneous">False</property>
+		  <property name="spacing">0</property>
+
 		  <child>
 		    <placeholder/>
 		  </child>
@@ -39,88 +79,128 @@
 	  </child>
 	</widget>
 	<packing>
-            <property name="position">1</property>
+	  <property name="padding">0</property>
+	  <property name="expand">True</property>
+	  <property name="fill">True</property>
 	</packing>
       </child>
+
       <child>
 	<widget class="GtkHBox" id="buttonhbox">
 	  <property name="visible">True</property>
 	  <property name="can_focus">True</property>
+	  <property name="homogeneous">False</property>
+	  <property name="spacing">0</property>
+
 	  <child>
 	    <widget class="GtkButton" id="resetbutton">
 	      <property name="visible">True</property>
 	      <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
+	      <property name="relief">GTK_RELIEF_NORMAL</property>
-                <property name="response_id">0</property>
+	      <property name="focus_on_click">True</property>
+
 	      <child>
 		<widget class="GtkHBox" id="button1hbox">
 		  <property name="visible">True</property>
+		  <property name="homogeneous">False</property>
+		  <property name="spacing">0</property>
+
 		  <child>
 		    <widget class="GtkImage" id="image1">
 		      <property name="visible">True</property>
 		      <property name="stock">gtk-refresh</property>
+		      <property name="icon_size">4</property>
+		      <property name="xalign">0.5</property>
+		      <property name="yalign">0.5</property>
+		      <property name="xpad">0</property>
+		      <property name="ypad">0</property>
 		    </widget>
 		    <packing>
+		      <property name="padding">0</property>
 		      <property name="expand">False</property>
+		      <property name="fill">True</property>
 		    </packing>
 		  </child>
+
 		  <child>
 		    <widget class="GtkLabel" id="refreshbuttonlabel">
 		      <property name="visible">True</property>
-                        <property name="label" translatable="yes">reset default</property>
+		      <property name="label" translatable="yes">Reset to defaults</property>
+		      <property name="use_underline">False</property>
+		      <property name="use_markup">False</property>
+		      <property name="justify">GTK_JUSTIFY_LEFT</property>
+		      <property name="wrap">False</property>
+		      <property name="selectable">False</property>
+		      <property name="xalign">0.5</property>
+		      <property name="yalign">0.5</property>
+		      <property name="xpad">0</property>
+		      <property name="ypad">0</property>
+		      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+		      <property name="width_chars">-1</property>
+		      <property name="single_line_mode">False</property>
+		      <property name="angle">0</property>
 		    </widget>
 		    <packing>
-                        <property name="position">1</property>
+		      <property name="padding">0</property>
+		      <property name="expand">True</property>
+		      <property name="fill">True</property>
 		    </packing>
 		  </child>
 		</widget>
 	      </child>
 	    </widget>
 	    <packing>
-                <property name="expand">False</property>
 	      <property name="padding">10</property>
+	      <property name="expand">False</property>
+	      <property name="fill">True</property>
 	    </packing>
 	  </child>
+
 	  <child>
 	    <placeholder/>
 	  </child>
+
 	  <child>
 	    <widget class="GtkButton" id="okbutton">
 	      <property name="visible">True</property>
 	      <property name="can_focus">True</property>
 	      <property name="has_focus">True</property>
-                <property name="receives_default">True</property>
+	      <property name="label">gtk-apply</property>
-                <property name="label" translatable="yes">gtk-apply</property>
 	      <property name="use_stock">True</property>
-                <property name="response_id">0</property>
+	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
 	    </widget>
 	    <packing>
-                <property name="expand">False</property>
 	      <property name="padding">10</property>
-                <property name="position">2</property>
+	      <property name="expand">False</property>
+	      <property name="fill">True</property>
 	    </packing>
 	  </child>
+
 	  <child>
 	    <widget class="GtkButton" id="cancelbutton">
 	      <property name="visible">True</property>
 	      <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
+	      <property name="label">gtk-cancel</property>
-                <property name="label" translatable="yes">gtk-cancel</property>
 	      <property name="use_stock">True</property>
-                <property name="response_id">0</property>
+	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
 	    </widget>
 	    <packing>
+	      <property name="padding">0</property>
 	      <property name="expand">False</property>
-                <property name="position">3</property>
+	      <property name="fill">True</property>
 	    </packing>
 	  </child>
 	</widget>
 	<packing>
+	  <property name="padding">0</property>
 	  <property name="expand">False</property>
-            <property name="position">2</property>
+	  <property name="fill">True</property>
 	</packing>
       </child>
     </widget>
   </child>
 </widget>
+
 </glade-interface>