Tag: odbmacros_2_5 User: fs Date: 2008-02-27 14:41:50+0000 Modified: dba/dbaccess/source/ext/macromigration/macromigrationpages.cxx dba/dbaccess/source/ext/macromigration/macromigrationpages.hxx
Log: 'Update' after progress changes, and take the final summary from outside File Changes: Directory: /dba/dbaccess/source/ext/macromigration/ =================================================== File [changed]: macromigrationpages.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ext/macromigration/macromigrationpages.cxx?r1=1.1.2.8.2.2&r2=1.1.2.8.2.3 Delta lines: +21 -19 --------------------- --- macromigrationpages.cxx 2008-02-14 22:25:00+0000 1.1.2.8.2.2 +++ macromigrationpages.cxx 2008-02-27 14:41:47+0000 1.1.2.8.2.3 @@ -4,9 +4,9 @@ * * $RCSfile: macromigrationpages.cxx,v $ * - * $Revision: 1.1.2.8.2.2 $ + * $Revision: 1.1.2.8.2.3 $ * - * last change: $Author: fs $ $Date: 2008/02/14 22:25:00 $ + * last change: $Author: fs $ $Date: 2008/02/27 14:41:47 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -230,9 +230,6 @@ ,m_aMigrationDone ( this, MacroMigrationResId( FT_MIGRATION_DONE ) ) { FreeResource(); - - // TODO: remove when this prototype becomes real - m_aAllProgress.SetValue( (sal_uInt32)65 ); } //-------------------------------------------------------------------- @@ -257,42 +254,54 @@ m_aCurrentAction.SetText( _rCurrentAction ); m_aCurrentProgress.SetRange( _nRange ); m_aCurrentProgress.SetValue( (sal_uInt32)0 ); + + // since this is currently called from the main thread, which does not have the chance + // to re-schedule, we need to explicitly update the display + Update(); } //-------------------------------------------------------------------- void ProgressPage::setObjectProgressText( const ::rtl::OUString& _rText ) { m_aCurrentAction.SetText( _rText ); + Update(); } //-------------------------------------------------------------------- void ProgressPage::setObjectProgressValue( const sal_uInt32 _nValue ) { m_aCurrentProgress.SetValue( _nValue ); + Update(); } //-------------------------------------------------------------------- void ProgressPage::endObject() { - m_aCurrentProgress.SetValue( m_aCurrentProgress.GetRange() ); + m_aCurrentObject.SetText( String() ); + m_aCurrentAction.SetText( String() ); + m_aCurrentProgress.SetValue( (sal_uInt32)0 ); + Update(); } //-------------------------------------------------------------------- void ProgressPage::start( const sal_uInt32 _nOverallRange ) { m_aAllProgress.SetRange( _nOverallRange ); + Update(); } //-------------------------------------------------------------------- void ProgressPage::setOverallProgressText( const ::rtl::OUString& _rText ) { m_aAllProgressText.SetText( _rText ); + Update(); } //-------------------------------------------------------------------- void ProgressPage::setOverallProgressValue( const sal_uInt32 _nValue ) { m_aAllProgress.SetValue( _nValue ); + Update(); } //==================================================================== @@ -305,19 +314,6 @@ ,m_aChanges ( this, MacroMigrationResId( ED_CHANGES ) ) { FreeResource(); - - // TODO: remove when this is not a prototype anymore - m_aChanges.SetText( String::CreateFromAscii( - "=== Database Document ===\n" - "saved as '/home/user/databases/database.backup.odb'\n\n" - - "=== Form 'Customers' ===\n" - "moved basic library 'UserInterface' to 'Form_Customers_UserInterface'\n" - "moved basic library 'Management' to 'Form_Customers_Management'\n" - "moved dialog library 'Standard' to 'Form_Customers_Standard'\n\n" - - "=== Report 'Unshipped Orders' ===\n" - "moved JavaScript library 'Library1' to 'Report_Unshipped_Orders_Library1'\n" ) ); } //-------------------------------------------------------------------- @@ -326,6 +322,12 @@ return new ResultPage( dynamic_cast< MacroMigrationDialog& >( _rParentDialog ) ); } + //-------------------------------------------------------------------- + void ResultPage::displaySummary( const String& _rSummary ) + { + m_aChanges.SetText( _rSummary ); + } + //........................................................................ } // namespace dbmm //........................................................................ File [changed]: macromigrationpages.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ext/macromigration/macromigrationpages.hxx?r1=1.1.2.6.2.2&r2=1.1.2.6.2.3 Delta lines: +4 -2 ------------------- --- macromigrationpages.hxx 2008-02-14 22:25:00+0000 1.1.2.6.2.2 +++ macromigrationpages.hxx 2008-02-27 14:41:47+0000 1.1.2.6.2.3 @@ -4,9 +4,9 @@ * * $RCSfile: macromigrationpages.hxx,v $ * - * $Revision: 1.1.2.6.2.2 $ + * $Revision: 1.1.2.6.2.3 $ * - * last change: $Author: fs $ $Date: 2008/02/14 22:25:00 $ + * last change: $Author: fs $ $Date: 2008/02/27 14:41:47 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -172,6 +172,8 @@ static TabPage* Create( ::svt::RoadmapWizard& _rParentDialog ); + void displaySummary( const String& _rSummary ); + private: FixedText m_aChangesLabel; MultiLineEdit m_aChanges; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
