[goffice] Replaced GtkTable by GtkGrid.
- From: Jean BrÃfort <jbrefort src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [goffice] Replaced GtkTable by GtkGrid.
- Date: Thu, 14 Feb 2013 12:56:59 +0000 (UTC)
commit 104ee005d08716d779575a25028e32f752c0ed5a
Author: Jean Brefort <jean brefort normalesup org>
Date: Thu Feb 14 13:55:32 2013 +0100
Replaced GtkTable by GtkGrid.
ChangeLog | 8 +
docs/reference/goffice-0.10-sections.txt | 1 -
goffice/graph/gog-chart.c | 14 +-
goffice/graph/gog-error-bar-prefs.ui | 616 +++++++++-----------
goffice/graph/gog-error-bar.c | 43 +-
goffice/graph/gog-object-prefs.ui | 270 +++++-----
goffice/graph/gog-object-xml.c | 3 +-
goffice/graph/gog-object.c | 2 +-
goffice/graph/gog-plot-prefs.ui | 510 ++++++++--------
goffice/graph/gog-plot.c | 25 +-
goffice/graph/gog-series.c | 97 ++--
goffice/graph/gog-smoothed-curve.c | 3 +-
goffice/graph/gog-styled-object.c | 2 +-
goffice/graph/gog-trend-line.c | 10 +-
goffice/gtk/go-color-palette.c | 25 +-
goffice/gtk/go-combo-pixmaps.c | 15 +-
goffice/gtk/go-font-sel.c | 21 +-
goffice/gtk/go-font-sel.ui | 143 +++--
goffice/gtk/go-image-save-dialog-extra.ui | 78 ++-
goffice/gtk/goffice-gtk.c | 8 +-
goffice/utils/go-editor.c | 38 +-
goffice/utils/go-editor.h | 11 -
goffice/utils/go-style-prefs.ui | 569 ++++++++----------
goffice/utils/go-style.c | 28 +-
plugins/plot_barcol/gog-area-prefs.ui | 42 ++-
plugins/plot_barcol/gog-barcol-prefs.c | 2 +-
plugins/plot_barcol/gog-barcol-prefs.ui | 115 ++--
plugins/plot_barcol/gog-minmax-prefs.ui | 72 ++-
plugins/plot_barcol/gog-minmax.c | 2 +-
plugins/plot_distrib/go-distribution-prefs.c | 18 +-
plugins/plot_distrib/gog-boxplot-prefs.ui | 166 +++---
plugins/plot_distrib/gog-boxplot.c | 2 +-
plugins/plot_distrib/gog-double-histogram-prefs.ui | 51 ++-
plugins/plot_distrib/gog-histogram-prefs.ui | 53 ++-
plugins/plot_distrib/gog-histogram.c | 10 +-
plugins/plot_pie/gog-pie-prefs.c | 6 +-
plugins/plot_pie/gog-pie-prefs.ui | 148 +++---
plugins/plot_pie/gog-pie-series.ui | 120 ++--
plugins/plot_pie/gog-ring-prefs.ui | 223 ++++----
plugins/plot_radar/gog-color-polar-prefs.ui | 42 ++-
plugins/plot_radar/gog-polar-prefs.ui | 42 ++-
plugins/plot_xy/gog-bubble-prefs.c | 2 +-
plugins/plot_xy/gog-bubble-prefs.ui | 194 +++----
plugins/plot_xy/gog-xy-color-prefs.ui | 42 ++-
plugins/plot_xy/gog-xy-dropbar-prefs.ui | 79 ++--
plugins/plot_xy/gog-xy-prefs.ui | 41 ++-
plugins/plot_xy/gog-xy-series-prefs.ui | 39 +-
plugins/plot_xy/gog-xy.c | 2 +-
plugins/smoothing/gog-exp-smooth.c | 9 +-
plugins/smoothing/gog-exp-smooth.ui | 51 ++-
50 files changed, 2161 insertions(+), 1952 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 2dfe234..543cb05 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2013-02-14 Jean Brefort <jean brefort normalesup org>
+
+ * goffice/graph/gog-object-xml.c (gog_object_write_property_sax): always
+ save a GogStyle for compatibility.
+ * goffice/graph/gog-styled-object.c (gog_styled_object_class_init): use
+ GOStyle for style property.
+ * others: replaced all GtkTable uses.
+
2013-02-07 Morten Welinder <terra gnome org>
* goffice/math/go-regression.c (back_solve): Fix infinite loop.
diff --git a/docs/reference/goffice-0.10-sections.txt b/docs/reference/goffice-0.10-sections.txt
index 7c59994..da3709a 100644
--- a/docs/reference/goffice-0.10-sections.txt
+++ b/docs/reference/goffice-0.10-sections.txt
@@ -902,7 +902,6 @@ GO_IS_DOC_CLASS
<FILE>go-editor</FILE>
<TITLE>GOEditor</TITLE>
GOEditor
-GOEditorPage
go_editor_add_page
go_editor_free
go_editor_get_notebook
diff --git a/goffice/graph/gog-chart.c b/goffice/graph/gog-chart.c
index e0dba18..accaa89 100644
--- a/goffice/graph/gog-chart.c
+++ b/goffice/graph/gog-chart.c
@@ -237,7 +237,7 @@ typedef struct {
GtkWidget *x_spin, *y_spin, *w_spin, *h_spin;
gulong w_spin_signal, h_spin_signal;
GtkWidget *position_select_combo;
- GtkWidget *manual_setting_table;
+ GtkWidget *manual_setting_grid;
GogChart *chart;
} PlotAreaPrefState;
@@ -284,7 +284,7 @@ cb_plot_area_changed (GtkWidget *spin, PlotAreaPrefState *state)
}
gog_chart_set_plot_area (state->chart, &pos);
gtk_combo_box_set_active (GTK_COMBO_BOX (state->position_select_combo), 1);
- gtk_widget_show (state->manual_setting_table);
+ gtk_widget_show (state->manual_setting_grid);
}
static void
@@ -295,10 +295,10 @@ cb_manual_position_changed (GtkComboBox *combo, PlotAreaPrefState *state)
gog_chart_get_plot_area (state->chart, &plot_area);
gog_chart_set_plot_area (state->chart, &plot_area);
- gtk_widget_show (state->manual_setting_table);
+ gtk_widget_show (state->manual_setting_grid);
} else {
gog_chart_set_plot_area (state->chart, NULL);
- gtk_widget_hide (state->manual_setting_table);
+ gtk_widget_hide (state->manual_setting_grid);
}
}
@@ -362,14 +362,14 @@ gog_chart_populate_editor (GogObject *gobj,
state->position_select_combo = go_gtk_builder_get_widget (gui, "position_select_combo");
gtk_combo_box_set_active (GTK_COMBO_BOX (state->position_select_combo),
is_plot_area_manual ? 1 : 0);
- state->manual_setting_table = go_gtk_builder_get_widget (gui, "manual_setting_table");
+ state->manual_setting_grid = go_gtk_builder_get_widget (gui, "manual-setting-grid");
if (!is_plot_area_manual)
- gtk_widget_hide (state->manual_setting_table);
+ gtk_widget_hide (state->manual_setting_grid);
g_signal_connect (G_OBJECT (state->position_select_combo),
"changed", G_CALLBACK (cb_manual_position_changed), state);
- w = go_gtk_builder_get_widget (gui, "gog_plot_prefs");
+ w = go_gtk_builder_get_widget (gui, "gog-plot-prefs");
g_signal_connect_swapped (G_OBJECT (w), "destroy", G_CALLBACK (plot_area_pref_state_free), state);
go_editor_add_page (editor, w, _("Plot area"));
diff --git a/goffice/graph/gog-error-bar-prefs.ui b/goffice/graph/gog-error-bar-prefs.ui
index b262954..41a42e6 100644
--- a/goffice/graph/gog-error-bar-prefs.ui
+++ b/goffice/graph/gog-error-bar-prefs.ui
@@ -1,393 +1,341 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<interface>
<!-- interface-requires gtk+ 3.0 -->
- <!-- interface-naming-policy toplevel-contextual -->
<object class="GtkAdjustment" id="adjustment1">
- <property name="value">1</property>
<property name="upper">100</property>
+ <property name="value">1</property>
<property name="step_increment">1</property>
<property name="page_increment">10</property>
</object>
<object class="GtkAdjustment" id="adjustment2">
- <property name="value">5</property>
<property name="upper">100</property>
+ <property name="value">5</property>
<property name="step_increment">1</property>
<property name="page_increment">10</property>
</object>
- <object class="GtkListStore" id="model1">
- <columns>
- <!-- column-name gchararray -->
- <column type="gchararray"/>
- </columns>
- <data>
- <row>
- <col id="0" translatable="yes">None</col>
- </row>
- <row>
- <col id="0" translatable="yes">Absolute</col>
- </row>
- <row>
- <col id="0" translatable="yes">Relative</col>
- </row>
- <row>
- <col id="0" translatable="yes">Percent</col>
- </row>
- </data>
- </object>
- <object class="GtkBox" id="gog_error_bar_prefs">
+ <object class="GtkGrid" id="gog-error-bar-prefs">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="border_width">12</property>
- <property name="orientation">vertical</property>
- <property name="spacing">12</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
<child>
- <object class="GtkBox" id="hbox1">
+ <object class="GtkGrid" id="style-grid">
<property name="visible">True</property>
- <property name="spacing">24</property>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
<child>
- <object class="GtkBox" id="vbox1">
+ <object class="GtkLabel" id="display_label">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
- <child>
- <object class="GtkLabel" id="category_label">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Error category</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkAlignment" id="category_alignment">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="yalign">0</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
- <property name="top_padding">6</property>
- <property name="left_padding">18</property>
- <child>
- <object class="GtkComboBox" id="category_combo">
- <property name="visible">True</property>
- <property name="model">model1</property>
- <child>
- <object class="GtkCellRendererText" id="renderer1"/>
- <attributes>
- <attribute name="text">0</attribute>
- </attributes>
- </child>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
+ <property name="can_focus">False</property>
+ <property name="margin_left">18</property>
+ <property name="xalign">0</property>
+ <property name="xpad">5</property>
+ <property name="label" translatable="yes">Dis_play:</property>
+ <property name="use_underline">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">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
- <object class="GtkBox" id="style_box">
+ <object class="GtkLabel" id="width_label">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
- <child>
- <object class="GtkLabel" id="style_label">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Style</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkAlignment" id="alignment1">
- <property name="visible">True</property>
- <property name="top_padding">6</property>
- <property name="left_padding">18</property>
- <child>
- <object class="GtkTable" id="style_table">
- <property name="visible">True</property>
- <property name="n_rows">4</property>
- <property name="n_columns">5</property>
- <property name="column_spacing">12</property>
- <property name="row_spacing">6</property>
- <child>
- <object class="GtkLabel" id="display_label">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="xpad">5</property>
- <property name="label" translatable="yes">Dis_play:</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="width_label">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="xpad">5</property>
- <property name="label" translatable="yes">_Width:</property>
- <property name="use_underline">True</property>
- <property name="justify">right</property>
- <property name="mnemonic_widget">width</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="GtkLabel" id="line_width_label">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="xpad">5</property>
- <property name="label" translatable="yes">_Line width:</property>
- <property name="use_underline">True</property>
- <property name="justify">right</property>
- <property name="mnemonic_widget">line_width</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="GtkLabel" id="color_label">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="xpad">5</property>
- <property name="label" translatable="yes">Colo_r:</property>
- <property name="use_underline">True</property>
- <property name="justify">right</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="line_width">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="invisible_char">•</property>
- <property name="adjustment">adjustment1</property>
- <property name="climb_rate">1</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>
- <object class="GtkSpinButton" id="width">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="invisible_char">•</property>
- <property name="adjustment">adjustment2</property>
- <property name="climb_rate">1</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="GtkLabel" id="width-label">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">pts</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="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label2">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">pts</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>
- <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>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
+ <property name="can_focus">False</property>
+ <property name="margin_left">18</property>
+ <property name="xalign">0</property>
+ <property name="xpad">5</property>
+ <property name="label" translatable="yes">_Width:</property>
+ <property name="use_underline">True</property>
+ <property name="justify">right</property>
+ <property name="mnemonic_widget">width</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="line_width_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_left">18</property>
+ <property name="xalign">0</property>
+ <property name="xpad">5</property>
+ <property name="label" translatable="yes">_Line width:</property>
+ <property name="use_underline">True</property>
+ <property name="justify">right</property>
+ <property name="mnemonic_widget">line_width</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="color_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_left">18</property>
+ <property name="xalign">0</property>
+ <property name="xpad">5</property>
+ <property name="label" translatable="yes">Colo_r:</property>
+ <property name="use_underline">True</property>
+ <property name="justify">right</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="GtkSpinButton" id="width">
+ <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="adjustment">adjustment2</property>
+ <property name="climb_rate">1</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="GtkSpinButton" id="line_width">
+ <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="adjustment">adjustment1</property>
+ <property name="climb_rate">1</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">3</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="width-pts-label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">pts</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="GtkLabel" id="line-pts-label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">pts</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="GtkLabel" id="style_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Style</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</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>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</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="GtkBox" id="values_box">
+ <object class="GtkGrid" id="values-grid">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
+ <property name="can_focus">False</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
+ <child>
+ <object class="GtkLabel" id="plus_label1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_left">18</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">(+)</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="GtkLabel" id="minus_label1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_left">18</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">(-)</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="values_label">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Values</property>
<attributes>
- <attribute name="weight" value="bold"/>
+ <attribute name="weight" value="bold"/>
</attributes>
</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">0</property>
+ <property name="width">2</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
- <object class="GtkAlignment" id="alignment3">
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ <packing>
+ <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="GtkGrid" id="category-grid">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">start</property>
+ <property name="row_spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="category_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Error category</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </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>
+ <child>
+ <object class="GtkComboBox" id="category-combo">
<property name="visible">True</property>
- <property name="top_padding">6</property>
- <property name="left_padding">18</property>
+ <property name="can_focus">False</property>
+ <property name="margin_left">18</property>
+ <property name="model">model1</property>
<child>
- <object class="GtkTable" id="values_table">
- <property name="visible">True</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>
- <child>
- <object class="GtkLabel" id="plus_label">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">(+)</property>
- </object>
- <packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="minus_label">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">(-)</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>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- </object>
+ <object class="GtkCellRendererText" id="renderer1"/>
+ <attributes>
+ <attribute name="text">0</attribute>
+ </attributes>
</child>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
</object>
<packing>
- <property name="position">1</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>
+ <placeholder/>
+ </child>
+ </object>
+ <object class="GtkListStore" id="model1">
+ <columns>
+ <!-- column-name gchararray -->
+ <column type="gchararray"/>
+ </columns>
+ <data>
+ <row>
+ <col id="0" translatable="yes">None</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Absolute</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Relative</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Percent</col>
+ </row>
+ </data>
</object>
</interface>
diff --git a/goffice/graph/gog-error-bar.c b/goffice/graph/gog-error-bar.c
index 998bfa0..79c6392 100644
--- a/goffice/graph/gog-error-bar.c
+++ b/goffice/graph/gog-error-bar.c
@@ -181,10 +181,10 @@ cb_type_changed (GtkWidget *w, GogErrorBarEditor *editor)
gtk_widget_destroy (GTK_WIDGET(data));
g_object_set_data (G_OBJECT (w), "plus", NULL);
g_object_set_data (G_OBJECT (w), "minus", NULL);
- gtk_widget_hide (go_gtk_builder_get_widget (gui, "values_box"));
- gtk_widget_hide (go_gtk_builder_get_widget (gui, "style_box"));
+ gtk_widget_hide (go_gtk_builder_get_widget (gui, "values-grid"));
+ gtk_widget_hide (go_gtk_builder_get_widget (gui, "style-grid"));
} else {
- GtkWidget *table = go_gtk_builder_get_widget (gui, "values_table");
+ GtkWidget *grid = go_gtk_builder_get_widget (gui, "values-grid");
if (!editor->bar) {
editor->bar = g_object_new (GOG_TYPE_ERROR_BAR, NULL);
editor->bar->style->line.color = editor->color;
@@ -203,7 +203,8 @@ cb_type_changed (GtkWidget *w, GogErrorBarEditor *editor)
GtkWidget* al = GTK_WIDGET (gog_data_allocator_editor (dalloc, set,
editor->bar->error_i,
GOG_DATA_VECTOR));
- gtk_table_attach (GTK_TABLE (table), al, 1, 2, 0, 1, GTK_FILL | GTK_EXPAND, 0, 0, 0);
+ gtk_widget_set_hexpand (al, TRUE);
+ gtk_grid_attach (GTK_GRID (grid), al, 1, 1, 1, 1);
g_object_set_data (G_OBJECT (w), "plus", al);
}
data = g_object_get_data (G_OBJECT (w), "minus");
@@ -211,11 +212,12 @@ cb_type_changed (GtkWidget *w, GogErrorBarEditor *editor)
GtkWidget* al = GTK_WIDGET (gog_data_allocator_editor (dalloc, set,
editor->bar->error_i + 1,
GOG_DATA_VECTOR));
- gtk_table_attach (GTK_TABLE (table), al, 1, 2, 1, 2, GTK_FILL | GTK_EXPAND, 0, 0, 0);
+ gtk_widget_set_hexpand (al, TRUE);
+ gtk_grid_attach (GTK_GRID (grid), al, 1, 2, 1, 1);
g_object_set_data (G_OBJECT (w), "minus", al);
}
- gtk_widget_show_all (go_gtk_builder_get_widget (gui, "values_box"));
- gtk_widget_show (go_gtk_builder_get_widget (gui, "style_box"));
+ gtk_widget_show_all (grid);
+ gtk_widget_show_all (go_gtk_builder_get_widget (gui, "style-grid"));
}
gog_object_request_update (GOG_OBJECT (editor->series));
}
@@ -238,8 +240,7 @@ gog_error_bar_prefs (GogSeries *series,
GOCmdContext *cc)
{
GtkBuilder *gui;
- GtkWidget *w, *bar_prefs;
- GtkTable *style_table, *values_table;
+ GtkWidget *w, *bar_prefs, *grid;
GtkWidget *combo;
GtkListStore *list;
GtkTreeIter iter;
@@ -271,6 +272,7 @@ gog_error_bar_prefs (GogSeries *series,
gui = go_gtk_builder_load_internal ("res:go:graph/gog-error-bar-prefs.ui", GETTEXT_PACKAGE, cc);
/* Style properties */
+ grid = go_gtk_builder_get_widget (gui, "style-grid");
/* Width */
w = go_gtk_builder_get_widget (gui, "width");
@@ -286,8 +288,6 @@ gog_error_bar_prefs (GogSeries *series,
"value_changed",
G_CALLBACK (cb_line_width_changed), editor);
- style_table = GTK_TABLE (gtk_builder_get_object (gui, "style_table"));
-
/* Color */
w = go_selector_new_color (editor->color, GO_COLOR_BLACK, "error-bar");
gtk_label_set_mnemonic_widget (
@@ -295,7 +295,8 @@ gog_error_bar_prefs (GogSeries *series,
g_signal_connect (G_OBJECT (w),
"activate",
G_CALLBACK (cb_color_changed), editor);
- gtk_table_attach (GTK_TABLE (style_table), w, 1, 2, 3, 4, GTK_FILL, GTK_FILL, 0, 0);
+ gtk_widget_set_halign (w, GTK_ALIGN_START);
+ gtk_grid_attach (GTK_GRID (grid), w, 1, 4, 1, 1);
/* Display style */
list = gtk_list_store_new (3, GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_UINT);
@@ -325,7 +326,7 @@ gog_error_bar_prefs (GogSeries *series,
gtk_combo_box_set_active_iter (GTK_COMBO_BOX (combo), &iter);
}
- gtk_table_attach (GTK_TABLE (style_table), GTK_WIDGET(combo), 1, 4, 0, 1, GTK_FILL, GTK_FILL, 0, 0);
+ gtk_grid_attach (GTK_GRID (grid), GTK_WIDGET(combo), 1, 1, 1, 1);
g_signal_connect (G_OBJECT (combo), "changed", G_CALLBACK (cb_display_changed), editor);
/* if radial, change the width unit */
@@ -336,31 +337,33 @@ gog_error_bar_prefs (GogSeries *series,
}
/* Category property*/
- w = go_gtk_builder_get_widget (gui, "category_combo");
+ w = go_gtk_builder_get_widget (gui, "category-combo");
gtk_combo_box_set_active (GTK_COMBO_BOX (w), (editor->bar)? (int) editor->bar->type: 0);
g_object_set_data (G_OBJECT (w), "gui", gui);
g_object_set_data (G_OBJECT (w), "allocator", dalloc);
g_signal_connect (G_OBJECT (w), "changed", G_CALLBACK (cb_type_changed), editor);
/* Value properties */
- bar_prefs = go_gtk_builder_get_widget (gui, "gog_error_bar_prefs");
+ bar_prefs = go_gtk_builder_get_widget (gui, "gog-error-bar-prefs");
g_object_ref (bar_prefs);
g_signal_connect (bar_prefs, "destroy", G_CALLBACK (cb_destroy), editor);
gtk_widget_show_all (bar_prefs);
- values_table = GTK_TABLE (gtk_builder_get_object (gui, "values_table"));
if (editor->bar) {
GtkWidget* al = GTK_WIDGET (gog_data_allocator_editor (dalloc, set, editor->bar->error_i,
GOG_DATA_VECTOR));
+ grid = go_gtk_builder_get_widget (gui, "values-grid");
gtk_widget_show (al);
- gtk_table_attach (values_table, al, 1, 2, 0, 1, GTK_FILL | GTK_EXPAND, 0, 0, 0);
+ gtk_widget_set_hexpand (al, TRUE);
+ gtk_grid_attach (GTK_GRID (bar_prefs), al, 1, 1, 1, 1);
g_object_set_data (G_OBJECT (w), "plus", al);
al = GTK_WIDGET (gog_data_allocator_editor (dalloc, set, editor->bar->error_i + 1,
GOG_DATA_VECTOR));
gtk_widget_show (al);
- gtk_table_attach (values_table, al, 1, 2, 1, 2, GTK_FILL | GTK_EXPAND, 0, 0, 0);
+ gtk_widget_set_hexpand (al, TRUE);
+ gtk_grid_attach (GTK_GRID (bar_prefs), al, 1, 2, 1, 1);
g_object_set_data (G_OBJECT (w), "minus", al);
} else {
- gtk_widget_hide (go_gtk_builder_get_widget (gui, "values_box"));
- gtk_widget_hide (go_gtk_builder_get_widget (gui, "style_box"));
+ gtk_widget_hide (go_gtk_builder_get_widget (gui, "values-grid"));
+ gtk_widget_hide (go_gtk_builder_get_widget (gui, "style-grid"));
}
g_signal_connect_swapped (G_OBJECT (bar_prefs), "destroy", G_CALLBACK (g_object_unref), gui);
diff --git a/goffice/graph/gog-object-prefs.ui b/goffice/graph/gog-object-prefs.ui
index 81b5857..6172fb6 100644
--- a/goffice/graph/gog-object-prefs.ui
+++ b/goffice/graph/gog-object-prefs.ui
@@ -203,29 +203,59 @@
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
- <object class="GtkTable" id="manual_positions">
+ <object class="GtkGrid" id="manual-positions">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="n_rows">3</property>
- <property name="n_columns">3</property>
- <property name="column_spacing">12</property>
<property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
<child>
- <object class="GtkLabel" id="label37">
+ <object class="GtkLabel" id="x_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">%</property>
+ <property name="label" translatable="yes">_X:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">x_spin</property>
</object>
<packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></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>
- <object class="GtkLabel" id="label38">
+ <object class="GtkLabel" id="y_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Y:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">y_spin</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="GtkLabel" id="anchor_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Anchor:</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="label37">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
@@ -233,27 +263,23 @@
</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="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
- <object class="GtkLabel" id="y_label">
+ <object class="GtkLabel" id="label38">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_Y:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">y_spin</property>
+ <property name="label" translatable="yes">%</property>
</object>
<packing>
+ <property name="left_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>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
@@ -261,6 +287,7 @@
<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="adjustment">adjustment1</property>
<property name="climb_rate">1</property>
<property name="digits">1</property>
@@ -268,9 +295,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"></property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
@@ -278,6 +305,7 @@
<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="adjustment">adjustment2</property>
<property name="climb_rate">1</property>
<property name="digits">1</property>
@@ -285,39 +313,9 @@
</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="GtkLabel" id="x_label">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">_X:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">x_spin</property>
- </object>
- <packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="anchor_label">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Anchor:</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>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
@@ -328,17 +326,15 @@
</object>
<packing>
<property name="left_attach">1</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">GTK_FILL</property>
+ <property name="width">2</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">0</property>
</packing>
</child>
@@ -359,13 +355,11 @@
</packing>
</child>
<child>
- <object class="GtkTable" id="chart-table">
+ <object class="GtkGrid" id="chart-grid">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="n_rows">2</property>
- <property name="n_columns">4</property>
- <property name="column_spacing">12</property>
<property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
<child>
<object class="GtkLabel" id="col-lbl">
<property name="visible">True</property>
@@ -374,8 +368,10 @@
<property name="label" translatable="yes">Column:</property>
</object>
<packing>
- <property name="x_options"></property>
- <property name="y_options"></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>
@@ -386,10 +382,10 @@
<property name="label" translatable="yes">Row:</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>
@@ -402,9 +398,9 @@
</object>
<packing>
<property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
@@ -417,11 +413,9 @@
</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="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
@@ -429,29 +423,29 @@
<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="adjustment">col-adj</property>
</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"></property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
- <object class="GtkSpinButton" id="ypos">
+ <object class="GtkSpinButton" id="rows">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">â</property>
- <property name="adjustment">row-adj</property>
+ <property name="invisible_char_set">True</property>
+ <property name="adjustment">row-span-adj</property>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
+ <property name="left_attach">3</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>
@@ -459,35 +453,34 @@
<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="adjustment">col-span-adj</property>
</object>
<packing>
<property name="left_attach">3</property>
- <property name="right_attach">4</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
- <object class="GtkSpinButton" id="rows">
+ <object class="GtkSpinButton" id="ypos">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">â</property>
- <property name="adjustment">row-span-adj</property>
+ <property name="invisible_char_set">True</property>
+ <property name="adjustment">row-adj</property>
</object>
<packing>
- <property name="left_attach">3</property>
- <property name="right_attach">4</property>
+ <property name="left_attach">1</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>
</object>
<packing>
<property name="position">2</property>
- <property name="tab_fill">False</property>
</packing>
</child>
<child type="tab">
@@ -559,13 +552,27 @@
</packing>
</child>
<child>
- <object class="GtkTable" id="manual_sizes">
+ <object class="GtkGrid" id="manual-sizes">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="n_rows">2</property>
- <property name="n_columns">3</property>
- <property name="column_spacing">12</property>
<property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
+ <child>
+ <object class="GtkLabel" id="width_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Width:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">width_spin</property>
+ </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>
<child>
<object class="GtkLabel" id="height_label">
<property name="visible">True</property>
@@ -576,10 +583,10 @@
<property name="mnemonic_widget">height_spin</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>
@@ -591,9 +598,9 @@
</object>
<packing>
<property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
@@ -605,25 +612,9 @@
</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="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="width_label">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">_Width:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">width_spin</property>
- </object>
- <packing>
- <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>
@@ -639,9 +630,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"></property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
@@ -657,17 +648,24 @@
</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>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">False</property>
+ <property name="fill">True</property>
<property name="position">4</property>
</packing>
</child>
diff --git a/goffice/graph/gog-object-xml.c b/goffice/graph/gog-object-xml.c
index 78665b2..8e40229 100644
--- a/goffice/graph/gog-object-xml.c
+++ b/goffice/graph/gog-object-xml.c
@@ -123,7 +123,8 @@ gog_object_write_property_sax (GogObject const *obj, GParamSpec *pspec, GsfXMLOu
if (val_obj != NULL) {
if (GO_IS_PERSIST (val_obj)) {
gsf_xml_out_start_element (output, "property");
- gsf_xml_out_add_cstr_unchecked (output, "name", pspec->name);
+ gsf_xml_out_add_cstr_unchecked (output, "name",
+ GO_IS_STYLE (val_obj)? "GogStyle":
pspec->name);
go_persist_sax_save (GO_PERSIST (val_obj), output);
gsf_xml_out_end_element (output); /* </property> */
} else
diff --git a/goffice/graph/gog-object.c b/goffice/graph/gog-object.c
index 29c61fd..dbf4ce7 100644
--- a/goffice/graph/gog-object.c
+++ b/goffice/graph/gog-object.c
@@ -658,7 +658,7 @@ gog_object_populate_editor (GogObject *gobj,
}
if (size_mode == GOG_MANUAL_SIZE_AUTO) {
- w = go_gtk_builder_get_widget (gui, "manual_sizes");
+ w = go_gtk_builder_get_widget (gui, "manual-sizes");
gtk_widget_destroy (w);
w = go_gtk_builder_get_widget (gui, "size-select-box");
gtk_widget_destroy (w);
diff --git a/goffice/graph/gog-plot-prefs.ui b/goffice/graph/gog-plot-prefs.ui
index d7181f2..71fec08 100644
--- a/goffice/graph/gog-plot-prefs.ui
+++ b/goffice/graph/gog-plot-prefs.ui
@@ -1,7 +1,6 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<interface>
<!-- interface-requires gtk+ 3.0 -->
- <!-- interface-naming-policy toplevel-contextual -->
<object class="GtkAdjustment" id="adjustment1">
<property name="upper">100</property>
<property name="step_increment">1</property>
@@ -22,274 +21,283 @@
<property name="step_increment">1</property>
<property name="page_increment">10</property>
</object>
- <object class="GtkListStore" id="model1">
- <columns>
- <!-- column-name gchararray -->
- <column type="gchararray"/>
- </columns>
- <data>
- <row>
- <col id="0" translatable="yes">Automatic</col>
- </row>
- <row>
- <col id="0" translatable="yes">Manual</col>
- </row>
- </data>
- </object>
- <object class="GtkBox" id="gog_plot_prefs">
+ <object class="GtkGrid" id="gog-plot-prefs">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="border_width">12</property>
- <property name="orientation">vertical</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
<child>
- <object class="GtkBox" id="plot_area_box">
+ <object class="GtkGrid" id="manual-setting-grid">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
- <property name="spacing">6</property>
+ <property name="can_focus">False</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
+ <child>
+ <object class="GtkLabel" id="label46">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_X:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">x_spin</property>
+ </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>
+ <child>
+ <object class="GtkSpinButton" id="x_spin">
+ <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="adjustment">adjustment1</property>
+ <property name="climb_rate">1</property>
+ <property name="digits">1</property>
+ <property name="numeric">True</property>
+ </object>
+ <packing>
+ <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="GtkSpinButton" id="y_spin">
+ <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="adjustment">adjustment2</property>
+ <property name="climb_rate">1</property>
+ <property name="digits">1</property>
+ <property name="numeric">True</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="GtkSpinButton" id="w_spin">
+ <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="adjustment">adjustment3</property>
+ <property name="climb_rate">1</property>
+ <property name="digits">1</property>
+ <property name="numeric">True</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="GtkSpinButton" id="h_spin">
+ <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="adjustment">adjustment4</property>
+ <property name="climb_rate">1</property>
+ <property name="digits">1</property>
+ <property name="numeric">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">3</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label47">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Y:</property>
+ <property name="use_underline">True</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="GtkLabel" id="label48">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Width:</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label49">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Height:</property>
+ <property name="use_underline">True</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="GtkBox" id="hbox1">
+ <object class="GtkLabel" id="label50">
<property name="visible">True</property>
- <property name="spacing">12</property>
- <child>
- <object class="GtkLabel" id="label54">
- <property name="visible">True</property>
- <property name="label" translatable="yes">_Object position:</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkComboBox" id="position_select_combo">
- <property name="visible">True</property>
- <property name="model">model1</property>
- <child>
- <object class="GtkCellRendererText" id="renderer1"/>
- <attributes>
- <attribute name="text">0</attribute>
- </attributes>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="position">1</property>
- </packing>
- </child>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">%</property>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</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>
<child>
- <object class="GtkTable" id="manual_setting_table">
+ <object class="GtkLabel" id="label51">
<property name="visible">True</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>
- <child>
- <object class="GtkLabel" id="label47">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">_Y:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">y_spin</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="GtkLabel" id="label48">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">_Width:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">w_spin</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="GtkLabel" id="label49">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">_Height:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">h_spin</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="GtkLabel" id="label51">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">%</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="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label52">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">%</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>
- <object class="GtkLabel" id="label53">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">%</property>
- </object>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <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="x_spin">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="invisible_char">•</property>
- <property name="adjustment">adjustment1</property>
- <property name="climb_rate">1</property>
- <property name="digits">1</property>
- <property name="numeric">True</property>
- </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"></property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="y_spin">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="invisible_char">•</property>
- <property name="adjustment">adjustment2</property>
- <property name="climb_rate">1</property>
- <property name="digits">1</property>
- <property name="numeric">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="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="w_spin">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="invisible_char">•</property>
- <property name="adjustment">adjustment3</property>
- <property name="climb_rate">1</property>
- <property name="digits">1</property>
- <property name="numeric">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>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="h_spin">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="invisible_char">•</property>
- <property name="adjustment">adjustment4</property>
- <property name="climb_rate">1</property>
- <property name="digits">1</property>
- <property name="numeric">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>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label50">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">%</property>
- </object>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label46">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">_X:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">x_spin</property>
- </object>
- <packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">%</property>
</object>
<packing>
- <property name="position">1</property>
+ <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="GtkLabel" id="label52">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">%</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="GtkLabel" id="label53">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">%</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>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">2</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkComboBox" id="position_select_combo">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="model">model1</property>
+ <child>
+ <object class="GtkCellRendererText" id="renderer1"/>
+ <attributes>
+ <attribute name="text">0</attribute>
+ </attributes>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ <property name="width">2</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label54">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Object position:</property>
+ <property name="use_underline">True</property>
</object>
<packing>
- <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>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ <object class="GtkListStore" id="model1">
+ <columns>
+ <!-- column-name gchararray -->
+ <column type="gchararray"/>
+ </columns>
+ <data>
+ <row>
+ <col id="0" translatable="yes">Automatic</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Manual</col>
+ </row>
+ </data>
</object>
</interface>
diff --git a/goffice/graph/gog-plot.c b/goffice/graph/gog-plot.c
index a2f8e39..aaadae6 100644
--- a/goffice/graph/gog-plot.c
+++ b/goffice/graph/gog-plot.c
@@ -250,14 +250,12 @@ gog_plot_populate_editor (GogObject *obj,
axis_set = gog_chart_get_axis_set (chart) & GOG_AXIS_SET_FUNDAMENTAL;
if (axis_set == GOG_AXIS_SET_XY || axis_set == GOG_AXIS_SET_RADAR) {
GtkWidget *combo;
- GtkWidget *table = gtk_table_new (0, 1, FALSE);
+ GtkWidget *grid = gtk_grid_new ();
for (type = 0 ; type < GOG_AXIS_TYPES ; type++) {
if (plot->axis[type] != NULL) {
- count++;
- gtk_table_resize (GTK_TABLE (table), count, 1);
- gtk_table_attach (GTK_TABLE (table), gtk_label_new (_(axis_labels[type])),
- 0, 1, count - 1, count, 0, 0, 0, 0);
+ gtk_grid_attach (GTK_GRID (grid), gtk_label_new (_(axis_labels[type])),
+ 0, count, 1, 1);
store = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_UINT);
combo = gtk_combo_box_new_with_model (GTK_TREE_MODEL (store));
@@ -285,23 +283,24 @@ gog_plot_populate_editor (GogObject *obj,
if (axis_count < 2)
gtk_widget_set_sensitive (GTK_WIDGET (combo), FALSE);
g_slist_free (axes);
- gtk_table_attach (GTK_TABLE (table), combo,
- 1, 2, count - 1, count, 0, 0, 0, 0);
+ gtk_grid_attach (GTK_GRID (grid), combo,
+ 1, count,1 ,1);
g_object_set_data (G_OBJECT (combo), "axis-type", GUINT_TO_POINTER (type));
g_signal_connect (G_OBJECT (combo), "changed",
G_CALLBACK (cb_axis_changed), plot);
+ count++;
}
}
if (count > 0) {
- gtk_table_set_col_spacings (GTK_TABLE (table), 12);
- gtk_table_set_row_spacings (GTK_TABLE (table), 6);
- gtk_container_set_border_width (GTK_CONTAINER (table), 12);
- gtk_widget_show_all (table);
- go_editor_add_page (editor, table, _("Axes"));
+ gtk_grid_set_column_spacing (GTK_GRID (grid), 12);
+ gtk_grid_set_row_spacing (GTK_GRID (grid), 6);
+ gtk_container_set_border_width (GTK_CONTAINER (grid), 12);
+ gtk_widget_show_all (grid);
+ go_editor_add_page (editor, grid, _("Axes"));
}
else
- g_object_unref (G_OBJECT (table));
+ g_object_unref (G_OBJECT (grid));
}
(GOG_OBJECT_CLASS(plot_parent_klass)->populate_editor) (obj, editor, dalloc, cc);
diff --git a/goffice/graph/gog-series.c b/goffice/graph/gog-series.c
index 98a8ebc..ade93c3 100644
--- a/goffice/graph/gog-series.c
+++ b/goffice/graph/gog-series.c
@@ -211,35 +211,37 @@ gog_series_element_populate_editor (GogObject *gobj,
GOCmdContext *cc)
{
static guint series_element_pref_page = 1;
- GtkWidget *w, *gse_vbox = NULL, *spin_button = NULL, *vbox;
+ GtkWidget *w, *gse_grid = NULL, *grid;
GogSeriesElementClass *klass = GOG_SERIES_ELEMENT_GET_CLASS (gobj);
if (klass->gse_populate_editor)
- gse_vbox = (*klass->gse_populate_editor) (gobj, editor, cc);
+ gse_grid = (*klass->gse_populate_editor) (gobj, editor, cc);
(GOG_OBJECT_CLASS(gse_parent_klass)->populate_editor) (gobj, editor, dalloc, cc);
- w = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
- gtk_box_pack_start (GTK_BOX (w), gtk_label_new (_("Index:")),
- FALSE, FALSE, 0);
- spin_button = gtk_spin_button_new_with_range (0, G_MAXINT, 1);
- gtk_spin_button_set_value (GTK_SPIN_BUTTON (spin_button),
+ if (gse_grid == NULL) {
+ grid = gtk_grid_new ();
+ gtk_grid_set_row_spacing (GTK_GRID (grid), 6);
+ gtk_grid_set_column_spacing (GTK_GRID (grid), 12);
+ gtk_container_set_border_width (GTK_CONTAINER (grid), 12);
+ } else {
+ grid = gse_grid;
+ gtk_grid_insert_row (GTK_GRID (grid), 0);
+ }
+ w = gtk_label_new (_("Index:"));
+ g_object_set (G_OBJECT (w), "xalign", 0., NULL);
+ gtk_grid_attach (GTK_GRID (grid), w, 0, 0, 1, 1);
+ w = gtk_spin_button_new_with_range (0, G_MAXINT, 1);
+ gtk_spin_button_set_value (GTK_SPIN_BUTTON (w),
GOG_SERIES_ELEMENT(gobj)->index);
- g_signal_connect (G_OBJECT (spin_button),
+ g_signal_connect (G_OBJECT (w),
"value_changed",
G_CALLBACK (cb_index_changed), gobj);
- gtk_box_pack_start(GTK_BOX (w), spin_button, FALSE, FALSE, 0);
- if (gse_vbox == NULL) {
- vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
- gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
- } else
- vbox = gse_vbox;
- gtk_box_pack_start (GTK_BOX (vbox), w, FALSE, FALSE, 0);
- gtk_box_reorder_child (GTK_BOX (vbox), w, 0);
- gtk_widget_show_all (vbox);
-
- if (gse_vbox == NULL)
- go_editor_add_page (editor, vbox, _("Settings"));
+ gtk_grid_attach (GTK_GRID (grid), w, 1, 0, 1, 1);
+ gtk_widget_show_all (grid);
+
+ if (gse_grid == NULL)
+ go_editor_add_page (editor, grid, _("Settings"));
go_editor_set_store_page (editor, &series_element_pref_page);
}
@@ -476,7 +478,7 @@ gog_series_get_property (GObject *obj, guint param_id,
#ifdef GOFFICE_WITH_GTK
static unsigned
-make_dim_editor (GtkTable *table, unsigned row, GogDataEditor *deditor,
+make_dim_editor (GtkGrid *grid, unsigned row, GogDataEditor *deditor,
char const *name, GogSeriesPriority priority, gboolean is_shared)
{
GtkWidget *editor = GTK_WIDGET (deditor);
@@ -485,10 +487,11 @@ make_dim_editor (GtkTable *table, unsigned row, GogDataEditor *deditor,
GtkWidget *label = gtk_label_new_with_mnemonic (txt);
g_free (txt);
- gtk_table_attach (table, label,
- 0, 1, row, row+1, GTK_FILL, 0, 0, 0);
- gtk_table_attach (table, editor,
- 1, 2, row, row+1, GTK_FILL | GTK_EXPAND, 0, 0, 0);
+ gtk_grid_attach (grid, label,
+ 0, row, 1, 1);
+ gtk_widget_set_hexpand (editor, TRUE);
+ gtk_grid_attach (grid, editor,
+ 1, row, 1, 1);
gtk_label_set_mnemonic_widget (GTK_LABEL (label), editor);
gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
@@ -544,8 +547,8 @@ gog_series_populate_editor (GogObject *gobj,
GOCmdContext *cc)
{
static guint series_pref_page = 1;
- GtkWidget *w, *grid;
- GtkTable *table;
+ GtkWidget *w;
+ GtkGrid *grid;
unsigned i, row = 0;
gboolean has_shared = FALSE;
GogSeries *series = GOG_SERIES (gobj);
@@ -565,13 +568,13 @@ gog_series_populate_editor (GogObject *gobj,
break;
}
- w = gtk_table_new (desc->num_dim + (has_shared ? 2 : 1), 2, FALSE);
- table = GTK_TABLE (w);
- gtk_table_set_row_spacings (table, 6);
- gtk_table_set_col_spacings (table, 12);
- gtk_container_set_border_width (GTK_CONTAINER (table), 12);
+ w = gtk_grid_new ();
+ grid = GTK_GRID (w);
+ gtk_grid_set_row_spacing (grid, 6);
+ gtk_grid_set_column_spacing (grid, 12);
+ gtk_container_set_border_width (GTK_CONTAINER (grid), 12);
- row = make_dim_editor (table, row,
+ row = make_dim_editor (grid, row,
gog_data_allocator_editor (dalloc, set, -1, GOG_DATA_SCALAR),
N_("Name"), TRUE, FALSE);
@@ -580,14 +583,14 @@ gog_series_populate_editor (GogObject *gobj,
data_type = (desc->dim[i].val_type == GOG_DIM_MATRIX)?
GOG_DATA_MATRIX: GOG_DATA_VECTOR;
if (!desc->dim[i].is_shared && (desc->dim[i].priority != GOG_SERIES_ERRORS))
- row = make_dim_editor (table, row,
+ row = make_dim_editor (grid, row,
gog_data_allocator_editor (dalloc, set, i, data_type),
desc->dim[i].name, desc->dim[i].priority, FALSE);
}
if (has_shared) {
- gtk_table_attach (table, gtk_separator_new (GTK_ORIENTATION_HORIZONTAL),
- 0, 2, row, row+1, GTK_FILL, 0, 0, 0);
+ gtk_grid_attach (grid, gtk_separator_new (GTK_ORIENTATION_HORIZONTAL),
+ 0, row, 2, 1);
row++;
}
@@ -596,13 +599,13 @@ gog_series_populate_editor (GogObject *gobj,
data_type = (desc->dim[i].val_type == GOG_DIM_MATRIX)?
GOG_DATA_MATRIX: GOG_DATA_VECTOR;
if (desc->dim[i].is_shared)
- row = make_dim_editor (table, row,
+ row = make_dim_editor (grid, row,
gog_data_allocator_editor (dalloc, set, i, data_type),
desc->dim[i].name, desc->dim[i].priority, TRUE);
}
- gtk_table_attach (table, gtk_separator_new (GTK_ORIENTATION_HORIZONTAL),
- 0, 2, row, row+1, GTK_FILL, 0, 0, 0);
+ gtk_grid_attach (grid, gtk_separator_new (GTK_ORIENTATION_HORIZONTAL),
+ 0, row, 2, 1);
row++;
w = gtk_check_button_new_with_mnemonic (_("_Show in Legend"));
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (w),
@@ -610,15 +613,15 @@ gog_series_populate_editor (GogObject *gobj,
g_signal_connect (G_OBJECT (w),
"toggled",
G_CALLBACK (cb_show_in_legend), series);
- gtk_table_attach (table, w,
- 0, 2, row, row+1, GTK_FILL, 0, 0, 0);
- gtk_widget_show_all (GTK_WIDGET (table));
+ gtk_grid_attach (grid, w,
+ 0, row, 2, 1);
+ gtk_widget_show_all (GTK_WIDGET (grid));
- go_editor_add_page (editor, GTK_WIDGET (table), _("Data"));
+ go_editor_add_page (editor, GTK_WIDGET (grid), _("Data"));
(GOG_OBJECT_CLASS(series_parent_klass)->populate_editor) (gobj, editor, dalloc, cc);
- grid = go_editor_get_registered_widget (editor, "line-grid");
+ grid = GTK_GRID (go_editor_get_registered_widget (editor, "line-grid"));
if (series_class->has_interpolation && grid != NULL) {
GtkBuilder *gui;
GtkWidget *widget;
@@ -629,7 +632,7 @@ gog_series_populate_editor (GogObject *gobj,
GogAxisSet set = gog_plot_axis_set_pref (gog_series_get_plot (series));
GogDataset *clamp_set = gog_series_get_interpolation_params (series);
widget = go_gtk_builder_get_widget (gui, "interpolation-prefs");
- gtk_grid_attach (GTK_GRID (grid), widget, 0, 3, 4, 1);
+ gtk_grid_attach (grid, widget, 0, 3, 4, 1);
/* create an interpolation type combo and populate it */
combo = GTK_COMBO_BOX_TEXT (gtk_combo_box_text_new ());
if (set & 1 << GOG_AXIS_RADIAL)
@@ -673,7 +676,7 @@ gog_series_populate_editor (GogObject *gobj,
}
}
- grid = go_editor_get_registered_widget (editor, "fill-grid");
+ grid = GTK_GRID (go_editor_get_registered_widget (editor, "fill-grid"));
if (series_class->has_fill_type && grid != NULL) {
GtkBuilder *gui;
GtkWidget *widget;
@@ -689,7 +692,7 @@ gog_series_populate_editor (GogObject *gobj,
if (series->interpolation == GO_LINE_INTERPOLATION_CLOSED_SPLINE)
gtk_widget_set_sensitive (widget, FALSE);
widget = go_gtk_builder_get_widget (gui, "fill_type_prefs");
- gtk_grid_attach (GTK_GRID (grid), widget, 0, 1, 3, 1);
+ gtk_grid_attach (grid, widget, 0, 1, 3, 1);
g_object_set_data (G_OBJECT (widget), "gui", gui);
g_signal_connect_swapped (G_OBJECT (widget), "destroy",
diff --git a/goffice/graph/gog-smoothed-curve.c b/goffice/graph/gog-smoothed-curve.c
index 324e2ee..afb2db6 100644
--- a/goffice/graph/gog-smoothed-curve.c
+++ b/goffice/graph/gog-smoothed-curve.c
@@ -49,7 +49,8 @@ gog_smoothed_curve_populate_editor (GogObject *gobj,
w = gtk_grid_new ();
grid = GTK_GRID (w);
- g_object_set (G_OBJECT (grid), "margin", 12, "row-spacing", 12, NULL);
+ g_object_set (G_OBJECT (grid), "margin", 12, "column-spacing", 12,
+ "orientation", GTK_ORIENTATION_VERTICAL, NULL);
child = gtk_label_new (_("(Name):"));
gtk_grid_attach (grid, child, 0, 0, 1, 1);
child = GTK_WIDGET (gog_data_allocator_editor (dalloc, set, -1, GOG_DATA_SCALAR));
diff --git a/goffice/graph/gog-styled-object.c b/goffice/graph/gog-styled-object.c
index cab83bd..e96742a 100644
--- a/goffice/graph/gog-styled-object.c
+++ b/goffice/graph/gog-styled-object.c
@@ -221,7 +221,7 @@ gog_styled_object_class_init (GogObjectClass *gog_klass)
g_param_spec_object ("style",
_("Style"),
_("A pointer to the GOStyle object"),
- gog_style_get_type (),
+ GO_TYPE_STYLE,
GSF_PARAM_STATIC | G_PARAM_READWRITE | GO_PARAM_PERSISTENT));
}
diff --git a/goffice/graph/gog-trend-line.c b/goffice/graph/gog-trend-line.c
index 6ba44b8..1253af8 100644
--- a/goffice/graph/gog-trend-line.c
+++ b/goffice/graph/gog-trend-line.c
@@ -104,12 +104,10 @@ gog_trend_line_populate_editor (GogObject *gobj,
G_CALLBACK (cb_show_in_legend), gobj);
if (GTK_IS_BOX (box))
gtk_box_pack_start (GTK_BOX (box), w, FALSE, FALSE, 0);
- else if (GTK_IS_TABLE (box)) {
- GtkTable *table = GTK_TABLE (box);
- int nrows, ncols;
- g_object_get (G_OBJECT (box), "n-rows", &nrows, "n-columns", &ncols, NULL);
- gtk_table_resize (table, nrows + 1, ncols);
- gtk_table_attach (table, w, 0, ncols, nrows, nrows + 1, GTK_FILL, 0, 0, 0);
+ else if (GTK_IS_GRID (box)) {
+ GtkGrid *grid = GTK_GRID (box);
+ gtk_grid_insert_row (grid, 1);
+ gtk_grid_attach (grid, w, 0, 1, 2, 1);
} else if (GTK_IS_CONTAINER (box))
gtk_container_add (GTK_CONTAINER (box), w);
else
diff --git a/goffice/gtk/go-color-palette.c b/goffice/gtk/go-color-palette.c
index 858ac46..08823e1 100644
--- a/goffice/gtk/go-color-palette.c
+++ b/goffice/gtk/go-color-palette.c
@@ -343,11 +343,11 @@ draw_color_cb (GtkWidget *widget, cairo_t *cr, gpointer data)
* Utility function
*/
static GtkWidget *
-go_color_palette_button_new (GOColorPalette *pal, GtkTable* table,
+go_color_palette_button_new (GOColorPalette *pal, GtkGrid *grid,
GONamedColor const *color_name,
gint col, gint row)
{
- GtkWidget *button, *swatch, *box;
+ GtkWidget *button, *swatch, *box;
GdkRGBA gdk;
swatch = gtk_drawing_area_new ();
@@ -367,8 +367,7 @@ go_color_palette_button_new (GOColorPalette *pal, GtkTable* table,
gtk_container_add (GTK_CONTAINER (button), box);
gtk_widget_set_tooltip_text (button, _(color_name->name));
- gtk_table_attach (table, button, col, col+1, row, row+1,
- GTK_FILL, GTK_FILL, 0, 0);
+ gtk_grid_attach (grid, button, col, row, 1, 1);
g_object_connect (button,
"signal::button_release_event", G_CALLBACK (cb_swatch_release_event), pal,
@@ -437,15 +436,15 @@ go_color_palette_setup (GOColorPalette *pal,
int cols, int rows,
GONamedColor const *color_names)
{
- GtkWidget *w, *table;
+ GtkWidget *w, *grid;
int pos, row, col = 0;
- table = gtk_table_new (cols, rows, FALSE);
+ grid = gtk_grid_new ();
if (no_color_label != NULL) {
w = gtk_button_new_with_label (no_color_label);
- gtk_table_attach (GTK_TABLE (table), w,
- 0, cols, 0, 1, GTK_FILL | GTK_EXPAND, 0, 0, 0);
+ gtk_widget_set_hexpand (w, TRUE);
+ gtk_grid_attach (GTK_GRID (grid), w, 0, 0, cols, 1);
g_signal_connect (w,
"button_release_event",
G_CALLBACK (cb_default_release_event), pal);
@@ -457,7 +456,7 @@ go_color_palette_setup (GOColorPalette *pal,
if (color_names [pos].name == NULL)
goto custom_colors;
go_color_palette_button_new ( pal,
- GTK_TABLE (table),
+ GTK_GRID (grid),
&(color_names [pos]), col, row + 1);
}
@@ -468,20 +467,20 @@ custom_colors :
GONamedColor color_name = { 0, N_("custom") };
color_name.color = pal->group->history [col];
pal->swatches [col] = go_color_palette_button_new (pal,
- GTK_TABLE (table),
+ GTK_GRID (grid),
&color_name, col, row + 1);
}
w = go_gtk_button_build_with_stock (_("Custom color..."),
GTK_STOCK_SELECT_COLOR);
gtk_button_set_alignment (GTK_BUTTON (w), 0., .5);
- gtk_table_attach (GTK_TABLE (table), w, 0, cols,
- row + 2, row + 3, GTK_FILL | GTK_EXPAND, 0, 0, 0);
+ gtk_widget_set_hexpand (w, TRUE);
+ gtk_grid_attach (GTK_GRID (grid), w, 0, row + 2, cols, 1);
g_signal_connect (G_OBJECT (w),
"clicked",
G_CALLBACK (cb_combo_custom_clicked), pal);
- return table;
+ return grid;
}
void
diff --git a/goffice/gtk/go-combo-pixmaps.c b/goffice/gtk/go-combo-pixmaps.c
index 7002703..7a83ed1 100644
--- a/goffice/gtk/go-combo-pixmaps.c
+++ b/goffice/gtk/go-combo-pixmaps.c
@@ -42,7 +42,7 @@ struct _GOComboPixmaps {
int cols;
GArray *elements;
- GtkWidget *table, *preview_button;
+ GtkWidget *grid, *preview_button;
GtkWidget *preview_image;
};
@@ -86,7 +86,7 @@ cb_screen_changed (GOComboPixmaps *combo, GdkScreen *previous_screen)
: NULL;
if (screen) {
- GtkWidget *toplevel = gtk_widget_get_toplevel (combo->table);
+ GtkWidget *toplevel = gtk_widget_get_toplevel (combo->grid);
gtk_window_set_screen (GTK_WINDOW (toplevel), screen);
}
}
@@ -105,7 +105,7 @@ static void
go_combo_pixmaps_init (GOComboPixmaps *combo)
{
combo->elements = g_array_new (FALSE, FALSE, sizeof (Element));
- combo->table = gtk_table_new (1, 1, 0);
+ combo->grid = gtk_grid_new ();
combo->preview_button = gtk_toggle_button_new ();
combo->preview_image = gtk_image_new ();
@@ -120,9 +120,9 @@ go_combo_pixmaps_init (GOComboPixmaps *combo)
G_CALLBACK (emit_change), combo);
gtk_widget_show_all (combo->preview_button);
- gtk_widget_show_all (combo->table);
+ gtk_widget_show_all (combo->grid);
go_combo_box_construct (GO_COMBO_BOX (combo),
- combo->preview_button, combo->table, combo->table);
+ combo->preview_button, combo->grid, combo->grid);
}
static void
@@ -227,9 +227,8 @@ go_combo_pixmaps_add_element (GOComboPixmaps *combo,
g_array_append_val (combo->elements, tmp);
g_object_set_data (G_OBJECT (button), "ItemIndex",
GINT_TO_POINTER (combo->elements->len-1));
- gtk_table_attach (GTK_TABLE (combo->table), button,
- col, col + 1, row + 1, row + 2,
- GTK_FILL, GTK_FILL, 1, 1);
+ gtk_grid_attach (GTK_GRID (combo->grid), button,
+ col, row + 1, 1, 1);
gtk_widget_show_all (button);
g_object_connect (button,
diff --git a/goffice/gtk/go-font-sel.c b/goffice/gtk/go-font-sel.c
index 065bf19..54d5f04 100644
--- a/goffice/gtk/go-font-sel.c
+++ b/goffice/gtk/go-font-sel.c
@@ -33,7 +33,7 @@
#include <string.h>
struct _GOFontSel {
- GtkBox box;
+ GtkGrid grid;
GtkBuilder *gui;
GtkWidget *font_name_entry;
@@ -54,7 +54,7 @@ struct _GOFontSel {
};
typedef struct {
- GtkBoxClass parent_class;
+ GtkGridClass parent_class;
void (* font_changed) (GOFontSel *gfs, PangoAttrList *modfications);
} GOFontSelClass;
@@ -351,7 +351,7 @@ canvas_size_changed (G_GNUC_UNUSED GtkWidget *widget,
static void
gfs_init (GOFontSel *gfs)
{
- GtkWidget *w;
+ GtkWidget *w, *grid;
gfs->gui = go_gtk_builder_load_internal ("res:go:gtk/go-font-sel.ui", GETTEXT_PACKAGE, NULL);
if (gfs->gui == NULL)
@@ -359,9 +359,8 @@ gfs_init (GOFontSel *gfs)
gfs->modifications = pango_attr_list_new ();
- gtk_box_pack_start (GTK_BOX (gfs),
- go_gtk_builder_get_widget (gfs->gui, "toplevel-table"),
- TRUE, TRUE, 0);
+ grid = go_gtk_builder_get_widget (gfs->gui, "toplevel-grid");
+ gtk_container_add (GTK_CONTAINER (gfs), grid);
gfs->font_name_entry = go_gtk_builder_get_widget (gfs->gui, "font-name-entry");
gfs->font_style_entry = go_gtk_builder_get_widget (gfs->gui, "font-style-entry");
gfs->font_size_entry = go_gtk_builder_get_widget (gfs->gui, "font-size-entry");
@@ -371,9 +370,11 @@ gfs_init (GOFontSel *gfs)
w = GTK_WIDGET (g_object_new (GOC_TYPE_CANVAS, NULL));
gfs->font_preview_canvas = GOC_CANVAS (w);
- gtk_widget_show_all (w);
- w = go_gtk_builder_get_widget (gfs->gui, "font-preview-frame");
- gtk_container_add (GTK_CONTAINER (w), GTK_WIDGET (gfs->font_preview_canvas));
+ gtk_widget_set_hexpand (w, TRUE);
+ gtk_widget_set_size_request (w, -1, 96);
+ gtk_grid_attach (GTK_GRID (grid), GTK_WIDGET (gfs->font_preview_canvas),
+ 0, 4, 3, 1);
+ gtk_widget_show_all (grid);
gfs->font_preview_text = goc_item_new (
goc_canvas_get_root (gfs->font_preview_canvas),
@@ -444,7 +445,7 @@ gfs_class_init (GObjectClass *klass)
}
GSF_CLASS (GOFontSel, go_font_sel,
- gfs_class_init, gfs_init, GTK_TYPE_BOX)
+ gfs_class_init, gfs_init, GTK_TYPE_GRID)
GtkWidget *
go_font_sel_new (void)
diff --git a/goffice/gtk/go-font-sel.ui b/goffice/gtk/go-font-sel.ui
index a1d4188..ace2db8 100644
--- a/goffice/gtk/go-font-sel.ui
+++ b/goffice/gtk/go-font-sel.ui
@@ -1,65 +1,55 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<interface>
- <!-- interface-naming-policy toplevel-contextual -->
- <object class="GtkTable" id="toplevel-table">
+ <!-- interface-requires gtk+ 3.0 -->
+ <object class="GtkGrid" id="toplevel-grid">
<property name="visible">True</property>
- <property name="n_rows">4</property>
- <property name="n_columns">3</property>
- <property name="column_spacing">4</property>
+ <property name="can_focus">False</property>
+ <property name="vexpand">True</property>
<property name="row_spacing">4</property>
- <child>
- <object class="GtkEntry" id="font-style-entry">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="editable">False</property>
- <property name="invisible_char">•</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>
+ <property name="column_spacing">4</property>
<child>
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Font:</property>
<property name="justify">center</property>
</object>
<packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></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>
<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">Font style:</property>
<property name="justify">center</property>
</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"></property>
+ <property name="top_attach">0</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="xalign">0</property>
<property name="label" translatable="yes">Size:</property>
<property name="justify">center</property>
</object>
<packing>
<property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
@@ -67,84 +57,88 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="editable">False</property>
- <property name="invisible_char">•</property>
+ <property name="invisible_char">â</property>
+ <property name="invisible_char_set">True</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"></property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
- <object class="GtkFrame" id="font-preview-frame">
+ <object class="GtkEntry" id="font-style-entry">
<property name="visible">True</property>
- <property name="label_xalign">0</property>
- <child type="label">
- <object class="GtkLabel" id="label4">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Preview</property>
- </object>
- </child>
+ <property name="can_focus">True</property>
+ <property name="editable">False</property>
+ <property name="invisible_char">â</property>
+ <property name="invisible_char_set">True</property>
</object>
<packing>
- <property name="right_attach">3</property>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</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>
<child>
<object class="GtkEntry" id="font-size-entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="invisible_char">•</property>
+ <property name="invisible_char">â</property>
+ <property name="invisible_char_set">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="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="GtkScrolledWindow" id="scrolledwindow2">
+ <object class="GtkScrolledWindow" id="scrolledwindow1">
<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="font-style-list">
+ <object class="GtkTreeView" id="font-name-list">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="vexpand">True</property>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection" id="treeview-selection"/>
+ </child>
</object>
</child>
</object>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
+ <property name="left_attach">0</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
- <object class="GtkScrolledWindow" id="scrolledwindow1">
+ <object class="GtkScrolledWindow" id="scrolledwindow2">
<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="font-name-list">
+ <object class="GtkTreeView" id="font-style-list">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection" id="treeview-selection1"/>
+ </child>
</object>
</child>
</object>
<packing>
+ <property name="left_attach">1</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
@@ -152,22 +146,43 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hscrollbar_policy">never</property>
- <property name="vscrollbar_policy">automatic</property>
<property name="shadow_type">in</property>
<child>
<object class="GtkTreeView" id="font-size-list">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection" id="treeview-selection2"/>
+ </child>
</object>
</child>
</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="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Preview</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>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</object>
</interface>
diff --git a/goffice/gtk/go-image-save-dialog-extra.ui b/goffice/gtk/go-image-save-dialog-extra.ui
index fba8ba3..aa97a7d 100644
--- a/goffice/gtk/go-image-save-dialog-extra.ui
+++ b/goffice/gtk/go-image-save-dialog-extra.ui
@@ -1,25 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<interface>
<!-- interface-requires gtk+ 3.0 -->
- <!-- interface-naming-policy toplevel-contextual -->
<object class="GtkAdjustment" id="adjustment1">
- <property name="value">150</property>
<property name="lower">30</property>
<property name="upper">2400</property>
+ <property name="value">150</property>
<property name="step_increment">1</property>
<property name="page_increment">10</property>
</object>
<object class="GtkBox" id="image_save_dialog_extra">
<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="file_type_box">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">_File type:</property>
<property name="use_underline">True</property>
</object>
@@ -32,6 +34,7 @@
<child>
<object class="GtkComboBox" id="format_combo">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="model">liststore1</property>
</object>
<packing>
@@ -54,42 +57,32 @@
<property name="expanded">True</property>
<property name="spacing">12</property>
<child>
- <object class="GtkTable" id="resolution_table">
+ <object class="GtkGrid" id="resolution-grid">
<property name="visible">True</property>
- <property name="n_columns">3</property>
- <property name="column_spacing">6</property>
- <property name="row_spacing">6</property>
+ <property name="can_focus">False</property>
+ <property name="column_spacing">12</property>
<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">Resolution:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">resolution_spin</property>
</object>
<packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label4">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">pixels/in</property>
- </object>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></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>
<object class="GtkSpinButton" id="resolution_spin">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="invisible_char">•</property>
+ <property name="invisible_char">â</property>
+ <property name="invisible_char_set">True</property>
<property name="adjustment">adjustment1</property>
<property name="climb_rate">1</property>
<property name="snap_to_ticks">True</property>
@@ -97,16 +90,49 @@
</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"></property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label4">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">pixels/in</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</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>
</object>
</child>
<child type="label">
<object class="GtkLabel" id="label6">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">Export settings</property>
</object>
</child>
diff --git a/goffice/gtk/goffice-gtk.c b/goffice/gtk/goffice-gtk.c
index 966e655..ce487cd 100644
--- a/goffice/gtk/goffice-gtk.c
+++ b/goffice/gtk/goffice-gtk.c
@@ -941,7 +941,7 @@ go_gui_get_image_save_info (GtkWindow *toplevel, GSList *supported_formats,
GtkFileChooser *fsel = gui_image_chooser_new (TRUE);
GtkWidget *expander = NULL;
GtkWidget *resolution_spin = NULL;
- GtkWidget *resolution_table;
+ GtkWidget *resolution_grid;
GtkBuilder *gui;
SaveInfoState *state;
char const *key = "go_gui_get_image_save_info";
@@ -1002,11 +1002,11 @@ go_gui_get_image_save_info (GtkWindow *toplevel, GSList *supported_formats,
gtk_widget_hide (expander);
if (resolution != NULL && supported_formats != NULL && ret_format != NULL) {
- resolution_table = go_gtk_builder_get_widget (gui, "resolution_table");
+ resolution_grid = go_gtk_builder_get_widget (gui, "resolution-grid");
- cb_format_combo_changed (format_combo, resolution_table);
+ cb_format_combo_changed (format_combo, resolution_grid);
g_signal_connect (GTK_WIDGET (format_combo), "changed",
- G_CALLBACK (cb_format_combo_changed), resolution_table);
+ G_CALLBACK (cb_format_combo_changed), resolution_grid);
}
g_object_unref (G_OBJECT (gui));
diff --git a/goffice/utils/go-editor.c b/goffice/utils/go-editor.c
index b8c4732..307a7ee 100644
--- a/goffice/utils/go-editor.c
+++ b/goffice/utils/go-editor.c
@@ -25,17 +25,24 @@
#include <goffice/utils/go-editor.h>
#include <string.h>
-/**
- * GOEditor:
- * @store_page: pointer to a place for storing last edited page.
- * @pages: list of #GOEditorPage.
- * @registered_widgets: registered wigets.
- **/
+
+typedef struct {
+ char const *label; /* label for notebook page */
+ gpointer widget; /* GtkWidget* */
+ gpointer scrolled; /* GtkScrolledWindow embedding the widget.*/
+} GOEditorPage;
+
+struct _GOEditor {
+ unsigned *store_page; /* pointer to a place for storing last edited page */
+ GSList *pages; /* GOEditorPage */
+ GData *registered_widgets;
+ unsigned ref_count;
+};
/**
- * GOEditorPage:
- * @label: label for notebook page.
- * @widget: notebook page.
+ * GOEditor:
+ *
+ * Embeds a notebook containing all the pages added to the editor.
**/
/**
@@ -61,8 +68,8 @@ go_editor_new (void)
static void
page_free (GOEditorPage *page)
{
- if (page->widget)
- g_object_unref (page->widget);
+ if (page->scrolled)
+ g_object_unref (page->scrolled);
g_free (page);
}
@@ -121,7 +128,10 @@ go_editor_add_page (GOEditor *editor, gpointer widget, char const *label)
g_return_if_fail (editor != NULL);
page = g_new (GOEditorPage, 1);
- page->widget = g_object_ref (widget);
+ page->widget = widget;
+ page->scrolled = g_object_ref (gtk_scrolled_window_new (NULL, NULL));
+ gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (page->scrolled),
+ widget);
page->label = label;
editor->pages = g_slist_prepend (editor->pages, page);
@@ -204,9 +214,9 @@ go_editor_get_notebook (GOEditor *editor)
for (ptr = editor->pages; ptr != NULL; ptr = ptr->next) {
page = (GOEditorPage *) ptr->data;
gtk_notebook_prepend_page (GTK_NOTEBOOK (notebook),
- GTK_WIDGET (page->widget),
+ GTK_WIDGET (page->scrolled),
gtk_label_new (page->label));
- gtk_widget_show (page->widget);
+ gtk_widget_show (page->scrolled);
page_count ++;
}
} else {
diff --git a/goffice/utils/go-editor.h b/goffice/utils/go-editor.h
index 1b15f28..68dd8f8 100644
--- a/goffice/utils/go-editor.h
+++ b/goffice/utils/go-editor.h
@@ -26,17 +26,6 @@
G_BEGIN_DECLS
-typedef struct {
- char const *label; /* label for notebook page */
- gpointer widget; /* GtkWidget* */
-} GOEditorPage;
-
-struct _GOEditor {
- unsigned *store_page; /* pointer to a place for storing last edited page */
- GSList *pages; /* GOEditorPage */
- GData *registered_widgets;
- unsigned ref_count;
-};
GType go_editor_get_type (void);
GOEditor *go_editor_new (void);
diff --git a/goffice/utils/go-style-prefs.ui b/goffice/utils/go-style-prefs.ui
index 1284353..2bf0b70 100644
--- a/goffice/utils/go-style-prefs.ui
+++ b/goffice/utils/go-style-prefs.ui
@@ -22,11 +22,196 @@
<property name="step_increment">1</property>
<property name="page_increment">10</property>
</object>
- <object class="GtkGrid" id="go-style-prefs">
+ <object class="GtkGrid" id="go-style-font-prefs">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="border_width">12</property>
+ <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>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <object class="GtkLabel" id="font_color_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Co_lor:</property>
+ <property name="use_underline">True</property>
+ </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>
+ <object class="GtkGrid" id="go-style-marker-prefs">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="border_width">12</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
+ <child>
+ <object class="GtkLabel" id="marker_size_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_left">18</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Si_ze:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">marker_size_spin</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="marker_outline_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_left">18</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">O_utline:</property>
+ <property name="use_underline">True</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="marker_fill_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_left">18</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Fill:</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="marker_shape_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_left">18</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Sha_pe:</property>
+ <property name="use_underline">True</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="GtkLabel" id="marker_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Marker</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </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="GtkSpinButton" id="marker_size_spin">
+ <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="adjustment">adjustment4</property>
+ <property name="climb_rate">1</property>
+ <property name="numeric">True</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="GtkLabel" id="label7">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">pts</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">4</property>
+ <property name="width">1</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>
+ </object>
+ <object class="GtkGrid" id="go-style-prefs">
+ <property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
+ <property name="border_width">12</property>
<property name="row_spacing">6</property>
<property name="column_spacing">24</property>
<child>
@@ -256,21 +441,6 @@
<property name="row_spacing">6</property>
<property name="column_spacing">12</property>
<child>
- <object class="GtkLabel" id="fill_type_label">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">_Type:</property>
- <property name="use_underline">True</property>
- </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>
- <child>
<object class="GtkComboBoxText" id="fill-type-menu">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -480,24 +650,44 @@
</packing>
</child>
<child>
- <object class="GtkTable" id="fill_image_table">
+ <object class="GtkGrid" id="fill-image-grid">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="valign">start</property>
- <property name="n_rows">3</property>
- <property name="n_columns">3</property>
- <property name="column_spacing">12</property>
<property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
<child>
- <object class="GtkLabel" id="label33">
+ <object class="GtkLabel" id="fill_image_fit_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
+ <property name="label" translatable="yes">_Fit:</property>
+ <property name="use_underline">True</property>
</object>
<packing>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">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>
+ <object class="GtkComboBoxText" id="fill-image-fit">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="entry_text_column">0</property>
+ <property name="id_column">1</property>
+ <items>
+ <item translatable="yes">stretched</item>
+ <item translatable="yes">wallpaper</item>
+ <item translatable="yes">centered</item>
+ <item translatable="yes">centered wallpaper</item>
+ </items>
+ </object>
+ <packing>
+ <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>
@@ -549,96 +739,42 @@
</child>
</object>
<packing>
- <property name="right_attach">2</property>
+ <property name="left_attach">0</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_SHRINK</property>
+ <property name="width">2</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
- <object class="GtkLabel" id="fill_image_fit_label">
+ <object class="GtkImage" id="fill_image_sample">
+ <property name="width_request">100</property>
+ <property name="height_request">60</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">_Fit:</property>
- <property name="use_underline">True</property>
+ <property name="stock">gtk-missing-image</property>
</object>
<packing>
- <property name="x_options">GTK_SHRINK | GTK_FILL</property>
- <property name="y_options">GTK_SHRINK</property>
- </packing>
- </child>
- <child>
- <object class="GtkComboBoxText" id="fill-image-fit">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <items>
- <item translatable="yes">stretched</item>
- <item translatable="yes">wallpaper</item>
- <item translatable="yes">centered</item>
- <item translatable="yes">centered wallpaper</item>
- </items>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ <property name="width">2</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
- <object class="GtkBox" id="vbox2">
+ <object class="GtkLabel" id="image-size-label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <child>
- <object class="GtkImage" id="fill_image_sample">
- <property name="width_request">100</property>
- <property name="height_request">60</property>
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="stock">gtk-missing-image</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="image-size-label">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
</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">GTK_FILL</property>
+ <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>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
</object>
<packing>
<property name="position">2</property>
- <property name="tab_fill">False</property>
</packing>
</child>
<child type="tab">
@@ -673,6 +809,21 @@
</packing>
</child>
<child>
+ <object class="GtkLabel" id="fill_type_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Type:</property>
+ <property name="use_underline">True</property>
+ </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>
+ <child>
<placeholder/>
</child>
<child>
@@ -697,7 +848,7 @@
<property name="xalign">0</property>
<property name="label" translatable="yes">Outline</property>
<attributes>
- <attribute name="weight" value="bold"/>
+ <attribute name="weight" value="bold"/>
</attributes>
</object>
<packing>
@@ -715,7 +866,7 @@
<property name="xalign">0</property>
<property name="label" translatable="yes">Line</property>
<attributes>
- <attribute name="weight" value="bold"/>
+ <attribute name="weight" value="bold"/>
</attributes>
</object>
<packing>
@@ -733,7 +884,7 @@
<property name="xalign">0</property>
<property name="label" translatable="yes">Fill</property>
<attributes>
- <attribute name="weight" value="bold"/>
+ <attribute name="weight" value="bold"/>
</attributes>
</object>
<packing>
@@ -743,227 +894,5 @@
<property name="height">1</property>
</packing>
</child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- </object>
- <object class="GtkBox" id="go_style_font_prefs">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="border_width">12</property>
- <property name="orientation">vertical</property>
- <property name="spacing">12</property>
- <child>
- <object class="GtkBox" id="hbox5">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <object class="GtkBox" id="color_box">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">12</property>
- <child>
- <object class="GtkLabel" id="font_color_label">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Co_lor:</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <placeholder/>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- </object>
- <object class="GtkAlignment" id="go_style_marker_prefs">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="yalign">0</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
- <property name="top_padding">12</property>
- <property name="bottom_padding">12</property>
- <property name="left_padding">12</property>
- <property name="right_padding">12</property>
- <child>
- <object class="GtkBox" id="marker_box">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="orientation">vertical</property>
- <child>
- <object class="GtkLabel" id="marker_label">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Marker</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkAlignment" id="alignment7">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="top_padding">6</property>
- <property name="left_padding">18</property>
- <child>
- <object class="GtkTable" id="marker_table">
- <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>
- <child>
- <object class="GtkLabel" id="marker_fill_label">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">_Fill:</property>
- <property name="use_underline">True</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="GtkLabel" id="marker_outline_label">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">O_utline:</property>
- <property name="use_underline">True</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="GtkLabel" id="label7">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">pts</property>
- </object>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="marker_size_spin">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="invisible_char">â</property>
- <property name="adjustment">adjustment4</property>
- <property name="climb_rate">1</property>
- <property name="numeric">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>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="marker_size_label">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Si_ze:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">marker_size_spin</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="GtkLabel" id="marker_shape_label">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Sha_pe:</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- </child>
</object>
</interface>
diff --git a/goffice/utils/go-style.c b/goffice/utils/go-style.c
index 1401828..924a4ff 100644
--- a/goffice/utils/go-style.c
+++ b/goffice/utils/go-style.c
@@ -796,7 +796,7 @@ marker_init (StylePrefState *state, gboolean enable, GOEditor *editor, GOCmdCont
{
GOStyle *style = state->style;
GOStyle *default_style = state->default_style;
- GtkWidget *table, *w;
+ GtkWidget *grid, *w;
GtkWidget *selector;
GtkBuilder *gui;
@@ -807,7 +807,7 @@ marker_init (StylePrefState *state, gboolean enable, GOEditor *editor, GOCmdCont
if (gui == NULL)
return;
- table = go_gtk_builder_get_widget (gui, "marker_table");
+ grid = go_gtk_builder_get_widget (gui, "go-style-marker-prefs");
state->marker.selector = selector =
go_marker_selector_new (go_marker_get_shape (style->marker.mark),
@@ -821,7 +821,7 @@ marker_init (StylePrefState *state, gboolean enable, GOEditor *editor, GOCmdCont
GO_COLOR_BLUE, GO_COLOR_BLUE);
w = go_gtk_builder_get_widget (gui, "marker_shape_label");
gtk_label_set_mnemonic_widget (GTK_LABEL (w), selector);
- gtk_table_attach (GTK_TABLE (table), selector, 1, 2, 0, 1, GTK_FILL, GTK_FILL, 0, 0);
+ gtk_grid_attach (GTK_GRID (grid), selector, 1, 1, 1, 1);
g_signal_connect (G_OBJECT (selector), "activate",
G_CALLBACK (cb_marker_shape_changed), state);
gtk_widget_show (selector);
@@ -839,7 +839,7 @@ marker_init (StylePrefState *state, gboolean enable, GOEditor *editor, GOCmdCont
G_CALLBACK (cb_marker_fill_color_changed));
gtk_widget_set_sensitive (w, FALSE);
}
- gtk_table_attach (GTK_TABLE (table), w, 1, 2, 1, 2, GTK_FILL, GTK_FILL, 0, 0);
+ gtk_grid_attach (GTK_GRID (grid), w, 1, 2, 1, 1);
if ((style->interesting_fields & GO_STYLE_MARKER_NO_COLOR ) == 0)
state->marker.outline = w = create_go_combo_color (state,
@@ -854,7 +854,7 @@ marker_init (StylePrefState *state, gboolean enable, GOEditor *editor, GOCmdCont
G_CALLBACK (cb_marker_outline_color_changed));
gtk_widget_set_sensitive (w, FALSE);
}
- gtk_table_attach (GTK_TABLE (table), w, 1, 2, 2, 3, GTK_FILL, GTK_FILL, 0, 0);
+ gtk_grid_attach (GTK_GRID (grid), w, 1, 3, 1, 1);
w = go_gtk_builder_get_widget (gui, "marker_size_spin");
gtk_spin_button_set_value (GTK_SPIN_BUTTON (w),
@@ -863,11 +863,9 @@ marker_init (StylePrefState *state, gboolean enable, GOEditor *editor, GOCmdCont
"value_changed",
G_CALLBACK (cb_marker_size_changed), state);
- gtk_widget_show_all (table);
-
- w = GTK_WIDGET (g_object_ref (gtk_builder_get_object (gui, "go_style_marker_prefs")));
+ gtk_widget_show_all (grid);
- go_editor_add_page (editor, w, _("Markers"));
+ go_editor_add_page (editor, g_object_ref (grid), _("Markers"));
g_object_unref (gui);
if (state->gui == NULL) {
g_object_set_data (G_OBJECT (w), "state", state);
@@ -909,7 +907,7 @@ static void
font_init (StylePrefState *state, guint32 enable, GOEditor *editor, GOCmdContext *cc)
{
GOStyle *style = state->style;
- GtkWidget *w, *box;
+ GtkWidget *w, *grid;
GtkBuilder *gui;
if (!enable)
@@ -926,20 +924,20 @@ font_init (StylePrefState *state, guint32 enable, GOEditor *editor, GOCmdContext
w = create_go_combo_color (state, style->font.color, style->font.color,
gui, "pattern_foreground", "font_color_label",
G_CALLBACK (cb_font_color_changed));
- box = go_gtk_builder_get_widget (gui, "color_box");
- gtk_box_pack_start (GTK_BOX (box), w, TRUE, TRUE, 0);
+ grid = go_gtk_builder_get_widget (gui, "go-style-font-prefs");
+ gtk_grid_attach (GTK_GRID (grid), w, 1, 0, 1, 1);
gtk_widget_show (w);
w = go_font_sel_new ();
go_font_sel_set_font (GO_FONT_SEL (w), style->font.font);
g_signal_connect (G_OBJECT (w), "font_changed",
G_CALLBACK (cb_font_changed), state);
+ gtk_widget_set_vexpand (w, TRUE);
gtk_widget_show (w);
- box = go_gtk_builder_get_widget (gui, "go_style_font_prefs");
- gtk_box_pack_end (GTK_BOX (box), w, TRUE, TRUE, 0);
+ gtk_grid_attach (GTK_GRID (grid), w, 0, 1, 3, 1);
- go_editor_add_page (editor, box, _("Font"));
+ go_editor_add_page (editor, grid, _("Font"));
}
/************************************************************************/
diff --git a/plugins/plot_barcol/gog-area-prefs.ui b/plugins/plot_barcol/gog-area-prefs.ui
index 5180cbc..edf2abe 100644
--- a/plugins/plot_barcol/gog-area-prefs.ui
+++ b/plugins/plot_barcol/gog-area-prefs.ui
@@ -1,23 +1,51 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<interface>
<!-- interface-requires gtk+ 3.0 -->
- <!-- interface-naming-policy project-wide -->
- <object class="GtkTable" id="gog-area-prefs">
+ <object class="GtkGrid" id="gog-area-prefs">
<property name="visible">True</property>
- <property name="column_spacing">12</property>
- <property name="row_spacing">6</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">12</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>
<object class="GtkCheckButton" id="before-grid">
<property name="label" translatable="yes">_Display the grids above the plot</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>
</object>
<packing>
- <property name="x_options"></property>
- <property name="y_options"></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>
</object>
diff --git a/plugins/plot_barcol/gog-barcol-prefs.c b/plugins/plot_barcol/gog-barcol-prefs.c
index 30c630a..67a8183 100644
--- a/plugins/plot_barcol/gog-barcol-prefs.c
+++ b/plugins/plot_barcol/gog-barcol-prefs.c
@@ -73,7 +73,7 @@ gog_barcol_plot_pref (GogBarColPlot *barcol, GOCmdContext *cc)
"toggled",
G_CALLBACK (display_before_grid_cb), barcol);
- w = GTK_WIDGET (g_object_ref (gtk_builder_get_object (gui, "gog_barcol_prefs")));
+ w = GTK_WIDGET (g_object_ref (gtk_builder_get_object (gui, "gog-barcol-prefs")));
g_object_unref (gui);
return w;
diff --git a/plugins/plot_barcol/gog-barcol-prefs.ui b/plugins/plot_barcol/gog-barcol-prefs.ui
index 529c2bc..6bfc9c8 100644
--- a/plugins/plot_barcol/gog-barcol-prefs.ui
+++ b/plugins/plot_barcol/gog-barcol-prefs.ui
@@ -1,7 +1,6 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<interface>
<!-- interface-requires gtk+ 3.0 -->
- <!-- interface-naming-policy toplevel-contextual -->
<object class="GtkAdjustment" id="adjustment1">
<property name="upper">500</property>
<property name="step_increment">10</property>
@@ -13,75 +12,75 @@
<property name="step_increment">10</property>
<property name="page_increment">10</property>
</object>
- <object class="GtkTable" id="gog_barcol_prefs">
+ <object class="GtkGrid" id="gog-barcol-prefs">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="border_width">12</property>
- <property name="n_rows">3</property>
- <property name="n_columns">3</property>
- <property name="column_spacing">12</property>
<property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
<child>
<object class="GtkLabel" id="label61">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="yalign">0</property>
<property name="label" translatable="yes">_Gap:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">gap_spinner</property>
</object>
<packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label63">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">%</property>
- </object>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></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>
<object class="GtkLabel" id="label64">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">O_verlap:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">overlap_spinner</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="label65">
+ <object class="GtkCheckButton" id="before-grid">
+ <property name="label" translatable="yes">_Display the grids above the plot</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="label" translatable="yes">%</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="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ <property name="width">4</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
<object class="GtkSpinButton" id="gap_spinner">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="invisible_char">•</property>
+ <property name="invisible_char">â</property>
+ <property name="invisible_char_set">True</property>
<property name="adjustment">adjustment1</property>
<property name="climb_rate">10</property>
<property name="snap_to_ticks">True</property>
@@ -89,16 +88,17 @@
</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"></property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkSpinButton" id="overlap_spinner">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="invisible_char">•</property>
+ <property name="invisible_char">â</property>
+ <property name="invisible_char_set">True</property>
<property name="adjustment">adjustment2</property>
<property name="climb_rate">0.10000000000000001</property>
<property name="snap_to_ticks">True</property>
@@ -106,28 +106,37 @@
</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>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
- <object class="GtkCheckButton" id="before-grid">
- <property name="label" translatable="yes">_Display the grids above the plot</property>
+ <object class="GtkLabel" id="label63">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">%</property>
</object>
<packing>
- <property name="right_attach">3</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options"></property>
- <property name="y_options"></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>
+ <child>
+ <object class="GtkLabel" id="label65">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">%</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>
</object>
diff --git a/plugins/plot_barcol/gog-minmax-prefs.ui b/plugins/plot_barcol/gog-minmax-prefs.ui
index 2690481..3178f52 100644
--- a/plugins/plot_barcol/gog-minmax-prefs.ui
+++ b/plugins/plot_barcol/gog-minmax-prefs.ui
@@ -1,49 +1,56 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<interface>
- <!-- interface-naming-policy toplevel-contextual -->
+ <!-- interface-requires gtk+ 3.0 -->
<object class="GtkAdjustment" id="adjustment1">
<property name="upper">500</property>
<property name="step_increment">10</property>
<property name="page_increment">10</property>
</object>
- <object class="GtkTable" id="gog_minmax_prefs">
+ <object class="GtkGrid" id="gog-minmax-prefs">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="border_width">12</property>
- <property name="n_columns">3</property>
<property name="column_spacing">12</property>
- <property name="row_spacing">6</property>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
<child>
<object class="GtkLabel" id="label61">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="yalign">0</property>
<property name="label" translatable="yes">_Gap:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">gap_spinner</property>
</object>
<packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label63">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">%</property>
- </object>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></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>
<object class="GtkSpinButton" id="gap_spinner">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="invisible_char">•</property>
+ <property name="invisible_char">â</property>
+ <property name="invisible_char_set">True</property>
<property name="adjustment">adjustment1</property>
<property name="climb_rate">10</property>
<property name="snap_to_ticks">True</property>
@@ -51,9 +58,24 @@
</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"></property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label63">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_top">3</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">%</property>
+ </object>
+ <packing>
+ <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>
diff --git a/plugins/plot_barcol/gog-minmax.c b/plugins/plot_barcol/gog-minmax.c
index 20691a0..98469f8 100644
--- a/plugins/plot_barcol/gog-minmax.c
+++ b/plugins/plot_barcol/gog-minmax.c
@@ -191,7 +191,7 @@ gog_minmax_plot_populate_editor (GogObject *item,
"value_changed",
G_CALLBACK (cb_gap_changed), minmax);
- w = go_gtk_builder_get_widget (gui, "gog_minmax_prefs");
+ w = go_gtk_builder_get_widget (gui, "gog-minmax-prefs");
go_editor_add_page (editor, w, _("Properties"));
g_object_unref (gui);
diff --git a/plugins/plot_distrib/go-distribution-prefs.c b/plugins/plot_distrib/go-distribution-prefs.c
index 56ef282..3aac720 100644
--- a/plugins/plot_distrib/go-distribution-prefs.c
+++ b/plugins/plot_distrib/go-distribution-prefs.c
@@ -32,7 +32,7 @@ typedef struct
GParamSpec *props[2];
GtkWidget *labels[2];
GtkWidget *data[2];
- GtkTable *table;
+ GtkGrid *grid;
GogDataAllocator *dalloc;
} DistPrefs;
@@ -63,13 +63,13 @@ distribution_changed_cb (GtkComboBox *box, DistPrefs *prefs)
GtkWidget *w = gtk_label_new (lbl);
g_free (lbl);
g_object_set (w, "xalign", 0., NULL);
- gtk_table_attach (prefs->table, w, 0, 1, i+ 1, i + 2, GTK_FILL, GTK_FILL, 0,
0);
+ gtk_grid_attach (prefs->grid, w, 0, i + 1, 1, 1);
prefs->labels[i] = w;
} else
gtk_label_set_text (GTK_LABEL (prefs->labels[i]), lbl);
if (!prefs->data[i]) {
GtkWidget *w = GTK_WIDGET (gog_data_allocator_editor (prefs->dalloc,
GOG_DATASET (prefs->client), i, GOG_DATA_SCALAR));
- gtk_table_attach (prefs->table, w, 1, 2, i+ 1, i + 2, GTK_FILL, GTK_FILL, 0,
0);
+ gtk_grid_attach (prefs->grid, w, 1, i + 1, 1, 1);
prefs->data[i] = w;
}
gtk_widget_show (prefs->labels[i]);
@@ -96,20 +96,20 @@ go_distribution_pref_new (GObject *obj, GogDataAllocator *dalloc, G_GNUC_UNUSED
GParamSpec **props;
int n, i, j;
DistPrefs *prefs = g_new0 (DistPrefs, 1);
- GtkWidget *res = gtk_table_new (3, 2, FALSE);
+ GtkWidget *res = gtk_grid_new ();
GtkWidget *w = gtk_label_new (_("Distribution:"));
GODistribution *dist = NULL;
GODistributionType dist_type;
prefs->dalloc = dalloc;
- prefs->table = GTK_TABLE (res);
+ prefs->grid = GTK_GRID (res);
g_object_get (obj, "distribution", &dist, NULL);
g_return_val_if_fail (GO_IS_DISTRIBUTION (dist), NULL);
dist_type = go_distribution_get_distribution_type (dist);
g_object_set (res, "border-width", 12, "row-spacing", 12, "column-spacing", 24, NULL);
g_object_set (w, "xalign", 0., NULL);
- gtk_table_attach (prefs->table, w, 0, 1, 0, 1, GTK_FILL, GTK_FILL, 0, 0);
+ gtk_grid_attach (prefs->grid, w, 0, 0, 1, 1);
g_signal_connect_swapped (res, "destroy", G_CALLBACK (destroy_cb), prefs);
prefs->client = obj;
@@ -129,7 +129,7 @@ go_distribution_pref_new (GObject *obj, GogDataAllocator *dalloc, G_GNUC_UNUSED
gtk_combo_box_set_active_iter (GTK_COMBO_BOX (w), &iter);
}
g_signal_connect (w, "changed", G_CALLBACK (distribution_changed_cb), prefs);
- gtk_table_attach (prefs->table, w, 1, 2, 0, 1, GTK_FILL, GTK_FILL, 0, 0);
+ gtk_grid_attach (prefs->grid, w, 1, 0, 1, 1);
/* other persistent properties */
i = 1;
@@ -140,11 +140,11 @@ go_distribution_pref_new (GObject *obj, GogDataAllocator *dalloc, G_GNUC_UNUSED
w = gtk_label_new (lbl);
g_free (lbl);
g_object_set (w, "xalign", 0., NULL);
- gtk_table_attach (prefs->table, w, 0, 1, i, i + 1, GTK_FILL, GTK_FILL, 0, 0);
+ gtk_grid_attach (prefs->grid, w, 0, i, 1, 1);
prefs->labels[i-1] = w;
prefs->props[i-1] = props[n];
w = GTK_WIDGET (gog_data_allocator_editor (dalloc, GOG_DATASET (obj), i - 1,
GOG_DATA_SCALAR));
- gtk_table_attach (prefs->table, w, 1, 2, i, i + 1, GTK_FILL, GTK_FILL, 0, 0);
+ gtk_grid_attach (prefs->grid, w, 1, i, 1, 1);
prefs->data[i] = w;
i++;
}
diff --git a/plugins/plot_distrib/gog-boxplot-prefs.ui b/plugins/plot_distrib/gog-boxplot-prefs.ui
index a066a5c..f987c7b 100644
--- a/plugins/plot_distrib/gog-boxplot-prefs.ui
+++ b/plugins/plot_distrib/gog-boxplot-prefs.ui
@@ -1,42 +1,27 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<interface>
<!-- interface-requires gtk+ 3.0 -->
- <!-- interface-naming-policy toplevel-contextual -->
<object class="GtkAdjustment" id="adjustment1">
<property name="upper">500</property>
<property name="step_increment">10</property>
<property name="page_increment">10</property>
</object>
<object class="GtkAdjustment" id="adjustment2">
- <property name="value">25</property>
<property name="upper">50</property>
+ <property name="value">25</property>
<property name="step_increment">1</property>
<property name="page_increment">10</property>
</object>
- <object class="GtkListStore" id="model1">
- <columns>
- <!-- column-name gchararray -->
- <column type="gchararray"/>
- </columns>
- <data>
- <row>
- <col id="0" translatable="yes">Horizontal</col>
- </row>
- <row>
- <col id="0" translatable="yes">Vertical</col>
- </row>
- </data>
- </object>
- <object class="GtkTable" id="gog_box_plot_prefs">
+ <object class="GtkGrid" id="gog-box-plot-prefs">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="border_width">12</property>
- <property name="n_rows">5</property>
- <property name="n_columns">3</property>
- <property name="column_spacing">12</property>
<property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
<child>
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
<property name="label" translatable="yes">_Gap:</property>
@@ -44,28 +29,18 @@
<property name="mnemonic_widget">gap_spinner</property>
</object>
<packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label2">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">%</property>
- </object>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></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>
<object class="GtkSpinButton" id="gap_spinner">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="invisible_char">•</property>
+ <property name="invisible_char">â</property>
+ <property name="invisible_char_set">True</property>
<property name="adjustment">adjustment1</property>
<property name="climb_rate">10</property>
<property name="snap_to_ticks">True</property>
@@ -73,28 +48,44 @@
</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"></property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</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">%</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="layout-lbl">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">_Layout</property>
<property name="use_underline">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="GtkComboBox" id="layout">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="model">model1</property>
<child>
<object class="GtkCellRendererText" id="renderer1"/>
@@ -105,33 +96,34 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">3</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="width">2</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="show-outliers">
<property name="label" translatable="yes">_Exclude and show outliers</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>
</object>
<packing>
- <property name="right_attach">3</property>
+ <property name="left_attach">0</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>
+ <property name="width">3</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="diameter-label">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">_Diameter/width:</property>
<property name="use_underline">True</property>
@@ -139,59 +131,73 @@
<property name="wrap_mode">word-char</property>
</object>
<packing>
+ <property name="left_attach">0</property>
<property name="top_attach">3</property>
- <property name="bottom_attach">4</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="GtkCheckButton" id="before-grid">
+ <property name="label" translatable="yes">_Display the grids above the plot</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>
+ </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="GtkSpinButton" id="diameter">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="invisible_char">•</property>
+ <property name="invisible_char">â</property>
+ <property name="invisible_char_set">True</property>
<property name="adjustment">adjustment2</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="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="diam-pc-label">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">%</property>
</object>
<packing>
<property name="left_attach">2</property>
- <property name="right_attach">3</property>
<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="GtkCheckButton" id="before-grid">
- <property name="label" translatable="yes">_Display the grids above the plot</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="right_attach">3</property>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</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>
</object>
+ <object class="GtkListStore" id="model1">
+ <columns>
+ <!-- column-name gchararray -->
+ <column type="gchararray"/>
+ </columns>
+ <data>
+ <row>
+ <col id="0" translatable="yes">Horizontal</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Vertical</col>
+ </row>
+ </data>
+ </object>
</interface>
diff --git a/plugins/plot_distrib/gog-boxplot.c b/plugins/plot_distrib/gog-boxplot.c
index 5522a42..916373b 100644
--- a/plugins/plot_distrib/gog-boxplot.c
+++ b/plugins/plot_distrib/gog-boxplot.c
@@ -155,7 +155,7 @@ gog_box_plot_pref (GogObject *obj,
"toggled",
G_CALLBACK (display_before_grid_cb), obj);
- w = go_gtk_builder_get_widget (gui, "gog_box_plot_prefs");
+ w = go_gtk_builder_get_widget (gui, "gog-box-plot-prefs");
g_object_set_data (G_OBJECT (w), "state", gui);
g_signal_connect_swapped (G_OBJECT (w), "destroy", G_CALLBACK (g_object_unref), gui);
diff --git a/plugins/plot_distrib/gog-double-histogram-prefs.ui
b/plugins/plot_distrib/gog-double-histogram-prefs.ui
index 0f6a576..9f89150 100644
--- a/plugins/plot_distrib/gog-double-histogram-prefs.ui
+++ b/plugins/plot_distrib/gog-double-histogram-prefs.ui
@@ -1,45 +1,62 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<interface>
<!-- interface-requires gtk+ 3.0 -->
- <!-- interface-naming-policy toplevel-contextual -->
- <object class="GtkTable" id="double-histogram-prefs">
+ <object class="GtkGrid" id="double-histogram-prefs">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="border_width">12</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>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
<child>
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="xpad">5</property>
<property name="label" translatable="yes">First Y category label:</property>
</object>
<packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></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>
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="xpad">5</property>
<property name="label" translatable="yes">Second Y category label:</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>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
</object>
</interface>
diff --git a/plugins/plot_distrib/gog-histogram-prefs.ui b/plugins/plot_distrib/gog-histogram-prefs.ui
index 5b80c2d..29b3e5b 100644
--- a/plugins/plot_distrib/gog-histogram-prefs.ui
+++ b/plugins/plot_distrib/gog-histogram-prefs.ui
@@ -1,57 +1,84 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<interface>
<!-- interface-requires gtk+ 3.0 -->
- <!-- interface-naming-policy project-wide -->
- <object class="GtkTable" id="histogram-prefs">
+ <object class="GtkGrid" id="histogram-prefs">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="border_width">12</property>
- <property name="n_rows">3</property>
- <property name="column_spacing">12</property>
<property name="row_spacing">6</property>
<child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
<object class="GtkCheckButton" id="vertical">
<property name="label" translatable="yes">_Vertical</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>
</object>
<packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></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>
<object class="GtkCheckButton" id="cumulative">
<property name="label" translatable="yes">_Cumulative</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>
</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="GtkCheckButton" id="before-grid">
<property name="label" translatable="yes">_Display the grids above the plot</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>
</object>
<packing>
+ <property name="left_attach">0</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>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
</object>
diff --git a/plugins/plot_distrib/gog-histogram.c b/plugins/plot_distrib/gog-histogram.c
index 522b024..3b1bfd0 100644
--- a/plugins/plot_distrib/gog-histogram.c
+++ b/plugins/plot_distrib/gog-histogram.c
@@ -425,22 +425,24 @@ gog_double_histogram_plot_populate_editor (GogObject *gobj,
GogDataAllocator *dalloc,
GOCmdContext *cc)
{
- GtkTable *table;
+ GtkGrid *grid;
GtkWidget *w;
GogDataset *set = GOG_DATASET (gobj);
GtkBuilder *gui =
go_gtk_builder_load ("res:go:plot_distrib/gog-double-histogram-prefs.ui",
GETTEXT_PACKAGE, cc);
if (gui != NULL) {
- table = GTK_TABLE (gtk_builder_get_object (gui, "double-histogram-prefs"));
+ grid = GTK_GRID (gtk_builder_get_object (gui, "double-histogram-prefs"));
w = GTK_WIDGET (gog_data_allocator_editor (dalloc, set, 0, GOG_DATA_SCALAR));
gtk_widget_set_tooltip_text (w, _("Label for the first Y category. If not set or empty,
\"First values\" will be used."));
gtk_widget_show (w);
- gtk_table_attach (table, w, 1, 2, 0, 1, GTK_FILL | GTK_EXPAND, 0, 0, 0);
+ gtk_widget_set_hexpand (w, TRUE);
+ gtk_grid_attach (grid, w, 1, 0, 1, 1);
w = GTK_WIDGET (gog_data_allocator_editor (dalloc, set, 1, GOG_DATA_SCALAR));
gtk_widget_set_tooltip_text (w, _("Label for the second Y category. If not set or empty,
\"Second values\" will be used."));
gtk_widget_show (w);
- gtk_table_attach (table, w, 1, 2, 1, 2, GTK_FILL | GTK_EXPAND, 0, 0, 0);
+ gtk_widget_set_hexpand (w, TRUE);
+ gtk_grid_attach (grid, w, 1, 1, 1, 1);
go_editor_add_page (editor,
go_gtk_builder_get_widget (gui, "double-histogram-prefs"),
_("Categories labels"));
diff --git a/plugins/plot_pie/gog-pie-prefs.c b/plugins/plot_pie/gog-pie-prefs.c
index 08af2c0..b2dc162 100644
--- a/plugins/plot_pie/gog-pie-prefs.c
+++ b/plugins/plot_pie/gog-pie-prefs.c
@@ -49,7 +49,7 @@ gog_pie_series_element_pref (GogPieSeriesElement *element, GOCmdContext *cc)
"value_changed",
G_CALLBACK (cb_element_separation_changed), element);
- w = GTK_WIDGET (g_object_ref (gtk_builder_get_object (gui, "gog_pie_series_element_prefs")));
+ w = GTK_WIDGET (g_object_ref (gtk_builder_get_object (gui, "gog-pie-series-element-prefs")));
g_object_unref (gui);
return w;
@@ -169,7 +169,7 @@ gog_pie_plot_pref (GogPiePlot *pie, GOCmdContext *cc)
"update-editor",
G_CALLBACK (cb_update_editor), state);
- w = GTK_WIDGET (g_object_ref (gtk_builder_get_object (gui, "gog_pie_prefs")));
+ w = GTK_WIDGET (g_object_ref (gtk_builder_get_object (gui, "gog-pie-prefs")));
g_object_set_data_full (G_OBJECT (w), "state", state, (GDestroyNotify) pie_pref_state_free);
g_object_unref (gui);
@@ -216,7 +216,7 @@ gog_ring_plot_pref (GogRingPlot *ring, GOCmdContext *cc)
"update-editor",
G_CALLBACK (cb_update_editor), state);
- w = GTK_WIDGET (g_object_ref (gtk_builder_get_object (gui, "gog_ring_prefs")));
+ w = GTK_WIDGET (g_object_ref (gtk_builder_get_object (gui, "gog-ring-prefs")));
g_object_set_data_full (G_OBJECT (w), "state", state, (GDestroyNotify) pie_pref_state_free);
g_object_unref (gui);
diff --git a/plugins/plot_pie/gog-pie-prefs.ui b/plugins/plot_pie/gog-pie-prefs.ui
index e616dd7..4fa5d88 100644
--- a/plugins/plot_pie/gog-pie-prefs.ui
+++ b/plugins/plot_pie/gog-pie-prefs.ui
@@ -1,7 +1,6 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<interface>
<!-- interface-requires gtk+ 3.0 -->
- <!-- interface-naming-policy toplevel-contextual -->
<object class="GtkAdjustment" id="adjustment1">
<property name="upper">360</property>
<property name="step_increment">10</property>
@@ -12,16 +11,16 @@
<property name="step_increment">10</property>
<property name="page_increment">50</property>
</object>
- <object class="GtkTable" id="gog_pie_prefs">
+ <object class="GtkGrid" id="gog-pie-prefs">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="border_width">12</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="column_spacing">12</property>
<child>
<object class="GtkLabel" id="label61">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
<property name="label" translatable="yes">Slices start _at:</property>
@@ -29,75 +28,114 @@
<property name="mnemonic_widget">rotation_spinner</property>
</object>
<packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></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>
- <object class="GtkLabel" id="label63">
+ <object class="GtkLabel" id="label64">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">degrees</property>
+ <property name="label" translatable="yes">_Slice Separation:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">separation_spinner</property>
</object>
<packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <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="GtkLabel" id="neg-label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Negative data:</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="GtkCheckButton" id="vary_style_by_element">
<property name="label" translatable="yes">_Vary colors by slice</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>
</object>
<packing>
- <property name="right_attach">3</property>
+ <property name="left_attach">0</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>
+ <property name="width">3</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
- <object class="GtkLabel" id="label64">
+ <object class="GtkLabel" id="label63">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_Slice Separation:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">separation_spinner</property>
+ <property name="label" translatable="yes">degrees</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>
+ <property name="left_attach">2</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label65">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">%</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="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="GtkComboBox" id="neg-box">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="model">neg-list</property>
+ <child>
+ <object class="GtkCellRendererText" id="renderer1"/>
+ <attributes>
+ <attribute name="text">0</attribute>
+ </attributes>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">3</property>
+ <property name="width">2</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkSpinButton" id="rotation_spinner">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="invisible_char">•</property>
+ <property name="invisible_char">â</property>
+ <property name="invisible_char_set">True</property>
<property name="adjustment">adjustment1</property>
<property name="climb_rate">10</property>
<property name="snap_to_ticks">True</property>
@@ -106,16 +144,17 @@
</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"></property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkSpinButton" id="separation_spinner">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="invisible_char">•</property>
+ <property name="invisible_char">â</property>
+ <property name="invisible_char_set">True</property>
<property name="adjustment">adjustment2</property>
<property name="climb_rate">10</property>
<property name="snap_to_ticks">True</property>
@@ -123,44 +162,9 @@
</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="GtkLabel" id="neg-label">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Negative data:</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="GtkComboBox" id="neg-box">
- <property name="visible">True</property>
- <property name="model">neg-list</property>
- <child>
- <object class="GtkCellRendererText" id="renderer1"/>
- <attributes>
- <attribute name="text">0</attribute>
- </attributes>
- </child>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">3</property>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</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>
</object>
diff --git a/plugins/plot_pie/gog-pie-series.ui b/plugins/plot_pie/gog-pie-series.ui
index 3455f96..8529323 100644
--- a/plugins/plot_pie/gog-pie-series.ui
+++ b/plugins/plot_pie/gog-pie-series.ui
@@ -1,71 +1,81 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<interface>
<!-- interface-requires gtk+ 3.0 -->
- <!-- interface-naming-policy toplevel-contextual -->
<object class="GtkAdjustment" id="adjustment1">
<property name="upper">500</property>
<property name="step_increment">10</property>
<property name="page_increment">50</property>
</object>
- <object class="GtkBox" id="gog_pie_series_element_prefs">
+ <object class="GtkGrid" id="gog-pie-series-element-prefs">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="border_width">12</property>
- <property name="orientation">vertical</property>
- <property name="spacing">6</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
<child>
- <object class="GtkTable" id="separation_table">
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label64">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Separation:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">separation_spinner</property>
+ </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>
+ <child>
+ <object class="GtkSpinButton" id="separation_spinner">
+ <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="adjustment">adjustment1</property>
+ <property name="climb_rate">10</property>
+ <property name="snap_to_ticks">True</property>
+ <property name="numeric">True</property>
+ </object>
+ <packing>
+ <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="GtkLabel" id="label65">
<property name="visible">True</property>
- <property name="n_columns">3</property>
- <property name="column_spacing">12</property>
- <property name="row_spacing">6</property>
- <child>
- <object class="GtkLabel" id="label64">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">_Separation:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">separation_spinner</property>
- </object>
- <packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label65">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">%</property>
- </object>
- <packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="separation_spinner">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="invisible_char">•</property>
- <property name="adjustment">adjustment1</property>
- <property name="climb_rate">10</property>
- <property name="snap_to_ticks">True</property>
- <property name="numeric">True</property>
- </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"></property>
- </packing>
- </child>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">%</property>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</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>
diff --git a/plugins/plot_pie/gog-ring-prefs.ui b/plugins/plot_pie/gog-ring-prefs.ui
index 9d31cb7..ad69406 100644
--- a/plugins/plot_pie/gog-ring-prefs.ui
+++ b/plugins/plot_pie/gog-ring-prefs.ui
@@ -1,7 +1,6 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<interface>
<!-- interface-requires gtk+ 3.0 -->
- <!-- interface-naming-policy toplevel-contextual -->
<object class="GtkAdjustment" id="adjustment1">
<property name="upper">360</property>
<property name="step_increment">10</property>
@@ -17,204 +16,208 @@
<property name="step_increment">5</property>
<property name="page_increment">0.20000000000000001</property>
</object>
- <object class="GtkTable" id="gog_ring_prefs">
+ <object class="GtkGrid" id="gog-ring-prefs">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="border_width">12</property>
- <property name="n_rows">5</property>
- <property name="n_columns">3</property>
- <property name="column_spacing">12</property>
<property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
<child>
- <object class="GtkLabel" id="label61">
+ <object class="GtkCheckButton" id="vary_style_by_element">
+ <property name="label" translatable="yes">_Vary colors by slice</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="yalign">0</property>
- <property name="label" translatable="yes">Slices start _at:</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="mnemonic_widget">rotation_spinner</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
</object>
<packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">3</property>
+ <property name="width">3</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
- <object class="GtkLabel" id="label63">
+ <object class="GtkLabel" id="neg-label">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">degrees</property>
+ <property name="label" translatable="yes">Negative data:</property>
</object>
<packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <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="GtkCheckButton" id="vary_style_by_element">
- <property name="label" translatable="yes">_Vary colors by slice</property>
+ <object class="GtkComboBox" id="neg-box">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="draw_indicator">True</property>
+ <property name="can_focus">False</property>
+ <property name="model">neg-list</property>
+ <child>
+ <object class="GtkCellRendererText" id="renderer1"/>
+ <attributes>
+ <attribute name="text">0</attribute>
+ </attributes>
+ </child>
</object>
<packing>
- <property name="right_attach">3</property>
- <property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="left_attach">1</property>
+ <property name="top_attach">4</property>
+ <property name="width">2</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
- <object class="GtkLabel" id="label64">
+ <object class="GtkLabel" id="label61">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">_Slice Separation:</property>
+ <property name="yalign">0</property>
+ <property name="label" translatable="yes">Slices start _at:</property>
<property name="use_underline">True</property>
- <property name="mnemonic_widget">separation_spinner</property>
+ <property name="mnemonic_widget">rotation_spinner</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>
+ <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>
- <object class="GtkLabel" id="label65">
+ <object class="GtkLabel" id="label64">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">%</property>
+ <property name="label" translatable="yes">_Slice Separation:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">separation_spinner</property>
</object>
<packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
+ <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="GtkSpinButton" id="rotation_spinner">
+ <object class="GtkLabel" id="label66">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="invisible_char">•</property>
- <property name="adjustment">adjustment1</property>
- <property name="climb_rate">10</property>
- <property name="snap_to_ticks">True</property>
- <property name="numeric">True</property>
- <property name="wrap">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Cen_ter size:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">center_size_spinner</property>
</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"></property>
+ <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="GtkSpinButton" id="separation_spinner">
+ <object class="GtkLabel" id="label63">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="invisible_char">•</property>
- <property name="adjustment">adjustment2</property>
- <property name="climb_rate">10</property>
- <property name="snap_to_ticks">True</property>
- <property name="numeric">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">degrees</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>
+ <property name="left_attach">2</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
- <object class="GtkLabel" id="label66">
+ <object class="GtkLabel" id="label65">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
- <property name="label" translatable="yes">Cen_ter size:</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">center_size_spinner</property>
+ <property name="label" translatable="yes">%</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>
+ <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="GtkLabel" id="label67">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">%</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>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
- <object class="GtkSpinButton" id="center_size_spinner">
+ <object class="GtkSpinButton" id="rotation_spinner">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="invisible_char">•</property>
- <property name="adjustment">adjustment3</property>
- <property name="climb_rate">1</property>
+ <property name="invisible_char">â</property>
+ <property name="invisible_char_set">True</property>
+ <property name="adjustment">adjustment1</property>
+ <property name="climb_rate">10</property>
<property name="snap_to_ticks">True</property>
<property name="numeric">True</property>
+ <property name="wrap">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>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
- <object class="GtkComboBox" id="neg-box">
+ <object class="GtkSpinButton" id="separation_spinner">
<property name="visible">True</property>
- <property name="model">neg-list</property>
- <child>
- <object class="GtkCellRendererText" id="renderer1"/>
- <attributes>
- <attribute name="text">0</attribute>
- </attributes>
- </child>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">â</property>
+ <property name="invisible_char_set">True</property>
+ <property name="adjustment">adjustment2</property>
+ <property name="climb_rate">10</property>
+ <property name="snap_to_ticks">True</property>
+ <property name="numeric">True</property>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">3</property>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
- <object class="GtkLabel" id="neg-label">
+ <object class="GtkSpinButton" id="center_size_spinner">
<property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Negative data:</property>
+ <property name="can_focus">True</property>
+ <property name="invisible_char">â</property>
+ <property name="invisible_char_set">True</property>
+ <property name="adjustment">adjustment3</property>
+ <property name="climb_rate">1</property>
+ <property name="snap_to_ticks">True</property>
+ <property name="numeric">True</property>
</object>
<packing>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></property>
+ <property name="left_attach">1</property>
+ <property name="top_attach">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
</object>
diff --git a/plugins/plot_radar/gog-color-polar-prefs.ui b/plugins/plot_radar/gog-color-polar-prefs.ui
index 698fa69..29e0df9 100644
--- a/plugins/plot_radar/gog-color-polar-prefs.ui
+++ b/plugins/plot_radar/gog-color-polar-prefs.ui
@@ -1,22 +1,50 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<interface>
- <!-- interface-naming-policy toplevel-contextual -->
- <object class="GtkTable" id="gog-color-polar-prefs">
+ <!-- interface-requires gtk+ 3.0 -->
+ <object class="GtkGrid" id="gog-color-polar-prefs">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="border_width">12</property>
- <property name="column_spacing">12</property>
- <property name="row_spacing">6</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>
<object class="GtkCheckButton" id="hide-outliers">
<property name="label" translatable="yes">Hide data outside of color axis bounds</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="x_options"></property>
- <property name="y_options"></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>
</object>
diff --git a/plugins/plot_radar/gog-polar-prefs.ui b/plugins/plot_radar/gog-polar-prefs.ui
index 520f170..1d12b49 100644
--- a/plugins/plot_radar/gog-polar-prefs.ui
+++ b/plugins/plot_radar/gog-polar-prefs.ui
@@ -1,23 +1,51 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<interface>
<!-- interface-requires gtk+ 3.0 -->
- <!-- interface-naming-policy project-wide -->
- <object class="GtkTable" id="gog-polar-prefs">
+ <object class="GtkGrid" id="gog-polar-prefs">
<property name="visible">True</property>
- <property name="column_spacing">12</property>
- <property name="row_spacing">6</property>
+ <property name="can_focus">False</property>
+ <property name="border_width">12</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>
<object class="GtkCheckButton" id="before-grid">
<property name="label" translatable="yes">_Display the grids above the plot</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>
</object>
<packing>
- <property name="x_options"></property>
- <property name="y_options"></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>
</object>
diff --git a/plugins/plot_xy/gog-bubble-prefs.c b/plugins/plot_xy/gog-bubble-prefs.c
index fc6e37a..d96666e 100644
--- a/plugins/plot_xy/gog-bubble-prefs.c
+++ b/plugins/plot_xy/gog-bubble-prefs.c
@@ -113,7 +113,7 @@ gog_bubble_plot_pref (GogBubblePlot *bubble, GOCmdContext *cc)
"toggled",
G_CALLBACK (cb_negatives_changed), bubble);
- w = GTK_WIDGET (g_object_ref (gtk_builder_get_object (gui, "gog_bubble_prefs")));
+ w = GTK_WIDGET (g_object_ref (gtk_builder_get_object (gui, "gog-bubble-prefs")));
g_object_unref (gui);
return w;
diff --git a/plugins/plot_xy/gog-bubble-prefs.ui b/plugins/plot_xy/gog-bubble-prefs.ui
index eb86513..7218630 100644
--- a/plugins/plot_xy/gog-bubble-prefs.ui
+++ b/plugins/plot_xy/gog-bubble-prefs.ui
@@ -7,43 +7,26 @@
<property name="step_increment">1</property>
<property name="page_increment">10</property>
</object>
- <object class="GtkTable" id="gog_bubble_prefs">
+ <object class="GtkGrid" id="gog-bubble-prefs">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">12</property>
- <property name="n_rows">5</property>
- <property name="n_columns">3</property>
- <property name="column_spacing">12</property>
<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>
- <object class="GtkCheckButton" id="3d">
- <property name="label" translatable="yes">3_D</property>
- <property name="use_action_appearance">False</property>
+ <object class="GtkLabel" id="size_display">
<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="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Size represented by:</property>
<property name="use_underline">True</property>
- <property name="xalign">0.5</property>
- <property name="draw_indicator">True</property>
+ <property name="mnemonic_widget">area</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 name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
@@ -55,15 +38,15 @@
<property name="receives_default">False</property>
<property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
- <property name="xalign">0.5</property>
+ <property name="xalign">0</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="x_options">GTK_FILL</property>
- <property name="y_options"/>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
@@ -75,29 +58,34 @@
<property name="receives_default">False</property>
<property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
- <property name="xalign">0.5</property>
+ <property name="xalign">0</property>
+ <property name="active">True</property>
<property name="draw_indicator">True</property>
- <property name="group">area</property>
</object>
<packing>
<property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
- <object class="GtkLabel" id="size_display">
+ <object class="GtkCheckButton" id="show_negative_values">
+ <property name="label" translatable="yes">Show _negative values</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">_Size represented by:</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="mnemonic_widget">area</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
</object>
<packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">2</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
@@ -109,90 +97,90 @@
<property name="receives_default">False</property>
<property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
- <property name="xalign">0.5</property>
+ <property name="xalign">0</property>
<property name="draw_indicator">True</property>
</object>
<packing>
- <property name="right_attach">2</property>
+ <property name="left_attach">0</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 name="width">2</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
- <object class="GtkCheckButton" id="show_negative_values">
- <property name="label" translatable="yes">Show _negative values</property>
+ <object class="GtkCheckButton" id="3d">
+ <property name="label" translatable="yes">3_D</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.5</property>
+ <property name="xalign">0</property>
<property name="draw_indicator">True</property>
</object>
<packing>
- <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 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="GtkBox" id="scale_box">
+ <object class="GtkLabel" id="scale_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">12</property>
- <child>
- <object class="GtkLabel" id="scale_label">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">_Bubbles scaled to</property>
- <property name="use_underline">True</property>
- <property name="mnemonic_widget">scale</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="scale">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="invisible_char">â</property>
- <property name="adjustment">adjustment1</property>
- <property name="climb_rate">1</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="percent">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">% of default size</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
- </child>
+ <property name="label" translatable="yes">_Bubbles scaled to</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">scale</property>
</object>
<packing>
- <property name="right_attach">3</property>
+ <property name="left_attach">0</property>
<property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
+ <child>
+ <object class="GtkLabel" id="percent">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">% of default size</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">4</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="scale">
+ <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="adjustment">adjustment1</property>
+ <property name="climb_rate">1</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>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</object>
</interface>
diff --git a/plugins/plot_xy/gog-xy-color-prefs.ui b/plugins/plot_xy/gog-xy-color-prefs.ui
index e982a3e..bb7ec16 100644
--- a/plugins/plot_xy/gog-xy-color-prefs.ui
+++ b/plugins/plot_xy/gog-xy-color-prefs.ui
@@ -1,22 +1,52 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<interface>
- <!-- interface-naming-policy toplevel-contextual -->
- <object class="GtkTable" id="gog-xy-color-prefs">
+ <!-- interface-requires gtk+ 3.0 -->
+ <object class="GtkGrid" id="gog-xy-color-prefs">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="border_width">12</property>
- <property name="column_spacing">12</property>
<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>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
<child>
<object class="GtkCheckButton" id="hide-outliers">
<property name="label" translatable="yes">Hide data outside of color axis bounds</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="x_options"></property>
- <property name="y_options"></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>
</object>
diff --git a/plugins/plot_xy/gog-xy-dropbar-prefs.ui b/plugins/plot_xy/gog-xy-dropbar-prefs.ui
index a36415d..7cb4923 100644
--- a/plugins/plot_xy/gog-xy-dropbar-prefs.ui
+++ b/plugins/plot_xy/gog-xy-dropbar-prefs.ui
@@ -1,88 +1,89 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<interface>
<!-- interface-requires gtk+ 3.0 -->
- <!-- interface-naming-policy toplevel-contextual -->
- <object class="GtkAdjustment" id="width-adj">
- <property name="value">5</property>
- <property name="upper">50</property>
- <property name="step_increment">1</property>
- <property name="page_increment">10</property>
- </object>
- <object class="GtkTable" id="gog-xy-dropbar-prefs">
+ <object class="GtkGrid" id="gog-xy-dropbar-prefs">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="border_width">12</property>
- <property name="n_rows">3</property>
- <property name="n_columns">3</property>
- <property name="column_spacing">12</property>
<property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
<child>
<object class="GtkCheckButton" id="horizontal">
<property name="label" translatable="yes">_Horizontal</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>
</object>
<packing>
- <property name="right_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></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="GtkLabel" id="width-lbl">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Bar _width:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">width-btn</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>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton" id="width-btn">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="invisible_char">●</property>
- <property name="adjustment">width-adj</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>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkCheckButton" id="before-grid">
<property name="label" translatable="yes">_Display the grids above the plot</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>
</object>
<packing>
- <property name="right_attach">3</property>
+ <property name="left_attach">0</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>
+ <property name="width">3</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
<placeholder/>
</child>
<child>
- <placeholder/>
+ <object class="GtkSpinButton" id="width-btn">
+ <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="adjustment">width-adj</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>
</object>
+ <object class="GtkAdjustment" id="width-adj">
+ <property name="upper">50</property>
+ <property name="value">5</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
</interface>
diff --git a/plugins/plot_xy/gog-xy-prefs.ui b/plugins/plot_xy/gog-xy-prefs.ui
index 861d4e7..dac2203 100644
--- a/plugins/plot_xy/gog-xy-prefs.ui
+++ b/plugins/plot_xy/gog-xy-prefs.ui
@@ -1,24 +1,53 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<interface>
<!-- interface-requires gtk+ 3.0 -->
- <!-- interface-naming-policy project-wide -->
- <object class="GtkTable" id="gog-xy-prefs">
+ <object class="GtkGrid" id="gog-xy-prefs">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="border_width">12</property>
- <property name="column_spacing">12</property>
<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>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
<child>
<object class="GtkCheckButton" id="before-grid">
<property name="label" translatable="yes">_Display the grids above the plot</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>
</object>
<packing>
- <property name="x_options"></property>
- <property name="y_options"></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>
</object>
diff --git a/plugins/plot_xy/gog-xy-series-prefs.ui b/plugins/plot_xy/gog-xy-series-prefs.ui
index e0078c9..9e9bf05 100644
--- a/plugins/plot_xy/gog-xy-series-prefs.ui
+++ b/plugins/plot_xy/gog-xy-series-prefs.ui
@@ -1,12 +1,36 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<!-- interface-requires gtk+ 3.0 -->
- <object class="GtkBox" id="gog_xy_series_prefs">
+ <object class="GtkGrid" id="gog-xy-series-prefs">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">12</property>
- <property name="orientation">vertical</property>
- <property name="spacing">6</property>
+ <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>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
<child>
<object class="GtkCheckButton" id="invalid_as_zero">
<property name="label" translatable="yes">_Use null value instead of invalid</property>
@@ -16,13 +40,14 @@
<property name="receives_default">False</property>
<property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
- <property name="xalign">0.5</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">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
</object>
diff --git a/plugins/plot_xy/gog-xy.c b/plugins/plot_xy/gog-xy.c
index 110c36a..6d00546 100644
--- a/plugins/plot_xy/gog-xy.c
+++ b/plugins/plot_xy/gog-xy.c
@@ -2093,7 +2093,7 @@ gog_xy_series_populate_editor (GogObject *obj,
"toggled",
G_CALLBACK (invalid_toggled_cb), obj);
- w = go_gtk_builder_get_widget (gui, "gog_xy_series_prefs");
+ w = go_gtk_builder_get_widget (gui, "gog-xy-series-prefs");
go_editor_add_page (editor, w, _("Details"));
g_object_unref (gui);
diff --git a/plugins/smoothing/gog-exp-smooth.c b/plugins/smoothing/gog-exp-smooth.c
index 17e39cd..522a344 100644
--- a/plugins/smoothing/gog-exp-smooth.c
+++ b/plugins/smoothing/gog-exp-smooth.c
@@ -59,13 +59,13 @@ gog_exp_smooth_populate_editor (GogObject *obj,
go_gtk_builder_load ("res:go:smoothing/gog-exp-smooth.ui",
GETTEXT_PACKAGE, cc);
GtkWidget *label, *box, *w = go_gtk_builder_get_widget (gui, "steps");
- GtkTable *table;
+ GtkGrid *grid;
gtk_widget_set_tooltip_text (w, _("Number of interpolation steps"));
gtk_spin_button_set_range (GTK_SPIN_BUTTON (w), 10, G_MAXINT);
gtk_spin_button_set_value (GTK_SPIN_BUTTON (w), es->steps);
g_signal_connect (G_OBJECT (w), "value-changed", G_CALLBACK (steps_changed_cb), obj);
- table = GTK_TABLE (gtk_builder_get_object (gui, "exp-smooth-prefs"));
+ grid = GTK_GRID (gtk_builder_get_object (gui, "exp-smooth-prefs"));
w = GTK_WIDGET (gog_data_allocator_editor (dalloc, set, 0, GOG_DATA_SCALAR));
box = gtk_event_box_new ();
gtk_container_add (GTK_CONTAINER (box), w);
@@ -73,10 +73,11 @@ gog_exp_smooth_populate_editor (GogObject *obj,
"If no value or a negative (or null) value is provided, the "
"default will be used"));
gtk_widget_show_all (box);
- gtk_table_attach (table, box, 1, 2, 0, 1, GTK_FILL | GTK_EXPAND, 0, 0, 0);
+ gtk_widget_set_hexpand (box, TRUE);
+ gtk_grid_attach (grid, box, 1, 0, 1, 1);
label = go_gtk_builder_get_widget (gui, "period-lbl");
g_object_set (G_OBJECT (label), "mnemonic-widget", w, NULL);
- go_editor_add_page (editor, table, _("Properties"));
+ go_editor_add_page (editor, grid, _("Properties"));
g_object_unref (gui);
(GOG_OBJECT_CLASS (exp_smooth_parent_klass)->populate_editor) (obj, editor, dalloc, cc);
diff --git a/plugins/smoothing/gog-exp-smooth.ui b/plugins/smoothing/gog-exp-smooth.ui
index c8dd6db..86ae48e 100644
--- a/plugins/smoothing/gog-exp-smooth.ui
+++ b/plugins/smoothing/gog-exp-smooth.ui
@@ -1,36 +1,40 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<interface>
- <!-- interface-naming-policy toplevel-contextual -->
+ <!-- interface-requires gtk+ 3.0 -->
<object class="GtkAdjustment" id="adjustment1">
- <property name="value">100</property>
<property name="lower">10</property>
<property name="upper">10000</property>
+ <property name="value">100</property>
<property name="step_increment">1</property>
<property name="page_increment">10</property>
</object>
- <object class="GtkTable" id="exp-smooth-prefs">
+ <object class="GtkGrid" id="exp-smooth-prefs">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="border_width">12</property>
- <property name="n_rows">2</property>
- <property name="n_columns">2</property>
- <property name="column_spacing">12</property>
+ <property name="orientation">vertical</property>
<property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
<child>
<object class="GtkLabel" id="period-lbl">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="xpad">5</property>
<property name="label" translatable="yes">_Period:</property>
<property name="use_underline">True</property>
</object>
<packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"></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>
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="xpad">5</property>
<property name="label" translatable="yes">_Steps:</property>
@@ -38,30 +42,45 @@
<property name="mnemonic_widget">steps</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="GtkSpinButton" id="steps">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="invisible_char">•</property>
+ <property name="invisible_char">â</property>
+ <property name="invisible_char_set">True</property>
<property name="adjustment">adjustment1</property>
<property name="climb_rate">1</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>
+ <property name="width">1</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>
</object>
</interface>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
