Plugins-Commits March 2010

plugins-commits@lists.geany.org

7 participants
76 discussions

SF.net SVN: geany-plugins:[1211] trunk/geanylatex/src/latexenvironments.c
by frlan＠users.sourceforge.net 27 Mar '10

27 Mar '10

Revision: 1211 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1211&view=rev Author: frlan Date: 2010-03-27 10:00:23 +0000 (Sat, 27 Mar 2010) Log Message: ----------- GeanyLaTeX: Set markers for single undo on inserting environment Modified Paths: -------------- trunk/geanylatex/src/latexenvironments.c Modified: trunk/geanylatex/src/latexenvironments.c =================================================================== --- trunk/geanylatex/src/latexenvironments.c 2010-03-27 09:41:47 UTC (rev 1210) +++ trunk/geanylatex/src/latexenvironments.c 2010-03-27 10:00:23 UTC (rev 1211) @@ -73,6 +73,7 @@ gchar *replacement = NULL; selection = sci_get_selection_contents(doc->editor->sci); + sci_start_undo_action(doc->editor->sci); if (utils_str_equal(environment, "block") == TRUE) { replacement = g_strconcat("\\begin{", environment, "}{}\n", @@ -84,6 +85,7 @@ selection, "\n\\end{", environment, "}\n", NULL); } sci_replace_sel(doc->editor->sci, replacement); + sci_end_undo_action(doc->editor->sci); g_free(selection); g_free(replacement); @@ -95,6 +97,7 @@ GString *tmpstring = NULL; gchar *tmp = NULL; + sci_start_undo_action(doc->editor->sci); tmpstring = g_string_new("\\begin{"); g_string_append(tmpstring, environment); @@ -120,6 +123,7 @@ tmp = g_string_free(tmpstring, FALSE); glatex_insert_string(tmp, FALSE); sci_set_current_position(doc->editor->sci, pos + len + 9, TRUE); + sci_end_undo_action(doc->editor->sci); g_free(tmp); } } 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:[1210] trunk/geanylatex/src/geanylatex.c
by frlan＠users.sourceforge.net 27 Mar '10

27 Mar '10

Revision: 1210 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1210&view=rev Author: frlan Date: 2010-03-27 09:41:47 +0000 (Sat, 27 Mar 2010) Log Message: ----------- GeanyLaTeX: Fix a minor problem on showing a tooltip in a wrong context Modified Paths: -------------- trunk/geanylatex/src/geanylatex.c Modified: trunk/geanylatex/src/geanylatex.c =================================================================== --- trunk/geanylatex/src/geanylatex.c 2010-03-27 09:41:23 UTC (rev 1209) +++ trunk/geanylatex/src/geanylatex.c 2010-03-27 09:41:47 UTC (rev 1210) @@ -1816,7 +1816,7 @@ menu_latex_insert_usepackage = gtk_menu_item_new_with_mnemonic( _("Insert P_ackage")); - ui_widget_set_tooltip_text(menu_latex_insert_environment, + ui_widget_set_tooltip_text(menu_latex_insert_usepackage, _("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", @@ -1901,6 +1901,8 @@ G_CALLBACK(glatex_toggle_status), NULL); init_keybindings(); + + /* Check whether the toolbar should be shown or not and do so*/ if (glatex_set_toolbar_active == TRUE) { glatex_toolbar = init_toolbar(); 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:[1209] trunk/geanylatex/src/geanylatex.c
by frlan＠users.sourceforge.net 27 Mar '10

27 Mar '10

Revision: 1209 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1209&view=rev Author: frlan Date: 2010-03-27 09:41:23 +0000 (Sat, 27 Mar 2010) Log Message: ----------- GeanyLaTeX: Redefine a couple of accelerators on menu Modified Paths: -------------- trunk/geanylatex/src/geanylatex.c Modified: trunk/geanylatex/src/geanylatex.c =================================================================== --- trunk/geanylatex/src/geanylatex.c 2010-03-27 09:40:58 UTC (rev 1208) +++ trunk/geanylatex/src/geanylatex.c 2010-03-27 09:41:23 UTC (rev 1209) @@ -1780,7 +1780,7 @@ g_signal_connect(menu_latex_wizard, "activate", G_CALLBACK(glatex_wizard_activated), NULL); - menu_latex_menu_special_char = gtk_menu_item_new_with_mnemonic(_("Insert _Special Character")); + 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")); gtk_container_add(GTK_CONTAINER(menu_latex_menu), @@ -1815,7 +1815,7 @@ G_CALLBACK(glatex_insert_environment_dialog), NULL); menu_latex_insert_usepackage = gtk_menu_item_new_with_mnemonic( - _("Insert Package")); + _("Insert P_ackage")); ui_widget_set_tooltip_text(menu_latex_insert_environment, _("A small dialog to insert \\usepackage{} into header of current file")); gtk_container_add(GTK_CONTAINER(menu_latex_menu), menu_latex_insert_usepackage); @@ -1855,7 +1855,7 @@ } /* Add font size menu */ - menu_latex_fontsize = gtk_menu_item_new_with_mnemonic(_("_Font size")); + menu_latex_fontsize = gtk_menu_item_new_with_mnemonic(_("F_ont size")); gtk_container_add(GTK_CONTAINER(menu_latex_menu), menu_latex_fontsize); menu_latex_fontsize_submenu = gtk_menu_new(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany-plugins:[1208] trunk/geanylatex/ChangeLog
by frlan＠users.sourceforge.net 27 Mar '10

27 Mar '10

Revision: 1208 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1208&view=rev Author: frlan Date: 2010-03-27 09:40:58 +0000 (Sat, 27 Mar 2010) Log Message: ----------- GeanyLaTeX: Missed to update ChageLog Modified Paths: -------------- trunk/geanylatex/ChangeLog Modified: trunk/geanylatex/ChangeLog =================================================================== --- trunk/geanylatex/ChangeLog 2010-03-27 01:37:16 UTC (rev 1207) +++ trunk/geanylatex/ChangeLog 2010-03-27 09:40:58 UTC (rev 1208) @@ -1,3 +1,8 @@ +2010-03-27 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> + + * Add a menu entry for inserting font sizes to document + + 2010-03-20 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> * Insert a keybinding and a dialog to insert a \usepackage{} line to header. 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:[1207] trunk/geanylatex/src/formatutils.c
by frlan＠users.sourceforge.net 27 Mar '10

27 Mar '10

Revision: 1207 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1207&view=rev Author: frlan Date: 2010-03-27 01:37:16 +0000 (Sat, 27 Mar 2010) Log Message: ----------- GeanyLaTeX: Support normal selections on inserting font size Modified Paths: -------------- trunk/geanylatex/src/formatutils.c Modified: trunk/geanylatex/src/formatutils.c =================================================================== --- trunk/geanylatex/src/formatutils.c 2010-03-27 01:36:53 UTC (rev 1206) +++ trunk/geanylatex/src/formatutils.c 2010-03-27 01:37:16 UTC (rev 1207) @@ -66,10 +66,27 @@ if (doc != NULL) { - sci_start_undo_action(doc->editor->sci); - glatex_insert_string(glatex_fontsize_pattern[size], TRUE); - glatex_insert_string(" ", TRUE); - sci_end_undo_action(doc->editor->sci); + if (sci_has_selection(doc->editor->sci)) + { + gchar *selection; + gchar *replacement = NULL; + + selection = sci_get_selection_contents(doc->editor->sci); + + replacement = g_strconcat("{",glatex_fontsize_pattern[size], + " ", selection, "}", NULL); + + sci_replace_sel(doc->editor->sci, replacement); + g_free(selection); + g_free(replacement); + } + else + { + sci_start_undo_action(doc->editor->sci); + glatex_insert_string(glatex_fontsize_pattern[size], TRUE); + glatex_insert_string(" ", TRUE); + sci_end_undo_action(doc->editor->sci); + } } } 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:[1206] trunk/geanylatex/src
by frlan＠users.sourceforge.net 27 Mar '10

27 Mar '10

Revision: 1206 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1206&view=rev Author: frlan Date: 2010-03-27 01:36:53 +0000 (Sat, 27 Mar 2010) Log Message: ----------- GeanyLaTeX: Adding a menu entry for easy inserting font sizes into LaTeX document Modified Paths: -------------- trunk/geanylatex/src/formatpatterns.c trunk/geanylatex/src/formatutils.c trunk/geanylatex/src/formatutils.h trunk/geanylatex/src/geanylatex.c Modified: trunk/geanylatex/src/formatpatterns.c =================================================================== --- trunk/geanylatex/src/formatpatterns.c 2010-03-27 01:36:25 UTC (rev 1205) +++ trunk/geanylatex/src/formatpatterns.c 2010-03-27 01:36:53 UTC (rev 1206) @@ -1,7 +1,7 @@ /* * formatpatterns.c * - * Copyright 2009-2010 Frank Lanitz <frank@Jupiter> + * Copyright 2009-2010 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> * * 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 @@ -46,3 +46,29 @@ N_("Left side oriented"), N_("Right side oriented") }; + +gchar *glatex_fontsize_pattern[] = { + "\\tiny", + "\\scriptsize", + "\\footnotesize", + "\\small", + "\\normalsize", + "\\large", + "\\Large", + "\\LARGE", + "\\huge", + "\\Huge" +}; + +const gchar *glatex_fontsize_labels[] = { + N_("tiny"), + N_("scriptsize"), + N_("footnotesize"), + N_("small"), + N_("normalsize"), + N_("large"), + N_("Large"), + N_("LARGE"), + N_("huge"), + N_("Huge") +}; Modified: trunk/geanylatex/src/formatutils.c =================================================================== --- trunk/geanylatex/src/formatutils.c 2010-03-27 01:36:25 UTC (rev 1205) +++ trunk/geanylatex/src/formatutils.c 2010-03-27 01:36:53 UTC (rev 1206) @@ -1,59 +1,76 @@ /* - * formatutils.c + * formatutils.c * - * Copyright 2009-2010 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> + * Copyright 2009-2010 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> * - * 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. */ #include "formatutils.h" void glatex_insert_latex_format(G_GNUC_UNUSED GtkMenuItem * menuitem, - G_GNUC_UNUSED gpointer gdata) + G_GNUC_UNUSED gpointer gdata) { - gint format = GPOINTER_TO_INT(gdata); - GeanyDocument *doc = NULL; + gint format = GPOINTER_TO_INT(gdata); + GeanyDocument *doc = NULL; doc = document_get_current(); if (doc != NULL) { - if (sci_has_selection(doc->editor->sci)) - { - gchar *selection; - gchar *replacement = NULL; + if (sci_has_selection(doc->editor->sci)) + { + gchar *selection; + gchar *replacement = NULL; - selection = sci_get_selection_contents(doc->editor->sci); + selection = sci_get_selection_contents(doc->editor->sci); - replacement = g_strconcat(glatex_format_pattern[format],"{", - selection, "}", NULL); + replacement = g_strconcat(glatex_format_pattern[format],"{", + selection, "}", NULL); - sci_replace_sel(doc->editor->sci, replacement); - g_free(selection); + sci_replace_sel(doc->editor->sci, replacement); + g_free(selection); g_free(replacement); - } - else - { + } + else + { sci_start_undo_action(doc->editor->sci); - glatex_insert_string(glatex_format_pattern[format], TRUE); - glatex_insert_string("{", TRUE); - glatex_insert_string("}", FALSE); + glatex_insert_string(glatex_format_pattern[format], TRUE); + glatex_insert_string("{", TRUE); + glatex_insert_string("}", FALSE); sci_end_undo_action(doc->editor->sci); } - } + } } +void glatex_insert_latex_fontsize(G_GNUC_UNUSED GtkMenuItem * menuitem, + G_GNUC_UNUSED gpointer gdata) +{ + gint size = GPOINTER_TO_INT(gdata); + GeanyDocument *doc = NULL; + doc = document_get_current(); + + if (doc != NULL) + { + sci_start_undo_action(doc->editor->sci); + glatex_insert_string(glatex_fontsize_pattern[size], TRUE); + glatex_insert_string(" ", TRUE); + sci_end_undo_action(doc->editor->sci); + } +} + + Modified: trunk/geanylatex/src/formatutils.h =================================================================== --- trunk/geanylatex/src/formatutils.h 2010-03-27 01:36:25 UTC (rev 1205) +++ trunk/geanylatex/src/formatutils.h 2010-03-27 01:36:53 UTC (rev 1206) @@ -1,22 +1,22 @@ /* - * formatutils.h + * formatutils.h * - * Copyright 2009-2010 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> + * Copyright 2009-2010 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> * - * 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. */ #ifndef LATEXFORMATUTILS_H @@ -25,21 +25,44 @@ #include "geanylatex.h" enum { - LATEX_ITALIC = 0, - LATEX_BOLD, - LATEX_UNDERLINE, - LATEX_SLANTED, - LATEX_TYPEWRITER, - LATEX_SMALLCAPS, - LATEX_EMPHASIS, - LATEX_CENTER, - LATEX_LEFT, - LATEX_RIGHT, + LATEX_ITALIC = 0, + LATEX_BOLD, + LATEX_UNDERLINE, + LATEX_SLANTED, + LATEX_TYPEWRITER, + LATEX_SMALLCAPS, + LATEX_EMPHASIS, + LATEX_CENTER, + LATEX_LEFT, + LATEX_RIGHT, LATEX_STYLES_END }; +/* Couting from smalles on up to biggest default font size. Keep in mind: + * LATEX_FONTSIZE_LARGE1 -> large + * LATEX_FONTSIZE_LARGE2 -> Large + * LATEX_FONTSIZE_LARGE3 -> LARGE + * LATEX_FONTSIZE_HUGE1 -> huge + * LATEX_FONTSIZE_HUGE2 -> Huge */ +enum { + LATEX_FONTSIZE_TINY = 0, + LATEX_FONTSIZE_SCRIPTSIZE, + LATEX_FONTSIZE_FOOTNOTESIZE, + LATEX_FONTSIZE_SMALL, + LATEX_FONTSIZE_NORMALSIZE, + LATEX_FONTSIZE_LARGE1, + LATEX_FONTSIZE_LARGE2, + LATEX_FONTSIZE_LARGE3, + LATEX_FONTSIZE_HUGE1, + LATEX_FONTSIZE_HUGE2, + LATEX_FONTSIZE_END +}; + extern gchar* glatex_format_pattern[]; extern const gchar *glatex_format_labels[]; +extern const gchar *glatex_fontsize_labels[]; +extern gchar *glatex_fontsize_pattern[]; void glatex_insert_latex_format(GtkMenuItem * menuitem, gpointer gdata); +void glatex_insert_latex_fontsize(GtkMenuItem * menuitem, gpointer gdata); #endif Modified: trunk/geanylatex/src/geanylatex.c =================================================================== --- trunk/geanylatex/src/geanylatex.c 2010-03-27 01:36:25 UTC (rev 1205) +++ trunk/geanylatex/src/geanylatex.c 2010-03-27 01:36:53 UTC (rev 1206) @@ -49,6 +49,8 @@ static GtkWidget *menu_latex_bibtex_submenu = NULL; static GtkWidget *menu_latex_format_insert = NULL; static GtkWidget *menu_latex_format_insert_submenu = NULL; +static GtkWidget *menu_latex_fontsize = NULL; +static GtkWidget *menu_latex_fontsize_submenu = NULL; static GtkWidget *menu_latex_insert_environment = NULL; static GtkWidget *menu_latex_insert_usepackage = NULL; static GtkWidget *menu_latex_replacement = NULL; @@ -1852,6 +1854,23 @@ G_CALLBACK(glatex_insert_latex_format), GINT_TO_POINTER(i)); } + /* Add font size menu */ + menu_latex_fontsize = gtk_menu_item_new_with_mnemonic(_("_Font size")); + gtk_container_add(GTK_CONTAINER(menu_latex_menu), menu_latex_fontsize); + + menu_latex_fontsize_submenu = gtk_menu_new(); + gtk_menu_item_set_submenu(GTK_MENU_ITEM(menu_latex_fontsize), + menu_latex_fontsize_submenu); + + for (i = 0; i < LATEX_FONTSIZE_END; i++) + { + tmp = NULL; + tmp = gtk_menu_item_new_with_mnemonic(_(glatex_fontsize_labels[i])); + gtk_container_add(GTK_CONTAINER(menu_latex_fontsize_submenu), tmp); + g_signal_connect(tmp, "activate", + G_CALLBACK(glatex_insert_latex_fontsize), GINT_TO_POINTER(i)); + } + /* Add menuitem for LaTeX replacement functions*/ menu_latex_replacement = gtk_menu_item_new_with_mnemonic( _("_Special Character Replacement")); 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:[1205] trunk/geanylatex/doc/geanylatex.tex
by frlan＠users.sourceforge.net 27 Mar '10

27 Mar '10

Revision: 1205 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1205&view=rev Author: frlan Date: 2010-03-27 01:36:25 +0000 (Sat, 27 Mar 2010) Log Message: ----------- GeanyLaTeX: Minimal update of documentation for insert \usepackage{} feature Modified Paths: -------------- trunk/geanylatex/doc/geanylatex.tex Modified: trunk/geanylatex/doc/geanylatex.tex =================================================================== --- trunk/geanylatex/doc/geanylatex.tex 2010-03-27 01:36:00 UTC (rev 1204) +++ trunk/geanylatex/doc/geanylatex.tex 2010-03-27 01:36:25 UTC (rev 1205) @@ -486,7 +486,8 @@ \item right-aligned \end{itemize} -\subsection{Autocompletion of \textbackslash{}begin and \textbackslash{}begingroup} +\subsection{Autocompletion of \textbackslash{}begin and + \textbackslash{}begingroup} Since version 0.5 GeanyLaTeX{} is supporting autocompletion for closing \textbackslash{}end and \textbackslash{}endgroup for begin @@ -511,6 +512,17 @@ on \TeX{}-like file types. +\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. + +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 +insert them into header of document. Right now, its placed direct in +top of the \texttt{\textbackslash{}begin\{document\}} statement if +there is any. + \section{Configuration} GeanyLaTeX{} can be configured in two major ways: 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:[1204] trunk/geanylatex/TODO
by frlan＠users.sourceforge.net 27 Mar '10

27 Mar '10

Revision: 1204 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1204&view=rev Author: frlan Date: 2010-03-27 01:36:00 +0000 (Sat, 27 Mar 2010) Log Message: ----------- GeanyLaTeX: Add another feature request to feeled endless TODO-list Modified Paths: -------------- trunk/geanylatex/TODO Modified: trunk/geanylatex/TODO =================================================================== --- trunk/geanylatex/TODO 2010-03-26 21:04:44 UTC (rev 1203) +++ trunk/geanylatex/TODO 2010-03-27 01:36:00 UTC (rev 1204) @@ -28,3 +28,4 @@ * Make special characters extensible through files * Improve behaviour of levelup and leveldown of structures * Autoinserting {} when typing \command+return +* Adding a font size chooser to toolbar and menue 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:[1203] trunk/geany-plugins/treebrowser
by dimitrov-adrian＠users.sourceforge.net 26 Mar '10

26 Mar '10

Revision: 1203 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1203&view=rev Author: dimitrov-adrian Date: 2010-03-26 21:04:44 +0000 (Fri, 26 Mar 2010) Log Message: ----------- Treebrowser, fixed bug with 'On expand, refresh.' 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-23 11:33:11 UTC (rev 1202) +++ trunk/geany-plugins/treebrowser/ChangeLog 2010-03-26 21:04:44 UTC (rev 1203) @@ -1,6 +1,13 @@ Development release ChangeLog ----------------------------- +26-03-2010 Adrian Dimitrov <dimitrov.adrian(a)gmail.com> + + * src/treebrowser.c + fixed bug with 'On expand, refresh.' + now right click not select item from list + + 23-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-23 11:33:11 UTC (rev 1202) +++ trunk/geany-plugins/treebrowser/src/treebrowser.c 2010-03-26 21:04:44 UTC (rev 1203) @@ -28,7 +28,13 @@ static GtkTreeViewColumn *treeview_column_icon, *treeview_column_text; static GtkCellRenderer *render_icon, *render_text; +/* ------------------ + * FLAGS + * ------------------ */ +static gboolean flag_on_expand_refresh = FALSE; + + /* ------------------ * CONFIG VARS * ------------------ */ @@ -243,16 +249,16 @@ if (treebrowser_search(uri, &iter)) return TRUE; } + else + if (utils_str_equal(uri, uri_current) == TRUE) + { + path = gtk_tree_model_get_path(GTK_TREE_MODEL(treestore), &iter); + gtk_tree_view_expand_to_path(GTK_TREE_VIEW(treeview), path); + gtk_tree_view_scroll_to_cell(GTK_TREE_VIEW(treeview), path, TREEBROWSER_COLUMN_ICON, FALSE, 0, 0); + gtk_tree_view_set_cursor(GTK_TREE_VIEW(treeview), path, treeview_column_text, FALSE); + return TRUE; + } - if (utils_str_equal(uri,uri_current) == TRUE) - { - path = gtk_tree_model_get_path(GTK_TREE_MODEL(treestore), &iter); - gtk_tree_view_expand_to_path(GTK_TREE_VIEW(treeview), path); - gtk_tree_view_scroll_to_cell(GTK_TREE_VIEW(treeview), path, TREEBROWSER_COLUMN_ICON, FALSE, 0, 0); - gtk_tree_view_set_cursor(GTK_TREE_VIEW(treeview), path, treeview_column_text, FALSE); - return TRUE; - } - } while(gtk_tree_model_iter_next(GTK_TREE_MODEL(treestore), &iter)); return FALSE; @@ -310,6 +316,7 @@ gtk_tree_store_iter_clear_nodes(gpointer iter, gboolean delete_root) { GtkTreeIter i; + while (gtk_tree_model_iter_children(GTK_TREE_MODEL(treestore), &i, iter)) { if (gtk_tree_model_iter_has_child(GTK_TREE_MODEL(treestore), &i)) @@ -319,6 +326,7 @@ if (delete_root) gtk_tree_store_remove(GTK_TREE_STORE(treestore), iter); + } static gboolean @@ -712,6 +720,7 @@ if (popup_menu == NULL) popup_menu = create_popup_menu(user_data); gtk_menu_popup(GTK_MENU(popup_menu), NULL, NULL, NULL, NULL, event->button, event->time); + return TRUE; } return FALSE; } @@ -779,15 +788,18 @@ { gchar *uri; - gtk_tree_model_get_iter(GTK_TREE_MODEL(treestore), iter, path); - gtk_tree_model_get(GTK_TREE_MODEL(treestore), iter, + if (flag_on_expand_refresh == FALSE && CONFIG_ON_EXPAND_REFRESH == TRUE) + { + flag_on_expand_refresh = TRUE; + gtk_tree_model_get(GTK_TREE_MODEL(treestore), iter, TREEBROWSER_COLUMN_URI, &uri, -1); - - if (CONFIG_ON_EXPAND_REFRESH) treebrowser_browse(uri, iter, CONFIG_INITIAL_DIR_DEEP); + gtk_tree_view_expand_row(GTK_TREE_VIEW(treeview), path, FALSE); + flag_on_expand_refresh = FALSE; + } + gtk_tree_store_set(treestore, iter, TREEBROWSER_COLUMN_ICON, GTK_STOCK_OPEN, -1); - gtk_tree_store_set(treestore, iter, TREEBROWSER_COLUMN_ICON, GTK_STOCK_OPEN, -1); } static void @@ -797,7 +809,7 @@ } static void -on_treeview_renamed(GtkCellRenderer *renderer, const gchar *path_string, const gchar *name_new, gpointer data) +on_treeview_renamed(GtkCellRenderer *renderer, const gchar *path_string, const gchar *name_new, gpointer user_data) { GtkTreeViewColumn *column; @@ -1124,8 +1136,13 @@ CONFIG_FILE = g_strconcat(geany->app->configdir, G_DIR_SEPARATOR_S, "plugins", G_DIR_SEPARATOR_S, "treebrowser", G_DIR_SEPARATOR_S, "treebrowser.conf", NULL); + flag_on_expand_refresh = FALSE; + 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:[1202] trunk/geany-plugins/treebrowser
by dimitrov-adrian＠users.sourceforge.net 23 Mar '10

23 Mar '10

Revision: 1202 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1202&view=rev Author: dimitrov-adrian Date: 2010-03-23 11:33:11 +0000 (Tue, 23 Mar 2010) Log Message: ----------- Treebrowser, added option when expanding to refresh directory tree, compiler glib warning fix. 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-22 20:55:02 UTC (rev 1201) +++ trunk/geany-plugins/treebrowser/ChangeLog 2010-03-23 11:33:11 UTC (rev 1202) @@ -1,14 +1,22 @@ Development release ChangeLog ----------------------------- -22-03-2010 Adrian Dimitrov <dimitrov.adrian(a)gmail.com> +23-03-2010 Adrian Dimitrov <dimitrov.adrian(a)gmail.com> + * src/treebrowser.c + added option when expanding to refresh directory tree + fixed complier warning with glib + + +22-03-2010 Adrian Dimitrov <dimitrov.adrian(a)gmail.com> + + * src/treebrowser.c fixed some bugs fixed few old compiler warnings applied few patches from Enrico Troger (code improvement) -21-03-2010 Adrian Dimitrov <dimitrov.adrian(a)gmail.com> +21-03-2010 Adrian Dimitrov <dimitrov.adrian(a)gmail.com> * src/treebrowser.c fixed few compile warnings with glib and unused vars @@ -93,7 +101,8 @@ --------------------------- (DONE) codestyle improve to be same as other parts as geany`s (DONE) configuration dialog - * trackick path to current focused document + * trackick path to current focused document (currently now roking on Windows) + * In windows can choice between devices (C:\, D:\,...) * Windows compitable * Language files (DONE) oneclick document opening Modified: trunk/geany-plugins/treebrowser/src/treebrowser.c =================================================================== --- trunk/geany-plugins/treebrowser/src/treebrowser.c 2010-03-22 20:55:02 UTC (rev 1201) +++ trunk/geany-plugins/treebrowser/src/treebrowser.c 2010-03-23 11:33:11 UTC (rev 1202) @@ -4,6 +4,7 @@ * Copyright 2010 Adrian Dimitrov <dimitrov.adrian(a)gmail.com> */ +#include <glib.h> #include <glib/gstdio.h> #include "geanyplugin.h" @@ -41,6 +42,7 @@ static gboolean CONFIG_SHOW_BARS = TRUE; static gboolean CONFIG_CHROOT_ON_DCLICK = FALSE; static gboolean CONFIG_FOLLOW_CURRENT_DOC = TRUE; +static gboolean CONFIG_ON_EXPAND_REFRESH = FALSE; /* ------------------ @@ -757,7 +759,7 @@ gtk_tree_model_get_iter(GTK_TREE_MODEL(treestore), &iter, path); gtk_tree_model_get(GTK_TREE_MODEL(treestore), &iter, - TREEBROWSER_COLUMN_URI, &uri, + TREEBROWSER_COLUMN_URI, &uri, -1); if (g_file_test (uri, G_FILE_TEST_IS_DIR)) @@ -775,6 +777,16 @@ static void on_treeview_row_expanded(GtkWidget *widget, GtkTreeIter *iter, GtkTreePath *path, gpointer user_data) { + gchar *uri; + + gtk_tree_model_get_iter(GTK_TREE_MODEL(treestore), iter, path); + gtk_tree_model_get(GTK_TREE_MODEL(treestore), iter, + TREEBROWSER_COLUMN_URI, &uri, + -1); + + if (CONFIG_ON_EXPAND_REFRESH) + treebrowser_browse(uri, iter, CONFIG_INITIAL_DIR_DEEP); + gtk_tree_store_set(treestore, iter, TREEBROWSER_COLUMN_ICON, GTK_STOCK_OPEN, -1); } @@ -964,6 +976,8 @@ GtkWidget *SHOW_BARS; GtkWidget *CHROOT_ON_DCLICK; GtkWidget *FOLLOW_CURRENT_DOC; + GtkWidget *ON_EXPAND_REFRESH; + } configure_widgets; static void @@ -973,14 +987,15 @@ g_key_file_load_from_file(config, CONFIG_FILE, G_KEY_FILE_NONE, NULL); - CONFIG_OPEN_EXTERNAL_CMD = utils_get_setting_string(config, "treebrowser", "open_external_cmd", CONFIG_OPEN_EXTERNAL_CMD); - CONFIG_INITIAL_DIR_DEEP = utils_get_setting_integer(config, "treebrowser", "initial_dir_deep", CONFIG_INITIAL_DIR_DEEP); - CONFIG_REVERSE_FILTER = utils_get_setting_boolean(config, "treebrowser", "reverse_filter", CONFIG_REVERSE_FILTER); - CONFIG_ONE_CLICK_CHDOC = utils_get_setting_boolean(config, "treebrowser", "one_click_chdoc", CONFIG_ONE_CLICK_CHDOC); - CONFIG_SHOW_HIDDEN_FILES = utils_get_setting_boolean(config, "treebrowser", "show_hidden_files", CONFIG_SHOW_HIDDEN_FILES); - CONFIG_SHOW_BARS = utils_get_setting_boolean(config, "treebrowser", "show_bars", CONFIG_SHOW_BARS); - CONFIG_CHROOT_ON_DCLICK = utils_get_setting_boolean(config, "treebrowser", "chroot_on_dclick", CONFIG_CHROOT_ON_DCLICK); - CONFIG_FOLLOW_CURRENT_DOC = utils_get_setting_boolean(config, "treebrowser", "follow_current_doc", CONFIG_FOLLOW_CURRENT_DOC); + CONFIG_OPEN_EXTERNAL_CMD = utils_get_setting_string(config, "treebrowser", "open_external_cmd", CONFIG_OPEN_EXTERNAL_CMD); + CONFIG_INITIAL_DIR_DEEP = utils_get_setting_integer(config, "treebrowser", "initial_dir_deep", CONFIG_INITIAL_DIR_DEEP); + CONFIG_REVERSE_FILTER = utils_get_setting_boolean(config, "treebrowser", "reverse_filter", CONFIG_REVERSE_FILTER); + CONFIG_ONE_CLICK_CHDOC = utils_get_setting_boolean(config, "treebrowser", "one_click_chdoc", CONFIG_ONE_CLICK_CHDOC); + CONFIG_SHOW_HIDDEN_FILES = utils_get_setting_boolean(config, "treebrowser", "show_hidden_files", CONFIG_SHOW_HIDDEN_FILES); + CONFIG_SHOW_BARS = utils_get_setting_boolean(config, "treebrowser", "show_bars", CONFIG_SHOW_BARS); + CONFIG_CHROOT_ON_DCLICK = utils_get_setting_boolean(config, "treebrowser", "chroot_on_dclick", CONFIG_CHROOT_ON_DCLICK); + CONFIG_FOLLOW_CURRENT_DOC = utils_get_setting_boolean(config, "treebrowser", "follow_current_doc", CONFIG_FOLLOW_CURRENT_DOC); + CONFIG_ON_EXPAND_REFRESH = utils_get_setting_boolean(config, "treebrowser", "on_expand_refresh", CONFIG_ON_EXPAND_REFRESH); g_key_file_free(config); } @@ -1003,6 +1018,7 @@ 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) @@ -1018,6 +1034,7 @@ 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); @@ -1084,6 +1101,11 @@ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(configure_widgets.CHROOT_ON_DCLICK), CONFIG_CHROOT_ON_DCLICK); gtk_box_pack_start(GTK_BOX(vbox), configure_widgets.CHROOT_ON_DCLICK, FALSE, FALSE, 0); + configure_widgets.ON_EXPAND_REFRESH = gtk_check_button_new_with_label(_("On expand, refresh directory view")); + gtk_button_set_focus_on_click(GTK_BUTTON(configure_widgets.ON_EXPAND_REFRESH), FALSE); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(configure_widgets.ON_EXPAND_REFRESH), CONFIG_ON_EXPAND_REFRESH); + gtk_box_pack_start(GTK_BOX(vbox), configure_widgets.ON_EXPAND_REFRESH, FALSE, FALSE, 0); + gtk_widget_show_all(vbox); g_signal_connect(dialog, "response", G_CALLBACK(on_configure_response), NULL); 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