diff options
| -rw-r--r-- | lib/Plugins/Mailx.GTKBuilder | 57 | ||||
| -rw-r--r-- | src/Gui/CCMainWindow.py | 42 | ||||
| -rw-r--r-- | src/Gui/CCReporterDialog.py | 21 | ||||
| -rw-r--r-- | src/Gui/PluginsSettingsDialog.py | 1 | ||||
| -rw-r--r-- | src/Gui/SettingsDialog.py | 2 | ||||
| -rw-r--r-- | src/Gui/ccgui.glade | 130 | ||||
| -rw-r--r-- | src/Gui/dialogs.glade | 9 | ||||
| -rw-r--r-- | src/Gui/report.glade | 262 | ||||
| -rw-r--r-- | src/Gui/settings.glade | 618 | ||||
| -rw-r--r-- | src/Gui/settings_wizard.glade | 34 |
10 files changed, 611 insertions, 565 deletions
diff --git a/lib/Plugins/Mailx.GTKBuilder b/lib/Plugins/Mailx.GTKBuilder index df359734..a823eca1 100644 --- a/lib/Plugins/Mailx.GTKBuilder +++ b/lib/Plugins/Mailx.GTKBuilder @@ -27,7 +27,7 @@ <child> <object class="GtkTable" id="table1"> <property name="visible">True</property> - <property name="n_rows">4</property> + <property name="n_rows">3</property> <property name="n_columns">2</property> <child> <object class="GtkLabel" id="lSubject"> @@ -36,37 +36,18 @@ </object> </child> <child> - <object class="GtkLabel" id="lParameters"> - <property name="visible">True</property> - <property name="label" translatable="yes">Parameters:</property> - </object> - <packing> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="lEmailFrom"> - <property name="visible">True</property> - <property name="label" translatable="yes">Your Email:</property> - </object> - <packing> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="lEmailTo"> + <object class="GtkEntry" id="conf_Subject"> <property name="visible">True</property> - <property name="label" translatable="yes">Recipient's Email:</property> + <property name="can_focus">True</property> + <property name="invisible_char">●</property> </object> <packing> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> + <property name="left_attach">1</property> + <property name="right_attach">2</property> </packing> </child> <child> - <object class="GtkEntry" id="conf_Subject"> + <object class="GtkEntry" id="conf_EmailFrom"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="invisible_char">●</property> @@ -74,30 +55,26 @@ <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> </packing> </child> <child> - <object class="GtkEntry" id="conf_Parameters"> + <object class="GtkLabel" id="lEmailFrom"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="invisible_char">●</property> + <property name="label" translatable="yes">Your Email:</property> </object> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> </packing> </child> <child> - <object class="GtkEntry" id="conf_EmailFrom"> + <object class="GtkLabel" id="lEmailTo"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="invisible_char">●</property> + <property name="label" translatable="yes">Recipient's Email:</property> </object> <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> <property name="top_attach">2</property> <property name="bottom_attach">3</property> </packing> @@ -111,8 +88,8 @@ <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> </packing> </child> </object> @@ -143,7 +120,7 @@ <property name="layout_style">end</property> <child> <object class="GtkButton" id="button1"> - <property name="label" translatable="yes">gtk-apply</property> + <property name="label">gtk-apply</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -157,7 +134,7 @@ </child> <child> <object class="GtkButton" id="button2"> - <property name="label" translatable="yes">gtk-cancel</property> + <property name="label">gtk-cancel</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> diff --git a/src/Gui/CCMainWindow.py b/src/Gui/CCMainWindow.py index 8e480509..7de389bd 100644 --- a/src/Gui/CCMainWindow.py +++ b/src/Gui/CCMainWindow.py @@ -60,18 +60,11 @@ class MainWindow(): self.pBarWindow.set_transient_for(self.window) self.pBar = self.wTree.get_widget("pBar") - # set colours for description heading - self.wTree.get_widget("evDescription").modify_bg(gtk.STATE_NORMAL, gtk.gdk.color_parse("black")) - #init the dumps treeview self.dlist = self.wTree.get_widget("tvDumps") #rows of items with: - #icon, package_name, application, date, crash_rate, user (only if root), is_reported, ?object? - if os.getuid() == 0: - # root - self.dumpsListStore = gtk.ListStore(gtk.gdk.Pixbuf, str,str,str,str,str,bool, object) - else: - self.dumpsListStore = gtk.ListStore(gtk.gdk.Pixbuf, str,str,str,str,bool, object) + #icon, package_name, application, date, crash_rate, user, is_reported, ?object? + self.dumpsListStore = gtk.ListStore(gtk.gdk.Pixbuf, str,str,str,str,str,bool, object) # set filter self.modelfilter = self.dumpsListStore.filter_new() self.modelfilter.set_visible_func(self.filter_dumps, None) @@ -82,16 +75,15 @@ class MainWindow(): icon_column.cell.set_property('cell-background', "#C9C9C9") n = self.dlist.append_column(icon_column) icon_column.pack_start(icon_column.cell, False) - icon_column.set_attributes(icon_column.cell, pixbuf=(n-1), cell_background_set=5+(os.getuid() == 0)) + icon_column.set_attributes(icon_column.cell, pixbuf=(n-1), cell_background_set=6) # =============================================== columns = [None]*4 columns[0] = gtk.TreeViewColumn(_("Package")) columns[1] = gtk.TreeViewColumn(_("Application")) columns[2] = gtk.TreeViewColumn(_("Date")) columns[3] = gtk.TreeViewColumn(_("Crash count")) - if os.getuid() == 0: - column = gtk.TreeViewColumn(_("User")) - columns.append(column) + column = gtk.TreeViewColumn(_("User")) + columns.append(column) # create list for column in columns: n = self.dlist.append_column(column) @@ -100,7 +92,7 @@ class MainWindow(): #column.set_attributes(column.cell, ) # FIXME: use some relative indexing column.cell.set_property('cell-background', "#C9C9C9") - column.set_attributes(column.cell, text=(n-1), cell_background_set=5+(os.getuid() == 0)) + column.set_attributes(column.cell, text=(n-1), cell_background_set=6) column.set_resizable(True) #connect signals self.dlist.connect("cursor-changed", self.on_tvDumps_cursor_changed) @@ -204,18 +196,14 @@ class MainWindow(): icon = get_icon_for_package(self.theme, entry.getPackageName()) except: icon = None - if os.getuid() == 0: - user = "N/A" - if entry.getUID() != "-1": - try: - user = pwd.getpwuid(int(entry.getUID()))[0] - except Exception, e: - user = "UID: %s" % entry.getUID() - n = self.dumpsListStore.append([icon, entry.getPackage(), entry.getExecutable(), - entry.getTime("%c"), entry.getCount(), user, entry.isReported(), entry]) - else: - n = self.dumpsListStore.append([icon, entry.getPackage(), entry.getExecutable(), - entry.getTime("%c"), entry.getCount(), entry.isReported(), entry]) + user = "N/A" + if entry.getUID() != "-1": + try: + user = pwd.getpwuid(int(entry.getUID()))[0] + except Exception, e: + user = "UID: %s" % entry.getUID() + n = self.dumpsListStore.append([icon, entry.getPackage(), entry.getExecutable(), + entry.getTime("%c"), entry.getCount(), user, entry.isReported(), entry]) # activate the first row if any.. if n: # we can use (0,) as path for the first row, but what if API changes? @@ -230,7 +218,6 @@ class MainWindow(): if not path: self.wTree.get_widget("bDelete").set_sensitive(False) self.wTree.get_widget("bReport").set_sensitive(False) - self.wTree.get_widget("lDescription").set_label("") return self.wTree.get_widget("bDelete").set_sensitive(True) self.wTree.get_widget("bReport").set_sensitive(True) @@ -248,7 +235,6 @@ class MainWindow(): else: self.wTree.get_widget("lReported").set_markup(_("<b>Not reported!</b>")) lPackage = self.wTree.get_widget("lPackage") - self.wTree.get_widget("lDescription").set_label(dump.getDescription()) def on_bDelete_clicked(self, button, treeview): dumpsListStore, path = self.dlist.get_selection().get_selected_rows() diff --git a/src/Gui/CCReporterDialog.py b/src/Gui/CCReporterDialog.py index 7cdf3cf3..d943c0df 100644 --- a/src/Gui/CCReporterDialog.py +++ b/src/Gui/CCReporterDialog.py @@ -130,7 +130,7 @@ class ReporterDialog(): im = gtk.Image() im.set_from_stock(gtk.STOCK_APPLY, gtk.ICON_SIZE_MENU) box.remove(image) - box.pack_start(im) + box.pack_start(im, expand = False, fill = False) im.show() image.destroy() button.set_sensitive(False) @@ -155,12 +155,13 @@ class ReporterDialog(): vbWrongSettings = builder.get_object("vbWrongSettings") for plugin in wrong_conf_plugs: hbox = gtk.HBox() + hbox.set_spacing(6) image = gtk.Image() image.set_from_stock(gtk.STOCK_CANCEL, gtk.ICON_SIZE_MENU) button = gtk.Button(plugin.getName()) button.connect("clicked", self.on_config_plugin_clicked, plugin, image) hbox.pack_start(button) - hbox.pack_start(image) + hbox.pack_start(image, expand = False, fill = False) vbWrongSettings.pack_start(hbox) vbWrongSettings.show_all() dialog.set_transient_for(self.window) @@ -216,26 +217,32 @@ class ReporterDialog(): except: package = None ebErrors = self.wTree.get_widget("ebErrors") + fReproducer = self.wTree.get_widget("fReproducer") + fComments = self.wTree.get_widget("fComments") lErrors = self.wTree.get_widget("lErrors") bSend = self.wTree.get_widget("bSend") # not usable report if int(self.report[item][CD_CONTENT]) < 3: ebErrors.show() - ebErrors.modify_bg(gtk.STATE_NORMAL, gtk.gdk.color_parse("red")) + fReproducer.hide() + fComments.hide() if package: lErrors.set_markup( - "<span color=\"white\">%s</span>" % _("Reporting disabled because the backtrace is unusable.\nPlease try to install debuginfo manually using command:<span color=\"blue\"> debuginfo-install %s </span>\nthen use Refresh button to regenerate the backtrace." % package[0:package.rfind('-',0,package.rfind('-'))])) + _("Reporting disabled because the backtrace is unusable.\nPlease try to install debuginfo manually using command: <b>debuginfo-install %s</b> \nthen use Refresh button to regenerate the backtrace." % package[0:package.rfind('-',0,package.rfind('-'))])) else: - lErrors.set_markup("<span color=\"white\">%s</span>" % _("The backtrace is unusable, you can't report this!")) + lErrors.set_markup(_("The backtrace is unusable, you can't report this!")) bSend.set_sensitive(False) # probably usable 3 elif int(self.report[item][CD_CONTENT]) < 4: ebErrors.show() - ebErrors.modify_bg(gtk.STATE_NORMAL, gtk.gdk.color_parse("yellow")) - lErrors.set_markup("<span color=\"black\">%s</span>" % _("The backtrace is incomplete, please make sure you provide good steps to reproduce.")) + fReproducer.hide() + fComments.hide() + lErrors.set_markup(_("The backtrace is incomplete, please make sure you provide good steps to reproduce.")) bSend.set_sensitive(True) else: ebErrors.hide() + fReproducer.show() + fComments.show() bSend.set_sensitive(True) if self.report[item][CD_TYPE] != CD_SYS: diff --git a/src/Gui/PluginsSettingsDialog.py b/src/Gui/PluginsSettingsDialog.py index 39fc7a6f..8453385d 100644 --- a/src/Gui/PluginsSettingsDialog.py +++ b/src/Gui/PluginsSettingsDialog.py @@ -104,6 +104,7 @@ class PluginsSettingsDialog: n = self.pluginsListStore.append(plugin_rows[entry.getType()],["<b>%s</b>\n%s" % (entry.getName(), entry.Description), entry.Enabled == "yes", 1, 0, "white", entry]) self.pluginlist.expand_all() + def dehydrate(self): # we have nothing to save, plugin's does the work pass diff --git a/src/Gui/SettingsDialog.py b/src/Gui/SettingsDialog.py index cf423938..c2b292f7 100644 --- a/src/Gui/SettingsDialog.py +++ b/src/Gui/SettingsDialog.py @@ -157,6 +157,7 @@ class SettingsDialog: def add_CronJob(self, job=None): hbox = gtk.HBox() + hbox.set_spacing(6) time = gtk.Entry() remove_image = gtk.Image() remove_image.set_from_stock("gtk-remove",gtk.ICON_SIZE_MENU) @@ -193,6 +194,7 @@ class SettingsDialog: def add_AnalyzerAction(self, action=None): #print "add_AnalyzerAction" hbox = gtk.HBox() + hbox.set_spacing(6) action_list = gtk.Entry() edit_actions = gtk.Button() edit_actions.set_tooltip_text("Edit actions") diff --git a/src/Gui/ccgui.glade b/src/Gui/ccgui.glade index e9fd96f0..04bc26b5 100644 --- a/src/Gui/ccgui.glade +++ b/src/Gui/ccgui.glade @@ -3,17 +3,22 @@ <!-- interface-requires gtk+ 2.14 --> <!-- interface-naming-policy toplevel-contextual --> <widget class="GtkWindow" id="pBarWindow"> + <property name="width_request">270</property> + <property name="border_width">12</property> <property name="title" translatable="yes">Please wait..</property> + <property name="resizable">False</property> <property name="modal">True</property> <property name="window_position">center-on-parent</property> <property name="default_width">270</property> + <property name="transient_for">main_window3</property> <child> <widget class="GtkVBox" id="vbox1"> <property name="visible">True</property> + <property name="spacing">12</property> <child> - <widget class="GtkLabel" id="pbLabel"> + <widget class="GtkLabel" id="lStatus"> <property name="visible">True</property> - <property name="label" translatable="yes">Working...</property> + <property name="xalign">0</property> </widget> <packing> <property name="expand">False</property> @@ -23,43 +28,13 @@ <child> <widget class="GtkProgressBar" id="pBar"> <property name="visible">True</property> + <property name="text_xalign">0</property> </widget> <packing> <property name="expand">False</property> <property name="position">1</property> </packing> </child> - <child> - <widget class="GtkHBox" id="hbox1"> - <property name="visible">True</property> - <child> - <widget class="GtkArrow" id="arrow1"> - <property name="visible">True</property> - </widget> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <widget class="GtkLabel" id="lStatus"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes"> </property> - <property name="max_width_chars">8</property> - </widget> - <packing> - <property name="position">1</property> - </packing> - </child> - </widget> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">2</property> - </packing> - </child> </widget> </child> </widget> @@ -127,6 +102,7 @@ Zdenek Prikryl <zprikryl@redhat.com></property> <property name="visible">True</property> <property name="use_underline">True</property> <property name="use_stock">True</property> + <property name="always_show_image">True</property> </widget> </child> </widget> @@ -153,6 +129,7 @@ Zdenek Prikryl <zprikryl@redhat.com></property> <property name="visible">True</property> <property name="use_underline">True</property> <property name="use_stock">True</property> + <property name="always_show_image">True</property> </widget> </child> </widget> @@ -173,6 +150,7 @@ Zdenek Prikryl <zprikryl@redhat.com></property> <property name="visible">True</property> <property name="use_underline">True</property> <property name="use_stock">True</property> + <property name="always_show_image">True</property> </widget> </child> </widget> @@ -188,6 +166,7 @@ Zdenek Prikryl <zprikryl@redhat.com></property> <child> <widget class="GtkToolbar" id="toolbar1"> <property name="visible">True</property> + <property name="toolbar_style">both</property> <child> <widget class="GtkToolButton" id="bDelete"> <property name="visible">True</property> @@ -207,7 +186,7 @@ Zdenek Prikryl <zprikryl@redhat.com></property> <property name="sensitive">False</property> <property name="tooltip" translatable="yes">Report</property> <property name="label" translatable="yes">Report</property> - <property name="stock_id">gtk-save</property> + <property name="stock_id">gtk-go-up</property> </widget> <packing> <property name="expand">False</property> @@ -230,58 +209,48 @@ Zdenek Prikryl <zprikryl@redhat.com></property> </packing> </child> <child> - <widget class="GtkScrolledWindow" id="swDumps"> + <widget class="GtkVPaned" id="vpaned1"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="hscrollbar_policy">automatic</property> - <property name="vscrollbar_policy">automatic</property> + <property name="border_width">12</property> + <property name="orientation">vertical</property> <child> - <widget class="GtkTreeView" id="tvDumps"> + <widget class="GtkScrolledWindow" id="swDumps"> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="hscrollbar_policy">automatic</property> + <property name="vscrollbar_policy">automatic</property> + <property name="shadow_type">in</property> + <child> + <widget class="GtkTreeView" id="tvDumps"> + <property name="visible">True</property> + <property name="can_focus">True</property> + </widget> + </child> </widget> + <packing> + <property name="resize">False</property> + <property name="shrink">False</property> + </packing> </child> - </widget> - <packing> - <property name="position">2</property> - </packing> - </child> - <child> - <widget class="GtkEventBox" id="evDescription"> - <property name="visible">True</property> - <child> - <widget class="GtkLabel" id="Description"> - <property name="visible">True</property> - <property name="xalign">0.05000000074505806</property> - <property name="label" translatable="yes"><span color="white">Description</span></property> - <property name="use_markup">True</property> - </widget> - </child> - </widget> - <packing> - <property name="expand">False</property> - <property name="position">3</property> - </packing> - </child> - <child> - <widget class="GtkVBox" id="vbox2"> - <property name="visible">True</property> - <property name="orientation">vertical</property> <child> - <widget class="GtkScrolledWindow" id="scrolledwindow1"> + <widget class="GtkScrolledWindow" id="scrolledwindow2"> <property name="visible">True</property> <property name="can_focus">True</property> <property name="hscrollbar_policy">automatic</property> <property name="vscrollbar_policy">automatic</property> + <property name="shadow_type">in</property> <child> - <widget class="GtkViewport" id="viewport1"> + <widget class="GtkViewport" id="viewport2"> <property name="visible">True</property> <property name="resize_mode">queue</property> + <property name="shadow_type">none</property> <child> - <widget class="GtkLabel" id="lDescription"> + <widget class="GtkLabel" id="lReported"> <property name="visible">True</property> - <property name="xalign">0.10000000149011612</property> - <property name="yalign">0.20000000298023224</property> + <property name="xalign">0</property> + <property name="yalign">0</property> + <property name="label" translatable="yes">Not Reported</property> <property name="selectable">True</property> </widget> </child> @@ -289,33 +258,22 @@ Zdenek Prikryl <zprikryl@redhat.com></property> </child> </widget> <packing> - <property name="position">0</property> - </packing> - </child> - <child> - <widget class="GtkLabel" id="lReported"> - <property name="visible">True</property> - <property name="label" translatable="yes"><b>Not reported!</b></property> - <property name="use_markup">True</property> - <property name="justify">fill</property> - </widget> - <packing> - <property name="position">1</property> + <property name="resize">False</property> + <property name="shrink">True</property> </packing> </child> </widget> <packing> - <property name="position">4</property> + <property name="position">2</property> </packing> </child> <child> <widget class="GtkStatusbar" id="statusbar1"> <property name="visible">True</property> - <property name="spacing">2</property> </widget> <packing> <property name="expand">False</property> - <property name="position">5</property> + <property name="position">3</property> </packing> </child> </widget> @@ -329,6 +287,7 @@ Zdenek Prikryl <zprikryl@redhat.com></property> <property name="visible">True</property> <property name="use_underline">True</property> <property name="use_stock">True</property> + <property name="always_show_image">True</property> </widget> </child> <child> @@ -336,10 +295,11 @@ Zdenek Prikryl <zprikryl@redhat.com></property> <property name="label" translatable="yes">Report</property> <property name="visible">True</property> <property name="use_stock">False</property> + <property name="always_show_image">True</property> <child internal-child="image"> <widget class="GtkImage" id="image1"> <property name="visible">True</property> - <property name="stock">gtk-save</property> + <property name="stock">gtk-go-up</property> <property name="icon-size">1</property> </widget> </child> diff --git a/src/Gui/dialogs.glade b/src/Gui/dialogs.glade index 9d24864f..b5e5273a 100644 --- a/src/Gui/dialogs.glade +++ b/src/Gui/dialogs.glade @@ -3,8 +3,9 @@ <requires lib="gtk+" version="2.16"/> <!-- interface-naming-policy project-wide --> <object class="GtkDialog" id="ReportDialog"> - <property name="border_width">5</property> + <property name="border_width">6</property> <property name="title" translatable="yes">Report done</property> + <property name="resizable">False</property> <property name="modal">True</property> <property name="window_position">center-on-parent</property> <property name="destroy_with_parent">True</property> @@ -14,13 +15,17 @@ <object class="GtkVBox" id="dialog-vbox2"> <property name="visible">True</property> <property name="orientation">vertical</property> - <property name="spacing">2</property> + <property name="spacing">12</property> <child> <object class="GtkHBox" id="main_hbox"> <property name="visible">True</property> + <property name="border_width">6</property> + <property name="spacing">12</property> <child> <object class="GtkImage" id="image1"> <property name="visible">True</property> + <property name="xalign">0</property> + <property name="yalign">0</property> <property name="stock">gtk-dialog-info</property> <property name="icon-size">6</property> </object> diff --git a/src/Gui/report.glade b/src/Gui/report.glade index 29c5c288..08777fb1 100644 --- a/src/Gui/report.glade +++ b/src/Gui/report.glade @@ -3,161 +3,209 @@ <!-- interface-requires gtk+ 2.16 --> <!-- interface-naming-policy toplevel-contextual --> <widget class="GtkDialog" id="reporter_dialog"> - <property name="border_width">5</property> + <property name="border_width">6</property> <property name="title" translatable="yes">Report</property> + <property name="modal">True</property> <property name="window_position">center-on-parent</property> <property name="default_width">400</property> <property name="default_height">400</property> - <property name="type_hint">dialog</property> + <property name="type_hint">normal</property> <property name="has_separator">False</property> <child internal-child="vbox"> <widget class="GtkVBox" id="dialog-vbox4"> <property name="visible">True</property> <property name="orientation">vertical</property> - <property name="spacing">2</property> + <property name="spacing">12</property> <child> - <widget class="GtkVBox" id="vbox5"> + <widget class="GtkVBox" id="vbox1"> <property name="visible">True</property> <property name="orientation">vertical</property> + <property name="spacing">12</property> <child> - <widget class="GtkLabel" id="label10"> - <property name="visible">True</property> - <property name="label" translatable="yes">Report</property> - </widget> - <packing> - <property name="expand">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <widget class="GtkScrolledWindow" id="scrolledwindow5"> + <widget class="GtkVBox" id="vboxNonError"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hscrollbar_policy">automatic</property> - <property name="vscrollbar_policy">automatic</property> + <property name="orientation">vertical</property> + <property name="spacing">12</property> <child> - <widget class="GtkTreeView" id="tvReport"> + <widget class="GtkFrame" id="frame1"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="label_xalign">0</property> + <property name="shadow_type">none</property> + <child> + <widget class="GtkAlignment" id="alignment3"> + <property name="visible">True</property> + <property name="left_padding">12</property> + <child> + <widget class="GtkScrolledWindow" id="scrolledwindow5"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hscrollbar_policy">automatic</property> + <property name="vscrollbar_policy">automatic</property> + <property name="shadow_type">in</property> + <child> + <widget class="GtkTreeView" id="tvReport"> + <property name="visible">True</property> + <property name="can_focus">True</property> + </widget> + </child> + </widget> + </child> + </widget> + </child> + <child> + <widget class="GtkLabel" id="label3"> + <property name="visible">True</property> + <property name="label" translatable="yes"><b>Following items will be send</b></property> + <property name="use_markup">True</property> + </widget> + <packing> + <property name="type">label_item</property> + </packing> + </child> </widget> + <packing> + <property name="position">0</property> + </packing> </child> - </widget> - <packing> - <property name="position">1</property> - </packing> - </child> - <child> - <widget class="GtkEventBox" id="ebErrors"> - <property name="visible">True</property> <child> - <widget class="GtkLabel" id="lErrors"> + <widget class="GtkFrame" id="fReproducer"> <property name="visible">True</property> - <property name="label" translatable="yes"> </property> - <property name="use_markup">True</property> + <property name="label_xalign">0</property> + <property name="shadow_type">none</property> + <child> + <widget class="GtkAlignment" id="alignment1"> + <property name="visible">True</property> + <property name="left_padding">12</property> + <child> + <widget class="GtkScrolledWindow" id="scrolledwindow3"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hscrollbar_policy">automatic</property> + <property name="vscrollbar_policy">automatic</property> + <child> + <widget class="GtkViewport" id="viewport1"> + <property name="visible">True</property> + <property name="resize_mode">queue</property> + <child> + <widget class="GtkTextView" id="tevHowToReproduce"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="wrap_mode">word-char</property> + </widget> + </child> + </widget> + </child> + </widget> + </child> + </widget> + </child> + <child> + <widget class="GtkLabel" id="label1"> + <property name="visible">True</property> + <property name="label" translatable="yes"><b>How to reproduce (in a few simple steps)</b></property> + <property name="use_markup">True</property> + </widget> + <packing> + <property name="type">label_item</property> + </packing> + </child> </widget> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> </child> - </widget> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">2</property> - </packing> - </child> - </widget> - <packing> - <property name="position">0</property> - </packing> - </child> - <child> - <widget class="GtkVBox" id="vbox2"> - <property name="visible">True</property> - <property name="orientation">vertical</property> - <child> - <widget class="GtkEventBox" id="eventbox2"> - <property name="visible">True</property> <child> - <widget class="GtkLabel" id="lHowToReproduce"> + <widget class="GtkFrame" id="fComments"> <property name="visible">True</property> - <property name="xalign">0</property> - <property name="ypad">2</property> - <property name="label" translatable="yes">How to reproduce (in a few simple steps)</property> + <property name="label_xalign">0</property> + <property name="shadow_type">none</property> + <child> + <widget class="GtkAlignment" id="alignment2"> + <property name="visible">True</property> + <property name="left_padding">12</property> + <child> + <widget class="GtkScrolledWindow" id="scrolledwindow2"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hscrollbar_policy">automatic</property> + <property name="vscrollbar_policy">automatic</property> + <child> + <widget class="GtkViewport" id="viewport2"> + <property name="visible">True</property> + <property name="resize_mode">queue</property> + <child> + <widget class="GtkTextView" id="tvComment"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="wrap_mode">word-char</property> + </widget> + </child> + </widget> + </child> + </widget> + </child> + </widget> + </child> + <child> + <widget class="GtkLabel" id="label2"> + <property name="visible">True</property> + <property name="label" translatable="yes"><b>Comment</b></property> + <property name="use_markup">True</property> + </widget> + <packing> + <property name="type">label_item</property> + </packing> + </child> </widget> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">2</property> + </packing> </child> </widget> <packing> - <property name="expand">False</property> <property name="position">0</property> </packing> </child> <child> - <widget class="GtkScrolledWindow" id="scrolledwindow2"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hscrollbar_policy">automatic</property> - <property name="vscrollbar_policy">automatic</property> - <child> - <widget class="GtkTextView" id="tevHowToReproduce"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="wrap_mode">word-char</property> - </widget> - </child> - </widget> - <packing> - <property name="expand">False</property> - <property name="position">1</property> - </packing> - </child> - </widget> - <packing> - <property name="expand">False</property> - <property name="position">2</property> - </packing> - </child> - <child> - <widget class="GtkVBox" id="vbox1"> - <property name="visible">True</property> - <property name="orientation">vertical</property> - <child> - <widget class="GtkEventBox" id="eventbox1"> + <widget class="GtkHBox" id="ebErrors"> <property name="visible">True</property> + <property name="spacing">12</property> <child> - <widget class="GtkLabel" id="lComment"> + <widget class="GtkImage" id="image1"> <property name="visible">True</property> - <property name="xalign">0</property> - <property name="ypad">2</property> - <property name="label" translatable="yes">Comment</property> + <property name="stock">gtk-dialog-warning</property> + <property name="icon-size">6</property> </widget> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> </child> - </widget> - <packing> - <property name="expand">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <widget class="GtkScrolledWindow" id="scrolledwindow1"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hscrollbar_policy">automatic</property> - <property name="vscrollbar_policy">automatic</property> <child> - <widget class="GtkTextView" id="tvComment"> + <widget class="GtkLabel" id="lErrors"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="wrap_mode">word-char</property> + <property name="label" translatable="yes"> </property> + <property name="use_markup">True</property> </widget> + <packing> + <property name="position">1</property> + </packing> </child> </widget> <packing> <property name="expand">False</property> + <property name="fill">False</property> <property name="position">1</property> </packing> </child> </widget> <packing> - <property name="expand">False</property> - <property name="position">3</property> + <property name="position">0</property> </packing> </child> <child internal-child="action_area"> @@ -212,7 +260,7 @@ <packing> <property name="expand">False</property> <property name="pack_type">end</property> - <property name="position">0</property> + <property name="position">1</property> </packing> </child> </widget> diff --git a/src/Gui/settings.glade b/src/Gui/settings.glade index 094286b0..655c15b2 100644 --- a/src/Gui/settings.glade +++ b/src/Gui/settings.glade @@ -5,175 +5,216 @@ <object class="GtkWindow" id="wPluginsSettings"> <property name="title" translatable="yes">Settings</property> <property name="modal">True</property> + <property name="window_position">center-on-parent</property> <property name="default_width">450</property> <property name="default_height">400</property> <child> - <object class="GtkVBox" id="vbox1"> + <object class="GtkVBox" id="vboxabc1"> <property name="visible">True</property> + <property name="border_width">12</property> <property name="orientation">vertical</property> + <property name="spacing">12</property> <child> - <placeholder/> - </child> - <child> - <object class="GtkScrolledWindow" id="scrolledwindow1"> + <object class="GtkVBox" id="vboxl1"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hscrollbar_policy">never</property> - <property name="vscrollbar_policy">automatic</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> <child> - <object class="GtkTreeView" id="tvSettings"> + <object class="GtkScrolledWindow" id="scrolledwindowx1"> <property name="visible">True</property> <property name="can_focus">True</property> - </object> - </child> - </object> - <packing> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkExpander" id="exPluginDetails"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <child> - <object class="GtkVBox" id="vbox2"> - <property name="visible">True</property> - <property name="orientation">vertical</property> + <property name="resize_mode">immediate</property> + <property name="hscrollbar_policy">never</property> + <property name="vscrollbar_policy">automatic</property> + <property name="shadow_type">in</property> <child> - <object class="GtkLabel" id="lPluginName"> + <object class="GtkTreeView" id="tvSettings"> <property name="visible">True</property> - <property name="xalign">0.05000000074505806</property> - <property name="label" translatable="yes">Nothing selected</property> - </object> - <packing> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="lPluginDescription"> - <property name="visible">True</property> - <property name="label" translatable="yes">Nothing selected</property> + <property name="can_focus">True</property> </object> - <packing> - <property name="position">1</property> - </packing> </child> + </object> + <packing> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkExpander" id="expander1"> + <property name="visible">True</property> + <property name="can_focus">True</property> <child> - <object class="GtkTable" id="table1"> + <object class="GtkAlignment" id="alignment1"> <property name="visible">True</property> - <property name="n_rows">3</property> - <property name="n_columns">3</property> - <property name="homogeneous">True</property> - <child> - <object class="GtkLabel" id="label4"> - <property name="visible">True</property> - <property name="xalign">2.2351741291171123e-10</property> - <property name="xpad">5</property> - <property name="label" translatable="yes">Web Site:</property> - </object> - <packing> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> - </packing> - </child> + <property name="left_padding">12</property> <child> - <object class="GtkLabel" id="label2"> + <object class="GtkHBox" id="hboxx1"> <property name="visible">True</property> - <property name="xalign">2.2351741291171123e-10</property> - <property name="xpad">5</property> - <property name="label" translatable="yes">Author:</property> - </object> - <packing> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options">GTK_FILL</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label3"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="xpad">5</property> - <property name="label" translatable="yes">Version:</property> - </object> - <packing> - <property name="x_options">GTK_FILL</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="lPluginVersion"> - <property name="visible">True</property> - <property name="xalign">2.2351741291171123e-10</property> - <property name="label" translatable="yes">Nothing selected</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">3</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <object class="GtkLabel" id="lPluginAuthor"> - <property name="visible">True</property> - <property name="xalign">2.2351741291171123e-10</property> - <property name="label" translatable="yes">Nothing selected</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">3</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="lPluginWebSite"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Nothing selected</property> + <child> + <object class="GtkTable" id="table2"> + <property name="visible">True</property> + <property name="n_rows">5</property> + <property name="n_columns">2</property> + <property name="column_spacing">12</property> + <property name="row_spacing">6</property> + <child> + <object class="GtkLabel" id="label2"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Web Site:</property> + </object> + <packing> + <property name="top_attach">4</property> + <property name="bottom_attach">5</property> + <property name="x_options">GTK_FILL</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label7"> + <property name="visible">True</property> + <property name="xalign">2.2351741291171123e-10</property> + <property name="label" translatable="yes">Author:</property> + </object> + <packing> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> + <property name="x_options">GTK_FILL</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label8"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Version:</property> + </object> + <packing> + <property name="top_attach">3</property> + <property name="bottom_attach">4</property> + <property name="x_options">GTK_FILL</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="lPluginVersion"> + <property name="visible">True</property> + <property name="xalign">2.2351741291171123e-10</property> + <property name="selectable">True</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">3</property> + <property name="bottom_attach">4</property> + <property name="x_options">GTK_FILL</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="lPluginAuthor"> + <property name="visible">True</property> + <property name="xalign">2.2351741291171123e-10</property> + <property name="selectable">True</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> + <property name="x_options">GTK_FILL</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="lPluginWebSite"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="selectable">True</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">4</property> + <property name="bottom_attach">5</property> + <property name="x_options">GTK_FILL</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label9"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Description:</property> + </object> + <packing> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="x_options">GTK_FILL</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label10"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Name:</property> + </object> + </child> + <child> + <object class="GtkLabel" id="lPluginDescription"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="selectable">True</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="lPluginName"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="selectable">True</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <placeholder/> + </child> </object> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">3</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> - </packing> </child> </object> - <packing> - <property name="position">2</property> - </packing> + </child> + <child type="label"> + <object class="GtkLabel" id="label1"> + <property name="visible">True</property> + <property name="label" translatable="yes"><b>Plugin details</b></property> + <property name="use_markup">True</property> + </object> </child> </object> - </child> - <child type="label"> - <object class="GtkLabel" id="label1"> - <property name="visible">True</property> - <property name="label" translatable="yes">Plugin Details</property> - </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> </child> </object> <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">2</property> + <property name="position">0</property> </packing> </child> <child> - <object class="GtkHBox" id="hbox1"> + <object class="GtkHButtonBox" id="hbuttonbox1"> <property name="visible">True</property> - <property name="spacing">11</property> - <child> - <object class="GtkAlignment" id="alignment1"> - <property name="visible">True</property> - <child> - <placeholder/> - </child> - </object> - <packing> - <property name="position">0</property> - </packing> - </child> + <property name="spacing">12</property> + <property name="layout_style">end</property> <child> <object class="GtkButton" id="bConfigurePlugin"> <property name="label" translatable="yes">C_onfigure plugin</property> @@ -183,7 +224,9 @@ <property name="use_underline">True</property> </object> <packing> - <property name="position">1</property> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> </packing> </child> <child> @@ -195,23 +238,16 @@ <property name="use_stock">True</property> </object> <packing> - <property name="position">2</property> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> </packing> </child> </object> <packing> <property name="expand">False</property> - <property name="position">3</property> - </packing> - </child> - <child> - <object class="GtkStatusbar" id="statusbar1"> - <property name="visible">True</property> - <property name="spacing">2</property> - </object> - <packing> - <property name="expand">False</property> - <property name="position">4</property> + <property name="fill">False</property> + <property name="position">1</property> </packing> </child> </object> @@ -220,21 +256,28 @@ <object class="GtkWindow" id="wGlobalSettings"> <property name="title" translatable="yes">Global Settings</property> <property name="modal">True</property> + <property name="window_position">center-on-parent</property> <property name="default_width">450</property> <property name="default_height">400</property> <child> <object class="GtkVBox" id="gsvbox1"> <property name="visible">True</property> + <property name="border_width">12</property> <property name="orientation">vertical</property> + <property name="spacing">6</property> <child> <object class="GtkNotebook" id="notebook1"> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="show_border">False</property> <child> <object class="GtkTable" id="common_table"> <property name="visible">True</property> + <property name="border_width">6</property> <property name="n_rows">5</property> <property name="n_columns">2</property> + <property name="column_spacing">12</property> + <property name="row_spacing">6</property> <child> <object class="GtkCheckButton" id="cbOpenGPGCheck"> <property name="label" translatable="yes">Check package GPG signature</property> @@ -258,6 +301,7 @@ <packing> <property name="top_attach">1</property> <property name="bottom_attach">2</property> + <property name="x_options">GTK_FILL</property> <property name="y_options">GTK_FILL</property> </packing> </child> @@ -283,6 +327,7 @@ <packing> <property name="top_attach">2</property> <property name="bottom_attach">3</property> + <property name="x_options">GTK_FILL</property> <property name="y_options">GTK_FILL</property> </packing> </child> @@ -296,6 +341,7 @@ <packing> <property name="top_attach">3</property> <property name="bottom_attach">4</property> + <property name="x_options">GTK_FILL</property> <property name="y_options">GTK_FILL</property> </packing> </child> @@ -309,6 +355,7 @@ <packing> <property name="top_attach">4</property> <property name="bottom_attach">5</property> + <property name="x_options">GTK_FILL</property> <property name="y_options">GTK_FILL</property> </packing> </child> @@ -331,6 +378,7 @@ <child> <object class="GtkHBox" id="blhbox"> <property name="visible">True</property> + <property name="spacing">6</property> <child> <object class="GtkEntry" id="eBlacklist"> <property name="visible">True</property> @@ -346,7 +394,6 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes">Edit blacklisted packages</property> <property name="image">imEdit</property> </object> <packing> @@ -367,6 +414,7 @@ <child> <object class="GtkHBox" id="gpghbox"> <property name="visible">True</property> + <property name="spacing">6</property> <child> <object class="GtkEntry" id="eOpenGPGPublicKeys"> <property name="visible">True</property> @@ -414,7 +462,9 @@ <child> <object class="GtkVBox" id="cron_vbox"> <property name="visible">True</property> + <property name="border_width">6</property> <property name="orientation">vertical</property> + <property name="spacing">6</property> <child> <object class="GtkScrolledWindow" id="swCronJobs"> <property name="visible">True</property> @@ -425,6 +475,7 @@ <object class="GtkViewport" id="vpCronJobs"> <property name="visible">True</property> <property name="resize_mode">queue</property> + <property name="shadow_type">none</property> <child> <object class="GtkVBox" id="cjvbox1"> <property name="visible">True</property> @@ -480,31 +531,10 @@ </packing> </child> <child> - <object class="GtkHBox" id="cron_add_button_hbox"> + <object class="GtkHButtonBox" id="hbuttonboxy1"> <property name="visible">True</property> - <property name="homogeneous">True</property> - <child> - <object class="GtkAlignment" id="add_alignment1"> - <property name="visible">True</property> - <child> - <placeholder/> - </child> - </object> - <packing> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkAlignment" id="add_alignment2"> - <property name="visible">True</property> - <child> - <placeholder/> - </child> - </object> - <packing> - <property name="position">1</property> - </packing> - </child> + <property name="spacing">12</property> + <property name="layout_style">end</property> <child> <object class="GtkButton" id="bAddCronJob"> <property name="label">gtk-add</property> @@ -514,12 +544,15 @@ <property name="use_stock">True</property> </object> <packing> - <property name="position">2</property> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> </packing> </child> </object> <packing> <property name="expand">False</property> + <property name="fill">False</property> <property name="position">1</property> </packing> </child> @@ -541,84 +574,90 @@ <child> <object class="GtkVBox" id="actions_vbox"> <property name="visible">True</property> + <property name="border_width">6</property> <property name="orientation">vertical</property> + <property name="spacing">6</property> <child> - <object class="GtkHBox" id="ahbox1"> + <object class="GtkScrolledWindow" id="scrolledwindow1"> <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hscrollbar_policy">automatic</property> + <property name="vscrollbar_policy">automatic</property> <child> - <object class="GtkLabel" id="lReporter"> - <property name="visible">True</property> - <property name="label" translatable="yes"><b>Analyzer plugin</b></property> - <property name="use_markup">True</property> - </object> - <packing> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="lAssociatedActions"> - <property name="visible">True</property> - <property name="label" translatable="yes"><b>Associated action</b></property> - <property name="use_markup">True</property> - </object> - <packing> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkAlignment" id="action_lbl_align"> + <object class="GtkViewport" id="viewportA1"> <property name="visible">True</property> + <property name="resize_mode">queue</property> + <property name="shadow_type">none</property> <child> - <placeholder/> + <object class="GtkVBox" id="vbox1"> + <property name="visible">True</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkHBox" id="ahbox1"> + <property name="visible">True</property> + <child> + <object class="GtkLabel" id="lReporter"> + <property name="visible">True</property> + <property name="label" translatable="yes"><b>Analyzer plugin</b></property> + <property name="use_markup">True</property> + </object> + <packing> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="lAssociatedActions"> + <property name="visible">True</property> + <property name="label" translatable="yes"><b>Associated action</b></property> + <property name="use_markup">True</property> + </object> + <packing> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkAlignment" id="action_lbl_align"> + <property name="visible">True</property> + <child> + <placeholder/> + </child> + </object> + <packing> + <property name="position">2</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkVBox" id="vbActions"> + <property name="visible">True</property> + <property name="orientation">vertical</property> + <child> + <placeholder/> + </child> + </object> + <packing> + <property name="position">1</property> + </packing> + </child> + </object> </child> </object> - <packing> - <property name="position">2</property> - </packing> </child> </object> <packing> - <property name="expand">False</property> <property name="position">0</property> </packing> </child> <child> - <object class="GtkVBox" id="vbActions"> + <object class="GtkHButtonBox" id="hbuttonbox2"> <property name="visible">True</property> - <property name="orientation">vertical</property> - <child> - <placeholder/> - </child> - </object> - <packing> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkHBox" id="actions_button_hbox"> - <property name="visible">True</property> - <child> - <object class="GtkAlignment" id="act_align1"> - <property name="visible">True</property> - <child> - <placeholder/> - </child> - </object> - <packing> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkAlignment" id="act_align2"> - <property name="visible">True</property> - <child> - <placeholder/> - </child> - </object> - <packing> - <property name="position">1</property> - </packing> - </child> + <property name="spacing">12</property> + <property name="layout_style">end</property> <child> <object class="GtkButton" id="bAddAction"> <property name="label">gtk-add</property> @@ -628,13 +667,16 @@ <property name="use_stock">True</property> </object> <packing> - <property name="position">2</property> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> </packing> </child> </object> <packing> <property name="expand">False</property> - <property name="position">2</property> + <property name="fill">False</property> + <property name="position">1</property> </packing> </child> </object> @@ -658,55 +700,36 @@ </packing> </child> <child> - <object class="GtkHBox" id="button_align_hbox"> + <object class="GtkHButtonBox" id="hbuttonboxx1"> <property name="visible">True</property> - <property name="homogeneous">True</property> + <property name="spacing">12</property> + <property name="layout_style">end</property> <child> - <object class="GtkAlignment" id=" button_alignment"> + <object class="GtkButton" id="bCancelSettings"> + <property name="label" translatable="yes">gtk-cancel</property> <property name="visible">True</property> - <child> - <placeholder/> - </child> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_stock">True</property> </object> <packing> + <property name="expand">False</property> + <property name="fill">False</property> <property name="position">0</property> </packing> </child> <child> - <object class="GtkHBox" id="shbox1"> + <object class="GtkButton" id="bSaveSettings"> + <property name="label" translatable="yes">gtk-ok</property> <property name="visible">True</property> - <property name="spacing">14</property> - <property name="homogeneous">True</property> - <child> - <object class="GtkButton" id="bCancelSettings"> - <property name="label">gtk-cancel</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="use_stock">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkButton" id="bSaveSettings"> - <property name="label">gtk-ok</property> - <property name="visible">True</property> - <property name="sensitive">False</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes">This function is not implemented yet!</property> - <property name="use_stock">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="position">1</property> - </packing> - </child> + <property name="sensitive">False</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_stock">True</property> </object> <packing> + <property name="expand">False</property> + <property name="fill">False</property> <property name="position">1</property> </packing> </child> @@ -724,21 +747,13 @@ <property name="upper">1000000</property> <property name="step_increment">1</property> </object> - <object class="GtkImage" id="imEdit"> - <property name="visible">True</property> - <property name="stock">gtk-edit</property> - <property name="icon-size">1</property> - </object> - <object class="GtkImage" id="imEdit1"> - <property name="visible">True</property> - <property name="stock">gtk-edit</property> - <property name="icon-size">1</property> - </object> <object class="GtkWindow" id="wGPGKeys"> <property name="title" translatable="yes">GPG Keys</property> <property name="modal">True</property> + <property name="window_position">center-on-parent</property> <property name="default_width">400</property> <property name="default_height">400</property> + <property name="transient_for">wGlobalSettings</property> <child> <object class="GtkVBox" id="gpgkeys_vbox"> <property name="visible">True</property> @@ -753,9 +768,11 @@ </packing> </child> <child> - <object class="GtkHBox" id="gpg_buttons_hbox"> + <object class="GtkHButtonBox" id="hbuttonboxblabla1"> <property name="visible">True</property> - <property name="homogeneous">True</property> + <property name="border_width">12</property> + <property name="spacing">12</property> + <property name="layout_style">end</property> <child> <object class="GtkButton" id="bAddGPGKey"> <property name="label">gtk-add</property> @@ -765,6 +782,8 @@ <property name="use_stock">True</property> </object> <packing> + <property name="expand">False</property> + <property name="fill">False</property> <property name="position">0</property> </packing> </child> @@ -777,6 +796,8 @@ <property name="use_stock">True</property> </object> <packing> + <property name="expand">False</property> + <property name="fill">False</property> <property name="position">1</property> </packing> </child> @@ -789,6 +810,8 @@ <property name="use_stock">True</property> </object> <packing> + <property name="expand">False</property> + <property name="fill">False</property> <property name="position">2</property> </packing> </child> @@ -801,16 +824,29 @@ <property name="use_stock">True</property> </object> <packing> + <property name="expand">False</property> + <property name="fill">False</property> <property name="position">3</property> </packing> </child> </object> <packing> <property name="expand">False</property> + <property name="fill">False</property> <property name="position">1</property> </packing> </child> </object> </child> </object> + <object class="GtkImage" id="imEdit"> + <property name="visible">True</property> + <property name="stock">gtk-edit</property> + <property name="icon-size">1</property> + </object> + <object class="GtkImage" id="imEdit1"> + <property name="visible">True</property> + <property name="stock">gtk-edit</property> + <property name="icon-size">1</property> + </object> </interface> diff --git a/src/Gui/settings_wizard.glade b/src/Gui/settings_wizard.glade index feab4351..e0d54a1e 100644 --- a/src/Gui/settings_wizard.glade +++ b/src/Gui/settings_wizard.glade @@ -5,24 +5,47 @@ <object class="GtkDialog" id="WrongSettings"> <property name="border_width">5</property> <property name="title" translatable="yes">Wrong Settings Detected</property> + <property name="resizable">False</property> + <property name="window_position">center-on-parent</property> <property name="type_hint">normal</property> <property name="has_separator">False</property> <child internal-child="vbox"> <object class="GtkVBox" id="dialog-vbox3"> <property name="visible">True</property> <property name="orientation">vertical</property> - <property name="spacing">2</property> + <property name="spacing">6</property> <child> <object class="GtkVBox" id="ws_vbox1"> <property name="visible">True</property> <property name="orientation">vertical</property> + <property name="spacing">6</property> <child> - <object class="GtkLabel" id="lWrongSettingsWarning"> + <object class="GtkHBox" id="hbox1"> <property name="visible">True</property> - <property name="label" translatable="yes"><b>WARNING:</b> Wrong settings detected for some of the enabled reporter plugins, please use the buttons below to open respective configuration and fix it before you proceed, otherwise the reporting process can fail. + <property name="spacing">12</property> + <child> + <object class="GtkImage" id="image1"> + <property name="visible">True</property> + <property name="stock">gtk-dialog-warning</property> + <property name="icon-size">6</property> + </object> + <packing> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="lWrongSettingsWarning"> + <property name="visible">True</property> + <property name="label" translatable="yes">Wrong settings detected for some of the enabled reporter plugins, please use the buttons below to open respective configuration and fix it before you proceed, otherwise the reporting process can fail. </property> - <property name="use_markup">True</property> - <property name="wrap">True</property> + <property name="use_markup">True</property> + <property name="justify">fill</property> + <property name="wrap">True</property> + </object> + <packing> + <property name="position">1</property> + </packing> + </child> </object> <packing> <property name="position">0</property> @@ -32,6 +55,7 @@ <object class="GtkVBox" id="vbWrongSettings"> <property name="visible">True</property> <property name="orientation">vertical</property> + <property name="spacing">6</property> <child> <placeholder/> </child> |