Plugins-Commits January 2009

plugins-commits@lists.geany.org

5 participants
56 discussions

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

31 Jan '09

Revision: 416 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=416&view=rev Author: kugel- Date: 2009-01-31 20:30:11 +0000 (Sat, 31 Jan 2009) Log Message: ----------- Implement (the currently unused) VC_COMMAND_SHOW, which is supposed to return the base-version (i.e. unchanged version) of the current file. Working for svn, however the output isn't syntax-highlightened (FIXME, I didn't figured out how to do that) Modified Paths: -------------- branches/GeanyVC_menu_redesign/geanyvc.c branches/GeanyVC_menu_redesign/vc_svn.c Modified: branches/GeanyVC_menu_redesign/geanyvc.c =================================================================== --- branches/GeanyVC_menu_redesign/geanyvc.c 2009-01-31 19:59:05 UTC (rev 415) +++ branches/GeanyVC_menu_redesign/geanyvc.c 2009-01-31 20:30:11 UTC (rev 416) @@ -674,7 +674,7 @@ { gchar *name; name = g_strconcat(dir, ".vc.diff", NULL); - show_output(text, name, NULL); + show_output(text, name, doc->encoding); g_free(text); g_free(name); } @@ -816,6 +816,27 @@ g_free(base_name); } +static void +vcshow_file_activated(G_GNUC_UNUSED GtkMenuItem * menuitem, G_GNUC_UNUSED gpointer gdata) +{ + gchar *output = NULL; + const VC_RECORD *vc; + GeanyDocument *doc; + + doc = document_get_current(); + g_return_if_fail(doc != NULL && doc->file_name != NULL); + + vc = find_vc(doc->file_name); + g_return_if_fail(vc); + + execute_command(vc, &output, NULL, doc->file_name, VC_COMMAND_SHOW, NULL, NULL); + if (output) + { + show_output(output, "*VC-ORIG*", NULL); + g_free(output); + } +} + static gboolean command_with_question_activated(gchar ** text, gint cmd, const gchar * question, gint flags) { @@ -1461,6 +1482,7 @@ static GtkWidget *menu_vc_remove_file = NULL; static GtkWidget *menu_vc_update = NULL; static GtkWidget *menu_vc_commit = NULL; +static GtkWidget *menu_vc_show_file = NULL; static void update_menu_items() @@ -1508,6 +1530,8 @@ gtk_widget_set_sensitive(menu_vc_update, d_have_vc); gtk_widget_set_sensitive(menu_vc_commit, d_have_vc); + + gtk_widget_set_sensitive(menu_vc_show_file, f_have_vc); } @@ -1935,7 +1959,16 @@ g_signal_connect((gpointer) menu_vc_log_file, "activate", G_CALLBACK(vclog_file_activated), NULL); + /* base version of the current file */ + menu_vc_show_file = gtk_menu_item_new_with_mnemonic(_("_Original")); + gtk_container_add(GTK_CONTAINER(cur_file_menu), menu_vc_show_file); + gtk_tooltips_set_tip(*tooltips, menu_vc_log_file, + _("Shows the orignal of the current file"), NULL); + g_signal_connect((gpointer) menu_vc_show_file, "activate", + G_CALLBACK(vcshow_file_activated), NULL); + + gtk_container_add(GTK_CONTAINER(cur_file_menu), gtk_separator_menu_item_new()); /* add current file */ Modified: branches/GeanyVC_menu_redesign/vc_svn.c =================================================================== --- branches/GeanyVC_menu_redesign/vc_svn.c 2009-01-31 19:59:05 UTC (rev 415) +++ branches/GeanyVC_menu_redesign/vc_svn.c 2009-01-31 20:30:11 UTC (rev 416) @@ -47,7 +47,7 @@ static const gchar *SVN_CMD_COMMIT[] = { "svn", "commit", "--non-interactive", "-m", MESSAGE, FILE_LIST, NULL }; static const gchar *SVN_CMD_BLAME[] = { "svn", "blame", BASENAME, NULL }; -static const gchar *SVN_CMD_SHOW[] = { "svn", "cat", BASENAME, NULL }; +static const gchar *SVN_CMD_SHOW[] = { "svn", "cat", "-rBASE", BASENAME, NULL }; static const gchar *SVN_CMD_UPDATE[] = { "svn", "up", NULL }; static const VC_COMMAND commands[] = { 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:[415] branches/GeanyVC_menu_redesign/geanyvc.c
by kugel-＠users.sourceforge.net 31 Jan '09

31 Jan '09

Revision: 415 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=415&view=rev Author: kugel- Date: 2009-01-31 19:59:05 +0000 (Sat, 31 Jan 2009) Log Message: ----------- convert spaces-indentation introduced in the previous commit to tabs Modified Paths: -------------- branches/GeanyVC_menu_redesign/geanyvc.c Modified: branches/GeanyVC_menu_redesign/geanyvc.c =================================================================== --- branches/GeanyVC_menu_redesign/geanyvc.c 2009-01-31 19:53:01 UTC (rev 414) +++ branches/GeanyVC_menu_redesign/geanyvc.c 2009-01-31 19:59:05 UTC (rev 415) @@ -642,7 +642,7 @@ vcdiff_dir_activated(G_GNUC_UNUSED GtkMenuItem * menuitem, gint flags) { gchar *text = NULL; - gchar *dir; + gchar *dir; const VC_RECORD *vc; GeanyDocument *doc; @@ -657,22 +657,22 @@ vc = find_vc(doc->file_name); g_return_if_fail(vc); - if (flags & FLAG_BASEDIR) - { - dir = vc->get_base_dir(doc->file_name); - } - else if (flags & FLAG_DIR) - { - dir = g_path_get_dirname(doc->file_name); - } - else - return; - g_return_if_fail(dir); + if (flags & FLAG_BASEDIR) + { + dir = vc->get_base_dir(doc->file_name); + } + else if (flags & FLAG_DIR) + { + dir = g_path_get_dirname(doc->file_name); + } + else + return; + g_return_if_fail(dir); execute_command(vc, &text, NULL, dir, VC_COMMAND_DIFF_DIR, NULL, NULL); if (text) { - gchar *name; + gchar *name; name = g_strconcat(dir, ".vc.diff", NULL); show_output(text, name, NULL); g_free(text); 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:[414] branches/GeanyVC_menu_redesign/geanyvc.c
by kugel-＠users.sourceforge.net 31 Jan '09

31 Jan '09

Revision: 414 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=414&view=rev Author: kugel- Date: 2009-01-31 19:53:01 +0000 (Sat, 31 Jan 2009) Log Message: ----------- Rework diff a little: a) Remove duplicated code by using the same function for dir diff and basedir diff. Use function parameter to decide which of both to use. b) if basedir diff was used, show the name of the basedir in the created xxx.vc.diff (instead of the current doc's dir). c) tiny cleanup in the function too Modified Paths: -------------- branches/GeanyVC_menu_redesign/geanyvc.c Modified: branches/GeanyVC_menu_redesign/geanyvc.c =================================================================== --- branches/GeanyVC_menu_redesign/geanyvc.c 2009-01-31 19:42:35 UTC (rev 413) +++ branches/GeanyVC_menu_redesign/geanyvc.c 2009-01-31 19:53:01 UTC (rev 414) @@ -635,52 +635,14 @@ } } -/* Make a diff from the current directory */ -static void -vcdiff_dir_activated(G_GNUC_UNUSED GtkMenuItem * menuitem, G_GNUC_UNUSED gpointer gdata) -{ - gchar *base_name = NULL; - gchar *text = NULL; - const VC_RECORD *vc; - GeanyDocument *doc; - doc = document_get_current(); - g_return_if_fail(doc != NULL && doc->file_name != NULL); - if (doc->changed) - { - document_save_file(doc, FALSE); - } - - base_name = g_path_get_dirname(doc->file_name); - - vc = find_vc(base_name); - g_return_if_fail(vc); - - execute_command(vc, &text, NULL, base_name, VC_COMMAND_DIFF_DIR, NULL, NULL); - if (text) - { - setptr(base_name, g_strconcat(base_name, ".vc.diff", NULL)); - show_output(text, base_name, NULL); - g_free(text); - } - else - { - ui_set_statusbar(FALSE, _("No changes were made.")); - } - - g_free(base_name); -} - - /* Callback if menu item for the base directory was activated */ static void -vcdiff_basedir_activated(G_GNUC_UNUSED GtkMenuItem * menuitem, G_GNUC_UNUSED gpointer gdata) +vcdiff_dir_activated(G_GNUC_UNUSED GtkMenuItem * menuitem, gint flags) { gchar *text = NULL; - gchar *name; - gchar *basedir; - gchar *base_name; + gchar *dir; const VC_RECORD *vc; GeanyDocument *doc; @@ -695,16 +657,24 @@ vc = find_vc(doc->file_name); g_return_if_fail(vc); - basedir = vc->get_base_dir(doc->file_name); - g_return_if_fail(basedir); + if (flags & FLAG_BASEDIR) + { + dir = vc->get_base_dir(doc->file_name); + } + else if (flags & FLAG_DIR) + { + dir = g_path_get_dirname(doc->file_name); + } + else + return; + g_return_if_fail(dir); - execute_command(vc, &text, NULL, basedir, VC_COMMAND_DIFF_DIR, NULL, NULL); + execute_command(vc, &text, NULL, dir, VC_COMMAND_DIFF_DIR, NULL, NULL); if (text) { - base_name = g_path_get_dirname(doc->file_name); - name = g_strconcat(base_name, ".vc.diff", NULL); + gchar *name; + name = g_strconcat(dir, ".vc.diff", NULL); show_output(text, name, NULL); - g_free(base_name); g_free(text); g_free(name); } @@ -712,7 +682,7 @@ { ui_set_statusbar(FALSE, _("No changes were made.")); } - g_free(basedir); + g_free(dir); } static void @@ -909,11 +879,11 @@ } static void -vcrevert_dir_activated(G_GNUC_UNUSED GtkMenuItem * menuitem, gint gdata) +vcrevert_dir_activated(G_GNUC_UNUSED GtkMenuItem * menuitem, gint flags) { command_with_question_activated(NULL, VC_COMMAND_REVERT_DIR, _("Do you really want to revert: %s?"), - FLAG_RELOAD | gdata | FLAG_FORCE_ASK); + FLAG_RELOAD | flags | FLAG_FORCE_ASK); } static void @@ -1550,13 +1520,13 @@ static void kbdiff_dir(G_GNUC_UNUSED guint key_id) { - vcdiff_dir_activated(NULL, NULL); + vcdiff_dir_activated(NULL, FLAG_DIR); } static void kbdiff_basedir(G_GNUC_UNUSED guint key_id) { - vcdiff_basedir_activated(NULL, NULL); + vcdiff_dir_activated(NULL, FLAG_BASEDIR); } static void @@ -2005,7 +1975,7 @@ _("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); + G_CALLBACK(vcdiff_dir_activated), (gpointer)FLAG_DIR); /* Revert current dir */ menu_vc_revert_dir = gtk_menu_item_new_with_mnemonic(_("_Revert")); @@ -2045,7 +2015,7 @@ _("Make a diff from the top VC directory"), NULL); g_signal_connect((gpointer) menu_vc_diff_basedir, "activate", - G_CALLBACK(vcdiff_basedir_activated), NULL); + G_CALLBACK(vcdiff_dir_activated), (gpointer)FLAG_BASEDIR); /* Revert everything */ menu_vc_revert_basedir = gtk_menu_item_new_with_mnemonic(_("_Revert")); 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:[413] branches/GeanyVC_menu_redesign/vc_svk.c
by kugel-＠users.sourceforge.net 31 Jan '09

31 Jan '09

Revision: 413 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=413&view=rev Author: kugel- Date: 2009-01-31 19:42:35 +0000 (Sat, 31 Jan 2009) Log Message: ----------- oops :/ Modified Paths: -------------- branches/GeanyVC_menu_redesign/vc_svk.c Modified: branches/GeanyVC_menu_redesign/vc_svk.c =================================================================== --- branches/GeanyVC_menu_redesign/vc_svk.c 2009-01-31 19:26:19 UTC (rev 412) +++ branches/GeanyVC_menu_redesign/vc_svk.c 2009-01-31 19:42:35 UTC (rev 413) @@ -37,7 +37,7 @@ static const gchar *SVK_CMD_DIFF_FILE[] = { "svk", "diff", ABS_FILENAME, NULL }; static const gchar *SVK_CMD_DIFF_DIR[] = { "svk", "diff", ABS_DIRNAME, NULL }; static const gchar *SVK_CMD_REVERT_FILE[] = { "svk", "revert", BASENAME, NULL }; -static const gchar *SVK_CMD_REVERT_FILE[] = { "svk", NULL }; +static const gchar *SVK_CMD_REVERT_DIR[] = { "svk", NULL }; static const gchar *SVK_CMD_STATUS[] = { "svk", "status", NULL }; static const gchar *SVK_CMD_ADD[] = { "svk", "add", BASENAME, NULL }; static const gchar *SVK_CMD_REMOVE[] = { "svk", "remove", BASENAME, NULL }; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

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

31 Jan '09

Revision: 412 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=412&view=rev Author: kugel- Date: 2009-01-31 19:26:19 +0000 (Sat, 31 Jan 2009) Log Message: ----------- Add stubs for revert dir and basedir for other VCs Modified Paths: -------------- branches/GeanyVC_menu_redesign/vc_bzr.c branches/GeanyVC_menu_redesign/vc_cvs.c branches/GeanyVC_menu_redesign/vc_git.c branches/GeanyVC_menu_redesign/vc_hg.c branches/GeanyVC_menu_redesign/vc_svk.c Modified: branches/GeanyVC_menu_redesign/vc_bzr.c =================================================================== --- branches/GeanyVC_menu_redesign/vc_bzr.c 2009-01-30 16:51:27 UTC (rev 411) +++ branches/GeanyVC_menu_redesign/vc_bzr.c 2009-01-31 19:26:19 UTC (rev 412) @@ -37,6 +37,7 @@ static const gchar *BZR_CMD_DIFF_FILE[] = { "bzr", "diff", BASENAME, NULL }; static const gchar *BZR_CMD_DIFF_DIR[] = { "bzr", "diff", ABS_DIRNAME, NULL }; static const gchar *BZR_CMD_REVERT_FILE[] = { "bzr", "revert", BASENAME, NULL }; +static const gchar *BZR_CMD_REVERT_DIR[] = { "bzr", NULL }; static const gchar *BZR_CMD_STATUS[] = { "bzr", "status", NULL }; static const gchar *BZR_CMD_ADD[] = { "bzr", "add", BASENAME, NULL }; static const gchar *BZR_CMD_REMOVE[] = { "bzr", "remove", BASENAME, NULL }; @@ -65,6 +66,11 @@ .function = NULL}, { .startdir = VC_COMMAND_STARTDIR_FILE, + .command = BZR_CMD_REVERT_DIR, + .env = NULL, + .function = NULL}, + { + .startdir = VC_COMMAND_STARTDIR_FILE, .command = BZR_CMD_STATUS, .env = NULL, .function = NULL}, Modified: branches/GeanyVC_menu_redesign/vc_cvs.c =================================================================== --- branches/GeanyVC_menu_redesign/vc_cvs.c 2009-01-30 16:51:27 UTC (rev 411) +++ branches/GeanyVC_menu_redesign/vc_cvs.c 2009-01-31 19:26:19 UTC (rev 412) @@ -34,6 +34,7 @@ static const gchar *CVS_CMD_DIFF_FILE[] = { "cvs", "diff", "-u", BASE_FILENAME, NULL }; static const gchar *CVS_CMD_DIFF_DIR[] = { "cvs", "diff", "-u", NULL }; static const gchar *CVS_CMD_REVERT_FILE[] = { "cvs", "update", "-C", BASE_FILENAME, NULL }; +static const gchar *CVS_CMD_REVERT_DIR[] = { "cvs", NULL }; static const gchar *CVS_CMD_STATUS[] = { "cvs", "status", NULL }; static const gchar *CVS_CMD_ADD[] = { "cvs", "add", BASE_FILENAME, NULL }; static const gchar *CVS_CMD_REMOVE[] = { "cvs", "remove", BASE_FILENAME, NULL }; @@ -62,6 +63,11 @@ .function = NULL}, { .startdir = VC_COMMAND_STARTDIR_FILE, + .command = CVS_CMD_REVERT_DIR, + .env = NULL, + .function = NULL}, + { + .startdir = VC_COMMAND_STARTDIR_FILE, .command = CVS_CMD_STATUS, .env = NULL, .function = NULL}, Modified: branches/GeanyVC_menu_redesign/vc_git.c =================================================================== --- branches/GeanyVC_menu_redesign/vc_git.c 2009-01-30 16:51:27 UTC (rev 411) +++ branches/GeanyVC_menu_redesign/vc_git.c 2009-01-31 19:26:19 UTC (rev 412) @@ -89,6 +89,7 @@ static const gchar *GIT_CMD_DIFF_FILE[] = { "git", "diff", "HEAD", "--", BASENAME, NULL }; static const gchar *GIT_CMD_DIFF_DIR[] = { "git", "diff", "HEAD", NULL }; static const gchar *GIT_CMD_REVERT_FILE[] = { "git", "checkout", "--", BASENAME, NULL }; +static const gchar *GIT_CMD_REVERT_DIR[] = { "git", NULL }; static const gchar *GIT_CMD_STATUS[] = { "git", "status", NULL }; static const gchar *GIT_CMD_ADD[] = { "git", "add", "--", BASENAME, NULL }; static const gchar *GIT_CMD_REMOVE[] = @@ -103,6 +104,7 @@ static const gchar *GIT_ENV_DIFF_FILE[] = { "PAGER=cat", NULL }; static const gchar *GIT_ENV_DIFF_DIR[] = { "PAGER=cat", NULL }; static const gchar *GIT_ENV_REVERT_FILE[] = { "PAGER=cat", NULL }; +static const gchar *GIT_ENV_REVERT_DIR[] = { "PAGER=cat", NULL }; static const gchar *GIT_ENV_STATUS[] = { "PAGER=cat", NULL }; static const gchar *GIT_ENV_ADD[] = { "PAGER=cat", NULL }; static const gchar *GIT_ENV_REMOVE[] = { "PAGER=cat", NULL }; @@ -111,7 +113,7 @@ static const gchar *GIT_ENV_BLAME[] = { "PAGER=cat", NULL }; static const gchar *GIT_ENV_UPDATE[] = { "PAGER=cat", NULL }; -static const VC_COMMAND commands[] = { +static const VC_COMMAND commands[VC_COMMAND_COUNT] = { { .startdir = VC_COMMAND_STARTDIR_FILE, .command = GIT_CMD_DIFF_FILE, @@ -129,6 +131,11 @@ .function = NULL}, { .startdir = VC_COMMAND_STARTDIR_FILE, + .command = GIT_CMD_REVERT_DIR, + .env = GIT_ENV_REVERT_DIR, + .function = NULL}, + { + .startdir = VC_COMMAND_STARTDIR_FILE, .command = GIT_CMD_STATUS, .env = GIT_ENV_STATUS, .function = NULL}, Modified: branches/GeanyVC_menu_redesign/vc_hg.c =================================================================== --- branches/GeanyVC_menu_redesign/vc_hg.c 2009-01-30 16:51:27 UTC (rev 411) +++ branches/GeanyVC_menu_redesign/vc_hg.c 2009-01-31 19:26:19 UTC (rev 412) @@ -37,6 +37,7 @@ static const gchar *HG_CMD_DIFF_FILE[] = { "hg", "diff", ABS_FILENAME, NULL }; static const gchar *HG_CMD_DIFF_DIR[] = { "hg", "diff", ABS_DIRNAME, NULL }; static const gchar *HG_CMD_REVERT_FILE[] = { "hg", "revert", BASENAME, NULL }; +static const gchar *HG_CMD_REVERT_DIR[] = { "hg", NULL }; static const gchar *HG_CMD_STATUS[] = { "hg", "status", NULL }; static const gchar *HG_CMD_ADD[] = { "hg", "add", BASENAME, NULL }; static const gchar *HG_CMD_REMOVE[] = { "hg", "remove", BASENAME, NULL }; @@ -65,6 +66,11 @@ .function = NULL}, { .startdir = VC_COMMAND_STARTDIR_FILE, + .command = HG_CMD_REVERT_DIR, + .env = NULL, + .function = NULL}, + { + .startdir = VC_COMMAND_STARTDIR_FILE, .command = HG_CMD_STATUS, .env = NULL, .function = NULL}, Modified: branches/GeanyVC_menu_redesign/vc_svk.c =================================================================== --- branches/GeanyVC_menu_redesign/vc_svk.c 2009-01-30 16:51:27 UTC (rev 411) +++ branches/GeanyVC_menu_redesign/vc_svk.c 2009-01-31 19:26:19 UTC (rev 412) @@ -37,6 +37,7 @@ static const gchar *SVK_CMD_DIFF_FILE[] = { "svk", "diff", ABS_FILENAME, NULL }; static const gchar *SVK_CMD_DIFF_DIR[] = { "svk", "diff", ABS_DIRNAME, NULL }; static const gchar *SVK_CMD_REVERT_FILE[] = { "svk", "revert", BASENAME, NULL }; +static const gchar *SVK_CMD_REVERT_FILE[] = { "svk", NULL }; static const gchar *SVK_CMD_STATUS[] = { "svk", "status", NULL }; static const gchar *SVK_CMD_ADD[] = { "svk", "add", BASENAME, NULL }; static const gchar *SVK_CMD_REMOVE[] = { "svk", "remove", BASENAME, NULL }; @@ -65,6 +66,11 @@ .function = NULL}, { .startdir = VC_COMMAND_STARTDIR_FILE, + .command = SVK_CMD_REVERT_DIR, + .env = NULL, + .function = NULL}, + { + .startdir = VC_COMMAND_STARTDIR_FILE, .command = SVK_CMD_STATUS, .env = NULL, .function = NULL}, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany-plugins:[411] trunk/geanygdb/src/gdb-ui-main.c
by eht16＠users.sourceforge.net 30 Jan '09

30 Jan '09

Revision: 411 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=411&view=rev Author: eht16 Date: 2009-01-30 16:51:27 +0000 (Fri, 30 Jan 2009) Log Message: ----------- When loading an executable to debug, set the working directory accordingly. Modified Paths: -------------- trunk/geanygdb/src/gdb-ui-main.c Modified: trunk/geanygdb/src/gdb-ui-main.c =================================================================== --- trunk/geanygdb/src/gdb-ui-main.c 2009-01-30 01:08:23 UTC (rev 410) +++ trunk/geanygdb/src/gdb-ui-main.c 2009-01-30 16:51:27 UTC (rev 411) @@ -505,6 +505,7 @@ { if (access(fn, X_OK) == 0) { + gchar *base_path; gchar *ldd = g_strconcat("ldd ", fn, @@ -545,6 +546,10 @@ pipe_click(pipe_chk, NULL); } + /* set working dir after loading */ + base_path = g_path_get_dirname(fn); + gdbio_send_cmd("-environment-cd %s\n", base_path); + g_free(base_path); } else { 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:[410] branches/GeanyVC_menu_redesign
by kugel-＠users.sourceforge.net 30 Jan '09

30 Jan '09

Revision: 410 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=410&view=rev Author: kugel- Date: 2009-01-30 01:08:23 +0000 (Fri, 30 Jan 2009) Log Message: ----------- revert for current dir and basedir for subversion, I hope it's ok :) Modified Paths: -------------- branches/GeanyVC_menu_redesign/geanyvc.c branches/GeanyVC_menu_redesign/geanyvc.h branches/GeanyVC_menu_redesign/vc_svn.c Modified: branches/GeanyVC_menu_redesign/geanyvc.c =================================================================== --- branches/GeanyVC_menu_redesign/geanyvc.c 2009-01-28 21:59:09 UTC (rev 409) +++ branches/GeanyVC_menu_redesign/geanyvc.c 2009-01-30 01:08:23 UTC (rev 410) @@ -126,7 +126,9 @@ VC_COMMIT, VC_STATUS, VC_UPDATE, - VC_REVERT, + VC_REVERT_FILE, + VC_REVERT_DIR, + VC_REVERT_BASEDIR, COUNT_KB }; @@ -437,7 +439,6 @@ { return 0; } - for (cur = largv; cur != NULL; cur = g_slist_next(cur)) { argv = cur->data; @@ -861,6 +862,11 @@ vc = find_vc(dir); g_return_val_if_fail(vc, FALSE); + if (flags & FLAG_BASEDIR) + { + dir = vc->get_base_dir(dir); + } + if (doc->changed) { document_save_file(doc, FALSE); @@ -872,7 +878,7 @@ GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO, question, - (flags & FLAG_DIR ? dir : doc->file_name)); + (flags & (FLAG_DIR|FLAG_BASEDIR) ? dir : doc->file_name)); result = gtk_dialog_run(GTK_DIALOG(dialog)); gtk_widget_destroy(dialog); } @@ -885,11 +891,12 @@ { if (flags & FLAG_FILE) execute_command(vc, text, NULL, doc->file_name, cmd, NULL, NULL); - if (flags & FLAG_DIR) + if (flags & (FLAG_DIR|FLAG_BASEDIR)) execute_command(vc, text, NULL, dir, cmd, NULL, NULL); if (flags & FLAG_RELOAD) document_reload_file(doc, NULL); } + g_free(dir); return (result == GTK_RESPONSE_YES); } @@ -902,6 +909,14 @@ } static void +vcrevert_dir_activated(G_GNUC_UNUSED GtkMenuItem * menuitem, gint gdata) +{ + command_with_question_activated(NULL, VC_COMMAND_REVERT_DIR, + _("Do you really want to revert: %s?"), + FLAG_RELOAD | gdata | 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, @@ -1470,6 +1485,8 @@ static GtkWidget *menu_vc_log_basedir = NULL; static GtkWidget *menu_vc_status = NULL; static GtkWidget *menu_vc_revert_file = NULL; +static GtkWidget *menu_vc_revert_dir = NULL; +static GtkWidget *menu_vc_revert_basedir = NULL; static GtkWidget *menu_vc_add_file = NULL; static GtkWidget *menu_vc_remove_file = NULL; static GtkWidget *menu_vc_update = NULL; @@ -1513,6 +1530,8 @@ gtk_widget_set_sensitive(menu_vc_status, d_have_vc); gtk_widget_set_sensitive(menu_vc_revert_file, f_have_vc); + gtk_widget_set_sensitive(menu_vc_revert_dir, f_have_vc); + gtk_widget_set_sensitive(menu_vc_revert_basedir, f_have_vc); gtk_widget_set_sensitive(menu_vc_remove_file, f_have_vc); gtk_widget_set_sensitive(menu_vc_add_file, d_have_vc && !f_have_vc); @@ -1553,12 +1572,24 @@ } static void -kbrevert(G_GNUC_UNUSED guint key_id) +kbrevert_file(G_GNUC_UNUSED guint key_id) { vcrevert_activated(NULL, NULL); } static void +kbrevert_dir(G_GNUC_UNUSED guint key_id) +{ + vcrevert_dir_activated(NULL, FLAG_DIR); +} + +static void +kbrevert_basedir(G_GNUC_UNUSED guint key_id) +{ + vcrevert_dir_activated(NULL, FLAG_BASEDIR); +} + +static void kbupdate(G_GNUC_UNUSED guint key_id) { vcupdate_activated(NULL, NULL); @@ -1945,7 +1976,7 @@ g_signal_connect((gpointer) menu_vc_add_file, "activate", G_CALLBACK(vcadd_activated), NULL); - /* revert current file */ + /* remove 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, @@ -1976,6 +2007,15 @@ g_signal_connect((gpointer) menu_vc_diff_dir, "activate", G_CALLBACK(vcdiff_dir_activated), NULL); + /* Revert current dir */ + menu_vc_revert_dir = gtk_menu_item_new_with_mnemonic(_("_Revert")); + gtk_container_add(GTK_CONTAINER(cur_dir_menu), menu_vc_revert_dir); + gtk_tooltips_set_tip(*tooltips, menu_vc_revert_dir, + _("Restore original files in the current folder (undo local edits)."), NULL); + + g_signal_connect((gpointer) menu_vc_revert_dir, "activate", + G_CALLBACK(vcrevert_dir_activated), (gpointer)FLAG_DIR); + 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")); @@ -2007,6 +2047,15 @@ g_signal_connect((gpointer) menu_vc_diff_basedir, "activate", G_CALLBACK(vcdiff_basedir_activated), NULL); + /* Revert everything */ + menu_vc_revert_basedir = gtk_menu_item_new_with_mnemonic(_("_Revert")); + gtk_container_add(GTK_CONTAINER(basedir_menu), menu_vc_revert_basedir); + gtk_tooltips_set_tip(*tooltips, menu_vc_revert_basedir, + _("Revert any local edits."), NULL); + + g_signal_connect((gpointer) menu_vc_revert_basedir, "activate", + G_CALLBACK(vcrevert_dir_activated), (gpointer)FLAG_BASEDIR); + 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); @@ -2028,22 +2077,24 @@ 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); - 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_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); + "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_FILE, kbrevert_file, 0, 0, + "vc_revert_file", _("Revert single file"), menu_vc_revert_file); + keybindings_set_item(plugin_key_group, VC_REVERT_DIR, kbrevert_dir, 0, 0, + "vc_revert_dir", _("Revert whole directory"),menu_vc_revert_dir); + keybindings_set_item(plugin_key_group, VC_REVERT_BASEDIR, kbrevert_basedir, 0, 0, + "vc_revert_basedir", _("Revert whole tree"), menu_vc_revert_basedir); + 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 */ Modified: branches/GeanyVC_menu_redesign/geanyvc.h =================================================================== --- branches/GeanyVC_menu_redesign/geanyvc.h 2009-01-28 21:59:09 UTC (rev 409) +++ branches/GeanyVC_menu_redesign/geanyvc.h 2009-01-30 01:08:23 UTC (rev 410) @@ -27,6 +27,7 @@ VC_COMMAND_DIFF_FILE, VC_COMMAND_DIFF_DIR, VC_COMMAND_REVERT_FILE, + VC_COMMAND_REVERT_DIR, VC_COMMAND_STATUS, VC_COMMAND_ADD, VC_COMMAND_REMOVE, @@ -55,6 +56,7 @@ #define FLAG_FORCE_ASK (1<<1) #define FLAG_FILE (1<<2) #define FLAG_DIR (1<<3) +#define FLAG_BASEDIR (1<<4) #define P_ABS_DIRNAME "*<?geanyvcDIRNAME>*" #define P_ABS_FILENAME "*<?geanyvcFILENAME>*" Modified: branches/GeanyVC_menu_redesign/vc_svn.c =================================================================== --- branches/GeanyVC_menu_redesign/vc_svn.c 2009-01-28 21:59:09 UTC (rev 409) +++ branches/GeanyVC_menu_redesign/vc_svn.c 2009-01-30 01:08:23 UTC (rev 410) @@ -38,6 +38,7 @@ { "svn", "diff", "--non-interactive", BASE_FILENAME, NULL }; static const gchar *SVN_CMD_DIFF_DIR[] = { "svn", "diff", "--non-interactive", BASE_DIRNAME, NULL }; static const gchar *SVN_CMD_REVERT_FILE[] = { "svn", "revert", BASENAME, NULL }; +static const gchar *SVN_CMD_REVERT_DIR[] = { "svn", "revert", BASE_DIRNAME, "-R", NULL }; static const gchar *SVN_CMD_STATUS[] = { "svn", "status", NULL }; static const gchar *SVN_CMD_ADD[] = { "svn", "add", BASENAME, NULL }; static const gchar *SVN_CMD_REMOVE[] = { "svn", "rm", BASENAME, NULL }; @@ -67,6 +68,11 @@ .function = NULL}, { .startdir = VC_COMMAND_STARTDIR_FILE, + .command = SVN_CMD_REVERT_DIR, + .env = NULL, + .function = NULL}, + { + .startdir = VC_COMMAND_STARTDIR_FILE, .command = SVN_CMD_STATUS, .env = NULL, .function = NULL}, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany-plugins:[409] trunk/geanylatex/src/geanylatex.c
by frlan＠users.sourceforge.net 28 Jan '09

28 Jan '09

Revision: 409 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=409&view=rev Author: frlan Date: 2009-01-28 21:59:09 +0000 (Wed, 28 Jan 2009) Log Message: ----------- GeanyLaTeX: Make usage of plugin_help() function of Geany API v130 Modified Paths: -------------- trunk/geanylatex/src/geanylatex.c Modified: trunk/geanylatex/src/geanylatex.c =================================================================== --- trunk/geanylatex/src/geanylatex.c 2009-01-28 21:58:42 UTC (rev 408) +++ trunk/geanylatex/src/geanylatex.c 2009-01-28 21:59:09 UTC (rev 409) @@ -24,7 +24,7 @@ #include "geanylatex.h" -PLUGIN_VERSION_CHECK(115) +PLUGIN_VERSION_CHECK(130) PLUGIN_SET_INFO(_("LaTeX"), _("Plugin to provide better LaTeX support"), "0.3dev","Frank Lanitz <frank(a)frank.uvena.de>") @@ -834,6 +834,16 @@ insert_bibtex_entry(NULL, NULL); }*/ + +void plugin_help() +{ + dialogs_show_msgbox(GTK_MESSAGE_INFO, + _("GeanyLaTeX is a plugin to improve support for LaTeX in Geany." + "\n\nPlease report all bugs or feature requests to one of the " + "authors.")); +} + + void plugin_init(G_GNUC_UNUSED GeanyData * data) { 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:[408] trunk/geanylatex
by frlan＠users.sourceforge.net 28 Jan '09

28 Jan '09

Revision: 408 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=408&view=rev Author: frlan Date: 2009-01-28 21:58:42 +0000 (Wed, 28 Jan 2009) Log Message: ----------- GeanyLaTeX: Little reformating of code Modified Paths: -------------- trunk/geanylatex/po/de.po trunk/geanylatex/po/geanylatex.pot trunk/geanylatex/src/bibtex.c trunk/geanylatex/src/geanylatex.c trunk/geanylatex/src/geanylatex.h trunk/geanylatex/src/latexencodings.c Modified: trunk/geanylatex/po/de.po =================================================================== --- trunk/geanylatex/po/de.po 2009-01-27 22:38:33 UTC (rev 407) +++ trunk/geanylatex/po/de.po 2009-01-28 21:58:42 UTC (rev 408) @@ -2,7 +2,7 @@ msgstr "" "Project-Id-Version: GeanyLaTeX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-01-19 22:05+0100\n" +"POT-Creation-Date: 2009-01-28 22:23+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" @@ -21,87 +21,87 @@ msgid "Plugin to provide better LaTeX support" msgstr "Plugin zum Verbessern des LaTeX-Support für Geany" -#: src/geanylatex.c:97 +#: src/geanylatex.c:101 msgid "Insert label" msgstr "Lesezeichen einfügen" -#: src/geanylatex.c:110 +#: src/geanylatex.c:114 msgid "Label name:" msgstr "Lesezeichenname:" -#: src/geanylatex.c:142 +#: src/geanylatex.c:149 msgid "Insert reference" msgstr "Verweis einfügen" -#: src/geanylatex.c:155 +#: src/geanylatex.c:162 msgid "Ref name:" msgstr "Lesezeichenname:" -#: src/geanylatex.c:166 +#: src/geanylatex.c:173 msgid "Standard Reference" msgstr "Normaler Verweis" -#: src/geanylatex.c:171 +#: src/geanylatex.c:178 msgid "Page Reference" msgstr "Verweis auf Seite" -#: src/geanylatex.c:336 +#: src/geanylatex.c:351 msgid "More" msgstr "Weitere" #. Documentclass -#: src/geanylatex.c:427 +#: src/geanylatex.c:446 msgid "Documentclass:" msgstr "Dokumentenklasse:" -#: src/geanylatex.c:430 +#: src/geanylatex.c:449 msgid "Choose the kind of document you want to write" msgstr "Art des Dokumentes" -#: src/geanylatex.c:431 src/bibtexlabels.c:27 +#: src/geanylatex.c:451 src/bibtexlabels.c:27 msgid "Book" msgstr "Buch" -#: src/geanylatex.c:432 src/bibtexlabels.c:26 +#: src/geanylatex.c:453 src/bibtexlabels.c:26 msgid "Article" msgstr "Artikel" -#: src/geanylatex.c:433 +#: src/geanylatex.c:455 msgid "Report" msgstr "Bericht" -#: src/geanylatex.c:434 +#: src/geanylatex.c:457 msgid "Letter" msgstr "Brief" -#: src/geanylatex.c:435 +#: src/geanylatex.c:459 msgid "Presentation" msgstr "Präsentation" #. Encoding -#: src/geanylatex.c:445 +#: src/geanylatex.c:469 msgid "Encoding:" msgstr "Zeichensatz:" -#: src/geanylatex.c:449 +#: src/geanylatex.c:473 msgid "Set the encoding for your new document" msgstr "Zeichensatz für das neue Dokument" #. fontsize -#: src/geanylatex.c:464 +#: src/geanylatex.c:488 msgid "Fontsize:" msgstr "Schriftgröße:" -#: src/geanylatex.c:467 +#: src/geanylatex.c:491 msgid "Set the default fontsize of your new document" msgstr "Setzt die Standardschriftgröße für das neue Dokument" #. Author -#: src/geanylatex.c:480 +#: src/geanylatex.c:504 msgid "Author:" msgstr "Autor:" -#: src/geanylatex.c:483 +#: src/geanylatex.c:507 msgid "" "Sets the value of the \\author command. In most cases this should be your " "name" @@ -109,62 +109,62 @@ "Setzt den Eintrag für den \\author Befehl. Meist sollte hier Ihr Name stehen." #. Date -#: src/geanylatex.c:494 +#: src/geanylatex.c:518 msgid "Date:" msgstr "Datum:" -#: src/geanylatex.c:497 +#: src/geanylatex.c:521 msgid "" -"Sets the value of the \\date command inside header of your newly created " -"LaTeX-document. Keeping it at \\today is a good decision if you don't need " -"any fixed date." +"Sets the value of the \\date command inside header of your\t\t newly created " +"LaTeX-document. Keeping it at \\today is a good \t\t decision if you don't " +"need any fixed date." msgstr "" "Setzt den Eintrag für den \\date Befehl im Kopf des neuen Dokumentes. In den " "meisten Fällen sollte \\today eine gute Wahl sein." #. Title of the new document -#: src/geanylatex.c:504 +#: src/geanylatex.c:530 msgid "Title:" msgstr "Titel:" -#: src/geanylatex.c:506 +#: src/geanylatex.c:533 msgid "Sets the title of your new document." msgstr "Setzt den Titel für das neue Dokument." #. Papersize -#: src/geanylatex.c:513 +#: src/geanylatex.c:539 msgid "Paper size:" msgstr "Papiergröße:" -#: src/geanylatex.c:516 +#: src/geanylatex.c:542 msgid "Choose the paper format for the newly created document" msgstr "" "Setzt das Papierformat als Argument der Dokumentenklasse für das neue " "Dokument" #. Building the wizard-dialog and showing it -#: src/geanylatex.c:531 +#: src/geanylatex.c:557 msgid "LaTeX-Wizard" msgstr "LaTeX-Assistent" -#: src/geanylatex.c:541 +#: src/geanylatex.c:568 msgid "Use KOMA-script classes if possible" msgstr "Benutze KOMA-Skript wenn möglich" -#: src/geanylatex.c:544 +#: src/geanylatex.c:570 msgid "" "Uses the KOMA-script classes by Markus Kohm.\n" -"Keep in mind: To compile your document these classes have to be installed " +"Keep in mind: To compile your document these classeshave to be installed " "before." msgstr "" "Wenn diese Option aktiviert ist, werden die KOMA-Skript-Klassen von Markus " "Kohm genutzt. Sie müssen natürlich dafür installiert sein." -#: src/geanylatex.c:550 +#: src/geanylatex.c:577 msgid "Use draft mode" msgstr "Entwurfsmodus benutzen" -#: src/geanylatex.c:552 +#: src/geanylatex.c:579 msgid "" "Set the draft flag inside new created documents to get documents with a " "number of debugging helpers" @@ -172,63 +172,63 @@ "Setzt die Option draft für die Dokumentenklasse um das neue Dokument mit " "einer Nummer von kleinen Korrekturhinweisen zu versehen." -#: src/geanylatex.c:772 +#: src/geanylatex.c:807 msgid "Dear Sir or Madame" msgstr "Sehr geehrte Damen und Herren" -#: src/geanylatex.c:773 +#: src/geanylatex.c:808 msgid "With kind regards" msgstr "Mit freundlichen Grüßen" -#: src/geanylatex.c:815 +#: src/geanylatex.c:850 msgid "_LaTeX" msgstr "_LaTeX" -#: src/geanylatex.c:822 +#: src/geanylatex.c:857 msgid "LaTeX-_Wizard" msgstr "LaTeX-_Assistent" -#: src/geanylatex.c:825 +#: src/geanylatex.c:860 msgid "Starts a Wizard to easily create LaTeX-documents" msgstr "Öffnet einen Assistenten, um einfache LaTeX-Dokumente zu erstellen." -#: src/geanylatex.c:830 +#: src/geanylatex.c:865 msgid "Insert _Special Character" msgstr "_Sonderzeichen einfügen" -#: src/geanylatex.c:832 +#: src/geanylatex.c:867 msgid "Helps to use some not very common letters and signs" msgstr "Unterstützt bei der Verwendung von seltenen Sonderzeichen" -#: src/geanylatex.c:839 +#: src/geanylatex.c:877 msgid "Insert _Reference" msgstr "_Verweis einfügen" -#: src/geanylatex.c:841 +#: src/geanylatex.c:879 msgid "Inserting references to the document" msgstr "Eine Referenz in das Dokument einfügen" -#: src/geanylatex.c:845 +#: src/geanylatex.c:884 msgid "Insert _Label" msgstr "_Lesezeichen einfügen" -#: src/geanylatex.c:847 +#: src/geanylatex.c:886 msgid "Helps at inserting labels to a document" msgstr "Untersützt bei dem Einfügen von Lesezeichen in ein Dokument" -#: src/geanylatex.c:851 +#: src/geanylatex.c:891 msgid "BibTeX" msgstr "BibTeX" -#: src/geanylatex.c:868 +#: src/geanylatex.c:910 msgid "Run LaTeX-Wizard" msgstr "LaTeX-Assistent starten" -#: src/geanylatex.c:870 +#: src/geanylatex.c:912 msgid "Insert \\label" msgstr "\\label einfügen" -#: src/geanylatex.c:872 +#: src/geanylatex.c:914 msgid "Insert \\ref" msgstr "\\ref einfügen" @@ -268,15 +268,15 @@ msgid "ISO-8859-10 (Latin-10)" msgstr "ISO-8859-10 (Latin-10)" -#: src/latexencodings.c:52 +#: src/latexencodings.c:53 msgid "IBM 850 code page" msgstr "IBM 850 code page" -#: src/latexencodings.c:53 +#: src/latexencodings.c:55 msgid "IBM 852 code page" msgstr "IBM 852 code page" -#: src/latexencodings.c:54 src/letters.c:41 src/bibtexlabels.c:35 +#: src/latexencodings.c:57 src/letters.c:41 src/bibtexlabels.c:35 msgid "Misc" msgstr "Sonstiges" Modified: trunk/geanylatex/po/geanylatex.pot =================================================================== --- trunk/geanylatex/po/geanylatex.pot 2009-01-27 22:38:33 UTC (rev 407) +++ trunk/geanylatex/po/geanylatex.pot 2009-01-28 21:58:42 UTC (rev 408) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-01-19 22:05+0100\n" +"POT-Creation-Date: 2009-01-28 22:23+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" @@ -24,205 +24,205 @@ msgid "Plugin to provide better LaTeX support" msgstr "" -#: src/geanylatex.c:97 +#: src/geanylatex.c:101 msgid "Insert label" msgstr "" -#: src/geanylatex.c:110 +#: src/geanylatex.c:114 msgid "Label name:" msgstr "" -#: src/geanylatex.c:142 +#: src/geanylatex.c:149 msgid "Insert reference" msgstr "" -#: src/geanylatex.c:155 +#: src/geanylatex.c:162 msgid "Ref name:" msgstr "" -#: src/geanylatex.c:166 +#: src/geanylatex.c:173 msgid "Standard Reference" msgstr "" -#: src/geanylatex.c:171 +#: src/geanylatex.c:178 msgid "Page Reference" msgstr "" -#: src/geanylatex.c:336 +#: src/geanylatex.c:351 msgid "More" msgstr "" #. Documentclass -#: src/geanylatex.c:427 +#: src/geanylatex.c:446 msgid "Documentclass:" msgstr "" -#: src/geanylatex.c:430 +#: src/geanylatex.c:449 msgid "Choose the kind of document you want to write" msgstr "" -#: src/geanylatex.c:431 src/bibtexlabels.c:27 +#: src/geanylatex.c:451 src/bibtexlabels.c:27 msgid "Book" msgstr "" -#: src/geanylatex.c:432 src/bibtexlabels.c:26 +#: src/geanylatex.c:453 src/bibtexlabels.c:26 msgid "Article" msgstr "" -#: src/geanylatex.c:433 +#: src/geanylatex.c:455 msgid "Report" msgstr "" -#: src/geanylatex.c:434 +#: src/geanylatex.c:457 msgid "Letter" msgstr "" -#: src/geanylatex.c:435 +#: src/geanylatex.c:459 msgid "Presentation" msgstr "" #. Encoding -#: src/geanylatex.c:445 +#: src/geanylatex.c:469 msgid "Encoding:" msgstr "" -#: src/geanylatex.c:449 +#: src/geanylatex.c:473 msgid "Set the encoding for your new document" msgstr "" #. fontsize -#: src/geanylatex.c:464 +#: src/geanylatex.c:488 msgid "Fontsize:" msgstr "" -#: src/geanylatex.c:467 +#: src/geanylatex.c:491 msgid "Set the default fontsize of your new document" msgstr "" #. Author -#: src/geanylatex.c:480 +#: src/geanylatex.c:504 msgid "Author:" msgstr "" -#: src/geanylatex.c:483 +#: src/geanylatex.c:507 msgid "" "Sets the value of the \\author command. In most cases this should be your " "name" msgstr "" #. Date -#: src/geanylatex.c:494 +#: src/geanylatex.c:518 msgid "Date:" msgstr "" -#: src/geanylatex.c:497 +#: src/geanylatex.c:521 msgid "" -"Sets the value of the \\date command inside header of your newly created " -"LaTeX-document. Keeping it at \\today is a good decision if you don't need " -"any fixed date." +"Sets the value of the \\date command inside header of your\t\t newly created " +"LaTeX-document. Keeping it at \\today is a good \t\t decision if you don't " +"need any fixed date." msgstr "" #. Title of the new document -#: src/geanylatex.c:504 +#: src/geanylatex.c:530 msgid "Title:" msgstr "" -#: src/geanylatex.c:506 +#: src/geanylatex.c:533 msgid "Sets the title of your new document." msgstr "" #. Papersize -#: src/geanylatex.c:513 +#: src/geanylatex.c:539 msgid "Paper size:" msgstr "" -#: src/geanylatex.c:516 +#: src/geanylatex.c:542 msgid "Choose the paper format for the newly created document" msgstr "" #. Building the wizard-dialog and showing it -#: src/geanylatex.c:531 +#: src/geanylatex.c:557 msgid "LaTeX-Wizard" msgstr "" -#: src/geanylatex.c:541 +#: src/geanylatex.c:568 msgid "Use KOMA-script classes if possible" msgstr "" -#: src/geanylatex.c:544 +#: src/geanylatex.c:570 msgid "" "Uses the KOMA-script classes by Markus Kohm.\n" -"Keep in mind: To compile your document these classes have to be installed " +"Keep in mind: To compile your document these classeshave to be installed " "before." msgstr "" -#: src/geanylatex.c:550 +#: src/geanylatex.c:577 msgid "Use draft mode" msgstr "" -#: src/geanylatex.c:552 +#: src/geanylatex.c:579 msgid "" "Set the draft flag inside new created documents to get documents with a " "number of debugging helpers" msgstr "" -#: src/geanylatex.c:772 +#: src/geanylatex.c:807 msgid "Dear Sir or Madame" msgstr "" -#: src/geanylatex.c:773 +#: src/geanylatex.c:808 msgid "With kind regards" msgstr "" -#: src/geanylatex.c:815 +#: src/geanylatex.c:850 msgid "_LaTeX" msgstr "" -#: src/geanylatex.c:822 +#: src/geanylatex.c:857 msgid "LaTeX-_Wizard" msgstr "" -#: src/geanylatex.c:825 +#: src/geanylatex.c:860 msgid "Starts a Wizard to easily create LaTeX-documents" msgstr "" -#: src/geanylatex.c:830 +#: src/geanylatex.c:865 msgid "Insert _Special Character" msgstr "" -#: src/geanylatex.c:832 +#: src/geanylatex.c:867 msgid "Helps to use some not very common letters and signs" msgstr "" -#: src/geanylatex.c:839 +#: src/geanylatex.c:877 msgid "Insert _Reference" msgstr "" -#: src/geanylatex.c:841 +#: src/geanylatex.c:879 msgid "Inserting references to the document" msgstr "" -#: src/geanylatex.c:845 +#: src/geanylatex.c:884 msgid "Insert _Label" msgstr "" -#: src/geanylatex.c:847 +#: src/geanylatex.c:886 msgid "Helps at inserting labels to a document" msgstr "" -#: src/geanylatex.c:851 +#: src/geanylatex.c:891 msgid "BibTeX" msgstr "" -#: src/geanylatex.c:868 +#: src/geanylatex.c:910 msgid "Run LaTeX-Wizard" msgstr "" -#: src/geanylatex.c:870 +#: src/geanylatex.c:912 msgid "Insert \\label" msgstr "" -#: src/geanylatex.c:872 +#: src/geanylatex.c:914 msgid "Insert \\ref" msgstr "" @@ -262,15 +262,15 @@ msgid "ISO-8859-10 (Latin-10)" msgstr "" -#: src/latexencodings.c:52 +#: src/latexencodings.c:53 msgid "IBM 850 code page" msgstr "" -#: src/latexencodings.c:53 +#: src/latexencodings.c:55 msgid "IBM 852 code page" msgstr "" -#: src/latexencodings.c:54 src/letters.c:41 src/bibtexlabels.c:35 +#: src/latexencodings.c:57 src/letters.c:41 src/bibtexlabels.c:35 msgid "Misc" msgstr "" Modified: trunk/geanylatex/src/bibtex.c =================================================================== --- trunk/geanylatex/src/bibtex.c 2009-01-27 22:38:33 UTC (rev 407) +++ trunk/geanylatex/src/bibtex.c 2009-01-28 21:58:42 UTC (rev 408) @@ -40,7 +40,8 @@ } #endif -void insert_bibtex_entry(G_GNUC_UNUSED GtkMenuItem * menuitem, G_GNUC_UNUSED gpointer gdata) +void insert_bibtex_entry(G_GNUC_UNUSED GtkMenuItem * menuitem, + G_GNUC_UNUSED gpointer gdata) { int doctype = GPOINTER_TO_INT(gdata); gboolean fields[N_ENTRIES]; Modified: trunk/geanylatex/src/geanylatex.c =================================================================== --- trunk/geanylatex/src/geanylatex.c 2009-01-27 22:38:33 UTC (rev 407) +++ trunk/geanylatex/src/geanylatex.c 2009-01-28 21:58:42 UTC (rev 408) @@ -26,11 +26,11 @@ PLUGIN_VERSION_CHECK(115) -PLUGIN_SET_INFO(_("LaTeX"), _("Plugin to provide better LaTeX support"), "0.3dev", - "Frank Lanitz <frank(a)frank.uvena.de>") +PLUGIN_SET_INFO(_("LaTeX"), _("Plugin to provide better LaTeX support"), + "0.3dev","Frank Lanitz <frank(a)frank.uvena.de>") -GeanyPlugin *geany_plugin; -GeanyData *geany_data; +GeanyPlugin *geany_plugin; +GeanyData *geany_data; GeanyFunctions *geany_functions; @@ -79,14 +79,18 @@ return char_array[tab_index].latex; } + static void -char_insert_activated(G_GNUC_UNUSED GtkMenuItem * menuitem, G_GNUC_UNUSED gpointer gdata) +char_insert_activated(G_GNUC_UNUSED GtkMenuItem * menuitem, + G_GNUC_UNUSED gpointer gdata) { insert_string(get_latex_command(GPOINTER_TO_INT(gdata))); } + static void -insert_label_activated(G_GNUC_UNUSED GtkMenuItem * menuitem, G_GNUC_UNUSED gpointer gdata) +insert_label_activated(G_GNUC_UNUSED GtkMenuItem * menuitem, + G_GNUC_UNUSED gpointer gdata) { GtkWidget *dialog = NULL; GtkWidget *vbox = NULL; @@ -121,14 +125,17 @@ if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) { gchar *label_str = NULL; - label_str = g_strconcat("\\label{", g_strdup(gtk_entry_get_text(GTK_ENTRY(textbox_label))), "}", NULL); + label_str = g_strconcat("\\label{",g_strdup(gtk_entry_get_text( + GTK_ENTRY(textbox_label))), "}", NULL); insert_string(label_str); } gtk_widget_destroy(dialog); } + static void -insert_ref_activated(G_GNUC_UNUSED GtkMenuItem * menuitem, G_GNUC_UNUSED gpointer gdata) +insert_ref_activated(G_GNUC_UNUSED GtkMenuItem * menuitem, + G_GNUC_UNUSED gpointer gdata) { GtkWidget *dialog; GtkWidget *vbox = NULL; @@ -180,7 +187,8 @@ { gchar *ref_string = NULL; - ref_string = g_strdup(gtk_combo_box_get_active_text(GTK_COMBO_BOX(textbox_ref))); + ref_string = g_strdup(gtk_combo_box_get_active_text( + GTK_COMBO_BOX(textbox_ref))); if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(radio2)) == FALSE) { @@ -201,14 +209,17 @@ gtk_widget_destroy(dialog); } -static void character_create_menu_item(GtkWidget *menu, const gchar *label, gint letter, SubMenuCallback callback) + +static void character_create_menu_item(GtkWidget *menu, const gchar *label, + gint letter, SubMenuCallback callback) { GtkWidget *tmp; tmp = gtk_menu_item_new_with_label(label); gtk_widget_show(tmp); gtk_container_add(GTK_CONTAINER(menu), tmp); - g_signal_connect((gpointer) tmp, "activate", G_CALLBACK(callback), GINT_TO_POINTER(letter)); + g_signal_connect((gpointer) tmp, "activate", + G_CALLBACK(callback), GINT_TO_POINTER(letter)); } /* returns -1, if there are more than gint can work with or any other error @@ -255,7 +266,9 @@ return i; } -void sub_menu_init(GtkWidget *base_menu, SubMenuTemplate *menu_template, CategoryName *category_name, SubMenuCallback callback_function) +void sub_menu_init(GtkWidget *base_menu, SubMenuTemplate *menu_template, + CategoryName *category_name, + SubMenuCallback callback_function) { gint i; gint j; @@ -325,7 +338,9 @@ if (sorted == TRUE) { - create_sub_menu(sub_menu_cat[i][0], tmp, tmp_item, g_strconcat(menu_template[j].label, " ... ", menu_template[j + next_split_point-1].label, NULL)); + create_sub_menu(sub_menu_cat[i][0], tmp, tmp_item, + g_strconcat(menu_template[j].label, " ... ", + menu_template[j + next_split_point-1].label, NULL)); sub_menu = tmp; } @@ -340,9 +355,12 @@ } } - /* Sets the counter to keep in track if a new submenu needs to be build up */ + /* Sets the counter to keep in track if a new ,, + * submenu needs to be build up */ local_count = local_count + 1; - character_create_menu_item(sub_menu, g_strconcat(menu_template[j].label, "\t", menu_template[j].latex, NULL), j, callback_function); + character_create_menu_item(sub_menu, g_strconcat( + menu_template[j].label, "\t", menu_template[j].latex, + NULL), j, callback_function); } } } @@ -370,13 +388,14 @@ if (output) { doc = document_new_file(name, ft, output); - document_set_encoding(doc, encodings_get_charset_from_index(latex_encodings[local_enc].geany_enc)); + document_set_encoding(doc, encodings_get_charset_from_index + (latex_encodings[local_enc].geany_enc)); } - } static void -wizard_activated(G_GNUC_UNUSED GtkMenuItem * menuitem, G_GNUC_UNUSED gpointer gdata) +wizard_activated(G_GNUC_UNUSED GtkMenuItem * menuitem, + G_GNUC_UNUSED gpointer gdata) { gint i; GString *code = NULL; @@ -428,11 +447,16 @@ documentclass_combobox = gtk_combo_box_new_text(); gtk_tooltips_set_tip(tooltip, documentclass_combobox, _("Choose the kind of document you want to write"), NULL); - gtk_combo_box_insert_text(GTK_COMBO_BOX(documentclass_combobox), 0, _("Book")); - gtk_combo_box_insert_text(GTK_COMBO_BOX(documentclass_combobox), 1, _("Article")); - gtk_combo_box_insert_text(GTK_COMBO_BOX(documentclass_combobox), 2, _("Report")); - gtk_combo_box_insert_text(GTK_COMBO_BOX(documentclass_combobox), 3, _("Letter")); - gtk_combo_box_insert_text(GTK_COMBO_BOX(documentclass_combobox), 4, _("Presentation")); + gtk_combo_box_insert_text(GTK_COMBO_BOX(documentclass_combobox), 0, + _("Book")); + gtk_combo_box_insert_text(GTK_COMBO_BOX(documentclass_combobox), 1, + _("Article")); + gtk_combo_box_insert_text(GTK_COMBO_BOX(documentclass_combobox), 2, + _("Report")); + gtk_combo_box_insert_text(GTK_COMBO_BOX(documentclass_combobox), 3, + _("Letter")); + gtk_combo_box_insert_text(GTK_COMBO_BOX(documentclass_combobox), 4, + _("Presentation")); gtk_combo_box_set_active(GTK_COMBO_BOX(documentclass_combobox), 0); @@ -494,7 +518,9 @@ label_date = gtk_label_new(_("Date:")); date_textbox = gtk_entry_new(); gtk_tooltips_set_tip(tooltip, date_textbox, - _("Sets the value of the \\date command inside header of your newly created LaTeX-document. Keeping it at \\today is a good decision if you don't need any fixed date."), NULL); + _("Sets the value of the \\date command inside header of your\ + newly created LaTeX-document. Keeping it at \\today is a good \ + decision if you don't need any fixed date."), NULL); gtk_entry_set_text(GTK_ENTRY(date_textbox), "\\today"); gtk_misc_set_alignment(GTK_MISC(label_date), 0, 0.5); gtk_table_attach_defaults(GTK_TABLE(table), label_date, 0, 1, 4, 5); @@ -503,8 +529,8 @@ /* Title of the new document */ label_title = gtk_label_new(_("Title:")); title_textbox = gtk_entry_new(); - gtk_tooltips_set_tip(tooltip, title_textbox, _("Sets the title of your new document."), - NULL); + gtk_tooltips_set_tip(tooltip, title_textbox, + _("Sets the title of your new document."), NULL); gtk_misc_set_alignment(GTK_MISC(label_title), 0, 0.5); gtk_table_attach_defaults(GTK_TABLE(table), label_title, 0, 1, 5, 6); gtk_table_attach_defaults(GTK_TABLE(table), title_textbox, 1, 2, 5, 6); @@ -529,27 +555,29 @@ /* Building the wizard-dialog and showing it */ dialog = gtk_dialog_new_with_buttons(_("LaTeX-Wizard"), - GTK_WINDOW(geany->main_widgets->window), - GTK_DIALOG_DESTROY_WITH_PARENT, GTK_STOCK_CANCEL, - GTK_RESPONSE_CANCEL, GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, - NULL); + GTK_WINDOW(geany->main_widgets->window), + GTK_DIALOG_DESTROY_WITH_PARENT, GTK_STOCK_CANCEL, + GTK_RESPONSE_CANCEL, 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); gtk_container_add(GTK_CONTAINER(vbox), table); - checkbox_KOMA = gtk_check_button_new_with_label(_("Use KOMA-script classes if possible")); + checkbox_KOMA = gtk_check_button_new_with_label( + _("Use KOMA-script classes if possible")); gtk_tooltips_set_tip(tooltip, checkbox_KOMA, - _ - ("Uses the KOMA-script classes by Markus Kohm.\nKeep in mind: To compile your document these classes have to be installed before."), - NULL); + _("Uses the KOMA-script classes by Markus Kohm.\n" + "Keep in mind: To compile your document these classes" + "have to be installed before."), NULL); gtk_button_set_focus_on_click(GTK_BUTTON(checkbox_KOMA), FALSE); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbox_KOMA), KOMA_active); gtk_box_pack_start(GTK_BOX(vbox), checkbox_KOMA, FALSE, FALSE, 5); checkbox_draft = gtk_check_button_new_with_label(_("Use draft mode")); gtk_tooltips_set_tip(tooltip, checkbox_draft, - _("Set the draft flag inside new created documents to get documents with a number of debugging helpers"), NULL); + _("Set the draft flag inside new created documents to get " + "documents with a number of debugging helpers"), NULL); gtk_button_set_focus_on_click(GTK_BUTTON(checkbox_draft), FALSE); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbox_draft), draft_active); gtk_box_pack_start(GTK_BOX(vbox), checkbox_draft, FALSE, FALSE, 5); @@ -558,15 +586,21 @@ if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) { - KOMA_active = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(checkbox_KOMA)); - draft_active = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(checkbox_draft)); - documentclass_int = gtk_combo_box_get_active(GTK_COMBO_BOX(documentclass_combobox)); - encoding_int = gtk_combo_box_get_active(GTK_COMBO_BOX(encoding_combobox)); - enc_latex_char = g_strconcat("\\usepackage[", latex_encodings[encoding_int].latex,"]{inputenc}\n", NULL); + KOMA_active = gtk_toggle_button_get_active( + GTK_TOGGLE_BUTTON(checkbox_KOMA)); + draft_active = gtk_toggle_button_get_active( + GTK_TOGGLE_BUTTON(checkbox_draft)); + documentclass_int = gtk_combo_box_get_active( + GTK_COMBO_BOX(documentclass_combobox)); + encoding_int = gtk_combo_box_get_active( + GTK_COMBO_BOX(encoding_combobox)); + enc_latex_char = g_strconcat("\\usepackage[", + latex_encodings[encoding_int].latex,"]{inputenc}\n", NULL); author = g_strdup(gtk_entry_get_text(GTK_ENTRY(author_textbox))); date = g_strdup(gtk_entry_get_text(GTK_ENTRY(date_textbox))); title = g_strdup(gtk_entry_get_text(GTK_ENTRY(title_textbox))); - papersize_int = gtk_combo_box_get_active(GTK_COMBO_BOX(papersize_combobox)); + papersize_int = gtk_combo_box_get_active( + GTK_COMBO_BOX(papersize_combobox)); switch (papersize_int) { case 0: @@ -586,7 +620,8 @@ } } - fontsize_int = gtk_combo_box_get_active(GTK_COMBO_BOX(fontsize_combobox)); + fontsize_int = gtk_combo_box_get_active( + GTK_COMBO_BOX(fontsize_combobox)); switch (fontsize_int) { case 0: @@ -830,36 +865,43 @@ menu_latex_menu_special_char = gtk_menu_item_new_with_mnemonic(_("Insert _Special Character")); gtk_tooltips_set_tip(tooltips, menu_latex_menu_special_char, _("Helps to use some not very common letters and signs"), NULL); - gtk_container_add(GTK_CONTAINER(menu_latex_menu), menu_latex_menu_special_char); + gtk_container_add(GTK_CONTAINER(menu_latex_menu), + menu_latex_menu_special_char); menu_latex_menu_special_char_submenu = gtk_menu_new(); - gtk_menu_item_set_submenu(GTK_MENU_ITEM(menu_latex_menu_special_char), menu_latex_menu_special_char_submenu); - sub_menu_init(menu_latex_menu_special_char_submenu, char_array, cat_names, char_insert_activated); + gtk_menu_item_set_submenu(GTK_MENU_ITEM(menu_latex_menu_special_char), + menu_latex_menu_special_char_submenu); + sub_menu_init(menu_latex_menu_special_char_submenu, char_array, cat_names, + char_insert_activated); menu_latex_ref = gtk_menu_item_new_with_mnemonic(_("Insert _Reference")); gtk_tooltips_set_tip(tooltips, menu_latex_ref, _("Inserting references to the document"), NULL); gtk_container_add(GTK_CONTAINER(menu_latex_menu), menu_latex_ref); - g_signal_connect((gpointer) menu_latex_ref, "activate", G_CALLBACK(insert_ref_activated), NULL); + g_signal_connect((gpointer) menu_latex_ref, "activate", + G_CALLBACK(insert_ref_activated), NULL); menu_latex_label = gtk_menu_item_new_with_mnemonic(_("Insert _Label")); gtk_tooltips_set_tip(tooltips, menu_latex_label, _("Helps at inserting labels to a document"), NULL); gtk_container_add(GTK_CONTAINER(menu_latex_menu), menu_latex_label); - g_signal_connect((gpointer) menu_latex_label, "activate", G_CALLBACK(insert_label_activated), NULL); + g_signal_connect((gpointer) menu_latex_label, "activate", + G_CALLBACK(insert_label_activated), NULL); menu_latex_bibtex = gtk_menu_item_new_with_mnemonic(_("BibTeX")); gtk_container_add(GTK_CONTAINER(menu_latex_menu), menu_latex_bibtex); menu_latex_bibtex_submenu = gtk_menu_new(); - gtk_menu_item_set_submenu(GTK_MENU_ITEM(menu_latex_bibtex), menu_latex_bibtex_submenu); + gtk_menu_item_set_submenu(GTK_MENU_ITEM(menu_latex_bibtex), + menu_latex_bibtex_submenu); for (i = 0; i < N_TYPES; i++) { tmp = NULL; tmp = gtk_menu_item_new_with_mnemonic(_(label_types[i])); gtk_container_add(GTK_CONTAINER(menu_latex_bibtex_submenu), tmp); - g_signal_connect((gpointer) tmp, "activate", G_CALLBACK(insert_bibtex_entry), GINT_TO_POINTER(i)); + g_signal_connect((gpointer) tmp, "activate", + G_CALLBACK(insert_bibtex_entry), GINT_TO_POINTER(i)); } /* init keybindins */ Modified: trunk/geanylatex/src/geanylatex.h =================================================================== --- trunk/geanylatex/src/geanylatex.h 2009-01-27 22:38:33 UTC (rev 407) +++ trunk/geanylatex/src/geanylatex.h 2009-01-28 21:58:42 UTC (rev 408) @@ -33,6 +33,7 @@ #include "editor.h" #include "filetypes.h" #include "templates.h" +#include "dialogs.h" #include "utils.h" #include "ui_utils.h" #include "keybindings.h" @@ -45,6 +46,7 @@ #include "latexutils.h" #include "reftex.h" +#include <gtk/gtk.h> #ifdef HAVE_LOCALE_H # include <locale.h> Modified: trunk/geanylatex/src/latexencodings.c =================================================================== --- trunk/geanylatex/src/latexencodings.c 2009-01-27 22:38:33 UTC (rev 407) +++ trunk/geanylatex/src/latexencodings.c 2009-01-28 21:58:42 UTC (rev 408) @@ -37,19 +37,23 @@ fill(LATEX_ENCODING_UTF_8, _("UTF-8"), "utf8", GEANY_ENCODING_UTF_8); fill(LATEX_ENCODING_ASCII, _("US-ASCII"), "ascii", GEANY_ENCODING_ISO_8859_1); fill(LATEX_ENCODING_ISO_8859_1, _("ISO-8859-1 (Latin-1)"), "latin1", - GEANY_ENCODING_ISO_8859_1); + GEANY_ENCODING_ISO_8859_1); fill(LATEX_ENCODING_ISO_8859_2, _("ISO-8859-2 (Latin-2)"), "latin2", - GEANY_ENCODING_ISO_8859_2); + GEANY_ENCODING_ISO_8859_2); fill(LATEX_ENCODING_ISO_8859_3, _("ISO-8859-3 (Latin-3)"), "latin3", - GEANY_ENCODING_ISO_8859_3); + GEANY_ENCODING_ISO_8859_3); fill(LATEX_ENCODING_ISO_8859_4, _("ISO-8859-4 (Latin-4)"), "latin4", - GEANY_ENCODING_ISO_8859_4); + GEANY_ENCODING_ISO_8859_4); fill(LATEX_ENCODING_ISO_8859_5, _("ISO-8859-5 (Latin-5)"), "latin5", - GEANY_ENCODING_ISO_8859_5); + GEANY_ENCODING_ISO_8859_5); fill(LATEX_ENCODING_ISO_8859_9, _("ISO-8859-9 (Latin-9)"), "latin9", - GEANY_ENCODING_ISO_8859_9); - fill(LATEX_ENCODING_ISO_8859_10, _("ISO-8859-10 (Latin-10)"), "latin10", GEANY_ENCODING_ISO_8859_10); - fill(LATEX_ENCODING_IBM_850, _("IBM 850 code page"), "cp850", GEANY_ENCODING_IBM_850); - fill(LATEX_ENCODING_IBM_852, _("IBM 852 code page"), "cp852", GEANY_ENCODING_IBM_852); - fill(LATEX_ENCODING_NONE, _("Misc"), NULL, GEANY_ENCODING_NONE); + GEANY_ENCODING_ISO_8859_9); + fill(LATEX_ENCODING_ISO_8859_10, _("ISO-8859-10 (Latin-10)"), "latin10", + GEANY_ENCODING_ISO_8859_10); + fill(LATEX_ENCODING_IBM_850, _("IBM 850 code page"), "cp850", + GEANY_ENCODING_IBM_850); + fill(LATEX_ENCODING_IBM_852, _("IBM 852 code page"), "cp852", + GEANY_ENCODING_IBM_852); + fill(LATEX_ENCODING_NONE, _("Misc"), NULL, + GEANY_ENCODING_NONE); } 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:[407] branches/GeanyVC_menu_redesign/po
by frlan＠users.sourceforge.net 27 Jan '09

27 Jan '09

Revision: 407 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=407&view=rev Author: frlan Date: 2009-01-27 22:38:33 +0000 (Tue, 27 Jan 2009) Log Message: ----------- Translation of new strings Modified Paths: -------------- branches/GeanyVC_menu_redesign/po/ChangeLog branches/GeanyVC_menu_redesign/po/de.po Modified: branches/GeanyVC_menu_redesign/po/ChangeLog =================================================================== --- branches/GeanyVC_menu_redesign/po/ChangeLog 2009-01-26 22:51:55 UTC (rev 406) +++ branches/GeanyVC_menu_redesign/po/ChangeLog 2009-01-27 22:38:33 UTC (rev 407) @@ -1,3 +1,8 @@ +2009-01-27 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> + + * de.po: Translation of new strings. + + 2008-11-07 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> * de.po: Update of German translation. Modified: branches/GeanyVC_menu_redesign/po/de.po =================================================================== --- branches/GeanyVC_menu_redesign/po/de.po 2009-01-26 22:51:55 UTC (rev 406) +++ branches/GeanyVC_menu_redesign/po/de.po 2009-01-27 22:38:33 UTC (rev 407) @@ -8,9 +8,9 @@ msgstr "" "Project-Id-Version: geanyvc 0.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-11-07 20:48+0100\n" -"PO-Revision-Date: 2008-11-07 20:53+0100\n" -"Last-Translator: Enrico Tröger <enrico(a)xfce.org>\n" +"POT-Creation-Date: 2009-01-27 23:32+0100\n" +"PO-Revision-Date: 2009-01-27 23:37+0100\n" +"Last-Translator: Frank Lanitz <frank(a)frank.uvena.de>\n" "Language-Team: German <geany-i18n(a)uvena.de>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" @@ -32,306 +32,308 @@ msgid "" "Yura Siamashka <yurand2(a)gmail.com>,\n" "Frank Lanitz <frank(a)frank.uvena.de>" -msgstr "" -"Yura Siamashka <yurand2(a)gmail.com>, Frank Lanitz <frank(a)frank.uvena.de>" +msgstr "Yura Siamashka <yurand2(a)gmail.com>, Frank Lanitz <frank(a)frank.uvena.de>" -#: ../geanyvc.c:404 +#: ../geanyvc.c:402 msgid "Could not parse the output of command" msgstr "Kann die Ausgabe des Befehls nicht einlesen." -#: ../geanyvc.c:464 +#: ../geanyvc.c:462 #, c-format msgid "geanyvc: s_spawn_sync error: %s" msgstr "geanyvc: s_spawn_sync error: %s" -#: ../geanyvc.c:600 ../geanyvc.c:611 +#: ../geanyvc.c:596 +#: ../geanyvc.c:607 #, c-format msgid "geanyvc: vcdiff_file_activated: Unable to rename '%s' to '%s'" msgstr "geanyvc: vcdiff_file_activated: Kann »%s« nicht in »%s« umbenennen." -#: ../geanyvc.c:637 ../geanyvc.c:672 ../geanyvc.c:716 +#: ../geanyvc.c:633 +#: ../geanyvc.c:668 +#: ../geanyvc.c:712 msgid "No changes were made." msgstr "Es wurden keine Änderungen vorgenommen." -#: ../geanyvc.c:742 +#: ../geanyvc.c:738 msgid "No history avaible" msgstr "Keine Historie verfügbar" -#: ../geanyvc.c:907 +#: ../geanyvc.c:900 #, c-format msgid "Do you really want to revert: %s?" msgstr "Möchten Sie wirklich »%s« zurücksetzen?" -#: ../geanyvc.c:919 +#: ../geanyvc.c:908 #, c-format msgid "Do you really want to add: %s?" msgstr "Möchten Sie wirklich »%s« hinzufügen?" -#: ../geanyvc.c:928 +#: ../geanyvc.c:915 #, c-format msgid "Do you really want to remove: %s?" msgstr "Möchten Sie wirklich »%s« entfernen?" -#: ../geanyvc.c:953 +#: ../geanyvc.c:939 msgid "Do you really want to update?" msgstr "Möchten Sie wirklich »%s« aktualisieren?" -#: ../geanyvc.c:1235 +#: ../geanyvc.c:1218 msgid "Commit" msgstr "Übertragen" -#: ../geanyvc.c:1306 +#: ../geanyvc.c:1289 msgid "<b>Commit message:</b>" msgstr "<b>Commitnachricht:</b>" -#. Commit -#: ../geanyvc.c:1319 ../geanyvc.c:2038 +#. Commit all changes +#: ../geanyvc.c:1302 +#: ../geanyvc.c:2109 msgid "_Commit" msgstr "Ü_bertragen" -#: ../geanyvc.c:1389 +#: ../geanyvc.c:1372 msgid "Nothing to commit." msgstr "Nichts zum Übertragen." -#: ../geanyvc.c:1435 +#: ../geanyvc.c:1418 #, c-format msgid "Error initializing spell checking: %s" msgstr "Fehler beim Initialisieren der Rechtschreibprüfung: %s" -#: ../geanyvc.c:1447 +#: ../geanyvc.c:1430 #, c-format -msgid "" -"Error while setting up language for spellchecking. Please check " -"configuration. Error message was: %s" -msgstr "" -"Fehler beim Auswählen der Sprache für die Rechtschreibprüfung. Bitte " -"überprüfen Sie Ihre Konfiguration. Fehlermeldung: %s" +msgid "Error while setting up language for spellchecking. Please check configuration. Error message was: %s" +msgstr "Fehler beim Auswählen der Sprache für die Rechtschreibprüfung. Bitte überprüfen Sie Ihre Konfiguration. Fehlermeldung: %s" -#: ../geanyvc.c:1652 +#: ../geanyvc.c:1642 msgid "Plugin configuration directory could not be created." msgstr "Plugin-Konfigurationsverzeichnis konnte nicht erstellt werden." -#: ../geanyvc.c:1685 +#: ../geanyvc.c:1675 msgid "Set Changed-flag for document tabs created by the plugin" msgstr "Markiere vom Plugin erstelle Dokumente als geändert" -#: ../geanyvc.c:1688 -msgid "" -"If this option is activated, every new by the VC-plugin created document tab " -"will be marked as changed. Even this option is useful in some cases, it " -"could cause a big number of annoying \"Do you want to save\"-dialogs." -msgstr "" -"Wenn diese Option aktiviert ist, werden alle Dokumente die durch das Plugin " -"erzeugt werden als geändert markiert, sodass z.B. beim Schließen der Datei " -"der Speichern Dialog geöffnet wird. Auch wenn diese Option von Zeit zu Zeit " -"sehr nützlich sein kann, kann Sie ab und an einfach nur stören." +#: ../geanyvc.c:1678 +msgid "If this option is activated, every new by the VC-plugin created document tab will be marked as changed. Even this option is useful in some cases, it could cause a big number of annoying \"Do you want to save\"-dialogs." +msgstr "Wenn diese Option aktiviert ist, werden alle Dokumente die durch das Plugin erzeugt werden als geändert markiert, sodass z.B. beim Schließen der Datei der Speichern Dialog geöffnet wird. Auch wenn diese Option von Zeit zu Zeit sehr nützlich sein kann, kann Sie ab und an einfach nur stören." -#: ../geanyvc.c:1696 +#: ../geanyvc.c:1686 msgid "Confirm adding new files to a VCS" msgstr "Hinzufügen von Dateien zur Versionsverwaltung immer bestätigen" -#: ../geanyvc.c:1699 +#: ../geanyvc.c:1689 msgid "Shows a confirmation dialog on adding a new (created) file to VCS." -msgstr "" -"Zeigt einen Bestätigungsdialog wenn Dateien zu einem Versionskontrollsystem " -"hinzugefügt werden sollen." +msgstr "Zeigt einen Bestätigungsdialog wenn Dateien zu einem Versionskontrollsystem hinzugefügt werden sollen." -#: ../geanyvc.c:1706 +#: ../geanyvc.c:1696 msgid "Maximize commit dialog" msgstr "Commit-Dialog maximieren" -#: ../geanyvc.c:1707 +#: ../geanyvc.c:1697 msgid "Show commit dialog maximize." msgstr "Commit-Dialog beim Anzeigen maximieren" -#: ../geanyvc.c:1714 +#: ../geanyvc.c:1704 msgid "Use external diff viewer" msgstr "Externes Diff-Programm benutzen" -#: ../geanyvc.c:1716 +#: ../geanyvc.c:1706 msgid "Use external diff viewer for file diff." msgstr "Externes Diff-Programm benutzen zum Vergleich von zwei Dateien." -#: ../geanyvc.c:1722 +#: ../geanyvc.c:1712 msgid "Enable CVS" msgstr "CVS aktivieren" -#: ../geanyvc.c:1727 +#: ../geanyvc.c:1717 msgid "Enable GIT" msgstr "GIT aktivieren" -#: ../geanyvc.c:1732 +#: ../geanyvc.c:1722 msgid "Enable SVN" msgstr "SVN aktivieren" -#: ../geanyvc.c:1737 +#: ../geanyvc.c:1727 msgid "Enable SVK" msgstr "SVK aktivieren" -#: ../geanyvc.c:1742 +#: ../geanyvc.c:1732 msgid "Enable Bazaar" msgstr "Bazaar aktivieren" -#: ../geanyvc.c:1747 +#: ../geanyvc.c:1737 msgid "Enable Mercurial" msgstr "Mercurial aktivieren" -#: ../geanyvc.c:1753 +#: ../geanyvc.c:1743 msgid "Spellcheck language" msgstr "Sprache" -#: ../geanyvc.c:1914 -msgid "_VC" -msgstr "_VC" +#: ../geanyvc.c:1892 +msgid "Current _File" +msgstr "_Aktuelle Datei" -#. Single file -#: ../geanyvc.c:1923 -msgid "Diff From Current File" -msgstr "Diff von der aktuellen Datei" +#. Diff of current file +#. Diff of the current dir +#. Complete diff of base directory +#: ../geanyvc.c:1896 +#: ../geanyvc.c:1971 +#: ../geanyvc.c:2002 +msgid "_Diff" +msgstr "_Unterscheide anzeigen" -#: ../geanyvc.c:1926 +#: ../geanyvc.c:1899 msgid "Make a diff from the current active file" msgstr "Erstellt ein Diff für die aktuelle Datei." -#. Directory -#: ../geanyvc.c:1932 -msgid "Diff From Current Directory" -msgstr "Diff vom aktuellen Verzeichnis" +#. Revert current file +#: ../geanyvc.c:1905 +msgid "_Revert" +msgstr "_Zurücksetzen" -#: ../geanyvc.c:1935 -msgid "Make a diff from the directory of the current active file" -msgstr "Erstellt ein Diff für das Verzeichnis der aktuellen Datei." +#: ../geanyvc.c:1908 +msgid "Restore pristine working copy file (undo local edits)." +msgstr "Stellt den ursprünglichen Zustand der Datei wieder her (verwirft lokale Änderungen)." -#. Base directory -#: ../geanyvc.c:1941 -msgid "Diff From Base Directory" -msgstr "Diff vom Grundverzeichnis" - -#: ../geanyvc.c:1944 -msgid "Make a diff from the top VC directory" -msgstr "Erstellt ein Diff für die gesamte Arbeitskopie" - #. Blame for current file -#: ../geanyvc.c:1952 -msgid "Blame From Current File" -msgstr "Blame von aktueller Datei" +#: ../geanyvc.c:1918 +msgid "_Blame" +msgstr "Ä_nderungsverfolgung" -#: ../geanyvc.c:1955 +#: ../geanyvc.c:1921 msgid "Shows the changes made at one file per revision and author." msgstr "Zeigt alle Änderungen einer Datei nach Autor und Revision." -#. Log -#: ../geanyvc.c:1963 -msgid "Log Of Current File" -msgstr "Historie der aktuellen Datei" +#. History/log of current file +#. History/log of the current dir +#. Complete History/Log of base directory +#: ../geanyvc.c:1929 +#: ../geanyvc.c:1981 +#: ../geanyvc.c:2015 +msgid "_History" +msgstr "_Versionsgeschichte" -#: ../geanyvc.c:1966 +#: ../geanyvc.c:1932 msgid "Shows the log of the current file" msgstr "Zeigt die Versionshistorie der aktuellen Datei an." -#: ../geanyvc.c:1971 -msgid "Log Of Current Directory" -msgstr "Historie vom aktuellen Verzeichnis" +#. add current file +#: ../geanyvc.c:1941 +msgid "_Add to Version Control" +msgstr "Zur _Versionskontrolle hinzufügen" -#: ../geanyvc.c:1974 -msgid "Shows the log of the current directory" -msgstr "Zeigt die Versionshistorie für das aktuelle Verzeichnis." +#: ../geanyvc.c:1943 +msgid "Add file to repository." +msgstr "Fügt eine Datei zum Repositorium _hinzu." -#: ../geanyvc.c:1979 -msgid "Log Of Base Directory" -msgstr "Historie vom aktuellen Grundverzeichnis" +#. revert current file +#: ../geanyvc.c:1949 +msgid "_Remove from Version Control" +msgstr "Aus Versionskontrolle entfernen" -#: ../geanyvc.c:1982 -msgid "Shows the log of the top VC directory" -msgstr "Zeigt die Versionsgeschichte für die gesamte Arbeitskopie" +#: ../geanyvc.c:1952 +msgid "Remove file from repository." +msgstr "Entfernt eine Datei aus dem Repositorium." -#. Status -#: ../geanyvc.c:1990 -msgid "_Status" -msgstr "_Status" +#: ../geanyvc.c:1968 +msgid "Current _Directory" +msgstr "Aktueller _Dokumentenordner" -#: ../geanyvc.c:1992 -msgid "Show status." -msgstr "Zeigt den Status der Arbeitskopie." +#: ../geanyvc.c:1974 +msgid "Make a diff from the directory of the current active file" +msgstr "Erstellt ein Diff für das Verzeichnis der aktuellen Datei." -#. Revert file -#: ../geanyvc.c:2000 -msgid "_Revert File" -msgstr "Änderungen _verwerfen" +#: ../geanyvc.c:1984 +msgid "Shows the log of the current directory" +msgstr "Zeigt die Versionshistorie für das aktuelle Verzeichnis." -#: ../geanyvc.c:2003 -msgid "Restore pristine working copy file (undo local edits)." -msgstr "" -"Stellt den ursprünglichen Zustand der Datei wieder her (verwirft lokale " -"Änderungen)." +#: ../geanyvc.c:1998 +msgid "Current _Basedirectory" +msgstr "Aktuelles _Basisverzeichnis" -#. Add file -#: ../geanyvc.c:2011 -msgid "_Add File" -msgstr "Datei _hinzufügen" +#: ../geanyvc.c:2005 +msgid "Make a diff from the top VC directory" +msgstr "Erstellt ein Diff für die gesamte Arbeitskopie" -#: ../geanyvc.c:2013 -msgid "Add file to repository." -msgstr "Fügt eine Datei zum Repositorium _hinzu." +#: ../geanyvc.c:2018 +msgid "Shows the log of the top VC directory" +msgstr "Zeigt die Versionsgeschichte für die gesamte Arbeitskopie" -#. Remove file -#: ../geanyvc.c:2019 -msgid "Remove File" -msgstr "Datei entfernen" - -#: ../geanyvc.c:2022 -msgid "Remove file from repository." -msgstr "Entfernt eine Datei aus dem Repositorium." - -#. Update -#: ../geanyvc.c:2030 -msgid "Update" -msgstr "Aktualisieren" - #: ../geanyvc.c:2032 -msgid "Update from remote repositary." -msgstr "Aus dem Repository aktualisieren" - -#: ../geanyvc.c:2040 -msgid "Commit changes." -msgstr "Änderungen übertragen." - -#: ../geanyvc.c:2049 msgid "Show diff of file" msgstr "Diff von der aktuellen Datei" -#: ../geanyvc.c:2051 +#: ../geanyvc.c:2035 msgid "Show diff of diretory" msgstr "Diff vom aktuellen Verzeichnis" -#: ../geanyvc.c:2053 +#: ../geanyvc.c:2037 msgid "Show diff of basedir" msgstr "Diff vom Grundverzeichnis" -#: ../geanyvc.c:2055 +#: ../geanyvc.c:2040 msgid "Commit changes" msgstr "Änderungen übertragen" -#: ../geanyvc.c:2057 +#: ../geanyvc.c:2042 msgid "Show status" msgstr "Status der Arbeitskopie anzeigen" -#: ../geanyvc.c:2059 +#: ../geanyvc.c:2044 msgid "Revert changes" msgstr "Änderungen verwerfen" -#: ../geanyvc.c:2061 +#: ../geanyvc.c:2046 msgid "Update file" msgstr "Datei aktualisieren" +#: ../geanyvc.c:2071 +msgid "_VC" +msgstr "_VC" + +#. Status of basedir +#: ../geanyvc.c:2091 +msgid "_Status" +msgstr "_Status" + +#: ../geanyvc.c:2093 +msgid "Show status." +msgstr "Zeigt den Status der Arbeitskopie." + +#. complete update +#: ../geanyvc.c:2100 +msgid "Update" +msgstr "Aktualisieren" + +#: ../geanyvc.c:2102 +msgid "Update from remote repositary." +msgstr "Aus dem Repository aktualisieren" + +#: ../geanyvc.c:2111 +msgid "Commit changes." +msgstr "Änderungen übertragen." + +#~ msgid "Diff From Current File" +#~ msgstr "Diff von der aktuellen Datei" +#~ msgid "Diff From Current Directory" +#~ msgstr "Diff vom aktuellen Verzeichnis" +#~ msgid "Diff From Base Directory" +#~ msgstr "Diff vom Grundverzeichnis" +#~ msgid "Blame From Current File" +#~ msgstr "Blame von aktueller Datei" +#~ msgid "Log Of Base Directory" +#~ msgstr "Historie vom aktuellen Grundverzeichnis" +#~ msgid "_Add File" +#~ msgstr "Datei _hinzufügen" +#~ msgid "Remove File" +#~ msgstr "Datei entfernen" #~ msgid "Diff From Current Project" #~ msgstr "Diff vom aktuellen Projekt" - #~ msgid "Make a diff from the current project's base path" #~ msgstr "Erstellt ein Diff für das aktuell geöffnete Projekt." - #~ msgid "Log Of Current Project" #~ msgstr "Historie vom aktuellen Projekt" - #~ msgid "Shows the log of the current project" #~ msgstr "Zeigt die Versionshistorie vom aktuellen Projekt." + 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