diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/Gui/CCMainWindow.py | 7 | ||||
| -rw-r--r-- | src/Gui/SettingsDialog.py | 12 |
2 files changed, 8 insertions, 11 deletions
diff --git a/src/Gui/CCMainWindow.py b/src/Gui/CCMainWindow.py index e68d2fb..34c2def 100644 --- a/src/Gui/CCMainWindow.py +++ b/src/Gui/CCMainWindow.py @@ -154,9 +154,12 @@ class MainWindow(): def on_miSettings_clicked(self, widget): dialog = SettingsDialog(self.window, self.ccdaemon) - dialog.hydrate() + try: + dialog.hydrate() + except Exception, e: + gui_error_message(_("Can't show the settings dialog\n%s" % e)) + return dialog.show() - self.ccdaemon.getSettings() def warning_cb(self, daemon, message=None): # try to hide the progressbar, we dont really care if it was visible .. diff --git a/src/Gui/SettingsDialog.py b/src/Gui/SettingsDialog.py index b3af501..cf42393 100644 --- a/src/Gui/SettingsDialog.py +++ b/src/Gui/SettingsDialog.py @@ -1,9 +1,8 @@ import sys import gtk -from PluginList import getPluginInfoList, PluginInfoList +from PluginList import getPluginInfoList from CC_gui_functions import * #from PluginSettingsUI import PluginSettingsUI -from ABRTPlugin import PluginSettings, PluginInfo from abrt_utils import _ @@ -75,11 +74,11 @@ class SettingsDialog: try: self.pluginlist = getPluginInfoList(self.ccdaemon, refresh=True) except Exception, e: - print "SettingsDialog: ", e + raise Exception("Comunication with daemon has failed, have you restarted the daemon after update?") ## hydrate cron jobs: for key,val in self.settings["Cron"].iteritems(): - # actionas are separated by ',' + # actions are separated by ',' actions = val.split(',') self.settings["Cron"][key] = actions for plugin in self.pluginlist.getActionPlugins(): @@ -120,11 +119,9 @@ class SettingsDialog: self.add_AnalyzerAction(action) def on_bCancelGPGKeys_clicked(self, button): - print "cancel" self.wGPGKeys.hide() def on_bSaveGPGKeys_clicked(self, button): - print "save" self.wGPGKeys.hide() def on_bAddGPGKey_clicked(self, button): @@ -233,9 +230,6 @@ class SettingsDialog: def on_bAddAction_clicked(self, button): self.add_AnalyzerAction() - def on_cancel_clicked(self,button): - self.window.hide() - def dehydrate(self): self.ccdaemon.setSettings(self.settings) |