[Libreoffice-commits] core.git: dbaccess/source dbaccess/uiconfig dbaccess/UIConfig_dbaccess.mk extras/source
dbaccess/UIConfig_dbaccess.mk |2
dbaccess/source/ui/inc/WNameMatch.hxx | 24 +-
dbaccess/source/ui/inc/WTypeSelect.hxx | 24 +-
dbaccess/source/ui/inc/dbu_misc.hrc|4
dbaccess/source/ui/misc/WCPage.cxx |1
dbaccess/source/ui/misc/WColumnSelect.cxx |1
dbaccess/source/ui/misc/WCopyTable.cxx |3
dbaccess/source/ui/misc/WExtendPages.cxx | 11 -
dbaccess/source/ui/misc/WNameMatch.cxx | 217 ---
dbaccess/source/ui/misc/WTypeSelect.cxx| 135 +++---
dbaccess/source/ui/misc/WizardPages.hrc| 48 -
dbaccess/source/ui/misc/WizardPages.src| 228 +
dbaccess/uiconfig/ui/namematchingpage.ui | 226
dbaccess/uiconfig/ui/typeselectpage.ui | 180 +++
extras/source/glade/libreoffice-catalog.xml.in |6
15 files changed, 641 insertions(+), 469 deletions(-)
New commits:
commit 3067d228cd0db321868d766c917089540d02678d
Author: Szymon KÅos eszka...@gmail.com
Date: Tue Aug 5 23:55:21 2014 +0200
TAB_WIZ_TYPE_SELECT and TAB_WIZ_NAME_MATCHING conversion to .ui
Conflicts:
dbaccess/UIConfig_dbaccess.mk
dbaccess/source/ui/misc/WizardPages.src
Change-Id: I1a628dd6220f3f180cc01353380fe4aa7e166cf4
Reviewed-on: https://gerrit.libreoffice.org/10776
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 2ab2a66..289cd48 100644
--- a/dbaccess/UIConfig_dbaccess.mk
+++ b/dbaccess/UIConfig_dbaccess.mk
@@ -42,6 +42,7 @@ $(eval $(call gb_UIConfig_add_uifiles,dbaccess, \
dbaccess/uiconfig/ui/migratepage \
dbaccess/uiconfig/ui/mysqlnativepage \
dbaccess/uiconfig/ui/mysqlnativesettings \
+dbaccess/uiconfig/ui/namematchingpage \
dbaccess/uiconfig/ui/odbcpage \
dbaccess/uiconfig/ui/parametersdialog \
dbaccess/uiconfig/ui/password \
@@ -62,6 +63,7 @@ $(eval $(call gb_UIConfig_add_uifiles,dbaccess, \
dbaccess/uiconfig/ui/tablesjoindialog \
dbaccess/uiconfig/ui/textconnectionsettings \
dbaccess/uiconfig/ui/textpage \
+dbaccess/uiconfig/ui/typeselectpage \
dbaccess/uiconfig/ui/useradmindialog \
dbaccess/uiconfig/ui/useradminpage \
))
diff --git a/dbaccess/source/ui/inc/WNameMatch.hxx
b/dbaccess/source/ui/inc/WNameMatch.hxx
index 055a488..0c713685 100644
--- a/dbaccess/source/ui/inc/WNameMatch.hxx
+++ b/dbaccess/source/ui/inc/WNameMatch.hxx
@@ -36,7 +36,7 @@ namespace dbaui
virtual void InitEntry(SvTreeListEntry* pEntry, const OUString rStr,
const Image rImg1, const Image rImg2, SvLBoxButtonKind eButtonKind)
SAL_OVERRIDE;
public:
-OColumnTreeBox( Window* pParent, const ResId rResId );
+OColumnTreeBox( Window* pParent, WinBits nBits = WB_BORDER );
void FillListBox( const ODatabaseExport::TColumnVector _rList);
void SetReadOnly(bool _bRo=true) { m_bReadOnly = _bRo; }
@@ -50,18 +50,20 @@ namespace dbaui
// Name matching for data appending
class OWizNameMatching : public OWizardPage
{
-FixedText m_FT_TABLE_LEFT;
-FixedText m_FT_TABLE_RIGHT;
-OColumnTreeBox m_CTRL_LEFT;// left side
-OColumnTreeBox m_CTRL_RIGHT; // right side
-ImageButton m_ibColumn_up;
-ImageButton m_ibColumn_down;
-ImageButton m_ibColumn_up_right;
-ImageButton m_ibColumn_down_right;
-PushButton m_pbAll;
-PushButton m_pbNone;
+FixedText *m_pTABLE_LEFT;
+FixedText *m_pTABLE_RIGHT;
+OColumnTreeBox *m_pCTRL_LEFT;// left side
+OColumnTreeBox *m_pCTRL_RIGHT; // right side
+PushButton *m_pColumn_up;
+PushButton *m_pColumn_down;
+PushButton *m_pColumn_up_right;
+PushButton *m_pColumn_down_right;
+PushButton *m_pAll;
+PushButton *m_pNone;
OUStringm_sSourceText;
OUStringm_sDestText;
+Image m_aImgUp;
+Image m_aImgDown;
DECL_LINK( ButtonClickHdl, Button * );
DECL_LINK( RightButtonClickHdl, Button * );
diff --git a/dbaccess/source/ui/inc/WTypeSelect.hxx
b/dbaccess/source/ui/inc/WTypeSelect.hxx
index 58138e3..5e498d1 100644
--- a/dbaccess/source/ui/inc/WTypeSelect.hxx
+++ b/dbaccess/source/ui/inc/WTypeSelect.hxx
@@ -37,6 +37,7 @@ namespace dbaui
class OWizTypeSelectControl : public OFieldDescControl
{
protected:
+Window* m_pParentTabPage;
virtual voidActivateAggregate( EControlType eType )
SAL_OVERRIDE;
virtual voidDeactivateAggregate( EControlType
[Libreoffice-commits] core.git: dbaccess/source dbaccess/uiconfig dbaccess/UIConfig_dbaccess.mk extras/source
dbaccess/UIConfig_dbaccess.mk |1
dbaccess/source/ui/dlg/indexdialog.cxx | 263
dbaccess/source/ui/dlg/indexdialog.hrc | 42 ---
dbaccess/source/ui/dlg/indexdialog.src | 131 --
dbaccess/source/ui/dlg/indexfieldscontrol.cxx | 17 -
dbaccess/source/ui/inc/indexdialog.hxx | 21 -
dbaccess/source/ui/inc/indexfieldscontrol.hxx |4
dbaccess/uiconfig/ui/indexdesigndialog.ui | 316 +
extras/source/glade/libreoffice-catalog.xml.in |7
9 files changed, 457 insertions(+), 345 deletions(-)
New commits:
commit bf6a770dfe81dfc2567d2f3386d5946c7a6a31ef
Author: sk94 eszka...@gmail.com
Date: Mon Jun 9 18:27:43 2014 +0200
DLG_INDEXDESIGN conversion to .ui
Change-Id: I84d6531a73e6e726359bd20664b6299ad8a390ee
Reviewed-on: https://gerrit.libreoffice.org/9699
Tested-by: Caolán McNamara caol...@redhat.com
Reviewed-by: Caolán McNamara caol...@redhat.com
diff --git a/dbaccess/UIConfig_dbaccess.mk b/dbaccess/UIConfig_dbaccess.mk
index 4244e55..8919127 100644
--- a/dbaccess/UIConfig_dbaccess.mk
+++ b/dbaccess/UIConfig_dbaccess.mk
@@ -23,6 +23,7 @@ $(eval $(call gb_UIConfig_add_uifiles,dbaccess, \
dbaccess/uiconfig/ui/generalpagedialog \
dbaccess/uiconfig/ui/generalpagewizard \
dbaccess/uiconfig/ui/generatedvaluespage \
+dbaccess/uiconfig/ui/indexdesigndialog \
dbaccess/uiconfig/ui/joindialog \
dbaccess/uiconfig/ui/password \
dbaccess/uiconfig/ui/queryfilterdialog \
diff --git a/dbaccess/source/ui/dlg/indexdialog.cxx
b/dbaccess/source/ui/dlg/indexdialog.cxx
index 6857e2b..3c5cfac 100644
--- a/dbaccess/source/ui/dlg/indexdialog.cxx
+++ b/dbaccess/source/ui/dlg/indexdialog.cxx
@@ -24,7 +24,6 @@
#include indexdialog.hxx
#include dbu_dlg.hrc
#include dbaccess_helpid.hrc
-#include indexdialog.hrc
#include indexfieldscontrol.hxx
#include indexcollection.hxx
#include vcl/msgbox.hxx
@@ -36,6 +35,13 @@
#include browserids.hxx
#include connectivity/dbtools.hxx
#include osl/diagnose.h
+
+const char INDEX_NEW_CMD[] = .index:createNew;
+const char INDEX_DROP_CMD[] = .index:dropCurrent;
+const char INDEX_RENAME_CMD[] = .index:renameCurrent;
+const char INDEX_SAVE_CMD[] = .index:saveCurrent;
+const char INDEX_RESET_CMD[] = .index:resetCurrent;
+
namespace dbaui
{
@@ -81,8 +87,8 @@ namespace dbaui
}
// DbaIndexList
-DbaIndexList::DbaIndexList(Window* _pParent, const ResId _rId)
-:SvTreeListBox(_pParent, _rId)
+DbaIndexList::DbaIndexList(Window* _pParent, WinBits nWinBits)
+:SvTreeListBox(_pParent, nWinBits)
,m_bSuspendSelectHdl(false)
{
}
@@ -152,43 +158,46 @@ namespace dbaui
return bReturn;
}
+extern C SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeDbaIndexList(Window
*pParent, VclBuilder::stringmap )
+{
+return new DbaIndexList (pParent, WB_BORDER);
+}
+
// DbaIndexDialog
DbaIndexDialog::DbaIndexDialog( Window* _pParent, const Sequence OUString
_rFieldNames,
const Reference XNameAccess _rxIndexes,
const Reference XConnection
_rxConnection,
const Reference XComponentContext
_rxContext,sal_Int32 _nMaxColumnsInIndex)
-:ModalDialog( _pParent, ModuleRes(DLG_INDEXDESIGN))
+:ModalDialog( _pParent, IndexDesignDialog,
dbaccess/ui/indexdesigndialog.ui)
,m_xConnection(_rxConnection)
,m_aGeometrySettings(E_DIALOG,
OUString(dbaccess.tabledesign.indexdialog))
-,m_aActions (this, ModuleRes(TLB_ACTIONS))
-,m_aIndexes (this, ModuleRes(CTR_INDEXLIST))
-,m_aIndexDetails(this, ModuleRes(FL_INDEXDETAILS))
-,m_aDescriptionLabel(this, ModuleRes(FT_DESC_LABEL))
-,m_aDescription (this, ModuleRes(FT_DESCRIPTION))
-,m_aUnique (this, ModuleRes(CB_UNIQUE))
-,m_aFieldsLabel (this, ModuleRes(FT_FIELDS))
-,m_pFields(new IndexFieldsControl (this,
ModuleRes(CTR_FIELDS),_nMaxColumnsInIndex,::dbtools::getBooleanDataSourceSetting(
m_xConnection, AddIndexAppendix )))
-,m_aClose (this, ModuleRes(PB_CLOSE))
-,m_aHelp(this, ModuleRes(HB_HELP))
,m_pIndexes(NULL)
,m_pPreviousSelection(NULL)
,m_bEditAgain(false)
,m_xContext(_rxContext)
{
+get(m_pActions, ACTIONS);
+get(m_pIndexList, INDEX_LIST);
+get(m_pIndexDetails, INDEX_DETAILS);
+get(m_pDescriptionLabel, DESC_LABEL);
+get(m_pDescription, DESCRIPTION);
+get(m_pUnique, UNIQUE);
+get(m_pFieldsLabel, FIELDS_LABEL);
+get(m_pFields, FIELDS);
+get(m_pClose, CLOSE);
-FreeResource();
-
[Libreoffice-commits] core.git: dbaccess/source dbaccess/uiconfig dbaccess/UIConfig_dbaccess.mk extras/source svtools/source
dbaccess/UIConfig_dbaccess.mk |1
dbaccess/source/ui/dlg/directsql.cxx | 66 ++---
dbaccess/source/ui/inc/directsql.hxx | 18 -
dbaccess/uiconfig/ui/directsqldialog.ui| 277 +
extras/source/glade/libreoffice-catalog.xml.in |6
svtools/source/edit/editsyntaxhighlighter.cxx |6
svtools/source/edit/svmedit.cxx|6
7 files changed, 330 insertions(+), 50 deletions(-)
New commits:
commit 471e5c1ed19afde8a92a91bfc1ccc71a2506cc01
Author: Csikós Tamás csks.t...@gmail.com
Date: Mon Jul 29 19:54:43 2013 +0200
modern .ui widgetlayout for directsql
Change-Id: I51140fe6abd2d321c5784b923f920ab9183f417e
Reviewed-on: https://gerrit.libreoffice.org/5171
Reviewed-by: Caolán McNamara caol...@redhat.com
Tested-by: Caolán McNamara caol...@redhat.com
diff --git a/dbaccess/UIConfig_dbaccess.mk b/dbaccess/UIConfig_dbaccess.mk
index eb97972..cace6a8 100644
--- a/dbaccess/UIConfig_dbaccess.mk
+++ b/dbaccess/UIConfig_dbaccess.mk
@@ -10,6 +10,7 @@
$(eval $(call gb_UIConfig_UIConfig,dbaccess))
$(eval $(call gb_UIConfig_add_uifiles,dbaccess, \
+dbaccess/uiconfig/ui/directsqldialog \
dbaccess/uiconfig/ui/querypropertiesdialog \
dbaccess/uiconfig/ui/generalpagedialog \
dbaccess/uiconfig/ui/generalpagewizard \
diff --git a/dbaccess/source/ui/dlg/directsql.cxx
b/dbaccess/source/ui/dlg/directsql.cxx
index bb73d8a..87b9173 100644
--- a/dbaccess/source/ui/dlg/directsql.cxx
+++ b/dbaccess/source/ui/dlg/directsql.cxx
@@ -73,33 +73,25 @@ namespace dbaui
DBG_NAME(DirectSQLDialog)
//
DirectSQLDialog::DirectSQLDialog( Window* _pParent, const Reference
XConnection _rxConn )
-:ModalDialog(_pParent, ModuleRes(DLG_DIRECTSQL))
-,m_aFrame (this, ModuleRes(FL_SQL))
-,m_aSQLLabel(this, ModuleRes(FT_SQL))
-,m_aSQL (this, ModuleRes(ME_SQL))
-,m_aExecute (this, ModuleRes(PB_EXECUTE))
-,m_aHistoryLabel(this, ModuleRes(FT_HISTORY))
-,m_pSQLHistory(new LargeEntryListBox(this, ModuleRes(LB_HISTORY)))
-,m_aStatusFrame (this, ModuleRes(FL_STATUS))
-,m_aStatus (this, ModuleRes(ME_STATUS))
-,m_pShowOutput(new CheckBox(this, ModuleRes(CB_SHOWOUTPUT)))
-,m_aOutputFrame (this, ModuleRes(FL_OUTPUT))
-,m_aOutput (this, ModuleRes(ME_OUTPUT))
-,m_aButtonSeparator (this, ModuleRes(FL_BUTTONS))
-,m_aHelp(this, ModuleRes(PB_HELP))
-,m_aClose (this, ModuleRes(PB_CLOSE))
+:ModalDialog(_pParent, DirectSQLDialog ,
dbaccess/ui/directsqldialog.ui)
,m_nHistoryLimit(20)
,m_nStatusCount(1)
,m_xConnection(_rxConn)
{
-DBG_CTOR(DirectSQLDialog,NULL);
+get(m_pSQL,sql);
+get(m_pExecute,execute);
+get(m_pSQLHistory,sqlhistory);
+get(m_pStatus,status);
+get(m_pShowOutput,showoutput);
+get(m_pOutput,output);
+get(m_pClose,close);
-FreeResource();
+DBG_CTOR(DirectSQLDialog,NULL);
-m_aSQL.GrabFocus();
+m_pSQL-GrabFocus();
-m_aExecute.SetClickHdl(LINK(this, DirectSQLDialog, OnExecute));
-m_aClose.SetClickHdl(LINK(this, DirectSQLDialog, OnClose));
+m_pExecute-SetClickHdl(LINK(this, DirectSQLDialog, OnExecute));
+m_pClose-SetClickHdl(LINK(this, DirectSQLDialog, OnClose));
m_pSQLHistory-SetSelectHdl(LINK(this, DirectSQLDialog,
OnListEntrySelected));
m_pSQLHistory-SetDropDownLineCount(10);
@@ -109,8 +101,8 @@ DBG_NAME(DirectSQLDialog)
if (xConnComp.is())
startComponentListening(xConnComp);
-m_aSQL.SetModifyHdl(LINK(this, DirectSQLDialog, OnStatementModified));
-OnStatementModified(m_aSQL);
+m_pSQL-SetModifyHdl(LINK(this, DirectSQLDialog, OnStatementModified));
+OnStatementModified(m_pSQL);
}
//
@@ -120,8 +112,6 @@ DBG_NAME(DirectSQLDialog)
::osl::MutexGuard aGuard(m_aMutex);
stopAllComponentListening();
}
-delete m_pSQLHistory;
-delete m_pShowOutput;
DBG_DTOR(DirectSQLDialog,NULL);
}
@@ -226,7 +216,7 @@ DBG_NAME(DirectSQLDialog)
OSL_ENSURE(xStatement.is(),
DirectSQLDialog::implExecuteStatement: no statement returned by the
connection!);
// clear the output box
-m_aOutput.SetText(OUString());
+m_pOutput-SetText(OUString());
if (xStatement.is())
{
if
(OUString(_rStatement).toAsciiUpperCase().startsWith(SELECT)
m_pShowOutput-IsChecked())
@@ -288,10 +278,10 @@ DBG_NAME(DirectSQLDialog)
{
OUString
