[Libreoffice-commits] core.git: dbaccess/source
Palenik Mihály
palenik.mihaly at gmail.com
Fri Aug 1 01:21:34 PDT 2014
dbaccess/source/ui/dlg/dbadminsetup.hrc | 15 ---
dbaccess/source/ui/dlg/dbadminsetup.src | 130 ++++++++++++++------------------
dbaccess/source/ui/dlg/dbwizsetup.cxx | 6 -
dbaccess/source/ui/inc/dbu_dlg.hrc | 18 ++++
dbaccess/source/ui/inc/dbu_resource.hrc | 17 +---
5 files changed, 84 insertions(+), 102 deletions(-)
New commits:
commit 803b9cb047958ecb9ad3e61c0e29a1466f59f1e1
Author: Palenik Mihály <palenik.mihaly at gmail.com>
Date: Tue Jul 29 01:04:35 2014 +0200
Convert DLG_DATABASE_WIZARD dialog to .ui
Change-Id: I18bc001be01b526d4005eacc324b7d2fb82830a0
Reviewed-on: https://gerrit.libreoffice.org/10602
Reviewed-by: David Tardon <dtardon at redhat.com>
Tested-by: David Tardon <dtardon at redhat.com>
diff --git a/dbaccess/source/ui/dlg/dbadminsetup.hrc b/dbaccess/source/ui/dlg/dbadminsetup.hrc
index b55b455..c483d3a 100644
--- a/dbaccess/source/ui/dlg/dbadminsetup.hrc
+++ b/dbaccess/source/ui/dlg/dbadminsetup.hrc
@@ -42,30 +42,15 @@
#define STR_MYSQLJDBC_HEADERTEXT 48
// FREE
#define STR_ORACLE_HEADERTEXT 54
-#define STR_DBWIZARDTITLE 56
// FREE
#define STR_ORACLE_DEFAULT 67
-#define STR_PAGETITLE_INTROPAGE 69
-#define STR_PAGETITLE_DBASE 70
-#define STR_PAGETITLE_TEXT 71
-#define STR_PAGETITLE_MSACCESS 72
-#define STR_PAGETITLE_LDAP 73
// FREE
-#define STR_PAGETITLE_ADO 75
-#define STR_PAGETITLE_JDBC 76
-#define STR_PAGETITLE_ORACLE 77
-#define STR_PAGETITLE_MYSQL 78
-#define STR_PAGETITLE_ODBC 79
-#define STR_PAGETITLE_SPREADSHEET 80
-#define STR_PAGETITLE_AUTHENTIFICATION 81
-#define STR_PAGETITLE_FINAL 82
#define STR_MYSQL_DEFAULT 83
#define STR_ORACLE_DRIVERCLASSTEXT 84
#define STR_MYSQL_DRIVERCLASSTEXT 85
#define STR_LDAP_DEFAULT 86
-#define STR_PAGETITLE_MYSQL_NATIVE 87
#define FT_LDAP_HELPTEXT 2
#define FT_AUTHENTIFICATIONHELPTEXT 7
diff --git a/dbaccess/source/ui/dlg/dbadminsetup.src b/dbaccess/source/ui/dlg/dbadminsetup.src
index da1fa11..3255222 100644
--- a/dbaccess/source/ui/dlg/dbadminsetup.src
+++ b/dbaccess/source/ui/dlg/dbadminsetup.src
@@ -27,95 +27,79 @@
#define EDIT_HEIGHT 12
#define EDIT_X 101
-ModalDialog DLG_DATABASE_WIZARD
+String STR_DBWIZARDTITLE
{
- OutputSize = TRUE ;
- Moveable = TRUE;
- Closeable = TRUE ;
- HelpId = HID_DLG_DATABASE_WIZARD;
- Hide = TRUE;
Text[ en-US ] = "Database Wizard" ;
+};
- TabControl 1
- {
- OutputSize = TRUE ;
- };
-
- String STR_DBWIZARDTITLE
- {
- Text[ en-US ] = "Database Wizard" ;
- };
-
- String STR_PAGETITLE_INTROPAGE
- {
- Text[ en-US ] = "Select database" ;
- };
-
- String STR_PAGETITLE_DBASE
- {
- Text[ en-US ] = "Set up dBASE connection" ;
+String STR_PAGETITLE_INTROPAGE
+{
+ Text[ en-US ] = "Select database" ;
+};
- };
+String STR_PAGETITLE_DBASE
+{
+ Text[ en-US ] = "Set up dBASE connection" ;
+};
- String STR_PAGETITLE_TEXT
- {
- Text[ en-US ] = "Set up a connection to text files" ;
- };
+String STR_PAGETITLE_TEXT
+{
+ Text[ en-US ] = "Set up a connection to text files" ;
+};
- String STR_PAGETITLE_MSACCESS
- {
- Text[ en-US ] = "Set up Microsoft Access connection" ;
- };
+String STR_PAGETITLE_MSACCESS
+{
+ Text[ en-US ] = "Set up Microsoft Access connection" ;
+};
- String STR_PAGETITLE_LDAP
- {
- Text[ en-US ] = "Set up LDAP connection" ;
- };
+String STR_PAGETITLE_LDAP
+{
+ Text[ en-US ] = "Set up LDAP connection" ;
+};
- String STR_PAGETITLE_ADO
- {
- Text[ en-US ] = "Set up ADO connection" ;
- };
+String STR_PAGETITLE_ADO
+{
+ Text[ en-US ] = "Set up ADO connection" ;
+};
- String STR_PAGETITLE_JDBC
- {
- Text[ en-US ] = "Set up JDBC connection" ;
- };
+String STR_PAGETITLE_JDBC
+{
+ Text[ en-US ] = "Set up JDBC connection" ;
+};
- String STR_PAGETITLE_ORACLE
- {
- Text[ en-US ] = "Set up Oracle database connection" ;
- };
+String STR_PAGETITLE_ORACLE
+{
+ Text[ en-US ] = "Set up Oracle database connection" ;
+};
- String STR_PAGETITLE_MYSQL
- {
- Text[ en-US ] = "Set up MySQL connection" ;
- };
+String STR_PAGETITLE_MYSQL
+{
+ Text[ en-US ] = "Set up MySQL connection" ;
+};
- String STR_PAGETITLE_ODBC
- {
- Text[ en-US ] = "Set up ODBC connection" ;
- };
+String STR_PAGETITLE_ODBC
+{
+ Text[ en-US ] = "Set up ODBC connection" ;
+};
- String STR_PAGETITLE_SPREADSHEET
- {
- Text[ en-US ] = "Set up Spreadsheet connection" ;
- };
+String STR_PAGETITLE_SPREADSHEET
+{
+ Text[ en-US ] = "Set up Spreadsheet connection" ;
+};
- String STR_PAGETITLE_AUTHENTIFICATION
- {
- Text[ en-US ] = "Set up user authentication" ;
- };
+String STR_PAGETITLE_AUTHENTIFICATION
+{
+ Text[ en-US ] = "Set up user authentication" ;
+};
- String STR_PAGETITLE_MYSQL_NATIVE
- {
- Text [ en-US ] = "Set up MySQL server data";
- };
+String STR_PAGETITLE_MYSQL_NATIVE
+{
+ Text [ en-US ] = "Set up MySQL server data";
+};
- String STR_PAGETITLE_FINAL
- {
- Text[ en-US ] = "Save and proceed" ;
- };
+String STR_PAGETITLE_FINAL
+{
+ Text[ en-US ] = "Save and proceed" ;
};
String STR_DATABASEDEFAULTNAME
diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx b/dbaccess/source/ui/dlg/dbwizsetup.cxx
index 1b8101e..13ff9f6 100644
--- a/dbaccess/source/ui/dlg/dbwizsetup.cxx
+++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx
@@ -107,8 +107,7 @@ ODbTypeWizDialogSetup::ODbTypeWizDialogSetup(Window* _pParent
,const Reference< XComponentContext >& _rxORB
,const ::com::sun::star::uno::Any& _aDataSourceName
)
- :svt::RoadmapWizard( _pParent, ModuleRes(DLG_DATABASE_WIZARD),
- WZB_NEXT | WZB_PREVIOUS | WZB_FINISH | WZB_CANCEL | WZB_HELP )
+ :svt::RoadmapWizard( _pParent, static_cast<sal_uInt32>(WZB_NEXT | WZB_PREVIOUS | WZB_FINISH | WZB_CANCEL | WZB_HELP) )
, m_pOutSet(NULL)
, m_bResetting(false)
@@ -143,8 +142,6 @@ ODbTypeWizDialogSetup::ODbTypeWizDialogSetup(Window* _pParent
OSL_ENSURE(m_pCollection, "ODbTypeWizDialogSetup::ODbTypeWizDialogSetup : really need a DSN type collection !");
- FreeResource();
-
m_pImpl.reset(new ODbDataSourceAdministrationHelper(_rxORB,this,this));
m_pImpl->setDataSourceOrName(_aDataSourceName);
Reference< XPropertySet > xDatasource = m_pImpl->getCurrentDataSource();
@@ -183,6 +180,7 @@ ODbTypeWizDialogSetup::ODbTypeWizDialogSetup(Window* _pParent
m_pHelp->SetUniqueId(UID_DBWIZ_HELP);
SetRoadmapInteractive( true );
ActivatePage();
+ SetText(ModuleRes(STR_DBWIZARDTITLE));
}
void ODbTypeWizDialogSetup::declareAuthDepPath( const OUString& _sURL, PathId _nPathId, const svt::RoadmapWizardTypes::WizardPath& _rPaths)
diff --git a/dbaccess/source/ui/inc/dbu_dlg.hrc b/dbaccess/source/ui/inc/dbu_dlg.hrc
index 97067e6..77f34a7 100644
--- a/dbaccess/source/ui/inc/dbu_dlg.hrc
+++ b/dbaccess/source/ui/inc/dbu_dlg.hrc
@@ -109,9 +109,25 @@
#define STR_MSACCESS_2007_FILTERNAME RID_STR_DLG_START + 66
#define STR_FIREBIRD_FILTERNAME RID_STR_DLG_START + 67
+#define STR_DBWIZARDTITLE RID_STR_DLG_START + 68
+#define STR_PAGETITLE_INTROPAGE RID_STR_DLG_START + 69
+#define STR_PAGETITLE_DBASE RID_STR_DLG_START + 70
+#define STR_PAGETITLE_TEXT RID_STR_DLG_START + 71
+#define STR_PAGETITLE_MSACCESS RID_STR_DLG_START + 72
+#define STR_PAGETITLE_LDAP RID_STR_DLG_START + 73
+#define STR_PAGETITLE_ADO RID_STR_DLG_START + 74
+#define STR_PAGETITLE_JDBC RID_STR_DLG_START + 75
+#define STR_PAGETITLE_ORACLE RID_STR_DLG_START + 76
+#define STR_PAGETITLE_MYSQL RID_STR_DLG_START + 77
+#define STR_PAGETITLE_ODBC RID_STR_DLG_START + 78
+#define STR_PAGETITLE_SPREADSHEET RID_STR_DLG_START + 79
+#define STR_PAGETITLE_AUTHENTIFICATION RID_STR_DLG_START + 80
+#define STR_PAGETITLE_MYSQL_NATIVE RID_STR_DLG_START + 81
+#define STR_PAGETITLE_FINAL RID_STR_DLG_START + 82
+
// please adjust checking before insert new strings
-#define LAST_STR_HERE RID_STR_DLG_START + 68
+#define LAST_STR_HERE RID_STR_DLG_START + 83
#if LAST_STR_HERE > RID_STR_DLG_END
#error Resource-Id Overflow in #file, #line
diff --git a/dbaccess/source/ui/inc/dbu_resource.hrc b/dbaccess/source/ui/inc/dbu_resource.hrc
index 73d35ff..41b98fb 100644
--- a/dbaccess/source/ui/inc/dbu_resource.hrc
+++ b/dbaccess/source/ui/inc/dbu_resource.hrc
@@ -45,28 +45,28 @@
#define RID_STR_CONTROL_END RID_STR_CONTROL_START + 30 // 40 - 69
#define RID_STR_DLG_START RID_STR_CONTROL_END
-#define RID_STR_DLG_END RID_STR_DLG_START + 80 // 70 - 149
+#define RID_STR_DLG_END RID_STR_DLG_START + 95 // 70 - 164
#define RID_STR_MISC_START RID_STR_DLG_END
-#define RID_STR_MISC_END RID_STR_MISC_START + 20 // 150 - 169
+#define RID_STR_MISC_END RID_STR_MISC_START + 20 // 165 - 184
#define RID_STR_QRY_START RID_STR_MISC_END
-#define RID_STR_QRY_END RID_STR_QRY_START + 80 // 170 - 249
+#define RID_STR_QRY_END RID_STR_QRY_START + 80 // 185 - 264
#define RID_STR_TBL_START RID_STR_QRY_END
-#define RID_STR_TBL_END RID_STR_TBL_START + 80 // 250 - 329
+#define RID_STR_TBL_END RID_STR_TBL_START + 80 // 265 - 344
#define RID_STR_REL_START RID_STR_TBL_END
-#define RID_STR_REL_END RID_STR_REL_START + 10 // 330 - 349
+#define RID_STR_REL_END RID_STR_REL_START + 10 // 345 - 364
#define RID_STR_UNO_START RID_STR_REL_END
-#define RID_STR_UNO_END RID_STR_UNO_START + 20 // 350 - 369
+#define RID_STR_UNO_END RID_STR_UNO_START + 20 // 365 - 384
#define RID_STR_GEN_START RID_STR_UNO_END
-#define RID_STR_GEN_END RID_STR_GEN_START + 56 // 370 - 425
+#define RID_STR_GEN_END RID_STR_GEN_START + 56 // 385 - 440
#define RID_STR_APP_START RID_STR_GEN_END
-#define RID_STR_APP_END RID_STR_APP_START + 40 // 426 - 465
+#define RID_STR_APP_END RID_STR_APP_START + 40 // 441 - 480
#if RID_STR_GEN_END > RID_DBACCESS_END
#error Resource-Id Ueberlauf in #file, #line
@@ -87,7 +87,6 @@
// FREE
#define DLG_COLLECTION_VIEW RID_DIALOG_START + 27
#define DLG_DATABASE_TYPE_CHANGE RID_DIALOG_START + 28
-#define DLG_DATABASE_WIZARD RID_DIALOG_START + 29
// tab pages
More information about the Libreoffice-commits
mailing list