Signed-off-by: Jakub Filak <[email protected]>
---
src/gui-wizard-gtk/wizard.c | 31 ++++++++++++--
src/gui-wizard-gtk/wizard.glade | 89 +++------------------------------------
2 files changed, 33 insertions(+), 87 deletions(-)
diff --git a/src/gui-wizard-gtk/wizard.c b/src/gui-wizard-gtk/wizard.c
index 30c25ee..713e3d2 100644
--- a/src/gui-wizard-gtk/wizard.c
+++ b/src/gui-wizard-gtk/wizard.c
@@ -2455,9 +2455,7 @@ static void add_pages(void)
g_eb_comment = GTK_EVENT_BOX(
gtk_builder_get_object(g_builder, "eb_comment"));
g_cb_no_comment = GTK_CHECK_BUTTON(
gtk_builder_get_object(g_builder, "cb_no_comment"));
g_tv_details = GTK_TREE_VIEW(
gtk_builder_get_object(g_builder, "tv_details"));
- g_box_warning_labels = GTK_BOX(
gtk_builder_get_object(g_builder, "box_warning_labels"));
g_tb_approve_bt =
GTK_TOGGLE_BUTTON(gtk_builder_get_object(g_builder, "cb_approve_bt"));
- g_widget_warnings_area = GTK_WIDGET(
gtk_builder_get_object(g_builder, "box_warning_area"));
g_search_entry_bt = GTK_ENTRY(
gtk_builder_get_object(g_builder, "entry_search_bt"));
g_container_details1 = GTK_CONTAINER(
gtk_builder_get_object(g_builder, "container_details1"));
g_container_details2 = GTK_CONTAINER(
gtk_builder_get_object(g_builder, "container_details2"));
@@ -2469,7 +2467,6 @@ static void add_pages(void)
g_spinner_event_log = GTK_SPINNER(
gtk_builder_get_object(g_builder, "spinner_event_log"));
gtk_widget_set_no_show_all(GTK_WIDGET(g_spinner_event_log), true);
- gtk_widget_hide(g_widget_warnings_area);
gtk_widget_modify_font(GTK_WIDGET(g_tv_event_log), g_monospace_font);
fix_all_wrapped_labels(GTK_WIDGET(g_assistant));
@@ -2591,8 +2588,36 @@ void create_assistant(void)
gtk_box_pack_start(g_box_buttons, w, true, true, 5);
gtk_box_pack_start(g_box_buttons, g_btn_next, false, false, 5);
+ /* Warnings area widget definition start */
+ GtkWidget *alignment_top = gtk_alignment_new(0.5,0.5,1,1);
+ gtk_widget_set_visible(alignment_top, TRUE);
+
+ GtkWidget *alignment_bottom = gtk_alignment_new(0.5,0.5,1,1);
+ gtk_widget_set_visible(alignment_bottom, TRUE);
+
+ g_box_warning_labels = GTK_BOX(gtk_box_new(GTK_ORIENTATION_VERTICAL, 0));
+ gtk_widget_set_visible(GTK_WIDGET(g_box_warning_labels), TRUE);
+
+ GtkBox *vbox = GTK_BOX(gtk_box_new(GTK_ORIENTATION_VERTICAL, 0));
+ gtk_widget_set_visible(GTK_WIDGET(vbox), TRUE);
+ gtk_box_pack_start(vbox, alignment_top, false, false, 5);
+ gtk_box_pack_start(vbox, GTK_WIDGET(g_box_warning_labels), false, false,
5);
+ gtk_box_pack_start(vbox, alignment_bottom, false, false, 5);
+
+ GtkWidget *image = gtk_image_new_from_stock(GTK_STOCK_DIALOG_WARNING,
GTK_ICON_SIZE_DIALOG);
+ gtk_widget_set_visible(image, TRUE);
+
+ g_widget_warnings_area =
GTK_WIDGET(gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0));
+ gtk_widget_set_visible(g_widget_warnings_area, FALSE);
+ gtk_widget_set_no_show_all(g_widget_warnings_area, TRUE);
+ gtk_box_pack_start(GTK_BOX(g_widget_warnings_area), image, false, false,
5);
+ gtk_box_pack_start(GTK_BOX(g_widget_warnings_area), GTK_WIDGET(vbox),
false, false, 5);
+ /* Warnings area widget definition end */
+
g_box_assistant = GTK_BOX(gtk_box_new(GTK_ORIENTATION_VERTICAL, 0));
gtk_box_pack_start(g_box_assistant, GTK_WIDGET(g_assistant), true, true,
5);
+
+ gtk_box_pack_start(g_box_assistant, GTK_WIDGET(g_widget_warnings_area),
false, false, 5);
gtk_box_pack_start(g_box_assistant, GTK_WIDGET(g_box_buttons), false,
false, 5);
gtk_widget_show_all(GTK_WIDGET(g_box_buttons));
diff --git a/src/gui-wizard-gtk/wizard.glade b/src/gui-wizard-gtk/wizard.glade
index 41924eb..782cf4a 100644
--- a/src/gui-wizard-gtk/wizard.glade
+++ b/src/gui-wizard-gtk/wizard.glade
@@ -159,6 +159,7 @@
<child>
<object class="GtkCheckButton" id="cb_no_comment">
<property name="label" translatable="yes">I don't know what caused
this problem</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -204,6 +205,7 @@
<child>
<object class="GtkButton" id="button_cfg1">
<property name="label">gtk-preferences</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -302,90 +304,7 @@
<property name="can_focus">False</property>
<property name="border_width">5</property>
<child>
- <object class="GtkHBox" id="box_warning_area">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="no_show_all">True</property>
- <child>
- <object class="GtkImage" id="image1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="stock">gtk-dialog-warning</property>
- <property name="icon-size">6</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkVBox" id="vbox6">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <object class="GtkAlignment" id="alignment1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <placeholder/>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkVBox" id="box_warning_labels">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkAlignment" id="alignment2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <placeholder/>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="padding">1</property>
- <property name="position">2</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="padding">1</property>
- <property name="position">0</property>
- </packing>
+ <placeholder/>
</child>
<child>
<object class="GtkVBox" id="vbox5">
@@ -553,6 +472,7 @@
<child>
<object class="GtkButton" id="btn_add_file">
<property name="label" translatable="yes">Attach a
file</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -577,6 +497,7 @@
<child>
<object class="GtkCheckButton" id="cb_approve_bt">
<property name="label" translatable="yes">I reviewed the data and
_agree with submitting it</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
--
1.7.10.2
