[gnumeric] Format Cells: move underline selection mostly to the font selector.
- From: Morten Welinder <mortenw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnumeric] Format Cells: move underline selection mostly to the font selector.
- Date: Thu, 21 Mar 2013 14:58:42 +0000 (UTC)
commit 393f103184df0f886ebd62fd6224ccfc07b10b8d
Author: Morten Welinder <terra gnome org>
Date: Thu Mar 21 10:58:18 2013 -0400
Format Cells: move underline selection mostly to the font selector.
src/dialogs/cell-format.ui | 219 ++++++++++++++++++++++++++------------
src/dialogs/dialog-cell-format.c | 75 +++++---------
2 files changed, 175 insertions(+), 119 deletions(-)
---
diff --git a/src/dialogs/cell-format.ui b/src/dialogs/cell-format.ui
index 1b225e3..d680561 100644
--- a/src/dialogs/cell-format.ui
+++ b/src/dialogs/cell-format.ui
@@ -25,10 +25,12 @@
<child>
<object class="GtkButton" id="helpbutton">
<property name="label">gtk-help</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -40,10 +42,12 @@
<child>
<object class="GtkButton" id="applybutton">
<property name="label">gtk-apply</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -55,10 +59,12 @@
<child>
<object class="GtkButton" id="cancelbutton">
<property name="label">gtk-cancel</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -70,11 +76,13 @@
<child>
<object class="GtkButton" id="okbutton">
<property name="label">gtk-ok</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
<property name="has_default">True</property>
<property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -122,11 +130,13 @@
<child>
<object class="GtkRadioButton" id="halign_left">
<property name="label" translatable="yes">_Left</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="margin_left">24</property>
<property name="margin_top">6</property>
+ <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
@@ -142,10 +152,12 @@
<child>
<object class="GtkRadioButton" id="halign_general">
<property name="label" translatable="yes">_General</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="margin_left">24</property>
+ <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
@@ -161,10 +173,12 @@
<child>
<object class="GtkRadioButton" id="halign_center_across_selection">
<property name="label" translatable="yes">Center across _selection</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="margin_left">24</property>
+ <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
@@ -213,9 +227,11 @@
<child>
<object class="GtkRadioButton" id="halign_center">
<property name="label" translatable="yes">Ce_nter</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
@@ -231,9 +247,11 @@
<child>
<object class="GtkRadioButton" id="halign_right">
<property name="label" translatable="yes">_Right</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
@@ -249,9 +267,11 @@
<child>
<object class="GtkRadioButton" id="halign_fill">
<property name="label" translatable="yes">_Fill</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
@@ -267,9 +287,11 @@
<child>
<object class="GtkRadioButton" id="halign_justify">
<property name="label" translatable="yes">_Justify</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="active">True</property>
@@ -285,9 +307,11 @@
<child>
<object class="GtkRadioButton" id="halign_distributed">
<property name="label" translatable="yes">D_istributed</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
@@ -323,11 +347,13 @@
<child>
<object class="GtkRadioButton" id="valign_top">
<property name="label" translatable="yes">_Top</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="margin_left">24</property>
<property name="margin_top">6</property>
+ <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="active">True</property>
@@ -343,10 +369,12 @@
<child>
<object class="GtkRadioButton" id="valign_center">
<property name="label" translatable="yes">C_enter</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="margin_left">24</property>
+ <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
@@ -362,10 +390,12 @@
<child>
<object class="GtkRadioButton" id="valign_bottom">
<property name="label" translatable="yes">_Bottom</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="margin_left">24</property>
+ <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
@@ -381,9 +411,11 @@
<child>
<object class="GtkRadioButton" id="valign_justify">
<property name="label" translatable="yes">J_ustify</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
@@ -399,9 +431,11 @@
<child>
<object class="GtkRadioButton" id="valign_distributed">
<property name="label" translatable="yes">_Distributed</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
@@ -433,11 +467,13 @@
<child>
<object class="GtkCheckButton" id="align_wrap">
<property name="label" translatable="yes">_Wrap text</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="margin_left">24</property>
<property name="margin_top">6</property>
+ <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
@@ -452,11 +488,13 @@
<child>
<object class="GtkCheckButton" id="align_shrink">
<property name="label" translatable="yes">Shrin_k to fit</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="margin_left">24</property>
+ <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
@@ -518,78 +556,9 @@
</packing>
</child>
<child>
- <object class="GtkGrid" id="font-grid">
+ <object class="GtkBox" id="font_sel_placeholder">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="hexpand">True</property>
- <property name="border_width">12</property>
- <property name="row_spacing">6</property>
- <property name="column_spacing">12</property>
- <child>
- <object class="GtkLabel" id="label75">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="margin_top">12</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes"><b>Style</b></property>
- <property name="use_markup">True</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
- <property name="width">4</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="underline_label">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="halign">end</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">_Underline:</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">2</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkBox" id="underline_placeholder">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <placeholder/>
- </child>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">2</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkBox" id="font_sel_placeholder">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <placeholder/>
- </child>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- <property name="width">4</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
- <placeholder/>
- </child>
<child>
<placeholder/>
</child>
@@ -630,6 +599,7 @@
<property name="column_homogeneous">True</property>
<child>
<object class="GtkToggleButton" id="rev_diag_border">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -638,6 +608,7 @@
<property name="tooltip_text" translatable="yes">Reverse Diagonal</property>
<property name="halign">center</property>
<property name="valign">center</property>
+ <property name="use_action_appearance">False</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -648,6 +619,7 @@
</child>
<child>
<object class="GtkToggleButton" id="top_border">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -656,6 +628,7 @@
<property name="tooltip_text" translatable="yes">Top</property>
<property name="halign">center</property>
<property name="valign">center</property>
+ <property name="use_action_appearance">False</property>
</object>
<packing>
<property name="left_attach">2</property>
@@ -666,6 +639,7 @@
</child>
<child>
<object class="GtkToggleButton" id="diag_border">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -674,6 +648,7 @@
<property name="tooltip_text" translatable="yes">Diagonal</property>
<property name="halign">center</property>
<property name="valign">center</property>
+ <property name="use_action_appearance">False</property>
</object>
<packing>
<property name="left_attach">4</property>
@@ -684,6 +659,7 @@
</child>
<child>
<object class="GtkToggleButton" id="left_border">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -692,6 +668,7 @@
<property name="tooltip_text" translatable="yes">Left</property>
<property name="halign">center</property>
<property name="valign">center</property>
+ <property name="use_action_appearance">False</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -702,6 +679,7 @@
</child>
<child>
<object class="GtkToggleButton" id="right_border">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -710,6 +688,7 @@
<property name="tooltip_text" translatable="yes">Right</property>
<property name="halign">center</property>
<property name="valign">center</property>
+ <property name="use_action_appearance">False</property>
</object>
<packing>
<property name="left_attach">4</property>
@@ -720,6 +699,7 @@
</child>
<child>
<object class="GtkToggleButton" id="bottom_border">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -728,6 +708,7 @@
<property name="tooltip_text" translatable="yes">Bottom</property>
<property name="halign">center</property>
<property name="valign">center</property>
+ <property name="use_action_appearance">False</property>
</object>
<packing>
<property name="left_attach">2</property>
@@ -738,6 +719,7 @@
</child>
<child>
<object class="GtkButton" id="no_border">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -747,6 +729,7 @@
<property name="halign">center</property>
<property name="valign">center</property>
<property name="border_width">6</property>
+ <property name="use_action_appearance">False</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -757,6 +740,7 @@
</child>
<child>
<object class="GtkButton" id="outline_border">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -766,6 +750,7 @@
<property name="halign">center</property>
<property name="valign">center</property>
<property name="border_width">6</property>
+ <property name="use_action_appearance">False</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -776,6 +761,7 @@
</child>
<child>
<object class="GtkToggleButton" id="inside_vert_border">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -785,6 +771,7 @@
<property name="halign">center</property>
<property name="valign">center</property>
<property name="border_width">6</property>
+ <property name="use_action_appearance">False</property>
</object>
<packing>
<property name="left_attach">2</property>
@@ -795,6 +782,7 @@
</child>
<child>
<object class="GtkButton" id="inside_border">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -804,6 +792,7 @@
<property name="halign">center</property>
<property name="valign">center</property>
<property name="border_width">6</property>
+ <property name="use_action_appearance">False</property>
</object>
<packing>
<property name="left_attach">3</property>
@@ -814,6 +803,7 @@
</child>
<child>
<object class="GtkToggleButton" id="inside_horiz_border">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -823,6 +813,7 @@
<property name="halign">center</property>
<property name="valign">center</property>
<property name="border_width">6</property>
+ <property name="use_action_appearance">False</property>
</object>
<packing>
<property name="left_attach">4</property>
@@ -926,9 +917,11 @@
<child>
<object class="GtkToggleButton" id="line_pattern_none">
<property name="label" translatable="yes" context="line" comments="Cell border
line">None</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
</object>
<packing>
@@ -940,9 +933,11 @@
</child>
<child>
<object class="GtkToggleButton" id="line_pattern_medium_dash_dot_dot">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <property name="use_action_appearance">False</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -953,9 +948,11 @@
</child>
<child>
<object class="GtkToggleButton" id="line_pattern_hair">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <property name="use_action_appearance">False</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -966,9 +963,11 @@
</child>
<child>
<object class="GtkToggleButton" id="line_pattern_slant">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <property name="use_action_appearance">False</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -979,9 +978,11 @@
</child>
<child>
<object class="GtkToggleButton" id="line_pattern_dotted">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <property name="use_action_appearance">False</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -992,9 +993,11 @@
</child>
<child>
<object class="GtkToggleButton" id="line_pattern_medium_dash_dot">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <property name="use_action_appearance">False</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -1005,9 +1008,11 @@
</child>
<child>
<object class="GtkToggleButton" id="line_pattern_dash_dot_dot">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <property name="use_action_appearance">False</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -1018,9 +1023,11 @@
</child>
<child>
<object class="GtkToggleButton" id="line_pattern_medium_dash">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <property name="use_action_appearance">False</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -1031,9 +1038,11 @@
</child>
<child>
<object class="GtkToggleButton" id="line_pattern_dash_dot">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <property name="use_action_appearance">False</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -1044,9 +1053,11 @@
</child>
<child>
<object class="GtkToggleButton" id="line_pattern_medium">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <property name="use_action_appearance">False</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -1057,9 +1068,11 @@
</child>
<child>
<object class="GtkToggleButton" id="line_pattern_dashed">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <property name="use_action_appearance">False</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -1070,9 +1083,11 @@
</child>
<child>
<object class="GtkToggleButton" id="line_pattern_thick">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <property name="use_action_appearance">False</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -1083,9 +1098,11 @@
</child>
<child>
<object class="GtkToggleButton" id="line_pattern_thin">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <property name="use_action_appearance">False</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -1096,9 +1113,11 @@
</child>
<child>
<object class="GtkToggleButton" id="line_pattern_double">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <property name="use_action_appearance">False</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -1301,6 +1320,7 @@
<property name="column_spacing">6</property>
<child>
<object class="GtkToggleButton" id="gp_solid">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -1308,6 +1328,7 @@
<property name="tooltip_markup" translatable="yes">Solid</property>
<property name="tooltip_text" translatable="yes">Solid</property>
<property name="border_width">3</property>
+ <property name="use_action_appearance">False</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -1318,6 +1339,7 @@
</child>
<child>
<object class="GtkToggleButton" id="gp_75grey">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -1325,6 +1347,7 @@
<property name="tooltip_markup" translatable="yes">75% Grey</property>
<property name="tooltip_text" translatable="yes">75% Grey</property>
<property name="border_width">3</property>
+ <property name="use_action_appearance">False</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -1335,6 +1358,7 @@
</child>
<child>
<object class="GtkToggleButton" id="gp_50grey">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -1342,6 +1366,7 @@
<property name="tooltip_markup" translatable="yes">50% Grey</property>
<property name="tooltip_text" translatable="yes">50% Grey</property>
<property name="border_width">3</property>
+ <property name="use_action_appearance">False</property>
</object>
<packing>
<property name="left_attach">2</property>
@@ -1352,6 +1377,7 @@
</child>
<child>
<object class="GtkToggleButton" id="gp_25grey">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -1359,6 +1385,7 @@
<property name="tooltip_markup" translatable="yes">25% Grey</property>
<property name="tooltip_text" translatable="yes">25% Grey</property>
<property name="border_width">3</property>
+ <property name="use_action_appearance">False</property>
</object>
<packing>
<property name="left_attach">3</property>
@@ -1369,6 +1396,7 @@
</child>
<child>
<object class="GtkToggleButton" id="gp_125grey">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -1376,6 +1404,7 @@
<property name="tooltip_markup" translatable="yes">12.5% Grey</property>
<property name="tooltip_text" translatable="yes">12.5% Grey</property>
<property name="border_width">3</property>
+ <property name="use_action_appearance">False</property>
</object>
<packing>
<property name="left_attach">4</property>
@@ -1386,6 +1415,7 @@
</child>
<child>
<object class="GtkToggleButton" id="gp_625grey">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -1393,6 +1423,7 @@
<property name="tooltip_markup" translatable="yes">6.25% Grey</property>
<property name="tooltip_text" translatable="yes">6.25% Grey</property>
<property name="border_width">3</property>
+ <property name="use_action_appearance">False</property>
</object>
<packing>
<property name="left_attach">5</property>
@@ -1403,6 +1434,7 @@
</child>
<child>
<object class="GtkToggleButton" id="gp_horiz">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -1410,6 +1442,7 @@
<property name="tooltip_markup" translatable="yes">Horizontal Stripe</property>
<property name="tooltip_text" translatable="yes">Horizontal Stripe</property>
<property name="border_width">3</property>
+ <property name="use_action_appearance">False</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -1420,6 +1453,7 @@
</child>
<child>
<object class="GtkToggleButton" id="gp_vert">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -1427,6 +1461,7 @@
<property name="tooltip_markup" translatable="yes">Vertical Stripe</property>
<property name="tooltip_text" translatable="yes">Vertical Stripe</property>
<property name="border_width">3</property>
+ <property name="use_action_appearance">False</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -1437,6 +1472,7 @@
</child>
<child>
<object class="GtkToggleButton" id="gp_rev_diag">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -1444,6 +1480,7 @@
<property name="tooltip_markup" translatable="yes">Reverse Diagonal
Stripe</property>
<property name="tooltip_text" translatable="yes">Reverse Diagonal
Stripe</property>
<property name="border_width">3</property>
+ <property name="use_action_appearance">False</property>
</object>
<packing>
<property name="left_attach">2</property>
@@ -1454,6 +1491,7 @@
</child>
<child>
<object class="GtkToggleButton" id="gp_diag">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -1461,6 +1499,7 @@
<property name="tooltip_markup" translatable="yes">Diagonal Stripe</property>
<property name="tooltip_text" translatable="yes">Diagonal Stripe</property>
<property name="border_width">3</property>
+ <property name="use_action_appearance">False</property>
</object>
<packing>
<property name="left_attach">3</property>
@@ -1471,6 +1510,7 @@
</child>
<child>
<object class="GtkToggleButton" id="gp_diag_cross">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -1478,6 +1518,7 @@
<property name="tooltip_markup" translatable="yes">Diagonal Crosshatch</property>
<property name="tooltip_text" translatable="yes">Diagonal Crosshatch</property>
<property name="border_width">3</property>
+ <property name="use_action_appearance">False</property>
</object>
<packing>
<property name="left_attach">4</property>
@@ -1488,6 +1529,7 @@
</child>
<child>
<object class="GtkToggleButton" id="gp_thick_diag_cross">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -1495,6 +1537,7 @@
<property name="tooltip_markup" translatable="yes">Thick Diagonal
Crosshatch</property>
<property name="tooltip_text" translatable="yes">Thick Diagonal
Crosshatch</property>
<property name="border_width">3</property>
+ <property name="use_action_appearance">False</property>
</object>
<packing>
<property name="left_attach">5</property>
@@ -1505,6 +1548,7 @@
</child>
<child>
<object class="GtkToggleButton" id="gp_thin_horiz">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -1512,6 +1556,7 @@
<property name="tooltip_markup" translatable="yes">Thin Horizontal
Stripe</property>
<property name="tooltip_text" translatable="yes">Thin Horizontal
Stripe</property>
<property name="border_width">3</property>
+ <property name="use_action_appearance">False</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -1522,6 +1567,7 @@
</child>
<child>
<object class="GtkToggleButton" id="gp_thin_vert">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -1529,6 +1575,7 @@
<property name="tooltip_markup" translatable="yes">Thin Vertical
Stripe</property>
<property name="tooltip_text" translatable="yes">Thin Vertical Stripe</property>
<property name="border_width">3</property>
+ <property name="use_action_appearance">False</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -1539,6 +1586,7 @@
</child>
<child>
<object class="GtkToggleButton" id="gp_thin_rev_diag">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -1546,6 +1594,7 @@
<property name="tooltip_markup" translatable="yes">Thin Reverse Diagonal
Stripe</property>
<property name="tooltip_text" translatable="yes">Thin Reverse Diagonal
Stripe</property>
<property name="border_width">3</property>
+ <property name="use_action_appearance">False</property>
</object>
<packing>
<property name="left_attach">2</property>
@@ -1556,6 +1605,7 @@
</child>
<child>
<object class="GtkToggleButton" id="gp_thin_diag">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -1563,6 +1613,7 @@
<property name="tooltip_markup" translatable="yes">Thin Diagonal
Stripe</property>
<property name="tooltip_text" translatable="yes">Thin Diagonal Stripe</property>
<property name="border_width">3</property>
+ <property name="use_action_appearance">False</property>
</object>
<packing>
<property name="left_attach">3</property>
@@ -1573,6 +1624,7 @@
</child>
<child>
<object class="GtkToggleButton" id="gp_thin_horiz_cross">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -1580,6 +1632,7 @@
<property name="tooltip_markup" translatable="yes">Thin Horizontal
Crosshatch</property>
<property name="tooltip_text" translatable="yes">Thin Horizontal
Crosshatch</property>
<property name="border_width">3</property>
+ <property name="use_action_appearance">False</property>
</object>
<packing>
<property name="left_attach">4</property>
@@ -1590,6 +1643,7 @@
</child>
<child>
<object class="GtkToggleButton" id="gp_thin_diag_cross">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -1597,6 +1651,7 @@
<property name="tooltip_markup" translatable="yes">Thin Diagonal
Crosshatch</property>
<property name="tooltip_text" translatable="yes">Thin Diagonal
Crosshatch</property>
<property name="border_width">3</property>
+ <property name="use_action_appearance">False</property>
</object>
<packing>
<property name="left_attach">5</property>
@@ -1607,6 +1662,7 @@
</child>
<child>
<object class="GtkToggleButton" id="gp_foreground_solid">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -1614,6 +1670,7 @@
<property name="tooltip_markup" translatable="yes">Foreground Solid</property>
<property name="tooltip_text" translatable="yes">Foreground Solid</property>
<property name="border_width">3</property>
+ <property name="use_action_appearance">False</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -1624,6 +1681,7 @@
</child>
<child>
<object class="GtkToggleButton" id="gp_small_circle">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -1631,6 +1689,7 @@
<property name="tooltip_markup" translatable="yes">Small Circles</property>
<property name="tooltip_text" translatable="yes">Small Circles</property>
<property name="border_width">3</property>
+ <property name="use_action_appearance">False</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -1641,6 +1700,7 @@
</child>
<child>
<object class="GtkToggleButton" id="gp_semi_circle">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -1648,6 +1708,7 @@
<property name="tooltip_markup" translatable="yes">Semi Circles</property>
<property name="tooltip_text" translatable="yes">Semi Circles</property>
<property name="border_width">3</property>
+ <property name="use_action_appearance">False</property>
</object>
<packing>
<property name="left_attach">2</property>
@@ -1658,6 +1719,7 @@
</child>
<child>
<object class="GtkToggleButton" id="gp_thatch">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -1665,6 +1727,7 @@
<property name="tooltip_markup" translatable="yes">Thatch</property>
<property name="tooltip_text" translatable="yes">Thatch</property>
<property name="border_width">3</property>
+ <property name="use_action_appearance">False</property>
</object>
<packing>
<property name="left_attach">3</property>
@@ -1675,6 +1738,7 @@
</child>
<child>
<object class="GtkToggleButton" id="gp_large_circles">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -1682,6 +1746,7 @@
<property name="tooltip_markup" translatable="yes">Large Circles</property>
<property name="tooltip_text" translatable="yes">Large Circles</property>
<property name="border_width">3</property>
+ <property name="use_action_appearance">False</property>
</object>
<packing>
<property name="left_attach">4</property>
@@ -1692,6 +1757,7 @@
</child>
<child>
<object class="GtkToggleButton" id="gp_bricks">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -1699,6 +1765,7 @@
<property name="tooltip_markup" translatable="yes">Bricks</property>
<property name="tooltip_text" translatable="yes">Bricks</property>
<property name="border_width">3</property>
+ <property name="use_action_appearance">False</property>
</object>
<packing>
<property name="left_attach">5</property>
@@ -1780,9 +1847,11 @@
<child>
<object class="GtkCheckButton" id="protection_locked">
<property name="label" translatable="yes">_Lock</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
@@ -1797,9 +1866,11 @@
<child>
<object class="GtkCheckButton" id="protection_hidden">
<property name="label" translatable="yes">Hi_de</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
@@ -1831,9 +1902,11 @@
<child>
<object class="GtkCheckButton" id="protection_sheet_protected">
<property name="label" translatable="yes">_Protect worksheet</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
@@ -1963,10 +2036,12 @@
<child>
<object class="GtkCheckButton" id="validation_ignore_blank">
<property name="label" translatable="yes">Ignore _blank cells</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="margin_left">18</property>
+ <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
@@ -1981,9 +2056,11 @@
<child>
<object class="GtkCheckButton" id="validation_in_dropdown">
<property name="label" translatable="yes">I_n-cell dropdown</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
@@ -2205,9 +2282,11 @@
<child>
<object class="GtkCheckButton" id="input_msg_flag">
<property name="label" translatable="yes">_Show input message when cell is
selected</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
diff --git a/src/dialogs/dialog-cell-format.c b/src/dialogs/dialog-cell-format.c
index 3b0328b..8ac4915 100644
--- a/src/dialogs/dialog-cell-format.c
+++ b/src/dialogs/dialog-cell-format.c
@@ -835,49 +835,43 @@ set_font_underline (FormatState *state, GnmUnderline u)
change_font_attr (state, pango_attr_underline_new (pu));
}
-static gboolean
-cb_font_underline_changed (GtkComboBoxText *combo,
- FormatState *state)
+static void
+cb_underline_changed (GOOptionMenu *om, FormatState *state)
{
- GnmUnderline res = UNDERLINE_NONE;
- int i;
- char *new_text = gtk_combo_box_text_get_active_text (combo);
+ GtkWidget *selected = go_option_menu_get_history (om);
+ GnmUnderline u;
- if (!state->enable_edit) {
- g_free (new_text);
- return FALSE;
- }
-
- for (i = G_N_ELEMENTS (underline_types); i-- > 0; )
- if (go_utf8_collate_casefold (new_text, g_dpgettext2 (NULL, "underline",
underline_types[i].Cname)) == 0) {
- res = underline_types[i].ut;
- break;
- }
+ if (!selected)
+ return;
- set_font_underline (state, res);
- g_free (new_text);
- return TRUE;
+ u = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (selected), "value"));
+ set_font_underline (state, u);
}
+
/* Manually insert the font selector, and setup signals */
static void
fmt_dialog_init_font_page (FormatState *state)
{
GOColorGroup *cg;
GtkWidget *font_widget;
- GtkWidget *uline = gtk_combo_box_text_new_with_entry ();
- GtkEntry *uline_entry = GTK_ENTRY (gtk_bin_get_child (GTK_BIN (uline)));
- char const *uline_str;
gboolean strikethrough = FALSE;
GOFontScript script = GO_FONT_SCRIPT_STANDARD;
GODateConventions const *date_conv =
workbook_date_conv (state->sheet->workbook);
- int i;
GnmColor *mcolor = NULL;
GnmColor *def_sc;
-
- g_return_if_fail (uline != NULL);
-
+ GtkWidget *up;
+
+ up = go_option_menu_build
+ (C_("underline", "None"), UNDERLINE_NONE,
+ C_("underline", "Single"), UNDERLINE_SINGLE,
+ C_("underline", "Double"), UNDERLINE_DOUBLE,
+ C_("underline", "Single Low"), UNDERLINE_SINGLE_LOW,
+ C_("underline", "Double Low"), UNDERLINE_DOUBLE_LOW,
+ NULL);
+ g_signal_connect (up,
+ "changed", G_CALLBACK (cb_underline_changed), state);
def_sc = style_color_auto_font ();
cg = go_color_group_fetch ("fore_color_group", NULL);
font_widget = g_object_new (GO_TYPE_FONT_SEL,
@@ -886,6 +880,8 @@ fmt_dialog_init_font_page (FormatState *state)
"color-unset-text", _("Automatic"),
"color-group", cg,
"color-default", def_sc->go_color,
+ "show-underline", TRUE,
+ "underline-picker", up,
"show-script", TRUE,
"show-strikethrough", TRUE,
"vexpand", TRUE,
@@ -894,10 +890,11 @@ fmt_dialog_init_font_page (FormatState *state)
g_object_unref (cg);
style_color_unref (def_sc);
state->font.selector = GO_FONT_SEL (font_widget);
+ g_object_unref (up);
gtk_widget_show (font_widget);
- go_gtk_widget_replace (go_gtk_builder_get_widget (state->gui, "font_sel_placeholder"),
- font_widget);
+ gtk_container_add (GTK_CONTAINER (go_gtk_builder_get_widget (state->gui, "font_sel_placeholder")),
+ font_widget);
go_font_sel_editable_enters (state->font.selector,
GTK_WINDOW (state->dialog));
@@ -930,30 +927,10 @@ fmt_dialog_init_font_page (FormatState *state)
pts * PANGO_SCALE);
}
- for (i = 0; i < (int)G_N_ELEMENTS (underline_types); i++)
- gtk_combo_box_text_append_text
- (GTK_COMBO_BOX_TEXT (uline),
- g_dpgettext2 (NULL, "underline",
- underline_types[i].Cname));
if (0 == (state->conflicts & (1 << MSTYLE_FONT_UNDERLINE))) {
GnmUnderline ut = gnm_style_get_font_uline (state->style);
- uline_str = g_dpgettext2 (NULL, "underline", underline_types[ut].Cname);
set_font_underline (state, ut);
- } else
- uline_str = "";
- gtk_entry_set_text (uline_entry, uline_str);
- g_object_set (uline_entry,
- "editable", FALSE,
- "can-focus", FALSE,
- NULL);
- g_signal_connect (G_OBJECT (uline),
- "changed",
- G_CALLBACK (cb_font_underline_changed), state);
- gtk_widget_show_all (uline);
- go_gtk_widget_replace (go_gtk_builder_get_widget (state->gui, "underline_placeholder"),
- uline);
-
- gtk_label_set_mnemonic_widget (GTK_LABEL (go_gtk_builder_get_widget (state->gui, "underline_label")),
uline);
+ }
if (0 == (state->conflicts & (1 << MSTYLE_FONT_COLOR)))
mcolor = gnm_style_get_font_color (state->style);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
