Plugins-Commits December 2008

plugins-commits@lists.geany.org

4 participants
41 discussions

SF.net SVN: geany-plugins:[330] trunk/spellcheck
by eht16＠users.sourceforge.net 06 Dec '08

06 Dec '08

Revision: 330 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=330&view=rev Author: eht16 Date: 2008-12-06 17:21:04 +0000 (Sat, 06 Dec 2008) Log Message: ----------- Update to Geany API 115 - use geanyfunctions.h, from Nick's patch. Modified Paths: -------------- trunk/spellcheck/ChangeLog trunk/spellcheck/src/gui.c trunk/spellcheck/src/scplugin.c trunk/spellcheck/src/speller.c Modified: trunk/spellcheck/ChangeLog =================================================================== --- trunk/spellcheck/ChangeLog 2008-12-05 13:34:41 UTC (rev 329) +++ trunk/spellcheck/ChangeLog 2008-12-06 17:21:04 UTC (rev 330) @@ -1,3 +1,9 @@ +2008-12-06 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + + * src/scplugin.c, src/gui.c, src/speller.c: + Update to Geany API 115 - use geanyfunctions.h, from Nick's patch. + + 2008-11-30 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> * src/gui.c: Modified: trunk/spellcheck/src/gui.c =================================================================== --- trunk/spellcheck/src/gui.c 2008-12-05 13:34:41 UTC (rev 329) +++ trunk/spellcheck/src/gui.c 2008-12-06 17:21:04 UTC (rev 330) @@ -37,7 +37,7 @@ #include "utils.h" #include "ui_utils.h" -#include "pluginmacros.h" +#include "geanyfunctions.h" #include "gui.h" #include "scplugin.h" @@ -62,11 +62,11 @@ void gui_perform_check(GeanyDocument *doc) { - p_editor->indicator_clear(doc->editor, GEANY_INDICATOR_ERROR); + editor_indicator_clear(doc->editor, GEANY_INDICATOR_ERROR); if (sc->use_msgwin) { - p_msgwindow->clear_tab(MSG_MESSAGE); - p_msgwindow->switch_tab(MSG_MESSAGE, FALSE); + msgwin_clear_tab(MSG_MESSAGE); + msgwin_switch_tab(MSG_MESSAGE, FALSE); } speller_check_document(doc); @@ -76,9 +76,9 @@ static void print_typing_changed_message(void) { if (sc->check_while_typing) - p_ui->set_statusbar(FALSE, _("Spell checking while typing is now enabled")); + ui_set_statusbar(FALSE, _("Spell checking while typing is now enabled")); else - p_ui->set_statusbar(FALSE, _("Spell checking while typing is now disabled")); + ui_set_statusbar(FALSE, _("Spell checking while typing is now disabled")); } @@ -109,14 +109,14 @@ { if (sc->toolbar_button == NULL) { - sc->toolbar_button = gtk_toggle_tool_button_new_from_stock("gtk-spell-check"); + sc->toolbar_button = gtk_toggle_tool_button_new_from_stock(GTK_STOCK_SPELL_CHECK); #if GTK_CHECK_VERSION(2, 12, 0) - gtk_widget_set_tooltip_text(GTK_WIDGET(sc->toolbar_button), + gtk_tool_item_set_tooltip_text(GTK_TOOL_ITEM(sc->toolbar_button), _("Toggle spell check while typing.")); #endif gtk_widget_show(GTK_WIDGET(sc->toolbar_button)); - p_plugin->add_toolbar_item(geany_plugin, sc->toolbar_button); - p_ui->add_document_sensitive(GTK_WIDGET(sc->toolbar_button)); + plugin_add_toolbar_item(geany_plugin, sc->toolbar_button); + ui_add_document_sensitive(GTK_WIDGET(sc->toolbar_button)); g_signal_connect(sc->toolbar_button, "toggled", G_CALLBACK(toolbar_item_toggled_cb), NULL); @@ -136,10 +136,10 @@ g_return_if_fail(doc != NULL); - start_pos = p_sci->get_position_from_line(doc->editor->sci, line_number); - length = p_sci->get_line_length(doc->editor->sci, line_number); + start_pos = sci_get_position_from_line(doc->editor->sci, line_number); + length = sci_get_line_length(doc->editor->sci, line_number); - p_sci->indicator_clear(doc->editor->sci, start_pos, length); + sci_indicator_clear(doc->editor->sci, start_pos, length); } @@ -152,31 +152,31 @@ g_return_if_fail(clickinfo.doc != NULL && clickinfo.pos != -1); - startword = p_sci->send_message(sci, SCI_WORDSTARTPOSITION, clickinfo.pos, 0); - endword = p_sci->send_message(sci, SCI_WORDENDPOSITION, clickinfo.pos, 0); + startword = scintilla_send_message(sci, SCI_WORDSTARTPOSITION, clickinfo.pos, 0); + endword = scintilla_send_message(sci, SCI_WORDENDPOSITION, clickinfo.pos, 0); if (startword != endword) { gchar *word; - p_sci->set_selection_start(sci, startword); - p_sci->set_selection_end(sci, endword); + sci_set_selection_start(sci, startword); + sci_set_selection_end(sci, endword); /* retrieve the old text */ - word = g_malloc(p_sci->get_selected_text_length(sci) + 1); - p_sci->get_selected_text(sci, word); + word = g_malloc(sci_get_selected_text_length(sci) + 1); + sci_get_selected_text(sci, word); /* retrieve the new text */ sugg = gtk_label_get_text(GTK_LABEL(gtk_bin_get_child(GTK_BIN(menuitem)))); /* replace the misspelled word with the chosen suggestion */ - p_sci->replace_sel(sci, sugg); + sci_replace_sel(sci, sugg); /* store the replacement for future checks */ speller_store_replacement(word, sugg); /* remove indicator */ - p_sci->indicator_clear(sci, startword, endword - startword); + sci_indicator_clear(sci, startword, endword - startword); g_free(word); } @@ -204,22 +204,22 @@ /* Remove all indicators on the added/ignored word */ sci = clickinfo.doc->editor->sci; str = g_string_sized_new(256); - doc_len = p_sci->get_length(sci); + doc_len = sci_get_length(sci); for (i = 0; i < doc_len; i++) { - startword = p_sci->send_message(sci, SCI_INDICATORSTART, 0, i); + startword = scintilla_send_message(sci, SCI_INDICATORSTART, 0, i); if (startword >= 0) { - endword = p_sci->send_message(sci, SCI_INDICATOREND, 0, startword); + endword = scintilla_send_message(sci, SCI_INDICATOREND, 0, startword); if (startword == endword) continue; if (str->len < (guint)(endword - startword + 1)) str = g_string_set_size(str, endword - startword + 1); - p_sci->get_text_range(sci, startword, endword, str->str); + sci_get_text_range(sci, startword, endword, str->str); if (strcmp(str->str, clickinfo.word) == 0) - p_sci->indicator_clear(sci, startword, endword - startword); + sci_indicator_clear(sci, startword, endword - startword); i = endword; } @@ -240,11 +240,11 @@ gtk_widget_hide(sc->edit_menu_sep); /* if we have a selection, prefer it over the current word */ - if (p_sci->has_selection(doc->editor->sci)) + if (sci_has_selection(doc->editor->sci)) { - gint len = p_sci->get_selected_text_length(doc->editor->sci); + gint len = sci_get_selected_text_length(doc->editor->sci); search_word = g_malloc(len + 1); - p_sci->get_selected_text(doc->editor->sci, search_word); + sci_get_selected_text(doc->editor->sci, search_word); } else search_word = g_strdup(word); @@ -305,12 +305,12 @@ gtk_container_add(GTK_CONTAINER(sc->edit_menu_sub), menu_item); label = g_strdup_printf(_("Add \"%s\" to Dictionary"), search_word); - menu_item = p_ui->image_menu_item_new(GTK_STOCK_ADD, label); + menu_item = ui_image_menu_item_new(GTK_STOCK_ADD, label); gtk_container_add(GTK_CONTAINER(sc->edit_menu_sub), menu_item); g_signal_connect((gpointer) menu_item, "activate", G_CALLBACK(on_menu_addword_item_activate), GINT_TO_POINTER(0)); - menu_item = p_ui->image_menu_item_new(GTK_STOCK_REMOVE, _("Ignore All")); + menu_item = ui_image_menu_item_new(GTK_STOCK_REMOVE, _("Ignore All")); gtk_container_add(GTK_CONTAINER(sc->edit_menu_sub), menu_item); g_signal_connect((gpointer) menu_item, "activate", G_CALLBACK(on_menu_addword_item_activate), GINT_TO_POINTER(1)); @@ -350,28 +350,28 @@ /* set current time for the next key press */ time_prev = time_now; - doc = p_document->get_current(); + doc = document_get_current(); /* bail out if we don't have a document or if we are not in the editor widget */ focusw = gtk_window_get_focus(GTK_WINDOW(geany->main_widgets->window)); if (doc == NULL || focusw != GTK_WIDGET(doc->editor->sci)) return FALSE; if (ev->keyval == '\r' && - p_sci->send_message(doc->editor->sci, SCI_GETEOLMODE, 0, 0) == SC_EOL_CRLF) + scintilla_send_message(doc->editor->sci, SCI_GETEOLMODE, 0, 0) == SC_EOL_CRLF) { /* prevent double line checking */ return FALSE; } - line_number = p_sci->get_current_line(doc->editor->sci); + line_number = sci_get_current_line(doc->editor->sci); if (ev->keyval == '\n' || ev->keyval == '\r') line_number--; /* check previous line if we start a new one */ - line = p_sci->get_line(doc->editor->sci, line_number); + line = sci_get_line(doc->editor->sci, line_number); clear_indicators_on_line(doc, line_number); if (speller_process_line(doc, line_number, line) != 0) { if (sc->use_msgwin) - p_msgwindow->switch_tab(MSG_MESSAGE, FALSE); + msgwin_switch_tab(MSG_MESSAGE, FALSE); } g_string_free(str, TRUE); @@ -385,7 +385,7 @@ { GeanyDocument *doc; - doc = p_document->get_current(); + doc = document_get_current(); /* Another language was chosen from the menu item, so make it default for this session. */ if (gdata != NULL) @@ -393,11 +393,11 @@ speller_reinit_enchant_dict(); - p_editor->indicator_clear(doc->editor, GEANY_INDICATOR_ERROR); + editor_indicator_clear(doc->editor, GEANY_INDICATOR_ERROR); if (sc->use_msgwin) { - p_msgwindow->clear_tab(MSG_MESSAGE); - p_msgwindow->switch_tab(MSG_MESSAGE, FALSE); + msgwin_clear_tab(MSG_MESSAGE); + msgwin_switch_tab(MSG_MESSAGE, FALSE); } speller_check_document(doc); @@ -422,7 +422,7 @@ void gui_create_edit_menu(void) { - sc->edit_menu = p_ui->image_menu_item_new(GTK_STOCK_SPELL_CHECK, _("Spelling Suggestions")); + sc->edit_menu = ui_image_menu_item_new(GTK_STOCK_SPELL_CHECK, _("Spelling Suggestions")); gtk_container_add(GTK_CONTAINER(geany->main_widgets->editor_menu), sc->edit_menu); gtk_menu_reorder_child(GTK_MENU(geany->main_widgets->editor_menu), sc->edit_menu, 0); Modified: trunk/spellcheck/src/scplugin.c =================================================================== --- trunk/spellcheck/src/scplugin.c 2008-12-05 13:34:41 UTC (rev 329) +++ trunk/spellcheck/src/scplugin.c 2008-12-06 17:21:04 UTC (rev 330) @@ -42,7 +42,7 @@ #include "utils.h" #include "ui_utils.h" -#include "pluginmacros.h" +#include "geanyfunctions.h" #include "scplugin.h" #include "gui.h" @@ -54,7 +54,7 @@ GeanyFunctions *geany_functions; -PLUGIN_VERSION_CHECK(110) +PLUGIN_VERSION_CHECK(115) PLUGIN_SET_INFO(_("Spell Check"), _("Checks the spelling of the current document."), "0.2", _("The Geany developer team")) @@ -160,16 +160,16 @@ gui_toolbar_update(); - if (! g_file_test(config_dir, G_FILE_TEST_IS_DIR) && p_utils->mkdir(config_dir, TRUE) != 0) + if (! g_file_test(config_dir, G_FILE_TEST_IS_DIR) && utils_mkdir(config_dir, TRUE) != 0) { - p_dialogs->show_msgbox(GTK_MESSAGE_ERROR, + dialogs_show_msgbox(GTK_MESSAGE_ERROR, _("Plugin configuration directory could not be created.")); } else { /* write config to file */ data = g_key_file_to_data(config, NULL, NULL); - p_utils->write_file(sc->config_file, data); + utils_write_file(sc->config_file, data); g_free(data); } g_free(config_dir); @@ -191,20 +191,20 @@ "spellcheck", G_DIR_SEPARATOR_S, "spellcheck.conf", NULL); g_key_file_load_from_file(config, sc->config_file, G_KEY_FILE_NONE, NULL); - sc->default_language = p_utils->get_setting_string(config, + sc->default_language = utils_get_setting_string(config, "spellcheck", "language", default_lang); - sc->check_while_typing = p_utils->get_setting_boolean(config, + sc->check_while_typing = utils_get_setting_boolean(config, "spellcheck", "check_while_typing", FALSE); - sc->show_toolbar_item = p_utils->get_setting_boolean(config, + sc->show_toolbar_item = utils_get_setting_boolean(config, "spellcheck", "show_toolbar_item", TRUE); - sc->use_msgwin = p_utils->get_setting_boolean(config, "spellcheck", "use_msgwin", FALSE); + sc->use_msgwin = utils_get_setting_boolean(config, "spellcheck", "use_msgwin", FALSE); g_key_file_free(config); g_free(default_lang); locale_init(); sc->menu_item = gtk_image_menu_item_new_from_stock(GTK_STOCK_SPELL_CHECK, NULL); - p_ui->add_document_sensitive(sc->menu_item); + ui_add_document_sensitive(sc->menu_item); gui_toolbar_update(); @@ -219,9 +219,9 @@ "key-release-event", G_CALLBACK(gui_key_release_cb), NULL); /* setup keybindings */ - p_keybindings->set_item(plugin_key_group, KB_SPELL_CHECK, gui_kb_run_activate_cb, + keybindings_set_item(plugin_key_group, KB_SPELL_CHECK, gui_kb_run_activate_cb, 0, 0, "spell_check", _("Run Spell Check"), NULL); - p_keybindings->set_item(plugin_key_group, KB_SPELL_TOOGLE_TYPING, + keybindings_set_item(plugin_key_group, KB_SPELL_TOOGLE_TYPING, gui_kb_toggle_typing_activate_cb, 0, 0, "spell_toggle_typing", _("Toggle Check While Typing"), NULL); } @@ -257,7 +257,7 @@ { gtk_combo_box_append_text(GTK_COMBO_BOX(combo), g_ptr_array_index(sc->dicts, i)); - if (p_utils->str_equal(g_ptr_array_index(sc->dicts, i), sc->default_language)) + if (utils_str_equal(g_ptr_array_index(sc->dicts, i), sc->default_language)) gtk_combo_box_set_active(GTK_COMBO_BOX(combo), i); } /* if the default language couldn't be selected, select the first available language */ Modified: trunk/spellcheck/src/speller.c =================================================================== --- trunk/spellcheck/src/speller.c 2008-12-05 13:34:41 UTC (rev 329) +++ trunk/spellcheck/src/speller.c 2008-12-06 17:21:04 UTC (rev 330) @@ -36,9 +36,10 @@ #include "editor.h" #include "msgwindow.h" #include "utils.h" +#include "ui_utils.h" #include "scintilla/SciLexer.h" -#include "pluginmacros.h" +#include "geanyfunctions.h" #include "speller.h" #include "scplugin.h" @@ -83,7 +84,7 @@ if (start_pos == -1) start_pos = end_pos - strlen(word); - p_editor->indicator_set_on_range(doc->editor, GEANY_INDICATOR_ERROR, start_pos, end_pos); + editor_indicator_set_on_range(doc->editor, GEANY_INDICATOR_ERROR, start_pos, end_pos); if (sc->use_msgwin) { @@ -106,7 +107,7 @@ g_string_append_c(str, ' '); } - p_msgwindow->msg_add(COLOR_RED, line_number + 1, doc, "%s", str->str); + msgwin_msg_add(COLOR_RED, line_number + 1, doc, "%s", str->str); if (suggs != NULL && n_suggs > 0) enchant_dict_free_string_list(speller_dict, suggs); @@ -132,17 +133,17 @@ str = g_string_sized_new(256); - pos_start = p_sci->get_position_from_line(doc->editor->sci, line_number); + pos_start = sci_get_position_from_line(doc->editor->sci, line_number); /* TODO use SCI_GETLINEENDPOSITION */ - pos_end = p_sci->get_position_from_line(doc->editor->sci, line_number + 1); + pos_end = sci_get_position_from_line(doc->editor->sci, line_number + 1); while (pos_start < pos_end) { - wstart = p_sci->send_message(doc->editor->sci, SCI_WORDSTARTPOSITION, pos_start, TRUE); - wend = p_sci->send_message(doc->editor->sci, SCI_WORDENDPOSITION, wstart, FALSE); + wstart = scintilla_send_message(doc->editor->sci, SCI_WORDSTARTPOSITION, pos_start, TRUE); + wend = scintilla_send_message(doc->editor->sci, SCI_WORDENDPOSITION, wstart, FALSE); if (wstart == wend) break; - c = p_sci->get_char_at(doc->editor->sci, wstart); + c = sci_get_char_at(doc->editor->sci, wstart); /* hopefully it's enough to check for these both */ if (ispunct(c) || isspace(c)) { @@ -154,7 +155,7 @@ if (str->len < (guint)(wend - wstart)) g_string_set_size(str, wend - wstart); - p_sci->get_text_range(doc->editor->sci, wstart, wend, str->str); + sci_get_text_range(doc->editor->sci, wstart, wend, str->str); suggestions_found += speller_check_word(doc, line_number, str->str, wstart, wend); @@ -179,15 +180,15 @@ enchant_dict_describe(speller_dict, dict_describe, &dict_string); - if (p_sci->has_selection(doc->editor->sci)) + if (sci_has_selection(doc->editor->sci)) { - first_line = p_sci->get_line_from_position( - doc->editor->sci, p_sci->get_selection_start(doc->editor->sci)); - last_line = p_sci->get_line_from_position( - doc->editor->sci, p_sci->get_selection_end(doc->editor->sci)); + first_line = sci_get_line_from_position( + doc->editor->sci, sci_get_selection_start(doc->editor->sci)); + last_line = sci_get_line_from_position( + doc->editor->sci, sci_get_selection_end(doc->editor->sci)); if (sc->use_msgwin) - p_msgwindow->msg_add(COLOR_BLUE, -1, NULL, + msgwin_msg_add(COLOR_BLUE, -1, NULL, _("Checking file \"%s\" (lines %d to %d using %s):"), DOC_FILENAME(doc), first_line + 1, last_line + 1, dict_string); g_message("Checking file \"%s\" (lines %d to %d using %s):", @@ -196,9 +197,9 @@ else { first_line = 0; - last_line = p_sci->get_line_count(doc->editor->sci); + last_line = sci_get_line_count(doc->editor->sci); if (sc->use_msgwin) - p_msgwindow->msg_add(COLOR_BLUE, -1, NULL, _("Checking file \"%s\" (using %s):"), + msgwin_msg_add(COLOR_BLUE, -1, NULL, _("Checking file \"%s\" (using %s):"), DOC_FILENAME(doc), dict_string); g_message("Checking file \"%s\" (using %s):", DOC_FILENAME(doc), dict_string); } @@ -206,21 +207,21 @@ for (i = first_line; i < last_line; i++) { - line = p_sci->get_line(doc->editor->sci, i); + line = sci_get_line(doc->editor->sci, i); suggestions_found += speller_process_line(doc, i, line); g_free(line); } if (suggestions_found == 0 && sc->use_msgwin) - p_msgwindow->msg_add(COLOR_BLUE, -1, NULL, _("The checked text is spelled correctly.")); + msgwin_msg_add(COLOR_BLUE, -1, NULL, _("The checked text is spelled correctly.")); } static void broker_init_failed(void) { const gchar *err = enchant_broker_get_error(speller_broker); - p_dialogs->show_msgbox(GTK_MESSAGE_ERROR, + dialogs_show_msgbox(GTK_MESSAGE_ERROR, _("The Enchant library couldn't be initialized (%s)."), (err != NULL) ? err : _("unknown error (maybe the chosen language is not available)")); } @@ -230,7 +231,7 @@ { gboolean *supported = user_data; - if (p_utils->str_equal(sc->default_language, data)) + if (utils_str_equal(sc->default_language, data)) *supported = TRUE; } @@ -322,7 +323,7 @@ /* find duplicates and skip them */ for (i = 0; i < sc->dicts->len; i++) { - if (p_utils->str_equal(g_ptr_array_index(sc->dicts, i), result)) + if (utils_str_equal(g_ptr_array_index(sc->dicts, i), result)) return; } @@ -424,8 +425,8 @@ g_return_val_if_fail(doc != NULL, FALSE); g_return_val_if_fail(pos >= 0, FALSE); - lexer = p_sci->send_message(doc->editor->sci, SCI_GETLEXER, 0, 0); - style = p_sci->get_style_at(doc->editor->sci, pos); + lexer = scintilla_send_message(doc->editor->sci, SCI_GETLEXER, 0, 0); + style = sci_get_style_at(doc->editor->sci, pos); switch (lexer) { 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:[329] trunk/geanylua
by ntrel＠users.sourceforge.net 05 Dec '08

05 Dec '08

Revision: 329 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=329&view=rev Author: ntrel Date: 2008-12-05 13:34:41 +0000 (Fri, 05 Dec 2008) Log Message: ----------- Update to Geany API v115. Modified Paths: -------------- trunk/geanylua/ChangeLog trunk/geanylua/geanylua.c trunk/geanylua/glspi.h trunk/geanylua/glspi_app.c trunk/geanylua/glspi_doc.c trunk/geanylua/glspi_init.c trunk/geanylua/glspi_run.c trunk/geanylua/glspi_sci.c trunk/geanylua/glspi_ver.h Modified: trunk/geanylua/ChangeLog =================================================================== --- trunk/geanylua/ChangeLog 2008-12-05 09:42:56 UTC (rev 328) +++ trunk/geanylua/ChangeLog 2008-12-05 13:34:41 UTC (rev 329) @@ -1,3 +1,6 @@ +December 5, 2008 (ntrel) + Update to Geany API v115. + September 17, 2008 (eht16) Fix to work with Geany API v93. Modified: trunk/geanylua/geanylua.c =================================================================== --- trunk/geanylua/geanylua.c 2008-12-05 09:42:56 UTC (rev 328) +++ trunk/geanylua/geanylua.c 2008-12-05 13:34:41 UTC (rev 329) @@ -34,6 +34,7 @@ #include "geany.h" #include "plugindata.h" #include "keybindings.h" +#include "geanyfunctions.h" #include <glib/gi18n.h> @@ -180,7 +181,7 @@ if (glspi_configure) { glspi_configure(parent); } else { - geany_functions->p_dialogs->show_msgbox(GTK_MESSAGE_ERROR, + dialogs_show_msgbox(GTK_MESSAGE_ERROR, _("The "PLUGIN_NAME" plugin failed to load properly.\n" "Please check your installation.") ); } Modified: trunk/geanylua/glspi.h =================================================================== --- trunk/geanylua/glspi.h 2008-12-05 09:42:56 UTC (rev 328) +++ trunk/geanylua/glspi.h 2008-12-05 13:34:41 UTC (rev 329) @@ -22,8 +22,10 @@ #include "sciwrappers.h" #include "keybindings.h" #include "ui_utils.h" +#include "editor.h" +#include "templates.h" -#include "pluginmacros.h" +#include "geanyfunctions.h" #define main_widgets geany->main_widgets #include "glspi_ver.h" @@ -58,7 +60,7 @@ #define DOC_REQUIRED \ - GeanyDocument *doc = p_document->get_current();\ + GeanyDocument *doc = document_get_current();\ if (!(doc && doc->is_valid)) {return 0;} @@ -76,14 +78,8 @@ #define push_number(L,n) lua_pushnumber(L,(lua_Number)n) -#define sci_send_message(s,m,w,l) \ - p_sci->send_message( s,\ - (unsigned int) (m), \ - (long unsigned int) (w), \ - (long int) (l) ) - extern GeanyData *glspi_geany_data; #define geany_data glspi_geany_data Modified: trunk/geanylua/glspi_app.c =================================================================== --- trunk/geanylua/glspi_app.c 2008-12-05 09:42:56 UTC (rev 328) +++ trunk/geanylua/glspi_app.c 2008-12-05 13:34:41 UTC (rev 329) @@ -12,11 +12,7 @@ #define NEED_FAIL_ARG_TYPE #include "glspi.h" -#include "editor.h" -#include "templates.h" - - static gint glspi_pluginver(lua_State* L) { lua_pushfstring(L, _( @@ -150,7 +146,7 @@ if (!lua_isstring(L,1) ) { return FAIL_STRING_ARG(1); } widname=lua_tostring(L,1); signame=lua_tostring(L,2); - w=p_support->lookup_widget(main_widgets->window, widname); + w=ui_lookup_widget(main_widgets->window, widname); if (!w) { lua_pushfstring(L, _("Error in module \"%s\" at function %s():\n" "widget \"%s\" not found for argument #1.\n "), @@ -406,7 +402,7 @@ lua_error(L); return 0; } - p_keybindings->send_command(he->group, he->key_id); + keybindings_send_command(he->group, he->key_id); return 0; } @@ -579,13 +575,13 @@ if (lua_gettop(L)>0) { if (!lua_isstring(L,1)) {return FAIL_STRING_ARG(1); } prompt=lua_tostring(L,1); - doc=p_document->get_current(); + doc=document_get_current(); } if (prompt && doc && doc->is_valid ) { - gint fvl=sci_send_message(doc->editor->sci,SCI_GETFIRSTVISIBLELINE, 0,0); - gint pos=p_sci->get_position_from_line(doc->editor->sci, fvl+1); - sci_send_message(doc->editor->sci,SCI_CALLTIPSHOW,pos+3, (gint)prompt); + gint fvl=scintilla_send_message(doc->editor->sci,SCI_GETFIRSTVISIBLELINE, 0,0); + gint pos=sci_get_position_from_line(doc->editor->sci, fvl+1); + scintilla_send_message(doc->editor->sci,SCI_CALLTIPSHOW,pos+3, (gint)prompt); } gdk_window_add_filter(main_widgets->window->window, keygrab_cb, &km); do { @@ -599,7 +595,7 @@ gdk_window_remove_filter(main_widgets->window->window, keygrab_cb, &km); if (prompt && doc && doc->is_valid) { - p_sci->send_command(doc->editor->sci, SCI_CALLTIPCANCEL); + sci_send_command(doc->editor->sci, SCI_CALLTIPCANCEL); } km.group=0; /* reset the hijacked flag before passing to GDK */ lua_pushstring(L, gdk_keyval_name(gdk_keymap_lookup_key(NULL, &km))); Modified: trunk/geanylua/glspi_doc.c =================================================================== --- trunk/geanylua/glspi_doc.c 2008-12-05 09:42:56 UTC (rev 328) +++ trunk/geanylua/glspi_doc.c 2008-12-05 13:34:41 UTC (rev 329) @@ -7,11 +7,8 @@ #define NEED_FAIL_ARG_TYPES #include "glspi.h" -#include "editor.h" - - -#define DOCS ((GeanyDocument**)(documents_array->pdata)) +#define DOCS ((GeanyDocument**)(geany->documents_array->pdata)) #define NOTEBOOK GTK_NOTEBOOK(main_widgets->notebook) @@ -41,21 +38,21 @@ fn=lua_tostring(L, 1); if ( '\0' == fn[0] ) { fn = NULL; } } - p_document->new_file(fn, NULL, NULL); + document_new_file(fn, NULL, NULL); return 0; } /* - Try to find the documents_array index of the specified filename. + Try to find the geany->documents_array index of the specified filename. Returns -1 if the filename doesn't match any open tabs. */ static gint filename_to_doc_idx(const gchar*fn) { if (fn && *fn) { guint i; - for(i = 0; i < documents_array->len; i++) { + for(i = 0; i < geany->documents_array->len; i++) { if fncmp(fn,DOCS[i]->file_name) {return i; } } } @@ -63,11 +60,11 @@ } -/* Converts a documents_array index to a notebook tab index */ +/* Converts a geany->documents_array index to a notebook tab index */ static gint doc_idx_to_tab_idx(gint idx) { return ( - (idx>=0) && ((guint)idx<documents_array->len) && DOCS[idx]->is_valid + (idx>=0) && ((guint)idx<geany->documents_array->len) && DOCS[idx]->is_valid ) ? gtk_notebook_page_num(NOTEBOOK, GTK_WIDGET(DOCS[idx]->editor->sci)):-1; } @@ -75,8 +72,8 @@ /* Returns the filename of the specified document, or NULL on bad index */ static const gchar* doc_idx_to_filename(gint idx) { - if ( (idx >= 0 ) && ( ((guint)idx) < documents_array->len ) ) { - GeanyDocument *doc=g_ptr_array_index(documents_array, idx); + if ( (idx >= 0 ) && ( ((guint)idx) < geany->documents_array->len ) ) { + GeanyDocument *doc=g_ptr_array_index(geany->documents_array, idx); if (doc) { return doc->file_name?doc->file_name:GEANY_STRING_UNTITLED; } } return NULL; @@ -94,7 +91,7 @@ if (idx<0) { /* Negative number refers to (absolute) GtkNotebook index */ idx=(0-idx)-1; if (idx>=gtk_notebook_get_n_pages(NOTEBOOK)) { idx=-1;} - } else { /* A positive number refers to the documents_array index */ + } else { /* A positive number refers to the geany->documents_array index */ idx=doc_idx_to_tab_idx(idx-1); } @@ -121,7 +118,7 @@ static gint documents_closure(lua_State *L) { gint idx=lua_tonumber(L, lua_upvalueindex(1)); - int max=documents_array->len; + int max=geany->documents_array->len; do { /* Find next valid index, skipping invalid (closed) files */ idx++; @@ -176,7 +173,7 @@ static gint glspi_count(lua_State* L) { guint i, n=0; - for (i=0; i<documents_array->len; i++) { + for (i=0; i<geany->documents_array->len; i++) { if (DOCS[i]->is_valid){n++;} } push_number(L,n); @@ -190,15 +187,15 @@ gboolean status=FALSE; if (lua_gettop(L)==0){ DOC_REQUIRED - status=p_document->save_file(p_document->get_current(), TRUE); + status=document_save_file(document_get_current(), TRUE); } else { if (lua_isnumber(L,1)) { gint idx=(gint)lua_tonumber(L,1)-1; - status=p_document->save_file(DOCS[idx], TRUE); + status=document_save_file(DOCS[idx], TRUE); } else { if (lua_isstring(L,1)) { gint idx=filename_to_doc_idx(lua_tostring(L,1)); - status=p_document->save_file(DOCS[idx], TRUE); + status=document_save_file(DOCS[idx], TRUE); } else { return FAIL_STR_OR_NUM_ARG(1); } } } @@ -216,7 +213,7 @@ if (lua_gettop(L)==0) { DOC_REQUIRED - idx=p_document->get_current()->index; + idx=document_get_current()->index; } else { if (lua_isnumber(L,1)) { idx=lua_tonumber(L,1)-1; @@ -227,17 +224,17 @@ } } if (!fn) { - status=p_document->reload_file(DOCS[idx],NULL) ? idx : -1; + status=document_reload_file(DOCS[idx],NULL) ? idx : -1; } else { - guint len=documents_array->len; - GeanyDocument*doc=p_document->open_file(fn,FALSE,NULL,NULL); + guint len=geany->documents_array->len; + GeanyDocument*doc=document_open_file(fn,FALSE,NULL,NULL); status=doc?doc->index:-1; - if ( (status>=0) && (len==documents_array->len)) + if ( (status>=0) && (len==geany->documents_array->len)) { /* if len doesn't change, it means we are reloading an already open file */ /* ntrel: actually, len can stay the same when reusing invalid document slots. */ - idx=p_document->get_current()->index; - status=p_document->reload_file(DOCS[idx],NULL) ? idx : -1; + idx=document_get_current()->index; + status=document_reload_file(DOCS[idx],NULL) ? idx : -1; } } push_number(L,status+1); @@ -251,15 +248,15 @@ gboolean status=FALSE; if (lua_gettop(L)==0){ DOC_REQUIRED - status=p_document->close(p_document->get_current()); + status=document_close(document_get_current()); } else { if (lua_isnumber(L,1)) { guint idx=(guint)lua_tonumber(L,1)-1; - status=p_document->close(DOCS[idx]); + status=document_close(DOCS[idx]); } else { if (lua_isstring(L,1)) { guint idx=(guint)filename_to_doc_idx(lua_tostring(L,1)); - status=p_document->close(DOCS[idx]); + status=document_close(DOCS[idx]); } else { return FAIL_STR_OR_NUM_ARG(1); } } } Modified: trunk/geanylua/glspi_init.c =================================================================== --- trunk/geanylua/glspi_init.c 2008-12-05 09:42:56 UTC (rev 328) +++ trunk/geanylua/glspi_init.c 2008-12-05 13:34:41 UTC (rev 329) @@ -173,7 +173,7 @@ key=0; mod=0; } - p_keybindings->set_item(KG, i, kb_activate, + keybindings_set_item(KG, i, kb_activate, key,mod,KG->keys[i].name,KG->keys[i].label,NULL); } } else { Modified: trunk/geanylua/glspi_run.c =================================================================== --- trunk/geanylua/glspi_run.c 2008-12-05 09:42:56 UTC (rev 328) +++ trunk/geanylua/glspi_run.c 2008-12-05 13:34:41 UTC (rev 329) @@ -7,10 +7,7 @@ #define NEED_FAIL_ARG_TYPE #include "glspi.h" -#include "editor.h" - - typedef gint (*KeyfileAssignFunc) (lua_State *L, GKeyFile*kf); @@ -46,7 +43,7 @@ */ static void repaint_scintilla(void) { - GeanyDocument* doc=p_document->get_current(); + GeanyDocument* doc=document_get_current(); if ( doc && doc->is_valid ) { gdk_window_invalidate_rect(GTK_WIDGET(doc->editor->sci)->window, NULL, TRUE); gdk_window_process_updates(GTK_WIDGET(doc->editor->sci)->window, TRUE); @@ -81,13 +78,13 @@ static gboolean glspi_goto_error(gchar *fn, gint line) { - GeanyDocument *doc=p_document->open_file(fn, FALSE, NULL, NULL); + GeanyDocument *doc=document_open_file(fn, FALSE, NULL, NULL); if (doc) { if (doc->is_valid) { ScintillaObject*sci=doc->editor->sci; if (sci) { - gint pos=p_sci->get_position_from_line(sci,line-1); - p_sci->set_current_position(sci,pos,TRUE); + gint pos=sci_get_position_from_line(sci,line-1); + sci_set_current_position(sci,pos,TRUE); return TRUE; } } Modified: trunk/geanylua/glspi_sci.c =================================================================== --- trunk/geanylua/glspi_sci.c 2008-12-05 09:42:56 UTC (rev 328) +++ trunk/geanylua/glspi_sci.c 2008-12-05 13:34:41 UTC (rev 329) @@ -10,24 +10,20 @@ #include "glspi.h" #include "glspi_sci.h" -#include "editor.h" - - - /* Get or Set the entire text of the currently active Geany document */ static gint glspi_text(lua_State* L) { - GeanyDocument *doc = p_document->get_current(); + GeanyDocument *doc = document_get_current(); if (!doc) { return 0; } if (0 == lua_gettop(L)) { /* Called with no args, GET the current text */ - gint len = p_sci->get_length(doc->editor->sci); + gint len = sci_get_length(doc->editor->sci); gchar *txt = NULL; if (len>0) { txt = g_malloc0((guint)len+2); - p_sci->get_text(doc->editor->sci, len+1, txt); + sci_get_text(doc->editor->sci, len+1, txt); lua_pushstring(L, (const gchar *) txt); g_free(txt); } else { @@ -40,7 +36,7 @@ return FAIL_STRING_ARG(1); } txt = lua_tostring(L, 1); - p_sci->set_text(doc->editor->sci, txt); + sci_set_text(doc->editor->sci, txt); return 0; } } @@ -52,11 +48,11 @@ DOC_REQUIRED if (0 == lua_gettop(L)) { /* Called with no args, GET the selection */ - gint len = p_sci->get_selected_text_length(doc->editor->sci); + gint len = sci_get_selected_text_length(doc->editor->sci); gchar *txt = NULL; if (len>0) { txt = g_malloc0((guint)(len+1)); - p_sci->get_selected_text(doc->editor->sci, txt); + sci_get_selected_text(doc->editor->sci, txt); lua_pushstring(L, (const gchar *) txt); g_free(txt); } else { @@ -67,7 +63,7 @@ const gchar*txt=NULL; if (!lua_isstring(L, 1)) { return FAIL_STRING_ARG(1); } txt = lua_tostring(L, 1); - p_sci->replace_sel(doc->editor->sci, txt); + sci_replace_sel(doc->editor->sci, txt); return 0; } } @@ -82,7 +78,7 @@ gboolean rectsel=FALSE; DOC_REQUIRED if (0==argc) { - rectsel=sci_send_message(doc->editor->sci, SCI_SELECTIONISRECTANGLE, 0, 0); + rectsel=scintilla_send_message(doc->editor->sci, SCI_SELECTIONISRECTANGLE, 0, 0); } lua_getglobal(L, LUA_MODULE_NAME); @@ -99,8 +95,8 @@ } } if (0==argc) { - sel_end=p_sci->get_current_position(doc->editor->sci); - sel_start=sci_send_message(doc->editor->sci, SCI_GETANCHOR, 0, 0); + sel_end=sci_get_current_position(doc->editor->sci); + sel_start=scintilla_send_message(doc->editor->sci, SCI_GETANCHOR, 0, 0); push_number(L, sel_start); push_number(L, sel_end); return 2; @@ -113,14 +109,14 @@ if (!lua_isnumber(L, 2)) { return FAIL_NUMERIC_ARG(2); } sel_end=lua_tonumber(L,2); } - sci_send_message(doc->editor->sci, + scintilla_send_message(doc->editor->sci, SCI_SETSELECTIONMODE, rectsel?SC_SEL_RECTANGLE:SC_SEL_STREAM, 0); - p_sci->set_current_position(doc->editor->sci, sel_end, FALSE); - sci_send_message(doc->editor->sci, SCI_SETANCHOR, sel_start, 0); - p_sci->ensure_line_is_visible(doc->editor->sci, - p_sci->get_line_from_position(doc->editor->sci, sel_end)); - p_sci->scroll_caret(doc->editor->sci); - sci_send_message(doc->editor->sci, + sci_set_current_position(doc->editor->sci, sel_end, FALSE); + scintilla_send_message(doc->editor->sci, SCI_SETANCHOR, sel_start, 0); + sci_ensure_line_is_visible(doc->editor->sci, + sci_get_line_from_position(doc->editor->sci, sel_end)); + sci_scroll_caret(doc->editor->sci); + scintilla_send_message(doc->editor->sci, SCI_SETSELECTIONMODE, rectsel?SC_SEL_RECTANGLE:SC_SEL_STREAM, 0); return 0; } @@ -131,7 +127,7 @@ static gint glspi_height(lua_State* L) { DOC_REQUIRED - push_number(L, p_sci->get_line_count(doc->editor->sci)); + push_number(L, sci_get_line_count(doc->editor->sci)); return 1; } @@ -140,7 +136,7 @@ static gint glspi_length(lua_State* L) { DOC_REQUIRED - push_number(L, p_sci->get_length(doc->editor->sci)); + push_number(L, sci_get_length(doc->editor->sci)); return 1; } @@ -151,11 +147,11 @@ { DOC_REQUIRED if (lua_gettop(L)==0) { - push_number(L,p_sci->get_current_position(doc->editor->sci)); + push_number(L,sci_get_current_position(doc->editor->sci)); return 1; } else { if (!lua_isnumber(L,1)) { return FAIL_NUMERIC_ARG(1); } - p_sci->set_current_position(doc->editor->sci,(gint)lua_tonumber(L,1),TRUE); + sci_set_current_position(doc->editor->sci,(gint)lua_tonumber(L,1),TRUE); return 0; } } @@ -173,19 +169,19 @@ case 0: case 1: if (argc==0) { - pos=p_sci->get_current_position(doc->editor->sci); + pos=sci_get_current_position(doc->editor->sci); } else { if (!lua_isnumber(L,1)) { return FAIL_NUMERIC_ARG(1); } pos=lua_tonumber(L,1); if ( pos < 0 ) { pos=0; } else { - len=p_sci->get_length(doc->editor->sci); + len=sci_get_length(doc->editor->sci); if ( pos >= len ) { pos=len-1; } } } - line=p_sci->get_line_from_position(doc->editor->sci,pos); - col=p_sci->get_col_from_position(doc->editor->sci,pos); + line=sci_get_line_from_position(doc->editor->sci,pos); + col=sci_get_col_from_position(doc->editor->sci,pos); push_number(L,line+1); push_number(L,col); return 2; @@ -196,17 +192,17 @@ if ( line < 1 ) { line=1; } else { - cnt=p_sci->get_line_count(doc->editor->sci); + cnt=sci_get_line_count(doc->editor->sci); if ( line > cnt ) { line=cnt; } } col=lua_tonumber(L,2); if ( col < 0 ) { col=0; } else { - len=p_sci->get_line_length(doc->editor->sci,line); + len=sci_get_line_length(doc->editor->sci,line); if (col>=len) {col=len-1;} } - pos=p_sci->get_position_from_line(doc->editor->sci,line-1)+col; + pos=sci_get_position_from_line(doc->editor->sci,line-1)+col; push_number(L,pos); return 1; } @@ -221,9 +217,9 @@ return FAIL_BOOL_ARG(1); } if (lua_toboolean(L,1)) { - p_sci->start_undo_action(doc->editor->sci); + sci_start_undo_action(doc->editor->sci); } else { - p_sci->end_undo_action(doc->editor->sci); + sci_end_undo_action(doc->editor->sci); } return 0; } @@ -241,13 +237,13 @@ if (!lua_isnumber(L,1)) { return FAIL_NUMERIC_ARG(1); } pos=lua_tonumber(L,1); } else { - pos = p_sci->get_current_position(doc->editor->sci); + pos = sci_get_current_position(doc->editor->sci); } - linenum = p_sci->get_line_from_position(doc->editor->sci, pos); - bol = p_sci->get_position_from_line(doc->editor->sci, linenum); + linenum = sci_get_line_from_position(doc->editor->sci, pos); + bol = sci_get_position_from_line(doc->editor->sci, linenum); bow = pos - bol; eow = pos - bol; - text=p_sci->get_line(doc->editor->sci, linenum); + text=sci_get_line(doc->editor->sci, linenum); lua_getglobal(L, LUA_MODULE_NAME); if ( lua_istable(L, -1) ) { lua_pushstring(L,tokenWordChars); @@ -278,9 +274,9 @@ */ static gchar* get_line_text(GeanyDocument*doc,gint linenum) { - gint count=p_sci->get_line_count(doc->editor->sci); + gint count=sci_get_line_count(doc->editor->sci); if ((linenum>0)&&(linenum<=count)) { - gchar *text=p_sci->get_line(doc->editor->sci, linenum-1); + gchar *text=sci_get_line(doc->editor->sci, linenum-1); return text?text:g_strdup(""); } else { return FALSE; @@ -435,7 +431,7 @@ } else { gint n; for (n=0; n<count; n++) { - p_sci->send_command(doc->editor->sci,scicmd); + sci_send_command(doc->editor->sci,scicmd); } } return 0; @@ -461,17 +457,17 @@ switch (lua_gettop(L)) { case 0: - start=p_sci->get_selection_start(doc->editor->sci); - stop=p_sci->get_selection_end(doc->editor->sci); + start=sci_get_selection_start(doc->editor->sci); + stop=sci_get_selection_end(doc->editor->sci); if (start>stop) { swap(&start,&stop); } - if (start!=stop) p_sci->send_command(doc->editor->sci, SCI_COPY); + if (start!=stop) sci_send_command(doc->editor->sci, SCI_COPY); push_number(L, stop-start); return 1; case 1: if (!lua_isstring(L,1)) {return FAIL_STRING_ARG(1);} content=lua_tostring(L,1); len=strlen(content); - if (len) { sci_send_message(doc->editor->sci,SCI_COPYTEXT,len,(gint)content); } + if (len) { scintilla_send_message(doc->editor->sci,SCI_COPYTEXT,len,(gint)content); } push_number(L, len); return 1; default: @@ -482,7 +478,7 @@ if (start<0) { return FAIL_UNSIGNED_ARG(1); } if (stop <0) { return FAIL_UNSIGNED_ARG(2); } if (start>stop) { swap(&start,&stop); } - if (start!=stop) sci_send_message(doc->editor->sci,SCI_COPYRANGE,start,stop); + if (start!=stop) scintilla_send_message(doc->editor->sci,SCI_COPYRANGE,start,stop); push_number(L, stop-start); return 1; } @@ -494,12 +490,12 @@ { gint start,stop,len; DOC_REQUIRED - start=p_sci->get_selection_start(doc->editor->sci); - stop=p_sci->get_selection_end(doc->editor->sci); - len=p_sci->get_length(doc->editor->sci); + start=sci_get_selection_start(doc->editor->sci); + stop=sci_get_selection_end(doc->editor->sci); + len=sci_get_length(doc->editor->sci); if (start>stop) {swap(&start,&stop); } - if (start!=stop) {p_sci->send_command(doc->editor->sci, SCI_CUT); } - push_number(L,len-p_sci->get_length(doc->editor->sci)); + if (start!=stop) {sci_send_command(doc->editor->sci, SCI_CUT); } + push_number(L,len-sci_get_length(doc->editor->sci)); return 1; } @@ -510,10 +506,10 @@ static gint glspi_paste(lua_State* L) { DOC_REQUIRED - if (sci_send_message(doc->editor->sci,SCI_CANPASTE,0,0)) { - gint len=p_sci->get_length(doc->editor->sci); - p_sci->send_command(doc->editor->sci,SCI_PASTE); - push_number(L,p_sci->get_length(doc->editor->sci)-len); + if (scintilla_send_message(doc->editor->sci,SCI_CANPASTE,0,0)) { + gint len=sci_get_length(doc->editor->sci); + sci_send_command(doc->editor->sci,SCI_PASTE); + push_number(L,sci_get_length(doc->editor->sci)-len); } else { lua_pushnil(L); } @@ -527,12 +523,12 @@ gint pos; DOC_REQUIRED if (lua_gettop(L)==0) { - pos=p_sci->get_current_position(doc->editor->sci); + pos=sci_get_current_position(doc->editor->sci); } else { if ( !lua_isnumber(L,1) ) {return FAIL_NUMERIC_ARG(1);} pos=lua_tonumber(L,1); } - push_number(L,p_sci->find_matching_brace(doc->editor->sci,pos)); + push_number(L,sci_find_matching_brace(doc->editor->sci,pos)); return 1; } @@ -544,12 +540,12 @@ gint pos; DOC_REQUIRED if (lua_gettop(L)==0) { - pos=p_sci->get_current_position(doc->editor->sci); + pos=sci_get_current_position(doc->editor->sci); } else { if ( !lua_isnumber(L,1) ) {return FAIL_NUMERIC_ARG(1);} pos=lua_tonumber(L,1); } - push_number(L,p_sci->get_char_at(doc->editor->sci,pos)); + push_number(L,sci_get_char_at(doc->editor->sci,pos)); return 1; } @@ -709,19 +705,19 @@ case SLT_TEXTRANGE: return FAIL_API; case SLT_STRINGRESULT: if ((he->msgid==SCI_GETTEXT)&&(wparam==0)) { - wparam=sci_send_message(doc->editor->sci, SCI_GETLENGTH, 0,0); + wparam=scintilla_send_message(doc->editor->sci, SCI_GETLENGTH, 0,0); } switch (he->msgid) { case SCI_GETTEXT: if (wparam==0){ - wparam=sci_send_message(doc->editor->sci, SCI_GETLENGTH, 0,0); + wparam=scintilla_send_message(doc->editor->sci, SCI_GETLENGTH, 0,0); } else { wparam++; } break; case SCI_GETCURLINE: if (wparam>0) { wparam++; } break; } - bufsize=sci_send_message(doc->editor->sci, he->msgid, wparam, 0); + bufsize=scintilla_send_message(doc->editor->sci, he->msgid, wparam, 0); if (bufsize) { resultbuf=g_malloc0((guint)(bufsize+1)); lparam=GPOINTER_TO_INT(resultbuf); @@ -736,20 +732,20 @@ } switch (he->result) { case SLT_VOID: - sci_send_message(doc->editor->sci, he->msgid, wparam, lparam); + scintilla_send_message(doc->editor->sci, he->msgid, wparam, lparam); lua_pushnil(L); return 1; case SLT_INT: if (he->lparam==SLT_STRINGRESULT) { - sci_send_message(doc->editor->sci, he->msgid, wparam, lparam); + scintilla_send_message(doc->editor->sci, he->msgid, wparam, lparam); lua_pushstring(L,resultbuf); g_free(resultbuf); } else { - push_number(L, sci_send_message(doc->editor->sci, he->msgid, wparam, lparam)); + push_number(L, scintilla_send_message(doc->editor->sci, he->msgid, wparam, lparam)); } return 1; case SLT_BOOL: - lua_pushboolean(L, sci_send_message(doc->editor->sci, he->msgid, wparam, lparam)); + lua_pushboolean(L, scintilla_send_message(doc->editor->sci, he->msgid, wparam, lparam)); return 1; default:return FAIL_API; } @@ -805,7 +801,7 @@ lua_pop(L, 1); } - if (sci_send_message(doc->editor->sci,SCI_FINDTEXT,flags,GPOINTER_TO_INT(&ttf))!=-1) { + if (scintilla_send_message(doc->editor->sci,SCI_FINDTEXT,flags,GPOINTER_TO_INT(&ttf))!=-1) { push_number(L,ttf.chrgText.cpMin); push_number(L,ttf.chrgText.cpMax); g_free(ttf.lpstrText); Modified: trunk/geanylua/glspi_ver.h =================================================================== --- trunk/geanylua/glspi_ver.h 2008-12-05 09:42:56 UTC (rev 328) +++ trunk/geanylua/glspi_ver.h 2008-12-05 13:34:41 UTC (rev 329) @@ -14,7 +14,7 @@ #define PLUGIN_AUTHOR "Jeff Pohlmeyer" -#define MY_GEANY_API_VER 86 +#define MY_GEANY_API_VER 115 #define LUA_MODULE_NAME "geany" 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:[328] trunk/geanysendmail
by frlan＠users.sourceforge.net 05 Dec '08

05 Dec '08

Revision: 328 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=328&view=rev Author: frlan Date: 2008-12-05 09:42:56 +0000 (Fri, 05 Dec 2008) Log Message: ----------- GeanySendMail: Update of Geany plugin API v116 and make usage of geanyfunctions.h Modified Paths: -------------- trunk/geanysendmail/README trunk/geanysendmail/src/geanysendmail.c Modified: trunk/geanysendmail/README =================================================================== --- trunk/geanysendmail/README 2008-12-03 21:15:45 UTC (rev 327) +++ trunk/geanysendmail/README 2008-12-05 09:42:56 UTC (rev 328) @@ -24,7 +24,7 @@ prepared package e.g. from your distribution you probably need to install an additional package, this might be called geany-dev or geany-devel. Please note that in order to compile and use this plugin, -you need Geany 0.16svn or later (Geany Plugin API v104 or higher). +you need Geany 0.16svn or later (Geany Plugin API v116 or higher). Furthermore you need, of course, a C compiler and the Make tool. The GNU versions of these tools are recommended. Modified: trunk/geanysendmail/src/geanysendmail.c =================================================================== --- trunk/geanysendmail/src/geanysendmail.c 2008-12-03 21:15:45 UTC (rev 327) +++ trunk/geanysendmail/src/geanysendmail.c 2008-12-05 09:42:56 UTC (rev 328) @@ -32,7 +32,7 @@ #include "utils.h" #include "keybindings.h" #include "icon.h" -#include "pluginmacros.h" +#include "geanyfunctions.h" #ifdef HAVE_LOCALE_H # include <locale.h> @@ -42,7 +42,7 @@ GeanyData *geany_data; GeanyFunctions *geany_functions; -PLUGIN_VERSION_CHECK(104) +PLUGIN_VERSION_CHECK(116) PLUGIN_SET_INFO(_("GeanySendMail"), _("A little plugin to send the current \ file as attachment by user's favorite mailer"), "0.5svn", "Frank Lanitz <frank(a)frank.uvena.de>") @@ -83,23 +83,23 @@ gchar *data; - doc = p_document->get_current(); + doc = document_get_current(); if (doc->file_name == NULL) { - p_dialogs->show_save_as(); + dialogs_show_save_as(); } else { - p_document->save_file(doc, FALSE); + document_save_file(doc, FALSE); } if (doc->file_name != NULL) { if (mailer) { - locale_filename = p_utils->get_locale_from_utf8(doc->file_name); + locale_filename = utils_get_locale_from_utf8(doc->file_name); cmd_str = g_string_new(mailer); if ((use_address_dialog == TRUE) && (g_strrstr(mailer, "%r") != NULL)) @@ -109,7 +109,7 @@ dialog = gtk_dialog_new_with_buttons(_("Recipient's Address"), GTK_WINDOW(geany->main_widgets->window), GTK_DIALOG_DESTROY_WITH_PARENT, GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, NULL); - vbox = p_ui->dialog_vbox_new(GTK_DIALOG(dialog)); + vbox = ui_dialog_vbox_new(GTK_DIALOG(dialog)); gtk_widget_set_name(dialog, "GeanyDialog"); gtk_box_set_spacing(GTK_BOX(vbox), 10); @@ -137,41 +137,41 @@ g_key_file_set_string(config, "tools", "address", address); } - if (! g_file_test(config_dir, G_FILE_TEST_IS_DIR) && p_utils->mkdir(config_dir, TRUE) != 0) + if (! g_file_test(config_dir, G_FILE_TEST_IS_DIR) && utils_mkdir(config_dir, TRUE) != 0) { - p_dialogs->show_msgbox(GTK_MESSAGE_ERROR, + dialogs_show_msgbox(GTK_MESSAGE_ERROR, _("Plugin configuration directory could not be created.")); } else { // write config to file data = g_key_file_to_data(config, NULL, NULL); - p_utils->write_file(config_file, data); + utils_write_file(config_file, data); g_free(data); g_key_file_free(config); g_free(config_dir); } } - if (! p_utils->string_replace_all(cmd_str, "%f", locale_filename)) - p_ui->set_statusbar(FALSE, _("Filename placeholder not found. The executed command might have failed.")); + if (! utils_string_replace_all(cmd_str, "%f", locale_filename)) + ui_set_statusbar(FALSE, _("Filename placeholder not found. The executed command might have failed.")); if (use_address_dialog == TRUE && address != NULL) { - if (! p_utils->string_replace_all(cmd_str, "%r", address)) - p_ui->set_statusbar(FALSE, _("Recipient address placeholder not found. The executed command might have failed.")); + if (! utils_string_replace_all(cmd_str, "%r", address)) + ui_set_statusbar(FALSE, _("Recipient address placeholder not found. The executed command might have failed.")); } else /* Removes %r if option was not activ but was included into command */ - p_utils->string_replace_all(cmd_str, "%r", NULL); + utils_string_replace_all(cmd_str, "%r", NULL); - p_utils->string_replace_all(cmd_str, "%b", g_path_get_basename(locale_filename)); + utils_string_replace_all(cmd_str, "%b", g_path_get_basename(locale_filename)); command = g_string_free(cmd_str, FALSE); g_spawn_command_line_async(command, &error); if (error != NULL) { - p_ui->set_statusbar(FALSE, _("Could not execute mailer. Please check your configuration.")); + ui_set_statusbar(FALSE, _("Could not execute mailer. Please check your configuration.")); g_error_free(error); } @@ -183,12 +183,12 @@ } else { - p_ui->set_statusbar(FALSE, _("Please define a mail client first.")); + ui_set_statusbar(FALSE, _("Please define a mail client first.")); } } else { - p_ui->set_statusbar(FALSE, _("File has to be saved before sending.")); + ui_set_statusbar(FALSE, _("File has to be saved before sending.")); } } @@ -222,8 +222,8 @@ g_object_unref(mailbutton_pb); mailbutton = (GtkWidget*) gtk_tool_button_new (icon, _("Mail")); - p_plugin->add_toolbar_item(geany_plugin, GTK_TOOL_ITEM(mailbutton)); - p_ui->add_document_sensitive(mailbutton); + plugin_add_toolbar_item(geany_plugin, GTK_TOOL_ITEM(mailbutton)); + ui_add_document_sensitive(mailbutton); g_signal_connect (G_OBJECT(mailbutton), "clicked", G_CALLBACK(send_as_attachment), NULL); gtk_widget_show_all (mailbutton); } @@ -281,16 +281,16 @@ g_key_file_set_boolean(config, "tools", "address_usage", use_address_dialog); g_key_file_set_boolean(config, "icon", "show_icon", icon_in_toolbar); - if (! g_file_test(config_dir, G_FILE_TEST_IS_DIR) && p_utils->mkdir(config_dir, TRUE) != 0) + if (! g_file_test(config_dir, G_FILE_TEST_IS_DIR) && utils_mkdir(config_dir, TRUE) != 0) { - p_dialogs->show_msgbox(GTK_MESSAGE_ERROR, + dialogs_show_msgbox(GTK_MESSAGE_ERROR, _("Plugin configuration directory could not be created.")); } else { // write config to file gchar *data = g_key_file_to_data(config, NULL, NULL); - p_utils->write_file(config_file, data); + utils_write_file(config_file, data); g_free(data); } g_key_file_free(config); @@ -368,7 +368,7 @@ GtkWidget *menu_mail = NULL; - p_main->locale_init(LOCALEDIR, GETTEXT_PACKAGE); + main_locale_init(LOCALEDIR, GETTEXT_PACKAGE); config_file = g_strconcat(geany->app->configdir, G_DIR_SEPARATOR_S, "plugins", G_DIR_SEPARATOR_S, "geanysendmail", G_DIR_SEPARATOR_S, "mail.conf", NULL); @@ -397,11 +397,11 @@ g_signal_connect(G_OBJECT(menu_mail), "activate", G_CALLBACK(send_as_attachment), NULL); /* setup keybindings */ - p_keybindings->set_item(plugin_key_group, SENDMAIL_KB, key_send_as_attachment, + keybindings_set_item(plugin_key_group, SENDMAIL_KB, key_send_as_attachment, 0, 0, "send_file_as_attachment", kb_label, menu_mail); gtk_widget_show_all(menu_mail); - p_ui->add_document_sensitive(menu_mail); + ui_add_document_sensitive(menu_mail); main_menu_item = menu_mail; } 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:[327] trunk/geanylatex/src/geanylatex.h
by frlan＠users.sourceforge.net 03 Dec '08

03 Dec '08

Revision: 327 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=327&view=rev Author: frlan Date: 2008-12-03 21:15:45 +0000 (Wed, 03 Dec 2008) Log Message: ----------- GeanyLaTeX: Removed dinbrief specific commands and corrected a little issue at letter template Modified Paths: -------------- trunk/geanylatex/src/geanylatex.h Modified: trunk/geanylatex/src/geanylatex.h =================================================================== --- trunk/geanylatex/src/geanylatex.h 2008-12-03 21:15:19 UTC (rev 326) +++ trunk/geanylatex/src/geanylatex.h 2008-12-03 21:15:45 UTC (rev 327) @@ -69,8 +69,7 @@ #define TEMPLATE_LATEX_LETTER "\ \\documentclass[{CLASSOPTION}]{{DOCUMENTCLASS}}\n\ {ENCODING}\ -\\stdaddress{}\n\ -\\place{}\n\ +\\address{}\n\ {DATE}\ {TITLE}\ {AUTHOR}\ @@ -78,6 +77,7 @@ \\begin{letter}{}\n\ \\opening{{OPENING}}\n\n\ \\closing{{CLOSING}}\n\ +\\end{letter}\n\ \\end{document}\n" #define create_sub_menu(base_menu, menu, item, title) \ 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:[326] trunk/geanylatex/src/geanylatex.c
by frlan＠users.sourceforge.net 03 Dec '08

03 Dec '08

Revision: 326 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=326&view=rev Author: frlan Date: 2008-12-03 21:15:19 +0000 (Wed, 03 Dec 2008) Log Message: ----------- GeanyLaTeX: Don't offer KOMAscript class for letter due still existing long list of needed changes for it Modified Paths: -------------- trunk/geanylatex/src/geanylatex.c Modified: trunk/geanylatex/src/geanylatex.c =================================================================== --- trunk/geanylatex/src/geanylatex.c 2008-12-03 21:14:53 UTC (rev 325) +++ trunk/geanylatex/src/geanylatex.c 2008-12-03 21:15:19 UTC (rev 326) @@ -646,7 +646,7 @@ } case 3: { - documentclass_str = g_utf8_casefold("scrlttr2", -1); + documentclass_str = g_utf8_casefold("letter", -1); } } } 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:[325] trunk/geanylatex/README
by frlan＠users.sourceforge.net 03 Dec '08

03 Dec '08

Revision: 325 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=325&view=rev Author: frlan Date: 2008-12-03 21:14:53 +0000 (Wed, 03 Dec 2008) Log Message: ----------- GeanyLaTeX: Minor update of README Modified Paths: -------------- trunk/geanylatex/README Modified: trunk/geanylatex/README =================================================================== --- trunk/geanylatex/README 2008-12-03 21:14:30 UTC (rev 324) +++ trunk/geanylatex/README 2008-12-03 21:14:53 UTC (rev 325) @@ -24,7 +24,7 @@ prepared package e.g. from your distribution you probably need to install an additional package, this might be called geany-dev or geany-devel. Please note that in order to compile and use this plugin, -you need Geany 0.15 or later (Geany Plugin API v104 or higher). +you need Geany 0.16 or later (Geany Plugin API v111 or higher). Furthermore you need, of course, a C compiler (that is supporting C99) and the Make tool. The GNU versions of these tools are recommended. 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:[324] trunk/geanylatex
by frlan＠users.sourceforge.net 03 Dec '08

03 Dec '08

Revision: 324 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=324&view=rev Author: frlan Date: 2008-12-03 21:14:30 +0000 (Wed, 03 Dec 2008) Log Message: ----------- GeanyLaTeX: Extend letter template by opening and closing as well as set some translatable common default (compile time) values for. Modified Paths: -------------- trunk/geanylatex/po/de.po trunk/geanylatex/po/geanylatex.pot trunk/geanylatex/src/geanylatex.c trunk/geanylatex/src/geanylatex.h Modified: trunk/geanylatex/po/de.po =================================================================== --- trunk/geanylatex/po/de.po 2008-12-03 21:13:57 UTC (rev 323) +++ trunk/geanylatex/po/de.po 2008-12-03 21:14:30 UTC (rev 324) @@ -2,7 +2,7 @@ msgstr "" "Project-Id-Version: GeanyLaTeX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-12-03 00:11+0100\n" +"POT-Creation-Date: 2008-12-03 21:29+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" @@ -168,55 +168,63 @@ "Setzt die Option draft für die Dokumentenklasse um das neue Dokument mit " "einer Nummer von kleinen Korrekturhinweisen zu versehen." -#: src/geanylatex.c:771 +#: src/geanylatex.c:766 +msgid "Dear Sir or Madame" +msgstr "Sehr geehrte Damen und Herren" + +#: src/geanylatex.c:767 +msgid "With kind regards" +msgstr "Mit freundlichen Grüßen" + +#: src/geanylatex.c:809 msgid "_LaTeX" msgstr "_LaTeX" -#: src/geanylatex.c:778 +#: src/geanylatex.c:816 msgid "LaTeX-_Wizard" msgstr "LaTeX-_Assistent" -#: src/geanylatex.c:781 +#: src/geanylatex.c:819 msgid "Starts a Wizard to easily create LaTeX-documents" msgstr "Öffnet einen Assistenten, um einfache LaTeX-Dokumente zu erstellen." -#: src/geanylatex.c:786 +#: src/geanylatex.c:824 msgid "Insert _Special Character" msgstr "_Sonderzeichen einfügen" -#: src/geanylatex.c:788 +#: src/geanylatex.c:826 msgid "Helps to use some not very common letters and signs" msgstr "Unterstützt bei der Verwendung von seltenen Sonderzeichen" -#: src/geanylatex.c:795 +#: src/geanylatex.c:833 msgid "Insert _Reference" msgstr "_Verweis einfügen" -#: src/geanylatex.c:797 +#: src/geanylatex.c:835 msgid "Inserting references to the document" msgstr "Eine Referenz in das Dokument einfügen" -#: src/geanylatex.c:801 +#: src/geanylatex.c:839 msgid "Insert _Label" msgstr "_Lesezeichen einfügen" -#: src/geanylatex.c:803 +#: src/geanylatex.c:841 msgid "Helps at inserting labels to a document" msgstr "Untersützt bei dem Einfügen von Lesezeichen in ein Dokument" -#: src/geanylatex.c:807 +#: src/geanylatex.c:845 msgid "BibTeX" msgstr "BibTeX" -#: src/geanylatex.c:824 +#: src/geanylatex.c:862 msgid "Run LaTeX-Wizard" msgstr "LaTeX-Assistent starten" -#: src/geanylatex.c:826 +#: src/geanylatex.c:864 msgid "Insert \\label" msgstr "\\label einfügen" -#: src/geanylatex.c:828 +#: src/geanylatex.c:866 msgid "Insert \\ref" msgstr "\\ref einfügen" Modified: trunk/geanylatex/po/geanylatex.pot =================================================================== --- trunk/geanylatex/po/geanylatex.pot 2008-12-03 21:13:57 UTC (rev 323) +++ trunk/geanylatex/po/geanylatex.pot 2008-12-03 21:14:30 UTC (rev 324) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-12-03 00:11+0100\n" +"POT-Creation-Date: 2008-12-03 21:29+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" @@ -162,55 +162,63 @@ "number of debugging helpers" msgstr "" -#: src/geanylatex.c:771 +#: src/geanylatex.c:766 +msgid "Dear Sir or Madame" +msgstr "" + +#: src/geanylatex.c:767 +msgid "With kind regards" +msgstr "" + +#: src/geanylatex.c:809 msgid "_LaTeX" msgstr "" -#: src/geanylatex.c:778 +#: src/geanylatex.c:816 msgid "LaTeX-_Wizard" msgstr "" -#: src/geanylatex.c:781 +#: src/geanylatex.c:819 msgid "Starts a Wizard to easily create LaTeX-documents" msgstr "" -#: src/geanylatex.c:786 +#: src/geanylatex.c:824 msgid "Insert _Special Character" msgstr "" -#: src/geanylatex.c:788 +#: src/geanylatex.c:826 msgid "Helps to use some not very common letters and signs" msgstr "" -#: src/geanylatex.c:795 +#: src/geanylatex.c:833 msgid "Insert _Reference" msgstr "" -#: src/geanylatex.c:797 +#: src/geanylatex.c:835 msgid "Inserting references to the document" msgstr "" -#: src/geanylatex.c:801 +#: src/geanylatex.c:839 msgid "Insert _Label" msgstr "" -#: src/geanylatex.c:803 +#: src/geanylatex.c:841 msgid "Helps at inserting labels to a document" msgstr "" -#: src/geanylatex.c:807 +#: src/geanylatex.c:845 msgid "BibTeX" msgstr "" -#: src/geanylatex.c:824 +#: src/geanylatex.c:862 msgid "Run LaTeX-Wizard" msgstr "" -#: src/geanylatex.c:826 +#: src/geanylatex.c:864 msgid "Insert \\label" msgstr "" -#: src/geanylatex.c:828 +#: src/geanylatex.c:866 msgid "Insert \\ref" msgstr "" Modified: trunk/geanylatex/src/geanylatex.c =================================================================== --- trunk/geanylatex/src/geanylatex.c 2008-12-03 21:13:57 UTC (rev 323) +++ trunk/geanylatex/src/geanylatex.c 2008-12-03 21:14:30 UTC (rev 324) @@ -762,6 +762,10 @@ g_free(title); } + + p_utils->string_replace_all(code, "{OPENING}", _("Dear Sir or Madame")); + p_utils->string_replace_all(code, "{CLOSING}", _("With kind regards")); + output = g_string_free(code, FALSE); show_output(output, NULL, encoding_int); } Modified: trunk/geanylatex/src/geanylatex.h =================================================================== --- trunk/geanylatex/src/geanylatex.h 2008-12-03 21:13:57 UTC (rev 323) +++ trunk/geanylatex/src/geanylatex.h 2008-12-03 21:14:30 UTC (rev 324) @@ -76,7 +76,8 @@ {AUTHOR}\ \\begin{document}\n\ \\begin{letter}{}\n\ -\\opening{}\n\ +\\opening{{OPENING}}\n\n\ +\\closing{{CLOSING}}\n\ \\end{document}\n" #define create_sub_menu(base_menu, menu, item, title) \ 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:[323] trunk/geanylatex/src
by frlan＠users.sourceforge.net 03 Dec '08

03 Dec '08

Revision: 323 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=323&view=rev Author: frlan Date: 2008-12-03 21:13:57 +0000 (Wed, 03 Dec 2008) Log Message: ----------- GeanyLaTeX: Added a special template for letters Modified Paths: -------------- trunk/geanylatex/src/geanylatex.c trunk/geanylatex/src/geanylatex.h Modified: trunk/geanylatex/src/geanylatex.c =================================================================== --- trunk/geanylatex/src/geanylatex.c 2008-12-03 21:13:30 UTC (rev 322) +++ trunk/geanylatex/src/geanylatex.c 2008-12-03 21:13:57 UTC (rev 323) @@ -677,7 +677,10 @@ } } - code = g_string_new(TEMPLATE_LATEX); + if (documentclass_int == 3) + code = g_string_new(TEMPLATE_LATEX_LETTER); + else + code = g_string_new(TEMPLATE_LATEX); if (classoptions != NULL) { @@ -698,11 +701,27 @@ { if (author[0] != '\0') { - author = g_strconcat("\\author{", author, "}\n", NULL); + if (documentclass_int == 3) + { + author = g_strconcat("\\signature{", author, "}\n", NULL); + } + else + { + author = g_strconcat("\\author{", author, "}\n", NULL); + } + p_utils->string_replace_all(code, "{AUTHOR}", author); } else - p_utils->string_replace_all(code, "{AUTHOR}", "\% \\author{}\n"); + if (documentclass_int == 3) + { + p_utils->string_replace_all(code, "{AUTHOR}", "\% \\signature{}\n"); + } + else + { + p_utils->string_replace_all(code, "{AUTHOR}", "\% \\author{}\n"); + } + g_free(author); } if (date != NULL) @@ -720,11 +739,27 @@ { if (title[0] != '\0') { - title = g_strconcat("\\title{", title, "}\n", NULL); + if (documentclass_int == 3) + { + title = g_strconcat("\\subject{", title, "}\n", NULL); + } + else + { + title = g_strconcat("\\title{", title, "}\n", NULL); + } + p_utils->string_replace_all(code, "{TITLE}", title); } else - p_utils->string_replace_all(code, "{TITLE}", "\% \\title{} \n"); + if (documentclass_int == 3) + { + p_utils->string_replace_all(code, "{TITLE}", "\% \\subject{} \n"); + } + else + { + p_utils->string_replace_all(code, "{TITLE}", "\% \\title{} \n"); + } + g_free(title); } output = g_string_free(code, FALSE); Modified: trunk/geanylatex/src/geanylatex.h =================================================================== --- trunk/geanylatex/src/geanylatex.h 2008-12-03 21:13:30 UTC (rev 322) +++ trunk/geanylatex/src/geanylatex.h 2008-12-03 21:13:57 UTC (rev 323) @@ -66,6 +66,19 @@ \n\ \\end{document}\n" +#define TEMPLATE_LATEX_LETTER "\ +\\documentclass[{CLASSOPTION}]{{DOCUMENTCLASS}}\n\ +{ENCODING}\ +\\stdaddress{}\n\ +\\place{}\n\ +{DATE}\ +{TITLE}\ +{AUTHOR}\ +\\begin{document}\n\ +\\begin{letter}{}\n\ +\\opening{}\n\ +\\end{document}\n" + #define create_sub_menu(base_menu, menu, item, title) \ (menu) = gtk_menu_new(); \ (item) = gtk_menu_item_new_with_mnemonic((title)); \ 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:[322] trunk/geanylatex/src
by frlan＠users.sourceforge.net 03 Dec '08

03 Dec '08

Revision: 322 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=322&view=rev Author: frlan Date: 2008-12-03 21:13:30 +0000 (Wed, 03 Dec 2008) Log Message: ----------- GeanyLaTeX: Make menu entries for bibTeX entries also shown translated Modified Paths: -------------- trunk/geanylatex/src/bibtex.h trunk/geanylatex/src/geanylatex.c trunk/geanylatex/src/geanylatex.h Modified: trunk/geanylatex/src/bibtex.h =================================================================== --- trunk/geanylatex/src/bibtex.h 2008-12-03 21:13:01 UTC (rev 321) +++ trunk/geanylatex/src/bibtex.h 2008-12-03 21:13:30 UTC (rev 322) @@ -24,6 +24,7 @@ #include "geanylatex.h" + /* Define generic stuff */ enum { ARTICLE = 0, @@ -74,7 +75,7 @@ N_ENTRIES }; -extern gchar *label_types[]; +extern gchar *label_types[N_TYPES]; int push_bibtex_entry(int style, GeanyDocument *doc); Modified: trunk/geanylatex/src/geanylatex.c =================================================================== --- trunk/geanylatex/src/geanylatex.c 2008-12-03 21:13:01 UTC (rev 321) +++ trunk/geanylatex/src/geanylatex.c 2008-12-03 21:13:30 UTC (rev 322) @@ -761,7 +761,6 @@ GtkWidget *tmp = NULL; int i; - p_main->locale_init(LOCALEDIR, GETTEXT_PACKAGE); init_encodings_latex(); @@ -813,7 +812,7 @@ for (i = 0; i < N_TYPES; i++) { tmp = NULL; - tmp = gtk_menu_item_new_with_mnemonic(label_types[i]); + 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)); } Modified: trunk/geanylatex/src/geanylatex.h =================================================================== --- trunk/geanylatex/src/geanylatex.h 2008-12-03 21:13:01 UTC (rev 321) +++ trunk/geanylatex/src/geanylatex.h 2008-12-03 21:13:30 UTC (rev 322) @@ -25,6 +25,8 @@ #ifndef GEANYLATEX_H #define GEANYLATEX_H + + #include "geany.h" #include "support.h" #include "plugindata.h" @@ -37,15 +39,15 @@ #include "keybindings.h" #include "prefs.h" #include "pluginmacros.h" +#include "datatypes.h" +#include "letters.h" +#include "latexencodings.h" +#include "bibtex.h" #ifdef HAVE_LOCALE_H # include <locale.h> #endif -#include "datatypes.h" -#include "letters.h" -#include "latexencodings.h" -#include "bibtex.h" typedef void (*SubMenuCallback) (G_GNUC_UNUSED GtkMenuItem * menuitem, G_GNUC_UNUSED gpointer gdata); 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:[321] trunk/geanylatex
by frlan＠users.sourceforge.net 03 Dec '08

03 Dec '08

Revision: 321 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=321&view=rev Author: frlan Date: 2008-12-03 21:13:01 +0000 (Wed, 03 Dec 2008) Log Message: ----------- GeanyLaTeX: Make document types in wizard translatable Modified Paths: -------------- trunk/geanylatex/po/de.po trunk/geanylatex/po/geanylatex.pot trunk/geanylatex/src/geanylatex.c Modified: trunk/geanylatex/po/de.po =================================================================== --- trunk/geanylatex/po/de.po 2008-12-03 21:12:30 UTC (rev 320) +++ trunk/geanylatex/po/de.po 2008-12-03 21:13:01 UTC (rev 321) @@ -2,7 +2,7 @@ msgstr "" "Project-Id-Version: GeanyLaTeX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-11-24 18:31+0100\n" +"POT-Creation-Date: 2008-12-03 00:11+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" @@ -58,30 +58,46 @@ msgid "Choose the kind of document you want to write" msgstr "Art des Dokumentes" +#: src/geanylatex.c:428 src/bibtex.c:30 +msgid "Book" +msgstr "Buch" + +#: src/geanylatex.c:429 src/bibtex.c:29 +msgid "Article" +msgstr "Artikel" + +#: src/geanylatex.c:430 +msgid "Report" +msgstr "Bericht" + +#: src/geanylatex.c:431 +msgid "Letter" +msgstr "Brief" + #. Encoding -#: src/geanylatex.c:440 +#: src/geanylatex.c:441 msgid "Encoding:" msgstr "Zeichensatz:" -#: src/geanylatex.c:444 +#: src/geanylatex.c:445 msgid "Set the encoding for your new document" msgstr "Zeichensatz für das neue Dokument" #. Scriptsize -#: src/geanylatex.c:459 +#: src/geanylatex.c:460 msgid "Fontsize:" msgstr "Schriftgröße:" -#: src/geanylatex.c:462 +#: src/geanylatex.c:463 msgid "Set the default fontsize of your new document" msgstr "Setzt die Standardschriftgröße für das neue Dokument" #. Author -#: src/geanylatex.c:475 +#: src/geanylatex.c:476 msgid "Author:" msgstr "Autor:" -#: src/geanylatex.c:478 +#: src/geanylatex.c:479 msgid "" "Sets the value of the \\author command. In most cases this should be your " "name" @@ -89,11 +105,11 @@ "Setzt den Eintrag für den \\author Befehl. Meist sollte hier Ihr Name stehen." #. Date -#: src/geanylatex.c:489 +#: src/geanylatex.c:490 msgid "Date:" msgstr "Datum:" -#: src/geanylatex.c:492 +#: src/geanylatex.c:493 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 " @@ -103,35 +119,35 @@ "meisten Fällen sollte \\today eine gute Wahl sein." #. Title of the new document -#: src/geanylatex.c:499 +#: src/geanylatex.c:500 msgid "Title:" msgstr "Titel:" -#: src/geanylatex.c:501 +#: src/geanylatex.c:502 msgid "Sets the title of your new document." msgstr "Setzt den Titel für das neue Dokument." #. Papersize -#: src/geanylatex.c:508 +#: src/geanylatex.c:509 msgid "Paper size:" msgstr "Papiergröße:" -#: src/geanylatex.c:511 +#: src/geanylatex.c:512 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:526 +#: src/geanylatex.c:527 msgid "LaTeX-Wizard" msgstr "LaTeX-Assistent" -#: src/geanylatex.c:536 +#: src/geanylatex.c:537 msgid "Use KOMA-script classes if possible" msgstr "Benutze KOMA-Skript wenn möglich" -#: src/geanylatex.c:539 +#: src/geanylatex.c:540 msgid "" "Uses the KOMA-script classes by Markus Kohm.\n" "Keep in mind: To compile your document these classes have to be installed " @@ -140,11 +156,11 @@ "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:545 +#: src/geanylatex.c:546 msgid "Use draft mode" msgstr "Entwurfsmodus benutzen" -#: src/geanylatex.c:547 +#: src/geanylatex.c:548 msgid "" "Set the draft flag inside new created documents to get documents with a " "number of debugging helpers" @@ -152,55 +168,55 @@ "Setzt die Option draft für die Dokumentenklasse um das neue Dokument mit " "einer Nummer von kleinen Korrekturhinweisen zu versehen." -#: src/geanylatex.c:761 +#: src/geanylatex.c:771 msgid "_LaTeX" msgstr "_LaTeX" -#: src/geanylatex.c:768 +#: src/geanylatex.c:778 msgid "LaTeX-_Wizard" msgstr "LaTeX-_Assistent" -#: src/geanylatex.c:771 +#: src/geanylatex.c:781 msgid "Starts a Wizard to easily create LaTeX-documents" msgstr "Öffnet einen Assistenten, um einfache LaTeX-Dokumente zu erstellen." -#: src/geanylatex.c:776 +#: src/geanylatex.c:786 msgid "Insert _Special Character" msgstr "_Sonderzeichen einfügen" -#: src/geanylatex.c:778 +#: src/geanylatex.c:788 msgid "Helps to use some not very common letters and signs" msgstr "Unterstützt bei der Verwendung von seltenen Sonderzeichen" -#: src/geanylatex.c:785 +#: src/geanylatex.c:795 msgid "Insert _Reference" msgstr "_Verweis einfügen" -#: src/geanylatex.c:787 +#: src/geanylatex.c:797 msgid "Inserting references to the document" msgstr "Eine Referenz in das Dokument einfügen" -#: src/geanylatex.c:791 +#: src/geanylatex.c:801 msgid "Insert _Label" msgstr "_Lesezeichen einfügen" -#: src/geanylatex.c:793 +#: src/geanylatex.c:803 msgid "Helps at inserting labels to a document" msgstr "Untersützt bei dem Einfügen von Lesezeichen in ein Dokument" -#: src/geanylatex.c:797 +#: src/geanylatex.c:807 msgid "BibTeX" msgstr "BibTeX" -#: src/geanylatex.c:814 +#: src/geanylatex.c:824 msgid "Run LaTeX-Wizard" msgstr "LaTeX-Assistent starten" -#: src/geanylatex.c:816 +#: src/geanylatex.c:826 msgid "Insert \\label" msgstr "\\label einfügen" -#: src/geanylatex.c:818 +#: src/geanylatex.c:828 msgid "Insert \\ref" msgstr "\\ref einfügen" @@ -272,14 +288,6 @@ msgid "Binary operation" msgstr "Binäre Operatoren" -#: src/bibtex.c:29 -msgid "Article" -msgstr "Artikel" - -#: src/bibtex.c:30 -msgid "Book" -msgstr "Buch" - #: src/bibtex.c:31 msgid "Booklet" msgstr "Büchlein (Booklet)" Modified: trunk/geanylatex/po/geanylatex.pot =================================================================== --- trunk/geanylatex/po/geanylatex.pot 2008-12-03 21:12:30 UTC (rev 320) +++ trunk/geanylatex/po/geanylatex.pot 2008-12-03 21:13:01 UTC (rev 321) @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-11-24 18:31+0100\n" +"POT-Creation-Date: 2008-12-03 00:11+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" @@ -61,41 +61,57 @@ msgid "Choose the kind of document you want to write" msgstr "" +#: src/geanylatex.c:428 src/bibtex.c:30 +msgid "Book" +msgstr "" + +#: src/geanylatex.c:429 src/bibtex.c:29 +msgid "Article" +msgstr "" + +#: src/geanylatex.c:430 +msgid "Report" +msgstr "" + +#: src/geanylatex.c:431 +msgid "Letter" +msgstr "" + #. Encoding -#: src/geanylatex.c:440 +#: src/geanylatex.c:441 msgid "Encoding:" msgstr "" -#: src/geanylatex.c:444 +#: src/geanylatex.c:445 msgid "Set the encoding for your new document" msgstr "" #. Scriptsize -#: src/geanylatex.c:459 +#: src/geanylatex.c:460 msgid "Fontsize:" msgstr "" -#: src/geanylatex.c:462 +#: src/geanylatex.c:463 msgid "Set the default fontsize of your new document" msgstr "" #. Author -#: src/geanylatex.c:475 +#: src/geanylatex.c:476 msgid "Author:" msgstr "" -#: src/geanylatex.c:478 +#: src/geanylatex.c:479 msgid "" "Sets the value of the \\author command. In most cases this should be your " "name" msgstr "" #. Date -#: src/geanylatex.c:489 +#: src/geanylatex.c:490 msgid "Date:" msgstr "" -#: src/geanylatex.c:492 +#: src/geanylatex.c:493 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 " @@ -103,98 +119,98 @@ msgstr "" #. Title of the new document -#: src/geanylatex.c:499 +#: src/geanylatex.c:500 msgid "Title:" msgstr "" -#: src/geanylatex.c:501 +#: src/geanylatex.c:502 msgid "Sets the title of your new document." msgstr "" #. Papersize -#: src/geanylatex.c:508 +#: src/geanylatex.c:509 msgid "Paper size:" msgstr "" -#: src/geanylatex.c:511 +#: src/geanylatex.c:512 msgid "Choose the paper format for the newly created document" msgstr "" #. Building the wizard-dialog and showing it -#: src/geanylatex.c:526 +#: src/geanylatex.c:527 msgid "LaTeX-Wizard" msgstr "" -#: src/geanylatex.c:536 +#: src/geanylatex.c:537 msgid "Use KOMA-script classes if possible" msgstr "" -#: src/geanylatex.c:539 +#: src/geanylatex.c:540 msgid "" "Uses the KOMA-script classes by Markus Kohm.\n" "Keep in mind: To compile your document these classes have to be installed " "before." msgstr "" -#: src/geanylatex.c:545 +#: src/geanylatex.c:546 msgid "Use draft mode" msgstr "" -#: src/geanylatex.c:547 +#: src/geanylatex.c:548 msgid "" "Set the draft flag inside new created documents to get documents with a " "number of debugging helpers" msgstr "" -#: src/geanylatex.c:761 +#: src/geanylatex.c:771 msgid "_LaTeX" msgstr "" -#: src/geanylatex.c:768 +#: src/geanylatex.c:778 msgid "LaTeX-_Wizard" msgstr "" -#: src/geanylatex.c:771 +#: src/geanylatex.c:781 msgid "Starts a Wizard to easily create LaTeX-documents" msgstr "" -#: src/geanylatex.c:776 +#: src/geanylatex.c:786 msgid "Insert _Special Character" msgstr "" -#: src/geanylatex.c:778 +#: src/geanylatex.c:788 msgid "Helps to use some not very common letters and signs" msgstr "" -#: src/geanylatex.c:785 +#: src/geanylatex.c:795 msgid "Insert _Reference" msgstr "" -#: src/geanylatex.c:787 +#: src/geanylatex.c:797 msgid "Inserting references to the document" msgstr "" -#: src/geanylatex.c:791 +#: src/geanylatex.c:801 msgid "Insert _Label" msgstr "" -#: src/geanylatex.c:793 +#: src/geanylatex.c:803 msgid "Helps at inserting labels to a document" msgstr "" -#: src/geanylatex.c:797 +#: src/geanylatex.c:807 msgid "BibTeX" msgstr "" -#: src/geanylatex.c:814 +#: src/geanylatex.c:824 msgid "Run LaTeX-Wizard" msgstr "" -#: src/geanylatex.c:816 +#: src/geanylatex.c:826 msgid "Insert \\label" msgstr "" -#: src/geanylatex.c:818 +#: src/geanylatex.c:828 msgid "Insert \\ref" msgstr "" @@ -266,14 +282,6 @@ msgid "Binary operation" msgstr "" -#: src/bibtex.c:29 -msgid "Article" -msgstr "" - -#: src/bibtex.c:30 -msgid "Book" -msgstr "" - #: src/bibtex.c:31 msgid "Booklet" msgstr "" Modified: trunk/geanylatex/src/geanylatex.c =================================================================== --- trunk/geanylatex/src/geanylatex.c 2008-12-03 21:12:30 UTC (rev 320) +++ trunk/geanylatex/src/geanylatex.c 2008-12-03 21:13:01 UTC (rev 321) @@ -425,10 +425,10 @@ 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), 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_set_active(GTK_COMBO_BOX(documentclass_combobox), 0); 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 December 2008