Plugins-Commits January 2011

plugins-commits@lists.geany.org

8 participants
110 discussions

SF.net SVN: geany-plugins:[1877] trunk/geany-plugins/geanycfp/src/geanycfp. c
by wfraser＠users.sourceforge.net 26 Jan '11

26 Jan '11

Revision: 1877 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1877&view=rev Author: wfraser Date: 2011-01-26 22:10:20 +0000 (Wed, 26 Jan 2011) Log Message: ----------- added compiler tests to avoid tree functions not available in Gtk VERSIONS BELOW 2.10 Fixed spelling mistake in comment Removed unreacheble code in funcion GetFileData replaced g_strcmp0 with strcmp to avoid compiler warnings replaced g_sprintf with g_strdup_printf and sprintf to avoid compiler warnnings replaced g_ascii_strtoll with strtoll to avoid compiler warnings Removed GTK base64 conversion to avoid using GTK 2.12 functions Modified Paths: -------------- trunk/geany-plugins/geanycfp/src/geanycfp.c Modified: trunk/geany-plugins/geanycfp/src/geanycfp.c =================================================================== --- trunk/geany-plugins/geanycfp/src/geanycfp.c 2011-01-26 18:42:41 UTC (rev 1876) +++ trunk/geany-plugins/geanycfp/src/geanycfp.c 2011-01-26 22:10:20 UTC (rev 1877) @@ -21,6 +21,21 @@ #include <gdk/gdkkeysyms.h> #include <gtk/gtk.h> +static const gint base64_char_to_int[]= +{ + 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, + 255,255,255,255,255,255,255,255,255,255,255,255,255,255,255,255, + 255,255,255,255,255,255,255,255,255,255,255, 62,255,255,255, 63, + 52, 53, 54, 55, 56, 57, 58, 59, 60, 61,255,255,255, 0,255,255, + 255, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, + 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25,255,255,255,255,255, + 255, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, + 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51,255,255,255,255,255 +}; + +static const gchar base64_int_to_char[]= + "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; + /* offset for marker numbers used - to bypass markers used by normal bookmarksetc */ #define BOOKMARK_BASE 10 @@ -498,7 +513,7 @@ me=g_new0(MacroEvent,1); /* get event number */ - me->message=g_ascii_strtoll(s[(*k)++],NULL,10); + me->message=strtoll(s[(*k)++],NULL,10); /* now handle lparam if required */ switch(me->message) @@ -553,14 +568,12 @@ static gboolean Notification_Handler(GObject *obj, GeanyEditor *editor, SCNotification *nt, gpointer user_data) { - gchar cTemp[100]; + gchar *cTemp,*cFoldData=NULL; MacroEvent *me; ScintillaObject* sci=document_get_current()->editor->sci; - gint i,k,iFlags,iBitCounter,iLineCount; - guchar* guFoldData=NULL; + gint i,iBits,iFlags,iBitCounter,iLineCount; FileData* fdTemp; GSList * gslTemp=foldingToReApply; - gsize gs; /* setting fold states may have been delayed until after folding points were calculated before * paint so wait for a re-paint and check to see if any folding data needs applying @@ -574,7 +587,8 @@ if(utils_str_equal(document_get_current()->file_name,fdTemp->pcFileName)==TRUE) { /* get fold data */ - guFoldData=g_base64_decode(fdTemp->pcFolding,(gsize*)&gs); + cFoldData=fdTemp->pcFolding; + /* remove FileData from list needing folds re-applying */ foldingToReApply=g_slist_delete_link(foldingToReApply,gslTemp); break; @@ -585,31 +599,33 @@ } /* if there is folding data then set folds */ - if(guFoldData!=NULL) + if(cFoldData!=NULL) { iLineCount=scintilla_send_message(sci,SCI_GETLINECOUNT,0,0); /* go through lines setting fold status */ - for(i=0,k=0,iBitCounter=0;i<iLineCount;i++) + for(i=0,iBitCounter=6;i<iLineCount;i++) { iFlags=scintilla_send_message(sci,SCI_GETFOLDLEVEL,i,0); /* ignore non-folding lines */ if((iFlags & SC_FOLDLEVELHEADERFLAG)==0) - continue; + continue; + /* get next 6 fold states if needed */ + if(iBitCounter==6) + { + iBitCounter=0; + iBits=base64_char_to_int[(gint)(*cFoldData)]; + cFoldData++; + } + /* set fold if needed */ - if(((guFoldData[k]>>iBitCounter)&1)==0) + if(((iBits>>iBitCounter)&1)==0) scintilla_send_message(sci,SCI_TOGGLEFOLD,i,0); /* increment counter */ iBitCounter++; - if(iBitCounter<8) - continue; - - iBitCounter=0; - k++; } - g_free(guFoldData); } } @@ -680,8 +696,9 @@ case SCI_LINEENDDISPLAYEXTEND: break; default: - g_sprintf(cTemp,_("Unrecognised message\n%i %i %i"),nt->message,nt->wParam,nt->lParam); + cTemp=g_strdup_printf(_("Unrecognised message\n%i %i %i"),nt->message,nt->wParam,nt->lParam); dialogs_show_msgbox(GTK_MESSAGE_INFO,cTemp); + g_free(cTemp); return FALSE; } me=g_new0(MacroEvent,1); @@ -790,7 +807,6 @@ fdTemp=fdTemp->NextNode; } - retrun NULL; } @@ -843,7 +859,7 @@ { if(fdTemp->iBookmark[i]!=-1) { - g_sprintf(pszMarkers,"%d",fdTemp->iBookmark[i]); + sprintf(pszMarkers,"%d",fdTemp->iBookmark[i]); while(pszMarkers[0]!=0) pszMarkers++; } @@ -1006,7 +1022,7 @@ /* Bookmark entries are initialized to -1, so only need to parse non-empty slots */ if(pcKey[0]!=',' && pcKey[0]!=0) { - fdTemp->iBookmark[l]=g_ascii_strtoll(pcKey,NULL,10); + fdTemp->iBookmark[l]=strtoll(pcKey,NULL,10); while(pcKey[0]!=0 && pcKey[0]!=',') pcKey++; } @@ -1220,19 +1236,26 @@ /* remember if folded or not */ guiFold|=(iFlags&1)<<iBitCounter; iBitCounter++; - if(iBitCounter<8) + if(iBitCounter<6) continue; - /* if have 8 bits then store these */ + /* if have 6 bits then store these */ iBitCounter=0; + guiFold=(guint8)base64_int_to_char[guiFold]; g_byte_array_append(gbaFoldData,&guiFold,1); guiFold=0; } /* flush buffer */ - if(iBitCounter!=0) g_byte_array_append(gbaFoldData,&guiFold,1); + if(iBitCounter!=0) + { + guiFold=(guint8)base64_int_to_char[guiFold]; + g_byte_array_append(gbaFoldData,&guiFold,1); + } + /* transfer data to text string */ - fdTemp->pcFolding=g_base64_encode(gbaFoldData->data,gbaFoldData->len); + fdTemp->pcFolding=g_strndup((gchar*)(gbaFoldData->data),gbaFoldData->len); + /* free byte array space */ g_byte_array_free(gbaFoldData,TRUE); @@ -1809,7 +1832,7 @@ while(gsl!=NULL) { mTemp=(Macro*)(gsl->data); - if(mTemp!=m && g_strcmp0(new_text,mTemp->name)==0) + if(mTemp!=m && strcmp(new_text,mTemp->name)==0) return; gsl=g_slist_next(gsl); @@ -1824,7 +1847,8 @@ bMacrosHaveChanged=TRUE; } - +/* only allow render edit if GTK high enough version */ +#if GTK_CHECK_VERSION(2,10,0) /* handle a change in macro trigger accelerator key in the edit macro dialog */ static void Accel_Render_Edited_CallBack(GtkCellRendererAccel *cell,gchar *iter_id,guint key, GdkModifierType mods,guint keycode,gpointer data) @@ -1872,8 +1896,8 @@ bMacrosHaveChanged=TRUE; } +#endif - /* do editing of existing macros */ static void DoEditMacro(GtkMenuItem *menuitem, gpointer gdata) { @@ -1916,7 +1940,10 @@ /* create table */ table=gtk_tree_view_new_with_model(GTK_TREE_MODEL(ls)); +/* only allow grid lines if GTK high enough version (cosmetic so no biggie if absent)*/ +#if GTK_CHECK_VERSION(2,10,0) gtk_tree_view_set_grid_lines(GTK_TREE_VIEW(table),GTK_TREE_VIEW_GRID_LINES_BOTH); +#endif /* add columns */ renderer=gtk_cell_renderer_text_new(); @@ -1927,8 +1954,15 @@ renderer= gtk_cell_renderer_accel_new(); column=gtk_tree_view_column_new_with_attributes(_("Key Trigger"),renderer,"text",1,NULL); +/* only allow render edit if GTK high enough version. Shame to loose this function, but not the + * end of the world. I may time permitting write my own custom renderer +*/ +#if GTK_CHECK_VERSION(2,10,0) g_signal_connect(renderer,"accel-edited",G_CALLBACK(Accel_Render_Edited_CallBack),table); g_object_set(renderer,"editable",TRUE,NULL); +#else + g_object_set(renderer,"editable",FALSE,NULL); +#endif gtk_tree_view_append_column(GTK_TREE_VIEW(table),column); 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:[1876] trunk/geany-plugins
by frlan＠users.sourceforge.net 26 Jan '11

26 Jan '11

Revision: 1876 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1876&view=rev Author: frlan Date: 2011-01-26 18:42:41 +0000 (Wed, 26 Jan 2011) Log Message: ----------- Add new plugin HTMLTable Modified Paths: -------------- trunk/geany-plugins/Makefile.am trunk/geany-plugins/configure.ac trunk/geany-plugins/po/POTFILES.in Added Paths: ----------- trunk/geany-plugins/build/htmltable.m4 trunk/geany-plugins/htmltable/ trunk/geany-plugins/htmltable/AUTHORS trunk/geany-plugins/htmltable/COPYING trunk/geany-plugins/htmltable/ChangeLog trunk/geany-plugins/htmltable/Makefile.am trunk/geany-plugins/htmltable/NEWS trunk/geany-plugins/htmltable/README trunk/geany-plugins/htmltable/src/ trunk/geany-plugins/htmltable/src/Makefile.am trunk/geany-plugins/htmltable/src/htmltable.c trunk/geany-plugins/htmltable/wscript_build Modified: trunk/geany-plugins/Makefile.am =================================================================== --- trunk/geany-plugins/Makefile.am 2011-01-26 18:41:42 UTC (rev 1875) +++ trunk/geany-plugins/Makefile.am 2011-01-26 18:42:41 UTC (rev 1876) @@ -13,6 +13,7 @@ geanyprj \ geanysendmail \ geanyvc \ + htmltable \ pretty-printer \ shiftcolumn \ spellcheck \ Added: trunk/geany-plugins/build/htmltable.m4 =================================================================== --- trunk/geany-plugins/build/htmltable.m4 (rev 0) +++ trunk/geany-plugins/build/htmltable.m4 2011-01-26 18:42:41 UTC (rev 1876) @@ -0,0 +1,9 @@ +AC_DEFUN([GP_CHECK_HTMLTABLE], +[ + GP_ARG_DISABLE([HTMLTable], [yes]) + GP_STATUS_PLUGIN_ADD([HTMLTable], [$enable_htmltable]) + AC_CONFIG_FILES([ + htmltable/Makefile + htmltable/src/Makefile + ]) +]) Modified: trunk/geany-plugins/configure.ac =================================================================== --- trunk/geany-plugins/configure.ac 2011-01-26 18:41:42 UTC (rev 1875) +++ trunk/geany-plugins/configure.ac 2011-01-26 18:42:41 UTC (rev 1876) @@ -36,6 +36,7 @@ GP_CHECK_GEANYPRJ GP_CHECK_GEANYSENDMAIL GP_CHECK_GEANYVC +GP_CHECK_HTMLTABLE GP_CHECK_PRETTYPRINTER GP_CHECK_SHIFTCOLUMN GP_CHECK_SPELLCHECK Added: trunk/geany-plugins/htmltable/AUTHORS =================================================================== Added: trunk/geany-plugins/htmltable/COPYING =================================================================== Added: trunk/geany-plugins/htmltable/ChangeLog =================================================================== --- trunk/geany-plugins/htmltable/ChangeLog (rev 0) +++ trunk/geany-plugins/htmltable/ChangeLog 2011-01-26 18:42:41 UTC (rev 1876) @@ -0,0 +1,3 @@ +2011-01-26 Frank Lanitz <frank(a)frank.uvena.de> + + * Initial Entry. New plugin: HTMLTable. Added: trunk/geany-plugins/htmltable/Makefile.am =================================================================== --- trunk/geany-plugins/htmltable/Makefile.am (rev 0) +++ trunk/geany-plugins/htmltable/Makefile.am 2011-01-26 18:42:41 UTC (rev 1876) @@ -0,0 +1,8 @@ +if ENABLE_HTMLTABLE +include $(top_srcdir)/build/vars.auxfiles.mk +else +include $(top_srcdir)/build/vars.docs.mk +endif + +SUBDIRS = src +plugin = htmltable Added: trunk/geany-plugins/htmltable/NEWS =================================================================== Added: trunk/geany-plugins/htmltable/README =================================================================== --- trunk/geany-plugins/htmltable/README (rev 0) +++ trunk/geany-plugins/htmltable/README 2011-01-26 18:42:41 UTC (rev 1876) @@ -0,0 +1,82 @@ +HTMLTable +----------- + +.. contents:: + +About +------ +HTMLTable is a plugin which helps on converting a tabulator +separated selection into a HTML-like table. + + +Installation +------------ + +This version of the plugin is installed with the combined +geany-plugins release. Please check README of this package + + +Usage +----- + +After installed successfully, load the plugin in Geany's plugin +manager. This will add a new keybinding into Geany's list of +keybindings inside the preferences dialog. You might like to set up +a keybinding for the function. Once this is done, the plugin is +ready to use. + +When using the plugin, just mark the area you like to transform and +push your keybinding. All line endings will be token as end of a row +and therefor transformed to <tr> and </tr>. Occurrences of tabulator +will be interpreted as column separators and replaced by <td> and +</td>. + +Rectangle selections are currently not supported and might lead to +some weird output you didn't expect -- just don't try it if you have +heart issues or working on an important document :) + +Development +----------- + +You can checkout the current source code from the Subversion repository at +Sourceforge.net. Get the code from: + +svn checkout +http://geany-plugins.svn.sourceforge.net/svnroot/geany-plugins/trunk/geany-plugins/htmltable + +If you want to create a patch, please respect the license of +HTMLTable as well as intellectual property of third. Patches that +should be included to the default distribution must be licensed under +the same conditions as HTMLTable by the copyright owner (GPL2+). + + +Known issues +------------ + +The plugin currently is not supporting rectangle selections very +well. Also it is not able to support <thead> and <tbody> at the +moment. However, at least the second point is planned for some later +release. + +For more recent information all reported issues will be tracked at +http://sourceforge.net/tracker/?group_id=222729 + + +License +------- + +HTMLTable and all its parts is distributed 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. A copy of this license can be found in the file COPYING +included with the source code of this program. If not, you will be +able to get a copy by contacting the Free Software Foundation, Inc., +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + + +Bugs, questions, bugs, homepage +------------------------------- + +If you found any bugs or want to provide a patch, please contact Frank +Lanitz (frank(at)geany(dot)org). Please also do so, if you got any +questions. Added: trunk/geany-plugins/htmltable/src/Makefile.am =================================================================== --- trunk/geany-plugins/htmltable/src/Makefile.am (rev 0) +++ trunk/geany-plugins/htmltable/src/Makefile.am 2011-01-26 18:42:41 UTC (rev 1876) @@ -0,0 +1,10 @@ +include $(top_srcdir)/build/vars.build.mk + +if ENABLE_HTMLTABLE +geanyplugins_LTLIBRARIES = htmltable.la +else +EXTRA_LTLIBRARIES = htmltable.la +endif + +htmltable_la_SOURCES = htmltable.c +htmltable_la_LIBADD = $(COMMONLIBS) Added: trunk/geany-plugins/htmltable/src/htmltable.c =================================================================== --- trunk/geany-plugins/htmltable/src/htmltable.c (rev 0) +++ trunk/geany-plugins/htmltable/src/htmltable.c 2011-01-26 18:42:41 UTC (rev 1876) @@ -0,0 +1,148 @@ +/* + * htmltable.c + * + * Copyright 2011 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 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. + */ + +#include "geanyplugin.h" + +GeanyPlugin *geany_plugin; +GeanyData *geany_data; +GeanyFunctions *geany_functions; + +PLUGIN_VERSION_CHECK(200) + +PLUGIN_SET_TRANSLATABLE_INFO( + LOCALEDIR, GETTEXT_PACKAGE, _("HTMLTable"), + _("A little plugin to convert list into HTML-like tables"), + VERSION, "Frank Lanitz <frank(a)frank.uvena.de>"); + +enum +{ + KB_HTMLTABLE_CONVERT_TO_TABLE, + COUNT_KB +}; + + +void convert_to_table(gboolean header) +{ + GeanyDocument *doc = NULL; + doc = document_get_current(); + + g_return_if_fail(doc != NULL); + + if (sci_has_selection(doc->editor->sci)) + { + gchar *selection = NULL; + gchar **rows = NULL; + GString *replacement_str = NULL; + gchar *replacement = NULL; + + /* Actually grabbing selection and splitting it into single + * lines we will work on later */ + selection = sci_get_selection_contents(doc->editor->sci); + rows = g_strsplit_set(selection, "\r\n", -1); + g_free(selection); + + /* Checking whether we do have something we can work on - Returning if not */ + if (rows != NULL) + { + + /* Adding header to replacement */ + replacement_str = g_string_new("<table>\n"); + + /* Iteration onto rows and building up lines of table for + * replacement */ + + if (header == TRUE) + { + /* If the first line is given to be a header, we do use + * <thead> and <tbody> inside table for real XHTML */ + } + else + { + /* There is no header at selection. */ + guint i; + guint j; + for (i = 0; rows[i] != NULL ; i++) + { + gchar **columns = NULL; + columns = g_strsplit_set(rows[i], "\t", -1); + g_string_append(replacement_str, "\t<tr>\n"); + for (j = 0; columns[j] != NULL; j++) + { + g_string_append(replacement_str, "\t\t<td>"); + g_string_append(replacement_str, columns[j]); + g_string_append(replacement_str, "</td>\n"); + } + g_string_append(replacement_str, + "\t</tr>\n"); + g_free(columns); + } + } + + /* Adding the footer of table */ + g_string_append(replacement_str, "</table>\n"); + + /* Replacing selection with new table */ + replacement = g_string_free(replacement_str, FALSE); + sci_replace_sel(doc->editor->sci, replacement); + + g_free(rows); + g_free(replacement); + } + else + { + /* OK. Something went not as expected. + * We did have a selection but cannot parse it into rows. + * Aborting */ + g_warning(_("Something went went wrong on parsing selection. Aborting")); + return; + } + } /* Selection was gien -- end + * in case of there was no selection we are just doing nothing */ + return; +} + +void kb_convert_to_table(G_GNUC_UNUSED guint key_id) +{ + g_return_if_fail(document_get_current() != NULL); + convert_to_table(FALSE); +} + + +static void init_keybindings(void) +{ + GeanyKeyGroup *key_group; + key_group = plugin_set_key_group(geany_plugin, "htmltable", COUNT_KB, NULL); + keybindings_set_item(key_group, KB_HTMLTABLE_CONVERT_TO_TABLE, + kb_convert_to_table, 0, 0, "convert_to_table", + _("Convert selection to table"), NULL); +} + + +void plugin_init(GeanyData *data) +{ + init_keybindings(); + main_locale_init(LOCALEDIR, GETTEXT_PACKAGE); +} + + +void plugin_cleanup(void) +{ + /* We don't need to do anything here at the moment */ +} Added: trunk/geany-plugins/htmltable/wscript_build =================================================================== --- trunk/geany-plugins/htmltable/wscript_build (rev 0) +++ trunk/geany-plugins/htmltable/wscript_build 2011-01-26 18:42:41 UTC (rev 1876) @@ -0,0 +1,30 @@ +# -*- coding: utf-8 -*- +# +# WAF build script for geany-plugins - HTMLTable +# +# Copyright 2010 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de> +# Copyright 2111 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 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. +# +# $Id$ + +from build.wafutils import build_plugin + + +name = 'HTMLTable' +includes = ['htmltable/src'] + +build_plugin(bld, name, includes=includes) Modified: trunk/geany-plugins/po/POTFILES.in =================================================================== --- trunk/geany-plugins/po/POTFILES.in 2011-01-26 18:41:42 UTC (rev 1875) +++ trunk/geany-plugins/po/POTFILES.in 2011-01-26 18:42:41 UTC (rev 1876) @@ -83,6 +83,9 @@ geanyvc/src/vc_svn.c geanyvc/src/utils.c +# htmltable +htmltable/src/htmltable.c + # Spell Check spellcheck/src/speller.c spellcheck/src/scplugin.c 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:[1875] trunk/geany-plugins/geanylipsum/README
by frlan＠users.sourceforge.net 26 Jan '11

26 Jan '11

Revision: 1875 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1875&view=rev Author: frlan Date: 2011-01-26 18:41:42 +0000 (Wed, 26 Jan 2011) Log Message: ----------- GeanyLipsum: Minimal update of README Modified Paths: -------------- trunk/geany-plugins/geanylipsum/README Modified: trunk/geany-plugins/geanylipsum/README =================================================================== --- trunk/geany-plugins/geanylipsum/README 2011-01-26 18:41:08 UTC (rev 1874) +++ trunk/geany-plugins/geanylipsum/README 2011-01-26 18:41:42 UTC (rev 1875) @@ -44,7 +44,7 @@ If you want to create a patch, please respect the license of GeanyLipsum as well as intellectual property of third. Patches that should be included to the default distribution must be licensed under -the same conditions as GeanyLipsum by the copyright owner. +the same conditions as GeanyLipsum by the copyright owner (GPL2+). Known issues @@ -71,8 +71,11 @@ Bugs, questions, bugs, homepage ------------------------------- -If you found any bugs or want to provide a patch, please contact Frank -Lanitz (frank(at)geany(dot)org). Please also do so, if you got any -questions and visiting http://frank.uvena.de/en/Geany/geanylipsum -didn't help you to figure out the answer. Visiting the website is also -a good start if you want to check for any update on this plugin. +If you found any bugs or want to provide a patch, please contact +Frank Lanitz (frank(at)geany(dot)org). Please also do so, if you got +any questions and visiting http://plugins.geany.org didn't help you +to figure out the answer. Visiting the website is also a good start +if you want to check for any update on this plugin. + +A more historical page can be found at +http://frank.uvena.de/en/Geany/geanylipsum 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:[1874] trunk/geanylatex/src/latexutils.c
by frlan＠users.sourceforge.net 26 Jan '11

26 Jan '11

Revision: 1874 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1874&view=rev Author: frlan Date: 2011-01-26 18:41:08 +0000 (Wed, 26 Jan 2011) Log Message: ----------- GeanyLaTeX: Remove debug output Modified Paths: -------------- trunk/geanylatex/src/latexutils.c Modified: trunk/geanylatex/src/latexutils.c =================================================================== --- trunk/geanylatex/src/latexutils.c 2011-01-23 14:26:05 UTC (rev 1873) +++ trunk/geanylatex/src/latexutils.c 2011-01-26 18:41:08 UTC (rev 1874) @@ -32,7 +32,6 @@ if (data != NULL) { - g_warning("Content eingelesen: \n %s", data); result = g_strsplit_set(data, "\r\n", -1); g_free(data); return result; 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:[1873] trunk/geany-plugins/webhelper/src/ gwh-browser.c
by colombanw＠users.sourceforge.net 23 Jan '11

23 Jan '11

Revision: 1873 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1873&view=rev Author: colombanw Date: 2011-01-23 14:26:05 +0000 (Sun, 23 Jan 2011) Log Message: ----------- WebHelper: Fix focus grabbing after inspector window closing Modified Paths: -------------- trunk/geany-plugins/webhelper/src/gwh-browser.c Modified: trunk/geany-plugins/webhelper/src/gwh-browser.c =================================================================== --- trunk/geany-plugins/webhelper/src/gwh-browser.c 2011-01-23 14:25:37 UTC (rev 1872) +++ trunk/geany-plugins/webhelper/src/gwh-browser.c 2011-01-23 14:26:05 UTC (rev 1873) @@ -291,7 +291,7 @@ inspector_hide_window (self); gtk_toggle_tool_button_set_active (GTK_TOGGLE_TOOL_BUTTON (self->priv->item_inspector), FALSE); - gtk_widget_grab_focus (self->priv->web_view); + gtk_widget_grab_focus (gtk_widget_get_toplevel (self->priv->web_view)); return TRUE; } 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:[1872] trunk/geany-plugins/webhelper/src
by colombanw＠users.sourceforge.net 23 Jan '11

23 Jan '11

Revision: 1872 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1872&view=rev Author: colombanw Date: 2011-01-23 14:25:37 +0000 (Sun, 23 Jan 2011) Log Message: ----------- WebHelper: Allow the user to choose some windows settings Since not all user use the separated windows the same way, nor all window manager really handle some hints the same way, allow the user to configure them as they want. Modified Paths: -------------- trunk/geany-plugins/webhelper/src/gwh-browser.c trunk/geany-plugins/webhelper/src/gwh-plugin.c trunk/geany-plugins/webhelper/src/gwh-utils.h Modified: trunk/geany-plugins/webhelper/src/gwh-browser.c =================================================================== --- trunk/geany-plugins/webhelper/src/gwh-browser.c 2011-01-23 14:25:10 UTC (rev 1871) +++ trunk/geany-plugins/webhelper/src/gwh-browser.c 2011-01-23 14:25:37 UTC (rev 1872) @@ -41,7 +41,13 @@ # define gtk_widget_get_visible(w) \ (GTK_WIDGET_VISIBLE (w)) # endif /* defined (gtk_widget_get_visible) */ -#endif +#endif /* GTK_CHECK_VERSION (2, 18, 0) */ +#if ! GTK_CHECK_VERSION (2, 20, 0) +# ifndef gtk_widget_get_mapped +# define gtk_widget_get_mapped(w) \ + (GTK_WIDGET_MAPPED ((w))) +# endif /* defined (gtk_widget_get_mapped) */ +#endif /* GTK_CHECK_VERSION (2, 20, 0) */ struct _GwhBrowserPrivate @@ -179,6 +185,39 @@ g_free (geometry); } +static void +on_settings_wm_windows_skip_taskbar_notify (GObject *object, + GParamSpec *pspec, + GwhBrowser *self) +{ + gboolean skips_taskbar; + + g_object_get (object, pspec->name, &skips_taskbar, NULL); + gtk_window_set_skip_taskbar_hint (GTK_WINDOW (self->priv->inspector_window), + skips_taskbar); +} + +static void +on_settings_wm_windows_type_notify (GObject *object, + GParamSpec *pspec, + GwhBrowser *self) +{ + gint type; + gboolean remap = gtk_widget_get_mapped (self->priv->inspector_window); + + /* We need to remap the window if we change its type because it's not doable + * when mapped. So, hack around. */ + + g_object_get (object, pspec->name, &type, NULL); + if (remap) { + gtk_widget_unmap (self->priv->inspector_window); + } + gtk_window_set_type_hint (GTK_WINDOW (self->priv->inspector_window), type); + if (remap) { + gtk_widget_map (self->priv->inspector_window); + } +} + /* web inspector events handling */ #define INSPECTOR_DETACHED(self) \ @@ -768,11 +807,40 @@ return toolbar; } +static GtkWidget * +create_inspector_window (GwhBrowser *self) +{ + gboolean skips_taskbar; + gboolean window_type; + + g_object_get (self->priv->settings, + "wm-secondary-windows-skip-taskbar", &skips_taskbar, + "wm-secondary-windows-type", &window_type, + NULL); + self->priv->inspector_window_x = self->priv->inspector_window_y = 0; + self->priv->inspector_window = g_object_new (GTK_TYPE_WINDOW, + "type", GTK_WINDOW_TOPLEVEL, + "skip-taskbar-hint", skips_taskbar, + "type-hint", window_type, + "title", _("Web inspector"), + NULL); + g_signal_connect (self->priv->inspector_window, "delete-event", + G_CALLBACK (on_inspector_window_delete_event), self); + g_signal_connect (self->priv->settings, "notify::wm-secondary-windows-skip-taskbar", + G_CALLBACK (on_settings_wm_windows_skip_taskbar_notify), self); + g_signal_connect (self->priv->settings, "notify::wm-secondary-windows-type", + G_CALLBACK (on_settings_wm_windows_type_notify), self); + gtk_container_add (GTK_CONTAINER (self->priv->inspector_window), + self->priv->inspector_view); + + return self->priv->inspector_window; +} + static void gwh_browser_init (GwhBrowser *self) { - GtkWidget *scrolled; - WebKitWebSettings *wkws; + GtkWidget *scrolled; + WebKitWebSettings *wkws; self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, GWH_TYPE_BROWSER, GwhBrowserPrivate); @@ -806,16 +874,7 @@ gtk_container_add (GTK_CONTAINER (self->priv->inspector_view), self->priv->inspector_web_view); - self->priv->inspector_window_x = self->priv->inspector_window_y = 0; - self->priv->inspector_window = g_object_new (GTK_TYPE_WINDOW, - "type", GTK_WINDOW_TOPLEVEL, - "skip-taskbar-hint", TRUE, - "title", _("Web inspector"), - NULL); - g_signal_connect (self->priv->inspector_window, "delete-event", - G_CALLBACK (on_inspector_window_delete_event), self); - gtk_container_add (GTK_CONTAINER (self->priv->inspector_window), - self->priv->inspector_view); + self->priv->inspector_window = create_inspector_window (self); g_signal_connect (self, "notify::orientation", G_CALLBACK (on_orientation_notify), self); Modified: trunk/geany-plugins/webhelper/src/gwh-plugin.c =================================================================== --- trunk/geany-plugins/webhelper/src/gwh-plugin.c 2011-01-23 14:25:10 UTC (rev 1871) +++ trunk/geany-plugins/webhelper/src/gwh-plugin.c 2011-01-23 14:25:37 UTC (rev 1872) @@ -127,21 +127,38 @@ static GtkWidget * create_separate_window (void) { - GtkWidget *window; + GtkWidget *window; + gboolean skips_taskbar; + gboolean is_transient; + gint window_type; + g_object_get (G_settings, + "wm-secondary-windows-skip-taskbar", &skips_taskbar, + "wm-secondary-windows-are-transient", &is_transient, + "wm-secondary-windows-type", &window_type, + NULL); window = g_object_new (GTK_TYPE_WINDOW, "type", GTK_WINDOW_TOPLEVEL, - "skip-taskbar-hint", TRUE, + "skip-taskbar-hint", skips_taskbar, "title", _("Web view"), "deletable", FALSE, + "type-hint", window_type, NULL); g_signal_connect (window, "delete-event", G_CALLBACK (on_separate_window_delete_event), NULL); g_signal_connect (window, "destroy", G_CALLBACK (on_separate_window_destroy), NULL); gtk_container_add (GTK_CONTAINER (window), G_browser); - gtk_window_set_transient_for (GTK_WINDOW (window), - GTK_WINDOW (geany_data->main_widgets->window)); + if (is_transient) { + gtk_window_set_transient_for (GTK_WINDOW (window), + GTK_WINDOW (geany_data->main_widgets->window)); + } else { + GList *icons; + + icons = gtk_window_get_icon_list (GTK_WINDOW (geany_data->main_widgets->window)); + gtk_window_set_icon_list (GTK_WINDOW (window), icons); + g_list_free (icons); + } gwh_browser_set_inspector_transient_for (GWH_BROWSER (G_browser), GTK_WINDOW (window)); @@ -218,6 +235,20 @@ } static void +on_settings_windows_attrs_notify (GObject *object, + GParamSpec *pspec, + gpointer data) +{ + /* recreate the window to apply the new attributes */ + if (G_container.type == CONTAINER_WINDOW) { + g_object_ref (G_browser); + detach_browser (); + attach_browser (); + g_object_unref (G_browser); + } +} + +static void on_document_save (GObject *obj, GeanyDocument *doc, gpointer user_data) @@ -329,6 +360,25 @@ "Last geometry of the inspector window", "400x300", G_PARAM_READWRITE)); + gwh_settings_install_property (G_settings, g_param_spec_boolean ( + "wm-secondary-windows-skip-taskbar", + "Secondary windows skip task bar", + "Whether to tell the window manager not to show the secondary windows in the task bar", + TRUE, + G_PARAM_READWRITE)); + gwh_settings_install_property (G_settings, g_param_spec_boolean ( + "wm-secondary-windows-are-transient", + "Secondary windows are transient", + "Whether secondary windows are transient children of their parent", + TRUE, + G_PARAM_READWRITE)); + gwh_settings_install_property (G_settings, g_param_spec_enum ( + "wm-secondary-windows-type", + "Secondary windows type", + "The type of the secondary windows", + GWH_TYPE_WINDOW_TYPE, + GWH_WINDOW_TYPE_NORMAL, + G_PARAM_READWRITE)); path = get_config_filename (); if (! gwh_settings_load_from_file (G_settings, path, &err)) { @@ -379,6 +429,15 @@ plugin_signal_connect (geany_plugin, G_OBJECT (G_settings), "notify::browser-position", FALSE, G_CALLBACK (on_settings_browser_position_notify), NULL); + plugin_signal_connect (geany_plugin, G_OBJECT (G_settings), + "notify::wm-secondary-windows-skip-taskbar", FALSE, + G_CALLBACK (on_settings_windows_attrs_notify), NULL); + plugin_signal_connect (geany_plugin, G_OBJECT (G_settings), + "notify::wm-secondary-windows-are-transient", FALSE, + G_CALLBACK (on_settings_windows_attrs_notify), NULL); + plugin_signal_connect (geany_plugin, G_OBJECT (G_settings), + "notify::wm-secondary-windows-type", FALSE, + G_CALLBACK (on_settings_windows_attrs_notify), NULL); plugin_signal_connect (geany_plugin, NULL, "document-save", TRUE, G_CALLBACK (on_document_save), NULL); @@ -409,6 +468,10 @@ { GtkWidget *browser_position; GtkWidget *browser_auto_reload; + + GtkWidget *secondary_windows_skip_taskbar; + GtkWidget *secondary_windows_are_transient; + GtkWidget *secondary_windows_type; }; static void @@ -421,8 +484,13 @@ case GTK_RESPONSE_APPLY: case GTK_RESPONSE_OK: case GTK_RESPONSE_YES: { - gwh_settings_widget_sync (G_settings, cdialog->browser_position); - gwh_settings_widget_sync (G_settings, cdialog->browser_auto_reload); + gwh_settings_widget_sync_v (G_settings, + cdialog->browser_position, + cdialog->browser_auto_reload, + cdialog->secondary_windows_skip_taskbar, + cdialog->secondary_windows_are_transient, + cdialog->secondary_windows_type, + NULL); break; } @@ -434,26 +502,50 @@ } } - GtkWidget * plugin_configure (GtkDialog *dialog) { + GtkWidget *box1; GtkWidget *box; + GtkWidget *alignment; GwhConfigDialog *cdialog; cdialog = g_malloc (sizeof *cdialog); - box = gtk_vbox_new (FALSE, 6); - cdialog->browser_position = gwh_settings_widget_new (G_settings, - "browser-position"); + /* Top-level box, containing the different frames */ + box1 = gtk_vbox_new (FALSE, 12); + + /* Browser */ + gtk_box_pack_start (GTK_BOX (box1), ui_frame_new_with_alignment (_("Browser"), &alignment), FALSE, FALSE, 0); + box = gtk_vbox_new (FALSE, 0); + gtk_container_add (GTK_CONTAINER (alignment), box); + /* browser position */ + cdialog->browser_position = gwh_settings_widget_new (G_settings, "browser-position"); gtk_box_pack_start (GTK_BOX (box), cdialog->browser_position, FALSE, TRUE, 0); + /* auto-reload */ cdialog->browser_auto_reload = gwh_settings_widget_new (G_settings, "browser-auto-reload"); - gtk_box_pack_start (GTK_BOX (box), cdialog->browser_auto_reload, - FALSE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (box), cdialog->browser_auto_reload, FALSE, TRUE, 0); + /* Windows */ + gtk_box_pack_start (GTK_BOX (box1), ui_frame_new_with_alignment (_("Windows"), &alignment), FALSE, FALSE, 0); + box = gtk_vbox_new (FALSE, 0); + gtk_container_add (GTK_CONTAINER (alignment), box); + /* skip taskbar */ + cdialog->secondary_windows_skip_taskbar = gwh_settings_widget_new (G_settings, + "wm-secondary-windows-skip-taskbar"); + gtk_box_pack_start (GTK_BOX (box), cdialog->secondary_windows_skip_taskbar, FALSE, TRUE, 0); + /* tranisent */ + cdialog->secondary_windows_are_transient = gwh_settings_widget_new (G_settings, + "wm-secondary-windows-are-transient"); + gtk_box_pack_start (GTK_BOX (box), cdialog->secondary_windows_are_transient, FALSE, TRUE, 0); + /* type */ + cdialog->secondary_windows_type = gwh_settings_widget_new (G_settings, + "wm-secondary-windows-type"); + gtk_box_pack_start (GTK_BOX (box), cdialog->secondary_windows_type, FALSE, TRUE, 0); + g_signal_connect (dialog, "response", G_CALLBACK (on_configure_dialog_response), cdialog); - return box; + return box1; } Modified: trunk/geany-plugins/webhelper/src/gwh-utils.h =================================================================== --- trunk/geany-plugins/webhelper/src/gwh-utils.h 2011-01-23 14:25:10 UTC (rev 1871) +++ trunk/geany-plugins/webhelper/src/gwh-utils.h 2011-01-23 14:25:37 UTC (rev 1872) @@ -27,6 +27,14 @@ G_BEGIN_DECLS +/* emulates some values of GdkWindowTypeHint */ +typedef enum _GwhWindowType +{ + GWH_WINDOW_TYPE_NORMAL = GDK_WINDOW_TYPE_HINT_NORMAL, + GWH_WINDOW_TYPE_UTILITY = GDK_WINDOW_TYPE_HINT_UTILITY +} GwhWindowType; + + G_GNUC_INTERNAL GdkPixbuf *gwh_pixbuf_new_from_uri (const gchar *uri, GError **error); 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:[1871] trunk/geany-plugins/webhelper/src/ gwh-settings.c
by colombanw＠users.sourceforge.net 23 Jan '11

23 Jan '11

Revision: 1871 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1871&view=rev Author: colombanw Date: 2011-01-23 14:25:10 +0000 (Sun, 23 Jan 2011) Log Message: ----------- WebHelper: Avoid useless notifications when synchronizing settings from widgets When synchronizing settings from their display widget, only change the corresponding property if the value actually changed. This avoids useless notifications if the value was not modified. This is particularly useful because we synchronize on preference dialog validation, but since the dialog is shared by all plugins we might synchronize even when the user has only changed the settings of another plugin. Modified Paths: -------------- trunk/geany-plugins/webhelper/src/gwh-settings.c Modified: trunk/geany-plugins/webhelper/src/gwh-settings.c =================================================================== --- trunk/geany-plugins/webhelper/src/gwh-settings.c 2011-01-23 14:24:39 UTC (rev 1870) +++ trunk/geany-plugins/webhelper/src/gwh-settings.c 2011-01-23 14:25:10 UTC (rev 1871) @@ -506,13 +506,16 @@ } static void -gwh_settings_widget_boolean_sync (GwhSettings *self, - GParamSpec *pspec, - GtkWidget *widget) +gwh_settings_widget_boolean_sync (GwhSettings *self, + GParamSpec *pspec, + const GValue *old_value, + GtkWidget *widget) { - g_object_set (self, pspec->name, - gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget)), - NULL); + gboolean val = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget)); + + if (g_value_get_boolean (old_value) != val) { + g_object_set (self, pspec->name, val, NULL); + } } static void @@ -575,9 +578,10 @@ } static void -gwh_settings_widget_enum_sync (GwhSettings *self, - GParamSpec *pspec, - GtkWidget *widget) +gwh_settings_widget_enum_sync (GwhSettings *self, + GParamSpec *pspec, + const GValue *old_value, + GtkWidget *widget) { GtkTreeIter iter; @@ -587,7 +591,9 @@ model = gtk_combo_box_get_model (GTK_COMBO_BOX (widget)); gtk_tree_model_get (model, &iter, 0, &val, -1); - g_object_set (self, pspec->name, val, NULL); + if (g_value_get_enum (old_value) != val) { + g_object_set (self, pspec->name, val, NULL); + } } } @@ -623,13 +629,16 @@ } static void -gwh_settings_widget_int_sync (GwhSettings *self, - GParamSpec *pspec, - GtkWidget *widget) +gwh_settings_widget_int_sync (GwhSettings *self, + GParamSpec *pspec, + const GValue *old_value, + GtkWidget *widget) { - g_object_set (self, pspec->name, - gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (widget)), - NULL); + gint val = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (widget)); + + if (g_value_get_int (old_value) != val) { + g_object_set (self, pspec->name, val, NULL); + } } static void @@ -665,12 +674,17 @@ } static void -gwh_settings_widget_string_sync (GwhSettings *self, - GParamSpec *pspec, - GtkWidget *widget) +gwh_settings_widget_string_sync (GwhSettings *self, + GParamSpec *pspec, + const GValue *old_value, + GtkWidget *widget) { - g_object_set (self, pspec->name, gtk_entry_get_text (GTK_ENTRY (widget)), - NULL); + const gchar *val = gtk_entry_get_text (GTK_ENTRY (widget)); + const gchar *old_val = g_value_get_string (old_value); + + if (g_strcmp0 (old_val, val) != 0) { + g_object_set (self, pspec->name, val, NULL); + } } @@ -783,6 +797,7 @@ GtkWidget *widget) { GParamSpec *pspec; + GValue value = {0}; g_return_val_if_fail (G_IS_OBJECT (widget), FALSE); @@ -790,10 +805,12 @@ g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE); pspec = g_object_get_data (G_OBJECT (widget), KEY_PSPEC); g_return_val_if_fail (G_IS_PARAM_SPEC (pspec), FALSE); + g_value_init (&value, pspec->value_type); + g_object_get_property (G_OBJECT (self), pspec->name, &value); switch (G_TYPE_FUNDAMENTAL (pspec->value_type)) { #define HANDLE_TYPE(T, t) \ case G_TYPE_##T: \ - gwh_settings_widget_##t##_sync (self, pspec, widget); \ + gwh_settings_widget_##t##_sync (self, pspec, &value, widget); \ break; HANDLE_TYPE (BOOLEAN, boolean) @@ -807,6 +824,7 @@ g_critical ("Unsupported property type \"%s\"", g_type_name (pspec->value_type)); } + g_value_unset (&value); return TRUE; } 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:[1870] trunk/geany-plugins/webhelper/src
by colombanw＠users.sourceforge.net 23 Jan '11

23 Jan '11

Revision: 1870 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1870&view=rev Author: colombanw Date: 2011-01-23 14:24:39 +0000 (Sun, 23 Jan 2011) Log Message: ----------- WebHelper: add gwh_settings_widget_sync_v() Modified Paths: -------------- trunk/geany-plugins/webhelper/src/gwh-settings.c trunk/geany-plugins/webhelper/src/gwh-settings.h Modified: trunk/geany-plugins/webhelper/src/gwh-settings.c =================================================================== --- trunk/geany-plugins/webhelper/src/gwh-settings.c 2011-01-23 14:24:16 UTC (rev 1869) +++ trunk/geany-plugins/webhelper/src/gwh-settings.c 2011-01-23 14:24:39 UTC (rev 1870) @@ -20,6 +20,7 @@ #include "gwh-settings.h" #include <string.h> +#include <stdarg.h> #include <glib.h> #include <glib-object.h> #include <gtk/gtk.h> @@ -777,19 +778,18 @@ return gwh_settings_widget_new_full (self, prop_name, NULL, NULL, 0); } -void -gwh_settings_widget_sync (GwhSettings *self, - GtkWidget *widget) +static gboolean +gwh_settings_widget_sync_internal (GwhSettings *self, + GtkWidget *widget) { GParamSpec *pspec; - g_return_if_fail (GWH_IS_SETTINGS (self)); - g_return_if_fail (G_IS_OBJECT (widget)); + g_return_val_if_fail (G_IS_OBJECT (widget), FALSE); widget = g_object_get_data (G_OBJECT (widget), KEY_WIDGET); - g_return_if_fail (GTK_IS_WIDGET (widget)); + g_return_val_if_fail (GTK_IS_WIDGET (widget), FALSE); pspec = g_object_get_data (G_OBJECT (widget), KEY_PSPEC); - g_return_if_fail (G_IS_PARAM_SPEC (pspec)); + g_return_val_if_fail (G_IS_PARAM_SPEC (pspec), FALSE); switch (G_TYPE_FUNDAMENTAL (pspec->value_type)) { #define HANDLE_TYPE(T, t) \ case G_TYPE_##T: \ @@ -807,4 +807,44 @@ g_critical ("Unsupported property type \"%s\"", g_type_name (pspec->value_type)); } + + return TRUE; } + +/** + * gwh_settings_widget_sync_v: + * @self: A #GwhSettings object + * @...: a %NULL-terminated list of widgets to sync + * + * Same as gwh_settings_widget_sync() but emits notifications only after all + * widgets got synchronized. + */ +void +gwh_settings_widget_sync_v (GwhSettings *self, + ...) +{ + GParamSpec *pspec; + GtkWidget *widget; + va_list ap; + + g_return_if_fail (GWH_IS_SETTINGS (self)); + + g_object_freeze_notify (G_OBJECT (self)); + va_start (ap, self); + while ((widget = va_arg (ap, GtkWidget*))) { + if (! gwh_settings_widget_sync_internal (self, widget)) { + break; + } + } + va_end (ap); + g_object_thaw_notify (G_OBJECT (self)); +} + +void +gwh_settings_widget_sync (GwhSettings *self, + GtkWidget *widget) +{ + g_return_if_fail (GWH_IS_SETTINGS (self)); + + gwh_settings_widget_sync_internal (self, widget); +} Modified: trunk/geany-plugins/webhelper/src/gwh-settings.h =================================================================== --- trunk/geany-plugins/webhelper/src/gwh-settings.h 2011-01-23 14:24:16 UTC (rev 1869) +++ trunk/geany-plugins/webhelper/src/gwh-settings.h 2011-01-23 14:24:39 UTC (rev 1870) @@ -20,6 +20,7 @@ #ifndef H_GWH_SETTINGS #define H_GWH_SETTINGS +#include <stdarg.h> #include <glib.h> #include <glib-object.h> #include <gtk/gtk.h> @@ -102,6 +103,9 @@ GtkWidget *gwh_settings_widget_new (GwhSettings *self, const gchar *prop_name); G_GNUC_INTERNAL +void gwh_settings_widget_sync_v (GwhSettings *self, + ...) G_GNUC_NULL_TERMINATED; +G_GNUC_INTERNAL void gwh_settings_widget_sync (GwhSettings *self, GtkWidget *widget); 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:[1869] trunk/geany-plugins/webhelper/src
by colombanw＠users.sourceforge.net 23 Jan '11

23 Jan '11

Revision: 1869 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1869&view=rev Author: colombanw Date: 2011-01-23 14:24:16 +0000 (Sun, 23 Jan 2011) Log Message: ----------- WebHelper: Add notification support for settings display widgets Add support for callbacks when the value displayed by a widget changes. This might be useful to e.g. update the sensitivity of another widget if it depends on a setting that was just disabled. Modified Paths: -------------- trunk/geany-plugins/webhelper/src/gwh-settings.c trunk/geany-plugins/webhelper/src/gwh-settings.h Modified: trunk/geany-plugins/webhelper/src/gwh-settings.c =================================================================== --- trunk/geany-plugins/webhelper/src/gwh-settings.c 2011-01-23 11:30:25 UTC (rev 1868) +++ trunk/geany-plugins/webhelper/src/gwh-settings.c 2011-01-23 14:24:16 UTC (rev 1869) @@ -456,9 +456,40 @@ /* display/edit widgets stuff */ +/* + * gwh_settings_widget_<type>_notify: + * calls user's callback with appropriate arguments + * gwh_settings_widget_<type>_notify_callback: + * a callback connected to a signal on the widget. + * calls gwh_settings_widget_<type>_notify + * gwh_settings_widget_<type>_new: + * creates the widget + * gwh_settings_widget_<type>_sync: + * syncs widget's value with its setting + */ + +typedef struct _GwhSettingsWidgetNotifyData +{ + GwhSettings *settings; + GCallback callback; + gpointer user_data; +} GwhSettingsWidgetNotifyData; + + +static void +gwh_settings_widget_boolean_notify (GObject *tbutton, + GwhSettingsWidgetNotifyData *data) +{ + ((GwhSettingsWidgetBooleanNotify)data->callback) (data->settings, + gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (tbutton)), + data->user_data); +} + +#define gwh_settings_widget_boolean_notify_callback gwh_settings_widget_boolean_notify + static GtkWidget * -gwh_settings_widget_new_boolean (GwhSettings *self, +gwh_settings_widget_boolean_new (GwhSettings *self, const GValue *value, GParamSpec *pspec, gboolean *needs_label) @@ -474,7 +505,7 @@ } static void -gwh_settings_widget_sync_boolean (GwhSettings *self, +gwh_settings_widget_boolean_sync (GwhSettings *self, GParamSpec *pspec, GtkWidget *widget) { @@ -483,8 +514,26 @@ NULL); } +static void +gwh_settings_widget_enum_notify (GObject *object, + GwhSettingsWidgetNotifyData *data) +{ + GtkTreeIter iter; + GtkComboBox *cbox = GTK_COMBO_BOX (object); + + if (gtk_combo_box_get_active_iter (cbox, &iter)) { + gint val; + + gtk_tree_model_get (gtk_combo_box_get_model (cbox), &iter, 0, &val, -1); + ((GwhSettingsWidgetEnumNotify)data->callback) (data->settings, val, + data->user_data); + } +} + +#define gwh_settings_widget_enum_notify_callback gwh_settings_widget_enum_notify + static GtkWidget * -gwh_settings_widget_new_enum (GwhSettings *self, +gwh_settings_widget_enum_new (GwhSettings *self, const GValue *value, GParamSpec *pspec, gboolean *needs_label) @@ -525,7 +574,7 @@ } static void -gwh_settings_widget_sync_enum (GwhSettings *self, +gwh_settings_widget_enum_sync (GwhSettings *self, GParamSpec *pspec, GtkWidget *widget) { @@ -541,8 +590,19 @@ } } +static void +gwh_settings_widget_int_notify (GObject *spin, + GwhSettingsWidgetNotifyData *data) +{ + ((GwhSettingsWidgetIntNotify)data->callback) (data->settings, + gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (spin)), + data->user_data); +} + +#define gwh_settings_widget_int_notify_callback gwh_settings_widget_int_notify + static GtkWidget * -gwh_settings_widget_new_int (GwhSettings *self, +gwh_settings_widget_int_new (GwhSettings *self, const GValue *value, GParamSpec *pspec, gboolean *needs_label) @@ -562,7 +622,7 @@ } static void -gwh_settings_widget_sync_int (GwhSettings *self, +gwh_settings_widget_int_sync (GwhSettings *self, GParamSpec *pspec, GtkWidget *widget) { @@ -571,8 +631,25 @@ NULL); } +static void +gwh_settings_widget_string_notify (GObject *entry, + GwhSettingsWidgetNotifyData *data) +{ + ((GwhSettingsWidgetStringNotify)data->callback) (data->settings, + gtk_entry_get_text (GTK_ENTRY (entry)), + data->user_data); +} + +static void +gwh_settings_widget_string_notify_callback (GObject *object, + GParamSpec *pspec, + GwhSettingsWidgetNotifyData *data) +{ + gwh_settings_widget_string_notify (object, data); +} + static GtkWidget * -gwh_settings_widget_new_string (GwhSettings *self, +gwh_settings_widget_string_new (GwhSettings *self, const GValue *value, GParamSpec *pspec, gboolean *needs_label) @@ -587,7 +664,7 @@ } static void -gwh_settings_widget_sync_string (GwhSettings *self, +gwh_settings_widget_string_sync (GwhSettings *self, GParamSpec *pspec, GtkWidget *widget) { @@ -599,9 +676,30 @@ #define KEY_PSPEC "gwh-settings-configure-pspec" #define KEY_WIDGET "gwh-settings-configure-widget" +/** + * gwh_settings_widget_new_full: + * @self: A GwhSettings object + * @prop_name: the name of the setting for which create a widget + * @setting_changed_callback: a callback to be called when the widget's value + * changes, or %NULL. The type of the callback + * is GwhSettingsWidget*Notify, depending of the + * setting type + * @user_data: user data to pass to @callback + * @notify_flags: notification flags + * + * Creates a widgets to configure the value of a setting @prop_name. + * This setting will not be changed automatically, you'll need to call + * gwh_settings_widget_sync() when you want to synchronize the widget's value to + * the setting. + * + * Returns: A #GtkWidget that displays and edit @prop_name. + */ GtkWidget * -gwh_settings_widget_new (GwhSettings *self, - const gchar *prop_name) +gwh_settings_widget_new_full (GwhSettings *self, + const gchar *prop_name, + GCallback setting_changed_callback, + gpointer user_data, + GwhSettingsNotifyFlags notify_flags) { GtkWidget *widget = NULL; GParamSpec *pspec; @@ -616,13 +714,29 @@ g_value_init (&value, pspec->value_type); g_object_get_property (G_OBJECT (self), prop_name, &value); switch (G_TYPE_FUNDAMENTAL (G_VALUE_TYPE (&value))) { - #define HANDLE_TYPE(T, h) \ - case T: widget = ((h) (self, &value, pspec, &needs_label)); break; + #define HANDLE_TYPE(T, t, signal) \ + case G_TYPE_##T: \ + widget = gwh_settings_widget_##t##_new (self, &value, pspec, \ + &needs_label); \ + if (setting_changed_callback) { \ + GwhSettingsWidgetNotifyData *data = g_malloc (sizeof *data); \ + \ + data->settings = self; \ + data->callback = setting_changed_callback; \ + data->user_data = user_data; \ + g_signal_connect_data (widget, signal, \ + G_CALLBACK (gwh_settings_widget_##t##_notify_callback),\ + data, (GClosureNotify)g_free, 0); \ + if (notify_flags & GWH_SETTINGS_NOTIFY_ON_CONNEXION) { \ + gwh_settings_widget_##t##_notify (G_OBJECT (widget), data); \ + } \ + } \ + break; - HANDLE_TYPE (G_TYPE_BOOLEAN, gwh_settings_widget_new_boolean) - HANDLE_TYPE (G_TYPE_ENUM, gwh_settings_widget_new_enum) - HANDLE_TYPE (G_TYPE_INT, gwh_settings_widget_new_int) - HANDLE_TYPE (G_TYPE_STRING, gwh_settings_widget_new_string) + HANDLE_TYPE (BOOLEAN, boolean, "toggled") + HANDLE_TYPE (ENUM, enum, "changed") + HANDLE_TYPE (INT, int, "value-changed") + HANDLE_TYPE (STRING, string, "notify::text") #undef HANDLE_TYPE @@ -656,6 +770,13 @@ return widget; } +GtkWidget * +gwh_settings_widget_new (GwhSettings *self, + const gchar *prop_name) +{ + return gwh_settings_widget_new_full (self, prop_name, NULL, NULL, 0); +} + void gwh_settings_widget_sync (GwhSettings *self, GtkWidget *widget) @@ -670,12 +791,15 @@ pspec = g_object_get_data (G_OBJECT (widget), KEY_PSPEC); g_return_if_fail (G_IS_PARAM_SPEC (pspec)); switch (G_TYPE_FUNDAMENTAL (pspec->value_type)) { - #define HANDLE_TYPE(T, h) case T: (h) (self, pspec, widget); break; + #define HANDLE_TYPE(T, t) \ + case G_TYPE_##T: \ + gwh_settings_widget_##t##_sync (self, pspec, widget); \ + break; - HANDLE_TYPE (G_TYPE_BOOLEAN, gwh_settings_widget_sync_boolean) - HANDLE_TYPE (G_TYPE_ENUM, gwh_settings_widget_sync_enum) - HANDLE_TYPE (G_TYPE_INT, gwh_settings_widget_sync_int) - HANDLE_TYPE (G_TYPE_STRING, gwh_settings_widget_sync_string) + HANDLE_TYPE (BOOLEAN, boolean) + HANDLE_TYPE (ENUM, enum) + HANDLE_TYPE (INT, int) + HANDLE_TYPE (STRING, string) #undef HANDLE_TYPE Modified: trunk/geany-plugins/webhelper/src/gwh-settings.h =================================================================== --- trunk/geany-plugins/webhelper/src/gwh-settings.h 2011-01-23 11:30:25 UTC (rev 1868) +++ trunk/geany-plugins/webhelper/src/gwh-settings.h 2011-01-23 14:24:16 UTC (rev 1869) @@ -34,9 +34,35 @@ #define GWH_IS_SETTINGS_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GWH_TYPE_SETTINGS)) +/** + * GwhSettingsNotifyFlags: + * @GWH_SETTINGS_NOTIFY_NONE: 0, no flags + * @GWH_SETTINGS_NOTIFY_ON_CONNEXION: Call user callback just after widget + * creation. + * + * Notification flags for gwh_settings_widget_new_full(). + */ +typedef enum _GwhSettingsNotifyFlags +{ + GWH_SETTINGS_NOTIFY_NONE = 0, + GWH_SETTINGS_NOTIFY_ON_CONNEXION = 1<<0 +} GwhSettingsNotifyFlags; + typedef struct _GwhSettings GwhSettings; typedef struct _GwhSettingsClass GwhSettingsClass; typedef struct _GwhSettingsPrivate GwhSettingsPrivate; +typedef void (*GwhSettingsWidgetBooleanNotify) (GwhSettings *settings, + gboolean value, + gpointer data); +typedef void (*GwhSettingsWidgetEnumNotify) (GwhSettings *settings, + gint value, + gpointer data); +typedef void (*GwhSettingsWidgetIntNotify) (GwhSettings *settings, + gint value, + gpointer data); +typedef void (*GwhSettingsWidgetStringNotify) (GwhSettings *settings, + const gchar *value, + gpointer data); struct _GwhSettings { @@ -67,6 +93,12 @@ const gchar *filename, GError **error); G_GNUC_INTERNAL +GtkWidget *gwh_settings_widget_new_full (GwhSettings *self, + const gchar *prop_name, + GCallback setting_changed_callback, + gpointer user_data, + GwhSettingsNotifyFlags notify_flags); +G_GNUC_INTERNAL GtkWidget *gwh_settings_widget_new (GwhSettings *self, const gchar *prop_name); G_GNUC_INTERNAL 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:[1868] trunk/geanylatex/src/latexkeybindings.c
by frlan＠users.sourceforge.net 23 Jan '11

23 Jan '11

Revision: 1868 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1868&view=rev Author: frlan Date: 2011-01-23 11:30:25 +0000 (Sun, 23 Jan 2011) Log Message: ----------- GeanyLaTeX: Fix check whether we do have a document pointer Modified Paths: -------------- trunk/geanylatex/src/latexkeybindings.c Modified: trunk/geanylatex/src/latexkeybindings.c =================================================================== --- trunk/geanylatex/src/latexkeybindings.c 2011-01-23 11:25:21 UTC (rev 1867) +++ trunk/geanylatex/src/latexkeybindings.c 2011-01-23 11:30:25 UTC (rev 1868) @@ -23,21 +23,21 @@ void glatex_kblabel_insert(G_GNUC_UNUSED guint key_id) { - g_return_if_fail(document_get_current != NULL); + g_return_if_fail(document_get_current() != NULL); glatex_insert_label_activated(NULL, NULL); } void glatex_kbref_insert(G_GNUC_UNUSED guint key_id) { - g_return_if_fail(document_get_current != NULL); + g_return_if_fail(document_get_current() != NULL); glatex_insert_ref_activated(NULL, NULL); } void glatex_kbref_insert_environment(G_GNUC_UNUSED guint key_id) { - g_return_if_fail(document_get_current != NULL); + g_return_if_fail(document_get_current() != NULL); glatex_insert_environment_dialog(NULL, NULL); } @@ -50,122 +50,122 @@ void glatex_kb_insert_newline(G_GNUC_UNUSED guint key_id) { - g_return_if_fail(document_get_current != NULL); + g_return_if_fail(document_get_current() != NULL); glatex_insert_string("\\\\\n", TRUE); } void glatex_kb_insert_newitem(G_GNUC_UNUSED guint key_id) { - g_return_if_fail(document_get_current != NULL); + g_return_if_fail(document_get_current() != NULL); glatex_insert_string("\\item ", TRUE); } void glatex_kb_replace_special_chars(G_GNUC_UNUSED guint key_id) { - g_return_if_fail(document_get_current != NULL); + g_return_if_fail(document_get_current() != NULL); glatex_replace_special_character(); } void glatex_kb_format_bold(G_GNUC_UNUSED guint key_id) { - g_return_if_fail(document_get_current != NULL); + g_return_if_fail(document_get_current() != NULL); glatex_insert_latex_format(NULL, GINT_TO_POINTER(LATEX_BOLD)); } void glatex_kb_format_italic(G_GNUC_UNUSED guint key_id) { - g_return_if_fail(document_get_current != NULL); + g_return_if_fail(document_get_current() != NULL); glatex_insert_latex_format(NULL, GINT_TO_POINTER(LATEX_ITALIC)); } void glatex_kb_format_typewriter(G_GNUC_UNUSED guint key_id) { - g_return_if_fail(document_get_current != NULL); + g_return_if_fail(document_get_current() != NULL); glatex_insert_latex_format(NULL, GINT_TO_POINTER(LATEX_TYPEWRITER)); } void glatex_kb_format_centering(G_GNUC_UNUSED guint key_id) { - g_return_if_fail(document_get_current != NULL); + g_return_if_fail(document_get_current() != NULL); glatex_insert_latex_format(NULL, GINT_TO_POINTER(LATEX_CENTER)); } void glatex_kb_format_left(G_GNUC_UNUSED guint key_id) { - g_return_if_fail(document_get_current != NULL); + g_return_if_fail(document_get_current() != NULL); glatex_insert_latex_format(NULL, GINT_TO_POINTER(LATEX_LEFT)); } void glatex_kb_format_right(G_GNUC_UNUSED guint key_id) { - g_return_if_fail(document_get_current != NULL); + g_return_if_fail(document_get_current() != NULL); glatex_insert_latex_format(NULL, GINT_TO_POINTER(LATEX_RIGHT)); } void glatex_kb_insert_description_list(G_GNUC_UNUSED guint key_id) { - g_return_if_fail(document_get_current != NULL); + g_return_if_fail(document_get_current() != NULL); glatex_insert_list_environment(GLATEX_LIST_DESCRIPTION); } void glatex_kb_insert_itemize_list(G_GNUC_UNUSED guint key_id) { - g_return_if_fail(document_get_current != NULL); + g_return_if_fail(document_get_current() != NULL); glatex_insert_list_environment(GLATEX_LIST_ITEMIZE); } void glatex_kb_insert_enumerate_list(G_GNUC_UNUSED guint key_id) { - g_return_if_fail(document_get_current != NULL); + g_return_if_fail(document_get_current() != NULL); glatex_insert_list_environment(GLATEX_LIST_ENUMERATE); } void glatex_kb_structure_lvlup(G_GNUC_UNUSED guint key_id) { - g_return_if_fail(document_get_current != NULL); + g_return_if_fail(document_get_current() != NULL); glatex_structure_lvlup(); } void glatex_kb_structure_lvldown(G_GNUC_UNUSED guint key_id) { - g_return_if_fail(document_get_current != NULL); + g_return_if_fail(document_get_current() != NULL); glatex_structure_lvldown(); } void glatex_kb_usepackage_dialog(G_GNUC_UNUSED guint key_id) { - g_return_if_fail(document_get_current != NULL); + g_return_if_fail(document_get_current() != NULL); glatex_insert_usepackage_dialog(NULL, NULL); } void glatex_kb_insert_command_dialog(G_GNUC_UNUSED guint key_id) { - g_return_if_fail(document_get_current != NULL); + g_return_if_fail(document_get_current() != NULL); glatex_insert_command_activated(NULL, NULL); } void glatex_kb_insert_bibtex_cite(G_GNUC_UNUSED guint key_id) { - g_return_if_fail(document_get_current != NULL); + g_return_if_fail(document_get_current() != NULL); on_insert_bibtex_dialog_activate(NULL, NULL); } void glatex_kb_convert_to_table(G_GNUC_UNUSED guint key_id) { - g_return_if_fail(document_get_current != NULL); + g_return_if_fail(document_get_current() != NULL); glatex_convert_to_table(); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

Plugins-Commits January 2011