Skip to content

C
core
Kaydet (Commit) 55a639f6 authored tarafından Caolán McNamara's avatar Caolán McNamara
Dosyalara gözat
Seçenekler

convert backup page to .ui 

Change-Id: Id9a90001153fdaad51a00b68f38b1298195c5646
üst cebd0347
Hide whitespace changes
Inline Side-by-side
Showing with 171 additions and 114 deletions
dbaccess/UIConfig_dbaccess.mk
Dosyayı görüntüle @ 55a639f6
...@@ -13,6 +13,7 @@ $(eval $(call gb_UIConfig_add_uifiles,dbaccess, \ ...@@ -13,6 +13,7 @@ $(eval $(call gb_UIConfig_add_uifiles,dbaccess, \
dbaccess/uiconfig/ui/admindialog \ dbaccess/uiconfig/ui/admindialog \
dbaccess/uiconfig/ui/advancedsettingsdialog \ dbaccess/uiconfig/ui/advancedsettingsdialog \
dbaccess/uiconfig/ui/applycolpage \ dbaccess/uiconfig/ui/applycolpage \
dbaccess/uiconfig/ui/backuppage \
dbaccess/uiconfig/ui/choosedatasourcedialog \ dbaccess/uiconfig/ui/choosedatasourcedialog \
dbaccess/uiconfig/ui/collectionviewdialog \ dbaccess/uiconfig/ui/collectionviewdialog \
dbaccess/uiconfig/ui/colwidthdialog \ dbaccess/uiconfig/ui/colwidthdialog \
......
dbaccess/inc/dbaccess_helpid.hrc
Dosyayı görüntüle @ 55a639f6
...@@ -245,8 +245,6 @@ ...@@ -245,8 +245,6 @@
#define HID_DLG_DATABASE_WIZARD "DBACCESS_HID_DLG_DATABASE_WIZARD" #define HID_DLG_DATABASE_WIZARD "DBACCESS_HID_DLG_DATABASE_WIZARD"
#define HID_MACRO_MIGRATION_BACKUP_LOCATION "DBACCESS_HID_MACRO_MIGRATION_BACKUP_LOCATION"
#endif // _DBA_DBACCESS_HELPID_HRC_ #endif // _DBA_DBACCESS_HELPID_HRC_
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
dbaccess/source/ext/macromigration/dbmm_global.hrc
Dosyayı görüntüle @ 55a639f6
...@@ -38,7 +38,6 @@ ...@@ -38,7 +38,6 @@
//= tab pages //= tab pages
#define TP_SAVE_DBDOC_AS ( RID_DBMM_TAPPAGE_START + 1 )
#define TP_MIGRATE ( RID_DBMM_TAPPAGE_START + 2 ) #define TP_MIGRATE ( RID_DBMM_TAPPAGE_START + 2 )
#define TP_SUMMARY ( RID_DBMM_TAPPAGE_START + 3 ) #define TP_SUMMARY ( RID_DBMM_TAPPAGE_START + 3 )
......
dbaccess/source/ext/macromigration/macromigration.hrc
Dosyayı görüntüle @ 55a639f6
...@@ -47,9 +47,6 @@ ...@@ -47,9 +47,6 @@
//... fixed texts ....................................................... //... fixed texts .......................................................
#define FT_HEADER 1 #define FT_HEADER 1
#define FT_EXPLANATION 3
#define FT_SAVE_AS_LABEL 4
#define FT_START_MIGRATION 5
#define FT_CURRENT_OBJECT_LABEL 6 #define FT_CURRENT_OBJECT_LABEL 6
#define FT_CURRENT_OBJECT 7 #define FT_CURRENT_OBJECT 7
#define FT_CURRENT_PROGRESS_LABEL 8 #define FT_CURRENT_PROGRESS_LABEL 8
...@@ -68,13 +65,8 @@ ...@@ -68,13 +65,8 @@
//... edits .............................................................. //... edits ..............................................................
#define ED_SAVE_AS_LOCATION 1
#define ED_CHANGES 2 #define ED_CHANGES 2
//... buttons ............................................................
#define PB_BROWSE_SAVE_AS_LOCATION 1
//... strings ............................................................ //... strings ............................................................
#define STR_STATE_CLOSE_SUB_DOCS 1 #define STR_STATE_CLOSE_SUB_DOCS 1
......
dbaccess/source/ext/macromigration/macromigration.src
Dosyayı görüntüle @ 55a639f6
...@@ -51,83 +51,7 @@ ModalDialog DLG_MACRO_MIGRATION ...@@ -51,83 +51,7 @@ ModalDialog DLG_MACRO_MIGRATION
}; };
}; };
//= SaveDBDocPage
TabPage TP_SAVE_DBDOC_AS
{
HelpID = "dbaccess:TabPage:TP_SAVE_DBDOC_AS";
Pos = MAP_APPFONT( 40, 130 );
Size = MAP_APPFONT( TAB_PAGE_WIDTH, TAB_PAGE_HEIGHT );
Hide = TRUE;
FixedText FT_HEADER
{
Pos = MAP_APPFONT( TAB_PAGE_CONTENT_MARGIN, TAB_PAGE_CONTENT_MARGIN );
Size = MAP_APPFONT( TAB_PAGE_WIDTH - 2 * TAB_PAGE_CONTENT_MARGIN, FIXED_TEXT_HEIGHT );
Text [ en-US ] = "Backup your Document";
};
FixedText FT_EXPLANATION
{
Pos = MAP_APPFONT( TAB_PAGE_CONTENT_MARGIN, CONTENT_POS_X );
Size = MAP_APPFONT( TAB_PAGE_WIDTH - 2 * TAB_PAGE_CONTENT_MARGIN, 5 * FIXED_TEXT_HEIGHT );
WordBreak = TRUE;
Text [ en-US ] = "To allow you to go back to the state before the migration, the database "
"document will be backed up to a location of your choice. Every change done by the wizard will "
"be made to the original document, the backup will stay untouched.";
};
FixedText FT_SAVE_AS_LABEL
{
Pos = MAP_APPFONT( TAB_PAGE_CONTENT_MARGIN, CONTENT_POS_X + 5 * FIXED_TEXT_HEIGHT + SPACING_UNRELATED );
Size = MAP_APPFONT( 60, INPUT_HEIGHT );
VCenter = TRUE;
Text [ en-US ] = "Save To:";
};
ComboBox ED_SAVE_AS_LOCATION
{
HelpID = "dbaccess:ComboBox:TP_SAVE_DBDOC_AS:ED_SAVE_AS_LOCATION";
Pos = MAP_APPFONT( TAB_PAGE_CONTENT_MARGIN + 60 + SPACING_RELATED,
CONTENT_POS_X + 5 * FIXED_TEXT_HEIGHT + SPACING_UNRELATED );
Size = MAP_APPFONT( TAB_PAGE_WIDTH - ( TAB_PAGE_CONTENT_MARGIN + 60 + SPACING_RELATED ) - TAB_PAGE_CONTENT_MARGIN,
INPUT_HEIGHT );
Border = TRUE;
DropDown = TRUE ;
};
PushButton PB_BROWSE_SAVE_AS_LOCATION
{
HelpID = "dbaccess:PushButton:TP_SAVE_DBDOC_AS:PB_BROWSE_SAVE_AS_LOCATION";
Pos = MAP_APPFONT( TAB_PAGE_WIDTH - BUTTON_WIDTH - TAB_PAGE_CONTENT_MARGIN,
CONTENT_POS_X + 5 * FIXED_TEXT_HEIGHT + SPACING_UNRELATED + INPUT_HEIGHT + SPACING_RELATED );
Size = MAP_APPFONT( BUTTON_WIDTH, BUTTON_HEIGHT );
Text [ en-US ] = "Browse ...";
};
FixedText FT_START_MIGRATION
{
Pos = MAP_APPFONT( TAB_PAGE_CONTENT_MARGIN,
TAB_PAGE_HEIGHT - TAB_PAGE_CONTENT_MARGIN - 3 * FIXED_TEXT_HEIGHT );
Size = MAP_APPFONT( TAB_PAGE_WIDTH - 2 * TAB_PAGE_CONTENT_MARGIN,
3 * FIXED_TEXT_HEIGHT );
WordBreak = TRUE;
Text [ en-US ] = "Press 'Next' to save a copy of your document, and to begin the migration.";
};
};
//= ProgressPage //= ProgressPage
TabPage TP_MIGRATE TabPage TP_MIGRATE
{ {
HelpID = "dbaccess:TabPage:TP_MIGRATE"; HelpID = "dbaccess:TabPage:TP_MIGRATE";
......
dbaccess/source/ext/macromigration/macromigrationpages.cxx
Dosyayı görüntüle @ 55a639f6
...@@ -94,29 +94,30 @@ namespace dbmm ...@@ -94,29 +94,30 @@ namespace dbmm
} }
// SaveDBDocPage // SaveDBDocPage
SaveDBDocPage::SaveDBDocPage( MacroMigrationDialog& _rParentDialog ) SaveDBDocPage::SaveDBDocPage(MacroMigrationDialog& _rParentDialog)
:MacroMigrationPage( _rParentDialog, MacroMigrationResId( TP_SAVE_DBDOC_AS ) ) : MacroMigrationPage(&_rParentDialog, "BackupPage" ,"dbaccess/ui/backuppage.ui")
,m_aExplanation ( this, MacroMigrationResId( FT_EXPLANATION ) )
,m_aSaveAsLabel ( this, MacroMigrationResId( FT_SAVE_AS_LABEL ) )
,m_aSaveAsLocation ( this, MacroMigrationResId( ED_SAVE_AS_LOCATION ) )
,m_aBrowseSaveAsLocation( this, MacroMigrationResId( PB_BROWSE_SAVE_AS_LOCATION ) )
,m_aStartMigration ( this, MacroMigrationResId( FT_START_MIGRATION ) )
,m_aLocationController( _rParentDialog.getComponentContext(), m_aSaveAsLocation, m_aBrowseSaveAsLocation )
{ {
FreeResource(); get(m_pStartMigration, "startmigrate");
get(m_pBrowseSaveAsLocation, "browse");
m_aSaveAsLocation.SetModifyHdl( LINK( this, SaveDBDocPage, OnLocationModified ) ); get(m_pSaveAsLocation, "location");
m_aSaveAsLocation.SetDropDownLineCount( 20 ); m_pLocationController = new ::svx::DatabaseLocationInputController(
_rParentDialog.getComponentContext(), *m_pSaveAsLocation, *m_pBrowseSaveAsLocation);
m_aSaveAsLocation.SetHelpId( HID_MACRO_MIGRATION_BACKUP_LOCATION ); m_pSaveAsLocation->SetModifyHdl( LINK( this, SaveDBDocPage, OnLocationModified ) );
m_pSaveAsLocation->SetDropDownLineCount( 20 );
impl_updateLocationDependentItems(); impl_updateLocationDependentItems();
} }
SaveDBDocPage::~SaveDBDocPage()
{
delete m_pLocationController;
}
void SaveDBDocPage::impl_updateLocationDependentItems() void SaveDBDocPage::impl_updateLocationDependentItems()
{ {
updateDialogTravelUI(); updateDialogTravelUI();
m_aStartMigration.Show( !m_aSaveAsLocation.GetText().isEmpty() ); m_pStartMigration->Show(!m_pSaveAsLocation->GetText().isEmpty());
} }
IMPL_LINK( SaveDBDocPage, OnLocationModified, Edit*, /**/ ) IMPL_LINK( SaveDBDocPage, OnLocationModified, Edit*, /**/ )
...@@ -140,7 +141,7 @@ namespace dbmm ...@@ -140,7 +141,7 @@ namespace dbmm
aBaseName.appendAscii( ".backup" ); aBaseName.appendAscii( ".backup" );
aURLParser.setBase( aBaseName.makeStringAndClear() ); aURLParser.setBase( aBaseName.makeStringAndClear() );
m_aLocationController.setURL( aURLParser.GetMainURL( INetURLObject::NO_DECODE ) ); m_pLocationController->setURL( aURLParser.GetMainURL( INetURLObject::NO_DECODE ) );
impl_updateLocationDependentItems(); impl_updateLocationDependentItems();
} }
catch( const Exception& ) catch( const Exception& )
...@@ -154,7 +155,7 @@ namespace dbmm ...@@ -154,7 +155,7 @@ namespace dbmm
if ( !MacroMigrationPage::canAdvance() ) if ( !MacroMigrationPage::canAdvance() )
return false; return false;
return !m_aSaveAsLocation.GetText().isEmpty(); return !m_pSaveAsLocation->GetText().isEmpty();
} }
bool SaveDBDocPage::commitPage( ::svt::WizardTypes::CommitPageReason _eReason ) bool SaveDBDocPage::commitPage( ::svt::WizardTypes::CommitPageReason _eReason )
...@@ -165,7 +166,7 @@ namespace dbmm ...@@ -165,7 +166,7 @@ namespace dbmm
if ( ::svt::WizardTypes::eTravelBackward == _eReason ) if ( ::svt::WizardTypes::eTravelBackward == _eReason )
return true; return true;
if ( !m_aLocationController.prepareCommit() ) if ( !m_pLocationController->prepareCommit() )
return false; return false;
return true; return true;
......
dbaccess/source/ext/macromigration/macromigrationpages.hxx
Dosyayı görüntüle @ 55a639f6
...@@ -76,21 +76,19 @@ namespace dbmm ...@@ -76,21 +76,19 @@ namespace dbmm
class SaveDBDocPage : public MacroMigrationPage class SaveDBDocPage : public MacroMigrationPage
{ {
public: public:
SaveDBDocPage( MacroMigrationDialog& _rParentDialog ); SaveDBDocPage(MacroMigrationDialog& _rParentDialog);
~SaveDBDocPage();
static TabPage* Create( ::svt::RoadmapWizard& _rParentDialog ); static TabPage* Create( ::svt::RoadmapWizard& _rParentDialog );
public: public:
OUString getBackupLocation() const { return m_aLocationController.getURL(); } OUString getBackupLocation() const { return m_pLocationController->getURL(); }
void grabLocationFocus() { m_aSaveAsLocation.GrabFocus(); } void grabLocationFocus() { m_pSaveAsLocation->GrabFocus(); }
protected: protected:
FixedText m_aExplanation; ::svt::OFileURLControl* m_pSaveAsLocation;
FixedText m_aSaveAsLabel; PushButton* m_pBrowseSaveAsLocation;
::svt::OFileURLControl m_aSaveAsLocation; FixedText* m_pStartMigration;
PushButton m_aBrowseSaveAsLocation; ::svx::DatabaseLocationInputController* m_pLocationController;
FixedText m_aStartMigration;
::svx::DatabaseLocationInputController
m_aLocationController;
protected: protected:
// IWizardPageController overridables // IWizardPageController overridables
......
dbaccess/uiconfig/ui/backuppage.ui 0 → 100644
Dosyayı görüntüle @ 55a639f6
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.16.1 -->
<interface>
<requires lib="gtk+" version="3.0"/>
<!-- interface-requires LibreOffice 1.0 -->
<object class="GtkGrid" id="BackupPage">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="border_width">6</property>
<property name="row_spacing">24</property>
<child>
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Backup your Document</property>
<attributes>
<attribute name="weight" value="semibold"/>
</attributes>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
<property name="label" translatable="yes">To allow you to go back to the state before the migration, the database document will be backed up to a location of your choice. Every change done by the wizard will be made to the original document, the backup will stay untouched.</property>
<property name="wrap">True</property>
<property name="max_width_chars">64</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="GtkLabel" id="startmigrate">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
<property name="label" translatable="yes">Press 'Next' to save a copy of your document, and to begin the migration.</property>
<property name="wrap">True</property>
<property name="max_width_chars">64</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="GtkGrid" id="grid1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="row_spacing">6</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="column_spacing">12</property>
<child>
<object class="GtkLabel" id="label3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Save To:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">location</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="svtlo-OFileURLControl" id="location">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="has_entry">True</property>
<child internal-child="entry">
<object class="GtkEntry" id="URLBox-entry1">
<property name="can_focus">False</property>
</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="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="browse">
<property name="label" translatable="yes">Browse...</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="halign">end</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">1</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
</object>
<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>
</interface>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment