diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2010-02-04 16:36:01 +0100 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2010-02-04 16:36:01 +0100 |
| commit | b634e1a482f6871bb4e128f3bc23456f09f85547 (patch) | |
| tree | 9f26e4db8ff0033d3ba24fe4190b90d7b4889564 /src/Gui | |
| parent | c45047c5414d2b24b6d1182179509a1efc55846e (diff) | |
| parent | f42baa45204bfb1df7219242d7ebcc102ad494be (diff) | |
Merge branch 'master' into rhel6
Diffstat (limited to 'src/Gui')
| -rw-r--r-- | src/Gui/ccgui.glade | 2 | ||||
| -rw-r--r-- | src/Gui/report.glade | 24 | ||||
| -rw-r--r-- | src/Gui/settings.glade | 11 |
3 files changed, 15 insertions, 22 deletions
diff --git a/src/Gui/ccgui.glade b/src/Gui/ccgui.glade index 2b9cdbe..78e5fd9 100644 --- a/src/Gui/ccgui.glade +++ b/src/Gui/ccgui.glade @@ -9,6 +9,7 @@ <property name="modal">True</property> <property name="window_position">center-on-parent</property> <property name="default_width">470</property> + <property name="icon">/usr/share/pixmaps/abrt.png</property> <property name="transient_for">main_window3</property> <child> <widget class="GtkVBox" id="vbox1"> @@ -76,6 +77,7 @@ <property name="title" translatable="yes">About ABRT</property> <property name="resizable">False</property> <property name="window_position">center-on-parent</property> + <property name="icon">/usr/share/pixmaps/abrt.png</property> <property name="type_hint">dialog</property> <property name="has_separator">False</property> <property name="program_name">ABRT</property> diff --git a/src/Gui/report.glade b/src/Gui/report.glade index 13e4c14..e7f37ec 100644 --- a/src/Gui/report.glade +++ b/src/Gui/report.glade @@ -374,16 +374,10 @@ <property name="hscrollbar_policy">automatic</property> <property name="vscrollbar_policy">automatic</property> <child> - <object class="GtkViewport" id="viewport1"> + <object class="GtkTextView" id="tevHowToReproduce"> <property name="visible">True</property> - <property name="resize_mode">queue</property> - <child> - <object class="GtkTextView" id="tevHowToReproduce"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="wrap_mode">word-char</property> - </object> - </child> + <property name="can_focus">True</property> + <property name="wrap_mode">word-char</property> </object> </child> </object> @@ -417,16 +411,10 @@ <property name="hscrollbar_policy">automatic</property> <property name="vscrollbar_policy">automatic</property> <child> - <object class="GtkViewport" id="viewport2"> + <object class="GtkTextView" id="tvComment"> <property name="visible">True</property> - <property name="resize_mode">queue</property> - <child> - <object class="GtkTextView" id="tvComment"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="wrap_mode">word-char</property> - </object> - </child> + <property name="can_focus">True</property> + <property name="wrap_mode">word-char</property> </object> </child> </object> diff --git a/src/Gui/settings.glade b/src/Gui/settings.glade index 655c15b..a9a14f4 100644 --- a/src/Gui/settings.glade +++ b/src/Gui/settings.glade @@ -3,11 +3,12 @@ <requires lib="gtk+" version="2.16"/> <!-- interface-naming-policy project-wide --> <object class="GtkWindow" id="wPluginsSettings"> - <property name="title" translatable="yes">Settings</property> + <property name="title" translatable="yes">Plugins</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> + <property name="icon">/usr/share/pixmaps/abrt.png</property> <child> <object class="GtkVBox" id="vboxabc1"> <property name="visible">True</property> @@ -254,11 +255,12 @@ </child> </object> <object class="GtkWindow" id="wGlobalSettings"> - <property name="title" translatable="yes">Global Settings</property> + <property name="title" translatable="yes">Preferences</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> + <property name="icon">/usr/share/pixmaps/abrt.png</property> <child> <object class="GtkVBox" id="gsvbox1"> <property name="visible">True</property> @@ -706,7 +708,7 @@ <property name="layout_style">end</property> <child> <object class="GtkButton" id="bCancelSettings"> - <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> @@ -720,7 +722,7 @@ </child> <child> <object class="GtkButton" id="bSaveSettings"> - <property name="label" translatable="yes">gtk-ok</property> + <property name="label">gtk-ok</property> <property name="visible">True</property> <property name="sensitive">False</property> <property name="can_focus">True</property> @@ -753,6 +755,7 @@ <property name="window_position">center-on-parent</property> <property name="default_width">400</property> <property name="default_height">400</property> + <property name="icon">/usr/share/pixmaps/abrt.png</property> <property name="transient_for">wGlobalSettings</property> <child> <object class="GtkVBox" id="gpgkeys_vbox"> |