summaryrefslogtreecommitdiff
path: root/cui
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2013-08-01 11:38:09 +0100
committerMiklos Vajna <vmiklos@suse.cz>2013-08-06 08:41:17 +0000
commitd185b1d2ae6c24ec8c9a133741ad3dba9e5dc66e (patch)
tree19d37df3dc6cffc4f7749dbe937aa6b5f942ad0f /cui
parent1a97f10084629df98606746da6401fdff3996914 (diff)
Resolves: fdo#65609 restrict width of all user-controlled edis and lists
Change-Id: I1f15e17c903daee849c53a689a8bb3465bac5f74 (cherry picked from commit 4938d06ad251e8e57ff66b185189d98587ca5104) Reviewed-on: https://gerrit.libreoffice.org/5253 Reviewed-by: Miklos Vajna <vmiklos@suse.cz> Tested-by: Miklos Vajna <vmiklos@suse.cz>
Diffstat (limited to 'cui')
-rw-r--r--cui/uiconfig/ui/acorexceptpage.ui53
-rw-r--r--cui/uiconfig/ui/acorreplacepage.ui31
2 files changed, 49 insertions, 35 deletions
diff --git a/cui/uiconfig/ui/acorexceptpage.ui b/cui/uiconfig/ui/acorexceptpage.ui
index 6f36c0ef467e..44a1632012c6 100644
--- a/cui/uiconfig/ui/acorexceptpage.ui
+++ b/cui/uiconfig/ui/acorexceptpage.ui
@@ -135,11 +135,19 @@
</packing>
</child>
<child>
- <object class="GtkTreeView" id="abbrevlist:border">
+ <object class="GtkScrolledWindow" id="scrolledwindow1">
+ <property name="width_request">1</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="hexpand">True</property>
- <property name="vexpand">True</property>
+ <property name="shadow_type">in</property>
+ <child>
+ <object class="GtkTreeView" id="abbrevlist:border">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ </object>
+ </child>
</object>
<packing>
<property name="left_attach">0</property>
@@ -208,23 +216,6 @@
</packing>
</child>
<child>
- <object class="GtkTreeView" id="doublelist: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">0</property>
- <property name="top_attach">1</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
<object class="GtkCheckButton" id="autodouble">
<property name="label" translatable="yes">A_utoInclude</property>
<property name="visible">True</property>
@@ -313,6 +304,28 @@
<property name="height">2</property>
</packing>
</child>
+ <child>
+ <object class="GtkScrolledWindow" id="scrolledwindow2">
+ <property name="width_request">1</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="shadow_type">in</property>
+ <child>
+ <object class="GtkTreeView" id="doublelist:border">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ </object>
+ </child>
+ </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>
</object>
</child>
</object>
diff --git a/cui/uiconfig/ui/acorreplacepage.ui b/cui/uiconfig/ui/acorreplacepage.ui
index f300c86fec80..199269f10f09 100644
--- a/cui/uiconfig/ui/acorreplacepage.ui
+++ b/cui/uiconfig/ui/acorreplacepage.ui
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
- <!-- interface-requires gtk+ 3.0 -->
<!-- interface-requires LibreOffice 1.0 -->
+ <!-- interface-requires gtk+ 3.0 -->
<object class="GtkGrid" id="AcorReplacePage">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -91,20 +91,6 @@
</packing>
</child>
<child>
- <object class="svtlo-SvTabListBox" id="tabview:border">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hexpand">True</property>
- <property name="vexpand">True</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">2</property>
- <property name="width">3</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>
@@ -164,6 +150,21 @@
</packing>
</child>
<child>
+ <object class="svtlo-SvTabListBox" id="tabview:border">
+ <property name="width_request">1</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ <property name="width">3</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
<placeholder/>
</child>
</object>