[Libreoffice-commits] core.git: dbaccess/source dbaccess/uiconfig dbaccess/UIConfig_dbaccess.mk extras/source
Szymon KÅ‚os
eszkadev at gmail.com
Wed Aug 6 06:15:23 PDT 2014
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 <eszkadev at 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 <dtardon at redhat.com>
Tested-by: David Tardon <dtardon at 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;
OUString m_sSourceText;
OUString m_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 void ActivateAggregate( EControlType eType ) SAL_OVERRIDE;
virtual void DeactivateAggregate( EControlType eType ) SAL_OVERRIDE;
@@ -50,7 +51,7 @@ namespace dbaui
virtual OUString getAutoIncrementValue() const SAL_OVERRIDE;
public:
- OWizTypeSelectControl(Window* pParent, const ResId& rResId,OTableDesignHelpBar* pHelpBar=NULL);
+ OWizTypeSelectControl(Window* pParent, Window* pParentTabPage, OTableDesignHelpBar* pHelpBar=NULL);
virtual ~OWizTypeSelectControl();
virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData> getMetaData() SAL_OVERRIDE;
@@ -68,16 +69,14 @@ namespace dbaui
bool _bSet = false);
protected:
virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE;
+ Window* m_pParentTabPage;
public:
OWizTypeSelectList( Window* pParent, WinBits nStyle = WB_BORDER )
: MultiListBox(pParent,nStyle)
, m_bPKey(false)
{}
- OWizTypeSelectList( Window* pParent, const ResId& rResId )
- : MultiListBox(pParent,rResId)
- , m_bPKey(false)
- {}
void SetPKey(bool bPKey) { m_bPKey = bPKey; }
+ void SetParentTabPage(Window* pParentTabPage) { m_pParentTabPage = pParentTabPage; }
};
// Wizard Page: OWizTypeSelect
@@ -91,13 +90,13 @@ namespace dbaui
DECL_LINK( ColumnSelectHdl, MultiListBox* );
DECL_LINK( ButtonClickHdl, Button * );
protected:
- OWizTypeSelectList m_lbColumnNames;
- FixedLine m_flColumns;
- OWizTypeSelectControl m_aTypeControl;
- FixedLine m_flAutoType;
- FixedText m_ftAuto;
- NumericField m_etAuto;
- PushButton m_pbAuto;
+ OWizTypeSelectList *m_pColumnNames;
+ FixedText *m_pColumns;
+ OWizTypeSelectControl *m_pTypeControl;
+ FixedText *m_pAutoType;
+ FixedText *m_pAutoFt;
+ NumericField *m_pAutoEt;
+ PushButton *m_pAutoPb;
Image m_imgPKey;
SvStream* m_pParserStream; // stream to read the tokens from or NULL
@@ -113,7 +112,6 @@ namespace dbaui
public:
virtual void Reset ( ) SAL_OVERRIDE;
virtual void ActivatePage( ) SAL_OVERRIDE;
- virtual void Resize() SAL_OVERRIDE;
virtual bool LeavePage() SAL_OVERRIDE;
virtual OUString GetTitle() const SAL_OVERRIDE;
diff --git a/dbaccess/source/ui/inc/dbu_misc.hrc b/dbaccess/source/ui/inc/dbu_misc.hrc
index ed0aacd..61b5d67 100644
--- a/dbaccess/source/ui/inc/dbu_misc.hrc
+++ b/dbaccess/source/ui/inc/dbu_misc.hrc
@@ -21,8 +21,8 @@
#include "dbu_resource.hrc"
-// free
-// free
+#define IMG_UP RID_STR_MISC_START + 0
+#define IMG_DOWN RID_STR_MISC_START + 1
#define STR_WIZ_COLUMN_SELECT_TITEL RID_STR_MISC_START + 2
#define STR_WIZ_TYPE_SELECT_TITEL RID_STR_MISC_START + 3
#define STR_WIZ_PKEY_ALREADY_DEFINED RID_STR_MISC_START + 4
diff --git a/dbaccess/source/ui/misc/WCPage.cxx b/dbaccess/source/ui/misc/WCPage.cxx
index 7cfb2b9..f73c73c 100644
--- a/dbaccess/source/ui/misc/WCPage.cxx
+++ b/dbaccess/source/ui/misc/WCPage.cxx
@@ -24,7 +24,6 @@
#include <tools/debug.hxx>
#include "dbaccess_helpid.hrc"
#include "dbu_misc.hrc"
-#include "WizardPages.hrc"
#include <com/sun/star/sdbc/XResultSet.hpp>
#include <com/sun/star/sdb/CommandType.hpp>
#include <com/sun/star/sdbc/XRow.hpp>
diff --git a/dbaccess/source/ui/misc/WColumnSelect.cxx b/dbaccess/source/ui/misc/WColumnSelect.cxx
index 87f9928..0f9ce1c 100644
--- a/dbaccess/source/ui/misc/WColumnSelect.cxx
+++ b/dbaccess/source/ui/misc/WColumnSelect.cxx
@@ -20,7 +20,6 @@
#include "WColumnSelect.hxx"
#include "dbu_misc.hrc"
#include <osl/diagnose.h>
-#include "WizardPages.hrc"
#include "WCopyTable.hxx"
#include <com/sun/star/sdbcx/XDataDescriptorFactory.hpp>
#include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
diff --git a/dbaccess/source/ui/misc/WCopyTable.cxx b/dbaccess/source/ui/misc/WCopyTable.cxx
index c478b57..5edbe08 100644
--- a/dbaccess/source/ui/misc/WCopyTable.cxx
+++ b/dbaccess/source/ui/misc/WCopyTable.cxx
@@ -26,7 +26,6 @@
#include "WCopyTable.hxx"
#include "WCPage.hxx"
#include "WExtendPages.hxx"
-#include "WizardPages.hrc"
#include "WNameMatch.hxx"
#include "WTypeSelect.hxx"
@@ -639,6 +638,8 @@ OCopyTableWizard::OCopyTableWizard( Window* pParent, const OUString& _rDefaultNa
void OCopyTableWizard::construct()
{
+ SetSizePixel(Size(580, 350));
+
AddButton( m_pbHelp = new HelpButton(this, WB_TABSTOP) );
AddButton( m_pbCancel = new CancelButton(this, WB_TABSTOP) );
AddButton( m_pbPrev = new PushButton(this, WB_TABSTOP));
diff --git a/dbaccess/source/ui/misc/WExtendPages.cxx b/dbaccess/source/ui/misc/WExtendPages.cxx
index 7d1646f..9ec4d84 100644
--- a/dbaccess/source/ui/misc/WExtendPages.cxx
+++ b/dbaccess/source/ui/misc/WExtendPages.cxx
@@ -51,17 +51,6 @@ SvParser* OWizRTFExtend::createReader(sal_Int32 _nRows)
OWizNormalExtend::OWizNormalExtend(Window* pParent) : OWizTypeSelect( pParent )
{
EnableAuto(false);
- Size aflSize( m_flColumns.GetSizePixel() );
- Point aPos(m_flColumns.GetPosPixel());
-
- m_flColumns.SetPosSizePixel(aPos, aflSize );
-
- sal_Int32 nHeight = m_lbColumnNames.GetSizePixel().Height() +6;
- aPos = m_aTypeControl.GetPosPixel();
- Size aNewSize(m_aTypeControl.GetSizePixel().Width(),nHeight - aPos.Y()-6);
-
- aflSize = m_aTypeControl.GetSizePixel();
- m_aTypeControl.SetPosSizePixel(aPos,aNewSize);
}
SvParser* OWizNormalExtend::createReader(sal_Int32 /*_nRows*/)
diff --git a/dbaccess/source/ui/misc/WNameMatch.cxx b/dbaccess/source/ui/misc/WNameMatch.cxx
index b274ba2..fcdd0ae 100644
--- a/dbaccess/source/ui/misc/WNameMatch.cxx
+++ b/dbaccess/source/ui/misc/WNameMatch.cxx
@@ -23,7 +23,6 @@
#include "WCopyTable.hxx"
#include "dbaccess_helpid.hrc"
#include "dbu_misc.hrc"
-#include "WizardPages.hrc"
#include <vcl/scrbar.hxx>
#include <vcl/settings.hxx>
#include "svtools/treelistentry.hxx"
@@ -32,42 +31,45 @@
using namespace ::dbaui;
// OWizColumnSelect
OWizNameMatching::OWizNameMatching( Window* pParent)
- :OWizardPage( pParent, ModuleRes( TAB_WIZ_NAME_MATCHING ) )
- ,m_FT_TABLE_LEFT( this, ModuleRes( FT_TABLE_LEFT ) )
- ,m_FT_TABLE_RIGHT( this, ModuleRes( FT_TABLE_RIGHT ) )
- ,m_CTRL_LEFT( this, ModuleRes( CTRL_LEFT ) )
- ,m_CTRL_RIGHT( this, ModuleRes( CTRL_RIGHT ) )
- ,m_ibColumn_up( this, ModuleRes( IB_COLUMN_UP ) )
- ,m_ibColumn_down( this, ModuleRes( IB_COLUMN_DOWN ) )
- ,m_ibColumn_up_right( this, ModuleRes( IB_COLUMN_UP_RIGHT ) )
- ,m_ibColumn_down_right( this, ModuleRes( IB_COLUMN_DOWN_RIGHT ) )
- ,m_pbAll( this, ModuleRes( PB_ALL ) )
- ,m_pbNone( this, ModuleRes( PB_NONE ) )
-
+ :OWizardPage( pParent, "NameMatching", "dbaccess/ui/namematchingpage.ui" )
+ , m_aImgUp(ModuleRes(IMG_UP))
+ , m_aImgDown(ModuleRes(IMG_DOWN))
{
-
- m_ibColumn_up.SetClickHdl(LINK(this,OWizNameMatching,ButtonClickHdl));
- m_ibColumn_down.SetClickHdl(LINK(this,OWizNameMatching,ButtonClickHdl));
-
- m_ibColumn_up_right.SetClickHdl(LINK(this,OWizNameMatching,RightButtonClickHdl));
- m_ibColumn_down_right.SetClickHdl(LINK(this,OWizNameMatching,RightButtonClickHdl));
-
- m_pbAll.SetClickHdl(LINK(this,OWizNameMatching,AllNoneClickHdl));
- m_pbNone.SetClickHdl(LINK(this,OWizNameMatching,AllNoneClickHdl));
-
- m_CTRL_LEFT.SetSelectHdl(LINK(this,OWizNameMatching,TableListClickHdl));
- m_CTRL_RIGHT.SetSelectHdl(LINK(this,OWizNameMatching,TableListRightSelectHdl));
- m_CTRL_RIGHT.EnableCheckButton( NULL );
-
- m_CTRL_LEFT.SetStyle( m_CTRL_LEFT.GetStyle() | WB_FORCE_MAKEVISIBLE );
- m_CTRL_RIGHT.SetStyle( m_CTRL_RIGHT.GetStyle() | WB_FORCE_MAKEVISIBLE );
-
- m_sSourceText = m_FT_TABLE_LEFT.GetText();
+ get(m_pTABLE_LEFT, "leftlabel");
+ get(m_pTABLE_RIGHT, "rightlabel");
+ get(m_pCTRL_LEFT, "left");
+ get(m_pCTRL_RIGHT, "right");
+ get(m_pColumn_up, "up");
+ m_pColumn_up->SetModeImage(m_aImgUp);
+ get(m_pColumn_down, "down");
+ m_pColumn_down->SetModeImage(m_aImgDown);
+ get(m_pColumn_up_right, "up_right");
+ m_pColumn_up_right->SetModeImage(m_aImgUp);
+ get(m_pColumn_down_right, "down_right");
+ m_pColumn_down_right->SetModeImage(m_aImgDown);
+ get(m_pAll, "all");
+ get(m_pNone, "none");
+
+ m_pColumn_up->SetClickHdl(LINK(this,OWizNameMatching,ButtonClickHdl));
+ m_pColumn_down->SetClickHdl(LINK(this,OWizNameMatching,ButtonClickHdl));
+
+ m_pColumn_up_right->SetClickHdl(LINK(this,OWizNameMatching,RightButtonClickHdl));
+ m_pColumn_down_right->SetClickHdl(LINK(this,OWizNameMatching,RightButtonClickHdl));
+
+ m_pAll->SetClickHdl(LINK(this,OWizNameMatching,AllNoneClickHdl));
+ m_pNone->SetClickHdl(LINK(this,OWizNameMatching,AllNoneClickHdl));
+
+ m_pCTRL_LEFT->SetSelectHdl(LINK(this,OWizNameMatching,TableListClickHdl));
+ m_pCTRL_RIGHT->SetSelectHdl(LINK(this,OWizNameMatching,TableListRightSelectHdl));
+ m_pCTRL_RIGHT->EnableCheckButton( NULL );
+
+ m_pCTRL_LEFT->SetStyle( m_pCTRL_LEFT->GetStyle() | WB_FORCE_MAKEVISIBLE );
+ m_pCTRL_RIGHT->SetStyle( m_pCTRL_RIGHT->GetStyle() | WB_FORCE_MAKEVISIBLE );
+
+ m_sSourceText = m_pTABLE_LEFT->GetText();
m_sSourceText += "\n";
- m_sDestText = m_FT_TABLE_RIGHT.GetText();
+ m_sDestText = m_pTABLE_RIGHT->GetText();
m_sDestText += "\n";
-
- FreeResource();
}
OWizNameMatching::~OWizNameMatching()
@@ -80,10 +82,10 @@ void OWizNameMatching::Reset()
// the left tree contains bitmaps so i need to resize the right one
if(m_bFirstTime)
{
- m_CTRL_RIGHT.SetReadOnly(); // sets autoinc to readonly
- m_CTRL_RIGHT.SetEntryHeight(m_CTRL_LEFT.GetEntryHeight());
- m_CTRL_RIGHT.SetIndent(m_CTRL_LEFT.GetIndent());
- m_CTRL_RIGHT.SetSpaceBetweenEntries(m_CTRL_LEFT.GetSpaceBetweenEntries());
+ m_pCTRL_RIGHT->SetReadOnly(); // sets autoinc to readonly
+ m_pCTRL_RIGHT->SetEntryHeight(m_pCTRL_LEFT->GetEntryHeight());
+ m_pCTRL_RIGHT->SetIndent(m_pCTRL_LEFT->GetIndent());
+ m_pCTRL_RIGHT->SetSpaceBetweenEntries(m_pCTRL_LEFT->GetSpaceBetweenEntries());
m_bFirstTime = false;
}
@@ -97,24 +99,24 @@ void OWizNameMatching::ActivatePage( )
OUString aName = m_sSourceText;
aName += m_pParent->m_sSourceName;
- m_FT_TABLE_LEFT.SetText(aName);
+ m_pTABLE_LEFT->SetText(aName);
// set dest table name
aName = m_sDestText;
aName += m_pParent->m_sName;
- m_FT_TABLE_RIGHT.SetText(aName);
+ m_pTABLE_RIGHT->SetText(aName);
- m_CTRL_LEFT.FillListBox(m_pParent->getSrcVector());
- m_CTRL_RIGHT.FillListBox(m_pParent->getDestVector());
+ m_pCTRL_LEFT->FillListBox(m_pParent->getSrcVector());
+ m_pCTRL_RIGHT->FillListBox(m_pParent->getDestVector());
- m_ibColumn_up.Enable( m_CTRL_LEFT.GetEntryCount() > 1 );
- m_ibColumn_down.Enable( m_CTRL_LEFT.GetEntryCount() > 1 );
+ m_pColumn_up->Enable( m_pCTRL_LEFT->GetEntryCount() > 1 );
+ m_pColumn_down->Enable( m_pCTRL_LEFT->GetEntryCount() > 1 );
- m_ibColumn_up_right.Enable( m_CTRL_RIGHT.GetEntryCount() > 1 );
- m_ibColumn_down_right.Enable( m_CTRL_RIGHT.GetEntryCount() > 1 );
+ m_pColumn_up_right->Enable( m_pCTRL_RIGHT->GetEntryCount() > 1 );
+ m_pColumn_down_right->Enable( m_pCTRL_RIGHT->GetEntryCount() > 1 );
m_pParent->EnableButton(OCopyTableWizard::WIZARD_NEXT,false);
- m_CTRL_LEFT.GrabFocus();
+ m_pCTRL_LEFT->GrabFocus();
}
bool OWizNameMatching::LeavePage()
@@ -128,8 +130,8 @@ bool OWizNameMatching::LeavePage()
m_pParent->m_vColumnTypes.resize( rSrcColumns.size(), COLUMN_POSITION_NOT_FOUND );
sal_Int32 nParamPos = 0;
- SvTreeListEntry* pLeftEntry = m_CTRL_LEFT.GetModel()->First();
- SvTreeListEntry* pRightEntry = m_CTRL_RIGHT.GetModel()->First();
+ SvTreeListEntry* pLeftEntry = m_pCTRL_LEFT->GetModel()->First();
+ SvTreeListEntry* pRightEntry = m_pCTRL_RIGHT->GetModel()->First();
while(pLeftEntry && pRightEntry)
{
OFieldDescription* pSrcField = static_cast<OFieldDescription*>(pLeftEntry->GetUserData());
@@ -141,7 +143,7 @@ bool OWizNameMatching::LeavePage()
;
const sal_Int32 nPos = ::std::distance(rSrcColumns.begin(),aSrcIter);
- if(m_CTRL_LEFT.GetCheckButtonState(pLeftEntry) == SV_BUTTON_CHECKED)
+ if(m_pCTRL_LEFT->GetCheckButtonState(pLeftEntry) == SV_BUTTON_CHECKED)
{
OFieldDescription* pDestField = static_cast<OFieldDescription*>(pRightEntry->GetUserData());
OSL_ENSURE(pDestField,"OWizNameMatching: OColumn can not be null!");
@@ -174,8 +176,8 @@ bool OWizNameMatching::LeavePage()
m_pParent->m_vColumnPos[nPos].second = COLUMN_POSITION_NOT_FOUND;
}
- pLeftEntry = m_CTRL_LEFT.GetModel()->Next(pLeftEntry);
- pRightEntry = m_CTRL_RIGHT.GetModel()->Next(pRightEntry);
+ pLeftEntry = m_pCTRL_LEFT->GetModel()->Next(pLeftEntry);
+ pRightEntry = m_pCTRL_RIGHT->GetModel()->Next(pRightEntry);
}
return true;
@@ -185,28 +187,28 @@ OUString OWizNameMatching::GetTitle() const { return ModuleRes(STR_WIZ_NAME_MATC
IMPL_LINK( OWizNameMatching, ButtonClickHdl, Button *, pButton )
{
- SvTreeListEntry* pEntry = m_CTRL_LEFT.FirstSelected();
+ SvTreeListEntry* pEntry = m_pCTRL_LEFT->FirstSelected();
if ( pEntry )
{
- sal_Int32 nPos = m_CTRL_LEFT.GetModel()->GetAbsPos(pEntry);
- if(pButton == &m_ibColumn_up && nPos)
+ sal_Int32 nPos = m_pCTRL_LEFT->GetModel()->GetAbsPos(pEntry);
+ if(pButton == m_pColumn_up && nPos)
--nPos;
- else if(pButton == &m_ibColumn_down)
+ else if(pButton == m_pColumn_down)
nPos += 2;
- m_CTRL_LEFT.ModelIsMoving(pEntry,NULL,nPos);
- m_CTRL_LEFT.GetModel()->Move(pEntry,NULL,nPos);
- m_CTRL_LEFT.ModelHasMoved(pEntry);
+ m_pCTRL_LEFT->ModelIsMoving(pEntry,NULL,nPos);
+ m_pCTRL_LEFT->GetModel()->Move(pEntry,NULL,nPos);
+ m_pCTRL_LEFT->ModelHasMoved(pEntry);
- long nThumbPos = m_CTRL_LEFT.GetVScroll()->GetThumbPos();
- long nVisibleSize = m_CTRL_LEFT.GetVScroll()->GetVisibleSize();
+ long nThumbPos = m_pCTRL_LEFT->GetVScroll()->GetThumbPos();
+ long nVisibleSize = m_pCTRL_LEFT->GetVScroll()->GetVisibleSize();
- if(pButton == &m_ibColumn_down && (nThumbPos+nVisibleSize+1) < nPos)
+ if(pButton == m_pColumn_down && (nThumbPos+nVisibleSize+1) < nPos)
{
- m_CTRL_LEFT.GetVScroll()->DoScrollAction(SCROLL_LINEDOWN);
+ m_pCTRL_LEFT->GetVScroll()->DoScrollAction(SCROLL_LINEDOWN);
}
- TableListClickHdl(&m_CTRL_LEFT);
+ TableListClickHdl(m_pCTRL_LEFT);
}
return 0;
@@ -214,55 +216,55 @@ IMPL_LINK( OWizNameMatching, ButtonClickHdl, Button *, pButton )
IMPL_LINK( OWizNameMatching, RightButtonClickHdl, Button *, pButton )
{
- SvTreeListEntry* pEntry = m_CTRL_RIGHT.FirstSelected();
+ SvTreeListEntry* pEntry = m_pCTRL_RIGHT->FirstSelected();
if ( pEntry )
{
- sal_Int32 nPos = m_CTRL_RIGHT.GetModel()->GetAbsPos(pEntry);
- if(pButton == &m_ibColumn_up_right && nPos)
+ sal_Int32 nPos = m_pCTRL_RIGHT->GetModel()->GetAbsPos(pEntry);
+ if(pButton == m_pColumn_up_right && nPos)
--nPos;
- else if(pButton == &m_ibColumn_down_right)
+ else if(pButton == m_pColumn_down_right)
nPos += 2;
- m_CTRL_RIGHT.ModelIsMoving(pEntry,NULL,nPos);
- m_CTRL_RIGHT.GetModel()->Move(pEntry,NULL,nPos);
- m_CTRL_RIGHT.ModelHasMoved(pEntry);
- long nThumbPos = m_CTRL_RIGHT.GetVScroll()->GetThumbPos();
- long nVisibleSize = m_CTRL_RIGHT.GetVScroll()->GetVisibleSize();
+ m_pCTRL_RIGHT->ModelIsMoving(pEntry,NULL,nPos);
+ m_pCTRL_RIGHT->GetModel()->Move(pEntry,NULL,nPos);
+ m_pCTRL_RIGHT->ModelHasMoved(pEntry);
+ long nThumbPos = m_pCTRL_RIGHT->GetVScroll()->GetThumbPos();
+ long nVisibleSize = m_pCTRL_RIGHT->GetVScroll()->GetVisibleSize();
- if(pButton == &m_ibColumn_down_right && (nThumbPos+nVisibleSize+1) < nPos)
- m_CTRL_RIGHT.GetVScroll()->DoScrollAction(SCROLL_LINEDOWN);
- TableListRightSelectHdl(&m_CTRL_RIGHT);
+ if(pButton == m_pColumn_down_right && (nThumbPos+nVisibleSize+1) < nPos)
+ m_pCTRL_RIGHT->GetVScroll()->DoScrollAction(SCROLL_LINEDOWN);
+ TableListRightSelectHdl(m_pCTRL_RIGHT);
}
return 0;
}
IMPL_LINK( OWizNameMatching, TableListClickHdl, void*, /*NOTINTERESTEDIN*/ )
{
- SvTreeListEntry* pEntry = m_CTRL_LEFT.FirstSelected();
+ SvTreeListEntry* pEntry = m_pCTRL_LEFT->FirstSelected();
if(pEntry)
{
- sal_uLong nPos = m_CTRL_LEFT.GetModel()->GetAbsPos(pEntry);
- SvTreeListEntry* pOldEntry = m_CTRL_RIGHT.FirstSelected();
- if(pOldEntry && nPos != m_CTRL_RIGHT.GetModel()->GetAbsPos(pOldEntry))
+ sal_uLong nPos = m_pCTRL_LEFT->GetModel()->GetAbsPos(pEntry);
+ SvTreeListEntry* pOldEntry = m_pCTRL_RIGHT->FirstSelected();
+ if(pOldEntry && nPos != m_pCTRL_RIGHT->GetModel()->GetAbsPos(pOldEntry))
{
if(pOldEntry)
- m_CTRL_RIGHT.Select(pOldEntry,false);
- pOldEntry = m_CTRL_RIGHT.GetEntry(nPos);
+ m_pCTRL_RIGHT->Select(pOldEntry,false);
+ pOldEntry = m_pCTRL_RIGHT->GetEntry(nPos);
if(pOldEntry)
{
- sal_uLong nNewPos = m_CTRL_LEFT.GetModel()->GetAbsPos(m_CTRL_LEFT.GetFirstEntryInView());
+ sal_uLong nNewPos = m_pCTRL_LEFT->GetModel()->GetAbsPos(m_pCTRL_LEFT->GetFirstEntryInView());
if ( nNewPos - nPos == 1 )
--nNewPos;
- m_CTRL_RIGHT.MakeVisible(m_CTRL_RIGHT.GetEntry(nNewPos), true);
- m_CTRL_RIGHT.Select(pOldEntry,true);
+ m_pCTRL_RIGHT->MakeVisible(m_pCTRL_RIGHT->GetEntry(nNewPos), true);
+ m_pCTRL_RIGHT->Select(pOldEntry,true);
}
}
else if(!pOldEntry)
{
- pOldEntry = m_CTRL_RIGHT.GetEntry(nPos);
+ pOldEntry = m_pCTRL_RIGHT->GetEntry(nPos);
if(pOldEntry)
{
- m_CTRL_RIGHT.Select(pOldEntry,true);
+ m_pCTRL_RIGHT->Select(pOldEntry,true);
}
}
}
@@ -272,31 +274,31 @@ IMPL_LINK( OWizNameMatching, TableListClickHdl, void*, /*NOTINTERESTEDIN*/ )
IMPL_LINK( OWizNameMatching, TableListRightSelectHdl, void*, /*NOTINTERESTEDIN*/ )
{
- SvTreeListEntry* pEntry = m_CTRL_RIGHT.FirstSelected();
+ SvTreeListEntry* pEntry = m_pCTRL_RIGHT->FirstSelected();
if(pEntry)
{
- sal_uLong nPos = m_CTRL_RIGHT.GetModel()->GetAbsPos(pEntry);
- SvTreeListEntry* pOldEntry = m_CTRL_LEFT.FirstSelected();
- if(pOldEntry && nPos != m_CTRL_LEFT.GetModel()->GetAbsPos(pOldEntry))
+ sal_uLong nPos = m_pCTRL_RIGHT->GetModel()->GetAbsPos(pEntry);
+ SvTreeListEntry* pOldEntry = m_pCTRL_LEFT->FirstSelected();
+ if(pOldEntry && nPos != m_pCTRL_LEFT->GetModel()->GetAbsPos(pOldEntry))
{
if(pOldEntry)
- m_CTRL_LEFT.Select(pOldEntry,false);
- pOldEntry = m_CTRL_LEFT.GetEntry(nPos);
+ m_pCTRL_LEFT->Select(pOldEntry,false);
+ pOldEntry = m_pCTRL_LEFT->GetEntry(nPos);
if(pOldEntry)
{
- sal_uLong nNewPos = m_CTRL_RIGHT.GetModel()->GetAbsPos(m_CTRL_RIGHT.GetFirstEntryInView());
+ sal_uLong nNewPos = m_pCTRL_RIGHT->GetModel()->GetAbsPos(m_pCTRL_RIGHT->GetFirstEntryInView());
if ( nNewPos - nPos == 1 )
nNewPos--;
- m_CTRL_LEFT.MakeVisible(m_CTRL_LEFT.GetEntry(nNewPos), true);
- m_CTRL_LEFT.Select(pOldEntry,true);
+ m_pCTRL_LEFT->MakeVisible(m_pCTRL_LEFT->GetEntry(nNewPos), true);
+ m_pCTRL_LEFT->Select(pOldEntry,true);
}
}
else if(!pOldEntry)
{
- pOldEntry = m_CTRL_LEFT.GetEntry(nPos);
+ pOldEntry = m_pCTRL_LEFT->GetEntry(nPos);
if(pOldEntry)
{
- m_CTRL_LEFT.Select(pOldEntry,true);
+ m_pCTRL_LEFT->Select(pOldEntry,true);
}
}
}
@@ -306,12 +308,12 @@ IMPL_LINK( OWizNameMatching, TableListRightSelectHdl, void*, /*NOTINTERESTEDIN*/
IMPL_LINK( OWizNameMatching, AllNoneClickHdl, Button *, pButton )
{
- bool bAll = pButton == &m_pbAll;
- SvTreeListEntry* pEntry = m_CTRL_LEFT.First();
+ bool bAll = pButton == m_pAll;
+ SvTreeListEntry* pEntry = m_pCTRL_LEFT->First();
while(pEntry)
{
- m_CTRL_LEFT.SetCheckButtonState( pEntry, bAll ? SV_BUTTON_CHECKED : SV_BUTTON_UNCHECKED);
- pEntry = m_CTRL_LEFT.Next(pEntry);
+ m_pCTRL_LEFT->SetCheckButtonState( pEntry, bAll ? SV_BUTTON_CHECKED : SV_BUTTON_UNCHECKED);
+ pEntry = m_pCTRL_LEFT->Next(pEntry);
}
return 0;
@@ -342,16 +344,21 @@ void OColumnString::Paint(const Point& rPos, SvTreeListBox& rDev, const SvViewDa
rDev.DrawText( rPos, GetText() );
}
-OColumnTreeBox::OColumnTreeBox( Window* pParent, const ResId& rResId )
- : OMarkableTreeListBox(pParent, rResId)
+OColumnTreeBox::OColumnTreeBox( Window* pParent, WinBits nBits )
+ : OMarkableTreeListBox(pParent, nBits)
, m_bReadOnly(false)
{
SetDragDropMode( 0 );
EnableInplaceEditing( false );
- SetStyle(GetStyle() | WB_BORDER | WB_HASBUTTONS | WB_HSCROLL);
+ SetStyle(GetStyle() | WB_BORDER | WB_HASBUTTONS | WB_HSCROLL | nBits);
SetSelectionMode( SINGLE_SELECTION );
}
+extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeOColumnTreeBox(Window *pParent, VclBuilder::stringmap &)
+{
+ return new OColumnTreeBox(pParent);
+}
+
void OColumnTreeBox::InitEntry(SvTreeListEntry* pEntry, const OUString& rStr, const Image& rImg1, const Image& rImg2, SvLBoxButtonKind eButtonKind)
{
DBTreeListBox::InitEntry(pEntry, rStr, rImg1, rImg2, eButtonKind);
diff --git a/dbaccess/source/ui/misc/WTypeSelect.cxx b/dbaccess/source/ui/misc/WTypeSelect.cxx
index 018e797..a0bca4b 100644
--- a/dbaccess/source/ui/misc/WTypeSelect.cxx
+++ b/dbaccess/source/ui/misc/WTypeSelect.cxx
@@ -18,7 +18,6 @@
*/
#include "WTypeSelect.hxx"
-#include "WizardPages.hrc"
#include "dbustrings.hrc"
#include <tools/diagnose_ex.h>
#include <osl/diagnose.h>
@@ -31,6 +30,7 @@
#include "UITools.hxx"
#include "sqlmessage.hxx"
#include "FieldControls.hxx"
+#include <vcl/layout.hxx>
#include "dbaccess_slotid.hrc"
@@ -42,10 +42,11 @@ using namespace ::com::sun::star::util;
using namespace ::com::sun::star::sdbc;
// OWizTypeSelectControl
-OWizTypeSelectControl::OWizTypeSelectControl(Window* pParent, const ResId& rResId,OTableDesignHelpBar* pHelpBar)
- : OFieldDescControl(pParent,rResId,pHelpBar)
+OWizTypeSelectControl::OWizTypeSelectControl(Window* pParent, Window* pParentTabPage, OTableDesignHelpBar* pHelpBar)
+ : OFieldDescControl(pParent, pHelpBar)
{
+ m_pParentTabPage = pParentTabPage;
}
OWizTypeSelectControl::~OWizTypeSelectControl()
@@ -86,12 +87,12 @@ void OWizTypeSelectControl::CellModified(long nRow, sal_uInt16 nColId )
OSL_ENSURE(nRow == -1,"nRow muss -1 sein!");
(void)nRow;
- MultiListBox &aListBox = ((OWizTypeSelect*)GetParent())->m_lbColumnNames;
+ MultiListBox *pListBox = ((OWizTypeSelect*)m_pParentTabPage)->m_pColumnNames;
OFieldDescription* pCurFieldDescr = getCurrentFieldDescData();
- sal_uInt16 nPos = aListBox.GetEntryPos( OUString( pCurFieldDescr->GetName() ) );
- pCurFieldDescr = static_cast< OFieldDescription* >( aListBox.GetEntryData( nPos ) );
+ sal_uInt16 nPos = pListBox->GetEntryPos( OUString( pCurFieldDescr->GetName() ) );
+ pCurFieldDescr = static_cast< OFieldDescription* >( pListBox->GetEntryData( nPos ) );
OSL_ENSURE( pCurFieldDescr, "OWizTypeSelectControl::CellModified: Columnname/type not found in the listbox!" );
if ( !pCurFieldDescr )
return;
@@ -114,10 +115,10 @@ void OWizTypeSelectControl::CellModified(long nRow, sal_uInt16 nColId )
if ( getMetaData().is() && !getMetaData()->supportsMixedCaseQuotedIdentifiers() )
{
bCase = false;
- sal_uInt16 nCount = aListBox.GetEntryCount();
+ sal_uInt16 nCount = pListBox->GetEntryCount();
for (sal_uInt16 i=0 ; !bDoubleName && i < nCount ; ++i)
{
- OUString sEntry(aListBox.GetEntry(i));
+ OUString sEntry(pListBox->GetEntry(i));
bDoubleName = sNewName.equalsIgnoreAsciiCase(sEntry);
}
if ( !bDoubleName && pWiz->shouldCreatePrimaryKey() )
@@ -125,7 +126,7 @@ void OWizTypeSelectControl::CellModified(long nRow, sal_uInt16 nColId )
}
else
- bDoubleName = ((aListBox.GetEntryPos(OUString(sNewName)) != LISTBOX_ENTRY_NOTFOUND)
+ bDoubleName = ((pListBox->GetEntryPos(OUString(sNewName)) != LISTBOX_ENTRY_NOTFOUND)
|| ( pWiz->shouldCreatePrimaryKey()
&& pWiz->getPrimaryKeyName() == sNewName) );
@@ -136,13 +137,13 @@ void OWizTypeSelectControl::CellModified(long nRow, sal_uInt16 nColId )
pWiz->showError(strMessage);
pCurFieldDescr->SetName(sName);
DisplayData(pCurFieldDescr);
- static_cast<OWizTypeSelect*>(GetParent())->setDuplicateName(true);
+ static_cast<OWizTypeSelect*>(m_pParentTabPage)->setDuplicateName(true);
return;
}
OUString sOldName = pCurFieldDescr->GetName();
pCurFieldDescr->SetName(sNewName);
- static_cast<OWizTypeSelect*>(GetParent())->setDuplicateName(false);
+ static_cast<OWizTypeSelect*>(m_pParentTabPage)->setDuplicateName(false);
// now we change the name
OCopyTableWizard::TNameMapping::iterator aIter = pWiz->m_mNameMapping.begin();
@@ -158,9 +159,9 @@ void OWizTypeSelectControl::CellModified(long nRow, sal_uInt16 nColId )
}
}
- aListBox.RemoveEntry(nPos);
- aListBox.InsertEntry(pCurFieldDescr->GetName(),nPos);
- aListBox.SetEntryData(nPos,pCurFieldDescr);
+ pListBox->RemoveEntry(nPos);
+ pListBox->InsertEntry(pCurFieldDescr->GetName(),nPos);
+ pListBox->SetEntryData(nPos,pCurFieldDescr);
pWiz->replaceColumn(nPos,pCurFieldDescr,sOldName);
}
@@ -171,87 +172,90 @@ void OWizTypeSelectControl::CellModified(long nRow, sal_uInt16 nColId )
::com::sun::star::lang::Locale OWizTypeSelectControl::GetLocale() const
{
- return static_cast<OWizTypeSelect*>(GetParent())->m_pParent->GetLocale();
+ return static_cast<OWizTypeSelect*>(m_pParentTabPage)->m_pParent->GetLocale();
}
Reference< XNumberFormatter > OWizTypeSelectControl::GetFormatter() const
{
- return static_cast<OWizTypeSelect*>(GetParent())->m_pParent->GetFormatter();
+ return static_cast<OWizTypeSelect*>(m_pParentTabPage)->m_pParent->GetFormatter();
}
TOTypeInfoSP OWizTypeSelectControl::getTypeInfo(sal_Int32 _nPos)
{
- return static_cast<OWizTypeSelect*>(GetParent())->m_pParent->getDestTypeInfo(_nPos);
+ return static_cast<OWizTypeSelect*>(m_pParentTabPage)->m_pParent->getDestTypeInfo(_nPos);
}
const OTypeInfoMap* OWizTypeSelectControl::getTypeInfo() const
{
- return &static_cast<OWizTypeSelect*>(GetParent())->m_pParent->getDestTypeInfo();
+ return &static_cast<OWizTypeSelect*>(m_pParentTabPage)->m_pParent->getDestTypeInfo();
}
::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData> OWizTypeSelectControl::getMetaData()
{
- return ((OWizTypeSelect*)GetParent())->m_pParent->m_xDestConnection->getMetaData();
+ return ((OWizTypeSelect*)m_pParentTabPage)->m_pParent->m_xDestConnection->getMetaData();
}
::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> OWizTypeSelectControl::getConnection()
{
- return ((OWizTypeSelect*)GetParent())->m_pParent->m_xDestConnection;
+ return ((OWizTypeSelect*)m_pParentTabPage)->m_pParent->m_xDestConnection;
}
bool OWizTypeSelectControl::isAutoIncrementValueEnabled() const
{
- return ((OWizTypeSelect*)GetParent())->m_bAutoIncrementEnabled;
+ return ((OWizTypeSelect*)m_pParentTabPage)->m_bAutoIncrementEnabled;
}
OUString OWizTypeSelectControl::getAutoIncrementValue() const
{
- return ((OWizTypeSelect*)GetParent())->m_sAutoIncrementValue;
+ return ((OWizTypeSelect*)m_pParentTabPage)->m_sAutoIncrementValue;
}
#define IMG_PRIMARY_KEY 1
OWizTypeSelect::OWizTypeSelect( Window* pParent, SvStream* _pStream )
- :OWizardPage( pParent, ModuleRes( TAB_WIZ_TYPE_SELECT ))
- ,m_lbColumnNames( this, ModuleRes( LB_NEW_COLUMN_NAMES ) )
- ,m_flColumns( this, ModuleRes( FL_COLUMN_NAME ) )
- ,m_aTypeControl( this, ModuleRes( CONTROL_CONTAINER ))
- ,m_flAutoType( this, ModuleRes( FL_AUTO_TYPE ) )
- ,m_ftAuto( this, ModuleRes( FT_AUTO ) )
- ,m_etAuto( this, ModuleRes( ET_AUTO ) )
- ,m_pbAuto( this, ModuleRes( PB_AUTO ) )
+ :OWizardPage( pParent, "TypeSelect", "dbaccess/ui/typeselectpage.ui")
+ ,m_pTypeControl(new OWizTypeSelectControl(get<VclVBox>("control_container"), this) )
,m_pParserStream( _pStream )
,m_nDisplayRow(0)
,m_bAutoIncrementEnabled(false)
,m_bDuplicateName(false)
{
- m_lbColumnNames.SetSelectHdl(LINK(this,OWizTypeSelect,ColumnSelectHdl));
+ get(m_pColumnNames, "columnnames");
+ m_pColumnNames->SetParentTabPage(this);
+ get(m_pColumns, "columns");
+ get(m_pAutoType, "autotype");
+ get(m_pAutoFt, "autolabel");
+ get(m_pAutoEt, "auto");
+ get(m_pAutoPb, "autobutton");
+
+ m_pColumnNames->SetSelectHdl(LINK(this,OWizTypeSelect,ColumnSelectHdl));
ModuleRes aModuleRes(IMG_JOINS);
ImageList aImageList(aModuleRes);
m_imgPKey = aImageList.GetImage(IMG_PRIMARY_KEY);
- m_aTypeControl.Show();
- m_aTypeControl.Init();
- m_etAuto.SetText(OUString("10"));
- m_etAuto.SetDecimalDigits(0);
- m_pbAuto.SetClickHdl(LINK(this,OWizTypeSelect,ButtonClickHdl));
- m_lbColumnNames.EnableMultiSelection(true);
+
+ m_pTypeControl->Show();
+ m_pTypeControl->Init();
+
+ m_pAutoEt->SetText(OUString("10"));
+ m_pAutoEt->SetDecimalDigits(0);
+ m_pAutoPb->SetClickHdl(LINK(this,OWizTypeSelect,ButtonClickHdl));
+ m_pColumnNames->EnableMultiSelection(true);
try
{
- m_lbColumnNames.SetPKey( m_pParent->supportsPrimaryKey() );
+ m_pColumnNames->SetPKey( m_pParent->supportsPrimaryKey() );
::dbaui::fillAutoIncrementValue( m_pParent->m_xDestConnection, m_bAutoIncrementEnabled, m_sAutoIncrementValue );
}
catch(const Exception&)
{
DBG_UNHANDLED_EXCEPTION();
}
-
- FreeResource();
}
OWizTypeSelect::~OWizTypeSelect()
{
+ delete m_pTypeControl;
}
OUString OWizTypeSelect::GetTitle() const
@@ -259,19 +263,15 @@ OUString OWizTypeSelect::GetTitle() const
return ModuleRes(STR_WIZ_TYPE_SELECT_TITEL);
}
-void OWizTypeSelect::Resize()
-{
-}
-
IMPL_LINK( OWizTypeSelect, ColumnSelectHdl, MultiListBox *, /*pListBox*/ )
{
- OUString aColumnName( m_lbColumnNames.GetSelectEntry() );
+ OUString aColumnName( m_pColumnNames->GetSelectEntry() );
- OFieldDescription* pField = static_cast<OFieldDescription*>(m_lbColumnNames.GetEntryData(m_lbColumnNames.GetEntryPos(aColumnName)));
+ OFieldDescription* pField = static_cast<OFieldDescription*>(m_pColumnNames->GetEntryData(m_pColumnNames->GetEntryPos(aColumnName)));
if(pField)
- m_aTypeControl.DisplayData(pField);
+ m_pTypeControl->DisplayData(pField);
- m_aTypeControl.Enable(m_lbColumnNames.GetSelectEntryCount() == 1 );
+ m_pTypeControl->Enable(m_pColumnNames->GetSelectEntryCount() == 1 );
return 0;
}
@@ -279,9 +279,9 @@ void OWizTypeSelect::Reset()
{
// restore original state
- while(m_lbColumnNames.GetEntryCount())
- m_lbColumnNames.RemoveEntry(0);
- m_lbColumnNames.Clear();
+ while(m_pColumnNames->GetEntryCount())
+ m_pColumnNames->RemoveEntry(0);
+ m_pColumnNames->Clear();
sal_Int32 nBreakPos;
m_pParent->CheckColumns(nBreakPos);
@@ -292,10 +292,10 @@ void OWizTypeSelect::Reset()
{
sal_uInt16 nPos;
if((*aIter)->second->IsPrimaryKey())
- nPos = m_lbColumnNames.InsertEntry((*aIter)->first, m_imgPKey );
+ nPos = m_pColumnNames->InsertEntry((*aIter)->first, m_imgPKey );
else
- nPos = m_lbColumnNames.InsertEntry((*aIter)->first);
- m_lbColumnNames.SetEntryData(nPos,(*aIter)->second);
+ nPos = m_pColumnNames->InsertEntry((*aIter)->first);
+ m_pColumnNames->SetEntryData(nPos,(*aIter)->second);
}
m_bFirstTime = false;
}
@@ -306,20 +306,20 @@ void OWizTypeSelect::ActivatePage( )
Reset();
m_bFirstTime = bOldFirstTime;
- m_lbColumnNames.SelectEntryPos(static_cast<sal_uInt16>(m_nDisplayRow));
+ m_pColumnNames->SelectEntryPos(static_cast<sal_uInt16>(m_nDisplayRow));
m_nDisplayRow = 0;
- m_lbColumnNames.GetSelectHdl().Call(&m_lbColumnNames);
+ m_pColumnNames->GetSelectHdl().Call(m_pColumnNames);
}
bool OWizTypeSelect::LeavePage()
{
- OUString aColumnName( m_lbColumnNames.GetSelectEntry() );
+ OUString aColumnName( m_pColumnNames->GetSelectEntry() );
bool bDuplicateName = false;
- OFieldDescription* pField = static_cast<OFieldDescription*>(m_lbColumnNames.GetEntryData(m_lbColumnNames.GetEntryPos(aColumnName)));
+ OFieldDescription* pField = static_cast<OFieldDescription*>(m_pColumnNames->GetEntryData(m_pColumnNames->GetEntryPos(aColumnName)));
if ( pField )
{
- m_aTypeControl.SaveData(pField);
+ m_pTypeControl->SaveData(pField);
bDuplicateName = m_bDuplicateName;
}
return !bDuplicateName;
@@ -327,17 +327,17 @@ bool OWizTypeSelect::LeavePage()
void OWizTypeSelect::EnableAuto(bool bEnable)
{
- m_ftAuto.Show(bEnable);
- m_etAuto.Show(bEnable);
- m_pbAuto.Show(bEnable);
- m_flAutoType.Show(bEnable);
+ m_pAutoFt->Show(bEnable);
+ m_pAutoEt->Show(bEnable);
+ m_pAutoPb->Show(bEnable);
+ m_pAutoType->Show(bEnable);
}
IMPL_LINK( OWizTypeSelect, ButtonClickHdl, Button *, /*pButton*/ )
{
sal_Int32 nBreakPos;
m_pParent->CheckColumns(nBreakPos);
- fillColumnList(m_etAuto.GetText().toInt32());
+ fillColumnList(m_pAutoEt->GetText().toInt32());
ActivatePage();
@@ -364,7 +364,7 @@ void OWizTypeSelectList::setPrimaryKey(OFieldDescription* _pFieldDescr, sal_uInt
RemoveEntry(_nPos);
_pFieldDescr->SetPrimaryKey(_bSet);
if( _bSet )
- InsertEntry(sColumnName,((OWizTypeSelect*)GetParent())->m_imgPKey,_nPos);
+ InsertEntry(sColumnName,((OWizTypeSelect*)m_pParentTabPage)->m_imgPKey,_nPos);
else if( _pFieldDescr->getTypeInfo()->bNullable )
{
_pFieldDescr->SetControlDefault(Any());
@@ -373,6 +373,11 @@ void OWizTypeSelectList::setPrimaryKey(OFieldDescription* _pFieldDescr, sal_uInt
SetEntryData(_nPos,_pFieldDescr);
}
+extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeOWizTypeSelectList(Window *pParent, VclBuilder::stringmap &)
+{
+ return new OWizTypeSelectList(pParent);
+}
+
bool OWizTypeSelectList::PreNotify( NotifyEvent& rEvt )
{
bool nDone = false;
diff --git a/dbaccess/source/ui/misc/WizardPages.hrc b/dbaccess/source/ui/misc/WizardPages.hrc
deleted file mode 100644
index cf62039..0000000
--- a/dbaccess/source/ui/misc/WizardPages.hrc
+++ /dev/null
@@ -1,48 +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_WIZARD_PAGES_HRC
-#define DBAUI_WIZARD_PAGES_HRC
-
-#define LB_NEW_COLUMN_NAMES 2
-
-#define PB_AUTO 5
-#define IB_COLUMN_UP 12
-#define IB_COLUMN_DOWN 13
-#define IB_COLUMN_UP_RIGHT 14
-#define IB_COLUMN_DOWN_RIGHT 15
-#define PB_ALL 16
-#define PB_NONE 17
-
-#define ET_AUTO 1
-
-#define FT_AUTO 1
-#define FT_TABLE_LEFT 2
-#define FT_TABLE_RIGHT 3
-
-#define FL_COLUMN_NAME 2
-#define FL_AUTO_TYPE 3
-
-#define CONTROL_CONTAINER 1
-// controls
-#define CTRL_LEFT 1
-#define CTRL_RIGHT 2
-
-#endif // DBAUI_WIZARD_PAGES_HRC
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/dbaccess/source/ui/misc/WizardPages.src b/dbaccess/source/ui/misc/WizardPages.src
index de9634c..ed04106 100644
--- a/dbaccess/source/ui/misc/WizardPages.src
+++ b/dbaccess/source/ui/misc/WizardPages.src
@@ -17,19 +17,10 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include "WizardPages.hrc"
#include "dbu_misc.hrc"
#include "dbaccess_helpid.hrc"
#include "dbaccess_slotid.hrc"
-#define WINDOW_SIZE_X 276
-#define WINDOW_SIZE_Y 185
-
-#define WINDOW_BORDER_Y 14
-
-#define BUTTON_SIZE_X 50
-#define BUTTON_SIZE_Y 14
-
String STR_WIZ_COLUMN_SELECT_TITEL
{
Text [ en-US ] = "Apply columns";
@@ -65,76 +56,6 @@ String STR_WIZ_PB_OK
Text [ en-US ] = "C~reate";
};
-TabPage TAB_WIZ_TYPE_SELECT
-{
- SVLook = TRUE ;
- Size = MAP_APPFONT ( WINDOW_SIZE_X , WINDOW_SIZE_Y ) ;
-
- HelpId = HID_TAB_WIZ_TYPE_SELECT;
- Hide = TRUE;
-
- MultiListBox LB_NEW_COLUMN_NAMES
- {
- HelpID = "dbaccess:MultiListBox:TAB_WIZ_TYPE_SELECT:LB_NEW_COLUMN_NAMES";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 6 , 6 ) ;
- Size = MAP_APPFONT ( 87 , WINDOW_SIZE_Y - 12 ) ;
- TabStop = TRUE ;
- HScroll = TRUE;
- VScroll = TRUE;
- AutoHScroll = TRUE;
- SimpleMode = TRUE;
- };
-
- FixedLine FL_COLUMN_NAME
- {
- Pos = MAP_APPFONT ( 99 , 3 ) ;
- Size = MAP_APPFONT ( WINDOW_SIZE_X - 105, 8 ) ;
- Text [ en-US ] = "Column information" ;
- };
-
- TabPage CONTROL_CONTAINER
- {
- HelpID = "dbaccess:TabPage:CONTROL_CONTAINER";
- Pos = MAP_APPFONT ( 102 , WINDOW_BORDER_Y ) ;
- Size = MAP_APPFONT ( WINDOW_SIZE_X - 111, WINDOW_SIZE_Y - WINDOW_BORDER_Y - 67 );
- SVLook = TRUE;
- DialogControl = TRUE;
- };
-
- FixedLine FL_AUTO_TYPE
- {
- Pos = MAP_APPFONT ( 99 , WINDOW_SIZE_Y - WINDOW_BORDER_Y - 41 ) ;
- Size = MAP_APPFONT ( WINDOW_SIZE_X - 105, 8 ) ;
- Text [ en-US ] = "Automatic type recognition" ;
- };
-
- FixedText FT_AUTO
- {
- Pos = MAP_APPFONT ( 105 , WINDOW_SIZE_Y - WINDOW_BORDER_Y - 28 ) ;
- Size = MAP_APPFONT ( 40 , 8 ) ;
- Text [ en-US ] = "Lines (ma~x)";
- };
-
- NumericField ET_AUTO
- {
- HelpID = "dbaccess:NumericField:TAB_WIZ_TYPE_SELECT:ET_AUTO";
- Border = TRUE ;
- Pos = MAP_APPFONT ( 151 , WINDOW_SIZE_Y - WINDOW_BORDER_Y - 29) ;
- Size = MAP_APPFONT ( 40 , 12 ) ;
- TabStop = TRUE ;
- };
-
- PushButton PB_AUTO
- {
- HelpID = "dbaccess:PushButton:TAB_WIZ_TYPE_SELECT:PB_AUTO";
- Pos = MAP_APPFONT ( WINDOW_SIZE_X - 62 , WINDOW_SIZE_Y - WINDOW_BORDER_Y - 30 ) ;
- Size = MAP_APPFONT ( BUTTON_SIZE_X , BUTTON_SIZE_Y ) ;
- TabStop = TRUE ;
- Text = "~Auto" ;
- };
-};
-
Menu RID_SBA_RTF_PKEYPOPUP
{
ItemList =
@@ -149,147 +70,32 @@ Menu RID_SBA_RTF_PKEYPOPUP
};
};
-TabPage TAB_WIZ_NAME_MATCHING
-{
- HelpID = "dbaccess:TabPage:TAB_WIZ_NAME_MATCHING";
- SVLook = TRUE ;
- Size = MAP_APPFONT ( WINDOW_SIZE_X , WINDOW_SIZE_Y ) ;
-
- Hide = TRUE;
-
- FixedText FT_TABLE_LEFT
- {
- Pos = MAP_APPFONT ( 52 , 6 ) ;
- Size = MAP_APPFONT ( 75 , 20) ;
- Text [ en-US ] = "Source table: \n";
- };
-
- FixedText FT_TABLE_RIGHT
- {
- Pos = MAP_APPFONT ( 144, 6 ) ;
- Size = MAP_APPFONT ( 75 , 20) ;
- Text [ en-US ] = "Destination table: \n";
- };
- Control CTRL_LEFT
- {
- Border = TRUE;
- Pos = MAP_APPFONT ( 52, 28) ;
- Size = MAP_APPFONT ( 82 , WINDOW_SIZE_Y - 34 ) ;
- TabStop = TRUE;
- HelpId = HID_TAB_NAMEMATCHING_COLS_AVAIL;
- /*DialogControl = TRUE;*/
- };
-
- Control CTRL_RIGHT
- {
- Border = TRUE ;
- Pos = MAP_APPFONT ( 144, 28) ;
- Size = MAP_APPFONT ( 82 , WINDOW_SIZE_Y - 34 ) ;
- TabStop = TRUE;
- HelpId = HID_TAB_NAMEMATCHING_COLS_ASSIGN;
- /*DialogControl = TRUE;*/
- };
-
- ImageButton IB_COLUMN_UP
- {
- HelpID = "dbaccess:ImageButton:TAB_WIZ_NAME_MATCHING:IB_COLUMN_UP";
- Pos = MAP_APPFONT ( 19 , 45 ) ;
- Size = MAP_APPFONT ( 14 , 14 ) ;
- TabStop = TRUE;
- DefButton = TRUE;
- ButtonImage = Image
- {
- ImageBitmap = Bitmap
- {
- File = "sortup.png" ;
- };
- MaskColor = Color
- {
- Red = 0xFFFF ;
- Green = 0x0000 ;
- Blue = 0xFFFF ;
- };
- };
- };
- ImageButton IB_COLUMN_DOWN
- {
- HelpID = "dbaccess:ImageButton:TAB_WIZ_NAME_MATCHING:IB_COLUMN_DOWN";
- Pos = MAP_APPFONT ( 19 , 63 ) ;
- Size = MAP_APPFONT ( 14 , 14 ) ;
- TabStop = TRUE;
- ButtonImage = Image
- {
- ImageBitmap = Bitmap
- {
- File = "sortdown.png" ;
- };
- MaskColor = Color
- {
- Red = 0xFFFF ;
- Green = 0x0000 ;
- Blue = 0xFFFF ;
- };
- };
- };
- ImageButton IB_COLUMN_UP_RIGHT
+Image IMG_UP
+{
+ ImageBitmap = Bitmap
{
- HelpID = "dbaccess:ImageButton:TAB_WIZ_NAME_MATCHING:IB_COLUMN_UP_RIGHT";
- Pos = MAP_APPFONT ( WINDOW_SIZE_X - 33, 45 ) ;
- Size = MAP_APPFONT ( 14 , 14 ) ;
- TabStop = TRUE;
- DefButton = TRUE;
- ButtonImage = Image
- {
- ImageBitmap = Bitmap
- {
- File = "sortup.png" ;
- };
- MaskColor = Color
- {
- Red = 0xFFFF ;
- Green = 0x0000 ;
- Blue = 0xFFFF ;
- };
- };
+ File = "sortup.png" ;
};
- ImageButton IB_COLUMN_DOWN_RIGHT
+ MaskColor = Color
{
- HelpID = "dbaccess:ImageButton:TAB_WIZ_NAME_MATCHING:IB_COLUMN_DOWN_RIGHT";
- Pos = MAP_APPFONT ( WINDOW_SIZE_X - 33, 63) ;
- Size = MAP_APPFONT ( 14 , 14 ) ;
- TabStop = TRUE ;
- ButtonImage = Image
- {
- ImageBitmap = Bitmap
- {
- File = "sortdown.png" ;
- };
- MaskColor = Color
- {
- Red = 0xFFFF ;
- Green = 0x0000 ;
- Blue = 0xFFFF ;
- };
- };
+ Red = 0xFFFF ;
+ Green = 0x0000 ;
+ Blue = 0xFFFF ;
};
+};
- PushButton PB_ALL
+Image IMG_DOWN
+{
+ ImageBitmap = Bitmap
{
- HelpID = "dbaccess:PushButton:TAB_WIZ_NAME_MATCHING:PB_ALL";
- Pos = MAP_APPFONT ( 6, 83) ;
- Size = MAP_APPFONT ( 40 , 14 ) ;
- TabStop = TRUE ;
- Text [ en-US ] = "~All" ;
+ File = "sortdown.png" ;
};
-
- PushButton PB_NONE
+ MaskColor = Color
{
- HelpID = "dbaccess:PushButton:TAB_WIZ_NAME_MATCHING:PB_NONE";
- Pos = MAP_APPFONT ( 6, 103) ;
- Size = MAP_APPFONT ( 40 , 14 ) ;
- TabStop = TRUE ;
- Text [ en-US ] = "Non~e" ;
+ Red = 0xFFFF ;
+ Green = 0x0000 ;
+ Blue = 0xFFFF ;
};
};
diff --git a/dbaccess/uiconfig/ui/namematchingpage.ui b/dbaccess/uiconfig/ui/namematchingpage.ui
new file mode 100644
index 0000000..259511d
--- /dev/null
+++ b/dbaccess/uiconfig/ui/namematchingpage.ui
@@ -0,0 +1,226 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+ <!-- interface-requires gtk+ 3.0 -->
+ <object class="GtkBox" id="NameMatching">
+ <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="spacing">12</property>
+ <child>
+ <object class="GtkButtonBox" id="buttonbox1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
+ <property name="layout_style">center</property>
+ <child>
+ <object class="GtkButton" id="up">
+ <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="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="down">
+ <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="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="all">
+ <property name="label" translatable="yes">_All</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="hexpand">True</property>
+ <property name="use_action_appearance">False</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="none">
+ <property name="label" translatable="yes">Non_e</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="hexpand">True</property>
+ <property name="use_action_appearance">False</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <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="leftlabel">
+ <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">Source table: </property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="dbulo-OColumnTreeBox" id="left:border">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection" id="treeview-selection1"/>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="box2">
+ <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="rightlabel">
+ <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">Destination table: </property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="dbulo-OColumnTreeBox" id="right:border">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection" id="treeview-selection3"/>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButtonBox" id="buttonbox2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
+ <property name="layout_style">center</property>
+ <child>
+ <object class="GtkButton" id="up_right">
+ <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="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="down_right">
+ <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="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ </object>
+</interface>
diff --git a/dbaccess/uiconfig/ui/typeselectpage.ui b/dbaccess/uiconfig/ui/typeselectpage.ui
new file mode 100644
index 0000000..373c78e
--- /dev/null
+++ b/dbaccess/uiconfig/ui/typeselectpage.ui
@@ -0,0 +1,180 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+ <!-- interface-requires gtk+ 3.0 -->
+ <!-- interface-requires LibreOffice 1.0 -->
+ <object class="GtkBox" id="TypeSelect">
+ <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="spacing">12</property>
+ <child>
+ <object class="dbulo-OWizTypeSelectList" id="columnnames">
+ <property name="width_request">150</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="vexpand">True</property>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection" id="treeview-selection1"/>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <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="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="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="control_container">
+ <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>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="columns">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Column information</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>
+ <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="grid2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="autolabel">
+ <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">Lines (ma_x)</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">auto</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="GtkButton" id="autobutton">
+ <property name="label" translatable="yes">_Auto</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>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="auto">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="invisible_char">•</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>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="autotype">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Automatic type recognition</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>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+</interface>
diff --git a/extras/source/glade/libreoffice-catalog.xml.in b/extras/source/glade/libreoffice-catalog.xml.in
index 6f3eaf0..12ff8b4 100644
--- a/extras/source/glade/libreoffice-catalog.xml.in
+++ b/extras/source/glade/libreoffice-catalog.xml.in
@@ -741,6 +741,12 @@
<glade-widget-class title="DbaIndexList" name="dbulo-DbaIndexList"
generic-name="DbaIndexList" parent="GtkTreeView"
icon-name="widget-gtk-treeview"/>
+ <glade-widget-class title="ColumnTreeBox" name="dbulo-OColumnTreeBox"
+ generic-name="ColumnTreeBox" parent="GtkTreeView"
+ icon-name="widget-gtk-treeview"/>
+ <glade-widget-class title="TypeSelectList" name="dbulo-OWizTypeSelectList"
+ generic-name="TypeSelectList" parent="GtkTreeView"
+ icon-name="widget-gtk-treeview"/>
<glade-widget-class title="Icon Choice Control" name="cuilo-SvtIconChoiceCtrl"
generic-name="Icon Choice Control" parent="GtkIconView"
More information about the Libreoffice-commits
mailing list