From d7562e99ae9fa1c7a2dc894087b580a9e503fa71 Mon Sep 17 00:00:00 2001
From: Peter Williams <peterw@ximian.com>
Date: Mon, 6 Aug 2001 19:02:00 +0000
Subject: Reimplement to be asynchronous and pretty, with progressive folder
 loading

2001-08-06  Peter Williams  <peterw@ximian.com>

	* subscribe-dialog.[ch]: Reimplement to be asynchronous and pretty,
	with progressive folder loading and all sorts of wonderful
	improvements.

	* mail-callbacks.c (manage_subscriptions): Change to reflect API
	update.

	* component-factory.c (mail_load_storages): Don't add the storage
	if it has been disabled.

	* Makefile.am (etspec_DATA): Add subscribe-dialog.etspec.
	(glade_DATA): And the glade file.

	* subscribe-dialog.etspec: New file, break out the specification
	from inside the subscribe-dialog.c

	* subscribe-dialog.glade: Update this, actually use it now.

svn path=/trunk/; revision=11706
---
 mail/subscribe-dialog.glade | 366 ++++++++++++++++++++++++--------------------
 1 file changed, 197 insertions(+), 169 deletions(-)

(limited to 'mail/subscribe-dialog.glade')

diff --git a/mail/subscribe-dialog.glade b/mail/subscribe-dialog.glade
index 5169f450c3..472491b3e8 100644
--- a/mail/subscribe-dialog.glade
+++ b/mail/subscribe-dialog.glade
@@ -15,12 +15,13 @@
 
 <widget>
   <class>GnomeDialog</class>
-  <name>subscriptions</name>
-  <visible>False</visible>
-  <title></title>
+  <name>Manage Subscriptions</name>
+  <title>Manage Subscriptions</title>
   <type>GTK_WINDOW_TOPLEVEL</type>
   <position>GTK_WIN_POS_NONE</position>
-  <modal>True</modal>
+  <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>
@@ -30,7 +31,7 @@
   <widget>
     <class>GtkVBox</class>
     <child_name>GnomeDialog:vbox</child_name>
-    <name>dialog-vbox1</name>
+    <name>dialog-vbox2</name>
     <homogeneous>False</homogeneous>
     <spacing>8</spacing>
     <child>
@@ -42,7 +43,7 @@
     <widget>
       <class>GtkHButtonBox</class>
       <child_name>GnomeDialog:action_area</child_name>
-      <name>dialog-action_area1</name>
+      <name>dialog-action_area2</name>
       <layout_style>GTK_BUTTONBOX_END</layout_style>
       <spacing>8</spacing>
       <child_min_width>85</child_min_width>
@@ -58,36 +59,19 @@
 
       <widget>
 	<class>GtkButton</class>
-	<name>button1</name>
+	<name>button9</name>
 	<can_default>True</can_default>
 	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_OK</stock_button>
-      </widget>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button2</name>
-	<can_default>True</can_default>
-	<can_focus>True</can_focus>
-	<stock_button>GNOME_STOCK_BUTTON_APPLY</stock_button>
-      </widget>
-
-      <widget>
-	<class>GtkButton</class>
-	<name>button3</name>
-	<can_default>True</can_default>
-	<has_default>True</has_default>
-	<can_focus>True</can_focus>
-	<has_focus>True</has_focus>
-	<stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button>
+	<stock_button>GNOME_STOCK_BUTTON_CLOSE</stock_button>
       </widget>
     </widget>
 
     <widget>
       <class>GtkVBox</class>
-      <name>vbox1</name>
+      <name>vbox2</name>
+      <border_width>3</border_width>
       <homogeneous>False</homogeneous>
-      <spacing>0</spacing>
+      <spacing>3</spacing>
       <child>
 	<padding>0</padding>
 	<expand>True</expand>
@@ -95,199 +79,243 @@
       </child>
 
       <widget>
-	<class>GtkTable</class>
-	<name>table</name>
-	<rows>3</rows>
-	<columns>2</columns>
+	<class>GtkHBox</class>
+	<name>hbox1</name>
 	<homogeneous>False</homogeneous>
-	<row_spacing>0</row_spacing>
-	<column_spacing>3</column_spacing>
+	<spacing>0</spacing>
 	<child>
 	  <padding>0</padding>
-	  <expand>True</expand>
+	  <expand>False</expand>
 	  <fill>True</fill>
 	</child>
 
 	<widget>
 	  <class>GtkLabel</class>
-	  <name>lblDisplay</name>
-	  <label>Display folders whose name contain:</label>
-	  <justify>GTK_JUSTIFY_LEFT</justify>
+	  <name>label1</name>
+	  <label>Show _folders from server: </label>
+	  <justify>GTK_JUSTIFY_CENTER</justify>
 	  <wrap>False</wrap>
-	  <xalign>0</xalign>
+	  <xalign>0.5</xalign>
 	  <yalign>0.5</yalign>
 	  <xpad>0</xpad>
 	  <ypad>0</ypad>
+	  <default_focus_target>store_menu</default_focus_target>
 	  <child>
-	    <left_attach>0</left_attach>
-	    <right_attach>1</right_attach>
-	    <top_attach>0</top_attach>
-	    <bottom_attach>1</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>False</xfill>
-	    <yfill>False</yfill>
+	    <padding>0</padding>
+	    <expand>False</expand>
+	    <fill>False</fill>
 	  </child>
 	</widget>
 
 	<widget>
-	  <class>GtkEntry</class>
-	  <name>txtSearch``</name>
+	  <class>GtkOptionMenu</class>
+	  <name>store_menu</name>
 	  <can_focus>True</can_focus>
-	  <editable>True</editable>
-	  <text_visible>True</text_visible>
-	  <text_max_length>0</text_max_length>
-	  <text></text>
+	  <items></items>
+	  <initial_choice>0</initial_choice>
 	  <child>
-	    <left_attach>0</left_attach>
-	    <right_attach>1</right_attach>
-	    <top_attach>1</top_attach>
-	    <bottom_attach>2</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>True</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
+	    <padding>0</padding>
+	    <expand>False</expand>
+	    <fill>False</fill>
 	  </child>
 	</widget>
+      </widget>
+
+      <widget>
+	<class>GtkHBox</class>
+	<name>tree_box</name>
+	<homogeneous>False</homogeneous>
+	<spacing>0</spacing>
+	<child>
+	  <padding>0</padding>
+	  <expand>True</expand>
+	  <fill>True</fill>
+	</child>
+
+	<widget>
+	  <class>Placeholder</class>
+	</widget>
 
 	<widget>
-	  <class>GtkNotebook</class>
-	  <name>notebook</name>
-	  <can_focus>True</can_focus>
-	  <show_tabs>True</show_tabs>
-	  <show_border>True</show_border>
-	  <tab_pos>GTK_POS_BOTTOM</tab_pos>
-	  <scrollable>False</scrollable>
-	  <tab_hborder>2</tab_hborder>
-	  <tab_vborder>2</tab_vborder>
-	  <popup_enable>False</popup_enable>
+	  <class>GtkVBox</class>
+	  <name>vbox3</name>
+	  <border_width>3</border_width>
+	  <homogeneous>False</homogeneous>
+	  <spacing>3</spacing>
 	  <child>
-	    <left_attach>0</left_attach>
-	    <right_attach>1</right_attach>
-	    <top_attach>2</top_attach>
-	    <bottom_attach>3</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>True</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
+	    <padding>0</padding>
+	    <expand>False</expand>
+	    <fill>False</fill>
+	    <pack>GTK_PACK_END</pack>
 	  </child>
 
-	  <widget>
-	    <class>Custom</class>
-	    <name>etableAll</name>
-	    <creation_function>create_folderlist</creation_function>
-	    <int1>0</int1>
-	    <int2>0</int2>
-	    <last_modification_time>Thu, 09 Nov 2000 23:31:36 GMT</last_modification_time>
-	  </widget>
-
 	  <widget>
 	    <class>GtkLabel</class>
-	    <child_name>Notebook:tab</child_name>
-	    <name>lblAll</name>
-	    <label>All Folders</label>
+	    <name>label2</name>
+	    <label>
+</label>
 	    <justify>GTK_JUSTIFY_CENTER</justify>
 	    <wrap>False</wrap>
 	    <xalign>0.5</xalign>
 	    <yalign>0.5</yalign>
 	    <xpad>0</xpad>
 	    <ypad>0</ypad>
+	    <child>
+	      <padding>0</padding>
+	      <expand>False</expand>
+	      <fill>False</fill>
+	    </child>
 	  </widget>
 
 	  <widget>
-	    <class>Custom</class>
-	    <name>etableSubscribed</name>
-	    <creation_function>create_folderlist</creation_function>
-	    <int1>1</int1>
-	    <int2>0</int2>
-	    <last_modification_time>Thu, 09 Nov 2000 23:30:19 GMT</last_modification_time>
+	    <class>GtkVButtonBox</class>
+	    <name>vbuttonbox2</name>
+	    <layout_style>GTK_BUTTONBOX_SPREAD</layout_style>
+	    <spacing>0</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>False</fill>
+	    </child>
+
+	    <widget>
+	      <class>GtkButton</class>
+	      <name>subscribe_button</name>
+	      <can_default>True</can_default>
+	      <can_focus>True</can_focus>
+	      <label>_Subscribe</label>
+	      <relief>GTK_RELIEF_NORMAL</relief>
+	    </widget>
+
+	    <widget>
+	      <class>GtkButton</class>
+	      <name>unsubscribe_button</name>
+	      <can_default>True</can_default>
+	      <can_focus>True</can_focus>
+	      <label>_Unsubscribe</label>
+	      <relief>GTK_RELIEF_NORMAL</relief>
+	    </widget>
 	  </widget>
 
 	  <widget>
-	    <class>GtkLabel</class>
-	    <child_name>Notebook:tab</child_name>
-	    <name>lblSubscribed</name>
-	    <label>Subscribed</label>
-	    <justify>GTK_JUSTIFY_CENTER</justify>
-	    <wrap>False</wrap>
-	    <xalign>0.5</xalign>
-	    <yalign>0.5</yalign>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
+	    <class>GtkHSeparator</class>
+	    <name>hseparator1</name>
+	    <child>
+	      <padding>14</padding>
+	      <expand>False</expand>
+	      <fill>False</fill>
+	    </child>
 	  </widget>
-	</widget>
 
-	<widget>
-	  <class>GtkButton</class>
-	  <name>cmdQuery</name>
-	  <can_focus>True</can_focus>
-	  <label>Query</label>
-	  <child>
-	    <left_attach>1</left_attach>
-	    <right_attach>2</right_attach>
-	    <top_attach>1</top_attach>
-	    <bottom_attach>2</bottom_attach>
-	    <xpad>5</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>False</yfill>
-	  </child>
+	  <widget>
+	    <class>GtkVButtonBox</class>
+	    <name>vbuttonbox3</name>
+	    <layout_style>GTK_BUTTONBOX_START</layout_style>
+	    <spacing>10</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>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>
+	<label_xalign>0</label_xalign>
+	<shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
+	<child>
+	  <padding>0</padding>
+	  <expand>False</expand>
+	  <fill>True</fill>
+	</child>
 
 	<widget>
-	  <class>GtkVButtonBox</class>
-	  <name>vbuttonbox1</name>
-	  <layout_style>GTK_BUTTONBOX_DEFAULT_STYLE</layout_style>
-	  <spacing>0</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>
-	    <left_attach>1</left_attach>
-	    <right_attach>2</right_attach>
-	    <top_attach>2</top_attach>
-	    <bottom_attach>3</bottom_attach>
-	    <xpad>0</xpad>
-	    <ypad>0</ypad>
-	    <xexpand>False</xexpand>
-	    <yexpand>False</yexpand>
-	    <xshrink>False</xshrink>
-	    <yshrink>False</yshrink>
-	    <xfill>True</xfill>
-	    <yfill>True</yfill>
-	  </child>
+	  <class>GtkHBox</class>
+	  <name>hbox3</name>
+	  <border_width>3</border_width>
+	  <homogeneous>False</homogeneous>
+	  <spacing>3</spacing>
+
+	  <widget>
+	    <class>GtkRadioButton</class>
+	    <name>all_radio</name>
+	    <can_focus>True</can_focus>
+	    <label>All folders</label>
+	    <active>False</active>
+	    <draw_indicator>True</draw_indicator>
+	    <group>view_type</group>
+	    <child>
+	      <padding>0</padding>
+	      <expand>False</expand>
+	      <fill>False</fill>
+	    </child>
+	  </widget>
 
 	  <widget>
-	    <class>GtkButton</class>
-	    <name>cmdSubscribe</name>
-	    <can_default>True</can_default>
+	    <class>GtkRadioButton</class>
+	    <name>filter_radio</name>
 	    <can_focus>True</can_focus>
-	    <label>Subscribe</label>
+	    <label>Folders whose names begin with:</label>
+	    <active>False</active>
+	    <draw_indicator>True</draw_indicator>
+	    <group>view_type</group>
+	    <child>
+	      <padding>0</padding>
+	      <expand>False</expand>
+	      <fill>False</fill>
+	    </child>
 	  </widget>
 
 	  <widget>
-	    <class>GtkButton</class>
-	    <name>cmdUnsubscribe</name>
-	    <can_default>True</can_default>
+	    <class>GtkEntry</class>
+	    <name>search_entry</name>
 	    <can_focus>True</can_focus>
-	    <label>Unsubscribe</label>
+	    <editable>True</editable>
+	    <text_visible>True</text_visible>
+	    <text_max_length>0</text_max_length>
+	    <text></text>
+	    <child>
+	      <padding>0</padding>
+	      <expand>True</expand>
+	      <fill>True</fill>
+	    </child>
+	  </widget>
+
+	  <widget>
+	    <class>GtkHButtonBox</class>
+	    <name>hbuttonbox1</name>
+	    <layout_style>GTK_BUTTONBOX_DEFAULT_STYLE</layout_style>
+	    <spacing>30</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>False</fill>
+	    </child>
 	  </widget>
 	</widget>
       </widget>
-- 
cgit