[Libreoffice-commits] core.git: cui/source include/svtools svtools/source svtools/uiconfig

[Caolán McNamara]

 cui/source/options/optjava.cxx           |    5 +++++
 include/svtools/restartdialog.hxx        |    5 ++++-
 svtools/source/dialogs/restartdialog.cxx |    3 +++
 svtools/uiconfig/ui/restartdialog.ui     |   16 +++++++++++++++-
 4 files changed, 27 insertions(+), 2 deletions(-)

New commits:
commit 7ce2a89f4f8fa84232896766276cb3433ada239c
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu May 30 20:00:46 2013 +0100

    prompt to restart office when required for experimental features
    
    Change-Id: I43051ec6b0efeaebcf4a28940f70913423b8ea9f

diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
index 50428e34..74fa157 100644
--- a/cui/source/options/optjava.cxx
+++ b/cui/source/options/optjava.cxx
@@ -632,6 +632,11 @@ sal_Bool SvxJavaOptionsPage::FillItemSet( SfxItemSet& /*rCoreSet*/ )
     {
         SvtMiscOptions aMiscOpt;
         aMiscOpt.SetExperimentalSidebar( m_pExpSidebarCB->IsChecked() );
+
+        svtools::executeRestartDialog(
+            comphelper::getProcessComponentContext(), this,
+            svtools::RESTART_REASON_MODIFIED_SIDEBAR);
+
         bModified = sal_True;
     }
 
diff --git a/include/svtools/restartdialog.hxx b/include/svtools/restartdialog.hxx
index 993b099..d74d6d3 100644
--- a/include/svtools/restartdialog.hxx
+++ b/include/svtools/restartdialog.hxx
@@ -29,9 +29,12 @@ enum RestartReason {
     RESTART_REASON_PDF_AS_STANDARD_JOB_FORMAT,
         // For the modified default print job format to take effect,
         // %PRODUCTNAME must be restarted.
-    RESTART_REASON_BIBLIOGRAPHY_INSTALL
+    RESTART_REASON_BIBLIOGRAPHY_INSTALL,
         // "For the bibliography to work properly,
         // %PRODUCTNAME must be restarted."
+    RESTART_REASON_MODIFIED_SIDEBAR
+        // "For the sidebar to work properly,
+        // %PRODUCTNAME must be restarted."
 };
 
 // Must be called with the solar mutex locked:
diff --git a/svtools/source/dialogs/restartdialog.cxx b/svtools/source/dialogs/restartdialog.cxx
index e5d64de..81655a5 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_MODIFIED_SIDEBAR:
+            get(reason_, "reason_sidebar");
+            break;
         default:
             assert(false); // this cannot happen
         }
diff --git a/svtools/uiconfig/ui/restartdialog.ui b/svtools/uiconfig/ui/restartdialog.ui
index 5027620..f2445df 100644
--- a/svtools/uiconfig/ui/restartdialog.ui
+++ b/svtools/uiconfig/ui/restartdialog.ui
@@ -101,6 +101,20 @@
               </packing>
             </child>
             <child>
+              <object class="GtkLabel" id="reason_sidebar">
+                <property name="can_focus">False</property>
+                <property name="no_show_all">True</property>
+                <property name="label" translatable="yes">For the modified sidebar setting 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">3</property>
+              </packing>
+            </child>
+            <child>
               <object class="GtkLabel" id="label">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
@@ -110,7 +124,7 @@
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">True</property>
-                <property name="position">3</property>
+                <property name="position">4</property>
               </packing>
             </child>
           </object>