dbaccess/UIConfig_dbaccess.mk | 2
dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx | 47 ++----
dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx | 11 -
dbaccess/source/ui/dlg/dbadminsetup.hrc | 12 -
dbaccess/source/ui/dlg/dbadminsetup.src | 91 +-----------
dbaccess/source/ui/inc/dbu_resource.hrc | 9 -
dbaccess/uiconfig/ui/dbwizmysqlintropage.ui | 162 +++++++++++++++++++++
dbaccess/uiconfig/ui/dbwizspreadsheetpage.ui | 165 ++++++++++++++++++++++
8 files changed, 366 insertions(+), 133 deletions(-)
New commits:
commit 8ea2d6b073ae283af3e7709862a23e5e39e87819
Author: Szymon KÅos <eszka...@gmail.com>
Date: Tue Jul 29 12:47:04 2014 +0200
PAGE_DBWIZARD_MYSQL_INTRO and PAGE_DBWIZARD_SPREADSHEET conversion to .ui
Change-Id: I5d14fc4bd051c37802c0689d55d8557e26312a5d
Reviewed-on: https://gerrit.libreoffice.org/10606
Reviewed-by: David Tardon <dtar...@redhat.com>
Tested-by: David Tardon <dtar...@redhat.com>
diff --git a/dbaccess/UIConfig_dbaccess.mk b/dbaccess/UIConfig_dbaccess.mk
index 6a79a08..d227222 100644
--- a/dbaccess/UIConfig_dbaccess.mk
+++ b/dbaccess/UIConfig_dbaccess.mk
@@ -19,6 +19,8 @@ $(eval $(call gb_UIConfig_add_uifiles,dbaccess, \
dbaccess/uiconfig/ui/colwidthdialog \
dbaccess/uiconfig/ui/copytablepage \
dbaccess/uiconfig/ui/dbaseindexdialog \
+ dbaccess/uiconfig/ui/dbwizmysqlintropage \
+ dbaccess/uiconfig/ui/dbwizspreadsheetpage \
dbaccess/uiconfig/ui/dbwiztextpage \
dbaccess/uiconfig/ui/directsqldialog \
dbaccess/uiconfig/ui/emptypage \
diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
index 8b503cb..5e8c7bb 100644
--- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
+++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
@@ -227,20 +227,15 @@ using namespace ::com::sun::star;
OMySQLIntroPageSetup::OMySQLIntroPageSetup( Window* pParent, const
SfxItemSet& _rCoreAttrs )
- :OGenericAdministrationPage(pParent,
ModuleRes(PAGE_DBWIZARD_MYSQL_INTRO), _rCoreAttrs)
- ,m_aRB_ODBCDatabase(this, ModuleRes(RB_CONNECTVIAODBC))
- ,m_aRB_JDBCDatabase(this, ModuleRes(RB_CONNECTVIAJDBC))
- ,m_aRB_NATIVEDatabase(this, ModuleRes(RB_CONNECTVIANATIVE))
- ,m_aFT_ConnectionMode(this, ModuleRes(FT_MYSQLCONNECTIONMODE))
- ,m_aFT_Helptext(this, ModuleRes(FT_MYSQL_HELPTEXT))
- ,m_aFT_Headertext(this, ModuleRes(FT_MYSQL_HEADERTEXT))
- {
-
- SetControlFontWeight(&m_aFT_Headertext);
- m_aRB_ODBCDatabase.SetToggleHdl(LINK(this, OMySQLIntroPageSetup,
OnSetupModeSelected));
- m_aRB_JDBCDatabase.SetToggleHdl(LINK(this, OMySQLIntroPageSetup,
OnSetupModeSelected));
- m_aRB_NATIVEDatabase.SetToggleHdl(LINK(this, OMySQLIntroPageSetup,
OnSetupModeSelected));
- FreeResource();
+ :OGenericAdministrationPage(pParent, "DBWizMysqlIntroPage",
"dbaccess/ui/dbwizmysqlintropage.ui", _rCoreAttrs)
+ {
+ get(m_pODBCDatabase, "odbc");
+ get(m_pJDBCDatabase, "jdbc");
+ get(m_pNATIVEDatabase, "directly");
+
+ m_pODBCDatabase->SetToggleHdl(LINK(this, OMySQLIntroPageSetup,
OnSetupModeSelected));
+ m_pJDBCDatabase->SetToggleHdl(LINK(this, OMySQLIntroPageSetup,
OnSetupModeSelected));
+ m_pNATIVEDatabase->SetToggleHdl(LINK(this, OMySQLIntroPageSetup,
OnSetupModeSelected));
}
IMPL_LINK(OMySQLIntroPageSetup, OnSetupModeSelected, RadioButton*,
/*_pBox*/)
@@ -260,17 +255,17 @@ using namespace ::com::sun::star;
DbuTypeCollectionItem* pCollectionItem =
PTR_CAST(DbuTypeCollectionItem, _rSet.GetItem(DSID_TYPECOLLECTION));
bool bHasMySQLNative = ( pCollectionItem != NULL ) &&
pCollectionItem->getCollection()->hasDriver( "sdbc:mysqlc:" );
if ( bHasMySQLNative )
- m_aRB_NATIVEDatabase.Show();
+ m_pNATIVEDatabase->Show();
// if any of the options is checked, then there's nothing to do
- if ( m_aRB_ODBCDatabase.IsChecked() || m_aRB_JDBCDatabase.IsChecked()
|| m_aRB_NATIVEDatabase.IsChecked() )
+ if ( m_pODBCDatabase->IsChecked() || m_pJDBCDatabase->IsChecked() ||
m_pNATIVEDatabase->IsChecked() )
return;
// prefer "native" or "JDBC"
if ( bHasMySQLNative )
- m_aRB_NATIVEDatabase.Check();
+ m_pNATIVEDatabase->Check();
else
- m_aRB_JDBCDatabase.Check();
+ m_pJDBCDatabase->Check();
}
void OMySQLIntroPageSetup::fillControls(::std::vector< ISaveValueWrapper*
>& /*_rControlList*/)
@@ -289,9 +284,9 @@ using namespace ::com::sun::star;
OMySQLIntroPageSetup::ConnectionType OMySQLIntroPageSetup::getMySQLMode()
{
- if (m_aRB_JDBCDatabase.IsChecked())
+ if (m_pJDBCDatabase->IsChecked())
return VIA_JDBC;
- else if (m_aRB_NATIVEDatabase.IsChecked())
+ else if (m_pNATIVEDatabase->IsChecked())
return VIA_NATIVE;
else
return VIA_ODBC;
@@ -641,12 +636,10 @@ using namespace ::com::sun::star;
OSpreadSheetConnectionPageSetup::OSpreadSheetConnectionPageSetup( Window*
pParent, const SfxItemSet& _rCoreAttrs )
- :OConnectionTabPageSetup(pParent, PAGE_DBWIZARD_SPREADSHEET,
_rCoreAttrs, STR_SPREADSHEET_HELPTEXT, STR_SPREADSHEET_HEADERTEXT,
STR_SPREADSHEETPATH)
- , m_aCBPasswordrequired(this,
ModuleRes(CB_SPREADSHEETPASSWORDREQUIRED))
+ :OConnectionTabPageSetup(pParent, "DBWizSpreadsheetPage",
"dbaccess/ui/dbwizspreadsheetpage.ui", _rCoreAttrs, STR_SPREADSHEET_HELPTEXT,
STR_SPREADSHEET_HEADERTEXT, STR_SPREADSHEETPATH)
{
-
- m_aCBPasswordrequired.SetToggleHdl(getControlModifiedLink());
- FreeResource();
+ get(m_pPasswordrequired, "passwordrequired");
+ m_pPasswordrequired->SetToggleHdl(getControlModifiedLink());
}
OSpreadSheetConnectionPageSetup::~OSpreadSheetConnectionPageSetup()
@@ -661,7 +654,7 @@ using namespace ::com::sun::star;
void OSpreadSheetConnectionPageSetup::fillControls(::std::vector<
ISaveValueWrapper* >& _rControlList)
{
OConnectionTabPageSetup::fillControls(_rControlList);
- _rControlList.push_back(new
OSaveValueWrapper<CheckBox>(&m_aCBPasswordrequired));
+ _rControlList.push_back(new
OSaveValueWrapper<CheckBox>(m_pPasswordrequired));
}
@@ -673,7 +666,7 @@ using namespace ::com::sun::star;
bool OSpreadSheetConnectionPageSetup::FillItemSet( SfxItemSet* _rSet )
{
bool bChangedSomething = OConnectionTabPageSetup::FillItemSet(_rSet);
-
fillBool(*_rSet,&m_aCBPasswordrequired,DSID_PASSWORDREQUIRED,bChangedSomething);
+
fillBool(*_rSet,m_pPasswordrequired,DSID_PASSWORDREQUIRED,bChangedSomething);
return bChangedSomething;
}
diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx
b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx
index a8c3d7c..36621f2 100644
--- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx
+++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx
@@ -44,7 +44,7 @@ namespace dbaui
OSpreadSheetConnectionPageSetup(Window* pParent, const SfxItemSet&
_rCoreAttrs);
protected:
- CheckBox m_aCBPasswordrequired;
+ CheckBox *m_pPasswordrequired;
virtual ~OSpreadSheetConnectionPageSetup();
protected:
@@ -221,12 +221,9 @@ namespace dbaui
virtual ~OMySQLIntroPageSetup();
private:
- RadioButton m_aRB_ODBCDatabase;
- RadioButton m_aRB_JDBCDatabase;
- RadioButton m_aRB_NATIVEDatabase;
- FixedText m_aFT_ConnectionMode;
- FixedText m_aFT_Helptext;
- FixedText m_aFT_Headertext;
+ RadioButton *m_pODBCDatabase;
+ RadioButton *m_pJDBCDatabase;
+ RadioButton *m_pNATIVEDatabase;
DECL_LINK(OnSetupModeSelected, RadioButton*);
diff --git a/dbaccess/source/ui/dlg/dbadminsetup.hrc
b/dbaccess/source/ui/dlg/dbadminsetup.hrc
index 547ffb8..b55b455 100644
--- a/dbaccess/source/ui/dlg/dbadminsetup.hrc
+++ b/dbaccess/source/ui/dlg/dbadminsetup.hrc
@@ -31,7 +31,6 @@
#define STR_JDBC_HELPTEXT 33
#define STR_ODBC_HELPTEXT 34
#define STR_MYSQLJDBC_HELPTEXT 35
-#define STR_SPREADSHEET_HELPTEXT 36
// FREE
#define STR_ORACLE_HELPTEXT 40
#define STR_DBASE_HEADERTEXT 41
@@ -42,13 +41,10 @@
#define STR_ODBC_HEADERTEXT 47
#define STR_MYSQLJDBC_HEADERTEXT 48
// FREE
-#define STR_SPREADSHEET_HEADERTEXT 50
- // FREE
#define STR_ORACLE_HEADERTEXT 54
#define STR_DBWIZARDTITLE 56
// FREE
-#define STR_SPREADSHEETPATH 64
#define STR_ORACLE_DEFAULT 67
#define STR_PAGETITLE_INTROPAGE 69
@@ -72,9 +68,6 @@
#define STR_PAGETITLE_MYSQL_NATIVE 87
#define FT_LDAP_HELPTEXT 2
-#define FT_MYSQL_HELPTEXT 3
-#define FT_MYSQL_HEADERTEXT 4
-#define FT_MYSQLCONNECTIONMODE 5
#define FT_AUTHENTIFICATIONHELPTEXT 7
#define FT_AUTHENTIFICATIONHEADERTEXT 8
#define FT_LDAP_HEADERTEXT 9
@@ -86,12 +79,7 @@
#define PB_TESTCONNECTION 1
-#define RB_CONNECTVIAODBC 1
-#define RB_CONNECTVIAJDBC 2
-#define RB_CONNECTVIANATIVE 5
-
#define CB_WIZ_USESSL 1
-#define CB_SPREADSHEETPASSWORDREQUIRED 4
#define CB_GENERALPASSWORDREQUIRED 5
#endif
diff --git a/dbaccess/source/ui/dlg/dbadminsetup.src
b/dbaccess/source/ui/dlg/dbadminsetup.src
index ed3658d..da1fa11 100644
--- a/dbaccess/source/ui/dlg/dbadminsetup.src
+++ b/dbaccess/source/ui/dlg/dbadminsetup.src
@@ -123,62 +123,6 @@ String STR_DATABASEDEFAULTNAME
Text[ en-US ] = "New Database" ;
};
-TabPage PAGE_DBWIZARD_MYSQL_INTRO
-{
- HelpID = "dbaccess:TabPage:PAGE_DBWIZARD_MYSQL_INTRO";
- SVLook = TRUE ;
- Pos = MAP_APPFONT ( 0 , 0 ) ;
- Size = MAP_APPFONT ( WIZARD_PAGE_X , WIZARD_PAGE_Y ) ;
- Hide = TRUE ;
-
- FixedText FT_MYSQL_HEADERTEXT
- {
- Pos = MAP_APPFONT ( START_X , 8 ) ;
- Size = MAP_APPFONT ( (WIZARD_PAGE_X - START_X) - 12 , 2 *
FIXEDTEXT_HEIGHT ) ;
- Text[ en-US ] = "Set up a connection to a MySQL database";
- WordBreak = TRUE;
- };
-
- FixedText FT_MYSQL_HELPTEXT
- {
- Pos = MAP_APPFONT (START_X , 27 ) ;
- Size = MAP_APPFONT ( 213 , 48 ) ;
- Text[ en-US ] = "You can connect to a MySQL database using either
ODBC or JDBC.\nPlease contact your system administrator if you are unsure about
the following settings.";
- WordBreak = TRUE ;
- };
-
- FixedText FT_MYSQLCONNECTIONMODE
- {
- Pos = MAP_APPFONT (START_X , 79 ) ;
- Size = MAP_APPFONT ( 209 , 8 ) ;
- Text[ en-US ] = "How do you want to connect to your MySQL database?" ;
- };
-
- RadioButton RB_CONNECTVIAODBC
- {
- HelpId = HID_PAGE_DBWIZARD_MYSQL_RB_CONNECTVIAODBC ;
- Pos = MAP_APPFONT (START_X + 6 , 91 ) ;
- Size = MAP_APPFONT ( 205 , 9 ) ;
- Text[ en-US ] = "Connect using ODBC (Open Database Connectivity)" ;
- };
-
- RadioButton RB_CONNECTVIAJDBC
- {
- HelpId = HID_PAGE_DBWIZARD_MYSQL_RB_CONNECTVIAJDBC ;
- Pos = MAP_APPFONT (START_X + 6, 103 ) ;
- Size = MAP_APPFONT ( 208 , 8 ) ;
- Text[ en-US ] = "Connect using JDBC (Java Database Connectivity)" ;
- };
- RadioButton RB_CONNECTVIANATIVE
- {
- HelpID =
"dbaccess:RadioButton:PAGE_DBWIZARD_MYSQL_INTRO:RB_CONNECTVIANATIVE";
- Pos = MAP_APPFONT (START_X + 6 , 115 ) ;
- Size = MAP_APPFONT ( 205 , 9 ) ;
- Text[ en-US ] = "Connect directly" ;
- Hide = TRUE ;
- };
-};
-
#define AUTHENTEDIT_X (EDIT_X - 10)
TabPage PAGE_DBWIZARD_AUTHENTIFICATION
@@ -492,36 +436,17 @@ TabPage PAGE_DBWIZARD_ORACLE
AUTOHELP_JDBCCONTROLGROUP(HID_PAGE_DBWIZARD_ORACLE_ET_ORACLEDBNAME,HID_PAGE_DBWIZARD_ORACLE_ET_ORACLEHOSTSERVER,HID_PAGE_DBWIZARD_ORACLE_ET_ORACLEPORT,HID_PAGE_DBWIZARD_ORACLE_ET_ORACLECLASS,HID_PAGE_DBWIZARD_ORACLE_PB_TESTORACLECLASS)
};
-TabPage PAGE_DBWIZARD_SPREADSHEET
+String STR_SPREADSHEET_HEADERTEXT
{
- HelpID = "dbaccess:TabPage:PAGE_DBWIZARD_SPREADSHEET";
- SVLook = TRUE ;
- Pos = MAP_APPFONT ( 0 , 0 ) ;
- Size = MAP_APPFONT ( WIZARD_PAGE_X , WIZARD_PAGE_Y ) ;
- Hide = TRUE ;
-
- String STR_SPREADSHEET_HEADERTEXT
- {
- Text[ en-US ] = "Set up a connection to spreadsheets";
- };
-
- String STR_SPREADSHEET_HELPTEXT{
- Text[ en-US ] = "Click 'Browse...' to select a %PRODUCTNAME
spreadsheet or Microsoft Excel workbook.\n%PRODUCTNAME will open this file in
read-only mode." ;
- };
-
- AUTO_HELP_BROWSECONTROLGROUP(3,
HID_PAGE_DBWIZARD_SPREADSHEET_ET_SPREADSHEETPATH,HID_PAGE_DBWIZARD_SPREADSHEET_PB_SPREADSHEETPATH
)
+ Text[ en-US ] = "Set up a connection to spreadsheets";
+};
- String STR_SPREADSHEETPATH{
- Text[ en-US ] = "~Location and file name" ;
- };
+String STR_SPREADSHEET_HELPTEXT{
+ Text[ en-US ] = "Click 'Browse...' to select a %PRODUCTNAME spreadsheet or
Microsoft Excel workbook.\n%PRODUCTNAME will open this file in read-only mode."
;
+};
- CheckBox CB_SPREADSHEETPASSWORDREQUIRED
- {
- HelpId = HID_PAGE_DBWIZARD_SPREADSHEET_CB_SPREADSHEETPASSWORDREQUIRED ;
- Pos = MAP_APPFONT (START_X + UNRELATED_CONTROLS , 83 ) ;
- Size = MAP_APPFONT ( 93 , 11 ) ;
- Text[ en-US ] = "~Password required" ;
- };
+String STR_SPREADSHEETPATH{
+ Text[ en-US ] = "~Location and file name" ;
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/inc/dbu_resource.hrc
b/dbaccess/source/ui/inc/dbu_resource.hrc
index f370b2d..73d35ff 100644
--- a/dbaccess/source/ui/inc/dbu_resource.hrc
+++ b/dbaccess/source/ui/inc/dbu_resource.hrc
@@ -63,10 +63,10 @@
#define RID_STR_UNO_END RID_STR_UNO_START + 20 // 350
- 369
#define RID_STR_GEN_START RID_STR_UNO_END
-#define RID_STR_GEN_END RID_STR_GEN_START + 55 // 370
- 424
+#define RID_STR_GEN_END RID_STR_GEN_START + 56 // 370
- 425
#define RID_STR_APP_START RID_STR_GEN_END
-#define RID_STR_APP_END RID_STR_APP_START + 40 //
425 - 464
+#define RID_STR_APP_END RID_STR_APP_START + 40 //
426 - 465
#if RID_STR_GEN_END > RID_DBACCESS_END
#error Resource-Id Ueberlauf in #file, #line
@@ -120,12 +120,10 @@
#define PAGE_DBWIZARD_MSACCESS RID_PAGE_START + 43
#define PAGE_DBWIZARD_LDAP RID_PAGE_START + 44
// FREE
-#define PAGE_DBWIZARD_MYSQL_INTRO RID_PAGE_START + 46
#define PAGE_DBWIZARD_ORACLE RID_PAGE_START + 48
#define PAGE_DBWIZARD_JDBC RID_PAGE_START + 49
#define PAGE_DBWIZARD_ADO RID_PAGE_START + 50
#define PAGE_DBWIZARD_ODBC RID_PAGE_START + 51
-#define PAGE_DBWIZARD_SPREADSHEET RID_PAGE_START + 52
#define PAGE_DBWIZARD_AUTHENTIFICATION RID_PAGE_START + 53
#define PAGE_DBWIZARD_MYSQL_JDBC RID_PAGE_START + 54
#define PAGE_DBWIZARD_USERDEFINED RID_PAGE_START + 56
@@ -260,6 +258,9 @@
#define STR_AUTODELIMITER_MISSING RID_STR_GEN_START + 50
#define STR_AUTODELIMITER_MUST_DIFFER RID_STR_GEN_START + 51
#define STR_AUTONO_WILDCARDS RID_STR_GEN_START + 52
+#define STR_SPREADSHEET_HEADERTEXT RID_STR_GEN_START + 53
+#define STR_SPREADSHEET_HELPTEXT RID_STR_GEN_START + 54
+#define STR_SPREADSHEETPATH RID_STR_GEN_START + 55
// untyped resources
diff --git a/dbaccess/uiconfig/ui/dbwizmysqlintropage.ui
b/dbaccess/uiconfig/ui/dbwizmysqlintropage.ui
new file mode 100644
index 0000000..6c98251
--- /dev/null
+++ b/dbaccess/uiconfig/ui/dbwizmysqlintropage.ui
@@ -0,0 +1,162 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+ <!-- interface-requires gtk+ 3.0 -->
+ <object class="GtkBox" id="DBWizMysqlIntroPage">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="border_width">6</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">12</property>
+ <child>
+ <object class="GtkFrame" id="frame1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">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="GtkBox" id="box1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="label2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">You can connect
to a MySQL database using either ODBC or JDBC.
+Please contact your system administrator if you are unsure about the following
settings.</property>
+ <property name="wrap">True</property>
+ <property name="max_width_chars">100</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <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="GtkBox" id="box2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkRadioButton" id="odbc">
+ <property name="label"
translatable="yes">Connect using ODBC (Open Database Connectivity)</property>
+ <property
name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property
name="receives_default">False</property>
+ <property
name="use_action_appearance">False</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="jdbc">
+ <property name="label"
translatable="yes">Connect using JDBC (Java Database Connectivity)</property>
+ <property
name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property
name="receives_default">False</property>
+ <property
name="use_action_appearance">False</property>
+ <property name="xalign">0</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">odbc</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="directly">
+ <property name="label"
translatable="yes">Connect directly</property>
+ <property
name="use_action_appearance">False</property>
+ <property name="can_focus">True</property>
+ <property
name="receives_default">False</property>
+ <property
name="use_action_appearance">False</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ <property name="group">odbc</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</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">How do you
want to connect to your MySQL database?</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="header">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Set up a connection to a
MySQL database</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+</interface>
diff --git a/dbaccess/uiconfig/ui/dbwizspreadsheetpage.ui
b/dbaccess/uiconfig/ui/dbwizspreadsheetpage.ui
new file mode 100644
index 0000000..f66783b
--- /dev/null
+++ b/dbaccess/uiconfig/ui/dbwizspreadsheetpage.ui
@@ -0,0 +1,165 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+ <!-- interface-requires gtk+ 3.0 -->
+ <!-- interface-requires LibreOffice 1.0 -->
+ <object class="GtkBox" id="DBWizSpreadsheetPage">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="border_width">6</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">12</property>
+ <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="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="top_padding">6</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkBox" id="box1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="helptext">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
+ <property name="hexpand">True</property>
+ <property name="xalign">0</property>
+ <property name="wrap">True</property>
+ <property name="max_width_chars">100</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <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">6</property>
+ <child>
+ <object class="dbulo-ConnectionURLEdit" id="browseurl">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">â¢</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="GtkButton" id="browse">
+ <property name="label"
translatable="yes">Browse</property>
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_action_appearance">False</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="GtkButton" id="create">
+ <property name="label" translatable="yes">Create
New</property>
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_action_appearance">False</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="browseurllabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
+ <property name="hexpand">True</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">3</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="header">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="passwordrequired">
+ <property name="label" translatable="yes">_Password required</property>
+ <property name="use_action_appearance">False</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+</interface>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
