[evolution-patches] shell HIG patch
- From: William Jon McCann <mccannwj pha jhu edu>
- To: evolution-patches lists ximian com
- Subject: [evolution-patches] shell HIG patch
- Date: Wed, 07 Jan 2004 14:48:22 -0500
? shell/apps_evolution_shell-1.5.schemas
? shell/glade/e-active-connection-dialog.gladep
? shell/glade/e-shell-folder-creation-dialog.gladep
? shell/glade/e-shell-shared-folder-picker-dialog.gladep
Index: shell/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/shell/ChangeLog,v
retrieving revision 1.1362
diff -u -r1.1362 ChangeLog
--- shell/ChangeLog 7 Jan 2004 14:29:07 -0000 1.1362
+++ shell/ChangeLog 7 Jan 2004 18:49:34 -0000
@@ -1,3 +1,19 @@
+2003-01-07 William Jon McCann <mccann jhu edu>
+
+ * importer/intelligent.c (create_gui):
+ * main.c (show_development_warning):
+ * e-shortcuts-view.c (destroy_group_cb):
+ * e-shell-startup-wizard.c (prepare_importer_page)
+ (key_press_event_callback):
+ * e-shell-shared-folder-picker-dialog.c (create_progress_dialog):
+ * e-shell-importer.c (choose_importer_from_list, show_error)
+ (start_import, prepare_intelligent_page):
+ * e-shell-folder-commands.c (delete_dialog):
+ * glade/e-shell-shared-folder-picker-dialog.glade:
+ * glade/e-shell-folder-creation-dialog.glade:
+ * glade/e-active-connection-dialog.glade:
+ Remove separator from dialogs. HIG fixes.
+
2004-01-05 ERDI Gergo <cactus cactus rulez org>
* e-task-bar.c (init): Create a separate label to the left of the
Index: shell/e-shell-folder-commands.c
===================================================================
RCS file: /cvs/gnome/evolution/shell/e-shell-folder-commands.c,v
retrieving revision 1.59
diff -u -r1.59 e-shell-folder-commands.c
--- shell/e-shell-folder-commands.c 9 Jul 2003 19:54:25 -0000 1.59
+++ shell/e-shell-folder-commands.c 7 Jan 2004 18:49:35 -0000
@@ -407,6 +407,7 @@
gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
gtk_dialog_add_button (GTK_DIALOG (dialog), GTK_STOCK_DELETE, GTK_RESPONSE_OK);
+ gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
gtk_container_set_border_width (GTK_CONTAINER (dialog), 6);
Index: shell/e-shell-importer.c
===================================================================
RCS file: /cvs/gnome/evolution/shell/e-shell-importer.c,v
retrieving revision 1.61
diff -u -r1.61 e-shell-importer.c
--- shell/e-shell-importer.c 6 Dec 2003 18:09:17 -0000 1.61
+++ shell/e-shell-importer.c 7 Jan 2004 18:49:37 -0000
@@ -323,6 +323,7 @@
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
GTK_STOCK_OK, GTK_RESPONSE_OK,
NULL);
+ gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
clist = gtk_clist_new (1);
@@ -440,6 +441,7 @@
GtkWidget *box;
box = gtk_message_dialog_new(NULL, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, "%s", message);
+ gtk_dialog_set_has_separator (GTK_DIALOG (box), FALSE);
gtk_window_set_title (GTK_WINDOW (box), title);
g_signal_connect(box, "response", G_CALLBACK(error_response_cb), box);
@@ -489,6 +491,7 @@
icd->dialog = GTK_DIALOG (gtk_dialog_new_with_buttons(_("Importing"), NULL, 0,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
NULL));
+ gtk_dialog_set_has_separator (icd->dialog, FALSE);
g_signal_connect (icd->dialog, "response", G_CALLBACK (dialog_response_cb), icd);
g_object_weak_ref (G_OBJECT(icd->dialog), dialog_destroy_notify, icd);
@@ -753,6 +756,7 @@
dialog = gtk_message_dialog_new(NULL, 0, GTK_MESSAGE_INFO, GTK_BUTTONS_NONE, "%s",
_("Please wait...\nScanning for existing setups"));
e_make_widget_backing_stored (dialog);
+ gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
gtk_window_set_title (GTK_WINDOW (dialog), _("Starting Intelligent Importers"));
gtk_widget_show_all (dialog);
Index: shell/e-shell-settings-dialog.c
===================================================================
RCS file: /cvs/gnome/evolution/shell/e-shell-settings-dialog.c,v
retrieving revision 1.27
diff -u -r1.27 e-shell-settings-dialog.c
--- shell/e-shell-settings-dialog.c 3 Nov 2003 20:15:50 -0000 1.27
+++ shell/e-shell-settings-dialog.c 7 Jan 2004 18:49:38 -0000
@@ -344,6 +344,7 @@
gtk_container_set_border_width (GTK_CONTAINER (dialog), 6);
gtk_window_set_title (GTK_WINDOW (dialog), _("Evolution Settings"));
+ gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
}
Index: shell/e-shell-shared-folder-picker-dialog.c
===================================================================
RCS file: /cvs/gnome/evolution/shell/e-shell-shared-folder-picker-dialog.c,v
retrieving revision 1.25
diff -u -r1.25 e-shell-shared-folder-picker-dialog.c
--- shell/e-shell-shared-folder-picker-dialog.c 1 Dec 2003 22:14:42 -0000 1.25
+++ shell/e-shell-shared-folder-picker-dialog.c 7 Jan 2004 18:49:39 -0000
@@ -387,6 +387,7 @@
dialog = gtk_dialog_new_with_buttons (_("Opening Folder"), NULL, 0,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
NULL);
+ gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
gtk_widget_set_size_request (dialog, 300, -1);
gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
Index: shell/e-shell-startup-wizard.c
===================================================================
RCS file: /cvs/gnome/evolution/shell/e-shell-startup-wizard.c,v
retrieving revision 1.45
diff -u -r1.45 e-shell-startup-wizard.c
--- shell/e-shell-startup-wizard.c 1 Dec 2003 22:14:42 -0000 1.45
+++ shell/e-shell-startup-wizard.c 7 Jan 2004 18:49:40 -0000
@@ -558,6 +558,7 @@
dialog = gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_INFO,
GTK_BUTTONS_NONE,
_("Please wait...\nScanning for existing setups"));
+ gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
e_make_widget_backing_stored (dialog);
gtk_window_set_title (GTK_WINDOW (dialog), _("Starting import"));
@@ -787,6 +788,7 @@
gtk_dialog_add_button (confirm_dialog, _("Cancel"), GTK_RESPONSE_CANCEL);
gtk_dialog_add_button (confirm_dialog, _("Quit Assistant"), GTK_RESPONSE_OK);
+ gtk_dialog_set_has_separator (GTK_DIALOG (confirm_dialog), FALSE);
returnvalue = gtk_dialog_run (GTK_DIALOG (confirm_dialog));
gtk_widget_destroy (confirm_dialog);
Index: shell/e-shortcuts-view.c
===================================================================
RCS file: /cvs/gnome/evolution/shell/e-shortcuts-view.c,v
retrieving revision 1.65
diff -u -r1.65 e-shortcuts-view.c
--- shell/e-shortcuts-view.c 22 Apr 2003 19:49:22 -0000 1.65
+++ shell/e-shortcuts-view.c 7 Jan 2004 18:49:41 -0000
@@ -191,6 +191,7 @@
gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (message_dialog)->vbox), 6);
+ gtk_dialog_set_has_separator (GTK_DIALOG (message_dialog), FALSE);
gtk_dialog_set_default_response (GTK_DIALOG (message_dialog), GTK_RESPONSE_OK);
response = gtk_dialog_run (GTK_DIALOG (message_dialog));
Index: shell/main.c
===================================================================
RCS file: /cvs/gnome/evolution/shell/main.c,v
retrieving revision 1.138
diff -u -r1.138 main.c
--- shell/main.c 30 Dec 2003 15:09:35 -0000 1.138
+++ shell/main.c 7 Jan 2004 18:49:43 -0000
@@ -263,6 +263,7 @@
warning_dialog = gtk_dialog_new_with_buttons("Ximian Evolution " VERSION, parent,
GTK_DIALOG_MODAL|GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_STOCK_OK, GTK_RESPONSE_OK, NULL);
+ gtk_dialog_set_has_separator (GTK_DIALOG (warning_dialog), FALSE);
text = g_strdup_printf(
/* xgettext:no-c-format */
/* Preview/Alpha/Beta version warning message */
Index: shell/glade/e-active-connection-dialog.glade
===================================================================
RCS file: /cvs/gnome/evolution/shell/glade/e-active-connection-dialog.glade,v
retrieving revision 1.8
diff -u -r1.8 e-active-connection-dialog.glade
--- shell/glade/e-active-connection-dialog.glade 21 Apr 2003 19:13:35 -0000 1.8
+++ shell/glade/e-active-connection-dialog.glade 7 Jan 2004 18:49:43 -0000
@@ -2,6 +2,7 @@
<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd";>
<glade-interface>
+<requires lib="gnome"/>
<widget class="GtkDialog" id="active_connection_dialog">
<property name="border_width">6</property>
@@ -12,7 +13,7 @@
<property name="modal">False</property>
<property name="resizable">True</property>
<property name="destroy_with_parent">False</property>
- <property name="has_separator">True</property>
+ <property name="has_separator">False</property>
<child internal-child="vbox">
<widget class="GtkVBox" id="dialog-vbox2">
Index: shell/glade/e-shell-folder-creation-dialog.glade
===================================================================
RCS file: /cvs/gnome/evolution/shell/glade/e-shell-folder-creation-dialog.glade,v
retrieving revision 1.7
diff -u -r1.7 e-shell-folder-creation-dialog.glade
--- shell/glade/e-shell-folder-creation-dialog.glade 21 Apr 2003 19:27:35 -0000 1.7
+++ shell/glade/e-shell-folder-creation-dialog.glade 7 Jan 2004 18:49:43 -0000
@@ -2,6 +2,7 @@
<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd";>
<glade-interface>
+<requires lib="gnome"/>
<widget class="GtkDialog" id="create_folder_dialog">
<property name="border_width">6</property>
@@ -14,7 +15,7 @@
<property name="default_height">410</property>
<property name="resizable">True</property>
<property name="destroy_with_parent">False</property>
- <property name="has_separator">True</property>
+ <property name="has_separator">False</property>
<child internal-child="vbox">
<widget class="GtkVBox" id="dialog-vbox1">
Index: shell/glade/e-shell-shared-folder-picker-dialog.glade
===================================================================
RCS file: /cvs/gnome/evolution/shell/glade/e-shell-shared-folder-picker-dialog.glade,v
retrieving revision 1.6
diff -u -r1.6 e-shell-shared-folder-picker-dialog.glade
--- shell/glade/e-shell-shared-folder-picker-dialog.glade 2 May 2003 14:54:45 -0000 1.6
+++ shell/glade/e-shell-shared-folder-picker-dialog.glade 7 Jan 2004 18:49:44 -0000
@@ -1,252 +1,251 @@
<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
-<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd"; >
+<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd";>
<glade-interface>
- <widget class="GtkDialog" id="dialog">
- <property name="title" translatable="yes">Open Other User's Folder</property>
- <property name="type">GTK_WINDOW_TOPLEVEL</property>
- <property name="modal">no</property>
- <property name="allow_shrink">no</property>
- <property name="allow_grow">no</property>
- <property name="width-request">350</property>
- <property name="visible">yes</property>
- <property name="window-position">GTK_WIN_POS_NONE</property>
-
- <child internal-child="vbox">
- <widget class="GtkVBox" id="dialog-vbox1">
- <property name="homogeneous">no</property>
- <property name="spacing">8</property>
- <property name="visible">yes</property>
-
- <child internal-child="action_area">
- <widget class="GtkHButtonBox" id="dialog-action_area1">
- <property name="layout_style">GTK_BUTTONBOX_END</property>
- <property name="spacing">8</property>
- <property name="visible">yes</property>
-
- <child>
- <widget class="GtkButton" id="button3">
- <property name="can_default">yes</property>
- <property name="can_focus">yes</property>
- <property name="visible">yes</property>
- <property name="label">gtk-cancel</property>
- <property name="use_stock">yes</property>
- <property name="use_underline">yes</property>
- <property name="response_id">-6</property>
- </widget>
- </child>
-
- <child>
- <widget class="GtkButton" id="button1">
- <property name="can_default">yes</property>
- <property name="has_default">yes</property>
- <property name="can_focus">yes</property>
- <property name="visible">yes</property>
- <property name="label">gtk-ok</property>
- <property name="use_stock">yes</property>
- <property name="use_underline">yes</property>
- <property name="response_id">-5</property>
- </widget>
- </child>
-
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">no</property>
- <property name="fill">yes</property>
- <property name="pack_type">GTK_PACK_END</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkTable" id="table1">
- <property name="homogeneous">no</property>
- <property name="row_spacing">3</property>
- <property name="column_spacing">3</property>
- <property name="n-rows">3</property>
- <property name="n-columns">2</property>
- <property name="visible">yes</property>
-
- <child>
- <widget class="GtkLabel" id="label1">
- <property name="label" translatable="yes">_Account:</property>
- <property name="justify">GTK_JUSTIFY_CENTER</property>
- <property name="wrap">no</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">server-option-menu</property>
- <property name="visible">yes</property>
- <property name="use_underline">yes</property>
- </widget>
- <packing>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
- <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
- <property name="x_padding">0</property>
- <property name="y_padding">0</property>
- <property name="x_options">fill</property>
- <property name="y_options"></property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label3">
- <property name="label" translatable="yes">_Folder Name:</property>
- <property name="justify">GTK_JUSTIFY_CENTER</property>
- <property name="wrap">no</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">folder-name-entry</property>
- <property name="visible">yes</property>
- <property name="use_underline">yes</property>
- </widget>
- <packing>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_padding">0</property>
- <property name="y_padding">0</property>
- <property name="x_options">fill</property>
- <property name="y_options"></property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkOptionMenu" id="server-option-menu">
- <property name="can_focus">yes</property>
- <property name="history">0</property>
- <property name="visible">yes</property>
-
- <child internal-child="menu">
- <widget class="GtkMenu" id="convertwidget1">
- <property name="visible">yes</property>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
- <property name="x_padding">0</property>
- <property name="y_padding">0</property>
- <property name="x_options">fill</property>
- <property name="y_options"></property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkCombo" id="folder-name-combo">
- <property name="value_in_list">no</property>
- <property name="case_sensitive">no</property>
- <property name="enable_arrow_keys">yes</property>
- <property name="enable_arrows_always">no</property>
- <property name="allow_empty">yes</property>
- <property name="visible">yes</property>
-
- <child internal-child="entry">
- <widget class="GtkEntry" id="folder-name-entry">
- <property name="can_focus">yes</property>
- <property name="editable">yes</property>
- <property name="text" translatable="yes"></property>
- <property name="max-length">0</property>
- <property name="visibility">yes</property>
- <property name="visible">yes</property>
- </widget>
- </child>
-
- <child internal-child="list">
- <widget class="GtkList" id="convertwidget2">
- <property name="visible">yes</property>
-
- <child>
- <widget class="GtkListItem" id="convertwidget3">
- <property name="visible">yes</property>
-
- <child>
- <widget class="GtkLabel" id="convertwidget4">
- <property name="label" translatable="yes"></property>
- <property name="xalign">0.0</property>
- <property name="visible">yes</property>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_padding">0</property>
- <property name="y_padding">0</property>
- <property name="x_options">expand|fill</property>
- <property name="y_options"></property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkHBox" id="user-picker-placeholder">
- <property name="homogeneous">no</property>
- <property name="spacing">0</property>
- <property name="visible">yes</property>
-
- <child>
- <placeholder />
- </child>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_padding">0</property>
- <property name="y_padding">0</property>
- <property name="x_options">fill</property>
- <property name="y_options"></property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkButton" id="button-user">
- <property name="can_focus">yes</property>
- <property name="label" translatable="yes">_User:</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="visible">yes</property>
- <property name="use_underline">yes</property>
- </widget>
- <packing>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_padding">0</property>
- <property name="y_padding">0</property>
- <property name="x_options">fill</property>
- <property name="y_options"></property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">2</property>
- <property name="expand">yes</property>
- <property name="fill">yes</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">4</property>
- <property name="expand">yes</property>
- <property name="fill">yes</property>
- </packing>
- </child>
- </widget>
+<requires lib="gnome"/>
+
+<widget class="GtkDialog" id="dialog">
+ <property name="visible">True</property>
+ <property name="title" translatable="yes">Open Other User's Folder</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="has_separator">False</property>
+
+ <child internal-child="vbox">
+ <widget class="GtkVBox" id="dialog-vbox1">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">8</property>
+
+ <child internal-child="action_area">
+ <widget class="GtkHButtonBox" id="dialog-action_area1">
+ <property name="visible">True</property>
+ <property name="layout_style">GTK_BUTTONBOX_END</property>
+
+ <child>
+ <widget class="GtkButton" id="button3">
+ <property name="visible">True</property>
+ <property name="can_default">True</property>
+ <property name="can_focus">True</property>
+ <property name="label">gtk-cancel</property>
+ <property name="use_stock">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="response_id">-6</property>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkButton" id="button1">
+ <property name="visible">True</property>
+ <property name="can_default">True</property>
+ <property name="has_default">True</property>
+ <property name="can_focus">True</property>
+ <property name="label">gtk-ok</property>
+ <property name="use_stock">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="response_id">-5</property>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="pack_type">GTK_PACK_END</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkTable" id="table1">
+ <property name="visible">True</property>
+ <property name="n_rows">3</property>
+ <property name="n_columns">2</property>
+ <property name="homogeneous">False</property>
+ <property name="row_spacing">3</property>
+ <property name="column_spacing">3</property>
+
+ <child>
+ <widget class="GtkLabel" id="label1">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">_Account:</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">server-option-menu</property>
+ </widget>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="right_attach">1</property>
+ <property name="top_attach">0</property>
+ <property name="bottom_attach">1</property>
+ <property name="x_options">fill</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="label3">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">_Folder Name:</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">folder-name-entry</property>
+ </widget>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="right_attach">1</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="x_options">fill</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkOptionMenu" id="server-option-menu">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="history">-1</property>
+
+ <child internal-child="menu">
+ <widget class="GtkMenu" id="convertwidget1">
+ <property name="visible">True</property>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">0</property>
+ <property name="bottom_attach">1</property>
+ <property name="x_options">fill</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkCombo" id="folder-name-combo">
+ <property name="visible">True</property>
+ <property name="value_in_list">False</property>
+ <property name="allow_empty">True</property>
+ <property name="case_sensitive">False</property>
+ <property name="enable_arrow_keys">True</property>
+ <property name="enable_arrows_always">False</property>
+
+ <child internal-child="entry">
+ <widget class="GtkEntry" id="folder-name-entry">
+ <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" translatable="yes">*</property>
+ <property name="activates_default">False</property>
+ </widget>
+ </child>
+
+ <child internal-child="list">
+ <widget class="GtkList" id="convertwidget2">
+ <property name="visible">True</property>
+ <property name="selection_mode">GTK_SELECTION_BROWSE</property>
+
+ <child>
+ <widget class="GtkListItem" id="convertwidget3">
+ <property name="visible">True</property>
+
+ <child>
+ <widget class="GtkLabel" id="convertwidget4">
+ <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</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkHBox" id="user-picker-placeholder">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">0</property>
+
+ <child>
+ <placeholder/>
+ </child>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">fill</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkButton" id="button-user">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">_User:</property>
+ <property name="use_underline">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ </widget>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="right_attach">1</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">fill</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">2</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+</widget>
+
</glade-interface>
Index: shell/importer/intelligent.c
===================================================================
RCS file: /cvs/gnome/evolution/shell/importer/intelligent.c,v
retrieving revision 1.18
diff -u -r1.18 intelligent.c
--- shell/importer/intelligent.c 22 Oct 2003 19:16:47 -0000 1.18
+++ shell/importer/intelligent.c 7 Jan 2004 18:49:45 -0000
@@ -186,6 +186,7 @@
d = g_new (IntelligentImporterDialog, 1);
d->dialog = dialog = gtk_dialog_new();
+ gtk_dialog_set_has_separator ((GtkDialog *) dialog, FALSE);
gtk_window_set_title((GtkWindow *)dialog, _("Importers"));
dummy = gtk_button_new_from_stock(GTK_STOCK_CONVERT);
gtk_button_set_label((GtkButton *)dummy, _("Import"));
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
