[gnumeric] Format Cells: move more grid coordinates to the ui file.
- From: Morten Welinder <mortenw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnumeric] Format Cells: move more grid coordinates to the ui file.
- Date: Thu, 14 Mar 2013 02:20:42 +0000 (UTC)
commit 837730ed3a96b6b7d121c573e062f00b6ba3a723
Author: Morten Welinder <terra gnome org>
Date: Wed Mar 13 20:26:37 2013 -0400
Format Cells: move more grid coordinates to the ui file.
src/dialogs/ChangeLog | 3 +
src/dialogs/cell-format.ui | 84 ++++++++++++++++++++-----------------
src/dialogs/dialog-cell-format.c | 49 +++++++++++++---------
3 files changed, 76 insertions(+), 60 deletions(-)
---
diff --git a/src/dialogs/ChangeLog b/src/dialogs/ChangeLog
index bd722d4..30bfe70 100644
--- a/src/dialogs/ChangeLog
+++ b/src/dialogs/ChangeLog
@@ -2,6 +2,9 @@
* dialog-cell-format.c (setup_color_pickers): Find grid
coordinates directly from placeholder widgets.
+ (draw_border_preview): Ditto.
+ (fmt_dialog_init_align_page): Ditto.
+ (fmt_dialog_init_font_page): Ditto.
* dialog-preferences.c: Use GOFontSel instead of our own.
diff --git a/src/dialogs/cell-format.ui b/src/dialogs/cell-format.ui
index 135a98c..f7f903e 100644
--- a/src/dialogs/cell-format.ui
+++ b/src/dialogs/cell-format.ui
@@ -469,6 +469,21 @@
</packing>
</child>
<child>
+ <object class="GtkBox" id="rotation_placeholder">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">3</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">12</property>
+ </packing>
+ </child>
+ <child>
<placeholder/>
</child>
<child>
@@ -626,7 +641,7 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="underline_box">
+ <object class="GtkBox" id="underline_placeholder">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@@ -641,16 +656,19 @@
</packing>
</child>
<child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
+ <object class="GtkBox" id="font_sel_placeholder">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">4</property>
+ <property name="height">1</property>
+ </packing>
</child>
</object>
<packing>
@@ -891,31 +909,19 @@
</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/>
+ <object class="GtkBox" id="border_sample_placeholder">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">1</property>
+ <property name="width">3</property>
+ <property name="height">3</property>
+ </packing>
</child>
<child>
<placeholder/>
@@ -1792,9 +1798,6 @@
</packing>
</child>
<child>
- <placeholder/>
- </child>
- <child>
<object class="GtkBox" id="background_color_placeholder">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -1824,6 +1827,9 @@
<property name="height">1</property>
</packing>
</child>
+ <child>
+ <placeholder/>
+ </child>
</object>
<packing>
<property name="position">3</property>
diff --git a/src/dialogs/dialog-cell-format.c b/src/dialogs/dialog-cell-format.c
index 0444677..79ed211 100644
--- a/src/dialogs/dialog-cell-format.c
+++ b/src/dialogs/dialog-cell-format.c
@@ -349,10 +349,25 @@ setup_pattern_button (GdkScreen *screen,
}
static void
+replace_in_grid (GtkWidget *w, GtkWidget *neww)
+{
+ GtkWidget *parent = gtk_widget_get_parent (w);
+ int col, row, width, height;
+ gtk_container_child_get (GTK_CONTAINER (parent),
+ w,
+ "left-attach", &col,
+ "top-attach", &row,
+ "width", &width,
+ "height", &height,
+ NULL);
+ gtk_grid_attach (GTK_GRID (parent), neww, col, row, width, height);
+}
+
+static void
setup_color_pickers (FormatState *state,
ColorPicker *picker,
char const *color_group,
- char const *container,
+ char const *placeholder,
char const *label,
char const *default_caption,
char const *caption,
@@ -360,11 +375,10 @@ setup_color_pickers (FormatState *state,
GnmStyleElement e,
gboolean allow_alpha)
{
- GtkWidget *combo, *w, *parent, *frame;
+ GtkWidget *combo, *w, *frame;
GOColorGroup *cg;
GnmColor *mcolor = NULL;
GnmColor *def_sc = NULL;
- int col, row;
switch (e) {
case MSTYLE_COLOR_PATTERN:
@@ -414,14 +428,8 @@ setup_color_pickers (FormatState *state,
gtk_container_add (GTK_CONTAINER (frame), combo);
gtk_widget_show_all (frame);
- w = go_gtk_builder_get_widget (state->gui, container);
- parent = gtk_widget_get_parent (w);
- gtk_container_child_get (GTK_CONTAINER (parent),
- w,
- "left-attach", &col,
- "top-attach", &row,
- NULL);
- gtk_grid_attach (GTK_GRID (parent), frame, col, row, 1, 1);
+ w = go_gtk_builder_get_widget (state->gui, placeholder);
+ replace_in_grid (w, frame);
w = go_gtk_builder_get_widget (state->gui, label);
gtk_label_set_mnemonic_widget (GTK_LABEL (w), combo);
@@ -697,11 +705,11 @@ fmt_dialog_init_align_page (FormatState *state)
} else
r = 0;
state->align.rotation = (GORotationSel *) go_rotation_sel_new ();
- gtk_grid_attach (GTK_GRID (go_gtk_builder_get_widget (state->gui, "alignment-grid")),
- GTK_WIDGET (state->align.rotation), 3, 0, 1, 12);
go_rotation_sel_set_rotation (state->align.rotation, r);
g_signal_connect (G_OBJECT (state->align.rotation), "rotation-changed",
G_CALLBACK (cb_rotation_changed), state);
+ replace_in_grid (go_gtk_builder_get_widget (state->gui, "rotation_placeholder"),
+ GTK_WIDGET (state->align.rotation));
}
/*****************************************************************************/
@@ -822,7 +830,6 @@ fmt_dialog_init_font_page (FormatState *state)
{
GtkWidget *tmp = font_selector_new ();
FontSelector *font_widget = FONT_SELECTOR (tmp);
- GtkWidget *container = go_gtk_builder_get_widget (state->gui, "font-grid");
GtkWidget *uline = gtk_combo_box_text_new_with_entry ();
GtkEntry *uline_entry = GTK_ENTRY (gtk_bin_get_child (GTK_BIN (uline)));
char const *uline_str;
@@ -831,15 +838,14 @@ fmt_dialog_init_font_page (FormatState *state)
GOFontScript script = GO_FONT_SCRIPT_STANDARD;
int i;
- g_return_if_fail (container != NULL);
g_return_if_fail (uline != NULL);
g_return_if_fail (strike != NULL);
- /* TODO: How to insert the font box in the right place initially */
- gtk_widget_show (tmp);
gtk_widget_set_vexpand (tmp, TRUE);
gtk_widget_set_hexpand (tmp, TRUE);
- gtk_grid_attach (GTK_GRID (container), tmp, 0, 0, 5, 1);
+ gtk_widget_show (tmp);
+ replace_in_grid (go_gtk_builder_get_widget (state->gui, "font_sel_placeholder"),
+ tmp);
font_selector_editable_enters (font_widget, GTK_WINDOW (state->dialog));
@@ -880,7 +886,8 @@ fmt_dialog_init_font_page (FormatState *state)
"changed",
G_CALLBACK (cb_font_underline_changed), state);
gtk_widget_show_all (uline);
- gtk_grid_attach (GTK_GRID (container), uline, 3, 2, 1, 1);
+ replace_in_grid (go_gtk_builder_get_widget (state->gui, "underline_placeholder"),
+ uline);
tmp = go_gtk_builder_get_widget (state->gui, "underline_label");
gtk_label_set_mnemonic_widget (GTK_LABEL (tmp), uline);
@@ -1284,8 +1291,8 @@ draw_border_preview (FormatState *state)
gtk_widget_show (GTK_WIDGET (state->border.canvas));
gtk_widget_set_size_request (GTK_WIDGET (state->border.canvas),
150, 100);
- gtk_grid_attach (GTK_GRID (go_gtk_builder_get_widget (state->gui, "border-sample-container")),
- GTK_WIDGET (state->border.canvas), 1, 1, 3, 3);
+ replace_in_grid (go_gtk_builder_get_widget (state->gui, "border_sample_placeholder"),
+ GTK_WIDGET (state->border.canvas));
group = GOC_GROUP (goc_canvas_get_root (state->border.canvas));
g_signal_connect (G_OBJECT (state->border.canvas),
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
