From 7b10285665605a659dd901634b3d4010a0f0b2c4 Mon Sep 17 00:00:00 2001 From: Palenik Mihály Date: Wed, 6 Aug 2014 12:22:12 +0200 Subject: Convert PAGE_MYSQL_JDBC and PAGE_ORACLE_JDBC to .ui Change-Id: I925dd0971aaf7f453c76ec37771ce001608dc57b Reviewed-on: https://gerrit.libreoffice.org/10785 Reviewed-by: David Tardon Tested-by: David Tardon --- dbaccess/UIConfig_dbaccess.mk | 1 + dbaccess/source/ui/dlg/dbadmin.hrc | 4 - dbaccess/source/ui/dlg/dbadmin.src | 82 ------- dbaccess/source/ui/dlg/detailpages.cxx | 119 ++++------ dbaccess/source/ui/dlg/detailpages.hxx | 21 +- .../uiconfig/ui/generalspecialjdbcdetailspage.ui | 260 +++++++++++++++++++++ 6 files changed, 312 insertions(+), 175 deletions(-) create mode 100644 dbaccess/uiconfig/ui/generalspecialjdbcdetailspage.ui (limited to 'dbaccess') diff --git a/dbaccess/UIConfig_dbaccess.mk b/dbaccess/UIConfig_dbaccess.mk index 1fdbaa946772..3373b84610a3 100644 --- a/dbaccess/UIConfig_dbaccess.mk +++ b/dbaccess/UIConfig_dbaccess.mk @@ -33,6 +33,7 @@ $(eval $(call gb_UIConfig_add_uifiles,dbaccess, \ dbaccess/uiconfig/ui/finalpagewizard \ dbaccess/uiconfig/ui/generalpagedialog \ dbaccess/uiconfig/ui/generalpagewizard \ + dbaccess/uiconfig/ui/generalspecialjdbcdetailspage \ dbaccess/uiconfig/ui/generatedvaluespage \ dbaccess/uiconfig/ui/indexdesigndialog \ dbaccess/uiconfig/ui/jdbcconnectionpage \ diff --git a/dbaccess/source/ui/dlg/dbadmin.hrc b/dbaccess/source/ui/dlg/dbadmin.hrc index d097204f2df9..4e1dcc89859b 100644 --- a/dbaccess/source/ui/dlg/dbadmin.hrc +++ b/dbaccess/source/ui/dlg/dbadmin.hrc @@ -23,19 +23,15 @@ // control ids #define FT_OPTIONS 5 -#define FT_JDBCDRIVERCLASS 7 #define FT_HOSTNAME 10 #define FT_BASEDN 11 #define FT_PORTNUMBER 12 #define FT_LDAPROWCOUNT 13 #define ET_OPTIONS 3 -#define ET_JDBCDRIVERCLASS 4 #define ET_HOSTNAME 5 #define ET_BASEDN 6 -#define PB_TESTDRIVERCLASS 5 - #define CB_USESSL 3 #define CB_USECATALOG 4 diff --git a/dbaccess/source/ui/dlg/dbadmin.src b/dbaccess/source/ui/dlg/dbadmin.src index b3301a3b2fd8..7d38b0ac4d66 100644 --- a/dbaccess/source/ui/dlg/dbadmin.src +++ b/dbaccess/source/ui/dlg/dbadmin.src @@ -132,88 +132,6 @@ TabPage PAGE_MYSQL_ODBC AUTO_CHARSET( UNRELATED_CONTROLS, PAGE_X ) }; -TabPage PAGE_MYSQL_JDBC -{ - HelpID = "dbaccess:TabPage:PAGE_MYSQL_JDBC"; - SVLook = TRUE ; - Pos = MAP_APPFONT ( 0 , 0 ) ; - Size = MAP_APPFONT ( PAGE_X , PAGE_Y ) ; - Hide = TRUE; - - AUTO_FIXEDLINE_CONNSETTINGS( UNRELATED_CONTROLS ) - AUTO_HOST_AND_PORT( UNRELATED_CONTROLS + RELATED_CONTROLS + FIXEDTEXT_HEIGHT ) - AUTO_SOCKETCONTROLGROUP(3*UNRELATED_CONTROLS + RELATED_CONTROLS + 3*FIXEDTEXT_HEIGHT) - - FixedText FT_JDBCDRIVERCLASS - { - Pos = MAP_APPFONT ( 6, - 4*UNRELATED_CONTROLS + RELATED_CONTROLS + 3*FIXEDTEXT_HEIGHT + EDIT_HEIGHT) ; - Size = MAP_APPFONT ( EDIT_X - 7 , FIXEDTEXT_HEIGHT ) ; - Text[ en-US ] = "MySQL JDBC d~river class"; - }; - Edit ET_JDBCDRIVERCLASS - { - HelpID = "dbaccess:Edit:PAGE_MYSQL_JDBC:ET_JDBCDRIVERCLASS"; - Pos = MAP_APPFONT ( EDIT_X, - 4*UNRELATED_CONTROLS + RELATED_CONTROLS + 3*FIXEDTEXT_HEIGHT -1 + EDIT_HEIGHT) ; - Size = MAP_APPFONT ( 97 , EDIT_HEIGHT ) ; - TabStop = TRUE ; - Border = TRUE ; - }; - PushButton PB_TESTDRIVERCLASS - { - HelpID = "dbaccess:PushButton:PAGE_MYSQL_JDBC:PB_TESTDRIVERCLASS"; - TabStop = TRUE ; - Pos = MAP_APPFONT ( PAGE_X - BUTTON_WIDTH - UNRELATED_CONTROLS , 4*UNRELATED_CONTROLS + RELATED_CONTROLS + 3*FIXEDTEXT_HEIGHT -2 + EDIT_HEIGHT) ; - Size = MAP_APPFONT ( BUTTON_WIDTH , BUTTON_HEIGHT ) ; - Text [ en-US ] = "Test class" ; - }; - - AUTO_CHARSET( 5*UNRELATED_CONTROLS + RELATED_CONTROLS + 4*FIXEDTEXT_HEIGHT+ EDIT_HEIGHT, PAGE_X ) -}; - -TabPage PAGE_ORACLE_JDBC -{ - HelpID = "dbaccess:TabPage:PAGE_ORACLE_JDBC"; - SVLook = TRUE ; - Pos = MAP_APPFONT ( 0 , 0 ) ; - Size = MAP_APPFONT ( PAGE_X , PAGE_Y ) ; - Hide = TRUE; - - AUTO_FIXEDLINE_CONNSETTINGS( UNRELATED_CONTROLS ) - AUTO_HOST_AND_PORT( UNRELATED_CONTROLS + RELATED_CONTROLS + FIXEDTEXT_HEIGHT ) - - AUTO_SOCKETCONTROLGROUP(3*UNRELATED_CONTROLS + RELATED_CONTROLS + 3*FIXEDTEXT_HEIGHT) - - FixedText FT_JDBCDRIVERCLASS - { - Pos = MAP_APPFONT ( 6, - 4*UNRELATED_CONTROLS + RELATED_CONTROLS + 3*FIXEDTEXT_HEIGHT + EDIT_HEIGHT) ; - Size = MAP_APPFONT ( EDIT_X - 7 , FIXEDTEXT_HEIGHT ) ; - Text[ en-US ] = "Oracle JDBC d~river class"; - }; - Edit ET_JDBCDRIVERCLASS - { - HelpID = "dbaccess:Edit:PAGE_ORACLE_JDBC:ET_JDBCDRIVERCLASS"; - Pos = MAP_APPFONT ( EDIT_X, - 4*UNRELATED_CONTROLS + RELATED_CONTROLS + 3*FIXEDTEXT_HEIGHT + EDIT_HEIGHT + ( FIXEDTEXT_HEIGHT - EDIT_HEIGHT ) / 2 ) ; - Size = MAP_APPFONT ( 97 , EDIT_HEIGHT ) ; - TabStop = TRUE ; - Border = TRUE ; - }; - PushButton PB_TESTDRIVERCLASS - { - HelpID = "dbaccess:PushButton:PAGE_ORACLE_JDBC:PB_TESTDRIVERCLASS"; - TabStop = TRUE ; - Pos = MAP_APPFONT ( PAGE_X - BUTTON_WIDTH - UNRELATED_CONTROLS, - 4*UNRELATED_CONTROLS + RELATED_CONTROLS + 3*FIXEDTEXT_HEIGHT + EDIT_HEIGHT + ( FIXEDTEXT_HEIGHT - BUTTON_HEIGHT ) / 2 ) ; - Size = MAP_APPFONT ( BUTTON_WIDTH , BUTTON_HEIGHT ) ; - Text [ en-US ] = "Test class" ; - }; - - AUTO_CHARSET( 5*UNRELATED_CONTROLS + RELATED_CONTROLS + 4*FIXEDTEXT_HEIGHT+ EDIT_HEIGHT, PAGE_X ) -}; - TabPage PAGE_LDAP { SVLook = TRUE ; diff --git a/dbaccess/source/ui/dlg/detailpages.cxx b/dbaccess/source/ui/dlg/detailpages.cxx index 7b5c78a576f1..3bcedeb83a17 100644 --- a/dbaccess/source/ui/dlg/detailpages.cxx +++ b/dbaccess/source/ui/dlg/detailpages.cxx @@ -463,21 +463,19 @@ namespace dbaui } // OMySQLJDBCDetailsPage - OGeneralSpecialJDBCDetailsPage::OGeneralSpecialJDBCDetailsPage( Window* pParent,sal_uInt16 _nResId, const SfxItemSet& _rCoreAttrs ,sal_uInt16 _nPortId) - :OCommonBehaviourTabPage(pParent, _nResId, _rCoreAttrs, CBTP_USE_CHARSET ,false) - ,m_aFL_1 (this, ModuleRes( FL_SEPARATOR1) ) - ,m_aFTHostname (this, ModuleRes(FT_HOSTNAME)) - ,m_aEDHostname (this, ModuleRes(ET_HOSTNAME)) - ,m_aPortNumber (this, ModuleRes(FT_PORTNUMBER)) - ,m_aNFPortNumber (this, ModuleRes(NF_PORTNUMBER)) - ,m_aFTSocket (this, ModuleRes(FT_SOCKET)) - ,m_aEDSocket (this, ModuleRes(ET_SOCKET)) - ,m_aFTDriverClass (this, ModuleRes(FT_JDBCDRIVERCLASS)) - ,m_aEDDriverClass (this, ModuleRes(ET_JDBCDRIVERCLASS)) - ,m_aTestJavaDriver (this, ModuleRes(PB_TESTDRIVERCLASS)) + OGeneralSpecialJDBCDetailsPage::OGeneralSpecialJDBCDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs ,sal_uInt16 _nPortId, bool bShowSocket ) + :OCommonBehaviourTabPage(pParent, "GeneralSpecialJDBCDetails", "dbaccess/ui/generalspecialjdbcdetailspage.ui", _rCoreAttrs, CBTP_USE_CHARSET) ,m_nPortId(_nPortId) ,m_bUseClass(true) { + get(m_pEDHostname, "hostNameEntry"); + get(m_pNFPortNumber, "portNumberSpinbutton"); + get(m_pFTSocket, "socketLabel"); + get(m_pEDSocket, "socketEntry"); + get(m_pFTDriverClass, "driverClassLabel"); + get(m_pEDDriverClass, "jdbcDriverClassEntry"); + get(m_pTestJavaDriver, "testDriverClassButton"); + SFX_ITEMSET_GET(_rCoreAttrs, pUrlItem, SfxStringItem, DSID_CONNECTURL, true); SFX_ITEMSET_GET(_rCoreAttrs, pTypesItem, DbuTypeCollectionItem, DSID_TYPECOLLECTION, true); ::dbaccess::ODsnTypeCollection* pTypeCollection = pTypesItem ? pTypesItem->getCollection() : NULL; @@ -487,65 +485,34 @@ namespace dbaui } if ( m_sDefaultJdbcDriverName.getLength() ) { - m_aEDDriverClass.SetModifyHdl(getControlModifiedLink()); - m_aEDDriverClass.SetModifyHdl(LINK(this, OGeneralSpecialJDBCDetailsPage, OnEditModified)); - m_aTestJavaDriver.SetClickHdl(LINK(this,OGeneralSpecialJDBCDetailsPage,OnTestJavaClickHdl)); + m_pEDDriverClass->SetModifyHdl(getControlModifiedLink()); + m_pEDDriverClass->SetModifyHdl(LINK(this, OGeneralSpecialJDBCDetailsPage, OnEditModified)); + m_pTestJavaDriver->SetClickHdl(LINK(this,OGeneralSpecialJDBCDetailsPage,OnTestJavaClickHdl)); } else { m_bUseClass = false; - m_aFTDriverClass.Show(false); - m_aEDDriverClass.Show(false); - m_aTestJavaDriver.Show(false); + m_pFTDriverClass->Show(false); + m_pEDDriverClass->Show(false); + m_pTestJavaDriver->Show(false); } - m_aFTSocket.Show(PAGE_MYSQL_JDBC == _nResId && !m_bUseClass); - m_aEDSocket.Show(PAGE_MYSQL_JDBC == _nResId && !m_bUseClass); - - m_aEDHostname.SetModifyHdl(getControlModifiedLink()); - m_aNFPortNumber.SetModifyHdl(getControlModifiedLink()); - m_aEDSocket.SetModifyHdl(getControlModifiedLink()); - - Window* pWindows[] = { &m_aFTHostname,&m_aEDHostname, - &m_aPortNumber,&m_aNFPortNumber,&m_aFTSocket,&m_aEDSocket, - &m_aFTDriverClass, &m_aEDDriverClass,&m_aTestJavaDriver, - m_pCharsetLabel, m_pCharset}; + m_pFTSocket->Show(bShowSocket && !m_bUseClass); + m_pEDSocket->Show(bShowSocket && !m_bUseClass); - sal_Int32 nCount = sizeof(pWindows) / sizeof(pWindows[0]); - for (sal_Int32 i=1; i < nCount; ++i) - pWindows[i]->SetZOrder(pWindows[i-1], WINDOW_ZORDER_BEHIND); - - FreeResource(); - } - - void OGeneralSpecialJDBCDetailsPage::fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) - { - OCommonBehaviourTabPage::fillControls(_rControlList); - if ( m_bUseClass ) - _rControlList.push_back(new OSaveValueWrapper(&m_aEDDriverClass)); - _rControlList.push_back(new OSaveValueWrapper(&m_aEDHostname)); - _rControlList.push_back(new OSaveValueWrapper(&m_aNFPortNumber)); - _rControlList.push_back(new OSaveValueWrapper(&m_aEDSocket)); - } - void OGeneralSpecialJDBCDetailsPage::fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) - { - OCommonBehaviourTabPage::fillWindows(_rControlList); - _rControlList.push_back(new ODisableWrapper(&m_aFTHostname)); - _rControlList.push_back(new ODisableWrapper(&m_aPortNumber)); - _rControlList.push_back(new ODisableWrapper(&m_aFTSocket)); - if ( m_bUseClass ) - _rControlList.push_back(new ODisableWrapper(&m_aFTDriverClass)); - _rControlList.push_back(new ODisableWrapper(&m_aFL_1)); + m_pEDHostname->SetModifyHdl(getControlModifiedLink()); + m_pNFPortNumber->SetModifyHdl(getControlModifiedLink()); + m_pEDSocket->SetModifyHdl(getControlModifiedLink()); } bool OGeneralSpecialJDBCDetailsPage::FillItemSet( SfxItemSet* _rSet ) { bool bChangedSomething = OCommonBehaviourTabPage::FillItemSet(_rSet); if ( m_bUseClass ) - fillString(*_rSet,&m_aEDDriverClass,DSID_JDBCDRIVERCLASS,bChangedSomething); - fillString(*_rSet,&m_aEDHostname,DSID_CONN_HOSTNAME,bChangedSomething); - fillString(*_rSet,&m_aEDSocket,DSID_CONN_SOCKET,bChangedSomething); - fillInt32(*_rSet,&m_aNFPortNumber,m_nPortId,bChangedSomething ); + fillString(*_rSet,m_pEDDriverClass,DSID_JDBCDRIVERCLASS,bChangedSomething); + fillString(*_rSet,m_pEDHostname,DSID_CONN_HOSTNAME,bChangedSomething); + fillString(*_rSet,m_pEDSocket,DSID_CONN_SOCKET,bChangedSomething); + fillInt32(*_rSet,m_pNFPortNumber,m_nPortId,bChangedSomething ); return bChangedSomething; } @@ -564,27 +531,27 @@ namespace dbaui { if ( m_bUseClass ) { - m_aEDDriverClass.SetText(pDrvItem->GetValue()); - m_aEDDriverClass.ClearModifyFlag(); + m_pEDDriverClass->SetText(pDrvItem->GetValue()); + m_pEDDriverClass->ClearModifyFlag(); } - m_aEDHostname.SetText(pHostName->GetValue()); - m_aEDHostname.ClearModifyFlag(); + m_pEDHostname->SetText(pHostName->GetValue()); + m_pEDHostname->ClearModifyFlag(); - m_aNFPortNumber.SetValue(pPortNumber->GetValue()); - m_aNFPortNumber.ClearModifyFlag(); + m_pNFPortNumber->SetValue(pPortNumber->GetValue()); + m_pNFPortNumber->ClearModifyFlag(); - m_aEDSocket.SetText(pSocket->GetValue()); - m_aEDSocket.ClearModifyFlag(); + m_pEDSocket->SetText(pSocket->GetValue()); + m_pEDSocket->ClearModifyFlag(); } OCommonBehaviourTabPage::implInitControls(_rSet, _bSaveValue); // to get the correcxt value when saveValue was called by base class - if ( m_bUseClass && m_aEDDriverClass.GetText().trim().isEmpty() ) + if ( m_bUseClass && m_pEDDriverClass->GetText().trim().isEmpty() ) { - m_aEDDriverClass.SetText(m_sDefaultJdbcDriverName); - m_aEDDriverClass.SetModifyFlag(); + m_pEDDriverClass->SetText(m_sDefaultJdbcDriverName); + m_pEDDriverClass->SetModifyFlag(); } } IMPL_LINK(OGeneralSpecialJDBCDetailsPage, OnTestJavaClickHdl, PushButton*, /*_pButton*/) @@ -596,12 +563,12 @@ namespace dbaui #if HAVE_FEATURE_JAVA try { - if ( !m_aEDDriverClass.GetText().trim().isEmpty() ) + if ( !m_pEDDriverClass->GetText().trim().isEmpty() ) { // TODO change jvmaccess ::rtl::Reference< jvmaccess::VirtualMachine > xJVM = ::connectivity::getJavaVM( m_pAdminDialog->getORB() ); - m_aEDDriverClass.SetText(m_aEDDriverClass.GetText().trim()); // fdo#68341 - bSuccess = ::connectivity::existsJavaClassByName(xJVM,m_aEDDriverClass.GetText()); + m_pEDDriverClass->SetText(m_pEDDriverClass->GetText().trim()); // fdo#68341 + bSuccess = ::connectivity::existsJavaClassByName(xJVM,m_pEDDriverClass->GetText()); } } catch(Exception&) @@ -616,8 +583,8 @@ namespace dbaui } IMPL_LINK(OGeneralSpecialJDBCDetailsPage, OnEditModified, Edit*, _pEdit) { - if ( m_bUseClass && _pEdit == &m_aEDDriverClass ) - m_aTestJavaDriver.Enable( !m_aEDDriverClass.GetText().trim().isEmpty() ); + if ( m_bUseClass && _pEdit == m_pEDDriverClass ) + m_pTestJavaDriver->Enable( !m_pEDDriverClass->GetText().trim().isEmpty() ); // tell the listener we were modified callModifiedHdl(); @@ -697,7 +664,7 @@ namespace dbaui SfxTabPage* ODriversSettings::CreateMySQLJDBC( Window* pParent, const SfxItemSet* _rAttrSet ) { - return ( new OGeneralSpecialJDBCDetailsPage( pParent,PAGE_MYSQL_JDBC, *_rAttrSet,DSID_MYSQL_PORTNUMBER ) ); + return ( new OGeneralSpecialJDBCDetailsPage( pParent, *_rAttrSet,DSID_MYSQL_PORTNUMBER ) ); } SfxTabPage* ODriversSettings::CreateMySQLNATIVE( Window* pParent, const SfxItemSet* _rAttrSet ) { @@ -706,7 +673,7 @@ namespace dbaui SfxTabPage* ODriversSettings::CreateOracleJDBC( Window* pParent, const SfxItemSet* _rAttrSet ) { - return ( new OGeneralSpecialJDBCDetailsPage( pParent,PAGE_ORACLE_JDBC, *_rAttrSet,DSID_ORACLE_PORTNUMBER) ); + return ( new OGeneralSpecialJDBCDetailsPage( pParent, *_rAttrSet,DSID_ORACLE_PORTNUMBER, false) ); } // OLDAPDetailsPage diff --git a/dbaccess/source/ui/dlg/detailpages.hxx b/dbaccess/source/ui/dlg/detailpages.hxx index 323710e71a51..f91388cbfe18 100644 --- a/dbaccess/source/ui/dlg/detailpages.hxx +++ b/dbaccess/source/ui/dlg/detailpages.hxx @@ -171,32 +171,27 @@ namespace dbaui { public: OGeneralSpecialJDBCDetailsPage( Window* pParent - , sal_uInt16 _nResId , const SfxItemSet& _rCoreAttrs , sal_uInt16 _nPortId + , bool bShowSocket = true ); protected: virtual bool FillItemSet( SfxItemSet* _rCoreAttrs ) SAL_OVERRIDE; virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) SAL_OVERRIDE; - virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE; - virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE; DECL_LINK(OnTestJavaClickHdl,PushButton*); DECL_LINK(OnEditModified,Edit*); - FixedLine m_aFL_1; - FixedText m_aFTHostname; - Edit m_aEDHostname; - FixedText m_aPortNumber; - NumericField m_aNFPortNumber; - FixedText m_aFTSocket; - Edit m_aEDSocket; + Edit* m_pEDHostname; + NumericField* m_pNFPortNumber; + FixedText* m_pFTSocket; + Edit* m_pEDSocket; - FixedText m_aFTDriverClass; - Edit m_aEDDriverClass; - PushButton m_aTestJavaDriver; + FixedText* m_pFTDriverClass; + Edit* m_pEDDriverClass; + PushButton* m_pTestJavaDriver; OUString m_sDefaultJdbcDriverName; sal_uInt16 m_nPortId; diff --git a/dbaccess/uiconfig/ui/generalspecialjdbcdetailspage.ui b/dbaccess/uiconfig/ui/generalspecialjdbcdetailspage.ui new file mode 100644 index 000000000000..84b485612f6b --- /dev/null +++ b/dbaccess/uiconfig/ui/generalspecialjdbcdetailspage.ui @@ -0,0 +1,260 @@ + + + + + + True + False + True + True + 6 + vertical + 12 + + + True + False + True + 0 + none + + + True + False + True + 6 + 12 + + + True + False + 2 + 6 + + + True + False + start + _Host name + True + hostNameEntry + + + 0 + 0 + 1 + 1 + + + + + True + False + start + _Port number + True + portNumberSpinbutton + + + 0 + 1 + 1 + 1 + + + + + True + True + True + + + 1 + 0 + 1 + 1 + + + + + True + False + start + Socket + + + 0 + 2 + 1 + 1 + + + + + True + False + start + MySQL JDBC d_river class + True + jdbcDriverClassEntry + + + 0 + 3 + 1 + 1 + + + + + True + True + True + + + 1 + 3 + 1 + 1 + + + + + Test class + False + True + True + True + + + 2 + 3 + 1 + 1 + + + + + True + True + True + + + 1 + 2 + 1 + 1 + + + + + + + + + + + + + + True + True + True + + + 1 + 1 + 1 + 1 + + + + + + + + + True + False + Connection Settings + + + + + + + + False + True + 0 + + + + + True + False + True + 0 + none + + + True + False + True + 6 + 12 + + + True + False + True + 6 + + + True + False + _Character set + True + charset + + + False + True + 0 + + + + + True + True + True + + + False + True + 1 + + + + + + + + + True + False + Data conversion + + + + + + + + False + True + 1 + + + + -- cgit