[evolution-patches] Shell HIG Work
- From: Rodney Dawes <dobey ximian com>
- To: evolution-patches ximian com
- Subject: [evolution-patches] Shell HIG Work
- Date: Tue, 30 Mar 2004 16:48:29 -0500
Here is an updated patch for the shell to be more HIG-compliant, based
on the original patch sent in by William Jon McCann. Also attached is
a list of files that were no longer being used in either the Makefile.am
or in any of the code, as is the case with the removed glade files. Some
of the removed files will need removal from po/POTFILES.in as well, but
those changes are not included in this patch.
-- dobey
R e-shell-config-autocompletion.c
R e-shell-config-autocompletion.h
R e-shell-config-default-folders.c
R e-shell-config-default-folders.h
R e-shell-config-folder-settings.c
R e-shell-config-folder-settings.h
R e-shell-config-offline.c
R e-shell-config-offline.h
R e-shell-config.c
R e-shell-config.h
R e-shell-folder-creation-dialog.c
R e-shell-folder-creation-dialog.h
R e-shell-shared-folder-picker-dialog.c
R e-shell-shared-folder-picker-dialog.h
R e-splash.c
R e-splash.h
R e-storage-set-store.c
R e-storage-set-store.h
R e-uri-schema-registry.c
R e-uri-schema-registry.h
R evolution-activity-client.c
R evolution-storage-set-view-factory.c
R evolution-storage-set-view-factory.h
R evolution-storage-set-view.c
R evolution-storage-set-view.h
R glade/e-folder-list.glade
R glade/e-shell-config-default-folders.glade
R glade/e-shell-folder-creation-dialog.glade
R glade/e-shell-shared-folder-picker-dialog.glade
Index: Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution/shell/Makefile.am,v
retrieving revision 1.192
diff -u -r1.192 Makefile.am
--- Makefile.am 4 Feb 2004 21:08:30 -0000 1.192
+++ Makefile.am 30 Mar 2004 21:40:35 -0000
@@ -199,8 +199,6 @@
@EVO_SERVER_RULE@
@INTLTOOL_SERVER_RULE@
-etspec_DATA = e-storage-set-view.etspec
-
icons = \
check-empty.xpm \
check-filled.xpm \
@@ -253,7 +251,6 @@
$(IDLS) \
$(server_in_files) \
GNOME_Evolution_Test.server.in.in \
- $(etspec_DATA) \
$(schema_DATA) \
$(icons) \
ChangeLog.pre-1-4 \
Index: e-shell-importer.c
===================================================================
RCS file: /cvs/gnome/evolution/shell/e-shell-importer.c,v
retrieving revision 1.64
diff -u -r1.64 e-shell-importer.c
--- e-shell-importer.c 7 Feb 2004 01:25:21 -0000 1.64
+++ e-shell-importer.c 30 Mar 2004 21:40:35 -0000
@@ -333,6 +333,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);
@@ -456,6 +457,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);
@@ -717,6 +719,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: e-shell-offline-handler.c
===================================================================
RCS file: /cvs/gnome/evolution/shell/e-shell-offline-handler.c,v
retrieving revision 1.36
diff -u -r1.36 e-shell-offline-handler.c
--- e-shell-offline-handler.c 18 Feb 2004 01:36:57 -0000 1.36
+++ e-shell-offline-handler.c 30 Mar 2004 21:40:36 -0000
@@ -656,6 +656,8 @@
}
dialog = glade_xml_get_widget (priv->dialog_gui, "active_connection_dialog");
+ gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), 0);
+ gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (dialog)->action_area), 12);
/* FIXME: do we really want this? */
/* gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (priv->parent_shell_view)); */
Index: e-shell-settings-dialog.c
===================================================================
RCS file: /cvs/gnome/evolution/shell/e-shell-settings-dialog.c,v
retrieving revision 1.28
diff -u -r1.28 e-shell-settings-dialog.c
--- e-shell-settings-dialog.c 26 Mar 2004 17:12:00 -0000 1.28
+++ e-shell-settings-dialog.c 30 Mar 2004 21:40:36 -0000
@@ -325,6 +325,7 @@
set_dialog_size (dialog);
gtk_window_set_title (GTK_WINDOW (dialog), _("Evolution Settings"));
+ gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
}
Index: e-shell-startup-wizard.c
===================================================================
RCS file: /cvs/gnome/evolution/shell/e-shell-startup-wizard.c,v
retrieving revision 1.48
diff -u -r1.48 e-shell-startup-wizard.c
--- e-shell-startup-wizard.c 10 Mar 2004 16:07:25 -0000 1.48
+++ e-shell-startup-wizard.c 30 Mar 2004 21:40:36 -0000
@@ -564,6 +564,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"));
@@ -785,20 +786,22 @@
"you have entered will be forgotten. You will need to run this assistant again "
"before using Evolution.\n\nDo you want to quit using the Assistant now?");
- confirm_dialog = gtk_message_dialog_new (data->dialog,
+ confirm_dialog = gtk_message_dialog_new (GTK_WINDOW (data->dialog),
GTK_DIALOG_MODAL,
GTK_MESSAGE_WARNING,
GTK_BUTTONS_NONE,
confirmations);
- gtk_dialog_add_button (confirm_dialog, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
- gtk_dialog_add_button (confirm_dialog, GTK_STOCK_QUIT, GTK_RESPONSE_OK);
+ gtk_dialog_add_button (GTK_DIALOG (confirm_dialog), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
+ gtk_dialog_add_button (GTK_DIALOG (confirm_dialog), GTK_STOCK_QUIT, 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);
if (returnvalue == GTK_RESPONSE_OK) {
- startup_wizard_cancel (data->druid, data);
+ startup_wizard_cancel ((GnomeDruid *)data->druid, data);
return TRUE;
}
}
Index: main.c
===================================================================
RCS file: /cvs/gnome/evolution/shell/main.c,v
retrieving revision 1.147
diff -u -r1.147 main.c
--- main.c 4 Feb 2004 10:55:25 -0000 1.147
+++ main.c 30 Mar 2004 21:40:36 -0000
@@ -192,6 +192,7 @@
static void
show_development_warning (GtkWindow *parent)
{
+ GtkWidget *vbox;
GtkWidget *label;
GtkWidget *warning_dialog;
GtkWidget *dont_bother_me_again_checkbox;
@@ -208,9 +209,22 @@
g_object_unref (client);
- 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);
+ warning_dialog = gtk_dialog_new ();
+ gtk_window_set_title (GTK_WINDOW (warning_dialog), "Ximian Evolution " VERSION);
+ gtk_window_set_modal (GTK_WINDOW (warning_dialog), TRUE);
+ gtk_dialog_add_button (GTK_DIALOG (warning_dialog), GTK_STOCK_OK, GTK_RESPONSE_OK);
+ e_dialog_set_transient_for (GTK_WINDOW (warning_dialog), GTK_WIDGET (parent));
+
+ gtk_dialog_set_has_separator (GTK_DIALOG (warning_dialog), FALSE);
+
+ gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (warning_dialog)->vbox), 0);
+ gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (warning_dialog)->action_area), 12);
+
+ vbox = gtk_vbox_new (FALSE, 12);
+ gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
+ gtk_box_pack_start (GTK_BOX (GTK_DIALOG (warning_dialog)->vbox), vbox,
+ TRUE, TRUE, 0);
+
text = g_strdup_printf(
/* xgettext:no-c-format */
/* Preview/Alpha/Beta version warning message */
@@ -234,26 +248,23 @@
g_free(text);
gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
+ gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0);
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (warning_dialog)->vbox),
- label, TRUE, TRUE, 4);
+ gtk_box_pack_start (GTK_BOX (vbox), label, TRUE, TRUE, 0);
label = gtk_label_new (_("Thanks\n"
"The Ximian Evolution Team\n"));
gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_RIGHT);
gtk_misc_set_alignment(GTK_MISC(label), 1, .5);
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (warning_dialog)->vbox),
- label, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), label, TRUE, TRUE, 0);
dont_bother_me_again_checkbox = gtk_check_button_new_with_label (_("Don't tell me again"));
- /* GTK sucks. (Just so you know.) */
alignment = gtk_alignment_new (0.0, 0.0, 0.0, 0.0);
gtk_container_add (GTK_CONTAINER (alignment), dont_bother_me_again_checkbox);
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (warning_dialog)->vbox),
- alignment, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), alignment, TRUE, TRUE, 0);
gtk_widget_show_all (warning_dialog);
Index: glade/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution/shell/glade/Makefile.am,v
retrieving revision 1.9
diff -u -r1.9 Makefile.am
--- glade/Makefile.am 5 Feb 2003 22:25:17 -0000 1.9
+++ glade/Makefile.am 30 Mar 2004 21:40:36 -0000
@@ -1,9 +1,5 @@
glade_DATA = \
e-active-connection-dialog.glade \
- e-shell-config-default-folders.glade \
- e-shell-folder-creation-dialog.glade \
- e-shell-shared-folder-picker-dialog.glade \
- evolution-startup-wizard.glade \
- e-folder-list.glade
+ evolution-startup-wizard.glade
EXTRA_DIST = $(glade_DATA)
Index: 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
--- glade/e-active-connection-dialog.glade 21 Apr 2003 19:13:35 -0000 1.8
+++ glade/e-active-connection-dialog.glade 30 Mar 2004 21:40:36 -0000
@@ -4,21 +4,22 @@
<glade-interface>
<widget class="GtkDialog" id="active_connection_dialog">
- <property name="border_width">6</property>
<property name="visible">True</property>
<property name="title" translatable="yes">Active Connections</property>
<property name="type">GTK_WINDOW_TOPLEVEL</property>
<property name="window_position">GTK_WIN_POS_NONE</property>
<property name="modal">False</property>
+ <property name="default_width">256</property>
+ <property name="default_height">192</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">
<property name="visible">True</property>
<property name="homogeneous">False</property>
- <property name="spacing">6</property>
+ <property name="spacing">0</property>
<child internal-child="action_area">
<widget class="GtkHButtonBox" id="dialog-action_area2">
@@ -41,6 +42,7 @@
<widget class="GtkButton" id="okbutton1">
<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>
@@ -58,17 +60,18 @@
</child>
<child>
- <widget class="GtkVBox" id="vbox1">
+ <widget class="GtkVBox" id="vbox2">
+ <property name="border_width">12</property>
<property name="visible">True</property>
<property name="homogeneous">False</property>
- <property name="spacing">6</property>
+ <property name="spacing">12</property>
<child>
<widget class="GtkLabel" id="label1">
<property name="visible">True</property>
- <property name="label" translatable="yes">The following connections are currently active:</property>
+ <property name="label" translatable="yes"><b>Active Connections</b></property>
<property name="use_underline">False</property>
- <property name="use_markup">False</property>
+ <property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">False</property>
<property name="selectable">False</property>
@@ -78,56 +81,102 @@
<property name="ypad">0</property>
</widget>
<packing>
- <property name="padding">10</property>
+ <property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
<child>
- <widget class="GtkScrolledWindow" id="scrolledwindow1">
+ <widget class="GtkHBox" id="hbox1">
<property name="visible">True</property>
- <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
- <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
- <property name="shadow_type">GTK_SHADOW_IN</property>
- <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">12</property>
<child>
- <widget class="GtkTreeView" id="active_connection_treeview">
+ <widget class="GtkLabel" id="label2">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="headers_visible">True</property>
- <property name="rules_hint">False</property>
- <property name="reorderable">False</property>
- <property name="enable_search">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.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="GtkVBox" id="vbox3">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">12</property>
+
+ <child>
+ <widget class="GtkScrolledWindow" id="scrolledwindow1">
+ <property name="visible">True</property>
+ <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
+ <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="shadow_type">GTK_SHADOW_IN</property>
+ <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+
+ <child>
+ <widget class="GtkTreeView" id="active_connection_treeview">
+ <property name="visible">True</property>
+ <property name="headers_visible">True</property>
+ <property name="rules_hint">False</property>
+ <property name="reorderable">False</property>
+ <property name="enable_search">True</property>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="instruction_label">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Click OK to close these connections and go offline</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</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>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</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="GtkLabel" id="instruction_label">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Click OK to close these connections and go offline</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">10</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
</packing>
</child>
</widget>
Index: importer/intelligent.c
===================================================================
RCS file: /cvs/gnome/evolution/shell/importer/intelligent.c,v
retrieving revision 1.19
diff -u -r1.19 intelligent.c
--- importer/intelligent.c 7 Feb 2004 01:20:15 -0000 1.19
+++ importer/intelligent.c 30 Mar 2004 21:40:36 -0000
@@ -186,6 +186,10 @@
d = g_new (IntelligentImporterDialog, 1);
d->dialog = dialog = gtk_dialog_new();
+ gtk_dialog_set_has_separator ((GtkDialog *) dialog, FALSE);
+ gtk_container_set_border_width ((GtkContainer *) ((GtkDialog *)dialog)->vbox, 0);
+ gtk_container_set_border_width ((GtkContainer *) ((GtkDialog *)dialog)->action_area, 12);
+
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]
