summaryrefslogtreecommitdiff
path: root/sw/uiconfig
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2018-12-14 14:52:04 +0000
committerCaolán McNamara <caolanm@redhat.com>2018-12-20 09:51:15 +0100
commit4e6be990eaf6a524740299e8d00fb5401c1a21c0 (patch)
tree2b3cf7708eef105d8e3cad039ff1e6109342c667 /sw/uiconfig
parent009108aa53896ccd3a2bad4380654d22f7c2206f (diff)
weld SwTOXEntryTabPage
Change-Id: Ib093fbb78a73b26060613ea72030e92f7d3681a5 Reviewed-on: https://gerrit.libreoffice.org/65325 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw/uiconfig')
-rw-r--r--sw/uiconfig/swriter/ui/tocentriespage.ui67
-rw-r--r--sw/uiconfig/swriter/ui/tokenwidget.ui27
-rw-r--r--sw/uiconfig/swriter/ui/toxbuttonwidget.ui10
-rw-r--r--sw/uiconfig/swriter/ui/toxentrywidget.ui11
4 files changed, 95 insertions, 20 deletions
diff --git a/sw/uiconfig/swriter/ui/tocentriespage.ui b/sw/uiconfig/swriter/ui/tocentriespage.ui
index 907ec3209d7d..dba1ae33f18c 100644
--- a/sw/uiconfig/swriter/ui/tocentriespage.ui
+++ b/sw/uiconfig/swriter/ui/tocentriespage.ui
@@ -1,8 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
+<!-- Generated with glade 3.22.1 -->
<interface domain="sw">
<requires lib="gtk+" version="3.18"/>
<requires lib="LibreOffice" version="1.0"/>
+ <object class="GtkTreeStore" id="liststore1">
+ <columns>
+ <!-- column-name text -->
+ <column type="gchararray"/>
+ <!-- column-name id -->
+ <column type="gchararray"/>
+ </columns>
+ </object>
<object class="GtkAdjustment" id="adjustment1">
<property name="upper">19.989999999999998</property>
<property name="step_increment">0.050000000000000003</property>
@@ -73,12 +81,33 @@
<property name="top_padding">6</property>
<property name="left_padding">12</property>
<child>
- <object class="swuilo-SwIdxTreeListBox" id="level:border">
+ <object class="GtkScrolledWindow">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="vexpand">True</property>
- <child internal-child="selection">
- <object class="GtkTreeSelection" id="treeview-selection1"/>
+ <property name="shadow_type">in</property>
+ <child>
+ <object class="GtkTreeView" id="level">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="model">liststore1</property>
+ <property name="headers_visible">False</property>
+ <property name="headers_clickable">False</property>
+ <property name="search_column">0</property>
+ <property name="show_expanders">False</property>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection" id="treeview-selection1"/>
+ </child>
+ <child>
+ <object class="GtkTreeViewColumn" id="treeviewcolumn1">
+ <child>
+ <object class="GtkCellRendererText" id="cellrenderertext1"/>
+ <attributes>
+ <attribute name="text">0</attribute>
+ </attributes>
+ </child>
+ </object>
+ </child>
+ </object>
</child>
</object>
</child>
@@ -189,7 +218,7 @@
</packing>
</child>
<child>
- <object class="swuilo-SwTokenWindow" id="token">
+ <object class="GtkBox" id="token">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
@@ -276,6 +305,7 @@
<child internal-child="entry">
<object class="GtkEntry" id="comboboxtext-entry">
<property name="can_focus">False</property>
+ <property name="activates_default">True</property>
</object>
</child>
</object>
@@ -290,7 +320,7 @@
<property name="can_focus">False</property>
<property name="label" translatable="yes" context="tocentriespage|tabstopposft">Tab stop position:</property>
<property name="use_underline">True</property>
- <property name="mnemonic_widget">tabstoppos:0.00cm</property>
+ <property name="mnemonic_widget">tabstoppos</property>
<property name="xalign">0</property>
</object>
<packing>
@@ -299,11 +329,12 @@
</packing>
</child>
<child>
- <object class="GtkSpinButton" id="tabstoppos:0.00cm">
+ <object class="GtkSpinButton" id="tabstoppos">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="halign">start</property>
<property name="hexpand">True</property>
+ <property name="activates_default">True</property>
<property name="adjustment">adjustment1</property>
<property name="digits">2</property>
</object>
@@ -378,6 +409,7 @@
<property name="can_focus">True</property>
<property name="halign">start</property>
<property name="hexpand">True</property>
+ <property name="activates_default">True</property>
<property name="adjustment">adjustment2</property>
</object>
<packing>
@@ -885,13 +917,12 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_underline">True</property>
<property name="tooltip_text" translatable="yes" context="tocentriespage|up1cb|tooltip_text">Ascending</property>
<property name="image">image1</property>
+ <property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
- <property name="group">down1cb</property>
</object>
<packing>
<property name="left_attach">2</property>
@@ -903,9 +934,9 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_underline">True</property>
<property name="tooltip_text" translatable="yes" context="tocentriespage|down1cb|tooltip_text">Descending</property>
<property name="image">image2</property>
+ <property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
<property name="group">up1cb</property>
@@ -920,13 +951,13 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_underline">True</property>
<property name="has_tooltip">True</property>
<property name="tooltip_text" translatable="yes" context="tocentriespage|up2cb|tooltip_text">Ascending</property>
<property name="image">image3</property>
+ <property name="use_underline">True</property>
<property name="xalign">0</property>
+ <property name="active">True</property>
<property name="draw_indicator">True</property>
- <property name="group">down2cb</property>
</object>
<packing>
<property name="left_attach">2</property>
@@ -938,13 +969,13 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_underline">True</property>
<property name="has_tooltip">True</property>
<property name="tooltip_text" translatable="yes" context="tocentriespage|up3cb|tooltip_text">Ascending</property>
<property name="image">image4</property>
+ <property name="use_underline">True</property>
<property name="xalign">0</property>
+ <property name="active">True</property>
<property name="draw_indicator">True</property>
- <property name="group">down3cb</property>
</object>
<packing>
<property name="left_attach">2</property>
@@ -956,10 +987,10 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_underline">True</property>
<property name="has_tooltip">True</property>
<property name="tooltip_text" translatable="yes" context="tocentriespage|down2cb|tooltip_text">Descending</property>
<property name="image">image5</property>
+ <property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
<property name="group">up2cb</property>
@@ -974,10 +1005,10 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
- <property name="use_underline">True</property>
<property name="has_tooltip">True</property>
<property name="tooltip_text" translatable="yes" context="tocentriespage|down3cb|tooltip_text">Descending</property>
<property name="image">image6</property>
+ <property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
<property name="group">up3cb</property>
@@ -1024,7 +1055,7 @@
<object class="GtkSizeGroup" id="sizegroup1">
<widgets>
<widget name="fillchar"/>
- <widget name="tabstoppos:0.00cm"/>
+ <widget name="tabstoppos"/>
</widgets>
</object>
</interface>
diff --git a/sw/uiconfig/swriter/ui/tokenwidget.ui b/sw/uiconfig/swriter/ui/tokenwidget.ui
index dc928e492db0..0ff2bb068aae 100644
--- a/sw/uiconfig/swriter/ui/tokenwidget.ui
+++ b/sw/uiconfig/swriter/ui/tokenwidget.ui
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.22.1 -->
<interface domain="sw">
<requires lib="gtk+" version="3.18"/>
<object class="GtkImage" id="image1">
@@ -14,6 +15,7 @@
<object class="GtkBox" id="TokenWidget">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="hexpand">True</property>
<property name="spacing">12</property>
<child>
<object class="GtkButton" id="left">
@@ -29,10 +31,31 @@
</packing>
</child>
<child>
- <object class="GtkDrawingArea" id="ctrl">
+ <object class="GtkScrolledWindow" id="scrollwin">
+ <property name="width_request">5</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can_focus">True</property>
<property name="hexpand">True</property>
+ <property name="hscrollbar_policy">external</property>
+ <property name="vscrollbar_policy">never</property>
+ <property name="shadow_type">in</property>
+ <child>
+ <object class="GtkViewport">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <child>
+ <object class="GtkGrid" id="ctrl">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
</object>
<packing>
<property name="expand">True</property>
diff --git a/sw/uiconfig/swriter/ui/toxbuttonwidget.ui b/sw/uiconfig/swriter/ui/toxbuttonwidget.ui
new file mode 100644
index 000000000000..061a130ad878
--- /dev/null
+++ b/sw/uiconfig/swriter/ui/toxbuttonwidget.ui
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.22.1 -->
+<interface domain="sw">
+ <requires lib="gtk+" version="3.18"/>
+ <object class="GtkToggleButton" id="button">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ </object>
+</interface>
diff --git a/sw/uiconfig/swriter/ui/toxentrywidget.ui b/sw/uiconfig/swriter/ui/toxentrywidget.ui
new file mode 100644
index 000000000000..e647b1df72e0
--- /dev/null
+++ b/sw/uiconfig/swriter/ui/toxentrywidget.ui
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.22.1 -->
+<interface domain="sw">
+ <requires lib="gtk+" version="3.18"/>
+ <object class="GtkEntry" id="entry">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="width_chars">1</property>
+ </object>
+</interface>