IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Saved report configuration ui tuning

Browse Source 
- Settle for 'Saved report configuration' as name of the beast
  in favour of 'Custom report' (ambiguous with full scheme reports added by the user)
  or 'Saved report' (ambiguous with exported html reports)
  or 'Preconfigured report' (which I personally like better but got criticisms)
- Group menu items related to saved report configurations together
  in the Report menu
This commit is contained in:
Geert Janssens 2014-03-10 18:25:57 +01:00
parent cebe4ed90a
commit 7235751eb3
6 changed files with 29 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/gnome-utils/ui/gnc-main-window-ui.xml
View File

@ -89,14 +89,12 @@
<menu name="Reports" action="ReportsAction">
<placeholder name="StandardReports"/>
<separator name="ReportSep1"/>
<placeholder name="CustomReports"/>
<placeholder name="SavedReportConfigs"/>
<separator name="ReportSep2"/>
<placeholder name="CustomReports"/>
<separator name="ReportSep3"/>
<placeholder name="AccountReports"/>
<separator name="ReportSep4"/>
<separator name="ReportSep3"/>
<placeholder name="OtherReports"/>
<separator name="ReportSep5"/>
<separator name="ReportSep4"/>
</menu>
<menu name="Tools" action="ToolsAction">

14
src/report/report-gnome/dialog-custom-report.c
View File

@ -409,7 +409,7 @@ custom_report_list_view_clicked_cb(GtkTreeView *view, GdkEventButton *event, gpo
{
if (column == crd->runcol)
{
SCM guid = get_custom_report_selection(crd, _("You must select a report to run."));
SCM guid = get_custom_report_selection(crd, _("You must select a report configuration to load."));
custom_report_run_report (guid, crd);
}
else if (column == crd->editcol)
@ -420,7 +420,7 @@ custom_report_list_view_clicked_cb(GtkTreeView *view, GdkEventButton *event, gpo
}
else if (column == crd->delcol)
{
SCM guid = get_custom_report_selection(crd, _("You must select a report to delete."));
SCM guid = get_custom_report_selection(crd, _("You must select a report configuration to delete."));
custom_report_delete (guid, crd);
}
}
@ -429,7 +429,7 @@ custom_report_list_view_clicked_cb(GtkTreeView *view, GdkEventButton *event, gpo
void custom_report_name_edited_cb(GtkCellRendererText *renderer, gchar *path, gchar *new_text, gpointer data)
{
CustomReportDialog *crd = data;
SCM guid = get_custom_report_selection(crd, _("Unable to change report name."));
SCM guid = get_custom_report_selection(crd, _("Unable to change report configuration name."));
SCM unique_name_func = scm_c_eval_string("gnc:report-template-has-unique-name?");
SCM new_name_scm = scm_from_utf8_string(new_text);
@ -441,7 +441,7 @@ void custom_report_name_edited_cb(GtkCellRendererText *renderer, gchar *path, gc
custom_report_edit_report_name (guid, crd, new_text);
else
gnc_error_dialog(crd->dialog, "%s",
_("A custom report with this name already exists, please choose another name.") );
_("A saved report configuration with this name already exists, please choose another name.") );
}
@ -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 saved report"));
gtk_tooltip_set_text (tooltip, _("Load report configuration"));
else if (column == crd->editcol)
gtk_tooltip_set_text (tooltip, _("Edit configuration name"));
gtk_tooltip_set_text (tooltip, _("Edit report configuration name"));
else if (column == crd->delcol)
gtk_tooltip_set_text (tooltip, _("Delete saved report"));
gtk_tooltip_set_text (tooltip, _("Delete report configuration"));
else
gtk_tooltip_set_text (tooltip, NULL);
}

12
src/report/report-gnome/dialog-custom-report.glade
View File

@ -5,7 +5,7 @@
<object class="GtkDialog" id="custom_report_dialog">
<property name="can_focus">False</property>
<property name="border_width">5</property>
<property name="title" translatable="yes">Saved Reports</property>
<property name="title" translatable="yes">Saved Report Configurations</property>
<property name="window_position">center-on-parent</property>
<property name="type_hint">dialog</property>
<property name="skip_taskbar_hint">True</property>
@ -28,8 +28,8 @@
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<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="tooltip_markup">Exit the saved report configurations dialog</property>
<property name="tooltip_text" translatable="yes">Exit the saved report configurations dialog</property>
<property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
<signal name="clicked" handler="close_custom_report_clicked_cb" swapped="no"/>
@ -91,9 +91,9 @@ Currently you have no saved reports.
<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>
<property name="label" translatable="yes">Saved report configurations are created by first opening a report from the Reports menu,
altering the report's options to your taste and then choosing "Save Report Configuration" from
the Reports menu or tool bar.</property>
</object>
<packing>
<property name="expand">True</property>

11
src/report/report-gnome/gnc-plugin-page-report-ui.xml
View File

@ -1,10 +1,6 @@
<ui>
<menubar>
<menu name="File" action="FileAction">
<placeholder name="FileSavePlaceholder">
<menuitem name="FileReportSave" action="ReportSaveAction" />
<menuitem name="FileReportSaveAs" action="ReportSaveAsAction" />
</placeholder>
<placeholder name="FilePrintPlaceholder">
<menuitem name="FileExportPDF" action="FilePrintPDFAction"/>
</placeholder>
@ -20,6 +16,13 @@
<menuitem name="EditReportOptions" action="ReportOptionsAction" />
</placeholder>
</menu>
<menu name="Reports" action="ReportsAction">
<placeholder name="SavedReportConfigs">
<menuitem name="ReportSaveConfig" action="ReportSaveAction" />
<menuitem name="ReportSaveConfigAs" action="ReportSaveAsAction" />
</placeholder>
</menu>
</menubar>
<popup name="MainPopup" action="FakeToplevel">

6
src/report/report-gnome/gnc-plugin-page-report.c
View File

@ -1028,14 +1028,14 @@ static GtkActionEntry report_actions[] =
G_CALLBACK (gnc_plugin_page_report_reload_cb)
},
{
"ReportSaveAction", GTK_STOCK_SAVE, N_("Save _Report"), "<control><alt>s",
"ReportSaveAction", GTK_STOCK_SAVE, N_("Save _Report Configuration"), "<control><alt>s",
N_("Update the current report's saved configuration. "
"The report will be saved in the file ~/.gnucash/saved-reports-2.4. "),
G_CALLBACK(gnc_plugin_page_report_save_cb)
},
{
"ReportSaveAsAction", GTK_STOCK_SAVE_AS, N_("Save Report As..."), "<control><alt><shift>s",
N_("Add the current report's configuration to the `Preconfigured Reports' menu. "
"ReportSaveAsAction", GTK_STOCK_SAVE_AS, N_("Save Report Configuration As..."), "<control><alt><shift>s",
N_("Add the current report's configuration to the `Saved Report Configurations' menu. "
"The report will be saved in the file ~/.gnucash/saved-reports-2.4. "),
G_CALLBACK(gnc_plugin_page_report_save_as_cb)
},

6
src/report/report-gnome/report-gnome.scm
View File

@ -111,10 +111,10 @@
(gnc-add-scm-extension
(gnc:make-menu-item
(N_ "Saved Reports")
(N_ "Saved Report Configurations")
"4d3dcdc8890b11df99dd94cddfd72085"
(N_ "Manage and run saved reports")
(list gnc:menuname-reports)
(N_ "Manage and run saved report configurations")
(list "Reports/SavedReportConfigs")
(lambda (window)
(gnc:spawn-custom-report-dialog window))))