copyleftie
/
gajim-plural
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Cancel and close buttons merged into one.

This commit is contained in:
Tomasz Melcer 2006-11-20 22:33:08 +00:00
parent 2ca94a530a
commit 73461bdb21
2 changed files with 43 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
data/glade/adhoc_commands_window.glade
View File

@ -670,53 +670,24 @@
<property name="spacing">0</property> <property name="spacing">0</property>
<child> <child>
<widget class="GtkHBox" id="hbox2958"> <placeholder/>
<property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">0</property>
<child>
<widget class="GtkButton" id="cancel_button">
<property name="visible">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="focus_on_click">True</property>
<signal name="clicked" handler="on_cancel_button_clicked" last_modification_time="Mon, 10 Jul 2006 16:24:32 GMT"/>
</widget>
<packing>
<property name="padding">0</property>
<property name="expand">False</property>
<property name="fill">False</property>
</packing>
</child>
<child>
<placeholder/>
</child>
</widget>
<packing>
<property name="padding">3</property>
<property name="expand">True</property>
<property name="fill">True</property>
</packing>
</child> </child>
<child> <child>
<widget class="GtkButton" id="back_button"> <widget class="GtkButton" id="execute_button">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="label">gtk-go-back</property> <property name="label">gtk-execute</property>
<property name="use_stock">True</property> <property name="use_stock">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property> <property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property> <property name="focus_on_click">True</property>
<signal name="clicked" handler="on_back_button_clicked" last_modification_time="Mon, 10 Jul 2006 16:24:50 GMT"/> <signal name="clicked" handler="on_execute_button_clicked" last_modification_time="Mon, 10 Jul 2006 16:24:42 GMT"/>
</widget> </widget>
<packing> <packing>
<property name="padding">0</property> <property name="padding">3</property>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">False</property> <property name="fill">False</property>
<property name="pack_type">GTK_PACK_END</property>
</packing> </packing>
</child> </child>
@ -734,23 +705,25 @@
<property name="padding">3</property> <property name="padding">3</property>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">False</property> <property name="fill">False</property>
<property name="pack_type">GTK_PACK_END</property>
</packing> </packing>
</child> </child>
<child> <child>
<widget class="GtkButton" id="execute_button"> <widget class="GtkButton" id="back_button">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">True</property> <property name="can_focus">True</property>
<property name="label">gtk-execute</property> <property name="label">gtk-go-back</property>
<property name="use_stock">True</property> <property name="use_stock">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property> <property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property> <property name="focus_on_click">True</property>
<signal name="clicked" handler="on_execute_button_clicked" last_modification_time="Mon, 10 Jul 2006 16:24:42 GMT"/> <signal name="clicked" handler="on_back_button_clicked" last_modification_time="Mon, 10 Jul 2006 16:24:50 GMT"/>
</widget> </widget>
<packing> <packing>
<property name="padding">3</property> <property name="padding">0</property>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">False</property> <property name="fill">False</property>
<property name="pack_type">GTK_PACK_END</property>
</packing> </packing>
</child> </child>
@ -767,6 +740,7 @@
<property name="padding">3</property> <property name="padding">3</property>
<property name="expand">False</property> <property name="expand">False</property>
<property name="fill">False</property> <property name="fill">False</property>
<property name="pack_type">GTK_PACK_END</property>
</packing> </packing>
</child> </child>
</widget> </widget>

73
src/adhoc_commands.py
View File

@ -60,7 +60,7 @@ class CommandWindow:
# retrieving widgets from xml # retrieving widgets from xml
self.xml = gtkgui_helpers.get_glade('adhoc_commands_window.glade') self.xml = gtkgui_helpers.get_glade('adhoc_commands_window.glade')
self.window = self.xml.get_widget('adhoc_commands_window') self.window = self.xml.get_widget('adhoc_commands_window')
for name in ('cancel_button', 'back_button', 'forward_button', for name in ('back_button', 'forward_button',
'execute_button','close_button','stages_notebook', 'execute_button','close_button','stages_notebook',
'retrieving_commands_stage_vbox', 'retrieving_commands_stage_vbox',
'command_list_stage_vbox','command_list_vbox', 'command_list_stage_vbox','command_list_vbox',
@ -75,7 +75,6 @@ class CommandWindow:
self.sending_form_stage_vbox.pack_start(self.data_form_widget) self.sending_form_stage_vbox.pack_start(self.data_form_widget)
# setting initial stage # setting initial stage
self.close_button.set_no_show_all(True)
self.stage1() self.stage1()
# displaying the window # displaying the window
@ -84,7 +83,6 @@ class CommandWindow:
# these functions are set up by appropriate stageX methods # these functions are set up by appropriate stageX methods
def stage_finish(self, *anything): pass def stage_finish(self, *anything): pass
def stage_cancel_button_clicked(self, *anything): assert False
def stage_back_button_clicked(self, *anything): assert False def stage_back_button_clicked(self, *anything): assert False
def stage_forward_button_clicked(self, *anything): assert False def stage_forward_button_clicked(self, *anything): assert False
def stage_execute_button_clicked(self, *anything): assert False def stage_execute_button_clicked(self, *anything): assert False
@ -93,9 +91,6 @@ class CommandWindow:
def do_nothing(self, *anything): return False def do_nothing(self, *anything): return False
# widget callbacks # widget callbacks
def on_cancel_button_clicked(self, *anything):
return self.stage_cancel_button_clicked(*anything)
def on_back_button_clicked(self, *anything): def on_back_button_clicked(self, *anything):
return self.stage_back_button_clicked(*anything) return self.stage_back_button_clicked(*anything)
@ -131,7 +126,7 @@ class CommandWindow:
self.retrieving_commands_stage_vbox)) self.retrieving_commands_stage_vbox))
# set widgets' state # set widgets' state
self.cancel_button.set_sensitive(True) self.close_button.set_sensitive(True)
self.back_button.set_sensitive(False) self.back_button.set_sensitive(False)
self.forward_button.set_sensitive(False) self.forward_button.set_sensitive(False)
self.execute_button.set_sensitive(False) self.execute_button.set_sensitive(False)
@ -143,13 +138,13 @@ class CommandWindow:
# setup the callbacks # setup the callbacks
self.stage_finish = self.stage1_finish self.stage_finish = self.stage1_finish
self.stage_cancel_button_clicked = self.stage1_cancel_button_clicked self.stage_close_button_clicked = self.stage1_close_button_clicked
self.stage_adhoc_commands_window_delete_event = self.stage1_adhoc_commands_window_delete_event self.stage_adhoc_commands_window_delete_event = self.stage1_adhoc_commands_window_delete_event
def stage1_finish(self): def stage1_finish(self):
self.remove_pulsing() self.remove_pulsing()
def stage1_cancel_button_clicked(self, widget): def stage1_close_button_clicked(self, widget):
# cancelling in this stage is not critical, so we don't # cancelling in this stage is not critical, so we don't
# show any popups to user # show any popups to user
self.stage1_finish() self.stage1_finish()
@ -173,7 +168,7 @@ class CommandWindow:
self.stages_notebook.page_num( self.stages_notebook.page_num(
self.command_list_stage_vbox)) self.command_list_stage_vbox))
self.cancel_button.set_sensitive(True) self.close_button.set_sensitive(True)
self.back_button.set_sensitive(False) self.back_button.set_sensitive(False)
self.forward_button.set_sensitive(True) self.forward_button.set_sensitive(True)
self.execute_button.set_sensitive(False) self.execute_button.set_sensitive(False)
@ -190,7 +185,7 @@ class CommandWindow:
self.command_list_vbox.show_all() self.command_list_vbox.show_all()
self.stage_finish = self.stage2_finish self.stage_finish = self.stage2_finish
self.stage_cancel_button_clicked = self.stage2_cancel_button_clicked self.stage_close_button_clicked = self.stage2_close_button_clicked
self.stage_forward_button_clicked = self.stage2_forward_button_clicked self.stage_forward_button_clicked = self.stage2_forward_button_clicked
self.stage_adhoc_commands_window_delete_event = self.do_nothing self.stage_adhoc_commands_window_delete_event = self.do_nothing
@ -200,7 +195,7 @@ class CommandWindow:
self.command_list_vbox.remove(widget) self.command_list_vbox.remove(widget)
self.command_list_vbox.foreach(remove_widget) self.command_list_vbox.foreach(remove_widget)
def stage2_cancel_button_clicked(self, widget): def stage2_close_button_clicked(self, widget):
self.stage_finish() self.stage_finish()
self.window.destroy() self.window.destroy()
@ -226,7 +221,7 @@ class CommandWindow:
self.stages_notebook.page_num( self.stages_notebook.page_num(
self.sending_form_stage_vbox)) self.sending_form_stage_vbox))
self.cancel_button.set_sensitive(True) self.close_button.set_sensitive(True)
self.back_button.set_sensitive(False) self.back_button.set_sensitive(False)
self.forward_button.set_sensitive(False) self.forward_button.set_sensitive(False)
self.execute_button.set_sensitive(False) self.execute_button.set_sensitive(False)
@ -234,22 +229,25 @@ class CommandWindow:
self.stage3_submit_form() self.stage3_submit_form()
self.stage_finish = self.stage3_finish self.stage_finish = self.stage3_finish
self.stage_cancel_button_clicked = self.stage3_cancel_button_clicked
self.stage_back_button_clicked = self.stage3_back_button_clicked self.stage_back_button_clicked = self.stage3_back_button_clicked
self.stage_forward_button_clicked = self.stage3_forward_button_clicked self.stage_forward_button_clicked = self.stage3_forward_button_clicked
self.stage_execute_button_clicked = self.stage3_execute_button_clicked self.stage_execute_button_clicked = self.stage3_execute_button_clicked
self.stage_close_button_clicked = self.stage3_close_button_clicked self.stage_close_button_clicked = self.stage3_close_button_clicked
self.stage_adhoc_commands_window_delete_event = self.stage3_cancel_button_clicked self.stage_adhoc_commands_window_delete_event = self.stage3_close_button_clicked
def stage3_finish(self): def stage3_finish(self):
pass pass
def stage3_cancel_button_clicked(self, widget, *anything): def stage3_close_button_clicked(self, widget):
''' We are in the middle of executing command. Ask user if he really want to cancel ''' We are in the middle of executing command. Ask user if he really want to cancel
the process, then... cancel it. ''' the process, then... cancel it. '''
# this works also as a handler for window_delete_event, so we have to return appropriate # this works also as a handler for window_delete_event, so we have to return appropriate
# values # values
# TODO: translate it if self.form_status == 'completed':
if widget!=self.window:
self.window.destroy()
return False
dialog = dialogs.HigDialog(self.window, gtk.DIALOG_DESTROY_WITH_PARENT | gtk.DIALOG_MODAL, dialog = dialogs.HigDialog(self.window, gtk.DIALOG_DESTROY_WITH_PARENT | gtk.DIALOG_MODAL,
gtk.BUTTONS_YES_NO, 'Cancel confirmation', gtk.BUTTONS_YES_NO, 'Cancel confirmation',
'You are in process of executing command. Do you really want to cancel it?') 'You are in process of executing command. Do you really want to cancel it?')
@ -261,15 +259,6 @@ class CommandWindow:
else: else:
self.window.destroy() self.window.destroy()
return False return False
return True
def stage3_close_button_clicked(self, widget):
# this works also as a handler for window_delete_event, so we have to return appropriate
# values
if widget==self.window:
return False
else:
self.window.destroy()
def stage3_back_button_clicked(self, widget): def stage3_back_button_clicked(self, widget):
self.stage3_submit_form('prev') self.stage3_submit_form('prev')
@ -285,7 +274,7 @@ class CommandWindow:
if self.data_form_widget.get_data_form() is None: if self.data_form_widget.get_data_form() is None:
self.data_form_widget.hide() self.data_form_widget.hide()
self.cancel_button.set_sensitive(True) self.close_button.set_sensitive(True)
self.back_button.set_sensitive(False) self.back_button.set_sensitive(False)
self.forward_button.set_sensitive(False) self.forward_button.set_sensitive(False)
self.execute_button.set_sensitive(False) self.execute_button.set_sensitive(False)
@ -320,24 +309,22 @@ class CommandWindow:
action = command.getTag('action') action = command.getTag('action')
if action is None: if action is None:
self.cancel_button.set_sensitive(True) self.close_button.set_sensitive(True)
self.back_button.set_sensitive(False) self.back_button.set_sensitive(False)
self.forward_button.set_sensitive(False) self.forward_button.set_sensitive(False)
self.execute_button.set_sensitive(True) self.execute_button.set_sensitive(True)
else: else:
# actions, actions, actions... # actions, actions, actions...
self.cancel_button.set_sensitive(True) self.close_button.set_sensitive(True)
self.back_button.set_sensitive(action.getTag('prev') is not None) self.back_button.set_sensitive(action.getTag('prev') is not None)
self.forward_button.set_sensitive(action.getTag('next') is not None) self.forward_button.set_sensitive(action.getTag('next') is not None)
self.execute_button.set_sensitive(True) self.execute_button.set_sensitive(True)
if self.form_status == 'completed': if self.form_status == 'completed':
self.cancel_button.set_sensitive(False) self.close_button.set_sensitive(True)
self.back_button.set_sensitive(False) self.back_button.hide()
self.forward_button.set_sensitive(False) self.forward_button.hide()
self.execute_button.set_no_show_all(True)
self.execute_button.hide() self.execute_button.hide()
self.close_button.set_no_show_all(False)
self.close_button.show() self.close_button.show()
self.stage_adhoc_commands_window_delete_event = self.stage3_close_button_clicked self.stage_adhoc_commands_window_delete_event = self.stage3_close_button_clicked
@ -360,16 +347,16 @@ class CommandWindow:
self.stages_notebook.page_num( self.stages_notebook.page_num(
self.no_commands_stage_vbox)) self.no_commands_stage_vbox))
self.cancel_button.set_sensitive(True) self.close_button.set_sensitive(True)
self.back_button.set_sensitive(False) self.back_button.set_sensitive(False)
self.forward_button.set_sensitive(False) self.forward_button.set_sensitive(False)
self.execute_button.set_sensitive(False) self.execute_button.set_sensitive(False)
self.stage_finish = self.do_nothing self.stage_finish = self.do_nothing
self.stage_cancel_button_clicked = self.stage4_cancel_button_clicked self.stage_close_button_clicked = self.stage4_close_button_clicked
self.stage_adhoc_commands_window_delete_event = self.do_nothing self.stage_adhoc_commands_window_delete_event = self.do_nothing
def stage4_cancel_button_clicked(self, widget): def stage4_close_button_clicked(self, widget):
self.window.destroy() self.window.destroy()
def on_check_commands_2_button_clicked(self, widget): def on_check_commands_2_button_clicked(self, widget):
@ -401,18 +388,18 @@ class CommandWindow:
self.stages_notebook.page_num( self.stages_notebook.page_num(
self.error_stage_vbox)) self.error_stage_vbox))
self.cancel_button.set_sensitive(True) self.close_button.set_sensitive(True)
self.back_button.set_sensitive(False) self.back_button.hide()
self.forward_button.set_sensitive(False) self.forward_button.hide()
self.execute_button.set_sensitive(False) self.execute_button.hide()
self.error_description_label.set_text(error) self.error_description_label.set_text(error)
self.stage_finish = self.do_nothing self.stage_finish = self.do_nothing
self.stage_cancel_button_clicked = self.stage5_cancel_button_clicked self.stage_close_button_clicked = self.stage5_close_button_clicked
self.stage_adhoc_commands_window_delete_event = self.do_nothing self.stage_adhoc_commands_window_delete_event = self.do_nothing
def stage5_cancel_button_clicked(self, widget): def stage5_close_button_clicked(self, widget):
self.window.destroy() self.window.destroy()
# helpers to handle pulsing in progressbar # helpers to handle pulsing in progressbar