Change this into a GnomeApp so we get a statusbar and the dialog is a

2002-08-09  Peter Williams  <peterw@ximian.com>

	* subscribe-dialog.c: Change this into a GnomeApp so we get a
	statusbar and the dialog is a little more comprehensible.

	* subscribe-dialog.c: (struct _FolderETree): Add members for
	tracking activity callback information.
	(get_short_folderinfo_got): Notify the activity callback.
	(subscribe_get_short_folderinfo): Here too.
	(folder_etree_init): Initialize the activity level to 0.
	(folder_etree_construct): Take new parameters of our activity
	callback and user_data.
	(folder_etree_new): Here too.
	(store_data_get_widget): Take the parameters here and pass them
	on.
	(sc_close_pressed): New callback for when close button is pressed.
	(sc_activity_timeout): New timeout to move the activity bar when
	folders are being scanned.
	(sc_activity_cb): If activity_level > 0, start the progressbar
	moving and set the status.
	(menu_item_selected): Pass the callback to store_data_get_widget.
	(subscribe_dialog_construct): Load some more widgets and adapt to
	some changes in the XML. Also connect the close button signal and
	initialize the progress bar's settings.

	* mail-callbacks.c (manage_subscriptions): Don't call
	gnome_dialog_set_close on it anymore since it's no longer a gnome
	dialog.

svn path=/trunk/; revision=17793

1 files changed, 79 insertions, 69 deletions

diff --git a/mail/subscribe-dialog.glade b/mail/subscribe-dialog.glade
index 472491b3e8..1970844367 100644
--- a/mail/subscribe-dialog.glade
+++ b/mail/subscribe-dialog.glade
@@ -14,73 +14,89 @@
 </project>
 
 <widget>
-  <class>GnomeDialog</class>
-  <name>Manage Subscriptions</name>
+  <class>GnomeApp</class>
+  <name>app</name>
   <title>Manage Subscriptions</title>
   <type>GTK_WINDOW_TOPLEVEL</type>
   <position>GTK_WIN_POS_NONE</position>
   <modal>False</modal>
-  <default_width>484</default_width>
-  <default_height>423</default_height>
   <allow_shrink>False</allow_shrink>
   <allow_grow>True</allow_grow>
   <auto_shrink>False</auto_shrink>
-  <auto_close>False</auto_close>
-  <hide_on_close>False</hide_on_close>
+  <enable_layout_config>True</enable_layout_config>
 
   <widget>
-    <class>GtkVBox</class>
-    <child_name>GnomeDialog:vbox</child_name>
-    <name>dialog-vbox2</name>
-    <homogeneous>False</homogeneous>
-    <spacing>8</spacing>
+    <class>GnomeDock</class>
+    <child_name>GnomeApp:dock</child_name>
+    <name>dock2</name>
+    <border_width>3</border_width>
+    <allow_floating>True</allow_floating>
     <child>
-      <padding>4</padding>
+      <padding>0</padding>
       <expand>True</expand>
       <fill>True</fill>
     </child>
 
     <widget>
-      <class>GtkHButtonBox</class>
-      <child_name>GnomeDialog:action_area</child_name>
-      <name>dialog-action_area2</name>
-      <layout_style>GTK_BUTTONBOX_END</layout_style>
-      <spacing>8</spacing>
-      <child_min_width>85</child_min_width>
-      <child_min_height>27</child_min_height>
-      <child_ipad_x>7</child_ipad_x>
-      <child_ipad_y>0</child_ipad_y>
-      <child>
-	<padding>0</padding>
-	<expand>False</expand>
-	<fill>True</fill>
-	<pack>GTK_PACK_END</pack>
-      </child>
+      <class>GnomeDockItem</class>
+      <name>dockitem2</name>
+      <border_width>1</border_width>
+      <placement>GNOME_DOCK_TOP</placement>
+      <band>1</band>
+      <position>0</position>
+      <offset>0</offset>
+      <locked>False</locked>
+      <exclusive>True</exclusive>
+      <never_floating>False</never_floating>
+      <never_vertical>False</never_vertical>
+      <never_horizontal>False</never_horizontal>
+      <shadow_type>GTK_SHADOW_OUT</shadow_type>
 
       <widget>
-	<class>GtkButton</class>
-	<name>button9</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_CLOSE</stock_button>
+	<class>GtkToolbar</class>
+	<name>toolbar1</name>
+	<border_width>1</border_width>
+	<orientation>GTK_ORIENTATION_HORIZONTAL</orientation>
+	<type>GTK_TOOLBAR_BOTH</type>
+	<space_size>16</space_size>
+	<space_style>GTK_TOOLBAR_SPACE_LINE</space_style>
+	<relief>GTK_RELIEF_NONE</relief>
+	<tooltips>True</tooltips>
+
+	<widget>
+	  <class>GtkButton</class>
+	  <child_name>Toolbar:button</child_name>
+	  <name>refresh_button</name>
+	  <tooltip>Apri file</tooltip>
+	  <label>Refresh List</label>
+	  <stock_pixmap>GNOME_STOCK_PIXMAP_REFRESH</stock_pixmap>
+	</widget>
+
+	<widget>
+	  <class>GtkButton</class>
+	  <child_name>Toolbar:button</child_name>
+	  <name>close_button</name>
+	  <tooltip>Salve file</tooltip>
+	  <label>Close</label>
+	  <stock_pixmap>GNOME_STOCK_PIXMAP_CLOSE</stock_pixmap>
+	  <child>
+	    <new_group>True</new_group>
+	  </child>
+	</widget>
       </widget>
     </widget>
 
     <widget>
       <class>GtkVBox</class>
-      <name>vbox2</name>
+      <child_name>GnomeDock:contents</child_name>
+      <name>vbox6</name>
       <border_width>3</border_width>
       <homogeneous>False</homogeneous>
       <spacing>3</spacing>
-      <child>
-	<padding>0</padding>
-	<expand>True</expand>
-	<fill>True</fill>
-      </child>
 
       <widget>
 	<class>GtkHBox</class>
-	<name>hbox1</name>
+	<name>hbox7</name>
 	<homogeneous>False</homogeneous>
 	<spacing>0</spacing>
 	<child>
@@ -91,15 +107,15 @@
 
 	<widget>
 	  <class>GtkLabel</class>
-	  <name>label1</name>
-	  <label>Show _folders from server: </label>
+	  <name>label5</name>
+	  <label>S_elect server: </label>
 	  <justify>GTK_JUSTIFY_CENTER</justify>
 	  <wrap>False</wrap>
 	  <xalign>0.5</xalign>
 	  <yalign>0.5</yalign>
 	  <xpad>0</xpad>
 	  <ypad>0</ypad>
-	  <default_focus_target>store_menu</default_focus_target>
+	  <default_focus_target>optionmenu2</default_focus_target>
 	  <child>
 	    <padding>0</padding>
 	    <expand>False</expand>
@@ -138,7 +154,7 @@
 
 	<widget>
 	  <class>GtkVBox</class>
-	  <name>vbox3</name>
+	  <name>vbox7</name>
 	  <border_width>3</border_width>
 	  <homogeneous>False</homogeneous>
 	  <spacing>3</spacing>
@@ -151,7 +167,7 @@
 
 	  <widget>
 	    <class>GtkLabel</class>
-	    <name>label2</name>
+	    <name>label6</name>
 	    <label>
 </label>
 	    <justify>GTK_JUSTIFY_CENTER</justify>
@@ -169,7 +185,7 @@
 
 	  <widget>
 	    <class>GtkVButtonBox</class>
-	    <name>vbuttonbox2</name>
+	    <name>vbuttonbox6</name>
 	    <layout_style>GTK_BUTTONBOX_SPREAD</layout_style>
 	    <spacing>0</spacing>
 	    <child_min_width>85</child_min_width>
@@ -202,18 +218,8 @@
 	  </widget>
 
 	  <widget>
-	    <class>GtkHSeparator</class>
-	    <name>hseparator1</name>
-	    <child>
-	      <padding>14</padding>
-	      <expand>False</expand>
-	      <fill>False</fill>
-	    </child>
-	  </widget>
-
-	  <widget>
 	    <class>GtkVButtonBox</class>
-	    <name>vbuttonbox3</name>
+	    <name>vbuttonbox7</name>
 	    <layout_style>GTK_BUTTONBOX_START</layout_style>
 	    <spacing>10</spacing>
 	    <child_min_width>85</child_min_width>
@@ -225,23 +231,14 @@
 	      <expand>False</expand>
 	      <fill>False</fill>
 	    </child>
-
-	    <widget>
-	      <class>GtkButton</class>
-	      <name>refresh_button</name>
-	      <can_default>True</can_default>
-	      <can_focus>True</can_focus>
-	      <label> _Refresh List </label>
-	      <relief>GTK_RELIEF_NORMAL</relief>
-	    </widget>
 	  </widget>
 	</widget>
       </widget>
 
       <widget>
 	<class>GtkFrame</class>
-	<name>frame1</name>
-	<label>Display options</label>
+	<name>frame3</name>
+	<label>Display Options</label>
 	<label_xalign>0</label_xalign>
 	<shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
 	<child>
@@ -252,7 +249,7 @@
 
 	<widget>
 	  <class>GtkHBox</class>
-	  <name>hbox3</name>
+	  <name>hbox9</name>
 	  <border_width>3</border_width>
 	  <homogeneous>False</homogeneous>
 	  <spacing>3</spacing>
@@ -304,7 +301,7 @@
 
 	  <widget>
 	    <class>GtkHButtonBox</class>
-	    <name>hbuttonbox1</name>
+	    <name>hbuttonbox3</name>
 	    <layout_style>GTK_BUTTONBOX_DEFAULT_STYLE</layout_style>
 	    <spacing>30</spacing>
 	    <child_min_width>85</child_min_width>
@@ -321,6 +318,19 @@
       </widget>
     </widget>
   </widget>
+
+  <widget>
+    <class>GnomeAppBar</class>
+    <child_name>GnomeApp:appbar</child_name>
+    <name>appbar2</name>
+    <has_progress>True</has_progress>
+    <has_status>True</has_status>
+    <child>
+      <padding>0</padding>
+      <expand>True</expand>
+      <fill>True</fill>
+    </child>
+  </widget>
 </widget>
 
 </GTK-Interface>