[gnumeric] Fixed layout issues in cell border dialog. [#661213]
- From: Jean BrÃfort <jbrefort src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnumeric] Fixed layout issues in cell border dialog. [#661213]
- Date: Sun, 9 Oct 2011 09:40:29 +0000 (UTC)
commit 8f69bb0d171ef4b1096b21cddb89ec9b6bcb9eeb
Author: Jean Brefort <jean vaio brefort fr>
Date: Sun Oct 9 11:38:30 2011 +0200
Fixed layout issues in cell border dialog. [#661213]
NEWS | 1 +
src/dialogs/ChangeLog | 5 +
src/dialogs/cell-format.ui | 608 ++++++++++++++++----------------------
src/dialogs/dialog-cell-format.c | 4 +-
4 files changed, 263 insertions(+), 355 deletions(-)
---
diff --git a/NEWS b/NEWS
index 1c472e6..e5beda8 100644
--- a/NEWS
+++ b/NEWS
@@ -39,6 +39,7 @@ Jean:
* Fixed autofilter user interface issues. [#657036]
* Make the windows shrink again. [#659246]
* Make the graph window work again. [#660241]
+ * Fixed layout issues in cell border dialog. [#661213]
Mikko Rasa:
* Fix ODF import of certain percentage formats. [Debian #642135]
diff --git a/src/dialogs/ChangeLog b/src/dialogs/ChangeLog
index f68fb24..73afdac 100644
--- a/src/dialogs/ChangeLog
+++ b/src/dialogs/ChangeLog
@@ -1,3 +1,8 @@
+2011-10-09 Jean Brefort <jean vaio>
+
+ * cell-format.ui: fixed border page layout. [#661213]
+ * dialog-cell-format.c (draw_border_preview):
+
2011-09-28 Andreas J. Guelzow <aguelzow pyrshep ca>
* dialog-stf-csv-page.c (csv_page_textindicator_change): allow \0
diff --git a/src/dialogs/cell-format.ui b/src/dialogs/cell-format.ui
index f3efab3..10588e9 100644
--- a/src/dialogs/cell-format.ui
+++ b/src/dialogs/cell-format.ui
@@ -105,14 +105,14 @@
<child>
<object class="GtkBox" id="vbox12">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
<property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<property name="spacing">12</property>
<child>
<object class="GtkBox" id="vbox54">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
<property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<property name="spacing">12</property>
<child>
<object class="GtkLabel" id="label67">
@@ -278,8 +278,6 @@
<property name="can_focus">True</property>
<property name="primary_icon_activatable">False</property>
<property name="secondary_icon_activatable">False</property>
- <property name="primary_icon_sensitive">True</property>
- <property name="secondary_icon_sensitive">True</property>
<property name="adjustment">adjustment1</property>
<property name="climb_rate">1</property>
<property name="numeric">True</property>
@@ -359,8 +357,8 @@
<child>
<object class="GtkBox" id="vbox55">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
<property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<property name="spacing">12</property>
<child>
<object class="GtkLabel" id="label69">
@@ -519,8 +517,8 @@
<child>
<object class="GtkBox" id="vbox56">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
<property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<property name="spacing">12</property>
<child>
<object class="GtkLabel" id="label70">
@@ -555,8 +553,8 @@
<child>
<object class="GtkBox" id="vbox38">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
<property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkCheckButton" id="align_wrap">
@@ -638,15 +636,15 @@
<child>
<object class="GtkBox" id="font_box">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
<property name="can_focus">False</property>
<property name="border_width">12</property>
+ <property name="orientation">vertical</property>
<property name="spacing">18</property>
<child>
<object class="GtkBox" id="vbox58">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
<property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<property name="spacing">12</property>
<child>
<object class="GtkLabel" id="label75">
@@ -858,390 +856,297 @@
<child>
<object class="GtkBox" id="vbox4">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
<property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
- <object class="GtkBox" id="hbox32">
+ <object class="GtkGrid" id="border-sample-container">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">6</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">6</property>
+ <property name="row_homogeneous">True</property>
<child>
- <object class="GtkBox" id="vbox34">
+ <object class="GtkToggleButton" id="rev_diag_border">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
- <property name="can_focus">False</property>
- <property name="spacing">4</property>
- <child>
- <object class="GtkAlignment" id="alignment44">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">1</property>
- <property name="yalign">1</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
- <child>
- <object class="GtkToggleButton" id="rev_diag_border">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="tooltip_text" translatable="yes">Reverse Diagonal</property>
- <property name="border_width">6</property>
- <property name="use_action_appearance">False</property>
- <child>
- <placeholder/>
- </child>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkAlignment" id="alignment14">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">1</property>
- <property name="yalign">0.30000001192092896</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
- <child>
- <object class="GtkToggleButton" id="left_border">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="tooltip_text" translatable="yes">Left</property>
- <property name="border_width">6</property>
- <property name="use_action_appearance">False</property>
- <child>
- <placeholder/>
- </child>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup" translatable="yes">Reverse Diagonal</property>
+ <property name="tooltip_text" translatable="yes">Reverse Diagonal</property>
+ <property name="halign">center</property>
+ <property name="valign">center</property>
+ <property name="use_action_appearance">False</property>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
- <object class="GtkBox" id="vbox36">
+ <object class="GtkToggleButton" id="top_border">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
- <property name="can_focus">False</property>
- <property name="spacing">4</property>
- <child>
- <object class="GtkAlignment" id="alignment43">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="yalign">1</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
- <child>
- <object class="GtkToggleButton" id="top_border">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="tooltip_text" translatable="yes">Top</property>
- <property name="border_width">6</property>
- <property name="use_action_appearance">False</property>
- <child>
- <placeholder/>
- </child>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkAlignment" id="alignment48">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <object class="GtkFrame" id="border_sample_container">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label_xalign">0</property>
- <child>
- <placeholder/>
- </child>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkAlignment" id="alignment16">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="yalign">0</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
- <child>
- <object class="GtkToggleButton" id="bottom_border">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="tooltip_text" translatable="yes">Bottom</property>
- <property name="border_width">6</property>
- <property name="use_action_appearance">False</property>
- <child>
- <placeholder/>
- </child>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
- </child>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup" translatable="yes">Top</property>
+ <property name="tooltip_text" translatable="yes">Top</property>
+ <property name="halign">center</property>
+ <property name="valign">center</property>
+ <property name="use_action_appearance">False</property>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</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="GtkBox" id="vbox35">
+ <object class="GtkToggleButton" id="diag_border">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
- <property name="can_focus">False</property>
- <property name="spacing">4</property>
- <child>
- <object class="GtkAlignment" id="alignment11">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="yalign">1</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
- <child>
- <object class="GtkToggleButton" id="diag_border">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="tooltip_text" translatable="yes">Diagonal</property>
- <property name="border_width">6</property>
- <property name="use_action_appearance">False</property>
- <child>
- <placeholder/>
- </child>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkAlignment" id="alignment42">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="yalign">0.30000001192092896</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
- <child>
- <object class="GtkToggleButton" id="right_border">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="tooltip_text" translatable="yes">Right</property>
- <property name="border_width">6</property>
- <property name="use_action_appearance">False</property>
- <child>
- <placeholder/>
- </child>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup" translatable="yes">Diagonal</property>
+ <property name="tooltip_text" translatable="yes">Diagonal</property>
+ <property name="halign">center</property>
+ <property name="valign">center</property>
+ <property name="use_action_appearance">False</property>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">2</property>
+ <property name="left_attach">4</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkBox" id="hbox30">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">6</property>
- <property name="homogeneous">True</property>
<child>
- <object class="GtkAlignment" id="alignment41">
+ <object class="GtkToggleButton" id="left_border">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
- <child>
- <object class="GtkButton" id="no_border">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="tooltip_text" translatable="yes" context="border" comments="Cell border">None</property>
- <property name="border_width">6</property>
- <property name="use_action_appearance">False</property>
- <child>
- <placeholder/>
- </child>
- </object>
- </child>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup" translatable="yes">Left</property>
+ <property name="tooltip_text" translatable="yes">Left</property>
+ <property name="halign">center</property>
+ <property name="valign">center</property>
+ <property name="use_action_appearance">False</property>
</object>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</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="GtkAlignment" id="alignment40">
+ <object class="GtkToggleButton" id="right_border">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
- <child>
- <object class="GtkButton" id="outline_border">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="tooltip_text" translatable="yes">Outline</property>
- <property name="border_width">6</property>
- <property name="use_action_appearance">False</property>
- <child>
- <placeholder/>
- </child>
- </object>
- </child>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup" translatable="yes">Right</property>
+ <property name="tooltip_text" translatable="yes">Right</property>
+ <property name="halign">center</property>
+ <property name="valign">center</property>
+ <property name="use_action_appearance">False</property>
</object>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
+ <property name="left_attach">4</property>
+ <property name="top_attach">2</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
- <object class="GtkAlignment" id="alignment13">
+ <object class="GtkToggleButton" id="bottom_border">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
- <child>
- <object class="GtkToggleButton" id="inside_vert_border">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="tooltip_text" translatable="yes">Inside Vertical</property>
- <property name="border_width">6</property>
- <property name="use_action_appearance">False</property>
- <child>
- <placeholder/>
- </child>
- </object>
- </child>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup" translatable="yes">Bottom</property>
+ <property name="tooltip_text" translatable="yes">Bottom</property>
+ <property name="halign">center</property>
+ <property name="valign">center</property>
+ <property name="use_action_appearance">False</property>
</object>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">2</property>
+ <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="GtkAlignment" id="alignment38">
+ <object class="GtkButton" id="no_border">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
- <child>
- <object class="GtkButton" id="inside_border">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="tooltip_text" translatable="yes">Inside</property>
- <property name="border_width">6</property>
- <property name="use_action_appearance">False</property>
- <child>
- <placeholder/>
- </child>
- </object>
- </child>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup" translatable="yes">None</property>
+ <property name="tooltip_text" translatable="yes" context="border" comments="Cell border">None</property>
+ <property name="halign">center</property>
+ <property name="valign">center</property>
+ <property name="border_width">6</property>
+ <property name="use_action_appearance">False</property>
</object>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">3</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">5</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
<child>
- <object class="GtkAlignment" id="alignment39">
+ <object class="GtkButton" id="outline_border">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
- <child>
- <object class="GtkToggleButton" id="inside_horiz_border">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="tooltip_text" translatable="yes">Inside Horizontal</property>
- <property name="border_width">6</property>
- <property name="use_action_appearance">False</property>
- <child>
- <placeholder/>
- </child>
- </object>
- </child>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup" translatable="yes">Outline</property>
+ <property name="tooltip_text" translatable="yes">Outline</property>
+ <property name="halign">center</property>
+ <property name="valign">center</property>
+ <property name="border_width">6</property>
+ <property name="use_action_appearance">False</property>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">4</property>
+ <property name="left_attach">1</property>
+ <property name="top_attach">5</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToggleButton" id="inside_vert_border">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup" translatable="yes">Inside Vertical</property>
+ <property name="tooltip_text" translatable="yes">Inside Vertical</property>
+ <property name="halign">center</property>
+ <property name="valign">center</property>
+ <property name="border_width">6</property>
+ <property name="use_action_appearance">False</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">5</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="inside_border">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup" translatable="yes">Inside</property>
+ <property name="tooltip_text" translatable="yes">Inside</property>
+ <property name="halign">center</property>
+ <property name="valign">center</property>
+ <property name="border_width">6</property>
+ <property name="use_action_appearance">False</property>
+ </object>
+ <packing>
+ <property name="left_attach">3</property>
+ <property name="top_attach">5</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>
+ <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>
+ <child>
+ <object class="GtkToggleButton" id="inside_horiz_border">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup" translatable="yes">Inside Horizontal</property>
+ <property name="tooltip_text" translatable="yes">Inside Horizontal</property>
+ <property name="halign">center</property>
+ <property name="valign">center</property>
+ <property name="border_width">6</property>
+ <property name="use_action_appearance">False</property>
+ </object>
+ <packing>
+ <property name="left_attach">4</property>
+ <property name="top_attach">5</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
</packing>
</child>
+ <child>
+ <placeholder/>
+ </child>
</object>
</child>
</object>
@@ -1254,8 +1159,8 @@
<child>
<object class="GtkBox" id="vbox59">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
<property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<property name="spacing">12</property>
<child>
<object class="GtkLabel" id="label76">
@@ -1290,14 +1195,14 @@
<child>
<object class="GtkBox" id="vbox60">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
<property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<property name="spacing">12</property>
<child>
<object class="GtkBox" id="vbox61">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
<property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkLabel" id="label9">
@@ -1653,6 +1558,7 @@
</object>
<packing>
<property name="position">2</property>
+ <property name="tab_expand">True</property>
</packing>
</child>
<child type="tab">
@@ -1676,14 +1582,14 @@
<child>
<object class="GtkBox" id="vbox25">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
<property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<property name="spacing">18</property>
<child>
<object class="GtkBox" id="vbox65">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
<property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<property name="spacing">12</property>
<child>
<object class="GtkLabel" id="label82">
@@ -1758,8 +1664,8 @@
<child>
<object class="GtkBox" id="vbox66">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
<property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<property name="spacing">12</property>
<child>
<object class="GtkLabel" id="label83">
@@ -1794,8 +1700,8 @@
<child>
<object class="GtkBox" id="vbox67">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
<property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkBox" id="pattern_color_hbox">
@@ -1826,8 +1732,8 @@
<child>
<object class="GtkBox" id="vbox62">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
<property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkLabel" id="label58">
@@ -2387,8 +2293,8 @@
<child>
<object class="GtkBox" id="vbox68">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
<property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<property name="spacing">12</property>
<child>
<object class="GtkLabel" id="label85">
@@ -2472,9 +2378,9 @@
<child>
<object class="GtkBox" id="protection_box">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
<property name="can_focus">False</property>
<property name="border_width">12</property>
+ <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkCheckButton" id="protection_locked">
@@ -2560,15 +2466,15 @@
<child>
<object class="GtkBox" id="validation_box">
<property name="visible">True</property>
- <property name="orientation">vertical</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="vbox63">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
<property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<property name="spacing">12</property>
<child>
<object class="GtkLabel" id="label64">
@@ -2783,8 +2689,8 @@
<child>
<object class="GtkBox" id="vbox64">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
<property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<property name="spacing">12</property>
<child>
<object class="GtkLabel" id="label80">
@@ -2924,8 +2830,6 @@
<property name="can_focus">True</property>
<property name="primary_icon_activatable">False</property>
<property name="secondary_icon_activatable">False</property>
- <property name="primary_icon_sensitive">True</property>
- <property name="secondary_icon_sensitive">True</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -2989,9 +2893,9 @@
<child>
<object class="GtkBox" id="input_msg_box">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
<property name="can_focus">False</property>
<property name="border_width">12</property>
+ <property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkCheckButton" id="input_msg_flag">
@@ -3038,8 +2942,6 @@
<property name="can_focus">True</property>
<property name="primary_icon_activatable">False</property>
<property name="secondary_icon_activatable">False</property>
- <property name="primary_icon_sensitive">True</property>
- <property name="secondary_icon_sensitive">True</property>
</object>
<packing>
<property name="left_attach">1</property>
diff --git a/src/dialogs/dialog-cell-format.c b/src/dialogs/dialog-cell-format.c
index dfbedd5..e110134 100644
--- a/src/dialogs/dialog-cell-format.c
+++ b/src/dialogs/dialog-cell-format.c
@@ -1263,8 +1263,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_container_add (GTK_CONTAINER (go_gtk_builder_get_widget (state->gui, "border_sample_container")),
- GTK_WIDGET (state->border.canvas));
+ gtk_grid_attach (GTK_CONTAINER (go_gtk_builder_get_widget (state->gui, "border-sample-container")),
+ GTK_WIDGET (state->border.canvas), 1, 1, 3, 3);
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]
