dbaccess/source/ui/querydesign/querydlg.cxx | 5 ++
dbaccess/uiconfig/ui/joindialog.ui | 61 ++++++++++++++--------------
2 files changed, 36 insertions(+), 30 deletions(-)
New commits:
commit 3fc1e691c5e14f3b7a2579b563188e814f731cf6
Author: Caolán McNamara <caol...@redhat.com>
Date: Mon Sep 8 15:49:24 2014 +0100
Resolves: fdo#83501 STR_QUERY_* populate the join dialog
Change-Id: Id4cff969297009c9f9cd3323ac01c743b29ca6c4
diff --git a/dbaccess/source/ui/querydesign/querydlg.cxx
b/dbaccess/source/ui/querydesign/querydlg.cxx
index b655a9b..23db605 100644
--- a/dbaccess/source/ui/querydesign/querydlg.cxx
+++ b/dbaccess/source/ui/querydesign/querydlg.cxx
@@ -55,6 +55,11 @@ DlgQryJoin::DlgQryJoin( OQueryTableView * pParent,
, m_xConnection(_xConnection)
{
get(m_pML_HelpText, "helptext");
+ Size aSize(LogicToPixel(Size(179, 49), MAP_APPFONT));
+ //alternatively loop through the STR_QUERY_* strings with their
STR_JOIN_TYPE_HINT
+ //suffix to find the longest entry at runtime
+ m_pML_HelpText->set_height_request(aSize.Height());
+ m_pML_HelpText->set_width_request(aSize.Width());
get(m_pLB_JoinType, "type");
get(m_pCBNatural, "natural");
get(m_pPB_OK, "ok");
diff --git a/dbaccess/uiconfig/ui/joindialog.ui
b/dbaccess/uiconfig/ui/joindialog.ui
index 0c4add3..a7375e4 100644
--- a/dbaccess/uiconfig/ui/joindialog.ui
+++ b/dbaccess/uiconfig/ui/joindialog.ui
@@ -3,6 +3,36 @@
<interface>
<requires lib="gtk+" version="3.0"/>
<!-- interface-requires LibreOffice 1.0 -->
+ <object class="GtkListStore" id="liststore1">
+ <columns>
+ <!-- column-name gchararray1 -->
+ <column type="gchararray"/>
+ <!-- column-name gint1 -->
+ <column type="gint"/>
+ </columns>
+ <data>
+ <row>
+ <col id="0" translatable="yes">Inner join</col>
+ <col id="1">1</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Left join</col>
+ <col id="1">2</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Right join</col>
+ <col id="1">3</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Full (outer) join</col>
+ <col id="1">4</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Cross join</col>
+ <col id="1">5</col>
+ </row>
+ </data>
+ </object>
<object class="GtkDialog" id="JoinDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
@@ -167,6 +197,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
+ <property name="yalign">0</property>
<property name="wrap">True</property>
<property name="max_width_chars">48</property>
</object>
@@ -333,34 +364,4 @@
<widget name="type"/>
</widgets>
</object>
- <object class="GtkListStore" id="liststore1">
- <columns>
- <!-- column-name gchararray1 -->
- <column type="gchararray"/>
- <!-- column-name gint1 -->
- <column type="gint"/>
- </columns>
- <data>
- <row>
- <col id="0" translatable="yes">Inner join</col>
- <col id="1">1</col>
- </row>
- <row>
- <col id="0" translatable="yes">Left join</col>
- <col id="1">2</col>
- </row>
- <row>
- <col id="0" translatable="yes">Right join</col>
- <col id="1">3</col>
- </row>
- <row>
- <col id="0" translatable="yes">Full (outer) join</col>
- <col id="1">4</col>
- </row>
- <row>
- <col id="0" translatable="yes">Cross join</col>
- <col id="1">5</col>
- </row>
- </data>
- </object>
</interface>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
