From a47eb7a9a182c9d124fa8c98c852b0bdcfa245f4 Mon Sep 17 00:00:00 2001 From: Ettore Perazzoli Date: Fri, 15 Nov 2002 22:13:52 +0000 Subject: Added rule to generate GNOME_Evolution_Addressbook.server.in from * gui/component/Makefile.am: Added rule to generate GNOME_Evolution_Addressbook.server.in from GNOME_Evolution_Addressbook.server.in.in, substituting @LIBEXECDIR@. * GNOME_Evolution_Addressbook.server.in.in: Renamed from GNOME_Evolution_Addressbook.server.in. Added @LIBEXECDIR@ before the location of the executable. * gui/component/select-names/select-names.glade: Ported to Glade 2. * gui/component/select-names/recipient.glade: Ported to Glade 2. svn path=/trunk/; revision=18794 --- .../GNOME_Evolution_Addressbook.server.in | 177 ----- .../GNOME_Evolution_Addressbook.server.in.in | 177 +++++ addressbook/gui/component/Makefile.am | 14 +- addressbook/gui/component/addressbook-component.c | 4 +- .../gui/component/select-names/recipient.glade | 94 +-- .../gui/component/select-names/select-names.glade | 833 ++++++++++----------- 6 files changed, 621 insertions(+), 678 deletions(-) delete mode 100644 addressbook/gui/component/GNOME_Evolution_Addressbook.server.in create mode 100644 addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in (limited to 'addressbook/gui/component') diff --git a/addressbook/gui/component/GNOME_Evolution_Addressbook.server.in b/addressbook/gui/component/GNOME_Evolution_Addressbook.server.in deleted file mode 100644 index 294db83fe9..0000000000 --- a/addressbook/gui/component/GNOME_Evolution_Addressbook.server.in +++ /dev/null @@ -1,177 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in b/addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in new file mode 100644 index 0000000000..a859f22c9e --- /dev/null +++ b/addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in @@ -0,0 +1,177 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/addressbook/gui/component/Makefile.am b/addressbook/gui/component/Makefile.am index c3be7a7f81..2dc9972641 100644 --- a/addressbook/gui/component/Makefile.am +++ b/addressbook/gui/component/Makefile.am @@ -27,7 +27,7 @@ INCLUDES = \ $(LDAP_CFLAGS) \ $(EVOLUTION_ADDRESSBOOK_CFLAGS) -bin_PROGRAMS = \ +libexec_PROGRAMS = \ evolution-addressbook evolution_addressbook_SOURCES = \ @@ -68,11 +68,13 @@ evolution_addressbook_LDADD = \ # not done yet: # $(top_builddir)/filter/libfilter.la -@INTLTOOL_SERVER_RULE@ +server_in_files = GNOME_Evolution_Addressbook.server.in.in -serversdir = $(libdir)/bonobo/servers -server_in_files = GNOME_Evolution_Addressbook.server.in -servers_DATA = $(server_in_files:.server.in=.server) +serverdir = $(libdir)/bonobo/servers +server_DATA = $(server_in_files:.server.in.in=.server) +$(server_in_files:.server.in.in=.server.in): $(server_in_files) + sed -e "s|\@LIBEXECDIR\@|$(libexecdir)|" $< > $@ +@INTLTOOL_SERVER_RULE@ gladedir = $(datadir)/evolution/glade glade_DATA = ldap-config.glade @@ -84,7 +86,7 @@ etspec_DATA = addressbook-config.etspec EXTRA_DIST = \ $(glade_DATA) \ - $(servers_DATA) \ + $(server_DATA) \ $(server_in_files) \ $(etspec_DATA) diff --git a/addressbook/gui/component/addressbook-component.c b/addressbook/gui/component/addressbook-component.c index 044f613580..5773b5ba94 100644 --- a/addressbook/gui/component/addressbook-component.c +++ b/addressbook/gui/component/addressbook-component.c @@ -378,7 +378,7 @@ owner_set_cb (EvolutionShellComponent *shell_component, } static gboolean -gtk_main_quit_cb (gpointer closure) +bonobo_main_quit_cb (gpointer closure) { bonobo_main_quit (); return TRUE; @@ -391,7 +391,7 @@ owner_unset_cb (EvolutionShellComponent *shell_component, { owner_count --; if (owner_count == 0) { - g_idle_add (gtk_main_quit_cb, NULL); + g_idle_add (bonobo_main_quit_cb, NULL); } } diff --git a/addressbook/gui/component/select-names/recipient.glade b/addressbook/gui/component/select-names/recipient.glade index b60972d094..edcf6bbab0 100644 --- a/addressbook/gui/component/select-names/recipient.glade +++ b/addressbook/gui/component/select-names/recipient.glade @@ -1,61 +1,45 @@ - - + + - - Recipient - recipient - - src - pixmaps - C - True - True - True - False - False - False - True - + + + no + window1 + GTK_WINDOW_TOPLEVEL + no + no + yes + GTK_WIN_POS_NONE - - GtkWindow - window1 - False - window1 - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - False - True - False + + + no + 4 + yes - - GtkHBox - hbox-top - False - 4 + + + 1.08033e-07 + 0 + 1 + 0 + yes - - GtkAlignment - alignment1 - 1.08033e-07 - 0 - 1 - 0 - - 0 - False - True - - - - GtkButton - text-button - True - + + + yes + -> + yes + + + + + 0 + no + yes + + - + - - - + diff --git a/addressbook/gui/component/select-names/select-names.glade b/addressbook/gui/component/select-names/select-names.glade index e46d745b67..112a3d52b9 100644 --- a/addressbook/gui/component/select-names/select-names.glade +++ b/addressbook/gui/component/select-names/select-names.glade @@ -1,465 +1,422 @@ - - + + - - Select-names - select-names - - src - ../../../../art/ - C - True - True - False - False - False - + + + no + Select Names + GTK_WINDOW_TOPLEVEL + no + 417 + 332 + no + yes + GTK_WIN_POS_NONE - - GnomeDialog - dialog-top - False - Select Names - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - 417 - 332 - False - True - False - False - False + + + 3 + no + 3 + yes - - GtkVBox - GnomeDialog:vbox - dialog-vbox1 - 3 - False - 3 - - 4 - True - True - + + + GTK_BUTTONBOX_END + 8 + yes - - GtkHButtonBox - GnomeDialog:action_area - dialog-action_area1 - GTK_BUTTONBOX_END - 8 - 85 - 27 - 7 - 0 - - 0 - False - True - GTK_PACK_END - + + + yes + yes + yes + yes + gtk-ok + yes + yes + + - - GtkButton - button4 - True - True - True - GNOME_STOCK_BUTTON_OK - + + + yes + yes + gtk-cancel + yes + yes + + + + + 0 + no + yes + GTK_PACK_END + + - - GtkButton - button5 - True - GNOME_STOCK_BUTTON_CANCEL - - + + + no + 3 + 3 + 3 + 1 + yes - - GtkTable - table-top - 3 - 1 - False - 3 - 3 - - 0 - True - True - + + + yes + + + 0 + 1 + 1 + 2 + 0 + 0 + + + + - - GtkHSeparator - hseparator1 - - 0 - 1 - 1 - 2 - 0 - 0 - False - False - False - False - False - False - - + + + Show Contacts + 0 + GTK_SHADOW_ETCHED_IN + yes - - GtkFrame - frame1 - - 0 - GTK_SHADOW_ETCHED_IN - - 0 - 1 - 0 - 1 - 0 - 0 - True - False - False - False - True - False - + + + 3 + no + 3 + 3 + 2 + 2 + yes - - GtkTable - table5 - 3 - 2 - 2 - False - 3 - 3 + + + _Folder: + GTK_JUSTIFY_CENTER + no + 0 + 0.5 + 0 + 0 + yes + yes + + + 0 + 1 + 0 + 1 + 0 + 0 + fill + + + - - GtkLabel - label30 - - GTK_JUSTIFY_CENTER - False - 0 - 0.5 - 0 - 0 - - 0 - 1 - 0 - 1 - 0 - 0 - False - False - False - False - True - False - - + + + _Category: + GTK_JUSTIFY_CENTER + no + 0 + 0.5 + 0 + 0 + yes + yes + + + 0 + 1 + 1 + 2 + 0 + 0 + fill + + + - - GtkLabel - label31 - - GTK_JUSTIFY_CENTER - False - 0 - 0.5 - 0 - 0 - - 0 - 1 - 1 - 2 - 0 - 0 - False - False - False - False - True - False - - + + + 7.45058e-09 + 0.5 + 0 + 1 + yes - - GtkAlignment - alignment5 - 7.45058e-09 - 0.5 - 0 - 1 - - 1 - 2 - 1 - 2 - 0 - 0 - True - False - False - False - True - True - + + + e_select_names_create_categories + 0 + 0 + Tue, 19 Feb 2002 23:06:24 GMT + yes + + + + + 1 + 2 + 1 + 2 + 0 + 0 + expand|fill + fill + + - - Custom - custom-categories - e_select_names_create_categories - 0 - 0 - Tue, 19 Feb 2002 23:06:24 GMT - - + + + e_addressbook_create_folder_selector + 0 + 0 + Mon, 15 Jul 2002 02:21:32 GMT + yes + + + 1 + 2 + 0 + 1 + 0 + 0 + fill + fill + + + + + + + 0 + 1 + 0 + 1 + 0 + 0 + expand|fill + + + - - Custom - folder-selector - e_addressbook_create_folder_selector - 0 - 0 - Mon, 15 Jul 2002 02:21:32 GMT - - 1 - 2 - 0 - 1 - 0 - 0 - False - False - False - False - True - True - - - - + + + no + 0 + yes - - GtkVBox - vbox5 - False - 0 - - 0 - 1 - 1 - 2 - 0 - 0 - False - True - False - False - True - True - + + + no + 3 + 3 + 2 + 2 + yes - - GtkTable - table4 - 2 - 2 - False - 3 - 3 - - 0 - True - True - + + + Type a name into the entry, or +select one from the list below: + GTK_JUSTIFY_LEFT + no + 0 + 0.5 + 0 + 0 + yes + + + 0 + 1 + 0 + 1 + 0 + 0 + fill + + + - - GtkLabel - label32 - - GTK_JUSTIFY_LEFT - False - 0 - 0.5 - 0 - 0 - - 0 - 1 - 0 - 1 - 0 - 0 - False - False - False - False - True - False - - + + + no + 3 + 3 + 5 + 2 + yes - - GtkTable - table-recipients - 5 - 2 - False - 3 - 3 - - 1 - 2 - 1 - 2 - 0 - 0 - True - True - False - False - True - True - + + + Selected Contacts: + GTK_JUSTIFY_CENTER + yes + 0.5 + 0.5 + 0 + 0 + yes + + + 1 + 2 + 0 + 1 + 0 + 0 + fill + + + + + + 1 + 2 + 1 + 2 + 0 + 0 + expand|fill + expand|fill + + - - GtkLabel - label20 - - GTK_JUSTIFY_CENTER - True - 0.5 - 0.5 - 0 - 0 - - 1 - 2 - 0 - 1 - 0 - 0 - False - False - False - False - True - False - - - + + + 7.45058e-09 + 0.5 + 1 + 1 + yes - - GtkAlignment - alignment4 - 7.45058e-09 - 0.5 - 1 - 1 - - 0 - 1 - 1 - 2 - 0 - 0 - True - True - False - False - True - True - + + + 3 + no + 3 + yes - - GtkVBox - vbox6 - 3 - False - 3 + + + yes + yes + + 0 + yes + yes + + + 0 + no + no + + - - GtkEntry - entry-select - True - True - True - 0 - - - 0 - False - False - - + + + 0.5 + 0.5 + 1 + 1 + yes - - GtkAlignment - alignment3 - 0.5 - 0.5 - 1 - 1 - - 0 - True - True - + + + e_addressbook_create_ebook_table + 0 + 0 + Sat, 10 Jun 2000 22:02:57 GMT + yes + + + + + 0 + yes + yes + + + + + + + 0 + 1 + 1 + 2 + 0 + 0 + expand|fill + expand|fill + + + + + 0 + yes + yes + + + + + 0 + 1 + 1 + 2 + 0 + 0 + fill + expand|fill + + - - Custom - table-source - e_addressbook_create_ebook_table - 0 - 0 - Sat, 10 Jun 2000 22:02:57 GMT - - - - - + + + + GTK_JUSTIFY_LEFT + no + 0 + 0.5 + 0 + 3 + yes + + + 0 + 1 + 2 + 3 + 0 + 0 + fill + + + + + + 0 + yes + yes + + - - - GtkLabel - status-message - - GTK_JUSTIFY_LEFT - False - 0 - 0.5 - 0 - 3 - - 0 - 1 - 2 - 3 - 0 - 0 - False - False - False - False - True - False - - - + + 4 + yes + yes + + - - - + -- cgit