cui/uiconfig/ui/optfltrembedpage.ui | 10 +++-------
cui/uiconfig/ui/optlingupage.ui | 4 +++-
sc/uiconfig/scalc/ui/filterdropdown.ui | 8 ++++++--
sw/uiconfig/swriter/ui/optcaptionpage.ui | 5 ++++-
sw/uiconfig/swriter/ui/optcompatpage.ui | 5 ++++-
vcl/unx/gtk3/gtkinst.cxx | 1 +
6 files changed, 21 insertions(+), 12 deletions(-)
New commits:
commit 635514553abdd830951d3ba91651c9f0b208360b
Author: Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Wed Aug 28 17:26:22 2024 +0100
Commit: Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Thu Aug 29 09:03:29 2024 +0200
Resolves: tdf#162659 toggle buttons have no "weight" property
so those extra columns don't make sense, they make sense if those
were text entries.
and add sensitive as a property we expect to see in tree/list-stores if
sensitivity or later properties are used.
Checking all the existing cases shows the only other cases like this are
where we've just used the -1 'col' arg to set all columns to the desired
sensitivity and previously shared a single sensitive property between
checkboxes and the main 'text' case.
Change-Id: I0b22fb93b935a06bfcda6f6a3169df0e24d8b9e9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/172546
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
Tested-by: Caolán McNamara <caolan.mcnam...@collabora.com>
diff --git a/cui/uiconfig/ui/optfltrembedpage.ui
b/cui/uiconfig/ui/optfltrembedpage.ui
index 899825752e99..9bdff46c1491 100644
--- a/cui/uiconfig/ui/optfltrembedpage.ui
+++ b/cui/uiconfig/ui/optfltrembedpage.ui
@@ -28,10 +28,6 @@
<column type="gboolean"/>
<!-- column-name weight1 -->
<column type="gint"/>
- <!-- column-name weight2 -->
- <column type="gint"/>
- <!-- column-name weight3 -->
- <column type="gint"/>
<!-- column-name sensitive1 -->
<column type="gboolean"/>
<!-- column-name sensitive2 -->
@@ -96,7 +92,7 @@
<child>
<object class="GtkCellRendererToggle"
id="cellrenderer5"/>
<attributes>
- <attribute name="sensitive">14</attribute>
+ <attribute name="sensitive">12</attribute>
<attribute name="visible">5</attribute>
<attribute name="active">0</attribute>
</attributes>
@@ -104,7 +100,7 @@
<child>
<object class="GtkCellRendererToggle"
id="cellrenderer8"/>
<attributes>
- <attribute name="sensitive">15</attribute>
+ <attribute name="sensitive">13</attribute>
<attribute name="visible">6</attribute>
<attribute name="active">1</attribute>
</attributes>
@@ -120,7 +116,7 @@
<child>
<object class="GtkCellRendererToggle"
id="cellrenderer7"/>
<attributes>
- <attribute name="sensitive">16</attribute>
+ <attribute name="sensitive">14</attribute>
<attribute name="visible">7</attribute>
<attribute name="active">2</attribute>
</attributes>
diff --git a/cui/uiconfig/ui/optlingupage.ui b/cui/uiconfig/ui/optlingupage.ui
index ad8ee3da1ca7..e1b1868e0f90 100644
--- a/cui/uiconfig/ui/optlingupage.ui
+++ b/cui/uiconfig/ui/optlingupage.ui
@@ -46,6 +46,8 @@
<column type="gint"/>
<!-- column-name sensitive1 -->
<column type="gboolean"/>
+ <!-- column-name sensitive2 -->
+ <column type="gboolean"/>
</columns>
</object>
<!-- n-columns=1 n-rows=3 -->
@@ -416,7 +418,7 @@
<child>
<object class="GtkCellRendererText"
id="cellrenderer444"/>
<attributes>
- <attribute name="sensitive">6</attribute>
+ <attribute name="sensitive">7</attribute>
<attribute name="text">1</attribute>
</attributes>
</child>
diff --git a/sc/uiconfig/scalc/ui/filterdropdown.ui
b/sc/uiconfig/scalc/ui/filterdropdown.ui
index 8fa9e8f98395..403a270150df 100644
--- a/sc/uiconfig/scalc/ui/filterdropdown.ui
+++ b/sc/uiconfig/scalc/ui/filterdropdown.ui
@@ -58,6 +58,8 @@
<column type="gint"/>
<!-- column-name sensitive1 -->
<column type="gboolean"/>
+ <!-- column-name sensitive2 -->
+ <column type="gboolean"/>
</columns>
</object>
<object class="GtkTreeStore" id="treestore2">
@@ -76,6 +78,8 @@
<column type="gint"/>
<!-- column-name sensitive1 -->
<column type="gboolean"/>
+ <!-- column-name sensitive2 -->
+ <column type="gboolean"/>
</columns>
</object>
<object class="GtkPopover" id="FilterDropDown">
@@ -321,7 +325,7 @@
<child>
<object class="GtkCellRendererText"
id="cellrenderer4"/>
<attributes>
- <attribute name="sensitive">6</attribute>
+ <attribute name="sensitive">7</attribute>
<attribute name="text">1</attribute>
</attributes>
</child>
@@ -373,7 +377,7 @@
<child>
<object class="GtkCellRendererText"
id="cellrenderer2"/>
<attributes>
- <attribute name="sensitive">6</attribute>
+ <attribute name="sensitive">7</attribute>
<attribute name="text">1</attribute>
</attributes>
</child>
diff --git a/sw/uiconfig/swriter/ui/optcaptionpage.ui
b/sw/uiconfig/swriter/ui/optcaptionpage.ui
index 29dc5ec08c69..4577a33eeb06 100644
--- a/sw/uiconfig/swriter/ui/optcaptionpage.ui
+++ b/sw/uiconfig/swriter/ui/optcaptionpage.ui
@@ -18,6 +18,8 @@
<column type="gint"/>
<!-- column-name sensitive1 -->
<column type="gboolean"/>
+ <!-- column-name sensitive2 -->
+ <column type="gboolean"/>
</columns>
</object>
<object class="GtkBox" id="OptCaptionPage">
@@ -612,6 +614,7 @@
<object class="GtkCellRendererToggle"
id="cellrenderer2"/>
<attributes>
<attribute name="active">0</attribute>
+ <attribute name="sensitive">6</attribute>
</attributes>
</child>
</object>
@@ -625,7 +628,7 @@
<child>
<object class="GtkCellRendererText"
id="cellrenderer1"/>
<attributes>
- <attribute name="sensitive">6</attribute>
+ <attribute name="sensitive">7</attribute>
<attribute name="text">1</attribute>
</attributes>
</child>
diff --git a/sw/uiconfig/swriter/ui/optcompatpage.ui
b/sw/uiconfig/swriter/ui/optcompatpage.ui
index 4d55aa3195fc..4cbd6b66516f 100644
--- a/sw/uiconfig/swriter/ui/optcompatpage.ui
+++ b/sw/uiconfig/swriter/ui/optcompatpage.ui
@@ -18,6 +18,8 @@
<column type="gint"/>
<!-- column-name sensitive1 -->
<column type="gboolean"/>
+ <!-- column-name sensitive2 -->
+ <column type="gboolean"/>
</columns>
</object>
<object class="GtkBox" id="OptCompatPage">
@@ -75,6 +77,7 @@
<attribute name="visible">3</attribute>
<attribute name="active">0</attribute>
<attribute name="inconsistent">4</attribute>
+ <attribute name="sensitive">7</attribute>
</attributes>
</child>
</object>
@@ -86,7 +89,7 @@
<child>
<object class="GtkCellRendererText"
id="cellrenderer4"/>
<attributes>
- <attribute name="sensitive">6</attribute>
+ <attribute name="sensitive">7</attribute>
<attribute name="text">1</attribute>
</attributes>
</child>
diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx
index 3b126c094035..2c54e1662e41 100644
--- a/vcl/unx/gtk3/gtkinst.cxx
+++ b/vcl/unx/gtk3/gtkinst.cxx
@@ -15017,6 +15017,7 @@ public:
g_signal_connect(G_OBJECT(pCellRenderer), "toggled",
G_CALLBACK(signalCellToggled), this);
m_aToggleVisMap[nIndex] = -1;
m_aToggleTriStateMap[nIndex] = -1;
+ m_aSensitiveMap[nIndex] = -1;
}
else if (GTK_IS_CELL_RENDERER_PIXBUF(pCellRenderer))
{
