[Libreoffice-commits] core.git: 2 commits - cui/AllLangResTarget_cui.mk cui/source cui/uiconfig cui/UI_cui.mk
Honza Minarik
minarja4 at gmail.com
Wed Apr 3 06:33:26 PDT 2013
cui/AllLangResTarget_cui.mk | 1
cui/UI_cui.mk | 1
cui/source/inc/helpid.hrc | 1
cui/source/options/optupdt.cxx | 141 +++++++----------
cui/source/options/optupdt.hrc | 42 -----
cui/source/options/optupdt.hxx | 23 +-
cui/source/options/optupdt.src | 111 -------------
cui/uiconfig/ui/hyphenate.ui | 5
cui/uiconfig/ui/optonlineupdatepage.ui | 269 +++++++++++++++++++++++++++++++++
9 files changed, 340 insertions(+), 254 deletions(-)
New commits:
commit 2409c4b291f720a1c607bd0dfdf5986f396a045c
Author: Honza Minarik <minarja4 at gmail.com>
Date: Wed Apr 3 11:13:38 2013 +0100
Resolves: fdo#60663: Adapt hyphenation dialog to HIG
Change-Id: I1a67a73e6dc6b26bdb84f0594d84a1f5d7e2bca2
diff --git a/cui/uiconfig/ui/hyphenate.ui b/cui/uiconfig/ui/hyphenate.ui
index a859275..26818c6 100644
--- a/cui/uiconfig/ui/hyphenate.ui
+++ b/cui/uiconfig/ui/hyphenate.ui
@@ -17,7 +17,7 @@
<property name="can_focus">False</property>
<property name="layout_style">end</property>
<child>
- <object class="GtkButton" id="button1">
+ <object class="GtkButton" id="help">
<property name="label">gtk-help</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -69,7 +69,6 @@
<object class="GtkGrid" id="grid1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="margin_bottom">18</property>
<property name="hexpand">True</property>
<property name="row_spacing">6</property>
<property name="column_spacing">6</property>
@@ -195,7 +194,7 @@
</object>
</child>
<action-widgets>
- <action-widget response="0">button1</action-widget>
+ <action-widget response="0">help</action-widget>
<action-widget response="0">hyphall</action-widget>
<action-widget response="0">close</action-widget>
</action-widgets>
commit 1b6afe078844b8deb08c15501adebf6e4a5421b3
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Apr 3 09:26:26 2013 +0100
convert online updates page to .ui
Change-Id: I69e8a1d136df3f8f8daa2d3f5241b74d2b39efdd
diff --git a/cui/AllLangResTarget_cui.mk b/cui/AllLangResTarget_cui.mk
index bcf726e..6a806b1 100644
--- a/cui/AllLangResTarget_cui.mk
+++ b/cui/AllLangResTarget_cui.mk
@@ -92,7 +92,6 @@ $(eval $(call gb_SrsTarget_add_files,cui/res,\
cui/source/options/optlingu.src \
cui/source/options/optpath.src \
cui/source/options/optsave.src \
- cui/source/options/optupdt.src \
cui/source/options/readonlyimage.src \
cui/source/options/treeopt.src \
cui/source/tabpages/align.src \
diff --git a/cui/UI_cui.mk b/cui/UI_cui.mk
index ba28866..3220a15 100644
--- a/cui/UI_cui.mk
+++ b/cui/UI_cui.mk
@@ -42,6 +42,7 @@ $(eval $(call gb_UI_add_uifiles,cui,\
cui/uiconfig/ui/optfontspage \
cui/uiconfig/ui/optgeneralpage \
cui/uiconfig/ui/optmemorypage \
+ cui/uiconfig/ui/optonlineupdatepage \
cui/uiconfig/ui/optpathspage \
cui/uiconfig/ui/optsavepage \
cui/uiconfig/ui/optsecuritypage \
diff --git a/cui/source/inc/helpid.hrc b/cui/source/inc/helpid.hrc
index 31e3d85..e4204c7 100644
--- a/cui/source/inc/helpid.hrc
+++ b/cui/source/inc/helpid.hrc
@@ -43,7 +43,6 @@
#define HID_OPTIONS_JAVA_CLASSPATH "CUI_HID_OPTIONS_JAVA_CLASSPATH"
#define HID_SVXPAGE_JSEARCH_OPTIONS "CUI_HID_SVXPAGE_JSEARCH_OPTIONS"
#define HID_SVXDLG_FILTER_WARNING "CUI_HID_SVXDLG_FILTER_WARNING"
-#define HID_SVX_OPTIONS_ONLINEUPDATE "CUI_HID_SVX_OPTIONS_ONLINEUPDATE"
#define HID_OFADLG_OPTIONS_TREE "CUI_HID_OFADLG_OPTIONS_TREE"
#define HID_OFA_CONNPOOL_DRIVERLIST "CUI_HID_OFA_CONNPOOL_DRIVERLIST"
#define UID_OFA_CONNPOOL_DRIVERLIST_BACK "CUI_UID_OFA_CONNPOOL_DRIVERLIST_BACK"
diff --git a/cui/source/options/optupdt.cxx b/cui/source/options/optupdt.cxx
index 3475b56..375a8d3 100644
--- a/cui/source/options/optupdt.cxx
+++ b/cui/source/options/optupdt.cxx
@@ -21,7 +21,6 @@
#include <sfx2/filedlghelper.hxx>
#include <svl/zforlist.hxx>
#include "optupdt.hxx"
-#include "optupdt.hrc"
#include <dialmgr.hxx>
#include <cuires.hrc>
#include <comphelper/componentcontext.hxx>
@@ -43,27 +42,24 @@ using namespace ::com::sun::star;
// class SvxOnlineUpdateTabPage --------------------------------------------------
-SvxOnlineUpdateTabPage::SvxOnlineUpdateTabPage( Window* pParent, const SfxItemSet& rSet ) :
-
- SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_ONLINEUPDATE ), rSet ),
- m_aOptionsLine( this, CUI_RES( FL_OPTIONS ) ),
- m_aAutoCheckCheckBox( this, CUI_RES( CB_AUTOCHECK ) ),
- m_aEveryDayButton( this, CUI_RES( RB_EVERYDAY ) ),
- m_aEveryWeekButton( this, CUI_RES( RB_EVERYWEEK ) ),
- m_aEveryMonthButton( this, CUI_RES( RB_EVERYMONTH ) ),
- m_aCheckNowButton( this, CUI_RES( PB_CHECKNOW ) ),
- m_aAutoDownloadCheckBox( this, CUI_RES( CB_AUTODOWNLOAD ) ),
- m_aDestPathLabel( this, CUI_RES( FT_DESTPATHLABEL ) ),
- m_aDestPath( this, CUI_RES( FT_DESTPATH ) ),
- m_aChangePathButton( this, CUI_RES( PB_CHANGEPATH ) ),
- m_aLastChecked( this, CUI_RES( FT_LASTCHECKED ) )
+SvxOnlineUpdateTabPage::SvxOnlineUpdateTabPage(Window* pParent, const SfxItemSet& rSet)
+ : SfxTabPage(pParent, "OptOnlineUpdatePage", "cui/ui/optonlineupdatepage.ui", rSet)
{
- m_aNeverChecked = String( CUI_RES( STR_NEVERCHECKED ) );
- FreeResource();
-
- m_aAutoCheckCheckBox.SetClickHdl( LINK( this, SvxOnlineUpdateTabPage, AutoCheckHdl_Impl ) );
- m_aCheckNowButton.SetClickHdl( LINK( this, SvxOnlineUpdateTabPage, CheckNowHdl_Impl ) );
- m_aChangePathButton.SetClickHdl( LINK( this, SvxOnlineUpdateTabPage, FileDialogHdl_Impl ) );
+ m_aNeverChecked = get<FixedText>("neverchecked")->GetText();
+ get(m_pAutoCheckCheckBox, "autocheck");
+ get(m_pEveryDayButton, "everyday");
+ get(m_pEveryWeekButton, "everyweek");
+ get(m_pEveryMonthButton, "everymonth");
+ get(m_pCheckNowButton, "checknow");
+ get(m_pAutoDownloadCheckBox, "autodownload");
+ get(m_pDestPathLabel, "destpathlabel");
+ get(m_pDestPath, "destpath");
+ get(m_pChangePathButton, "changepath");
+ get(m_pLastChecked, "lastchecked");
+
+ m_pAutoCheckCheckBox->SetClickHdl( LINK( this, SvxOnlineUpdateTabPage, AutoCheckHdl_Impl ) );
+ m_pCheckNowButton->SetClickHdl( LINK( this, SvxOnlineUpdateTabPage, CheckNowHdl_Impl ) );
+ m_pChangePathButton->SetClickHdl( LINK( this, SvxOnlineUpdateTabPage, FileDialogHdl_Impl ) );
uno::Reference < uno::XComponentContext > xContext( ::comphelper::getProcessComponentContext() );
@@ -72,19 +68,16 @@ SvxOnlineUpdateTabPage::SvxOnlineUpdateTabPage( Window* pParent, const SfxItemSe
sal_Bool bDownloadSupported = sal_False;
m_xUpdateAccess->getByName( "DownloadSupported" ) >>= bDownloadSupported;
- WinBits nStyle = m_aDestPath.GetStyle();
+ WinBits nStyle = m_pDestPath->GetStyle();
nStyle |= WB_PATHELLIPSIS;
- m_aDestPath.SetStyle(nStyle);
-
- m_aAutoDownloadCheckBox.Show(bDownloadSupported);
- m_aDestPathLabel.Show(bDownloadSupported);
- m_aDestPath.Show(bDownloadSupported);
- m_aChangePathButton.Show(bDownloadSupported);
+ m_pDestPath->SetStyle(nStyle);
- // dynamical length of the PushButtons
- CalcButtonWidth();
+ m_pAutoDownloadCheckBox->Show(bDownloadSupported);
+ m_pDestPathLabel->Show(bDownloadSupported);
+ m_pDestPath->Show(bDownloadSupported);
+ m_pChangePathButton->Show(bDownloadSupported);
- m_aLastCheckedTemplate = m_aLastChecked.GetText();
+ m_aLastCheckedTemplate = m_pLastChecked->GetText();
UpdateLastCheckedText();
}
@@ -153,7 +146,7 @@ void SvxOnlineUpdateTabPage::UpdateLastCheckedText()
aText = aText.replaceAt( nIndex, 6, aTimeStr );
}
- m_aLastChecked.SetText( aText );
+ m_pLastChecked->SetText( aText );
}
// -----------------------------------------------------------------------
@@ -174,27 +167,27 @@ sal_Bool SvxOnlineUpdateTabPage::FillItemSet( SfxItemSet& )
sal_Bool bValue;
sal_Int64 nValue;
- if( m_aAutoCheckCheckBox.GetSavedValue() != m_aAutoCheckCheckBox.IsChecked() )
+ if( m_pAutoCheckCheckBox->GetSavedValue() != m_pAutoCheckCheckBox->IsChecked() )
{
- bValue = (sal_True == m_aAutoCheckCheckBox.IsChecked());
+ bValue = (sal_True == m_pAutoCheckCheckBox->IsChecked());
m_xUpdateAccess->replaceByName( "AutoCheckEnabled", uno::makeAny( bValue ) );
bModified = sal_True;
}
nValue = 0;
- if( sal_True == m_aEveryDayButton.IsChecked() )
+ if( sal_True == m_pEveryDayButton->IsChecked() )
{
- if( sal_False == m_aEveryDayButton.GetSavedValue() )
+ if( sal_False == m_pEveryDayButton->GetSavedValue() )
nValue = 86400;
}
- else if( sal_True == m_aEveryWeekButton.IsChecked() )
+ else if( sal_True == m_pEveryWeekButton->IsChecked() )
{
- if( sal_False == m_aEveryWeekButton.GetSavedValue() )
+ if( sal_False == m_pEveryWeekButton->GetSavedValue() )
nValue = 604800;
}
- else if( sal_True == m_aEveryMonthButton.IsChecked() )
+ else if( sal_True == m_pEveryMonthButton->IsChecked() )
{
- if( sal_False == m_aEveryMonthButton.GetSavedValue() )
+ if( sal_False == m_pEveryMonthButton->GetSavedValue() )
nValue = 2592000;
}
@@ -204,9 +197,9 @@ sal_Bool SvxOnlineUpdateTabPage::FillItemSet( SfxItemSet& )
bModified = sal_True;
}
- if( m_aAutoDownloadCheckBox.GetSavedValue() != m_aAutoDownloadCheckBox.IsChecked() )
+ if( m_pAutoDownloadCheckBox->GetSavedValue() != m_pAutoDownloadCheckBox->IsChecked() )
{
- bValue = (sal_True == m_aAutoDownloadCheckBox.IsChecked());
+ bValue = (sal_True == m_pAutoDownloadCheckBox->IsChecked());
m_xUpdateAccess->replaceByName( "AutoDownloadEnabled", uno::makeAny( bValue ) );
bModified = sal_True;
}
@@ -214,7 +207,7 @@ sal_Bool SvxOnlineUpdateTabPage::FillItemSet( SfxItemSet& )
rtl::OUString sValue, aURL;
m_xUpdateAccess->getByName( "DownloadDestination" ) >>= sValue;
- if( ( osl::FileBase::E_None == osl::FileBase::getFileURLFromSystemPath(m_aDestPath.GetText(), aURL) ) &&
+ if( ( osl::FileBase::E_None == osl::FileBase::getFileURLFromSystemPath(m_pDestPath->GetText(), aURL) ) &&
( ! aURL.equals( sValue ) ) )
{
m_xUpdateAccess->replaceByName( "DownloadDestination", uno::makeAny( aURL ) );
@@ -235,39 +228,39 @@ void SvxOnlineUpdateTabPage::Reset( const SfxItemSet& )
sal_Bool bValue = sal_Bool();
m_xUpdateAccess->getByName( "AutoCheckEnabled" ) >>= bValue;
- m_aAutoCheckCheckBox.Check(bValue);
- m_aEveryDayButton.Enable(bValue);
- m_aEveryWeekButton.Enable(bValue);
- m_aEveryMonthButton.Enable(bValue);
+ m_pAutoCheckCheckBox->Check(bValue);
+ m_pEveryDayButton->Enable(bValue);
+ m_pEveryWeekButton->Enable(bValue);
+ m_pEveryMonthButton->Enable(bValue);
sal_Int64 nValue = 0;
m_xUpdateAccess->getByName( "CheckInterval" ) >>= nValue;
if( nValue == 86400 )
- m_aEveryDayButton.Check();
+ m_pEveryDayButton->Check();
else if( nValue == 604800 )
- m_aEveryWeekButton.Check();
+ m_pEveryWeekButton->Check();
else
- m_aEveryMonthButton.Check();
+ m_pEveryMonthButton->Check();
- m_aAutoCheckCheckBox.SaveValue();
- m_aEveryDayButton.SaveValue();
- m_aEveryWeekButton.SaveValue();
- m_aEveryMonthButton.SaveValue();
+ m_pAutoCheckCheckBox->SaveValue();
+ m_pEveryDayButton->SaveValue();
+ m_pEveryWeekButton->SaveValue();
+ m_pEveryMonthButton->SaveValue();
m_xUpdateAccess->getByName( "AutoDownloadEnabled" ) >>= bValue;
- m_aAutoDownloadCheckBox.Check(bValue);
- m_aDestPathLabel.Enable(sal_True);
- m_aDestPath.Enable(sal_True);
- m_aChangePathButton.Enable(sal_True);
+ m_pAutoDownloadCheckBox->Check(bValue);
+ m_pDestPathLabel->Enable(sal_True);
+ m_pDestPath->Enable(sal_True);
+ m_pChangePathButton->Enable(sal_True);
rtl::OUString sValue, aPath;
m_xUpdateAccess->getByName( "DownloadDestination" ) >>= sValue;
if( osl::FileBase::E_None == osl::FileBase::getSystemPathFromFileURL(sValue, aPath) )
- m_aDestPath.SetText(aPath);
+ m_pDestPath->SetText(aPath);
- m_aAutoDownloadCheckBox.SaveValue();
+ m_pAutoDownloadCheckBox->SaveValue();
}
// -----------------------------------------------------------------------
@@ -282,9 +275,9 @@ IMPL_LINK( SvxOnlineUpdateTabPage, AutoCheckHdl_Impl, CheckBox *, pBox )
{
sal_Bool bEnabled = pBox->IsChecked();
- m_aEveryDayButton.Enable(bEnabled);
- m_aEveryWeekButton.Enable(bEnabled);
- m_aEveryMonthButton.Enable(bEnabled);
+ m_pEveryDayButton->Enable(bEnabled);
+ m_pEveryWeekButton->Enable(bEnabled);
+ m_pEveryMonthButton->Enable(bEnabled);
return 0;
}
@@ -297,7 +290,7 @@ IMPL_LINK_NOARG(SvxOnlineUpdateTabPage, FileDialogHdl_Impl)
uno::Reference < ui::dialogs::XFolderPicker2 > xFolderPicker = ui::dialogs::FolderPicker::create(xContext);
rtl::OUString aURL;
- if( osl::FileBase::E_None != osl::FileBase::getFileURLFromSystemPath(m_aDestPath.GetText(), aURL) )
+ if( osl::FileBase::E_None != osl::FileBase::getFileURLFromSystemPath(m_pDestPath->GetText(), aURL) )
osl::Security().getHomeDir(aURL);
xFolderPicker->setDisplayDirectory( aURL );
@@ -307,7 +300,7 @@ IMPL_LINK_NOARG(SvxOnlineUpdateTabPage, FileDialogHdl_Impl)
{
rtl::OUString aFolder;
if( osl::FileBase::E_None == osl::FileBase::getSystemPathFromFileURL(xFolderPicker->getDirectory(), aFolder))
- m_aDestPath.SetText( aFolder );
+ m_pDestPath->SetText( aFolder );
}
return 0;
@@ -365,22 +358,4 @@ IMPL_LINK_NOARG(SvxOnlineUpdateTabPage, CheckNowHdl_Impl)
return 0;
}
-void SvxOnlineUpdateTabPage::CalcButtonWidth()
-{
- // detect the longest button text
- long nTxtWidth = ::std::max( m_aCheckNowButton.GetCtrlTextWidth( m_aCheckNowButton.GetText() ),
- m_aCheckNowButton.GetCtrlTextWidth( m_aChangePathButton.GetText() ) );
- // add a little offset
- nTxtWidth = nTxtWidth + 12;
- // compare with the button width
- Size aSize = m_aCheckNowButton.GetSizePixel();
- // and change it if it's necessary
- if ( nTxtWidth > aSize.Width() )
- {
- aSize.Width() = nTxtWidth;
- m_aCheckNowButton.SetSizePixel( aSize );
- m_aChangePathButton.SetSizePixel( aSize );
- }
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/options/optupdt.hrc b/cui/source/options/optupdt.hrc
deleted file mode 100644
index 7fbc465..0000000
--- a/cui/source/options/optupdt.hrc
+++ /dev/null
@@ -1,42 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#ifndef _SVX_OPTUPDT_HRC
-#define _SVX_OPTUPDT_HRC
-
-// defines ---------------------------------------------------------------
-
-// class SvxOnlineUpdateTabPage ----------------------------------------------
-
-#define FL_OPTIONS 10
-#define CB_AUTOCHECK 11
-#define RB_EVERYDAY 12
-#define RB_EVERYWEEK 13
-#define RB_EVERYMONTH 14
-#define PB_CHECKNOW 15
-#define CB_AUTODOWNLOAD 16
-#define FT_DESTPATHLABEL 17
-#define FT_DESTPATH 18
-#define PB_CHANGEPATH 19
-#define FT_LASTCHECKED 20
-#define STR_NEVERCHECKED 21
-
-
-#endif // #ifndef _SVX_OPTUPDT_HRC
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/options/optupdt.hxx b/cui/source/options/optupdt.hxx
index b17876a..3323f08 100644
--- a/cui/source/options/optupdt.hxx
+++ b/cui/source/options/optupdt.hxx
@@ -29,17 +29,16 @@
class SvxOnlineUpdateTabPage : public SfxTabPage
{
private:
- FixedLine m_aOptionsLine;
- CheckBox m_aAutoCheckCheckBox;
- RadioButton m_aEveryDayButton;
- RadioButton m_aEveryWeekButton;
- RadioButton m_aEveryMonthButton;
- PushButton m_aCheckNowButton;
- CheckBox m_aAutoDownloadCheckBox;
- FixedText m_aDestPathLabel;
- FixedText m_aDestPath;
- PushButton m_aChangePathButton;
- FixedText m_aLastChecked;
+ CheckBox* m_pAutoCheckCheckBox;
+ RadioButton* m_pEveryDayButton;
+ RadioButton* m_pEveryWeekButton;
+ RadioButton* m_pEveryMonthButton;
+ PushButton* m_pCheckNowButton;
+ CheckBox* m_pAutoDownloadCheckBox;
+ FixedText* m_pDestPathLabel;
+ FixedText* m_pDestPath;
+ PushButton* m_pChangePathButton;
+ FixedText* m_pLastChecked;
rtl::OUString m_aNeverChecked;
rtl::OUString m_aLastCheckedTemplate;
@@ -47,8 +46,6 @@ private:
DECL_LINK(CheckNowHdl_Impl, void *) ;
DECL_LINK( AutoCheckHdl_Impl, CheckBox* ) ;
- void CalcButtonWidth();
-
::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > m_xUpdateAccess;
void UpdateLastCheckedText();
diff --git a/cui/source/options/optupdt.src b/cui/source/options/optupdt.src
deleted file mode 100644
index a47f77c..0000000
--- a/cui/source/options/optupdt.src
+++ /dev/null
@@ -1,111 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include "optupdt.hrc"
-#include <cuires.hrc>
-#include "helpid.hrc"
-
- // RID_SVXPAGE_ONLINEUPDATE --------------------------------------------
-TabPage RID_SVXPAGE_ONLINEUPDATE
-{
- HelpId = HID_SVX_OPTIONS_ONLINEUPDATE ;
- OutputSize = TRUE ;
- SVLook = TRUE ;
- Hide = TRUE ;
- Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
- Text [ en-US ] = "OnlineUpdate" ;
- FixedLine FL_OPTIONS
- {
- Pos = MAP_APPFONT ( 6 , 3 ) ;
- Size = MAP_APPFONT ( 248 , 8 ) ;
- Text [ en-US ] = "Online Update Options" ;
- };
- CheckBox CB_AUTOCHECK
- {
- HelpID = "cui:CheckBox:RID_SVXPAGE_ONLINEUPDATE:CB_AUTOCHECK";
- Pos = MAP_APPFONT ( 12, 14 ) ;
- Size = MAP_APPFONT ( 210, 10 ) ;
- Text [ en-US ] = "~Check for updates automatically" ;
- };
- RadioButton RB_EVERYDAY
- {
- HelpID = "cui:RadioButton:RID_SVXPAGE_ONLINEUPDATE:RB_EVERYDAY";
- Pos = MAP_APPFONT ( 18, 27 ) ;
- Size = MAP_APPFONT ( 160, 10 ) ;
- Text [ en-US ] = "Every Da~y" ;
- };
- RadioButton RB_EVERYWEEK
- {
- HelpID = "cui:RadioButton:RID_SVXPAGE_ONLINEUPDATE:RB_EVERYWEEK";
- Pos = MAP_APPFONT ( 18, 40 ) ;
- Size = MAP_APPFONT ( 160, 10 ) ;
- Text [ en-US ] = "Every ~Week" ;
- };
- RadioButton RB_EVERYMONTH
- {
- HelpID = "cui:RadioButton:RID_SVXPAGE_ONLINEUPDATE:RB_EVERYMONTH";
- Pos = MAP_APPFONT ( 18, 53 ) ;
- Size = MAP_APPFONT ( 160, 10 ) ;
- Text [ en-US ] = "Every ~Month" ;
- };
- FixedText FT_LASTCHECKED
- {
- Pos = MAP_APPFONT ( 12, 69 ) ;
- Size = MAP_APPFONT ( 160, 10 ) ;
- Text [ en-US ] = "Last checked: %DATE%, %TIME%" ;
- };
- PushButton PB_CHECKNOW
- {
- HelpID = "cui:PushButton:RID_SVXPAGE_ONLINEUPDATE:PB_CHECKNOW";
- Pos = MAP_APPFONT ( 12, 82 ) ;
- Size = MAP_APPFONT ( 50, 14 ) ;
- Text [ en-US ] = "Check ~now" ;
- };
- CheckBox CB_AUTODOWNLOAD
- {
- HelpID = "cui:CheckBox:RID_SVXPAGE_ONLINEUPDATE:CB_AUTODOWNLOAD";
- Pos = MAP_APPFONT ( 12, 130 ) ;
- Size = MAP_APPFONT ( 160, 10 ) ;
- Text [ en-US ] = "~Download updates automatically" ;
- };
- FixedText FT_DESTPATHLABEL
- {
- Pos = MAP_APPFONT ( 22, 143 ) ;
- Size = MAP_APPFONT ( 150, 8 ) ;
- Text [ en-US ] = "Download destination:" ;
- };
- FixedText FT_DESTPATH
- {
- Pos = MAP_APPFONT ( 22, 154 ) ;
- Size = MAP_APPFONT ( 138, 8 ) ;
- };
- PushButton PB_CHANGEPATH
- {
- HelpID = "cui:PushButton:RID_SVXPAGE_ONLINEUPDATE:PB_CHANGEPATH";
- Pos = MAP_APPFONT ( 162, 151 ) ;
- Size = MAP_APPFONT ( 50, 14 ) ;
- Text [ en-US ] = "Ch~ange..." ;
- };
- String STR_NEVERCHECKED
- {
- Text [ en-US ] = "Last checked: Not yet" ;
- };
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/uiconfig/ui/optonlineupdatepage.ui b/cui/uiconfig/ui/optonlineupdatepage.ui
new file mode 100644
index 0000000..dec4255
--- /dev/null
+++ b/cui/uiconfig/ui/optonlineupdatepage.ui
@@ -0,0 +1,269 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+ <!-- interface-requires gtk+ 3.0 -->
+ <object class="GtkFrame" id="OptOnlineUpdatePage">
+ <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="hexpand">True</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>
+ <property name="hexpand">True</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
+ <child>
+ <object class="GtkCheckButton" id="autocheck">
+ <property name="label" translatable="yes">_Check for updates automatically</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">2</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkAlignment" id="alignment2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkGrid" id="grid2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="row_spacing">6</property>
+ <child>
+ <object class="GtkRadioButton" id="everyday">
+ <property name="label" translatable="yes">Every Da_y</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="active">True</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">everyweek</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="GtkRadioButton" id="everyweek">
+ <property name="label" translatable="yes">Every _Week</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>
+ <property name="group">everymonth</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="GtkRadioButton" id="everymonth">
+ <property name="label" translatable="yes">Every _Month</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>
+ <property name="group">everyday</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>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">2</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="lastchecked">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Last checked: %DATE%, %TIME%</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ <property name="width">2</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="checknow">
+ <property name="label" translatable="yes">Check _now</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="halign">start</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">4</property>
+ <property name="width">2</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="autodownload">
+ <property name="label" translatable="yes">_Download updates automatically</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="margin_top">12</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">2</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkAlignment" id="alignment3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</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="row_spacing">6</property>
+ <property name="column_spacing">12</property>
+ <child>
+ <object class="GtkLabel" id="destpathlabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Download destination:</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="GtkButton" id="changepath">
+ <property name="label" translatable="yes">Ch_ange...</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="halign">start</property>
+ <property name="use_underline">True</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>
+ <child>
+ <object class="GtkLabel" id="destpath">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="xalign">0</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>
+ <placeholder/>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">6</property>
+ <property name="width">2</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="neverchecked">
+ <property name="can_focus">False</property>
+ <property name="no_show_all">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Last checked: Not yet</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">3</property>
+ <property name="width">2</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">Online Update Options</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ </child>
+ </object>
+ <object class="GtkSizeGroup" id="sizegroup1">
+ <widgets>
+ <widget name="checknow"/>
+ <widget name="changepath"/>
+ </widgets>
+ </object>
+</interface>
More information about the Libreoffice-commits
mailing list