[ABRT PATCH 4/5] GUI config: hide option descriptions in tool tips

Jakub Filak jfilak at redhat.com
Wed Aug 14 12:43:08 UTC 2013


Closes rhbz#993592

Signed-off-by: Jakub Filak <jfilak at redhat.com>
---
 src/configuration-gui/abrt-config-widget.ui | 173 ++++++++++++++--------------
 src/configuration-gui/main.c                |   2 +-
 src/configuration-gui/system-config-abrt.c  |   2 +-
 3 files changed, 91 insertions(+), 86 deletions(-)

diff --git a/src/configuration-gui/abrt-config-widget.ui b/src/configuration-gui/abrt-config-widget.ui
index 2b8f010..76f4b82 100644
--- a/src/configuration-gui/abrt-config-widget.ui
+++ b/src/configuration-gui/abrt-config-widget.ui
@@ -12,39 +12,20 @@
         <property name="margin_top">10</property>
         <property name="margin_bottom">10</property>
         <property name="row_homogeneous">True</property>
-        <property name="column_homogeneous">True</property>
-        <child>
-          <object class="GtkLabel" id="label1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="halign">start</property>
-            <property name="ypad">10</property>
-            <property name="label" translatable="yes">Ask before uploading coredump</property>
-            <attributes>
-              <attribute name="weight" value="bold"/>
-            </attributes>
-          </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">0</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
-        </child>
         <child>
           <object class="GtkLabel" id="label2">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="halign">start</property>
+            <property name="hexpand">True</property>
             <property name="ypad">10</property>
             <property name="label" translatable="yes">Ask before stealing directory</property>
-            <attributes>
-              <attribute name="weight" value="bold"/>
-            </attributes>
+            <signal name="enter-notify-event" handler="label_enter_notify_event_cb" swapped="no"/>
+            <signal name="leave-notify-event" handler="label_leave_notify_event_cb" swapped="no"/>
           </object>
           <packing>
             <property name="left_attach">0</property>
-            <property name="top_attach">2</property>
+            <property name="top_attach">1</property>
             <property name="width">1</property>
             <property name="height">1</property>
           </packing>
@@ -54,15 +35,15 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="halign">start</property>
+            <property name="hexpand">True</property>
             <property name="ypad">10</property>
             <property name="label" translatable="yes">Automatically send uReport</property>
-            <attributes>
-              <attribute name="weight" value="bold"/>
-            </attributes>
+            <signal name="enter-notify-event" handler="label_enter_notify_event_cb" swapped="no"/>
+            <signal name="leave-notify-event" handler="label_leave_notify_event_cb" swapped="no"/>
           </object>
           <packing>
             <property name="left_attach">0</property>
-            <property name="top_attach">4</property>
+            <property name="top_attach">2</property>
             <property name="width">1</property>
             <property name="height">1</property>
           </packing>
@@ -73,6 +54,7 @@
             <property name="can_focus">True</property>
             <property name="halign">end</property>
             <property name="valign">center</property>
+            <property name="margin_left">10</property>
           </object>
           <packing>
             <property name="left_attach">1</property>
@@ -87,10 +69,11 @@
             <property name="can_focus">True</property>
             <property name="halign">end</property>
             <property name="valign">center</property>
+            <property name="margin_left">10</property>
           </object>
           <packing>
             <property name="left_attach">1</property>
-            <property name="top_attach">2</property>
+            <property name="top_attach">1</property>
             <property name="width">1</property>
             <property name="height">1</property>
           </packing>
@@ -101,10 +84,11 @@
             <property name="can_focus">True</property>
             <property name="halign">end</property>
             <property name="valign">center</property>
+            <property name="margin_left">10</property>
           </object>
           <packing>
             <property name="left_attach">1</property>
-            <property name="top_attach">4</property>
+            <property name="top_attach">2</property>
             <property name="width">1</property>
             <property name="height">1</property>
           </packing>
@@ -114,15 +98,15 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="halign">start</property>
+            <property name="hexpand">True</property>
             <property name="ypad">10</property>
             <property name="label" translatable="yes">Shortened reporting</property>
-            <attributes>
-              <attribute name="weight" value="bold"/>
-            </attributes>
+            <signal name="enter-notify-event" handler="label_enter_notify_event_cb" swapped="no"/>
+            <signal name="leave-notify-event" handler="label_leave_notify_event_cb" swapped="no"/>
           </object>
           <packing>
             <property name="left_attach">0</property>
-            <property name="top_attach">6</property>
+            <property name="top_attach">3</property>
             <property name="width">1</property>
             <property name="height">1</property>
           </packing>
@@ -133,123 +117,144 @@
             <property name="can_focus">True</property>
             <property name="halign">end</property>
             <property name="valign">center</property>
+            <property name="margin_left">10</property>
+          </object>
+          <packing>
+            <property name="left_attach">1</property>
+            <property name="top_attach">3</property>
+            <property name="width">1</property>
+            <property name="height">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkSwitch" id="switch_silent_shortened_reporting">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="halign">end</property>
+            <property name="valign">center</property>
+            <property name="margin_left">10</property>
           </object>
           <packing>
             <property name="left_attach">1</property>
-            <property name="top_attach">6</property>
+            <property name="top_attach">4</property>
             <property name="width">1</property>
             <property name="height">1</property>
           </packing>
         </child>
         <child>
-          <object class="GtkLabel" id="label5">
+          <object class="GtkLabel" id="label9">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="halign">start</property>
-            <property name="valign">start</property>
-            <property name="label" translatable="yes">The coredump file is necessary for generating stack trace which is time and space consuming operation. ABRT provides a service which generates the stack trace from the coredump but you have to upload the coredump to this service. With this option disabled ABRT will upload the coredump without asking.</property>
-            <property name="wrap">True</property>
+            <property name="hexpand">True</property>
+            <property name="ypad">10</property>
+            <property name="label" translatable="yes">Silent shortened reporting</property>
+            <signal name="enter-notify-event" handler="label_enter_notify_event_cb" swapped="no"/>
+            <signal name="leave-notify-event" handler="label_leave_notify_event_cb" swapped="no"/>
           </object>
           <packing>
             <property name="left_attach">0</property>
-            <property name="top_attach">1</property>
-            <property name="width">2</property>
+            <property name="top_attach">4</property>
+            <property name="width">1</property>
             <property name="height">1</property>
           </packing>
         </child>
         <child>
-          <object class="GtkLabel" id="label6">
+          <object class="GtkImage" id="image1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="halign">start</property>
-            <property name="valign">start</property>
-            <property name="label" translatable="yes">ABRT stores problem data in directories. Whenever ABRT needs writable directory, the directory is moved from the system location to your home directory. With this option disabled ABRT will move the problem directory without asking.</property>
-            <property name="wrap">True</property>
+            <property name="tooltip_text" translatable="yes">The coredump file is necessary for generating stack trace which is time and space consuming operation. ABRT provides a service which generates the stack trace from the coredump but you have to upload the coredump to this service. With this option disabled ABRT will upload the coredump without asking.</property>
+            <property name="halign">end</property>
+            <property name="margin_left">5</property>
+            <property name="margin_right">1</property>
+            <property name="stock">gtk-dialog-question</property>
           </object>
           <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">3</property>
-            <property name="width">2</property>
+            <property name="left_attach">2</property>
+            <property name="top_attach">0</property>
+            <property name="width">1</property>
             <property name="height">1</property>
           </packing>
         </child>
         <child>
-          <object class="GtkLabel" id="label7">
+          <object class="GtkImage" id="image2">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="halign">start</property>
-            <property name="valign">start</property>
-            <property name="label" translatable="yes">uReport is short and completely anonymous description of a problem. ABRT uses uReports  for fast global duplicate detection. In default configuration uReport is sent at beginning of reporting process. With this option enabled uReports are sent automatically immediately after problem detection.</property>
-            <property name="wrap">True</property>
+            <property name="tooltip_text" translatable="yes">ABRT stores problem data in directories. Whenever ABRT needs writable directory, the directory is moved from the system location to your home directory. With this option disabled ABRT will move the problem directory without asking.</property>
+            <property name="halign">end</property>
+            <property name="margin_left">5</property>
+            <property name="stock">gtk-dialog-question</property>
           </object>
           <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">5</property>
-            <property name="width">2</property>
+            <property name="left_attach">2</property>
+            <property name="top_attach">1</property>
+            <property name="width">1</property>
             <property name="height">1</property>
           </packing>
         </child>
         <child>
-          <object class="GtkLabel" id="label8">
+          <object class="GtkImage" id="image3">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="halign">start</property>
-            <property name="valign">start</property>
-            <property name="label" translatable="yes">With this option enabled reporting process started by click on Report button in problem notification bubble will be interrupted after uReport is sent. You can always use the default problem browser to make complete report.</property>
-            <property name="wrap">True</property>
+            <property name="tooltip_text" translatable="yes">uReport is short and completely anonymous description of a problem. ABRT uses uReports  for fast global duplicate detection. In default configuration uReport is sent at beginning of reporting process. With this option enabled uReports are sent automatically immediately after problem detection.</property>
+            <property name="halign">end</property>
+            <property name="margin_left">5</property>
+            <property name="stock">gtk-dialog-question</property>
           </object>
           <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">7</property>
-            <property name="width">2</property>
+            <property name="left_attach">2</property>
+            <property name="top_attach">2</property>
+            <property name="width">1</property>
             <property name="height">1</property>
           </packing>
         </child>
         <child>
-          <object class="GtkSwitch" id="switch_silent_shortened_reporting">
+          <object class="GtkImage" id="image4">
             <property name="visible">True</property>
-            <property name="can_focus">True</property>
+            <property name="can_focus">False</property>
+            <property name="tooltip_text" translatable="yes">With this option enabled reporting process started by click on Report button in problem notification bubble will be interrupted after uReport is sent. You can always use the default problem browser to make complete report.</property>
             <property name="halign">end</property>
-            <property name="valign">center</property>
+            <property name="margin_left">5</property>
+            <property name="stock">gtk-dialog-question</property>
           </object>
           <packing>
-            <property name="left_attach">1</property>
-            <property name="top_attach">8</property>
+            <property name="left_attach">2</property>
+            <property name="top_attach">3</property>
             <property name="width">1</property>
             <property name="height">1</property>
           </packing>
         </child>
         <child>
-          <object class="GtkLabel" id="label9">
+          <object class="GtkImage" id="image5">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="halign">start</property>
-            <property name="ypad">10</property>
-            <property name="label" translatable="yes">Silent shortened reporting</property>
-            <attributes>
-              <attribute name="weight" value="bold"/>
-            </attributes>
+            <property name="tooltip_text" translatable="yes"> With this option enabled ABRT never shows notifications of reported problems. Takes effect only if Shortened reporting is enabled.</property>
+            <property name="halign">end</property>
+            <property name="margin_left">5</property>
+            <property name="stock">gtk-dialog-question</property>
           </object>
           <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">8</property>
+            <property name="left_attach">2</property>
+            <property name="top_attach">4</property>
             <property name="width">1</property>
             <property name="height">1</property>
           </packing>
         </child>
         <child>
-          <object class="GtkLabel" id="label10">
+          <object class="GtkLabel" id="label1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="halign">start</property>
-            <property name="valign">start</property>
-            <property name="label" translatable="yes"> With this option enabled ABRT never shows notifications of reported problems. Takes effect only if Shortened reporting is enabled.</property>
-            <property name="wrap">True</property>
+            <property name="hexpand">True</property>
+            <property name="ypad">10</property>
+            <property name="label" translatable="yes">Ask before uploading coredump</property>
+            <signal name="enter-notify-event" handler="label_enter_notify_event_cb" swapped="no"/>
+            <signal name="leave-notify-event" handler="label_leave_notify_event_cb" swapped="no"/>
           </object>
           <packing>
             <property name="left_attach">0</property>
-            <property name="top_attach">9</property>
-            <property name="width">2</property>
+            <property name="top_attach">0</property>
+            <property name="width">1</property>
             <property name="height">1</property>
           </packing>
         </child>
diff --git a/src/configuration-gui/main.c b/src/configuration-gui/main.c
index 15e0796..b07b852 100644
--- a/src/configuration-gui/main.c
+++ b/src/configuration-gui/main.c
@@ -26,7 +26,7 @@ static GtkWidget *
 system_config_abrt_window_new(GApplication *app)
 {
     GtkWidget *wnd = gtk_application_window_new(GTK_APPLICATION(app));
-    gtk_window_set_default_size(GTK_WINDOW(wnd), 640, 480);
+    gtk_window_set_default_size(GTK_WINDOW(wnd), 500, 300);
     gtk_window_set_title(GTK_WINDOW(wnd), _("Problem Reporting Configuration"));
 
     GtkWidget *sca = system_config_abrt_widget_new();
diff --git a/src/configuration-gui/system-config-abrt.c b/src/configuration-gui/system-config-abrt.c
index f15ce01..8945a48 100644
--- a/src/configuration-gui/system-config-abrt.c
+++ b/src/configuration-gui/system-config-abrt.c
@@ -91,7 +91,7 @@ void show_system_config_abrt_dialog(GtkWindow *parent)
     GtkWidget *dialog = gtk_dialog_new();
 
     gtk_window_set_title(GTK_WINDOW(dialog), _("Problem Reporting Configuration"));
-    gtk_window_set_default_size(GTK_WINDOW(dialog), 640, 480);
+    gtk_window_set_default_size(GTK_WINDOW(dialog), 500, 300);
     gtk_window_set_modal(GTK_WINDOW(dialog), TRUE);
 
     if (parent != NULL)
-- 
1.8.3.1



More information about the Crash-catcher mailing list