Commit 2f343484 authored by Almer S. Tigelaar's avatar Almer S. Tigelaar Committed by Almer S. Tigelaar

Remove ability to focus widgets on the Template Details tab. Remove the

2000-09-16  Almer S. Tigelaar  <almer1@dds.nl>

	* src/dialogs/autoformat.glade:
	Remove ability to focus widgets on the Template Details tab.
	Remove the 'Apply Dimensions' checkbox.
	Add some accelerators.
	Add tooltip to category combo.

	* src/dialogs/dialog-autoformat.c:
	(cb_category_entry_changed): Replaced by cb_category_popwin_hide
	(cb_category_popwin_hide): Invoked when the popup window of
	the category window becomes hidden.
	(dialog_autoformat): Remove handling for dimensions checkbox and
	change signal binding for category combo.
parent 8a6b93ff
2000-09-16 Almer S. Tigelaar <almer1@dds.nl>
* src/dialogs/autoformat.glade:
Remove ability to focus widgets on the Template Details tab.
Remove the 'Apply Dimensions' checkbox.
Add some accelerators.
Add tooltip to category combo.
* src/dialogs/dialog-autoformat.c:
(cb_category_entry_changed): Replaced by cb_category_popwin_hide
(cb_category_popwin_hide): Invoked when the popup window of
the category window becomes hidden.
(dialog_autoformat): Remove handling for dimensions checkbox and
change signal binding for category combo.
2000-09-16 Michael Meeks <michael@helixcode.com>
* src/workbook.c (workbook_new): use datadir for get_ui_fname.
......
2000-09-16 Almer S. Tigelaar <almer1@dds.nl>
* src/dialogs/autoformat.glade:
Remove ability to focus widgets on the Template Details tab.
Remove the 'Apply Dimensions' checkbox.
Add some accelerators.
Add tooltip to category combo.
* src/dialogs/dialog-autoformat.c:
(cb_category_entry_changed): Replaced by cb_category_popwin_hide
(cb_category_popwin_hide): Invoked when the popup window of
the category window becomes hidden.
(dialog_autoformat): Remove handling for dimensions checkbox and
change signal binding for category combo.
2000-09-16 Michael Meeks <michael@helixcode.com>
* src/workbook.c (workbook_new): use datadir for get_ui_fname.
......
2000-09-16 Almer S. Tigelaar <almer1@dds.nl>
* src/dialogs/autoformat.glade:
Remove ability to focus widgets on the Template Details tab.
Remove the 'Apply Dimensions' checkbox.
Add some accelerators.
Add tooltip to category combo.
* src/dialogs/dialog-autoformat.c:
(cb_category_entry_changed): Replaced by cb_category_popwin_hide
(cb_category_popwin_hide): Invoked when the popup window of
the category window becomes hidden.
(dialog_autoformat): Remove handling for dimensions checkbox and
change signal binding for category combo.
2000-09-16 Michael Meeks <michael@helixcode.com>
* src/workbook.c (workbook_new): use datadir for get_ui_fname.
......
2000-09-16 Almer S. Tigelaar <almer1@dds.nl>
* src/dialogs/autoformat.glade:
Remove ability to focus widgets on the Template Details tab.
Remove the 'Apply Dimensions' checkbox.
Add some accelerators.
Add tooltip to category combo.
* src/dialogs/dialog-autoformat.c:
(cb_category_entry_changed): Replaced by cb_category_popwin_hide
(cb_category_popwin_hide): Invoked when the popup window of
the category window becomes hidden.
(dialog_autoformat): Remove handling for dimensions checkbox and
change signal binding for category combo.
2000-09-16 Michael Meeks <michael@helixcode.com>
* src/workbook.c (workbook_new): use datadir for get_ui_fname.
......
2000-09-16 Almer S. Tigelaar <almer1@dds.nl>
* src/dialogs/autoformat.glade:
Remove ability to focus widgets on the Template Details tab.
Remove the 'Apply Dimensions' checkbox.
Add some accelerators.
Add tooltip to category combo.
* src/dialogs/dialog-autoformat.c:
(cb_category_entry_changed): Replaced by cb_category_popwin_hide
(cb_category_popwin_hide): Invoked when the popup window of
the category window becomes hidden.
(dialog_autoformat): Remove handling for dimensions checkbox and
change signal binding for category combo.
2000-09-16 Michael Meeks <michael@helixcode.com>
* src/workbook.c (workbook_new): use datadir for get_ui_fname.
......
2000-09-16 Almer S. Tigelaar <almer1@dds.nl>
* src/dialogs/autoformat.glade:
Remove ability to focus widgets on the Template Details tab.
Remove the 'Apply Dimensions' checkbox.
Add some accelerators.
Add tooltip to category combo.
* src/dialogs/dialog-autoformat.c:
(cb_category_entry_changed): Replaced by cb_category_popwin_hide
(cb_category_popwin_hide): Invoked when the popup window of
the category window becomes hidden.
(dialog_autoformat): Remove handling for dimensions checkbox and
change signal binding for category combo.
2000-09-16 Michael Meeks <michael@helixcode.com>
* src/workbook.c (workbook_new): use datadir for get_ui_fname.
......
2000-09-16 Almer S. Tigelaar <almer1@dds.nl>
* src/dialogs/autoformat.glade:
Remove ability to focus widgets on the Template Details tab.
Remove the 'Apply Dimensions' checkbox.
Add some accelerators.
Add tooltip to category combo.
* src/dialogs/dialog-autoformat.c:
(cb_category_entry_changed): Replaced by cb_category_popwin_hide
(cb_category_popwin_hide): Invoked when the popup window of
the category window becomes hidden.
(dialog_autoformat): Remove handling for dimensions checkbox and
change signal binding for category combo.
2000-09-16 Michael Meeks <michael@helixcode.com>
* src/workbook.c (workbook_new): use datadir for get_ui_fname.
......
......@@ -194,19 +194,6 @@
<always_show_toggle>False</always_show_toggle>
</widget>
<widget>
<class>GtkCheckMenuItem</class>
<name>format_dimensions</name>
<signal>
<name>activate</name>
<handler>on_item13_activate</handler>
<last_modification_time>Tue, 12 Sep 2000 23:09:03 GMT</last_modification_time>
</signal>
<label>Apply _Sizes</label>
<active>True</active>
<always_show_toggle>False</always_show_toggle>
</widget>
<widget>
<class>GtkMenuItem</class>
<name>separator1</name>
......@@ -309,7 +296,7 @@
<class>GtkEntry</class>
<child_name>GnomeEntry:entry</child_name>
<name>combo-entry1</name>
<can_focus>True</can_focus>
<tooltip>The current category</tooltip>
<editable>False</editable>
<text_visible>True</text_visible>
<text_max_length>0</text_max_length>
......@@ -661,7 +648,7 @@
<class>GtkLabel</class>
<child_name>Notebook:tab</child_name>
<name>label9</name>
<label>Preview</label>
<label>_Preview</label>
<justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap>
<xalign>0.5</xalign>
......@@ -707,7 +694,6 @@
<class>GtkText</class>
<name>format_info_descr</name>
<tooltip>A short description of the template</tooltip>
<can_focus>True</can_focus>
<editable>False</editable>
<text></text>
</widget>
......@@ -717,7 +703,6 @@
<class>GtkEntry</class>
<name>format_info_cat</name>
<tooltip>The category this template belongs to</tooltip>
<can_focus>True</can_focus>
<editable>False</editable>
<text_visible>True</text_visible>
<text_max_length>0</text_max_length>
......@@ -742,7 +727,6 @@
<class>GtkEntry</class>
<name>format_info_author</name>
<tooltip>The group/individual that made the template</tooltip>
<can_focus>True</can_focus>
<editable>False</editable>
<text_visible>True</text_visible>
<text_max_length>0</text_max_length>
......@@ -767,7 +751,6 @@
<class>GtkEntry</class>
<name>format_info_name</name>
<tooltip>Name of template</tooltip>
<can_focus>True</can_focus>
<editable>False</editable>
<text_visible>True</text_visible>
<text_max_length>0</text_max_length>
......@@ -897,7 +880,7 @@
<class>GtkLabel</class>
<child_name>Notebook:tab</child_name>
<name>label10</name>
<label>Template Details</label>
<label>_Template Details</label>
<justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap>
<xalign>0.5</xalign>
......
......@@ -10,13 +10,13 @@ gchar *s = N_("Apply _Borders");
gchar *s = N_("Apply _Fonts");
gchar *s = N_("Apply _Patterns");
gchar *s = N_("Apply _Alignment");
gchar *s = N_("Apply _Sizes");
gchar *s = N_("_Show Gridlines");
gchar *s = N_("_New...");
gchar *s = N_("_Edit...");
gchar *s = N_("_Remove Current");
gchar *s = N_("_Category");
gchar *s = N_("Preview");
gchar *s = N_("The current category");
gchar *s = N_("_Preview");
gchar *s = N_("A short description of the template");
gchar *s = N_("The category this template belongs to");
gchar *s = N_("The group/individual that made the template");
......@@ -25,4 +25,4 @@ gchar *s = N_("Name :");
gchar *s = N_("Author :");
gchar *s = N_("Category :");
gchar *s = N_("Description :");
gchar *s = N_("Template Details");
gchar *s = N_("_Template Details");
......@@ -99,7 +99,7 @@ typedef struct {
GtkEntry *info_name, *info_author, *info_cat;
GtkText *info_descr;
GtkCheckMenuItem *number, *border, *font, *patterns, *alignment, *dimensions;
GtkCheckMenuItem *number, *border, *font, *patterns, *alignment;
GtkButton *ok, *cancel;
......@@ -782,13 +782,10 @@ cb_canvas_button_release (GnomeCanvas *canvas, GdkEventButton *event, AutoFormat
}
/**
* cb_category_entry_changed:
* @clist:
* @row:
* @column:
* @event:
* @info:
*
* cb_category_popwin_hide:
* @widget:
* @info:
*
* Invoked when a category is selected in the category list, this will quickly load
* all templates in the newly selected category, load the previews and select
* the first one by default.
......@@ -796,12 +793,12 @@ cb_canvas_button_release (GnomeCanvas *canvas, GdkEventButton *event, AutoFormat
* menu items will be disable and the Template Information cleared.
**/
static void
cb_category_entry_changed (GtkEntry *entry, AutoFormatInfo *info)
cb_category_popwin_hide (GtkWidget *widget, AutoFormatInfo *info)
{
/*
* Don't directly modify current_category!
*/
info->current_category = gtk_entry_get_text (entry);
info->current_category = gtk_entry_get_text (GTK_ENTRY (info->category->entry));
previews_free (info);
templates_free (info);
......@@ -1002,7 +999,6 @@ dialog_autoformat (Workbook *wb)
info->font = setup_apply_item (gui, info, "format_font");
info->patterns = setup_apply_item (gui, info, "format_patterns");
info->alignment = setup_apply_item (gui, info, "format_alignment");
info->dimensions = setup_apply_item (gui, info, "format_dimensions");
/*
* Connect signals
......@@ -1011,10 +1007,16 @@ dialog_autoformat (Workbook *wb)
"close",
GTK_SIGNAL_FUNC (cb_dialog_close),
info);
gtk_signal_connect (GTK_OBJECT (info->category->entry),
"changed",
GTK_SIGNAL_FUNC (cb_category_entry_changed),
/*
* FIXME: UGLY! This actually connects a signal to the window
* which is popped-up by the category combo, this is actually
* not allowed (only entry and list are public) and may
* very well break when gtkcombo's implementation changes
*/
gtk_signal_connect (GTK_OBJECT (info->category->popwin),
"hide",
GTK_SIGNAL_FUNC (cb_category_popwin_hide),
info);
gtk_signal_connect (GTK_OBJECT (GTK_RANGE (info->scroll)->adjustment),
......@@ -1069,6 +1071,11 @@ dialog_autoformat (Workbook *wb)
} else {
gtk_combo_set_popdown_strings (info->category, info->categories);
/*
* Call callback the screen updates
*/
cb_category_popwin_hide (GTK_WIDGET (info->category), info);
}
/*
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment