diff options
author | Caolán McNamara <caolanm@redhat.com> | 2013-02-18 13:37:51 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2013-02-18 14:16:27 +0000 |
commit | 8d4e51a599a02f2342f066dba4f2e700b4950c6a (patch) | |
tree | 6730186ad241e4128435a3bc8502e63263b98d15 | |
parent | 7bf7d96a65dc1e14029db42c05230dc091a55da0 (diff) |
move General options page to cui and adapt code
Change-Id: I724db9d199ad15d31f8daf2329ceb9cd46fdefda
-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 | 208 | ||||
-rw-r--r-- | cui/source/options/optgdlg.hrc | 15 | ||||
-rw-r--r-- | cui/source/options/optgdlg.hxx | 31 | ||||
-rw-r--r-- | cui/source/options/optgdlg.src | 127 | ||||
-rw-r--r-- | cui/uiconfig/ui/optgeneralpage.ui (renamed from sw/uiconfig/swriter/ui/libgeneral.ui) | 196 |
7 files changed, 193 insertions, 386 deletions
diff --git a/cui/UI_cui.mk b/cui/UI_cui.mk index d3302da39710..4d54024134e3 100644 --- a/cui/UI_cui.mk +++ b/cui/UI_cui.mk @@ -36,6 +36,7 @@ $(eval $(call gb_UI_add_uifiles,cui,\ cui/uiconfig/ui/optadvancedpage \ cui/uiconfig/ui/optappearancepage \ cui/uiconfig/ui/optfontspage \ + cui/uiconfig/ui/optgeneralpage \ cui/uiconfig/ui/optpathspage \ cui/uiconfig/ui/optsecuritypage \ cui/uiconfig/ui/personalization_tab \ diff --git a/cui/source/inc/helpid.hrc b/cui/source/inc/helpid.hrc index 14a3606b76b4..920dd2dd65ab 100644 --- a/cui/source/inc/helpid.hrc +++ b/cui/source/inc/helpid.hrc @@ -49,7 +49,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_MISC "CUI_HID_OFA_TP_MISC" #define HID_OFA_TP_VIEW "CUI_HID_OFA_TP_VIEW" #define HID_OFA_TP_LANGUAGES "CUI_HID_OFA_TP_LANGUAGES" #define HID_OFA_TP_MEMORY "CUI_HID_OFA_TP_MEMORY" diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index a41c945e0aee..d4dc3f692876 100644 --- a/cui/source/options/optgdlg.cxx +++ b/cui/source/options/optgdlg.cxx @@ -182,112 +182,47 @@ namespace // ----------------------------------------------------------------------- -OfaMiscTabPage::OfaMiscTabPage(Window* pParent, const SfxItemSet& rSet ) : - - SfxTabPage( pParent, CUI_RES( OFA_TP_MISC ), rSet ), - - aHelpFL ( this, CUI_RES( FL_HELP ) ), - aToolTipsCB ( this, CUI_RES( CB_TOOLTIP ) ), - aExtHelpCB ( this, CUI_RES( CB_EXTHELP ) ), - aHelpAgentCB ( this, CUI_RES( CB_HELPAGENT ) ), - aHelpAgentResetBtn ( this, CUI_RES( PB_HELPAGENT_RESET ) ), - aFileDlgFL ( this, CUI_RES( FL_FILEDLG ) ), - aFileDlgROImage ( this, CUI_RES( FI_FILEDLG_RO ) ), - aFileDlgCB ( this, CUI_RES( CB_FILEDLG ) ), - aPrintDlgFL ( this, CUI_RES( FL_PRINTDLG ) ), - aPrintDlgCB ( this, CUI_RES( CB_PRINTDLG ) ), - aDocStatusFL ( this, CUI_RES( FL_DOCSTATUS ) ), - aDocStatusCB ( this, CUI_RES( CB_DOCSTATUS ) ), - aSaveAlwaysCB ( this, CUI_RES( CB_SAVE_ALWAYS ) ), - aTwoFigureFL ( this, CUI_RES( FL_TWOFIGURE ) ), - aInterpretFT ( this, CUI_RES( FT_INTERPRET ) ), - aYearValueField ( this, CUI_RES( NF_YEARVALUE ) ), - aToYearFT ( this, CUI_RES( FT_TOYEAR ) ) +OfaMiscTabPage::OfaMiscTabPage(Window* pParent, const SfxItemSet& rSet) + : SfxTabPage(pParent, "OptGeneralPage", "cui/ui/optgeneralpage.ui", rSet) { - FreeResource(); - + get(m_pToolTipsCB, "tooltips"); + get(m_pExtHelpCB, "exthelp"); + get(m_pHelpAgentCB, "helpagent"); + get(m_pHelpAgentResetBtn, "resethelpagent"); if (!lcl_HasSystemFilePicker()) - { - aFileDlgFL.Hide(); - aFileDlgCB.Hide(); - } - + get<VclContainer>("filedlgframe")->Hide(); #if !defined(MACOSX) && !defined(ENABLE_GTK) - aPrintDlgFL.Hide(); - aPrintDlgCB.Hide(); + get<VclContainer>("printdlgframe")->Hide(); #endif + get(m_pFileDlgCB, "filedlg"); + get(m_pPrintDlgCB, "printdlg"); + get(m_pDocStatusCB, "docstatus"); + get(m_pSaveAlwaysCB, "savealways"); + get(m_pYearFrame, "yearframe"); + get(m_pYearValueField, "year"); + get(m_pToYearFT, "toyear"); - if ( !aFileDlgCB.IsVisible() ) - { - // rearrange the following controls - Point aNewPos = aPrintDlgFL.GetPosPixel(); - long nDelta = aNewPos.Y() - aFileDlgFL.GetPosPixel().Y(); - - Window* pWins[] = - { - &aPrintDlgFL, &aPrintDlgCB, &aDocStatusFL, &aDocStatusCB, &aSaveAlwaysCB, - &aTwoFigureFL, &aInterpretFT, &aYearValueField, &aToYearFT - }; - Window** pCurrent = pWins; - const sal_Int32 nCount = SAL_N_ELEMENTS( pWins ); - for ( sal_Int32 i = 0; i < nCount; ++i, ++pCurrent ) - { - aNewPos = (*pCurrent)->GetPosPixel(); - aNewPos.Y() -= nDelta; - (*pCurrent)->SetPosPixel( aNewPos ); - } - } - else if ( SvtMiscOptions().IsUseSystemFileDialogReadOnly() ) - { - aFileDlgROImage.Show(); - aFileDlgCB.Disable(); - } - - if ( !aPrintDlgCB.IsVisible() ) - { - // rearrange the following controls - Point aNewPos = aDocStatusFL.GetPosPixel(); - long nDelta = aNewPos.Y() - aPrintDlgFL.GetPosPixel().Y(); - - Window* pWins[] = - { - &aDocStatusFL, &aDocStatusCB, &aSaveAlwaysCB, &aTwoFigureFL, - &aInterpretFT, &aYearValueField, &aToYearFT - }; - Window** pCurrent = pWins; - const sal_Int32 nCount = SAL_N_ELEMENTS( pWins ); - for ( sal_Int32 i = 0; i < nCount; ++i, ++pCurrent ) - { - aNewPos = (*pCurrent)->GetPosPixel(); - aNewPos.Y() -= nDelta; - (*pCurrent)->SetPosPixel( aNewPos ); - } - } - - // at least the button is as wide as its text - long nTxtWidth = aHelpAgentResetBtn.GetTextWidth( aHelpAgentResetBtn.GetText() ); - Size aBtnSz = aHelpAgentResetBtn.GetSizePixel(); - if ( aBtnSz.Width() < nTxtWidth ) + if (m_pFileDlgCB->IsVisible() && SvtMiscOptions().IsUseSystemFileDialogReadOnly()) { - aBtnSz.Width() = nTxtWidth; - aHelpAgentResetBtn.SetSizePixel( aBtnSz ); + m_pFileDlgROImage->Show(); + m_pFileDlgCB->Disable(); } - aStrDateInfo = aToYearFT.GetText(); - aYearValueField.SetModifyHdl( LINK( this, OfaMiscTabPage, TwoFigureHdl ) ); + m_aStrDateInfo = m_pToYearFT->GetText(); + m_pYearValueField->SetModifyHdl( LINK( this, OfaMiscTabPage, TwoFigureHdl ) ); Link aLink = LINK( this, OfaMiscTabPage, TwoFigureConfigHdl ); - aYearValueField.SetDownHdl( aLink ); - aYearValueField.SetUpHdl( aLink ); - aYearValueField.SetLoseFocusHdl( aLink ); - aYearValueField.SetFirstHdl( aLink ); - TwoFigureConfigHdl( &aYearValueField ); + m_pYearValueField->SetDownHdl( aLink ); + m_pYearValueField->SetUpHdl( aLink ); + m_pYearValueField->SetLoseFocusHdl( aLink ); + m_pYearValueField->SetFirstHdl( aLink ); + TwoFigureConfigHdl(m_pYearValueField); SetExchangeSupport(); aLink = LINK( this, OfaMiscTabPage, HelpCheckHdl_Impl ); - aToolTipsCB.SetClickHdl( aLink ); - aHelpAgentCB.SetClickHdl( aLink ); - aHelpAgentResetBtn.SetClickHdl( LINK( this, OfaMiscTabPage, HelpAgentResetHdl_Impl ) ); + m_pToolTipsCB->SetClickHdl( aLink ); + m_pHelpAgentCB->SetClickHdl( aLink ); + m_pHelpAgentResetBtn->SetClickHdl( LINK( this, OfaMiscTabPage, HelpAgentResetHdl_Impl ) ); } // ----------------------------------------------------------------------- @@ -310,47 +245,47 @@ sal_Bool OfaMiscTabPage::FillItemSet( SfxItemSet& rSet ) sal_Bool bModified = sal_False; SvtHelpOptions aHelpOptions; - sal_Bool bChecked = aToolTipsCB.IsChecked(); - if ( bChecked != aToolTipsCB.GetSavedValue() ) + sal_Bool bChecked = m_pToolTipsCB->IsChecked(); + if ( bChecked != m_pToolTipsCB->GetSavedValue() ) aHelpOptions.SetHelpTips( bChecked ); - bChecked = ( aExtHelpCB.IsChecked() && aToolTipsCB.IsChecked() ); - if ( bChecked != aExtHelpCB.GetSavedValue() ) + bChecked = ( m_pExtHelpCB->IsChecked() && m_pToolTipsCB->IsChecked() ); + if ( bChecked != m_pExtHelpCB->GetSavedValue() ) aHelpOptions.SetExtendedHelp( bChecked ); - bChecked = aHelpAgentCB.IsChecked(); - if ( bChecked != aHelpAgentCB.GetSavedValue() ) + bChecked = m_pHelpAgentCB->IsChecked(); + if ( bChecked != m_pHelpAgentCB->GetSavedValue() ) aHelpOptions.SetHelpAgentAutoStartMode( bChecked ); - if ( aFileDlgCB.IsChecked() != aFileDlgCB.GetSavedValue() ) + if ( m_pFileDlgCB->IsChecked() != m_pFileDlgCB->GetSavedValue() ) { SvtMiscOptions aMiscOpt; - aMiscOpt.SetUseSystemFileDialog( !aFileDlgCB.IsChecked() ); + aMiscOpt.SetUseSystemFileDialog( !m_pFileDlgCB->IsChecked() ); bModified = sal_True; } - if ( aPrintDlgCB.IsChecked() != aPrintDlgCB.GetSavedValue() ) + if ( m_pPrintDlgCB->IsChecked() != m_pPrintDlgCB->GetSavedValue() ) { SvtMiscOptions aMiscOpt; - aMiscOpt.SetUseSystemPrintDialog( !aPrintDlgCB.IsChecked() ); + aMiscOpt.SetUseSystemPrintDialog( !m_pPrintDlgCB->IsChecked() ); bModified = sal_True; } - if ( aDocStatusCB.IsChecked() != aDocStatusCB.GetSavedValue() ) + if ( m_pDocStatusCB->IsChecked() != m_pDocStatusCB->GetSavedValue() ) { SvtPrintWarningOptions aPrintOptions; - aPrintOptions.SetModifyDocumentOnPrintingAllowed( aDocStatusCB.IsChecked() ); + aPrintOptions.SetModifyDocumentOnPrintingAllowed( m_pDocStatusCB->IsChecked() ); bModified = sal_True; } - if ( aSaveAlwaysCB.IsChecked() != aSaveAlwaysCB.GetSavedValue() ) + if ( m_pSaveAlwaysCB->IsChecked() != m_pSaveAlwaysCB->GetSavedValue() ) { SvtMiscOptions aMiscOpt; - aMiscOpt.SetSaveAlwaysAllowed( aSaveAlwaysCB.IsChecked() ); + aMiscOpt.SetSaveAlwaysAllowed( m_pSaveAlwaysCB->IsChecked() ); bModified = sal_True; } const SfxUInt16Item* pUInt16Item = PTR_CAST( SfxUInt16Item, GetOldItem( rSet, SID_ATTR_YEAR2000 ) ); - sal_uInt16 nNum = (sal_uInt16)aYearValueField.GetText().toInt32(); + sal_uInt16 nNum = (sal_uInt16)m_pYearValueField->GetText().toInt32(); if ( pUInt16Item && pUInt16Item->GetValue() != nNum ) { bModified = sal_True; @@ -365,39 +300,36 @@ sal_Bool OfaMiscTabPage::FillItemSet( SfxItemSet& rSet ) void OfaMiscTabPage::Reset( const SfxItemSet& rSet ) { SvtHelpOptions aHelpOptions; - aToolTipsCB.Check( aHelpOptions.IsHelpTips() ); - aExtHelpCB.Check( aHelpOptions.IsHelpTips() && aHelpOptions.IsExtendedHelp() ); - aHelpAgentCB.Check( aHelpOptions.IsHelpAgentAutoStartMode() ); + m_pToolTipsCB->Check( aHelpOptions.IsHelpTips() ); + m_pExtHelpCB->Check( aHelpOptions.IsHelpTips() && aHelpOptions.IsExtendedHelp() ); + m_pHelpAgentCB->Check( aHelpOptions.IsHelpAgentAutoStartMode() ); - aToolTipsCB.SaveValue(); - aExtHelpCB.SaveValue(); - aHelpAgentCB.SaveValue(); - HelpCheckHdl_Impl( &aHelpAgentCB ); + m_pToolTipsCB->SaveValue(); + m_pExtHelpCB->SaveValue(); + m_pHelpAgentCB->SaveValue(); + HelpCheckHdl_Impl(m_pHelpAgentCB); SvtMiscOptions aMiscOpt; - aFileDlgCB.Check( !aMiscOpt.UseSystemFileDialog() ); - aFileDlgCB.SaveValue(); - aPrintDlgCB.Check( !aMiscOpt.UseSystemPrintDialog() ); - aPrintDlgCB.SaveValue(); - aSaveAlwaysCB.Check( aMiscOpt.IsSaveAlwaysAllowed() ); - aSaveAlwaysCB.SaveValue(); + m_pFileDlgCB->Check( !aMiscOpt.UseSystemFileDialog() ); + m_pFileDlgCB->SaveValue(); + m_pPrintDlgCB->Check( !aMiscOpt.UseSystemPrintDialog() ); + m_pPrintDlgCB->SaveValue(); + m_pSaveAlwaysCB->Check( aMiscOpt.IsSaveAlwaysAllowed() ); + m_pSaveAlwaysCB->SaveValue(); SvtPrintWarningOptions aPrintOptions; - aDocStatusCB.Check(aPrintOptions.IsModifyDocumentOnPrintingAllowed()); - aDocStatusCB.SaveValue(); + m_pDocStatusCB->Check(aPrintOptions.IsModifyDocumentOnPrintingAllowed()); + m_pDocStatusCB->SaveValue(); const SfxPoolItem* pItem = NULL; if ( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_YEAR2000, sal_False, &pItem ) ) { - aYearValueField.SetValue( ((SfxUInt16Item*)pItem)->GetValue() ); - TwoFigureConfigHdl( &aYearValueField ); + m_pYearValueField->SetValue( ((SfxUInt16Item*)pItem)->GetValue() ); + TwoFigureConfigHdl(m_pYearValueField); } else { - aYearValueField.Enable(sal_False); - aTwoFigureFL.Enable(sal_False); - aInterpretFT.Enable(sal_False); - aToYearFT.Enable(sal_False); + m_pYearFrame->Enable(sal_False); } } @@ -407,21 +339,21 @@ IMPL_LINK( OfaMiscTabPage, TwoFigureHdl, NumericField*, pEd ) { (void)pEd; - OUString aOutput( aStrDateInfo ); - OUString aStr( aYearValueField.GetText() ); + OUString aOutput( m_aStrDateInfo ); + OUString aStr( m_pYearValueField->GetText() ); OUString sSep( SvtSysLocale().GetLocaleData().getNumThousandSep() ); sal_Int32 nIndex = 0; while ((nIndex = aStr.indexOf( sSep, nIndex)) != -1) aStr = aStr.replaceAt( nIndex, sSep.getLength(), ""); sal_Int32 nNum = aStr.toInt32(); - if ( aStr.getLength() != 4 || nNum < aYearValueField.GetMin() || nNum > aYearValueField.GetMax() ) + if ( aStr.getLength() != 4 || nNum < m_pYearValueField->GetMin() || nNum > m_pYearValueField->GetMax() ) aOutput += "????"; else { nNum += 99; aOutput += OUString::number( nNum ); } - aToYearFT.SetText( aOutput ); + m_pToYearFT->SetText( aOutput ); return 0; } @@ -429,10 +361,10 @@ IMPL_LINK( OfaMiscTabPage, TwoFigureHdl, NumericField*, pEd ) IMPL_LINK( OfaMiscTabPage, TwoFigureConfigHdl, NumericField*, pEd ) { - sal_Int64 nNum = aYearValueField.GetValue(); + sal_Int64 nNum = m_pYearValueField->GetValue(); rtl::OUString aOutput(rtl::OUString::number(nNum)); - aYearValueField.SetText(aOutput); - aYearValueField.SetSelection( Selection( 0, aOutput.getLength() ) ); + m_pYearValueField->SetText(aOutput); + m_pYearValueField->SetSelection( Selection( 0, aOutput.getLength() ) ); TwoFigureHdl( pEd ); return 0; } @@ -441,8 +373,8 @@ IMPL_LINK( OfaMiscTabPage, TwoFigureConfigHdl, NumericField*, pEd ) IMPL_LINK_NOARG(OfaMiscTabPage, HelpCheckHdl_Impl) { - aExtHelpCB.Enable( aToolTipsCB.IsChecked() ); - aHelpAgentResetBtn.Enable( aHelpAgentCB.IsChecked() ); + m_pExtHelpCB->Enable( m_pToolTipsCB->IsChecked() ); + m_pHelpAgentResetBtn->Enable( m_pHelpAgentCB->IsChecked() ); return 0; } diff --git a/cui/source/options/optgdlg.hrc b/cui/source/options/optgdlg.hrc index fbf3c32086c0..bb7a7a500d24 100644 --- a/cui/source/options/optgdlg.hrc +++ b/cui/source/options/optgdlg.hrc @@ -87,21 +87,6 @@ #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 general ------------------------------------------------------- - -#define FL_HELP 10 -#define CB_TOOLTIP 11 -#define CB_EXTHELP 12 -#define CB_HELPAGENT 13 -#define PB_HELPAGENT_RESET 14 - -#define FL_TWOFIGURE 40 -#define FT_INTERPRET 41 -#define NF_YEARVALUE 42 -#define FT_TOYEAR 43 -#define FL_PRINTDLG 44 -#define CB_PRINTDLG 45 - // tabpage view ---------------------------------------------------------- // #i95644# 10 .. 14 freed, may be reused diff --git a/cui/source/options/optgdlg.hxx b/cui/source/options/optgdlg.hxx index 718344ba45b3..70cfc7fcf2be 100644 --- a/cui/source/options/optgdlg.hxx +++ b/cui/source/options/optgdlg.hxx @@ -36,29 +36,24 @@ class OfaMiscTabPage : public SfxTabPage { using TabPage::DeactivatePage; private: - FixedLine aHelpFL; - CheckBox aToolTipsCB; - CheckBox aExtHelpCB; - CheckBox aHelpAgentCB; - PushButton aHelpAgentResetBtn; + CheckBox* m_pToolTipsCB; + CheckBox* m_pExtHelpCB; + CheckBox* m_pHelpAgentCB; + PushButton* m_pHelpAgentResetBtn; - FixedLine aFileDlgFL; - ReadOnlyImage aFileDlgROImage; - CheckBox aFileDlgCB; + FixedImage* m_pFileDlgROImage; + CheckBox* m_pFileDlgCB; - FixedLine aPrintDlgFL; - CheckBox aPrintDlgCB; + CheckBox* m_pPrintDlgCB; - FixedLine aDocStatusFL; - CheckBox aDocStatusCB; - CheckBox aSaveAlwaysCB; + CheckBox* m_pDocStatusCB; + CheckBox* m_pSaveAlwaysCB; - FixedLine aTwoFigureFL; - FixedText aInterpretFT; - NumericField aYearValueField; - FixedText aToYearFT; + VclContainer* m_pYearFrame; + NumericField* m_pYearValueField; + FixedText* m_pToYearFT; - String aStrDateInfo; + OUString m_aStrDateInfo; DECL_LINK( TwoFigureHdl, NumericField* ); DECL_LINK( TwoFigureConfigHdl, NumericField* ); diff --git a/cui/source/options/optgdlg.src b/cui/source/options/optgdlg.src index 9ed740d09332..374a32b655fd 100644 --- a/cui/source/options/optgdlg.src +++ b/cui/source/options/optgdlg.src @@ -22,133 +22,6 @@ //**************************************************************************** // - // TabPage Sonstiges - // - //**************************************************************************** - -TabPage OFA_TP_MISC -{ - HelpID = HID_OFA_TP_MISC ; - SVLook = TRUE ; - Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ; - Hide = TRUE ; - FixedLine FL_HELP - { - Pos = MAP_APPFONT( COL0, ROW0 ); - Size = MAP_APPFONT( WHOLE_WIDTH, RSC_CD_FIXEDLINE_HEIGHT ); - Text [ en-US ] = "Help"; - }; - CheckBox CB_TOOLTIP - { - HelpID = "cui:CheckBox:OFA_TP_MISC:CB_TOOLTIP"; - Pos = MAP_APPFONT( COL1, ROW1 ); - Size = MAP_APPFONT( COL3 - COL1, RSC_CD_CHECKBOX_HEIGHT ); - Text [ en-US ] = "~Tips"; - }; - CheckBox CB_EXTHELP - { - HelpID = "cui:CheckBox:OFA_TP_MISC:CB_EXTHELP"; - Pos = MAP_APPFONT( COL3, ROW1 ); - Size = MAP_APPFONT( WHOLE_WIDTH - COL3, RSC_CD_CHECKBOX_HEIGHT ); - Text [ en-US ] = "~Extended tips"; - }; - CheckBox CB_HELPAGENT - { - HelpID = "cui:CheckBox:OFA_TP_MISC:CB_HELPAGENT"; - Pos = MAP_APPFONT( COL1, ROW3 ); - Size = MAP_APPFONT( COL3 - COL1, RSC_CD_CHECKBOX_HEIGHT ); - Text [ en-US ] = "~Help Agent"; - }; - PushButton PB_HELPAGENT_RESET - { - HelpID = "cui:PushButton:OFA_TP_MISC:PB_HELPAGENT_RESET"; - Pos = MAP_APPFONT( COL3, ROW3 ); - Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH + 20, RSC_CD_PUSHBUTTON_HEIGHT ); - Text [ en-US ] = "~Reset Help Agent"; - }; - FixedLine FL_FILEDLG - { - Pos = MAP_APPFONT( COL0, ROW4 ); - Size = MAP_APPFONT( WHOLE_WIDTH, RSC_CD_FIXEDLINE_HEIGHT ); - Text [ en-US ] = "Open/Save dialogs"; - }; - FixedImage FI_FILEDLG_RO - { - Pos = MAP_APPFONT( COL1 - 7, ROW5 + 2 ); - Size = MAP_APPFONT( 6, 6 ); - Hide = TRUE; - }; - CheckBox CB_FILEDLG - { - HelpID = "cui:CheckBox:OFA_TP_MISC:CB_FILEDLG"; - Pos = MAP_APPFONT( COL1, ROW5 ); - Size = MAP_APPFONT( WHOLE_WIDTH, RSC_CD_CHECKBOX_HEIGHT ); - Text [ en-US ] = "~Use %PRODUCTNAME dialogs"; - }; - FixedLine FL_PRINTDLG - { - Pos = MAP_APPFONT( COL0, ROW6 ); - Size = MAP_APPFONT( WHOLE_WIDTH, RSC_CD_FIXEDLINE_HEIGHT ); - Text [ en-US ] = "Print dialogs"; - }; - CheckBox CB_PRINTDLG - { - Pos = MAP_APPFONT( COL1, ROW7 ); - Size = MAP_APPFONT( WHOLE_WIDTH - COL1, RSC_CD_CHECKBOX_HEIGHT ); - Text [ en-US ] = "Use %PRODUCTNAME ~dialogs"; - }; - FixedLine FL_DOCSTATUS - { - Pos = MAP_APPFONT( COL0, ROW8 ); - Size = MAP_APPFONT( WHOLE_WIDTH, RSC_CD_FIXEDLINE_HEIGHT ); - Text [ en-US ] = "Document status"; - }; - CheckBox CB_DOCSTATUS - { - HelpID = "cui:CheckBox:OFA_TP_MISC:CB_DOCSTATUS"; - Pos = MAP_APPFONT( COL1, ROW9 ); - Size = MAP_APPFONT( WHOLE_WIDTH - COL1, RSC_CD_CHECKBOX_HEIGHT ); - Text [ en-US ] = "~Printing sets \"document modified\" status"; - }; - CheckBox CB_SAVE_ALWAYS - { - Pos = MAP_APPFONT( COL1, ROW10 ); - Size = MAP_APPFONT( WHOLE_WIDTH - COL1, RSC_CD_CHECKBOX_HEIGHT ); - Text [ en-US ] = "Allow to save document even when the document is not modified"; - }; - FixedLine FL_TWOFIGURE - { - Pos = MAP_APPFONT( COL0, ROW11 ); - Size = MAP_APPFONT( WHOLE_WIDTH, RSC_CD_FIXEDLINE_HEIGHT ); - Text [ en-US ] = "Year (two digits)" ; - }; - FixedText FT_INTERPRET - { - Pos = MAP_APPFONT( COL1, OFFS_TEXTBOX_FIXEDTEXT(ROW12) ); - Size = MAP_APPFONT( DIFF( COL1, COL3), RSC_CD_FIXEDTEXT_HEIGHT ); - Text [ en-US ] = "Interpret as years between"; - }; - NumericField NF_YEARVALUE - { - HelpID = "cui:NumericField:OFA_TP_MISC:NF_YEARVALUE"; - Border = TRUE ; - Pos = MAP_APPFONT( COL4, ROW12 ); - Size = MAP_APPFONT( EDIT_WIDTH, RSC_CD_TEXTBOX_HEIGHT ); - Minimum = 1583 ; - Maximum = 9857 ; - Spin = TRUE ; - Repeat = TRUE ; - }; - FixedText FT_TOYEAR - { - Pos = MAP_APPFONT( COL6, OFFS_TEXTBOX_FIXEDTEXT(ROW12) ); - Size = MAP_APPFONT( WHOLE_WIDTH - COL6, RSC_CD_FIXEDTEXT_HEIGHT ); - Text [ en-US ] = "and " ; - }; -}; - - //**************************************************************************** - // // TabPage Ansicht // //**************************************************************************** diff --git a/sw/uiconfig/swriter/ui/libgeneral.ui b/cui/uiconfig/ui/optgeneralpage.ui index 7c142595516a..0db876a35ed0 100644 --- a/sw/uiconfig/swriter/ui/libgeneral.ui +++ b/cui/uiconfig/ui/optgeneralpage.ui @@ -1,9 +1,17 @@ <?xml version="1.0" encoding="UTF-8"?> <interface> <!-- interface-requires gtk+ 3.0 --> - <object class="GtkBox" id="box1"> + <object class="GtkAdjustment" id="adjustment1"> + <property name="lower">1583</property> + <property name="upper">9857</property> + <property name="value">1930</property> + <property name="step_increment">1</property> + <property name="page_increment">10</property> + </object> + <object class="GtkBox" id="OptGeneralPage"> <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> @@ -16,6 +24,7 @@ <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"> @@ -23,14 +32,14 @@ <property name="can_focus">False</property> <property name="row_spacing">6</property> <property name="column_spacing">12</property> + <property name="column_homogeneous">True</property> <child> - <object class="GtkCheckButton" id="checkbutton1"> - <property name="label" translatable="yes">~Tips</property> - <property name="use_action_appearance">False</property> + <object class="GtkCheckButton" id="tooltips"> + <property name="label" translatable="yes">_Tips</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="use_action_appearance">False</property> + <property name="use_underline">True</property> <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> @@ -42,13 +51,12 @@ </packing> </child> <child> - <object class="GtkCheckButton" id="checkbutton2"> - <property name="label" translatable="yes">~Extended tips</property> - <property name="use_action_appearance">False</property> + <object class="GtkCheckButton" id="exthelp"> + <property name="label" translatable="yes">_Extended tips</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="use_action_appearance">False</property> + <property name="use_underline">True</property> <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> @@ -60,13 +68,12 @@ </packing> </child> <child> - <object class="GtkCheckButton" id="checkbutton3"> - <property name="label" translatable="yes">~Help Agent</property> - <property name="use_action_appearance">False</property> + <object class="GtkCheckButton" id="helpagent"> + <property name="label" translatable="yes">_Help Agent</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="use_action_appearance">False</property> + <property name="use_underline">True</property> <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> @@ -78,13 +85,13 @@ </packing> </child> <child> - <object class="GtkButton" id="button1"> - <property name="label" translatable="yes">~Reset Help Agent</property> - <property name="use_action_appearance">False</property> + <object class="GtkButton" id="resethelpagent"> + <property name="label" translatable="yes">_Reset Help Agent</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> - <property name="use_action_appearance">False</property> + <property name="halign">start</property> + <property name="use_underline">True</property> </object> <packing> <property name="left_attach">1</property> @@ -102,6 +109,9 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes">Help</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> </object> </child> </object> @@ -112,7 +122,7 @@ </packing> </child> <child> - <object class="GtkFrame" id="frame2"> + <object class="GtkFrame" id="filedlgframe"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="label_xalign">0</property> @@ -121,17 +131,45 @@ <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="GtkCheckButton" id="checkbutton4"> - <property name="label" translatable="yes">~Use LibreOffice dialogs</property> - <property name="use_action_appearance">False</property> + <object class="GtkGrid" id="grid4"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_action_appearance">False</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> + <property name="can_focus">False</property> + <property name="column_spacing">6</property> + <child> + <object class="GtkCheckButton" id="filedlg"> + <property name="label" translatable="yes">_Use LibreOffice dialogs</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">1</property> + <property name="top_attach">0</property> + <property name="width">1</property> + <property name="height">1</property> + </packing> + </child> + <child> + <object class="GtkImage" id="image1"> + <property name="can_focus">False</property> + <property name="no_show_all">True</property> + <property name="halign">center</property> + <property name="valign">center</property> + <property name="pixbuf">res/lock.png</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> @@ -141,6 +179,9 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes">Open/Save dialogs</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> </object> </child> </object> @@ -151,7 +192,7 @@ </packing> </child> <child> - <object class="GtkFrame" id="frame3"> + <object class="GtkFrame" id="printdlgframe"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="label_xalign">0</property> @@ -160,15 +201,15 @@ <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="GtkCheckButton" id="checkbutton5"> - <property name="label" translatable="yes">Use LibreOffice ~dialogs</property> - <property name="use_action_appearance">False</property> + <object class="GtkCheckButton" id="printdlg"> + <property name="label" translatable="yes">Use LibreOffice _dialogs</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="use_action_appearance">False</property> + <property name="use_underline">True</property> <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> @@ -180,6 +221,9 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes">Print dialogs</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> </object> </child> </object> @@ -199,19 +243,19 @@ <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="grid2"> <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="GtkCheckButton" id="checkbutton6"> - <property name="label" translatable="yes">~Printing sets "document modified" status</property> - <property name="use_action_appearance">False</property> + <object class="GtkCheckButton" id="docstatus"> + <property name="label" translatable="yes">_Printing sets "document modified" status</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="use_action_appearance">False</property> + <property name="use_underline">True</property> <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> @@ -223,13 +267,12 @@ </packing> </child> <child> - <object class="GtkCheckButton" id="checkbutton7"> - <property name="label" translatable="yes">~Allow to save document even when the document is not modified </property> - <property name="use_action_appearance">False</property> + <object class="GtkCheckButton" id="savealways"> + <property name="label" translatable="yes">_Allow to save document even when the document is not modified </property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="use_action_appearance">False</property> + <property name="use_underline">True</property> <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> @@ -249,6 +292,9 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="label" translatable="yes">Document status</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> </object> </child> </object> @@ -259,7 +305,7 @@ </packing> </child> <child> - <object class="GtkFrame" id="frame5"> + <object class="GtkFrame" id="yearframe"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="label_xalign">0</property> @@ -268,80 +314,53 @@ <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="grid3"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="column_spacing">12</property> <child> - <placeholder/> - </child> - <child> - <object class="GtkGrid" id="grid4"> + <object class="GtkLabel" id="label6"> <property name="visible">True</property> <property name="can_focus">False</property> - <child> - <object class="GtkLabel" id="label7"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">label</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="GtkSpinButton" id="spinbutton1"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="invisible_char">•</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> + <property name="xalign">0</property> + <property name="label" translatable="yes">_Interpret as years between </property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">year</property> </object> <packing> - <property name="left_attach">1</property> + <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="label6"> + <object class="GtkSpinButton" id="year"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">~Interpret as years between </property> + <property name="can_focus">True</property> + <property name="invisible_char">•</property> + <property name="invisible_char_set">True</property> + <property name="adjustment">adjustment1</property> </object> <packing> - <property name="left_attach">0</property> + <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="GtkCheckButton" id="checkbutton8"> - <property name="label" translatable="yes">Enable experimental (unstable) ~features </property> - <property name="use_action_appearance">False</property> + <object class="GtkLabel" id="toyear"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_action_appearance">False</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes">and </property> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> + <property name="left_attach">2</property> + <property name="top_attach">0</property> <property name="width">1</property> <property name="height">1</property> </packing> @@ -354,7 +373,10 @@ <object class="GtkLabel" id="label5"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Year(two digits)</property> + <property name="label" translatable="yes">Year (two digits)</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> </object> </child> </object> |