Plugins-Commits March 2010

plugins-commits@lists.geany.org

7 participants
76 discussions

SF.net SVN: geany-plugins:[1221] trunk/geany-plugins/treebrowser
by dimitrov-adrian＠users.sourceforge.net 31 Mar '10

31 Mar '10

Revision: 1221 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1221&view=rev Author: dimitrov-adrian Date: 2010-03-31 15:43:19 +0000 (Wed, 31 Mar 2010) Log Message: ----------- Treebrowser: fixed bug when 'Right click->Refresh'; now changing root directory when change current project Modified Paths: -------------- trunk/geany-plugins/treebrowser/ChangeLog trunk/geany-plugins/treebrowser/src/treebrowser.c Modified: trunk/geany-plugins/treebrowser/ChangeLog =================================================================== --- trunk/geany-plugins/treebrowser/ChangeLog 2010-03-31 15:25:20 UTC (rev 1220) +++ trunk/geany-plugins/treebrowser/ChangeLog 2010-03-31 15:43:19 UTC (rev 1221) @@ -1,12 +1,31 @@ -Development release ChangeLog ------------------------------ ++---------------------------+ +| TODO | ++---------------------------+ + (DONE) codestyle improve to be same as other parts as geany`s + (DONE) configuration dialog + * trackick path to current focused document (currently now roking on Windows) + * In windows can choice between devices (C:\, D:\,...) + * Windows compitable + * Language files + (DONE) Saving state of Showbars in config file everytime where is changed + (DONE) oneclick document opening + (DONE) filter separating ex.: "*.c;*.cpp;*.h" + * fix possible memory leaks (using g_free... where is need) + + ++-------------------------------+ +| Development release ChangeLog | ++-------------------------------+ + 31-03-2010 Adrian Dimitrov <dimitrov.adrian(a)gmail.com> * src/treebrowser.c fixed saving state of Show the toolbars when starting Geany moving settings saving in separated function - save_settings() + now changing root directory when change current project + fixed bug when 'Right click->Refresh' 30-03-2010 Adrian Dimitrov <dimitrov.adrian(a)gmail.com> @@ -115,19 +134,3 @@ * src/treebrowser.c initial, with base options - - - -TODO ---------------------------- - (DONE) codestyle improve to be same as other parts as geany`s - (DONE) configuration dialog - * trackick path to current focused document (currently now roking on Windows) - * In windows can choice between devices (C:\, D:\,...) - * Windows compitable - * Language files - * Saving state of Showbars in config file everytime where is changed - (DONE) oneclick document opening - (DONE) filter separating ex.: "*.c;*.cpp;*.h" - * fix possible memory leaks (using g_free... where is need) - Modified: trunk/geany-plugins/treebrowser/src/treebrowser.c =================================================================== --- trunk/geany-plugins/treebrowser/src/treebrowser.c 2010-03-31 15:25:20 UTC (rev 1220) +++ trunk/geany-plugins/treebrowser/src/treebrowser.c 2010-03-31 15:43:19 UTC (rev 1221) @@ -54,6 +54,7 @@ /* ------------------ * TREEVIEW STRUCT * ------------------ */ + enum { TREEBROWSER_COLUMNC = 3, @@ -70,6 +71,7 @@ /* ------------------ * PLUGIN INFO * ------------------ */ + PLUGIN_VERSION_CHECK(147) PLUGIN_SET_INFO(_("Tree Browser"), _("Treeview filebrowser plugin."), "0.1" , "Adrian Dimitrov (dimitrov.adrian(a)gmail.com)") @@ -77,6 +79,7 @@ /* ------------------ * PREDEFINES * ------------------ */ + #define foreach_slist_free(node, list) for (node = list, list = NULL; g_slist_free_1(list), node != NULL; list = node, node = node->next) static GList* @@ -93,6 +96,8 @@ /* ------------------ * PROTOTYPES * ------------------ */ + +static void project_change_cb(G_GNUC_UNUSED GObject *obj, G_GNUC_UNUSED GKeyFile *config, G_GNUC_UNUSED gpointer data); static void treebrowser_browse(gchar *directory, gpointer parent, gint deep_limit); static void gtk_tree_store_iter_clear_nodes(gpointer iter, gboolean delete_root); static void load_settings(void); @@ -100,6 +105,18 @@ /* ------------------ + * PLUGIN CALLBACKS + * ------------------ */ + +PluginCallback plugin_callbacks[] = +{ + { "project-open", (GCallback) &project_change_cb, TRUE, NULL }, + { "project-save", (GCallback) &project_change_cb, TRUE, NULL }, + { NULL, NULL, FALSE, NULL } +}; + + +/* ------------------ * TREEBROWSER CORE FUNCTIONS * ------------------ */ @@ -419,9 +436,7 @@ g_free(locale_cmd); g_free(cmd); g_free(dir); - } - } static void @@ -568,6 +583,8 @@ treebrowser_browse(uri, &iter, CONFIG_INITIAL_DIR_DEEP); } } + else + treebrowser_browse(addressbar_last_address, NULL, CONFIG_INITIAL_DIR_DEEP); } static void @@ -1135,6 +1152,12 @@ * GEANY HOOKS * ------------------ */ +static void +project_change_cb(G_GNUC_UNUSED GObject *obj, G_GNUC_UNUSED GKeyFile *config, G_GNUC_UNUSED gpointer data) +{ + treebrowser_chroot(get_default_dir()); +} + void plugin_init(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:[1220] trunk/geany-plugins/treebrowser
by dimitrov-adrian＠users.sourceforge.net 31 Mar '10

31 Mar '10

Revision: 1220 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1220&view=rev Author: dimitrov-adrian Date: 2010-03-31 15:25:20 +0000 (Wed, 31 Mar 2010) Log Message: ----------- Treebrowser, fixed saving state of Show the toolbars when starting Geany; added new function - save_settings() wich save the current settings. Modified Paths: -------------- trunk/geany-plugins/treebrowser/ChangeLog trunk/geany-plugins/treebrowser/src/treebrowser.c Modified: trunk/geany-plugins/treebrowser/ChangeLog =================================================================== --- trunk/geany-plugins/treebrowser/ChangeLog 2010-03-30 18:14:11 UTC (rev 1219) +++ trunk/geany-plugins/treebrowser/ChangeLog 2010-03-31 15:25:20 UTC (rev 1220) @@ -2,6 +2,13 @@ ----------------------------- +31-03-2010 Adrian Dimitrov <dimitrov.adrian(a)gmail.com> + + * src/treebrowser.c + fixed saving state of Show the toolbars when starting Geany + moving settings saving in separated function - save_settings() + + 30-03-2010 Adrian Dimitrov <dimitrov.adrian(a)gmail.com> * src/treebrowser.c Modified: trunk/geany-plugins/treebrowser/src/treebrowser.c =================================================================== --- trunk/geany-plugins/treebrowser/src/treebrowser.c 2010-03-30 18:14:11 UTC (rev 1219) +++ trunk/geany-plugins/treebrowser/src/treebrowser.c 2010-03-31 15:25:20 UTC (rev 1220) @@ -95,6 +95,8 @@ * ------------------ */ static void treebrowser_browse(gchar *directory, gpointer parent, gint deep_limit); static void gtk_tree_store_iter_clear_nodes(gpointer iter, gboolean delete_root); +static void load_settings(void); +static gboolean save_settings(void); /* ------------------ @@ -233,10 +235,8 @@ g_free(uri); } } - if (expanded) gtk_tree_view_expand_row(GTK_TREE_VIEW(treeview), gtk_tree_model_get_path(GTK_TREE_MODEL(treestore), parent), FALSE); - } static gboolean @@ -274,13 +274,11 @@ static void fs_remove(gchar *root, gboolean delete_root) { - if (! g_file_test(root, G_FILE_TEST_EXISTS)) return; if (g_file_test(root, G_FILE_TEST_IS_DIR)) { - GDir *dir; const gchar *name; @@ -317,6 +315,7 @@ else gtk_widget_hide(sidebar_vbox_bars); CONFIG_SHOW_BARS = state; gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menu_showbars), CONFIG_SHOW_BARS); + save_settings(); } static void @@ -1012,13 +1011,39 @@ g_key_file_free(config); } -static void -on_configure_response(GtkDialog *dialog, gint response, gpointer user_data) +static gboolean +save_settings(void) { GKeyFile *config = g_key_file_new(); gchar *config_dir = g_path_get_dirname(CONFIG_FILE); gchar *data; + g_key_file_load_from_file(config, CONFIG_FILE, G_KEY_FILE_NONE, NULL); + if (! g_file_test(config_dir, G_FILE_TEST_IS_DIR) && utils_mkdir(config_dir, TRUE) != 0) + return FALSE; + + g_key_file_set_string(config, "treebrowser", "open_external_cmd", CONFIG_OPEN_EXTERNAL_CMD); + g_key_file_set_integer(config, "treebrowser", "initial_dir_deep", CONFIG_INITIAL_DIR_DEEP); + g_key_file_set_boolean(config, "treebrowser", "reverse_filter", CONFIG_REVERSE_FILTER); + g_key_file_set_boolean(config, "treebrowser", "one_click_chdoc", CONFIG_ONE_CLICK_CHDOC); + g_key_file_set_boolean(config, "treebrowser", "show_hidden_files", CONFIG_SHOW_HIDDEN_FILES); + g_key_file_set_boolean(config, "treebrowser", "show_bars", CONFIG_SHOW_BARS); + g_key_file_set_boolean(config, "treebrowser", "chroot_on_dclick", CONFIG_CHROOT_ON_DCLICK); + g_key_file_set_boolean(config, "treebrowser", "follow_current_doc", CONFIG_FOLLOW_CURRENT_DOC); + g_key_file_set_boolean(config, "treebrowser", "on_expand_refresh", CONFIG_ON_EXPAND_REFRESH); + + /* write config to file */ + data = g_key_file_to_data(config, NULL, NULL); + utils_write_file(CONFIG_FILE, data); + g_free(data); + + return TRUE; +} + +static void +on_configure_response(GtkDialog *dialog, gint response, gpointer user_data) +{ + if (! (response == GTK_RESPONSE_OK || response == GTK_RESPONSE_APPLY)) return; @@ -1027,35 +1052,15 @@ CONFIG_REVERSE_FILTER = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(configure_widgets.REVERSE_FILTER)); CONFIG_ONE_CLICK_CHDOC = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(configure_widgets.ONE_CLICK_CHDOC)); CONFIG_SHOW_HIDDEN_FILES = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(configure_widgets.SHOW_HIDDEN_FILES)); - CONFIG_SHOW_BARS = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(configure_widgets.SHOW_BARS)); CONFIG_CHROOT_ON_DCLICK = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(configure_widgets.CHROOT_ON_DCLICK)); CONFIG_FOLLOW_CURRENT_DOC = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(configure_widgets.FOLLOW_CURRENT_DOC)); CONFIG_ON_EXPAND_REFRESH = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(configure_widgets.ON_EXPAND_REFRESH)); - g_key_file_load_from_file(config, CONFIG_FILE, G_KEY_FILE_NONE, NULL); - if (! g_file_test(config_dir, G_FILE_TEST_IS_DIR) && utils_mkdir(config_dir, TRUE) != 0) + if (save_settings() == TRUE) + treebrowser_chroot(addressbar_last_address); + else dialogs_show_msgbox(GTK_MESSAGE_ERROR, _("Plugin configuration directory could not be created.")); - else - { - g_key_file_set_string(config, "treebrowser", "open_external_cmd", CONFIG_OPEN_EXTERNAL_CMD); - g_key_file_set_integer(config, "treebrowser", "initial_dir_deep", CONFIG_INITIAL_DIR_DEEP); - g_key_file_set_boolean(config, "treebrowser", "reverse_filter", CONFIG_REVERSE_FILTER); - g_key_file_set_boolean(config, "treebrowser", "one_click_chdoc", CONFIG_ONE_CLICK_CHDOC); - g_key_file_set_boolean(config, "treebrowser", "show_hidden_files", CONFIG_SHOW_HIDDEN_FILES); - g_key_file_set_boolean(config, "treebrowser", "show_bars", CONFIG_SHOW_BARS); - g_key_file_set_boolean(config, "treebrowser", "chroot_on_dclick", CONFIG_CHROOT_ON_DCLICK); - g_key_file_set_boolean(config, "treebrowser", "follow_current_doc", CONFIG_FOLLOW_CURRENT_DOC); - g_key_file_set_boolean(config, "treebrowser", "on_expand_refresh", CONFIG_ON_EXPAND_REFRESH); - - /* write config to file */ - data = g_key_file_to_data(config, NULL, NULL); - utils_write_file(CONFIG_FILE, data); - g_free(data); - - treebrowser_chroot(addressbar_last_address); - } - } GtkWidget* @@ -1140,9 +1145,6 @@ load_settings(); - if (CONFIG_SHOW_BARS) - dialogs_show_msgbox(GTK_MESSAGE_INFO, "wasaaaaa"); - treeview = create_view_and_model(); create_sidebar(); treebrowser_chroot(get_default_dir()); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany-plugins:[1219] trunk/geany-plugins/treebrowser
by dimitrov-adrian＠users.sourceforge.net 30 Mar '10

30 Mar '10

Revision: 1219 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1219&view=rev Author: dimitrov-adrian Date: 2010-03-30 18:14:11 +0000 (Tue, 30 Mar 2010) Log Message: ----------- Treebrowser, fixed expaned state when create/delete/remove files or directories Modified Paths: -------------- trunk/geany-plugins/treebrowser/ChangeLog trunk/geany-plugins/treebrowser/src/treebrowser.c Modified: trunk/geany-plugins/treebrowser/ChangeLog =================================================================== --- trunk/geany-plugins/treebrowser/ChangeLog 2010-03-28 10:31:32 UTC (rev 1218) +++ trunk/geany-plugins/treebrowser/ChangeLog 2010-03-30 18:14:11 UTC (rev 1219) @@ -1,6 +1,13 @@ Development release ChangeLog ----------------------------- + +30-03-2010 Adrian Dimitrov <dimitrov.adrian(a)gmail.com> + + * src/treebrowser.c + fixed expaned state when create/delete/remove files or directories + + 26-03-2010 Adrian Dimitrov <dimitrov.adrian(a)gmail.com> * src/treebrowser.c @@ -112,6 +119,7 @@ * In windows can choice between devices (C:\, D:\,...) * Windows compitable * Language files + * Saving state of Showbars in config file everytime where is changed (DONE) oneclick document opening (DONE) filter separating ex.: "*.c;*.cpp;*.h" * fix possible memory leaks (using g_free... where is need) Modified: trunk/geany-plugins/treebrowser/src/treebrowser.c =================================================================== --- trunk/geany-plugins/treebrowser/src/treebrowser.c 2010-03-28 10:31:32 UTC (rev 1218) +++ trunk/geany-plugins/treebrowser/src/treebrowser.c 2010-03-30 18:14:11 UTC (rev 1219) @@ -170,6 +170,7 @@ { GtkTreeIter iter, *last_dir_iter = NULL; gboolean is_dir; + gboolean expanded = FALSE; gchar *utf8_name; GSList *list, *node; @@ -180,6 +181,9 @@ directory = g_strconcat(directory, G_DIR_SEPARATOR_S, NULL); + if (gtk_tree_view_row_expanded(GTK_TREE_VIEW(treeview), gtk_tree_model_get_path(GTK_TREE_MODEL(treestore), parent))) + expanded = TRUE; + gtk_tree_store_iter_clear_nodes(parent, FALSE); list = utils_get_file_list(directory, NULL, NULL); @@ -230,6 +234,9 @@ } } + if (expanded) + gtk_tree_view_expand_row(GTK_TREE_VIEW(treeview), gtk_tree_model_get_path(GTK_TREE_MODEL(treestore), parent), FALSE); + } static gboolean @@ -350,8 +357,6 @@ for (i = 0; path_segments[i]; i++) { path_search = g_build_filename(path_search, path_segments[i], NULL); - /* dialogs_show_msgbox(GTK_MESSAGE_INFO, "%s", path_search); - */ treebrowser_search(path_search, NULL); return FALSE; } @@ -445,6 +450,7 @@ GtkTreeModel *model; gchar *uri, *uri_new; GtkTreePath *path_parent; + gboolean refresh_root = FALSE; if (gtk_tree_selection_get_selected(selection, &model, &iter)) { @@ -457,8 +463,15 @@ gtk_tree_model_get_iter(GTK_TREE_MODEL(treestore), &iter, path_parent); } } - else return; + else + { + refresh_root = TRUE; + uri = addressbar_last_address; + path_parent = gtk_tree_path_new_from_string("0"); + gtk_tree_model_get_iter(GTK_TREE_MODEL(treestore), &iter, path_parent); + } + if (utils_str_equal(type, "directory")) uri_new = g_strconcat(uri, G_DIR_SEPARATOR_S, _("NewDirectory"), NULL); else @@ -473,12 +486,12 @@ if (utils_str_equal(type, "directory")) { if (g_mkdir(uri_new, 0755) == 0) - treebrowser_browse(uri, &iter, CONFIG_INITIAL_DIR_DEEP); + treebrowser_browse(uri, refresh_root ? NULL : &iter, CONFIG_INITIAL_DIR_DEEP); } else { if (g_creat(uri_new, 0755) != -1) - treebrowser_browse(uri, &iter, CONFIG_INITIAL_DIR_DEEP); + treebrowser_browse(uri, refresh_root ? NULL : &iter, CONFIG_INITIAL_DIR_DEEP); } } @@ -531,8 +544,10 @@ { fs_remove(uri, TRUE); path_parent = gtk_tree_model_get_path(GTK_TREE_MODEL(treestore), &iter); + if (gtk_tree_path_up(path_parent)) gtk_tree_model_get_iter(GTK_TREE_MODEL(treestore), &iter, path_parent); + treebrowser_browse(g_path_get_dirname(uri), &iter, CONFIG_INITIAL_DIR_DEEP); } } @@ -545,20 +560,13 @@ GtkTreeIter iter; GtkTreeModel *model; gchar *uri; - gboolean expanded = FALSE; if (gtk_tree_selection_get_selected(selection, &model, &iter)) { gtk_tree_model_get(model, &iter, TREEBROWSER_COLUMN_URI, &uri, -1); if (g_file_test(uri, G_FILE_TEST_IS_DIR)) { - if (gtk_tree_view_row_expanded(GTK_TREE_VIEW(treeview), gtk_tree_model_get_path(GTK_TREE_MODEL(treestore), &iter))) - expanded = TRUE; - treebrowser_browse(uri, &iter, CONFIG_INITIAL_DIR_DEEP); - - if (expanded) - gtk_tree_view_expand_row(GTK_TREE_VIEW(treeview), gtk_tree_model_get_path(GTK_TREE_MODEL(treestore), &iter), FALSE); } } } @@ -731,7 +739,6 @@ GtkTreeIter iter; GtkTreeModel *model; gchar *uri; - gboolean expanded = FALSE; if (gtk_tree_selection_get_selected(GTK_TREE_SELECTION(widget), &model, &iter)) { @@ -742,14 +749,7 @@ { if (g_file_test(uri, G_FILE_TEST_IS_DIR)) { - if (gtk_tree_view_row_expanded(GTK_TREE_VIEW(treeview), gtk_tree_model_get_path(GTK_TREE_MODEL(treestore), &iter)) - || !gtk_tree_model_iter_has_child(GTK_TREE_MODEL(treestore), &iter)) - expanded = TRUE; - treebrowser_browse(uri, &iter, CONFIG_INITIAL_DIR_DEEP); - - if (expanded) - gtk_tree_view_expand_row(GTK_TREE_VIEW(treeview), gtk_tree_model_get_path(GTK_TREE_MODEL(treestore), &iter), FALSE); } else if (CONFIG_ONE_CLICK_CHDOC) 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:[1218] trunk/geanylatex/src
by frlan＠users.sourceforge.net 28 Mar '10

28 Mar '10

Revision: 1218 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1218&view=rev Author: frlan Date: 2010-03-28 10:31:32 +0000 (Sun, 28 Mar 2010) Log Message: ----------- GeanyLaTeX: Fix multiple definition warning on linker time Modified Paths: -------------- trunk/geanylatex/src/geanylatex.c trunk/geanylatex/src/geanylatex.h Modified: trunk/geanylatex/src/geanylatex.c =================================================================== --- trunk/geanylatex/src/geanylatex.c 2010-03-28 10:22:45 UTC (rev 1217) +++ trunk/geanylatex/src/geanylatex.c 2010-03-28 10:31:32 UTC (rev 1218) @@ -87,6 +87,8 @@ /* Configuration file */ static gchar *config_file = NULL; +LaTeXWizard glatex_wizard; + PLUGIN_KEY_GROUP(geanylatex, COUNT_KB) const GtkActionEntry format_icons[] = Modified: trunk/geanylatex/src/geanylatex.h =================================================================== --- trunk/geanylatex/src/geanylatex.h 2010-03-28 10:22:45 UTC (rev 1217) +++ trunk/geanylatex/src/geanylatex.h 2010-03-28 10:31:32 UTC (rev 1218) @@ -78,7 +78,7 @@ gboolean draft_active; } LaTeXWizard; -LaTeXWizard glatex_wizard; +extern LaTeXWizard glatex_wizard; extern void glatex_insert_string(gchar *string, gboolean reset_position); gint glatex_count_menu_entries(SubMenuTemplate *tmp, gint categorie); void glatex_wizard_activated(G_GNUC_UNUSED GtkMenuItem * menuitem, 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:[1217] trunk/geanylatex/src
by frlan＠users.sourceforge.net 28 Mar '10

28 Mar '10

Revision: 1217 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1217&view=rev Author: frlan Date: 2010-03-28 10:22:45 +0000 (Sun, 28 Mar 2010) Log Message: ----------- GeanyLaTeX: Splitting up wizard dialog and wizard dialog response handling Modified Paths: -------------- trunk/geanylatex/src/geanylatex.c trunk/geanylatex/src/geanylatex.h Modified: trunk/geanylatex/src/geanylatex.c =================================================================== --- trunk/geanylatex/src/geanylatex.c 2010-03-27 14:34:58 UTC (rev 1216) +++ trunk/geanylatex/src/geanylatex.c 2010-03-28 10:22:45 UTC (rev 1217) @@ -1,25 +1,25 @@ /* - * geanylatex.c - Plugin to let Geany better work together with LaTeX + * geanylatex.c - Plugin to let Geany better work together with LaTeX * - * Copyright 2007-2010 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> - * Copyright 2005-2009 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> - * Copyright 2006-2009 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + * Copyright 2007-2010 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> + * Copyright 2005-2009 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> + * Copyright 2006-2009 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * - * For long list of friendly supporters please have a look at THANKS. + * For long list of friendly supporters please have a look at THANKS. * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ /* LaTeX plugin */ @@ -33,9 +33,9 @@ PLUGIN_SET_INFO(_("GeanyLaTeX"), _("Plugin to provide better LaTeX support"), VERSION,"Frank Lanitz <frank(a)frank.uvena.de>") -GeanyPlugin *geany_plugin; -GeanyData *geany_data; -GeanyFunctions *geany_functions; +GeanyPlugin *geany_plugin; +GeanyData *geany_data; +GeanyFunctions *geany_functions; static GtkWidget *menu_latex = NULL; @@ -191,7 +191,7 @@ glatex_autocompletion_active); if (!g_file_test(config_dir, G_FILE_TEST_IS_DIR) - && utils_mkdir(config_dir, TRUE) != 0) + && utils_mkdir(config_dir, TRUE) != 0) { dialogs_show_msgbox(GTK_MESSAGE_ERROR, _("Plugin configuration directory could not be created.")); @@ -231,9 +231,9 @@ GtkWidget * plugin_configure(GtkDialog * dialog) { - GtkWidget *vbox; - GtkWidget *hbox_autocompletion; - GtkWidget *label_autocompletion = NULL; + GtkWidget *vbox; + GtkWidget *hbox_autocompletion; + GtkWidget *label_autocompletion = NULL; gint tmp; vbox = gtk_vbox_new(FALSE, 6); @@ -339,7 +339,7 @@ if (glatex_set_toolbar_active == TRUE) { if (id == GEANY_FILETYPES_LATEX || - glatex_deactivate_toolbaritems_with_non_latex == FALSE) + glatex_deactivate_toolbaritems_with_non_latex == FALSE) { activate_toolbar_items(); } @@ -473,7 +473,7 @@ j = 0; i++; while (buf[i] != '}' && j < (sizeof(env) - 1)) - { /* this could be done in a shorter way, but so it remains readable ;-) */ + { /* this could be done in a shorter way, but so it remains readable ;-) */ env[j] = buf[i]; j++; i++; @@ -485,7 +485,7 @@ /* Search whether the environment is closed within the next * lines. We assume, no \end is needed in such cases */ /* TODO using sci_find_text() should be way faster than getting - * the line buffer and performing string comparisons */ + * the line buffer and performing string comparisons */ for (i = 1; i < glatex_autocompletion_context_size; i++) { gchar *tmp; @@ -680,10 +680,10 @@ GtkWidget *table = NULL; dialog = gtk_dialog_new_with_buttons(_("Insert Label"), - 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); @@ -735,10 +735,10 @@ doc = document_get_current(); dialog = gtk_dialog_new_with_buttons(_("Insert Reference"), - 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); @@ -1020,7 +1020,7 @@ } void glatex_insert_usepackage_dialog(G_GNUC_UNUSED GtkMenuItem * menuitem, - G_GNUC_UNUSED gpointer gdata) + G_GNUC_UNUSED gpointer gdata) { GtkWidget *dialog = NULL; GtkWidget *vbox = NULL; @@ -1031,10 +1031,10 @@ GtkWidget *textbox_options = NULL; dialog = gtk_dialog_new_with_buttons(_("Add additional package"), - 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); @@ -1074,11 +1074,10 @@ } -void -glatex_wizard_activated(G_GNUC_UNUSED GtkMenuItem * menuitem, - G_GNUC_UNUSED gpointer gdata) +static void +on_wizard_response(G_GNUC_UNUSED GtkDialog *dialog, gint response, + G_GNUC_UNUSED gpointer user_data) { - gint i; GString *code = NULL; gchar *author = NULL; gchar *date = NULL; @@ -1091,249 +1090,39 @@ gchar *draft = NULL; gchar *fontsize = NULL; gchar *orientation_string = NULL; + gboolean KOMA_active = FALSE; + gboolean draft_active = FALSE; guint template_int; gint documentclass_int; gint encoding_int; gint papersize_int; gint paperorientation_int; - GtkWidget *dialog = NULL; - GtkWidget *vbox = NULL; - GtkWidget *label_documentclass = NULL; - GtkWidget *documentclass_combobox = NULL; - GtkWidget *label_encoding = NULL; - GtkWidget *encoding_combobox = NULL; - GtkWidget *fontsize_combobox = NULL; - GtkWidget *label_fontsize = NULL; - GtkWidget *table = NULL; - GtkWidget *checkbox_KOMA = NULL; - GtkWidget *author_textbox = NULL; - GtkWidget *label_author = NULL; - GtkWidget *date_textbox = NULL; - GtkWidget *label_date = NULL; - GtkWidget *title_textbox = NULL; - GtkWidget *label_title = NULL; - GtkWidget *papersize_combobox = NULL; - GtkWidget *label_papersize = NULL; - GtkWidget *checkbox_draft = NULL; - GtkWidget *label_template = NULL; - GtkWidget *template_combobox = NULL; - GtkWidget *label_orientation = NULL; - GtkWidget *orientation_combobox = NULL; - gboolean KOMA_active; - gboolean draft_active = FALSE; - GPtrArray *template_list = NULL; - /* Creating and formatting table */ - table = gtk_table_new(2, 6, FALSE); - gtk_table_set_col_spacings(GTK_TABLE(table), 6); - gtk_table_set_row_spacings(GTK_TABLE(table), 6); - - /* Templates - * Adds custom templates if there are any. If there are none just - * adds default one */ - label_template = gtk_label_new(_("Template:")); - - template_combobox = gtk_combo_box_new_text(); - ui_widget_set_tooltip_text(template_combobox, - _("Set the template which should be used for creating the new document")); - gtk_misc_set_alignment(GTK_MISC(label_template), 0, 0.5); - - gtk_table_attach_defaults(GTK_TABLE(table), label_template, 0, 1, 0, 1); - gtk_table_attach_defaults(GTK_TABLE(table), template_combobox, 1, 2, 0, 1); - - /* Adding default/build in templates to pull down and set the generic - * one as default */ - gtk_combo_box_insert_text(GTK_COMBO_BOX(template_combobox), - LATEX_WIZARD_TEMPLATE_DEFAULT, _("Default")); - gtk_combo_box_set_active(GTK_COMBO_BOX(template_combobox), - LATEX_WIZARD_TEMPLATE_DEFAULT); - - /* Checking whether some custom template are available and adding - * if so. - * Also init array with templates available. */ - template_list = glatex_init_custom_templates(); - glatex_add_templates_to_combobox(template_list, template_combobox); - - /* Documentclass */ - label_documentclass = gtk_label_new(_("Documentclass:")); - documentclass_combobox = gtk_combo_box_new_text(); - ui_widget_set_tooltip_text(documentclass_combobox, - _("Choose the kind of document you want to write")); - 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); - - gtk_misc_set_alignment(GTK_MISC(label_documentclass), 0, 0.5); - - gtk_table_attach_defaults(GTK_TABLE(table), label_documentclass, 0, 1, 1, 2); - gtk_table_attach_defaults(GTK_TABLE(table), documentclass_combobox, 1, 2, 1, 2); - - /* Encoding */ - label_encoding = gtk_label_new(_("Encoding:")); - - encoding_combobox = gtk_combo_box_new_text(); - ui_widget_set_tooltip_text(encoding_combobox, - _("Set the encoding for your new document")); - for (i = 0; i < LATEX_ENCODINGS_MAX; i++) + if (response == GTK_RESPONSE_OK || + response == GTK_RESPONSE_APPLY || + response == GTK_RESPONSE_ACCEPT) { - gtk_combo_box_insert_text(GTK_COMBO_BOX(encoding_combobox), i, - latex_encodings[i].name); - } - - gtk_combo_box_set_active(GTK_COMBO_BOX(encoding_combobox), - find_latex_enc(geany_data->file_prefs->default_new_encoding)); - - gtk_misc_set_alignment(GTK_MISC(label_encoding), 0, 0.5); - - gtk_table_attach_defaults(GTK_TABLE(table), label_encoding, 0, 1, 2, 3); - gtk_table_attach_defaults(GTK_TABLE(table), encoding_combobox, 1, 2, 2, 3); - - /* fontsize */ - label_fontsize = gtk_label_new(_("Font size:")); - fontsize_combobox = gtk_combo_box_entry_new_text(); - gtk_combo_box_append_text(GTK_COMBO_BOX(fontsize_combobox),"10pt"); - gtk_combo_box_append_text(GTK_COMBO_BOX(fontsize_combobox),"11pt"); - gtk_combo_box_append_text(GTK_COMBO_BOX(fontsize_combobox),"12pt"); - ui_widget_set_tooltip_text(fontsize_combobox, - _("Set the default font size of your new document")); - - gtk_misc_set_alignment(GTK_MISC(label_fontsize), 0, 0.5); - - gtk_table_attach_defaults(GTK_TABLE(table), label_fontsize, 0, 1, 3, 4); - gtk_table_attach_defaults(GTK_TABLE(table), fontsize_combobox, 1, 2, 3, 4); - - /* Author */ - label_author = gtk_label_new(_("Author:")); - author_textbox = gtk_entry_new(); - ui_widget_set_tooltip_text(author_textbox, - _("Sets the value of the \\author command. In most cases this should be your name")); - if (geany_data->template_prefs->developer != NULL) - { - author = geany_data->template_prefs->developer; - gtk_entry_set_text(GTK_ENTRY(author_textbox), author); - } - gtk_misc_set_alignment(GTK_MISC(label_author), 0, 0.5); - gtk_table_attach_defaults(GTK_TABLE(table), label_author, 0, 1, 4, 5); - gtk_table_attach_defaults(GTK_TABLE(table), author_textbox, 1, 2, 4, 5); - - /* Date */ - label_date = gtk_label_new(_("Date:")); - date_textbox = gtk_entry_new(); - ui_widget_set_tooltip_text(date_textbox, - _("Sets the value of the \\date command inside header of your " - "new created LaTeX-document. Keeping it at \\today is a good " - "decision if you don't need any fixed date.")); - 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, 5, 6); - gtk_table_attach_defaults(GTK_TABLE(table), date_textbox, 1, 2, 5, 6); - - /* Title of the new document */ - label_title = gtk_label_new(_("Title:")); - title_textbox = gtk_entry_new(); - ui_widget_set_tooltip_text(title_textbox, - _("Sets the title of your new document.")); - gtk_misc_set_alignment(GTK_MISC(label_title), 0, 0.5); - gtk_table_attach_defaults(GTK_TABLE(table), label_title, 0, 1, 6, 7); - gtk_table_attach_defaults(GTK_TABLE(table), title_textbox, 1, 2, 6, 7); - - /* Papersize */ - label_papersize = gtk_label_new(_("Paper size:")); - papersize_combobox = gtk_combo_box_new_text(); - ui_widget_set_tooltip_text(papersize_combobox, - _("Choose the paper format for the newly created document")); - gtk_combo_box_insert_text(GTK_COMBO_BOX(papersize_combobox), 0, "A4"); - gtk_combo_box_insert_text(GTK_COMBO_BOX(papersize_combobox), 1, "A5"); - gtk_combo_box_insert_text(GTK_COMBO_BOX(papersize_combobox), 2, "A6"); - - gtk_combo_box_set_active(GTK_COMBO_BOX(papersize_combobox), 0); - - gtk_misc_set_alignment(GTK_MISC(label_papersize), 0, 0.5); - - gtk_table_attach_defaults(GTK_TABLE(table), label_papersize, 0, 1, 7, 8); - gtk_table_attach_defaults(GTK_TABLE(table), papersize_combobox, 1, 2, 7, 8); - - /* Paper direction */ - label_orientation = gtk_label_new(_("Paper Orientation:")); - orientation_combobox = gtk_combo_box_new_text(); - ui_widget_set_tooltip_text(orientation_combobox, - _("Choose the paper orientation for the newly created document")); - gtk_combo_box_insert_text(GTK_COMBO_BOX(orientation_combobox), 0, "Default"); - gtk_combo_box_insert_text(GTK_COMBO_BOX(orientation_combobox), 1, "Portrait"); - gtk_combo_box_insert_text(GTK_COMBO_BOX(orientation_combobox), 2, "Landscape"); - - gtk_combo_box_set_active(GTK_COMBO_BOX(orientation_combobox), 0); - - gtk_misc_set_alignment(GTK_MISC(label_orientation), 0, 0.5); - - gtk_table_attach_defaults(GTK_TABLE(table), label_orientation, 0, 1, 8, 9); - gtk_table_attach_defaults(GTK_TABLE(table), orientation_combobox, 1, 2, 8, 9); - - - /* Doing the rest .... */ - gtk_widget_show_all(table); - - /* 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); - 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")); - ui_widget_set_tooltip_text(checkbox_KOMA, - _("Uses the KOMA-script classes by Markus Kohm.\n" - "Keep in mind: To compile your document these classes " - "have to be installed before.")); - gtk_button_set_focus_on_click(GTK_BUTTON(checkbox_KOMA), FALSE); - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(checkbox_KOMA), glatex_set_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")); - ui_widget_set_tooltip_text(checkbox_draft, - _("Set the draft flag inside new created documents to get " - "documents with a number of debugging helpers")); - 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); - - gtk_widget_show_all(vbox); - - if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) - { KOMA_active = gtk_toggle_button_get_active( - GTK_TOGGLE_BUTTON(checkbox_KOMA)); + GTK_TOGGLE_BUTTON(glatex_wizard.checkbox_KOMA)); draft_active = gtk_toggle_button_get_active( - GTK_TOGGLE_BUTTON(checkbox_draft)); + GTK_TOGGLE_BUTTON(glatex_wizard.checkbox_draft)); documentclass_int = gtk_combo_box_get_active( - GTK_COMBO_BOX(documentclass_combobox)); + GTK_COMBO_BOX(glatex_wizard.documentclass_combobox)); template_int = gtk_combo_box_get_active( - GTK_COMBO_BOX(template_combobox)); + GTK_COMBO_BOX(glatex_wizard.template_combobox)); encoding_int = gtk_combo_box_get_active( - GTK_COMBO_BOX(encoding_combobox)); + GTK_COMBO_BOX(glatex_wizard.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))); + fontsize = gtk_combo_box_get_active_text( + GTK_COMBO_BOX(glatex_wizard.fontsize_combobox)); + author = g_strdup(gtk_entry_get_text(GTK_ENTRY(glatex_wizard.author_textbox))); + date = g_strdup(gtk_entry_get_text(GTK_ENTRY(glatex_wizard.date_textbox))); + title = g_strdup(gtk_entry_get_text(GTK_ENTRY(glatex_wizard.title_textbox))); papersize_int = gtk_combo_box_get_active( - GTK_COMBO_BOX(papersize_combobox)); + GTK_COMBO_BOX(glatex_wizard.papersize_combobox)); paperorientation_int = gtk_combo_box_get_active( - GTK_COMBO_BOX(orientation_combobox)); + GTK_COMBO_BOX(glatex_wizard.orientation_combobox)); if (KOMA_active == TRUE) { @@ -1379,7 +1168,7 @@ } } fontsize = gtk_combo_box_get_active_text( - GTK_COMBO_BOX(fontsize_combobox)); + GTK_COMBO_BOX(glatex_wizard.fontsize_combobox)); if (papersize != NULL) { @@ -1494,7 +1283,7 @@ /* First check whether its a build in one or a custom one than * assign the wished template */ if (template_int < LATEX_WIZARD_TEMPLATE_END || - template_list == NULL) + glatex_wizard.template_list == NULL) { if (template_int == LATEX_WIZARD_TEMPLATE_DEFAULT && documentclass_int == 3 && documentclass_int == 4) @@ -1511,15 +1300,15 @@ TemplateEntry *tmp = NULL; /* Return if the value choose is for some uknown reason to high */ - if (template_int > (template_list->len + LATEX_WIZARD_TEMPLATE_END)) + if (template_int > (glatex_wizard.template_list->len + LATEX_WIZARD_TEMPLATE_END)) return; - tmp = g_ptr_array_index(template_list, template_int - LATEX_WIZARD_TEMPLATE_END); + tmp = g_ptr_array_index(glatex_wizard.template_list, template_int - LATEX_WIZARD_TEMPLATE_END); code = glatex_get_template_from_file(tmp->filepath); /* Cleaning up template array as there is no usage for anymore */ - g_ptr_array_foreach (template_list, (GFunc)glatex_free_TemplateEntry, NULL); - g_ptr_array_free(template_list, TRUE); + g_ptr_array_foreach (glatex_wizard.template_list, (GFunc)glatex_free_TemplateEntry, NULL); + g_ptr_array_free(glatex_wizard.template_list, TRUE); } if (code != NULL) @@ -1557,10 +1346,10 @@ { gchar* author_string = NULL; if (documentclass_int == 3) - { - author_string = g_strconcat("\\signature{", author, "}\n", NULL); + { + author_string = g_strconcat("\\signature{", author, "}\n", NULL); } - else + else { author_string = g_strconcat("\\author{", author, "}\n", NULL); } @@ -1647,10 +1436,220 @@ g_warning(_("No template assigned. Aborting")); } } - gtk_widget_destroy(dialog); + gtk_widget_destroy(GTK_WIDGET(dialog)); } +void +glatex_wizard_activated(G_GNUC_UNUSED GtkMenuItem * menuitem, + G_GNUC_UNUSED gpointer gdata) +{ + gint i; + gchar *author; + GtkWidget *dialog = NULL; + GtkWidget *vbox = NULL; + GtkWidget *label_documentclass = NULL; + GtkWidget *label_encoding = NULL; + GtkWidget *label_fontsize = NULL; + GtkWidget *table = NULL; + GtkWidget *label_author = NULL; + GtkWidget *label_date = NULL; + GtkWidget *label_title = NULL; + GtkWidget *label_papersize = NULL; + GtkWidget *label_template = NULL; + GtkWidget *label_orientation = NULL; + /* Creating and formatting table */ + table = gtk_table_new(2, 6, FALSE); + gtk_table_set_col_spacings(GTK_TABLE(table), 6); + gtk_table_set_row_spacings(GTK_TABLE(table), 6); + + /* Templates + * Adds custom templates if there are any. If there are none just + * adds default one */ + label_template = gtk_label_new(_("Template:")); + + glatex_wizard.template_combobox = gtk_combo_box_new_text(); + ui_widget_set_tooltip_text(glatex_wizard.template_combobox, + _("Set the template which should be used for creating the new document")); + gtk_misc_set_alignment(GTK_MISC(label_template), 0, 0.5); + + gtk_table_attach_defaults(GTK_TABLE(table), label_template, 0, 1, 0, 1); + gtk_table_attach_defaults(GTK_TABLE(table), glatex_wizard.template_combobox, 1, 2, 0, 1); + + /* Adding default/build in templates to pull down and set the generic + * one as default */ + gtk_combo_box_insert_text(GTK_COMBO_BOX(glatex_wizard.template_combobox), + LATEX_WIZARD_TEMPLATE_DEFAULT, _("Default")); + gtk_combo_box_set_active(GTK_COMBO_BOX(glatex_wizard.template_combobox), + LATEX_WIZARD_TEMPLATE_DEFAULT); + + /* Checking whether some custom template are available and adding + * if so. + * Also init array with templates available. */ + glatex_wizard.template_list = glatex_init_custom_templates(); + glatex_add_templates_to_combobox(glatex_wizard.template_list, glatex_wizard.template_combobox); + + /* Documentclass */ + label_documentclass = gtk_label_new(_("Documentclass:")); + glatex_wizard.documentclass_combobox = gtk_combo_box_new_text(); + ui_widget_set_tooltip_text(glatex_wizard.documentclass_combobox, + _("Choose the kind of document you want to write")); + gtk_combo_box_insert_text(GTK_COMBO_BOX(glatex_wizard.documentclass_combobox), 0, + _("Book")); + gtk_combo_box_insert_text(GTK_COMBO_BOX(glatex_wizard.documentclass_combobox), 1, + _("Article")); + gtk_combo_box_insert_text(GTK_COMBO_BOX(glatex_wizard.documentclass_combobox), 2, + _("Report")); + gtk_combo_box_insert_text(GTK_COMBO_BOX(glatex_wizard.documentclass_combobox), 3, + _("Letter")); + gtk_combo_box_insert_text(GTK_COMBO_BOX(glatex_wizard.documentclass_combobox), 4, + _("Presentation")); + + gtk_combo_box_set_active(GTK_COMBO_BOX(glatex_wizard.documentclass_combobox), 0); + + gtk_misc_set_alignment(GTK_MISC(label_documentclass), 0, 0.5); + + gtk_table_attach_defaults(GTK_TABLE(table), label_documentclass, 0, 1, 1, 2); + gtk_table_attach_defaults(GTK_TABLE(table), glatex_wizard.documentclass_combobox, 1, 2, 1, 2); + + /* Encoding */ + label_encoding = gtk_label_new(_("Encoding:")); + + glatex_wizard.encoding_combobox = gtk_combo_box_new_text(); + ui_widget_set_tooltip_text(glatex_wizard.encoding_combobox, + _("Set the encoding for your new document")); + for (i = 0; i < LATEX_ENCODINGS_MAX; i++) + { + gtk_combo_box_insert_text(GTK_COMBO_BOX(glatex_wizard.encoding_combobox), i, + latex_encodings[i].name); + } + + gtk_combo_box_set_active(GTK_COMBO_BOX(glatex_wizard.encoding_combobox), + find_latex_enc(geany_data->file_prefs->default_new_encoding)); + + gtk_misc_set_alignment(GTK_MISC(label_encoding), 0, 0.5); + + gtk_table_attach_defaults(GTK_TABLE(table), label_encoding, 0, 1, 2, 3); + gtk_table_attach_defaults(GTK_TABLE(table), glatex_wizard.encoding_combobox, 1, 2, 2, 3); + + /* fontsize */ + label_fontsize = gtk_label_new(_("Font size:")); + glatex_wizard.fontsize_combobox = gtk_combo_box_entry_new_text(); + gtk_combo_box_append_text(GTK_COMBO_BOX(glatex_wizard.fontsize_combobox),"10pt"); + gtk_combo_box_append_text(GTK_COMBO_BOX(glatex_wizard.fontsize_combobox),"11pt"); + gtk_combo_box_append_text(GTK_COMBO_BOX(glatex_wizard.fontsize_combobox),"12pt"); + ui_widget_set_tooltip_text(glatex_wizard.fontsize_combobox, + _("Set the default font size of your new document")); + + gtk_misc_set_alignment(GTK_MISC(label_fontsize), 0, 0.5); + + gtk_table_attach_defaults(GTK_TABLE(table), label_fontsize, 0, 1, 3, 4); + gtk_table_attach_defaults(GTK_TABLE(table), glatex_wizard.fontsize_combobox, 1, 2, 3, 4); + + /* Author */ + label_author = gtk_label_new(_("Author:")); + glatex_wizard.author_textbox = gtk_entry_new(); + ui_widget_set_tooltip_text(glatex_wizard.author_textbox, + _("Sets the value of the \\author command. In most cases this should be your name")); + if (geany_data->template_prefs->developer != NULL) + { + author = geany_data->template_prefs->developer; + gtk_entry_set_text(GTK_ENTRY(glatex_wizard.author_textbox), author); + } + gtk_misc_set_alignment(GTK_MISC(label_author), 0, 0.5); + gtk_table_attach_defaults(GTK_TABLE(table), label_author, 0, 1, 4, 5); + gtk_table_attach_defaults(GTK_TABLE(table), glatex_wizard.author_textbox, 1, 2, 4, 5); + + /* Date */ + label_date = gtk_label_new(_("Date:")); + glatex_wizard.date_textbox = gtk_entry_new(); + ui_widget_set_tooltip_text(glatex_wizard.date_textbox, + _("Sets the value of the \\date command inside header of your " + "new created LaTeX-document. Keeping it at \\today is a good " + "decision if you don't need any fixed date.")); + gtk_entry_set_text(GTK_ENTRY(glatex_wizard.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, 5, 6); + gtk_table_attach_defaults(GTK_TABLE(table), glatex_wizard.date_textbox, 1, 2, 5, 6); + + /* Title of the new document */ + label_title = gtk_label_new(_("Title:")); + glatex_wizard.title_textbox = gtk_entry_new(); + ui_widget_set_tooltip_text(glatex_wizard.title_textbox, + _("Sets the title of your new document.")); + gtk_misc_set_alignment(GTK_MISC(label_title), 0, 0.5); + gtk_table_attach_defaults(GTK_TABLE(table), label_title, 0, 1, 6, 7); + gtk_table_attach_defaults(GTK_TABLE(table), glatex_wizard.title_textbox, 1, 2, 6, 7); + + /* Papersize */ + label_papersize = gtk_label_new(_("Paper size:")); + glatex_wizard.papersize_combobox = gtk_combo_box_new_text(); + ui_widget_set_tooltip_text(glatex_wizard.papersize_combobox, + _("Choose the paper format for the newly created document")); + gtk_combo_box_insert_text(GTK_COMBO_BOX(glatex_wizard.papersize_combobox), 0, "A4"); + gtk_combo_box_insert_text(GTK_COMBO_BOX(glatex_wizard.papersize_combobox), 1, "A5"); + gtk_combo_box_insert_text(GTK_COMBO_BOX(glatex_wizard.papersize_combobox), 2, "A6"); + + gtk_combo_box_set_active(GTK_COMBO_BOX(glatex_wizard.papersize_combobox), 0); + + gtk_misc_set_alignment(GTK_MISC(label_papersize), 0, 0.5); + + gtk_table_attach_defaults(GTK_TABLE(table), label_papersize, 0, 1, 7, 8); + gtk_table_attach_defaults(GTK_TABLE(table), glatex_wizard.papersize_combobox, 1, 2, 7, 8); + + /* Paper direction */ + label_orientation = gtk_label_new(_("Paper Orientation:")); + glatex_wizard.orientation_combobox = gtk_combo_box_new_text(); + ui_widget_set_tooltip_text(glatex_wizard.orientation_combobox, + _("Choose the paper orientation for the newly created document")); + gtk_combo_box_insert_text(GTK_COMBO_BOX(glatex_wizard.orientation_combobox), 0, "Default"); + gtk_combo_box_insert_text(GTK_COMBO_BOX(glatex_wizard.orientation_combobox), 1, "Portrait"); + gtk_combo_box_insert_text(GTK_COMBO_BOX(glatex_wizard.orientation_combobox), 2, "Landscape"); + + gtk_combo_box_set_active(GTK_COMBO_BOX(glatex_wizard.orientation_combobox), 0); + + gtk_misc_set_alignment(GTK_MISC(label_orientation), 0, 0.5); + + gtk_table_attach_defaults(GTK_TABLE(table), label_orientation, 0, 1, 8, 9); + gtk_table_attach_defaults(GTK_TABLE(table), glatex_wizard.orientation_combobox, 1, 2, 8, 9); + + + /* Doing the rest .... */ + gtk_widget_show_all(table); + + /* 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); + 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); + + glatex_wizard.checkbox_KOMA = gtk_check_button_new_with_label( + _("Use KOMA-script classes if possible")); + ui_widget_set_tooltip_text(glatex_wizard.checkbox_KOMA, + _("Uses the KOMA-script classes by Markus Kohm.\n" + "Keep in mind: To compile your document these classes " + "have to be installed before.")); + gtk_button_set_focus_on_click(GTK_BUTTON(glatex_wizard.checkbox_KOMA), FALSE); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(glatex_wizard.checkbox_KOMA), glatex_set_koma_active); + gtk_box_pack_start(GTK_BOX(vbox), glatex_wizard.checkbox_KOMA, FALSE, FALSE, 5); + + glatex_wizard.checkbox_draft = gtk_check_button_new_with_label(_("Use draft mode")); + ui_widget_set_tooltip_text(glatex_wizard.checkbox_draft, + _("Set the draft flag inside new created documents to get " + "documents with a number of debugging helpers")); + gtk_button_set_focus_on_click(GTK_BUTTON(glatex_wizard.checkbox_draft), FALSE); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(glatex_wizard.checkbox_draft), FALSE); + gtk_box_pack_start(GTK_BOX(vbox), glatex_wizard.checkbox_draft, FALSE, FALSE, 5); + g_signal_connect(dialog, "response", G_CALLBACK(on_wizard_response), NULL); + + gtk_widget_show_all(dialog); +} + void init_keybindings() { /* init keybindins */ @@ -1669,7 +1668,7 @@ glatex_kb_replace_special_chars, 0, 0, "latex_replace_chars", _("Replace special characters"), NULL); keybindings_set_item(plugin_key_group, KB_LATEX_ENVIRONMENT_INSERT, - glatex_kbref_insert_environment, 0, 0, "latex_insert_environment", + glatex_kbref_insert_environment, 0, 0, "latex_insert_environment", _("Run insert environment dialog"), menu_latex_insert_environment); keybindings_set_item(plugin_key_group, KB_LATEX_INSERT_NEWITEM, glatex_kb_insert_newitem, 0, 0, "latex_insert_item", _("Insert \\item"), NULL); @@ -1791,14 +1790,14 @@ menu_latex_wizard = ui_image_menu_item_new(GTK_STOCK_NEW, _("LaTeX-_Wizard")); gtk_container_add(GTK_CONTAINER(menu_latex_menu), menu_latex_wizard); ui_widget_set_tooltip_text(menu_latex_wizard, - _("Starts a Wizard to easily create LaTeX-documents")); + _("Starts a Wizard to easily create LaTeX-documents")); g_signal_connect(menu_latex_wizard, "activate", G_CALLBACK(glatex_wizard_activated), NULL); menu_latex_menu_special_char = gtk_menu_item_new_with_mnemonic(_("I_nsert Special Character")); ui_widget_set_tooltip_text(menu_latex_menu_special_char, - _("Helps to use some not very common letters and signs")); + _("Helps to use some not very common letters and signs")); gtk_container_add(GTK_CONTAINER(menu_latex_menu), menu_latex_menu_special_char); @@ -1817,7 +1816,7 @@ menu_latex_label = gtk_menu_item_new_with_mnemonic(_("Insert _Label")); ui_widget_set_tooltip_text(menu_latex_label, - _("Helps at inserting labels to a document")); + _("Helps at inserting labels to a document")); gtk_container_add(GTK_CONTAINER(menu_latex_menu), menu_latex_label); g_signal_connect(menu_latex_label, "activate", G_CALLBACK(glatex_insert_label_activated), NULL); @@ -1825,7 +1824,7 @@ menu_latex_insert_environment = gtk_menu_item_new_with_mnemonic( _("Insert _Environment")); ui_widget_set_tooltip_text(menu_latex_insert_environment, - _("Helps at inserting an environment a document")); + _("Helps at inserting an environment a document")); gtk_container_add(GTK_CONTAINER(menu_latex_menu), menu_latex_insert_environment); g_signal_connect(menu_latex_insert_environment, "activate", G_CALLBACK(glatex_insert_environment_dialog), NULL); @@ -1833,7 +1832,7 @@ menu_latex_insert_usepackage = gtk_menu_item_new_with_mnemonic( _("Insert P_ackage")); ui_widget_set_tooltip_text(menu_latex_insert_usepackage, - _("A small dialog to insert \\usepackage{} into header of current file")); + _("A small dialog to insert \\usepackage{} into header of current file")); gtk_container_add(GTK_CONTAINER(menu_latex_menu), menu_latex_insert_usepackage); g_signal_connect(menu_latex_insert_usepackage, "activate", G_CALLBACK(glatex_insert_usepackage_dialog), NULL); @@ -1914,7 +1913,7 @@ menu_latex_replace_toggle); g_signal_connect(menu_latex_replace_toggle, "activate", - G_CALLBACK(glatex_toggle_status), NULL); + G_CALLBACK(glatex_toggle_status), NULL); init_keybindings(); Modified: trunk/geanylatex/src/geanylatex.h =================================================================== --- trunk/geanylatex/src/geanylatex.h 2010-03-27 14:34:58 UTC (rev 1216) +++ trunk/geanylatex/src/geanylatex.h 2010-03-28 10:22:45 UTC (rev 1217) @@ -61,6 +61,24 @@ #define MAX_MENU_ENTRIES 20 +typedef struct +{ + GtkWidget *documentclass_combobox; + GtkWidget *encoding_combobox; + GtkWidget *fontsize_combobox; + GtkWidget *checkbox_KOMA; + GtkWidget *author_textbox; + GtkWidget *date_textbox; + GtkWidget *title_textbox; + GtkWidget *papersize_combobox; + GtkWidget *checkbox_draft; + GtkWidget *template_combobox; + GtkWidget *orientation_combobox; + GPtrArray *template_list; + gboolean draft_active; +} LaTeXWizard; + +LaTeXWizard glatex_wizard; extern void glatex_insert_string(gchar *string, gboolean reset_position); gint glatex_count_menu_entries(SubMenuTemplate *tmp, gint categorie); void glatex_wizard_activated(G_GNUC_UNUSED GtkMenuItem * menuitem, 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:[1216] trunk/geanylatex/src/geanylatex.c
by frlan＠users.sourceforge.net 27 Mar '10

27 Mar '10

Revision: 1216 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1216&view=rev Author: frlan Date: 2010-03-27 14:34:58 +0000 (Sat, 27 Mar 2010) Log Message: ----------- GeanyLaTeX: Fix a memory leak on title handling of wizard Modified Paths: -------------- trunk/geanylatex/src/geanylatex.c Modified: trunk/geanylatex/src/geanylatex.c =================================================================== --- trunk/geanylatex/src/geanylatex.c 2010-03-27 14:34:35 UTC (rev 1215) +++ trunk/geanylatex/src/geanylatex.c 2010-03-27 14:34:58 UTC (rev 1216) @@ -1606,32 +1606,35 @@ if (title != NULL) { - if (title[0] != '\0') + gchar *title_string = NULL; + if (documentclass_int == 3) { - if (documentclass_int == 3) - { - title = g_strconcat("\\subject{", title, "}\n", NULL); - } - else - { - title = g_strconcat("\\title{", title, "}\n", NULL); - } - - utils_string_replace_all(code, "{TITLE}", title); + title_string = g_strconcat("\\subject{", title, "}\n", NULL); } else - if (documentclass_int == 3) - { - utils_string_replace_all(code, "{TITLE}", "\% \\subject{} \n"); - } - else - { - utils_string_replace_all(code, "{TITLE}", "\% \\title{} \n"); - } + { + title_string = g_strconcat("\\title{", title, "}\n", NULL); + } + utils_string_replace_all(code, "{TITLE}", title_string); g_free(title); + g_free(title_string); } - + else + { + if (documentclass_int == 3) + { + utils_string_replace_all(code, "{TITLE}", "\% \\subject{} \n"); + } + else + { + utils_string_replace_all(code, "{TITLE}", "\% \\title{} \n"); + } + if (title != NULL) + { + g_free(title); + } + } utils_string_replace_all(code, "{OPENING}", _("Dear Sir or Madame")); utils_string_replace_all(code, "{CLOSING}", _("With kind regards")); 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:[1215] trunk/geanylatex/src/geanylatex.c
by frlan＠users.sourceforge.net 27 Mar '10

27 Mar '10

Revision: 1215 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1215&view=rev Author: frlan Date: 2010-03-27 14:34:35 +0000 (Sat, 27 Mar 2010) Log Message: ----------- GeanyLaTeX: Try to ensure we don't try to free a non valid pointer Modified Paths: -------------- trunk/geanylatex/src/geanylatex.c Modified: trunk/geanylatex/src/geanylatex.c =================================================================== --- trunk/geanylatex/src/geanylatex.c 2010-03-27 14:34:12 UTC (rev 1214) +++ trunk/geanylatex/src/geanylatex.c 2010-03-27 14:34:35 UTC (rev 1215) @@ -1580,7 +1580,10 @@ utils_string_replace_all(code, "{AUTHOR}", "\% \\author{}\n"); } utils_string_replace_all(code, "{AUTHOR}", author_string); - g_free(author); + if (author != NULL) + { + g_free(author); + } g_free(author_string); } @@ -1595,6 +1598,10 @@ else { utils_string_replace_all(code, "{DATE}", "\% \\date{}\n"); + if (date != NULL) + { + g_free(date); + } } if (title != 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:[1214] trunk/geanylatex/src/geanylatex.c
by frlan＠users.sourceforge.net 27 Mar '10

27 Mar '10

Revision: 1214 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1214&view=rev Author: frlan Date: 2010-03-27 14:34:12 +0000 (Sat, 27 Mar 2010) Log Message: ----------- GeanyLaTeX: Fix a memory leak on date handling of wizard Modified Paths: -------------- trunk/geanylatex/src/geanylatex.c Modified: trunk/geanylatex/src/geanylatex.c =================================================================== --- trunk/geanylatex/src/geanylatex.c 2010-03-27 14:33:49 UTC (rev 1213) +++ trunk/geanylatex/src/geanylatex.c 2010-03-27 14:34:12 UTC (rev 1214) @@ -1584,17 +1584,19 @@ g_free(author_string); } - if (date != NULL) + if (NZV(date)) { - if (date[0] != '\0') - { - date = g_strconcat("\\date{", date, "}\n", NULL); - utils_string_replace_all(code, "{DATE}", date); - } - else - utils_string_replace_all(code, "{DATE}", "\% \\date{}\n"); + gchar *date_string = NULL; + date_string = g_strconcat("\\date{", date, "}\n", NULL); + utils_string_replace_all(code, "{DATE}", date_string); g_free(date); + g_free(date_string); } + else + { + utils_string_replace_all(code, "{DATE}", "\% \\date{}\n"); + } + if (title != NULL) { if (title[0] != '\0') 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:[1213] trunk/geanylatex/src/geanylatex.c
by frlan＠users.sourceforge.net 27 Mar '10

27 Mar '10

Revision: 1213 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1213&view=rev Author: frlan Date: 2010-03-27 14:33:49 +0000 (Sat, 27 Mar 2010) Log Message: ----------- GeanyLaTeX: Fix a memory leak on author section of wiazrd Modified Paths: -------------- trunk/geanylatex/src/geanylatex.c Modified: trunk/geanylatex/src/geanylatex.c =================================================================== --- trunk/geanylatex/src/geanylatex.c 2010-03-27 10:00:46 UTC (rev 1212) +++ trunk/geanylatex/src/geanylatex.c 2010-03-27 14:33:49 UTC (rev 1213) @@ -1553,33 +1553,37 @@ break; } } - if (author != NULL) + if (NZV(author)) { - if (author[0] != '\0') + gchar* author_string = NULL; + if (documentclass_int == 3) + { + author_string = g_strconcat("\\signature{", author, "}\n", NULL); + } + else { - if (documentclass_int == 3) - { - author = g_strconcat("\\signature{", author, "}\n", NULL); - } - else - { - author = g_strconcat("\\author{", author, "}\n", NULL); - } - - utils_string_replace_all(code, "{AUTHOR}", author); + author_string = g_strconcat("\\author{", author, "}\n", NULL); } + utils_string_replace_all(code, "{AUTHOR}", author_string); + g_free(author); + g_free(author_string); + } + else + { + gchar* author_string = NULL; + if (documentclass_int == 3) + { + utils_string_replace_all(code, "{AUTHOR}", "\% \\signature{}\n"); + } else - if (documentclass_int == 3) - { - utils_string_replace_all(code, "{AUTHOR}", "\% \\signature{}\n"); - } - else - { - utils_string_replace_all(code, "{AUTHOR}", "\% \\author{}\n"); - } - + { + utils_string_replace_all(code, "{AUTHOR}", "\% \\author{}\n"); + } + utils_string_replace_all(code, "{AUTHOR}", author_string); g_free(author); + g_free(author_string); } + if (date != NULL) { if (date[0] != '\0') 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:[1212] trunk/geanylatex/doc/geanylatex.tex
by frlan＠users.sourceforge.net 27 Mar '10

27 Mar '10

Revision: 1212 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1212&view=rev Author: frlan Date: 2010-03-27 10:00:46 +0000 (Sat, 27 Mar 2010) Log Message: ----------- GeanyLaTeX: Another minor update of documentation Modified Paths: -------------- trunk/geanylatex/doc/geanylatex.tex Modified: trunk/geanylatex/doc/geanylatex.tex =================================================================== --- trunk/geanylatex/doc/geanylatex.tex 2010-03-27 10:00:23 UTC (rev 1211) +++ trunk/geanylatex/doc/geanylatex.tex 2010-03-27 10:00:46 UTC (rev 1212) @@ -112,6 +112,8 @@ \end{itemize} \item Increasing dependency for plugin to Geany Plugin API v166 \item Make inserting text for references configurable. + \item Add an function to insert \textbackslash{}usepackage\{\} into + header of file \end{itemize} \subsection*{GeanyLaTeX{} 0.4 -- 2009-05-26} @@ -515,7 +517,7 @@ \subsection{Inserting \textbackslash{}usepackage\{\}-entry to header} From time you need to insert a new package into header of a document, -but don't want to change to top of document and scroll back to where you were. +but don't want to change to top of document and scroll back to where you were. Since version 0.5 Geany\LaTeX{} is offering an easy to use dialog which is taking over the package name and possible package options to 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 March 2010