diff options
author | Caolán McNamara <caolanm@redhat.com> | 2013-02-20 14:01:54 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2013-02-20 15:56:59 +0000 |
commit | 48a3e86ba752926631117b5e3a3d888e0a11e309 (patch) | |
tree | dad0647258d67f1dd23476e125511c38430b8080 /cui | |
parent | 6145c6efa4f346287ed9693c9d00038d829d5a35 (diff) |
move view options page to cui and adapt code
Change-Id: I16f9c1fb1cce0a673255468a4dd5492683ad4298
Diffstat (limited to 'cui')
-rw-r--r-- | cui/UI_cui.mk | 1 | ||||
-rw-r--r-- | cui/source/inc/helpid.hrc | 1 | ||||
-rw-r--r-- | cui/source/options/optgdlg.cxx | 291 | ||||
-rw-r--r-- | cui/source/options/optgdlg.hrc | 109 | ||||
-rw-r--r-- | cui/source/options/optgdlg.hxx | 51 | ||||
-rw-r--r-- | cui/source/options/optgdlg.src | 286 | ||||
-rw-r--r-- | cui/uiconfig/ui/optviewpage.ui | 691 |
7 files changed, 825 insertions, 605 deletions
diff --git a/cui/UI_cui.mk b/cui/UI_cui.mk index 521bb825c0e9..b255d7639c32 100644 --- a/cui/UI_cui.mk +++ b/cui/UI_cui.mk @@ -41,6 +41,7 @@ $(eval $(call gb_UI_add_uifiles,cui,\ cui/uiconfig/ui/optpathspage \ cui/uiconfig/ui/optsecuritypage \ cui/uiconfig/ui/optuserpage \ + cui/uiconfig/ui/optviewpage \ cui/uiconfig/ui/personalization_tab \ cui/uiconfig/ui/pickbulletpage \ cui/uiconfig/ui/pickgraphicpage \ diff --git a/cui/source/inc/helpid.hrc b/cui/source/inc/helpid.hrc index e1084a1c411a..8f14929c48ba 100644 --- a/cui/source/inc/helpid.hrc +++ b/cui/source/inc/helpid.hrc @@ -48,7 +48,6 @@ #define HID_OFA_CONNPOOL_DRIVERLIST "CUI_HID_OFA_CONNPOOL_DRIVERLIST" #define UID_OFA_CONNPOOL_DRIVERLIST_BACK "CUI_UID_OFA_CONNPOOL_DRIVERLIST_BACK" #define HID_OFA_FONT_SUBST_CLB "CUI_HID_OFA_FONT_SUBST_CLB" -#define HID_OFA_TP_VIEW "CUI_HID_OFA_TP_VIEW" #define HID_OFA_TP_LANGUAGES "CUI_HID_OFA_TP_LANGUAGES" #define HID_DBPATH_CTL_PATH "CUI_HID_DBPATH_CTL_PATH" #define HID_DBPATH_HEADERBAR "CUI_HID_DBPATH_HEADERBAR" diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index d4dc3f692876..380a295b900b 100644 --- a/cui/source/options/optgdlg.cxx +++ b/cui/source/options/optgdlg.cxx @@ -549,120 +549,57 @@ void CanvasSettings::EnabledHardwareAcceleration( sal_Bool _bEnabled ) const // class OfaViewTabPage -------------------------------------------------- -OfaViewTabPage::OfaViewTabPage(Window* pParent, const SfxItemSet& rSet ) : - - SfxTabPage( pParent, CUI_RES( OFA_TP_VIEW ), rSet ), - - aUserInterfaceFL ( this, CUI_RES( FL_USERINTERFACE ) ), - aWindowSizeFT ( this, CUI_RES( FT_WINDOWSIZE ) ), - aWindowSizeMF ( this, CUI_RES( MF_WINDOWSIZE ) ), - aIconSizeStyleFT ( this, CUI_RES( FT_ICONSIZESTYLE ) ), - aIconSizeLB ( this, CUI_RES( LB_ICONSIZE ) ), - aIconStyleLB ( this, CUI_RES( LB_ICONSTYLE ) ), - m_aSystemFont (this, CUI_RES( CB_SYSTEM_FONT ) ), -#if defined( UNX ) - aFontAntiAliasing ( this, CUI_RES( CB_FONTANTIALIASING )), - aAAPointLimitLabel ( this, CUI_RES( FT_POINTLIMIT_LABEL )), - aAAPointLimit ( this, CUI_RES( NF_AA_POINTLIMIT )), - aAAPointLimitUnits ( this, CUI_RES( FT_POINTLIMIT_UNIT )), -#endif - aMenuFL ( this, CUI_RES( FL_MENU ) ), - aMenuIconsFT ( this, CUI_RES( FT_MENU_ICONS )), - aMenuIconsLB ( this, CUI_RES( LB_MENU_ICONS )), - aFontListsFL ( this, CUI_RES( FL_FONTLISTS) ), - aFontShowCB ( this, CUI_RES( CB_FONT_SHOW ) ), - aFontHistoryCB ( this, CUI_RES( CB_FONT_HISTORY ) ), - aRenderingFL ( this, CUI_RES( FL_RENDERING ) ), - aUseHardwareAccell ( this, CUI_RES( CB_USE_HARDACCELL ) ), - aUseAntiAliase ( this, CUI_RES( CB_USE_ANTIALIASE ) ), - aMouseFL ( this, CUI_RES( FL_MOUSE ) ), - aMousePosFT ( this, CUI_RES( FT_MOUSEPOS ) ), - aMousePosLB ( this, CUI_RES( LB_MOUSEPOS ) ), - aMouseMiddleFT ( this, CUI_RES( FT_MOUSEMIDDLE ) ), - aMouseMiddleLB ( this, CUI_RES( LB_MOUSEMIDDLE ) ), - - // #i97672# - maSelectionFL(this, CUI_RES(FL_SELECTION)), - maSelectionCB(this, CUI_RES(CB_SELECTION)), - maSelectionMF(this, CUI_RES(MF_SELECTION)), - - nSizeLB_InitialSelection(0), - nStyleLB_InitialSelection(0), - pAppearanceCfg(new SvtTabAppearanceCfg), - pCanvasSettings(new CanvasSettings), - mpDrawinglayerOpt(new SvtOptionsDrawinglayer) +OfaViewTabPage::OfaViewTabPage(Window* pParent, const SfxItemSet& rSet) + : SfxTabPage(pParent, "OptViewPage", "cui/ui/optviewpage.ui", rSet) + , nSizeLB_InitialSelection(0) + , nStyleLB_InitialSelection(0) + , pAppearanceCfg(new SvtTabAppearanceCfg) + , pCanvasSettings(new CanvasSettings) + , mpDrawinglayerOpt(new SvtOptionsDrawinglayer) { + get(m_pWindowSizeMF, "windowsize"); + get(m_pIconSizeLB, "iconsize"); + get(m_pIconStyleLB, "iconstyle"); + get(m_pSystemFont, "systemfont"); + get(m_pFontAntiAliasing, "aafont"); + get(m_pAAPointLimitLabel, "aafrom"); + get(m_pAAPointLimit, "aanf"); + get(m_pAAPointLimitUnits, "aaunits"); + get(m_pMenuIconsLB, "menuicons"); + get(m_pFontShowCB, "showfontpreview"); + get(m_pFontHistoryCB, "showfonthistory"); + get(m_pUseHardwareAccell, "useaccel"); + get(m_pUseAntiAliase, "useaa"); + get(m_pMousePosLB, "mousepos"); + get(m_pMouseMiddleLB, "mousemiddle"); + // #i97672# + get(m_pSelectionCB, "trans"); + get(m_pSelectionMF, "transmf"); + #if defined( UNX ) - aFontAntiAliasing.SetToggleHdl( LINK( this, OfaViewTabPage, OnAntialiasingToggled ) ); - - // depending on the size of the text in aAAPointLimitLabel, we slightly re-arrange aAAPointLimit and aAAPointLimitUnits - //#110391# if the label has no mnemonic and we are in a CJK version the mnemonic "(X)" will be added which - // influences the width calculation - MnemonicGenerator aMnemonicGenerator; - String sLabel(aAAPointLimitLabel.GetText()); - aMnemonicGenerator.RegisterMnemonic( sLabel ); - aMnemonicGenerator.CreateMnemonic( sLabel ); - sLabel = comphelper::string::remove(sLabel, '~'); - - sal_Int32 nLabelWidth = aAAPointLimitLabel.GetTextWidth( sLabel ); - nLabelWidth += 3; // small gap - // pixels to move both controls to the left - Size aSize = aAAPointLimitLabel.GetSizePixel(); - sal_Int32 nMoveLeft = aSize.Width() - nLabelWidth; - // resize the first label - aSize.Width() = nLabelWidth; - aAAPointLimitLabel.SetSizePixel( aSize ); - - // move the numeric field - Point aPos( aAAPointLimit.GetPosPixel() ); - aPos.X() -= nMoveLeft; - aAAPointLimit.SetPosPixel( aPos ); - - // move (and resize) the units FixedText - aPos = ( aAAPointLimitUnits.GetPosPixel() ); - aPos.X() -= nMoveLeft; - aSize = aAAPointLimitUnits.GetSizePixel(); - aSize.Width() += nMoveLeft; - aAAPointLimitUnits.SetPosSizePixel( aPos, aSize ); + m_pFontAntiAliasing->SetToggleHdl( LINK( this, OfaViewTabPage, OnAntialiasingToggled ) ); #else - // on this platform, we do not have the anti aliasing options - move the other checkboxes accordingly - // (in the resource, the coordinates are calculated for the AA options beeing present) - Control* pMiscOptions[] = - { - &aMenuFL, &aMenuIconsFT, &aMenuIconsLB, - &aFontListsFL, &aFontShowCB, &aFontHistoryCB - }; - - // temporaryly create the checkbox for the anti aliasing (we need to to determine it's pos) - CheckBox* pFontAntiAliasing = new CheckBox( this, CUI_RES( CB_FONTANTIALIASING ) ); - sal_Int32 nMoveUp = aMenuFL.GetPosPixel().Y() - pFontAntiAliasing->GetPosPixel().Y(); - DELETEZ( pFontAntiAliasing ); - - Point aPos; - for ( size_t i = 0; i < SAL_N_ELEMENTS( pMiscOptions ); ++i ) - { - aPos = pMiscOptions[i]->GetPosPixel( ); - aPos.Y() -= nMoveUp; - pMiscOptions[i]->SetPosPixel( aPos ); - } + // on this platform, we do not have the anti aliasing options + m_pFontAntiAliasing->Hide(); + m_pAAPointLimitLabel->Hide(); + m_pAAPointLimit->Hide(); + m_pAAPointLimitUnits->Hide(); #endif // #i97672# - maSelectionCB.SetToggleHdl( LINK( this, OfaViewTabPage, OnSelectionToggled ) ); - - FreeResource(); + m_pSelectionCB->SetToggleHdl( LINK( this, OfaViewTabPage, OnSelectionToggled ) ); if( ! Application::ValidateSystemFont() ) { - m_aSystemFont.Check( sal_False ); - m_aSystemFont.Enable( sal_False ); + m_pSystemFont->Check(false); + m_pSystemFont->Enable(false); } const StyleSettings& aStyleSettings = Application::GetSettings().GetStyleSettings(); // remove non-installed icon themes - if( aIconStyleLB.GetEntryCount() == STYLE_SYMBOLS_THEMES_MAX ) + if( m_pIconStyleLB->GetEntryCount() == STYLE_SYMBOLS_THEMES_MAX ) { // do not check 0th item == auto; it is not a real theme aIconStyleItemId[0] = 0; @@ -677,16 +614,16 @@ OfaViewTabPage::OfaViewTabPage(Window* pParent, const SfxItemSet& rSet ) : else { // non-existing style => remove item; - aIconStyleLB.RemoveEntry( nItem ); + m_pIconStyleLB->RemoveEntry( nItem ); aIconStyleItemId[n] = 0; } } } // add real theme name to 'auto' theme, e.g. 'auto' => 'auto (classic)' - if( aIconStyleLB.GetEntryCount() > 1 ) + if( m_pIconStyleLB->GetEntryCount() > 1 ) { - ::rtl::OUString aAutoStr( aIconStyleLB.GetEntry( 0 ) ); + ::rtl::OUString aAutoStr( m_pIconStyleLB->GetEntry( 0 ) ); aAutoStr += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" (") ); @@ -696,12 +633,12 @@ OfaViewTabPage::OfaViewTabPage(Window* pParent, const SfxItemSet& rSet ) : if ( nAutoStyle == STYLE_SYMBOLS_AUTO || !aIconStyleItemId[nAutoStyle] ) nAutoStyle = aStyleSettings.GetAutoSymbolsStyle(); if ( aIconStyleItemId[nAutoStyle] ) - aAutoStr += aIconStyleLB.GetEntry( aIconStyleItemId[nAutoStyle] ); + aAutoStr += m_pIconStyleLB->GetEntry( aIconStyleItemId[nAutoStyle] ); - aIconStyleLB.RemoveEntry( 0 ); - aIconStyleLB.InsertEntry( aAutoStr += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(")") ), 0 ); + m_pIconStyleLB->RemoveEntry( 0 ); + m_pIconStyleLB->InsertEntry( aAutoStr += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(")") ), 0 ); // separate auto and other icon themes - aIconStyleLB.SetSeparatorPos( 0 ); + m_pIconStyleLB->SetSeparatorPos( 0 ); } } @@ -717,11 +654,11 @@ IMPL_LINK( OfaViewTabPage, OnAntialiasingToggled, void*, NOTINTERESTEDIN ) { (void)NOTINTERESTEDIN; - sal_Bool bAAEnabled = aFontAntiAliasing.IsChecked(); + sal_Bool bAAEnabled = m_pFontAntiAliasing->IsChecked(); - aAAPointLimitLabel.Enable( bAAEnabled ); - aAAPointLimit.Enable( bAAEnabled ); - aAAPointLimitUnits.Enable( bAAEnabled ); + m_pAAPointLimitLabel->Enable( bAAEnabled ); + m_pAAPointLimit->Enable( bAAEnabled ); + m_pAAPointLimitUnits->Enable( bAAEnabled ); return 0L; } @@ -731,8 +668,8 @@ IMPL_LINK( OfaViewTabPage, OnAntialiasingToggled, void*, NOTINTERESTEDIN ) IMPL_LINK( OfaViewTabPage, OnSelectionToggled, void*, NOTINTERESTEDIN ) { (void)NOTINTERESTEDIN; - const bool bSelectionEnabled(maSelectionCB.IsChecked()); - maSelectionMF.Enable(bSelectionEnabled); + const bool bSelectionEnabled(m_pSelectionCB->IsChecked()); + m_pSelectionMF->Enable(bSelectionEnabled); return 0; } @@ -751,7 +688,7 @@ sal_Bool OfaViewTabPage::FillItemSet( SfxItemSet& ) bool bRepaintWindows(false); SvtMiscOptions aMiscOptions; - sal_uInt16 nSizeLB_NewSelection = aIconSizeLB.GetSelectEntryPos(); + sal_uInt16 nSizeLB_NewSelection = m_pIconSizeLB->GetSelectEntryPos(); if( nSizeLB_InitialSelection != nSizeLB_NewSelection ) { // from now on it's modified, even if via auto setting the same size was set as now selected in the LB @@ -762,12 +699,12 @@ sal_Bool OfaViewTabPage::FillItemSet( SfxItemSet& ) case 1: eSet = SFX_SYMBOLS_SIZE_SMALL; break; case 2: eSet = SFX_SYMBOLS_SIZE_LARGE; break; default: - OSL_FAIL( "OfaViewTabPage::FillItemSet(): This state of aIconSizeLB should not be possible!" ); + OSL_FAIL( "OfaViewTabPage::FillItemSet(): This state of m_pIconSizeLB should not be possible!" ); } aMiscOptions.SetSymbolsSize( eSet ); } - sal_uInt16 nStyleLB_NewSelection = aIconStyleLB.GetSelectEntryPos(); + sal_uInt16 nStyleLB_NewSelection = m_pIconStyleLB->GetSelectEntryPos(); if( nStyleLB_InitialSelection != nStyleLB_NewSelection ) { // find the style name in the aIconStyleItemId table @@ -787,7 +724,7 @@ sal_Bool OfaViewTabPage::FillItemSet( SfxItemSet& ) // Screen Scaling sal_uInt16 nOldScale = pAppearanceCfg->GetScaleFactor(); - sal_uInt16 nNewScale = (sal_uInt16)aWindowSizeMF.GetValue(); + sal_uInt16 nNewScale = (sal_uInt16)m_pWindowSizeMF->GetValue(); if ( nNewScale != nOldScale ) { @@ -797,7 +734,7 @@ sal_Bool OfaViewTabPage::FillItemSet( SfxItemSet& ) // Mouse Snap Mode short eOldSnap = pAppearanceCfg->GetSnapMode(); - short eNewSnap = aMousePosLB.GetSelectEntryPos(); + short eNewSnap = m_pMousePosLB->GetSelectEntryPos(); if(eNewSnap > 2) eNewSnap = 2; @@ -809,7 +746,7 @@ sal_Bool OfaViewTabPage::FillItemSet( SfxItemSet& ) // Middle Mouse Button short eOldMiddleMouse = pAppearanceCfg->GetMiddleMouseButton(); - short eNewMiddleMouse = aMouseMiddleLB.GetSelectEntryPos(); + short eNewMiddleMouse = m_pMouseMiddleLB->GetSelectEntryPos(); if(eNewMiddleMouse > 2) eNewMiddleMouse = 2; @@ -820,74 +757,74 @@ sal_Bool OfaViewTabPage::FillItemSet( SfxItemSet& ) } #if defined( UNX ) - if ( aFontAntiAliasing.IsChecked() != aFontAntiAliasing.GetSavedValue() ) + if ( m_pFontAntiAliasing->IsChecked() != m_pFontAntiAliasing->GetSavedValue() ) { - pAppearanceCfg->SetFontAntiAliasing( aFontAntiAliasing.IsChecked() ); + pAppearanceCfg->SetFontAntiAliasing( m_pFontAntiAliasing->IsChecked() ); bAppearanceChanged = sal_True; } - if ( aAAPointLimit.GetValue() != aAAPointLimit.GetSavedValue().toInt32() ) + if ( m_pAAPointLimit->GetValue() != m_pAAPointLimit->GetSavedValue().toInt32() ) { - pAppearanceCfg->SetFontAntialiasingMinPixelHeight( aAAPointLimit.GetValue() ); + pAppearanceCfg->SetFontAntialiasingMinPixelHeight( m_pAAPointLimit->GetValue() ); bAppearanceChanged = sal_True; } #endif - if ( aFontShowCB.IsChecked() != aFontShowCB.GetSavedValue() ) + if ( m_pFontShowCB->IsChecked() != m_pFontShowCB->GetSavedValue() ) { - aFontOpt.EnableFontWYSIWYG( aFontShowCB.IsChecked() ); + aFontOpt.EnableFontWYSIWYG( m_pFontShowCB->IsChecked() ); bModified = sal_True; } - if(aMenuIconsLB.GetSelectEntryPos() != aMenuIconsLB.GetSavedValue()) + if(m_pMenuIconsLB->GetSelectEntryPos() != m_pMenuIconsLB->GetSavedValue()) { - aMenuOpt.SetMenuIconsState( aMenuIconsLB.GetSelectEntryPos() == 0 ? 2 : aMenuIconsLB.GetSelectEntryPos() - 1); + aMenuOpt.SetMenuIconsState( m_pMenuIconsLB->GetSelectEntryPos() == 0 ? 2 : m_pMenuIconsLB->GetSelectEntryPos() - 1); bModified = sal_True; bMenuOptModified = sal_True; bAppearanceChanged = sal_True; } - if ( aFontHistoryCB.IsChecked() != aFontHistoryCB.GetSavedValue() ) + if ( m_pFontHistoryCB->IsChecked() != m_pFontHistoryCB->GetSavedValue() ) { - aFontOpt.EnableFontHistory( aFontHistoryCB.IsChecked() ); + aFontOpt.EnableFontHistory( m_pFontHistoryCB->IsChecked() ); bModified = sal_True; } // #i95644# if disabled, do not use value, see in ::Reset() - if(aUseHardwareAccell.IsEnabled()) + if(m_pUseHardwareAccell->IsEnabled()) { - if(aUseHardwareAccell.IsChecked() != aUseHardwareAccell.GetSavedValue()) + if(m_pUseHardwareAccell->IsChecked() != m_pUseHardwareAccell->GetSavedValue()) { - pCanvasSettings->EnabledHardwareAcceleration(aUseHardwareAccell.IsChecked()); + pCanvasSettings->EnabledHardwareAcceleration(m_pUseHardwareAccell->IsChecked()); bModified = sal_True; } } // #i95644# if disabled, do not use value, see in ::Reset() - if(aUseAntiAliase.IsEnabled()) + if(m_pUseAntiAliase->IsEnabled()) { - if(aUseAntiAliase.IsChecked() != mpDrawinglayerOpt->IsAntiAliasing()) + if(m_pUseAntiAliase->IsChecked() != mpDrawinglayerOpt->IsAntiAliasing()) { - mpDrawinglayerOpt->SetAntiAliasing(aUseAntiAliase.IsChecked()); + mpDrawinglayerOpt->SetAntiAliasing(m_pUseAntiAliase->IsChecked()); bModified = sal_True; bRepaintWindows = true; } } // #i97672# - if(maSelectionCB.IsEnabled()) + if(m_pSelectionCB->IsEnabled()) { - const bool bNewSelection(maSelectionCB.IsChecked()); - const sal_uInt16 nNewTransparence((sal_uInt16)maSelectionMF.GetValue()); + const bool bNewSelection(m_pSelectionCB->IsChecked()); + const sal_uInt16 nNewTransparence((sal_uInt16)m_pSelectionMF->GetValue()); if(bNewSelection != (bool)mpDrawinglayerOpt->IsTransparentSelection()) { - mpDrawinglayerOpt->SetTransparentSelection(maSelectionCB.IsChecked()); + mpDrawinglayerOpt->SetTransparentSelection(m_pSelectionCB->IsChecked()); bModified = sal_True; bRepaintWindows = true; } - // #i104150# even read the value when maSelectionMF is disabled; it may have been + // #i104150# even read the value when m_pSelectionMF is disabled; it may have been // modified by enabling-modify-disabling by the user if(nNewTransparence != mpDrawinglayerOpt->GetTransparentSelectionPercent()) { @@ -898,10 +835,10 @@ sal_Bool OfaViewTabPage::FillItemSet( SfxItemSet& ) } SvtAccessibilityOptions aAccessibilityOptions; - if( aAccessibilityOptions.GetIsSystemFont() != m_aSystemFont.IsChecked() && - m_aSystemFont.IsEnabled() ) + if( aAccessibilityOptions.GetIsSystemFont() != m_pSystemFont->IsChecked() && + m_pSystemFont->IsEnabled() ) { - aAccessibilityOptions.SetIsSystemFont( m_aSystemFont.IsChecked() ); + aAccessibilityOptions.SetIsSystemFont( m_pSystemFont->IsChecked() ); bModified = sal_True; bMenuOptModified = sal_True; } @@ -911,8 +848,8 @@ sal_Bool OfaViewTabPage::FillItemSet( SfxItemSet& ) // Set changed settings to the application instance AllSettings aAllSettings = Application::GetSettings(); StyleSettings aStyleSettings = aAllSettings.GetStyleSettings(); - if( m_aSystemFont.IsEnabled() ) - aStyleSettings.SetUseSystemUIFonts( m_aSystemFont.IsChecked() ); + if( m_pSystemFont->IsEnabled() ) + aStyleSettings.SetUseSystemUIFonts( m_pSystemFont->IsChecked() ); aAllSettings.SetStyleSettings(aStyleSettings); Application::MergeSystemSettings( aAllSettings ); Application::SetSettings(aAllSettings); @@ -944,70 +881,70 @@ void OfaViewTabPage::Reset( const SfxItemSet& ) if( aMiscOptions.GetSymbolsSize() != SFX_SYMBOLS_SIZE_AUTO ) nSizeLB_InitialSelection = ( aMiscOptions.AreCurrentSymbolsLarge() )? 2 : 1; - aIconSizeLB.SelectEntryPos( nSizeLB_InitialSelection ); - aIconSizeLB.SaveValue(); + m_pIconSizeLB->SelectEntryPos( nSizeLB_InitialSelection ); + m_pIconSizeLB->SaveValue(); if( aMiscOptions.GetSymbolsStyle() != STYLE_SYMBOLS_AUTO ) nStyleLB_InitialSelection = aIconStyleItemId[aMiscOptions.GetCurrentSymbolsStyle()]; - aIconStyleLB.SelectEntryPos( nStyleLB_InitialSelection ); - aIconStyleLB.SaveValue(); + m_pIconStyleLB->SelectEntryPos( nStyleLB_InitialSelection ); + m_pIconStyleLB->SaveValue(); - if( m_aSystemFont.IsEnabled() ) + if( m_pSystemFont->IsEnabled() ) { SvtAccessibilityOptions aAccessibilityOptions; - m_aSystemFont.Check( aAccessibilityOptions.GetIsSystemFont() ); + m_pSystemFont->Check( aAccessibilityOptions.GetIsSystemFont() ); } // Screen Scaling - aWindowSizeMF.SetValue ( pAppearanceCfg->GetScaleFactor() ); + m_pWindowSizeMF->SetValue ( pAppearanceCfg->GetScaleFactor() ); // Mouse Snap - aMousePosLB.SelectEntryPos(pAppearanceCfg->GetSnapMode()); - aMousePosLB.SaveValue(); + m_pMousePosLB->SelectEntryPos(pAppearanceCfg->GetSnapMode()); + m_pMousePosLB->SaveValue(); // Mouse Snap - aMouseMiddleLB.SelectEntryPos(pAppearanceCfg->GetMiddleMouseButton()); - aMouseMiddleLB.SaveValue(); + m_pMouseMiddleLB->SelectEntryPos(pAppearanceCfg->GetMiddleMouseButton()); + m_pMouseMiddleLB->SaveValue(); #if defined( UNX ) - aFontAntiAliasing.Check( pAppearanceCfg->IsFontAntiAliasing() ); - aAAPointLimit.SetValue( pAppearanceCfg->GetFontAntialiasingMinPixelHeight() ); + m_pFontAntiAliasing->Check( pAppearanceCfg->IsFontAntiAliasing() ); + m_pAAPointLimit->SetValue( pAppearanceCfg->GetFontAntialiasingMinPixelHeight() ); #endif // WorkingSet SvtFontOptions aFontOpt; - aFontShowCB.Check( aFontOpt.IsFontWYSIWYGEnabled() ); + m_pFontShowCB->Check( aFontOpt.IsFontWYSIWYGEnabled() ); SvtMenuOptions aMenuOpt; - aMenuIconsLB.SelectEntryPos(aMenuOpt.GetMenuIconsState() == 2 ? 0 : aMenuOpt.GetMenuIconsState() + 1); - aMenuIconsLB.SaveValue(); - aFontHistoryCB.Check( aFontOpt.IsFontHistoryEnabled() ); + m_pMenuIconsLB->SelectEntryPos(aMenuOpt.GetMenuIconsState() == 2 ? 0 : aMenuOpt.GetMenuIconsState() + 1); + m_pMenuIconsLB->SaveValue(); + m_pFontHistoryCB->Check( aFontOpt.IsFontHistoryEnabled() ); { // #i95644# HW accel (unified to disable mechanism) if(pCanvasSettings->IsHardwareAccelerationAvailable()) { - aUseHardwareAccell.Check(pCanvasSettings->IsHardwareAccelerationEnabled()); + m_pUseHardwareAccell->Check(pCanvasSettings->IsHardwareAccelerationEnabled()); } else { - aUseHardwareAccell.Check(false); - aUseHardwareAccell.Disable(); + m_pUseHardwareAccell->Check(false); + m_pUseHardwareAccell->Disable(); } - aUseHardwareAccell.SaveValue(); + m_pUseHardwareAccell->SaveValue(); } { // #i95644# AntiAliasing if(mpDrawinglayerOpt->IsAAPossibleOnThisSystem()) { - aUseAntiAliase.Check(mpDrawinglayerOpt->IsAntiAliasing()); + m_pUseAntiAliase->Check(mpDrawinglayerOpt->IsAntiAliasing()); } else { - aUseAntiAliase.Check(false); - aUseAntiAliase.Disable(); + m_pUseAntiAliase->Check(false); + m_pUseAntiAliase->Disable(); } - aUseAntiAliase.SaveValue(); + m_pUseAntiAliase->SaveValue(); } { @@ -1020,23 +957,23 @@ void OfaViewTabPage::Reset( const SfxItemSet& ) // enter values if(bTransparentSelectionPossible) { - maSelectionCB.Check(mpDrawinglayerOpt->IsTransparentSelection()); + m_pSelectionCB->Check(mpDrawinglayerOpt->IsTransparentSelection()); } else { - maSelectionCB.Enable(false); + m_pSelectionCB->Enable(false); } - maSelectionMF.SetValue(mpDrawinglayerOpt->GetTransparentSelectionPercent()); - maSelectionMF.Enable(mpDrawinglayerOpt->IsTransparentSelection() && bTransparentSelectionPossible); + m_pSelectionMF->SetValue(mpDrawinglayerOpt->GetTransparentSelectionPercent()); + m_pSelectionMF->Enable(mpDrawinglayerOpt->IsTransparentSelection() && bTransparentSelectionPossible); } #if defined( UNX ) - aFontAntiAliasing.SaveValue(); - aAAPointLimit.SaveValue(); + m_pFontAntiAliasing->SaveValue(); + m_pAAPointLimit->SaveValue(); #endif - aFontShowCB.SaveValue(); - aFontHistoryCB.SaveValue(); + m_pFontShowCB->SaveValue(); + m_pFontHistoryCB->SaveValue(); #if defined( UNX ) LINK( this, OfaViewTabPage, OnAntialiasingToggled ).Call( NULL ); diff --git a/cui/source/options/optgdlg.hrc b/cui/source/options/optgdlg.hrc index bb7a7a500d24..5e4b2b0bf793 100644 --- a/cui/source/options/optgdlg.hrc +++ b/cui/source/options/optgdlg.hrc @@ -19,115 +19,6 @@ #define _SVX_OPTGDLG_HRC #include <svtools/controldims.hrc> -// defines for positions and sizes --------------------------------------- - -#define WHOLE_WIDTH 248 -#define EDIT_WIDTH 30 -#define UNIT_WIDTH 40 - -#define COLSPACE RSC_SP_CTRL_DESC_X -#define COL0 6 -#define COL1 (COL0+6) -#define COL2 (COL1+10) -#define COL3 (COL2+100) -#define COL4 (COL3+COLSPACE) -#define COL5 (COL4+EDIT_WIDTH) -#define COL6 (COL5+COLSPACE) - -#define ROWSPACE RSC_SP_CTRL_DESC_Y -#define ROW0 3 -#define ROW1 (ROW0 +RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE) -#define ROW2 (ROW1) -#define ROW3 (ROW2 +RSC_CD_DROPDOWN_HEIGHT+ROWSPACE) -#define ROW4 (ROW3 +RSC_CD_PUSHBUTTON_HEIGHT+ROWSPACE) -#define ROW5 (ROW4 +RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE) -#define ROW6 (ROW5 +RSC_CD_CHECKBOX_HEIGHT+ROWSPACE) -#define ROW7 (ROW6 +RSC_CD_CHECKBOX_HEIGHT+ROWSPACE) -#define ROW8 (ROW7 +RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE) -#define ROW9 (ROW8 +RSC_CD_CHECKBOX_HEIGHT+ROWSPACE) -#define ROW10 (ROW9 +RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE) -#define ROW11 (ROW10+RSC_CD_CHECKBOX_HEIGHT+ROWSPACE) -#define ROW12 (ROW11+RSC_CD_CHECKBOX_HEIGHT+ROWSPACE) -#define ROW13 (ROW12+RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE) -#define ROW14 (ROW13+RSC_CD_TEXTBOX_HEIGHT+ROWSPACE) -#define ROW15 (ROW14+RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE) -#define ROW16 (ROW15+RSC_CD_CHECKBOX_HEIGHT) - -#define DIFF(v1,v2) (v2-v1) -#define OFFS_TEXTBOX_FIXEDTEXT(base) (base+(RSC_CD_TEXTBOX_HEIGHT-RSC_CD_FIXEDTEXT_HEIGHT)/2) - -#define ROW_MF_SCALING (13) -#define ROW_FT_ICONSIZESTYLE (ROW_MF_SCALING+RSC_CD_DROPDOWN_HEIGHT+ROWSPACE) -#define ROW_LB_ICONSIZESTYLE (ROW_FT_ICONSIZESTYLE+RSC_CD_FIXEDTEXT_HEIGHT+ROWSPACE) -#define ROW_CB_SYSTEM_FONT (ROW_LB_ICONSIZESTYLE+RSC_CD_DROPDOWN_HEIGHT+ROWSPACE) -#define ROW_CB_FONTANTIALIASING (ROW_CB_SYSTEM_FONT+ (2 * RSC_CD_FIXEDLINE_HEIGHT) +ROWSPACE) -#define ROW_NF_AA_POINTLIMIT (ROW_CB_FONTANTIALIASING+RSC_CD_FIXEDLINE_HEIGHT+ROWSPACE) - -#define ROW_FL_MENU (ROW_NF_AA_POINTLIMIT+RSC_CD_DROPDOWN_HEIGHT+RSC_SP_FLGR_SPACE_X) -#define ROW_FT_MENU_ICONS (ROW_FL_MENU + RSC_CD_FIXEDLINE_HEIGHT + ROWSPACE) -#define ROW_LB_MENU_ICONS (ROW_FT_MENU_ICONS + RSC_CD_FIXEDLINE_HEIGHT + ROWSPACE) - -#define ROW_FL_FONTLISTS (ROW_LB_MENU_ICONS + RSC_CD_CHECKBOX_HEIGHT + RSC_SP_FLGR_SPACE_X) -#define ROW_CB_FONT_SHOW (ROW_FL_FONTLISTS + RSC_CD_FIXEDLINE_HEIGHT + ROWSPACE) -#define ROW_CB_FONT_HISTORY (ROW_CB_FONT_SHOW + RSC_CD_CHECKBOX_HEIGHT + ROWSPACE) - -// #i95644# start on top with rendering section -#define ROW_FL_RENDERING (3) -#define ROW_CB_USE_HARDACCELL (ROW_FL_RENDERING + RSC_CD_FIXEDLINE_HEIGHT + ROWSPACE) -#define ROW_CB_USE_ANTIALIASE (ROW_CB_USE_HARDACCELL + RSC_CD_CHECKBOX_HEIGHT + ROWSPACE) - -// #i95644# set Menu to follow vertically (was (ROW_FL_MENU)) previously) -#define ROW_FL_MOUSE (ROW_CB_USE_ANTIALIASE + RSC_CD_FIXEDLINE_HEIGHT + RSC_SP_FLGR_SPACE_X) -#define ROW_FT_MOUSEPOS (ROW_FL_MOUSE + RSC_CD_FIXEDLINE_HEIGHT + ROWSPACE) -#define ROW_LB_MOUSEPOS (ROW_FT_MOUSEPOS + RSC_CD_FIXEDTEXT_HEIGHT + ROWSPACE) -#define ROW_FT_MOUSEMIDDLE (ROW_LB_MOUSEPOS + RSC_CD_DROPDOWN_HEIGHT + ROWSPACE) -#define ROW_LB_MOUSEMIDDLE (ROW_FT_MOUSEMIDDLE + RSC_CD_FIXEDTEXT_HEIGHT + ROWSPACE) - -// #i97672# -#define ROW_FL_SELECTION (ROW_LB_MOUSEMIDDLE + RSC_CD_DROPDOWN_HEIGHT + RSC_SP_FLGR_SPACE_X) -#define ROW_CB_SELECTION (ROW_FL_SELECTION + RSC_CD_FIXEDLINE_HEIGHT + ROWSPACE) - -// tabpage view ---------------------------------------------------------- -// #i95644# 10 .. 14 freed, may be reused - -#define FL_USERINTERFACE 20 -#define FT_WINDOWSIZE 21 -#define MF_WINDOWSIZE 22 - -#define FL_MOUSE 30 -#define LB_MOUSEPOS 31 -#define FT_MOUSEPOS 32 -#define FT_MOUSEMIDDLE 33 -#define LB_MOUSEMIDDLE 34 - -#define FT_MENU_ICONS 40 -#define LB_MENU_ICONS 41 -#define FL_MENU 42 -#define FL_FONTLISTS 43 - -#define LB_ICONSIZE 54 -#define FT_ICONSIZESTYLE 55 -#define LB_ICONSTYLE 56 -#define CB_SYSTEM_FONT 57 -#define STR_ICONSIZE 58 - -#define CB_FONT_SHOW 60 -#define CB_FONT_HISTORY 62 - -#define CB_FONTANTIALIASING 63 -#define NF_AA_POINTLIMIT 64 -#define FT_POINTLIMIT_LABEL 65 -#define FT_POINTLIMIT_UNIT 66 - -#define FL_RENDERING 67 -#define CB_USE_HARDACCELL 68 -#define CB_USE_ANTIALIASE 69 - -// #i97672# -#define FL_SELECTION 70 -#define CB_SELECTION 71 -#define MF_SELECTION 72 - // tabpage languages ----------------------------------------------------- #define FL_UI_LANG 1 diff --git a/cui/source/options/optgdlg.hxx b/cui/source/options/optgdlg.hxx index 70cfc7fcf2be..cc4e667f7e0b 100644 --- a/cui/source/options/optgdlg.hxx +++ b/cui/source/options/optgdlg.hxx @@ -81,46 +81,33 @@ class SvtTabAppearanceCfg; class OfaViewTabPage : public SfxTabPage { private: - FixedLine aUserInterfaceFL; - FixedText aWindowSizeFT; - MetricField aWindowSizeMF; - FixedText aIconSizeStyleFT; - ListBox aIconSizeLB; - ListBox aIconStyleLB; - CheckBox m_aSystemFont; + MetricField* m_pWindowSizeMF; + ListBox* m_pIconSizeLB; + ListBox* m_pIconStyleLB; + CheckBox* m_pSystemFont; -#if defined( UNX ) - CheckBox aFontAntiAliasing; - FixedText aAAPointLimitLabel; - NumericField aAAPointLimit; - FixedText aAAPointLimitUnits; -#endif + CheckBox* m_pFontAntiAliasing; + FixedText* m_pAAPointLimitLabel; + NumericField* m_pAAPointLimit; + FixedText* m_pAAPointLimitUnits; - FixedLine aMenuFL; - FixedText aMenuIconsFT; - ListBox aMenuIconsLB; + ListBox* m_pMenuIconsLB; - FixedLine aFontListsFL; - CheckBox aFontShowCB; - CheckBox aFontHistoryCB; + CheckBox* m_pFontShowCB; + CheckBox* m_pFontHistoryCB; - FixedLine aRenderingFL; - CheckBox aUseHardwareAccell; - CheckBox aUseAntiAliase; + CheckBox* m_pUseHardwareAccell; + CheckBox* m_pUseAntiAliase; - FixedLine aMouseFL; - FixedText aMousePosFT; - ListBox aMousePosLB; - FixedText aMouseMiddleFT; - ListBox aMouseMiddleLB; + ListBox* m_pMousePosLB; + ListBox* m_pMouseMiddleLB; // #i97672# - FixedLine maSelectionFL; - CheckBox maSelectionCB; - MetricField maSelectionMF; + CheckBox* m_pSelectionCB; + MetricField* m_pSelectionMF; - sal_uInt16 nSizeLB_InitialSelection; - sal_uInt16 nStyleLB_InitialSelection; + sal_uInt16 nSizeLB_InitialSelection; + sal_uInt16 nStyleLB_InitialSelection; // item ID for the given icon theme // might be zero when the theme is not installed and the item is removed diff --git a/cui/source/options/optgdlg.src b/cui/source/options/optgdlg.src index ae9ab804dbd9..56c6a889c2c9 100644 --- a/cui/source/options/optgdlg.src +++ b/cui/source/options/optgdlg.src @@ -20,292 +20,6 @@ #include "optgdlg.hrc" #include "helpid.hrc" - //**************************************************************************** - // - // TabPage Ansicht - // - //**************************************************************************** - -TabPage OFA_TP_VIEW -{ - HelpID = HID_OFA_TP_VIEW ; - SVLook = TRUE ; - Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ; - Hide = TRUE ; - FixedLine FL_USERINTERFACE - { - Pos = MAP_APPFONT ( 6 , ROW0 ) ; - Size = MAP_APPFONT ( 120 , 8 ) ; - Text [ en-US ] = "User Interface" ; - }; - FixedText FT_WINDOWSIZE - { - Pos = MAP_APPFONT ( 12 , OFFS_TEXTBOX_FIXEDTEXT( ROW_MF_SCALING ) ) ; - Size = MAP_APPFONT ( 80 , 8 ) ; - Text [ en-US ] = "Sc~aling" ; - }; - MetricField MF_WINDOWSIZE - { - HelpID = "cui:MetricField:OFA_TP_VIEW:MF_WINDOWSIZE"; - Pos = MAP_APPFONT ( 95 , ROW_MF_SCALING ) ; - Size = MAP_APPFONT ( 31 , 12 ) ; - Border = TRUE ; - TabStop = TRUE ; - Left = TRUE ; - Repeat = TRUE ; - Spin = TRUE ; - Minimum = 80 ; - Maximum = 130 ; - DecimalDigits = 0 ; - First = 80 ; - Last = 130 ; - SpinSize = 1 ; - Unit = FUNIT_CUSTOM ; - CustomUnitText = "%" ; - }; - FixedText FT_ICONSIZESTYLE - { - Pos = MAP_APPFONT ( 12 , ROW_FT_ICONSIZESTYLE ) ; - Size = MAP_APPFONT ( 114 , 8 ) ; - Text [ en-US ] = "Icon size and style" ; - }; - String STR_ICONSIZE - { - Text [ en-US ] = "Icon size" ; - }; - ListBox LB_ICONSIZE - { - HelpID = "cui:ListBox:OFA_TP_VIEW:LB_ICONSIZE"; - Pos = MAP_APPFONT ( 12 , ROW_LB_ICONSIZESTYLE ) ; - Size = MAP_APPFONT ( 45 , 60 ) ; - DropDown = TRUE ; - Border = TRUE ; - TabStop = TRUE ; - StringList [ en-US ] = - { - < "Automatic" ; > ; - < "Small" ; > ; - < "Large" ; > ; - }; - }; - ListBox LB_ICONSTYLE - { - HelpID = "cui:ListBox:OFA_TP_VIEW:LB_ICONSTYLE"; - Pos = MAP_APPFONT ( 61 , ROW_LB_ICONSIZESTYLE ) ; - Size = MAP_APPFONT ( 65 , 70 ) ; - DropDown = TRUE ; - Border = TRUE ; - TabStop = TRUE ; - StringList [ en-US ] = - { - < "Automatic" ; > ; - < "Galaxy (default)" ; > ; - < "High Contrast" ; > ; - < "Industrial" ; > ; // industrial is dead, but we have to keep the entry - < "Crystal" ; > ; - < "Tango" ; > ; - < "Oxygen" ; > ; - < "Classic" ; > ; - < "Human" ; > ; - < "Tango Testing" ; > ; - }; - }; - CheckBox CB_SYSTEM_FONT - { - HelpID = "cui:CheckBox:OFA_TP_VIEW:CB_SYSTEM_FONT"; - TabStop = TRUE ; - Pos = MAP_APPFONT( 12, ROW_CB_SYSTEM_FONT ); - Size = MAP_APPFONT( 114, 16 ); - WordBreak = TRUE; - Text[ en-US ] = "Use system ~font for user interface"; - }; - - CheckBox CB_FONTANTIALIASING - { - HelpID = "cui:CheckBox:OFA_TP_VIEW:CB_FONTANTIALIASING"; - TabStop = TRUE ; - Pos = MAP_APPFONT ( 12 , ROW_CB_FONTANTIALIASING ) ; - Size = MAP_APPFONT ( 110 , RSC_CD_CHECKBOX_HEIGHT ) ; - Text [ en-US ] = "Screen font antialiasing" ; - }; - FixedText FT_POINTLIMIT_LABEL - { - Pos = MAP_APPFONT ( 23 , OFFS_TEXTBOX_FIXEDTEXT( ROW_NF_AA_POINTLIMIT ) ) ; - Size = MAP_APPFONT ( 20 , 8 ) ; - Text [ en-US ] = "from"; - }; - NumericField NF_AA_POINTLIMIT - { - HelpID = "cui:NumericField:OFA_TP_VIEW:NF_AA_POINTLIMIT"; - Border = TRUE ; - Pos = MAP_APPFONT ( 46, ROW_NF_AA_POINTLIMIT ) ; - Size = MAP_APPFONT ( 30 , 12 ) ; - Minimum = 1; - Maximum = 10000; - SpinSize = 1; - Spin = TRUE ; - Repeat = TRUE ; - }; - FixedText FT_POINTLIMIT_UNIT - { - Pos = MAP_APPFONT ( 79 , OFFS_TEXTBOX_FIXEDTEXT( ROW_NF_AA_POINTLIMIT ) ) ; - Size = MAP_APPFONT ( 47 , 8 ) ; - Text [ en-US ] = "Pixels"; - }; - FixedLine FL_MENU - { - Pos = MAP_APPFONT ( 6, ROW_FL_MENU ) ; - Size = MAP_APPFONT ( 120 , 8 ) ; - Text [ en-US ] = "Menu" ; - }; - FixedText FT_MENU_ICONS - { - Pos = MAP_APPFONT ( 12 , ROW_FT_MENU_ICONS ) ; - Size = MAP_APPFONT ( 114 , 8 ) ; - Text [ en-US ] = "Icons in menus" ; - }; - ListBox LB_MENU_ICONS - { - HelpID = "cui:ListBox:OFA_TP_VIEW:LB_MENU_ICONS"; - Pos = MAP_APPFONT ( 12 , ROW_LB_MENU_ICONS ) ; - Size = MAP_APPFONT ( 114 , 60 ) ; - DropDown = TRUE ; - Border = TRUE ; - TabStop = TRUE ; - StringList [ en-US ] = - { - < "Automatic" ; > ; - < "Hide" ; > ; - < "Show" ; > ; - }; - }; - FixedLine FL_FONTLISTS - { - Pos = MAP_APPFONT ( 6, ROW_FL_FONTLISTS ) ; - Size = MAP_APPFONT ( 120 , 8 ) ; - Text [ en-US ] = "Font Lists" ; - }; - CheckBox CB_FONT_SHOW - { - HelpID = "cui:CheckBox:OFA_TP_VIEW:CB_FONT_SHOW"; - Pos = MAP_APPFONT ( 12, ROW_CB_FONT_SHOW ) ; - Size = MAP_APPFONT ( 118 , RSC_CD_CHECKBOX_HEIGHT ) ; - Text [ en-US ] = "Show p~review of fonts" ; - }; - CheckBox CB_FONT_HISTORY - { - HelpID = "cui:CheckBox:OFA_TP_VIEW:CB_FONT_HISTORY"; - Pos = MAP_APPFONT ( 12, ROW_CB_FONT_HISTORY ) ; - Size = MAP_APPFONT ( 118 , RSC_CD_CHECKBOX_HEIGHT ) ; - Text [ en-US ] = "Show font h~istory" ; - }; - FixedLine FL_RENDERING - { - Pos = MAP_APPFONT ( 133 , ROW_FL_RENDERING ) ; - Size = MAP_APPFONT ( 120 , 8 ) ; - Text [ en-US ] = "Graphics output"; - }; - - CheckBox CB_USE_HARDACCELL - { - HelpID = "cui:CheckBox:OFA_TP_VIEW:CB_USE_HARDACCELL"; - Pos = MAP_APPFONT ( 139, ROW_CB_USE_HARDACCELL ) ; - Size = MAP_APPFONT ( 118 , RSC_CD_CHECKBOX_HEIGHT ) ; - Text [ en-US ] = "Use hardware acceleration" ; - }; - - CheckBox CB_USE_ANTIALIASE - { - HelpID = "cui:CheckBox:OFA_TP_VIEW:CB_USE_ANTIALIASE"; - Pos = MAP_APPFONT ( 139, ROW_CB_USE_ANTIALIASE ) ; - Size = MAP_APPFONT ( 118 , RSC_CD_CHECKBOX_HEIGHT ) ; - Text [ en-US ] = "Use Anti-Aliasing" ; - }; - - FixedLine FL_MOUSE - { - Pos = MAP_APPFONT ( 133 , ROW_FL_MOUSE ) ; - Size = MAP_APPFONT ( 120 , 8 ) ; - Text [ en-US ] = "Mouse"; - }; - FixedText FT_MOUSEPOS - { - Pos = MAP_APPFONT ( 139, ROW_FT_MOUSEPOS ) ; - Size = MAP_APPFONT ( 120 , 8 ) ; - Text [ en-US ] = "Mouse positioning" ; - }; - ListBox LB_MOUSEPOS - { - HelpID = "cui:ListBox:OFA_TP_VIEW:LB_MOUSEPOS"; - Pos = MAP_APPFONT ( 139, ROW_LB_MOUSEPOS ) ; - Size = MAP_APPFONT ( 114 , 60 ) ; - DropDown = TRUE ; - Border = TRUE ; - TabStop = TRUE ; - StringList [ en-US ] = - { - < "Default button" ; > ; - < "Dialog center" ; > ; - < "No automatic positioning" ; > ; - }; - }; - FixedText FT_MOUSEMIDDLE - { - Pos = MAP_APPFONT ( 139, ROW_FT_MOUSEMIDDLE ) ; - Size = MAP_APPFONT ( 120 , 8 ) ; - Text [ en-US ] = "Middle mouse button"; - }; - ListBox LB_MOUSEMIDDLE - { - HelpID = "cui:ListBox:OFA_TP_VIEW:LB_MOUSEMIDDLE"; - Pos = MAP_APPFONT ( 139, ROW_LB_MOUSEMIDDLE ) ; - Size = MAP_APPFONT ( 114 , 60 ) ; - DropDown = TRUE ; - Border = TRUE ; - TabStop = TRUE ; - StringList [ en-US ] = - { - < "No function" ; > ; - < "Automatic scrolling" ; > ; - < "Paste clipboard" ; > ; - }; - }; - - // #i97672# - FixedLine FL_SELECTION - { - Pos = MAP_APPFONT ( 133 , ROW_FL_SELECTION ) ; - Size = MAP_APPFONT ( 120 , 8 ) ; - Text [ en-US ] = "Selection"; - }; - - CheckBox CB_SELECTION - { - HelpID = "cui:CheckBox:OFA_TP_VIEW:CB_SELECTION"; - Pos = MAP_APPFONT ( 139, ROW_CB_SELECTION + (((12 - RSC_CD_CHECKBOX_HEIGHT) / 2) + 1)) ; - Size = MAP_APPFONT ( 83 , RSC_CD_CHECKBOX_HEIGHT ) ; - Text [ en-US ] = "Transparency" ; - }; - - MetricField MF_SELECTION - { - HelpID = "cui:MetricField:OFA_TP_VIEW:MF_SELECTION"; - Pos = MAP_APPFONT ( 139 + (95 - 12), ROW_CB_SELECTION ) ; - Size = MAP_APPFONT ( 31 , 12 ) ; - Border = TRUE ; - TabStop = TRUE ; - Repeat = TRUE ; - Spin = TRUE ; - Minimum = 10 ; - Maximum = 90 ; - DecimalDigits = 0 ; - First = 10 ; - Last = 90 ; - SpinSize = 5 ; - Unit = FUNIT_CUSTOM ; - CustomUnitText [ en-US ] = "%" ; - }; -}; // ******************************************************************* TabPage OFA_TP_LANGUAGES diff --git a/cui/uiconfig/ui/optviewpage.ui b/cui/uiconfig/ui/optviewpage.ui new file mode 100644 index 000000000000..f1cb8c732dc6 --- /dev/null +++ b/cui/uiconfig/ui/optviewpage.ui @@ -0,0 +1,691 @@ +<?xml version="1.0" encoding="UTF-8"?> +<interface> + <!-- interface-requires gtk+ 3.0 --> + <object class="GtkBox" id="OptViewPage"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="border_width">6</property> + <property name="spacing">12</property> + <property name="homogeneous">True</property> + <child> + <object class="GtkBox" id="box3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <property name="spacing">18</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="grid4"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="row_spacing">6</property> + <child> + <object class="GtkGrid" id="grid5"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <child> + <object class="GtkLabel" id="label7"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Sc_aling</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">windowsize</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> + <child> + <object class="GtkSpinButton" id="windowsize"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="halign">start</property> + <property name="invisible_char">•</property> + <property name="invisible_char_set">True</property> + <property name="adjustment">adjustment1</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label8"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Icon _size and style</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">iconsize</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="GtkComboBoxText" id="iconsize"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="entry_text_column">0</property> + <property name="id_column">1</property> + <items> + <item translatable="yes">Automatic</item> + <item translatable="yes">Small</item> + <item translatable="yes">Large</item> + </items> + </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="GtkComboBoxText" id="iconstyle"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="entry_text_column">0</property> + <property name="id_column">1</property> + <items> + <item translatable="yes">Automatic</item> + <item translatable="yes">Galaxy (default)</item> + <item translatable="yes">High Contrast</item> + <item translatable="yes">Industrial</item> + <item translatable="yes">Crystal</item> + <item translatable="yes">Tango</item> + <item translatable="yes">Oxygen</item> + <item translatable="yes">Classic</item> + <item translatable="yes">Human</item> + <item translatable="yes">Tango Testing</item> + </items> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">2</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <placeholder/> + </child> + </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> + <child> + <object class="GtkCheckButton" id="systemfont"> + <property name="label" translatable="yes">Use system _font for user interface</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="aafont"> + <property name="label" translatable="yes">Screen font antialiasin_g</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">2</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkGrid" id="fromft"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_left">12</property> + <property name="column_spacing">12</property> + <child> + <object class="GtkLabel" id="aafrom"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">fro_m</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">aanf</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> + <child> + <object class="GtkLabel" id="aaunits"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">pixels</property> + </object> + <packing> + <property name="left_attach">2</property> + <property name="top_attach">0</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="aanf"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="invisible_char">•</property> + <property name="invisible_char_set">True</property> + <property name="adjustment">adjustment2</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + </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> + </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">User Interface</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="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="grid8"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="column_spacing">12</property> + <child> + <object class="GtkLabel" id="label13"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Icons in men_us</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">menuicons</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> + <child> + <object class="GtkComboBoxText" id="menuicons"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="entry_text_column">0</property> + <property name="id_column">1</property> + <items> + <item translatable="yes">Automatic</item> + <item translatable="yes">Hide</item> + <item translatable="yes">Show</item> + </items> + </object> + <packing> + <property name="left_attach">1</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">Menu</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="frame5"> + <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="alignment5"> + <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="grid9"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="row_spacing">6</property> + <child> + <object class="GtkCheckButton" id="showfontpreview"> + <property name="label" translatable="yes">Show p_review of fonts</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">0</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="showfonthistory"> + <property name="label" translatable="yes">Show font h_istory</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> + </object> + </child> + </object> + </child> + <child type="label"> + <object class="GtkLabel" id="label5"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Font Lists</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> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkBox" id="box4"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <property name="spacing">18</property> + <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="useaccel"> + <property name="label" translatable="yes">Use hard_ware acceleration</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">0</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="useaa"> + <property name="label" translatable="yes">Use Anti-A_liasing</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> + </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">Graphics output</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="frame4"> + <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="alignment4"> + <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="grid7"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="row_spacing">6</property> + <child> + <object class="GtkLabel" id="label11"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Mouse _positioning</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">mousepos</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> + <child> + <object class="GtkLabel" id="label12"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Middle Mouse _button</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">mousemiddle</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="GtkComboBoxText" id="mousepos"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="entry_text_column">0</property> + <property name="id_column">1</property> + <items> + <item translatable="yes">Default button</item> + <item translatable="yes">Dialog center</item> + <item translatable="yes">No automatic positioning</item> + </items> + </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="GtkComboBoxText" id="mousemiddle"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="entry_text_column">0</property> + <property name="id_column">1</property> + <items> + <item translatable="yes">No function</item> + <item translatable="yes">Automatic scrolling</item> + <item translatable="yes">Paste clipboard</item> + </items> + </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> + </object> + </child> + </object> + </child> + <child type="label"> + <object class="GtkLabel" id="label4"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Mouse</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="frame7"> + <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="alignment7"> + <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="grid11"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="column_spacing">12</property> + <child> + <object class="GtkCheckButton" id="trans"> + <property name="label" translatable="yes">_Transparency</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">0</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="transmf:0%"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="invisible_char">•</property> + <property name="invisible_char_set">True</property> + <property name="adjustment">adjustment3</property> + </object> + <packing> + <property name="left_attach">1</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="label14"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">Selection</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> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <object class="GtkAdjustment" id="adjustment1"> + <property name="lower">80</property> + <property name="upper">130</property> + <property name="value">100</property> + <property name="step_increment">1</property> + <property name="page_increment">10</property> + </object> + <object class="GtkAdjustment" id="adjustment2"> + <property name="lower">1</property> + <property name="upper">10000</property> + <property name="value">8</property> + <property name="step_increment">1</property> + <property name="page_increment">10</property> + </object> + <object class="GtkAdjustment" id="adjustment3"> + <property name="lower">10</property> + <property name="upper">90</property> + <property name="value">75</property> + <property name="step_increment">1</property> + <property name="page_increment">10</property> + </object> +</interface> |