diff options
Diffstat (limited to 'cui')
-rw-r--r-- | cui/Library_cui.mk | 1 | ||||
-rw-r--r-- | cui/UIConfig_cui.mk | 1 | ||||
-rw-r--r-- | cui/source/inc/cuires.hrc | 1 | ||||
-rw-r--r-- | cui/source/options/optbasic.cxx | 158 | ||||
-rw-r--r-- | cui/source/options/optbasic.hxx | 52 | ||||
-rw-r--r-- | cui/source/options/treeopt.cxx | 3 | ||||
-rw-r--r-- | cui/source/options/treeopt.src | 1 | ||||
-rw-r--r-- | cui/uiconfig/ui/optbasicidepage.ui | 220 |
8 files changed, 437 insertions, 0 deletions
diff --git a/cui/Library_cui.mk b/cui/Library_cui.mk index 0a08baa255a5..a29801a27498 100644 --- a/cui/Library_cui.mk +++ b/cui/Library_cui.mk @@ -138,6 +138,7 @@ $(eval $(call gb_Library_add_exception_objects,cui,\ cui/source/options/optaboutconfig \ cui/source/options/optaccessibility \ cui/source/options/optasian \ + cui/source/options/optbasic \ cui/source/options/optchart \ cui/source/options/optcolor \ cui/source/options/optctl \ diff --git a/cui/UIConfig_cui.mk b/cui/UIConfig_cui.mk index 9dbb2409c5cc..8ff1a09c1709 100644 --- a/cui/UIConfig_cui.mk +++ b/cui/UIConfig_cui.mk @@ -60,6 +60,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\ cui/uiconfig/ui/optaccessibilitypage \ cui/uiconfig/ui/optadvancedpage \ cui/uiconfig/ui/optappearancepage \ + cui/uiconfig/ui/optbasicidepage \ cui/uiconfig/ui/optbrowserpage \ cui/uiconfig/ui/optctlpage \ cui/uiconfig/ui/optchartcolorspage \ diff --git a/cui/source/inc/cuires.hrc b/cui/source/inc/cuires.hrc index d7fd464dc615..29fc645fc590 100644 --- a/cui/source/inc/cuires.hrc +++ b/cui/source/inc/cuires.hrc @@ -166,6 +166,7 @@ #define RID_SVXBMP_LOCK (RID_SVX_START + 118) #define RID_SVXSTR_READONLY_CONFIG_TIP (RID_SVX_START + 1026) #define RID_SVXERR_OPT_DOUBLEPATHS (RID_SVX_START + 208) //? +#define RID_SVXPAGE_BASICIDE_OPTIONS (RID_SVX_START + 209) #define RID_SVXSTR_KEY_AUTOCORRECT_DIR (RID_SVX_START + 1004) //? #define RID_SVXSTR_KEY_DICTIONARY_PATH (RID_SVX_START + 1010)//? #define RID_SVXSTR_KEY_LINGUISTIC_DIR (RID_SVX_START + 1016)//? diff --git a/cui/source/options/optbasic.cxx b/cui/source/options/optbasic.cxx new file mode 100644 index 000000000000..93d8fc58c3e2 --- /dev/null +++ b/cui/source/options/optbasic.cxx @@ -0,0 +1,158 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + +#include "optbasic.hxx" +#include <basic/codecompletecache.hxx> +#include <svtools/miscopt.hxx> +#include <iostream> +#include <officecfg/Office/BasicIDE.hxx> +#include <boost/shared_ptr.hpp> +#include <cuires.hrc> +#include <svtools/miscopt.hxx> + +SvxBasicIDEOptionsPage::SvxBasicIDEOptionsPage( Window* pParent, const SfxItemSet& rSet ) +: SfxTabPage(pParent, "OptBasicIDEPage", "cui/ui/optbasicidepage.ui", rSet) +{ + SvtMiscOptions aMiscOpt; + if( ! aMiscOpt.IsExperimentalMode() ) + { + Disable(); + } + + get(pCodeCompleteChk, "codecomplete_enable"); + get(pAutocloseProcChk, "autoclose_proc"); + get(pAutocloseParenChk, "autoclose_paren"); + get(pAutocloseQuotesChk, "autoclose_quotes"); + get(pAutoCorrectKeywordsChk, "autocorrect_keywords"); + get(pUseExtendedTypesChk, "extendedtypes_enable"); + + LoadConfig(); + +} + +SvxBasicIDEOptionsPage::~SvxBasicIDEOptionsPage() +{ +} + +void SvxBasicIDEOptionsPage::LoadConfig() +{ + bool bProcClose = officecfg::Office::BasicIDE::Autocomplete::AutocloseProc::get(); + bool bExtended = officecfg::Office::BasicIDE::Autocomplete::UseExtended::get(); + bool bCodeCompleteOn = officecfg::Office::BasicIDE::Autocomplete::CodeComplete::get(); + bool bParenClose = officecfg::Office::BasicIDE::Autocomplete::AutocloseParenthesis::get(); + bool bQuoteClose = officecfg::Office::BasicIDE::Autocomplete::AutocloseDoubleQuotes::get(); + bool bCorrect = officecfg::Office::BasicIDE::Autocomplete::AutoCorrectKeywords::get(); + + pCodeCompleteChk->Check( bCodeCompleteOn ); + pAutocloseProcChk->Check( bProcClose ); + pAutocloseQuotesChk->Check( bQuoteClose ); + pAutocloseParenChk->Check( bParenClose ); + pAutoCorrectKeywordsChk->Check( bCorrect ); + pUseExtendedTypesChk->Check( bExtended ); +} + +void SvxBasicIDEOptionsPage::SaveConfig() +{ + boost::shared_ptr< comphelper::ConfigurationChanges > batch( comphelper::ConfigurationChanges::create() ); + officecfg::Office::BasicIDE::Autocomplete::AutocloseProc::set( pAutocloseProcChk->IsChecked(), batch ); + officecfg::Office::BasicIDE::Autocomplete::CodeComplete::set( pCodeCompleteChk->IsChecked(), batch ); + officecfg::Office::BasicIDE::Autocomplete::UseExtended::set( pUseExtendedTypesChk->IsChecked(), batch ); + officecfg::Office::BasicIDE::Autocomplete::AutocloseParenthesis::set( pAutocloseParenChk->IsChecked(), batch ); + officecfg::Office::BasicIDE::Autocomplete::AutocloseDoubleQuotes::set( pAutocloseQuotesChk->IsChecked(), batch ); + officecfg::Office::BasicIDE::Autocomplete::AutoCorrectKeywords::set( pAutoCorrectKeywordsChk->IsChecked(), batch ); + batch->commit(); +} + +sal_Bool SvxBasicIDEOptionsPage::FillItemSet( SfxItemSet& /*rCoreSet*/ ) +{ + sal_Bool bModified = sal_False; + + if( pAutocloseProcChk->IsChecked() != pAutocloseProcChk->GetSavedValue() ) + { + boost::shared_ptr< comphelper::ConfigurationChanges > batch( comphelper::ConfigurationChanges::create() ); + officecfg::Office::BasicIDE::Autocomplete::AutocloseProc::set( pAutocloseProcChk->IsChecked(), batch ); + batch->commit(); + bModified = sal_True; + } + + if( pCodeCompleteChk->IsChecked() != pCodeCompleteChk->GetSavedValue() ) + { + boost::shared_ptr< comphelper::ConfigurationChanges > batch( comphelper::ConfigurationChanges::create() ); + officecfg::Office::BasicIDE::Autocomplete::CodeComplete::set( pCodeCompleteChk->IsChecked(), batch ); + batch->commit(); + bModified = sal_True; + } + + if( pUseExtendedTypesChk->IsChecked() != pUseExtendedTypesChk->GetSavedValue() ) + { + boost::shared_ptr< comphelper::ConfigurationChanges > batch( comphelper::ConfigurationChanges::create() ); + officecfg::Office::BasicIDE::Autocomplete::UseExtended::set( pUseExtendedTypesChk->IsChecked(), batch ); + batch->commit(); + bModified = sal_True; + } + + if( pAutocloseParenChk->IsChecked() != pAutocloseParenChk->GetSavedValue() ) + { + boost::shared_ptr< comphelper::ConfigurationChanges > batch( comphelper::ConfigurationChanges::create() ); + officecfg::Office::BasicIDE::Autocomplete::AutocloseParenthesis::set( pAutocloseParenChk->IsChecked(), batch ); + batch->commit(); + bModified = sal_True; + } + + if( pAutocloseQuotesChk->IsChecked() != pAutocloseQuotesChk->GetSavedValue() ) + { + boost::shared_ptr< comphelper::ConfigurationChanges > batch( comphelper::ConfigurationChanges::create() ); + officecfg::Office::BasicIDE::Autocomplete::AutocloseDoubleQuotes::set( pAutocloseQuotesChk->IsChecked(), batch ); + batch->commit(); + bModified = sal_True; + } + + if( pAutoCorrectKeywordsChk->IsChecked() != pAutoCorrectKeywordsChk->GetSavedValue() ) + { + boost::shared_ptr< comphelper::ConfigurationChanges > batch( comphelper::ConfigurationChanges::create() ); + officecfg::Office::BasicIDE::Autocomplete::AutoCorrectKeywords::set( pAutoCorrectKeywordsChk->IsChecked(), batch ); + batch->commit(); + bModified = sal_True; + } + + return bModified; +} + +void SvxBasicIDEOptionsPage::Reset( const SfxItemSet& /*rSet*/ ) +{ + LoadConfig(); + pCodeCompleteChk->SaveValue(); + + pAutocloseProcChk->SaveValue(); + + pAutocloseQuotesChk->SaveValue(); + + pAutocloseParenChk->SaveValue(); + + pAutoCorrectKeywordsChk->SaveValue(); + + pUseExtendedTypesChk->SaveValue(); +} + +SfxTabPage* SvxBasicIDEOptionsPage::Create( Window* pParent, const SfxItemSet& rAttrSet ) +{ + return ( new SvxBasicIDEOptionsPage( pParent, rAttrSet ) ); +} + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/optbasic.hxx b/cui/source/options/optbasic.hxx new file mode 100644 index 000000000000..4265f57fc419 --- /dev/null +++ b/cui/source/options/optbasic.hxx @@ -0,0 +1,52 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + +#ifndef _SVX_OPTBASIC_HXX +#define _SVX_OPTBASIC_HXX + +#include <vcl/button.hxx> +#include <vcl/dialog.hxx> +#include <sfx2/tabdlg.hxx> + +class SvxBasicIDEOptionsPage: public SfxTabPage +{ +private: + CheckBox* pCodeCompleteChk; + CheckBox* pAutocloseProcChk; + CheckBox* pAutocloseParenChk; + CheckBox* pAutocloseQuotesChk; + CheckBox* pAutoCorrectKeywordsChk; + CheckBox* pUseExtendedTypesChk; + + void LoadConfig(); + void SaveConfig(); + +public: + SvxBasicIDEOptionsPage( Window* pParent, const SfxItemSet& rSet ); + ~SvxBasicIDEOptionsPage(); + + static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet ); + virtual sal_Bool FillItemSet( SfxItemSet& rSet ); + virtual void Reset( const SfxItemSet& rSet ); +}; + + +#endif //_SVX_OPTBASIC_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx index fde7cbdb4cc1..4fd3d8716a4e 100644 --- a/cui/source/options/treeopt.cxx +++ b/cui/source/options/treeopt.cxx @@ -51,6 +51,7 @@ #include "optupdt.hxx" #include "personalization.hxx" #include "treeopt.hxx" +#include "optbasic.hxx" #include <com/sun/star/awt/XContainerWindowEventHandler.hpp> #include <com/sun/star/awt/ContainerWindowProvider.hpp> @@ -319,6 +320,7 @@ SfxTabPage* CreateGeneralTabPage( sal_uInt16 nId, Window* pParent, const SfxItem case RID_SVXPAGE_ONLINEUPDATE: fnCreate = &SvxOnlineUpdateTabPage::Create; break; case RID_OPTPAGE_CHART_DEFCOLORS: fnCreate = &SvxDefaultColorOptPage::Create; break; case RID_SVXPAGE_ABOUT_CONFIG: fnCreate = &CuiAboutConfigTabPage::Create; break; + case RID_SVXPAGE_BASICIDE_OPTIONS: fnCreate = &SvxBasicIDEOptionsPage::Create; break; } SfxTabPage* pRet = fnCreate ? (*fnCreate)( pParent, rSet ) : NULL; @@ -349,6 +351,7 @@ static OptionsMapping_Impl const OptionsMap_Impl[] = { "ProductName", "Appearance", RID_SVXPAGE_COLORCONFIG }, { "ProductName", "Accessibility", RID_SVXPAGE_ACCESSIBILITYCONFIG }, { "ProductName", "Java", RID_SVXPAGE_OPTIONS_JAVA }, + { "ProductName", "BasicIDEOptions", RID_SVXPAGE_BASICIDE_OPTIONS }, { "ProductName", "OnlineUpdate", RID_SVXPAGE_ONLINEUPDATE }, { "ProductName", "AboutConfig", RID_SVXPAGE_ABOUT_CONFIG }, { "LanguageSettings", NULL, SID_LANGUAGE_OPTIONS }, diff --git a/cui/source/options/treeopt.src b/cui/source/options/treeopt.src index e9de970b4f58..a8bb91fee139 100644 --- a/cui/source/options/treeopt.src +++ b/cui/source/options/treeopt.src @@ -100,6 +100,7 @@ Resource RID_OFADLG_OPTIONS_TREE_PAGES < "Appearance" ; RID_SVXPAGE_COLORCONFIG ; > ; < "Accessibility" ; RID_SVXPAGE_ACCESSIBILITYCONFIG ; > ; < "Advanced" ; RID_SVXPAGE_OPTIONS_JAVA ; > ; + < "Basic IDE Options" ; RID_SVXPAGE_BASICIDE_OPTIONS ; > ; < "Online Update" ; RID_SVXPAGE_ONLINEUPDATE ; > ; < "Expert Config" ; RID_SVXPAGE_ABOUT_CONFIG ; > ; }; diff --git a/cui/uiconfig/ui/optbasicidepage.ui b/cui/uiconfig/ui/optbasicidepage.ui new file mode 100644 index 000000000000..3dde65f43dea --- /dev/null +++ b/cui/uiconfig/ui/optbasicidepage.ui @@ -0,0 +1,220 @@ +<?xml version="1.0" encoding="UTF-8"?> +<interface> + <!-- interface-requires gtk+ 3.0 --> + <object class="GtkBox" id="OptBasicIDEPage"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="border_width">6</property> + <property name="orientation">vertical</property> + <property name="spacing">12</property> + <child> + <object class="GtkFrame" id="frame1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label_xalign">0</property> + <property name="shadow_type">none</property> + <child> + <object class="GtkAlignment" id="alignment1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="top_padding">6</property> + <property name="left_padding">12</property> + <child> + <object class="GtkGrid" id="grid1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkCheckButton" id="codecomplete_enable"> + <property name="label" translatable="yes">Enable Code Completition</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + </object> + </child> + </object> + </child> + <child type="label"> + <object class="GtkLabel" id="label1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Code Completition</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkFrame" id="frame2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label_xalign">0</property> + <property name="shadow_type">none</property> + <child> + <object class="GtkAlignment" id="alignment2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="top_padding">6</property> + <property name="left_padding">12</property> + <child> + <object class="GtkGrid" id="grid3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="row_spacing">6</property> + <child> + <object class="GtkCheckButton" id="autoclose_proc"> + <property name="label" translatable="yes">Autoclose Procedures</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">3</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="autoclose_paren"> + <property name="label" translatable="yes">Autoclose Parenthesis</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="autoclose_quotes"> + <property name="label" translatable="yes">Autoclose Quotes</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</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="autocorrect_keywords"> + <property name="label" translatable="yes">Autocorrect Keywords</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + </object> + </child> + </object> + </child> + <child type="label"> + <object class="GtkLabel" id="label2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Code Suggestion</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkFrame" id="frame3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label_xalign">0</property> + <property name="shadow_type">none</property> + <child> + <object class="GtkAlignment" id="alignment3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="top_padding">6</property> + <property name="left_padding">12</property> + <child> + <object class="GtkGrid" id="grid2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="row_spacing">6</property> + <child> + <object class="GtkCheckButton" id="extendedtypes_enable"> + <property name="label" translatable="yes">Use extended types</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + </object> + </child> + </object> + </child> + <child type="label"> + <object class="GtkLabel" id="label3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Language Features</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + </object> +</interface> |