Made some minor alterations to anna's version, as in the changelog. also attach the whoel glade file in addition to the diff below.
? GNOME_Evolution_Mail.oaf
? GNOME_Evolution_Mail.oafinfo
? Mail-common.c
? Mail-skels.c
? Mail-stubs.c
? Mail.h
? a
? a.out
? bak
? blah.c
? blah.ps
? changes.diff
? conf.keys
? diff
? econf.h
? mail-config.c.save
? mail-config.evolution
? mail-send-recv.c.save
? message-list.c.save
? ml.diff
? old
? out
? store_change.diff
? subscribe-dialog-new.c
? subscribe-dialog.c.new
? subscribe-dialog.glade.backup
? subscribe-dialog.glade.save
? subscribe-dialog.gladep
? test-mt
? typescript
? importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.oaf
? importers/GNOME_Evolution_Mail_Elm_Intelligent_Importer.oaf.in
? importers/GNOME_Evolution_Mail_Mbox_Importer.oaf
? importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.oaf
? importers/GNOME_Evolution_Mail_Netscape_Intelligent_Importer.oaf.in
? importers/GNOME_Evolution_Mail_Outlook_Importer.oaf
? importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.oaf
? importers/GNOME_Evolution_Mail_Pine_Intelligent_Importer.oaf.in
? importers/am.diff
? importers/b
? importers/elm-importer.c.new
? importers/elm.ps
? importers/im.diff
Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/mail/ChangeLog,v
retrieving revision 1.2692
diff -u -3 -r1.2692 ChangeLog
--- ChangeLog 14 Apr 2003 22:52:31 -0000 1.2692
+++ ChangeLog 15 Apr 2003 02:35:21 -0000
@@ -1,3 +1,18 @@
+2003-04-15 Not Zed <NotZed Ximian com>
+
+ * For bug #41199.
+
+ * subscribe-dialog.glade: New interface from Anna. Setup the
+ wigdet names and add a progress bar, and set the default opening
+ size to something reasonable.
+
+ * subscribe-dialog.c (subscribe_dialog_construct): changes to
+ match the glade file chagnes. remove the search stuff. hide the
+ progress bar by default.
+ (sc_activity_cb): show the progress bar when we're active, hide
+ it when inactive. dont set any status.
+ (struct _SubscribeDialogPrivate): Remove the appbar.
+
2003-04-14 Not Zed <NotZed Ximian com>
* mail-send-recv.c (build_dialogue): create a stock cancel button
Index: subscribe-dialog.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/subscribe-dialog.c,v
retrieving revision 1.88
diff -u -3 -r1.88 subscribe-dialog.c
--- subscribe-dialog.c 9 Apr 2003 14:20:34 -0000 1.88
+++ subscribe-dialog.c 15 Apr 2003 02:35:21 -0000
@@ -31,9 +31,6 @@
#include <string.h>
-#include <libgnomeui/gnome-app.h>
-#include <libgnomeui/gnome-appbar.h>
-
#include <gal/util/e-util.h>
#include <gal/e-table/e-cell-toggle.h>
@@ -1289,7 +1286,6 @@
GtkWidget *filter_radio, *all_radio;
GtkWidget *sub_button, *unsub_button, *refresh_button, *close_button;
GtkWidget *progress;
- GtkWidget *appbar;
int cancel; /* have we been cancelled? */
guint activity_timeout_id;
@@ -1386,14 +1382,14 @@
return;
sc->priv->activity_timeout_id = g_timeout_add(50, (GSourceFunc)sc_activity_timeout, sc);
- gnome_appbar_set_status (GNOME_APPBAR (sc->priv->appbar), _("Scanning folders..."));
+ gtk_widget_show(sc->priv->progress);
} else {
if (sc->priv->activity_timeout_id) {
g_source_remove (sc->priv->activity_timeout_id);
sc->priv->activity_timeout_id = 0;
}
- gnome_appbar_set_status (GNOME_APPBAR (sc->priv->appbar), "");
+ gtk_widget_hide(sc->priv->progress);
}
}
@@ -1616,19 +1612,15 @@
/* Load the XML */
/* "app2" */
- sc->priv->xml = glade_xml_new (EVOLUTION_GLADEDIR "/subscribe-dialog.glade", "app", NULL);
-
- sc->app = glade_xml_get_widget (sc->priv->xml, "app");
+ sc->priv->xml = glade_xml_new (EVOLUTION_GLADEDIR "/subscribe-dialog.glade", "subscribe_dialog", NULL);
+
+ sc->app = glade_xml_get_widget (sc->priv->xml, "subscribe_dialog");
sc->priv->hbox = glade_xml_get_widget (sc->priv->xml, "tree_box");
- sc->priv->search_entry = glade_xml_get_widget (sc->priv->xml, "search_entry");
- sc->priv->filter_radio = glade_xml_get_widget (sc->priv->xml, "filter_radio");
- sc->priv->all_radio = glade_xml_get_widget (sc->priv->xml, "all_radio");
sc->priv->close_button = glade_xml_get_widget (sc->priv->xml, "close_button");
sc->priv->sub_button = glade_xml_get_widget (sc->priv->xml, "subscribe_button");
sc->priv->unsub_button = glade_xml_get_widget (sc->priv->xml, "unsubscribe_button");
sc->priv->refresh_button = glade_xml_get_widget (sc->priv->xml, "refresh_button");
- sc->priv->appbar = GNOME_APP (sc->app)->statusbar;
- sc->priv->progress = GTK_WIDGET (gnome_appbar_get_progress (GNOME_APPBAR (sc->priv->appbar)));
+ sc->priv->progress = glade_xml_get_widget(sc->priv->xml, "progress_bar");
/* create default view */
sc->priv->default_widget = sc_create_default_widget();
@@ -1648,6 +1640,10 @@
/* progress */
gtk_progress_bar_set_pulse_step(GTK_PROGRESS_BAR(sc->priv->progress), 0.1);
+ gtk_widget_hide(sc->priv->progress);
+
+ /* reasonable starting point */
+ gtk_window_set_default_size((GtkWindow *)sc->app, 350, 400);
/* Get the list of stores */
populate_store_list (sc);
Index: subscribe-dialog.glade
===================================================================
RCS file: /cvs/gnome/evolution/mail/subscribe-dialog.glade,v
retrieving revision 1.8
diff -u -3 -r1.8 subscribe-dialog.glade
--- subscribe-dialog.glade 25 Mar 2003 20:33:25 -0000 1.8
+++ subscribe-dialog.glade 15 Apr 2003 02:35:22 -0000
@@ -2,225 +2,327 @@
<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd";>
<glade-interface>
-<requires lib="gnome"/>
-<requires lib="bonobo"/>
-<widget class="GnomeApp" id="app">
+<widget class="GtkWindow" id="subscribe_dialog">
+ <property name="width_request">500</property>
+ <property name="height_request">400</property>
<property name="visible">True</property>
- <property name="title" translatable="yes">Manage Subscriptions</property>
+ <property name="title" translatable="yes">Folder Subscriptions</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="enable_layout_config">True</property>
- <child internal-child="dock">
- <widget class="BonoboDock" id="dock2">
- <property name="border_width">3</property>
+ <child>
+ <widget class="GtkVBox" id="vbox1">
+ <property name="border_width">12</property>
<property name="visible">True</property>
- <property name="allow_floating">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">6</property>
<child>
- <widget class="BonoboDockItem" id="dockitem2">
- <property name="border_width">1</property>
+ <widget class="GtkHBox" id="hbox1">
<property name="visible">True</property>
- <property name="shadow_type">GTK_SHADOW_OUT</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">6</property>
+
+ <child>
+ <widget class="GtkLabel" id="label1">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">S_erver:</property>
+ <property name="use_underline">True</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="mnemonic_widget">store_menu</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
<child>
- <widget class="GtkToolbar" id="toolbar1">
- <property name="border_width">1</property>
+ <widget class="GtkOptionMenu" id="store_menu">
<property name="visible">True</property>
- <property name="orientation">GTK_ORIENTATION_HORIZONTAL</property>
- <property name="toolbar_style">GTK_TOOLBAR_BOTH</property>
- <property name="tooltips">True</property>
+ <property name="can_focus">True</property>
+ <property name="history">0</property>
<child>
- <widget class="button" id="refresh_button">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Refresh List</property>
- <property name="use_underline">True</property>
- <property name="stock_pixmap">gtk-refresh</property>
+ <widget class="GtkMenu" id="menu1">
+
+ <child>
+ <widget class="GtkMenuItem" id="no_imap_server_selected1">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">None Selected</property>
+ <property name="use_underline">True</property>
+ <signal name="activate" handler="on_no_imap_server_selected1_activate" last_modification_time="Mon, 14 Apr 2003 17:08:20 GMT"/>
+ </widget>
+ </child>
</widget>
</child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
- <child>
- <widget class="button" id="close_button">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Close</property>
- <property name="use_underline">True</property>
- <property name="stock_pixmap">gtk-close</property>
- </widget>
- <packing>
- <property name="new_group">True</property>
- </packing>
- </child>
+ <child>
+ <widget class="GtkProgressBar" id="progress_bar">
+ <property name="visible">True</property>
+ <property name="orientation">GTK_PROGRESS_LEFT_TO_RIGHT</property>
+ <property name="fraction">0</property>
+ <property name="pulse_step">0.1</property>
+ <property name="text" translatable="yes">Scanning folders ...</property>
</widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="pack_type">GTK_PACK_END</property>
+ </packing>
</child>
</widget>
<packing>
- <property name="placement">BONOBO_DOCK_TOP</property>
- <property name="band">0</property>
- <property name="position">0</property>
- <property name="offset">0</property>
- <property name="behavior">BONOBO_DOCK_ITEM_BEH_EXCLUSIVE</property>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
</packing>
</child>
<child>
- <widget class="GtkVBox" id="vbox6">
- <property name="border_width">3</property>
+ <widget class="GtkHBox" id="tree_box">
<property name="visible">True</property>
<property name="homogeneous">False</property>
- <property name="spacing">3</property>
+ <property name="spacing">6</property>
<child>
- <widget class="GtkHBox" id="hbox7">
+ <widget class="GtkVButtonBox" id="vbuttonbox1">
<property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
+ <property name="layout_style">GTK_BUTTONBOX_START</property>
+ <property name="spacing">6</property>
<child>
- <widget class="GtkLabel" id="label5">
+ <widget class="GtkButton" id="subscribe_button">
<property name="visible">True</property>
- <property name="label" translatable="yes">S_elect server: </property>
- <property name="use_underline">True</property>
- <property name="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_CENTER</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="mnemonic_widget">store_menu</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
+ <property name="can_default">True</property>
+ <property name="can_focus">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</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">0</property>
+ <property name="yscale">0</property>
+
+ <child>
+ <widget class="GtkHBox" id="hbox3">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">2</property>
+
+ <child>
+ <widget class="GtkImage" id="image1">
+ <property name="visible">True</property>
+ <property name="stock">gtk-add</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="label2">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">_Subscribe</property>
+ <property name="use_underline">True</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>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ </widget>
</child>
<child>
- <widget class="GtkOptionMenu" id="store_menu">
+ <widget class="GtkButton" id="unsubscribe_button">
<property name="visible">True</property>
+ <property name="can_default">True</property>
<property name="can_focus">True</property>
- <property name="history">-1</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
- <child internal-child="menu">
- <widget class="GtkMenu" id="convertwidget1">
+ <child>
+ <widget class="GtkAlignment" id="alignment2">
<property name="visible">True</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xscale">0</property>
+ <property name="yscale">0</property>
+
+ <child>
+ <widget class="GtkHBox" id="hbox4">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">2</property>
+
+ <child>
+ <widget class="GtkImage" id="image2">
+ <property name="visible">True</property>
+ <property name="stock">gtk-remove</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="label3">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">_Unsubscribe</property>
+ <property name="use_underline">True</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>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
</widget>
</child>
</widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
</child>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">False</property>
- <property name="fill">True</property>
+ <property name="fill">False</property>
+ <property name="pack_type">GTK_PACK_END</property>
</packing>
</child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkHSeparator" id="hseparator1">
+ <property name="visible">True</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkHBox" id="hbox5">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">0</property>
<child>
- <widget class="GtkHBox" id="tree_box">
+ <widget class="GtkHButtonBox" id="hbuttonbox2">
<property name="visible">True</property>
- <property name="homogeneous">False</property>
+ <property name="layout_style">GTK_BUTTONBOX_DEFAULT_STYLE</property>
<property name="spacing">0</property>
<child>
- <placeholder/>
+ <widget class="GtkButton" id="button5">
+ <property name="visible">True</property>
+ <property name="can_default">True</property>
+ <property name="can_focus">True</property>
+ <property name="label">gtk-help</property>
+ <property name="use_stock">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ </widget>
</child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkHButtonBox" id="hbuttonbox1">
+ <property name="visible">True</property>
+ <property name="layout_style">GTK_BUTTONBOX_END</property>
+ <property name="spacing">12</property>
<child>
- <widget class="GtkVBox" id="vbox7">
- <property name="border_width">3</property>
+ <widget class="GtkButton" id="refresh_button">
<property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">3</property>
-
- <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_CENTER</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>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkVButtonBox" id="vbuttonbox6">
- <property name="visible">True</property>
- <property name="layout_style">GTK_BUTTONBOX_SPREAD</property>
- <property name="spacing">0</property>
-
- <child>
- <widget class="GtkButton" id="subscribe_button">
- <property name="visible">True</property>
- <property name="can_default">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">_Subscribe</property>
- <property name="use_underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- </widget>
- </child>
-
- <child>
- <widget class="GtkButton" id="unsubscribe_button">
- <property name="visible">True</property>
- <property name="can_default">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">_Unsubscribe</property>
- <property name="use_underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
+ <property name="can_default">True</property>
+ <property name="can_focus">True</property>
+ <property name="label">gtk-refresh</property>
+ <property name="use_stock">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ </widget>
+ </child>
- <child>
- <widget class="GtkVButtonBox" id="vbuttonbox7">
- <property name="visible">True</property>
- <property name="layout_style">GTK_BUTTONBOX_START</property>
- <property name="spacing">10</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
+ <child>
+ <widget class="GtkButton" id="close_button">
+ <property name="visible">True</property>
+ <property name="can_default">True</property>
+ <property name="can_focus">True</property>
+ <property name="label">gtk-close</property>
+ <property name="use_stock">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
</widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="pack_type">GTK_PACK_END</property>
- </packing>
</child>
</widget>
<packing>
@@ -230,26 +332,13 @@
</packing>
</child>
</widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
</child>
</widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
-
- <child internal-child="appbar">
- <widget class="GnomeAppBar" id="appbar2">
- <property name="visible">True</property>
- <property name="has_progress">True</property>
- <property name="has_status">True</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
</child>
</widget>
Attachment:
41199.glade
Description: application/glade