sw/source/uibase/shells/tabsh.cxx | 2
sw/uiconfig/swriter/ui/sidebartableedit.ui | 228 ++++++++++-------------------
2 files changed, 81 insertions(+), 149 deletions(-)
New commits:
commit baf205e91db4356e71002581e46b1bdcc1841319
Author: Tamás Zolnai <tamas.zol...@collabora.com>
AuthorDate: Wed Oct 30 14:17:37 2019 +0100
Commit: Tamás Zolnai <tamas.zol...@collabora.com>
CommitDate: Sat Nov 2 13:26:27 2019 +0100
Table panel: Make sure Row Height spin button works with the default size
type
SwFormatFrameSize() object has ATT_VAR_SIZE size type by default, before
we change it to anything else. We will change ATT_VAR_SIZE to ATT_MIN_SIZE
when changing the row height on the sidebar panel, similar to the
row height dialog.
Change-Id: I2520340e023b910549ff2a4b011e9ae3da2b7b11
Reviewed-on: https://gerrit.libreoffice.org/81897
Tested-by: Jenkins
Reviewed-by: Tamás Zolnai <tamas.zol...@collabora.com>
diff --git a/sw/source/uibase/shells/tabsh.cxx
b/sw/source/uibase/shells/tabsh.cxx
index 57e6f99b59ec..df63915ce961 100644
--- a/sw/source/uibase/shells/tabsh.cxx
+++ b/sw/source/uibase/shells/tabsh.cxx
@@ -1123,6 +1123,8 @@ void SwTableShell::Execute(SfxRequest &rReq)
std::unique_ptr<SwFormatFrameSize> pHeight =
rSh.GetRowHeight();
if ( pHeight )
{
+ if (pHeight->GetHeightSizeType() == ATT_VAR_SIZE)
+ pHeight->SetHeightSizeType(ATT_MIN_SIZE);
pHeight->SetHeight(nNewHeight);
rSh.SetRowHeight(*pHeight);
}
commit 9b400e84b1689997378f6738b97b71b09cdb7be6
Author: Tamás Zolnai <tamas.zol...@collabora.com>
AuthorDate: Tue Oct 29 13:39:00 2019 +0100
Commit: Tamás Zolnai <tamas.zol...@collabora.com>
CommitDate: Sat Nov 2 13:26:06 2019 +0100
Table panel: Redesign the panel a bit
* Remove some labels.
* Move 'Merge Cells' button next to the insert / delete buttons.
Change-Id: Ibe0acc8e8825dbaa84464bc7347f7711f8185680
Reviewed-on: https://gerrit.libreoffice.org/81896
Tested-by: Jenkins
Reviewed-by: Tamás Zolnai <tamas.zol...@collabora.com>
diff --git a/sw/uiconfig/swriter/ui/sidebartableedit.ui
b/sw/uiconfig/swriter/ui/sidebartableedit.ui
index e48865b0f8a8..6f9c477bffd6 100644
--- a/sw/uiconfig/swriter/ui/sidebartableedit.ui
+++ b/sw/uiconfig/swriter/ui/sidebartableedit.ui
@@ -18,84 +18,57 @@
<object class="GtkBox" id="box5">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="spacing">20</property>
<child>
- <object class="GtkBox" id="box6">
+ <object class="sfxlo-SidebarToolBox" id="insert">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="orientation">vertical</property>
<child>
- <object class="GtkLabel" id="insertlabel">
+ <object class="GtkToolButton" id="insertrowsbefore">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="hexpand">True</property>
- <property name="label" translatable="yes"
context="sidebatableedit|insertlabel">Insert:</property>
+ <property
name="action_name">.uno:InsertRowsBefore</property>
<property name="use_underline">True</property>
- <property name="mnemonic_widget">insert</property>
- <property name="xalign">0</property>
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
+ <property name="homogeneous">True</property>
</packing>
</child>
<child>
- <object class="sfxlo-SidebarToolBox" id="insert">
+ <object class="GtkToolButton" id="insertrowsafter">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <child>
- <object class="GtkToolButton" id="insertrowsbefore">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property
name="action_name">.uno:InsertRowsBefore</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkToolButton" id="insertrowsafter">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property
name="action_name">.uno:InsertRowsAfter</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkToolButton" id="insertcolumnsbefore">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property
name="action_name">.uno:InsertColumnsBefore</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkToolButton" id="insertcolumnsafter">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property
name="action_name">.uno:InsertColumnsAfter</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
+ <property
name="action_name">.uno:InsertRowsAfter</property>
+ <property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id="insertcolumnsbefore">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="action_name">.uno:InsertColumnsBefore</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id="insertcolumnsafter">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property
name="action_name">.uno:InsertColumnsAfter</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
</packing>
</child>
</object>
@@ -106,81 +79,75 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="box7">
+ <object class="sfxlo-SidebarToolBox" id="delete">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="orientation">vertical</property>
<child>
- <object class="GtkLabel" id="deletelabel">
+ <object class="GtkToolButton" id="deleterows">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="hexpand">True</property>
- <property name="label" translatable="yes"
context="sidebatableedit|deletelabel">Delete:</property>
+ <property name="action_name">.uno:DeleteRows</property>
<property name="use_underline">True</property>
- <property name="mnemonic_widget">delete</property>
- <property name="xalign">0</property>
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
+ <property name="homogeneous">True</property>
</packing>
</child>
<child>
- <object class="sfxlo-SidebarToolBox" id="delete">
+ <object class="GtkToolButton" id="deletecolumns">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <child>
- <object class="GtkToolButton" id="deleterows">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:DeleteRows</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkToolButton" id="deletecolumns">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property
name="action_name">.uno:DeleteColumns</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkToolButton" id="deletetable">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property
name="action_name">.uno:DeleteTable</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
+ <property name="action_name">.uno:DeleteColumns</property>
+ <property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id="deletetable">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:DeleteTable</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="pack_type">end</property>
<property name="position">1</property>
</packing>
</child>
+ <child>
+ <object class="sfxlo-SidebarToolBox" id="merge">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkToolButton" id="mergecells">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:MergeCells</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ </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">0</property>
@@ -192,7 +159,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
- <property name="label" translatable="yes"
context="sidebatableedit|deletelabel">Size:</property>
+ <property name="label" translatable="yes"
context="sidebatableedit|sizelabel">Size:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">box3</property>
<property name="xalign">0</property>
@@ -235,7 +202,7 @@
<property name="text">0</property>
<child internal-child="accessible">
<object class="AtkObject" id="rowheight-atkobject">
- <property name="AtkObject::accessible-name"
translatable="yes" context="sidebatableedit|rowheight-atkobject">Row
Height</property>
+ <property name="AtkObject::accessible-name"
translatable="yes" context="rowheight-atkobject">Row Height</property>
</object>
</child>
</object>
@@ -281,7 +248,7 @@
<property name="text">0</property>
<child internal-child="accessible">
<object class="AtkObject" id="columnwidth-atkobject">
- <property name="AtkObject::accessible-name"
translatable="yes" context="sidebatableedit|columnwidth-atkobject">Column
Width</property>
+ <property name="AtkObject::accessible-name"
translatable="yes" context="columnwidth-atkobject">Column Width</property>
</object>
</child>
</object>
@@ -411,43 +378,6 @@
<property name="top_attach">3</property>
</packing>
</child>
- <child>
- <object class="GtkLabel" id="layoutlabel">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="hexpand">True</property>
- <property name="label" translatable="yes"
context="sidebatableedit|deletelabel">Layout:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">layouting</property>
- <property name="xalign">0</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">4</property>
- </packing>
- </child>
- <child>
- <object class="sfxlo-SidebarToolBox" id="layouting">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <object class="GtkToolButton" id="mergecells">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:MergeCells</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">5</property>
- </packing>
- </child>
</object>
<packing>
<property name="left_attach">0</property>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
