Skip to content

C
core
Kaydet (Commit) 5c72a213 authored tarafından Caolán McNamara's avatar Caolán McNamara
Dosyalara gözat
Seçenekler

convert table filter page to .ui 

Change-Id: I7bfb7698e2a5303b492766fba564c7b9033bcc52
üst b3114106
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 92 additions and 58 deletions
dbaccess/UIConfig_dbaccess.mk
Dosyayı görüntüle @ 5c72a213
...@@ -20,6 +20,7 @@ $(eval $(call gb_UIConfig_add_uifiles,dbaccess, \ ...@@ -20,6 +20,7 @@ $(eval $(call gb_UIConfig_add_uifiles,dbaccess, \
dbaccess/uiconfig/ui/rowheightdialog \ dbaccess/uiconfig/ui/rowheightdialog \
dbaccess/uiconfig/ui/sortdialog \ dbaccess/uiconfig/ui/sortdialog \
dbaccess/uiconfig/ui/tablesfilterdialog \ dbaccess/uiconfig/ui/tablesfilterdialog \
dbaccess/uiconfig/ui/tablesfilterpage \
)) ))
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:
dbaccess/inc/dbaccess_helpid.hrc
Dosyayı görüntüle @ 5c72a213
...@@ -39,7 +39,6 @@ ...@@ -39,7 +39,6 @@
#define HID_DSADMIN_PAGE_JDBC "DBACCESS_HID_DSADMIN_PAGE_JDBC" #define HID_DSADMIN_PAGE_JDBC "DBACCESS_HID_DSADMIN_PAGE_JDBC"
#define HID_DSADMIN_PAGE_ODBC "DBACCESS_HID_DSADMIN_PAGE_ODBC" #define HID_DSADMIN_PAGE_ODBC "DBACCESS_HID_DSADMIN_PAGE_ODBC"
#define HID_DSADMIN_PAGE_TEXT "DBACCESS_HID_DSADMIN_PAGE_TEXT" #define HID_DSADMIN_PAGE_TEXT "DBACCESS_HID_DSADMIN_PAGE_TEXT"
#define HID_DSADMIN_TABLE_SUBSCRIPTION "DBACCESS_HID_DSADMIN_TABLE_SUBSCRIPTION"
#define HID_DSADMIN_DSACTIONS_NEWDS "DBACCESS_HID_DSADMIN_DSACTIONS_NEWDS" #define HID_DSADMIN_DSACTIONS_NEWDS "DBACCESS_HID_DSADMIN_DSACTIONS_NEWDS"
#define HID_DSADMIN_DSACTIONS_DELETEDS "DBACCESS_HID_DSADMIN_DSACTIONS_DELETEDS" #define HID_DSADMIN_DSACTIONS_DELETEDS "DBACCESS_HID_DSADMIN_DSACTIONS_DELETEDS"
#define HID_DSADMIN_DSACTIONS_RESTOREDS "DBACCESS_HID_DSADMIN_DSACTIONS_RESTOREDS" #define HID_DSADMIN_DSACTIONS_RESTOREDS "DBACCESS_HID_DSADMIN_DSACTIONS_RESTOREDS"
...@@ -63,7 +62,6 @@ ...@@ -63,7 +62,6 @@
#define HID_DSADMIN_ALL_TABLES "DBACCESS_HID_DSADMIN_ALL_TABLES" #define HID_DSADMIN_ALL_TABLES "DBACCESS_HID_DSADMIN_ALL_TABLES"
#define HID_DSADMIN_NO_TABLES "DBACCESS_HID_DSADMIN_NO_TABLES" #define HID_DSADMIN_NO_TABLES "DBACCESS_HID_DSADMIN_NO_TABLES"
#define HID_DSADMIN_SELECT_TABLES "DBACCESS_HID_DSADMIN_SELECT_TABLES" #define HID_DSADMIN_SELECT_TABLES "DBACCESS_HID_DSADMIN_SELECT_TABLES"
#define HID_DSADMIN_TABLE_SELECTOR "DBACCESS_HID_DSADMIN_TABLE_SELECTOR"
#define HID_DSADMIN_SUPPRESS_VERSIONCL "DBACCESS_HID_DSADMIN_SUPPRESS_VERSIONCL" #define HID_DSADMIN_SUPPRESS_VERSIONCL "DBACCESS_HID_DSADMIN_SUPPRESS_VERSIONCL"
#define HID_GENERIC_SQL_ERROR "DBACCESS_HID_GENERIC_SQL_ERROR" #define HID_GENERIC_SQL_ERROR "DBACCESS_HID_GENERIC_SQL_ERROR"
...@@ -178,7 +176,6 @@ ...@@ -178,7 +176,6 @@
#define HID_BROWSER_VIEW_CREATE_DESIGN "DBACCESS_HID_BROWSER_VIEW_CREATE_DESIGN" #define HID_BROWSER_VIEW_CREATE_DESIGN "DBACCESS_HID_BROWSER_VIEW_CREATE_DESIGN"
#define HID_DSADMIN_DOCUMENTS "DBACCESS_HID_DSADMIN_DOCUMENTS" #define HID_DSADMIN_DOCUMENTS "DBACCESS_HID_DSADMIN_DOCUMENTS"
#define HID_DSADMIN_DOCUMENTLINKS "DBACCESS_HID_DSADMIN_DOCUMENTLINKS" #define HID_DSADMIN_DOCUMENTLINKS "DBACCESS_HID_DSADMIN_DOCUMENTLINKS"
#define HID_DSADMIN_FILTER_EXPLANATION "DBACCESS_HID_DSADMIN_FILTER_EXPLANATION"
#define HID_CONFIRM_DROP_BUTTON_ALL "DBACCESS_HID_CONFIRM_DROP_BUTTON_ALL" #define HID_CONFIRM_DROP_BUTTON_ALL "DBACCESS_HID_CONFIRM_DROP_BUTTON_ALL"
#define HID_DSBROWSER_BOOKMARK_SELECTED "DBACCESS_HID_DSBROWSER_BOOKMARK_SELECTED" #define HID_DSBROWSER_BOOKMARK_SELECTED "DBACCESS_HID_DSBROWSER_BOOKMARK_SELECTED"
#define HID_DSADMIN_TABLE_TOOLBOX "DBACCESS_HID_DSADMIN_TABLE_TOOLBOX" #define HID_DSADMIN_TABLE_TOOLBOX "DBACCESS_HID_DSADMIN_TABLE_TOOLBOX"
......
dbaccess/source/ui/control/tabletree.cxx
Dosyayı görüntüle @ 5c72a213
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
#include "imageprovider.hxx" #include "imageprovider.hxx"
#include "moduledbu.hxx" #include "moduledbu.hxx"
#include "dbu_control.hrc" #include "dbu_control.hrc"
#include <vcl/layout.hxx>
#include <vcl/menu.hxx> #include <vcl/menu.hxx>
#include <connectivity/dbtools.hxx> #include <connectivity/dbtools.hxx>
#include <comphelper/types.hxx> #include <comphelper/types.hxx>
...@@ -73,6 +74,15 @@ OTableTreeListBox::OTableTreeListBox(Window* pParent, WinBits nWinStyle) ...@@ -73,6 +74,15 @@ OTableTreeListBox::OTableTreeListBox(Window* pParent, WinBits nWinStyle)
implSetDefaultImages(); implSetDefaultImages();
} }
extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeOTableTreeListBox(Window *pParent, VclBuilder::stringmap &rMap)
{
WinBits nWinStyle = 0;
OString sBorder = VclBuilder::extractCustomProperty(rMap);
if (!sBorder.isEmpty())
nWinStyle |= WB_BORDER;
return new OTableTreeListBox(pParent, nWinStyle);
}
OTableTreeListBox::OTableTreeListBox( Window* pParent, const ResId& rResId, sal_Bool _bVirtualRoot) OTableTreeListBox::OTableTreeListBox( Window* pParent, const ResId& rResId, sal_Bool _bVirtualRoot)
:OMarkableTreeListBox(pParent, rResId) :OMarkableTreeListBox(pParent, rResId)
,m_xImageProvider( new ImageProvider ) ,m_xImageProvider( new ImageProvider )
......
dbaccess/source/ui/dlg/dbadmin.hrc
Dosyayı görüntüle @ 5c72a213
...@@ -31,7 +31,6 @@ ...@@ -31,7 +31,6 @@
// FREE // FREE
#define FT_JDBCDRIVERCLASS 7 #define FT_JDBCDRIVERCLASS 7
#define FT_SPECIAL_MESSAGE 8 #define FT_SPECIAL_MESSAGE 8
#define FT_FILTER_EXPLANATION 9
#define FT_HOSTNAME 10 #define FT_HOSTNAME 10
#define FT_BASEDN 11 #define FT_BASEDN 11
#define FT_PORTNUMBER 12 #define FT_PORTNUMBER 12
...@@ -53,8 +52,6 @@ ...@@ -53,8 +52,6 @@
#define FL_SEPARATOR2 1 #define FL_SEPARATOR2 1
#define CTL_TABLESUBSCRIPTION 1
#define TLB_ACTIONS 1 #define TLB_ACTIONS 1
#define NF_PORTNUMBER 1 #define NF_PORTNUMBER 1
......
dbaccess/source/ui/dlg/dbadmin2.src
Dosyayı görüntüle @ 5c72a213
...@@ -41,52 +41,4 @@ String STR_COULD_NOT_CREATE_DIRECTORY ...@@ -41,52 +41,4 @@ String STR_COULD_NOT_CREATE_DIRECTORY
Text [ en-US ] = "The directory $name$ could not be created."; Text [ en-US ] = "The directory $name$ could not be created.";
}; };
#define EDIT_SIZE_X 50
#define FT_SIZE_X 90
#define WIN_X 220
#define WIN_Y 72
#define PAGE_X_T (PAGE_X -80)
#define PAGE_Y_T (PAGE_Y -50)
TabPage PAGE_TABLESUBSCRIPTION
{
SVLook = TRUE ;
Hide = TRUE;
Pos = MAP_APPFONT ( 0 , 0 ) ;
Size = MAP_APPFONT ( PAGE_X_T, PAGE_Y_T) ;
HelpId = HID_DSADMIN_TABLE_SUBSCRIPTION;
Text [ en-US ] = "Tables Filter" ;
FixedLine FL_SEPARATOR1
{
Pos = MAP_APPFONT ( RELATED_CONTROLS , UNRELATED_CONTROLS ) ;
Size = MAP_APPFONT ( PAGE_X_T - 2* RELATED_CONTROLS, FIXEDTEXT_HEIGHT ) ;
Text [ en-US ] = "Tables and table filter";
};
Control CTL_TABLESUBSCRIPTION
{
Pos = MAP_APPFONT ( UNRELATED_CONTROLS , UNRELATED_CONTROLS + FIXEDTEXT_HEIGHT + RELATED_CONTROLS) ;
Size = MAP_APPFONT ( PAGE_X_T - 2*UNRELATED_CONTROLS , 81 ) ;
Group = TRUE;
Border = TRUE ;
TabStop = TRUE ;
HelpId = HID_DSADMIN_TABLE_SELECTOR;
};
FixedText FT_FILTER_EXPLANATION
{
Pos = MAP_APPFONT ( UNRELATED_CONTROLS , 2*UNRELATED_CONTROLS + FIXEDTEXT_HEIGHT + RELATED_CONTROLS + 81 ) ;
Size = MAP_APPFONT ( PAGE_X_T - 2*UNRELATED_CONTROLS , 16 ) ;
HelpId = HID_DSADMIN_FILTER_EXPLANATION;
WordBreak = TRUE;
Text [ en-US ] = "Mark the tables that should be visible for the applications.";
};
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
dbaccess/source/ui/dlg/tablespage.hxx
Dosyayı görüntüle @ 5c72a213
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
#include "adminpages.hxx" #include "adminpages.hxx"
#include <com/sun/star/i18n/XCollator.hpp> #include <com/sun/star/i18n/XCollator.hpp>
#include <osl/mutex.hxx> #include <osl/mutex.hxx>
#include <vcl/fixed.hxx> #include <vcl/layout.hxx>
#include "tabletree.hxx" #include "tabletree.hxx"
#include <com/sun/star/sdbc/XConnection.hpp> #include <com/sun/star/sdbc/XConnection.hpp>
...@@ -36,9 +36,8 @@ namespace dbaui ...@@ -36,9 +36,8 @@ namespace dbaui
:public OGenericAdministrationPage :public OGenericAdministrationPage
{ {
private: private:
FixedLine m_aTables; VclContainer* m_pTables;
OTableTreeListBox m_aTablesList; OTableTreeListBox* m_pTablesList;
FixedText m_aExplanation;
OUString m_sCatalogSeparator; OUString m_sCatalogSeparator;
sal_Bool m_bCatalogAtStart : 1; sal_Bool m_bCatalogAtStart : 1;
......
dbaccess/uiconfig/ui/tablesfilterpage.ui 0 → 100644
Dosyayı görüntüle @ 5c72a213
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.16.0 on Tue Jan 21 09:48:38 2014 -->
<interface>
<!-- interface-requires gtk+ 3.0 -->
<object class="GtkFrame" id="TablesFilterPage">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
<object class="GtkAlignment" id="alignment4">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="top_padding">6</property>
<property name="left_padding">12</property>
<child>
<object class="GtkGrid" id="grid10">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="row_spacing">6</property>
<property name="column_spacing">18</property>
<child>
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Mark the tables that should be visible for the applications.</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">1</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
<object class="dbulo-OTableTreeListBox" id="treeview:border">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<child internal-child="selection">
<object class="GtkTreeSelection" id="treeview-selection1"/>
</child>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
</object>
</child>
</object>
</child>
<child type="label">
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Tables and table filter</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
</child>
</object>
</interface>
extras/source/glade/libreoffice-catalog.xml.in
Dosyayı görüntüle @ 5c72a213
...@@ -585,6 +585,10 @@ ...@@ -585,6 +585,10 @@
generic-name="DPFunctionListBox" parent="GtkTreeView" generic-name="DPFunctionListBox" parent="GtkTreeView"
icon-name="widget-gtk-treeview"/> icon-name="widget-gtk-treeview"/>
<glade-widget-class title="OTableTreeListBox" name="dbulo-OTableTreeListBox"
generic-name="OTableTreeListBox" parent="GtkTreeView"
icon-name="widget-gtk-treeview"/>
<glade-widget-class title="Recent Documents View" name="sfxlo-RecentDocsView" <glade-widget-class title="Recent Documents View" name="sfxlo-RecentDocsView"
generic-name="Icon View" parent="GtkIconView" generic-name="Icon View" parent="GtkIconView"
icon-name="widget-gtk-iconview"/> icon-name="widget-gtk-iconview"/>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment