--- src/gui-wizard-gtk/wizard.c | 38 +++++++---- src/gui-wizard-gtk/wizard.glade | 140 +++++++++++++++++++++++++++++++++++++-- 2 files changed, 159 insertions(+), 19 deletions(-)
diff --git a/src/gui-wizard-gtk/wizard.c b/src/gui-wizard-gtk/wizard.c index aba044e..63cc6c6 100644 --- a/src/gui-wizard-gtk/wizard.c +++ b/src/gui-wizard-gtk/wizard.c @@ -96,19 +96,25 @@ static PangoFontDescription *monospace_font;
/* THE PAGE FLOW - * page_5: user comments - * page_1: analyze action selection - * page_2: analyze progress - * page_3: reporter selection - * page_4: backtrace editor - * page_6: summary - * page_7: reporting progress + * page_0: introduction/summary + * page_1: user comments + * page_2: analyze action selection + * page_3: analyze progress + * page_4: file collect selection + * page_5: collect progress + * page_6: reporter selection + * page_7: backtrace editor + * page_8: summary + * page_9: reporting progress + * page_10: finished */ enum { PAGENO_SUMMARY, PAGENO_EDIT_COMMENT, PAGENO_ANALYZE_SELECTOR, PAGENO_ANALYZE_PROGRESS, + PAGENO_COLLECT_SELECTOR, + PAGENO_COLLECT_PROGRESS, PAGENO_REPORTER_SELECTOR, PAGENO_EDIT_BACKTRACE, PAGENO_REVIEW_DATA, @@ -126,12 +132,14 @@ static const gchar PAGE_SUMMARY[] = "page_0"; static const gchar PAGE_EDIT_COMMENT[] = "page_1"; static const gchar PAGE_ANALYZE_SELECTOR[] = "page_2"; static const gchar PAGE_ANALYZE_PROGRESS[] = "page_3"; -static const gchar PAGE_REPORTER_SELECTOR[] = "page_4_report"; -static const gchar PAGE_EDIT_BACKTRACE[] = "page_5"; -static const gchar PAGE_REVIEW_DATA[] = "page_6_report"; -static const gchar PAGE_REPORT_PROGRESS[] = "page_7_report"; -static const gchar PAGE_REPORT_DONE[] = "page_8_report"; -static const gchar PAGE_NOT_SHOWN[] = "page_9_report"; +static const gchar PAGE_COLLECT_SELECTOR[] = "page_4"; +static const gchar PAGE_COLLECT_PROGRESS[] = "page_5"; +static const gchar PAGE_REPORTER_SELECTOR[] = "page_6_report"; +static const gchar PAGE_EDIT_BACKTRACE[] = "page_7"; +static const gchar PAGE_REVIEW_DATA[] = "page_8_report"; +static const gchar PAGE_REPORT_PROGRESS[] = "page_9_report"; +static const gchar PAGE_REPORT_DONE[] = "page_10_report"; +static const gchar PAGE_NOT_SHOWN[] = "page_11_report";
static const gchar *const page_names[] = { @@ -139,6 +147,8 @@ static const gchar *const page_names[] = PAGE_EDIT_COMMENT, PAGE_ANALYZE_SELECTOR, PAGE_ANALYZE_PROGRESS, + PAGE_COLLECT_SELECTOR, + PAGE_COLLECT_PROGRESS, PAGE_REPORTER_SELECTOR, PAGE_EDIT_BACKTRACE, PAGE_REVIEW_DATA, @@ -174,6 +184,8 @@ static page_obj_t pages[] = { PAGE_EDIT_COMMENT,"Provide additional information", GTK_ASSISTANT_PAGE_CONTENT }, { PAGE_ANALYZE_SELECTOR , "Select analyzer" , GTK_ASSISTANT_PAGE_CONFIRM }, { PAGE_ANALYZE_PROGRESS , "Analyzing" , GTK_ASSISTANT_PAGE_INTRO }, + { PAGE_COLLECT_SELECTOR , "Select collector" , GTK_ASSISTANT_PAGE_CONFIRM }, + { PAGE_COLLECT_PROGRESS , "Collecting" , GTK_ASSISTANT_PAGE_INTRO }, /* Some reporters don't need backtrace, we can skip bt page for them. * Therefore we want to know reporters _before_ we go to bt page */ diff --git a/src/gui-wizard-gtk/wizard.glade b/src/gui-wizard-gtk/wizard.glade index aeca16c..c57b13d 100644 --- a/src/gui-wizard-gtk/wizard.glade +++ b/src/gui-wizard-gtk/wizard.glade @@ -294,10 +294,138 @@ </object> </child> </object> + <object class="GtkWindow" id="window10"> + <property name="can_focus">False</property> + <child> + <object class="GtkVBox" id="page_4"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="border_width">10</property> + <property name="spacing">3</property> + <child> + <object class="GtkLabel" id="lbl_page7"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Select additional files to attach to the report:</property> + <property name="use_markup">True</property> + <property name="justify">fill</property> + <property name="wrap">True</property> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkVBox" id="vb_collectors"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <placeholder/> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkHBox" id="hbox4"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkButton" id="button_cfg3"> + <property name="label" translatable="yes">Configure _Events</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_action_appearance">False</property> + <property name="use_underline">True</property> + <property name="image_position">right</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkAlignment" id="alignment5"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <placeholder/> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</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> + </packing> + </child> + </object> + </child> + </object> + <object class="GtkWindow" id="window11"> + <property name="can_focus">False</property> + <child> + <object class="GtkVBox" id="page_5"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="border_width">10</property> + <property name="spacing">3</property> + <child> + <object class="GtkLabel" id="lbl_collect_log"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Collecting did not start yet</property> + <property name="use_markup">True</property> + <property name="wrap">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkScrolledWindow" id="scrolledwindow7"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="shadow_type">GTK_SHADOW_OUT</property> + <child> + <object class="GtkTextView" id="tv_collect_log"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="editable">False</property> + <property name="accepts_tab">False</property> + </object> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + </child> + </object> <object class="GtkWindow" id="window4"> <property name="can_focus">False</property> <child> - <object class="GtkVBox" id="page_4_report"> + <object class="GtkVBox" id="page_6_report"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="border_width">10</property> @@ -380,7 +508,7 @@ <property name="can_focus">False</property> <property name="tooltip_text" translatable="yes">Use this button to generate more informative backtrace after you installed additional debug packages</property> <child> - <object class="GtkVBox" id="page_5"> + <object class="GtkVBox" id="page_7"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="border_width">10</property> @@ -562,7 +690,7 @@ <object class="GtkWindow" id="window6"> <property name="can_focus">False</property> <child> - <object class="GtkVBox" id="page_6_report"> + <object class="GtkVBox" id="page_8_report"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="border_width">10</property> @@ -721,7 +849,7 @@ <object class="GtkWindow" id="window7"> <property name="can_focus">False</property> <child> - <object class="GtkVBox" id="page_7_report"> + <object class="GtkVBox" id="page_9_report"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="border_width">10</property> @@ -767,7 +895,7 @@ <object class="GtkWindow" id="window8"> <property name="can_focus">False</property> <child> - <object class="GtkVBox" id="page_8_report"> + <object class="GtkVBox" id="page_10_report"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="border_width">10</property> @@ -811,7 +939,7 @@ <object class="GtkWindow" id="window9"> <property name="can_focus">False</property> <child> - <object class="GtkVBox" id="page_9_report"> + <object class="GtkVBox" id="page_11_report"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="border_width">10</property>