diff options
| author | Michael Meeks <michael.meeks@suse.com> | 2013-05-17 11:51:41 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2013-05-20 11:33:37 +0100 |
| commit | 54d820a7815af03a248c1aa424fae9bf9a4881f4 (patch) | |
| tree | 39fbdc1950ed87d86c0cf936b26741927b591daf /cui | |
| parent | e9c2d5b26b1e1b52bdf87192a76314b7362fa80c (diff) | |
add experimental option for sidebar to 'Advanced' pane.
Diffstat (limited to 'cui')
| -rw-r--r-- | cui/source/options/optjava.cxx | 12 | ||||
| -rw-r--r-- | cui/source/options/optjava.hxx | 1 | ||||
| -rw-r--r-- | cui/uiconfig/ui/optadvancedpage.ui | 19 |
3 files changed, 29 insertions, 3 deletions
diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx index 8f7adca0dd97..1c03981a794d 100644 --- a/cui/source/options/optjava.cxx +++ b/cui/source/options/optjava.cxx @@ -144,6 +144,7 @@ SvxJavaOptionsPage::SvxJavaOptionsPage( Window* pParent, const SfxItemSet& rSet get(m_pParameterBtn, "parameters"); get(m_pClassPathBtn, "classpath"); get(m_pExperimentalCB, "experimental"); + get(m_pExpSidebarCB, "exp_sidebar"); get(m_pMacroCB, "macrorecording"); m_sAccessibilityText = get<FixedText>("a11y")->GetText(); m_sAddDialogText = get<FixedText>("selectruntime")->GetText(); @@ -622,6 +623,13 @@ sal_Bool SvxJavaOptionsPage::FillItemSet( SfxItemSet& /*rCoreSet*/ ) bModified = sal_True; } + if ( m_pExpSidebarCB->IsChecked() != m_pExpSidebarCB->GetSavedValue() ) + { + SvtMiscOptions aMiscOpt; + aMiscOpt.SetExperimentalSidebar( m_pExpSidebarCB->IsChecked() ); + bModified = sal_True; + } + if ( m_pMacroCB->IsChecked() != m_pMacroCB->GetSavedValue() ) { SvtMiscOptions aMiscOpt; @@ -629,8 +637,6 @@ sal_Bool SvxJavaOptionsPage::FillItemSet( SfxItemSet& /*rCoreSet*/ ) bModified = sal_True; } - - if ( m_pPathDlg ) { OUString sPath( m_pPathDlg->GetClassPath() ); @@ -716,6 +722,8 @@ void SvxJavaOptionsPage::Reset( const SfxItemSet& /*rSet*/ ) m_pExperimentalCB->Check( aMiscOpt.IsExperimentalMode() ); m_pExperimentalCB->SaveValue(); + m_pExpSidebarCB->Check( aMiscOpt.IsExperimentalSidebar() ); + m_pExpSidebarCB->SaveValue(); m_pMacroCB->Check( aMiscOpt.IsMacroRecorderMode() ); m_pMacroCB->SaveValue(); diff --git a/cui/source/options/optjava.hxx b/cui/source/options/optjava.hxx index 07fa6be1bfeb..b3e9c8ef3dad 100644 --- a/cui/source/options/optjava.hxx +++ b/cui/source/options/optjava.hxx @@ -65,6 +65,7 @@ private: Timer m_aResetTimer; CheckBox* m_pExperimentalCB; + CheckBox* m_pExpSidebarCB; CheckBox* m_pMacroCB; ::std::vector< JavaInfo* > diff --git a/cui/uiconfig/ui/optadvancedpage.ui b/cui/uiconfig/ui/optadvancedpage.ui index ddfce7e19a73..1c5449738d7c 100644 --- a/cui/uiconfig/ui/optadvancedpage.ui +++ b/cui/uiconfig/ui/optadvancedpage.ui @@ -340,6 +340,23 @@ </packing> </child> <child> + <object class="GtkCheckButton" id="exp_sidebar"> + <property name="label" translatable="yes">Enable experimental sidebar (on restart)</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> <object class="GtkCheckButton" id="macrorecording"> <property name="label" translatable="yes">Enable macro recording</property> <property name="visible">True</property> @@ -350,7 +367,7 @@ </object> <packing> <property name="left_attach">0</property> - <property name="top_attach">1</property> + <property name="top_attach">2</property> <property name="width">1</property> <property name="height">1</property> </packing> |