cui/uiconfig/ui/breaknumberoption.ui | 18 ++++++++++++++++--
cui/uiconfig/ui/calloutpage.ui | 14 ++++++++++++--
svtools/uiconfig/ui/graphicexport.ui | 18 ++++++++++++++++--
svx/uiconfig/ui/compressgraphicdialog.ui | 26 ++++++++++++++++++++------
svx/uiconfig/ui/sidebareffect.ui | 7 ++++++-
5 files changed, 70 insertions(+), 13 deletions(-)
New commits:
commit 093eb46aea59c2359d122bc8d2c2a7411e9b8a23
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Sun Nov 14 14:59:38 2021 +0000
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Mon Nov 15 11:20:27 2021 +0100
Resolves: tdf#140250 don't share adjustments between differerent spinbuttons
Change-Id: Ib684c746ff3176cf45ea9364efc12f2d6dde1f70
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125199
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/cui/uiconfig/ui/breaknumberoption.ui
b/cui/uiconfig/ui/breaknumberoption.ui
index 9400ddfac773..71fa24cb7c5b 100644
--- a/cui/uiconfig/ui/breaknumberoption.ui
+++ b/cui/uiconfig/ui/breaknumberoption.ui
@@ -9,6 +9,20 @@
<property name="step_increment">1</property>
<property name="page_increment">10</property>
</object>
+ <object class="GtkAdjustment" id="adjustment2">
+ <property name="lower">2</property>
+ <property name="upper">9</property>
+ <property name="value">1</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
+ <object class="GtkAdjustment" id="adjustment3">
+ <property name="lower">2</property>
+ <property name="upper">9</property>
+ <property name="value">1</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
<object class="GtkDialog" id="BreakNumberOption">
<property name="can_focus">False</property>
<property name="border_width">6</property>
@@ -122,7 +136,7 @@
<property name="can_focus">True</property>
<property name="halign">start</property>
<property name="activates_default">True</property>
- <property name="adjustment">adjustment1</property>
+ <property name="adjustment">adjustment2</property>
<property name="margin-start">12</property>
<property name="margin-top">6</property>
<property name="truncate-multiline">True</property>
@@ -161,7 +175,7 @@
<property name="can_focus">True</property>
<property name="halign">start</property>
<property name="activates_default">True</property>
- <property name="adjustment">adjustment1</property>
+ <property name="adjustment">adjustment3</property>
<property name="margin-start">12</property>
<property name="margin-top">6</property>
<property name="truncate-multiline">True</property>
diff --git a/cui/uiconfig/ui/calloutpage.ui b/cui/uiconfig/ui/calloutpage.ui
index 62c393d9ef01..d1e6f3e801ea 100644
--- a/cui/uiconfig/ui/calloutpage.ui
+++ b/cui/uiconfig/ui/calloutpage.ui
@@ -7,6 +7,16 @@
<property name="step_increment">0.5</property>
<property name="page_increment">10</property>
</object>
+ <object class="GtkAdjustment" id="adjustment2">
+ <property name="upper">2400</property>
+ <property name="step_increment">0.5</property>
+ <property name="page_increment">10</property>
+ </object>
+ <object class="GtkAdjustment" id="adjustment3">
+ <property name="upper">2400</property>
+ <property name="step_increment">0.5</property>
+ <property name="page_increment">10</property>
+ </object>
<object class="GtkBox" id="CalloutPage">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -230,7 +240,7 @@
<property name="can_focus">True</property>
<property name="activates_default">True</property>
<property name="text">0.00</property>
- <property name="adjustment">adjustment1</property>
+ <property name="adjustment">adjustment2</property>
<property name="digits">2</property>
<property name="truncate-multiline">True</property>
<child internal-child="accessible">
@@ -276,7 +286,7 @@
<property name="can_focus">True</property>
<property name="activates_default">True</property>
<property name="text">0.00</property>
- <property name="adjustment">adjustment1</property>
+ <property name="adjustment">adjustment3</property>
<property name="digits">2</property>
<property name="truncate-multiline">True</property>
<child internal-child="accessible">
diff --git a/svtools/uiconfig/ui/graphicexport.ui
b/svtools/uiconfig/ui/graphicexport.ui
index b14a8869a25c..223dd3dd456c 100644
--- a/svtools/uiconfig/ui/graphicexport.ui
+++ b/svtools/uiconfig/ui/graphicexport.ui
@@ -31,6 +31,20 @@
<property name="step-increment">1</property>
<property name="page-increment">10</property>
</object>
+ <object class="GtkAdjustment" id="adjustment6">
+ <property name="lower">1</property>
+ <property name="upper">100</property>
+ <property name="value">75</property>
+ <property name="step-increment">1</property>
+ <property name="page-increment">10</property>
+ </object>
+ <object class="GtkAdjustment" id="adjustment7">
+ <property name="lower">1</property>
+ <property name="upper">9</property>
+ <property name="value">9</property>
+ <property name="step-increment">1</property>
+ <property name="page-increment">10</property>
+ </object>
<object class="GtkDialog" id="GraphicExportDialog">
<property name="can-focus">False</property>
<property name="border-width">6</property>
@@ -391,7 +405,7 @@
<property name="can-focus">True</property>
<property name="valign">center</property>
<property name="hexpand">True</property>
- <property name="adjustment">adjustment1</property>
+ <property name="adjustment">adjustment6</property>
<property name="digits">0</property>
</object>
<packing>
@@ -456,7 +470,7 @@
<property name="can-focus">True</property>
<property name="valign">center</property>
<property name="hexpand">True</property>
- <property name="adjustment">adjustment2</property>
+ <property name="adjustment">adjustment7</property>
<property name="digits">0</property>
</object>
<packing>
diff --git a/svx/uiconfig/ui/compressgraphicdialog.ui
b/svx/uiconfig/ui/compressgraphicdialog.ui
index 3ecab9735f41..e86d6f476e7d 100644
--- a/svx/uiconfig/ui/compressgraphicdialog.ui
+++ b/svx/uiconfig/ui/compressgraphicdialog.ui
@@ -2,7 +2,14 @@
<!-- Generated with glade 3.20.4 -->
<interface domain="svx">
<requires lib="gtk+" version="3.20"/>
- <object class="GtkAdjustment" id="compression-adjustment">
+ <object class="GtkAdjustment" id="compression-adjustment-spin">
+ <property name="lower">1</property>
+ <property name="upper">9</property>
+ <property name="value">6</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">1</property>
+ </object>
+ <object class="GtkAdjustment" id="compression-adjustment-scale">
<property name="lower">1</property>
<property name="upper">9</property>
<property name="value">6</property>
@@ -16,7 +23,14 @@
<property name="step_increment">100</property>
<property name="page_increment">100</property>
</object>
- <object class="GtkAdjustment" id="quality-adjustment">
+ <object class="GtkAdjustment" id="quality-adjustment-spin">
+ <property name="lower">1</property>
+ <property name="upper">99</property>
+ <property name="value">80</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">5</property>
+ </object>
+ <object class="GtkAdjustment" id="quality-adjustment-scale">
<property name="lower">1</property>
<property name="upper">99</property>
<property name="value">80</property>
@@ -178,7 +192,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hexpand">True</property>
- <property
name="adjustment">quality-adjustment</property>
+ <property
name="adjustment">quality-adjustment-scale</property>
<property name="digits">0</property>
<property name="draw_value">False</property>
<property name="value_pos">right</property>
@@ -196,7 +210,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="activates_default">True</property>
- <property
name="adjustment">quality-adjustment</property>
+ <property
name="adjustment">quality-adjustment-spin</property>
<property name="numeric">True</property>
<property name="truncate-multiline">True</property>
<accessibility>
@@ -226,7 +240,7 @@
<property name="width_request">150</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property
name="adjustment">compression-adjustment</property>
+ <property
name="adjustment">compression-adjustment-scale</property>
<property name="digits">0</property>
<property name="draw_value">False</property>
<property name="value_pos">right</property>
@@ -245,7 +259,7 @@
<property name="can_focus">True</property>
<property name="activates_default">True</property>
<property name="text">6</property>
- <property
name="adjustment">compression-adjustment</property>
+ <property
name="adjustment">compression-adjustment-spin</property>
<property name="numeric">True</property>
<property name="value">6</property>
<property name="truncate-multiline">True</property>
diff --git a/svx/uiconfig/ui/sidebareffect.ui b/svx/uiconfig/ui/sidebareffect.ui
index 0c0ee28da606..78dbb5233e63 100644
--- a/svx/uiconfig/ui/sidebareffect.ui
+++ b/svx/uiconfig/ui/sidebareffect.ui
@@ -12,6 +12,11 @@
<property name="step_increment">1</property>
<property name="page_increment">10</property>
</object>
+ <object class="GtkAdjustment" id="adjustment3">
+ <property name="upper">150</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
<!-- n-columns=1 n-rows=1 -->
<object class="GtkGrid" id="EffectPropertyPanel">
<property name="visible">True</property>
@@ -185,7 +190,7 @@
<property name="can_focus">True</property>
<property name="hexpand">True</property>
<property name="truncate-multiline">True</property>
- <property name="adjustment">adjustment1</property>
+ <property name="adjustment">adjustment3</property>
</object>
<packing>
<property name="left_attach">1</property>
