evilny0/fpdb
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

add warning when reloading config and minor optical change

Browse Source
This commit is contained in:
Steffen Schaumburg 2011-04-06 23:09:10 +02:00
parent 641a13ac45
commit c415e479c7
1 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
pyfpdb/fpdb.pyw
View File

@ -323,13 +323,7 @@ class fpdb:
if response == gtk.RESPONSE_ACCEPT: if response == gtk.RESPONSE_ACCEPT:
# save updated config # save updated config
self.config.save() self.config.save()
if len(self.nb_tab_names) == 1: self.reload_config(dia)
# only main tab open, reload profile
self.load_profile()
dia.destroy()
else:
dia.destroy() # destroy prefs before raising warning, otherwise parent is dia rather than self.window
self.warning_box(_("Updated preferences have not been loaded because windows are open. Re-start fpdb to load them."))
else: else:
dia.destroy() dia.destroy()
@ -715,6 +709,9 @@ class fpdb:
except KeyError: except KeyError:
pass pass
label = gtk.Label(_(" "))
dia.vbox.add(label)
table = gtk.Table(rows=len(available_site_names)+1, columns=2, homogeneous=False) table = gtk.Table(rows=len(available_site_names)+1, columns=2, homogeneous=False)
dia.vbox.add(table) dia.vbox.add(table)
@ -747,16 +744,20 @@ class fpdb:
self.config.edit_site(available_site_names[site_number], str(check_buttons[site_number].get_active()), entries[site_number].get_text()) self.config.edit_site(available_site_names[site_number], str(check_buttons[site_number].get_active()), entries[site_number].get_text())
self.config.save() self.config.save()
self.reload_config(dia)
if len(self.nb_tab_names) == 1:
# only main tab open, reload profile
self.load_profile()
dia.destroy()
else:
dia.destroy() # destroy prefs before raising warning, otherwise parent is dia rather than self.window
self.warning_box(_("Updated preferences have not been loaded because windows are open. Re-start fpdb to load them."))
dia.destroy() dia.destroy()
def reload_config(self, dia):
if len(self.nb_tab_names) == 1:
# only main tab open, reload profile
self.load_profile()
dia.destroy() # destroy prefs before raising warning, otherwise parent is dia rather than self.window
self.warning_box(_("If you had previously opened any tabs they cannot use the new settings without restart.")+" "+_("Re-start fpdb to load them."))
else:
dia.destroy() # destroy prefs before raising warning, otherwise parent is dia rather than self.window
self.warning_box(_("Updated preferences have not been loaded because windows are open.")+" "+_("Re-start fpdb to load them."))
def addLogText(self, text): def addLogText(self, text):
end_iter = self.logbuffer.get_end_iter() end_iter = self.logbuffer.get_end_iter()
self.logbuffer.insert(end_iter, text) self.logbuffer.insert(end_iter, text)