SF.net SVN: geany:[4220] trunk
ntrel at users.sourceforge.net
ntrel at xxxxx
Mon Sep 21 16:46:31 UTC 2009
Revision: 4220
http://geany.svn.sourceforge.net/geany/?rev=4220&view=rev
Author: ntrel
Date: 2009-09-21 16:46:16 +0000 (Mon, 21 Sep 2009)
Log Message:
-----------
Make ui_entry_add_clear_icon() take a GtkEntry, not GtkWidget.
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/dialogs.c
trunk/src/geanyentryaction.c
trunk/src/plugindata.h
trunk/src/prefs.c
trunk/src/printing.c
trunk/src/project.c
trunk/src/search.c
trunk/src/tools.c
trunk/src/ui_utils.c
trunk/src/ui_utils.h
trunk/src/vte.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2009-09-21 16:21:03 UTC (rev 4219)
+++ trunk/ChangeLog 2009-09-21 16:46:16 UTC (rev 4220)
@@ -16,6 +16,10 @@
* src/build.c, src/ui_utils.h, src/dialogs.c, src/notebook.c,
src/ui_utils.c:
Add & use ui_label_set_markup(), ui_label_new_bold().
+ * src/ui_utils.h, src/printing.c, src/tools.c, src/project.c,
+ src/prefs.c, src/dialogs.c, src/geanyentryaction.c,
+ src/plugindata.h, src/vte.c, src/search.c, src/ui_utils.c:
+ Make ui_entry_add_clear_icon() take a GtkEntry, not GtkWidget.
2009-09-20 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
Modified: trunk/src/dialogs.c
===================================================================
--- trunk/src/dialogs.c 2009-09-21 16:21:03 UTC (rev 4219)
+++ trunk/src/dialogs.c 2009-09-21 16:46:16 UTC (rev 4220)
@@ -853,14 +853,14 @@
GtkWidget *combo = gtk_combo_box_entry_new_text();
entry = GTK_BIN(combo)->child;
- ui_entry_add_clear_icon(entry);
+ ui_entry_add_clear_icon(GTK_ENTRY(entry));
g_object_set_data(G_OBJECT(dialog), "combo", combo);
gtk_container_add(GTK_CONTAINER(vbox), combo);
}
else
{
entry = gtk_entry_new();
- ui_entry_add_clear_icon(entry);
+ ui_entry_add_clear_icon(GTK_ENTRY(entry));
gtk_container_add(GTK_CONTAINER(vbox), entry);
}
@@ -949,7 +949,7 @@
gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
spin = gtk_spin_button_new_with_range(min, max, step);
- ui_entry_add_clear_icon(spin);
+ ui_entry_add_clear_icon(GTK_ENTRY(spin));
gtk_spin_button_set_value(GTK_SPIN_BUTTON(spin), *value);
g_signal_connect(spin, "activate", G_CALLBACK(on_input_numeric_activate), dialog);
Modified: trunk/src/geanyentryaction.c
===================================================================
--- trunk/src/geanyentryaction.c 2009-09-21 16:21:03 UTC (rev 4219)
+++ trunk/src/geanyentryaction.c 2009-09-21 16:46:16 UTC (rev 4220)
@@ -65,7 +65,7 @@
if (priv->numeric)
gtk_entry_set_width_chars(GTK_ENTRY(priv->entry), 9);
- ui_entry_add_clear_icon(priv->entry);
+ ui_entry_add_clear_icon(GTK_ENTRY(priv->entry));
gtk_widget_show(priv->entry);
Modified: trunk/src/plugindata.h
===================================================================
--- trunk/src/plugindata.h 2009-09-21 16:21:03 UTC (rev 4219)
+++ trunk/src/plugindata.h 2009-09-21 16:46:16 UTC (rev 4220)
@@ -50,7 +50,7 @@
enum {
/** The Application Programming Interface (API) version, incremented
* whenever any plugin data types are modified or appended to. */
- GEANY_API_VERSION = 156,
+ GEANY_API_VERSION = 157,
/** The Application Binary Interface (ABI) version, incremented whenever
* existing fields in the plugin data types have to be changed or reordered. */
@@ -419,7 +419,7 @@
GtkWidget* (*lookup_widget) (GtkWidget *widget, const gchar *widget_name);
void (*progress_bar_start) (const gchar *text);
void (*progress_bar_stop) (void);
- void (*entry_add_clear_icon) (GtkWidget *entry);
+ void (*entry_add_clear_icon) (GtkEntry *entry);
}
UIUtilsFuncs;
Modified: trunk/src/prefs.c
===================================================================
--- trunk/src/prefs.c 2009-09-21 16:21:03 UTC (rev 4219)
+++ trunk/src/prefs.c 2009-09-21 16:46:16 UTC (rev 4220)
@@ -1549,26 +1549,33 @@
"label_project_indent_warning")), label, FALSE, TRUE, 5);
/* add the clear icon to GtkEntry widgets in the dialog */
- ui_entry_add_clear_icon(ui_lookup_widget(ui_widgets.prefs_dialog, "startup_path_entry"));
- ui_entry_add_clear_icon(ui_lookup_widget(ui_widgets.prefs_dialog, "project_file_path_entry"));
- ui_entry_add_clear_icon(ui_lookup_widget(ui_widgets.prefs_dialog, "extra_plugin_path_entry"));
- ui_entry_add_clear_icon(ui_lookup_widget(ui_widgets.prefs_dialog, "entry_toggle_mark"));
- /* ui_entry_add_clear_icon(ui_lookup_widget(ui_widgets.prefs_dialog, "entry_com_make")); */
- ui_entry_add_clear_icon(ui_lookup_widget(ui_widgets.prefs_dialog, "entry_com_term"));
- ui_entry_add_clear_icon(ui_lookup_widget(ui_widgets.prefs_dialog, "entry_browser"));
- ui_entry_add_clear_icon(ui_lookup_widget(ui_widgets.prefs_dialog, "entry_grep"));
- ui_entry_add_clear_icon(ui_lookup_widget(ui_widgets.prefs_dialog, "entry_contextaction"));
- ui_entry_add_clear_icon(ui_lookup_widget(ui_widgets.prefs_dialog, "entry_template_developer"));
- ui_entry_add_clear_icon(ui_lookup_widget(ui_widgets.prefs_dialog, "entry_template_initial"));
- ui_entry_add_clear_icon(ui_lookup_widget(ui_widgets.prefs_dialog, "entry_template_mail"));
- ui_entry_add_clear_icon(ui_lookup_widget(ui_widgets.prefs_dialog, "entry_template_company"));
- ui_entry_add_clear_icon(ui_lookup_widget(ui_widgets.prefs_dialog, "entry_template_version"));
- ui_entry_add_clear_icon(ui_lookup_widget(ui_widgets.prefs_dialog, "entry_template_year"));
- ui_entry_add_clear_icon(ui_lookup_widget(ui_widgets.prefs_dialog, "entry_template_date"));
- ui_entry_add_clear_icon(ui_lookup_widget(ui_widgets.prefs_dialog, "entry_template_datetime"));
- ui_entry_add_clear_icon(ui_lookup_widget(ui_widgets.prefs_dialog, "entry_print_external_cmd"));
- ui_entry_add_clear_icon(ui_lookup_widget(ui_widgets.prefs_dialog, "entry_print_dateformat"));
+ {
+ const gchar *names[] = {
+ "startup_path_entry",
+ "project_file_path_entry",
+ "extra_plugin_path_entry",
+ "entry_toggle_mark",
+ /* "entry_com_make", */
+ "entry_com_term",
+ "entry_browser",
+ "entry_grep",
+ "entry_contextaction",
+ "entry_template_developer",
+ "entry_template_initial",
+ "entry_template_mail",
+ "entry_template_company",
+ "entry_template_version",
+ "entry_template_year",
+ "entry_template_date",
+ "entry_template_datetime",
+ "entry_print_external_cmd",
+ "entry_print_dateformat"};
+ const gchar **name;
+ foreach_c_array(name, names, G_N_ELEMENTS(names))
+ ui_entry_add_clear_icon(GTK_ENTRY(ui_lookup_widget(ui_widgets.prefs_dialog, *name)));
+ }
+
#ifdef HAVE_VTE
vte_append_preferences_tab();
#endif
Modified: trunk/src/printing.c
===================================================================
--- trunk/src/printing.c 2009-09-21 16:21:03 UTC (rev 4219)
+++ trunk/src/printing.c 2009-09-21 16:46:16 UTC (rev 4220)
@@ -418,7 +418,7 @@
gtk_box_pack_start(GTK_BOX(hbox10), label203, FALSE, FALSE, 0);
w->entry_print_dateformat = gtk_entry_new();
- ui_entry_add_clear_icon(w->entry_print_dateformat);
+ ui_entry_add_clear_icon(GTK_ENTRY(w->entry_print_dateformat));
gtk_box_pack_start(GTK_BOX(hbox10), w->entry_print_dateformat, TRUE, TRUE, 0);
ui_widget_set_tooltip_text(w->entry_print_dateformat, _("Specify a format for the date and time stamp which is added to the page header on each page. You can use any conversion specifiers which can be used with the ANSI C strftime function."));
gtk_entry_set_text(GTK_ENTRY(w->entry_print_dateformat), printing_prefs.page_header_datefmt);
Modified: trunk/src/project.c
===================================================================
--- trunk/src/project.c 2009-09-21 16:21:03 UTC (rev 4219)
+++ trunk/src/project.c 2009-09-21 16:46:16 UTC (rev 4220)
@@ -141,7 +141,7 @@
gtk_misc_set_alignment(GTK_MISC(label), 1, 0);
e->name = gtk_entry_new();
- ui_entry_add_clear_icon(e->name);
+ ui_entry_add_clear_icon(GTK_ENTRY(e->name));
gtk_entry_set_max_length(GTK_ENTRY(e->name), MAX_NAME_LEN);
ui_table_add_row(GTK_TABLE(table), 0, label, e->name, NULL);
@@ -150,7 +150,7 @@
gtk_misc_set_alignment(GTK_MISC(label), 1, 0);
e->file_name = gtk_entry_new();
- ui_entry_add_clear_icon(e->file_name);
+ ui_entry_add_clear_icon(GTK_ENTRY(e->file_name));
gtk_entry_set_width_chars(GTK_ENTRY(e->file_name), 30);
button = gtk_button_new();
g_signal_connect(button, "clicked", G_CALLBACK(on_file_save_button_clicked), e);
@@ -166,7 +166,7 @@
gtk_misc_set_alignment(GTK_MISC(label), 1, 0);
e->base_path = gtk_entry_new();
- ui_entry_add_clear_icon(e->base_path);
+ ui_entry_add_clear_icon(GTK_ENTRY(e->base_path));
ui_widget_set_tooltip_text(e->base_path,
_("Base directory of all files that make up the project. "
"This can be a new path, or an existing directory tree. "
@@ -407,8 +407,8 @@
gtk_window_set_destroy_with_parent(GTK_WINDOW(e->dialog), TRUE);
gtk_widget_set_name(e->dialog, "GeanyDialogProject");
- ui_entry_add_clear_icon(ui_lookup_widget(e->dialog, "spin_indent_width"));
- ui_entry_add_clear_icon(ui_lookup_widget(e->dialog, "spin_tab_width"));
+ ui_entry_add_clear_icon(GTK_ENTRY(ui_lookup_widget(e->dialog, "spin_indent_width")));
+ ui_entry_add_clear_icon(GTK_ENTRY(ui_lookup_widget(e->dialog, "spin_tab_width")));
table = gtk_table_new(6, 2, FALSE);
gtk_container_set_border_width(GTK_CONTAINER(table), 6);
@@ -422,7 +422,7 @@
gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
e->name = gtk_entry_new();
- ui_entry_add_clear_icon(e->name);
+ ui_entry_add_clear_icon(GTK_ENTRY(e->name));
gtk_entry_set_max_length(GTK_ENTRY(e->name), MAX_NAME_LEN);
gtk_table_attach(GTK_TABLE(table), e->name, 1, 2, 0, 1,
(GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
@@ -435,7 +435,7 @@
gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
e->file_name = gtk_entry_new();
- ui_entry_add_clear_icon(e->file_name);
+ ui_entry_add_clear_icon(GTK_ENTRY(e->file_name));
gtk_editable_set_editable(GTK_EDITABLE(e->file_name), FALSE); /* read-only */
gtk_table_attach(GTK_TABLE(table), e->file_name, 1, 2, 1, 2,
(GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
@@ -465,7 +465,7 @@
gtk_misc_set_alignment(GTK_MISC(label), 0, 0);
e->base_path = gtk_entry_new();
- ui_entry_add_clear_icon(e->base_path);
+ ui_entry_add_clear_icon(GTK_ENTRY(e->base_path));
ui_widget_set_tooltip_text(e->base_path,
_("Base directory of all files that make up the project. "
"This can be a new path, or an existing directory tree. "
Modified: trunk/src/search.c
===================================================================
--- trunk/src/search.c 2009-09-21 16:21:03 UTC (rev 4219)
+++ trunk/src/search.c 2009-09-21 16:46:16 UTC (rev 4220)
@@ -397,7 +397,7 @@
gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
entry = gtk_combo_box_entry_new_text();
- ui_entry_add_clear_icon(gtk_bin_get_child(GTK_BIN(entry)));
+ ui_entry_add_clear_icon(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(entry))));
gtk_label_set_mnemonic_widget(GTK_LABEL(label), entry);
gtk_entry_set_max_length(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(entry))), 248);
gtk_entry_set_width_chars(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(entry))), 50);
@@ -539,7 +539,7 @@
gtk_misc_set_alignment(GTK_MISC(label_replace), 0, 0.5);
entry_find = gtk_combo_box_entry_new_text();
- ui_entry_add_clear_icon(gtk_bin_get_child(GTK_BIN(entry_find)));
+ ui_entry_add_clear_icon(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(entry_find))));
gtk_label_set_mnemonic_widget(GTK_LABEL(label_find), entry_find);
gtk_entry_set_max_length(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(entry_find))), 248);
gtk_entry_set_width_chars(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(entry_find))), 50);
@@ -548,7 +548,7 @@
replace_dlg.find_entry = GTK_BIN(entry_find)->child;
entry_replace = gtk_combo_box_entry_new_text();
- ui_entry_add_clear_icon(gtk_bin_get_child(GTK_BIN(entry_replace)));
+ ui_entry_add_clear_icon(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(entry_replace))));
gtk_label_set_mnemonic_widget(GTK_LABEL(label_replace), entry_replace);
gtk_entry_set_max_length(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(entry_replace))), 248);
gtk_entry_set_width_chars(GTK_ENTRY(gtk_bin_get_child(GTK_BIN(entry_replace))), 50);
@@ -698,7 +698,7 @@
dir_combo = gtk_combo_box_entry_new_text();
entry = gtk_bin_get_child(GTK_BIN(dir_combo));
- ui_entry_add_clear_icon(entry);
+ ui_entry_add_clear_icon(GTK_ENTRY(entry));
gtk_label_set_mnemonic_widget(GTK_LABEL(label1), entry);
gtk_entry_set_max_length(GTK_ENTRY(entry), 248);
gtk_entry_set_width_chars(GTK_ENTRY(entry), 50);
@@ -713,7 +713,7 @@
combo = gtk_combo_box_entry_new_text();
entry = gtk_bin_get_child(GTK_BIN(combo));
- ui_entry_add_clear_icon(entry);
+ ui_entry_add_clear_icon(GTK_ENTRY(entry));
gtk_label_set_mnemonic_widget(GTK_LABEL(label), entry);
gtk_entry_set_max_length(GTK_ENTRY(entry), 248);
gtk_entry_set_width_chars(GTK_ENTRY(entry), 50);
@@ -817,7 +817,7 @@
gtk_button_set_focus_on_click(GTK_BUTTON(check_extra), FALSE);
entry_extra = gtk_entry_new();
- ui_entry_add_clear_icon(entry_extra);
+ ui_entry_add_clear_icon(GTK_ENTRY(entry_extra));
gtk_widget_set_sensitive(entry_extra, FALSE);
ui_widget_set_tooltip_text(entry_extra, _("Other options to pass to Grep"));
ui_hookup_widget(fif_dlg.dialog, entry_extra, "entry_extra");
Modified: trunk/src/tools.c
===================================================================
--- trunk/src/tools.c 2009-09-21 16:21:03 UTC (rev 4219)
+++ trunk/src/tools.c 2009-09-21 16:46:16 UTC (rev 4220)
@@ -76,7 +76,7 @@
entry = gtk_entry_new();
if (idx >= 0)
gtk_entry_set_text(GTK_ENTRY(entry), ui_prefs.custom_commands[idx]);
- ui_entry_add_clear_icon(entry);
+ ui_entry_add_clear_icon(GTK_ENTRY(entry));
gtk_entry_set_max_length(GTK_ENTRY(entry), 255);
gtk_entry_set_width_chars(GTK_ENTRY(entry), 30);
gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0);
Modified: trunk/src/ui_utils.c
===================================================================
--- trunk/src/ui_utils.c 2009-09-21 16:21:03 UTC (rev 4219)
+++ trunk/src/ui_utils.c 2009-09-21 16:46:16 UTC (rev 4220)
@@ -1336,7 +1336,7 @@
*
* @since 0.16
*/
-void ui_entry_add_clear_icon(GtkWidget *entry)
+void ui_entry_add_clear_icon(GtkEntry *entry)
{
if (gtk_check_version(2, 15, 2) == NULL)
{
Modified: trunk/src/ui_utils.h
===================================================================
--- trunk/src/ui_utils.h 2009-09-21 16:21:03 UTC (rev 4219)
+++ trunk/src/ui_utils.h 2009-09-21 16:46:16 UTC (rev 4220)
@@ -196,7 +196,7 @@
void ui_widget_set_sensitive(GtkWidget *widget, gboolean set);
-void ui_entry_add_clear_icon(GtkWidget *entry);
+void ui_entry_add_clear_icon(GtkEntry *entry);
#define ui_label_new_bold(text)\
Modified: trunk/src/vte.c
===================================================================
--- trunk/src/vte.c 2009-09-21 16:21:03 UTC (rev 4219)
+++ trunk/src/vte.c 2009-09-21 16:46:16 UTC (rev 4220)
@@ -783,7 +783,7 @@
spin_scrollback_adj = gtk_adjustment_new(500, 0, 5000, 1, 10, 0);
spin_scrollback = gtk_spin_button_new(GTK_ADJUSTMENT(spin_scrollback_adj), 1, 0);
- ui_entry_add_clear_icon(spin_scrollback);
+ ui_entry_add_clear_icon(GTK_ENTRY(spin_scrollback));
gtk_table_attach(GTK_TABLE(table), spin_scrollback, 1, 2, 3, 4,
(GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
(GtkAttachOptions) (0), 0, 0);
@@ -798,7 +798,7 @@
gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5);
entry_shell = gtk_entry_new();
- ui_entry_add_clear_icon(entry_shell);
+ ui_entry_add_clear_icon(GTK_ENTRY(entry_shell));
ui_widget_set_tooltip_text(entry_shell, _("Sets the path to the shell which should be started inside the terminal emulation"));
button_shell = gtk_button_new();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Commits
mailing list