diff options
| author | Berk Gureken <berkgureken@gmail.com> | 2016-03-22 07:15:05 +0200 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2016-04-11 07:11:19 +0000 |
| commit | cf81f3ba0602eeffad8907a1bb9cdd24e62c2d1e (patch) | |
| tree | c6af501c71350ce3b91b0fbdd512b5d7f6e6f2ad /svtools | |
| parent | b4ddacbc552905d0434e9204ee954cb4522a00cd (diff) | |
tdf#79656 Restart now window for language change
When you change the UI language and click OK,
Restart Now window opens instead of warning window.
Change-Id: Ic503bf4536a855891456f48745b748786857200f
Reviewed-on: https://gerrit.libreoffice.org/23421
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Jan Holesovsky <kendy@collabora.com>
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/source/dialogs/restartdialog.cxx | 3 | ||||
| -rw-r--r-- | svtools/uiconfig/ui/restartdialog.ui | 23 |
2 files changed, 22 insertions, 4 deletions
diff --git a/svtools/source/dialogs/restartdialog.cxx b/svtools/source/dialogs/restartdialog.cxx index 0ff1340f85bb..3b9df0ff3ee7 100644 --- a/svtools/source/dialogs/restartdialog.cxx +++ b/svtools/source/dialogs/restartdialog.cxx @@ -43,6 +43,9 @@ public: case svtools::RESTART_REASON_MAILMERGE_INSTALL: get(reason_, "reason_mailmerge_install"); break; + case svtools::RESTART_REASON_LANGUAGE_CHANGE: + get(reason_, "reason_language_change"); + break; default: assert(false); // this cannot happen } diff --git a/svtools/uiconfig/ui/restartdialog.ui b/svtools/uiconfig/ui/restartdialog.ui index 9e4b984e0228..2dc71d79eadf 100644 --- a/svtools/uiconfig/ui/restartdialog.ui +++ b/svtools/uiconfig/ui/restartdialog.ui @@ -91,6 +91,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 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="reason_bibliography_install"> <property name="can_focus">False</property> <property name="no_show_all">True</property> @@ -106,18 +121,18 @@ </packing> </child> <child> - <object class="GtkLabel" id="reason_mailmerge_install"> + <object class="GtkLabel" id="reason_language_change"> <property name="can_focus">False</property> <property name="no_show_all">True</property> <property name="xalign">0</property> - <property name="label" translatable="yes">For mail merge to work properly, %PRODUCTNAME must be restarted.</property> + <property name="label" translatable="yes">For the updated language settings to take effect, %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> + <property name="position">3</property> </packing> </child> <child> @@ -131,7 +146,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">3</property> + <property name="position">5</property> </packing> </child> </object> |