[Libreoffice-commits] core.git: 5 commits - dbaccess/AllLangResTarget_dbu.mk dbaccess/inc dbaccess/source dbaccess/uiconfig dbaccess/UIConfig_dbaccess.mk
Caolán McNamara
caolanm at redhat.com
Fri Aug 15 02:59:58 PDT 2014
dbaccess/AllLangResTarget_dbu.mk | 1
dbaccess/UIConfig_dbaccess.mk | 1
dbaccess/inc/dbaccess_helpid.hrc | 1
dbaccess/source/ui/dlg/AutoControls_tmpl.hrc | 274 ------------------
dbaccess/source/ui/dlg/ConnectionPageSetup.cxx | 1
dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx | 2
dbaccess/source/ui/dlg/adminpages.cxx | 1
dbaccess/source/ui/dlg/advancedsettings.cxx | 1
dbaccess/source/ui/dlg/dbadmin.cxx | 1
dbaccess/source/ui/dlg/dbadmin.hrc | 38 --
dbaccess/source/ui/dlg/dbadmin.src | 57 ---
dbaccess/source/ui/dlg/dbadmin2.src | 1
dbaccess/source/ui/dlg/dbwiz.cxx | 1
dbaccess/source/ui/dlg/dbwizsetup.cxx | 1
dbaccess/source/ui/dlg/detailpages.cxx | 111 +------
dbaccess/source/ui/dlg/detailpages.hxx | 11
dbaccess/source/ui/dlg/generalpage.cxx | 1
dbaccess/source/ui/dlg/tablespage.cxx | 1
dbaccess/uiconfig/ui/generalspecialjdbcdetailspage.ui | 27 -
dbaccess/uiconfig/ui/mysqlnativepage.ui | 7
dbaccess/uiconfig/ui/userdetailspage.ui | 240 +++++++++++++++
21 files changed, 292 insertions(+), 487 deletions(-)
New commits:
commit 20d52860f7a72510180f887268d6ff7d911a8c8c
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Aug 15 10:54:09 2014 +0100
res ctor OCommonBehaviourTabPage::OCommonBehaviourTabPage can go now
Change-Id: I0697faa1e66b912e3090c149efdf409c33b31b9c
diff --git a/dbaccess/AllLangResTarget_dbu.mk b/dbaccess/AllLangResTarget_dbu.mk
index f44c220..060743e 100644
--- a/dbaccess/AllLangResTarget_dbu.mk
+++ b/dbaccess/AllLangResTarget_dbu.mk
@@ -61,7 +61,6 @@ $(eval $(call gb_SrsTarget_add_nonlocalizable_files,dbaccess/dbu,\
))
$(eval $(call gb_SrsTarget_add_templates,dbaccess/dbu,\
- dbaccess/source/ui/dlg/AutoControls_tmpl.hrc \
dbaccess/source/ui/inc/toolbox_tmpl.hrc \
))
diff --git a/dbaccess/source/ui/dlg/AutoControls_tmpl.hrc b/dbaccess/source/ui/dlg/AutoControls_tmpl.hrc
deleted file mode 100644
index 431cecf..0000000
--- a/dbaccess/source/ui/dlg/AutoControls_tmpl.hrc
+++ /dev/null
@@ -1,274 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef _DBAUI_AUTOCONTROLS_HRC_
-#define _DBAUI_AUTOCONTROLS_HRC_
-
-#include "dbaccess_helpid.hrc"
-#include "dbu_dlg.hrc"
-
-#define FIXEDTEXT_HEIGHT 8
-#define RELATED_CONTROLS 4
-#define UNRELATED_CONTROLS 7
-#define EDIT_HEIGHT 12
-#define EDIT_X 101
-
-#define FT_AUTOJDBCDRIVERCLASS 80
-#define FT_AUTOPORTNUMBER 85
-#define FT_AUTOPORTNUMBERDEFAULT 86
-#define FT_AUTOBASEDN 87
-#define FT_AUTOHOSTNAME 88
-#define FT_AUTOBROWSEURL 89
-#define FT_AUTODATABASENAME 90
-#define FT_AUTOWIZARDHELPTEXT 91
-#define FT_AUTOWIZARDHEADER 92
-#define FT_CHARSET 95
-#define FT_SOCKET 96
-
-#define FL_DATACONVERT 81
-
-#define PB_AUTOTESTDRIVERCLASS 80
-#define PB_AUTOBROWSEURL 81
-#define PB_CREATEDB 82
-
-#define NF_AUTOPORTNUMBER 80
-
-#define ET_AUTOBASEDN 80
-#define ET_AUTOHOSTNAME 81
-#define ET_AUTODATABASENAME 82
-#define ET_AUTOBROWSEURL 83
-#define ET_AUTOJDBCDRIVERCLASS 84
-#define ET_SOCKET 86
-
-#define LB_CHARSET 80
-
-#define AUTO_WIZARDHELPTEXT( AUTO_LINECOUNT ) \
- FixedText FT_AUTOWIZARDHEADER \
- { \
- Pos = MAP_APPFONT ( START_X , 8 ) ; \
- Size = MAP_APPFONT ( (WIZARD_PAGE_X - START_X) - 12 , 2 * FIXEDTEXT_HEIGHT ) ; \
- Text[ en-US ] = ""; \
- WordBreak = TRUE; \
- }; \
- \
- FixedText FT_AUTOWIZARDHELPTEXT \
- { \
- Pos = MAP_APPFONT ( START_X , INIT_Y ) ; \
- Size = MAP_APPFONT ( WIZARD_PAGE_X - START_X - 6 , AUTO_LINECOUNT * FIXEDTEXT_HEIGHT ) ; \
- Text[ en-US ] = ""; \
- WordBreak = TRUE; \
- };
-
-#define AUTO_BROWSECONTROLGROUP( AUTO_X, AUTO_Y, AUTOPAGE_X, AUTO_HID, AUTO_HID2) \
- FixedText FT_AUTOBROWSEURL { \
- Pos = MAP_APPFONT ( AUTO_X , AUTO_Y ) ; \
- Size = MAP_APPFONT ( AUTOPAGE_X - AUTO_X - 6 , FIXEDTEXT_HEIGHT ) ; \
- Text[ en-US ] = ""; \
- }; \
- \
- \
- Edit ET_AUTOBROWSEURL \
- { \
- Pos = MAP_APPFONT ( AUTO_X , AUTO_Y + FIXEDTEXT_HEIGHT + 3) ; \
- Size = MAP_APPFONT ( AUTOPAGE_X - AUTO_X - 6 - 3 - BUTTON_WIDTH , EDIT_HEIGHT ) ; \
- HelpId = AUTO_HID; \
- TabStop = TRUE ; \
- Border = TRUE ; \
- }; \
- \
- PushButton PB_AUTOBROWSEURL \
- { \
- Pos = MAP_APPFONT ( AUTOPAGE_X - BUTTON_WIDTH - 6 , AUTO_Y + FIXEDTEXT_HEIGHT + 2 ) ; \
- Size = MAP_APPFONT ( BUTTON_WIDTH , BUTTON_HEIGHT ) ; \
- HelpId = AUTO_HID2; \
- TabStop = TRUE ; \
- Text[ en-US ] = "Browse"; \
- }; \
- \
- PushButton PB_CREATEDB \
- { \
- Pos = MAP_APPFONT ( AUTOPAGE_X - BUTTON_WIDTH - 6 , AUTO_Y - BUTTON_HEIGHT ) ; \
- Size = MAP_APPFONT ( BUTTON_WIDTH , BUTTON_HEIGHT ) ; \
- HelpId = AUTO_HID2; \
- TabStop = TRUE ; \
- Text[ en-US ] = "Create New"; \
- };
-
-#define AUTO_NAMECONTROLGROUP(AUTO_Y, AUTO_HID) \
- FixedText FT_AUTODATABASENAME \
- { \
- Pos = MAP_APPFONT ( START_X , AUTO_Y + 2) ; \
- Size = MAP_APPFONT ( EDIT_X - START_X - UNRELATED_CONTROLS , FIXEDTEXT_HEIGHT ) ; \
- Text[ en-US ] = "Database name"; \
- }; \
- \
- Edit ET_AUTODATABASENAME \
- { \
- Pos = MAP_APPFONT ( EDIT_X, AUTO_Y) ; \
- Size = MAP_APPFONT ( 97, EDIT_HEIGHT ) ; \
- HelpId = AUTO_HID; \
- TabStop = TRUE ; \
- Border = TRUE ; \
- };
-
-#define AUTO_HOSTCONTROLGROUP(AUTO_Y, AUTO_HID) \
- FixedText FT_AUTOHOSTNAME \
- { \
- Pos = MAP_APPFONT (START_X , AUTO_Y + 2 ) ; \
- Size = MAP_APPFONT ( EDIT_X - START_X - UNRELATED_CONTROLS , FIXEDTEXT_HEIGHT ); \
- Text [ en-US ] = "Server" ; \
- }; \
- \
- Edit ET_AUTOHOSTNAME \
- { \
- Pos = MAP_APPFONT (EDIT_X, AUTO_Y ) ; \
- Size = MAP_APPFONT ( 60, EDIT_HEIGHT ) ; \
- HelpId = AUTO_HID; \
- TabStop = TRUE ; \
- Border = TRUE ; \
- };
-
-#define AUTO_BASEDNCONTROLGROUP(AUTO_Y, AUTO_HID) \
- FixedText FT_AUTOBASEDN \
- { \
- Pos = MAP_APPFONT (START_X , AUTO_Y + 2 ) ; \
- Size = MAP_APPFONT ( EDIT_X - START_X - UNRELATED_CONTROLS , FIXEDTEXT_HEIGHT ) ; \
- Text [ en-US ] = "Base ~DN" ; \
- }; \
- \
- Edit ET_AUTOBASEDN \
- { \
- HelpId = AUTO_HID ; \
- Pos = MAP_APPFONT (EDIT_X, AUTO_Y ) ; \
- Size = MAP_APPFONT ( 60, EDIT_HEIGHT ) ; \
- TabStop = TRUE ; \
- Border = TRUE ; \
- }; \
-
-// MBA: the HID set in the FixText can't make any sense; in case this macro was called from within the
-// AUTOHELP_JDBCCONTROLGROUP, the FixText would have got the same HID as an EditField from the
-// also called AUTO_JDBCDRIVERCLASSGROUP macro; thus I conclude that we can remove the HID from the FixedText
-#define AUTO_PORTCONTROLGROUP(AUTO_Y, AUTO_HID) \
- FixedText FT_AUTOPORTNUMBER \
- { \
- Pos = MAP_APPFONT (START_X , AUTO_Y +2) ; \
- Size = MAP_APPFONT ( EDIT_X - START_X - UNRELATED_CONTROLS , FIXEDTEXT_HEIGHT ) ; \
- Text [ en-US ] = "~Port number" ; \
- }; \
- \
- NumericField NF_AUTOPORTNUMBER \
- { \
- HelpId = AUTO_HID ; \
- Pos = MAP_APPFONT (EDIT_X, AUTO_Y ) ; \
- Size = MAP_APPFONT ( 22 , EDIT_HEIGHT ) ; \
- TabStop = TRUE ; \
- Border = TRUE ; \
- NoThousandSep = TRUE; \
- }; \
- \
- FixedText FT_AUTOPORTNUMBERDEFAULT \
- { \
- Pos = MAP_APPFONT (EDIT_X + 22 + UNRELATED_CONTROLS, AUTO_Y +2) ; \
- Size = MAP_APPFONT ( WIZARD_PAGE_X - EDIT_X - 22 - UNRELATED_CONTROLS , FIXEDTEXT_HEIGHT ) ; \
- Text[ en-US ] = "" ; \
- };
-
-#define AUTO_CHARSET( AUTO_Y, AUTOPAGE_X ) \
- FixedLine FL_DATACONVERT \
- { \
- Pos = MAP_APPFONT ( 4 , AUTO_Y ) ; \
- Size = MAP_APPFONT ( AUTOPAGE_X - 2*RELATED_CONTROLS , FIXEDTEXT_HEIGHT ) ; \
- Text [ en-US ] = "Data conversion"; \
- }; \
- FixedText FT_CHARSET \
- { \
- Pos = MAP_APPFONT ( 6 , AUTO_Y + RELATED_CONTROLS + FIXEDTEXT_HEIGHT ) ; \
- Size = MAP_APPFONT ( EDIT_X - 7 , FIXEDTEXT_HEIGHT ) ; \
- Text [ en-US ] = "~Character set" ; \
- }; \
- ListBox LB_CHARSET \
- { \
- Border = TRUE ; \
- Pos = MAP_APPFONT ( EDIT_X , AUTO_Y + RELATED_CONTROLS + FIXEDTEXT_HEIGHT -1 ) ; \
- Size = MAP_APPFONT ( AUTOPAGE_X - EDIT_X - 6 , 60 ) ; \
- TabStop = TRUE ; \
- HelpId = HID_DSADMIN_CHARSET; \
- DropDown = TRUE ; \
- CurPos = 0 ; \
- }; \
-
-#define AUTO_HELP_BROWSECONTROLGROUP(AUTO_LINECOUNT, AUTO_HID, AUTO_HID2) \
- AUTO_WIZARDHELPTEXT(AUTO_LINECOUNT) \
- AUTO_BROWSECONTROLGROUP(START_X, INIT_Y + AUTO_LINECOUNT * FIXEDTEXT_HEIGHT + 2, WIZARD_PAGE_X, AUTO_HID, AUTO_HID2)
-
-#define AUTO_JDBCDRIVERCLASSGROUP(AUTO_Y, AUTO_HID, AUTO_HID2) \
- \
- FixedText FT_AUTOJDBCDRIVERCLASS \
- { \
- Pos = MAP_APPFONT ( 6 , AUTO_Y) ; \
- Size = MAP_APPFONT ( PAGE_X - 12 , FIXEDTEXT_HEIGHT ) ; \
- Text [ en-US ] = "JDBC d~river class"; \
- }; \
- \
- Edit ET_AUTOJDBCDRIVERCLASS \
- { \
- Pos = MAP_APPFONT ( START_X, AUTO_Y + FIXEDTEXT_HEIGHT + RELATED_CONTROLS ) ; \
- Size = MAP_APPFONT ( WIZARD_PAGE_X - START_X - BUTTON_WIDTH - RELATED_CONTROLS - UNRELATED_CONTROLS , EDIT_HEIGHT ) ; \
- TabStop = TRUE ; \
- Border = TRUE ; \
- HelpId = AUTO_HID; \
- }; \
- \
- PushButton PB_AUTOTESTDRIVERCLASS \
- { \
- TabStop = TRUE ; \
- Pos = MAP_APPFONT ( WIZARD_PAGE_X - BUTTON_WIDTH - UNRELATED_CONTROLS , AUTO_Y + FIXEDTEXT_HEIGHT + 2) ; \
- Size = MAP_APPFONT ( BUTTON_WIDTH , BUTTON_HEIGHT ) ; \
- Size = MAP_APPFONT (50, 14); \
- HelpId = AUTO_HID2; \
- Text[ en-US ] = "Test class" ; \
- };
-
-#define AUTO_SOCKETCONTROLGROUP(AUTO_Y) \
- FixedText FT_SOCKET \
- { \
- Pos = MAP_APPFONT (START_X , AUTO_Y +2) ; \
- Size = MAP_APPFONT ( EDIT_X - START_X - UNRELATED_CONTROLS , FIXEDTEXT_HEIGHT ) ; \
- Text [ en-US ] = "Socket" ; \
- }; \
- \
- Edit ET_SOCKET \
- { \
- Pos = MAP_APPFONT (EDIT_X, AUTO_Y ) ; \
- Size = MAP_APPFONT ( 97, EDIT_HEIGHT ) ; \
- TabStop = TRUE ; \
- Border = TRUE ; \
- };
-
-#define AUTOHELP_JDBCCONTROLGROUP( AUTO_HID, AUTO_HID2, AUTO_HID3, AUTO_HID4, AUTO_HID5 ) \
- AUTO_WIZARDHELPTEXT( 6 ) \
- AUTO_NAMECONTROLGROUP( INIT_Y + 6 * FIXEDTEXT_HEIGHT + 2, AUTO_HID ) \
- AUTO_HOSTCONTROLGROUP(96, AUTO_HID2) \
- AUTO_PORTCONTROLGROUP(113, AUTO_HID3 ) \
- AUTO_SOCKETCONTROLGROUP(129) \
- AUTO_JDBCDRIVERCLASSGROUP(146, AUTO_HID4, AUTO_HID5)
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx b/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx
index 836679c..e2263cc 100644
--- a/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx
@@ -31,7 +31,6 @@
#include <osl/process.h>
#include <vcl/msgbox.hxx>
#include "dbadmin.hxx"
-#include "dbadmin.hrc"
#include <comphelper/types.hxx>
#include <vcl/stdtext.hxx>
#include "sqlmessage.hxx"
diff --git a/dbaccess/source/ui/dlg/adminpages.cxx b/dbaccess/source/ui/dlg/adminpages.cxx
index 640db09..292b73a 100644
--- a/dbaccess/source/ui/dlg/adminpages.cxx
+++ b/dbaccess/source/ui/dlg/adminpages.cxx
@@ -18,7 +18,6 @@
*/
#include "adminpages.hxx"
-#include "dbadmin.hrc"
#include "dbadmin.hxx"
#include "dbu_dlg.hrc"
#include <svl/stritem.hxx>
diff --git a/dbaccess/source/ui/dlg/advancedsettings.cxx b/dbaccess/source/ui/dlg/advancedsettings.cxx
index 48c8c75..27c202e 100644
--- a/dbaccess/source/ui/dlg/advancedsettings.cxx
+++ b/dbaccess/source/ui/dlg/advancedsettings.cxx
@@ -26,7 +26,6 @@
#include "optionalboolitem.hxx"
#include "dbu_resource.hrc"
#include "dbu_dlg.hrc"
-#include "dbadmin.hrc"
#include <svl/eitem.hxx>
#include <svl/intitem.hxx>
diff --git a/dbaccess/source/ui/dlg/dbadmin.cxx b/dbaccess/source/ui/dlg/dbadmin.cxx
index 8846291..8f99adb 100644
--- a/dbaccess/source/ui/dlg/dbadmin.cxx
+++ b/dbaccess/source/ui/dlg/dbadmin.cxx
@@ -21,7 +21,6 @@
#include "DbAdminImpl.hxx"
#include "DriverSettings.hxx"
#include "adminpages.hxx"
-#include "dbadmin.hrc"
#include "dbadmin.hxx"
#include "dbu_dlg.hrc"
#include <svl/stritem.hxx>
diff --git a/dbaccess/source/ui/dlg/dbadmin.hrc b/dbaccess/source/ui/dlg/dbadmin.hrc
deleted file mode 100644
index 62ac7ca..0000000
--- a/dbaccess/source/ui/dlg/dbadmin.hrc
+++ /dev/null
@@ -1,38 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef _DBAUI_DBADMIN_HRC_
-#define _DBAUI_DBADMIN_HRC_
-
-// control ids
-
-#define FT_OPTIONS 5
-#define FT_HOSTNAME 10
-#define FT_PORTNUMBER 12
-
-#define ET_OPTIONS 3
-#define ET_HOSTNAME 5
-
-#define CB_USECATALOG 4
-
-#define NF_PORTNUMBER 1
-
-#endif // _DBAUI_DBADMIN_HRC_
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/dlg/dbadmin.src b/dbaccess/source/ui/dlg/dbadmin.src
index 6d729f9..65f2069 100644
--- a/dbaccess/source/ui/dlg/dbadmin.src
+++ b/dbaccess/source/ui/dlg/dbadmin.src
@@ -20,7 +20,6 @@
#include "dbaccess_helpid.hrc"
#include "AutoControls.hrc"
#include "dbu_dlg.hrc"
-#include "dbadmin.hrc"
#include "browserids.hxx"
String STR_DATABASE_TYPE_CHANGE
diff --git a/dbaccess/source/ui/dlg/dbadmin2.src b/dbaccess/source/ui/dlg/dbadmin2.src
index b3d3a78..3548147 100644
--- a/dbaccess/source/ui/dlg/dbadmin2.src
+++ b/dbaccess/source/ui/dlg/dbadmin2.src
@@ -19,7 +19,6 @@
#include "dbaccess_helpid.hrc"
#include "dbu_dlg.hrc"
-#include "dbadmin.hrc"
#include "browserids.hxx"
#include "toolbox.hrc"
#include "AutoControls.hrc"
diff --git a/dbaccess/source/ui/dlg/dbwiz.cxx b/dbaccess/source/ui/dlg/dbwiz.cxx
index 94a9893..03ffa01 100644
--- a/dbaccess/source/ui/dlg/dbwiz.cxx
+++ b/dbaccess/source/ui/dlg/dbwiz.cxx
@@ -18,7 +18,6 @@
*/
#include "dbwiz.hxx"
-#include "dbadmin.hrc"
#include "dbu_dlg.hrc"
#include "dsitems.hxx"
#include "dsnItem.hxx"
diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx b/dbaccess/source/ui/dlg/dbwizsetup.cxx
index 2270556..175f6c8 100644
--- a/dbaccess/source/ui/dlg/dbwizsetup.cxx
+++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx
@@ -42,7 +42,6 @@
#include "dbaccess_helpid.hrc"
#include "ConnectionPageSetup.hxx"
#include "UITools.hxx"
-#include "dbadmin.hrc"
#include <dbaccess/AsyncronousLink.hxx>
#include <sfx2/filedlghelper.hxx>
#include <cppuhelper/exc_hlp.hxx>
diff --git a/dbaccess/source/ui/dlg/detailpages.cxx b/dbaccess/source/ui/dlg/detailpages.cxx
index c3e9088..e0de94a 100644
--- a/dbaccess/source/ui/dlg/detailpages.cxx
+++ b/dbaccess/source/ui/dlg/detailpages.cxx
@@ -30,7 +30,6 @@
#include "dbaccess_helpid.hrc"
#include "dbu_dlg.hrc"
-#include "dbadmin.hrc"
#include <svl/itemset.hxx>
#include <svl/stritem.hxx>
@@ -58,66 +57,8 @@ namespace dbaui
using namespace ::com::sun::star::container;
using namespace ::dbtools;
- // OCommonBehaviourTabPage
- OCommonBehaviourTabPage::OCommonBehaviourTabPage(Window* pParent, sal_uInt16 nResId, const SfxItemSet& _rCoreAttrs,
- sal_uInt32 nControlFlags,bool _bFreeResource)
-
- :OGenericAdministrationPage(pParent, ModuleRes(nResId), _rCoreAttrs)
- ,m_pOptionsLabel(NULL)
- ,m_pOptions(NULL)
- ,m_pDataConvertFixedLine(NULL)
- ,m_pDataConvertLabel(NULL)
- ,m_pCharsetLabel(NULL)
- ,m_pCharset(NULL)
- ,m_pAutoFixedLine(NULL)
- ,m_pAutoRetrievingEnabled(NULL)
- ,m_pAutoIncrementLabel(NULL)
- ,m_pAutoIncrement(NULL)
- ,m_pAutoRetrievingLabel(NULL)
- ,m_pAutoRetrieving(NULL)
- ,m_nControlFlags(nControlFlags)
- ,m_bDelete(true)
- {
-
- if ((m_nControlFlags & CBTP_USE_OPTIONS) == CBTP_USE_OPTIONS)
- {
- m_pOptionsLabel = new FixedText(this, ModuleRes(FT_OPTIONS));
- m_pOptions = new Edit(this, ModuleRes(ET_OPTIONS));
- m_pOptions->SetModifyHdl(getControlModifiedLink());
- }
-
- if ((m_nControlFlags & CBTP_USE_CHARSET) == CBTP_USE_CHARSET)
- {
- m_pDataConvertFixedLine = new FixedLine(this, ModuleRes(FL_DATACONVERT));
- m_pCharsetLabel = new FixedText(this, ModuleRes(FT_CHARSET));
- m_pCharset = new CharSetListBox(this, ModuleRes(LB_CHARSET));
- m_pCharset->SetSelectHdl(getControlModifiedLink());
- }
-
- Window* pWindows[] = { m_pAutoRetrievingEnabled, m_pAutoFixedLine,
- m_pAutoIncrementLabel, m_pAutoIncrement,
- m_pAutoRetrievingLabel, m_pAutoRetrieving };
-
- sal_Int32 nCount = sizeof(pWindows) / sizeof(pWindows[0]);
- for (sal_Int32 i=1; i < nCount; ++i)
- {
- if ( pWindows[i] )
- {
- Window* pPrev = pWindows[i-1];
- for (sal_Int32 j = i-1; pPrev == NULL && j >= 0 ; --j)
- {
- pPrev = pWindows[j];
- }
- if ( pPrev )
- pWindows[i]->SetZOrder(pPrev, WINDOW_ZORDER_BEHIND);
- }
- }
-
- if ( _bFreeResource )
- FreeResource();
- }
-
- OCommonBehaviourTabPage::OCommonBehaviourTabPage(Window* pParent, const OString& rId, const OUString& rUIXMLDescription, const SfxItemSet& _rCoreAttrs,
+ OCommonBehaviourTabPage::OCommonBehaviourTabPage(Window* pParent, const OString& rId,
+ const OUString& rUIXMLDescription, const SfxItemSet& _rCoreAttrs,
sal_uInt32 nControlFlags)
:OGenericAdministrationPage(pParent, rId, rUIXMLDescription, _rCoreAttrs)
diff --git a/dbaccess/source/ui/dlg/detailpages.hxx b/dbaccess/source/ui/dlg/detailpages.hxx
index ca87281..8fbba3c 100644
--- a/dbaccess/source/ui/dlg/detailpages.hxx
+++ b/dbaccess/source/ui/dlg/detailpages.hxx
@@ -73,7 +73,6 @@ namespace dbaui
virtual bool FillItemSet (SfxItemSet* _rCoreAttrs) SAL_OVERRIDE;
// nControlFlags is a combination of the CBTP_xxx-constants
- OCommonBehaviourTabPage(Window* pParent, sal_uInt16 nResId, const SfxItemSet& _rCoreAttrs, sal_uInt32 nControlFlags,bool _bFreeResource = true);
OCommonBehaviourTabPage(Window* pParent, const OString& rId, const OUString& rUIXMLDescription, const SfxItemSet& _rCoreAttrs, sal_uInt32 nControlFlags);
protected:
diff --git a/dbaccess/source/ui/dlg/generalpage.cxx b/dbaccess/source/ui/dlg/generalpage.cxx
index 110dcba..77f9703 100644
--- a/dbaccess/source/ui/dlg/generalpage.cxx
+++ b/dbaccess/source/ui/dlg/generalpage.cxx
@@ -21,7 +21,6 @@
#include "generalpage.hxx"
#include <connectivity/dbexception.hxx>
#include "dbu_dlg.hrc"
-#include "dbadmin.hrc"
#include "dsitems.hxx"
#include "dbustrings.hrc"
#include "dbadmin.hxx"
diff --git a/dbaccess/source/ui/dlg/tablespage.cxx b/dbaccess/source/ui/dlg/tablespage.cxx
index a4b2860..07cad95 100644
--- a/dbaccess/source/ui/dlg/tablespage.cxx
+++ b/dbaccess/source/ui/dlg/tablespage.cxx
@@ -19,7 +19,6 @@
#include "tablespage.hxx"
#include "dbu_dlg.hrc"
-#include "dbadmin.hrc"
#include "dsitems.hxx"
#include "browserids.hxx"
#include "datasourceconnector.hxx"
commit 10bae418f8bd162e2e5262031249875857a5cc75
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Aug 15 10:39:43 2014 +0100
convert user details page to .ui
Change-Id: Id8ad4a013fb5049452bbad502da828db94ce7d47
diff --git a/dbaccess/UIConfig_dbaccess.mk b/dbaccess/UIConfig_dbaccess.mk
index e30fc52..41567d7 100644
--- a/dbaccess/UIConfig_dbaccess.mk
+++ b/dbaccess/UIConfig_dbaccess.mk
@@ -68,6 +68,7 @@ $(eval $(call gb_UIConfig_add_uifiles,dbaccess, \
dbaccess/uiconfig/ui/typeselectpage \
dbaccess/uiconfig/ui/useradmindialog \
dbaccess/uiconfig/ui/useradminpage \
+ dbaccess/uiconfig/ui/userdetailspage \
))
# vim: set noet sw=4 ts=4:
diff --git a/dbaccess/inc/dbaccess_helpid.hrc b/dbaccess/inc/dbaccess_helpid.hrc
index a64c290..e37a493 100644
--- a/dbaccess/inc/dbaccess_helpid.hrc
+++ b/dbaccess/inc/dbaccess_helpid.hrc
@@ -136,7 +136,6 @@
#define HID_DOCUMENT_CREATE_REPWIZ "DBACCESS_HID_DOCUMENT_CREATE_REPWIZ"
#define HID_TAB_AUTOINCREMENTVALUE "DBACCESS_HID_TAB_AUTOINCREMENTVALUE"
-#define HID_DSADMIN_PAGE_USERDRIVER "DBACCESS_HID_DSADMIN_PAGE_USERDRIVER"
#define HID_DSADMIN_USESSL_LDAP "DBACCESS_HID_DSADMIN_USESSL_LDAP"
#define HID_DSADMIN_DBASE_PATH "DBACCESS_HID_DSADMIN_DBASE_PATH"
#define HID_DSADMIN_MYSQL_DATABASE "DBACCESS_HID_DSADMIN_MYSQL_DATABASE"
diff --git a/dbaccess/source/ui/dlg/dbadmin.src b/dbaccess/source/ui/dlg/dbadmin.src
index 500341a..6d729f9 100644
--- a/dbaccess/source/ui/dlg/dbadmin.src
+++ b/dbaccess/source/ui/dlg/dbadmin.src
@@ -28,62 +28,6 @@ String STR_DATABASE_TYPE_CHANGE
Text [ en-US ] = "Database properties" ;
};
-TabPage PAGE_USERDRIVER
-{
- SVLook = TRUE ;
- Pos = MAP_APPFONT ( 0 , 0 ) ;
- Size = MAP_APPFONT ( PAGE_X , PAGE_Y ) ;
- Hide = TRUE;
- HelpId = HID_DSADMIN_PAGE_USERDRIVER;
-
- FixedText FT_HOSTNAME
- {
- Pos = MAP_APPFONT ( 6 , UNRELATED_CONTROLS ) ;
- Size = MAP_APPFONT ( EDIT_X - 7 , FIXEDTEXT_HEIGHT ) ;
- Text[ en-US ] = "~Hostname";
- };
- Edit ET_HOSTNAME
- {
- HelpID = "dbaccess:Edit:PAGE_USERDRIVER:ET_HOSTNAME";
- TabStop = TRUE ;
- Border = TRUE ;
- Pos = MAP_APPFONT ( EDIT_X , UNRELATED_CONTROLS -1 ) ;
- Size = MAP_APPFONT ( 105 , EDIT_HEIGHT ) ;
- };
-
- FixedText FT_PORTNUMBER
- {
- Pos = MAP_APPFONT ( 6 , 2*UNRELATED_CONTROLS + FIXEDTEXT_HEIGHT) ;
- Size = MAP_APPFONT ( EDIT_X - 7 , FIXEDTEXT_HEIGHT ) ;
- Text[ en-US ] = "~Port number";
- };
-
- NumericField NF_PORTNUMBER
- {
- HelpID = "dbaccess:NumericField:PAGE_USERDRIVER:NF_PORTNUMBER";
- TabStop = TRUE ;
- Border = TRUE ;
- NoThousandSep = TRUE;
-
- Pos = MAP_APPFONT ( EDIT_X , 2*UNRELATED_CONTROLS + FIXEDTEXT_HEIGHT -1 ) ;
- Size = MAP_APPFONT ( 105 , EDIT_HEIGHT ) ;
- };
-
- FixedText FT_OPTIONS
- {
- Pos = MAP_APPFONT ( 6 , 3*UNRELATED_CONTROLS + 2*FIXEDTEXT_HEIGHT ) ;
- Size = MAP_APPFONT ( EDIT_X - 7 , FIXEDTEXT_HEIGHT ) ;
- Text [ en-US ] = "~Driver settings" ;
- };
- Edit ET_OPTIONS
- {
- HelpID = "dbaccess:Edit:PAGE_USERDRIVER:ET_OPTIONS";
- Border = TRUE ;
- TabStop = TRUE ;
- };
- AUTO_CHARSET( 4*UNRELATED_CONTROLS+ 3*FIXEDTEXT_HEIGHT + RELATED_CONTROLS, PAGE_X)
-};
-
String STR_PARENTTITLE_GENERAL
{
Text [ en-US ] = "Data Source Properties: #" ;
diff --git a/dbaccess/source/ui/dlg/detailpages.cxx b/dbaccess/source/ui/dlg/detailpages.cxx
index c627896..c3e9088 100644
--- a/dbaccess/source/ui/dlg/detailpages.cxx
+++ b/dbaccess/source/ui/dlg/detailpages.cxx
@@ -369,16 +369,16 @@ namespace dbaui
}
// OOdbcDetailsPage
OUserDriverDetailsPage::OUserDriverDetailsPage( Window* pParent, const SfxItemSet& _rCoreAttrs )
- :OCommonBehaviourTabPage(pParent, PAGE_USERDRIVER, _rCoreAttrs,
- CBTP_USE_CHARSET | CBTP_USE_OPTIONS ,false)
- ,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_aUseCatalog (this, ModuleRes(CB_USECATALOG))
+ : OCommonBehaviourTabPage(pParent, "UserDetailsPage", "dbaccess/ui/userdetailspage.ui", _rCoreAttrs,
+ CBTP_USE_CHARSET | CBTP_USE_OPTIONS)
{
- m_aUseCatalog.SetToggleHdl(getControlModifiedLink());
- FreeResource();
+ get(m_pFTHostname, "hostnameft");
+ get(m_pEDHostname, "hostname");
+ get(m_pPortNumber, "portnumberft");
+ get(m_pNFPortNumber, "portnumber");
+ m_pNFPortNumber->SetUseThousandSep(false);
+ get(m_pUseCatalog, "usecatalog");
+ m_pUseCatalog->SetToggleHdl(getControlModifiedLink());
}
SfxTabPage* ODriversSettings::CreateUser( Window* pParent, const SfxItemSet* _rAttrSet )
@@ -390,24 +390,24 @@ namespace dbaui
{
bool bChangedSomething = OCommonBehaviourTabPage::FillItemSet(_rSet);
- fillInt32(*_rSet,&m_aNFPortNumber,DSID_CONN_PORTNUMBER,bChangedSomething);
- fillString(*_rSet,&m_aEDHostname,DSID_CONN_HOSTNAME,bChangedSomething);
- fillBool(*_rSet,&m_aUseCatalog,DSID_USECATALOG,bChangedSomething);
+ fillInt32(*_rSet,m_pNFPortNumber,DSID_CONN_PORTNUMBER,bChangedSomething);
+ fillString(*_rSet,m_pEDHostname,DSID_CONN_HOSTNAME,bChangedSomething);
+ fillBool(*_rSet,m_pUseCatalog,DSID_USECATALOG,bChangedSomething);
return bChangedSomething;
}
void OUserDriverDetailsPage::fillControls(::std::vector< ISaveValueWrapper* >& _rControlList)
{
OCommonBehaviourTabPage::fillControls(_rControlList);
- _rControlList.push_back(new OSaveValueWrapper<Edit>(&m_aEDHostname));
- _rControlList.push_back(new OSaveValueWrapper<CheckBox>(&m_aUseCatalog));
- _rControlList.push_back(new OSaveValueWrapper<NumericField>(&m_aNFPortNumber));
+ _rControlList.push_back(new OSaveValueWrapper<Edit>(m_pEDHostname));
+ _rControlList.push_back(new OSaveValueWrapper<CheckBox>(m_pUseCatalog));
+ _rControlList.push_back(new OSaveValueWrapper<NumericField>(m_pNFPortNumber));
}
void OUserDriverDetailsPage::fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList)
{
OCommonBehaviourTabPage::fillWindows(_rControlList);
- _rControlList.push_back(new ODisableWrapper<FixedText>(&m_aFTHostname));
- _rControlList.push_back(new ODisableWrapper<FixedText>(&m_aPortNumber));
+ _rControlList.push_back(new ODisableWrapper<FixedText>(m_pFTHostname));
+ _rControlList.push_back(new ODisableWrapper<FixedText>(m_pPortNumber));
}
void OUserDriverDetailsPage::implInitControls(const SfxItemSet& _rSet, bool _bSaveValue)
{
@@ -421,13 +421,13 @@ namespace dbaui
if ( bValid )
{
- 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_aUseCatalog.Check(pUseCatalogItem->GetValue());
+ m_pUseCatalog->Check(pUseCatalogItem->GetValue());
}
OCommonBehaviourTabPage::implInitControls(_rSet, _bSaveValue);
diff --git a/dbaccess/source/ui/dlg/detailpages.hxx b/dbaccess/source/ui/dlg/detailpages.hxx
index 840c01f..ca87281 100644
--- a/dbaccess/source/ui/dlg/detailpages.hxx
+++ b/dbaccess/source/ui/dlg/detailpages.hxx
@@ -149,11 +149,11 @@ namespace dbaui
virtual void fillControls(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE;
virtual void fillWindows(::std::vector< ISaveValueWrapper* >& _rControlList) SAL_OVERRIDE;
private:
- FixedText m_aFTHostname;
- Edit m_aEDHostname;
- FixedText m_aPortNumber;
- NumericField m_aNFPortNumber;
- CheckBox m_aUseCatalog;
+ FixedText* m_pFTHostname;
+ Edit* m_pEDHostname;
+ FixedText* m_pPortNumber;
+ NumericField* m_pNFPortNumber;
+ CheckBox* m_pUseCatalog;
};
// OMySQLODBCDetailsPage
diff --git a/dbaccess/uiconfig/ui/userdetailspage.ui b/dbaccess/uiconfig/ui/userdetailspage.ui
new file mode 100644
index 0000000..38e24ac
--- /dev/null
+++ b/dbaccess/uiconfig/ui/userdetailspage.ui
@@ -0,0 +1,240 @@
+<?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="GtkBox" id="UserDetailsPage">
+ <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="frame2">
+ <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="alignment2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="top_padding">6</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkGrid" id="grid1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
+ <child>
+ <object class="GtkLabel" id="hostnameft">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Hostname</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">hostname</property>
+ <property name="ellipsize">end</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="GtkLabel" id="portnumberft">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Port number</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">portnumber</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="GtkEntry" id="hostname">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ </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>
+ <child>
+ <object class="GtkSpinButton" id="portnumber">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</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="GtkCheckButton" id="usecatalog">
+ <property name="label" translatable="yes">_Use catalog</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">3</property>
+ <property name="width">2</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="optionslabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Driver settings</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">options</property>
+ </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>
+ <child>
+ <object class="GtkEntry" id="options">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">2</property>
+ <property name="width">1</property>
+ <property name="height">1</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">Connection Settings</property>
+ <attributes>
+ <attribute name="weight" value="semibold"/>
+ </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="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="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="spacing">12</property>
+ <child>
+ <object class="GtkLabel" id="charsetlabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Character set</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">charset</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="dbulo-CharSetListBox" id="charset">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ </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="charsetheader">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Data conversion</property>
+ <attributes>
+ <attribute name="weight" value="semibold"/>
+ </attributes>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <object class="GtkSizeGroup" id="sizegroup1">
+ <widgets>
+ <widget name="hostnameft"/>
+ <widget name="portnumberft"/>
+ <widget name="optionslabel"/>
+ <widget name="charsetlabel"/>
+ </widgets>
+ </object>
+</interface>
commit bf697ef3e6c2a00086d916ee054b339246fbb6aa
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Aug 15 10:01:05 2014 +0100
use 12 spacing
Change-Id: I61ac1b5bd262ecd10ed0f405adcc5e2fb4fa949c
diff --git a/dbaccess/uiconfig/ui/generalspecialjdbcdetailspage.ui b/dbaccess/uiconfig/ui/generalspecialjdbcdetailspage.ui
index 84b4856..faea8d4 100644
--- a/dbaccess/uiconfig/ui/generalspecialjdbcdetailspage.ui
+++ b/dbaccess/uiconfig/ui/generalspecialjdbcdetailspage.ui
@@ -1,7 +1,8 @@
<?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 -->
- <!-- interface-requires gtk+ 3.0 -->
<object class="GtkBox" id="GeneralSpecialJDBCDetails">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -28,8 +29,8 @@
<object class="GtkGrid" id="grid1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="row_spacing">2</property>
- <property name="column_spacing">6</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
<child>
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
@@ -147,15 +148,6 @@
</packing>
</child>
<child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
<object class="GtkSpinButton" id="portNumberSpinbutton">
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -168,6 +160,15 @@
<property name="height">1</property>
</packing>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</object>
</child>
</object>
@@ -208,7 +209,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
- <property name="spacing">6</property>
+ <property name="spacing">12</property>
<child>
<object class="GtkLabel" id="charsetlabel">
<property name="visible">True</property>
commit 1dcb30fd4a0814c38b336cb577047051b960e50b
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Aug 15 09:30:32 2014 +0100
drop thousand seperator in port number spinbuttons
Change-Id: I89c56f52ab8134bdb4376d30f2c85af0f946bd88
diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
index d2363fe..12af7c0 100644
--- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
+++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
@@ -140,6 +140,7 @@ using namespace ::com::sun::star;
get(m_pETBaseDN, "baseDNEntry");
get(m_pFTPortNumber, "portNumLabel");
get(m_pNFPortNumber, "portNumEntry");
+ m_pNFPortNumber->SetUseThousandSep(false);
get(m_pFTDefaultPortNumber, "portNumDefLabel");
get(m_pCBUseSSL, "useSSLCheckbutton");
@@ -355,6 +356,7 @@ using namespace ::com::sun::star;
get(m_pFTPortNumber, "portNumLabel");
get(m_pFTDefaultPortNumber, "portNumDefLabel");
get(m_pNFPortNumber, "portNumEntry");
+ m_pNFPortNumber->SetUseThousandSep(false);
get(m_pFTDriverClass, "jdbcDriverLabel");
get(m_pETDriverClass, "jdbcDriverEntry");
get(m_pPBTestJavaDriver, "testDriverButton");
diff --git a/dbaccess/source/ui/dlg/detailpages.cxx b/dbaccess/source/ui/dlg/detailpages.cxx
index 49d9c7c..c627896 100644
--- a/dbaccess/source/ui/dlg/detailpages.cxx
+++ b/dbaccess/source/ui/dlg/detailpages.cxx
@@ -451,6 +451,7 @@ namespace dbaui
{
get(m_pEDHostname, "hostNameEntry");
get(m_pNFPortNumber, "portNumberSpinbutton");
+ m_pNFPortNumber->SetUseThousandSep(false);
get(m_pFTSocket, "socketLabel");
get(m_pEDSocket, "socketEntry");
get(m_pFTDriverClass, "driverClassLabel");
@@ -664,6 +665,7 @@ namespace dbaui
get(m_pETBaseDN, "baseDNEntry");
get(m_pCBUseSSL, "useSSLCheckbutton");
get(m_pNFPortNumber, "portNumberSpinbutton");
+ m_pNFPortNumber->SetUseThousandSep(false);
get(m_pNFRowCount, "LDAPRowCountspinbutton");
m_pETBaseDN->SetModifyHdl(getControlModifiedLink());
commit 3eac92de4056651627a8cbb0560c3b962f3ec828
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Aug 15 09:33:29 2014 +0100
don't stretch listbox vertically
Change-Id: Id50412ae0f29a340839b68faa53e223f7ac03fd2
diff --git a/dbaccess/uiconfig/ui/mysqlnativepage.ui b/dbaccess/uiconfig/ui/mysqlnativepage.ui
index 9c14885..a45be0b 100644
--- a/dbaccess/uiconfig/ui/mysqlnativepage.ui
+++ b/dbaccess/uiconfig/ui/mysqlnativepage.ui
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.16.1 -->
<interface>
- <!-- interface-requires gtk+ 3.0 -->
+ <requires lib="gtk+" version="3.0"/>
<!-- interface-requires LibreOffice 1.0 -->
<object class="GtkBox" id="MysqlNativePage">
<property name="visible">True</property>
@@ -118,7 +119,6 @@
<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>
@@ -164,8 +164,8 @@
<object class="GtkAlignment" id="alignment3">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="valign">start</property>
<property name="hexpand">True</property>
- <property name="vexpand">True</property>
<property name="top_padding">6</property>
<property name="left_padding">12</property>
<child>
@@ -173,7 +173,6 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
- <property name="vexpand">True</property>
<property name="spacing">6</property>
<child>
<object class="GtkLabel" id="charsetlabel">
More information about the Libreoffice-commits
mailing list