Plugins-Commits January 2009

plugins-commits@lists.geany.org

5 participants
56 discussions

SF.net SVN: geany-plugins:[406] branches/GeanyVC_menu_redesign
by kugel-＠users.sourceforge.net 26 Jan '09

26 Jan '09

Revision: 406 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=406&view=rev Author: kugel- Date: 2009-01-26 22:51:55 +0000 (Mon, 26 Jan 2009) Log Message: ----------- Use flags in command_with_question_activated (and remove the ask flag). Commands can set FLAG_DIR, so that the dir instead of the filename will passed to that command. Remove code which is only needed to reload the file after an action, and use command_with_question_activated for the reload (with FLAG_RELOAD). Some other cleanup. Run that rediculous indent-all.sh script. Modified Paths: -------------- branches/GeanyVC_menu_redesign/geanyvc.c branches/GeanyVC_menu_redesign/geanyvc.h Modified: branches/GeanyVC_menu_redesign/geanyvc.c =================================================================== --- branches/GeanyVC_menu_redesign/geanyvc.c 2009-01-26 18:52:40 UTC (rev 405) +++ branches/GeanyVC_menu_redesign/geanyvc.c 2009-01-26 22:51:55 UTC (rev 406) @@ -131,9 +131,7 @@ }; PLUGIN_KEY_GROUP(geanyvc, COUNT_KB) - -GSList * -get_commit_files_null(G_GNUC_UNUSED const gchar * dir) +GSList *get_commit_files_null(G_GNUC_UNUSED const gchar * dir) { return NULL; } @@ -446,23 +444,23 @@ if (cur != g_slist_last(largv)) { utils_spawn_sync(dir, cur->data, (gchar **) env, - G_SPAWN_SEARCH_PATH | G_SPAWN_STDOUT_TO_DEV_NULL | - G_SPAWN_STDERR_TO_DEV_NULL, NULL, NULL, NULL, NULL, - &exit_code, &error); + G_SPAWN_SEARCH_PATH | G_SPAWN_STDOUT_TO_DEV_NULL | + G_SPAWN_STDERR_TO_DEV_NULL, NULL, NULL, NULL, NULL, + &exit_code, &error); } else { utils_spawn_sync(dir, cur->data, (gchar **) env, - G_SPAWN_SEARCH_PATH | (std_out ? 0 : - G_SPAWN_STDOUT_TO_DEV_NULL) | - (std_err ? 0 : G_SPAWN_STDERR_TO_DEV_NULL), NULL, NULL, - std_out, std_err, &exit_code, &error); + G_SPAWN_SEARCH_PATH | (std_out ? 0 : + G_SPAWN_STDOUT_TO_DEV_NULL) | + (std_err ? 0 : G_SPAWN_STDERR_TO_DEV_NULL), NULL, NULL, + std_out, std_err, &exit_code, &error); } if (error) { g_warning("geanyvc: s_spawn_sync error: %s", error->message); ui_set_statusbar(FALSE, _("geanyvc: s_spawn_sync error: %s"), - error->message); + error->message); g_error_free(error); } @@ -478,8 +476,7 @@ if (!g_utf8_validate(*std_out, -1, NULL)) { setptr(*std_out, encodings_convert_to_utf8(*std_out, - strlen(*std_out), - NULL)); + strlen(*std_out), NULL)); } if (!NZV(*std_out)) { @@ -497,8 +494,7 @@ if (!g_utf8_validate(*std_err, -1, NULL)) { setptr(*std_err, encodings_convert_to_utf8(*std_err, - strlen(*std_err), - NULL)); + strlen(*std_err), NULL)); } if (!NZV(*std_err)) { @@ -850,7 +846,7 @@ } static gboolean -command_with_question_activated(gchar ** text, gint cmd, const gchar * question, gboolean ask) +command_with_question_activated(gchar ** text, gint cmd, const gchar * question, gint flags) { GtkWidget *dialog; gint result; @@ -861,17 +857,22 @@ doc = document_get_current(); g_return_val_if_fail(doc != NULL && doc->file_name != NULL, FALSE); + dir = g_path_get_dirname(doc->file_name); + vc = find_vc(dir); + g_return_val_if_fail(vc, FALSE); + if (doc->changed) { document_save_file(doc, FALSE); } - if (ask) + if ((flags & FLAG_FORCE_ASK) || set_add_confirmation) { dialog = gtk_message_dialog_new(GTK_WINDOW(geany->main_widgets->window), GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_QUESTION, - GTK_BUTTONS_YES_NO, question, doc->file_name); + GTK_BUTTONS_YES_NO, question, + (flags & FLAG_DIR ? dir : doc->file_name)); result = gtk_dialog_run(GTK_DIALOG(dialog)); gtk_widget_destroy(dialog); } @@ -882,52 +883,40 @@ if (result == GTK_RESPONSE_YES) { - dir = g_path_get_dirname(doc->file_name); - vc = find_vc(dir); - g_return_val_if_fail(vc, FALSE); - - execute_command(vc, text, NULL, doc->file_name, cmd, NULL, NULL); - g_free(dir); + if (flags & FLAG_FILE) + execute_command(vc, text, NULL, doc->file_name, cmd, NULL, NULL); + if (flags & FLAG_DIR) + execute_command(vc, text, NULL, dir, cmd, NULL, NULL); + if (flags & FLAG_RELOAD) + document_reload_file(doc, NULL); } - return (result == GTK_RESPONSE_YES) ? TRUE : FALSE; + return (result == GTK_RESPONSE_YES); } static void vcrevert_activated(G_GNUC_UNUSED GtkMenuItem * menuitem, G_GNUC_UNUSED gpointer gdata) { - gboolean ret; - GeanyDocument *doc; - - doc = document_get_current(); - g_return_if_fail(doc != NULL && doc->file_name != NULL); - - ret = command_with_question_activated(NULL, VC_COMMAND_REVERT_FILE, - _("Do you really want to revert: %s?"), TRUE); - if (ret) - { - document_reload_file(doc, NULL); - } + command_with_question_activated(NULL, VC_COMMAND_REVERT_FILE, + _("Do you really want to revert: %s?"), + FLAG_RELOAD | FLAG_FILE | FLAG_FORCE_ASK); } - static void vcadd_activated(G_GNUC_UNUSED GtkMenuItem * menuitem, G_GNUC_UNUSED gpointer gdata) { command_with_question_activated(NULL, VC_COMMAND_ADD, - _("Do you really want to add: %s?"), set_add_confirmation); + _("Do you really want to add: %s?"), FLAG_FILE); } static void vcremove_activated(G_GNUC_UNUSED GtkMenuItem * menuitem, G_GNUC_UNUSED gpointer gdata) { - gboolean ret; - - ret = command_with_question_activated(NULL, VC_COMMAND_REMOVE, - _("Do you really want to remove: %s?"), TRUE); - if (ret) + if (command_with_question_activated(NULL, VC_COMMAND_REMOVE, + _("Do you really want to remove: %s?"), + FLAG_FORCE_ASK | FLAG_FILE)) { document_remove_page(gtk_notebook_get_current_page - (GTK_NOTEBOOK(geany->main_widgets->notebook))); + (GTK_NOTEBOOK(geany->main_widgets->notebook))); } } @@ -946,17 +935,14 @@ document_save_file(doc, FALSE); } - ret = command_with_question_activated(&text, VC_COMMAND_UPDATE, - _("Do you really want to update?"), - set_add_confirmation); - if (ret) + if (command_with_question_activated(&text, VC_COMMAND_UPDATE, + _("Do you really want to update?"), FLAG_FILE)) { document_reload_file(doc, NULL); if (NZV(text)) show_output(text, "*VC-UPDATE*", NULL); - if (text) - g_free(text); + g_free(text); } } @@ -1430,7 +1416,7 @@ if (speller == NULL) { ui_set_statusbar(FALSE, _("Error initializing spell checking: %s"), - spellcheck_error->message); + spellcheck_error->message); g_error_free(spellcheck_error); spellcheck_error = NULL; } @@ -1440,9 +1426,9 @@ if (spellcheck_error != NULL) { ui_set_statusbar(TRUE, - _ - ("Error while setting up language for spellchecking. Please check configuration. Error message was: %s"), - spellcheck_error->message); + _ + ("Error while setting up language for spellchecking. Please check configuration. Error message was: %s"), + spellcheck_error->message); g_error_free(spellcheck_error); spellcheck_error = NULL; } @@ -1536,37 +1522,44 @@ } -static void kbdiff_file(G_GNUC_UNUSED guint key_id) +static void +kbdiff_file(G_GNUC_UNUSED guint key_id) { vcdiff_file_activated(NULL, NULL); } -static void kbdiff_dir(G_GNUC_UNUSED guint key_id) +static void +kbdiff_dir(G_GNUC_UNUSED guint key_id) { vcdiff_dir_activated(NULL, NULL); } -static void kbdiff_basedir(G_GNUC_UNUSED guint key_id) +static void +kbdiff_basedir(G_GNUC_UNUSED guint key_id) { vcdiff_basedir_activated(NULL, NULL); } -static void kbstatus(G_GNUC_UNUSED guint key_id) +static void +kbstatus(G_GNUC_UNUSED guint key_id) { vcstatus_activated(NULL, NULL); } -static void kbcommit(G_GNUC_UNUSED guint key_id) +static void +kbcommit(G_GNUC_UNUSED guint key_id) { vccommit_activated(NULL, NULL); } -static void kbrevert(G_GNUC_UNUSED guint key_id) +static void +kbrevert(G_GNUC_UNUSED guint key_id) { vcrevert_activated(NULL, NULL); } -static void kbupdate(G_GNUC_UNUSED guint key_id) +static void +kbupdate(G_GNUC_UNUSED guint key_id) { vcupdate_activated(NULL, NULL); } @@ -1645,8 +1638,8 @@ && utils_mkdir(config_dir, TRUE) != 0) { dialogs_show_msgbox(GTK_MESSAGE_ERROR, - _ - ("Plugin configuration directory could not be created.")); + _ + ("Plugin configuration directory could not be created.")); } else { @@ -1890,16 +1883,16 @@ } static void -do_current_file_menu(GtkWidget **parent_menu, GtkTooltips **tooltips) +do_current_file_menu(GtkWidget ** parent_menu, GtkTooltips ** tooltips) { GtkWidget *cur_file_menu = NULL; - /* Menu which will hold the items in the current file menu */ + /* Menu which will hold the items in the current file menu */ cur_file_menu = gtk_menu_new(); *parent_menu = gtk_image_menu_item_new_with_mnemonic(_("Current _File")); - g_signal_connect((gpointer) *parent_menu, "activate", G_CALLBACK(update_menu_items), NULL); + g_signal_connect((gpointer) * parent_menu, "activate", G_CALLBACK(update_menu_items), NULL); - /* Diff of current file */ + /* Diff of current file */ menu_vc_diff_file = gtk_menu_item_new_with_mnemonic(_("_Diff")); gtk_container_add(GTK_CONTAINER(cur_file_menu), menu_vc_diff_file); gtk_tooltips_set_tip(*tooltips, menu_vc_diff_file, @@ -1961,19 +1954,19 @@ g_signal_connect((gpointer) menu_vc_remove_file, "activate", G_CALLBACK(vcremove_activated), NULL); - /* connect to parent menu */ + /* connect to parent menu */ gtk_menu_item_set_submenu(GTK_MENU_ITEM(*parent_menu), cur_file_menu); } static void -do_current_dir_menu(GtkWidget **parent_menu, GtkTooltips **tooltips) +do_current_dir_menu(GtkWidget ** parent_menu, GtkTooltips ** tooltips) { - GtkWidget *cur_dir_menu = NULL; - /* Menu which will hold the items in the current file menu */ + GtkWidget *cur_dir_menu = NULL; + /* Menu which will hold the items in the current file menu */ cur_dir_menu = gtk_menu_new(); *parent_menu = gtk_image_menu_item_new_with_mnemonic(_("Current _Directory")); - g_signal_connect((gpointer) *parent_menu, "activate", G_CALLBACK(update_menu_items), NULL); + g_signal_connect((gpointer) * parent_menu, "activate", G_CALLBACK(update_menu_items), NULL); /* Diff of the current dir */ menu_vc_diff_dir = gtk_menu_item_new_with_mnemonic(_("_Diff")); gtk_container_add(GTK_CONTAINER(cur_dir_menu), menu_vc_diff_dir); @@ -1984,26 +1977,26 @@ G_CALLBACK(vcdiff_dir_activated), NULL); gtk_container_add(GTK_CONTAINER(cur_dir_menu), gtk_separator_menu_item_new()); - /* History/log of the current dir */ + /* History/log of the current dir */ menu_vc_log_dir = gtk_menu_item_new_with_mnemonic(_("_History")); gtk_container_add(GTK_CONTAINER(cur_dir_menu), menu_vc_log_dir); gtk_tooltips_set_tip(*tooltips, menu_vc_log_dir, _("Shows the log of the current directory"), NULL); - /* connect to parent menu */ + /* connect to parent menu */ gtk_menu_item_set_submenu(GTK_MENU_ITEM(*parent_menu), cur_dir_menu); } static void -do_basedir_menu(GtkWidget **parent_menu, GtkTooltips **tooltips) +do_basedir_menu(GtkWidget ** parent_menu, GtkTooltips ** tooltips) { - GtkWidget *basedir_menu = NULL; - /* Menu which will hold the items in the current file menu */ + GtkWidget *basedir_menu = NULL; + /* Menu which will hold the items in the current file menu */ basedir_menu = gtk_menu_new(); *parent_menu = gtk_image_menu_item_new_with_mnemonic(_("Current _Basedirectory")); - g_signal_connect((gpointer) *parent_menu, "activate", G_CALLBACK(update_menu_items), NULL); + g_signal_connect((gpointer) * parent_menu, "activate", G_CALLBACK(update_menu_items), NULL); /* Complete diff of base directory */ menu_vc_diff_basedir = gtk_menu_item_new_with_mnemonic(_("_Diff")); @@ -2018,7 +2011,7 @@ g_signal_connect((gpointer) menu_vc_log_dir, "activate", G_CALLBACK(vclog_dir_activated), NULL); - /* Complete History/Log of base directory */ + /* Complete History/Log of base directory */ menu_vc_log_basedir = gtk_menu_item_new_with_mnemonic(_("_History")); gtk_container_add(GTK_CONTAINER(basedir_menu), menu_vc_log_basedir); gtk_tooltips_set_tip(*tooltips, menu_vc_log_basedir, @@ -2027,7 +2020,7 @@ g_signal_connect((gpointer) menu_vc_log_basedir, "activate", G_CALLBACK(vclog_basedir_activated), NULL); - /* connect to parent menu */ + /* connect to parent menu */ gtk_menu_item_set_submenu(GTK_MENU_ITEM(*parent_menu), basedir_menu); } @@ -2036,19 +2029,21 @@ { /* init keybindins */ keybindings_set_item(plugin_key_group, VC_DIFF_FILE, kbdiff_file, - 0, 0, "vc_show_diff_of_file", _("Show diff of file"), menu_vc_diff_file); - keybindings_set_item(plugin_key_group, VC_DIFF_DIR, kbdiff_dir, - 0, 0, "vc_show_diff_of_dir", _("Show diff of diretory"), menu_vc_diff_dir); - keybindings_set_item(plugin_key_group, VC_DIFF_BASEDIR, kbdiff_basedir, - 0, 0, "vc_show_diff_of_basedir", _("Show diff of basedir"), menu_vc_diff_basedir); - keybindings_set_item(plugin_key_group, VC_COMMIT, kbcommit, - 0, 0, "vc_commit", _("Commit changes"), menu_vc_commit); - keybindings_set_item(plugin_key_group, VC_STATUS, kbstatus, - 0, 0, "vc_status", _("Show status") , menu_vc_status); - keybindings_set_item(plugin_key_group, VC_REVERT, kbrevert, - 0, 0, "vc_revert", _("Revert changes"), menu_vc_revert_file); - keybindings_set_item(plugin_key_group, VC_UPDATE, kbupdate, - 0, 0, "vc_update", _("Update file"), menu_vc_update); + 0, 0, "vc_show_diff_of_file", _("Show diff of file"), + menu_vc_diff_file); + keybindings_set_item(plugin_key_group, VC_DIFF_DIR, kbdiff_dir, 0, 0, "vc_show_diff_of_dir", + _("Show diff of diretory"), menu_vc_diff_dir); + keybindings_set_item(plugin_key_group, VC_DIFF_BASEDIR, kbdiff_basedir, 0, 0, + "vc_show_diff_of_basedir", _("Show diff of basedir"), + menu_vc_diff_basedir); + keybindings_set_item(plugin_key_group, VC_COMMIT, kbcommit, 0, 0, "vc_commit", + _("Commit changes"), menu_vc_commit); + keybindings_set_item(plugin_key_group, VC_STATUS, kbstatus, 0, 0, "vc_status", + _("Show status"), menu_vc_status); + keybindings_set_item(plugin_key_group, VC_REVERT, kbrevert, 0, 0, "vc_revert", + _("Revert changes"), menu_vc_revert_file); + keybindings_set_item(plugin_key_group, VC_UPDATE, kbupdate, 0, 0, "vc_update", + _("Update file"), menu_vc_update); } /* Called by Geany to initialize the plugin */ @@ -2081,18 +2076,18 @@ menu_vc_menu = gtk_menu_new(); gtk_menu_item_set_submenu(GTK_MENU_ITEM(menu_vc), menu_vc_menu); - /* Create the current file Submenu */ + /* Create the current file Submenu */ do_current_file_menu(&menu_vc_file, &tooltips); gtk_container_add(GTK_CONTAINER(menu_vc_menu), menu_vc_file); - /* Create the current directory Submenu */ - do_current_dir_menu(&menu_vc_dir, &tooltips); + /* Create the current directory Submenu */ + do_current_dir_menu(&menu_vc_dir, &tooltips); gtk_container_add(GTK_CONTAINER(menu_vc_menu), menu_vc_dir); - /* Create the current base directory Submenu */ - do_basedir_menu(&menu_vc_basedir, &tooltips); + /* Create the current base directory Submenu */ + do_basedir_menu(&menu_vc_basedir, &tooltips); gtk_container_add(GTK_CONTAINER(menu_vc_menu), menu_vc_basedir); gtk_container_add(GTK_CONTAINER(menu_vc_menu), gtk_separator_menu_item_new()); - /* Status of basedir */ + /* Status of basedir */ menu_vc_status = gtk_menu_item_new_with_mnemonic(_("_Status")); gtk_container_add(GTK_CONTAINER(menu_vc_menu), menu_vc_status); gtk_tooltips_set_tip(tooltips, menu_vc_status, _("Show status."), NULL); @@ -2124,8 +2119,8 @@ gtk_widget_show_all(menu_vc_dir); gtk_widget_show_all(menu_vc_basedir); - /* initialize keybindings */ - init_keybindings(); + /* initialize keybindings */ + init_keybindings(); plugin_fields->menu_item = menu_vc; plugin_fields->flags = PLUGIN_IS_DOCUMENT_SENSITIVE; Modified: branches/GeanyVC_menu_redesign/geanyvc.h =================================================================== --- branches/GeanyVC_menu_redesign/geanyvc.h 2009-01-26 18:52:40 UTC (rev 405) +++ branches/GeanyVC_menu_redesign/geanyvc.h 2009-01-26 22:51:55 UTC (rev 406) @@ -51,10 +51,15 @@ VC_COMMAND_STARTDIR_FILE }; -#define P_ABS_DIRNAME "*<?geanyvcDIRNAME>*" -#define P_ABS_FILENAME "*<?geanyvcFILENAME>*" -#define P_BASENAME "*<?geanyvcBASE_FILENAME>*" +#define FLAG_RELOAD (1<<0) +#define FLAG_FORCE_ASK (1<<1) +#define FLAG_FILE (1<<2) +#define FLAG_DIR (1<<3) +#define P_ABS_DIRNAME "*<?geanyvcDIRNAME>*" +#define P_ABS_FILENAME "*<?geanyvcFILENAME>*" +#define P_BASENAME "*<?geanyvcBASE_FILENAME>*" + /* The addresses of these strings act as enums, their contents are not used. */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany-plugins:[405] branches/GeanyVC_menu_redesign/geanyvc.c
by kugel-＠users.sourceforge.net 26 Jan '09

26 Jan '09

Revision: 405 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=405&view=rev Author: kugel- Date: 2009-01-26 18:52:40 +0000 (Mon, 26 Jan 2009) Log Message: ----------- update to patch v2 Modified Paths: -------------- branches/GeanyVC_menu_redesign/geanyvc.c Modified: branches/GeanyVC_menu_redesign/geanyvc.c =================================================================== --- branches/GeanyVC_menu_redesign/geanyvc.c 2009-01-24 01:31:48 UTC (rev 404) +++ branches/GeanyVC_menu_redesign/geanyvc.c 2009-01-26 18:52:40 UTC (rev 405) @@ -1890,7 +1890,7 @@ } static void -current_file_menu(GtkWidget **parent_menu, GtkTooltips **tooltips) +do_current_file_menu(GtkWidget **parent_menu, GtkTooltips **tooltips) { GtkWidget *cur_file_menu = NULL; /* Menu which will hold the items in the current file menu */ @@ -1966,7 +1966,7 @@ } static void -current_dir_menu(GtkWidget **parent_menu, GtkTooltips **tooltips) +do_current_dir_menu(GtkWidget **parent_menu, GtkTooltips **tooltips) { GtkWidget *cur_dir_menu = NULL; /* Menu which will hold the items in the current file menu */ @@ -1996,7 +1996,7 @@ } static void -basedir_menu(GtkWidget **parent_menu, GtkTooltips **tooltips) +do_basedir_menu(GtkWidget **parent_menu, GtkTooltips **tooltips) { GtkWidget *basedir_menu = NULL; /* Menu which will hold the items in the current file menu */ @@ -2027,32 +2027,6 @@ g_signal_connect((gpointer) menu_vc_log_basedir, "activate", G_CALLBACK(vclog_basedir_activated), NULL); - gtk_container_add(GTK_CONTAINER(basedir_menu), gtk_separator_menu_item_new()); - /* Status of basedir */ - menu_vc_status = gtk_menu_item_new_with_mnemonic(_("_Status")); - gtk_container_add(GTK_CONTAINER(basedir_menu), menu_vc_status); - gtk_tooltips_set_tip(*tooltips, menu_vc_status, _("Show status."), NULL); - - g_signal_connect((gpointer) menu_vc_status, "activate", - G_CALLBACK(vcstatus_activated), NULL); - - - /* complete update */ - menu_vc_update = gtk_menu_item_new_with_mnemonic(_("Update")); - gtk_container_add(GTK_CONTAINER(basedir_menu), menu_vc_update); - gtk_tooltips_set_tip(*tooltips, menu_vc_update, _("Update from remote repositary."), NULL); - - g_signal_connect((gpointer) menu_vc_update, "activate", - G_CALLBACK(vcupdate_activated), NULL); - - - /* Commit all changes */ - menu_vc_commit = gtk_menu_item_new_with_mnemonic(_("_Commit")); - gtk_container_add(GTK_CONTAINER(basedir_menu), menu_vc_commit); - gtk_tooltips_set_tip(*tooltips, menu_vc_commit, _("Commit changes."), NULL); - - g_signal_connect((gpointer) menu_vc_commit, "activate", - G_CALLBACK(vccommit_activated), NULL); /* connect to parent menu */ gtk_menu_item_set_submenu(GTK_MENU_ITEM(*parent_menu), basedir_menu); } @@ -2108,15 +2082,43 @@ gtk_menu_item_set_submenu(GTK_MENU_ITEM(menu_vc), menu_vc_menu); /* Create the current file Submenu */ - current_file_menu(&menu_vc_file, &tooltips); + do_current_file_menu(&menu_vc_file, &tooltips); gtk_container_add(GTK_CONTAINER(menu_vc_menu), menu_vc_file); /* Create the current directory Submenu */ - current_dir_menu(&menu_vc_dir, &tooltips); + do_current_dir_menu(&menu_vc_dir, &tooltips); gtk_container_add(GTK_CONTAINER(menu_vc_menu), menu_vc_dir); /* Create the current base directory Submenu */ - basedir_menu(&menu_vc_basedir, &tooltips); + do_basedir_menu(&menu_vc_basedir, &tooltips); gtk_container_add(GTK_CONTAINER(menu_vc_menu), menu_vc_basedir); + gtk_container_add(GTK_CONTAINER(menu_vc_menu), gtk_separator_menu_item_new()); + /* Status of basedir */ + menu_vc_status = gtk_menu_item_new_with_mnemonic(_("_Status")); + gtk_container_add(GTK_CONTAINER(menu_vc_menu), menu_vc_status); + gtk_tooltips_set_tip(tooltips, menu_vc_status, _("Show status."), NULL); + + g_signal_connect((gpointer) menu_vc_status, "activate", + G_CALLBACK(vcstatus_activated), NULL); + + + /* complete update */ + menu_vc_update = gtk_menu_item_new_with_mnemonic(_("Update")); + gtk_container_add(GTK_CONTAINER(menu_vc_menu), menu_vc_update); + gtk_tooltips_set_tip(tooltips, menu_vc_update, _("Update from remote repositary."), NULL); + + g_signal_connect((gpointer) menu_vc_update, "activate", + G_CALLBACK(vcupdate_activated), NULL); + + + /* Commit all changes */ + menu_vc_commit = gtk_menu_item_new_with_mnemonic(_("_Commit")); + gtk_container_add(GTK_CONTAINER(menu_vc_menu), menu_vc_commit); + gtk_tooltips_set_tip(tooltips, menu_vc_commit, _("Commit changes."), NULL); + + g_signal_connect((gpointer) menu_vc_commit, "activate", + G_CALLBACK(vccommit_activated), NULL); + + gtk_widget_show_all(menu_vc); gtk_widget_show_all(menu_vc_file); gtk_widget_show_all(menu_vc_dir); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany-plugins:[404] branches/GeanyVC_menu_redesign/geanyvc.c
by frlan＠users.sourceforge.net 24 Jan '09

24 Jan '09

Revision: 404 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=404&view=rev Author: frlan Date: 2009-01-24 01:31:48 +0000 (Sat, 24 Jan 2009) Log Message: ----------- Applied original patch created by Thomas Martitz Modified Paths: -------------- branches/GeanyVC_menu_redesign/geanyvc.c Modified: branches/GeanyVC_menu_redesign/geanyvc.c =================================================================== --- branches/GeanyVC_menu_redesign/geanyvc.c 2009-01-24 01:29:37 UTC (rev 403) +++ branches/GeanyVC_menu_redesign/geanyvc.c 2009-01-24 01:31:48 UTC (rev 404) @@ -1889,158 +1889,177 @@ REGISTER_VC(HG, enable_hg); } -/* Called by Geany to initialize the plugin */ -void -plugin_init(G_GNUC_UNUSED GeanyData * data) +static void +current_file_menu(GtkWidget **parent_menu, GtkTooltips **tooltips) { - GtkWidget *menu_vc = NULL; - GtkWidget *menu_vc_menu = NULL; - GtkTooltips *tooltips = NULL; + GtkWidget *cur_file_menu = NULL; + /* Menu which will hold the items in the current file menu */ + cur_file_menu = gtk_menu_new(); - main_locale_init(LOCALEDIR, GETTEXT_PACKAGE); + *parent_menu = gtk_image_menu_item_new_with_mnemonic(_("Current _File")); + g_signal_connect((gpointer) *parent_menu, "activate", G_CALLBACK(update_menu_items), NULL); - config_file = - g_strconcat(geany->app->configdir, G_DIR_SEPARATOR_S, "plugins", G_DIR_SEPARATOR_S, - "VC", G_DIR_SEPARATOR_S, "VC.conf", NULL); - - load_config(); - registrate(); - - tooltips = gtk_tooltips_new(); - - menu_vc = gtk_image_menu_item_new_with_mnemonic(_("_VC")); - gtk_container_add(GTK_CONTAINER(geany->main_widgets->tools_menu), menu_vc); - - g_signal_connect((gpointer) menu_vc, "activate", G_CALLBACK(update_menu_items), NULL); - - menu_vc_menu = gtk_menu_new(); - gtk_menu_item_set_submenu(GTK_MENU_ITEM(menu_vc), menu_vc_menu); - - // Single file - menu_vc_diff_file = gtk_menu_item_new_with_mnemonic(_("Diff From Current File")); - gtk_container_add(GTK_CONTAINER(menu_vc_menu), menu_vc_diff_file); - gtk_tooltips_set_tip(tooltips, menu_vc_diff_file, + /* Diff of current file */ + menu_vc_diff_file = gtk_menu_item_new_with_mnemonic(_("_Diff")); + gtk_container_add(GTK_CONTAINER(cur_file_menu), menu_vc_diff_file); + gtk_tooltips_set_tip(*tooltips, menu_vc_diff_file, _("Make a diff from the current active file"), NULL); g_signal_connect((gpointer) menu_vc_diff_file, "activate", G_CALLBACK(vcdiff_file_activated), NULL); - // Directory - menu_vc_diff_dir = gtk_menu_item_new_with_mnemonic(_("Diff From Current Directory")); - gtk_container_add(GTK_CONTAINER(menu_vc_menu), menu_vc_diff_dir); - gtk_tooltips_set_tip(tooltips, menu_vc_diff_dir, - _("Make a diff from the directory of the current active file"), NULL); + /* Revert current file */ + menu_vc_revert_file = gtk_menu_item_new_with_mnemonic(_("_Revert")); + gtk_container_add(GTK_CONTAINER(cur_file_menu), menu_vc_revert_file); + gtk_tooltips_set_tip(*tooltips, menu_vc_revert_file, + _("Restore pristine working copy file (undo local edits)."), NULL); - g_signal_connect((gpointer) menu_vc_diff_dir, "activate", - G_CALLBACK(vcdiff_dir_activated), NULL); + g_signal_connect((gpointer) menu_vc_revert_file, "activate", + G_CALLBACK(vcrevert_activated), NULL); - // Base directory - menu_vc_diff_basedir = gtk_menu_item_new_with_mnemonic(_("Diff From Base Directory")); - gtk_container_add(GTK_CONTAINER(menu_vc_menu), menu_vc_diff_basedir); - gtk_tooltips_set_tip(tooltips, menu_vc_diff_basedir, - _("Make a diff from the top VC directory"), NULL); - g_signal_connect((gpointer) menu_vc_diff_basedir, "activate", - G_CALLBACK(vcdiff_basedir_activated), NULL); + gtk_container_add(GTK_CONTAINER(cur_file_menu), gtk_separator_menu_item_new()); - gtk_container_add(GTK_CONTAINER(menu_vc_menu), gtk_separator_menu_item_new()); - // Blame for current file - menu_vc_blame = gtk_menu_item_new_with_mnemonic(_("Blame From Current File")); - gtk_container_add(GTK_CONTAINER(menu_vc_menu), menu_vc_blame); - gtk_tooltips_set_tip(tooltips, menu_vc_blame, + /* Blame for current file */ + menu_vc_blame = gtk_menu_item_new_with_mnemonic(_("_Blame")); + gtk_container_add(GTK_CONTAINER(cur_file_menu), menu_vc_blame); + gtk_tooltips_set_tip(*tooltips, menu_vc_blame, _("Shows the changes made at one file per revision and author."), NULL); g_signal_connect((gpointer) menu_vc_blame, "activate", G_CALLBACK(vcblame_activated), NULL); - gtk_container_add(GTK_CONTAINER(menu_vc_menu), gtk_separator_menu_item_new()); + gtk_container_add(GTK_CONTAINER(cur_file_menu), gtk_separator_menu_item_new()); - // Log - menu_vc_log_file = gtk_menu_item_new_with_mnemonic(_("Log Of Current File")); - gtk_container_add(GTK_CONTAINER(menu_vc_menu), menu_vc_log_file); - gtk_tooltips_set_tip(tooltips, menu_vc_log_file, + /* History/log of current file */ + menu_vc_log_file = gtk_menu_item_new_with_mnemonic(_("_History")); + gtk_container_add(GTK_CONTAINER(cur_file_menu), menu_vc_log_file); + gtk_tooltips_set_tip(*tooltips, menu_vc_log_file, _("Shows the log of the current file"), NULL); g_signal_connect((gpointer) menu_vc_log_file, "activate", G_CALLBACK(vclog_file_activated), NULL); - menu_vc_log_dir = gtk_menu_item_new_with_mnemonic(_("Log Of Current Directory")); - gtk_container_add(GTK_CONTAINER(menu_vc_menu), menu_vc_log_dir); - gtk_tooltips_set_tip(tooltips, menu_vc_log_dir, + + gtk_container_add(GTK_CONTAINER(cur_file_menu), gtk_separator_menu_item_new()); + + /* add current file */ + menu_vc_add_file = gtk_menu_item_new_with_mnemonic(_("_Add to Version Control")); + gtk_container_add(GTK_CONTAINER(cur_file_menu), menu_vc_add_file); + gtk_tooltips_set_tip(*tooltips, menu_vc_add_file, _("Add file to repository."), NULL); + + g_signal_connect((gpointer) menu_vc_add_file, "activate", + G_CALLBACK(vcadd_activated), NULL); + + /* revert current file */ + menu_vc_remove_file = gtk_menu_item_new_with_mnemonic(_("_Remove from Version Control")); + gtk_container_add(GTK_CONTAINER(cur_file_menu), menu_vc_remove_file); + gtk_tooltips_set_tip(*tooltips, menu_vc_remove_file, + _("Remove file from repository."), NULL); + + g_signal_connect((gpointer) menu_vc_remove_file, "activate", + G_CALLBACK(vcremove_activated), NULL); + + /* connect to parent menu */ + gtk_menu_item_set_submenu(GTK_MENU_ITEM(*parent_menu), cur_file_menu); +} + +static void +current_dir_menu(GtkWidget **parent_menu, GtkTooltips **tooltips) +{ + GtkWidget *cur_dir_menu = NULL; + /* Menu which will hold the items in the current file menu */ + cur_dir_menu = gtk_menu_new(); + + *parent_menu = gtk_image_menu_item_new_with_mnemonic(_("Current _Directory")); + g_signal_connect((gpointer) *parent_menu, "activate", G_CALLBACK(update_menu_items), NULL); + /* Diff of the current dir */ + menu_vc_diff_dir = gtk_menu_item_new_with_mnemonic(_("_Diff")); + gtk_container_add(GTK_CONTAINER(cur_dir_menu), menu_vc_diff_dir); + gtk_tooltips_set_tip(*tooltips, menu_vc_diff_dir, + _("Make a diff from the directory of the current active file"), NULL); + + g_signal_connect((gpointer) menu_vc_diff_dir, "activate", + G_CALLBACK(vcdiff_dir_activated), NULL); + + gtk_container_add(GTK_CONTAINER(cur_dir_menu), gtk_separator_menu_item_new()); + /* History/log of the current dir */ + menu_vc_log_dir = gtk_menu_item_new_with_mnemonic(_("_History")); + gtk_container_add(GTK_CONTAINER(cur_dir_menu), menu_vc_log_dir); + gtk_tooltips_set_tip(*tooltips, menu_vc_log_dir, _("Shows the log of the current directory"), NULL); + + /* connect to parent menu */ + gtk_menu_item_set_submenu(GTK_MENU_ITEM(*parent_menu), cur_dir_menu); +} + +static void +basedir_menu(GtkWidget **parent_menu, GtkTooltips **tooltips) +{ + GtkWidget *basedir_menu = NULL; + /* Menu which will hold the items in the current file menu */ + basedir_menu = gtk_menu_new(); + + *parent_menu = gtk_image_menu_item_new_with_mnemonic(_("Current _Basedirectory")); + g_signal_connect((gpointer) *parent_menu, "activate", G_CALLBACK(update_menu_items), NULL); + + /* Complete diff of base directory */ + menu_vc_diff_basedir = gtk_menu_item_new_with_mnemonic(_("_Diff")); + gtk_container_add(GTK_CONTAINER(basedir_menu), menu_vc_diff_basedir); + gtk_tooltips_set_tip(*tooltips, menu_vc_diff_basedir, + _("Make a diff from the top VC directory"), NULL); + + g_signal_connect((gpointer) menu_vc_diff_basedir, "activate", + G_CALLBACK(vcdiff_basedir_activated), NULL); + + gtk_container_add(GTK_CONTAINER(basedir_menu), gtk_separator_menu_item_new()); g_signal_connect((gpointer) menu_vc_log_dir, "activate", G_CALLBACK(vclog_dir_activated), NULL); - menu_vc_log_basedir = gtk_menu_item_new_with_mnemonic(_("Log Of Base Directory")); - gtk_container_add(GTK_CONTAINER(menu_vc_menu), menu_vc_log_basedir); - gtk_tooltips_set_tip(tooltips, menu_vc_log_basedir, + /* Complete History/Log of base directory */ + menu_vc_log_basedir = gtk_menu_item_new_with_mnemonic(_("_History")); + gtk_container_add(GTK_CONTAINER(basedir_menu), menu_vc_log_basedir); + gtk_tooltips_set_tip(*tooltips, menu_vc_log_basedir, _("Shows the log of the top VC directory"), NULL); g_signal_connect((gpointer) menu_vc_log_basedir, "activate", G_CALLBACK(vclog_basedir_activated), NULL); - gtk_container_add(GTK_CONTAINER(menu_vc_menu), gtk_separator_menu_item_new()); - - // Status + gtk_container_add(GTK_CONTAINER(basedir_menu), gtk_separator_menu_item_new()); + /* Status of basedir */ menu_vc_status = gtk_menu_item_new_with_mnemonic(_("_Status")); - gtk_container_add(GTK_CONTAINER(menu_vc_menu), menu_vc_status); - gtk_tooltips_set_tip(tooltips, menu_vc_status, _("Show status."), NULL); + gtk_container_add(GTK_CONTAINER(basedir_menu), menu_vc_status); + gtk_tooltips_set_tip(*tooltips, menu_vc_status, _("Show status."), NULL); g_signal_connect((gpointer) menu_vc_status, "activate", G_CALLBACK(vcstatus_activated), NULL); - gtk_container_add(GTK_CONTAINER(menu_vc_menu), gtk_separator_menu_item_new()); - // Revert file - menu_vc_revert_file = gtk_menu_item_new_with_mnemonic(_("_Revert File")); - gtk_container_add(GTK_CONTAINER(menu_vc_menu), menu_vc_revert_file); - gtk_tooltips_set_tip(tooltips, menu_vc_revert_file, - _("Restore pristine working copy file (undo local edits)."), NULL); - - g_signal_connect((gpointer) menu_vc_revert_file, "activate", - G_CALLBACK(vcrevert_activated), NULL); - - gtk_container_add(GTK_CONTAINER(menu_vc_menu), gtk_separator_menu_item_new()); - - // Add file - menu_vc_add_file = gtk_menu_item_new_with_mnemonic(_("_Add File")); - gtk_container_add(GTK_CONTAINER(menu_vc_menu), menu_vc_add_file); - gtk_tooltips_set_tip(tooltips, menu_vc_add_file, _("Add file to repository."), NULL); - - g_signal_connect((gpointer) menu_vc_add_file, "activate", - G_CALLBACK(vcadd_activated), NULL); - - // Remove file - menu_vc_remove_file = gtk_menu_item_new_with_mnemonic(_("Remove File")); - gtk_container_add(GTK_CONTAINER(menu_vc_menu), menu_vc_remove_file); - gtk_tooltips_set_tip(tooltips, menu_vc_remove_file, - _("Remove file from repository."), NULL); - - g_signal_connect((gpointer) menu_vc_remove_file, "activate", - G_CALLBACK(vcremove_activated), NULL); - - gtk_container_add(GTK_CONTAINER(menu_vc_menu), gtk_separator_menu_item_new()); - - // Update + /* complete update */ menu_vc_update = gtk_menu_item_new_with_mnemonic(_("Update")); - gtk_container_add(GTK_CONTAINER(menu_vc_menu), menu_vc_update); - gtk_tooltips_set_tip(tooltips, menu_vc_update, _("Update from remote repositary."), NULL); + gtk_container_add(GTK_CONTAINER(basedir_menu), menu_vc_update); + gtk_tooltips_set_tip(*tooltips, menu_vc_update, _("Update from remote repositary."), NULL); g_signal_connect((gpointer) menu_vc_update, "activate", G_CALLBACK(vcupdate_activated), NULL); - // Commit + + /* Commit all changes */ menu_vc_commit = gtk_menu_item_new_with_mnemonic(_("_Commit")); - gtk_container_add(GTK_CONTAINER(menu_vc_menu), menu_vc_commit); - gtk_tooltips_set_tip(tooltips, menu_vc_commit, _("Commit changes."), NULL); + gtk_container_add(GTK_CONTAINER(basedir_menu), menu_vc_commit); + gtk_tooltips_set_tip(*tooltips, menu_vc_commit, _("Commit changes."), NULL); g_signal_connect((gpointer) menu_vc_commit, "activate", G_CALLBACK(vccommit_activated), NULL); + /* connect to parent menu */ + gtk_menu_item_set_submenu(GTK_MENU_ITEM(*parent_menu), basedir_menu); +} - gtk_widget_show_all(menu_vc); - +static void +init_keybindings(void) +{ /* init keybindins */ keybindings_set_item(plugin_key_group, VC_DIFF_FILE, kbdiff_file, 0, 0, "vc_show_diff_of_file", _("Show diff of file"), menu_vc_diff_file); @@ -2056,10 +2075,58 @@ 0, 0, "vc_revert", _("Revert changes"), menu_vc_revert_file); keybindings_set_item(plugin_key_group, VC_UPDATE, kbupdate, 0, 0, "vc_update", _("Update file"), menu_vc_update); +} +/* Called by Geany to initialize the plugin */ +void +plugin_init(G_GNUC_UNUSED GeanyData * data) +{ + GtkWidget *menu_vc = NULL; + GtkWidget *menu_vc_menu = NULL; + GtkWidget *menu_vc_file = NULL; + GtkWidget *menu_vc_dir = NULL; + GtkWidget *menu_vc_basedir = NULL; + GtkTooltips *tooltips = NULL; + + main_locale_init(LOCALEDIR, GETTEXT_PACKAGE); + + config_file = + g_strconcat(geany->app->configdir, G_DIR_SEPARATOR_S, "plugins", G_DIR_SEPARATOR_S, + "VC", G_DIR_SEPARATOR_S, "VC.conf", NULL); + + load_config(); + registrate(); + + tooltips = gtk_tooltips_new(); + + menu_vc = gtk_image_menu_item_new_with_mnemonic(_("_VC")); + gtk_container_add(GTK_CONTAINER(geany->main_widgets->tools_menu), menu_vc); + + g_signal_connect((gpointer) menu_vc, "activate", G_CALLBACK(update_menu_items), NULL); + + menu_vc_menu = gtk_menu_new(); + gtk_menu_item_set_submenu(GTK_MENU_ITEM(menu_vc), menu_vc_menu); + + /* Create the current file Submenu */ + current_file_menu(&menu_vc_file, &tooltips); + gtk_container_add(GTK_CONTAINER(menu_vc_menu), menu_vc_file); + /* Create the current directory Submenu */ + current_dir_menu(&menu_vc_dir, &tooltips); + gtk_container_add(GTK_CONTAINER(menu_vc_menu), menu_vc_dir); + /* Create the current base directory Submenu */ + basedir_menu(&menu_vc_basedir, &tooltips); + gtk_container_add(GTK_CONTAINER(menu_vc_menu), menu_vc_basedir); + + gtk_widget_show_all(menu_vc); + gtk_widget_show_all(menu_vc_file); + gtk_widget_show_all(menu_vc_dir); + gtk_widget_show_all(menu_vc_basedir); + + /* initialize keybindings */ + init_keybindings(); + plugin_fields->menu_item = menu_vc; plugin_fields->flags = PLUGIN_IS_DOCUMENT_SENSITIVE; - } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany-plugins:[403] branches/GeanyVC_menu_redesign/
by frlan＠users.sourceforge.net 24 Jan '09

24 Jan '09

Revision: 403 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=403&view=rev Author: frlan Date: 2009-01-24 01:29:37 +0000 (Sat, 24 Jan 2009) Log Message: ----------- Created branch for redesign patch for geanyVC of Thomas Martitz Added Paths: ----------- branches/GeanyVC_menu_redesign/ Property changes on: branches/GeanyVC_menu_redesign ___________________________________________________________________ Added: svn:mergeinfo + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany-plugins:[402] trunk/geanydoc/src/geanydoc.c
by yurand＠users.sourceforge.net 24 Jan '09

24 Jan '09

Revision: 402 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=402&view=rev Author: yurand Date: 2009-01-24 00:15:48 +0000 (Sat, 24 Jan 2009) Log Message: ----------- GeanyDoc: locale_init fix Modified Paths: -------------- trunk/geanydoc/src/geanydoc.c Modified: trunk/geanydoc/src/geanydoc.c =================================================================== --- trunk/geanydoc/src/geanydoc.c 2009-01-23 12:59:06 UTC (rev 401) +++ trunk/geanydoc/src/geanydoc.c 2009-01-24 00:15:48 UTC (rev 402) @@ -446,10 +446,12 @@ void plugin_init(G_GNUC_UNUSED GeanyData * data) { - gchar *kb_label1 = _("Document current word"); - gchar *kb_label2 = _("Document interactive"); + gchar *kb_label1; + gchar *kb_label2; p_main->locale_init(LOCALEDIR, GETTEXT_PACKAGE); + kb_label1 = _("Document current word"); + kb_label2 = _("Document interactive"); config_init(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany-plugins:[401] trunk/geanydoc/src/geanydoc.c
by yurand＠users.sourceforge.net 23 Jan '09

23 Jan '09

Revision: 401 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=401&view=rev Author: yurand Date: 2009-01-23 12:59:06 +0000 (Fri, 23 Jan 2009) Log Message: ----------- GeanyDoc: Added locale_init() function call Modified Paths: -------------- trunk/geanydoc/src/geanydoc.c Modified: trunk/geanydoc/src/geanydoc.c =================================================================== --- trunk/geanydoc/src/geanydoc.c 2009-01-23 00:41:26 UTC (rev 400) +++ trunk/geanydoc/src/geanydoc.c 2009-01-23 12:59:06 UTC (rev 401) @@ -41,6 +41,10 @@ #include "plugindata.h" /* this defines the plugin API */ #include "pluginmacros.h" /* some useful macros to avoid typing geany_data so often */ +#ifdef HAVE_LOCALE_H +# include <locale.h> +#endif + #include "geanydoc.h" /* These items are set by Geany before init() is called. */ @@ -52,9 +56,9 @@ static GtkWidget *keyb2; -/* Check that Geany supports plugin API version 71 or later, and check +/* Check that Geany supports plugin API version 128 or later, and check * for binary compatibility. */ -PLUGIN_VERSION_CHECK(78) +PLUGIN_VERSION_CHECK(128) /* All plugins must set name, description, version and author. */ PLUGIN_SET_INFO(_("Doc"), _("Call documentation viewer on current symbol."), VERSION, _("Yura Siamshka <yurand2(a)gmail.com>")); @@ -445,6 +449,7 @@ gchar *kb_label1 = _("Document current word"); gchar *kb_label2 = _("Document interactive"); + p_main->locale_init(LOCALEDIR, GETTEXT_PACKAGE); config_init(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany-plugins:[400] trunk/geanysendmail/README
by frlan＠users.sourceforge.net 23 Jan '09

23 Jan '09

Revision: 400 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=400&view=rev Author: frlan Date: 2009-01-23 00:41:26 +0000 (Fri, 23 Jan 2009) Log Message: ----------- GeanySendMail: Added another example for using plugin with Thunderbird on Windows Modified Paths: -------------- trunk/geanysendmail/README Modified: trunk/geanysendmail/README =================================================================== --- trunk/geanysendmail/README 2009-01-23 00:40:54 UTC (rev 399) +++ trunk/geanysendmail/README 2009-01-23 00:41:26 UTC (rev 400) @@ -77,6 +77,8 @@ several times. Examples could be: sylpheed --attach "%f" --compose "%r" mutt -s "Sending '%b'" -a "%f" "%r" + "C:\Program Files\Mozilla Thunderbird\thunderbird.exe" \ + -compose to="%r",subject="%b",attachment="%f" Development This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany-plugins:[399] trunk/geanysendmail/makefile.win32
by frlan＠users.sourceforge.net 23 Jan '09

23 Jan '09

Revision: 399 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=399&view=rev Author: frlan Date: 2009-01-23 00:40:54 +0000 (Fri, 23 Jan 2009) Log Message: ----------- GeanySendMail: Added flag to W32 makefile, so plugin should also compile also on Windows Vista (Thanks to Timothy Boronczyk) for reporting. Modified Paths: -------------- trunk/geanysendmail/makefile.win32 Modified: trunk/geanysendmail/makefile.win32 =================================================================== --- trunk/geanysendmail/makefile.win32 2009-01-22 23:31:18 UTC (rev 398) +++ trunk/geanysendmail/makefile.win32 2009-01-23 00:40:54 UTC (rev 399) @@ -34,12 +34,12 @@ -I$(PREFIX)/include/gettext \ -I$(PREFIX)/include \ -I$(ASPELL_PREFIX)/interfaces/cc - + ALL_GTK_LIBS= \ -L"$(PREFIX)/lib" \ -lgtk-win32-2.0 -lgdk-win32-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lpangowin32-1.0 -lgdi32 \ -lpango-1.0 -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lglib-2.0 -lintl -liconv -CCFLAGS=-Wall -O2 -mms-bitfields -DHAVE_CONFIG_H +CCFLAGS=-Wall -O2 -mms-bitfields -DHAVE_CONFIG_H -DLOCALEDIR=\"share\" all: $(TARGET) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany-plugins:[398] trunk/geanylipsum
by frlan＠users.sourceforge.net 23 Jan '09

23 Jan '09

Revision: 398 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=398&view=rev Author: frlan Date: 2009-01-22 23:31:18 +0000 (Thu, 22 Jan 2009) Log Message: ----------- GeanyLipsum: Make usage of Geany plugin API v128 Modified Paths: -------------- trunk/geanylipsum/ChangeLog trunk/geanylipsum/po/de.po trunk/geanylipsum/po/geanylipsum.pot trunk/geanylipsum/src/geanylipsum.c Modified: trunk/geanylipsum/ChangeLog =================================================================== --- trunk/geanylipsum/ChangeLog 2009-01-21 22:25:45 UTC (rev 397) +++ trunk/geanylipsum/ChangeLog 2009-01-22 23:31:18 UTC (rev 398) @@ -0,0 +1,5 @@ +2009-01-23 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> + + * Update to plugin API v128 + + Modified: trunk/geanylipsum/po/de.po =================================================================== --- trunk/geanylipsum/po/de.po 2009-01-21 22:25:45 UTC (rev 397) +++ trunk/geanylipsum/po/de.po 2009-01-22 23:31:18 UTC (rev 398) @@ -2,7 +2,7 @@ msgstr "" "Project-Id-Version: geanylipsum 0.1dev\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-12-22 23:17+0100\n" +"POT-Creation-Date: 2009-01-23 00:30+0100\n" "PO-Revision-Date: \n" "Last-Translator: Frank Lanitz <frank(a)frank.uvena.de>\n" "Language-Team: geany-118n <geany-118n(a)uvena.de>\n" @@ -13,38 +13,34 @@ "X-Poedit-Country: GERMANY\n" "X-Poedit-SourceCharset: utf-8\n" -#: src/geanylipsum.c:74 +#: src/geanylipsum.c:63 msgid "Lipsum" msgstr "Lipsum" -#: src/geanylipsum.c:74 +#: src/geanylipsum.c:63 msgid "Creating dummy text with Geany" msgstr "Platzhaltertexte erstellen mit Geany" -#: src/geanylipsum.c:74 +#: src/geanylipsum.c:63 msgid "Frank Lanitz <frank(a)frank.uvena.de>" msgstr "Frank Lanitz <frank(a)frank.uvena.de>" -#: src/geanylipsum.c:117 -msgid "Lipsum-generator" +#: src/geanylipsum.c:105 +msgid "Lipsum-Generator" msgstr "Lorem ipsum Generator" -#: src/geanylipsum.c:126 -msgid "HTML" -msgstr "HTML" +#: src/geanylipsum.c:106 +msgid "Enter the length of Lipsum text here" +msgstr "Bitte die Länge des Platzhaltertextes eingeben" -#: src/geanylipsum.c:136 -msgid "LaTeX" -msgstr "LaTeX" - -#: src/geanylipsum.c:146 -msgid "Plain" -msgstr "Unformatiert" - -#: src/geanylipsum.c:196 +#: src/geanylipsum.c:174 msgid "_Lipsum" msgstr "_Lipsum" -#: src/geanylipsum.c:198 +#: src/geanylipsum.c:176 msgid "Include Pseudotext to your code" msgstr "Fügt Platzhaltertexte in das Dokument ein" + +#: src/geanylipsum.c:184 +msgid "Insert Lipsum text" +msgstr "Fügt Platzhaltertexte ein" Modified: trunk/geanylipsum/po/geanylipsum.pot =================================================================== --- trunk/geanylipsum/po/geanylipsum.pot 2009-01-21 22:25:45 UTC (rev 397) +++ trunk/geanylipsum/po/geanylipsum.pot 2009-01-22 23:31:18 UTC (rev 398) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-12-22 23:17+0100\n" +"POT-Creation-Date: 2009-01-23 00:30+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" @@ -16,38 +16,34 @@ "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: src/geanylipsum.c:74 +#: src/geanylipsum.c:63 msgid "Lipsum" msgstr "" -#: src/geanylipsum.c:74 +#: src/geanylipsum.c:63 msgid "Creating dummy text with Geany" msgstr "" -#: src/geanylipsum.c:74 +#: src/geanylipsum.c:63 msgid "Frank Lanitz <frank(a)frank.uvena.de>" msgstr "" -#: src/geanylipsum.c:117 -msgid "Lipsum-generator" +#: src/geanylipsum.c:105 +msgid "Lipsum-Generator" msgstr "" -#: src/geanylipsum.c:126 -msgid "HTML" +#: src/geanylipsum.c:106 +msgid "Enter the length of Lipsum text here" msgstr "" -#: src/geanylipsum.c:136 -msgid "LaTeX" -msgstr "" - -#: src/geanylipsum.c:146 -msgid "Plain" -msgstr "" - -#: src/geanylipsum.c:196 +#: src/geanylipsum.c:174 msgid "_Lipsum" msgstr "" -#: src/geanylipsum.c:198 +#: src/geanylipsum.c:176 msgid "Include Pseudotext to your code" msgstr "" + +#: src/geanylipsum.c:184 +msgid "Insert Lipsum text" +msgstr "" Modified: trunk/geanylipsum/src/geanylipsum.c =================================================================== --- trunk/geanylipsum/src/geanylipsum.c 2009-01-21 22:25:45 UTC (rev 397) +++ trunk/geanylipsum/src/geanylipsum.c 2009-01-22 23:31:18 UTC (rev 398) @@ -59,7 +59,7 @@ GeanyData *geany_data; GeanyFunctions *geany_functions; -PLUGIN_VERSION_CHECK(115) +PLUGIN_VERSION_CHECK(128) PLUGIN_SET_INFO(_("Lipsum"), _("Creating dummy text with Geany"), VERSION, _("Frank Lanitz <frank(a)frank.uvena.de>")); static GtkWidget *main_menu_item = NULL; @@ -96,41 +96,14 @@ void lipsum_activated(G_GNUC_UNUSED GtkMenuItem *menuitem, G_GNUC_UNUSED gpointer gdata) { - GtkWidget *dialog = NULL; - GtkWidget *vbox = NULL; - GtkWidget *label = NULL; - GtkWidget *hbox = NULL; - GtkWidget *spin = NULL; - GtkTooltips *tooltip = NULL; GeanyDocument *doc = NULL; + /* Setting default length to 1500 characters */ + gdouble value = 1500; - int length = 0; - - tooltip = gtk_tooltips_new(); - doc = document_get_current(); - dialog = gtk_dialog_new_with_buttons(_("Lipsum-generator"), - GTK_WINDOW(geany->main_widgets->window), - GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, NULL); - vbox = ui_dialog_vbox_new(GTK_DIALOG(dialog)); - gtk_widget_set_name(dialog, "GeanyDialog"); - gtk_box_set_spacing(GTK_BOX(vbox), 10); - - label = gtk_label_new(_("characters")); - spin = gtk_spin_button_new_with_range(1, 5000, 1); - gtk_spin_button_set_value(GTK_SPIN_BUTTON(spin), 1500); - - hbox = gtk_hbox_new(FALSE, 5); - gtk_box_pack_start(GTK_BOX(hbox), spin, TRUE, TRUE, 0); - gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0); - - gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 5); - - gtk_widget_show_all(vbox); - - if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) + if (dialogs_show_input_numeric(_("Lipsum-Generator"), + _("Enter the length of Lipsum text here"), &value, 1, 5000, 1)) { int tmp = 0; @@ -138,27 +111,23 @@ int i = 0; int missing = 0; - /* Checking for length of string that should be inserted */ - length = gtk_spin_button_get_value_as_int( - GTK_SPIN_BUTTON(spin)); - /* Checking what we have */ tmp = strlen(lipsum); - if (tmp > length) + if (tmp > value) { x = 0; - missing = length - (x * tmp); + missing = value - (x * tmp); } - else if (tmp == length) + else if (tmp == (int)value) { x = 1; } else if (tmp > 0) { - x = length / tmp; - missing = length - (x * tmp); + x = value / tmp; + missing = value - (x * tmp); } for (i = 0; i < x; i++) @@ -167,7 +136,6 @@ if (missing > 0) insert_string(g_strndup(lipsum, missing)); - gtk_widget_destroy(dialog); } } @@ -213,7 +181,7 @@ /* init keybindins */ keybindings_set_item(plugin_key_group, LIPSUM_KB_INSERT, kblipsum_insert, - 0, 0, "inster_lipsum", _("Insert Lipsum tex"), menu_lipsum); + 0, 0, "inster_lipsum", _("Insert Lipsum text"), menu_lipsum); main_menu_item = menu_lipsum; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany-plugins:[397] trunk/wscript
by eht16＠users.sourceforge.net 21 Jan '09

21 Jan '09

Revision: 397 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=397&view=rev Author: eht16 Date: 2009-01-21 22:25:45 +0000 (Wed, 21 Jan 2009) Log Message: ----------- Use new taskgen syntax. Write 'ENABLE_NLS' and 'GETTEXT_PACKAGE' macros only to config.h if the plugin supports I18n. Modified Paths: -------------- trunk/wscript Modified: trunk/wscript =================================================================== --- trunk/wscript 2009-01-21 22:13:43 UTC (rev 396) +++ trunk/wscript 2009-01-21 22:25:45 UTC (rev 397) @@ -201,7 +201,6 @@ svn_rev = conf_get_svn_rev() - conf.define('ENABLE_NLS', 1) conf.define('REVISION', svn_rev, 1) # write a config.h for each plugin @@ -212,8 +211,13 @@ conf.define('USE_GTKSPELL', 1); conf.define('VERSION', p.version, 1) conf.define('PACKAGE', p.name, 1) - conf.define('GETTEXT_PACKAGE', p.name, 1) conf.define('PREFIX', conf.env['PREFIX'], 1) + if os.path.exists(os.path.join(p.name, 'po')): + conf.define('GETTEXT_PACKAGE', p.name, 1) + conf.define('ENABLE_NLS', 1) + else: + conf.undefine('GETTEXT_PACKAGE') + conf.undefine('ENABLE_NLS') conf.write_config_header(os.path.join(p.name, 'config.h')) Utils.pprint('BLUE', 'Summary:') @@ -252,10 +256,6 @@ help='plugins which should not be built, ignored when --enable-plugins is set, same format as --enable-plugins' % \ { '1' : plugins[0].name, '2' : plugins[1].name }, dest='skip_plugins') -#~ future code -#~ def error_handler(self, tsk): - #~ print "haha, %r failed" % tsk - #~ self.error = 0 def build(bld): for p in plugins: @@ -275,16 +275,18 @@ if p.name == 'geany-mini-script': tgt = 'gms' else: tgt = p.name - obj = bld.new_task_gen('cc', 'shlib') - obj.source = p.sources - obj.includes = p.includes - obj.env['shlib_PATTERN'] = '%s.so' - obj.target = tgt - obj.uselib = libs - obj.install_path = '${LIBDIR}/geany' - # if we are compiling more than one plugin, allow some of to fail - #~ Runner.Parallel.error_handler = error_handler + bld.env['shlib_PATTERN'] = '%s.so' + bld.new_task_gen( + features = 'cc cshlib', + source = p.sources, + includes = p.includes, + target = tgt, + uselib = libs, + install_path = '${LIBDIR}/geany' + ) + + # TODO update waf and use new syntax if os.path.exists(os.path.join(p.name, 'po')): obj = bld.new_task_gen('intltool_po') obj.podir = os.path.join(p.name, 'po') @@ -297,13 +299,14 @@ 'geanylua/glspi_doc.c', 'geanylua/glspi_kfile.c', 'geanylua/glspi_run.c', 'geanylua/glspi_sci.c', 'geanylua/gsdlg_lua.c' ] - obj = bld.new_task_gen('cc', 'shlib') - obj.source = lua_sources - obj.includes = p.includes - obj.env['shlib_PATTERN'] = '%s.so' - obj.target = 'libgeanylua' - obj.uselib = libs - obj.install_path = '${DATADIR}/geany/plugins/geanylua' + bld.new_task_gen( + features = 'cc cshlib', + source = lua_sources, + includes = p.includes, + target = 'libgeanylua', + uselib = libs, + install_path = '${DATADIR}/geany/plugins/geanylua' + ) # install docs bld.install_files('${DATADIR}/doc/geany/plugins/geanylua', 'geanylua/docs/*.html') @@ -316,11 +319,13 @@ def build_debug(bld, p, libs): - obj = bld.new_task_gen('cc', 'program') - obj.source = [ 'geanydebug/src/ttyhelper.c' ] - obj.includes = p.includes - obj.target = 'geanydebug_ttyhelper' - obj.uselib = libs + bld.new_task_gen( + features = 'cc cprogram', + source = [ 'geanydebug/src/ttyhelper.c' ], + includes = p.includes, + target = 'geanydebug_ttyhelper', + uselib = libs + ) def init(): @@ -364,13 +369,15 @@ pass - # Simple function to execute a command and print its exit status def launch(command, status, success_color='GREEN'): ret = 0 Utils.pprint(success_color, status) try: ret = subprocess.call(command.split()) + except OSError, e: + ret = 1 + print str(e), ":", command except: ret = 1 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

Plugins-Commits January 2009