From d85dfd0e7c104e7032a9f09516b6d2c79658d258 Mon Sep 17 00:00:00 2001
From: Rob Kendrick <rjek@netsurf-browser.org>
Date: Sun, 5 Dec 2010 15:03:53 +0000
Subject: Rationalise titles and styles of various GTK windows

svn path=/trunk/netsurf/; revision=11002
---
 gtk/dialogs/gtk_source.c |  4 ++--
 gtk/res/cookies.glade    | 24 ++++++++++----------
 gtk/res/downloads.glade  | 57 +++++++++++++++++++++++++++++++-----------------
 gtk/res/hotlist.glade    |  2 +-
 4 files changed, 52 insertions(+), 35 deletions(-)

(limited to 'gtk')

diff --git a/gtk/dialogs/gtk_source.c b/gtk/dialogs/gtk_source.c
index 842d4c4ef..b7dec945b 100644
--- a/gtk/dialogs/gtk_source.c
+++ b/gtk/dialogs/gtk_source.c
@@ -178,8 +178,8 @@ void nsgtk_source_dialog_init(GtkWindow *parent, struct browser_window *bw)
 	thiswindow->sourcewindow = wndSource;
 	thiswindow->bw = bw;
 
-	char title[strlen(thiswindow->url) + SLEN("Source of ") + 1];
-	sprintf(title, "Source of %s", thiswindow->url);
+	char title[strlen(thiswindow->url) + SLEN("Source of  - NetSurf") + 1];
+	sprintf(title, "Source of %s - NetSurf", thiswindow->url);
 
 	thiswindow->next = nsgtk_source_list;
 	thiswindow->prev = NULL;
diff --git a/gtk/res/cookies.glade b/gtk/res/cookies.glade
index 2bb92f372..9fc5de148 100644
--- a/gtk/res/cookies.glade
+++ b/gtk/res/cookies.glade
@@ -1,13 +1,12 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
-<!--Generated with glade3 3.4.5 on Tue Jul 28 17:12:17 2009 -->
+<?xml version="1.0" encoding="UTF-8"?>
 <glade-interface>
+  <!-- interface-requires gtk+ 2.6 -->
+  <!-- interface-naming-policy toplevel-contextual -->
   <widget class="GtkWindow" id="wndCookies">
-    <property name="title" translatable="yes">NetSurf Cookies</property>
-    <property name="window_position">GTK_WIN_POS_CENTER</property>
+    <property name="title" translatable="yes">Cookies - NetSurf</property>
+    <property name="window_position">mouse</property>
     <property name="default_width">600</property>
     <property name="default_height">500</property>
-    <property name="type_hint">GDK_WINDOW_TYPE_HINT_UTILITY</property>
     <child>
       <widget class="GtkVBox" id="vbox1">
         <property name="visible">True</property>
@@ -30,7 +29,7 @@
                         <property name="tooltip" translatable="yes">Deletes selected nodes</property>
                         <property name="label" translatable="yes">_Delete</property>
                         <property name="use_underline">True</property>
-                        <accelerator key="Delete" modifiers="GDK_CONTROL_MASK" signal="activate"/>
+                        <accelerator key="Delete" signal="activate" modifiers="GDK_CONTROL_MASK"/>
                       </widget>
                     </child>
                     <child>
@@ -45,7 +44,7 @@
                         <property name="visible">True</property>
                         <property name="label" translatable="yes">_Select all</property>
                         <property name="use_underline">True</property>
-                        <accelerator key="A" modifiers="GDK_MOD1_MASK" signal="activate"/>
+                        <accelerator key="A" signal="activate" modifiers="GDK_MOD1_MASK"/>
                       </widget>
                     </child>
                     <child>
@@ -53,7 +52,7 @@
                         <property name="visible">True</property>
                         <property name="label" translatable="yes">_Clear selection</property>
                         <property name="use_underline">True</property>
-                        <accelerator key="U" modifiers="GDK_MOD1_MASK" signal="activate"/>
+                        <accelerator key="U" signal="activate" modifiers="GDK_MOD1_MASK"/>
                       </widget>
                     </child>
                   </widget>
@@ -141,18 +140,19 @@
           </widget>
           <packing>
             <property name="expand">False</property>
+            <property name="position">0</property>
           </packing>
         </child>
         <child>
           <widget class="GtkScrolledWindow" id="cookiesScrolled">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
-            <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-            <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+            <property name="hscrollbar_policy">automatic</property>
+            <property name="vscrollbar_policy">automatic</property>
             <child>
               <widget class="GtkViewport" id="cookiesViewport">
                 <property name="visible">True</property>
-                <property name="resize_mode">GTK_RESIZE_QUEUE</property>
+                <property name="resize_mode">queue</property>
                 <child>
                   <widget class="GtkDrawingArea" id="cookiesDrawingArea">
                     <property name="visible">True</property>
diff --git a/gtk/res/downloads.glade b/gtk/res/downloads.glade
index 72adc29df..706bfe19a 100644
--- a/gtk/res/downloads.glade
+++ b/gtk/res/downloads.glade
@@ -1,13 +1,14 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <glade-interface>
+  <!-- interface-requires gtk+ 2.12 -->
+  <!-- interface-naming-policy toplevel-contextual -->
   <widget class="GtkWindow" id="wndDownloads">
     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-    <property name="title" translatable="yes">NetSurf Downloads</property>
-    <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
+    <property name="title" translatable="yes">Downloads - NetSurf</property>
+    <property name="window_position">mouse</property>
     <property name="default_width">500</property>
     <property name="default_height">300</property>
     <property name="destroy_with_parent">True</property>
-    <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
     <child>
       <widget class="GtkVBox" id="vbox1">
         <property name="visible">True</property>
@@ -15,8 +16,8 @@
           <widget class="GtkScrolledWindow" id="scrolledwindow1">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
-            <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
-            <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+            <property name="hscrollbar_policy">never</property>
+            <property name="vscrollbar_policy">automatic</property>
             <child>
               <widget class="GtkTreeView" id="treeDownloads">
                 <property name="visible">True</property>
@@ -27,6 +28,9 @@
               </widget>
             </child>
           </widget>
+          <packing>
+            <property name="position">0</property>
+          </packing>
         </child>
         <child>
           <widget class="GtkHSeparator" id="hseparator1">
@@ -55,23 +59,30 @@
                   </widget>
                 </child>
               </widget>
+              <packing>
+                <property name="position">0</property>
+              </packing>
             </child>
             <child>
               <widget class="GtkHButtonBox" id="hbuttonbox1">
                 <property name="visible">True</property>
                 <property name="homogeneous">True</property>
-                <property name="layout_style">GTK_BUTTONBOX_END</property>
+                <property name="layout_style">end</property>
                 <child>
                   <widget class="GtkButton" id="buttonPause">
+                    <property name="label">gtk-media-pause</property>
                     <property name="visible">True</property>
                     <property name="sensitive">False</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
-                    <property name="label" translatable="yes">gtk-media-pause</property>
-                    <property name="relief">GTK_RELIEF_NONE</property>
+                    <property name="relief">none</property>
                     <property name="use_stock">True</property>
-                    <property name="response_id">0</property>
                   </widget>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
+                    <property name="position">0</property>
+                  </packing>
                 </child>
                 <child>
                   <widget class="GtkButton" id="buttonPlay">
@@ -79,8 +90,7 @@
                     <property name="sensitive">False</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
-                    <property name="relief">GTK_RELIEF_NONE</property>
-                    <property name="response_id">0</property>
+                    <property name="relief">none</property>
                     <child>
                       <widget class="GtkHBox" id="hbox2">
                         <property name="visible">True</property>
@@ -88,8 +98,11 @@
                           <widget class="GtkImage" id="image1">
                             <property name="visible">True</property>
                             <property name="stock">gtk-media-play</property>
-                            <property name="icon_size">2</property>
+                            <property name="icon-size">2</property>
                           </widget>
+                          <packing>
+                            <property name="position">0</property>
+                          </packing>
                         </child>
                         <child>
                           <widget class="GtkLabel" id="label1">
@@ -104,36 +117,40 @@
                     </child>
                   </widget>
                   <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
                 <child>
                   <widget class="GtkButton" id="buttonCancel">
+                    <property name="label">gtk-cancel</property>
                     <property name="visible">True</property>
                     <property name="sensitive">False</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
-                    <property name="label" translatable="yes">gtk-cancel</property>
-                    <property name="relief">GTK_RELIEF_NONE</property>
+                    <property name="relief">none</property>
                     <property name="use_stock">True</property>
-                    <property name="response_id">0</property>
                   </widget>
                   <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
                     <property name="position">2</property>
                   </packing>
                 </child>
                 <child>
                   <widget class="GtkButton" id="buttonClear">
+                    <property name="label">gtk-clear</property>
                     <property name="visible">True</property>
                     <property name="sensitive">False</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
-                    <property name="label" translatable="yes">gtk-clear</property>
-                    <property name="relief">GTK_RELIEF_NONE</property>
+                    <property name="relief">none</property>
                     <property name="use_stock">True</property>
-                    <property name="response_id">0</property>
                   </widget>
                   <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">False</property>
                     <property name="position">3</property>
                   </packing>
                 </child>
@@ -141,7 +158,7 @@
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">False</property>
-                <property name="pack_type">GTK_PACK_END</property>
+                <property name="pack_type">end</property>
                 <property name="position">1</property>
               </packing>
             </child>
diff --git a/gtk/res/hotlist.glade b/gtk/res/hotlist.glade
index a01fc30d8..8f0a6ecc7 100644
--- a/gtk/res/hotlist.glade
+++ b/gtk/res/hotlist.glade
@@ -3,7 +3,7 @@
   <!-- interface-requires gtk+ 2.6 -->
   <!-- interface-naming-policy toplevel-contextual -->
   <widget class="GtkWindow" id="wndHotlist">
-    <property name="title" translatable="yes">Bookmarks</property>
+    <property name="title" translatable="yes">Bookmarks - NetSurf</property>
     <property name="window_position">mouse</property>
     <property name="default_width">600</property>
     <property name="default_height">500</property>
-- 
cgit v1.2.3