Skip to content

Commit

Permalink
Update Window and Menu item from "Preconfigured-" to "Saved-" Report …
Browse files Browse the repository at this point in the history 
…and add lables to the dialog with help texts
  • Loading branch information
@GnuFiBux @gjanssens
GnuFiBux authored and gjanssens committed Mar 10, 2014
1 parent faf05aa commit cebe4ed
Show file tree
Hide file tree
Showing 3 changed files with 85 additions and 33 deletions.
23 changes: 21 additions & 2 deletions src/report/report-gnome/dialog-custom-report.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -465,11 +465,11 @@ void custom_report_query_tooltip_cb (GtkTreeView *view,
{
gtk_tree_view_set_tooltip_cell (view, tooltip, path, column, NULL);
if (column == crd->runcol)
gtk_tooltip_set_text (tooltip, _("Run preconfigured report"));
gtk_tooltip_set_text (tooltip, _("Run saved report"));
else if (column == crd->editcol)
gtk_tooltip_set_text (tooltip, _("Edit configuration name"));
else if (column == crd->delcol)
gtk_tooltip_set_text (tooltip, _("Delete preconfigured report"));
gtk_tooltip_set_text (tooltip, _("Delete saved report"));
else
gtk_tooltip_set_text (tooltip, NULL);
}
Expand All @@ -482,6 +482,9 @@ static CustomReportDialog *gnc_ui_custom_report_internal(GncMainWindow * window)

GtkBuilder *builder;
CustomReportDialog *crd;
GtkTreeIter iter;
GtkTreeModel *model;
GtkWidget *no_report_notification;

crd = g_new0(CustomReportDialog, 1);

Expand All @@ -490,6 +493,7 @@ static CustomReportDialog *gnc_ui_custom_report_internal(GncMainWindow * window)

crd->dialog = GTK_WIDGET(gtk_builder_get_object (builder, "custom_report_dialog"));
crd->reportview = GTK_WIDGET(gtk_builder_get_object (builder, "custom_report_list_view"));
no_report_notification = GTK_WIDGET(gtk_builder_get_object (builder, "label2"));
set_reports_view_and_model(crd);
crd->window = window;

Expand All @@ -498,6 +502,21 @@ static CustomReportDialog *gnc_ui_custom_report_internal(GncMainWindow * window)

gtk_widget_show_all(crd->dialog);

/* check if there are currently saved reports available
* by checking if there is a first element */
model = gtk_tree_view_get_model (GTK_TREE_VIEW (crd->reportview));
if (gtk_tree_model_get_iter_first (model, &iter))
{
/* saved reports available
-> hide the "no reports available" notification */
gtk_widget_hide(no_report_notification);
}
else
{
/* hide the scrolled window of the report list */
gtk_widget_hide(crd->reportview);
}

g_object_unref(G_OBJECT(builder));

return crd;
Expand Down
91 changes: 62 additions & 29 deletions src/report/report-gnome/dialog-custom-report.glade
View file
Original file line number Diff line number Diff line change
@@ -1,47 +1,25 @@
<?xml version="1.0"?>
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<requires lib="gtk+" version="2.16"/>
<!-- interface-naming-policy project-wide -->
<object class="GtkDialog" id="custom_report_dialog">
<property name="can_focus">False</property>
<property name="border_width">5</property>
<property name="title" translatable="yes">Preconfigured Reports</property>
<property name="title" translatable="yes">Saved Reports</property>
<property name="window_position">center-on-parent</property>
<property name="type_hint">dialog</property>
<property name="skip_taskbar_hint">True</property>
<property name="skip_pager_hint">True</property>
<signal name="close" handler="custom_report_dialog_close_cb"/>
<signal name="close" handler="custom_report_dialog_close_cb" swapped="no"/>
<child internal-child="vbox">
<object class="GtkVBox" id="dialog-vbox1">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<property name="can_focus">False</property>
<property name="spacing">2</property>
<child>
<object class="GtkScrolledWindow" id="scrolledwindow1">
<property name="width_request">300</property>
<property name="height_request">150</property>
<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="GtkTreeView" id="custom_report_list_view">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="has_tooltip">True</property>
<property name="headers_visible">False</property>
<signal name="row_activated" handler="custom_report_list_view_row_activated_cb"/>
<signal name="button_release_event" handler="custom_report_list_view_clicked_cb"/>
<signal name="query_tooltip" handler="custom_report_query_tooltip_cb"/>
</object>
</child>
</object>
<packing>
<property name="position">1</property>
</packing>
</child>
<child internal-child="action_area">
<object class="GtkHButtonBox" id="dialog-action_area1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="layout_style">end</property>
<child>
<object class="GtkButton" id="close_report_button">
Expand All @@ -52,8 +30,9 @@
<property name="has_tooltip">True</property>
<property name="tooltip_markup">Exit the custom report dialog</property>
<property name="tooltip_text" translatable="yes">Exit the custom report dialog</property>
<property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
<signal name="clicked" handler="close_custom_report_clicked_cb"/>
<signal name="clicked" handler="close_custom_report_clicked_cb" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
Expand All @@ -64,10 +43,64 @@
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="pack_type">end</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkScrolledWindow" id="scrolledwindow1">
<property name="width_request">300</property>
<property name="height_request">150</property>
<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="GtkTreeView" id="custom_report_list_view">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="has_tooltip">True</property>
<property name="headers_visible">False</property>
<signal name="row-activated" handler="custom_report_list_view_row_activated_cb" swapped="no"/>
<signal name="button-release-event" handler="custom_report_list_view_clicked_cb" swapped="no"/>
<signal name="query-tooltip" handler="custom_report_query_tooltip_cb" swapped="no"/>
</object>
</child>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label2">
<property name="can_focus">False</property>
<property name="label" translatable="yes">
Currently you have no saved reports.
</property>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Saved reports are created by first opening a report from the Reports menu,
altering the report's options to your taste and then choosing "Save Report" from
the File menu or tool bar.</property>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">3</property>
</packing>
</child>
</object>
</child>
<action-widgets>
Expand Down
4 changes: 2 additions & 2 deletions src/report/report-gnome/report-gnome.scm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,9 +111,9 @@

(gnc-add-scm-extension
(gnc:make-menu-item
(N_ "Preconfigured Reports")
(N_ "Saved Reports")
"4d3dcdc8890b11df99dd94cddfd72085"
(N_ "Manage and run preconfigured reports")
(N_ "Manage and run saved reports")
(list gnc:menuname-reports)
(lambda (window)
(gnc:spawn-custom-report-dialog window))))
Expand Down

0 comments on commit cebe4ed

Please sign in to comment.