Commits September 2009

commits@lists.geany.org

4 participants
131 discussions

SF.net SVN: geany:[4224] trunk
by eht16＠users.sourceforge.net 21 Sep '09

21 Sep '09

Revision: 4224 http://geany.svn.sourceforge.net/geany/?rev=4224&view=rev Author: eht16 Date: 2009-09-21 21:14:03 +0000 (Mon, 21 Sep 2009) Log Message: ----------- Turn on automake silent rules if supported. Modified Paths: -------------- trunk/ChangeLog trunk/configure.in Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-09-21 20:48:50 UTC (rev 4223) +++ trunk/ChangeLog 2009-09-21 21:14:03 UTC (rev 4224) @@ -5,6 +5,8 @@ * src/callbacks.c, src/document.c: When reloading files, use the previously set encoding instead of detecting it again (closes #2862041). + * configure.in: + Turn on automake silent rules if supported. 2009-09-21 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> Modified: trunk/configure.in =================================================================== --- trunk/configure.in 2009-09-21 20:48:50 UTC (rev 4223) +++ trunk/configure.in 2009-09-21 21:14:03 UTC (rev 4224) @@ -4,6 +4,8 @@ AC_INIT(configure.in) AM_INIT_AUTOMAKE(geany, 0.19) +m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) + AM_CONFIG_HEADER(config.h) AC_GNU_SOURCE This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[4223] trunk
by eht16＠users.sourceforge.net 21 Sep '09

21 Sep '09

Revision: 4223 http://geany.svn.sourceforge.net/geany/?rev=4223&view=rev Author: eht16 Date: 2009-09-21 20:48:50 +0000 (Mon, 21 Sep 2009) Log Message: ----------- When reloading files, use the previously set encoding instead of detecting it again (closes #2862041). Modified Paths: -------------- trunk/ChangeLog trunk/src/callbacks.c trunk/src/document.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-09-21 20:31:39 UTC (rev 4222) +++ trunk/ChangeLog 2009-09-21 20:48:50 UTC (rev 4223) @@ -2,6 +2,9 @@ * src/build.c: Fix compiler warnings about uninitialised variables. + * src/callbacks.c, src/document.c: + When reloading files, use the previously set encoding instead of + detecting it again (closes #2862041). 2009-09-21 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> Modified: trunk/src/callbacks.c =================================================================== --- trunk/src/callbacks.c 2009-09-21 20:31:39 UTC (rev 4222) +++ trunk/src/callbacks.c 2009-09-21 20:48:50 UTC (rev 4223) @@ -464,6 +464,8 @@ return; charset = encodings[i].charset; } + else + charset = doc->encoding; base_name = g_path_get_basename(doc->file_name); if (dialogs_show_question_full(NULL, _("_Reload"), GTK_STOCK_CANCEL, Modified: trunk/src/document.c =================================================================== --- trunk/src/document.c 2009-09-21 20:31:39 UTC (rev 4222) +++ trunk/src/document.c 2009-09-21 20:48:50 UTC (rev 4223) @@ -2913,7 +2913,7 @@ base_name); if (want_reload) - document_reload_file(doc, NULL); + document_reload_file(doc, doc->encoding); g_free(base_name); return want_reload; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[4222] trunk
by eht16＠users.sourceforge.net 21 Sep '09

21 Sep '09

Revision: 4222 http://geany.svn.sourceforge.net/geany/?rev=4222&view=rev Author: eht16 Date: 2009-09-21 20:31:39 +0000 (Mon, 21 Sep 2009) Log Message: ----------- Fix compiler warnings about uninitialised variables. Modified Paths: -------------- trunk/ChangeLog trunk/src/build.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-09-21 17:11:42 UTC (rev 4221) +++ trunk/ChangeLog 2009-09-21 20:31:39 UTC (rev 4222) @@ -1,3 +1,9 @@ +2009-09-21 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * src/build.c: + Fix compiler warnings about uninitialised variables. + + 2009-09-21 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * src/utils.c: Modified: trunk/src/build.c =================================================================== --- trunk/src/build.c 2009-09-21 17:11:42 UTC (rev 4221) +++ trunk/src/build.c 2009-09-21 20:31:39 UTC (rev 4222) @@ -1381,7 +1381,7 @@ gint i, cmdcount, cmd, grp; gboolean vis = FALSE; gboolean have_path, build_running, exec_running, have_errors, cmd_sensitivity; - gboolean can_compile, can_make, run_sensitivity, run_running; + gboolean can_compile, can_make, run_sensitivity = FALSE, run_running = FALSE; GeanyBuildCommand *bc; if (menu_items.menu == NULL) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[4221] trunk
by ntrel＠users.sourceforge.net 21 Sep '09

21 Sep '09

Revision: 4221 http://geany.svn.sourceforge.net/geany/?rev=4221&view=rev Author: ntrel Date: 2009-09-21 17:11:42 +0000 (Mon, 21 Sep 2009) Log Message: ----------- Make 'Go to Line' keybinding focus the toolbar entry if visible. Modified Paths: -------------- trunk/ChangeLog trunk/src/keybindings.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-09-21 16:46:16 UTC (rev 4220) +++ trunk/ChangeLog 2009-09-21 17:11:42 UTC (rev 4221) @@ -20,6 +20,8 @@ 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. + * src/keybindings.c: + Make 'Go to Line' keybinding focus the toolbar entry if visible. 2009-09-20 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> Modified: trunk/src/keybindings.c =================================================================== --- trunk/src/keybindings.c 2009-09-21 16:46:16 UTC (rev 4220) +++ trunk/src/keybindings.c 2009-09-21 17:11:42 UTC (rev 4221) @@ -1833,8 +1833,16 @@ navqueue_go_forward(); return; case GEANY_KEYS_GOTO_LINE: - on_go_to_line_activate(NULL, NULL); + { + GtkWidget *wid = toolbar_get_widget_child_by_name("GotoEntry"); + + /* use toolbar item if shown */ + if (wid) + gtk_widget_grab_focus(wid); + else + on_go_to_line_activate(NULL, NULL); return; + } case GEANY_KEYS_GOTO_MATCHINGBRACE: goto_matching_brace(doc); return; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[4220] trunk
by ntrel＠users.sourceforge.net 21 Sep '09

21 Sep '09

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.

1 0

SF.net SVN: geany:[4219] trunk
by ntrel＠users.sourceforge.net 21 Sep '09

21 Sep '09

Revision: 4219 http://geany.svn.sourceforge.net/geany/?rev=4219&view=rev Author: ntrel Date: 2009-09-21 16:21:03 +0000 (Mon, 21 Sep 2009) Log Message: ----------- Add & use ui_label_set_markup(), ui_label_new_bold(). Modified Paths: -------------- trunk/ChangeLog trunk/src/build.c trunk/src/dialogs.c trunk/src/notebook.c trunk/src/ui_utils.c trunk/src/ui_utils.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-09-21 13:24:39 UTC (rev 4218) +++ trunk/ChangeLog 2009-09-21 16:21:03 UTC (rev 4219) @@ -13,6 +13,9 @@ * src/build.c: Fix none filetype Build Commands dialog label. Make group labels bold. + * 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(). 2009-09-20 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> Modified: trunk/src/build.c =================================================================== --- trunk/src/build.c 2009-09-21 13:24:39 UTC (rev 4218) +++ trunk/src/build.c 2009-09-21 16:21:03 UTC (rev 4219) @@ -1776,19 +1776,6 @@ } TableFields; -static GtkWidget *ui_label_new_bold(const gchar *text) -{ - GtkWidget *wid; - gchar *str = g_strdup_printf("%s", text); - - wid = gtk_label_new(str); - g_free(str); - - gtk_label_set_use_markup(GTK_LABEL(wid), TRUE); - return wid; -} - - GtkWidget *build_commands_table(GeanyDocument *doc, GeanyBuildSource dst, TableData *table_data, GeanyFiletype *ft) { Modified: trunk/src/dialogs.c =================================================================== --- trunk/src/dialogs.c 2009-09-21 13:24:39 UTC (rev 4218) +++ trunk/src/dialogs.c 2009-09-21 16:21:03 UTC (rev 4219) @@ -1049,8 +1049,7 @@ gtk_window_set_default_size(GTK_WINDOW(dialog), 300, -1); - title = g_strdup_printf("%s", base_name); - label = gtk_label_new(title); + label = ui_label_new_bold(base_name); gtk_label_set_selectable(GTK_LABEL(label), TRUE); gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); image = gtk_image_new_from_stock("gtk-file", GTK_ICON_SIZE_BUTTON); @@ -1060,7 +1059,6 @@ gtk_container_add(GTK_CONTAINER(hbox), image); gtk_container_add(GTK_CONTAINER(hbox), label); gtk_container_add(GTK_CONTAINER(vbox), hbox); - g_free(title); table = gtk_table_new(8, 2, FALSE); gtk_table_set_row_spacings(GTK_TABLE(table), 10); Modified: trunk/src/notebook.c =================================================================== --- trunk/src/notebook.c 2009-09-21 13:24:39 UTC (rev 4218) +++ trunk/src/notebook.c 2009-09-21 16:21:03 UTC (rev 4219) @@ -227,10 +227,8 @@ gtk_widget_modify_fg(menu_item_label, GTK_STATE_ACTIVE, color); if (doc == current_doc) - { - setptr(base_name, g_strconcat("", base_name, "", NULL)); - gtk_label_set_markup(GTK_LABEL(menu_item_label), base_name); - } + ui_label_set_markup(GTK_LABEL(menu_item_label), "%s", base_name); + g_free(base_name); } menu_item = gtk_separator_menu_item_new(); Modified: trunk/src/ui_utils.c =================================================================== --- trunk/src/ui_utils.c 2009-09-21 13:24:39 UTC (rev 4218) +++ trunk/src/ui_utils.c 2009-09-21 16:21:03 UTC (rev 4219) @@ -1238,20 +1238,16 @@ GtkWidget *ui_frame_new_with_alignment(const gchar *label_text, GtkWidget **alignment) { GtkWidget *label, *align; - GtkWidget *frame = gtk_frame_new (NULL); - gchar *label_markup; + GtkWidget *frame = gtk_frame_new(NULL); - gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_NONE); + gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_NONE); - align = gtk_alignment_new (0.5, 0.5, 1, 1); - gtk_container_add (GTK_CONTAINER (frame), align); - gtk_alignment_set_padding (GTK_ALIGNMENT (align), 0, 0, 12, 0); + align = gtk_alignment_new(0.5, 0.5, 1, 1); + gtk_container_add(GTK_CONTAINER(frame), align); + gtk_alignment_set_padding(GTK_ALIGNMENT(align), 0, 0, 12, 0); - label_markup = g_strconcat("", label_text, "", NULL); - label = gtk_label_new (label_markup); - gtk_frame_set_label_widget (GTK_FRAME (frame), label); - gtk_label_set_use_markup (GTK_LABEL (label), TRUE); - g_free(label_markup); + label = ui_label_new_bold(label_text); + gtk_frame_set_label_widget(GTK_FRAME(frame), label); *alignment = align; return frame; @@ -2088,3 +2084,21 @@ g_list_free(list); } + +/* return value is for macros */ +GtkWidget *ui_label_set_markup(GtkLabel *label, const gchar *format, ...) +{ + va_list a; + gchar *text; + + va_start(a, format); + text = g_strdup_vprintf(format, a); + va_end(a); + + gtk_label_set_text(label, text); + gtk_label_set_use_markup(label, TRUE); + g_free(text); + return GTK_WIDGET(label); +} + + Modified: trunk/src/ui_utils.h =================================================================== --- trunk/src/ui_utils.h 2009-09-21 13:24:39 UTC (rev 4218) +++ trunk/src/ui_utils.h 2009-09-21 16:21:03 UTC (rev 4219) @@ -198,6 +198,12 @@ void ui_entry_add_clear_icon(GtkWidget *entry); + +#define ui_label_new_bold(text)\ + ui_label_set_markup(GTK_LABEL(gtk_label_new(NULL)), "%s", text); + +GtkWidget *ui_label_set_markup(GtkLabel *label, const gchar *format, ...) G_GNUC_PRINTF(2, 3); + /* End of general widget functions */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[4218] trunk
by ntrel＠users.sourceforge.net 21 Sep '09

21 Sep '09

Revision: 4218 http://geany.svn.sourceforge.net/geany/?rev=4218&view=rev Author: ntrel Date: 2009-09-21 13:24:39 +0000 (Mon, 21 Sep 2009) Log Message: ----------- Fix none filetype Build Commands dialog label. Make group labels bold. Modified Paths: -------------- trunk/ChangeLog trunk/src/build.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-09-21 13:08:36 UTC (rev 4217) +++ trunk/ChangeLog 2009-09-21 13:24:39 UTC (rev 4218) @@ -10,6 +10,9 @@ * src/build.c: Add padding for Build Commands dialog separators. Add colons for regex field labels; fix 1 capitalisation. + * src/build.c: + Fix none filetype Build Commands dialog label. + Make group labels bold. 2009-09-20 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> Modified: trunk/src/build.c =================================================================== --- trunk/src/build.c 2009-09-21 13:08:36 UTC (rev 4217) +++ trunk/src/build.c 2009-09-21 13:24:39 UTC (rev 4218) @@ -1776,6 +1776,19 @@ } TableFields; +static GtkWidget *ui_label_new_bold(const gchar *text) +{ + GtkWidget *wid; + gchar *str = g_strdup_printf("%s", text); + + wid = gtk_label_new(str); + g_free(str); + + gtk_label_set_use_markup(GTK_LABEL(wid), TRUE); + return wid; +} + + GtkWidget *build_commands_table(GeanyDocument *doc, GeanyBuildSource dst, TableData *table_data, GeanyFiletype *ft) { @@ -1800,13 +1813,11 @@ sep = gtk_hseparator_new(); gtk_table_attach(table, sep, 0, DC_N_COL, 1, 2, GTK_FILL, GTK_FILL | GTK_EXPAND, entry_x_padding, sep_padding); - if (ft != NULL) - { + if (ft->id != GEANY_FILETYPES_NONE) txt = g_strdup_printf(_("%s Commands"), ft->title); - } else - txt = g_strdup(_("No Filetype")); - label = gtk_label_new(txt); + txt = g_strdup_printf(_("%s Commands"), _("No Filetype")); + label = ui_label_new_bold(txt); g_free(txt); gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); gtk_table_attach(table, label, 0, DC_N_COL, 2, 3, GTK_FILL, GTK_FILL | GTK_EXPAND, @@ -1841,7 +1852,7 @@ gtk_table_attach(table, sep, 0, DC_N_COL, row, row + 1, GTK_FILL, GTK_FILL | GTK_EXPAND, entry_x_padding, sep_padding); ++row; - label = gtk_label_new(_("Non Filetype Commands")); + label = ui_label_new_bold(_("Non-Filetype Commands")); gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); gtk_table_attach(table, label, 0, DC_N_COL, row, row + 1, GTK_FILL, GTK_FILL | GTK_EXPAND, entry_x_padding, entry_y_padding); @@ -1880,7 +1891,7 @@ gtk_table_attach(table, sep, 0, DC_N_COL, row, row + 1, GTK_FILL, GTK_FILL | GTK_EXPAND, entry_x_padding, sep_padding); ++row; - label = gtk_label_new(_("Execute Commands")); + label = ui_label_new_bold(_("Execute Commands")); gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); gtk_table_attach(table, label, 0, DC_N_COL, row, row + 1, GTK_FILL, GTK_FILL | GTK_EXPAND, entry_x_padding, entry_y_padding); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[4217] trunk
by ntrel＠users.sourceforge.net 21 Sep '09

21 Sep '09

Revision: 4217 http://geany.svn.sourceforge.net/geany/?rev=4217&view=rev Author: ntrel Date: 2009-09-21 13:08:36 +0000 (Mon, 21 Sep 2009) Log Message: ----------- Add padding for Build Commands dialog separators. Add colons for regex field labels; fix 1 capitalisation. Modified Paths: -------------- trunk/ChangeLog trunk/src/build.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-09-21 12:58:05 UTC (rev 4216) +++ trunk/ChangeLog 2009-09-21 13:08:36 UTC (rev 4217) @@ -7,6 +7,9 @@ Expand command entry width when expanding Build Commands dialog. * src/build.c: Split Build Commands dialog notes label and edit text. + * src/build.c: + Add padding for Build Commands dialog separators. + Add colons for regex field labels; fix 1 capitalisation. 2009-09-20 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> Modified: trunk/src/build.c =================================================================== --- trunk/src/build.c 2009-09-21 12:58:05 UTC (rev 4216) +++ trunk/src/build.c 2009-09-21 13:08:36 UTC (rev 4217) @@ -1786,6 +1786,7 @@ gint col, row, cmdindex, cmd; gint src; gboolean sensitivity; + gint sep_padding = entry_y_padding + 3; table = GTK_TABLE(gtk_table_new(build_items_count + 12, 5, FALSE)); fields = g_new0(TableFields, 1); @@ -1798,10 +1799,10 @@ } sep = gtk_hseparator_new(); gtk_table_attach(table, sep, 0, DC_N_COL, 1, 2, GTK_FILL, GTK_FILL | GTK_EXPAND, - entry_x_padding, entry_y_padding); + entry_x_padding, sep_padding); if (ft != NULL) { - txt = g_strdup_printf(_("%s commands"), ft->title); + txt = g_strdup_printf(_("%s Commands"), ft->title); } else txt = g_strdup(_("No Filetype")); @@ -1812,7 +1813,7 @@ entry_x_padding, entry_y_padding); for (row = 3, cmdindex = 0, cmd = 0; cmd < build_groups_count[GEANY_GBG_FT]; ++row, ++cmdindex, ++cmd) fields->rows[cmdindex] = build_add_dialog_row(doc, table, row, dst, GEANY_GBG_FT, cmd, FALSE); - label = gtk_label_new(_("Error Regular Expression")); + label = gtk_label_new(_("Error Regular Expression:")); gtk_table_attach(table, label, 0, DC_ENTRIES + 1, row, row + 1, GTK_FILL, GTK_FILL | GTK_EXPAND, entry_x_padding, entry_y_padding); fields->fileregex = gtk_entry_new(); @@ -1838,7 +1839,7 @@ ++row; sep = gtk_hseparator_new(); gtk_table_attach(table, sep, 0, DC_N_COL, row, row + 1, GTK_FILL, GTK_FILL | GTK_EXPAND, - entry_x_padding, entry_y_padding); + entry_x_padding, sep_padding); ++row; label = gtk_label_new(_("Non Filetype Commands")); gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); @@ -1847,7 +1848,7 @@ for (++row, cmd = 0; cmd < build_groups_count[GEANY_GBG_NON_FT]; ++row, ++cmdindex, ++cmd) fields->rows[cmdindex] = build_add_dialog_row( doc, table, row, dst, GEANY_GBG_NON_FT, cmd, TRUE); - label = gtk_label_new(_("Error Regular Expression")); + label = gtk_label_new(_("Error Regular Expression:")); gtk_table_attach(table, label, 0, DC_ENTRIES + 1, row, row + 1, GTK_FILL, GTK_FILL | GTK_EXPAND, entry_x_padding, entry_y_padding); fields->nonfileregex = gtk_entry_new(); @@ -1877,7 +1878,7 @@ ++row; sep = gtk_hseparator_new(); gtk_table_attach(table, sep, 0, DC_N_COL, row, row + 1, GTK_FILL, GTK_FILL | GTK_EXPAND, - entry_x_padding, entry_y_padding); + entry_x_padding, sep_padding); ++row; label = gtk_label_new(_("Execute Commands")); gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); @@ -1887,12 +1888,8 @@ fields->rows[cmdindex] = build_add_dialog_row(doc, table, row, dst, GEANY_GBG_EXEC, cmd, TRUE); sep = gtk_hseparator_new(); gtk_table_attach(table, sep, 0, DC_N_COL, row, row + 1, GTK_FILL, GTK_FILL | GTK_EXPAND, - entry_x_padding, entry_y_padding); + entry_x_padding, sep_padding); ++row; - sep = gtk_hseparator_new(); - gtk_table_attach(table, sep, 0, DC_N_COL, row, row + 1, GTK_FILL, GTK_FILL | GTK_EXPAND, - entry_x_padding, entry_y_padding); - ++row; label = gtk_label_new( _("%d, %e, %f, %p are substituted in command and directory fields, see manual for details.")); gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[4216] trunk
by ntrel＠users.sourceforge.net 21 Sep '09

21 Sep '09

Revision: 4216 http://geany.svn.sourceforge.net/geany/?rev=4216&view=rev Author: ntrel Date: 2009-09-21 12:58:05 +0000 (Mon, 21 Sep 2009) Log Message: ----------- Split Build Commands dialog notes label and edit text. Modified Paths: -------------- trunk/ChangeLog trunk/src/build.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-09-21 12:47:20 UTC (rev 4215) +++ trunk/ChangeLog 2009-09-21 12:58:05 UTC (rev 4216) @@ -5,6 +5,8 @@ browser delay on displaying a big directory, e.g. /usr/bin. * src/build.c: Expand command entry width when expanding Build Commands dialog. + * src/build.c: + Split Build Commands dialog notes label and edit text. 2009-09-20 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> Modified: trunk/src/build.c =================================================================== --- trunk/src/build.c 2009-09-21 12:47:20 UTC (rev 4215) +++ trunk/src/build.c 2009-09-21 12:58:05 UTC (rev 4216) @@ -1870,6 +1870,11 @@ gtk_widget_set_sensitive(fields->nonfileregex, sensitivity); gtk_widget_set_sensitive(clear, sensitivity); ++row; + label = gtk_label_new(_("Note: Item 2 opens a dialog and appends the response to the command.")); + gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); + gtk_table_attach(table, label, 0, DC_N_COL, row, row + 1, GTK_FILL, GTK_FILL | GTK_EXPAND, + entry_x_padding, entry_y_padding); + ++row; sep = gtk_hseparator_new(); gtk_table_attach(table, sep, 0, DC_N_COL, row, row + 1, GTK_FILL, GTK_FILL | GTK_EXPAND, entry_x_padding, entry_y_padding); @@ -1888,10 +1893,8 @@ gtk_table_attach(table, sep, 0, DC_N_COL, row, row + 1, GTK_FILL, GTK_FILL | GTK_EXPAND, entry_x_padding, entry_y_padding); ++row; - label = gtk_label_new(_( - "Notes:\n" - " %d, %e, %f, %p are substituted in Commands and Working dir, see manual for details\n" - " Non-filetype menu Item 2 opens a dialog and appends the reponse to the command")); + label = gtk_label_new( + _("%d, %e, %f, %p are substituted in command and directory fields, see manual for details.")); gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); gtk_table_attach(table, label, 0, DC_N_COL, row, row + 1, GTK_FILL, GTK_FILL | GTK_EXPAND, entry_x_padding, entry_y_padding); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[4215] trunk
by ntrel＠users.sourceforge.net 21 Sep '09

21 Sep '09

Revision: 4215 http://geany.svn.sourceforge.net/geany/?rev=4215&view=rev Author: ntrel Date: 2009-09-21 12:47:20 +0000 (Mon, 21 Sep 2009) Log Message: ----------- Expand command entry width when expanding Build Commands dialog. Modified Paths: -------------- trunk/ChangeLog trunk/src/build.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-09-21 12:34:16 UTC (rev 4214) +++ trunk/ChangeLog 2009-09-21 12:47:20 UTC (rev 4215) @@ -3,6 +3,8 @@ * src/utils.c: Speed up sorting in utils_get_file_list(). This reduces the file browser delay on displaying a big directory, e.g. /usr/bin. + * src/build.c: + Expand command entry width when expanding Build Commands dialog. 2009-09-20 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> Modified: trunk/src/build.c =================================================================== --- trunk/src/build.c 2009-09-21 12:34:16 UTC (rev 4214) +++ trunk/src/build.c 2009-09-21 12:47:20 UTC (rev 4215) @@ -1731,9 +1731,11 @@ roww->dst = dst; for (i = 0; i < GEANY_BC_CMDENTRIES_COUNT; i++) { + gint xflags = (i == GEANY_BC_COMMAND) ? GTK_FILL | GTK_EXPAND : GTK_FILL; + column += 1; roww->entries[i] = gtk_entry_new(); - gtk_table_attach(table, roww->entries[i], column, column + 1, row, row + 1, GTK_FILL, + gtk_table_attach(table, roww->entries[i], column, column + 1, row, row + 1, xflags, GTK_FILL | GTK_EXPAND, entry_x_padding, entry_y_padding); } column++; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
14
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits September 2009