[Libreoffice-commits] core.git: dbaccess/source dbaccess/uiconfig dbaccess/UIConfig_dbaccess.mk solenv/sanitizers

2021-02-16 Thread Caolán McNamara (via logerrit) 
 dbaccess/UIConfig_dbaccess.mk   |1 
 dbaccess/source/ui/inc/TableWindow.hxx  |1 
 dbaccess/source/ui/inc/TableWindowTitle.hxx |   18 --
 dbaccess/source/ui/querydesign/TableWindow.cxx  |   31 ++---
 dbaccess/source/ui/querydesign/TableWindowTitle.cxx |  122 ++--
 dbaccess/uiconfig/ui/tabletitle.ui  |   39 ++
 solenv/sanitizers/ui/dbaccess.suppr |1 
 7 files changed, 80 insertions(+), 133 deletions(-)

New commits:
commit 807317255a655372e3b602a80cec2989776804c5
Author: Caolán McNamara 
AuthorDate: Tue Feb 16 09:42:07 2021 +
Commit: Caolán McNamara 
CommitDate: Tue Feb 16 15:57:32 2021 +0100

weld OTableWindowTitle

Change-Id: I466b73b1135c1336e3c94432f220b52343fe00d8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110984
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/dbaccess/UIConfig_dbaccess.mk b/dbaccess/UIConfig_dbaccess.mk
index 1e655af2ec2a..c0e6a28f895f 100644
--- a/dbaccess/UIConfig_dbaccess.mk
+++ b/dbaccess/UIConfig_dbaccess.mk
@@ -81,6 +81,7 @@ $(eval $(call gb_UIConfig_add_uifiles,dbaccess, \
 dbaccess/uiconfig/ui/tablesfilterdialog \
 dbaccess/uiconfig/ui/tablesfilterpage \
 dbaccess/uiconfig/ui/tablesjoindialog \
+dbaccess/uiconfig/ui/tabletitle \
 dbaccess/uiconfig/ui/taskwindow \
 dbaccess/uiconfig/ui/textconnectionsettings \
 dbaccess/uiconfig/ui/textpage \
diff --git a/dbaccess/source/ui/inc/TableWindow.hxx 
b/dbaccess/source/ui/inc/TableWindow.hxx
index 9e616e9fc135..cb8a210f527a 100644
--- a/dbaccess/source/ui/inc/TableWindow.hxx
+++ b/dbaccess/source/ui/inc/TableWindow.hxx
@@ -25,6 +25,7 @@
 #include "TableWindowData.hxx"
 #include "TableWindowListBox.hxx"
 #include 
+#include 
 #include 
 
 #include 
diff --git a/dbaccess/source/ui/inc/TableWindowTitle.hxx 
b/dbaccess/source/ui/inc/TableWindowTitle.hxx
index d60f7389a4f8..04e612de58ad 100644
--- a/dbaccess/source/ui/inc/TableWindowTitle.hxx
+++ b/dbaccess/source/ui/inc/TableWindowTitle.hxx
@@ -18,30 +18,24 @@
  */
 #pragma once
 
-#include 
+#include 
 
 namespace dbaui
 {
 class OTableWindow;
-class OTableWindowTitle : public FixedText
+class OTableWindowTitle final : public InterimItemWindow
 {
 VclPtr m_pTabWin;
+std::unique_ptr m_xLabel;
 
-protected:
-virtual void Command(const CommandEvent& rEvt) override;
-virtual void MouseButtonDown( const MouseEvent& rEvt ) override;
-virtual void KeyInput( const KeyEvent& rEvt ) override;
-virtual void DataChanged( const DataChangedEvent& rDCEvt ) override;
+DECL_LINK(MousePressHdl, const MouseEvent&, bool);
 
 public:
 OTableWindowTitle( OTableWindow* pParent );
 virtual ~OTableWindowTitle() override;
 virtual void dispose() override;
-virtual void LoseFocus() override;
-virtual void GetFocus() override;
-virtual void RequestHelp( const HelpEvent& rHEvt ) override;
-// window override
-virtual void StateChanged( StateChangedType nStateChange ) override;
+
+weld::Label& GetLabel() { return *m_xLabel; }
 };
 }
 
diff --git a/dbaccess/source/ui/querydesign/TableWindow.cxx 
b/dbaccess/source/ui/querydesign/TableWindow.cxx
index 200c39ebe006..db0119ce89da 100644
--- a/dbaccess/source/ui/querydesign/TableWindow.cxx
+++ b/dbaccess/source/ui/querydesign/TableWindow.cxx
@@ -87,16 +87,15 @@ void Draw3DBorder(vcl::RenderContext& rRenderContext, const 
tools::Rectangle& rR
 }
 
 OTableWindow::OTableWindow( vcl::Window* pParent, const 
TTableWindowData::value_type& pTabWinData )
-  : ::comphelper::OContainerListener(m_aMutex)
-  ,Window( pParent, WB_3DLOOK|WB_MOVEABLE )
-  ,m_aTypeImage( VclPtr::Create(this) )
-  ,m_xTitle( VclPtr::Create(this) )
-  ,m_pData( pTabWinData )
-  ,m_nMoveCount(0)
-  ,m_nMoveIncrement(1)
-  ,m_nSizingFlags( SizingFlags::NONE )
+: ::comphelper::OContainerListener(m_aMutex)
+, Window( pParent, WB_3DLOOK|WB_MOVEABLE )
+, m_aTypeImage( VclPtr::Create(this) )
+, m_xTitle( VclPtr::Create(this) )
+, m_pData( pTabWinData )
+, m_nMoveCount(0)
+, m_nMoveIncrement(1)
+, m_nSizingFlags( SizingFlags::NONE )
 {
-
 // Set position and size
 if( GetData()->HasPosition() )
 SetPosPixel( GetData()->GetPosition() );
@@ -294,7 +293,9 @@ bool OTableWindow::Init()
 }
 
 // Set the title
-m_xTitle->SetText( m_pData->GetWinName() );
+weld::Label& rLabel = m_xTitle->GetLabel();
+rLabel.set_label(m_pData->GetWinName());
+rLabel.set_tooltip_text(GetComposedName());
 m_xTitle->Show();
 
 m_xListBox->Show();
@@ -459,10 +460,10 @@ void OTableWindow::Resize()
 
 void OTableWindow::SetBoldTitle( bool bBold )
 {
-vcl::Font aFont = m_xTitle->GetFont();
-aFont.SetWeight( bBold?WEIGHT_BOLD:WEIGHT_NORMAL );
-

[Libreoffice-commits] core.git: dbaccess/source dbaccess/uiconfig dbaccess/UIConfig_dbaccess.mk

2020-08-28 Thread Caolán McNamara (via logerrit) 
 dbaccess/UIConfig_dbaccess.mk|1 
 dbaccess/source/ui/app/AppDetailPageHelper.hxx   |4 
 dbaccess/source/ui/app/AppSwapWindow.hxx |2 
 dbaccess/source/ui/app/AppTitleWindow.hxx|2 
 dbaccess/source/ui/app/ChildWindow.cxx   |2 
 dbaccess/source/ui/control/ColumnControlWindow.cxx   |7 -
 dbaccess/source/ui/control/FieldDescControl.cxx  |   16 +-
 dbaccess/source/ui/inc/ChildWindow.hxx   |4 
 dbaccess/source/ui/inc/ColumnControlWindow.hxx   |1 
 dbaccess/source/ui/inc/FieldDescControl.hxx  |7 -
 dbaccess/source/ui/inc/TableDesignHelpBar.hxx|5 
 dbaccess/source/ui/inc/TableDesignView.hxx   |   32 ++---
 dbaccess/source/ui/tabledesign/TEditControl.cxx  |9 -
 dbaccess/source/ui/tabledesign/TEditControl.hxx  |5 
 dbaccess/source/ui/tabledesign/TableDesignView.cxx   |  119 +--
 dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx |   27 +---
 dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx |   10 -
 dbaccess/uiconfig/ui/appdetailwindow.ui  |3 
 dbaccess/uiconfig/ui/tableborderwindow.ui|   72 +++
 19 files changed, 175 insertions(+), 153 deletions(-)

New commits:
commit 3fc63a7463149685b04c676968a82bc00a48a9af
Author: Caolán McNamara 
AuthorDate: Fri Aug 28 10:29:55 2020 +0100
Commit: Caolán McNamara 
CommitDate: Fri Aug 28 20:15:45 2020 +0200

weld OTableBorderWindow

Change-Id: I8008d9ea1e1c5418c960ec9c80b55602a11f15f6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101552
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/dbaccess/UIConfig_dbaccess.mk b/dbaccess/UIConfig_dbaccess.mk
index 3dc9eeb90e08..1e655af2ec2a 100644
--- a/dbaccess/UIConfig_dbaccess.mk
+++ b/dbaccess/UIConfig_dbaccess.mk
@@ -74,6 +74,7 @@ $(eval $(call gb_UIConfig_add_uifiles,dbaccess, \
 dbaccess/uiconfig/ui/specialsettingspage \
 dbaccess/uiconfig/ui/sortdialog \
 dbaccess/uiconfig/ui/sqlexception \
+dbaccess/uiconfig/ui/tableborderwindow \
 dbaccess/uiconfig/ui/tabledesignrowmenu \
 dbaccess/uiconfig/ui/tabledesignsavemodifieddialog \
 dbaccess/uiconfig/ui/tablelistbox \
diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.hxx 
b/dbaccess/source/ui/app/AppDetailPageHelper.hxx
index f5cd662236cb..ecc5048163bb 100644
--- a/dbaccess/source/ui/app/AppDetailPageHelper.hxx
+++ b/dbaccess/source/ui/app/AppDetailPageHelper.hxx
@@ -26,13 +26,13 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
 #include 
 #include 
-#include "ChildWindow.hxx"
+#include 
+#include 
 #include "DocumentInfoPreview.hxx"
 
 namespace com::sun::star::awt   { class XWindow; }
diff --git a/dbaccess/source/ui/app/AppSwapWindow.hxx 
b/dbaccess/source/ui/app/AppSwapWindow.hxx
index fadfb6fb3ccc..9fcd3ba816af 100644
--- a/dbaccess/source/ui/app/AppSwapWindow.hxx
+++ b/dbaccess/source/ui/app/AppSwapWindow.hxx
@@ -22,7 +22,7 @@
 #include 
 #include "AppIconControl.hxx"
 #include 
-#include "ChildWindow.hxx"
+#include 
 
 class MnemonicGenerator;
 
diff --git a/dbaccess/source/ui/app/AppTitleWindow.hxx 
b/dbaccess/source/ui/app/AppTitleWindow.hxx
index 2c536bfd2a93..e83a2ecbc815 100644
--- a/dbaccess/source/ui/app/AppTitleWindow.hxx
+++ b/dbaccess/source/ui/app/AppTitleWindow.hxx
@@ -19,7 +19,7 @@
 #ifndef INCLUDED_DBACCESS_SOURCE_UI_APP_APPTITLEWINDOW_HXX
 #define INCLUDED_DBACCESS_SOURCE_UI_APP_APPTITLEWINDOW_HXX
 
-#include "ChildWindow.hxx"
+#include 
 
 namespace dbaui
 {
diff --git a/dbaccess/source/ui/app/ChildWindow.cxx 
b/dbaccess/source/ui/app/ChildWindow.cxx
index 879b5f84a387..a8091c8637a5 100644
--- a/dbaccess/source/ui/app/ChildWindow.cxx
+++ b/dbaccess/source/ui/app/ChildWindow.cxx
@@ -8,7 +8,7 @@
  */
 
 #include 
-#include "ChildWindow.hxx"
+#include 
 
 namespace dbaui
 {
diff --git a/dbaccess/source/ui/control/ColumnControlWindow.cxx 
b/dbaccess/source/ui/control/ColumnControlWindow.cxx
index 8f9186b01ccb..9b2fa25aa8d9 100644
--- a/dbaccess/source/ui/control/ColumnControlWindow.cxx
+++ b/dbaccess/source/ui/control/ColumnControlWindow.cxx
@@ -49,12 +49,7 @@ void OColumnControlTopLevel::dispose()
 
 void OColumnControlTopLevel::GetFocus()
 {
-m_xControl->GetFocus();
-}
-
-void OColumnControlTopLevel::LoseFocus()
-{
-m_xControl->LoseFocus();
+m_xControl->GrabFocus();
 }
 
 // OColumnControlWindow
diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx 
b/dbaccess/source/ui/control/FieldDescControl.cxx
index bb10fb787f9f..28f3c9662500 100644
--- a/dbaccess/source/ui/control/FieldDescControl.cxx
+++ b/dbaccess/source/ui/control/FieldDescControl.cxx
@@ -78,6 +78,7 @@ OFieldDescControl::OFieldDescControl(weld::Container* pPage, 
OTableDesignHelpBar
 , m_nEditWidth(50)
 , pActFieldDescr(nullptr)
 {
+m_pHelp->connect_focus_out(LINK(this, OFieldDescControl, HelpFocusOut));
 }

[Libreoffice-commits] core.git: dbaccess/source dbaccess/uiconfig dbaccess/UIConfig_dbaccess.mk include/sfx2 sfx2/source

2020-08-26 Thread Caolán McNamara (via logerrit) 
 dbaccess/UIConfig_dbaccess.mk |1 
 dbaccess/source/ui/app/AppIconControl.cxx |  174 --
 dbaccess/source/ui/app/AppIconControl.hxx |   42 --
 dbaccess/source/ui/app/AppSwapWindow.cxx  |   89 +
 dbaccess/source/ui/app/AppSwapWindow.hxx  |   20 +-
 dbaccess/source/ui/app/AppView.cxx|4 
 dbaccess/source/ui/inc/TableWindowListBox.hxx |2 
 dbaccess/uiconfig/ui/appswapwindow.ui |   59 
 include/sfx2/thumbnailview.hxx|   13 +
 sfx2/source/control/thumbnailview.cxx |   17 ++
 sfx2/source/control/thumbnailviewitem.cxx |   37 -
 11 files changed, 334 insertions(+), 124 deletions(-)

New commits:
commit fd2ea8e03510c6a99ec8be6228b7422f6c5b182b
Author: Caolán McNamara 
AuthorDate: Wed Aug 19 14:59:33 2020 +0100
Commit: Caolán McNamara 
CommitDate: Wed Aug 26 17:14:31 2020 +0200

weld OApplicationSwapWindow

Change-Id: I71d24494b5fe7dd2949876944ab9aff41330ad50
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101027
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/dbaccess/UIConfig_dbaccess.mk b/dbaccess/UIConfig_dbaccess.mk
index 40a06cd388a0..91dc44de9606 100644
--- a/dbaccess/UIConfig_dbaccess.mk
+++ b/dbaccess/UIConfig_dbaccess.mk
@@ -13,6 +13,7 @@ $(eval $(call gb_UIConfig_add_uifiles,dbaccess, \
 dbaccess/uiconfig/ui/admindialog \
 dbaccess/uiconfig/ui/advancedsettingsdialog \
 dbaccess/uiconfig/ui/applycolpage \
+dbaccess/uiconfig/ui/appswapwindow \
 dbaccess/uiconfig/ui/authentificationpage \
 dbaccess/uiconfig/ui/autocharsetpage \
 dbaccess/uiconfig/ui/choosedatasourcedialog \
diff --git a/dbaccess/source/ui/app/AppIconControl.cxx 
b/dbaccess/source/ui/app/AppIconControl.cxx
index 514580014f79..84edc6a27f15 100644
--- a/dbaccess/source/ui/app/AppIconControl.cxx
+++ b/dbaccess/source/ui/app/AppIconControl.cxx
@@ -21,18 +21,53 @@
 #include 
 #include 
 #include 
-#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
 #include 
 #include 
 
-using namespace ::dbaui;
-OApplicationIconControl::OApplicationIconControl(vcl::Window* _pParent)
-: SvtIconChoiceCtrl(_pParent,WB_ICON | WB_NOCOLUMNHEADER | 
WB_HIGHLIGHTFRAME | /*!WB_NOSELECTION |*/
-WB_TABSTOP | WB_CLIPCHILDREN | WB_NOVSCROLL | 
WB_SMART_ARRANGE | WB_NOHSCROLL | WB_CENTER)
-,DropTargetHelper(this)
-,m_pActionListener(nullptr)
+namespace dbaui
 {
 
+class OApplicationIconControlDropTarget final : public DropTargetHelper
+{
+private:
+OApplicationIconControl& m_rControl;
+
+public:
+OApplicationIconControlDropTarget(OApplicationIconControl& rControl)
+: DropTargetHelper(rControl.GetDrawingArea()->get_drop_target())
+, m_rControl(rControl)
+{
+}
+
+virtual sal_Int8 AcceptDrop(const AcceptDropEvent& rEvt) override
+{
+return m_rControl.AcceptDrop(rEvt);
+}
+
+virtual sal_Int8 ExecuteDrop(const ExecuteDropEvent& rEvt) override
+{
+return m_rControl.ExecuteDrop(rEvt);
+}
+};
+
+OApplicationIconControl::OApplicationIconControl(std::unique_ptr
 xScroll)
+: SfxThumbnailView(std::move(xScroll), nullptr)
+, m_pActionListener(nullptr)
+, m_nMaxWidth(0)
+, m_nMaxHeight(0)
+{
+mnVItemSpace = 6; // row spacing
+DrawMnemonics(true);
+}
+
+void OApplicationIconControl::Fill()
+{
 static const struct CategoryDescriptor
 {
 const char* pLabelResId;
@@ -44,63 +79,128 @@ 
OApplicationIconControl::OApplicationIconControl(vcl::Window* _pParent)
 { RID_STR_FORMS_CONTAINER,  E_FORM, BMP_FORMFOLDER_TREE_L   },
 { RID_STR_REPORTS_CONTAINER,E_REPORT,   BMP_REPORTFOLDER_TREE_L }
 };
+
 for (const CategoryDescriptor& aCategorie : aCategories)
 {
-SvxIconChoiceCtrlEntry* pEntry = InsertEntry(
-DBA_RES(aCategorie.pLabelResId) ,
-Image(StockImage::Yes, 
OUString::createFromAscii(aCategorie.aImageResId)));
-if ( pEntry )
-pEntry->SetUserData( new ElementType( aCategorie.eType ) );
+// E_TABLE is 0, but 0 means void so use id of enum + 1
+std::unique_ptr xItem(new ThumbnailViewItem(*this, 
aCategorie.eType + 1));
+xItem->mbBorder = false;
+xItem->maPreview1 = 
BitmapEx(OUString::createFromAscii(aCategorie.aImageResId));
+const Size& rSize = xItem->maPreview1.GetSizePixel();
+m_nMaxWidth = std::max(m_nMaxWidth, rSize.Width());
+m_nMaxHeight = std::max(m_nMaxHeight, rSize.Height());
+xItem->maTitle = DBA_RES(aCategorie.pLabelResId);
+m_nMaxWidth = std::max(m_nMaxWidth, 
GetTextWidth(xItem->maTitle));
+AppendItem(std::move(xItem));
 }
 
-SetChoiceWithCursor();
-SetSelectionMode(SelectionMode::Single);
+const int nMargin = 12;
+const int nWidthRequest = m_nMaxWidth + 2 * nMargin;
+

[Libreoffice-commits] core.git: dbaccess/source dbaccess/uiconfig dbaccess/UIConfig_dbaccess.mk

2020-08-19 Thread Caolán McNamara (via logerrit) 
 dbaccess/UIConfig_dbaccess.mk |1 
 dbaccess/source/ui/app/AppDetailView.cxx  |8 -
 dbaccess/source/ui/app/AppTitleWindow.cxx |   87 -
 dbaccess/source/ui/app/AppTitleWindow.hxx |   23 +--
 dbaccess/source/ui/app/AppView.cxx|4 
 dbaccess/uiconfig/ui/detailwindow.ui  |  198 --
 dbaccess/uiconfig/ui/taskwindow.ui|  158 +--
 dbaccess/uiconfig/ui/titlewindow.ui   |   92 +
 8 files changed, 336 insertions(+), 235 deletions(-)

New commits:
commit 62cef592924fd86856304e361af1b68f204b61e1
Author: Caolán McNamara 
AuthorDate: Wed Aug 19 11:23:12 2020 +0100
Commit: Caolán McNamara 
CommitDate: Wed Aug 19 21:26:08 2020 +0200

weld OTitleWindow

Change-Id: I10996b1d927e6e8db913d04d975fda69669a2988
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100984
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/dbaccess/UIConfig_dbaccess.mk b/dbaccess/UIConfig_dbaccess.mk
index eb693505740b..40a06cd388a0 100644
--- a/dbaccess/UIConfig_dbaccess.mk
+++ b/dbaccess/UIConfig_dbaccess.mk
@@ -80,6 +80,7 @@ $(eval $(call gb_UIConfig_add_uifiles,dbaccess, \
 dbaccess/uiconfig/ui/taskwindow \
 dbaccess/uiconfig/ui/textconnectionsettings \
 dbaccess/uiconfig/ui/textpage \
+dbaccess/uiconfig/ui/titlewindow \
 dbaccess/uiconfig/ui/typeselectpage \
 dbaccess/uiconfig/ui/useradmindialog \
 dbaccess/uiconfig/ui/useradminpage \
diff --git a/dbaccess/source/ui/app/AppDetailView.cxx 
b/dbaccess/source/ui/app/AppDetailView.cxx
index ab8c7632e54f..ed7a1c6c861c 100644
--- a/dbaccess/source/ui/app/AppDetailView.cxx
+++ b/dbaccess/source/ui/app/AppDetailView.cxx
@@ -228,17 +228,17 @@ void OTasksWindow::Clear()
 
 OApplicationDetailView::OApplicationDetailView(OAppBorderWindow& 
_rParent,PreviewMode _ePreviewMode) : OSplitterView(&_rParent )
 ,m_aHorzSplitter(VclPtr::Create(this))
-,m_aTasks(VclPtr::Create(this, STR_TASKS, WB_BORDER | 
WB_DIALOGCONTROL))
-,m_aContainer(VclPtr::Create(this, nullptr, WB_BORDER 
| WB_DIALOGCONTROL))
+,m_aTasks(VclPtr::Create(this, STR_TASKS))
+,m_aContainer(VclPtr::Create(this, nullptr))
 ,m_rBorderWin(_rParent)
 {
 ImplInitSettings();
 
-m_pControlHelper = 
VclPtr::Create(m_aContainer.get(),m_rBorderWin,_ePreviewMode);
+m_pControlHelper = 
VclPtr::Create(m_aContainer->getChildContainer(),m_rBorderWin,_ePreviewMode);
 m_pControlHelper->Show();
 m_aContainer->setChildWindow(m_pControlHelper);
 
-VclPtrInstance pTasks(m_aTasks.get(),this);
+VclPtrInstance pTasks(m_aTasks->getChildContainer(),this);
 pTasks->Show();
 
pTasks->Disable(m_rBorderWin.getView()->getCommandController().isDataSourceReadOnly());
 m_aTasks->setChildWindow(pTasks);
diff --git a/dbaccess/source/ui/app/AppTitleWindow.cxx 
b/dbaccess/source/ui/app/AppTitleWindow.cxx
index f3a8023312c2..3231d020e42a 100644
--- a/dbaccess/source/ui/app/AppTitleWindow.cxx
+++ b/dbaccess/source/ui/app/AppTitleWindow.cxx
@@ -17,34 +17,30 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "AppTitleWindow.hxx"
+#include 
 #include 
+#include 
 #include 
 #include 
 #include 
+#include "AppTitleWindow.hxx"
 
 namespace dbaui
 {
 
-OTitleWindow::OTitleWindow(vcl::Window* _pParent, const char* pTitleId, 
WinBits _nBits, bool _bShift)
-: Window(_pParent,_nBits | WB_DIALOGCONTROL)
-, m_aTitleFrame(VclPtr::Create(this))
-, m_aTitle(VclPtr::Create(m_aTitleFrame, WB_VCENTER))
-, m_pChild(nullptr)
-, m_bShift(_bShift)
+OTitleWindow::OTitleWindow(vcl::Window* pParent, const char* pTitleId)
+: InterimItemWindow(pParent, "dbaccess/ui/titlewindow.ui", "TitleWindow")
+, m_xTitleFrame(m_xBuilder->weld_container("titleparent"))
+, m_xTitle(m_xBuilder->weld_label("title"))
+, m_xChildContainer(m_xBuilder->weld_container("box"))
+, m_xChildParent(m_xChildContainer->CreateChildFrame())
+, m_xChild(nullptr)
 {
 setTitle(pTitleId);
-SetBorderStyle(WindowBorderStyle::MONO);
 ImplInitSettings();
 
-const StyleSettings& rStyle = 
Application::GetSettings().GetStyleSettings();
-vcl::Font aFont = m_aTitle->GetControlFont();
-aFont.SetWeight(WEIGHT_BOLD);
-m_aTitle->SetControlFont(aFont);
-m_aTitle->SetControlForeground(rStyle.GetLightColor());
-m_aTitleFrame->SetBackground(rStyle.GetShadowColor());
-m_aTitleFrame->Show();
-m_aTitle->Show();
+m_xTitleFrame->set_title_background();
+m_xTitle->set_label_type(weld::LabelType::Title);
 }
 
 OTitleWindow::~OTitleWindow()
@@ -54,64 +50,45 @@ OTitleWindow::~OTitleWindow()
 
 void OTitleWindow::dispose()
 {
-if ( m_pChild )
-{
-m_pChild->Hide();
-}
-m_pChild.disposeAndClear();
-m_aTitle.disposeAndClear();
-m_aTitleFrame.disposeAndClear();
-vcl::Window::dispose();
+if (m_xChild)
+m_xChild->Hide();
+m_xChild.disposeAndClear();

[Libreoffice-commits] core.git: dbaccess/source dbaccess/uiconfig dbaccess/UIConfig_dbaccess.mk

2020-08-12 Thread Caolán McNamara (via logerrit) 
 dbaccess/UIConfig_dbaccess.mk |1 
 dbaccess/source/ui/app/AppController.cxx  |   61 +-
 dbaccess/source/ui/app/AppController.hxx  |   19 
 dbaccess/source/ui/app/AppDetailPageHelper.cxx|  516 +-
 dbaccess/source/ui/app/AppDetailPageHelper.hxx|   46 -
 dbaccess/source/ui/app/AppDetailView.cxx  |   14 
 dbaccess/source/ui/app/AppDetailView.hxx  |   16 
 dbaccess/source/ui/app/AppView.cxx|   12 
 dbaccess/source/ui/app/AppView.hxx|   21 
 dbaccess/source/ui/browser/dsbrowserDnD.cxx   |6 
 dbaccess/source/ui/browser/unodatbr.cxx   |   16 
 dbaccess/source/ui/control/dbtreelistbox.cxx  |  372 
 dbaccess/source/ui/control/tabletree.cxx  |  516 +++---
 dbaccess/source/ui/dlg/adtabdlg.cxx   |4 
 dbaccess/source/ui/dlg/tablespage.cxx |2 
 dbaccess/source/ui/inc/callbacks.hxx  |   11 
 dbaccess/source/ui/inc/dbtreelistbox.hxx  |   84 ++
 dbaccess/source/ui/inc/tabletree.hxx  |  110 +--
 dbaccess/source/ui/inc/unodatbr.hxx   |4 
 dbaccess/source/ui/querydesign/QTableWindow.cxx   |1 
 dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx |1 
 dbaccess/source/ui/querydesign/TableWindow.cxx|2 
 dbaccess/uiconfig/ui/dbtreelist.ui|   94 +++
 23 files changed, 1254 insertions(+), 675 deletions(-)

New commits:
commit 46c34d5abcc3fb709de4c3a6a62649f1fe41ec9c
Author: Caolán McNamara 
AuthorDate: Fri Aug 7 14:33:07 2020 +0100
Commit: Caolán McNamara 
CommitDate: Wed Aug 12 20:21:10 2020 +0200

weld DBTreeListBox

Change-Id: I4b7369a496339b9bbab0c885c7360a5d7818a62e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100329
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/dbaccess/UIConfig_dbaccess.mk b/dbaccess/UIConfig_dbaccess.mk
index feaa35c10708..8a4229e02f38 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/copytablepage \
 dbaccess/uiconfig/ui/dbaseindexdialog \
 dbaccess/uiconfig/ui/dbasepage \
+dbaccess/uiconfig/ui/dbtreelist \
 dbaccess/uiconfig/ui/dbwizconnectionpage \
 dbaccess/uiconfig/ui/dbwizmysqlintropage \
 dbaccess/uiconfig/ui/dbwizmysqlnativepage \
diff --git a/dbaccess/source/ui/app/AppController.cxx 
b/dbaccess/source/ui/app/AppController.cxx
index 958d5d9c7b4f..67bd857b60d4 100644
--- a/dbaccess/source/ui/app/AppController.cxx
+++ b/dbaccess/source/ui/app/AppController.cxx
@@ -97,6 +97,7 @@
 #include 
 #include 
 #include 
+#include 
 #include "AppDetailView.hxx"
 #include 
 #include 
@@ -1683,15 +1684,23 @@ bool 
OApplicationController::onContainerSelect(ElementType _eType)
 return true;
 }
 
-bool OApplicationController::onEntryDoubleClick( SvTreeListBox const & _rTree )
+bool OApplicationController::onEntryDoubleClick(const weld::TreeView& 
rTreeView)
 {
-if ( getContainer() && getContainer()->isLeaf( _rTree.GetHdlEntry() ) )
+OApplicationView* pContainer = getContainer();
+if (!pContainer)
+return false;   // not handled
+
+std::unique_ptr xHdlEntry = rTreeView.make_iterator();
+if (!rTreeView.get_cursor(xHdlEntry.get()))
+return false;
+
+if (pContainer->isLeaf(rTreeView, *xHdlEntry))
 {
 try
 {
 // opens a new frame with either the table or the query or report 
or form or view
 openElementWithArguments(
-getContainer()->getQualifiedName( _rTree.GetHdlEntry() ),
+getContainer()->getQualifiedName(xHdlEntry.get()),
 getContainer()->getElementType(),
 E_OPEN_NORMAL,
 0,
@@ -1703,6 +1712,7 @@ bool OApplicationController::onEntryDoubleClick( 
SvTreeListBox const & _rTree )
 DBG_UNHANDLED_EXCEPTION("dbaccess");
 }
 }
+
 return false;   // not handled
 }
 
@@ -2237,7 +2247,7 @@ void OApplicationController::onDeleteEntry()
 executeChecked(nId,Sequence());
 }
 
-OUString OApplicationController::getContextMenuResourceName( Control& 
/*_rControl*/ ) const
+OUString OApplicationController::getContextMenuResourceName() const
 {
 return "edit";
 }
@@ -2264,6 +2274,11 @@ bool OApplicationController::requestQuickHelp( const 
SvTreeListEntry* /*_pEntry*
 return false;
 }
 
+bool OApplicationController::requestQuickHelp(const void* /*pUserData*/, 
OUString& /*rText*/) const
+{
+return false;
+}
+
 bool OApplicationController::requestDrag(  const Point& /*_rPosPixel*/ )
 {
 rtl::Reference pTransfer;
@@ -2288,6 +2303,32 @@ bool OApplicationController::requestDrag(  const Point& 
/*_rPosPixel*/ )
 return pTransfer.is();
 }
 
+bool

[Libreoffice-commits] core.git: dbaccess/source dbaccess/uiconfig dbaccess/UIConfig_dbaccess.mk

2020-08-09 Thread Caolán McNamara (via logerrit) 
 dbaccess/UIConfig_dbaccess.mk|1 
 dbaccess/source/ui/app/AppDetailView.cxx |  313 +--
 dbaccess/source/ui/app/AppDetailView.hxx |   43 +---
 dbaccess/uiconfig/ui/creationlistbox.ui  |   71 +++
 4 files changed, 146 insertions(+), 282 deletions(-)

New commits:
commit 7614efb59d948ca07c16e32523831b81922ac8f9
Author: Caolán McNamara 
AuthorDate: Thu Aug 6 12:18:43 2020 +0100
Commit: Caolán McNamara 
CommitDate: Sun Aug 9 20:18:47 2020 +0200

weld OCreationList

Change-Id: Ia234233cd44b91518c22e125fef4180068b07be4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100255
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/dbaccess/UIConfig_dbaccess.mk b/dbaccess/UIConfig_dbaccess.mk
index 74ba080879d8..2a0770c184c9 100644
--- a/dbaccess/UIConfig_dbaccess.mk
+++ b/dbaccess/UIConfig_dbaccess.mk
@@ -21,6 +21,7 @@ $(eval $(call gb_UIConfig_add_uifiles,dbaccess, \
 dbaccess/uiconfig/ui/colwidthdialog \
 dbaccess/uiconfig/ui/connectionpage \
 dbaccess/uiconfig/ui/copytablepage \
+dbaccess/uiconfig/ui/creationlistbox \
 dbaccess/uiconfig/ui/dbaseindexdialog \
 dbaccess/uiconfig/ui/dbasepage \
 dbaccess/uiconfig/ui/dbwizconnectionpage \
diff --git a/dbaccess/source/ui/app/AppDetailView.cxx 
b/dbaccess/source/ui/app/AppDetailView.cxx
index 469c0c113050..a052f5c556bb 100644
--- a/dbaccess/source/ui/app/AppDetailView.cxx
+++ b/dbaccess/source/ui/app/AppDetailView.cxx
@@ -56,8 +56,6 @@ using namespace ::com::sun::star::beans;
 using ::com::sun::star::util::URL;
 using ::com::sun::star::sdb::application::NamedDatabaseObject;
 
-#define SPACEBETWEENENTRIES 4
-
 TaskEntry::TaskEntry( const char* _pAsciiUNOCommand, const char* _pHelpID, 
const char* pTitleResourceID )
 :sUNOCommand( OUString::createFromAscii( _pAsciiUNOCommand ) )
 ,pHelpID( _pHelpID )
@@ -66,269 +64,88 @@ TaskEntry::TaskEntry( const char* _pAsciiUNOCommand, const 
char* _pHelpID, const
 }
 
 OCreationList::OCreationList( OTasksWindow& _rParent )
-:SvTreeListBox( &_rParent, WB_TABSTOP | WB_HASBUTTONSATROOT | 
WB_HASBUTTONS )
-,m_rTaskWindow( _rParent )
-,m_pMouseDownEntry( nullptr )
-,m_pLastActiveEntry( nullptr )
-{
-SetSpaceBetweenEntries(SPACEBETWEENENTRIES);
-SetSelectionMode( SelectionMode::NONE );
-SetNoAutoCurEntry( true );
-SetNodeDefaultImages( );
-}
-
-void OCreationList::Paint(vcl::RenderContext& rRenderContext, const 
tools::Rectangle& _rRect )
-{
-SetBackground();
-
-if (m_pMouseDownEntry)
-m_aOriginalFont = rRenderContext.GetFont();
-
-m_aOriginalBackgroundColor = rRenderContext.GetBackground().GetColor();
-SvTreeListBox::Paint(rRenderContext, _rRect);
-rRenderContext.SetBackground(m_aOriginalBackgroundColor);
-
-if (m_pMouseDownEntry)
-rRenderContext.SetFont(m_aOriginalFont);
-}
-
-void OCreationList::PreparePaint(vcl::RenderContext& rRenderContext, 
SvTreeListEntry& rEntry)
-{
-Wallpaper aEntryBackground(m_aOriginalBackgroundColor);
-
-if ( == GetCurEntry())
-{
-// draw a selection background
-bool bIsMouseDownEntry = (  == m_pMouseDownEntry );
-vcl::RenderTools::DrawSelectionBackground(rRenderContext, *this, 
GetBoundingRect(),
-  bIsMouseDownEntry ? 1 : 2, 
false, true, false );
-
-if (bIsMouseDownEntry)
-{
-vcl::Font aFont(rRenderContext.GetFont());
-
aFont.SetColor(rRenderContext.GetSettings().GetStyleSettings().GetHighlightTextColor());
-rRenderContext.SetFont(aFont);
-}
-
-// and temporary set a transparent background, for all the other
-// paint operations the SvTreeListBox is going to do
-aEntryBackground = Wallpaper();
-}
-
-rRenderContext.SetBackground(aEntryBackground);
-rEntry.SetBackColor(aEntryBackground.GetColor());
-}
-
-tools::Rectangle OCreationList::GetFocusRect(const SvTreeListEntry* _pEntry, 
long _nLine)
-{
-tools::Rectangle aRect = SvTreeListBox::GetFocusRect( _pEntry, _nLine );
-aRect.SetLeft( 0 );
-
-// try to let the focus rect start before the bitmap item - this looks 
better
-const SvLBoxItem* pBitmapItem = 
_pEntry->GetFirstItem(SvLBoxItemType::ContextBmp);
-SvLBoxTab* pTab = pBitmapItem ? GetTab( _pEntry, pBitmapItem ) : nullptr;
-SvViewDataItem* pItemData = pBitmapItem ? GetViewDataItem( _pEntry, 
pBitmapItem ) : nullptr;
-OSL_ENSURE( pTab && pItemData, "OCreationList::GetFocusRect: could not 
find the first bitmap item!" );
-if ( pTab && pItemData )
-aRect.SetLeft( pTab->GetPos() - pItemData->mnWidth / 2 );
-
-// inflate the rectangle a little bit - looks better, too
-aRect.SetLeft( std::max< long >( 0, aRect.Left() - 2 ) );
-aRect.SetRight( std::min< long >( GetOutputSizePixel().Width() - 1, 
aRect.Right() + 2 ) );
-
-return aRect;
-}
-
-void OCreationList::StartDrag(

[Libreoffice-commits] core.git: dbaccess/source dbaccess/uiconfig dbaccess/UIConfig_dbaccess.mk

2020-08-04 Thread Caolán McNamara (via logerrit) 
 dbaccess/UIConfig_dbaccess.mk   |1 
 dbaccess/source/ui/inc/JoinExchange.hxx |8 
 dbaccess/source/ui/inc/TableWindow.hxx  |2 
 dbaccess/source/ui/inc/TableWindowListBox.hxx   |   67 +++-
 dbaccess/source/ui/querydesign/ConnectionLine.cxx   |   31 +-
 dbaccess/source/ui/querydesign/JoinExchange.cxx |   22 -
 dbaccess/source/ui/querydesign/JoinTableView.cxx|   36 +-
 dbaccess/source/ui/querydesign/QTableWindow.cxx |   26 -
 dbaccess/source/ui/querydesign/QTableWindow.hxx |2 
 dbaccess/source/ui/querydesign/QueryTableView.cxx   |   10 
 dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx   |7 
 dbaccess/source/ui/querydesign/TableWindow.cxx  |   84 +++--
 dbaccess/source/ui/querydesign/TableWindowAccess.cxx|1 
 dbaccess/source/ui/querydesign/TableWindowListBox.cxx   |  228 
 dbaccess/source/ui/querydesign/TableWindowTitle.cxx |3 
 dbaccess/source/ui/relationdesign/RelationTableView.cxx |6 
 dbaccess/uiconfig/ui/tablelistbox.ui|   71 
 17 files changed, 309 insertions(+), 296 deletions(-)

New commits:
commit 67e5f16e53a05587c4f36518a56e931f4708e16b
Author: Caolán McNamara 
AuthorDate: Sun Aug 2 15:05:27 2020 +0100
Commit: Caolán McNamara 
CommitDate: Tue Aug 4 21:40:44 2020 +0200

weld OTableWindowListBox

Change-Id: Iae1d2da93fd150d2a333a55bd5b3c06aad0a308f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100030
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/dbaccess/UIConfig_dbaccess.mk b/dbaccess/UIConfig_dbaccess.mk
index d2d30dd9b7fd..74ba080879d8 100644
--- a/dbaccess/UIConfig_dbaccess.mk
+++ b/dbaccess/UIConfig_dbaccess.mk
@@ -70,6 +70,7 @@ $(eval $(call gb_UIConfig_add_uifiles,dbaccess, \
 dbaccess/uiconfig/ui/sqlexception \
 dbaccess/uiconfig/ui/tabledesignrowmenu \
 dbaccess/uiconfig/ui/tabledesignsavemodifieddialog \
+dbaccess/uiconfig/ui/tablelistbox \
 dbaccess/uiconfig/ui/tablesfilterdialog \
 dbaccess/uiconfig/ui/tablesfilterpage \
 dbaccess/uiconfig/ui/tablesjoindialog \
diff --git a/dbaccess/source/ui/inc/JoinExchange.hxx 
b/dbaccess/source/ui/inc/JoinExchange.hxx
index a1a73595ae5c..2412c64c365f 100644
--- a/dbaccess/source/ui/inc/JoinExchange.hxx
+++ b/dbaccess/source/ui/inc/JoinExchange.hxx
@@ -30,7 +30,7 @@ namespace dbaui
 // OJoinExchObj: Additional data to create Joins in the JoinShell
 
 typedef ::cppu::ImplHelper1< css::lang::XUnoTunnel > OJoinExchObj_Base;
-class OJoinExchObj final : public TransferableHelper, public 
OJoinExchObj_Base
+class OJoinExchObj final : public TransferDataContainer, public 
OJoinExchObj_Base
 {
 boolm_bFirstEntry;
 
@@ -40,8 +40,8 @@ namespace dbaui
 virtual ~OJoinExchObj() override;
 
 public:
-OJoinExchObj(const OJoinExchangeData& jxdSource, bool _bFirstEntry);
-
+OJoinExchObj();
+void setDescriptors(const OJoinExchangeData& jxdSource, bool 
_bFirstEntry);
 
 // XInterface
 virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& 
aType ) override;
@@ -61,8 +61,6 @@ namespace dbaui
 virtual voidAddSupportedFormats() override;
 virtual bool GetData( const css::datatransfer::DataFlavor& rFlavor, 
const OUString& rDestDoc ) override;
 virtual voidDragFinished( sal_Int8 nDropAction ) 
override;
-
-using TransferableHelper::StartDrag;
 };
 }
 #endif
diff --git a/dbaccess/source/ui/inc/TableWindow.hxx 
b/dbaccess/source/ui/inc/TableWindow.hxx
index e356a5a265f7..83baf38e53fd 100644
--- a/dbaccess/source/ui/inc/TableWindow.hxx
+++ b/dbaccess/source/ui/inc/TableWindow.hxx
@@ -90,7 +90,7 @@ namespace dbaui
 void FillListBox();
 // called at EACH Init
 
-virtual void OnEntryDoubleClicked(SvTreeListEntry* /*pEntry*/) { }
+virtual void OnEntryDoubleClicked(weld::TreeIter& /*rEntry*/) { }
 // called from the DoubleClickHdl of the ListBox
 
 /** HandleKeyInput tries to handle the KeyEvent. Movement or deletion
diff --git a/dbaccess/source/ui/inc/TableWindowListBox.hxx 
b/dbaccess/source/ui/inc/TableWindowListBox.hxx
index 249a1dedf330..5ca01098266b 100644
--- a/dbaccess/source/ui/inc/TableWindowListBox.hxx
+++ b/dbaccess/source/ui/inc/TableWindowListBox.hxx
@@ -19,8 +19,8 @@
 #ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_TABLEWINDOWLISTBOX_HXX
 #define INCLUDED_DBACCESS_SOURCE_UI_INC_TABLEWINDOWLISTBOX_HXX
 
-#include 
-#include 
+#include 
+#include 
 #include "callbacks.hxx"
 
 struct AcceptDropEvent;
@@ -32,67 +32,88 @@ namespace dbaui
 {
 public:
 VclPtrpListBox;   // the ListBox inside 
the same (you can get the TabWin and the WinName out of it)
-SvTreeListEntry*pEntry; // the entry, which was 
dragged or to which was

[Libreoffice-commits] core.git: dbaccess/source dbaccess/uiconfig dbaccess/UIConfig_dbaccess.mk

2020-07-24 Thread Caolán McNamara (via logerrit) 
 dbaccess/UIConfig_dbaccess.mk|1 
 dbaccess/source/ui/control/ColumnControlWindow.cxx   |   29 +-
 dbaccess/source/ui/control/FieldDescControl.cxx  |   89 ++-
 dbaccess/source/ui/inc/ColumnControlWindow.hxx   |   20 +++-
 dbaccess/source/ui/inc/FieldDescControl.hxx  |   28 ++---
 dbaccess/source/ui/inc/WTypeSelect.hxx   |2 
 dbaccess/source/ui/misc/WTypeSelect.cxx  |7 -
 dbaccess/source/ui/tabledesign/TEditControl.cxx  |1 
 dbaccess/source/ui/tabledesign/TableFieldControl.cxx |5 -
 dbaccess/source/ui/tabledesign/TableFieldControl.hxx |4 
 dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx |4 
 dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx |2 
 dbaccess/source/ui/uno/ColumnPeer.cxx|   24 ++---
 dbaccess/uiconfig/ui/colcontrolbox.ui|   15 +++
 14 files changed, 110 insertions(+), 121 deletions(-)

New commits:
commit 3e5abe71c0f00969425da347e272b49c2624f40b
Author: Caolán McNamara 
AuthorDate: Fri Jul 24 19:38:22 2020 +0100
Commit: Caolán McNamara 
CommitDate: Fri Jul 24 22:42:51 2020 +0200

drop intermediate TabPage

OColumnControlWindow can be seen used in "use wizard to create table" from 
base

Change-Id: Ib59b487c6711321550c1b516986ef20df402b171
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99414
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/dbaccess/UIConfig_dbaccess.mk b/dbaccess/UIConfig_dbaccess.mk
index f1647bb44b08..d2d30dd9b7fd 100644
--- a/dbaccess/UIConfig_dbaccess.mk
+++ b/dbaccess/UIConfig_dbaccess.mk
@@ -16,6 +16,7 @@ $(eval $(call gb_UIConfig_add_uifiles,dbaccess, \
 dbaccess/uiconfig/ui/authentificationpage \
 dbaccess/uiconfig/ui/autocharsetpage \
 dbaccess/uiconfig/ui/choosedatasourcedialog \
+dbaccess/uiconfig/ui/colcontrolbox \
 dbaccess/uiconfig/ui/collectionviewdialog \
 dbaccess/uiconfig/ui/colwidthdialog \
 dbaccess/uiconfig/ui/connectionpage \
diff --git a/dbaccess/source/ui/control/ColumnControlWindow.cxx 
b/dbaccess/source/ui/control/ColumnControlWindow.cxx
index 28a77291ce13..8f9186b01ccb 100644
--- a/dbaccess/source/ui/control/ColumnControlWindow.cxx
+++ b/dbaccess/source/ui/control/ColumnControlWindow.cxx
@@ -34,10 +34,33 @@ using namespace ::com::sun::star::util;
 using namespace ::com::sun::star::sdbc;
 using namespace ::com::sun::star::lang;
 
+OColumnControlTopLevel::OColumnControlTopLevel(vcl::Window* pParent,
+   const 
Reference& _rxContext)
+: InterimItemWindow(pParent, "dbaccess/ui/colcontrolbox.ui", 
"ColControlBox")
+, m_xControl(new OColumnControlWindow(m_xContainer.get(), _rxContext))
+{
+}
+
+void OColumnControlTopLevel::dispose()
+{
+m_xControl.reset();
+InterimItemWindow::dispose();
+}
+
+void OColumnControlTopLevel::GetFocus()
+{
+m_xControl->GetFocus();
+}
+
+void OColumnControlTopLevel::LoseFocus()
+{
+m_xControl->LoseFocus();
+}
+
 // OColumnControlWindow
-OColumnControlWindow::OColumnControlWindow(vcl::Window* pParent
-   ,const 
Reference& _rxContext)
-: OFieldDescControl(nullptr, pParent, nullptr)
+OColumnControlWindow::OColumnControlWindow(weld::Container* pParent,
+   const Reference& 
_rxContext)
+: OFieldDescControl(pParent, nullptr)
 , m_xContext(_rxContext)
 , m_sTypeNames(DBA_RES(STR_TABLEDESIGN_DBFIELDTYPES))
 , m_bAutoIncrementEnabled(true)
diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx 
b/dbaccess/source/ui/control/FieldDescControl.cxx
index 54365392353b..bb10fb787f9f 100644
--- a/dbaccess/source/ui/control/FieldDescControl.cxx
+++ b/dbaccess/source/ui/control/FieldDescControl.cxx
@@ -65,70 +65,28 @@ namespace
 }
 }
 
-OFieldDescControl::OFieldDescControl(weld::Container* pPage, vcl::Window* 
pParent, OTableDesignHelpBar* pHelpBar)
-:TabPage(pPage ? Application::GetDefDialogParent() : pParent, WB_3DLOOK | 
WB_DIALOGCONTROL)
-,m_pHelp( pHelpBar )
-,m_pLastFocusWindow(nullptr)
-,m_pActFocusWindow(nullptr)
-,m_pPreviousType()
-,m_nPos(-1)
-,aYes(DBA_RES(STR_VALUE_YES))
-,aNo(DBA_RES(STR_VALUE_NO))
-,m_nEditWidth(50)
-,m_bAdded(false)
-,pActFieldDescr(nullptr)
+OFieldDescControl::OFieldDescControl(weld::Container* pPage, 
OTableDesignHelpBar* pHelpBar)
+: m_xBuilder(Application::CreateBuilder(pPage, 
"dbaccess/ui/fielddescpage.ui"))
+, m_xContainer(m_xBuilder->weld_container("FieldDescPage"))
+, m_pHelp( pHelpBar )
+, m_pLastFocusWindow(nullptr)
+, m_pActFocusWindow(nullptr)
+, m_pPreviousType()
+, m_nPos(-1)
+, aYes(DBA_RES(STR_VALUE_YES))
+, aNo(DBA_RES(STR_VALUE_NO))
+, m_nEditWidth(50)
+, pActFieldDescr(nullptr)
 {
-if (pPage)
-

[Libreoffice-commits] core.git: dbaccess/source dbaccess/uiconfig dbaccess/UIConfig_dbaccess.mk include/vcl

2020-07-23 Thread Caolán McNamara (via logerrit) 
 dbaccess/UIConfig_dbaccess.mk |1 
 dbaccess/source/ui/control/FieldDescControl.cxx   |2 
 dbaccess/source/ui/inc/TableDesignHelpBar.hxx |   15 +
 dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx |   52 +-
 dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx  |   29 --
 dbaccess/uiconfig/ui/designhelpbox.ui |   38 +
 include/vcl/weld.hxx  |1 
 7 files changed, 74 insertions(+), 64 deletions(-)

New commits:
commit 33e0f4c8f1a38ed06508eb0754c7b6fe9cc9f2c8
Author: Caolán McNamara 
AuthorDate: Thu Jul 23 16:03:09 2020 +0100
Commit: Caolán McNamara 
CommitDate: Thu Jul 23 22:10:15 2020 +0200

weld OTableDesignHelpBar

Change-Id: If77b9e180791909998cb8536439bcc6ea6d4137b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99331
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/dbaccess/UIConfig_dbaccess.mk b/dbaccess/UIConfig_dbaccess.mk
index eed1ba41a531..25f840ec5494 100644
--- a/dbaccess/UIConfig_dbaccess.mk
+++ b/dbaccess/UIConfig_dbaccess.mk
@@ -28,6 +28,7 @@ $(eval $(call gb_UIConfig_add_uifiles,dbaccess, \
 dbaccess/uiconfig/ui/dbwizspreadsheetpage \
 dbaccess/uiconfig/ui/dbwiztextpage \
 dbaccess/uiconfig/ui/deleteallrowsdialog \
+dbaccess/uiconfig/ui/designhelpbox \
 dbaccess/uiconfig/ui/designsavemodifieddialog \
 dbaccess/uiconfig/ui/directsqldialog  \
 dbaccess/uiconfig/ui/emptypage \
diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx 
b/dbaccess/source/ui/control/FieldDescControl.cxx
index 578574d933a5..eaa34b34fafa 100644
--- a/dbaccess/source/ui/control/FieldDescControl.cxx
+++ b/dbaccess/source/ui/control/FieldDescControl.cxx
@@ -732,6 +732,8 @@ void OFieldDescControl::DisplayData(OFieldDescription* 
pFieldDescr )
 pActFieldDescr = pFieldDescr;
 if(!pFieldDescr)
 {
+if (pHelp)
+pHelp->SetHelpText( OUString() );
 DeactivateAggregate( tpDefault );
 DeactivateAggregate( tpRequired );
 DeactivateAggregate( tpTextLen );
diff --git a/dbaccess/source/ui/inc/TableDesignHelpBar.hxx 
b/dbaccess/source/ui/inc/TableDesignHelpBar.hxx
index 87118362511b..a6d32dd1ae51 100644
--- a/dbaccess/source/ui/inc/TableDesignHelpBar.hxx
+++ b/dbaccess/source/ui/inc/TableDesignHelpBar.hxx
@@ -19,22 +19,15 @@
 #ifndef INCLUDED_DBACCESS_SOURCE_UI_INC_TABLEDESIGNHELPBAR_HXX
 #define INCLUDED_DBACCESS_SOURCE_UI_INC_TABLEDESIGNHELPBAR_HXX
 
-#include 
 #include "IClipBoardTest.hxx"
-
-class VclMultiLineEdit;
+#include 
 
 namespace dbaui
 {
-// Deriving from TabPage is a trick to notice changes
-// of the system colors
-class OTableDesignHelpBar : public TabPage, public IClipboardTest
+class OTableDesignHelpBar final : public InterimItemWindow, public 
IClipboardTest
 {
 private:
-VclPtr  m_pTextWin;
-
-protected:
-virtual void Resize() override;
+std::unique_ptr m_xTextWin;
 
 public:
 OTableDesignHelpBar( vcl::Window* pParent );
@@ -43,8 +36,6 @@ namespace dbaui
 
 void SetHelpText( const OUString& rText );
 
-virtual bool PreNotify( NotifyEvent& rNEvt ) override;
-
 // IClipboardTest
 virtual bool isCutAllowed() override;
 virtual bool isCopyAllowed() override;
diff --git a/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx 
b/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx
index 3d73ff0e6170..5d9069b3451c 100644
--- a/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx
+++ b/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx
@@ -20,19 +20,15 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 
 using namespace dbaui;
-#define STANDARD_MARGIN 6
-OTableDesignHelpBar::OTableDesignHelpBar( vcl::Window* pParent ) :
- TabPage( pParent, WB_3DLOOK )
+
+OTableDesignHelpBar::OTableDesignHelpBar(vcl::Window* pParent)
+: InterimItemWindow(pParent, "dbaccess/ui/designhelpbox.ui", 
"DesignHelpBox")
+, m_xTextWin(m_xBuilder->weld_text_view("textview"))
 {
-m_pTextWin = VclPtr::Create( this, WB_VSCROLL | WB_LEFT 
| WB_BORDER | WB_NOTABSTOP | WB_READONLY);
-m_pTextWin->SetHelpId(HID_TABLE_DESIGN_HELP_WINDOW);
-m_pTextWin->SetReadOnly();
-m_pTextWin->SetControlBackground( 
GetSettings().GetStyleSettings().GetFaceColor() );
-m_pTextWin->Show();
+m_xTextWin->set_help_id(HID_TABLE_DESIGN_HELP_WINDOW);
 }
 
 OTableDesignHelpBar::~OTableDesignHelpBar()
@@ -42,40 +38,21 @@ OTableDesignHelpBar::~OTableDesignHelpBar()
 
 void OTableDesignHelpBar::dispose()
 {
-m_pTextWin.disposeAndClear();
-TabPage::dispose();
+m_xTextWin.reset();
+InterimItemWindow::dispose();
 }
 
 void OTableDesignHelpBar::SetHelpText( const OUString& rText )
 {
-if(m_pTextWin)
-m_pTextWin->SetText( rText );
-Invalidate();
-}
-
-void OTableDesignHelpBar::Resize()
-{
-// parent window

[Libreoffice-commits] core.git: dbaccess/source dbaccess/uiconfig dbaccess/UIConfig_dbaccess.mk

2014-08-07 Thread Palenik Mihály 
 dbaccess/UIConfig_dbaccess.mk  |1 
 dbaccess/source/ui/dlg/dbadmin.hrc |5 -
 dbaccess/source/ui/dlg/dbadmin.src |   93 ---
 dbaccess/source/ui/dlg/detailpages.cxx |   72 +-
 dbaccess/source/ui/dlg/detailpages.hxx |   14 --
 dbaccess/uiconfig/ui/ldappage.ui   |  161 +
 6 files changed, 192 insertions(+), 154 deletions(-)

New commits:
commit 2159107594e2e4665e8d0724a56000d3be30d11e
Author: Palenik Mihály palenik.mih...@gmail.com
Date:   Wed Aug 6 22:02:43 2014 +0200

Convert PAGE_LDAP to .ui

Conflicts:
dbaccess/source/ui/dlg/dbadmin.src

Change-Id: I2655cc1d58c87a254c7074682fd7814e4d00fe73

diff --git a/dbaccess/UIConfig_dbaccess.mk b/dbaccess/UIConfig_dbaccess.mk
index 289cd48..8a45cf1 100644
--- a/dbaccess/UIConfig_dbaccess.mk
+++ b/dbaccess/UIConfig_dbaccess.mk
@@ -39,6 +39,7 @@ $(eval $(call gb_UIConfig_add_uifiles,dbaccess, \
 dbaccess/uiconfig/ui/jdbcconnectionpage \
 dbaccess/uiconfig/ui/joindialog \
 dbaccess/uiconfig/ui/ldapconnectionpage \
+dbaccess/uiconfig/ui/ldappage \
 dbaccess/uiconfig/ui/migratepage \
 dbaccess/uiconfig/ui/mysqlnativepage \
 dbaccess/uiconfig/ui/mysqlnativesettings \
diff --git a/dbaccess/source/ui/dlg/dbadmin.hrc 
b/dbaccess/source/ui/dlg/dbadmin.hrc
index 4e1dcc8..5fa069f 100644
--- a/dbaccess/source/ui/dlg/dbadmin.hrc
+++ b/dbaccess/source/ui/dlg/dbadmin.hrc
@@ -24,21 +24,16 @@
 
 #define FT_OPTIONS  5
 #define FT_HOSTNAME 10
-#define FT_BASEDN   11
 #define FT_PORTNUMBER   12
-#define FT_LDAPROWCOUNT 13
 
 #define ET_OPTIONS  3
 #define ET_HOSTNAME 5
-#define ET_BASEDN   6
 
-#define CB_USESSL   3
 #define CB_USECATALOG   4
 
 #define TLB_ACTIONS 1
 
 #define NF_PORTNUMBER   1
-#define NF_LDAPROWCOUNT 2
 
 #endif // _DBAUI_DBADMIN_HRC_
 
diff --git a/dbaccess/source/ui/dlg/dbadmin.src 
b/dbaccess/source/ui/dlg/dbadmin.src
index f81b75a..e67416d 100644
--- a/dbaccess/source/ui/dlg/dbadmin.src
+++ b/dbaccess/source/ui/dlg/dbadmin.src
@@ -77,99 +77,6 @@ String STR_DATABASE_TYPE_CHANGE
 Text [ en-US ] = Database properties ;
 };
 
-TabPage PAGE_ADO
-{
-SVLook = TRUE ;
-Pos = MAP_APPFONT ( 0 , 0 ) ;
-Size = MAP_APPFONT ( PAGE_X , PAGE_Y ) ;
-Hide = TRUE;
-HelpId = HID_DSADMIN_PAGE_ADO;
-AUTO_CHARSET(UNRELATED_CONTROLS,PAGE_X)
-};
-
-TabPage PAGE_MYSQL_ODBC
-{
-HelpID = dbaccess:TabPage:PAGE_MYSQL_ODBC;
-SVLook = TRUE ;
-Pos = MAP_APPFONT ( 0 , 0 ) ;
-Size = MAP_APPFONT ( PAGE_X , PAGE_Y ) ;
-Hide = TRUE;
-
-AUTO_CHARSET( UNRELATED_CONTROLS, PAGE_X )
-};
-
-TabPage PAGE_LDAP
-{
-SVLook = TRUE ;
-Pos = MAP_APPFONT ( 0 , 0 ) ;
-Size = MAP_APPFONT ( PAGE_X , PAGE_Y ) ;
-Hide = TRUE;
-HelpId = HID_DSADMIN_PAGE_LDAP;
-
-FixedLine FL_SEPARATOR1
-{
-Pos = MAP_APPFONT ( 4 , UNRELATED_CONTROLS ) ;
-Size = MAP_APPFONT ( PAGE_X - 8 , FIXEDTEXT_HEIGHT ) ;
-Text[ en-US ] = Connection Settings;
-};
-
-FixedText FT_BASEDN
-{
-Pos = MAP_APPFONT ( 6 , UNRELATED_CONTROLS + RELATED_CONTROLS + 
FIXEDTEXT_HEIGHT) ;
-Size = MAP_APPFONT ( EDIT_X - 7 , FIXEDTEXT_HEIGHT ) ;
-Text[ en-US ] = ~Base DN;
-};
-Edit ET_BASEDN
-{
-TabStop = TRUE ;
-Border = TRUE ;
-HelpId = HID_DSADMIN_LDAP_BASEDN;
-
-Pos = MAP_APPFONT ( EDIT_X , UNRELATED_CONTROLS + RELATED_CONTROLS + 
FIXEDTEXT_HEIGHT -1 ) ;
-Size = MAP_APPFONT ( 105 , EDIT_HEIGHT ) ;
-};
-CheckBox CB_USESSL
-{
-Pos = MAP_APPFONT ( 6 , 2*UNRELATED_CONTROLS + RELATED_CONTROLS + 
2*FIXEDTEXT_HEIGHT) ;
-Size = MAP_APPFONT ( PAGE_X - 12 , CHECKBOX_HEIGHT ) ;
-Text [ en-US ] = Use secure connection (SSL);
-HelpId = HID_DSADMIN_USESSL_LDAP;
-};
-
-FixedText FT_PORTNUMBER
-{
-Pos = MAP_APPFONT ( 6 , 3*UNRELATED_CONTROLS + RELATED_CONTROLS + 
2*FIXEDTEXT_HEIGHT + CHECKBOX_HEIGHT) ;
-Size = MAP_APPFONT ( EDIT_X - 7 , FIXEDTEXT_HEIGHT ) ;
-Text[ en-US ] = ~Port number;
-};
-NumericField NF_PORTNUMBER
-{
-TabStop = TRUE ;
-Border = TRUE ;
-HelpId = HID_DSADMIN_LDAP_PORTNUMBER;
-NoThousandSep = TRUE;
-
-Pos = MAP_APPFONT ( EDIT_X , 3*UNRELATED_CONTROLS + RELATED_CONTROLS + 
2*FIXEDTEXT_HEIGHT-1  + CHECKBOX_HEIGHT) ;
-Size = MAP_APPFONT ( 105 , EDIT_HEIGHT ) ;
-};
-FixedText FT_LDAPROWCOUNT
-{
-Pos = MAP_APPFONT ( 6 , 4*UNRELATED_CONTROLS + RELATED_CONTROLS + 
3*FIXEDTEXT_HEIGHT + CHECKBOX_HEIGHT ) ;
-Size = MAP_APPFONT ( EDIT_X - 7 , FIXEDTEXT_HEIGHT ) ;
-Text[ en-US ] = Maximum number of ~records;
-};
-NumericField NF_LDAPROWCOUNT
-{
-TabStop = TRUE ;
-Border = TRUE ;
-HelpId =

[Libreoffice-commits] core.git: dbaccess/source dbaccess/uiconfig dbaccess/UIConfig_dbaccess.mk

2014-08-07 Thread Palenik Mihály 
 dbaccess/UIConfig_dbaccess.mk   |1 
 dbaccess/source/ui/dlg/detailpages.cxx  |4 -
 dbaccess/uiconfig/ui/autocharsetpage.ui |   81 
 3 files changed, 84 insertions(+), 2 deletions(-)

New commits:
commit b6b77711bb3f3a4293a203a151b2de7bc39cba5a
Author: Palenik Mihály palenik.mih...@gmail.com
Date:   Wed Aug 6 21:07:00 2014 +0200

Convert PAGE_ADO and PAGE_MYSQL_ODBC to .ui

Conflicts:
dbaccess/source/ui/dlg/dbadmin.src

Change-Id: Idaba7ea38b8ca6b7d0d9cc9599e9a76836573086

diff --git a/dbaccess/UIConfig_dbaccess.mk b/dbaccess/UIConfig_dbaccess.mk
index 8a45cf1..e30fc52 100644
--- a/dbaccess/UIConfig_dbaccess.mk
+++ b/dbaccess/UIConfig_dbaccess.mk
@@ -14,6 +14,7 @@ $(eval $(call gb_UIConfig_add_uifiles,dbaccess, \
 dbaccess/uiconfig/ui/advancedsettingsdialog \
 dbaccess/uiconfig/ui/applycolpage \
 dbaccess/uiconfig/ui/authentificationpage \
+dbaccess/uiconfig/ui/autocharsetpage \
 dbaccess/uiconfig/ui/backuppage \
 dbaccess/uiconfig/ui/choosedatasourcedialog \
 dbaccess/uiconfig/ui/collectionviewdialog \
diff --git a/dbaccess/source/ui/dlg/detailpages.cxx 
b/dbaccess/source/ui/dlg/detailpages.cxx
index 165ef84..4bf718b 100644
--- a/dbaccess/source/ui/dlg/detailpages.cxx
+++ b/dbaccess/source/ui/dlg/detailpages.cxx
@@ -320,7 +320,7 @@ namespace dbaui
 
 // OAdoDetailsPage
 OAdoDetailsPage::OAdoDetailsPage( Window* pParent, const SfxItemSet 
_rCoreAttrs )
-:OCommonBehaviourTabPage(pParent, PAGE_ADO, _rCoreAttrs, 
CBTP_USE_CHARSET )
+:OCommonBehaviourTabPage(pParent, AutoCharset, 
dbaccess/ui/autocharsetpage.ui, _rCoreAttrs, CBTP_USE_CHARSET )
 {
 
 }
@@ -433,7 +433,7 @@ namespace dbaui
 }
 // OMySQLODBCDetailsPage
 OMySQLODBCDetailsPage::OMySQLODBCDetailsPage( Window* pParent, const 
SfxItemSet _rCoreAttrs )
-:OCommonBehaviourTabPage(pParent, PAGE_MYSQL_ODBC, _rCoreAttrs, 
CBTP_USE_CHARSET )
+:OCommonBehaviourTabPage(pParent, AutoCharset, 
dbaccess/ui/autocharsetpage.ui, _rCoreAttrs, CBTP_USE_CHARSET )
 {
 }
 
diff --git a/dbaccess/uiconfig/ui/autocharsetpage.ui 
b/dbaccess/uiconfig/ui/autocharsetpage.ui
new file mode 100644
index 000..8954f02
--- /dev/null
+++ b/dbaccess/uiconfig/ui/autocharsetpage.ui
@@ -0,0 +1,81 @@
+?xml version=1.0 encoding=UTF-8?
+interface
+  !-- interface-requires LibreOffice 1.0 --
+  !-- interface-requires gtk+ 3.0 --
+  object class=GtkBox id=AutoCharset
+property name=visibleTrue/property
+property name=can_focusFalse/property
+property name=hexpandTrue/property
+property name=vexpandTrue/property
+property name=border_width6/property
+property name=orientationvertical/property
+property name=spacing12/property
+child
+  object class=GtkFrame id=frame1
+property name=visibleTrue/property
+property name=can_focusFalse/property
+property name=hexpandTrue/property
+property name=label_xalign0/property
+property name=shadow_typenone/property
+child
+  object class=GtkAlignment id=alignment1
+property name=visibleTrue/property
+property name=can_focusFalse/property
+property name=hexpandTrue/property
+property name=top_padding6/property
+property name=left_padding12/property
+child
+  object class=GtkBox id=box1
+property name=visibleTrue/property
+property name=can_focusFalse/property
+property name=hexpandTrue/property
+property name=spacing6/property
+child
+  object class=GtkLabel id=charsetlabel
+property name=visibleTrue/property
+property name=can_focusFalse/property
+property name=label translatable=yes_Character 
set/property
+property name=use_underlineTrue/property
+property name=mnemonic_widgetcharset/property
+  /object
+  packing
+property name=expandFalse/property
+property name=fillTrue/property
+property name=position0/property
+  /packing
+/child
+child
+  object class=dbulo-CharSetListBox id=charset
+property name=visibleTrue/property
+property name=can_focusTrue/property
+property name=hexpandTrue/property
+  /object
+  packing
+property name=expandFalse/property
+property name=fillTrue/property
+property name=position1/property
+  /packing
+/child
+  /object
+/child
+  /object
+/child
+child type=label
+  object class=GtkLabel

[Libreoffice-commits] core.git: dbaccess/source dbaccess/uiconfig dbaccess/UIConfig_dbaccess.mk

2014-08-06 Thread Palenik Mihály 
 dbaccess/UIConfig_dbaccess.mk  |1 
 dbaccess/source/ui/dlg/dbadmin.hrc |3 
 dbaccess/source/ui/dlg/dbadmin.src |   45 
 dbaccess/source/ui/dlg/detailpages.cxx |   41 ++-
 dbaccess/source/ui/dlg/detailpages.hxx |   10 -
 dbaccess/uiconfig/ui/dbasepage.ui  |  172 +
 6 files changed, 188 insertions(+), 84 deletions(-)

New commits:
commit 1ff594ce98e9620578975decad1c6df382de82a4
Author: Palenik Mihály palenik.mih...@gmail.com
Date:   Wed Aug 6 00:00:02 2014 +0200

Convert PAGE_DBASE to .ui

Change-Id: Ie2f1592b030465a2ca5e2f25408ae38e9a833831
Reviewed-on: https://gerrit.libreoffice.org/10777
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 0ac73bf..1fdbaa9 100644
--- a/dbaccess/UIConfig_dbaccess.mk
+++ b/dbaccess/UIConfig_dbaccess.mk
@@ -21,6 +21,7 @@ $(eval $(call gb_UIConfig_add_uifiles,dbaccess, \
 dbaccess/uiconfig/ui/connectionpage \
 dbaccess/uiconfig/ui/copytablepage \
 dbaccess/uiconfig/ui/dbaseindexdialog \
+dbaccess/uiconfig/ui/dbasepage \
 dbaccess/uiconfig/ui/dbwizconnectionpage \
 dbaccess/uiconfig/ui/dbwizmysqlintropage \
 dbaccess/uiconfig/ui/dbwizmysqlnativepage \
diff --git a/dbaccess/source/ui/dlg/dbadmin.hrc 
b/dbaccess/source/ui/dlg/dbadmin.hrc
index 75d39b6..d097204 100644
--- a/dbaccess/source/ui/dlg/dbadmin.hrc
+++ b/dbaccess/source/ui/dlg/dbadmin.hrc
@@ -24,7 +24,6 @@
 
 #define FT_OPTIONS  5
 #define FT_JDBCDRIVERCLASS  7
-#define FT_SPECIAL_MESSAGE  8
 #define FT_HOSTNAME 10
 #define FT_BASEDN   11
 #define FT_PORTNUMBER   12
@@ -35,10 +34,8 @@
 #define ET_HOSTNAME 5
 #define ET_BASEDN   6
 
-#define PB_INDICIES 1
 #define PB_TESTDRIVERCLASS  5
 
-#define CB_SHOWDELETEDROWS  2
 #define CB_USESSL   3
 #define CB_USECATALOG   4
 
diff --git a/dbaccess/source/ui/dlg/dbadmin.src 
b/dbaccess/source/ui/dlg/dbadmin.src
index 4e89db9..b3301a3 100644
--- a/dbaccess/source/ui/dlg/dbadmin.src
+++ b/dbaccess/source/ui/dlg/dbadmin.src
@@ -77,51 +77,6 @@ String STR_DATABASE_TYPE_CHANGE
 Text [ en-US ] = Database properties ;
 };
 
-TabPage PAGE_DBASE
-{
-SVLook = TRUE ;
-Hide = TRUE;
-Pos = MAP_APPFONT ( 0 , 0 ) ;
-Size = MAP_APPFONT ( PAGE_X , PAGE_Y ) ;
-HelpId = HID_DSADMIN_PAGE_DBASE;
-
-AUTO_CHARSET(UNRELATED_CONTROLS,PAGE_X)
-
-FixedLine FL_SEPARATOR1
-{
-Pos = MAP_APPFONT ( 4 , 2*UNRELATED_CONTROLS + RELATED_CONTROLS + 
2*FIXEDTEXT_HEIGHT) ;
-Size = MAP_APPFONT ( PAGE_X - 8 , FIXEDTEXT_HEIGHT ) ;
-Text[ en-US ] = Optional settings;
-};
-
-CheckBox CB_SHOWDELETEDROWS
-{
-Pos = MAP_APPFONT ( 6 , 2*UNRELATED_CONTROLS + 2*RELATED_CONTROLS + 
3*FIXEDTEXT_HEIGHT) ;
-Size = MAP_APPFONT ( 200 , CHECKBOX_HEIGHT ) ;
-TabStop = TRUE ;
-HelpId = HID_DSADMIN_SHOWDELETED;
-Text [ en-US ] = Display deleted records as well ;
-};
-
-FixedText FT_SPECIAL_MESSAGE
-{
-Hide = TRUE;
-WordBreak = TRUE;
-Pos = MAP_APPFONT ( 6 , 3*UNRELATED_CONTROLS + 2*RELATED_CONTROLS + 
3*FIXEDTEXT_HEIGHT + CHECKBOX_HEIGHT) ;
-Size = MAP_APPFONT ( PAGE_X - 12 , 2*FIXEDTEXT_HEIGHT ) ;
-Text [ en-US ] = Note: When deleted, and thus inactive, records are 
displayed, you will not be able to delete records from the data source. ;
-};
-
-PushButton PB_INDICIES
-{
-Pos = MAP_APPFONT ( PAGE_X  - BUTTON_WIDTH - UNRELATED_CONTROLS, 
PAGE_Y - BUTTON_HEIGHT - UNRELATED_CONTROLS) ;
-Size = MAP_APPFONT ( BUTTON_WIDTH , BUTTON_HEIGHT ) ;
-TabStop = TRUE ;
-HelpId = HID_DSADMIN_DBASE_INDICIES;
-Text [ en-US ] = Indexes...;
-};
-};
-
 TabPage PAGE_ADO
 {
 SVLook = TRUE ;
diff --git a/dbaccess/source/ui/dlg/detailpages.cxx 
b/dbaccess/source/ui/dlg/detailpages.cxx
index 6d63fce..7b5c78a 100644
--- a/dbaccess/source/ui/dlg/detailpages.cxx
+++ b/dbaccess/source/ui/dlg/detailpages.cxx
@@ -247,20 +247,15 @@ namespace dbaui
 
 // ODbaseDetailsPage
 ODbaseDetailsPage::ODbaseDetailsPage( Window* pParent, const SfxItemSet 
_rCoreAttrs )
-:OCommonBehaviourTabPage(pParent, PAGE_DBASE, _rCoreAttrs, 
CBTP_USE_CHARSET ,false)
-,m_aShowDeleted (this, ModuleRes(CB_SHOWDELETEDROWS))
-,m_aFL_1(this, ModuleRes( FL_SEPARATOR1) )
-,m_aFT_Message  (this, ModuleRes( FT_SPECIAL_MESSAGE) )
-,m_aIndexes (this, ModuleRes(PB_INDICIES))
+:OCommonBehaviourTabPage(pParent, DbasePage, 
dbaccess/ui/dbasepage.ui, _rCoreAttrs, CBTP_USE_CHARSET)
 {
+get(m_pShowDeleted, showDelRowsCheckbutton);
+get(m_pFT_Message, specMessageLabel);
+get(m_pIndexes, indiciesButton);
+

[Libreoffice-commits] core.git: dbaccess/source dbaccess/uiconfig dbaccess/UIConfig_dbaccess.mk

2014-08-06 Thread Palenik Mihály 
 dbaccess/UIConfig_dbaccess.mk  |1 
 dbaccess/source/ui/dlg/dbadmin.src |   34 --
 dbaccess/source/ui/dlg/detailpages.cxx |   30 -
 dbaccess/source/ui/dlg/detailpages.hxx |5 
 dbaccess/uiconfig/ui/odbcpage.ui   |  178 +
 5 files changed, 185 insertions(+), 63 deletions(-)

New commits:
commit f71d65f39eac01374bb96d6305a7b21bd4fc
Author: Palenik Mihály palenik.mih...@gmail.com
Date:   Wed Aug 6 12:50:18 2014 +0200

Convert PAGE_ODBC to .ui

Change-Id: I23dfbeb7a1a5ed0c8c51d925a1c0d11daca75f3f
Reviewed-on: https://gerrit.libreoffice.org/10787
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 3373b84..2ab2a66 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/odbcpage \
 dbaccess/uiconfig/ui/parametersdialog \
 dbaccess/uiconfig/ui/password \
 dbaccess/uiconfig/ui/preparepage \
diff --git a/dbaccess/source/ui/dlg/dbadmin.src 
b/dbaccess/source/ui/dlg/dbadmin.src
index 7d38b0a..f81b75a 100644
--- a/dbaccess/source/ui/dlg/dbadmin.src
+++ b/dbaccess/source/ui/dlg/dbadmin.src
@@ -87,40 +87,6 @@ TabPage PAGE_ADO
 AUTO_CHARSET(UNRELATED_CONTROLS,PAGE_X)
 };
 
-TabPage PAGE_ODBC
-{
-SVLook = TRUE ;
-Pos = MAP_APPFONT ( 0 , 0 ) ;
-Size = MAP_APPFONT ( PAGE_X , PAGE_Y ) ;
-Hide = TRUE;
-HelpId = HID_DSADMIN_PAGE_ODBC;
-
-AUTO_CHARSET(UNRELATED_CONTROLS,PAGE_X)
-FixedLine FL_SEPARATOR1
-{
-Pos = MAP_APPFONT ( 4 , 2*UNRELATED_CONTROLS + 2*FIXEDTEXT_HEIGHT + 
RELATED_CONTROLS ) ;
-Size = MAP_APPFONT ( PAGE_X - 8 , FIXEDTEXT_HEIGHT ) ;
-Text[ en-US ] = Optional Settings;
-};
-
-FixedText FT_OPTIONS
-{
-Pos = MAP_APPFONT ( 6 , 2*UNRELATED_CONTROLS + 3*FIXEDTEXT_HEIGHT + 
2*RELATED_CONTROLS) ;
-Size = MAP_APPFONT ( EDIT_X - 7 , FIXEDTEXT_HEIGHT ) ;
-Text [ en-US ] = ODBC ~options ;
-};
-Edit ET_OPTIONS
-{
-Border = TRUE ;
-Pos = MAP_APPFONT ( EDIT_X , 2*UNRELATED_CONTROLS + 3*FIXEDTEXT_HEIGHT 
+ 2*RELATED_CONTROLS -1 ) ;
-Size = MAP_APPFONT ( 130 , EDIT_HEIGHT ) ;
-TabStop = TRUE ;
-HelpId = HID_DSADMIN_ODBC_OPTIONS;
-};
-
-AUTO_USECATALOG(3*UNRELATED_CONTROLS + 4*FIXEDTEXT_HEIGHT + 
2*RELATED_CONTROLS )
-};
-
 TabPage PAGE_MYSQL_ODBC
 {
 HelpID = dbaccess:TabPage:PAGE_MYSQL_ODBC;
diff --git a/dbaccess/source/ui/dlg/detailpages.cxx 
b/dbaccess/source/ui/dlg/detailpages.cxx
index 3bcedeb..0664f1e 100644
--- a/dbaccess/source/ui/dlg/detailpages.cxx
+++ b/dbaccess/source/ui/dlg/detailpages.cxx
@@ -336,20 +336,10 @@ namespace dbaui
 
 // OOdbcDetailsPage
 OOdbcDetailsPage::OOdbcDetailsPage( Window* pParent, const SfxItemSet 
_rCoreAttrs )
-:OCommonBehaviourTabPage(pParent, PAGE_ODBC, _rCoreAttrs, 
CBTP_USE_CHARSET | CBTP_USE_OPTIONS,false)
-,m_aFL_1(this, ModuleRes(FL_SEPARATOR1))
-,m_aUseCatalog  (this, ModuleRes(CB_USECATALOG))
+:OCommonBehaviourTabPage(pParent, ODBC, dbaccess/ui/odbcpage.ui, 
_rCoreAttrs, CBTP_USE_CHARSET | CBTP_USE_OPTIONS)
 {
-m_aUseCatalog.SetToggleHdl(getControlModifiedLink());
-FreeResource();
-
-Window* pWindows[] = {  m_pCharsetLabel, m_pCharset
-,m_pOptionsLabel,m_pOptions,m_aUseCatalog
-};
-
-sal_Int32 nCount = sizeof(pWindows) / sizeof(pWindows[0]);
-for (sal_Int32 i=1; i  nCount; ++i)
-pWindows[i]-SetZOrder(pWindows[i-1], WINDOW_ZORDER_BEHIND);
+get(m_pUseCatalog, useCatalogCheckbutton);
+m_pUseCatalog-SetToggleHdl(getControlModifiedLink());
 }
 
 SfxTabPage* ODriversSettings::CreateODBC( Window* pParent, const 
SfxItemSet* _rAttrSet )
@@ -360,19 +350,9 @@ namespace dbaui
 bool OOdbcDetailsPage::FillItemSet( SfxItemSet* _rSet )
 {
 bool bChangedSomething = OCommonBehaviourTabPage::FillItemSet(_rSet);
-fillBool(*_rSet,m_aUseCatalog,DSID_USECATALOG,bChangedSomething);
+fillBool(*_rSet,m_pUseCatalog,DSID_USECATALOG,bChangedSomething);
 return bChangedSomething;
 }
-void OOdbcDetailsPage::fillControls(::std::vector ISaveValueWrapper*  
_rControlList)
-{
-OCommonBehaviourTabPage::fillControls(_rControlList);
-_rControlList.push_back(new 
OSaveValueWrapperCheckBox(m_aUseCatalog));
-}
-void OOdbcDetailsPage::fillWindows(::std::vector ISaveValueWrapper*  
_rControlList)
-{
-OCommonBehaviourTabPage::fillWindows(_rControlList);
-_rControlList.push_back(new

[Libreoffice-commits] core.git: dbaccess/source dbaccess/uiconfig dbaccess/UIConfig_dbaccess.mk extras/source

2014-08-06 Thread Szymon Kłos 
 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 extensions/source

2014-08-05 Thread Palenik Mihály 
 dbaccess/UIConfig_dbaccess.mk  |1 
 dbaccess/source/ui/dlg/ConnectionPage.cxx  |  119 +++--
 dbaccess/source/ui/dlg/ConnectionPage.hrc  |   45 ---
 dbaccess/source/ui/dlg/ConnectionPage.hxx  |   25 -
 dbaccess/source/ui/dlg/ConnectionPage.src  |  110 
 dbaccess/source/ui/dlg/ConnectionPageSetup.cxx |   10 
 dbaccess/source/ui/inc/dbu_resource.hrc|1 
 dbaccess/uiconfig/ui/connectionpage.ui |  330 +++--
 dbaccess/uiconfig/ui/dbwizconnectionpage.ui|  122 +
 extensions/source/abpilot/abspilot.cxx |2 
 10 files changed, 445 insertions(+), 320 deletions(-)

New commits:
commit 020e283970783d53f0c8a4b88ff7ae79f6f81618
Author: Palenik Mihály palenik.mih...@gmail.com
Date:   Tue Aug 5 11:39:31 2014 +0200

Convert PAGE_CONNECTION to .ui

Change-Id: Id65d57b848280fee12384b4f470782a28233acd8
Reviewed-on: https://gerrit.libreoffice.org/10748
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 52d2bf4..0ac73bf 100644
--- a/dbaccess/UIConfig_dbaccess.mk
+++ b/dbaccess/UIConfig_dbaccess.mk
@@ -21,6 +21,7 @@ $(eval $(call gb_UIConfig_add_uifiles,dbaccess, \
 dbaccess/uiconfig/ui/connectionpage \
 dbaccess/uiconfig/ui/copytablepage \
 dbaccess/uiconfig/ui/dbaseindexdialog \
+dbaccess/uiconfig/ui/dbwizconnectionpage \
 dbaccess/uiconfig/ui/dbwizmysqlintropage \
 dbaccess/uiconfig/ui/dbwizmysqlnativepage \
 dbaccess/uiconfig/ui/dbwizspreadsheetpage \
diff --git a/dbaccess/source/ui/dlg/ConnectionPage.cxx 
b/dbaccess/source/ui/dlg/ConnectionPage.cxx
index b3c05d6..1f925b7 100644
--- a/dbaccess/source/ui/dlg/ConnectionPage.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionPage.cxx
@@ -19,7 +19,6 @@
 
 #include config_features.h
 #include ConnectionPage.hxx
-#include ConnectionPage.hrc
 #include dbu_dlg.hrc
 #include dsmeta.hxx
 #if HAVE_FEATURE_JAVA
@@ -89,30 +88,26 @@ namespace dbaui
 }
 // OConnectionTabPage
 OConnectionTabPage::OConnectionTabPage(Window* pParent, const SfxItemSet 
_rCoreAttrs)
-:OConnectionHelper(pParent, ModuleRes(PAGE_CONNECTION), _rCoreAttrs)
-,m_aFL1(this, ModuleRes(FL_SEPARATOR1))
-,m_aFL2(this, ModuleRes(FL_SEPARATOR2))
-,m_aUserNameLabel(this, ModuleRes(FT_USERNAME))
-,m_aUserName(this, ModuleRes(ET_USERNAME))
-,m_aPasswordRequired(this, ModuleRes(CB_PASSWORD_REQUIRED))
-,m_aFL3(this, ModuleRes(FL_SEPARATOR3))
-,m_aJavaDriverLabel(this, ModuleRes(FT_JDBCDRIVERCLASS))
-,m_aJavaDriver(this, ModuleRes(ET_JDBCDRIVERCLASS))
-,m_aTestJavaDriver(this, ModuleRes(PB_TESTDRIVERCLASS))
-,m_aTestConnection(this, ModuleRes(PB_TESTCONNECTION))
+:OConnectionHelper(pParent, ConnectionPage, 
dbaccess/ui/connectionpage.ui, _rCoreAttrs)
 {
-m_pConnectionURL-SetModifyHdl(LINK(this, OConnectionTabPage, 
OnEditModified));
-m_aJavaDriver.SetModifyHdl(getControlModifiedLink());
-m_aJavaDriver.SetModifyHdl(LINK(this, OConnectionTabPage, 
OnEditModified));
-m_aUserName.SetModifyHdl(getControlModifiedLink());
-m_aPasswordRequired.SetClickHdl(getControlModifiedLink());
-
-
m_aTestConnection.SetClickHdl(LINK(this,OGenericAdministrationPage,OnTestConnectionClickHdl));
-
m_aTestJavaDriver.SetClickHdl(LINK(this,OConnectionTabPage,OnTestJavaClickHdl));
+get(m_pFL2, userlabel);
+get(m_pUserNameLabel, userNameLabel);
+get(m_pUserName, userNameEntry);
+get(m_pPasswordRequired, passCheckbutton);
+get(m_pFL3, JDBCLabel);
+get(m_pJavaDriverLabel, javaDriverLabel);
+get(m_pJavaDriver, driverEntry);
+get(m_pTestJavaDriver, driverButton);
+get(m_pTestConnection, connectionButton);
 
-FreeResource();
+m_pConnectionURL-SetModifyHdl(LINK(this, OConnectionTabPage, 
OnEditModified));
+m_pJavaDriver-SetModifyHdl(getControlModifiedLink());
+m_pJavaDriver-SetModifyHdl(LINK(this, OConnectionTabPage, 
OnEditModified));
+m_pUserName-SetModifyHdl(getControlModifiedLink());
+m_pPasswordRequired-SetClickHdl(getControlModifiedLink());
 
-LayoutHelper::fitSizeRightAligned( m_aTestConnection );
+
m_pTestConnection-SetClickHdl(LINK(this,OGenericAdministrationPage,OnTestConnectionClickHdl));
+
m_pTestJavaDriver-SetClickHdl(LINK(this,OConnectionTabPage,OnTestJavaClickHdl));
 }
 
 OConnectionTabPage::~OConnectionTabPage()
@@ -128,7 +123,6 @@ namespace dbaui
 m_eType = m_pAdminDialog-getDatasourceType(_rSet);
 OConnectionHelper::implInitControls( _rSet, _bSaveValue);
 
-LocalResourceAccess aLocRes( PAGE_CONNECTION, RSC_TABPAGE );
 ::dbaccess::DATASOURCE_TYPE eType = 
m_pCollection-determineType(m_eType);
 switch( eType )
 {
@@

[Libreoffice-commits] core.git: dbaccess/source dbaccess/uiconfig dbaccess/UIConfig_dbaccess.mk

2014-08-04 Thread Palenik Mihály 
 dbaccess/UIConfig_dbaccess.mk|1 
 dbaccess/source/ui/dlg/paramdialog.cxx   |  112 +-
 dbaccess/source/ui/inc/paramdialog.hxx   |   12 --
 dbaccess/uiconfig/ui/parametersdialog.ui |  186 +++
 4 files changed, 247 insertions(+), 64 deletions(-)

New commits:
commit b15c01e43071099c6cb631953e56e88e9961e29e
Author: Palenik Mihály palenik.mih...@gmail.com
Date:   Mon Aug 4 13:43:09 2014 +0200

Convert DLG_PARAMETERS to .ui

Conflicts:
dbaccess/UIConfig_dbaccess.mk

Change-Id: Ib9e1c986e2f58b0095e69890664764d1cf8badb0

diff --git a/dbaccess/UIConfig_dbaccess.mk b/dbaccess/UIConfig_dbaccess.mk
index 0225fdb..52d2bf4 100644
--- a/dbaccess/UIConfig_dbaccess.mk
+++ b/dbaccess/UIConfig_dbaccess.mk
@@ -39,6 +39,7 @@ $(eval $(call gb_UIConfig_add_uifiles,dbaccess, \
 dbaccess/uiconfig/ui/migratepage \
 dbaccess/uiconfig/ui/mysqlnativepage \
 dbaccess/uiconfig/ui/mysqlnativesettings \
+dbaccess/uiconfig/ui/parametersdialog \
 dbaccess/uiconfig/ui/password \
 dbaccess/uiconfig/ui/preparepage \
 dbaccess/uiconfig/ui/queryfilterdialog \
diff --git a/dbaccess/source/ui/dlg/paramdialog.cxx 
b/dbaccess/source/ui/dlg/paramdialog.cxx
index bd5d295..c59e415 100644
--- a/dbaccess/source/ui/dlg/paramdialog.cxx
+++ b/dbaccess/source/ui/dlg/paramdialog.cxx
@@ -54,19 +54,19 @@ namespace dbaui
 OParameterDialog::OParameterDialog(
 Window* pParent, const Reference XIndexAccess   rParamContainer,
 const Reference XConnection   _rxConnection, const Reference 
XComponentContext  rxContext)
-:ModalDialog( pParent, ModuleRes(DLG_PARAMETERS))
-,m_aNamesFrame  (this, ModuleRes(FL_PARAMS))
-,m_aAllParams   (this, ModuleRes(LB_ALLPARAMS))
-,m_aValueFrame  (this, ModuleRes(FT_VALUE))
-,m_aParam   (this, ModuleRes(ET_PARAM))
-,m_aTravelNext  (this, ModuleRes(BT_TRAVELNEXT))
-,m_aOKBtn   (this, ModuleRes(BT_OK))
-,m_aCancelBtn   (this, ModuleRes(BT_CANCEL))
+:ModalDialog( pParent, Parameters, dbaccess/ui/parametersdialog.ui)
 ,m_nCurrentlySelected(LISTBOX_ENTRY_NOTFOUND)
 ,m_xConnection(_rxConnection)
 ,m_aPredicateInput( rxContext, _rxConnection, getParseContext() )
 ,m_bNeedErrorOnCurrent(true)
 {
+get(m_pAllParams, allParamTreeview);
+get(m_pParam, paramEntry);
+get(m_pTravelNext, next);
+get(m_pOKBtn, ok);
+get(m_pCancelBtn, cancel);
+
+set_height_request(200);
 
 if (rxContext.is())
 m_xFormatter = Reference XNumberFormatter( 
NumberFormatter::create( rxContext ), UNO_QUERY_THROW);
@@ -94,7 +94,7 @@ namespace dbaui
 if(!xParamAsSet.is())
 continue;
 pValues-Name = 
::comphelper::getString(xParamAsSet-getPropertyValue(PROPERTY_NAME));
-m_aAllParams.InsertEntry(pValues-Name);
+m_pAllParams-InsertEntry(pValues-Name);
 
 if (!pValues-Value.hasValue())
 // it won't have a value, 'cause it's default constructed. 
But may be later we support
@@ -116,8 +116,6 @@ namespace dbaui
 Construct();
 
 m_aResetVisitFlag.SetTimeoutHdl(LINK(this, OParameterDialog, 
OnVisitedTimeout));
-
-FreeResource();
 }
 
 OParameterDialog::~OParameterDialog()
@@ -129,31 +127,31 @@ namespace dbaui
 
 void OParameterDialog::Construct()
 {
-m_aAllParams.SetSelectHdl(LINK(this, OParameterDialog, 
OnEntrySelected));
-m_aParam.SetLoseFocusHdl(LINK(this, OParameterDialog, 
OnValueLoseFocus));
-m_aParam.SetModifyHdl(LINK(this, OParameterDialog, OnValueModified));
-m_aTravelNext.SetClickHdl(LINK(this, OParameterDialog, 
OnButtonClicked));
-m_aOKBtn.SetClickHdl(LINK(this, OParameterDialog, OnButtonClicked));
-m_aCancelBtn.SetClickHdl(LINK(this, OParameterDialog, 
OnButtonClicked));
-
-if (m_aAllParams.GetEntryCount())
+m_pAllParams-SetSelectHdl(LINK(this, OParameterDialog, 
OnEntrySelected));
+m_pParam-SetLoseFocusHdl(LINK(this, OParameterDialog, 
OnValueLoseFocus));
+m_pParam-SetModifyHdl(LINK(this, OParameterDialog, OnValueModified));
+m_pTravelNext-SetClickHdl(LINK(this, OParameterDialog, 
OnButtonClicked));
+m_pOKBtn-SetClickHdl(LINK(this, OParameterDialog, OnButtonClicked));
+m_pCancelBtn-SetClickHdl(LINK(this, OParameterDialog, 
OnButtonClicked));
+
+if (m_pAllParams-GetEntryCount())
 {
-m_aAllParams.SelectEntryPos(0);
-LINK(this, OParameterDialog, OnEntrySelected).Call(m_aAllParams);
+m_pAllParams-SelectEntryPos(0);
+LINK(this, OParameterDialog, OnEntrySelected).Call(m_pAllParams);
 
-if (m_aAllParams.GetEntryCount() == 1)
+if (m_pAllParams-GetEntryCount() == 1)
 {
-

[Libreoffice-commits] core.git: dbaccess/source dbaccess/uiconfig dbaccess/UIConfig_dbaccess.mk

2014-08-02 Thread Palenik Mihály 
 dbaccess/UIConfig_dbaccess.mk  |1 
 dbaccess/source/ui/dlg/dbadmin.src |   12 
 dbaccess/source/ui/dlg/dbwiz.cxx   |4 -
 dbaccess/source/ui/dlg/dbwizsetup.cxx  |2 
 dbaccess/source/ui/inc/WCopyTable.hxx  |   12 ++--
 dbaccess/source/ui/inc/dbu_dlg.hrc |4 +
 dbaccess/source/ui/inc/dbu_misc.hrc|4 +
 dbaccess/source/ui/inc/dbu_resource.hrc|   18 ++
 dbaccess/source/ui/misc/WCopyTable.cxx |   84 +++--
 dbaccess/source/ui/misc/WizardPages.hrc|5 -
 dbaccess/source/ui/misc/WizardPages.src|   52 +++--
 dbaccess/uiconfig/ui/rtfcopytabledialog.ui |   12 
 12 files changed, 94 insertions(+), 116 deletions(-)

New commits:
commit cf22f952af0b4e27d0b591f3a89a48c19918514c
Author: Palenik Mihály palenik.mih...@gmail.com
Date:   Thu Jul 31 19:22:24 2014 +0200

Convert DLG_DATABASE_TYPE_CHANGE to .ui

Conflicts:
dbaccess/source/ui/inc/dbu_resource.hrc

Change-Id: I854d1c37d5a8b4944b786b9a4cace8b3f8b5e093

diff --git a/dbaccess/UIConfig_dbaccess.mk b/dbaccess/UIConfig_dbaccess.mk
index 6530e96..6f1751b 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/querypropertiesdialog  \
 dbaccess/uiconfig/ui/relationdialog \
 dbaccess/uiconfig/ui/rowheightdialog \
+dbaccess/uiconfig/ui/rtfcopytabledialog \
 dbaccess/uiconfig/ui/savedialog \
 dbaccess/uiconfig/ui/specialjdbcconnectionpage \
 dbaccess/uiconfig/ui/specialsettingspage \
diff --git a/dbaccess/source/ui/dlg/dbadmin.src 
b/dbaccess/source/ui/dlg/dbadmin.src
index 904b8b1..c28cabe 100644
--- a/dbaccess/source/ui/dlg/dbadmin.src
+++ b/dbaccess/source/ui/dlg/dbadmin.src
@@ -73,18 +73,8 @@
 Size = MAP_APPFONT ( 97 , EDIT_HEIGHT ) ;  
 \
 };
 
-ModalDialog DLG_DATABASE_TYPE_CHANGE
+String STR_DATABASE_TYPE_CHANGE
 {
-OutputSize = TRUE ;
-Moveable = TRUE;
-Closeable = TRUE ;
-Hide = TRUE;
-HelpId = HID_DSADMIN_TYPE_DIALOG;
-
-TabControl 1
-{
-OutputSize = TRUE ;
-};
 Text [ en-US ] = Database properties ;
 };
 
diff --git a/dbaccess/source/ui/dlg/dbwiz.cxx b/dbaccess/source/ui/dlg/dbwiz.cxx
index b7e4592..38eb785 100644
--- a/dbaccess/source/ui/dlg/dbwiz.cxx
+++ b/dbaccess/source/ui/dlg/dbwiz.cxx
@@ -68,7 +68,7 @@ ODbTypeWizDialog::ODbTypeWizDialog(Window* _pParent
,const Reference XComponentContext  _rxORB
,const ::com::sun::star::uno::Any 
_aDataSourceName
)
-:OWizardMachine(_pParent, ModuleRes(DLG_DATABASE_TYPE_CHANGE), WZB_NEXT | 
WZB_PREVIOUS | WZB_FINISH | WZB_CANCEL | WZB_HELP )
+:OWizardMachine(_pParent, WZB_NEXT | WZB_PREVIOUS | WZB_FINISH | 
WZB_CANCEL | WZB_HELP )
 ,m_pOutSet(NULL)
 ,m_bResetting(false)
 ,m_bApplied(false)
@@ -98,8 +98,8 @@ ODbTypeWizDialog::ODbTypeWizDialog(Window* _pParent
 DbuTypeCollectionItem* pCollectionItem = PTR_CAST(DbuTypeCollectionItem, 
_pItems-GetItem(DSID_TYPECOLLECTION));
 m_pCollection = pCollectionItem-getCollection();
 
-FreeResource();
 ActivatePage();
+setTitleBase(ModuleRes(STR_DATABASE_TYPE_CHANGE));
 }
 
 ODbTypeWizDialog::~ODbTypeWizDialog()
diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx 
b/dbaccess/source/ui/dlg/dbwizsetup.cxx
index 13ff9f6..2db0e8f 100644
--- a/dbaccess/source/ui/dlg/dbwizsetup.cxx
+++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx
@@ -180,7 +180,7 @@ ODbTypeWizDialogSetup::ODbTypeWizDialogSetup(Window* 
_pParent
 m_pHelp-SetUniqueId(UID_DBWIZ_HELP);
 SetRoadmapInteractive( true );
 ActivatePage();
-SetText(ModuleRes(STR_DBWIZARDTITLE));
+setTitleBase(ModuleRes(STR_DBWIZARDTITLE));
 }
 
 void ODbTypeWizDialogSetup::declareAuthDepPath( const OUString _sURL, PathId 
_nPathId, const svt::RoadmapWizardTypes::WizardPath _rPaths)
diff --git a/dbaccess/source/ui/inc/WCopyTable.hxx 
b/dbaccess/source/ui/inc/WCopyTable.hxx
index c8b6831f..0255753 100644
--- a/dbaccess/source/ui/inc/WCopyTable.hxx
+++ b/dbaccess/source/ui/inc/WCopyTable.hxx
@@ -238,11 +238,11 @@ namespace dbaui
 ODatabaseExport::TColumns   m_vSourceColumns;
 ODatabaseExport::TColumnVector  m_vSourceVec;
 
-HelpButton  m_pbHelp;
-CancelButtonm_pbCancel;
-PushButton  m_pbPrev;
-PushButton  m_pbNext;
-OKButtonm_pbFinish;
+HelpButton* m_pbHelp;
+CancelButton*   m_pbCancel;
+PushButton* m_pbPrev;
+PushButton* m_pbNext;
+PushButton* m_pbFinish;
 
 OTypeInfoMapm_aTypeInfo;
 ::std::vectorOTypeInfoMap::iterator   m_aTypeInfoIndex;
@@

[Libreoffice-commits] core.git: dbaccess/source dbaccess/uiconfig dbaccess/UIConfig_dbaccess.mk

2014-08-01 Thread Palenik Mihály 
 dbaccess/UIConfig_dbaccess.mk  |1 
 dbaccess/source/ui/dlg/ConnectionPageSetup.cxx |   20 +---
 dbaccess/source/ui/dlg/dbadminsetup.hrc|8 -
 dbaccess/source/ui/dlg/dbadminsetup.src|   97 ---
 dbaccess/source/ui/inc/dbu_dlg.hrc |   14 ++
 dbaccess/source/ui/inc/dbu_resource.hrc|   21 +---
 dbaccess/uiconfig/ui/connectionpage.ui |  123 +
 7 files changed, 171 insertions(+), 113 deletions(-)

New commits:
commit ca1897ede3faaf71d263ab2efaf975c74c46f8b5
Author: Palenik Mihály palenik.mih...@gmail.com
Date:   Tue Jul 29 14:00:32 2014 +0200

Convert 5 tabpages to .ui

I convert PAGE_DBWIZARD_ADO, PAGE_DBWIZARD_DBASE,
PAGE_DBWIZARD_MSACCESS, PAGE_DBWIZARD_ODBC, PAGE_DBWIZARD_USERDEFINED

Conflicts:
dbaccess/source/ui/inc/dbu_resource.hrc

Change-Id: Id5efedb2016011a25c037b7d2bc15b20ddd73800
Reviewed-on: https://gerrit.libreoffice.org/10607
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 d227222..ae211df 100644
--- a/dbaccess/UIConfig_dbaccess.mk
+++ b/dbaccess/UIConfig_dbaccess.mk
@@ -17,6 +17,7 @@ $(eval $(call gb_UIConfig_add_uifiles,dbaccess, \
 dbaccess/uiconfig/ui/choosedatasourcedialog \
 dbaccess/uiconfig/ui/collectionviewdialog \
 dbaccess/uiconfig/ui/colwidthdialog \
+dbaccess/uiconfig/ui/connectionpage \
 dbaccess/uiconfig/ui/copytablepage \
 dbaccess/uiconfig/ui/dbaseindexdialog \
 dbaccess/uiconfig/ui/dbwizmysqlintropage \
diff --git a/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx 
b/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx
index 6820803..2c2d3fb 100644
--- a/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx
@@ -68,37 +68,27 @@ namespace dbaui
 
 OGenericAdministrationPage* OConnectionTabPageSetup::CreateDbaseTabPage( 
Window* pParent, const SfxItemSet _rAttrSet )
 {
-OConnectionTabPageSetup* oDBWizardPage = new OConnectionTabPageSetup( 
pParent, PAGE_DBWIZARD_DBASE,_rAttrSet, STR_DBASE_HELPTEXT,
STR_DBASE_HEADERTEXT,STR_DBASE_PATH_OR_FILE);
-oDBWizardPage-FreeResource();
-return oDBWizardPage;
+return new OConnectionTabPageSetup( pParent, ConnectionPage, 
dbaccess/ui/connectionpage.ui, _rAttrSet, STR_DBASE_HELPTEXT, 
STR_DBASE_HEADERTEXT, STR_DBASE_PATH_OR_FILE);
 }
 
 OGenericAdministrationPage* 
OConnectionTabPageSetup::CreateMSAccessTabPage( Window* pParent, const 
SfxItemSet _rAttrSet )
 {
-OConnectionTabPageSetup* oDBWizardPage = new OConnectionTabPageSetup( 
pParent, PAGE_DBWIZARD_MSACCESS, _rAttrSet, STR_MSACCESS_HELPTEXT, 
STR_MSACCESS_HEADERTEXT, STR_MSACCESS_MDB_FILE);
-oDBWizardPage-FreeResource();
-return oDBWizardPage;
+return new OConnectionTabPageSetup( pParent, ConnectionPage, 
dbaccess/ui/connectionpage.ui, _rAttrSet, STR_MSACCESS_HELPTEXT, 
STR_MSACCESS_HEADERTEXT, STR_MSACCESS_MDB_FILE);
 }
 
 OGenericAdministrationPage* OConnectionTabPageSetup::CreateADOTabPage( 
Window* pParent, const SfxItemSet _rAttrSet )
 {
-OConnectionTabPageSetup* oDBWizardPage = new OConnectionTabPageSetup( 
pParent, PAGE_DBWIZARD_ADO, _rAttrSet, STR_ADO_HELPTEXT, STR_ADO_HEADERTEXT, 
STR_COMMONURL);
-oDBWizardPage-FreeResource();
-return oDBWizardPage;
+return new OConnectionTabPageSetup( pParent, ConnectionPage, 
dbaccess/ui/connectionpage.ui, _rAttrSet, STR_ADO_HELPTEXT, 
STR_ADO_HEADERTEXT, STR_COMMONURL);
 }
 
 OGenericAdministrationPage* OConnectionTabPageSetup::CreateODBCTabPage( 
Window* pParent, const SfxItemSet _rAttrSet )
 {
-OConnectionTabPageSetup* oDBWizardPage = new OConnectionTabPageSetup( 
pParent, PAGE_DBWIZARD_ODBC, _rAttrSet, STR_ODBC_HELPTEXT, STR_ODBC_HEADERTEXT, 
STR_NAME_OF_ODBC_DATASOURCE);
-oDBWizardPage-FreeResource();
-return oDBWizardPage;
+return new OConnectionTabPageSetup( pParent, ConnectionPage, 
dbaccess/ui/connectionpage.ui, _rAttrSet, STR_ODBC_HELPTEXT, 
STR_ODBC_HEADERTEXT, STR_NAME_OF_ODBC_DATASOURCE);
 }
 
 OGenericAdministrationPage* 
OConnectionTabPageSetup::CreateUserDefinedTabPage( Window* pParent, const 
SfxItemSet _rAttrSet )
 {
-OConnectionTabPageSetup* oDBWizardPage = new OConnectionTabPageSetup( 
pParent, PAGE_DBWIZARD_USERDEFINED, _rAttrSet, USHRT_MAX, USHRT_MAX, 
STR_COMMONURL);
-oDBWizardPage-FreeResource();
-return oDBWizardPage;
+return new OConnectionTabPageSetup( pParent, ConnectionPage, 
dbaccess/ui/connectionpage.ui, _rAttrSet, USHRT_MAX, USHRT_MAX, 
STR_COMMONURL);
 }
 
 // OConnectionTabPageSetup
diff --git a/dbaccess/source/ui/dlg/dbadminsetup.hrc 
b/dbaccess/source/ui/dlg/dbadminsetup.hrc
index c483d3a..6571f91 100644
---

[Libreoffice-commits] core.git: dbaccess/source dbaccess/uiconfig dbaccess/UIConfig_dbaccess.mk

2014-08-01 Thread Palenik Mihály 
 dbaccess/UIConfig_dbaccess.mk |2 
 dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx |  157 +++---
 dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx |   32 +-
 dbaccess/source/ui/dlg/dbadminsetup.hrc   |   17 -
 dbaccess/source/ui/dlg/dbadminsetup.src   |   97 ++---
 dbaccess/source/ui/inc/dbu_dlg.hrc|   15 +
 dbaccess/source/ui/inc/dbu_resource.hrc   |   19 -
 dbaccess/uiconfig/ui/connectionpage.ui|4 
 dbaccess/uiconfig/ui/jdbcconnectionpage.ui|  192 +
 dbaccess/uiconfig/ui/specialjdbcconnectionpage.ui |  235 ++
 10 files changed, 578 insertions(+), 192 deletions(-)

New commits:
commit 2984644d86ddcc9857147423fa44636d9a867147
Author: Palenik Mihály palenik.mih...@gmail.com
Date:   Tue Jul 29 16:34:55 2014 +0200

Convert 3 tabpages to .ui

I converted PAGE_DBWIZARD_MYSQL_JDBC, PAGE_DBWIZARD_ORACLE and
PAGE_DBWIZARD_JDBC to .ui.

Conflicts:
dbaccess/source/ui/dlg/dbadminsetup.hrc
dbaccess/source/ui/inc/dbu_resource.hrc

Change-Id: I920183c4abf303918ac0406b5810e1b8b377a04c
Reviewed-on: https://gerrit.libreoffice.org/10608
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 ae211df..79724ec 100644
--- a/dbaccess/UIConfig_dbaccess.mk
+++ b/dbaccess/UIConfig_dbaccess.mk
@@ -31,6 +31,7 @@ $(eval $(call gb_UIConfig_add_uifiles,dbaccess, \
 dbaccess/uiconfig/ui/generalpagewizard \
 dbaccess/uiconfig/ui/generatedvaluespage \
 dbaccess/uiconfig/ui/indexdesigndialog \
+dbaccess/uiconfig/ui/jdbcconnectionpage \
 dbaccess/uiconfig/ui/joindialog \
 dbaccess/uiconfig/ui/migratepage \
 dbaccess/uiconfig/ui/password \
@@ -40,6 +41,7 @@ $(eval $(call gb_UIConfig_add_uifiles,dbaccess, \
 dbaccess/uiconfig/ui/relationdialog \
 dbaccess/uiconfig/ui/rowheightdialog \
 dbaccess/uiconfig/ui/savedialog \
+dbaccess/uiconfig/ui/specialjdbcconnectionpage \
 dbaccess/uiconfig/ui/specialsettingspage \
 dbaccess/uiconfig/ui/sortdialog \
 dbaccess/uiconfig/ui/sqlexception \
diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx 
b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
index 5e8c7bb..26e4e21 100644
--- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
+++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
@@ -351,35 +351,37 @@ using namespace ::com::sun::star;
 }
 
 // OMySQLJDBCConnectionPageSetup
-
OGeneralSpecialJDBCConnectionPageSetup::OGeneralSpecialJDBCConnectionPageSetup( 
Window* pParent,sal_uInt16 _nResId, const SfxItemSet _rCoreAttrs ,sal_uInt16 
_nPortId, sal_uInt16 _nDefaultPortResId, sal_uInt16 _nHelpTextResId, sal_uInt16 
_nHeaderTextResId, sal_uInt16 _nDriverClassId)
-:OGenericAdministrationPage(pParent, ModuleRes(_nResId), _rCoreAttrs)
-,m_aFTHelpText  (this, ModuleRes(FT_AUTOWIZARDHELPTEXT))
-,m_aFTDatabasename  (this, ModuleRes(FT_AUTODATABASENAME))
-,m_aETDatabasename  (this, ModuleRes(ET_AUTODATABASENAME))
-,m_aFTHostname  (this, ModuleRes(FT_AUTOHOSTNAME))
-,m_aETHostname  (this, ModuleRes(ET_AUTOHOSTNAME))
-,m_aFTPortNumber(this, ModuleRes(FT_AUTOPORTNUMBER))
-,m_aFTDefaultPortNumber (this, ModuleRes(FT_AUTOPORTNUMBERDEFAULT))
-,m_aNFPortNumber(this, ModuleRes(NF_AUTOPORTNUMBER))
-,m_aFTDriverClass   (this, ModuleRes(FT_AUTOJDBCDRIVERCLASS))
-,m_aETDriverClass   (this, ModuleRes(ET_AUTOJDBCDRIVERCLASS))
-,m_aPBTestJavaDriver(this, ModuleRes(PB_AUTOTESTDRIVERCLASS))
+
OGeneralSpecialJDBCConnectionPageSetup::OGeneralSpecialJDBCConnectionPageSetup( 
Window* pParent, const SfxItemSet _rCoreAttrs ,sal_uInt16 _nPortId, sal_uInt16 
_nDefaultPortResId, sal_uInt16 _nHelpTextResId, sal_uInt16 _nHeaderTextResId, 
sal_uInt16 _nDriverClassId)
+:OGenericAdministrationPage(pParent, SpecialJDBCConnectionPage, 
dbaccess/ui/specialjdbcconnectionpage.ui, _rCoreAttrs)
 ,m_nPortId(_nPortId)
 {
-m_aFTDriverClass.SetText(OUString(ModuleRes(_nDriverClassId)));
-
-
m_aFTDefaultPortNumber.SetText(OUString(ModuleRes(_nDefaultPortResId)));
+get(m_pHeaderText, header);
+get(m_pFTHelpText, helpLabel);
+get(m_pFTDatabasename, dbNameLabel);
+get(m_pETDatabasename, dbNameEntry);
+get(m_pFTHostname, hostNameLabel);
+get(m_pETHostname, hostNameEntry);
+get(m_pFTPortNumber, portNumLabel);
+get(m_pFTDefaultPortNumber, portNumDefLabel);
+get(m_pNFPortNumber, portNumEntry);
+get(m_pFTDriverClass, jdbcDriverLabel);
+get(m_pETDriverClass, jdbcDriverEntry);
+get(m_pPBTestJavaDriver, testDriverButton);
+
+

[Libreoffice-commits] core.git: dbaccess/source dbaccess/uiconfig dbaccess/UIConfig_dbaccess.mk

2014-08-01 Thread Palenik Mihály 
 dbaccess/UIConfig_dbaccess.mk |2 
 dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx |  117 ++---
 dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx |   30 +--
 dbaccess/source/ui/dlg/dbadminsetup.hrc   |   13 -
 dbaccess/source/ui/dlg/dbadminsetup.src   |   97 ---
 dbaccess/source/ui/inc/dbu_resource.hrc   |3 
 dbaccess/uiconfig/ui/authentificationpage.ui  |  128 ++
 dbaccess/uiconfig/ui/connectionpage.ui|5 
 dbaccess/uiconfig/ui/ldapconnectionpage.ui|  188 ++
 9 files changed, 390 insertions(+), 193 deletions(-)

New commits:
commit 3743f9da9ac31d728a4a148792766dcc8f232548
Author: Palenik Mihály palenik.mih...@gmail.com
Date:   Wed Jul 30 00:12:21 2014 +0200

Convert PAGE_DBWIZARD_AUTHENTIFICATION and PAGE_DBWIZARD_LDAP to .ui

Conflicts:
dbaccess/source/ui/dlg/dbadminsetup.hrc
dbaccess/source/ui/dlg/dbadminsetup.src
dbaccess/source/ui/inc/dbu_resource.hrc

Change-Id: I71558269dd2edcc828af9633992f2d143ffefd6d

diff --git a/dbaccess/UIConfig_dbaccess.mk b/dbaccess/UIConfig_dbaccess.mk
index 79724ec..6530e96 100644
--- a/dbaccess/UIConfig_dbaccess.mk
+++ b/dbaccess/UIConfig_dbaccess.mk
@@ -13,6 +13,7 @@ $(eval $(call gb_UIConfig_add_uifiles,dbaccess, \
 dbaccess/uiconfig/ui/admindialog \
 dbaccess/uiconfig/ui/advancedsettingsdialog \
 dbaccess/uiconfig/ui/applycolpage \
+dbaccess/uiconfig/ui/authentificationpage \
 dbaccess/uiconfig/ui/backuppage \
 dbaccess/uiconfig/ui/choosedatasourcedialog \
 dbaccess/uiconfig/ui/collectionviewdialog \
@@ -33,6 +34,7 @@ $(eval $(call gb_UIConfig_add_uifiles,dbaccess, \
 dbaccess/uiconfig/ui/indexdesigndialog \
 dbaccess/uiconfig/ui/jdbcconnectionpage \
 dbaccess/uiconfig/ui/joindialog \
+dbaccess/uiconfig/ui/ldapconnectionpage \
 dbaccess/uiconfig/ui/migratepage \
 dbaccess/uiconfig/ui/password \
 dbaccess/uiconfig/ui/preparepage \
diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx 
b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
index 26e4e21..1d20da9 100644
--- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
+++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
@@ -132,35 +132,32 @@ using namespace ::com::sun::star;
 
 // OLDAPPageSetup
 OLDAPConnectionPageSetup::OLDAPConnectionPageSetup( Window* pParent, const 
SfxItemSet _rCoreAttrs )
-:OGenericAdministrationPage(pParent, ModuleRes(PAGE_DBWIZARD_LDAP), 
_rCoreAttrs)
-,m_aFTHeaderText(this, ModuleRes(FT_LDAP_HEADERTEXT))
-,m_aFTHelpText  (this, ModuleRes(FT_LDAP_HELPTEXT))
-,m_aFTHostServer(this, ModuleRes(FT_AUTOHOSTNAME))
-,m_aETHostServer(this, ModuleRes(ET_AUTOHOSTNAME))
-,m_aFTBaseDN(this, ModuleRes(FT_AUTOBASEDN))
-,m_aETBaseDN(this, ModuleRes(ET_AUTOBASEDN))
-,m_aFTPortNumber(this, ModuleRes(FT_AUTOPORTNUMBER))
-,m_aNFPortNumber(this, ModuleRes(NF_AUTOPORTNUMBER))
-,m_aFTDefaultPortNumber (this, ModuleRes(FT_AUTOPORTNUMBERDEFAULT))
-,m_aCBUseSSL(this, ModuleRes(CB_WIZ_USESSL))
-{
-SetControlFontWeight(m_aFTHeaderText);
-m_aFTDefaultPortNumber.SetText(OUString(ModuleRes(STR_LDAP_DEFAULT)));
-m_aETHostServer.SetModifyHdl(getControlModifiedLink());
-m_aETBaseDN.SetModifyHdl(getControlModifiedLink());
-m_aNFPortNumber.SetModifyHdl(getControlModifiedLink());
-m_aCBUseSSL.SetToggleHdl(getControlModifiedLink());
+:OGenericAdministrationPage(pParent, LDAPConnectionPage, 
dbaccess/ui/ldapconnectionpage.ui,_rCoreAttrs)
+{
+get(m_pFTHelpText, helpLabel);
+get(m_pFTHostServer, hostNameLabel);
+get(m_pETHostServer, hostNameEntry);
+get(m_pFTBaseDN, baseDNLabel);
+get(m_pETBaseDN, baseDNEntry);
+get(m_pFTPortNumber, portNumLabel);
+get(m_pNFPortNumber, portNumEntry);
+get(m_pFTDefaultPortNumber, portNumDefLabel);
+get(m_pCBUseSSL, useSSLCheckbutton);
+
+m_pETHostServer-SetModifyHdl(getControlModifiedLink());
+m_pETBaseDN-SetModifyHdl(getControlModifiedLink());
+m_pNFPortNumber-SetModifyHdl(getControlModifiedLink());
+m_pCBUseSSL-SetToggleHdl(getControlModifiedLink());
 SetRoadmapStateValue(false);
-FreeResource();
 }
 
 bool OLDAPConnectionPageSetup::FillItemSet( SfxItemSet* _rSet )
 {
 bool bChangedSomething = false;
-fillString(*_rSet,m_aETBaseDN,DSID_CONN_LDAP_BASEDN, 
bChangedSomething);
-
fillInt32(*_rSet,m_aNFPortNumber,DSID_CONN_LDAP_PORTNUMBER,bChangedSomething);
+fillString(*_rSet,m_pETBaseDN,DSID_CONN_LDAP_BASEDN, 
bChangedSomething);
+
fillInt32(*_rSet,m_pNFPortNumber,DSID_CONN_LDAP_PORTNUMBER,bChangedSomething);
 
-if (

[Libreoffice-commits] core.git: dbaccess/source dbaccess/uiconfig dbaccess/UIConfig_dbaccess.mk

2014-07-29 Thread Szymon Kłos 
 dbaccess/UIConfig_dbaccess.mk |2 
 dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx |   47 ++
 dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx |   11 -
 dbaccess/source/ui/dlg/dbadminsetup.hrc   |   12 -
 dbaccess/source/ui/dlg/dbadminsetup.src   |   91 +---
 dbaccess/source/ui/inc/dbu_resource.hrc   |9 -
 dbaccess/uiconfig/ui/dbwizmysqlintropage.ui   |  162 +
 dbaccess/uiconfig/ui/dbwizspreadsheetpage.ui  |  165 ++
 8 files changed, 366 insertions(+), 133 deletions(-)

New commits:
commit 8ea2d6b073ae283af3e7709862a23e5e39e87819
Author: Szymon Kłos eszka...@gmail.com
Date:   Tue Jul 29 12:47:04 2014 +0200

PAGE_DBWIZARD_MYSQL_INTRO and PAGE_DBWIZARD_SPREADSHEET conversion to .ui

Change-Id: I5d14fc4bd051c37802c0689d55d8557e26312a5d
Reviewed-on: https://gerrit.libreoffice.org/10606
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com

diff --git a/dbaccess/UIConfig_dbaccess.mk b/dbaccess/UIConfig_dbaccess.mk
index 6a79a08..d227222 100644
--- a/dbaccess/UIConfig_dbaccess.mk
+++ b/dbaccess/UIConfig_dbaccess.mk
@@ -19,6 +19,8 @@ $(eval $(call gb_UIConfig_add_uifiles,dbaccess, \
 dbaccess/uiconfig/ui/colwidthdialog \
 dbaccess/uiconfig/ui/copytablepage \
 dbaccess/uiconfig/ui/dbaseindexdialog \
+dbaccess/uiconfig/ui/dbwizmysqlintropage \
+dbaccess/uiconfig/ui/dbwizspreadsheetpage \
 dbaccess/uiconfig/ui/dbwiztextpage \
 dbaccess/uiconfig/ui/directsqldialog  \
 dbaccess/uiconfig/ui/emptypage \
diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx 
b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
index 8b503cb..5e8c7bb 100644
--- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
+++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
@@ -227,20 +227,15 @@ using namespace ::com::sun::star;
 
 
 OMySQLIntroPageSetup::OMySQLIntroPageSetup( Window* pParent, const 
SfxItemSet _rCoreAttrs )
-:OGenericAdministrationPage(pParent, 
ModuleRes(PAGE_DBWIZARD_MYSQL_INTRO), _rCoreAttrs)
-,m_aRB_ODBCDatabase(this, ModuleRes(RB_CONNECTVIAODBC))
-,m_aRB_JDBCDatabase(this, ModuleRes(RB_CONNECTVIAJDBC))
-,m_aRB_NATIVEDatabase(this, ModuleRes(RB_CONNECTVIANATIVE))
-,m_aFT_ConnectionMode(this, ModuleRes(FT_MYSQLCONNECTIONMODE))
-,m_aFT_Helptext(this, ModuleRes(FT_MYSQL_HELPTEXT))
-,m_aFT_Headertext(this, ModuleRes(FT_MYSQL_HEADERTEXT))
-{
-
-SetControlFontWeight(m_aFT_Headertext);
-   m_aRB_ODBCDatabase.SetToggleHdl(LINK(this, OMySQLIntroPageSetup, 
OnSetupModeSelected));
-   m_aRB_JDBCDatabase.SetToggleHdl(LINK(this, OMySQLIntroPageSetup, 
OnSetupModeSelected));
-m_aRB_NATIVEDatabase.SetToggleHdl(LINK(this, OMySQLIntroPageSetup, 
OnSetupModeSelected));
-FreeResource();
+:OGenericAdministrationPage(pParent, DBWizMysqlIntroPage, 
dbaccess/ui/dbwizmysqlintropage.ui, _rCoreAttrs)
+{
+get(m_pODBCDatabase, odbc);
+get(m_pJDBCDatabase, jdbc);
+get(m_pNATIVEDatabase, directly);
+
+m_pODBCDatabase-SetToggleHdl(LINK(this, OMySQLIntroPageSetup, 
OnSetupModeSelected));
+m_pJDBCDatabase-SetToggleHdl(LINK(this, OMySQLIntroPageSetup, 
OnSetupModeSelected));
+m_pNATIVEDatabase-SetToggleHdl(LINK(this, OMySQLIntroPageSetup, 
OnSetupModeSelected));
 }
 
 IMPL_LINK(OMySQLIntroPageSetup, OnSetupModeSelected, RadioButton*, 
/*_pBox*/)
@@ -260,17 +255,17 @@ using namespace ::com::sun::star;
 DbuTypeCollectionItem* pCollectionItem = 
PTR_CAST(DbuTypeCollectionItem, _rSet.GetItem(DSID_TYPECOLLECTION));
 bool bHasMySQLNative = ( pCollectionItem != NULL )  
pCollectionItem-getCollection()-hasDriver( sdbc:mysqlc: );
 if ( bHasMySQLNative )
-m_aRB_NATIVEDatabase.Show();
+m_pNATIVEDatabase-Show();
 
 // if any of the options is checked, then there's nothing to do
-if ( m_aRB_ODBCDatabase.IsChecked() || m_aRB_JDBCDatabase.IsChecked() 
|| m_aRB_NATIVEDatabase.IsChecked() )
+if ( m_pODBCDatabase-IsChecked() || m_pJDBCDatabase-IsChecked() || 
m_pNATIVEDatabase-IsChecked() )
 return;
 
 // prefer native or JDBC
 if ( bHasMySQLNative )
-m_aRB_NATIVEDatabase.Check();
+m_pNATIVEDatabase-Check();
 else
-m_aRB_JDBCDatabase.Check();
+m_pJDBCDatabase-Check();
 }
 
 void OMySQLIntroPageSetup::fillControls(::std::vector ISaveValueWrapper* 
 /*_rControlList*/)
@@ -289,9 +284,9 @@ using namespace ::com::sun::star;
 
 OMySQLIntroPageSetup::ConnectionType OMySQLIntroPageSetup::getMySQLMode()
 {
-if (m_aRB_JDBCDatabase.IsChecked())
+if (m_pJDBCDatabase-IsChecked())
 return VIA_JDBC;
-else if (m_aRB_NATIVEDatabase.IsChecked())
+else if

[Libreoffice-commits] core.git: dbaccess/source dbaccess/uiconfig dbaccess/UIConfig_dbaccess.mk

2014-07-21 Thread Caolán McNamara 
 dbaccess/UIConfig_dbaccess.mk  |1 
 dbaccess/source/ext/macromigration/dbmm_global.hrc |1 
 dbaccess/source/ext/macromigration/macromigration.hrc  |1 
 dbaccess/source/ext/macromigration/macromigration.src  |   49 
 dbaccess/source/ext/macromigration/macromigrationpages.cxx |   25 ++--
 dbaccess/source/ext/macromigration/macromigrationpages.hxx |   10 -
 dbaccess/uiconfig/ui/preparepage.ui|   72 +
 7 files changed, 93 insertions(+), 66 deletions(-)

New commits:
commit aa7d58a1e6e6f809a5372d893b70fc298a240676
Author: Caolán McNamara caol...@redhat.com
Date:   Mon Jul 21 16:26:22 2014 +0100

convert TP_PREPARE to .ui

Change-Id: Iad0c94ffd08117f79cba5d5305f03c836ac6ada9

diff --git a/dbaccess/UIConfig_dbaccess.mk b/dbaccess/UIConfig_dbaccess.mk
index 197e4a3..c6060f1 100644
--- a/dbaccess/UIConfig_dbaccess.mk
+++ b/dbaccess/UIConfig_dbaccess.mk
@@ -27,6 +27,7 @@ $(eval $(call gb_UIConfig_add_uifiles,dbaccess, \
 dbaccess/uiconfig/ui/indexdesigndialog \
 dbaccess/uiconfig/ui/joindialog \
 dbaccess/uiconfig/ui/password \
+dbaccess/uiconfig/ui/preparepage \
 dbaccess/uiconfig/ui/queryfilterdialog \
 dbaccess/uiconfig/ui/querypropertiesdialog  \
 dbaccess/uiconfig/ui/relationdialog \
diff --git a/dbaccess/source/ext/macromigration/dbmm_global.hrc 
b/dbaccess/source/ext/macromigration/dbmm_global.hrc
index 2918be1..9354332 100644
--- a/dbaccess/source/ext/macromigration/dbmm_global.hrc
+++ b/dbaccess/source/ext/macromigration/dbmm_global.hrc
@@ -38,7 +38,6 @@
 
 //= tab pages
 
-#define TP_PREPARE  ( RID_DBMM_TAPPAGE_START + 0 )
 #define TP_SAVE_DBDOC_AS( RID_DBMM_TAPPAGE_START + 1 )
 #define TP_MIGRATE  ( RID_DBMM_TAPPAGE_START + 2 )
 #define TP_SUMMARY  ( RID_DBMM_TAPPAGE_START + 3 )
diff --git a/dbaccess/source/ext/macromigration/macromigration.hrc 
b/dbaccess/source/ext/macromigration/macromigration.hrc
index d55a9e1..ada05ff 100644
--- a/dbaccess/source/ext/macromigration/macromigration.hrc
+++ b/dbaccess/source/ext/macromigration/macromigration.hrc
@@ -47,7 +47,6 @@
 //... fixed texts  ...
 
 #define FT_HEADER   1
-#define FT_INTRODUCTION 2
 #define FT_EXPLANATION  3
 #define FT_SAVE_AS_LABEL4
 #define FT_START_MIGRATION  5
diff --git a/dbaccess/source/ext/macromigration/macromigration.src 
b/dbaccess/source/ext/macromigration/macromigration.src
index 52da579..b58891c 100644
--- a/dbaccess/source/ext/macromigration/macromigration.src
+++ b/dbaccess/source/ext/macromigration/macromigration.src
@@ -51,55 +51,6 @@ ModalDialog DLG_MACRO_MIGRATION
 };
 };
 
-//= PreparationPage
-
-TabPage TP_PREPARE
-{
-HelpID = dbaccess:TabPage:TP_PREPARE;
-Pos = MAP_APPFONT( 40, 130 );
-Size = MAP_APPFONT( TAB_PAGE_WIDTH, TAB_PAGE_HEIGHT );
-
-Hide = TRUE;
-
-FixedText FT_HEADER
-{
-Pos = MAP_APPFONT( TAB_PAGE_CONTENT_MARGIN, TAB_PAGE_CONTENT_MARGIN );
-Size = MAP_APPFONT( TAB_PAGE_WIDTH - 2 * TAB_PAGE_CONTENT_MARGIN, 
FIXED_TEXT_HEIGHT );
-
-Text [ en-US ] = Welcome to the Database Macro Migration Wizard;
-};
-
-FixedText FT_INTRODUCTION
-{
-Pos = MAP_APPFONT( TAB_PAGE_CONTENT_MARGIN, CONTENT_POS_X );
-Size = MAP_APPFONT( TAB_PAGE_WIDTH - 2 * TAB_PAGE_CONTENT_MARGIN,
-TAB_PAGE_HEIGHT - CONTENT_POS_X - 
TAB_PAGE_CONTENT_MARGIN - ( 2 * FIXED_TEXT_HEIGHT - SPACING_UNRELATED ) );
-WordBreak = TRUE;
-
-Text [ en-US ] = This wizard will guide you through the task of 
migrating your macros.\n\n
-
-After you finished it, all macros which were formerly embedded 
into the forms and reports of 
-the current database document will have been moved to the 
document itself. In this course, 
-libraries will be renamed as needed.\n\n
-
-If your forms and reports contain references to those macros, 
they will be adjusted, where 
-possible.\n\n
-
-Before the migration can start, all forms, reports, queries and 
tables belonging to the document must be closed. 
-Press 'Next' to do so.;
-};
-
-FixedText FT_CLOSE_DOC_ERROR
-{
-Pos = MAP_APPFONT ( TAB_PAGE_CONTENT_MARGIN,
-TAB_PAGE_HEIGHT - TAB_PAGE_CONTENT_MARGIN - ( 2 * 
FIXED_TEXT_HEIGHT - SPACING_UNRELATED ) );
-Size = MAP_APPFONT( TAB_PAGE_WIDTH - 2 * TAB_PAGE_CONTENT_MARGIN,
-2 * FIXED_TEXT_HEIGHT - SPACING_UNRELATED );
-Text [ en-US ] = Not all objects could be closed. Please close them 
manually, and re-start the wizard.;
-hide = TRUE;
-};
-};
-
 //= SaveDBDocPage
 
 TabPage TP_SAVE_DBDOC_AS
diff --git a/dbaccess/source/ext/macromigration/macromigrationpages.cxx

[Libreoffice-commits] core.git: dbaccess/source dbaccess/uiconfig dbaccess/UIConfig_dbaccess.mk extras/source

2014-06-10 Thread sk94 
 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

2014-01-21 Thread Caolán McNamara 
 dbaccess/UIConfig_dbaccess.mk  |1 
 dbaccess/source/ui/dlg/TablesSingleDlg.cxx |   15 ++---
 dbaccess/source/ui/inc/TablesSingleDlg.hxx |2 
 dbaccess/source/ui/inc/dbu_resource.hrc|1 
 dbaccess/uiconfig/ui/tablesfilterdialog.ui |   82 +
 5 files changed, 92 insertions(+), 9 deletions(-)

New commits:
commit 9eebbbcbf7a022e252c5f34f091f3e4b398271cc
Author: Caolán McNamara caol...@redhat.com
Date:   Tue Jan 21 09:33:35 2014 +

convert OTableSubscriptionDialog to SfxSingleTabDialog

Change-Id: I8335012139ccaf58bc18d0779e63a5bc388c9fb4

diff --git a/dbaccess/UIConfig_dbaccess.mk b/dbaccess/UIConfig_dbaccess.mk
index 702b9a2..7148268 100644
--- a/dbaccess/UIConfig_dbaccess.mk
+++ b/dbaccess/UIConfig_dbaccess.mk
@@ -19,6 +19,7 @@ $(eval $(call gb_UIConfig_add_uifiles,dbaccess, \
 dbaccess/uiconfig/ui/querypropertiesdialog  \
 dbaccess/uiconfig/ui/rowheightdialog \
 dbaccess/uiconfig/ui/sortdialog \
+dbaccess/uiconfig/ui/tablesfilterdialog \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/dbaccess/source/ui/dlg/TablesSingleDlg.cxx 
b/dbaccess/source/ui/dlg/TablesSingleDlg.cxx
index f470a54..f19080e 100644
--- a/dbaccess/source/ui/dlg/TablesSingleDlg.cxx
+++ b/dbaccess/source/ui/dlg/TablesSingleDlg.cxx
@@ -42,10 +42,11 @@ OTableSubscriptionDialog::OTableSubscriptionDialog(Window* 
pParent
 ,SfxItemSet* _pItems
 ,const Reference XComponentContext  _rxORB
 ,const ::com::sun::star::uno::Any _aDataSourceName)
-:SfxNoLayoutSingleTabDialog(pParent,DLG_TABLE_FILTER,_pItems)
-,m_pImpl( new ODbDataSourceAdministrationHelper( _rxORB, pParent, this ) )
-,m_bStopExecution(sal_False)
-,m_pOutSet(_pItems)
+: SfxSingleTabDialog(pParent, _pItems, TablesFilterDialog,
+dbaccess/ui/tablesfilterdialog.ui)
+, m_pImpl( new ODbDataSourceAdministrationHelper( _rxORB, pParent, this ) )
+, m_bStopExecution(sal_False)
+, m_pOutSet(_pItems)
 {
 DBG_CTOR(OTableSubscriptionDialog,NULL);
 m_pImpl-setDataSourceOrName(_aDataSourceName);
@@ -55,9 +56,9 @@ OTableSubscriptionDialog::OTableSubscriptionDialog(Window* 
pParent
 m_pImpl-translateProperties(xDatasource, *m_pOutSet);
 SetInputSet(m_pOutSet);
 
-OTableSubscriptionPage* pTabPage = new 
OTableSubscriptionPage(this,*m_pOutSet,this);
+OTableSubscriptionPage* pTabPage = new 
OTableSubscriptionPage(get_content_area(), *m_pOutSet, this);
 pTabPage-SetServiceFactory(_rxORB);
-SetTabPage(pTabPage);
+setTabPage(pTabPage);
 }
 
 OTableSubscriptionDialog::~OTableSubscriptionDialog()
@@ -71,7 +72,7 @@ short OTableSubscriptionDialog::Execute()
 short nRet = RET_CANCEL;
 if ( !m_bStopExecution )
 {
-nRet = SfxNoLayoutSingleTabDialog::Execute();
+nRet = SfxSingleTabDialog::Execute();
 if ( nRet == RET_OK )
 {
 m_pOutSet-Put(*GetOutputItemSet());
diff --git a/dbaccess/source/ui/inc/TablesSingleDlg.hxx 
b/dbaccess/source/ui/inc/TablesSingleDlg.hxx
index 14c4ec6..ba11843 100644
--- a/dbaccess/source/ui/inc/TablesSingleDlg.hxx
+++ b/dbaccess/source/ui/inc/TablesSingleDlg.hxx
@@ -40,7 +40,7 @@ namespace dbaui
 {
 class ODbDataSourceAdministrationHelper;
 // OTableSubscriptionDialog
-class OTableSubscriptionDialog : public SfxNoLayoutSingleTabDialog, public 
IItemSetHelper
+class OTableSubscriptionDialog : public SfxSingleTabDialog, public 
IItemSetHelper
 {
 ::std::auto_ptrODbDataSourceAdministrationHelper  m_pImpl;
 sal_Bool m_bStopExecution; // set when the dialog should not be 
executed
diff --git a/dbaccess/source/ui/inc/dbu_resource.hrc 
b/dbaccess/source/ui/inc/dbu_resource.hrc
index 2905821..bbe093e 100644
--- a/dbaccess/source/ui/inc/dbu_resource.hrc
+++ b/dbaccess/source/ui/inc/dbu_resource.hrc
@@ -98,7 +98,6 @@
 #define DLG_DATABASE_TYPE_CHANGERID_DIALOG_START + 28
 #define DLG_DATABASE_WIZARD RID_DIALOG_START + 29
 #define DLG_TEXT_CONNECTION_SETTINGSRID_DIALOG_START + 31
-#define DLG_TABLE_FILTERRID_DIALOG_START + 32
 //
 // tab pages
 
diff --git a/dbaccess/uiconfig/ui/tablesfilterdialog.ui 
b/dbaccess/uiconfig/ui/tablesfilterdialog.ui
new file mode 100644
index 000..b311189
--- /dev/null
+++ b/dbaccess/uiconfig/ui/tablesfilterdialog.ui
@@ -0,0 +1,82 @@
+?xml version=1.0 encoding=UTF-8?
+!-- Generated with glade 3.16.0 on Tue Jan 21 09:32:06 2014 --
+interface
+  !-- interface-requires gtk+ 3.0 --
+  object class=GtkDialog id=TablesFilterDialog
+property name=can_focusFalse/property
+property name=border_width6/property
+property name=title translatable=yesTables Filter/property
+property name=type_hintdialog/property
+child internal-child=vbox
+  object class=GtkBox id=dialog-vbox1
+property name=can_focusFalse/property
+property

[Libreoffice-commits] core.git: dbaccess/source dbaccess/uiconfig dbaccess/UIConfig_dbaccess.mk extras/source svtools/source

2013-07-30 Thread Csikós Tamás 
 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