Kaydet (Commit) 8a1e19f4 authored tarafından Gergo Mocsi's avatar Gergo Mocsi

GSOC work, Tool/Options/Basic IDE Options created

Created a new tab in Tools/Options/Basic IDE options instead of the ModalDialog.
The original dialog under Basic IDE/View/IDE Options was removed.
Tab page is disabled when experimetal flag is off, entry node in the treebox is visible.

Change-Id: Iaad1ea5fadc3f05ca81f2240dceb513f25be35b9
üst 6cb452f3
......@@ -90,7 +90,6 @@ $(eval $(call gb_Library_add_exception_objects,basctl,\
basctl/source/basicide/linenumberwindow \
basctl/source/basicide/localizationmgr \
basctl/source/basicide/macrodlg \
basctl/source/basicide/basicideoptionsdlg \
basctl/source/basicide/moduldl2 \
basctl/source/basicide/moduldlg \
basctl/source/basicide/objdlg \
......
......@@ -30,7 +30,6 @@ $(eval $(call gb_UIConfig_add_toolbarfiles,modules/BasicIDE,\
$(eval $(call gb_UIConfig_add_uifiles,modules/BasicIDE,\
basctl/uiconfig/basicide/ui/basicmacrodialog \
basctl/uiconfig/basicide/ui/basicideoptionsdialog \
))
# vim: set noet sw=4 ts=4:
......@@ -36,12 +36,6 @@ shell basctl_Shell
ExecMethod = ExecuteCurrent;
]
SID_BASICIDE_IDEOPTIONS
[
StateMethod = GetState;
ExecMethod = ExecuteCurrent;
]
SID_BASICIDE_HIDECURPAGE
[
ExecMethod = ExecuteCurrent;
......
......@@ -54,7 +54,6 @@
#include <cassert>
#include <basic/codecompletecache.hxx>
#include <svtools/miscopt.hxx>
#include "basicideoptionsdlg.hxx"
namespace basctl
{
......@@ -1012,12 +1011,6 @@ void ModulWindow::ExecuteCommand (SfxRequest& rReq)
rLayout.BasicRemoveWatch();
}
break;
case SID_BASICIDE_IDEOPTIONS:
{
boost::scoped_ptr< BasicIDEOptionsDlg > pDlg( new BasicIDEOptionsDlg( this ) );
pDlg->Execute();
}
break;
case SID_CUT:
{
if ( !IsReadOnly() )
......@@ -1164,15 +1157,6 @@ void ModulWindow::GetState( SfxItemSet &rSet )
rSet.Put(SfxBoolItem(nWh, bSourceLinesEnabled));
break;
}
case SID_BASICIDE_IDEOPTIONS:
{
SvtMiscOptions aMiscOptions;
if( !aMiscOptions.IsExperimentalMode() )
{
rSet.Put( SfxVisibilityItem(nWh, false) );
}
}
break;
}
}
}
......
......@@ -61,7 +61,6 @@
<menu:menuitem menu:id=".uno:StatusBarVisible"/>
<menu:menuitem menu:id=".uno:ShowImeStatusWindow"/>
<menu:menuitem menu:id=".uno:ShowLines"/>
<menu:menuitem menu:id=".uno:BasicIDEOptionsDialog"/>
<menu:menuitem menu:id=".uno:GotoLine"/>
<menu:menuseparator/>
<menu:menuitem menu:id=".uno:FullScreen"/>
......
......@@ -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 \
......
......@@ -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 \
......
......@@ -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)//?
......
......@@ -17,22 +17,23 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#include "basicideoptionsdlg.hxx"
#include "optbasic.hxx"
#include <basic/codecompletecache.hxx>
#include <svtools/miscopt.hxx>
#include <basidesh.hrc>
#include <iostream>
#include <officecfg/Office/BasicIDE.hxx>
#include <boost/shared_ptr.hpp>
#include <cuires.hrc>
#include <svtools/miscopt.hxx>
namespace basctl
{
BasicIDEOptionsDlg::BasicIDEOptionsDlg( Window* pWindow )
: ModalDialog(pWindow, "BasicIDEOptionsDlg", "modules/BasicIDE/ui/basicideoptionsdialog.ui")
SvxBasicIDEOptionsPage::SvxBasicIDEOptionsPage( Window* pParent, const SfxItemSet& rSet )
: SfxTabPage(pParent, "OptBasicIDEPage", "cui/ui/optbasicidepage.ui", rSet)
{
get(pCancelBtn, "cancel");
get(pOkBtn, "ok");
SvtMiscOptions aMiscOpt;
if( ! aMiscOpt.IsExperimentalMode() )
{
Disable();
}
get(pCodeCompleteChk, "codecomplete_enable");
get(pAutocloseProcChk, "autoclose_proc");
......@@ -41,43 +42,15 @@ BasicIDEOptionsDlg::BasicIDEOptionsDlg( Window* pWindow )
get(pAutoCorrectKeywordsChk, "autocorrect_keywords");
get(pUseExtendedTypesChk, "extendedtypes_enable");
pOkBtn->SetClickHdl( LINK( this, BasicIDEOptionsDlg, OkHdl ) );
pCancelBtn->SetClickHdl( LINK( this, BasicIDEOptionsDlg, CancelHdl ) );
LoadConfig();
}
BasicIDEOptionsDlg::~BasicIDEOptionsDlg()
{
}
IMPL_LINK_NOARG(BasicIDEOptionsDlg, OkHdl)
{
CodeCompleteOptions::SetCodeCompleteOn( pCodeCompleteChk->IsChecked() );
CodeCompleteOptions::SetProcedureAutoCompleteOn( pAutocloseProcChk->IsChecked() );
CodeCompleteOptions::SetAutoCloseQuotesOn( pAutocloseQuotesChk->IsChecked() );
CodeCompleteOptions::SetAutoCloseParenthesisOn( pAutocloseParenChk->IsChecked() );
CodeCompleteOptions::SetAutoCorrectKeywordsOn( pAutoCorrectKeywordsChk->IsChecked() );
CodeCompleteOptions::SetExtendedTypeDeclaration( pUseExtendedTypesChk->IsChecked() );
SaveConfig();
Close();
return 0;
}
IMPL_LINK_NOARG(BasicIDEOptionsDlg, CancelHdl)
SvxBasicIDEOptionsPage::~SvxBasicIDEOptionsPage()
{
Close();
return 0;
}
short BasicIDEOptionsDlg::Execute()
{
return ModalDialog::Execute();
}
void BasicIDEOptionsDlg::LoadConfig()
void SvxBasicIDEOptionsPage::LoadConfig()
{
bool bProcClose = officecfg::Office::BasicIDE::Autocomplete::AutocloseProc::get();
bool bExtended = officecfg::Office::BasicIDE::Autocomplete::UseExtended::get();
......@@ -94,7 +67,7 @@ void BasicIDEOptionsDlg::LoadConfig()
pUseExtendedTypesChk->Check( bExtended );
}
void BasicIDEOptionsDlg::SaveConfig()
void SvxBasicIDEOptionsPage::SaveConfig()
{
boost::shared_ptr< comphelper::ConfigurationChanges > batch( comphelper::ConfigurationChanges::create() );
officecfg::Office::BasicIDE::Autocomplete::AutocloseProc::set( pAutocloseProcChk->IsChecked(), batch );
......@@ -106,6 +79,80 @@ void BasicIDEOptionsDlg::SaveConfig()
batch->commit();
}
} // namespace basctl
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: */
......@@ -17,21 +17,16 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#ifndef BASCTL_BASICIDEOPTIONSDLG_HXX
#define BASCTL_BASICIDEOPTIONSDLG_HXX
#ifndef _SVX_OPTBASIC_HXX
#define _SVX_OPTBASIC_HXX
#include <vcl/button.hxx>
#include <vcl/dialog.hxx>
#include <sfx2/tabdlg.hxx>
namespace basctl
{
class BasicIDEOptionsDlg: public ModalDialog
class SvxBasicIDEOptionsPage: public SfxTabPage
{
private:
CancelButton* pCancelBtn;
OKButton* pOkBtn;
CheckBox* pCodeCompleteChk;
CheckBox* pAutocloseProcChk;
CheckBox* pAutocloseParenChk;
......@@ -39,21 +34,19 @@ private:
CheckBox* pAutoCorrectKeywordsChk;
CheckBox* pUseExtendedTypesChk;
DECL_LINK(OkHdl, void*);
DECL_LINK(CancelHdl, void*);
void LoadConfig();
void SaveConfig();
public:
BasicIDEOptionsDlg( Window* pWindow );
~BasicIDEOptionsDlg();
SvxBasicIDEOptionsPage( Window* pParent, const SfxItemSet& rSet );
~SvxBasicIDEOptionsPage();
virtual short Execute();
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet );
virtual sal_Bool FillItemSet( SfxItemSet& rSet );
virtual void Reset( const SfxItemSet& rSet );
};
} // namespace basctl
#endif //BASCTL_BASICIDEOPTIONSDLG_HXX
#endif //_SVX_OPTBASIC_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
......@@ -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 },
......
......@@ -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 ; > ;
};
......
<?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>
......@@ -8,11 +8,6 @@
<value xml:lang="en-US">Goto Line Number...</value>
</prop>
</node>
<node oor:name=".uno:BasicIDEOptionsDialog" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">IDE options</value>
</prop>
</node>
<node oor:name=".uno:ShowLines" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Line Numbers</value>
......
......@@ -3819,30 +3819,6 @@ SfxVoidItem MatchGroup SID_BASICIDE_MATCHGROUP
GroupId = GID_MACRO;
]
SfxVoidItem BasicIDEOptionsDialog SID_BASICIDE_IDEOPTIONS
[
/* flags: */
AutoUpdate = TRUE,
Cachable = Cachable,
FastCall = FALSE,
HasCoreId = FALSE,
HasDialog = FALSE,
ReadOnlyDoc = TRUE,
Toggle = FALSE,
Container = FALSE,
RecordAbsolute = FALSE,
RecordPerSet;
Synchron;
/* config: */
AccelConfig = TRUE,
MenuConfig = TRUE,
StatusBarConfig = FALSE,
ToolBoxConfig = TRUE,
GroupId = GID_MACRO;
]
//--------------------------------------------------------------------------
SfxBoolItem MenuBarVisible SID_TOGGLE_MENUBAR
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment