Commits November 2006

commits@lists.geany.org

3 participants
89 discussions

SF.net SVN: geany: [1038] trunk
by ntrel＠users.sourceforge.net 30 Nov '06

30 Nov '06

Revision: 1038 http://svn.sourceforge.net/geany/?rev=1038&view=rev Author: ntrel Date: 2006-11-30 07:42:52 -0800 (Thu, 30 Nov 2006) Log Message: ----------- Make all filetypes except LaTeX use the same build menu, disabling any items that don't apply for the current document. Move BuildMenuItems struct type to build.h. Modified Paths: -------------- trunk/ChangeLog trunk/src/build.c trunk/src/build.h trunk/src/callbacks.c trunk/src/dialogs.c trunk/src/filetypes.c trunk/src/filetypes.h trunk/src/keybindings.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-11-30 14:40:32 UTC (rev 1037) +++ trunk/ChangeLog 2006-11-30 15:42:52 UTC (rev 1038) @@ -3,6 +3,11 @@ * src/main.c: Disable open toolbutton recent files menu for now because on GTK+2.10 packing the recent files menu twice causes warnings. + * src/build.c, src/build.h, src/keybindings.c, src/callbacks.c, + src/filetypes.c, src/filetypes.h, src/dialogs.c: + Make all filetypes except LaTeX use the same build menu, disabling + any items that don't apply for the current document. + Move BuildMenuItems struct type to build.h. 2006-11-29 Nick Treleaven <nick.treleaven(a)btinternet.com> Modified: trunk/src/build.c =================================================================== --- trunk/src/build.c 2006-11-30 14:40:32 UTC (rev 1037) +++ trunk/src/build.c 2006-11-30 15:42:52 UTC (rev 1038) @@ -62,7 +62,12 @@ LATEX_CMD_VIEW_PDF }; +static BuildMenuItems default_menu_items = + {NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL}; +static BuildMenuItems latex_menu_items = + {NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL}; + static gboolean build_iofunc(GIOChannel *ioc, GIOCondition cond, gpointer data); static gboolean build_create_shellscript(const gint idx, const gchar *fname, const gchar *cmd, gboolean autoclose); @@ -82,6 +87,11 @@ { g_free(build_info.dir); g_free(build_info.custom_target); + + if (default_menu_items.menu != NULL && GTK_IS_WIDGET(default_menu_items.menu)) + gtk_widget_destroy(default_menu_items.menu); + if (latex_menu_items.menu != NULL && GTK_IS_WIDGET(latex_menu_items.menu)) + gtk_widget_destroy(latex_menu_items.menu); } @@ -793,49 +803,40 @@ gtk_widget_add_accelerator(menuitem, "activate", accel_group, \ keys[(gkey)]->key, keys[(gkey)]->mods, GTK_ACCEL_VISIBLE) -static GtkWidget *create_build_menu_gen(gint idx) +static void create_build_menu_gen(BuildMenuItems *menu_items) { GtkWidget *menu, *item = NULL, *image, *separator; GtkAccelGroup *accel_group = gtk_accel_group_new(); GtkTooltips *tooltips = GTK_TOOLTIPS(lookup_widget(app->window, "tooltips")); - filetype *ft = doc_list[idx].file_type; menu = gtk_menu_new(); #ifndef G_OS_WIN32 - if (ft->menu_items->can_compile) - { - // compile the code - item = gtk_image_menu_item_new_with_mnemonic(_("_Compile")); - gtk_widget_show(item); - gtk_container_add(GTK_CONTAINER(menu), item); - gtk_tooltips_set_tip(tooltips, item, _("Compiles the current file"), NULL); - GEANY_ADD_WIDGET_ACCEL(GEANY_KEYS_BUILD_COMPILE, item); - image = gtk_image_new_from_stock("gtk-convert", GTK_ICON_SIZE_MENU); - gtk_widget_show(image); - gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), image); - g_signal_connect((gpointer) item, "activate", G_CALLBACK(on_build_compile_activate), NULL); - ft->menu_items->item_compile = item; - } + // compile the code + item = gtk_image_menu_item_new_with_mnemonic(_("_Compile")); + gtk_widget_show(item); + gtk_container_add(GTK_CONTAINER(menu), item); + gtk_tooltips_set_tip(tooltips, item, _("Compiles the current file"), NULL); + GEANY_ADD_WIDGET_ACCEL(GEANY_KEYS_BUILD_COMPILE, item); + image = gtk_image_new_from_stock("gtk-convert", GTK_ICON_SIZE_MENU); + gtk_widget_show(image); + gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), image); + g_signal_connect((gpointer) item, "activate", G_CALLBACK(on_build_compile_activate), NULL); + menu_items->item_compile = item; - if (ft->menu_items->can_link) - { // build the code - item = gtk_image_menu_item_new_with_mnemonic(_("_Build")); - gtk_widget_show(item); - gtk_container_add(GTK_CONTAINER(menu), item); - gtk_tooltips_set_tip(tooltips, item, - _("Builds the current file (generate an executable file)"), NULL); - GEANY_ADD_WIDGET_ACCEL(GEANY_KEYS_BUILD_LINK, item); - g_signal_connect((gpointer) item, "activate", G_CALLBACK(on_build_build_activate), NULL); - ft->menu_items->item_link = item; - } + // build the code + item = gtk_image_menu_item_new_with_mnemonic(_("_Build")); + gtk_widget_show(item); + gtk_container_add(GTK_CONTAINER(menu), item); + gtk_tooltips_set_tip(tooltips, item, + _("Builds the current file (generate an executable file)"), NULL); + GEANY_ADD_WIDGET_ACCEL(GEANY_KEYS_BUILD_LINK, item); + g_signal_connect((gpointer) item, "activate", G_CALLBACK(on_build_build_activate), NULL); + menu_items->item_link = item; - if (item != NULL) - { - item = gtk_separator_menu_item_new(); - gtk_widget_show(item); - gtk_container_add(GTK_CONTAINER(menu), item); - } + item = gtk_separator_menu_item_new(); + gtk_widget_show(item); + gtk_container_add(GTK_CONTAINER(menu), item); // build the code with make all item = gtk_image_menu_item_new_with_mnemonic(_("_Make all")); @@ -846,7 +847,7 @@ GEANY_ADD_WIDGET_ACCEL(GEANY_KEYS_BUILD_MAKE, item); g_signal_connect((gpointer) item, "activate", G_CALLBACK(on_build_make_activate), GINT_TO_POINTER(GBO_MAKE_ALL)); - ft->menu_items->item_make_all = item; + menu_items->item_make_all = item; // build the code with make custom item = gtk_image_menu_item_new_with_mnemonic(_("Make custom _target")); @@ -857,7 +858,7 @@ "make tool and the specified target"), NULL); g_signal_connect((gpointer) item, "activate", G_CALLBACK(on_build_make_activate), GINT_TO_POINTER(GBO_MAKE_CUSTOM)); - ft->menu_items->item_make_custom = item; + menu_items->item_make_custom = item; // build the code with make object item = gtk_image_menu_item_new_with_mnemonic(_("Make _object")); @@ -868,56 +869,51 @@ "make tool"), NULL); g_signal_connect((gpointer) item, "activate", G_CALLBACK(on_build_make_activate), GINT_TO_POINTER(GBO_MAKE_OBJECT)); - ft->menu_items->item_make_object = item; + menu_items->item_make_object = item; #endif - if (ft->menu_items->can_exec) - { // execute the code - item = gtk_separator_menu_item_new(); - gtk_widget_show(item); - gtk_container_add(GTK_CONTAINER(menu), item); + item = gtk_separator_menu_item_new(); + gtk_widget_show(item); + gtk_container_add(GTK_CONTAINER(menu), item); - item = gtk_image_menu_item_new_from_stock("gtk-execute", accel_group); - gtk_widget_show(item); - gtk_container_add(GTK_CONTAINER(menu), item); - gtk_tooltips_set_tip(tooltips, item, _("Run or view the current file"), NULL); - GEANY_ADD_WIDGET_ACCEL(GEANY_KEYS_BUILD_RUN, item); - g_signal_connect((gpointer) item, "activate", G_CALLBACK(on_build_execute_activate), NULL); - ft->menu_items->item_exec = item; - } + // execute the code + item = gtk_image_menu_item_new_from_stock("gtk-execute", accel_group); + gtk_widget_show(item); + gtk_container_add(GTK_CONTAINER(menu), item); + gtk_tooltips_set_tip(tooltips, item, _("Run or view the current file"), NULL); + GEANY_ADD_WIDGET_ACCEL(GEANY_KEYS_BUILD_RUN, item); + g_signal_connect((gpointer) item, "activate", G_CALLBACK(on_build_execute_activate), NULL); + menu_items->item_exec = item; + separator = gtk_separator_menu_item_new(); + gtk_widget_show(separator); + gtk_container_add(GTK_CONTAINER(menu), separator); + gtk_widget_set_sensitive(separator, FALSE); + // arguments - if (ft->menu_items->can_compile || ft->menu_items->can_link || ft->menu_items->can_exec) - { - // separator - separator = gtk_separator_menu_item_new(); - gtk_widget_show(separator); - gtk_container_add(GTK_CONTAINER(menu), separator); - gtk_widget_set_sensitive(separator, FALSE); + item = gtk_image_menu_item_new_with_mnemonic(_("_Set Includes and Arguments")); + gtk_widget_show(item); + GEANY_ADD_WIDGET_ACCEL(GEANY_KEYS_BUILD_OPTIONS, item); + gtk_container_add(GTK_CONTAINER(menu), item); + gtk_tooltips_set_tip(tooltips, item, + _("Sets the includes and library paths for the compiler and " + "the program arguments for execution"), NULL); + image = gtk_image_new_from_stock("gtk-preferences", GTK_ICON_SIZE_MENU); + gtk_widget_show(image); + gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), image); + g_signal_connect((gpointer) item, "activate", G_CALLBACK(on_build_arguments_activate), NULL); + menu_items->item_set_args = item; - item = gtk_image_menu_item_new_with_mnemonic(_("_Set Includes and Arguments")); - gtk_widget_show(item); - GEANY_ADD_WIDGET_ACCEL(GEANY_KEYS_BUILD_OPTIONS, item); - gtk_container_add(GTK_CONTAINER(menu), item); - gtk_tooltips_set_tip(tooltips, item, - _("Sets the includes and library paths for the compiler and " - "the program arguments for execution"), NULL); - image = gtk_image_new_from_stock("gtk-preferences", GTK_ICON_SIZE_MENU); - gtk_widget_show(image); - gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), image); - g_signal_connect((gpointer) item, "activate", G_CALLBACK(on_build_arguments_activate), NULL); - } - - return menu; + menu_items->menu = menu; + g_object_ref((gpointer)menu_items->menu); // to hold it after removing } -static GtkWidget *create_build_menu_tex() +static void create_build_menu_tex(BuildMenuItems *menu_items) { GtkWidget *menu, *item, *image, *separator; GtkAccelGroup *accel_group = gtk_accel_group_new(); GtkTooltips *tooltips = GTK_TOOLTIPS(lookup_widget(app->window, "tooltips")); - filetype *ft = filetypes[GEANY_FILETYPES_LATEX]; menu = gtk_menu_new(); @@ -935,7 +931,7 @@ gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), image); g_signal_connect((gpointer) item, "activate", G_CALLBACK(on_build_tex_activate), GINT_TO_POINTER(LATEX_CMD_TO_DVI)); - ft->menu_items->item_compile = item; + menu_items->item_compile = item; // PDF item = gtk_image_menu_item_new_with_mnemonic(_("LaTeX -> PDF")); @@ -950,7 +946,7 @@ gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), image); g_signal_connect((gpointer) item, "activate", G_CALLBACK(on_build_tex_activate), GINT_TO_POINTER(LATEX_CMD_TO_PDF)); - ft->menu_items->item_link = item; + menu_items->item_link = item; if (item != NULL) { @@ -968,7 +964,7 @@ GEANY_ADD_WIDGET_ACCEL(GEANY_KEYS_BUILD_MAKE, item); g_signal_connect((gpointer) item, "activate", G_CALLBACK(on_build_make_activate), GINT_TO_POINTER(GBO_MAKE_ALL)); - ft->menu_items->item_make_all = item; + menu_items->item_make_all = item; // build the code with make custom item = gtk_image_menu_item_new_with_mnemonic(_("Make custom _target")); @@ -979,7 +975,7 @@ "make tool and the specified target"), NULL); g_signal_connect((gpointer) item, "activate", G_CALLBACK(on_build_make_activate), GINT_TO_POINTER(GBO_MAKE_CUSTOM)); - ft->menu_items->item_make_custom = item; + menu_items->item_make_custom = item; if (item != NULL) { @@ -1003,7 +999,7 @@ gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), image); g_signal_connect((gpointer) item, "activate", G_CALLBACK(on_build_execute_activate), GINT_TO_POINTER(LATEX_CMD_VIEW_DVI)); - ft->menu_items->item_exec = item; + menu_items->item_exec = item; // PDF view item = gtk_image_menu_item_new_with_mnemonic(_("View PDF file")); @@ -1018,7 +1014,7 @@ gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), image); g_signal_connect((gpointer) item, "activate", G_CALLBACK(on_build_execute_activate), GINT_TO_POINTER(LATEX_CMD_VIEW_PDF)); - ft->menu_items->item_exec2 = item; + menu_items->item_exec2 = item; // separator separator = gtk_separator_menu_item_new(); @@ -1039,11 +1035,13 @@ gtk_widget_show(image); gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), image); g_signal_connect((gpointer) item, "activate", - G_CALLBACK(on_build_arguments_activate), ft); + G_CALLBACK(on_build_arguments_activate), filetypes[GEANY_FILETYPES_LATEX]); + menu_items->item_set_args = item; gtk_window_add_accel_group(GTK_WINDOW(app->window), accel_group); - return menu; + menu_items->menu = menu; + g_object_ref((gpointer)menu_items->menu); // to hold it after removing } @@ -1059,10 +1057,13 @@ } +/* Call this whenever build menu items need to be enabled/disabled. + * Uses current document (if there is one) when idx == -1 */ void build_menu_update(gint idx) { filetype *ft; - gboolean have_path, can_build, can_make; + gboolean have_path, can_build, can_make, can_run, can_set_args; + BuildMenuItems *menu_items; if (idx == -1) idx = document_get_cur_idx(); @@ -1080,6 +1081,7 @@ gtk_widget_set_sensitive(lookup_widget(app->window, "menu_build1"), TRUE); ft = doc_list[idx].file_type; + g_return_if_fail(ft != NULL); #ifdef G_OS_WIN32 // disable compile and link under Windows until it is implemented @@ -1087,16 +1089,11 @@ ft->menu_items->can_link = FALSE; #endif - if (ft->menu_items->menu == NULL) - { - ft->menu_items->menu = (ft->id == GEANY_FILETYPES_LATEX) ? - create_build_menu_tex() : create_build_menu_gen(idx); - g_object_ref((gpointer)ft->menu_items->menu); // to hold it after removing - } + menu_items = build_get_menu_items(ft); /* Note: don't remove the submenu first because it can now cause an X hang if * the menu is already open when called from build_exit_cb(). */ gtk_menu_item_set_submenu(GTK_MENU_ITEM(lookup_widget(app->window, "menu_build1")), - ft->menu_items->menu); + menu_items->menu); have_path = (doc_list[idx].file_name != NULL); @@ -1108,31 +1105,36 @@ else can_build = can_make; - if (ft->menu_items->can_compile) - gtk_widget_set_sensitive(ft->menu_items->item_compile, can_build); - if (ft->menu_items->can_link) - gtk_widget_set_sensitive(ft->menu_items->item_link, can_build); - if (ft->menu_items->item_make_all) - gtk_widget_set_sensitive(ft->menu_items->item_make_all, can_make); - if (ft->menu_items->item_make_custom) - gtk_widget_set_sensitive(ft->menu_items->item_make_custom, can_make); - if (ft->menu_items->item_make_object) - gtk_widget_set_sensitive(ft->menu_items->item_make_object, can_make); - if (ft->menu_items->can_exec) - { - gboolean can_run = have_path && run_info.pid <= 1; + if (menu_items->item_compile) + gtk_widget_set_sensitive(menu_items->item_compile, can_build && ft->actions->can_compile); + if (menu_items->item_link) + gtk_widget_set_sensitive(menu_items->item_link, can_build && ft->actions->can_link); + if (menu_items->item_make_all) + gtk_widget_set_sensitive(menu_items->item_make_all, can_make); + if (menu_items->item_make_custom) + gtk_widget_set_sensitive(menu_items->item_make_custom, can_make); + if (menu_items->item_make_object) + gtk_widget_set_sensitive(menu_items->item_make_object, can_make); - /* can_run only applies item_exec2 - * item_exec is enabled for both run and stop commands */ - if (ft->menu_items->item_exec) - gtk_widget_set_sensitive(ft->menu_items->item_exec, have_path); - if (ft->menu_items->item_exec2) - gtk_widget_set_sensitive(ft->menu_items->item_exec2, can_run); - } + can_run = have_path && run_info.pid <= 1; + /* can_run only applies item_exec2 + * item_exec is enabled for both run and stop commands */ + if (menu_items->item_exec) + gtk_widget_set_sensitive(menu_items->item_exec, have_path && ft->actions->can_exec); + if (menu_items->item_exec2) + gtk_widget_set_sensitive(menu_items->item_exec2, can_run && ft->actions->can_exec); - gtk_widget_set_sensitive(app->compile_button, can_build && ft->menu_items->can_compile); - gtk_widget_set_sensitive(app->run_button, have_path && ft->menu_items->can_exec); + can_set_args = + ((ft->actions->can_compile || + ft->actions->can_link || + ft->actions->can_exec) && + FILETYPE_ID(ft) != GEANY_FILETYPES_ALL); + if (menu_items->item_set_args) + gtk_widget_set_sensitive(menu_items->item_set_args, can_set_args); + gtk_widget_set_sensitive(app->compile_button, can_build && ft->actions->can_compile); + gtk_widget_set_sensitive(app->run_button, have_path && ft->actions->can_exec); + // show the stop command if a program is running, otherwise show run command set_stop_button(run_info.pid > 1); } @@ -1143,7 +1145,7 @@ { GtkStockItem sitem; GtkWidget *menuitem = - filetypes[run_info.file_type_id]->menu_items->item_exec; + build_get_menu_items(filetypes[run_info.file_type_id])->item_exec; if (stop && utils_str_equal( gtk_tool_button_get_stock_id(GTK_TOOL_BUTTON(app->run_button)), "gtk-stop")) return; @@ -1192,6 +1194,27 @@ } +// Creates the relevant build menu if necessary. +BuildMenuItems *build_get_menu_items(const filetype *ft) +{ + BuildMenuItems *items; + + if (FILETYPE_ID(ft) == GEANY_FILETYPES_LATEX) + { + items = &latex_menu_items; + if (items->menu == NULL) + create_build_menu_tex(items); + } + else + { + items = &default_menu_items; + if (items->menu == NULL) + create_build_menu_gen(items); + } + return items; +} + + void on_build_compile_activate (GtkMenuItem *menuitem, gpointer user_data) @@ -1405,3 +1428,4 @@ g_free(first); } + Modified: trunk/src/build.h =================================================================== --- trunk/src/build.h 2006-11-30 14:40:32 UTC (rev 1037) +++ trunk/src/build.h 2006-11-30 15:42:52 UTC (rev 1038) @@ -24,6 +24,8 @@ #ifndef GEANY_BUILD_H #define GEANY_BUILD_H 1 +#include "filetypes.h" + typedef enum // Geany Build Options { GBO_COMPILE, @@ -44,7 +46,21 @@ extern BuildInfo build_info; +typedef struct +{ + GtkWidget *menu; + GtkWidget *item_compile; + GtkWidget *item_link; + GtkWidget *item_make_all; + GtkWidget *item_make_custom; + GtkWidget *item_make_object; + GtkWidget *item_exec; + GtkWidget *item_exec2; + GtkWidget *item_set_args; +} BuildMenuItems; + + void build_finalize(); GPid build_make_file(gint idx, gint build_opts); @@ -61,7 +77,9 @@ void build_menu_update(gint idx); +BuildMenuItems *build_get_menu_items(const filetype *ft); + void on_build_compile_activate (GtkMenuItem *menuitem, gpointer user_data); Modified: trunk/src/callbacks.c =================================================================== --- trunk/src/callbacks.c 2006-11-30 14:40:32 UTC (rev 1037) +++ trunk/src/callbacks.c 2006-11-30 15:42:52 UTC (rev 1038) @@ -1685,7 +1685,7 @@ const gchar *newstr; struct build_programs *programs = ft->programs; - if (ft->menu_items->can_compile) + if (ft->actions->can_compile) { newstr = gtk_entry_get_text( GTK_ENTRY(lookup_widget(GTK_WIDGET(dialog), "includes_entry1"))); @@ -1696,7 +1696,7 @@ programs->modified = TRUE; } } - if (ft->menu_items->can_link) + if (ft->actions->can_link) { newstr = gtk_entry_get_text( GTK_ENTRY(lookup_widget(GTK_WIDGET(dialog), "includes_entry2"))); @@ -1707,7 +1707,7 @@ programs->modified = TRUE; } } - if (ft->menu_items->can_exec) + if (ft->actions->can_exec) { newstr = gtk_entry_get_text( GTK_ENTRY(lookup_widget(GTK_WIDGET(dialog), "includes_entry3"))); Modified: trunk/src/dialogs.c =================================================================== --- trunk/src/dialogs.c 2006-11-30 14:40:32 UTC (rev 1037) +++ trunk/src/dialogs.c 2006-11-30 15:42:52 UTC (rev 1038) @@ -716,7 +716,7 @@ gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); gtk_container_add(GTK_CONTAINER(vbox), label); - if (ft->menu_items->can_compile || ft->menu_items->can_link || ft->menu_items->can_exec) + if (ft->actions->can_compile || ft->actions->can_link || ft->actions->can_exec) { GtkWidget *align, *frame; gchar *frame_title = g_strconcat(ft->title, _(" commands"), NULL); @@ -732,7 +732,7 @@ } // include-args - if (ft->menu_items->can_compile) + if (ft->actions->can_compile) { label = gtk_label_new(_("Compile:")); gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); @@ -753,7 +753,7 @@ } // lib-args - if (ft->menu_items->can_link) + if (ft->actions->can_link) { label = gtk_label_new(_("Build:")); gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); @@ -774,7 +774,7 @@ } // program-args - if (ft->menu_items->can_exec) + if (ft->actions->can_exec) { label = gtk_label_new(_("Execute:")); gtk_misc_set_alignment(GTK_MISC(label), 0, 0.5); Modified: trunk/src/filetypes.c =================================================================== --- trunk/src/filetypes.c 2006-11-30 14:40:32 UTC (rev 1037) +++ trunk/src/filetypes.c 2006-11-30 15:42:52 UTC (rev 1038) @@ -710,7 +710,7 @@ { ftype->programs = g_new0(struct build_programs, 1); - ftype->menu_items = g_new0(struct build_menu_items, 1); + ftype->actions = g_new0(struct build_actions, 1); } @@ -864,10 +864,7 @@ g_free(filetypes[i]->programs->run_cmd); g_free(filetypes[i]->programs->run_cmd2); g_free(filetypes[i]->programs); - if (filetypes[i]->menu_items->menu != NULL && - GTK_IS_WIDGET(filetypes[i]->menu_items->menu)) - gtk_widget_destroy(filetypes[i]->menu_items->menu); - g_free(filetypes[i]->menu_items); + g_free(filetypes[i]->actions); g_strfreev(filetypes[i]->pattern); g_free(filetypes[i]); @@ -918,7 +915,7 @@ if (result != NULL) { filetypes[ft]->programs->compiler = result; - filetypes[ft]->menu_items->can_compile = TRUE; + filetypes[ft]->actions->can_compile = TRUE; } result = g_key_file_get_string(configh, "build_settings", "linker", NULL); @@ -926,7 +923,7 @@ if (result != NULL) { filetypes[ft]->programs->linker = result; - filetypes[ft]->menu_items->can_link = TRUE; + filetypes[ft]->actions->can_link = TRUE; } result = g_key_file_get_string(configh, "build_settings", "run_cmd", NULL); @@ -934,7 +931,7 @@ if (result != NULL) { filetypes[ft]->programs->run_cmd = result; - filetypes[ft]->menu_items->can_exec = TRUE; + filetypes[ft]->actions->can_exec = TRUE; } result = g_key_file_get_string(configh, "build_settings", "run_cmd2", NULL); @@ -942,7 +939,7 @@ if (result != NULL) { filetypes[ft]->programs->run_cmd2 = result; - filetypes[ft]->menu_items->can_exec = TRUE; + filetypes[ft]->actions->can_exec = TRUE; } } Modified: trunk/src/filetypes.h =================================================================== --- trunk/src/filetypes.h 2006-11-30 14:40:32 UTC (rev 1037) +++ trunk/src/filetypes.h 2006-11-30 15:42:52 UTC (rev 1038) @@ -69,19 +69,11 @@ (((filetype_ptr) != NULL) ? (filetype_ptr)->id : GEANY_FILETYPES_ALL) -struct build_menu_items +struct build_actions { - GtkWidget *menu; - GtkWidget *item_compile; - GtkWidget *item_link; - GtkWidget *item_exec; - GtkWidget *item_exec2; - GtkWidget *item_make_all; - GtkWidget *item_make_custom; - GtkWidget *item_make_object; - gboolean can_compile; - gboolean can_link; - gboolean can_exec; + gboolean can_compile:1; + gboolean can_link:1; + gboolean can_exec:1; }; struct build_programs @@ -108,8 +100,8 @@ gchar *comment_open; gchar *comment_close; gboolean comment_use_indent; - struct build_programs *programs; - struct build_menu_items *menu_items; + struct build_programs *programs; + struct build_actions *actions; void (*style_func_ptr) (ScintillaObject*); } filetype; Modified: trunk/src/keybindings.c =================================================================== --- trunk/src/keybindings.c 2006-11-30 14:40:32 UTC (rev 1037) +++ trunk/src/keybindings.c 2006-11-30 15:42:52 UTC (rev 1038) @@ -75,7 +75,6 @@ static void cb_func_menu_foldall(guint key_id); static void cb_func_menu_unfoldall(guint key_id); static void cb_func_build_action(guint key_id); -static void cb_func_build_options(guint key_id); static void cb_func_reloadtaglist(guint key_id); static void cb_func_switch_editor(guint key_id); static void cb_func_switch_scribble(guint key_id); @@ -172,7 +171,7 @@ GDK_F5, 0, "build_run", _("Run")); keys[GEANY_KEYS_BUILD_RUN2] = fill(cb_func_build_action, 0, 0, "build_run2", _("Run (alternative command)")); - keys[GEANY_KEYS_BUILD_OPTIONS] = fill(cb_func_build_options, + keys[GEANY_KEYS_BUILD_OPTIONS] = fill(cb_func_build_action, 0, 0, "build_options", _("Build options")); keys[GEANY_KEYS_RELOADTAGLIST] = fill(cb_func_reloadtaglist, GDK_r, GDK_SHIFT_MASK | GDK_CONTROL_MASK, "reloadtaglist", _("Reload symbol list")); @@ -570,42 +569,48 @@ gint idx = document_get_cur_idx(); GtkWidget *item; filetype *ft; + BuildMenuItems *menu_items; if (! DOC_IDX_VALID(idx)) return; ft = doc_list[idx].file_type; - if (! ft || ! ft->menu_items) return; + if (! ft) return; + menu_items = build_get_menu_items(ft); switch (key_id) { case GEANY_KEYS_BUILD_COMPILE: - item = ft->menu_items->item_compile; + item = menu_items->item_compile; break; case GEANY_KEYS_BUILD_LINK: - item = ft->menu_items->item_link; + item = menu_items->item_link; break; case GEANY_KEYS_BUILD_MAKE: - item = ft->menu_items->item_make_all; + item = menu_items->item_make_all; break; case GEANY_KEYS_BUILD_MAKEOWNTARGET: - item = ft->menu_items->item_make_custom; + item = menu_items->item_make_custom; break; case GEANY_KEYS_BUILD_MAKEOBJECT: - item = ft->menu_items->item_make_object; + item = menu_items->item_make_object; break; case GEANY_KEYS_BUILD_RUN: - item = ft->menu_items->item_exec; + item = menu_items->item_exec; break; case GEANY_KEYS_BUILD_RUN2: - item = ft->menu_items->item_exec2; + item = menu_items->item_exec2; break; + case GEANY_KEYS_BUILD_OPTIONS: + item = menu_items->item_set_args; + break; + default: item = NULL; } @@ -613,24 +618,6 @@ gtk_menu_item_activate(GTK_MENU_ITEM(item)); } -static void cb_func_build_options(G_GNUC_UNUSED guint key_id) -{ - gint idx = document_get_cur_idx(); - document *doc; - filetype *ft; - - if (! DOC_IDX_VALID(idx)) return; - doc = &doc_list[idx]; - ft = doc->file_type; - if (! ft || ! ft->menu_items) return; - if ((ft->menu_items->can_compile || - ft->menu_items->can_link || - ft->menu_items->can_exec) && - (doc->file_name != NULL || - FILETYPE_ID(ft) != GEANY_FILETYPES_ALL)) - on_build_arguments_activate(NULL, ft); -} - static void cb_func_reloadtaglist(G_GNUC_UNUSED guint key_id) { gint idx = document_get_cur_idx(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1037] trunk
by ntrel＠users.sourceforge.net 30 Nov '06

30 Nov '06

Revision: 1037 http://svn.sourceforge.net/geany/?rev=1037&view=rev Author: ntrel Date: 2006-11-30 06:40:32 -0800 (Thu, 30 Nov 2006) Log Message: ----------- Disable open toolbutton recent files menu for now because on GTK+2.10 packing the recent files menu twice causes warnings. Modified Paths: -------------- trunk/ChangeLog trunk/src/main.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-11-29 10:29:34 UTC (rev 1036) +++ trunk/ChangeLog 2006-11-30 14:40:32 UTC (rev 1037) @@ -1,3 +1,10 @@ +2006-11-30 Nick Treleaven <nick.treleaven(a)btinternet.com> + + * src/main.c: + Disable open toolbutton recent files menu for now because on + GTK+2.10 packing the recent files menu twice causes warnings. + + 2006-11-29 Nick Treleaven <nick.treleaven(a)btinternet.com> * src/build.c, src/build.h, src/keybindings.c, src/filetypes.c, Modified: trunk/src/main.c =================================================================== --- trunk/src/main.c 2006-11-29 10:29:34 UTC (rev 1036) +++ trunk/src/main.c 2006-11-30 14:40:32 UTC (rev 1037) @@ -207,9 +207,12 @@ // connect the toolbar dropdown menus gtk_menu_tool_button_set_menu(GTK_MENU_TOOL_BUTTON( lookup_widget(app->window, "menutoolbutton1")), app->new_file_menu); +#if 0 + // gtk2.10 doesn't like doubly attached menus gtk_menu_tool_button_set_menu(GTK_MENU_TOOL_BUTTON( lookup_widget(app->window, "toolbutton9")), lookup_widget(app->window, "recent_files1_menu")); +#endif // set the tab placements of the notebooks gtk_notebook_set_tab_pos(GTK_NOTEBOOK(app->notebook), app->tab_pos_editor); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1036] trunk
by ntrel＠users.sourceforge.net 29 Nov '06

29 Nov '06

Revision: 1036 http://svn.sourceforge.net/geany/?rev=1036&view=rev Author: ntrel Date: 2006-11-29 02:29:34 -0800 (Wed, 29 Nov 2006) Log Message: ----------- Make stop button only apply for killing running programs. Disable build commands when building is in progress. Make build_menu_update() detect how to call set_stop_button(). Make build_menu_update() also update the LaTeX build menu. Make build keybindings only active when the equivalent menu item is also active. Modified Paths: -------------- trunk/ChangeLog trunk/src/build.c trunk/src/build.h trunk/src/filetypes.c trunk/src/filetypes.h trunk/src/keybindings.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-11-28 20:04:20 UTC (rev 1035) +++ trunk/ChangeLog 2006-11-29 10:29:34 UTC (rev 1036) @@ -1,3 +1,15 @@ +2006-11-29 Nick Treleaven <nick.treleaven(a)btinternet.com> + + * src/build.c, src/build.h, src/keybindings.c, src/filetypes.c, + src/filetypes.h: + Make stop button only apply for killing running programs. + Disable build commands when building is in progress. + Make build_menu_update() detect how to call set_stop_button(). + Make build_menu_update() also update the LaTeX build menu. + Make build keybindings only active when the equivalent menu item + is also active. + + 2006-11-27 Nick Treleaven <nick.treleaven(a)btinternet.com> * src/build.c: Modified: trunk/src/build.c =================================================================== --- trunk/src/build.c 2006-11-28 20:04:20 UTC (rev 1035) +++ trunk/src/build.c 2006-11-29 10:29:34 UTC (rev 1036) @@ -48,6 +48,12 @@ BuildInfo build_info = {GBO_COMPILE, 0, NULL, GEANY_FILETYPES_ALL, NULL}; +static struct +{ + GPid pid; + gint file_type_id; +} run_info = {0, GEANY_FILETYPES_ALL}; + enum { LATEX_CMD_TO_DVI, @@ -65,9 +71,11 @@ static void on_make_target_entry_activate(GtkEntry *entry, gpointer user_data); static void set_stop_button(gboolean stop); static void build_exit_cb(GPid child_pid, gint status, gpointer user_data); +static void run_exit_cb(GPid child_pid, gint status, gpointer user_data); static void free_pointers(gpointer first, ...); + #ifndef G_OS_WIN32 -static void kill_process(gint pid); +static void kill_process(GPid *pid); #endif void build_finalize() @@ -116,8 +124,7 @@ if (idx < 0 || doc_list[idx].file_name == NULL) return (GPid) 1; - build_info.file_type_id = GEANY_FILETYPES_LATEX; - build_info.type = GBO_RUN; + run_info.file_type_id = GEANY_FILETYPES_LATEX; #ifdef G_OS_WIN32 script_name = g_strdup("./geany_run_script.bat"); @@ -206,7 +213,7 @@ if (! g_spawn_async_with_pipes(NULL, argv, NULL, G_SPAWN_DO_NOT_REAP_CHILD, - NULL, NULL, &(build_info.pid), NULL, NULL, NULL, &error)) + NULL, NULL, &(run_info.pid), NULL, NULL, NULL, &error)) { geany_debug("g_spawn_async_with_pipes() failed: %s", error->message); msgwin_status_add(_("Process failed (%s)"), error->message); @@ -220,11 +227,11 @@ return (GPid) 0; } - if (build_info.pid > 0) + if (run_info.pid > 0) { //setpgid(0, getppid()); - g_child_watch_add(build_info.pid, (GChildWatchFunc) build_exit_cb, NULL); - set_stop_button(TRUE); + g_child_watch_add(run_info.pid, (GChildWatchFunc) run_exit_cb, NULL); + build_menu_update(idx); } free_pointers(executable, view_file, locale_filename, cmd_string, locale_cmd_string, @@ -232,7 +239,7 @@ g_strfreev(argv); g_strfreev(term_argv); - return build_info.pid; + return run_info.pid; } @@ -439,7 +446,7 @@ if (build_info.pid > 0) { g_child_watch_add(build_info.pid, (GChildWatchFunc) build_exit_cb, NULL); - set_stop_button(TRUE); + build_menu_update(idx); } // use GIOChannels to monitor stdout and stderr @@ -479,8 +486,7 @@ if (! DOC_IDX_VALID(idx) || doc_list[idx].file_name == NULL) return (GPid) 1; - build_info.file_type_id = FILETYPE_ID(doc_list[idx].file_type); - build_info.type = GBO_RUN; + run_info.file_type_id = FILETYPE_ID(doc_list[idx].file_type); #ifdef G_OS_WIN32 script_name = g_strdup("./geany_run_script.bat"); @@ -599,7 +605,7 @@ argv[term_argv_len + 2] = NULL; if (! g_spawn_async_with_pipes(working_dir, argv, NULL, G_SPAWN_DO_NOT_REAP_CHILD, - NULL, NULL, &(build_info.pid), NULL, NULL, NULL, &error)) + NULL, NULL, &(run_info.pid), NULL, NULL, NULL, &error)) { geany_debug("g_spawn_async_with_pipes() failed: %s", error->message); msgwin_status_add(_("Process failed (%s)"), error->message); @@ -610,11 +616,11 @@ goto free_strings; } - result_id = build_info.pid; // g_spawn was successful, result is child process id - if (build_info.pid > 0) + result_id = run_info.pid; // g_spawn was successful, result is child process id + if (run_info.pid > 0) { - g_child_watch_add(build_info.pid, (GChildWatchFunc) build_exit_cb, NULL); - set_stop_button(TRUE); + g_child_watch_add(run_info.pid, (GChildWatchFunc) run_exit_cb, NULL); + build_menu_update(idx); } free_strings: @@ -705,35 +711,42 @@ static void build_exit_cb(GPid child_pid, gint status, gpointer user_data) { - if (build_info.type != GBO_RUN) // not necessary when executing a file - { #ifdef G_OS_UNIX - gboolean failure = FALSE; + gboolean failure = FALSE; - if (WIFEXITED(status)) - { - if (WEXITSTATUS(status) != EXIT_SUCCESS) - failure = TRUE; - } - else if (WIFSIGNALED(status)) - { - // the terminating signal: WTERMSIG (status)); + if (WIFEXITED(status)) + { + if (WEXITSTATUS(status) != EXIT_SUCCESS) failure = TRUE; - } - else - { // any other failure occured - failure = TRUE; - } - show_build_result_message(failure); + } + else if (WIFSIGNALED(status)) + { + // the terminating signal: WTERMSIG (status)); + failure = TRUE; + } + else + { // any other failure occured + failure = TRUE; + } + show_build_result_message(failure); #endif - } - if (build_info.type != GBO_RUN) utils_beep(); + utils_beep(); g_spawn_close_pid(child_pid); build_info.pid = 0; + // enable build items again + build_menu_update(-1); +} + + +static void run_exit_cb(GPid child_pid, gint status, gpointer user_data) +{ + g_spawn_close_pid(child_pid); + + run_info.pid = 0; // reset the stop button and menu item to the original meaning - set_stop_button(FALSE); + build_menu_update(-1); } @@ -922,6 +935,7 @@ gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), image); g_signal_connect((gpointer) item, "activate", G_CALLBACK(on_build_tex_activate), GINT_TO_POINTER(LATEX_CMD_TO_DVI)); + ft->menu_items->item_compile = item; // PDF item = gtk_image_menu_item_new_with_mnemonic(_("LaTeX -> PDF")); @@ -936,6 +950,7 @@ gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), image); g_signal_connect((gpointer) item, "activate", G_CALLBACK(on_build_tex_activate), GINT_TO_POINTER(LATEX_CMD_TO_PDF)); + ft->menu_items->item_link = item; if (item != NULL) { @@ -1003,6 +1018,7 @@ gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), image); g_signal_connect((gpointer) item, "activate", G_CALLBACK(on_build_execute_activate), GINT_TO_POINTER(LATEX_CMD_VIEW_PDF)); + ft->menu_items->item_exec2 = item; // separator separator = gtk_separator_menu_item_new(); @@ -1022,7 +1038,8 @@ image = gtk_image_new_from_stock("gtk-preferences", GTK_ICON_SIZE_MENU); gtk_widget_show(image); gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), image); - g_signal_connect((gpointer) item, "activate", G_CALLBACK(on_build_tex_arguments_activate), NULL); + g_signal_connect((gpointer) item, "activate", + G_CALLBACK(on_build_arguments_activate), ft); gtk_window_add_accel_group(GTK_WINDOW(app->window), accel_group); @@ -1045,9 +1062,13 @@ void build_menu_update(gint idx) { filetype *ft; - gboolean have_path; + gboolean have_path, can_build, can_make; - if (idx == -1 || doc_list[idx].file_type == NULL) + if (idx == -1) + idx = document_get_cur_idx(); + if (idx == -1 || + (FILETYPE_ID(doc_list[idx].file_type) == GEANY_FILETYPES_ALL && + doc_list[idx].file_name == NULL)) { gtk_widget_set_sensitive(lookup_widget(app->window, "menu_build1"), FALSE); gtk_menu_item_remove_submenu(GTK_MENU_ITEM(lookup_widget(app->window, "menu_build1"))); @@ -1066,61 +1087,107 @@ ft->menu_items->can_link = FALSE; #endif - gtk_menu_item_remove_submenu(GTK_MENU_ITEM(lookup_widget(app->window, "menu_build1"))); - if (ft->menu_items->menu == NULL) { ft->menu_items->menu = (ft->id == GEANY_FILETYPES_LATEX) ? create_build_menu_tex() : create_build_menu_gen(idx); g_object_ref((gpointer)ft->menu_items->menu); // to hold it after removing } + /* Note: don't remove the submenu first because it can now cause an X hang if + * the menu is already open when called from build_exit_cb(). */ gtk_menu_item_set_submenu(GTK_MENU_ITEM(lookup_widget(app->window, "menu_build1")), ft->menu_items->menu); have_path = (doc_list[idx].file_name != NULL); - // update the Make items - if (ft->menu_items->item_make_all != NULL) - gtk_widget_set_sensitive(ft->menu_items->item_make_all, have_path); - if (ft->menu_items->item_make_custom != NULL) - gtk_widget_set_sensitive(ft->menu_items->item_make_custom, have_path); - if (ft->menu_items->item_make_object != NULL) - gtk_widget_set_sensitive(ft->menu_items->item_make_object, have_path); - switch (ft->id) + can_make = have_path && build_info.pid <= 1; + + // disable compile and link for C/C++ header files + if (ft->id == GEANY_FILETYPES_C || ft->id == GEANY_FILETYPES_CPP) + can_build = can_make && ! is_c_header(doc_list[idx].file_name); + else + can_build = can_make; + + if (ft->menu_items->can_compile) + gtk_widget_set_sensitive(ft->menu_items->item_compile, can_build); + if (ft->menu_items->can_link) + gtk_widget_set_sensitive(ft->menu_items->item_link, can_build); + if (ft->menu_items->item_make_all) + gtk_widget_set_sensitive(ft->menu_items->item_make_all, can_make); + if (ft->menu_items->item_make_custom) + gtk_widget_set_sensitive(ft->menu_items->item_make_custom, can_make); + if (ft->menu_items->item_make_object) + gtk_widget_set_sensitive(ft->menu_items->item_make_object, can_make); + if (ft->menu_items->can_exec) { - case GEANY_FILETYPES_LATEX: + gboolean can_run = have_path && run_info.pid <= 1; + + /* can_run only applies item_exec2 + * item_exec is enabled for both run and stop commands */ + if (ft->menu_items->item_exec) + gtk_widget_set_sensitive(ft->menu_items->item_exec, have_path); + if (ft->menu_items->item_exec2) + gtk_widget_set_sensitive(ft->menu_items->item_exec2, can_run); + } + + gtk_widget_set_sensitive(app->compile_button, can_build && ft->menu_items->can_compile); + gtk_widget_set_sensitive(app->run_button, have_path && ft->menu_items->can_exec); + + // show the stop command if a program is running, otherwise show run command + set_stop_button(run_info.pid > 1); +} + + +// Call build_menu_update() instead of calling this directly. +static void set_stop_button(gboolean stop) +{ + GtkStockItem sitem; + GtkWidget *menuitem = + filetypes[run_info.file_type_id]->menu_items->item_exec; + + if (stop && utils_str_equal( + gtk_tool_button_get_stock_id(GTK_TOOL_BUTTON(app->run_button)), "gtk-stop")) return; + if (! stop && utils_str_equal( + gtk_tool_button_get_stock_id(GTK_TOOL_BUTTON(app->run_button)), "gtk-execute")) return; + + // use the run button also as stop button + if (stop) + { + gtk_tool_button_set_stock_id(GTK_TOOL_BUTTON(app->run_button), "gtk-stop"); + + if (menuitem != NULL) { - gtk_widget_set_sensitive(app->compile_button, have_path && ft->menu_items->can_compile); - gtk_widget_set_sensitive(app->run_button, have_path && ft->menu_items->can_exec); - break; + gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(menuitem), + gtk_image_new_from_stock("gtk-stop", GTK_ICON_SIZE_MENU)); + gtk_stock_lookup("gtk-stop", &sitem); + gtk_label_set_text_with_mnemonic(GTK_LABEL(gtk_bin_get_child(GTK_BIN(menuitem))), + sitem.label); } - case GEANY_FILETYPES_C: // intended fallthrough, C and C++ behave equal - case GEANY_FILETYPES_CPP: + } + else + { + gtk_tool_button_set_stock_id(GTK_TOOL_BUTTON(app->run_button), "gtk-execute"); + + if (menuitem != NULL) { - if (ft->menu_items->can_exec) - gtk_widget_set_sensitive(ft->menu_items->item_exec, have_path); - gtk_widget_set_sensitive(app->run_button, have_path && ft->menu_items->can_exec); + // LaTeX hacks ;-( + if (run_info.file_type_id == GEANY_FILETYPES_LATEX) + { + gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(menuitem), + gtk_image_new_from_stock("gtk-find", GTK_ICON_SIZE_MENU)); + gtk_label_set_text_with_mnemonic(GTK_LABEL(gtk_bin_get_child(GTK_BIN(menuitem))), + LATEX_VIEW_DVI_LABEL); + } + else + { + gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(menuitem), + gtk_image_new_from_stock("gtk-execute", GTK_ICON_SIZE_MENU)); - // compile and link are disabled for header files - have_path = have_path && ! is_c_header(doc_list[idx].file_name); - gtk_widget_set_sensitive(app->compile_button, have_path && ft->menu_items->can_compile); - if (ft->menu_items->can_compile) - gtk_widget_set_sensitive(ft->menu_items->item_compile, have_path); - if (ft->menu_items->can_link) - gtk_widget_set_sensitive(ft->menu_items->item_link, have_path); - break; + gtk_stock_lookup("gtk-execute", &sitem); + gtk_label_set_text_with_mnemonic(GTK_LABEL(gtk_bin_get_child(GTK_BIN(menuitem))), + sitem.label); + } } - default: - { - gtk_widget_set_sensitive(app->compile_button, have_path && ft->menu_items->can_compile); - gtk_widget_set_sensitive(app->run_button, have_path && ft->menu_items->can_exec); - if (ft->menu_items->can_compile) - gtk_widget_set_sensitive(ft->menu_items->item_compile, have_path); - if (ft->menu_items->can_link) - gtk_widget_set_sensitive(ft->menu_items->item_link, have_path); - if (ft->menu_items->can_exec) - gtk_widget_set_sensitive(ft->menu_items->item_exec, have_path); - } } } @@ -1219,11 +1286,11 @@ gint idx = document_get_cur_idx(); // make the process "stopable" - if (build_info.pid > (GPid) 1) + if (run_info.pid > (GPid) 1) { // on Windows there is no PID returned (resp. it is a handle), currently unsupported #ifndef G_OS_WIN32 - kill_process(build_info.pid); + kill_process(&run_info.pid); #endif return; } @@ -1261,18 +1328,13 @@ on_build_arguments_activate (GtkMenuItem *menuitem, gpointer user_data) { - dialogs_show_includes_arguments_gen(); + if (user_data && FILETYPE_ID((filetype*) user_data) == GEANY_FILETYPES_LATEX) + dialogs_show_includes_arguments_tex(); + else + dialogs_show_includes_arguments_gen(); } -void -on_build_tex_arguments_activate (GtkMenuItem *menuitem, - gpointer user_data) -{ - dialogs_show_includes_arguments_tex(); -} - - static void on_make_target_dialog_response (GtkDialog *dialog, gint response, @@ -1301,57 +1363,8 @@ } -static void set_stop_button(gboolean stop) -{ - GtkStockItem sitem; - GtkWidget *menuitem = - filetypes[build_info.file_type_id]->menu_items->item_exec; - - // use the run button also as stop button - if (stop) - { - gtk_tool_button_set_stock_id(GTK_TOOL_BUTTON(app->run_button), "gtk-stop"); - gtk_widget_set_sensitive(app->compile_button, FALSE); - if (menuitem != NULL) - { - gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(menuitem), - gtk_image_new_from_stock("gtk-stop", GTK_ICON_SIZE_MENU)); - gtk_stock_lookup("gtk-stop", &sitem); - gtk_label_set_text_with_mnemonic(GTK_LABEL(gtk_bin_get_child(GTK_BIN(menuitem))), - sitem.label); - } - } - else - { - gtk_tool_button_set_stock_id(GTK_TOOL_BUTTON(app->run_button), "gtk-execute"); - gtk_widget_set_sensitive(app->compile_button, TRUE); - - if (menuitem != NULL) - { - // LaTeX hacks ;-( - if (build_info.file_type_id == GEANY_FILETYPES_LATEX) - { - gtk_label_set_text_with_mnemonic(GTK_LABEL(gtk_bin_get_child(GTK_BIN(menuitem))), - LATEX_VIEW_DVI_LABEL); - gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(menuitem), - gtk_image_new_from_stock("gtk-find", GTK_ICON_SIZE_MENU)); - } - else - { - gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(menuitem), - gtk_image_new_from_stock("gtk-execute", GTK_ICON_SIZE_MENU)); - - gtk_stock_lookup("gtk-execute", &sitem); - gtk_label_set_text_with_mnemonic(GTK_LABEL(gtk_bin_get_child(GTK_BIN(menuitem))), - sitem.label); - } - } - } -} - - #ifndef G_OS_WIN32 -static void kill_process(gint pid) +static void kill_process(GPid *pid) { /* SIGQUIT is not the best signal to use because it causes a core dump (this should not * perforce necessary for just killing a process). But we must use a signal which we can @@ -1360,15 +1373,15 @@ gint resultpg, result; // sent SIGQUIT to all the processes to the processes' own process group - result = kill(pid, SIGQUIT); + result = kill(*pid, SIGQUIT); resultpg = killpg(0, SIGQUIT); if (result != 0 || resultpg != 0) msgwin_status_add(_("Process could not be stopped (%s)."), g_strerror(errno)); else { - build_info.pid = 0; - set_stop_button(FALSE); + *pid = 0; + build_menu_update(-1); } } #endif Modified: trunk/src/build.h =================================================================== --- trunk/src/build.h 2006-11-28 20:04:20 UTC (rev 1035) +++ trunk/src/build.h 2006-11-29 10:29:34 UTC (rev 1036) @@ -30,8 +30,7 @@ GBO_BUILD, GBO_MAKE_ALL, GBO_MAKE_CUSTOM, - GBO_MAKE_OBJECT, - GBO_RUN + GBO_MAKE_OBJECT } build_type; typedef struct @@ -87,8 +86,4 @@ on_build_arguments_activate (GtkMenuItem *menuitem, gpointer user_data); -void -on_build_tex_arguments_activate (GtkMenuItem *menuitem, - gpointer user_data); - #endif Modified: trunk/src/filetypes.c =================================================================== --- trunk/src/filetypes.c 2006-11-28 20:04:20 UTC (rev 1035) +++ trunk/src/filetypes.c 2006-11-29 10:29:34 UTC (rev 1036) @@ -867,20 +867,7 @@ if (filetypes[i]->menu_items->menu != NULL && GTK_IS_WIDGET(filetypes[i]->menu_items->menu)) gtk_widget_destroy(filetypes[i]->menu_items->menu); - /// TODO not necessary because they got freed with the menu? -/* if (filetypes[i]->menu_items->item_compile != NULL && - GTK_IS_WIDGET(filetypes[i]->menu_items->item_compile)) - gtk_widget_destroy(filetypes[i]->menu_items->item_compile); - if (filetypes[i]->menu_items->item_link != NULL && - GTK_IS_WIDGET(filetypes[i]->menu_items->item_link)) - gtk_widget_destroy(filetypes[i]->menu_items->item_link); - if (filetypes[i]->menu_items->item_exec != NULL && - GTK_IS_WIDGET(filetypes[i]->menu_items->item_exec)) - gtk_widget_destroy(filetypes[i]->menu_items->item_exec); - if (filetypes[i]->menu_items->item_make_object != NULL && - GTK_IS_WIDGET(filetypes[i]->menu_items->item_make_object)) - gtk_widget_destroy(filetypes[i]->menu_items->item_make_object); -*/ g_free(filetypes[i]->menu_items); + g_free(filetypes[i]->menu_items); g_strfreev(filetypes[i]->pattern); g_free(filetypes[i]); Modified: trunk/src/filetypes.h =================================================================== --- trunk/src/filetypes.h 2006-11-28 20:04:20 UTC (rev 1035) +++ trunk/src/filetypes.h 2006-11-29 10:29:34 UTC (rev 1036) @@ -75,6 +75,7 @@ GtkWidget *item_compile; GtkWidget *item_link; GtkWidget *item_exec; + GtkWidget *item_exec2; GtkWidget *item_make_all; GtkWidget *item_make_custom; GtkWidget *item_make_object; Modified: trunk/src/keybindings.c =================================================================== --- trunk/src/keybindings.c 2006-11-28 20:04:20 UTC (rev 1035) +++ trunk/src/keybindings.c 2006-11-29 10:29:34 UTC (rev 1036) @@ -74,13 +74,7 @@ static void cb_func_menu_replacetabs(guint key_id); static void cb_func_menu_foldall(guint key_id); static void cb_func_menu_unfoldall(guint key_id); -static void cb_func_build_compile(guint key_id); -static void cb_func_build_link(guint key_id); -static void cb_func_build_make(guint key_id); -static void cb_func_build_makeowntarget(guint key_id); -static void cb_func_build_makeobject(guint key_id); -static void cb_func_build_run(guint key_id); -static void cb_func_build_run2(guint key_id); +static void cb_func_build_action(guint key_id); static void cb_func_build_options(guint key_id); static void cb_func_reloadtaglist(guint key_id); static void cb_func_switch_editor(guint key_id); @@ -163,20 +157,20 @@ 0, 0, "menu_foldall", _("Fold all")); keys[GEANY_KEYS_MENU_UNFOLDALL] = fill(cb_func_menu_unfoldall, 0, 0, "menu_unfoldall", _("Unfold all")); - keys[GEANY_KEYS_BUILD_COMPILE] = fill(cb_func_build_compile, + keys[GEANY_KEYS_BUILD_COMPILE] = fill(cb_func_build_action, GDK_F8, 0, "build_compile", _("Compile")); - keys[GEANY_KEYS_BUILD_LINK] = fill(cb_func_build_link, + keys[GEANY_KEYS_BUILD_LINK] = fill(cb_func_build_action, GDK_F9, 0, "build_link", _("Build")); - keys[GEANY_KEYS_BUILD_MAKE] = fill(cb_func_build_make, + keys[GEANY_KEYS_BUILD_MAKE] = fill(cb_func_build_action, GDK_F9, GDK_SHIFT_MASK, "build_make", _("Make all")); - keys[GEANY_KEYS_BUILD_MAKEOWNTARGET] = fill(cb_func_build_makeowntarget, + keys[GEANY_KEYS_BUILD_MAKEOWNTARGET] = fill(cb_func_build_action, GDK_F9, GDK_SHIFT_MASK | GDK_CONTROL_MASK, "build_makeowntarget", _("Make custom target")); - keys[GEANY_KEYS_BUILD_MAKEOBJECT] = fill(cb_func_build_makeobject, + keys[GEANY_KEYS_BUILD_MAKEOBJECT] = fill(cb_func_build_action, 0, 0, "build_makeobject", _("Make object")); - keys[GEANY_KEYS_BUILD_RUN] = fill(cb_func_build_run, + keys[GEANY_KEYS_BUILD_RUN] = fill(cb_func_build_action, GDK_F5, 0, "build_run", _("Run")); - keys[GEANY_KEYS_BUILD_RUN2] = fill(cb_func_build_run2, + keys[GEANY_KEYS_BUILD_RUN2] = fill(cb_func_build_action, 0, 0, "build_run2", _("Run (alternative command)")); keys[GEANY_KEYS_BUILD_OPTIONS] = fill(cb_func_build_options, 0, 0, "build_options", _("Build options")); @@ -571,71 +565,70 @@ document_unfold_all(idx); } -static void cb_func_build_compile(G_GNUC_UNUSED guint key_id) +static void cb_func_build_action(guint key_id) { gint idx = document_get_cur_idx(); - if (idx == -1 || ! doc_list[idx].is_valid) return; - if (doc_list[idx].file_type->menu_items->can_compile && doc_list[idx].file_name != NULL) - on_build_compile_activate(NULL, NULL); -} + GtkWidget *item; + filetype *ft; -static void cb_func_build_link(G_GNUC_UNUSED guint key_id) -{ - gint idx = document_get_cur_idx(); - if (idx == -1 || ! doc_list[idx].is_valid) return; - if (doc_list[idx].file_type->menu_items->can_link && doc_list[idx].file_name != NULL) - on_build_build_activate(NULL, NULL); -} + if (! DOC_IDX_VALID(idx)) return; -static void cb_func_build_make(G_GNUC_UNUSED guint key_id) -{ - gint idx = document_get_cur_idx(); - if (idx == -1 || ! doc_list[idx].is_valid) return; - if (doc_list[idx].file_name != NULL) - on_build_make_activate(NULL, GINT_TO_POINTER(GBO_MAKE_ALL)); -} + ft = doc_list[idx].file_type; + if (! ft || ! ft->menu_items) return; -static void cb_func_build_makeowntarget(G_GNUC_UNUSED guint key_id) -{ - gint idx = document_get_cur_idx(); - if (idx == -1 || ! doc_list[idx].is_valid) return; - if (doc_list[idx].file_name != NULL) - on_build_make_activate(NULL, GINT_TO_POINTER(GBO_MAKE_CUSTOM)); -} + switch (key_id) + { + case GEANY_KEYS_BUILD_COMPILE: + item = ft->menu_items->item_compile; + break; -static void cb_func_build_makeobject(G_GNUC_UNUSED guint key_id) -{ - gint idx = document_get_cur_idx(); - if (idx == -1 || ! doc_list[idx].is_valid) return; - if (doc_list[idx].file_name != NULL) - on_build_make_activate(NULL, GINT_TO_POINTER(GBO_MAKE_OBJECT)); -} + case GEANY_KEYS_BUILD_LINK: + item = ft->menu_items->item_link; + break; -static void cb_func_build_run(G_GNUC_UNUSED guint key_id) -{ - gint idx = document_get_cur_idx(); - if (idx == -1 || ! doc_list[idx].is_valid) return; - if (doc_list[idx].file_type->menu_items->can_exec && doc_list[idx].file_name != NULL) - on_build_execute_activate(NULL, GINT_TO_POINTER(0)); -} + case GEANY_KEYS_BUILD_MAKE: + item = ft->menu_items->item_make_all; + break; -static void cb_func_build_run2(G_GNUC_UNUSED guint key_id) -{ - gint idx = document_get_cur_idx(); - if (idx == -1 || ! doc_list[idx].is_valid) return; - if (doc_list[idx].file_type->menu_items->can_exec && doc_list[idx].file_name != NULL) - on_build_execute_activate(NULL, GINT_TO_POINTER(1)); + case GEANY_KEYS_BUILD_MAKEOWNTARGET: + item = ft->menu_items->item_make_custom; + break; + + case GEANY_KEYS_BUILD_MAKEOBJECT: + item = ft->menu_items->item_make_object; + break; + + case GEANY_KEYS_BUILD_RUN: + item = ft->menu_items->item_exec; + break; + + case GEANY_KEYS_BUILD_RUN2: + item = ft->menu_items->item_exec2; + break; + + default: + item = NULL; + } + if (item && GTK_WIDGET_IS_SENSITIVE(item)) + gtk_menu_item_activate(GTK_MENU_ITEM(item)); } static void cb_func_build_options(G_GNUC_UNUSED guint key_id) { gint idx = document_get_cur_idx(); - if (idx == -1 || ! doc_list[idx].is_valid) return; - if ((doc_list[idx].file_type->menu_items->can_compile || - doc_list[idx].file_type->menu_items->can_link || - doc_list[idx].file_type->menu_items->can_exec) && - doc_list[idx].file_name != NULL) - on_build_arguments_activate(NULL, NULL); + document *doc; + filetype *ft; + + if (! DOC_IDX_VALID(idx)) return; + doc = &doc_list[idx]; + ft = doc->file_type; + if (! ft || ! ft->menu_items) return; + if ((ft->menu_items->can_compile || + ft->menu_items->can_link || + ft->menu_items->can_exec) && + (doc->file_name != NULL || + FILETYPE_ID(ft) != GEANY_FILETYPES_ALL)) + on_build_arguments_activate(NULL, ft); } static void cb_func_reloadtaglist(G_GNUC_UNUSED guint key_id) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1035] trunk/po
by kretek＠users.sourceforge.net 28 Nov '06

28 Nov '06

Revision: 1035 http://svn.sourceforge.net/geany/?rev=1035&view=rev Author: kretek Date: 2006-11-28 12:04:20 -0800 (Tue, 28 Nov 2006) Log Message: ----------- Update of German translation Modified Paths: -------------- trunk/po/ChangeLog trunk/po/de.po Modified: trunk/po/ChangeLog =================================================================== --- trunk/po/ChangeLog 2006-11-27 11:32:45 UTC (rev 1034) +++ trunk/po/ChangeLog 2006-11-28 20:04:20 UTC (rev 1035) @@ -1,3 +1,8 @@ +2006-11-28 Frank Lanitz <frank(a)frank.uvena.de> + + * de.po: Small update of German translation + + 2006-11-23 Frank Lanitz <frank(a)frank.uvena.de> * de.po: Update of German translation (Thanks to Christoph Berg for Modified: trunk/po/de.po =================================================================== --- trunk/po/de.po 2006-11-27 11:32:45 UTC (rev 1034) +++ trunk/po/de.po 2006-11-28 20:04:20 UTC (rev 1035) @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: geany 0.8\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-11-23 21:24+0100\n" -"PO-Revision-Date: 2006-11-23 22:38+0100\n" +"POT-Creation-Date: 2006-11-28 20:59+0100\n" +"PO-Revision-Date: 2006-11-28 21:02+0100\n" "Last-Translator: Frank Lanitz <frank(a)frank.uvena.de>\n" "Language-Team: German <frank(a)frank.uvena.de>\n" "MIME-Version: 1.0\n" @@ -127,7 +127,7 @@ msgstr "Speichert alle offenen Dateien" #: src/interface.c:321 -#: src/callbacks.c:460 +#: src/callbacks.c:456 #: src/utils.c:352 msgid "_Reload" msgstr "_Neu laden" @@ -440,7 +440,7 @@ #. build the code #: src/interface.c:802 -#: src/build.c:793 +#: src/build.c:810 msgid "_Build" msgstr "_Erstellen" @@ -528,7 +528,7 @@ msgstr "Kompiliert die aktuelle Datei" #: src/interface.c:926 -#: src/build.c:853 +#: src/build.c:870 msgid "Run or view the current file" msgstr "Aktuelle Datei anzeigen oder ausführen" @@ -702,13 +702,12 @@ msgstr "Automatisch zu dem Statusmeldungs-Reiter im unteren Fenster wechseln, wenn eine neue Statusmeldung vorliegt." #: src/interface.c:2439 -#, fuzzy msgid "Always wrap search and hide the Find dialog" -msgstr "Suche vom Dokumentanfang bzw. -ende neu beginnen?" +msgstr "Das vollständige Dokument durchsuchen und den Suchen-Dialog schließen" #: src/interface.c:2443 msgid "Always wrap search around the document and hide the Find dialog after clicking Find Next/Previous" -msgstr "" +msgstr "Immer das vollständige Dokument durchsuchen und den Suchen-Dialog nach Klicken auf Nächstes/Vorheriges schließen." # Denke trifft es besser als »Eigenschaften« #: src/interface.c:2446 @@ -1016,8 +1015,8 @@ #: src/interface.c:3076 #: src/dialogs.c:494 -#: src/prefs.c:992 -#: src/prefs.c:999 +#: src/vte.c:538 +#: src/vte.c:545 msgid "Color Chooser" msgstr "Farbwähler" @@ -1237,92 +1236,86 @@ msgid "Keybindings" msgstr "Tastenkürzel" -#: src/callbacks.c:160 +#: src/callbacks.c:156 msgid "Do you really want to quit?" msgstr "Möchten Sie wirklich beenden?" -#: src/callbacks.c:461 +#: src/callbacks.c:457 msgid "Any unsaved changes will be lost." msgstr "Alle ungesicherten Änderungen gehen verloren." -#: src/callbacks.c:462 +#: src/callbacks.c:458 #, c-format msgid "Are you sure you want to reload '%s'?" msgstr "Wollen Sie %s wirklich neu laden?" -#: src/callbacks.c:847 +#: src/callbacks.c:843 #, c-format msgid "The file '%s' already exists. Do you want to overwrite it?" msgstr "Die Datei '%s' existiert bereits. Möchten Sie sie überschreiben?" -#: src/callbacks.c:1216 +#: src/callbacks.c:1212 #, c-format msgid "Declaration of \"%s()\" not found" msgstr "Deklaration von \"%s()\" nicht gefunden." -#: src/callbacks.c:1218 +#: src/callbacks.c:1214 #, c-format msgid "Definition of \"%s()\" not found" msgstr "Definition von \"%s()\" nicht gefunden." -#. initialize the dialog -#: src/callbacks.c:1453 -#: src/dialogs.c:74 -msgid "Open File" -msgstr "Datei öffnen" - -#: src/callbacks.c:1502 -#: src/callbacks.c:1547 +#: src/callbacks.c:1449 +#: src/callbacks.c:1494 msgid "Please set the filetype for the current file before using this function." msgstr "Bitte legen Sie den Dateityp fest, bevor Sie diese Funktion benutzen." -#: src/callbacks.c:1659 -#: src/ui_utils.c:543 +#: src/callbacks.c:1606 +#: src/ui_utils.c:557 msgid "dd.mm.yyyy" msgstr "TT.MM.JJ" -#: src/callbacks.c:1661 -#: src/ui_utils.c:544 +#: src/callbacks.c:1608 +#: src/ui_utils.c:558 msgid "mm.dd.yyyy" msgstr "MM.TT.JJ" -#: src/callbacks.c:1663 -#: src/ui_utils.c:545 +#: src/callbacks.c:1610 +#: src/ui_utils.c:559 msgid "yyyy/mm/dd" msgstr "JJJJ/MM/TT" -#: src/callbacks.c:1665 -#: src/ui_utils.c:554 +#: src/callbacks.c:1612 +#: src/ui_utils.c:568 msgid "dd.mm.yyyy hh:mm:ss" msgstr "TT.MM.JJJJ Stunden:Minuten:Sekunden" -#: src/callbacks.c:1667 -#: src/ui_utils.c:555 +#: src/callbacks.c:1614 +#: src/ui_utils.c:569 msgid "mm.dd.yyyy hh:mm:ss" msgstr "MM.TT.JJJJ Stunden:Minuten:Sekunden" -#: src/callbacks.c:1669 -#: src/ui_utils.c:556 +#: src/callbacks.c:1616 +#: src/ui_utils.c:570 msgid "yyyy/mm/dd hh:mm:ss" msgstr "JJJJ/MM/TT Stunden:Minuten:Sekunden" -#: src/callbacks.c:1671 -#: src/ui_utils.c:565 -#: src/ui_utils.c:569 -#: src/ui_utils.c:573 -#: src/ui_utils.c:577 +#: src/callbacks.c:1618 +#: src/ui_utils.c:579 +#: src/ui_utils.c:583 +#: src/ui_utils.c:587 +#: src/ui_utils.c:591 msgid "Use custom date format" msgstr "Benutze selbst erstelltes Zeitformat" -#: src/callbacks.c:1678 +#: src/callbacks.c:1625 msgid "Custom date format" msgstr "Benutzerdefiniertes Datumsformat" -#: src/callbacks.c:1679 +#: src/callbacks.c:1626 msgid "Enter here a custom date and time format. You can use any conversion specifiers which can be used with the ANSI C strftime function. See \"man strftime\" for more information." msgstr "Hier kann ein benutzerdefiniertes Datumsformat eingegeben werden. Dabei können alle Platzhalter verwendet werden, die auch in ANSI C strftime zum Einsatz kommen." -#: src/callbacks.c:1698 +#: src/callbacks.c:1645 msgid "Date format string could not be converted (possibly too long)." msgstr "Das Datenformat konnte nicht umgewandelt werden. Eventuell ist es zu lang." @@ -1332,6 +1325,12 @@ msgid "Couldn't find pixmap file: %s" msgstr "Konnte PixMap %s nicht finden." +#. initialize the dialog +#: src/dialogs.c:74 +#: src/prefs.c:1003 +msgid "Open File" +msgstr "Datei öffnen" + #: src/dialogs.c:79 msgid "Opens the file in read-only mode. If you choose more than one file to open, all files will be opened read-only." msgstr "Öffnet die Datei schreibgeschützt. Wenn Sie mehrere Dateien wählen, werden alle schreibgeschützt geöffnet." @@ -1427,7 +1426,7 @@ #. arguments #: src/dialogs.c:592 -#: src/build.c:997 +#: src/build.c:1014 msgid "Set Arguments" msgstr "Programm-Parameter angeben" @@ -1454,7 +1453,7 @@ msgstr "PDF-Vorschau:" #: src/dialogs.c:682 -#: src/dialogs.c:795 +#: src/dialogs.c:797 #, c-format msgid "" "%f will be replaced by the current filename, e.g. test_file.c\n" @@ -1475,141 +1474,141 @@ msgid " commands" msgstr "Kommandos" -#: src/dialogs.c:735 +#: src/dialogs.c:737 msgid "Compile:" msgstr "Kompilieren:" -#: src/dialogs.c:756 +#: src/dialogs.c:758 msgid "Build:" msgstr "Erstellen:" -#: src/dialogs.c:777 -#: src/dialogs.c:1048 +#: src/dialogs.c:779 +#: src/dialogs.c:1050 msgid "Execute:" msgstr "Ausführen:" -#: src/dialogs.c:842 +#: src/dialogs.c:844 msgid "An error occurred or file information could not be retrieved (e.g. from a new file)." msgstr "Es ist ein Fehler aufgetreten oder Datei-Informationen konnten nicht gelesen werden(z.B. bei einer neuen, ungespeicherten Datei)." -#: src/dialogs.c:861 -#: src/dialogs.c:862 #: src/dialogs.c:863 -#: src/dialogs.c:869 -#: src/dialogs.c:870 +#: src/dialogs.c:864 +#: src/dialogs.c:865 #: src/dialogs.c:871 +#: src/dialogs.c:872 +#: src/dialogs.c:873 #: src/utils.c:499 #: src/utils.c:553 -#: src/ui_utils.c:108 -#: src/ui_utils.c:110 +#: src/ui_utils.c:122 +#: src/ui_utils.c:124 msgid "unknown" msgstr "unbekannt" -#: src/dialogs.c:875 +#: src/dialogs.c:877 msgid "Properties" msgstr "Eigenschaften" -#: src/dialogs.c:903 +#: src/dialogs.c:905 msgid "Type:" msgstr "Dateityp:" -#: src/dialogs.c:916 +#: src/dialogs.c:918 msgid "Size:" msgstr "Größe:" -#: src/dialogs.c:931 +#: src/dialogs.c:933 msgid "Location:" msgstr "Ort:" -#: src/dialogs.c:944 +#: src/dialogs.c:946 msgid "Read-only:" msgstr "Schreibgeschützt:" -#: src/dialogs.c:951 +#: src/dialogs.c:953 msgid "(only inside Geany)" msgstr "(nur innerhalb von Geany)" -#: src/dialogs.c:960 +#: src/dialogs.c:962 msgid "Encoding:" msgstr "Kodierung:" -#: src/dialogs.c:969 -#: src/ui_utils.c:109 +#: src/dialogs.c:971 +#: src/ui_utils.c:123 msgid "(with BOM)" msgstr "(mit BOM)" -#: src/dialogs.c:969 -#: src/ui_utils.c:109 +#: src/dialogs.c:971 +#: src/ui_utils.c:123 msgid "(without BOM)" msgstr "(ohne BOM)" -#: src/dialogs.c:979 +#: src/dialogs.c:981 msgid "Modified:" msgstr "Modifiziert:" -#: src/dialogs.c:992 +#: src/dialogs.c:994 msgid "Changed:" msgstr "Geändert:" -#: src/dialogs.c:1005 +#: src/dialogs.c:1007 msgid "Accessed:" msgstr "Zugriff:" -#: src/dialogs.c:1026 +#: src/dialogs.c:1028 msgid "Permissions:" msgstr "Berechtigungen:" #. Header -#: src/dialogs.c:1034 +#: src/dialogs.c:1036 msgid "Read:" msgstr "Lesen:" -#: src/dialogs.c:1041 +#: src/dialogs.c:1043 msgid "Write:" msgstr "Schreiben:" #. Owner -#: src/dialogs.c:1056 +#: src/dialogs.c:1058 msgid "Owner:" msgstr "Eigentümer:" #. Group -#: src/dialogs.c:1092 +#: src/dialogs.c:1094 msgid "Group:" msgstr "Gruppe:" #. Other -#: src/dialogs.c:1128 +#: src/dialogs.c:1130 msgid "Other:" msgstr "Andere:" -#: src/dialogs.c:1249 +#: src/dialogs.c:1251 msgid "Keyboard shortcuts" msgstr "Tastaturkürzel" -#: src/dialogs.c:1258 +#: src/dialogs.c:1260 msgid "The following keyboard shortcuts are defined:" msgstr "Folgende Tastenkürzel sind definiert: " -#: src/document.c:368 +#: src/document.c:367 #, c-format msgid "File %s closed." msgstr "Datei %s wurde geschlossen." -#: src/document.c:450 +#: src/document.c:448 msgid "New file opened." msgstr "Neue Datei geöffnet." -#: src/document.c:598 +#: src/document.c:596 msgid "Invalid filename" msgstr "Ungültiger Dateiname" -#: src/document.c:623 +#: src/document.c:621 #, c-format msgid "Could not open file %s (%s)" msgstr "Konnte Datei '%s' nicht öffnen(%s)." -#: src/document.c:647 +#: src/document.c:645 #, c-format msgid "" "The file \"%s\" could not opened properly and probably was truncated. Be aware that saving it can cause data loss.\n" @@ -1618,36 +1617,36 @@ "Die Datei »%s« konnte nicht ordnungsgemäß geladen werden und wurde evtl. nicht vollständig abgeschnitten. Die kann zu Datenvelust beim Speichern führen!\n" "Die Datei wird schreibgeschützt geöffnet." -#: src/document.c:670 +#: src/document.c:668 #, c-format msgid "The file \"%s\" is not valid %s." msgstr "Die Datei \"%s\" ist kein gültiges %s." -#: src/document.c:681 +#: src/document.c:679 #, c-format msgid "The file \"%s\" does not look like a text file or the file encoding is not supported." msgstr "Die Datei \"%s\" scheint keine Textdatei zu sein, oder das Format wird nicht unterstützt." -#: src/document.c:752 +#: src/document.c:750 #, c-format msgid "File %s reloaded." msgstr "Datei %s neu geladen." -#: src/document.c:754 +#: src/document.c:752 #, c-format msgid "File %s opened(%d%s)." msgstr "Datei %s geöffnet(%d%s)." -#: src/document.c:756 +#: src/document.c:754 msgid ", read-only" msgstr ", schreibgeschützt" -#: src/document.c:831 -#: src/document.c:912 +#: src/document.c:829 +#: src/document.c:910 msgid "Error saving file." msgstr "Fehler beim Speichern der Datei." -#: src/document.c:876 +#: src/document.c:874 #, c-format msgid "" "An error occurred while converting the file from UTF-8 in \"%s\". The file remains unsaved.\n" @@ -1656,32 +1655,32 @@ "Beim Konvertieren der Datei von UTF-8 in \"%s\" ist ein Fehler aufgetreten. Die Datei bleibt ungespeichert.\n" "Fehlermeldung: %s\n" -#: src/document.c:900 +#: src/document.c:898 #, c-format msgid "Error saving file (%s)." msgstr "Fehler beim Speichern der Datei (%s)." -#: src/document.c:939 +#: src/document.c:937 #, c-format msgid "File %s saved." msgstr "Datei %s wurde gespeichert." -#: src/document.c:987 -#: src/document.c:1041 -#: src/document.c:1052 +#: src/document.c:985 +#: src/document.c:1037 +#: src/document.c:1045 #, c-format msgid "\"%s\" was not found." msgstr "\"%s\" wurde nicht gefunden." -#: src/document.c:1052 +#: src/document.c:1045 msgid "Wrap search and find again?" msgstr "Suche vom Dokumentanfang bzw. -ende neu beginnen?" -#: src/document.c:1171 -#: src/document.c:1178 +#: src/document.c:1166 +#: src/document.c:1173 #, c-format -msgid "Replaced %d occurrences of \"%s\" with \"%s\"." -msgstr "%d mal \"%s\" gegen \"%s\" ausgetauscht." +msgid "%s: replaced %d occurrences of \"%s\" with \"%s\"." +msgstr "%s: Es wurde %d Mal \"%s\" gegen \"%s\" ersetzt." #: src/document.c:1349 msgid "Win (CRLF)" @@ -1727,58 +1726,58 @@ "the current buffer." msgstr "Die Datei '%s' auf dem Datenträger ist aktueller als die momentan geöffnete Version." -#: src/ui_utils.c:100 +#: src/ui_utils.c:114 #, c-format msgid "%c line: % 4d column: % 3d selection: % 4d %s mode: %s%s cur. function: %s encoding: %s %s filetype: %s" msgstr "%c Zeile: % 4d Spalte: % 3d Auswahl: % 4d %s Modus: %s%s akt. Funktion: %s Kodierung: %s %s Dateityp: %s" -#: src/ui_utils.c:104 +#: src/ui_utils.c:118 msgid "OVR" msgstr "ÜBER" -#: src/ui_utils.c:104 +#: src/ui_utils.c:118 msgid "INS" msgstr "EINF" -#: src/ui_utils.c:130 +#: src/ui_utils.c:144 #: src/geany.h:47 msgid "untitled" msgstr "unbenannt" -#: src/ui_utils.c:131 +#: src/ui_utils.c:145 msgid "(Unsaved)" msgstr "(Ungespeichert)" -#: src/ui_utils.c:170 +#: src/ui_utils.c:184 #, c-format msgid "Font updated (%s)." msgstr "Schriftart gewechselt (%s)." -#: src/ui_utils.c:204 +#: src/ui_utils.c:218 msgid "No tags found" msgstr "Keine Symbole gefunden." -#: src/ui_utils.c:513 +#: src/ui_utils.c:527 msgid "C Standard Library" msgstr "C Standard Bibliothek" -#: src/ui_utils.c:514 +#: src/ui_utils.c:528 msgid "ISO C99" msgstr "ISO C99" -#: src/ui_utils.c:515 +#: src/ui_utils.c:529 msgid "C++ (C Standard Library)" msgstr "C++ (C Standard Bibliothek)" -#: src/ui_utils.c:516 +#: src/ui_utils.c:530 msgid "C++ Standard Library" msgstr "C++ Standard Bibliothek" -#: src/ui_utils.c:517 +#: src/ui_utils.c:531 msgid "C++ STL" msgstr "C++ STL" -#: src/ui_utils.c:581 +#: src/ui_utils.c:595 msgid "Set custom date format" msgstr "Benutzerdefiniertes Datumsformat einstellen " @@ -1952,7 +1951,7 @@ #: src/build.c:212 #: src/build.c:428 #: src/build.c:605 -#: src/search.c:1048 +#: src/search.c:1055 #, c-format msgid "Process failed (%s)" msgstr "Prozess fehlgeschlagen (%s)" @@ -1977,236 +1976,147 @@ msgid "Failed to change the working directory to %s" msgstr "Konnte nicht in Arbeitsverzeichnis %s wechseln" -#: src/build.c:702 +#: src/build.c:683 msgid "Compilation failed." msgstr "Kompilierung fehlgeschlagen." -#: src/build.c:707 +#: src/build.c:697 msgid "Compilation finished successfully." msgstr "Kompilierung beendet - erfolgreich." #. compile the code -#: src/build.c:779 +#: src/build.c:796 msgid "_Compile" msgstr "_Kompilieren" -#: src/build.c:782 +#: src/build.c:799 msgid "Compiles the current file" msgstr "Kompiliert die aktuelle Datei" -#: src/build.c:797 +#: src/build.c:814 msgid "Builds the current file (generate an executable file)" msgstr "Erstellt die aktuelle Datei (erzeugt eine ausführbare Datei)" #. build the code with make all -#: src/build.c:811 -#: src/build.c:931 +#: src/build.c:828 +#: src/build.c:948 msgid "_Make all" msgstr "_Make all" -#: src/build.c:814 -#: src/build.c:934 +#: src/build.c:831 +#: src/build.c:951 msgid "Builds the current file with the make tool and the default target" msgstr "Erstellt die aktuelle Datei mit \"make\" und dem Default-Target" #. build the code with make custom -#: src/build.c:822 -#: src/build.c:942 +#: src/build.c:839 +#: src/build.c:959 msgid "Make custom _target" msgstr "Make eigenes _Target" -#: src/build.c:826 -#: src/build.c:946 +#: src/build.c:843 +#: src/build.c:963 msgid "Builds the current file with the make tool and the specified target" msgstr "Erstellt die aktuelle Datei mit \"make\" und dem angegebenem Target" #. build the code with make object -#: src/build.c:833 +#: src/build.c:850 msgid "Make _object" msgstr "Make _Objekt-Datei" -#: src/build.c:837 +#: src/build.c:854 msgid "Compiles the current file using the make tool" msgstr "Kompiliert die aktuelle Datei mittels make " -#: src/build.c:868 +#: src/build.c:885 msgid "_Set Includes and Arguments" msgstr "_Programm-Parameter angeben" -#: src/build.c:873 +#: src/build.c:890 msgid "Sets the includes and library paths for the compiler and the program arguments for execution" msgstr "Include-Dateien und Bibliotheken-Pfade sowie Programmparameter festlegen" #. DVI -#: src/build.c:896 +#: src/build.c:913 msgid "LaTeX -> DVI" msgstr "LaTeX -> DVI" -#: src/build.c:899 +#: src/build.c:916 msgid "Compiles the current file into a DVI file" msgstr "Kompiliert die aktuelle Datei als DVI-Datei." #. PDF -#: src/build.c:910 +#: src/build.c:927 msgid "LaTeX -> PDF" msgstr "LaTeX -> PDF" -#: src/build.c:913 +#: src/build.c:930 msgid "Compiles the current file into a PDF file" msgstr "Kompiliert die aktuelle Datei als PDF-Datei." #. DVI view -#: src/build.c:961 +#: src/build.c:978 msgid "View DVI file" msgstr "DVI-Datei anzeigen" -#: src/build.c:968 -#: src/build.c:983 +#: src/build.c:985 +#: src/build.c:1000 msgid "Compiles and view the current file" msgstr "Kompiliert und zeigt die aktuelle Datei an." #. PDF view -#: src/build.c:977 +#: src/build.c:994 msgid "View PDF file" msgstr "PDF-Datei anzeigen" -#: src/build.c:1004 +#: src/build.c:1021 msgid "Sets the program paths and arguments" msgstr "Programm-Parameter angeben" -#: src/build.c:1178 +#: src/build.c:1195 #: src/keybindings.c:174 msgid "Make custom target" msgstr "Make mit eigenem Target" -#: src/build.c:1179 +#: src/build.c:1196 msgid "Enter custom options here, all entered text is passed to the make command." msgstr "Alles was Sie hier angeben, wird direkt an \"make\" übergeben." -#: src/build.c:1218 +#: src/build.c:1235 msgid "Failed to execute the view program" msgstr "Konnte das Anzeigeprogramm nicht ausführen." -#: src/build.c:1237 +#: src/build.c:1254 msgid "Failed to execute the terminal program" msgstr "Konnte das Terminal-Programm nicht ausführen." -#: src/build.c:1350 +#: src/build.c:1367 #, c-format msgid "Process could not be stopped (%s)." msgstr "Der Prozess konnte nicht angehalten werden (%s)." -#: src/prefs.c:301 +#: src/prefs.c:304 msgid "Action" msgstr "Aktion" -#: src/prefs.c:306 +#: src/prefs.c:309 msgid "Shortcut" msgstr "Tastenkürzel" -#: src/prefs.c:775 +#: src/prefs.c:778 msgid "Grab key" msgstr "Tasten festlegen" -#: src/prefs.c:779 +#: src/prefs.c:782 #, c-format msgid "Type the combination of the keys you want to use for \"%s\"" msgstr "Welche Tastenkomination soll für \"%s\" benutzt werden?" -#: src/prefs.c:903 +#: src/prefs.c:906 #, c-format msgid "The combination '%s' is already used for \"%s\". Please choose another one." msgstr "Die Tastenkombination '%s' wird bereits für \"%s\" verwendet. Bitte wählen Sie eine andere Tastenkombination." -#: src/prefs.c:947 -msgid "These are settings for the virtual terminal emulator widget (VTE). They only apply, if the VTE library could be loaded." -msgstr "Hier sehen Sie Einstellungen für die Terminalemulation (VTE). Änderungen werden nur wirksam, wenn die VTE-Bibliothek geladen werden konnte." - -#: src/prefs.c:963 -msgid "Terminal font" -msgstr "Terminal Schriftart" - -#: src/prefs.c:973 -msgid "Sets the font for the terminal widget." -msgstr "Ändert die Schriftart des Terminals." - -#: src/prefs.c:975 -msgid "Foreground color" -msgstr "Vordergrundfarbe" - -#: src/prefs.c:981 -msgid "Background color" -msgstr "Hintergrundfarbe" - -#: src/prefs.c:991 -msgid "Sets the foreground color of the text in the terminal widget." -msgstr "Setzt die Vordergrundfarbe für das Terminal." - -#: src/prefs.c:998 -msgid "Sets the background color of the text in the terminal widget." -msgstr "Setzt die Hintergrundfarbe für das Terminal." - -#: src/prefs.c:1001 -msgid "Scrollback lines" -msgstr "Zeilen zum Zurückrollen" - -#: src/prefs.c:1012 -msgid "Specifies the history in lines, which you can scroll back in the terminal widget." -msgstr "Gibt die Zeilen an, die man im Terminal zurückrollen kann." - -#: src/prefs.c:1016 -msgid "Terminal emulation" -msgstr "Terminalemulation" - -#: src/prefs.c:1026 -msgid "Controls how the terminal emulator should behave. xterm is a good start." -msgstr "Steuert wie sich das Terminal verhalten soll. In der Regel ist »xterm« ein guter Startwert." - -#: src/prefs.c:1028 -msgid "Shell" -msgstr "Shell" - -#: src/prefs.c:1038 -msgid "Sets the path to the shell which should be started inside the terminal emulation." -msgstr "Setzt den Pfad zu der Shell, die in der VTE benutzt werden soll." - -#: src/prefs.c:1050 -msgid "Scroll on keystroke" -msgstr "Bei Tastendruck scrollen" - -#: src/prefs.c:1054 -msgid "Whether to scroll to the bottom if a key was pressed." -msgstr "Legt fest, ob das Fenster bei einem Tastendruck bis zum Ende gescrollt werden soll." - -#: src/prefs.c:1057 -msgid "Scroll on output" -msgstr "Bei Ausgabe scrollen" - -#: src/prefs.c:1061 -msgid "Whether to scroll to the bottom if an output was generated." -msgstr "Legt fest, ob das Fenster bei Ausgabe bis zum Ende gescrollt werden soll." - -#: src/prefs.c:1064 -msgid "Disable menu shortcut key (F10 by default)" -msgstr "Me_nütastenkombination deaktivieren (Vorgabe ist F10)" - -#: src/prefs.c:1068 -msgid "This option disables the keybinding to popup the menu bar (default is F10). Disabling it can be useful if you use, for example, Midnight Commander within the VTE." -msgstr "Diese Option deaktiviert bestimmte Tastenkombinationen des Menüs. Eine Deaktivierung kann sinnvoll sein, wenn Sie zum Beispiel den Midnight Commander in der VTE benutzen möchten." - -#: src/prefs.c:1071 -msgid "Follow the path of the current file" -msgstr "Pfad der aktuellen Datei setzen" - -#: src/prefs.c:1075 -msgid "Whether to execute \"cd $path\" when you switch between opened files." -msgstr "Legt fest, ob \"cd $path\" in der VTE ausgeführt werden soll, wenn Sie zwischen geöffneten Dateien wechseln." - -#: src/prefs.c:1078 -#: src/vte.c:168 -msgid "Terminal" -msgstr "Terminal" - #: src/about.c:117 msgid "About Geany" msgstr "Über Geany" @@ -2571,10 +2481,103 @@ msgid "Reload" msgstr "Neu laden" -#: src/vte.c:376 +#: src/vte.c:170 +#: src/vte.c:495 +msgid "Terminal" +msgstr "Terminal" + +#: src/vte.c:366 msgid "_Input Methods" msgstr "_Eingabemethoden" +#: src/vte.c:491 +msgid "Terminal plugin" +msgstr "Terminalplugin" + +#: src/vte.c:498 +msgid "These settings for the virtual terminal emulator widget (VTE) only apply if the VTE library could be loaded." +msgstr "Die Einstellungen für VTE werden nur wirksam, wenn die VTE-Bibliothek erfolgreich geladen werden konnte." + +#: src/vte.c:509 +msgid "Terminal font:" +msgstr "Terminalschriftart:" + +#: src/vte.c:519 +msgid "Sets the font for the terminal widget." +msgstr "Ändert die Schriftart des Terminals." + +#: src/vte.c:521 +msgid "Foreground color:" +msgstr "Vordergrundfarbe:" + +#: src/vte.c:527 +msgid "Background color:" +msgstr "Hintergrundfarbe:" + +#: src/vte.c:537 +msgid "Sets the foreground color of the text in the terminal widget." +msgstr "Setzt die Vordergrundfarbe für das Terminal." + +#: src/vte.c:544 +msgid "Sets the background color of the text in the terminal widget." +msgstr "Setzt die Hintergrundfarbe für das Terminal." + +#: src/vte.c:547 +msgid "Scrollback lines:" +msgstr "Zeilen zum Zurückrollen:" + +#: src/vte.c:558 +msgid "Specifies the history in lines, which you can scroll back in the terminal widget." +msgstr "Gibt die Zeilen an, die man im Terminal zurückrollen kann." + +#: src/vte.c:562 +msgid "Terminal emulation:" +msgstr "Terminalemulation:" + +#: src/vte.c:572 +msgid "Controls how the terminal emulator should behave. xterm is a good start." +msgstr "Steuert wie sich das Terminal verhalten soll. In der Regel ist »xterm« ein guter Startwert." + +#: src/vte.c:574 +msgid "Shell:" +msgstr "Shell:" + +#: src/vte.c:581 +msgid "Sets the path to the shell which should be started inside the terminal emulation." +msgstr "Setzt den Pfad zu der Shell, die in der VTE benutzt werden soll." + +#: src/vte.c:598 +msgid "Scroll on keystroke" +msgstr "Bei Tastendruck scrollen" + +#: src/vte.c:599 +msgid "Whether to scroll to the bottom if a key was pressed." +msgstr "Legt fest, ob das Fenster bei einem Tastendruck bis zum Ende gescrollt werden soll." + +#: src/vte.c:603 +msgid "Scroll on output" +msgstr "Bei Ausgabe scrollen" + +#: src/vte.c:604 +msgid "Whether to scroll to the bottom when output is generated." +msgstr "Legt fest, ob das Fenster bei einer Ausgabe gescrollt werden soll." + +#: src/vte.c:608 +msgid "Disable menu shortcut key (F10 by default)" +msgstr "Me_nütastenkombination deaktivieren (Vorgabe ist F10)" + +#: src/vte.c:609 +msgid "This option disables the keybinding to popup the menu bar (default is F10). Disabling it can be useful if you use, for example, Midnight Commander within the VTE." +msgstr "Diese Option deaktiviert bestimmte Tastenkombinationen des Menüs. Eine Deaktivierung kann sinnvoll sein, wenn Sie zum Beispiel den Midnight Commander in der VTE benutzen möchten." + +#: src/vte.c:613 +msgid "Follow the path of the current file" +msgstr "Pfad der aktuellen Datei setzen" + +#: src/vte.c:614 +msgid "Whether to execute \"cd $path\" when you switch between opened files." +msgstr "Legt fest, ob \"cd $path\" in der VTE ausgeführt werden soll, wenn Sie zwischen geöffneten Dateien wechseln." + #: src/keybindings.c:113 msgid "New" msgstr "Neu" @@ -2914,37 +2917,42 @@ msgid "Select folder" msgstr "Ordner wählen" -#: src/search.c:942 +#: src/search.c:902 +#, c-format +msgid "Replaced text in %u files." +msgstr "Text wurde in %u Dateien ersetzt. " + +#: src/search.c:949 msgid "Invalid directory for find in files." msgstr "Ungültiges Verzeichnis." -#: src/search.c:972 +#: src/search.c:979 msgid "No text to find." msgstr "Kein Text zum Suchen angegeben." -#: src/search.c:1000 +#: src/search.c:1007 #, c-format msgid "Cannot execute grep tool '%s'; check the path setting in Preferences." msgstr "Konnte das grep Kommando '%s' nicht finden (Pfad zum Grep Kommando in den Einstellungen überprüfen)." -#: src/search.c:1115 +#: src/search.c:1122 #, c-format msgid "Could not open directory (%s)" msgstr "Konnte Verzeichnis nicht öffnen (%s)." -#: src/search.c:1160 +#: src/search.c:1167 msgid "Search failed." msgstr "Suche schlug fehl." -#: src/search.c:1166 +#: src/search.c:1173 msgid "Search completed." msgstr "Suche abgeschlossen." -#: src/search.c:1167 +#: src/search.c:1174 msgid "No matches found." msgstr "Keine Treffer gefunden." -#: src/search.c:1242 +#: src/search.c:1249 #, c-format msgid "No matches found for '%s'." msgstr "Keine Treffer für '%s' gefunden." This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1034] trunk
by ntrel＠users.sourceforge.net 27 Nov '06

27 Nov '06

Revision: 1034 http://svn.sourceforge.net/geany/?rev=1034&view=rev Author: ntrel Date: 2006-11-27 03:32:45 -0800 (Mon, 27 Nov 2006) Log Message: ----------- Show build result on status bar if Compiler window is not selected. Modified Paths: -------------- trunk/ChangeLog trunk/src/build.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-11-25 17:07:59 UTC (rev 1033) +++ trunk/ChangeLog 2006-11-27 11:32:45 UTC (rev 1034) @@ -1,3 +1,9 @@ +2006-11-27 Nick Treleaven <nick.treleaven(a)btinternet.com> + + * src/build.c: + Show build result on status bar if Compiler window is not selected. + + 2006-11-25 Nick Treleaven <nick.treleaven(a)btinternet.com> * src/msgwindow.c, src/notebook.c, src/msgwindow.h, src/notebook.h: Modified: trunk/src/build.c =================================================================== --- trunk/src/build.c 2006-11-25 17:07:59 UTC (rev 1033) +++ trunk/src/build.c 2006-11-27 11:32:45 UTC (rev 1034) @@ -674,6 +674,35 @@ } +static void show_build_result_message(gboolean failure) +{ + gchar *msg; + + if (failure) + { + msg = _("Compilation failed."); + msgwin_compiler_add(COLOR_DARK_RED, TRUE, "%s", msg); + // If msgwindow is hidden, user will want to display it to see the error + if (! app->msgwindow_visible) + { + gtk_notebook_set_current_page(GTK_NOTEBOOK(msgwindow.notebook), MSG_COMPILER); + msgwin_show(); + } + else + if (gtk_notebook_get_current_page(GTK_NOTEBOOK(msgwindow.notebook)) != MSG_COMPILER) + ui_set_statusbar("%s", msg); + } + else + { + msg = _("Compilation finished successfully."); + msgwin_compiler_add(COLOR_BLUE, TRUE, "%s", msg); + if (! app->msgwindow_visible || + gtk_notebook_get_current_page(GTK_NOTEBOOK(msgwindow.notebook)) != MSG_COMPILER) + ui_set_statusbar("%s", msg); + } +} + + static void build_exit_cb(GPid child_pid, gint status, gpointer user_data) { if (build_info.type != GBO_RUN) // not necessary when executing a file @@ -695,19 +724,7 @@ { // any other failure occured failure = TRUE; } - - - if (failure) - { - msgwin_compiler_add(COLOR_DARK_RED, TRUE, _("Compilation failed.")); - if (! app->msgwindow_visible) msgwin_show(); - } - else - { - gchar *msg = _("Compilation finished successfully."); - msgwin_compiler_add(COLOR_BLUE, TRUE, msg); - if (! app->msgwindow_visible) ui_set_statusbar("%s", msg); - } + show_build_result_message(failure); #endif } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1033] trunk
by ntrel＠users.sourceforge.net 25 Nov '06

25 Nov '06

Revision: 1033 http://svn.sourceforge.net/geany/?rev=1033&view=rev Author: ntrel Date: 2006-11-25 09:07:59 -0800 (Sat, 25 Nov 2006) Log Message: ----------- Change python default compile command to create a compiled python .pyc file (thanks to Bajusz Tam?\195?\161s). Modified Paths: -------------- trunk/ChangeLog trunk/data/filetypes.python Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-11-25 16:33:38 UTC (rev 1032) +++ trunk/ChangeLog 2006-11-25 17:07:59 UTC (rev 1033) @@ -15,6 +15,9 @@ src/document.c, src/ui_utils.c: Make ui_set_statusbar() use printf-style arguments & assume the message should not be overridden. + * data/filetypes.python: + Change python default compile command to create a compiled python + .pyc file (thanks to Bajusz Tamás). 2006-11-24 Nick Treleaven <nick.treleaven(a)btinternet.com> Modified: trunk/data/filetypes.python =================================================================== --- trunk/data/filetypes.python 2006-11-25 16:33:38 UTC (rev 1032) +++ trunk/data/filetypes.python 2006-11-25 17:07:59 UTC (rev 1033) @@ -41,5 +41,5 @@ # %f will be replaced by the complete filename # %e will be replaced by the filename without extension # (use only one of it at one time) -compiler=python "%f" +compiler=python -c "import py_compile; py_compile.compile('%f')" run_cmd=python "%f" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1032] trunk
by ntrel＠users.sourceforge.net 25 Nov '06

25 Nov '06

Revision: 1032 http://svn.sourceforge.net/geany/?rev=1032&view=rev Author: ntrel Date: 2006-11-25 08:33:38 -0800 (Sat, 25 Nov 2006) Log Message: ----------- Make ui_set_statusbar() use printf-style arguments & assume the message should not be overridden. Modified Paths: -------------- trunk/ChangeLog trunk/src/build.c trunk/src/document.c trunk/src/msgwindow.c trunk/src/search.c trunk/src/ui_utils.c trunk/src/ui_utils.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-11-25 12:32:22 UTC (rev 1031) +++ trunk/ChangeLog 2006-11-25 16:33:38 UTC (rev 1032) @@ -11,6 +11,10 @@ of the files changed. Show the filename when replacing text over a range. Add DOC_FILENAME() null-safe macro to get the filename at doc_idx. + * src/build.c, src/ui_utils.h, src/msgwindow.c, src/search.c, + src/document.c, src/ui_utils.c: + Make ui_set_statusbar() use printf-style arguments & assume the + message should not be overridden. 2006-11-24 Nick Treleaven <nick.treleaven(a)btinternet.com> Modified: trunk/src/build.c =================================================================== --- trunk/src/build.c 2006-11-25 12:32:22 UTC (rev 1031) +++ trunk/src/build.c 2006-11-25 16:33:38 UTC (rev 1032) @@ -706,7 +706,7 @@ { gchar *msg = _("Compilation finished successfully."); msgwin_compiler_add(COLOR_BLUE, TRUE, msg); - if (! app->msgwindow_visible) ui_set_statusbar(msg, FALSE); + if (! app->msgwindow_visible) ui_set_statusbar("%s", msg); } #endif } Modified: trunk/src/document.c =================================================================== --- trunk/src/document.c 2006-11-25 12:32:22 UTC (rev 1031) +++ trunk/src/document.c 2006-11-25 16:33:38 UTC (rev 1032) @@ -982,9 +982,7 @@ { if (! inc) { - gchar *msg = g_strdup_printf(_("\"%s\" was not found."), text); - ui_set_statusbar(msg, FALSE); - g_free(msg); + ui_set_statusbar(_("\"%s\" was not found."), text); } utils_beep(); sci_goto_pos(doc_list[idx].sci, start_pos, FALSE); // clear selection @@ -1036,10 +1034,7 @@ if ((selection_end == 0 && ! search_backwards) || (selection_end == sci_len && search_backwards)) { - gchar *msg = g_strdup_printf(_("\"%s\" was not found."), text); - - ui_set_statusbar(msg, FALSE); - g_free(msg); + ui_set_statusbar(_("\"%s\" was not found."), text); utils_beep(); return -1; } Modified: trunk/src/msgwindow.c =================================================================== --- trunk/src/msgwindow.c 2006-11-25 12:32:22 UTC (rev 1031) +++ trunk/src/msgwindow.c 2006-11-25 16:33:38 UTC (rev 1032) @@ -169,7 +169,7 @@ va_list args; va_start(args, format); - g_vsnprintf(string, 511, format, args); + g_vsnprintf(string, 512, format, args); va_end(args); switch (msg_color) @@ -229,11 +229,11 @@ va_list args; va_start(args, format); - g_vsnprintf(string, 511, format, args); + g_vsnprintf(string, 512, format, args); va_end(args); // display status message in status bar - ui_set_statusbar(string, FALSE); + ui_set_statusbar("%s", string); // add a timestamp to status messages time_str = utils_get_current_time_string(); Modified: trunk/src/search.c =================================================================== --- trunk/src/search.c 2006-11-25 12:32:22 UTC (rev 1031) +++ trunk/src/search.c 2006-11-25 16:33:38 UTC (rev 1032) @@ -888,7 +888,7 @@ case GEANY_RESPONSE_REPLACE_IN_SESSION: { guint n, count = 0; - gchar *msg; + // replace in all documents following notebook tab order for (n = 0; (gint) n < gtk_notebook_get_n_pages(GTK_NOTEBOOK(app->notebook)); n++) { @@ -899,9 +899,7 @@ if (document_replace_all(idx, find, replace, search_flags_re, search_replace_escape_re)) count++; } - msg = g_strdup_printf(_("Replaced text in %u files."), count); - ui_set_statusbar(msg, FALSE); - g_free(msg); + ui_set_statusbar(_("Replaced text in %u files."), count); ui_save_buttons_toggle(doc_list[idx].changed); // update save all if (close_window) gtk_widget_hide(widgets.replace_dialog); @@ -1239,7 +1237,7 @@ else { guint i; - for(i = 0; i < doc_array->len; i++) + for (i = 0; i < doc_array->len; i++) { if (doc_list[i].is_valid) if (find_document_usage(i, search_text, flags) > 0) found = TRUE; @@ -1249,7 +1247,7 @@ if (! found) // no matches were found { gchar *text = g_strdup_printf(_("No matches found for '%s'."), search_text); - ui_set_statusbar(text, FALSE); + ui_set_statusbar("%s", text); msgwin_msg_add(-1, -1, text); g_free(text); } Modified: trunk/src/ui_utils.c =================================================================== --- trunk/src/ui_utils.c 2006-11-25 12:32:22 UTC (rev 1031) +++ trunk/src/ui_utils.c 2006-11-25 16:33:38 UTC (rev 1032) @@ -50,7 +50,7 @@ /* allow_override is TRUE if text can be ignored when another message has been set * that didn't use allow_override and has not timed out. */ -void ui_set_statusbar(const gchar *text, gboolean allow_override) +static void set_statusbar(const gchar *text, gboolean allow_override) { static glong last_time = 0; GTimeVal timeval; @@ -73,7 +73,21 @@ } -/* updates the status bar */ +// Display text on the statusbar (without logging it to the Status window). +void ui_set_statusbar(const gchar *format, ...) +{ + gchar string[512]; + va_list args; + + va_start(args, format); + g_vsnprintf(string, 512, format, args); + va_end(args); + + set_statusbar(string, FALSE); +} + + +/* updates the status bar document statistics */ void ui_update_statusbar(gint idx, gint pos) { gchar *text; @@ -89,9 +103,9 @@ if (pos == -1) pos = sci_get_current_position(doc_list[idx].sci); line = sci_get_line_from_position(doc_list[idx].sci, pos); - // Add temporary fix for sci infinite loop in Document::GetColumn(int) - // when current pos is beyond document end (can occur when removing - // blocks of selected lines especially esp. brace sections near end of file). + // Add temporary fix for sci infinite loop in Document::GetColumn(int) + // when current pos is beyond document end (can occur when removing + // blocks of selected lines especially esp. brace sections near end of file). if (pos <= sci_get_length(doc_list[idx].sci)) col = sci_get_col_from_position(doc_list[idx].sci, pos); else @@ -108,12 +122,12 @@ (doc_list[idx].encoding) ? doc_list[idx].encoding : _("unknown"), (utils_is_unicode_charset(doc_list[idx].encoding)) ? ((doc_list[idx].has_bom) ? _("(with BOM)") : _("(without BOM)")) : "", (doc_list[idx].file_type) ? doc_list[idx].file_type->title : _("unknown")); - ui_set_statusbar(text, TRUE); //can be overridden by status messages + set_statusbar(text, TRUE); // can be overridden by status messages g_free(text); } else { - ui_set_statusbar("", TRUE); //can be overridden by status messages + set_statusbar("", TRUE); // can be overridden by status messages } } Modified: trunk/src/ui_utils.h =================================================================== --- trunk/src/ui_utils.h 2006-11-25 12:32:22 UTC (rev 1031) +++ trunk/src/ui_utils.h 2006-11-25 16:33:38 UTC (rev 1032) @@ -24,9 +24,8 @@ #ifndef GEANY_UI_UTILS_H #define GEANY_UI_UTILS_H 1 -/* allow_override is TRUE if text can be ignored when another message has been set - * that didn't use allow_override and has not timed out. */ -void ui_set_statusbar(const gchar *text, gboolean allow_override); +// Display text on the statusbar without logging it to the Status window. +void ui_set_statusbar(const gchar *format, ...) G_GNUC_PRINTF (1, 2); void ui_update_statusbar(gint idx, gint pos); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1031] trunk
by ntrel＠users.sourceforge.net 25 Nov '06

25 Nov '06

Revision: 1031 http://svn.sourceforge.net/geany/?rev=1031&view=rev Author: ntrel Date: 2006-11-25 04:32:22 -0800 (Sat, 25 Nov 2006) Log Message: ----------- When replacing in session, use notebook page order and show a count of the files changed. Show the filename when replacing text over a range. Add DOC_FILENAME() null-safe macro to get the filename at doc_idx. Modified Paths: -------------- trunk/ChangeLog trunk/src/document.c trunk/src/document.h trunk/src/search.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-11-25 12:23:49 UTC (rev 1030) +++ trunk/ChangeLog 2006-11-25 12:32:22 UTC (rev 1031) @@ -6,6 +6,11 @@ * src/vte.c: Remove vte_char_size_changed() workaround, not needed since r988; this also fixes an issue where the VTE is limited to 30x5 chars. + * src/search.c, src/document.c, src/document.h: + When replacing in session, use notebook page order and show a count + of the files changed. + Show the filename when replacing text over a range. + Add DOC_FILENAME() null-safe macro to get the filename at doc_idx. 2006-11-24 Nick Treleaven <nick.treleaven(a)btinternet.com> Modified: trunk/src/document.c =================================================================== --- trunk/src/document.c 2006-11-25 12:23:49 UTC (rev 1030) +++ trunk/src/document.c 2006-11-25 12:32:22 UTC (rev 1031) @@ -305,7 +305,6 @@ g_free(fname); title = (filename) ? g_path_get_basename(filename) : g_strdup(GEANY_STRING_UNTITLED); - tabnum = notebook_new_tab(new_idx, title, GTK_WIDGET(sci)); gtk_notebook_set_current_page(GTK_NOTEBOOK(app->notebook), tabnum); @@ -365,8 +364,7 @@ //g_object_unref(doc_list[idx].tag_tree); // no need to unref when destroying? gtk_widget_destroy(doc_list[idx].tag_tree); } - msgwin_status_add(_("File %s closed."), - (doc_list[idx].file_name) ? doc_list[idx].file_name : GEANY_STRING_UNTITLED); + msgwin_status_add(_("File %s closed."), DOC_FILENAME(idx)); g_free(doc_list[idx].encoding); g_free(doc_list[idx].saved_encoding.encoding); g_free(doc_list[idx].file_name); @@ -1130,7 +1128,7 @@ gint count = 0; gint find_len = 0, replace_len = 0; gboolean match_found = FALSE; - gchar *escaped_find_text, *escaped_replace_text; + gchar *escaped_find_text, *escaped_replace_text, *filename; struct TextToFind ttf; g_return_val_if_fail(find_text != NULL && replace_text != NULL, FALSE); @@ -1164,22 +1162,24 @@ } sci_end_undo_action(doc_list[idx].sci); + filename = g_path_get_basename(DOC_FILENAME(idx)); + if (escaped_chars) { // escape special characters for showing escaped_find_text = g_strescape(find_text, NULL); escaped_replace_text = g_strescape(replace_text, NULL); - msgwin_status_add(_("Replaced %d occurrences of \"%s\" with \"%s\"."), - count, escaped_find_text, escaped_replace_text); + msgwin_status_add(_("%s: replaced %d occurrences of \"%s\" with \"%s\"."), + filename, count, escaped_find_text, escaped_replace_text); g_free(escaped_find_text); g_free(escaped_replace_text); } else { - msgwin_status_add(_("Replaced %d occurrences of \"%s\" with \"%s\"."), - count, find_text, replace_text); + msgwin_status_add(_("%s: replaced %d occurrences of \"%s\" with \"%s\"."), + filename, count, find_text, replace_text); } + g_free(filename); - if (match_found) { // scroll last match in view. @@ -1220,16 +1220,21 @@ } -void document_replace_all(gint idx, const gchar *find_text, const gchar *replace_text, - gint flags, gboolean escaped_chars) +// returns TRUE if at least one replacement was made. +gboolean document_replace_all(gint idx, const gchar *find_text, const gchar *replace_text, + gint flags, gboolean escaped_chars) { gint len; - g_return_if_fail(find_text != NULL && replace_text != NULL); - if (idx == -1 || ! *find_text) return; + g_return_val_if_fail(find_text != NULL && replace_text != NULL, FALSE); + if (idx == -1 || ! *find_text) return FALSE; len = sci_get_length(doc_list[idx].sci); if (document_replace_range(idx, find_text, replace_text, flags, 0, len, escaped_chars) == -1) + { utils_beep(); + return FALSE; + } + return TRUE; } Modified: trunk/src/document.h =================================================================== --- trunk/src/document.h 2006-11-25 12:23:49 UTC (rev 1030) +++ trunk/src/document.h 2006-11-25 12:32:22 UTC (rev 1031) @@ -82,7 +82,11 @@ #define DOC_IDX_VALID(idx) \ ((idx) >= 0 && (guint)(idx) < doc_array->len && doc_list[idx].is_valid) +#define DOC_FILENAME(doc_idx) \ + ((doc_list[doc_idx].file_name != NULL) ? \ + (doc_list[doc_idx].file_name) : GEANY_STRING_UNTITLED) + /* returns the index of the notebook page which has the given filename */ gint document_find_by_filename(const gchar*, gboolean is_tm_filename); @@ -155,7 +159,8 @@ gint document_replace_text(gint idx, const gchar *find_text, const gchar *replace_text, gint flags, gboolean search_backwards); -void document_replace_all(gint, const gchar*, const gchar*, gint, gboolean); +gboolean document_replace_all(gint idx, const gchar *find_text, const gchar *replace_text, + gint flags, gboolean escaped_chars); void document_replace_sel(gint, const gchar*, const gchar*, gint, gboolean); Modified: trunk/src/search.c =================================================================== --- trunk/src/search.c 2006-11-25 12:23:49 UTC (rev 1030) +++ trunk/src/search.c 2006-11-25 12:32:22 UTC (rev 1031) @@ -887,13 +887,22 @@ } case GEANY_RESPONSE_REPLACE_IN_SESSION: { - guint i; - for (i = 0; i < doc_array->len; i++) + guint n, count = 0; + gchar *msg; + // replace in all documents following notebook tab order + for (n = 0; (gint) n < gtk_notebook_get_n_pages(GTK_NOTEBOOK(app->notebook)); n++) { - if (! doc_list[i].is_valid) continue; + gint idx = document_get_n_idx(n); - document_replace_all(i, find, replace, search_flags_re, search_replace_escape_re); + if (! doc_list[idx].is_valid) continue; + + if (document_replace_all(idx, find, replace, search_flags_re, + search_replace_escape_re)) count++; } + msg = g_strdup_printf(_("Replaced text in %u files."), count); + ui_set_statusbar(msg, FALSE); + g_free(msg); + ui_save_buttons_toggle(doc_list[idx].changed); // update save all if (close_window) gtk_widget_hide(widgets.replace_dialog); break; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1030] trunk
by ntrel＠users.sourceforge.net 25 Nov '06

25 Nov '06

Revision: 1030 http://svn.sourceforge.net/geany/?rev=1030&view=rev Author: ntrel Date: 2006-11-25 04:23:49 -0800 (Sat, 25 Nov 2006) Log Message: ----------- Remove vte_char_size_changed() workaround, not needed since r988; this also fixes an issue where the VTE is limited to 30x5 chars. Modified Paths: -------------- trunk/ChangeLog trunk/src/vte.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-11-25 12:17:50 UTC (rev 1029) +++ trunk/ChangeLog 2006-11-25 12:23:49 UTC (rev 1030) @@ -3,6 +3,9 @@ * src/msgwindow.c, src/notebook.c, src/msgwindow.h, src/notebook.h: Add some const char* argument modifiers, remove unneeded static from some local vars. + * src/vte.c: + Remove vte_char_size_changed() workaround, not needed since r988; + this also fixes an issue where the VTE is limited to 30x5 chars. 2006-11-24 Nick Treleaven <nick.treleaven(a)btinternet.com> Modified: trunk/src/vte.c =================================================================== --- trunk/src/vte.c 2006-11-25 12:17:50 UTC (rev 1029) +++ trunk/src/vte.c 2006-11-25 12:23:49 UTC (rev 1030) @@ -58,8 +58,6 @@ static void vte_register_symbols(GModule *module); static void vte_popup_menu_clicked(GtkMenuItem *menuitem, gpointer user_data); static GtkWidget *vte_create_popup_menu(void); -static void vte_char_size_changed(VteTerminal *vteterminal, guint arg1, guint arg2, - gpointer user_data); /* taken from anjuta, thanks */ @@ -151,8 +149,11 @@ gtk_box_pack_start(GTK_BOX(hbox), vte, TRUE, TRUE, 0); gtk_box_pack_start(GTK_BOX(hbox), scrollbar, FALSE, FALSE, 0); + /* set the default widget size first to prevent VTE expanding too much, + * sometimes causing the hscrollbar to be too big or out of view. */ gtk_widget_set_size_request(GTK_WIDGET(vte), 10, 10); vf->vte_terminal_set_size(VTE_TERMINAL(vte), 30, 1); + //vf->vte_terminal_set_encoding(VTE_TERMINAL(vte), "UTF-8"); vf->vte_terminal_set_mouse_autohide(VTE_TERMINAL(vte), TRUE); vf->vte_terminal_set_word_chars(VTE_TERMINAL(vte), VTE_WORDCHARS); @@ -160,8 +161,6 @@ g_signal_connect(G_OBJECT(vte), "child-exited", G_CALLBACK(vte_start), NULL); g_signal_connect(G_OBJECT(vte), "button-press-event", G_CALLBACK(vte_button_pressed), NULL); g_signal_connect(G_OBJECT(vte), "event", G_CALLBACK(vte_keypress), NULL); - g_signal_connect(G_OBJECT(vte), "char-size-changed", - G_CALLBACK(vte_char_size_changed), NULL); //g_signal_connect(G_OBJECT(vte), "drag-data-received", G_CALLBACK(vte_drag_data_received), NULL); //g_signal_connect(G_OBJECT(vte), "drag-drop", G_CALLBACK(vte_drag_drop), NULL); @@ -252,17 +251,6 @@ } -static void vte_char_size_changed(VteTerminal *vteterminal, guint arg1, guint arg2, - gpointer user_data) -{ - /* Now the font may have changed, we must limit the width, otherwise the - * vertical scroll bar will disappear e.g. for Monospace > 10. - * We don't want to set height, but there's no way to set just width, so say 5. - * The VTE will be safely enlarged by GTK, above 30, 5 after this callback. */ - vf->vte_terminal_set_size(VTE_TERMINAL(vc->vte), 30, 5); -} - - static void vte_register_symbols(GModule *mod) { g_module_symbol(mod, "vte_terminal_new", (void*)&vf->vte_terminal_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: [1029] trunk
by ntrel＠users.sourceforge.net 25 Nov '06

25 Nov '06

Revision: 1029 http://svn.sourceforge.net/geany/?rev=1029&view=rev Author: ntrel Date: 2006-11-25 04:17:50 -0800 (Sat, 25 Nov 2006) Log Message: ----------- Add some const char* argument modifiers, remove unneeded static from some local vars. Modified Paths: -------------- trunk/ChangeLog trunk/src/msgwindow.c trunk/src/msgwindow.h trunk/src/notebook.c trunk/src/notebook.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-11-24 11:55:26 UTC (rev 1028) +++ trunk/ChangeLog 2006-11-25 12:17:50 UTC (rev 1029) @@ -1,3 +1,10 @@ +2006-11-25 Nick Treleaven <nick.treleaven(a)btinternet.com> + + * src/msgwindow.c, src/notebook.c, src/msgwindow.h, src/notebook.h: + Add some const char* argument modifiers, remove unneeded static from + some local vars. + + 2006-11-24 Nick Treleaven <nick.treleaven(a)btinternet.com> * src/ui_utils.h, src/prefs.c, src/dialogs.c, src/ui_utils.c: Modified: trunk/src/msgwindow.c =================================================================== --- trunk/src/msgwindow.c 2006-11-24 11:55:26 UTC (rev 1028) +++ trunk/src/msgwindow.c 2006-11-25 12:17:50 UTC (rev 1029) @@ -49,8 +49,8 @@ gint file_idx; // idx of the field where the filename is or -1 } ParseData; -static GdkColor dark = {0, 58832, 58832, 58832}; -static GdkColor white = {0, 65535, 65535, 65535}; +static const GdkColor dark = {0, 58832, 58832, 58832}; +static const GdkColor white = {0, 65535, 65535, 65535}; MessageWindow msgwindow; @@ -156,16 +156,16 @@ // adds string to the compiler textview -void msgwin_compiler_add(gint msg_color, gboolean scroll, gchar const *format, ...) +void msgwin_compiler_add(gint msg_color, gboolean scroll, const gchar *format, ...) { GtkTreeIter iter; GtkTreePath *path; - GdkColor *color; - static GdkColor red = {0, 65535, 0, 0}; - static GdkColor dark_red = {0, 65535 / 2, 0, 0}; - static GdkColor blue = {0, 0, 0, 65535}; - static GdkColor black = {0, 0, 0, 0}; - static gchar string[512]; + const GdkColor *color; + const GdkColor red = {0, 65535, 0, 0}; + const GdkColor dark_red = {0, 65535 / 2, 0, 0}; + const GdkColor blue = {0, 0, 0, 65535}; + const GdkColor black = {0, 0, 0, 0}; + gchar string[512]; va_list args; va_start(args, format); @@ -206,7 +206,7 @@ // adds string to the msg treeview -void msgwin_msg_add(gint line, gint idx, gchar *string) +void msgwin_msg_add(gint line, gint idx, const gchar *string) { GtkTreeIter iter; static gint state = 0; @@ -219,12 +219,12 @@ } -// adds a status message -void msgwin_status_add(gchar const *format, ...) +// logs a status message (use ui_set_statusbar() to just display text on the statusbar) +void msgwin_status_add(const gchar *format, ...) { GtkTreeIter iter; static gint state = 0; - static gchar string[512]; + gchar string[512]; gchar *statusmsg, *time_str; va_list args; Modified: trunk/src/msgwindow.h =================================================================== --- trunk/src/msgwindow.h 2006-11-24 11:55:26 UTC (rev 1028) +++ trunk/src/msgwindow.h 2006-11-25 12:17:50 UTC (rev 1029) @@ -74,12 +74,12 @@ void msgwin_show(); -void msgwin_msg_add(gint line, gint idx, gchar *string); +void msgwin_msg_add(gint line, gint idx, const gchar *string); -void msgwin_compiler_add(gint msg_color, gboolean scroll, gchar const *format, ...) +void msgwin_compiler_add(gint msg_color, gboolean scroll, const gchar *format, ...) G_GNUC_PRINTF (3, 4); -void msgwin_status_add(gchar const *format, ...) G_GNUC_PRINTF (1, 2); +void msgwin_status_add(const gchar *format, ...) G_GNUC_PRINTF (1, 2); GtkWidget *msgwin_create_message_popup_menu(gint type); Modified: trunk/src/notebook.c =================================================================== --- trunk/src/notebook.c 2006-11-24 11:55:26 UTC (rev 1028) +++ trunk/src/notebook.c 2006-11-25 12:17:50 UTC (rev 1029) @@ -295,7 +295,7 @@ /* Returns index of notebook page, or -1 on error */ -gint notebook_new_tab(gint doc_idx, gchar *title, GtkWidget *page) +gint notebook_new_tab(gint doc_idx, const gchar *title, GtkWidget *page) { GtkWidget *hbox, *but; GtkWidget *align; Modified: trunk/src/notebook.h =================================================================== --- trunk/src/notebook.h 2006-11-24 11:55:26 UTC (rev 1028) +++ trunk/src/notebook.h 2006-11-25 12:17:50 UTC (rev 1029) @@ -27,7 +27,7 @@ void notebook_init(); /* Returns index of notebook page, or -1 on error */ -gint notebook_new_tab(gint doc_idx, gchar *title, GtkWidget *page); +gint notebook_new_tab(gint doc_idx, const gchar *title, GtkWidget *page); // Always use this instead of gtk_notebook_remove_page(). void notebook_remove_page(gint page_num); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits November 2006