[Libreoffice-commits] core.git: 2 commits - helpcontent2 sc/uiconfig
Heiko Tietze (via logerrit)
logerrit at kemper.freedesktop.org
Thu Sep 16 10:07:13 UTC 2021
helpcontent2 | 2
sc/uiconfig/scalc/ui/pastespecial.ui | 299 ++++++++++++++++++-----------------
2 files changed, 158 insertions(+), 143 deletions(-)
New commits:
commit 870e3cd6e34cca39fc9a9da335b9c1618ca50355
Author: Heiko Tietze <tietze.heiko at gmail.com>
AuthorDate: Thu Sep 2 11:28:26 2021 +0200
Commit: Heiko Tietze <heiko.tietze at documentfoundation.org>
CommitDate: Thu Sep 16 12:06:41 2021 +0200
Resolves tdf#144442 - Rearrangement at paste special dialog
Change-Id: I935b67f2159f7a35e28ea2b7b7eb707f0a1548de
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121507
Tested-by: Jenkins
Reviewed-by: Heiko Tietze <heiko.tietze at documentfoundation.org>
diff --git a/sc/uiconfig/scalc/ui/pastespecial.ui b/sc/uiconfig/scalc/ui/pastespecial.ui
index 78573fecab81..2151d1042f1f 100644
--- a/sc/uiconfig/scalc/ui/pastespecial.ui
+++ b/sc/uiconfig/scalc/ui/pastespecial.ui
@@ -95,11 +95,12 @@
</packing>
</child>
<child>
- <!-- n-columns=2 n-rows=1 -->
+ <!-- n-columns=3 n-rows=1 -->
<object class="GtkGrid" id="grid1">
<property name="visible">True</property>
<property name="can-focus">False</property>
- <property name="column-spacing">12</property>
+ <property name="row-spacing">6</property>
+ <property name="column-spacing">24</property>
<child>
<object class="GtkFrame" id="frmPresets">
<property name="visible">True</property>
@@ -238,30 +239,27 @@
</packing>
</child>
<child>
- <!-- n-columns=2 n-rows=3 -->
- <object class="GtkGrid">
+ <object class="GtkBox">
<property name="visible">True</property>
<property name="can-focus">False</property>
- <property name="vexpand">True</property>
- <property name="row-spacing">12</property>
- <property name="column-spacing">6</property>
+ <property name="valign">start</property>
+ <property name="orientation">vertical</property>
<child>
<object class="GtkFrame" id="frmPaste">
<property name="visible">True</property>
<property name="can-focus">False</property>
+ <property name="margin-bottom">12</property>
<property name="vexpand">True</property>
<property name="label-xalign">0</property>
<property name="shadow-type">none</property>
<child>
- <!-- n-columns=2 n-rows=4 -->
+ <!-- n-columns=1 n-rows=8 -->
<object class="GtkGrid">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="margin-start">12</property>
<property name="margin-top">3</property>
- <property name="margin-bottom">6</property>
<property name="row-spacing">6</property>
- <property name="column-spacing">6</property>
<child>
<object class="GtkCheckButton" id="paste_all">
<property name="label" translatable="yes" context="pastespecial|paste_all">_All</property>
@@ -281,25 +279,6 @@
<property name="top-attach">0</property>
</packing>
</child>
- <child>
- <object class="GtkCheckButton" id="comments">
- <property name="label" translatable="yes" context="pastespecial|comments">_Comments</property>
- <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="draw-indicator">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="comments-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="pastespecial|extended_tip|comments">Inserts comments that are attached to cells. If you want to add the comments to the existing cell content, select the "Add" operation.</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="left-attach">1</property>
- <property name="top-attach">1</property>
- </packing>
- </child>
<child>
<object class="GtkCheckButton" id="numbers">
<property name="label" translatable="yes" context="pastespecial|numbers">_Numbers</property>
@@ -372,8 +351,27 @@
</child>
</object>
<packing>
- <property name="left-attach">1</property>
- <property name="top-attach">0</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">4</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="comments">
+ <property name="label" translatable="yes" context="pastespecial|comments">_Comments</property>
+ <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="draw-indicator">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="comments-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="pastespecial|extended_tip|comments">Inserts comments that are attached to cells. If you want to add the comments to the existing cell content, select the "Add" operation.</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left-attach">0</property>
+ <property name="top-attach">5</property>
</packing>
</child>
<child>
@@ -391,8 +389,8 @@
</child>
</object>
<packing>
- <property name="left-attach">1</property>
- <property name="top-attach">2</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">6</property>
</packing>
</child>
<child>
@@ -410,8 +408,8 @@
</child>
</object>
<packing>
- <property name="left-attach">1</property>
- <property name="top-attach">3</property>
+ <property name="left-attach">0</property>
+ <property name="top-attach">7</property>
</packing>
</child>
</object>
@@ -428,14 +426,127 @@
</child>
</object>
<packing>
- <property name="left-attach">0</property>
- <property name="top-attach">0</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
</packing>
</child>
+ <child>
+ <object class="GtkFrame" id="frmShift">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="margin-bottom">12</property>
+ <property name="vexpand">True</property>
+ <property name="label-xalign">0</property>
+ <property name="shadow-type">none</property>
+ <child>
+ <object class="GtkBox" id="box2">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="margin-start">12</property>
+ <property name="margin-top">3</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">3</property>
+ <child>
+ <object class="GtkRadioButton" id="no_shift">
+ <property name="label" translatable="yes" context="pastespecial|no_shift">Don't sh_ift</property>
+ <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="active">True</property>
+ <property name="draw-indicator">True</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="no_shift-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="pastespecial|extended_tip|no_shift">Inserted cells replace the target cells.</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="move_down">
+ <property name="label" translatable="yes" context="pastespecial|move_down">_Down</property>
+ <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="draw-indicator">True</property>
+ <property name="group">no_shift</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="move_down-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="pastespecial|extended_tip|move_down">Target cells are shifted downward when you insert cells from the clipboard.</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton" id="move_right">
+ <property name="label" translatable="yes" context="pastespecial|move_right">_Right</property>
+ <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="draw-indicator">True</property>
+ <property name="group">no_shift</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="move_right-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes" context="pastespecial|extended_tip|move_right">Target cells are shifted to the right when you insert cells from the clipboard.</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel" id="label4">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="label" translatable="yes" context="pastespecial|label4">Shift Cells</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="left-attach">1</property>
+ <property name="top-attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="valign">start</property>
+ <property name="orientation">vertical</property>
+ <property name="baseline-position">top</property>
<child>
<object class="GtkFrame" id="frmOptions">
<property name="visible">True</property>
<property name="can-focus">False</property>
+ <property name="margin-bottom">12</property>
<property name="vexpand">True</property>
<property name="label-xalign">0</property>
<property name="shadow-type">none</property>
@@ -446,7 +557,6 @@
<property name="can-focus">False</property>
<property name="margin-start">12</property>
<property name="margin-top">3</property>
- <property name="margin-bottom">6</property>
<property name="row-spacing">6</property>
<child>
<object class="GtkCheckButton" id="link">
@@ -520,14 +630,16 @@
</child>
</object>
<packing>
- <property name="left-attach">1</property>
- <property name="top-attach">0</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkFrame" id="frmOperations">
<property name="visible">True</property>
<property name="can-focus">False</property>
+ <property name="margin-bottom">12</property>
<property name="vexpand">True</property>
<property name="label-xalign">0</property>
<property name="shadow-type">none</property>
@@ -537,7 +649,7 @@
<property name="can-focus">False</property>
<property name="margin-start">12</property>
<property name="margin-top">3</property>
- <property name="margin-bottom">6</property>
+ <property name="orientation">vertical</property>
<property name="spacing">3</property>
<child>
<object class="GtkRadioButton" id="none">
@@ -658,111 +770,14 @@
</child>
</object>
<packing>
- <property name="left-attach">0</property>
- <property name="top-attach">1</property>
- <property name="width">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkFrame" id="frmShift">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <property name="vexpand">True</property>
- <property name="label-xalign">0</property>
- <property name="shadow-type">none</property>
- <child>
- <object class="GtkBox" id="box2">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <property name="margin-start">12</property>
- <property name="margin-top">3</property>
- <property name="margin-bottom">6</property>
- <property name="spacing">3</property>
- <child>
- <object class="GtkRadioButton" id="no_shift">
- <property name="label" translatable="yes" context="pastespecial|no_shift">Don't sh_ift</property>
- <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="active">True</property>
- <property name="draw-indicator">True</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="no_shift-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="pastespecial|extended_tip|no_shift">Inserted cells replace the target cells.</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkRadioButton" id="move_down">
- <property name="label" translatable="yes" context="pastespecial|move_down">_Down</property>
- <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="draw-indicator">True</property>
- <property name="group">no_shift</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="move_down-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="pastespecial|extended_tip|move_down">Target cells are shifted downward when you insert cells from the clipboard.</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkRadioButton" id="move_right">
- <property name="label" translatable="yes" context="pastespecial|move_right">_Right</property>
- <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="draw-indicator">True</property>
- <property name="group">no_shift</property>
- <child internal-child="accessible">
- <object class="AtkObject" id="move_right-atkobject">
- <property name="AtkObject::accessible-description" translatable="yes" context="pastespecial|extended_tip|move_right">Target cells are shifted to the right when you insert cells from the clipboard.</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">2</property>
- </packing>
- </child>
- </object>
- </child>
- <child type="label">
- <object class="GtkLabel" id="label4">
- <property name="visible">True</property>
- <property name="can-focus">False</property>
- <property name="label" translatable="yes" context="pastespecial|label4">Shift Cells</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
- </object>
- </child>
- </object>
- <packing>
- <property name="left-attach">0</property>
- <property name="top-attach">2</property>
- <property name="width">2</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
</packing>
</child>
</object>
<packing>
- <property name="left-attach">1</property>
+ <property name="left-attach">2</property>
<property name="top-attach">0</property>
</packing>
</child>
commit 0fe197765e489f2a8df499f8f8faf8056fc33394
Author: Rafael Lima <rafael.palma.lima at gmail.com>
AuthorDate: Thu Sep 16 12:06:39 2021 +0200
Commit: Gerrit Code Review <gerrit at gerrit.libreoffice.org>
CommitDate: Thu Sep 16 12:06:39 2021 +0200
Update git submodules
* Update helpcontent2 from branch 'master'
to c8c6952d809ccc08b89b8d5ac5e603e5ec00ec20
- Minor fixes in help files (sbasic)
Change-Id: Ifb4a91bfeb1ca8f7e67e9affa30b1e29028b4731
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/122071
Tested-by: Jenkins
Reviewed-by: Olivier Hallot <olivier.hallot at libreoffice.org>
diff --git a/helpcontent2 b/helpcontent2
index 446fbc68aaf1..c8c6952d809c 160000
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 446fbc68aaf1ddc03e3b8c176d943c5f5ca09ade
+Subproject commit c8c6952d809ccc08b89b8d5ac5e603e5ec00ec20
More information about the Libreoffice-commits
mailing list