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 0000000..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="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="border_width">6</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">12</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="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="top_padding">6</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkBox" id="box1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="charsetlabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">_Character
set</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">charset</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="dbulo-CharSetListBox" id="charset">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="charsetheader">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Data
conversion</property>
+ <attributes>
+ <attribute name="weight" value="semibold"/>
+ </attributes>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+</interface>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
