Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/2816
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/16/2816/1
converted cui/source/options/optsave.src to .ui
Change-Id: Ieaef10684f45dc699e7d2c56dffca5483f0a30cc
---
M cui/UI_cui.mk
M cui/source/options/optsave.cxx
M cui/source/options/optsave.hrc
M cui/source/options/optsave.hxx
M cui/source/options/optsave.src
A cui/uiconfig/ui/optsavepage.ui
6 files changed, 706 insertions(+), 442 deletions(-)
diff --git a/cui/UI_cui.mk b/cui/UI_cui.mk
index d5bde91..fff3fda 100644
--- a/cui/UI_cui.mk
+++ b/cui/UI_cui.mk
@@ -41,6 +41,7 @@
cui/uiconfig/ui/optgeneralpage \
cui/uiconfig/ui/optmemorypage \
cui/uiconfig/ui/optpathspage \
+ cui/uiconfig/ui/optsavepage \
cui/uiconfig/ui/optsecuritypage \
cui/uiconfig/ui/optuserpage \
cui/uiconfig/ui/optviewpage \
diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx
index efced8d..a4734fe 100644
--- a/cui/source/options/optsave.cxx
+++ b/cui/source/options/optsave.cxx
@@ -54,10 +54,6 @@
using namespace comphelper;
#define CFG_PAGE_AND_GROUP OUString("General"), OUString("LoadSave")
-// !! you have to update these index, if you changed the list of the child windows !!
-#define WININDEX_AUTOSAVE ((sal_uInt16) 6)
-#define WININDEX_USERAUTOSAVE ((sal_uInt16) 9)
-#define WININDEX_SAVEURL_RELFSYS ((sal_uInt16)10)
// ----------------------------------------------------------------------
@@ -87,53 +83,53 @@
// class SvxSaveTabPage --------------------------------------------------
SfxSaveTabPage::SfxSaveTabPage( Window* pParent, const SfxItemSet& rCoreSet ) :
-
- SfxTabPage( pParent, CUI_RES( RID_SFXPAGE_SAVE ), rCoreSet ),
-
- aLoadFL ( this, CUI_RES( LB_LOAD ) ),
- aLoadUserSettingsCB ( this, CUI_RES( CB_LOAD_SETTINGS ) ),
- aLoadDocPrinterCB ( this, CUI_RES( CB_LOAD_DOCPRINTER ) ),
-
- aSaveFL ( this, CUI_RES( GB_SAVE ) ),
- aDocInfoCB ( this, CUI_RES( BTN_DOCINFO ) ),
- aBackupFI ( this, CUI_RES( FI_BACKUP ) ),
- aBackupCB ( this, CUI_RES( BTN_BACKUP ) ),
- aAutoSaveCB ( this, CUI_RES( BTN_AUTOSAVE ) ),
- aAutoSaveEdit ( this, CUI_RES( ED_AUTOSAVE ) ),
- aMinuteFT ( this, CUI_RES( FT_MINUTE ) ),
- aUserAutoSaveCB ( this, CUI_RES( BTN_USERAUTOSAVE ) ),
- aRelativeFsysCB ( this, CUI_RES( BTN_RELATIVE_FSYS ) ),
- aRelativeInetCB ( this, CUI_RES( BTN_RELATIVE_INET ) ),
-
- aDefaultFormatFL ( this, CUI_RES( FL_FILTER ) ),
- aODFVersionFT ( this, CUI_RES( FT_ODF_VERSION ) ),
- aODFVersionLB ( this, CUI_RES( LB_ODF_VERSION ) ),
- aSizeOptimizationCB ( this, CUI_RES( BTN_NOPRETTYPRINTING ) ),
- aWarnAlienFormatCB ( this, CUI_RES( BTN_WARNALIENFORMAT ) ),
- aDocTypeFT ( this, CUI_RES( FT_APP ) ),
- aDocTypeLB ( this, CUI_RES( LB_APP ) ),
- aSaveAsFT ( this, CUI_RES( FT_FILTER ) ),
- aSaveAsFI ( this, CUI_RES( FI_FILTER ) ),
- aSaveAsLB ( this, CUI_RES( LB_FILTER ) ),
- aODFWarningFI ( this, CUI_RES( FI_ODF_WARNING ) ),
- aODFWarningFT ( this, CUI_RES( FT_WARN ) ),
-
+ SfxTabPage( pParent, "OptSavePage", "cui/ui/optsavepage.ui", rCoreSet ),
pImpl ( new SvxSaveTabPage_Impl )
-
{
- aODFWarningFI.SetImage( Image( CUI_RES( IMG_ODF_WARNING )));
+ get(aLoadUserSettingsCB, "load_settings");
+ get(aLoadDocPrinterCB, "load_docprinter");
- FreeResource();
+ get(aDocInfoCB, "docinfo");
+ get(aBackupCB, "backup");
+ get(aAutoSaveCB, "autosave");
+ get(aAutoSaveEdit, "autosave_spin");
+ get(aMinuteFT, "autosave_mins");
+ get(aUserAutoSaveCB, "userautosave");
+ get(aRelativeFsysCB, "relative_fsys");
+ get(aRelativeInetCB, "relative_inet");
+
+ get(aODFVersionLB, "odfversion");
+ get(aSizeOptimizationCB, "sizeoptimization");
+ get(aWarnAlienFormatCB, "warnalienformat");
+ get(aDocTypeLB, "doctype");
+ get(aSaveAsFT, "saveas_label");
+ get(aSaveAsLB, "saveas");
+ get(aODFWarningFI, "odfwarning_image");
+ get(aODFWarningFT, "odfwarning_label");
+
+
+ aODFVersionLB->SetEntryData(0, (void*)2 ); // 1.0/1.1
+ aODFVersionLB->SetEntryData(1, (void*)4 ); // 1.2
+ aODFVersionLB->SetEntryData(2, (void*)8 ); // 1.2 Extended (compat mode)
+ aODFVersionLB->SetEntryData(3, (void*)0x7fffffff); // 1.2 Extended (recommended)
+
+ aDocTypeLB->SetEntryData(0, (void*)APP_WRITER );
+ aDocTypeLB->SetEntryData(1, (void*)APP_WRITER_WEB );
+ aDocTypeLB->SetEntryData(2, (void*)APP_WRITER_GLOBAL);
+ aDocTypeLB->SetEntryData(3, (void*)APP_CALC );
+ aDocTypeLB->SetEntryData(4, (void*)APP_IMPRESS );
+ aDocTypeLB->SetEntryData(5, (void*)APP_DRAW );
+ aDocTypeLB->SetEntryData(6, (void*)APP_MATH );
Link aLink = LINK( this, SfxSaveTabPage, AutoClickHdl_Impl );
- aAutoSaveCB.SetClickHdl( aLink );
- aAutoSaveEdit.SetMaxTextLen( 2 );
+ aAutoSaveCB->SetClickHdl( aLink );
+ aAutoSaveEdit->SetMaxTextLen( 2 );
SvtModuleOptions aModuleOpt;
if ( !aModuleOpt.IsModuleInstalled( SvtModuleOptions::E_SMATH ) )
{
- aSaveAsLB.RemoveEntry(aSaveAsLB.GetEntryPos( (void*) APP_MATH ));
- aDocTypeLB.RemoveEntry(aDocTypeLB.GetEntryPos( (void*) APP_MATH ));
+ aSaveAsLB->RemoveEntry(aSaveAsLB->GetEntryPos( (void*) APP_MATH ));
+ aDocTypeLB->RemoveEntry(aDocTypeLB->GetEntryPos( (void*) APP_MATH ));
}
else
{
@@ -143,8 +139,8 @@
if ( !aModuleOpt.IsModuleInstalled( SvtModuleOptions::E_SDRAW ) )
{
- aSaveAsLB.RemoveEntry(aSaveAsLB.GetEntryPos( (void*) APP_DRAW ));
- aDocTypeLB.RemoveEntry(aDocTypeLB.GetEntryPos( (void*) APP_DRAW ));
+ aSaveAsLB->RemoveEntry(aSaveAsLB->GetEntryPos( (void*) APP_DRAW ));
+ aDocTypeLB->RemoveEntry(aDocTypeLB->GetEntryPos( (void*) APP_DRAW ));
}
else
{
@@ -154,8 +150,8 @@
if ( !aModuleOpt.IsModuleInstalled( SvtModuleOptions::E_SIMPRESS ) )
{
- aSaveAsLB.RemoveEntry(aSaveAsLB.GetEntryPos( (void*) APP_IMPRESS ));
- aDocTypeLB.RemoveEntry(aDocTypeLB.GetEntryPos( (void*) APP_IMPRESS ));
+ aSaveAsLB->RemoveEntry(aSaveAsLB->GetEntryPos( (void*) APP_IMPRESS ));
+ aDocTypeLB->RemoveEntry(aDocTypeLB->GetEntryPos( (void*) APP_IMPRESS ));
}
else
{
@@ -165,8 +161,8 @@
if ( !aModuleOpt.IsModuleInstalled( SvtModuleOptions::E_SCALC ) )
{
- aSaveAsLB.RemoveEntry(aSaveAsLB.GetEntryPos( (void*) APP_CALC ));
- aDocTypeLB.RemoveEntry(aDocTypeLB.GetEntryPos( (void*) APP_CALC ));
+ aSaveAsLB->RemoveEntry(aSaveAsLB->GetEntryPos( (void*) APP_CALC ));
+ aDocTypeLB->RemoveEntry(aDocTypeLB->GetEntryPos( (void*) APP_CALC ));
}
else
{
@@ -176,12 +172,12 @@
if ( !aModuleOpt.IsModuleInstalled( SvtModuleOptions::E_SWRITER ) )
{
- aSaveAsLB.RemoveEntry(aSaveAsLB.GetEntryPos( (void*) APP_WRITER ));
- aSaveAsLB.RemoveEntry(aSaveAsLB.GetEntryPos( (void*) APP_WRITER_WEB ));
- aSaveAsLB.RemoveEntry(aSaveAsLB.GetEntryPos( (void*) APP_WRITER_GLOBAL ));
- aDocTypeLB.RemoveEntry(aDocTypeLB.GetEntryPos( (void*) APP_WRITER ));
- aDocTypeLB.RemoveEntry(aDocTypeLB.GetEntryPos( (void*) APP_WRITER_WEB ));
- aDocTypeLB.RemoveEntry(aDocTypeLB.GetEntryPos( (void*) APP_WRITER_GLOBAL ));
+ aSaveAsLB->RemoveEntry(aSaveAsLB->GetEntryPos( (void*) APP_WRITER ));
+ aSaveAsLB->RemoveEntry(aSaveAsLB->GetEntryPos( (void*) APP_WRITER_WEB ));
+ aSaveAsLB->RemoveEntry(aSaveAsLB->GetEntryPos( (void*) APP_WRITER_GLOBAL ));
+ aDocTypeLB->RemoveEntry(aDocTypeLB->GetEntryPos( (void*) APP_WRITER ));
+ aDocTypeLB->RemoveEntry(aDocTypeLB->GetEntryPos( (void*) APP_WRITER_WEB ));
+ aDocTypeLB->RemoveEntry(aDocTypeLB->GetEntryPos( (void*) APP_WRITER_GLOBAL ));
}
else
{
@@ -194,10 +190,10 @@
}
aLink = LINK( this, SfxSaveTabPage, ODFVersionHdl_Impl );
- aODFVersionLB.SetSelectHdl( aLink );
+ aODFVersionLB->SetSelectHdl( aLink );
aLink = LINK( this, SfxSaveTabPage, FilterHdl_Impl );
- aDocTypeLB.SetSelectHdl( aLink );
- aSaveAsLB.SetSelectHdl( aLink );
+ aDocTypeLB->SetSelectHdl( aLink );
+ aSaveAsLB->SetSelectHdl( aLink );
DetectHiddenControls();
}
@@ -220,133 +216,106 @@
// -----------------------------------------------------------------------
void SfxSaveTabPage::DetectHiddenControls()
{
- long nDelta = 0;
- // the index of the first child window which perhaps have to move upwards
- sal_uInt16 nWinIndex = WININDEX_SAVEURL_RELFSYS;
SvtOptionsDialogOptions aOptionsDlgOpt;
if ( aOptionsDlgOpt.IsOptionHidden( "Backup", CFG_PAGE_AND_GROUP ) )
{
// hide controls of "Backup"
- aBackupFI.Hide();
- aBackupCB.Hide();
- // the other controls have to move upwards the height of checkbox + space
- nDelta = aAutoSaveCB.GetPosPixel().Y() - aBackupCB.GetPosPixel().Y();
+ aBackupCB->Hide();
}
if ( aOptionsDlgOpt.IsOptionHidden( "AutoSave", CFG_PAGE_AND_GROUP ) )
{
// hide controls of "AutoSave"
- aAutoSaveCB.Hide();
- aAutoSaveEdit.Hide();
- aMinuteFT.Hide();
- // the other controls have to move upwards the height of checkbox + space
- nDelta += aUserAutoSaveCB.GetPosPixel().Y() - aAutoSaveCB.GetPosPixel().Y();
+ aAutoSaveCB->Hide();
+ aAutoSaveEdit->Hide();
+ aMinuteFT->Hide();
}
- else if ( nDelta > 0 )
- // the "AutoSave" controls have to move upwards too
- nWinIndex = WININDEX_AUTOSAVE;
if ( aOptionsDlgOpt.IsOptionHidden( "UserAutoSave", CFG_PAGE_AND_GROUP ) )
{
// hide controls of "UserAutoSave"
- aUserAutoSaveCB.Hide();
- // the other controls have to move upwards the height of checkbox + space
- nDelta += aRelativeFsysCB.GetPosPixel().Y() - aUserAutoSaveCB.GetPosPixel().Y();
+ aUserAutoSaveCB->Hide();
}
- else if ( nDelta > 0 )
- // the "UserAutoSave" controls have to move upwards too
- nWinIndex = WININDEX_USERAUTOSAVE;
- if ( nDelta > 0 )
- {
- sal_uInt16 i, nChildCount = GetChildCount();
- for ( i = nWinIndex; i < nChildCount; ++i )
- {
- Window* pWin = GetChild(i);
- Point aPos = pWin->GetPosPixel();
- aPos.Y() -= nDelta;
- pWin->SetPosPixel( aPos );
- }
- }
}
// -----------------------------------------------------------------------
sal_Bool SfxSaveTabPage::FillItemSet( SfxItemSet& rSet )
{
sal_Bool bModified = sal_False;
SvtSaveOptions aSaveOpt;
- if(aLoadUserSettingsCB.IsChecked() != aLoadUserSettingsCB.GetSavedValue())
+ if(aLoadUserSettingsCB->IsChecked() != aLoadUserSettingsCB->GetSavedValue())
{
- aSaveOpt.SetLoadUserSettings(aLoadUserSettingsCB.IsChecked());
+ aSaveOpt.SetLoadUserSettings(aLoadUserSettingsCB->IsChecked());
}
- if ( aLoadDocPrinterCB.IsChecked() != aLoadDocPrinterCB.GetSavedValue() )
- aSaveOpt.SetLoadDocumentPrinter( aLoadDocPrinterCB.IsChecked() );
+ if ( aLoadDocPrinterCB->IsChecked() != aLoadDocPrinterCB->GetSavedValue() )
+ aSaveOpt.SetLoadDocumentPrinter( aLoadDocPrinterCB->IsChecked() );
- if ( aODFVersionLB.GetSelectEntryPos() != aODFVersionLB.GetSavedValue() )
+ if ( aODFVersionLB->GetSelectEntryPos() != aODFVersionLB->GetSavedValue() )
{
- long nVersion = long( aODFVersionLB.GetEntryData( aODFVersionLB.GetSelectEntryPos() ) );
+ long nVersion = long( aODFVersionLB->GetEntryData( aODFVersionLB->GetSelectEntryPos() ) );
aSaveOpt.SetODFDefaultVersion( SvtSaveOptions::ODFDefaultVersion( nVersion ) );
}
- if ( aDocInfoCB.IsChecked() != aDocInfoCB.GetSavedValue() )
+ if ( aDocInfoCB->IsChecked() != aDocInfoCB->GetSavedValue() )
{
rSet.Put( SfxBoolItem( GetWhich( SID_ATTR_DOCINFO ),
- aDocInfoCB.IsChecked() ) );
+ aDocInfoCB->IsChecked() ) );
bModified |= sal_True;
}
- if ( aBackupCB.IsEnabled() && aBackupCB.IsChecked() != aBackupCB.GetSavedValue() )
+ if ( aBackupCB->IsEnabled() && aBackupCB->IsChecked() != aBackupCB->GetSavedValue() )
{
rSet.Put( SfxBoolItem( GetWhich( SID_ATTR_BACKUP ),
- aBackupCB.IsChecked() ) );
+ aBackupCB->IsChecked() ) );
bModified |= sal_True;
}
- if ( aSizeOptimizationCB.IsChecked() != aSizeOptimizationCB.GetSavedValue() )
+ if ( aSizeOptimizationCB->IsChecked() != aSizeOptimizationCB->GetSavedValue() )
{
- rSet.Put( SfxBoolItem( GetWhich( SID_ATTR_PRETTYPRINTING ),
!aSizeOptimizationCB.IsChecked() ) );
+ rSet.Put( SfxBoolItem( GetWhich( SID_ATTR_PRETTYPRINTING ),
!aSizeOptimizationCB->IsChecked() ) );
bModified |= sal_True;
}
- if ( aAutoSaveCB.IsChecked() != aAutoSaveCB.GetSavedValue() )
+ if ( aAutoSaveCB->IsChecked() != aAutoSaveCB->GetSavedValue() )
{
rSet.Put( SfxBoolItem( GetWhich( SID_ATTR_AUTOSAVE ),
- aAutoSaveCB.IsChecked() ) );
+ aAutoSaveCB->IsChecked() ) );
bModified |= sal_True;
}
- if ( aWarnAlienFormatCB.IsChecked() != aWarnAlienFormatCB.GetSavedValue() )
+ if ( aWarnAlienFormatCB->IsChecked() != aWarnAlienFormatCB->GetSavedValue() )
{
rSet.Put( SfxBoolItem( GetWhich( SID_ATTR_WARNALIENFORMAT ),
- aWarnAlienFormatCB.IsChecked() ) );
+ aWarnAlienFormatCB->IsChecked() ) );
bModified |= sal_True;
}
- if ( aAutoSaveEdit.GetText() != aAutoSaveEdit.GetSavedValue() )
+ if ( aAutoSaveEdit->GetText() != aAutoSaveEdit->GetSavedValue() )
{
rSet.Put( SfxUInt16Item( GetWhich( SID_ATTR_AUTOSAVEMINUTE ),
- (sal_uInt16)aAutoSaveEdit.GetValue() ) );
+ (sal_uInt16)aAutoSaveEdit->GetValue() ) );
bModified |= sal_True;
}
- if ( aUserAutoSaveCB.IsChecked() != aUserAutoSaveCB.GetSavedValue() )
+ if ( aUserAutoSaveCB->IsChecked() != aUserAutoSaveCB->GetSavedValue() )
{
rSet.Put( SfxBoolItem( GetWhich( SID_ATTR_USERAUTOSAVE ),
- aUserAutoSaveCB.IsChecked() ) );
+ aUserAutoSaveCB->IsChecked() ) );
bModified |= sal_True;
}
// save relatively
- if ( aRelativeFsysCB.IsChecked() != aRelativeFsysCB.GetSavedValue() )
+ if ( aRelativeFsysCB->IsChecked() != aRelativeFsysCB->GetSavedValue() )
{
rSet.Put( SfxBoolItem( GetWhich( SID_SAVEREL_FSYS ),
- aRelativeFsysCB.IsChecked() ) );
+ aRelativeFsysCB->IsChecked() ) );
bModified |= sal_True;
}
- if ( aRelativeInetCB.IsChecked() != aRelativeInetCB.GetSavedValue() )
+ if ( aRelativeInetCB->IsChecked() != aRelativeInetCB->GetSavedValue() )
{
rSet.Put( SfxBoolItem( GetWhich( SID_SAVEREL_INET ),
- aRelativeInetCB.IsChecked() ) );
+ aRelativeInetCB->IsChecked() ) );
bModified |= sal_True;
}
@@ -421,10 +390,10 @@
void SfxSaveTabPage::Reset( const SfxItemSet& )
{
SvtSaveOptions aSaveOpt;
- aLoadUserSettingsCB.Check(aSaveOpt.IsLoadUserSettings());
- aLoadUserSettingsCB.SaveValue();
- aLoadDocPrinterCB.Check( aSaveOpt.IsLoadDocumentPrinter() );
- aLoadDocPrinterCB.SaveValue();
+ aLoadUserSettingsCB->Check(aSaveOpt.IsLoadUserSettings());
+ aLoadUserSettingsCB->SaveValue();
+ aLoadDocPrinterCB->Check( aSaveOpt.IsLoadDocumentPrinter() );
+ aLoadDocPrinterCB->SaveValue();
if ( !pImpl->bInitialized )
{
@@ -438,9 +407,9 @@
Reference< XContainerQuery > xQuery(pImpl->xFact, UNO_QUERY);
if(xQuery.is())
{
- for(sal_uInt16 n = 0; n < aDocTypeLB.GetEntryCount(); n++)
+ for(sal_uInt16 n = 0; n < aDocTypeLB->GetEntryCount(); n++)
{
- long nData = (long) aDocTypeLB.GetEntryData(n);
+ long nData = (long) aDocTypeLB->GetEntryData(n);
OUString sCommand;
sCommand = "matchByDocumentService=%1:iflags=" +
OUString::number(SFX_FILTER_IMPORT|SFX_FILTER_EXPORT) +
@@ -482,8 +451,8 @@
pImpl->aODFArr[nData] = lODFList.getAsConstList();
}
}
- aDocTypeLB.SelectEntryPos(0);
- FilterHdl_Impl(&aDocTypeLB);
+ aDocTypeLB->SelectEntryPos(0);
+ FilterHdl_Impl(aDocTypeLB);
}
catch(Exception& e)
{
@@ -501,65 +470,64 @@
pImpl->bInitialized = sal_True;
}
- aDocInfoCB.Check(aSaveOpt.IsDocInfoSave());
+ aDocInfoCB->Check(aSaveOpt.IsDocInfoSave());
- aBackupCB.Check(aSaveOpt.IsBackup());
+ aBackupCB->Check(aSaveOpt.IsBackup());
sal_Bool bBackupRO = aSaveOpt.IsReadOnly(SvtSaveOptions::E_BACKUP);
- aBackupCB.Enable(!bBackupRO);
- aBackupFI.Show(bBackupRO);
+ aBackupCB->Enable(!bBackupRO);
- aAutoSaveCB.Check(aSaveOpt.IsAutoSave());
- aUserAutoSaveCB.Check(aSaveOpt.IsUserAutoSave());
- aWarnAlienFormatCB.Check(aSaveOpt.IsWarnAlienFormat());
- aWarnAlienFormatCB.Enable(!aSaveOpt.IsReadOnly(SvtSaveOptions::E_WARNALIENFORMAT));
+ aAutoSaveCB->Check(aSaveOpt.IsAutoSave());
+ aUserAutoSaveCB->Check(aSaveOpt.IsUserAutoSave());
+ aWarnAlienFormatCB->Check(aSaveOpt.IsWarnAlienFormat());
+ aWarnAlienFormatCB->Enable(!aSaveOpt.IsReadOnly(SvtSaveOptions::E_WARNALIENFORMAT));
// the pretty printing
- aSizeOptimizationCB.Check( !aSaveOpt.IsPrettyPrinting());
+ aSizeOptimizationCB->Check( !aSaveOpt.IsPrettyPrinting());
- aAutoSaveEdit.SetValue( aSaveOpt.GetAutoSaveTime() );
+ aAutoSaveEdit->SetValue( aSaveOpt.GetAutoSaveTime() );
// save relatively
- aRelativeFsysCB.Check( aSaveOpt.IsSaveRelFSys() );
+ aRelativeFsysCB->Check( aSaveOpt.IsSaveRelFSys() );
- aRelativeInetCB.Check( aSaveOpt.IsSaveRelINet() );
+ aRelativeInetCB->Check( aSaveOpt.IsSaveRelINet() );
void* pDefaultVersion = (void*)long( aSaveOpt.GetODFDefaultVersion() );
- aODFVersionLB.SelectEntryPos( aODFVersionLB.GetEntryPos( pDefaultVersion ) );
+ aODFVersionLB->SelectEntryPos( aODFVersionLB->GetEntryPos( pDefaultVersion ) );
- AutoClickHdl_Impl( &aAutoSaveCB );
- ODFVersionHdl_Impl( &aODFVersionLB );
+ AutoClickHdl_Impl( aAutoSaveCB );
+ ODFVersionHdl_Impl( aODFVersionLB );
- aDocInfoCB.SaveValue();
- aBackupCB.SaveValue();
- aWarnAlienFormatCB.SaveValue();
- aSizeOptimizationCB.SaveValue();
- aAutoSaveCB.SaveValue();
- aAutoSaveEdit.SaveValue();
+ aDocInfoCB->SaveValue();
+ aBackupCB->SaveValue();
+ aWarnAlienFormatCB->SaveValue();
+ aSizeOptimizationCB->SaveValue();
+ aAutoSaveCB->SaveValue();
+ aAutoSaveEdit->SaveValue();
- aUserAutoSaveCB.SaveValue();
+ aUserAutoSaveCB->SaveValue();
- aRelativeFsysCB.SaveValue();
- aRelativeInetCB.SaveValue();
- aODFVersionLB.SaveValue();
+ aRelativeFsysCB->SaveValue();
+ aRelativeInetCB->SaveValue();
+ aODFVersionLB->SaveValue();
}
// -----------------------------------------------------------------------
IMPL_LINK( SfxSaveTabPage, AutoClickHdl_Impl, CheckBox *, pBox )
{
- if ( pBox == &aAutoSaveCB )
+ if ( pBox == aAutoSaveCB )
{
- if ( aAutoSaveCB.IsChecked() )
+ if ( aAutoSaveCB->IsChecked() )
{
- aAutoSaveEdit.Enable();
- aMinuteFT.Enable();
- aUserAutoSaveCB.Enable();
+ aAutoSaveEdit->Enable();
+ aMinuteFT->Enable();
+ aUserAutoSaveCB->Enable();
}
else
{
- aAutoSaveEdit.Disable();
- aMinuteFT.Disable();
- aUserAutoSaveCB.Disable();
+ aAutoSaveEdit->Disable();
+ aMinuteFT->Disable();
+ aUserAutoSaveCB->Disable();
}
}
return 0;
@@ -586,17 +554,17 @@
IMPL_LINK( SfxSaveTabPage, FilterHdl_Impl, ListBox *, pBox )
{
- sal_uInt16 nCurPos = aDocTypeLB.GetSelectEntryPos();
+ sal_uInt16 nCurPos = aDocTypeLB->GetSelectEntryPos();
long nData = -1;
if(nCurPos < APP_COUNT)
- nData = (long) aDocTypeLB.GetEntryData(nCurPos);
+ nData = (long) aDocTypeLB->GetEntryData(nCurPos);
if ( nData >= 0 && nData < APP_COUNT )
{
- if(&aDocTypeLB == pBox)
+ if(aDocTypeLB == pBox)
{
- aSaveAsLB.Clear();
+ aSaveAsLB->Clear();
const OUString* pFilters = pImpl->aFilterArr[nData].getConstArray();
if(!pImpl->aUIFilterArr[nData].getLength())
{
@@ -614,17 +582,19 @@
OUString sSelect;
for(int i = 0; i < pImpl->aUIFilterArr[nData].getLength(); i++)
{
- sal_uInt16 nEntryPos = aSaveAsLB.InsertEntry(pUIFilters[i]);
+ sal_uInt16 nEntryPos = aSaveAsLB->InsertEntry(pUIFilters[i]);
if ( pImpl->aODFArr[nData][i] )
- aSaveAsLB.SetEntryData( nEntryPos, (void*)pImpl );
+ aSaveAsLB->SetEntryData( nEntryPos, (void*)pImpl );
if(pFilters[i] == pImpl->aDefaultArr[nData])
sSelect = pUIFilters[i];
}
if(!sSelect.isEmpty())
- aSaveAsLB.SelectEntry(sSelect);
- aSaveAsFI.Show(pImpl->aDefaultReadonlyArr[nData]);
- aSaveAsFT.Enable(!pImpl->aDefaultReadonlyArr[nData]);
- aSaveAsLB.Enable(!pImpl->aDefaultReadonlyArr[nData]);
+ {
+ aSaveAsLB->SelectEntry(sSelect);
+ }
+
+ aSaveAsFT->Enable(!pImpl->aDefaultReadonlyArr[nData]);
+ aSaveAsLB->Enable(!pImpl->aDefaultReadonlyArr[nData]);
}
else
{
@@ -642,21 +612,21 @@
}
}
- ODFVersionHdl_Impl( &aSaveAsLB );
+ ODFVersionHdl_Impl( aSaveAsLB );
return 0;
};
IMPL_LINK_NOARG(SfxSaveTabPage, ODFVersionHdl_Impl)
{
- long nVersion = long( aODFVersionLB.GetEntryData( aODFVersionLB.GetSelectEntryPos() ) );
+ long nVersion = long( aODFVersionLB->GetEntryData( aODFVersionLB->GetSelectEntryPos() ) );
bool bShown = SvtSaveOptions::ODFDefaultVersion( nVersion ) != SvtSaveOptions::ODFVER_LATEST;
if ( bShown )
{
bool bHasODFFormat = false;
- sal_uInt16 i = 0, nCount = aSaveAsLB.GetEntryCount();
+ sal_uInt16 i = 0, nCount = aSaveAsLB->GetEntryCount();
for ( ; i < nCount; ++ i )
{
- if ( aSaveAsLB.GetEntryData(i) != NULL )
+ if ( aSaveAsLB->GetEntryData(i) != NULL )
{
bHasODFFormat = true;
break;
@@ -664,11 +634,11 @@
}
bShown = !bHasODFFormat
- || ( aSaveAsLB.GetEntryData( aSaveAsLB.GetSelectEntryPos() ) != NULL );
+ || ( aSaveAsLB->GetEntryData( aSaveAsLB->GetSelectEntryPos() ) != NULL );
}
- aODFWarningFI.Show( bShown );
- aODFWarningFT.Show( bShown );
+ aODFWarningFI->Show( bShown );
+ aODFWarningFT->Show( bShown );
return 0;
}
diff --git a/cui/source/options/optsave.hrc b/cui/source/options/optsave.hrc
index d0148fb..bc20142 100644
--- a/cui/source/options/optsave.hrc
+++ b/cui/source/options/optsave.hrc
@@ -21,36 +21,6 @@
// defines ------------------------------------------------------------------
-#define LB_LOAD 10
-#define CB_LOAD_SETTINGS 11
-#define CB_LOAD_DOCPRINTER 12
-#define GB_SAVE 13
-#define BTN_DOCINFO 14
-#define BTN_BACKUP 15
-#define BTN_AUTOSAVE 16
-#define ED_AUTOSAVE 17
-#define FT_MINUTE 18
-#define BTN_USERAUTOSAVE 19
-#define BTN_NOPRETTYPRINTING 20
-#define FI_BACKUP 21
-#define BTN_WARNALIENFORMAT 22
-#define FT_ODF_VERSION 23
-#define LB_ODF_VERSION 24
-
-#define BTN_RELATIVE_FSYS 41
-#define BTN_RELATIVE_INET 42
-
-#define FL_FILTER 43
-#define FT_APP 44
-#define LB_APP 45
-#define FT_FILTER 46
-#define LB_FILTER 47
-#define FI_FILTER 48
-#define FT_WARN 49
-#define FI_ODF_WARNING 50
-
-#define IMG_ODF_WARNING 1
-
#define APP_WRITER 0
#define APP_WRITER_WEB 1
#define APP_WRITER_GLOBAL 2
diff --git a/cui/source/options/optsave.hxx b/cui/source/options/optsave.hxx
index 00cb63f..dcc3a5a 100644
--- a/cui/source/options/optsave.hxx
+++ b/cui/source/options/optsave.hxx
@@ -43,33 +43,26 @@
class SvxSaveTabPage : public SfxTabPage
{
private:
- FixedLine aLoadFL;
- CheckBox aLoadUserSettingsCB;
- CheckBox aLoadDocPrinterCB;
+ CheckBox* aLoadUserSettingsCB;
+ CheckBox* aLoadDocPrinterCB;
- FixedLine aSaveFL;
- CheckBox aDocInfoCB;
- ReadOnlyImage aBackupFI;
- CheckBox aBackupCB;
- CheckBox aAutoSaveCB;
- NumericField aAutoSaveEdit;
- FixedText aMinuteFT;
- CheckBox aUserAutoSaveCB;
- CheckBox aRelativeFsysCB;
- CheckBox aRelativeInetCB;
+ CheckBox* aDocInfoCB;
+ CheckBox* aBackupCB;
+ CheckBox* aAutoSaveCB;
+ NumericField* aAutoSaveEdit;
+ FixedText* aMinuteFT;
+ CheckBox* aUserAutoSaveCB;
+ CheckBox* aRelativeFsysCB;
+ CheckBox* aRelativeInetCB;
- FixedLine aDefaultFormatFL;
- FixedText aODFVersionFT;
- ListBox aODFVersionLB;
- CheckBox aSizeOptimizationCB;
- CheckBox aWarnAlienFormatCB;
- FixedText aDocTypeFT;
- ListBox aDocTypeLB;
- FixedText aSaveAsFT;
- ReadOnlyImage aSaveAsFI;
- ListBox aSaveAsLB;
- FixedImage aODFWarningFI;
- FixedText aODFWarningFT;
+ ListBox* aODFVersionLB;
+ CheckBox* aSizeOptimizationCB;
+ CheckBox* aWarnAlienFormatCB;
+ ListBox* aDocTypeLB;
+ FixedText* aSaveAsFT;
+ ListBox* aSaveAsLB;
+ FixedImage* aODFWarningFI;
+ FixedText* aODFWarningFT;
SvxSaveTabPage_Impl* pImpl;
diff --git a/cui/source/options/optsave.src b/cui/source/options/optsave.src
index 71b29d6..287709a 100644
--- a/cui/source/options/optsave.src
+++ b/cui/source/options/optsave.src
@@ -26,222 +26,6 @@
#define TEXT_SAVEPAGE \
Text [ en-US ] = "Save" ;\
-TabPage RID_SFXPAGE_SAVE
-{
- HelpId = HID_OPTIONS_SAVE ;
- OutputSize = TRUE ;
- SVLook = TRUE ;
- Hide = TRUE ;
- TEXT_SAVEPAGE
- Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
- FixedLine LB_LOAD
- {
- Pos = MAP_APPFONT ( 6 , 2 ) ;
- Size = MAP_APPFONT ( 248 , 8 ) ;
- Text [ en-US ] = "Load";
- };
- CheckBox CB_LOAD_SETTINGS
- {
- HelpID = "cui:CheckBox:RID_SFXPAGE_SAVE:CB_LOAD_SETTINGS";
- Pos = MAP_APPFONT ( 12 , 11 ) ;
- Size = MAP_APPFONT ( 236 , 10 ) ;
- Text [ en-US ] = "Load user-specific settings with the document";
- };
- CheckBox CB_LOAD_DOCPRINTER
- {
- HelpID = "cui:CheckBox:RID_SFXPAGE_SAVE:CB_LOAD_DOCPRINTER";
- Pos = MAP_APPFONT ( 12 , 22 ) ;
- Size = MAP_APPFONT ( 236 , 10 ) ;
- Text [ en-US ] = "Load printer settings with the document";
- };
- FixedLine GB_SAVE
- {
- Pos = MAP_APPFONT ( 6 , 32 ) ;
- Size = MAP_APPFONT ( 248 , 8 ) ;
- Text [ en-US ] = "Save" ;
- };
- CheckBox BTN_DOCINFO
- {
- HelpID = "cui:CheckBox:RID_SFXPAGE_SAVE:BTN_DOCINFO";
- Pos = MAP_APPFONT ( 12 , 41 ) ;
- Size = MAP_APPFONT ( 236 , 10 ) ;
- Text [ en-US ] = "~Edit document properties before saving" ;
- TabStop = TRUE ;
- };
- FixedImage FI_BACKUP
- {
- Pos = MAP_APPFONT ( 5, 53 ) ;
- Size = MAP_APPFONT ( 6 , 6 ) ;
- Hide = TRUE;
- };
- CheckBox BTN_BACKUP
- {
- HelpID = "cui:CheckBox:RID_SFXPAGE_SAVE:BTN_BACKUP";
- Pos = MAP_APPFONT ( 12 , 52 ) ;
- Size = MAP_APPFONT ( 236 , 10 ) ;
- Text [ en-US ] = "Al~ways create backup copy" ;
- };
- CheckBox BTN_AUTOSAVE
- {
- HelpID = "cui:CheckBox:RID_SFXPAGE_SAVE:BTN_AUTOSAVE";
- Pos = MAP_APPFONT ( 12 , 63 ) ;
- Size = MAP_APPFONT ( 163 , 10 ) ;
- Text [ en-US ] = "Save ~AutoRecovery information every" ;
- };
- NumericField ED_AUTOSAVE
- {
- HelpID = "cui:NumericField:RID_SFXPAGE_SAVE:ED_AUTOSAVE";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 180 , 62 ) ;
- Size = MAP_APPFONT ( 21 , 12 ) ;
- Left = TRUE ;
- Repeat = TRUE ;
- Spin = TRUE ;
- Minimum = 1 ;
- Maximum = 60 ;
- StrictFormat = TRUE ;
- First = 1 ;
- Last = 60 ;
- SpinSize = 1 ;
- TabStop = TRUE ;
- };
- FixedText FT_MINUTE
- {
- Pos = MAP_APPFONT ( 204 , 64 ) ;
- Size = MAP_APPFONT ( 65 , 8 ) ;
- Text [ en-US ] = "Minutes" ;
- };
- CheckBox BTN_USERAUTOSAVE
- {
- HelpID = "cui:CheckBox:RID_SFXPAGE_SAVE:BTN_USERAUTOSAVE";
- Pos = MAP_APPFONT ( 21 , 74 ) ;
- Size = MAP_APPFONT ( 163 , 10 ) ;
- Text [ en-US ] = "Automatically save the document too" ;
- };
- CheckBox BTN_RELATIVE_FSYS
- {
- HelpID = "cui:CheckBox:RID_SFXPAGE_SAVE:BTN_RELATIVE_FSYS";
- Pos = MAP_APPFONT ( 12 , 85 ) ;
- Size = MAP_APPFONT ( 236 , 10 ) ;
- Text [ en-US ] = "Save URLs relative to file system" ;
- };
- CheckBox BTN_RELATIVE_INET
- {
- HelpID = "cui:CheckBox:RID_SFXPAGE_SAVE:BTN_RELATIVE_INET";
- Pos = MAP_APPFONT ( 12 , 96 ) ;
- Size = MAP_APPFONT ( 248 , 10 ) ;
- Text [ en-US ] = "Save URLs relative to internet" ;
- };
- FixedLine FL_FILTER
- {
- Pos = MAP_APPFONT ( 6 , 108 ) ;
- Size = MAP_APPFONT ( 248 , 8 ) ;
- Text [ en-US ] = "Default file format and ODF settings" ;
- };
- FixedText FT_ODF_VERSION
- {
- Pos = MAP_APPFONT ( 12 , 118 ) ;
- Size = MAP_APPFONT ( 121 , 8 ) ;
- Text [ en-US ] = "ODF format version" ;
- };
- ListBox LB_ODF_VERSION
- {
- HelpID = "cui:ListBox:RID_SFXPAGE_SAVE:LB_ODF_VERSION";
- Pos = MAP_APPFONT ( 136 , 116 ) ;
- Size = MAP_APPFONT ( 108 , 58 ) ;
- Border = TRUE;
- DropDown = TRUE;
- StringList [ en-US ] =
- {
- < "1.0/1.1" ; 2 ; > ;
- < "1.2" ; 4 ; > ;
- < "1.2 Extended (compat mode)"; 8 ; > ;
- < "1.2 Extended (recommended)"; 0x7fffffff ; > ;
- };
- };
- CheckBox BTN_NOPRETTYPRINTING
- {
- HelpID = "cui:CheckBox:RID_SFXPAGE_SAVE:BTN_NOPRETTYPRINTING";
- Pos = MAP_APPFONT ( 12 , 131 ) ;
- Size = MAP_APPFONT ( 248 , 10 ) ;
- Text [ en-US ] = "Size optimization for ODF format" ;
- };
- CheckBox BTN_WARNALIENFORMAT
- {
- HelpID = "cui:CheckBox:RID_SFXPAGE_SAVE:BTN_WARNALIENFORMAT";
- Pos = MAP_APPFONT ( 12 , 142 ) ;
- Size = MAP_APPFONT ( 248 , 10 ) ;
- Text [ en-US ] = "Warn when not saving in ODF or default format" ;
- };
- FixedText FT_APP
- {
- Pos = MAP_APPFONT ( 12 , 153 ) ;
- Size = MAP_APPFONT ( 120 , 8 ) ;
- Text [ en-US ] = "D~ocument type";
- };
- FixedText FT_FILTER
- {
- Pos = MAP_APPFONT ( 136 , 153 ) ;
- Size = MAP_APPFONT ( 120 , 8 ) ;
- Text [ en-US ] = "Always sa~ve as";
- };
- ListBox LB_APP
- {
- HelpID = "cui:ListBox:RID_SFXPAGE_SAVE:LB_APP";
- Pos = MAP_APPFONT ( 12 , 164 ) ;
- Size = MAP_APPFONT ( 108 , 58 ) ;
- Border = TRUE;
- DropDown = TRUE;
- StringList [ en-US ] =
- {
- < "Text document" ; APP_WRITER ; > ;
- < "HTML document" ; APP_WRITER_WEB; > ;
- < "Master document" ; APP_WRITER_GLOBAL; > ;
- < "Spreadsheet" ; APP_CALC ; > ;
- < "Presentation" ; APP_IMPRESS ; > ;
- < "Drawing" ; APP_DRAW ; > ;
- < "Formula" ; APP_MATH ; > ;
- };
- };
- FixedImage FI_FILTER
- {
- Pos = MAP_APPFONT ( 129, 165 ) ;
- Size = MAP_APPFONT ( 6 , 6 ) ;
- Hide = TRUE;
- };
- ListBox LB_FILTER
- {
- HelpID = "cui:ListBox:RID_SFXPAGE_SAVE:LB_FILTER";
- Pos = MAP_APPFONT ( 136 , 164 ) ;
- Size = MAP_APPFONT ( 108 , 58 ) ;
- Border = TRUE;
- Sort = TRUE;
- DropDown = TRUE;
- };
- FixedImage FI_ODF_WARNING
- {
- Pos = MAP_APPFONT ( 12, 170 ) ;
- Size = MAP_APPFONT ( 8 , 8 ) ;
- Hide = TRUE;
- };
- FixedText FT_WARN
- {
- Pos = MAP_APPFONT ( 23 , 170 ) ;
- Size = MAP_APPFONT ( 239 , 8 ) ;
- Hide = TRUE;
- Text [ en-US ] = "Not using ODF 1.2 Extended may cause information to be lost.";
- Text [ x-comment ] = "EN-US, the term 'extended' must not be translated.";
- };
- Image IMG_ODF_WARNING
- {
- ImageBitmap = Bitmap
- {
- File = "odfwarning.png";
- };
- MaskColor = Color { Red=0xffff; Green=0x0000; Blue=0xffff; };
- };
-};
-
ModalDialog RID_SVXDLG_FILTER_WARNING
{
HelpID = HID_SVXDLG_FILTER_WARNING;
diff --git a/cui/uiconfig/ui/optsavepage.ui b/cui/uiconfig/ui/optsavepage.ui
new file mode 100644
index 0000000..3004e73
--- /dev/null
+++ b/cui/uiconfig/ui/optsavepage.ui
@@ -0,0 +1,546 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+ <!-- interface-requires gtk+ 3.0 -->
+ <object class="GtkAdjustment" id="adjustment1">
+ <property name="lower">1</property>
+ <property name="upper">60</property>
+ <property name="value">15</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
+ <object class="GtkBox" id="OptSavePage">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">6</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">12</property>
+ <child>
+ <object class="GtkGrid" id="grid8">
+ <property name="visible">True</property>
+ <property name="can_focus">False</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="grid2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="row_spacing">4</property>
+ <child>
+ <object class="GtkGrid" id="grid7">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="column_spacing">6</property>
+ <child>
+ <object class="GtkCheckButton" id="autosave">
+ <property name="label" translatable="yes">Save _AutoRecovery
information every</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="autosave_spin">
+ <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">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="autosave_mins">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Minutes</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>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="docinfo">
+ <property name="label" translatable="yes">_Edit document properties before
saving</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="backup">
+ <property name="label" translatable="yes">Al_ways create backup
copy</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="userautosave">
+ <property name="label" translatable="yes">Automatically save the document
too</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="margin_left">24</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">3</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="relative_fsys">
+ <property name="label" translatable="yes">Save URLs relative to file
system</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">4</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="relative_inet">
+ <property name="label" translatable="yes">Save URLs relative to
internet</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">5</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">Save</property>
+ <attributes>
+ <attribute name="weight" value="semibold"/>
+ </attributes>
+ </object>
+ </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="GtkFrame" id="frame1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment" id="alignment1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="top_padding">6</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkGrid" id="grid1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkCheckButton" id="load_docprinter:wrap">
+ <property name="label" translatable="yes">Load printer settings with the
document</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="vexpand">True</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="load_settings:wrap">
+ <property name="label" translatable="yes">Load user-specific settings with
the document</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="vexpand">True</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>
+ </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">Load</property>
+ <attributes>
+ <attribute name="weight" value="semibold"/>
+ </attributes>
+ </object>
+ </child>
+ </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="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkGrid" id="grid9">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkFrame" id="frame3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</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="grid3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="row_spacing">4</property>
+ <child>
+ <object class="GtkGrid" id="grid4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="column_spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="label5">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">ODF format
version:</property>
+ <property name="use_underline">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="GtkComboBoxText" id="odfversion">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="entry_text_column">0</property>
+ <property name="id_column">1</property>
+ <items>
+ <item translatable="yes">1.0/1.1</item>
+ <item translatable="yes">1.2</item>
+ <item translatable="yes">1.2 Extended (compat mode)</item>
+ <item translatable="yes">1.2 Extended (recommended)</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>
+ <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="sizeoptimization">
+ <property name="label" translatable="yes">Size optimization for ODF
format</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="hexpand">True</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="warnalienformat">
+ <property name="label" translatable="yes">Warn when not saving in ODF or
default format</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="grid10">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="row_spacing">4</property>
+ <property name="column_spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="label6">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">D_ocument type:</property>
+ <property name="use_underline">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="GtkComboBoxText" id="doctype">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="entry_text_column">0</property>
+ <property name="id_column">1</property>
+ <items>
+ <item translatable="yes">Text document</item>
+ <item translatable="yes">HTML document</item>
+ <item translatable="yes">Master document</item>
+ <item translatable="yes">Spreadsheet</item>
+ <item translatable="yes">Presentation</item>
+ <item translatable="yes">Drawing</item>
+ <item translatable="yes">Formula</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>
+ <child>
+ <object class="GtkLabel" id="saveas_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Always sa_ve as:</property>
+ <property name="use_underline">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="GtkComboBoxText" id="saveas">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="entry_text_column">0</property>
+ <property name="id_column">1</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">1</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>
+ <child>
+ <object class="GtkGrid" id="grid11">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">center</property>
+ <property name="column_spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="odfwarning_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes" comments="EN-US, the term
'extended' must not be translated.">Not using ODF 1.2 Extended may cause information to be
lost.</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="odfwarning_image">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="pixbuf">svx/res/odfwarning.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>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">4</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">Default file format and ODF
settings</property>
+ <attributes>
+ <attribute name="weight" value="semibold"/>
+ </attributes>
+ </object>
+ </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>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+</interface>
--
To view, visit https://gerrit.libreoffice.org/2816
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ieaef10684f45dc699e7d2c56dffca5483f0a30cc
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Krisztian Pinter <pin.terminator@gmail.com>
Context
- [PATCH] converted cui/source/options/optsave.src to .ui · Krisztian Pinter (via Code Review)
Privacy Policy |
Impressum (Legal Info) |
Copyright information: Unless otherwise specified, all text and images
on this website are licensed under the
Creative Commons Attribution-Share Alike 3.0 License.
This does not include the source code of LibreOffice, which is
licensed under the Mozilla Public License (
MPLv2).
"LibreOffice" and "The Document Foundation" are
registered trademarks of their corresponding registered owners or are
in actual use as trademarks in one or more countries. Their respective
logos and icons are also subject to international copyright laws. Use
thereof is explained in our
trademark policy.