Skip to content

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

convert apply columns page to .ui format 

Change-Id: I14f12809d2e78a184ed53d6d9cee81d5f4e79ae6
üst c6ee91b9
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 188 additions and 145 deletions
dbaccess/UIConfig_dbaccess.mk
Dosyayı görüntüle @ ad26e7b2
......@@ -12,6 +12,7 @@ $(eval $(call gb_UIConfig_UIConfig,dbaccess))
$(eval $(call gb_UIConfig_add_uifiles,dbaccess, \
dbaccess/uiconfig/ui/admindialog \
dbaccess/uiconfig/ui/advancedsettingsdialog \
dbaccess/uiconfig/ui/applycolpage \
dbaccess/uiconfig/ui/choosedatasourcedialog \
dbaccess/uiconfig/ui/colwidthdialog \
dbaccess/uiconfig/ui/dbaseindexdialog \
......
dbaccess/inc/dbaccess_helpid.hrc
Dosyayı görüntüle @ ad26e7b2
......@@ -101,7 +101,6 @@
#define HID_TAB_ENT_LEN "DBACCESS_HID_TAB_ENT_LEN"
#define HID_TAB_ENT_SCALE "DBACCESS_HID_TAB_ENT_SCALE"
#define HID_BROWSER_TABLE_CREATE_DESIGN "DBACCESS_HID_BROWSER_TABLE_CREATE_DESIGN"
#define HID_TAB_WIZ_COLUMN_SELECT "DBACCESS_HID_TAB_WIZ_COLUMN_SELECT"
#define HID_TAB_WIZ_TYPE_SELECT "DBACCESS_HID_TAB_WIZ_TYPE_SELECT"
#define HID_TAB_NAMEMATCHING_COLS_AVAIL "DBACCESS_HID_TAB_NAMEMATCHING_COLS_AVAIL"
#define HID_TAB_NAMEMATCHING_COLS_ASSIGN "DBACCESS_HID_TAB_NAMEMATCHING_COLS_ASSIGN"
......
dbaccess/source/ui/inc/WColumnSelect.hxx
Dosyayı görüntüle @ ad26e7b2
......@@ -35,19 +35,17 @@ namespace dbaui
class OWizColumnSelect : public OWizardPage
{
FixedLine m_flColumns;
MultiListBox m_lbOrgColumnNames; // left side
ImageButton m_ibColumn_RH;
ImageButton m_ibColumns_RH;
ImageButton m_ibColumn_LH;
ImageButton m_ibColumns_LH;
MultiListBox m_lbNewColumnNames; // right side
ListBox* m_pOrgColumnNames; // left side
PushButton* m_pColumn_RH;
PushButton* m_pColumns_RH;
PushButton* m_pColumn_LH;
PushButton* m_pColumns_LH;
ListBox* m_pNewColumnNames; // right side
DECL_LINK( ButtonClickHdl, Button * );
DECL_LINK( ListDoubleClickHdl, MultiListBox * );
DECL_LINK( ListDoubleClickHdl, ListBox * );
void clearListBox(MultiListBox& _rListBox);
void clearListBox(ListBox& _rListBox);
void fillColumns( ListBox* pRight,
::std::vector< OUString> &_rRightColumns);
......
dbaccess/source/ui/inc/WTabPage.hxx
Dosyayı görüntüle @ ad26e7b2
......@@ -33,6 +33,7 @@ namespace dbaui
bool m_bFirstTime; // Page wird das erste mal gerufen ; should be set in the reset methode
OWizardPage( Window* pParent, const ResId& rResId );
OWizardPage( Window *pParent, const OString& rID, const OUString& rUIXMLDescription );
public:
virtual void Reset ( ) = 0;
......
dbaccess/source/ui/inc/dbu_resource.hrc
Dosyayı görüntüle @ ad26e7b2
......@@ -101,7 +101,7 @@
// FREE
#define PAGE_CONNECTION RID_PAGE_START + 6
#define PAGE_ADO RID_PAGE_START + 7
#define TAB_WIZ_COLUMN_SELECT RID_PAGE_START + 9
// FREE
#define TAB_WIZ_TYPE_SELECT RID_PAGE_START + 10
#define TAB_WIZ_NAME_MATCHING RID_PAGE_START + 11
#define TAB_WIZ_COPYTABLE RID_PAGE_START + 12
......
dbaccess/source/ui/misc/WizardPages.hrc
Dosyayı görüntüle @ ad26e7b2
......@@ -19,14 +19,8 @@
#ifndef DBAUI_WIZARD_PAGES_HRC
#define DBAUI_WIZARD_PAGES_HRC
#define LB_ORG_COLUMN_NAMES 1
#define LB_NEW_COLUMN_NAMES 2
#define IB_COLUMN_RH 1
#define IB_COLUMN_LH 2
#define IB_COLUMNS_RH 3
#define IB_COLUMNS_LH 4
#define PB_AUTO 5
#define PB_OK 6
#define PB_CANCEL 7
......@@ -50,7 +44,6 @@
#define FT_TABLENAME 4
#define FT_KEYNAME 5
#define FL_COLUMN_SELECT 1
#define FL_COLUMN_NAME 2
#define FL_AUTO_TYPE 3
#define FL_OPTIONS 5
......
dbaccess/source/ui/misc/WizardPages.src
Dosyayı görüntüle @ ad26e7b2
......@@ -98,132 +98,6 @@ ModalDialog WIZ_RTFCOPYTABLE
};
TabPage TAB_WIZ_COLUMN_SELECT
{
SVLook = TRUE ;
Size = MAP_APPFONT ( WINDOW_SIZE_X , WINDOW_SIZE_Y ) ;
HelpId = HID_TAB_WIZ_COLUMN_SELECT;
Hide = TRUE;
FixedLine FL_COLUMN_SELECT
{
Pos = MAP_APPFONT ( 6 , 3 ) ;
Size = MAP_APPFONT ( WINDOW_SIZE_X - 12 , 8 ) ;
Text [ en-US ] = "Existing columns" ;
};
MultiListBox LB_ORG_COLUMN_NAMES
{
HelpID = "dbaccess:MultiListBox:TAB_WIZ_COLUMN_SELECT:LB_ORG_COLUMN_NAMES";
Border = TRUE ;
Pos = MAP_APPFONT ( WINDOW_BORDER_X , WINDOW_BORDER_Y ) ;
Size = MAP_APPFONT ( 95 , WINDOW_SIZE_Y - 23 ) ;
TabStop = TRUE ;
HScroll = TRUE;
VScroll = TRUE;
AutoHScroll = TRUE;
SimpleMode = TRUE;
Sort = FALSE;
};
ImageButton IB_COLUMN_RH
{
HelpID = "dbaccess:ImageButton:TAB_WIZ_COLUMN_SELECT:IB_COLUMN_RH";
Pos = MAP_APPFONT ( WINDOW_BORDER_X + 116 , WINDOW_BORDER_Y + 25 ) ;
Size = MAP_APPFONT ( 20 , 14 ) ;
TabStop = TRUE ;
ButtonImage = Image
{
ImageBitmap = Bitmap
{
File = "one_right.png" ;
};
MaskColor = Color
{
Red = 0xFFFF;
Green = 0x0000;
Blue = 0xFFFF;
};
};
};
ImageButton IB_COLUMNS_RH
{
HelpID = "dbaccess:ImageButton:TAB_WIZ_COLUMN_SELECT:IB_COLUMNS_RH";
Pos = MAP_APPFONT ( WINDOW_BORDER_X + 116 , WINDOW_BORDER_Y + 45 ) ;
Size = MAP_APPFONT ( 20 , 14 ) ;
TabStop = TRUE;
DefButton = TRUE;
ButtonImage = Image
{
ImageBitmap = Bitmap
{
File = "all_right.png" ;
};
MaskColor = Color
{
Red = 0xFFFF;
Green = 0x0000;
Blue = 0xFFFF;
};
};
};
ImageButton IB_COLUMN_LH
{
HelpID = "dbaccess:ImageButton:TAB_WIZ_COLUMN_SELECT:IB_COLUMN_LH";
Pos = MAP_APPFONT ( WINDOW_BORDER_X + 116 , WINDOW_BORDER_Y + 65) ;
Size = MAP_APPFONT ( 20 , 14 ) ;
TabStop = TRUE ;
ButtonImage = Image
{
ImageBitmap = Bitmap
{
File = "one_left.png1" ;
};
MaskColor = Color
{
Red = 0xFFFF;
Green = 0x0000;
Blue = 0xFFFF;
};
};
};
ImageButton IB_COLUMNS_LH
{
HelpID = "dbaccess:ImageButton:TAB_WIZ_COLUMN_SELECT:IB_COLUMNS_LH";
Pos = MAP_APPFONT ( WINDOW_BORDER_X + 116 , WINDOW_BORDER_Y + 85) ;
Size = MAP_APPFONT ( 20 , 14 ) ;
TabStop = TRUE ;
ButtonImage = Image
{
ImageBitmap = Bitmap
{
File = "all_left.png" ;
};
MaskColor = Color
{
Red = 0xFFFF;
Green = 0x0000;
Blue = 0xFFFF;
};
};
};
MultiListBox LB_NEW_COLUMN_NAMES
{
HelpID = "dbaccess:MultiListBox:TAB_WIZ_COLUMN_SELECT:LB_NEW_COLUMN_NAMES";
Border = TRUE ;
Pos = MAP_APPFONT ( WINDOW_BORDER_X + 157, WINDOW_BORDER_Y) ;
Size = MAP_APPFONT ( 95 , WINDOW_SIZE_Y - 23 ) ;
TabStop = TRUE ;
HScroll = TRUE;
VScroll = TRUE;
AutoHScroll = TRUE;
SimpleMode = TRUE;
Sort = FALSE;
};
};
TabPage TAB_WIZ_TYPE_SELECT
{
SVLook = TRUE ;
......
dbaccess/uiconfig/ui/applycolpage.ui 0 → 100644
Dosyayı görüntüle @ ad26e7b2
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.16.1 -->
<interface>
<requires lib="gtk+" version="3.0"/>
<object class="GtkImage" id="image1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="pixbuf">dbaccess/res/all_right.png</property>
</object>
<object class="GtkImage" id="image2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="pixbuf">dbaccess/res/one_right.png</property>
</object>
<object class="GtkImage" id="image3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="pixbuf">dbaccess/res/one_left.png</property>
</object>
<object class="GtkImage" id="image4">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="pixbuf">dbaccess/res/all_left.png</property>
</object>
<object class="GtkGrid" id="ApplyColPage">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">6</property>
<child>
<object class="GtkFrame" id="frame1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
<object class="GtkAlignment" id="alignment1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="top_padding">6</property>
<property name="left_padding">12</property>
<child>
<object class="GtkGrid" id="grid1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="column_spacing">12</property>
<child>
<object class="GtkTreeView" id="from: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>
<child>
<object class="GtkTreeView" id="to:border">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
<child internal-child="selection">
<object class="GtkTreeSelection" id="treeview-selection3"/>
</child>
</object>
<packing>
<property name="left_attach">2</property>
<property name="top_attach">0</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkButtonBox" id="buttonbox1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<property name="layout_style">start</property>
<child>
<object class="GtkButton" id="colrh">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="image">image2</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkButton" id="colsrh">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="image">image1</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkButton" id="collh">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="image">image3</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
<child>
<object class="GtkButton" id="colslh">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="image">image4</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">3</property>
</packing>
</child>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">0</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
</object>
</child>
</object>
</child>
<child type="label">
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Existing columns</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
</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>
</interface>
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