diff options
| author | Nikos Kouremenos <kourem@gmail.com> | 2005-04-17 22:36:09 +0400 |
|---|---|---|
| committer | Nikos Kouremenos <kourem@gmail.com> | 2005-04-17 22:36:09 +0400 |
| commit | 3b9b46b6e8a20e9170e7259f0c1ddcbb09431e4f (patch) | |
| tree | 0d787693edeadb56d28eaf9e0bd4054d0dd16455 | |
| parent | e3b478e1706c0fe0369ae12130257f1c109a3c8a (diff) | |
when windows already exist present() them. cancel button and not close in account_modification_window
| -rw-r--r-- | data/emoticons/lamp.png | bin | 768 -> 629 bytes | |||
| -rw-r--r-- | src/config.py | 3 | ||||
| -rw-r--r-- | src/gtkgui.glade | 6 | ||||
| -rw-r--r-- | src/roster_window.py | 8 |
4 files changed, 9 insertions, 8 deletions
diff --git a/data/emoticons/lamp.png b/data/emoticons/lamp.png Binary files differindex f1b63364c..3048d0a3a 100644 --- a/data/emoticons/lamp.png +++ b/data/emoticons/lamp.png diff --git a/src/config.py b/src/config.py index 2aa3b137d..8a0790f9f 100644 --- a/src/config.py +++ b/src/config.py @@ -897,8 +897,7 @@ class Account_modification_window: """close window""" del self.plugin.windows['account_modification'] - def on_close_button_clicked(self, widget): - """When Close button is clicked""" + def on_cancel_button_clicked(self, widget): self.window.destroy() def on_checkbutton_toggled(self, widget, widgets): diff --git a/src/gtkgui.glade b/src/gtkgui.glade index cb92d747b..98a8ee4f6 100644 --- a/src/gtkgui.glade +++ b/src/gtkgui.glade @@ -1585,15 +1585,15 @@ <property name="spacing">10</property> <child> - <widget class="GtkButton" id="close_button"> + <widget class="GtkButton" id="cancel_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="label">gtk-cancel</property> <property name="use_stock">True</property> <property name="relief">GTK_RELIEF_NORMAL</property> <property name="focus_on_click">True</property> - <signal name="clicked" handler="on_close_button_clicked" last_modification_time="Mon, 28 Feb 2005 20:32:02 GMT"/> + <signal name="clicked" handler="on_cancel_button_clicked" last_modification_time="Sun, 17 Apr 2005 18:17:10 GMT"/> </widget> </child> diff --git a/src/roster_window.py b/src/roster_window.py index 7f6ecbde5..b334499a2 100644 --- a/src/roster_window.py +++ b/src/roster_window.py @@ -530,7 +530,9 @@ class Roster_window: menu.reposition() def on_edit_account(self, widget, account): - if not self.plugin.windows.has_key('account_modification_window'): + if self.plugin.windows.has_key('account_modification_window'): + self.plugin.windows['account_modification'].window.present() + else: self.plugin.windows['account_modification'] = \ config.Account_modification_window(self.plugin, account) @@ -932,7 +934,7 @@ class Roster_window: def on_accounts_menuitem_activate(self, widget): if self.plugin.windows.has_key('accounts'): - self.plugin.windows['accounts'].present() + self.plugin.windows['accounts'].window.present() else: self.plugin.windows['accounts'] = config.Accounts_window(self.plugin) @@ -1100,7 +1102,7 @@ class Roster_window: """When Service Discovery is selected: Call browse class""" if self.plugin.windows[account].has_key('disco'): - self.plugin.windows[account]['disco'].present() + self.plugin.windows[account]['disco'].window.present() else: self.plugin.windows[account]['disco'] = \ config.Service_discovery_window(self.plugin, account) |
