diff options
author | Caolán McNamara <caolanm@redhat.com> | 2021-11-14 14:59:38 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2021-11-16 11:34:26 +0100 |
commit | 482aa3d22834b246cae7bc88e3bdaba968739884 (patch) | |
tree | 7da3b58f50435055c7d6767ebeadc3ed38868d63 | |
parent | 74ff78e1e21dc83099d0dfcedba780c176c8fb3f (diff) |
Resolves: tdf#140250 don't share adjustments between differerent spinbuttons
Change-Id: Ib684c746ff3176cf45ea9364efc12f2d6dde1f70
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125131
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r-- | cui/uiconfig/ui/breaknumberoption.ui | 18 | ||||
-rw-r--r-- | cui/uiconfig/ui/calloutpage.ui | 14 | ||||
-rw-r--r-- | svtools/uiconfig/ui/graphicexport.ui | 18 | ||||
-rw-r--r-- | svx/uiconfig/ui/compressgraphicdialog.ui | 26 | ||||
-rw-r--r-- | svx/uiconfig/ui/sidebareffect.ui | 7 |
5 files changed, 70 insertions, 13 deletions
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 2a860a9a6f36..8c5042b18932 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> @@ -392,7 +406,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> @@ -457,7 +471,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 6a18fdcb5b7c..e1b21f71504d 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> |