hide finish button in Account creation wizard until latest page
This commit is contained in:
parent
c201b03dce
commit
6999fae260
|
@ -2106,6 +2106,7 @@ class RemoveAccountWindow:
|
||||||
|
|
||||||
def on_remove_button_clicked(self, widget):
|
def on_remove_button_clicked(self, widget):
|
||||||
def remove(widget):
|
def remove(widget):
|
||||||
|
if self.dialog:
|
||||||
self.dialog.destroy()
|
self.dialog.destroy()
|
||||||
if gajim.connections[self.account].connected and \
|
if gajim.connections[self.account].connected and \
|
||||||
not self.remove_and_unregister_radiobutton.get_active():
|
not self.remove_and_unregister_radiobutton.get_active():
|
||||||
|
@ -2127,11 +2128,15 @@ class RemoveAccountWindow:
|
||||||
gajim.connections[self.account].unregister_account(self._on_remove_success)
|
gajim.connections[self.account].unregister_account(self._on_remove_success)
|
||||||
else:
|
else:
|
||||||
self._on_remove_success(True)
|
self._on_remove_success(True)
|
||||||
|
|
||||||
|
self.dialog = None
|
||||||
if gajim.connections[self.account].connected:
|
if gajim.connections[self.account].connected:
|
||||||
self.dialog = dialogs.ConfirmationDialog(
|
self.dialog = dialogs.ConfirmationDialog(
|
||||||
_('Account "%s" is connected to the server' % self.account),
|
_('Account "%s" is connected to the server' % self.account),
|
||||||
_('If you remove it, the connection will be lost.'),
|
_('If you remove it, the connection will be lost.'),
|
||||||
on_response_ok = remove)
|
on_response_ok = remove)
|
||||||
|
else:
|
||||||
|
remove(None)
|
||||||
|
|
||||||
def _on_remove_success(self, res):
|
def _on_remove_success(self, res):
|
||||||
# action of unregistration has failed, we don't remove the account
|
# action of unregistration has failed, we don't remove the account
|
||||||
|
@ -2467,6 +2472,7 @@ class AccountCreationWizardWindow:
|
||||||
|
|
||||||
self.notebook.set_current_page(0)
|
self.notebook.set_current_page(0)
|
||||||
self.advanced_button.set_no_show_all(True)
|
self.advanced_button.set_no_show_all(True)
|
||||||
|
self.finish_button.set_no_show_all(True)
|
||||||
self.xml.signal_autoconnect(self)
|
self.xml.signal_autoconnect(self)
|
||||||
self.window.show_all()
|
self.window.show_all()
|
||||||
|
|
||||||
|
@ -2585,7 +2591,7 @@ class AccountCreationWizardWindow:
|
||||||
_('Account has been added successfully'),
|
_('Account has been added successfully'),
|
||||||
_('You can set advanced account options by pressing Advanced button, or later by clicking in Accounts menuitem under Edit menu from the main window.'))
|
_('You can set advanced account options by pressing Advanced button, or later by clicking in Accounts menuitem under Edit menu from the main window.'))
|
||||||
self.finish_label.set_markup(finish_text)
|
self.finish_label.set_markup(finish_text)
|
||||||
self.finish_button.set_sensitive(True)
|
self.finish_button.show()
|
||||||
self.finish_button.set_property('has-default', True)
|
self.finish_button.set_property('has-default', True)
|
||||||
self.advanced_button.show()
|
self.advanced_button.show()
|
||||||
self.go_online_checkbutton.show()
|
self.go_online_checkbutton.show()
|
||||||
|
@ -2605,7 +2611,7 @@ _('You can set advanced account options by pressing Advanced button, or later by
|
||||||
def acc_is_ok(self, config):
|
def acc_is_ok(self, config):
|
||||||
'''Account creation succeeded'''
|
'''Account creation succeeded'''
|
||||||
self.create_vars(config)
|
self.create_vars(config)
|
||||||
self.finish_button.set_sensitive(True)
|
self.finish_button.show()
|
||||||
self.finish_button.set_property('has-default', True)
|
self.finish_button.set_property('has-default', True)
|
||||||
self.advanced_button.show()
|
self.advanced_button.show()
|
||||||
self.go_online_checkbutton.show()
|
self.go_online_checkbutton.show()
|
||||||
|
|
|
@ -13223,8 +13223,6 @@ Please wait...</property>
|
||||||
|
|
||||||
<child>
|
<child>
|
||||||
<widget class="GtkButton" id="finish_button">
|
<widget class="GtkButton" id="finish_button">
|
||||||
<property name="visible">True</property>
|
|
||||||
<property name="sensitive">False</property>
|
|
||||||
<property name="can_default">True</property>
|
<property name="can_default">True</property>
|
||||||
<property name="can_focus">True</property>
|
<property name="can_focus">True</property>
|
||||||
<property name="relief">GTK_RELIEF_NORMAL</property>
|
<property name="relief">GTK_RELIEF_NORMAL</property>
|
||||||
|
|
Loading…
Reference in New Issue