From ccc2b44cb885f8ecde92b091777439cbee44f8c7 Mon Sep 17 00:00:00 2001 From: Nikos Kouremenos Date: Mon, 28 Feb 2005 12:47:23 +0000 Subject: [PATCH] mostly glade/gui stuff --- gajim.py | 9 +- plugins/gtkgui/gtkgui.glade | 646 ++++++++++++++++++------------------ plugins/gtkgui/gtkgui.py | 2 +- 3 files changed, 331 insertions(+), 326 deletions(-) diff --git a/gajim.py b/gajim.py index 60ba16aab..2f2fb93bf 100755 --- a/gajim.py +++ b/gajim.py @@ -27,7 +27,9 @@ from common import i18n i18n.init() _ = i18n._ -import getopt, sys +import getopt +import sys +import signal def usage(): print "usage :", sys.argv[0], ' [OPTION]' @@ -48,5 +50,10 @@ for o, a in opts: usage() sys.exit() + +# FIXME: not sure where to put that. maybe here? +# ^C exits the application +signal.signal(signal.SIGINT, signal.SIG_DFL) + Core.core.start(mode) print _("Core Stopped") diff --git a/plugins/gtkgui/gtkgui.glade b/plugins/gtkgui/gtkgui.glade index 5731f5a94..7e4fa28be 100644 --- a/plugins/gtkgui/gtkgui.glade +++ b/plugins/gtkgui/gtkgui.glade @@ -27,194 +27,221 @@ 0 - + True - GTK_SHADOW_OUT - GTK_POS_LEFT - GTK_POS_TOP - + True + _Chat + True - - True - _Menu - True + - - + + True - gtk-convert - 1 - 0.5 - 0.5 - 0 - 0 + _New Message + True + + + + + + True + gtk-new + 1 + 0.5 + 0.5 + 0 + 0 + + - + + True + _Join Groupchat + True + + + - - + + + True + + + + + + True + Add Contact + True + + + True - _Preferences - True - - - - - - True - gtk-preferences - 1 - 0.5 - 0.5 - 0 - 0 - - + gtk-add + 1 + 0.5 + 0.5 + 0 + 0 + + - - + + + True + Show Offline + True + False + + + + + + + + True + + + + + + True + _Quit + True + + + + + True - A_ccounts - True - - - - - - True - gtk-select-color - 1 - 0.5 - 0.5 - 0 - 0 - - + gtk-quit + 1 + 0.5 + 0.5 + 0 + 0 + + + + + + - - + + + True + _Edit + True + + + + + + + True + A_ccounts + True + + + + + True - _Browse agents - True - - - - - True - gtk-find - 1 - 0.5 - 0.5 - 0 - 0 - - + gtk-select-color + 1 + 0.5 + 0.5 + 0 + 0 + + - - + + + True + _Browse Agents + True + + + + True + gtk-find + 1 + 0.5 + 0.5 + 0 + 0 + + - - + + + True + _Preferences + True + + + + + True - Add - True - - - - True - gtk-add - 1 - 0.5 - 0.5 - 0 - 0 - - + gtk-preferences + 1 + 0.5 + 0.5 + 0 + 0 + + + + + + - - + + + True + _Help + True + + + + + + + True + _About + True + + + + True - Show Offline - True - False - - - - - - - - True - _Join Groupchat - True - - - - - - - True - - - - - - True - _About - True - - - - - True - gtk-help - 1 - 0.5 - 0.5 - 0 - 0 - - - - - - - - True - _Quit - True - - - - - - True - gtk-quit - 1 - 0.5 - 0.5 - 0 - 0 - - + gtk-about + 1 + 0.5 + 0.5 + 0 + 0 @@ -227,7 +254,7 @@ 0 False - True + False @@ -509,6 +536,7 @@ 0 0 True + Click to see contact's information True Anonymous <id@server/res> True @@ -1562,7 +1590,7 @@ Yann Le Boulanger (asterix@lagaule.org) True True - Save passphrase (DANGEROUS) + Save passphrase (insecure) True GTK_RELIEF_NORMAL True @@ -1990,8 +2018,8 @@ Yann Le Boulanger (asterix@lagaule.org) True - Informations about you are stored -on the server. + Information about you are stored +on the server as a vCard False False GTK_JUSTIFY_LEFT @@ -2156,7 +2184,7 @@ on the server. 5 400 - 270 + 334 True Add user GTK_WINDOW_TOPLEVEL @@ -2180,50 +2208,29 @@ on the server. True 5 - 3 + 2 False 5 5 - + True True - True - True - 0 - - True - * - False - + Automatically authorize contact + True + GTK_RELIEF_NORMAL + True + True + False + True - 2 - 3 - 0 - 1 - - - - - - - True - True - False - True - 0 - - True - * - False - - - 2 - 3 - 2 - 3 + 1 + 2 + 4 + 5 + fill @@ -2243,8 +2250,8 @@ on the server. 0 - 1 - 2 + 0 + 1 0 1 fill @@ -2267,8 +2274,8 @@ on the server. 0 - 1 - 2 + 0 + 1 1 2 fill @@ -2291,8 +2298,8 @@ on the server. 0 - 1 - 2 + 0 + 1 2 3 fill @@ -2300,46 +2307,10 @@ on the server. - - - True - - - - - 2 - 3 - 1 - 2 - fill - fill - - - - - - True - gtk-add - 4 - 0.5 - 0.5 - 0 - 0 - - - 0 - 1 - 0 - 4 - fill - fill - - - True - Pseudo : + Nickname : False False GTK_JUSTIFY_LEFT @@ -2351,8 +2322,8 @@ on the server. 0 - 1 - 2 + 0 + 1 3 4 fill @@ -2360,6 +2331,65 @@ on the server. + + + True + True + True + True + 0 + + True + * + False + + + + 1 + 2 + 0 + 1 + + + + + + + True + + + + + 1 + 2 + 1 + 2 + fill + fill + + + + + + True + True + False + True + 0 + + True + * + False + + + 1 + 2 + 2 + 3 + + + + True @@ -2373,35 +2403,13 @@ on the server. False - 2 - 3 + 1 + 2 3 4 - - - - True - True - Automatically authorize contact - True - GTK_RELIEF_NORMAL - True - True - False - True - - - 1 - 3 - 4 - 5 - fill - - - 10 @@ -2420,57 +2428,22 @@ on the server. GTK_CORNER_TOP_LEFT - + True - GTK_SHADOW_IN - - - - True - 0 - 0.5 - GTK_SHADOW_IN - - - - True - True - True - False - True - GTK_JUSTIFY_LEFT - GTK_WRAP_WORD - True - 0 - 0 - 0 - 0 - 0 - 0 - I would like to add you to my contact list, please. - - - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - - label_item - - - - + True + True + False + True + GTK_JUSTIFY_LEFT + GTK_WRAP_WORD + True + 0 + 0 + 0 + 0 + 0 + 0 + I would like to add you to my contact list, please. @@ -2522,7 +2495,7 @@ on the server. - + True 0.5 0.5 @@ -2534,15 +2507,15 @@ on the server. 0 - + True False 2 - + True - gtk-apply + gtk-ok 4 0.5 0.5 @@ -2557,7 +2530,7 @@ on the server. - + True Subscribe True @@ -3762,9 +3735,8 @@ on the server. False - + True - True False True 0 @@ -5507,7 +5479,7 @@ on the server. True - ID + Jabber ID False False GTK_JUSTIFY_LEFT @@ -7001,10 +6973,10 @@ on the server. - + 5 True - jid + Personal Details GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE False @@ -8468,7 +8440,7 @@ on the server. 5 True - Group chat + Groupchat GTK_WINDOW_TOPLEVEL GTK_WIN_POS_NONE False @@ -9315,6 +9287,8 @@ on the server. 5 + 303 + 225 True Message GTK_WINDOW_TOPLEVEL @@ -9541,4 +9515,28 @@ on the server. + + True + window1 + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_NONE + False + True + False + True + False + False + GDK_WINDOW_TYPE_HINT_NORMAL + GDK_GRAVITY_NORTH_WEST + + + + True + abc +doremi + + + + + diff --git a/plugins/gtkgui/gtkgui.py b/plugins/gtkgui/gtkgui.py index 1558c0951..decb6c089 100644 --- a/plugins/gtkgui/gtkgui.py +++ b/plugins/gtkgui/gtkgui.py @@ -1638,7 +1638,7 @@ class roster_Window: item = gtk.MenuItem() menu.append(item) - item = gtk.MenuItem(_("Informations")) + item = gtk.MenuItem(_("Information")) menu.append(item) item.connect("activate", self.on_info, user, account) item = gtk.MenuItem(_("History"))