[gnumeric] More dialogs fixes. [#665062]
- From: Jean BrÃfort <jbrefort src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnumeric] More dialogs fixes. [#665062]
- Date: Mon, 28 Nov 2011 16:44:42 +0000 (UTC)
commit 63d8524315c57a8122bb6adae90f2a4c9eeddb6c
Author: Jean Brefort <jean brefort normalesup org>
Date: Mon Nov 28 17:43:44 2011 +0100
More dialogs fixes. [#665062]
src/dialogs/ChangeLog | 12 +
src/dialogs/cell-comment.ui | 66 +-
src/dialogs/cell-format-cond.ui | 614 ++++++------
src/dialogs/cell-format.ui | 1225 +++++++++++++----------
src/dialogs/covariance.ui | 27 +-
src/dialogs/dialog-analysis-tool-kaplan-meier.c | 10 +-
src/dialogs/dialog-cell-format-cond.c | 12 +-
src/dialogs/dialog-cell-format.c | 4 +-
src/dialogs/kaplan-meier.ui | 41 +-
src/sheet-object-image.c | 191 +---
10 files changed, 1169 insertions(+), 1033 deletions(-)
---
diff --git a/src/dialogs/ChangeLog b/src/dialogs/ChangeLog
index b731889..ab2c57a 100644
--- a/src/dialogs/ChangeLog
+++ b/src/dialogs/ChangeLog
@@ -1,3 +1,15 @@
+2011-11-28 Jean Brefort <jean brefort normalesup org>
+
+ * cell-comment.ui: more GtkTable eradication work.
+ * cell-format-cond.ui: ditto.
+ * cell-format.ui: ditto.
+ * covariance.ui: fixed widgets names. [#665062]
+ * dialog-analysis-tool-kaplan-meier.c (dialog_kaplan_meier_tool): fixed.
+ [#665062]
+ * dialog-cell-format-cond.c (c_fmt_dialog_init_editor_page): ditto.
+ * dialog-cell-format.c (fmt_dialog_init_align_page): ditto.
+ * kaplan-meier.ui: fixed groups page. [#665062]
+
2011-11-27 Morten Welinder <terra gnome org>
* Release 1.11.1
diff --git a/src/dialogs/cell-comment.ui b/src/dialogs/cell-comment.ui
index 217794d..5f24f7e 100644
--- a/src/dialogs/cell-comment.ui
+++ b/src/dialogs/cell-comment.ui
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<!-- interface-requires gtk+ 3.0 -->
- <!-- interface-naming-policy toplevel-contextual -->
<object class="GtkDialog" id="comment_dialog">
<property name="can_focus">False</property>
<property name="border_width">5</property>
@@ -23,6 +22,7 @@
<child>
<object class="GtkButton" id="help_button">
<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>
@@ -39,6 +39,7 @@
<child>
<object class="GtkButton" id="cancel_button">
<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>
@@ -55,6 +56,7 @@
<child>
<object class="GtkButton" id="ok_button">
<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>
@@ -77,29 +79,25 @@
</packing>
</child>
<child>
- <object class="GtkTable" id="table1">
+ <object class="GtkGrid" id="grid1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="n_rows">2</property>
- <property name="n_columns">2</property>
- <property name="column_spacing">12</property>
<property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
<child>
- <object class="GtkEntry" id="new-author-entry">
+ <object class="GtkLabel" id="old-author-label">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="invisible_char">â</property>
- <property name="primary_icon_activatable">False</property>
- <property name="secondary_icon_activatable">False</property>
- <property name="primary_icon_sensitive">True</property>
- <property name="secondary_icon_sensitive">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes"><b>Old Author:</b></property>
+ <property name="use_markup">True</property>
+ <property name="single_line_mode">True</property>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="y_options">GTK_SHRINK | GTK_FILL</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
@@ -111,9 +109,9 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_SHRINK | GTK_FILL</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
@@ -126,36 +124,40 @@
<property name="single_line_mode">True</property>
</object>
<packing>
+ <property name="left_attach">0</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
- <object class="GtkLabel" id="old-author-label">
+ <object class="GtkEntry" id="new-author-entry">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes"><b>Old Author:</b></property>
- <property name="use_markup">True</property>
- <property name="single_line_mode">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="invisible_char">â</property>
+ <property name="invisible_char_set">True</property>
+ <property name="primary_icon_activatable">False</property>
+ <property name="secondary_icon_activatable">False</property>
</object>
<packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="left_attach">1</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">False</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="wrap-check">
<property name="label" translatable="yes">_Wrap in properties window</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>
diff --git a/src/dialogs/cell-format-cond.ui b/src/dialogs/cell-format-cond.ui
index 84101e0..3f50416 100644
--- a/src/dialogs/cell-format-cond.ui
+++ b/src/dialogs/cell-format-cond.ui
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<!-- interface-requires gtk+ 2.12 -->
- <!-- interface-naming-policy toplevel-contextual -->
<object class="GtkDialog" id="CellFormat">
<property name="can_focus">False</property>
<property name="border_width">6</property>
@@ -33,6 +32,7 @@
<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>
@@ -49,6 +49,7 @@
<child>
<object class="GtkButton" id="closebutton">
<property name="label">gtk-close</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>
@@ -72,20 +73,21 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="hbox1">
+ <object class="GtkGrid" id="format-grid">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="column_spacing">5</property>
<child>
<object class="GtkFrame" id="frame2">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="hexpand">True</property>
<property name="label_xalign">0</property>
<child>
- <object class="GtkTable" id="condition-view-table">
+ <object class="GtkGrid" id="condition-view-grid">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">12</property>
- <property name="n_rows">3</property>
<child>
<object class="GtkLabel" id="conditions_label">
<property name="visible">True</property>
@@ -96,32 +98,13 @@
<property name="width_chars">35</property>
</object>
<packing>
+ <property name="left_attach">0</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="y_options">GTK_SHRINK | GTK_FILL</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
- <object class="GtkScrolledWindow" id="scrolledwindow1">
- <property name="height_request">250</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hscrollbar_policy">automatic</property>
- <property name="vscrollbar_policy">automatic</property>
- <property name="shadow_type">in</property>
- <child>
- <object class="GtkTreeView" id="conditions_treeview">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="border_width">5</property>
- <property name="headers_visible">False</property>
- <property name="enable_search">False</property>
- <property name="level_indentation">5</property>
- </object>
- </child>
- </object>
- </child>
- <child>
<object class="GtkButtonBox" id="hbuttonbox2">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -129,6 +112,7 @@
<child>
<object class="GtkButton" id="conditions_clear">
<property name="label">gtk-clear</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>
@@ -144,6 +128,7 @@
<child>
<object class="GtkButton" id="conditions_remove">
<property name="label">gtk-remove</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>
@@ -159,6 +144,7 @@
<child>
<object class="GtkButton" id="conditions_expand">
<property name="label" translatable="yes">E_xpand</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>
@@ -173,9 +159,35 @@
</child>
</object>
<packing>
+ <property name="left_attach">0</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="y_options">GTK_SHRINK | GTK_FILL</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkScrolledWindow" id="scrolledwindow1">
+ <property name="height_request">250</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="shadow_type">in</property>
+ <child>
+ <object class="GtkTreeView" id="conditions_treeview">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="border_width">5</property>
+ <property name="headers_visible">False</property>
+ <property name="enable_search">False</property>
+ <property name="level_indentation">5</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
</object>
@@ -185,10 +197,10 @@
</child>
</object>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="padding">6</property>
- <property name="position">0</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
@@ -201,6 +213,7 @@
<child>
<object class="GtkButton" id="copy-button">
<property name="label">Cop_y â</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>
@@ -217,6 +230,7 @@
<child>
<object class="GtkButton" id="add-button">
<property name="label">â _Add</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>
@@ -234,6 +248,7 @@
<child>
<object class="GtkButton" id="replace-button">
<property name="label">â Re_place</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">True</property>
@@ -251,313 +266,286 @@
</child>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkFrame" id="frame1">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="hexpand">True</property>
<property name="label_xalign">0</property>
<child>
- <object class="GtkBox" id="dialog-vbox1">
+ <object class="GtkGrid" id="condition-grid">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <property name="spacing">8</property>
+ <property name="border_width">5</property>
+ <property name="row_spacing">5</property>
+ <property name="column_spacing">5</property>
<child>
- <object class="GtkTable" id="condition-table">
+ <object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="border_width">5</property>
- <property name="n_rows">4</property>
- <property name="n_columns">2</property>
- <property name="column_spacing">5</property>
- <property name="row_spacing">5</property>
- <child>
- <object class="GtkComboBox" id="condition-combo">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="model">liststore1</property>
- </object>
- <packing>
- <property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="y_options">GTK_SHRINK | GTK_FILL</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label4">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">1</property>
- <property name="label">x:</property>
- </object>
- <packing>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_SHRINK | GTK_FILL</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label5">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">1</property>
- <property name="label">y:</property>
- </object>
- <packing>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_SHRINK | GTK_FILL</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label2">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Condition:</property>
- </object>
- <packing>
- <property name="right_attach">2</property>
- </packing>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Condition:</property>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">3</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
- <object class="GtkTable" id="table1">
+ <object class="GtkComboBox" id="condition-combo">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="border_width">5</property>
- <property name="n_rows">5</property>
- <property name="n_columns">2</property>
- <property name="column_spacing">2</property>
- <property name="row_spacing">2</property>
- <child>
- <object class="GtkLabel" id="label3">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Applicable Style Components:</property>
- </object>
- <packing>
- <property name="right_attach">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="check-number">
- <property name="label" translatable="yes">Number Format</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="draw_indicator">True</property>
- </object>
- <packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="check-align">
- <property name="label" translatable="yes">Alignment</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="draw_indicator">True</property>
- </object>
- <packing>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="check-font">
- <property name="label" translatable="yes">Font</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="draw_indicator">True</property>
- </object>
- <packing>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="check-background">
- <property name="label" translatable="yes">Background</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="active">True</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="check-protection">
- <property name="label" translatable="yes">Protection</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="use_action_appearance">False</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="check-validation">
- <property name="label" translatable="yes">Validation</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="use_action_appearance">False</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="check-border">
- <property name="label" translatable="yes">Border</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="draw_indicator">True</property>
- </object>
- <packing>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- </packing>
- </child>
- <child>
- <placeholder/>
- </child>
+ <property name="model">liststore1</property>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="padding">5</property>
- <property name="position">1</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">3</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
- <object class="GtkBox" id="vbox2">
+ <object class="GtkLabel" id="label4">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <property name="border_width">5</property>
- <property name="spacing">5</property>
- <child>
- <object class="GtkBox" id="hbox3">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <object class="GtkLabel" id="label6">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Style Overlay:</property>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="style-label">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">1</property>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkButtonBox" id="hbuttonbox4">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="layout_style">end</property>
- <child>
- <object class="GtkButton" id="edit-style-button">
- <property name="label" translatable="yes">_Edit Style</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="image">image1</property>
- <property name="use_underline">True</property>
- <property name="yalign">0.52999997138977051</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
+ <property name="xalign">0</property>
+ <property name="label">x:</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="GtkLabel" id="label5">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label">y:</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">3</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_top">8</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Applicable Style Components:</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">4</property>
+ <property name="width">3</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="check-number">
+ <property name="label" translatable="yes">Number Format</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="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">5</property>
+ <property name="width">2</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="check-align">
+ <property name="label" translatable="yes">Alignment</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="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">6</property>
+ <property name="width">2</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="check-font">
+ <property name="label" translatable="yes">Font</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="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">7</property>
+ <property name="width">2</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="check-border">
+ <property name="label" translatable="yes">Border</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="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">8</property>
+ <property name="width">2</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="check-background">
+ <property name="label" translatable="yes">Background</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="xalign">0</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">2</property>
+ <property name="left_attach">2</property>
+ <property name="top_attach">5</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
+ <child>
+ <object class="GtkCheckButton" id="check-protection">
+ <property name="label" translatable="yes">Protection</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="use_action_appearance">False</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">6</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="check-validation">
+ <property name="label" translatable="yes">Validation</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="use_action_appearance">False</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">7</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label6">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_top">8</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Style Overlay:</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">9</property>
+ <property name="width">2</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="style-label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">1</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">9</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="edit-style-button">
+ <property name="label" translatable="yes">_Edit Style</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="image">image1</property>
+ <property name="use_underline">True</property>
+ <property name="yalign">0.52999997138977051</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">10</property>
+ <property name="width">3</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</object>
</child>
<child type="label_item">
@@ -565,15 +553,15 @@
</child>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="padding">6</property>
- <property name="position">2</property>
+ <property name="left_attach">2</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
</object>
<packing>
- <property name="expand">True</property>
+ <property name="expand">False</property>
<property name="fill">True</property>
<property name="position">2</property>
</packing>
diff --git a/src/dialogs/cell-format.ui b/src/dialogs/cell-format.ui
index ada249d..0ce583f 100644
--- a/src/dialogs/cell-format.ui
+++ b/src/dialogs/cell-format.ui
@@ -20,6 +20,7 @@
<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>
@@ -36,6 +37,7 @@
<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>
@@ -52,6 +54,7 @@
<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>
@@ -68,6 +71,7 @@
<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>
@@ -97,529 +101,426 @@
<property name="border_width">5</property>
<property name="scrollable">True</property>
<child>
- <object class="GtkBox" id="alignment_box">
+ <object class="GtkGrid" id="alignment-grid">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="border_width">12</property>
- <property name="spacing">24</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
<child>
- <object class="GtkBox" id="vbox12">
+ <object class="GtkLabel" id="label67">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <property name="spacing">12</property>
- <child>
- <object class="GtkBox" id="vbox54">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <property name="spacing">12</property>
- <child>
- <object class="GtkLabel" id="label67">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes"><b>Horizontal alignment</b></property>
- <property name="use_markup">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkBox" id="hbox41">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <object class="GtkLabel" id="label66">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes"> </property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkTable" id="table3">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="n_rows">4</property>
- <property name="n_columns">3</property>
- <property name="column_spacing">12</property>
- <property name="row_spacing">6</property>
- <property name="homogeneous">True</property>
- <child>
- <object class="GtkRadioButton" id="halign_justify">
- <property name="label" translatable="yes">_Justify</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="draw_indicator">True</property>
- </object>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkRadioButton" id="halign_right">
- <property name="label" translatable="yes">_Right</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="draw_indicator">True</property>
- <property name="group">halign_justify</property>
- </object>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkRadioButton" id="halign_fill">
- <property name="label" translatable="yes">_Fill</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="draw_indicator">True</property>
- <property name="group">halign_justify</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkRadioButton" id="halign_center">
- <property name="label" translatable="yes">Ce_nter</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="draw_indicator">True</property>
- <property name="group">halign_justify</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkRadioButton" id="halign_left">
- <property name="label" translatable="yes">_Left</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="draw_indicator">True</property>
- <property name="group">halign_justify</property>
- </object>
- <packing>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkRadioButton" id="halign_general">
- <property name="label" translatable="yes">_General</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="draw_indicator">True</property>
- <property name="group">halign_justify</property>
- </object>
- <packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="halign_indent_label">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">_Indent:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">halign_indent</property>
- </object>
- <packing>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="halign_indent">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="primary_icon_activatable">False</property>
- <property name="secondary_icon_activatable">False</property>
- <property name="adjustment">adjustment1</property>
- <property name="climb_rate">1</property>
- <property name="numeric">True</property>
- <property name="update_policy">if-valid</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkRadioButton" id="halign_center_across_selection">
- <property name="label" translatable="yes">Center across _selection</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="draw_indicator">True</property>
- <property name="group">halign_justify</property>
- </object>
- <packing>
- <property name="right_attach">2</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkRadioButton" id="halign_distributed">
- <property name="label" translatable="yes">D_istributed</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="draw_indicator">True</property>
- <property name="group">halign_justify</property>
- </object>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <placeholder/>
- </child>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkBox" id="vbox55">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <property name="spacing">12</property>
- <child>
- <object class="GtkLabel" id="label69">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes"><b>Vertical alignment</b></property>
- <property name="use_markup">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkBox" id="hbox42">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <object class="GtkLabel" id="label68">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes"> </property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkTable" id="table6">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="n_rows">3</property>
- <property name="n_columns">2</property>
- <property name="column_spacing">12</property>
- <property name="row_spacing">6</property>
- <property name="homogeneous">True</property>
- <child>
- <object class="GtkRadioButton" id="valign_top">
- <property name="label" translatable="yes">_Top</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="draw_indicator">True</property>
- </object>
- <packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkRadioButton" id="valign_center">
- <property name="label" translatable="yes">C_enter</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="draw_indicator">True</property>
- <property name="group">valign_top</property>
- </object>
- <packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkRadioButton" id="valign_justify">
- <property name="label" translatable="yes">J_ustify</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="draw_indicator">True</property>
- <property name="group">valign_top</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkRadioButton" id="valign_bottom">
- <property name="label" translatable="yes">_Bottom</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="draw_indicator">True</property>
- <property name="group">valign_top</property>
- </object>
- <packing>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkRadioButton" id="valign_distributed">
- <property name="label" translatable="yes">_Distributed</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="draw_indicator">True</property>
- <property name="group">valign_top</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <placeholder/>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkBox" id="vbox56">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <property name="spacing">12</property>
- <child>
- <object class="GtkLabel" id="label70">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes"><b>Control</b></property>
- <property name="use_markup">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkBox" id="hbox43">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <object class="GtkLabel" id="label71">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes"> </property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkBox" id="vbox38">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkCheckButton" id="align_wrap">
- <property name="label" translatable="yes">_Wrap text</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="draw_indicator">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="align_shrink">
- <property name="label" translatable="yes">Shrin_k to fit</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="use_action_appearance">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">2</property>
- </packing>
- </child>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes"><b>Horizontal alignment</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">3</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <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>
+ <property name="group">halign_justify</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <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>
+ <property name="group">halign_justify</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="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>
+ <property name="group">halign_justify</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">3</property>
+ <property name="width">2</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="halign_indent_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_left">24</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Indent:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">halign_indent</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">4</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label69">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_top">6</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes"><b>Vertical alignment</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">5</property>
+ <property name="width">3</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <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>
+ <property name="group">halign_justify</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <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>
+ <property name="group">halign_justify</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <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>
+ <property name="group">halign_justify</property>
+ </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="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>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <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>
+ <property name="group">halign_justify</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">3</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="halign_indent">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">â</property>
+ <property name="invisible_char_set">True</property>
+ <property name="primary_icon_activatable">False</property>
+ <property name="secondary_icon_activatable">False</property>
+ <property name="adjustment">adjustment1</property>
+ <property name="climb_rate">1</property>
+ <property name="numeric">True</property>
+ <property name="update_policy">if-valid</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">4</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <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>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">6</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <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>
+ <property name="group">valign_top</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">7</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <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>
+ <property name="group">valign_top</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">8</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <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>
+ <property name="group">valign_top</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">7</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <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>
+ <property name="group">valign_top</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">8</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label70">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_top">6</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes"><b>Control</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">9</property>
+ <property name="width">3</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <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>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">10</property>
+ <property name="width">2</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <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>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">11</property>
+ <property name="width">2</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</object>
</child>
<child type="tab">
@@ -714,6 +615,7 @@
<child>
<object class="GtkCheckButton" id="strikethrough_button">
<property name="label" translatable="yes">Stri_kethrough</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>
@@ -736,6 +638,7 @@
<child>
<object class="GtkCheckButton" id="superscript_button">
<property name="label" translatable="yes">Sup_erscript</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>
@@ -752,6 +655,7 @@
<child>
<object class="GtkCheckButton" id="subscript_button">
<property name="label" translatable="yes">Su_bscript</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>
@@ -868,6 +772,7 @@
<property name="row_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>
@@ -887,6 +792,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>
@@ -906,6 +812,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>
@@ -925,6 +832,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>
@@ -944,6 +852,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>
@@ -963,6 +872,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>
@@ -982,6 +892,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>
@@ -1002,6 +913,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>
@@ -1022,6 +934,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>
@@ -1042,6 +955,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>
@@ -1062,6 +976,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>
@@ -1201,6 +1116,7 @@
<property name="homogeneous">True</property>
<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">False</property>
@@ -1220,6 +1136,7 @@
</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">False</property>
@@ -1239,6 +1156,7 @@
</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">False</property>
@@ -1258,6 +1176,7 @@
</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">False</property>
@@ -1277,6 +1196,7 @@
</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">False</property>
@@ -1296,6 +1216,7 @@
</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">False</property>
@@ -1315,6 +1236,7 @@
</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">False</property>
@@ -1332,6 +1254,7 @@
</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">False</property>
@@ -1349,6 +1272,7 @@
</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">False</property>
@@ -1366,6 +1290,7 @@
</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">False</property>
@@ -1383,6 +1308,7 @@
</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">False</property>
@@ -1400,6 +1326,7 @@
</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">False</property>
@@ -1417,6 +1344,7 @@
</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">False</property>
@@ -1435,6 +1363,7 @@
<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">False</property>
@@ -1725,6 +1654,7 @@
<property name="row_spacing">6</property>
<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">False</property>
@@ -1744,6 +1674,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">False</property>
@@ -1763,6 +1694,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">False</property>
@@ -1782,6 +1714,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">False</property>
@@ -1801,6 +1734,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">False</property>
@@ -1820,6 +1754,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">False</property>
@@ -1839,6 +1774,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">False</property>
@@ -1858,6 +1794,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">False</property>
@@ -1879,6 +1816,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">False</property>
@@ -1900,6 +1838,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">False</property>
@@ -1921,6 +1860,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">False</property>
@@ -1942,6 +1882,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">False</property>
@@ -1963,6 +1904,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">False</property>
@@ -1984,6 +1926,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">False</property>
@@ -2005,6 +1948,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">False</property>
@@ -2026,6 +1970,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">False</property>
@@ -2047,6 +1992,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">False</property>
@@ -2068,6 +2014,7 @@
</child>
<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">False</property>
@@ -2085,6 +2032,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">False</property>
@@ -2106,6 +2054,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">False</property>
@@ -2127,6 +2076,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">False</property>
@@ -2148,6 +2098,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">False</property>
@@ -2169,6 +2120,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">False</property>
@@ -2190,6 +2142,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">False</property>
@@ -2346,6 +2299,7 @@
<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>
@@ -2362,6 +2316,7 @@
<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>
@@ -2394,6 +2349,7 @@
<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>
@@ -2516,6 +2472,7 @@
<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>
@@ -2532,6 +2489,7 @@
<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>
@@ -2861,6 +2819,7 @@
<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>
@@ -2993,6 +2952,250 @@
<property name="step_increment">1</property>
<property name="page_increment">10</property>
</object>
+ <object class="GtkBox" id="alignment_box">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">12</property>
+ <property name="spacing">24</property>
+ <child>
+ <object class="GtkBox" id="vbox12">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">12</property>
+ <child>
+ <object class="GtkBox" id="vbox54">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">12</property>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <object class="GtkBox" id="hbox41">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkLabel" id="label66">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes"> </property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkTable" id="table3">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="n_rows">4</property>
+ <property name="n_columns">3</property>
+ <property name="column_spacing">12</property>
+ <property name="row_spacing">6</property>
+ <property name="homogeneous">True</property>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="vbox55">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">12</property>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <object class="GtkBox" id="hbox42">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkLabel" id="label68">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes"> </property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkTable" id="table6">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="n_rows">3</property>
+ <property name="n_columns">2</property>
+ <property name="column_spacing">12</property>
+ <property name="row_spacing">6</property>
+ <property name="homogeneous">True</property>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="vbox56">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">12</property>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <object class="GtkBox" id="hbox43">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkLabel" id="label71">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes"> </property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="vbox38">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
<object class="GtkListStore" id="model1">
<columns>
<!-- column-name gchararray -->
diff --git a/src/dialogs/covariance.ui b/src/dialogs/covariance.ui
index ab5250e..3e71ffb 100644
--- a/src/dialogs/covariance.ui
+++ b/src/dialogs/covariance.ui
@@ -88,7 +88,7 @@
<property name="row_spacing">6</property>
<property name="column_spacing">12</property>
<child>
- <object class="GtkLabel" id="var1-label1">
+ <object class="GtkLabel" id="var1-label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
@@ -119,7 +119,7 @@
</packing>
</child>
<child>
- <object class="GtkCheckButton" id="labels_button1">
+ <object class="GtkCheckButton" id="labels_button">
<property name="label" translatable="yes">_Labels</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
@@ -138,7 +138,7 @@
</packing>
</child>
<child>
- <object class="GtkRadioButton" id="grouped_by_col1">
+ <object class="GtkRadioButton" id="grouped_by_col">
<property name="label" translatable="yes" context="groupby" comments="Group by Columns">_Columns</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
@@ -158,7 +158,7 @@
</packing>
</child>
<child>
- <object class="GtkRadioButton" id="grouped_by_row1">
+ <object class="GtkRadioButton" id="grouped_by_row">
<property name="label" translatable="yes" context="groupby" comments="Group by Rows">_Rows</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
@@ -168,7 +168,6 @@
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
- <property name="group">grouped_by_col</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -178,7 +177,7 @@
</packing>
</child>
<child>
- <object class="GtkRadioButton" id="grouped_by_area1">
+ <object class="GtkRadioButton" id="grouped_by_area">
<property name="label" translatable="yes">_Areas</property>
<property name="use_action_appearance">False</property>
<property name="visible">True</property>
@@ -188,7 +187,6 @@
<property name="use_underline">True</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
- <property name="group">grouped_by_col</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -197,6 +195,21 @@
<property name="height">1</property>
</packing>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</object>
</child>
<child type="tab">
diff --git a/src/dialogs/dialog-analysis-tool-kaplan-meier.c b/src/dialogs/dialog-analysis-tool-kaplan-meier.c
index 9d7e3f5..f70ca74 100644
--- a/src/dialogs/dialog-analysis-tool-kaplan-meier.c
+++ b/src/dialogs/dialog-analysis-tool-kaplan-meier.c
@@ -67,7 +67,7 @@ typedef struct {
GtkWidget *remove_group_button;
GtkWidget *std_error_button;
GtkWidget *groups_check;
- GtkWidget *groups_table;
+ GtkWidget *groups_grid;
GnmExprEntry *groups_input;
GtkTreeView *groups_treeview;
GtkListStore *groups_list;
@@ -666,14 +666,14 @@ dialog_kaplan_meier_tool (WBCGtk *wbcg, Sheet *sheet)
state->groups_check = GTK_WIDGET (go_gtk_builder_get_widget
(state->base.gui,
"groups-check"));
- state->groups_table = GTK_WIDGET (go_gtk_builder_get_widget
+ state->groups_grid = GTK_WIDGET (go_gtk_builder_get_widget
(state->base.gui,
- "groups-table"));
+ "groups-grid"));
state->groups_input = gnm_expr_entry_new (state->base.wbcg, TRUE);
gnm_expr_entry_set_flags (state->groups_input, GNM_EE_FORCE_ABS_REF,
GNM_EE_MASK);
- gtk_table_attach (GTK_TABLE (state->groups_table), GTK_WIDGET (state->groups_input),
- 1, 3, 0, 1, GTK_EXPAND | GTK_FILL, 0, 0, 0);
+ gtk_grid_attach (GTK_GRID (state->groups_grid),
+ GTK_WIDGET (state->groups_input), 1, 1, 2, 1);
dialog_kaplan_meier_tool_setup_treeview (state);
diff --git a/src/dialogs/dialog-cell-format-cond.c b/src/dialogs/dialog-cell-format-cond.c
index 5cab689..d66c89c 100644
--- a/src/dialogs/dialog-cell-format-cond.c
+++ b/src/dialogs/dialog-cell-format-cond.c
@@ -1117,25 +1117,25 @@ cb_c_format_dialog_range (G_GNUC_UNUSED SheetView *sv, GnmRange const *range, GS
static void
c_fmt_dialog_init_editor_page (CFormatState *state)
{
- GtkTable *table;
+ GtkGrid *grid;
state->editor.add_button = go_gtk_builder_get_widget (state->gui, "add-button");
state->editor.replace_button = go_gtk_builder_get_widget (state->gui, "replace-button");
state->editor.copy_button = go_gtk_builder_get_widget (state->gui, "copy-button");
state->editor.edit_style_button = go_gtk_builder_get_widget (state->gui, "edit-style-button");
state->editor.combo = go_gtk_builder_get_widget (state->gui, "condition-combo");
- table = GTK_TABLE (go_gtk_builder_get_widget (state->gui, "condition-table"));
+ grid = GTK_GRID (go_gtk_builder_get_widget (state->gui, "condition-grid"));
state->editor.expr_x = GTK_WIDGET (gnm_expr_entry_new (state->wbcg, TRUE));
- gtk_table_attach (table, state->editor.expr_x, 1, 2, 2, 3,
- GTK_EXPAND | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0);
+ gtk_grid_attach (grid, state->editor.expr_x, 1, 2, 2, 1);
+ gtk_widget_set_hexpand (state->editor.expr_x, TRUE);
gtk_widget_show(state->editor.expr_x);
gnm_expr_entry_set_flags (GNM_EXPR_ENTRY (state->editor.expr_x),
GNM_EE_CONSTANT_ALLOWED,
GNM_EE_MASK);
state->editor.expr_y = GTK_WIDGET (gnm_expr_entry_new (state->wbcg, TRUE));
- gtk_table_attach (table, state->editor.expr_y, 1, 2, 3, 4,
- GTK_EXPAND | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0);
+ gtk_grid_attach (grid, state->editor.expr_y, 1, 3, 2, 1);
+ gtk_widget_set_hexpand (state->editor.expr_y, TRUE);
gtk_widget_show(state->editor.expr_y);
gnm_expr_entry_set_flags (GNM_EXPR_ENTRY (state->editor.expr_y),
GNM_EE_CONSTANT_ALLOWED,
diff --git a/src/dialogs/dialog-cell-format.c b/src/dialogs/dialog-cell-format.c
index a18ef4d..7e6563a 100644
--- a/src/dialogs/dialog-cell-format.c
+++ b/src/dialogs/dialog-cell-format.c
@@ -687,8 +687,8 @@ fmt_dialog_init_align_page (FormatState *state)
} else
r = 0;
state->align.rotation = (GORotationSel *) go_rotation_sel_new ();
- gtk_box_pack_start (GTK_BOX (go_gtk_builder_get_widget (state->gui, "alignment_box")),
- GTK_WIDGET (state->align.rotation), TRUE, TRUE, 0);
+ gtk_grid_attach (GTK_GRID (go_gtk_builder_get_widget (state->gui, "alignment-grid")),
+ GTK_WIDGET (state->align.rotation), 3, 0, 1, 12);
go_rotation_sel_set_rotation (state->align.rotation, r);
g_signal_connect (G_OBJECT (state->align.rotation), "rotation-changed",
G_CALLBACK (cb_rotation_changed), state);
diff --git a/src/dialogs/kaplan-meier.ui b/src/dialogs/kaplan-meier.ui
index 86ba338..0444975 100644
--- a/src/dialogs/kaplan-meier.ui
+++ b/src/dialogs/kaplan-meier.ui
@@ -314,7 +314,7 @@
<packing>
<property name="left_attach">0</property>
<property name="top_attach">2</property>
- <property name="width">1</property>
+ <property name="width">2</property>
<property name="height">3</property>
</packing>
</child>
@@ -325,11 +325,12 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <property name="valign">start</property>
<property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
- <property name="left_attach">1</property>
+ <property name="left_attach">2</property>
<property name="top_attach">2</property>
<property name="width">1</property>
<property name="height">1</property>
@@ -342,11 +343,12 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <property name="valign">start</property>
<property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
- <property name="left_attach">1</property>
+ <property name="left_attach">2</property>
<property name="top_attach">3</property>
<property name="width">1</property>
<property name="height">1</property>
@@ -389,21 +391,6 @@
<property name="row_spacing">6</property>
<property name="column_spacing">12</property>
<child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
<object class="GtkCheckButton" id="graph-button">
<property name="label" translatable="yes">Show graph </property>
<property name="use_action_appearance">False</property>
@@ -499,6 +486,24 @@
<property name="height">1</property>
</packing>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</object>
<packing>
<property name="position">2</property>
diff --git a/src/sheet-object-image.c b/src/sheet-object-image.c
index b9c074e..5466631 100644
--- a/src/sheet-object-image.c
+++ b/src/sheet-object-image.c
@@ -10,6 +10,7 @@
#include <glib/gi18n-lib.h>
#include "gnumeric.h"
#include "sheet-object-image.h"
+#include "sheet.h"
#include "gnm-pane.h"
#include "wbc-gtk.h"
@@ -98,6 +99,7 @@ struct _SheetObjectImage {
GOImage *image;
char *type;
+ char *name;
GByteArray bytes;
gboolean dumped;
@@ -169,6 +171,7 @@ gnm_soi_finalize (GObject *object)
soi = SHEET_OBJECT_IMAGE (object);
g_free (soi->bytes.data);
g_free (soi->type);
+ g_free (soi->name);
soi->bytes.data = NULL;
if (soi->image)
g_object_unref (soi->image);
@@ -176,129 +179,6 @@ gnm_soi_finalize (GObject *object)
G_OBJECT_CLASS (gnm_soi_parent_class)->finalize (object);
}
-static GdkPixbuf *
-soi_get_cropped_pixbuf (SheetObjectImage *soi, GdkPixbuf *pixbuf)
-{
- int width = gdk_pixbuf_get_width (pixbuf);
- int height = gdk_pixbuf_get_height (pixbuf);
- int sub_x = rint (soi->crop_left * width);
- int sub_y = rint (soi->crop_top * height);
- int sub_width = rint (width *
- (1. - soi->crop_left - soi->crop_right));
- int sub_height = rint (height *
- (1. - soi->crop_top - soi->crop_bottom));
- GdkPixbuf *sub = gdk_pixbuf_new_subpixbuf (pixbuf, sub_x, sub_y,
- sub_width, sub_height);
- if (sub) {
- g_object_unref (G_OBJECT (pixbuf));
- pixbuf = sub;
- }
- return pixbuf;
-}
-
-static void
-soi_info_cb (GdkPixbufLoader *loader,
- int width,
- int height,
- gpointer data)
-{
- SheetObjectImage *soi = SHEET_OBJECT_IMAGE (data);
- GdkPixbufFormat *format = gdk_pixbuf_loader_get_format (loader);
- char *name = gdk_pixbuf_format_get_name (format);
-
- g_free (soi->type);
- soi->type = name;
-}
-
-/**
- * be sure to unref the result if it is non-NULL
- *
- * TODO : this is really overkill for now.
- * only wmf/emf will require regenerating the pixbuf for different scale
- * factors. And even then we should cache them.
- */
-static GdkPixbuf *
-soi_get_pixbuf (SheetObjectImage *soi, double scale)
-{
- GError *err = NULL;
- guint8 *data;
- guint32 data_len;
- GdkPixbufLoader *loader = NULL;
- GdkPixbuf *pixbuf = NULL;
- gboolean ret;
-
- g_return_val_if_fail (IS_SHEET_OBJECT_IMAGE (soi), NULL);
-
- data = soi->bytes.data;
- data_len = soi->bytes.len;
- if (data == NULL || data_len == 0)
- return pixbuf;
-
- if (soi->type != NULL && !strcmp (soi->type, "wmf"))
- loader = gdk_pixbuf_loader_new_with_type (soi->type, &err);
- else
- loader = gdk_pixbuf_loader_new ();
-
- if (soi->type == NULL || strlen (soi->type) == 0)
- g_signal_connect (loader, "size-prepared",
- G_CALLBACK (soi_info_cb), soi);
-
- if (loader) {
- ret = gdk_pixbuf_loader_write (loader,
- soi->bytes.data, soi->bytes.len,
- &err);
- /* Close in any case. But don't let error during closing
- * shadow error from loader_write. */
- gdk_pixbuf_loader_close (loader, ret ? &err : NULL);
- if (ret)
- pixbuf = gdk_pixbuf_loader_get_pixbuf (loader);
- if (pixbuf) {
- g_object_ref (G_OBJECT (pixbuf));
- d (printf ("pixbuf width=%d, height=%d\n",
- gdk_pixbuf_get_width (pixbuf),
- gdk_pixbuf_get_height (pixbuf)));
- if (soi->crop_top != 0.0 || soi->crop_bottom != 0.0 ||
- soi->crop_left != 0.0 || soi->crop_right != 0.0) {
- d (printf ("crop rect top=%g, bottom=%g, "
- "left=%g, right=%g\n",
- soi->crop_top, soi->crop_bottom,
- soi->crop_left, soi->crop_right));
- pixbuf = soi_get_cropped_pixbuf (soi, pixbuf);
- }
- }
- g_object_unref (G_OBJECT (loader));
- }
- if (!pixbuf) {
- if (!soi->dumped) {
- static int count = 0;
- char *filename = g_strdup_printf ("unknown%d.%s",
- count++, soi->type);
-#if 0
- GsfOutput *file = gsf_output_stdio_new (filename, NULL);
- if (file) {
- gsf_output_write (GSF_OUTPUT (file),
- soi->bytes.len,
- soi->bytes.data);
- gsf_output_close (GSF_OUTPUT (file));
- g_object_unref (file);
- }
-#endif
- g_free (filename);
- soi->dumped = TRUE;
- }
-
- if (err != NULL) {
- g_warning ("%s", err->message);
- g_error_free (err);
- err = NULL;
- } else {
- g_warning ("Unable to display image");
- }
- }
-
- return pixbuf;
-}
-
static SheetObjectView *
gnm_soi_new_view (SheetObject *so, SheetObjectViewContainer *container)
{
@@ -322,7 +202,7 @@ gnm_soi_new_view (SheetObject *so, SheetObjectViewContainer *container)
} else {
GdkPixbuf *pixbuf, *placeholder = NULL;
- pixbuf = soi_get_pixbuf (soi, 1.);
+ pixbuf = go_image_get_pixbuf (soi->image);
if (pixbuf == NULL) {
placeholder = gtk_icon_theme_load_icon (
@@ -364,7 +244,8 @@ static GOImageFormat const standard_formats[] = {
GO_IMAGE_FORMAT_JPG,
GO_IMAGE_FORMAT_SVG,
GO_IMAGE_FORMAT_EMF,
- GO_IMAGE_FORMAT_WMF
+ GO_IMAGE_FORMAT_WMF,
+ GO_IMAGE_FORMAT_EPS
};
static GtkTargetList *
@@ -377,7 +258,7 @@ gnm_soi_get_target_list (SheetObject const *so)
GdkPixbuf *pixbuf = NULL;
if (soi->type == NULL || soi->image == NULL)
- pixbuf = soi_get_pixbuf (soi, 1.0);
+ pixbuf = go_image_get_pixbuf (soi->image);
mime_str = go_image_format_to_mime (soi->type);
if (mime_str) {
mimes = go_strsplit_to_slist (mime_str, ',');
@@ -407,7 +288,7 @@ gnm_soi_write_image (SheetObject const *so, char const *format, double resolutio
{
SheetObjectImage *soi = SHEET_OBJECT_IMAGE (so);
gboolean res = FALSE;
- GdkPixbuf *pixbuf = soi_get_pixbuf (soi, 1.0);
+ GdkPixbuf *pixbuf = go_image_get_pixbuf (soi->image);
if (!soi->type || strcmp (format, soi->type) == 0)
res = gsf_output_write (output,
@@ -440,10 +321,10 @@ soi_cb_save_as (SheetObject *so, SheetControl *sc)
g_return_if_fail (soi != NULL);
sel_fmt = go_image_get_format_from_name (soi->type);
- if ((pixbuf = soi_get_pixbuf (soi, 1.0)) != NULL)
+ if ((pixbuf = go_image_get_pixbuf (soi->image)) != NULL)
l = go_image_get_formats_with_pixbuf_saver ();
/* Move original format first in menu */
- if (sel_fmt) {
+ if (sel_fmt != GO_IMAGE_FORMAT_UNKNOWN) {
l = g_slist_remove (l, GUINT_TO_POINTER (sel_fmt));
l = g_slist_prepend (l, GUINT_TO_POINTER (sel_fmt));
}
@@ -486,13 +367,17 @@ content_start (GsfXMLIn *xin, xmlChar const **attrs)
{
SheetObject *so = gnm_xml_in_cur_obj (xin);
SheetObjectImage *soi = SHEET_OBJECT_IMAGE (so);
- char const *image_type = NULL;
+ char const *image_type = NULL, *image_name = NULL;
for (; attrs != NULL && attrs[0] && attrs[1] ; attrs += 2)
if (attr_eq (attrs[0], "image-type"))
image_type = CXML2C (attrs[1]);
+ else if (attr_eq (attrs[0], "name"))
+ image_name = CXML2C (attrs[1]);
soi->type = g_strdup (image_type);
+ if (image_name)
+ soi->name = g_strdup (image_name);
}
static void
content_end (GsfXMLIn *xin, G_GNUC_UNUSED GsfXMLBlob *unknown)
@@ -500,10 +385,12 @@ content_end (GsfXMLIn *xin, G_GNUC_UNUSED GsfXMLBlob *unknown)
SheetObject *so = gnm_xml_in_cur_obj (xin);
SheetObjectImage *soi = SHEET_OBJECT_IMAGE (so);
- soi->bytes.len = gsf_base64_decode_simple (
- xin->content->str, xin->content->len);
- soi->bytes.data = g_memdup (xin->content->str, soi->bytes.len);
- soi->image = go_image_new_from_data (soi->type, xin->content->str, soi->bytes.len, NULL, NULL);
+ if (soi->name == NULL) {
+ soi->bytes.len = gsf_base64_decode_simple (
+ xin->content->str, xin->content->len);
+ soi->bytes.data = g_memdup (xin->content->str, soi->bytes.len);
+ soi->image = go_image_new_from_data (soi->type, xin->content->str, soi->bytes.len, NULL, NULL);
+ }
}
static void
@@ -545,8 +432,13 @@ gnm_soi_write_xml_sax (SheetObject const *so, GsfXMLOut *output,
gsf_xml_out_start_element (output, "Content");
if (soi->type != NULL)
gsf_xml_out_add_cstr (output, "image-type", soi->type);
- gsf_xml_out_add_uint (output, "size-bytes", soi->bytes.len);
- gsf_xml_out_add_base64 (output, NULL, soi->bytes.data, soi->bytes.len);
+ if (soi->image && go_image_get_name (soi->image)) {
+ gsf_xml_out_add_cstr (output, "name", go_image_get_name (soi->image));
+ go_doc_save_image (GO_DOC (sheet_object_get_sheet (so)->workbook), go_image_get_name (soi->image));
+ } else {
+ gsf_xml_out_add_uint (output, "size-bytes", soi->bytes.len);
+ gsf_xml_out_add_base64 (output, NULL, soi->bytes.data, soi->bytes.len);
+ }
gsf_xml_out_end_element (output);
}
@@ -589,7 +481,7 @@ gnm_soi_draw_cairo (SheetObject const *so, cairo_t *cr,
go_image_draw (soi->image, cr);
cairo_restore (cr);
} else {
- pixbuf = soi_get_pixbuf (soi, 1.);
+ pixbuf = go_image_get_pixbuf (soi->image);
if (!pixbuf || width == 0. || height == 0.)
return;
cairo_save (cr);
@@ -617,7 +509,7 @@ gnm_soi_default_size (SheetObject const *so, double *w, double *h)
*w = go_image_get_width (soi->image);
*h = go_image_get_height (soi->image);
} else {
- GdkPixbuf *buf = soi_get_pixbuf (soi, 1.);
+ GdkPixbuf *buf = go_image_get_pixbuf (soi->image);
if (!buf) {
*w = *h = 5;
@@ -639,6 +531,26 @@ gnm_soi_default_size (SheetObject const *so, double *w, double *h)
}
}
+static gboolean
+gnm_soi_assign_to_sheet (SheetObject *so, Sheet *sheet)
+{
+ SheetObjectImage *soi = SHEET_OBJECT_IMAGE (so);
+
+ if (soi->image && !go_image_get_name (soi->image)) {
+ GODoc *doc = GO_DOC (sheet->workbook);
+ GOImage *image = go_doc_add_image (doc, NULL, soi->image);
+ if (soi->image != image) {
+ g_object_unref (soi->image);
+ soi->image = image;
+ }
+ } else if (soi->name) {
+ GODoc *doc = GO_DOC (sheet->workbook);
+ GType type = go_image_type_for_format (soi->type);
+ soi->image = g_object_ref (go_doc_image_fetch (doc, soi->name, type));
+ }
+ return FALSE;
+}
+
static void
gnm_soi_get_property (GObject *object,
guint property_id,
@@ -656,7 +568,7 @@ gnm_soi_get_property (GObject *object,
g_value_set_pointer (value, &soi->bytes);
break;
case PROP_PIXBUF:
- pixbuf = soi_get_pixbuf (soi, 1.0);
+ pixbuf = go_image_get_pixbuf (soi->image);
g_value_set_object (value, pixbuf);
break;
default:
@@ -686,6 +598,7 @@ gnm_soi_class_init (GObjectClass *object_class)
so_class->draw_cairo = gnm_soi_draw_cairo;
so_class->user_config = NULL;
so_class->default_size = gnm_soi_default_size;
+ so_class->assign_to_sheet = gnm_soi_assign_to_sheet;
so_class->rubber_band_directly = TRUE;
/* The property strings don't need translation */
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
