summaryrefslogtreecommitdiff
path: root/svtools
diff options
context:
space:
mode:
authorirem <iremsendur1@gmail.com>2016-05-11 10:42:17 +0300
committerCaolán McNamara <caolanm@redhat.com>2016-05-23 08:34:38 +0000
commita4e8419c8a1eb3e56ef973de4b15fdafc91248a2 (patch)
tree63cbb72016e2c104483d244168a5e35a54405436 /svtools
parent42e51c4a6320763d9b60914da4372eae9a11f17d (diff)
tdf#99211 Use the restart dialog for notifications about restart
Change-Id: I97a10cddafc464ccbdd37902c5d24b73246f5c3f Reviewed-on: https://gerrit.libreoffice.org/24877 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'svtools')
-rw-r--r--svtools/source/dialogs/restartdialog.cxx9
-rw-r--r--svtools/uiconfig/ui/restartdialog.ui45
2 files changed, 54 insertions, 0 deletions
diff --git a/svtools/source/dialogs/restartdialog.cxx b/svtools/source/dialogs/restartdialog.cxx
index 99c0fd865af8..bc6c3f7309ac 100644
--- a/svtools/source/dialogs/restartdialog.cxx
+++ b/svtools/source/dialogs/restartdialog.cxx
@@ -49,6 +49,15 @@ public:
case svtools::RESTART_REASON_ADDING_PATH:
get(reason_, "reason_adding_path");
break;
+ case svtools::RESTART_REASON_ASSIGNING_JAVAPARAMETERS:
+ get(reason_, "reason_assigning_javaparameters");
+ break;
+ case svtools::RESTART_REASON_ASSIGNING_FOLDERS:
+ get(reason_, "reason_assigning_folders");
+ break;
+ case svtools::RESTART_REASON_EXP_FEATURES:
+ get(reason_,"reason_exp_features");
+ break;
default:
assert(false); // this cannot happen
}
diff --git a/svtools/uiconfig/ui/restartdialog.ui b/svtools/uiconfig/ui/restartdialog.ui
index 0d94b81cfa59..03584e66f09f 100644
--- a/svtools/uiconfig/ui/restartdialog.ui
+++ b/svtools/uiconfig/ui/restartdialog.ui
@@ -151,6 +151,51 @@
</packing>
</child>
<child>
+ <object class="GtkLabel" id="reason_assigning_javaparameters">
+ <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 assigned Java parameters 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">4</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="reason_assigning_folders">
+ <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 assigned folders and archives 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">4</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="reason_exp_features">
+ <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 modified experimental features 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">5</property>
+ </packing>
+ </child>
+ <child>
<object class="GtkLabel" id="label">
<property name="visible">True</property>
<property name="can_focus">False</property>