diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2015-05-19 13:58:13 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2015-05-19 13:59:16 +0200 |
| commit | 76c61ced4eaa5f69b948dca7537028eaa88225b3 (patch) | |
| tree | ed8d00436051f02e73456af547cbf4a2a4a5382b /svtools | |
| parent | 4ab498fd50d94f2d84b5794f0a75d621a701e622 (diff) | |
check for and handle missing base in mail merge (related: fdo#33266)
Change-Id: I3e362a873c28026cbecf005c07def1295aa920e0
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/source/dialogs/restartdialog.cxx | 3 | ||||
| -rw-r--r-- | svtools/uiconfig/ui/restartdialog.ui | 15 |
2 files changed, 18 insertions, 0 deletions
diff --git a/svtools/source/dialogs/restartdialog.cxx b/svtools/source/dialogs/restartdialog.cxx index 1e99d16c3d36..7bef79758c47 100644 --- a/svtools/source/dialogs/restartdialog.cxx +++ b/svtools/source/dialogs/restartdialog.cxx @@ -40,6 +40,9 @@ public: case svtools::RESTART_REASON_BIBLIOGRAPHY_INSTALL: get(reason_, "reason_bibliography_install"); break; + case svtools::RESTART_REASON_MAILMERGE_INSTALL: + get(reason_, "reason_mailmerge_install"); + break; default: assert(false); // this cannot happen } diff --git a/svtools/uiconfig/ui/restartdialog.ui b/svtools/uiconfig/ui/restartdialog.ui index 0782ff4a7987..78e4d7d3318d 100644 --- a/svtools/uiconfig/ui/restartdialog.ui +++ b/svtools/uiconfig/ui/restartdialog.ui @@ -106,6 +106,21 @@ </packing> </child> <child> + <object class="GtkLabel" id="reason_mailmerge_install"> + <property name="can_focus">False</property> + <property name="no_show_all">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">For the mail merge to work properly, %PRODUCTNAME must be restarted.</property> + <property name="wrap">True</property> + <property name="max_width_chars">50</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <child> <object class="GtkLabel" id="label"> <property name="visible">True</property> <property name="can_focus">False</property> |