Plugins-Commits February 2013

plugins-commits@lists.geany.org

1 participants
25 discussions

[geany/geany-plugins] 1a0246: GeanyMacro: Fix a little typo reported by Lucas Vieites
by Frank Lanitz 09 Feb '13

09 Feb '13

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Sat, 09 Feb 2013 06:58:01 UTC Commit: 1a024675d4fe9c95fc806cf3863d0f9d72cedf9d https://github.com/geany/geany-plugins/commit/1a024675d4fe9c95fc806cf3863d0… Log Message: ----------- GeanyMacro: Fix a little typo reported by Lucas Vieites Modified Paths: -------------- geanymacro/src/geanymacro.c Modified: geanymacro/src/geanymacro.c 26 files changed, 13 insertions(+), 13 deletions(-) =================================================================== @@ -1407,8 +1407,8 @@ static void EditSearchOptions(GtkTreeModel *model,GtkTreeIter *iter) gtk_widget_show(gtkcb); /* create checkbox to check for search options */ - cbA=gtk_check_button_new_with_label(_("Seach for contents of clipboard")); - /* if search text is empty then to seach for clipboard contents */ + cbA=gtk_check_button_new_with_label(_("Search for contents of clipboard")); + /* if search text is empty then to search for clipboard contents */ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(cbA),(*cText)==0); gtk_box_pack_start(GTK_BOX(vbox),cbA,FALSE,FALSE,2); /* ensure we monitor for change in this button */ @@ -1421,7 +1421,7 @@ static void EditSearchOptions(GtkTreeModel *model,GtkTreeIter *iter) gtk_box_pack_start(GTK_BOX(vbox),hbox,FALSE,FALSE,2); gtk_widget_show(hbox); - gtkl=gtk_label_new(_("Seach for:")); + gtkl=gtk_label_new(_("Search for:")); gtk_box_pack_start(GTK_BOX(hbox),gtkl,FALSE,FALSE,2); gtk_widget_show(gtkl); /* save pointer to label */ @@ -1439,28 +1439,28 @@ static void EditSearchOptions(GtkTreeModel *model,GtkTreeIter *iter) gtk_widget_set_sensitive((GtkWidget*)gtke,(*cText)!=0); /* create checkbox to check for search options */ - cbB=gtk_check_button_new_with_label(_("Seach is case sensitive")); - /* if search text is empty then to seach for clipboard contents */ + cbB=gtk_check_button_new_with_label(_("Search is case sensitive")); + /* if search text is empty then to search for clipboard contents */ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(cbB),(flags&SCFIND_MATCHCASE)==SCFIND_MATCHCASE); gtk_box_pack_start(GTK_BOX(vbox),cbB,FALSE,FALSE,2); - cbC=gtk_check_button_new_with_label(_("Seach for whole word")); - /* if search text is empty then to seach for clipboard contents */ + cbC=gtk_check_button_new_with_label(_("Search for whole word")); + /* if search text is empty then to search for clipboard contents */ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(cbC),(flags&SCFIND_WHOLEWORD)==SCFIND_WHOLEWORD); gtk_box_pack_start(GTK_BOX(vbox),cbC,FALSE,FALSE,2); - cbD=gtk_check_button_new_with_label(_("Seach for start of word")); - /* if search text is empty then to seach for clipboard contents */ + cbD=gtk_check_button_new_with_label(_("Search for start of word")); + /* if search text is empty then to search for clipboard contents */ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(cbD),(flags&SCFIND_WORDSTART)==SCFIND_WORDSTART); gtk_box_pack_start(GTK_BOX(vbox),cbD,FALSE,FALSE,2); - cbE=gtk_check_button_new_with_label(_("Seach text is regular expression")); - /* if search text is empty then to seach for clipboard contents */ + cbE=gtk_check_button_new_with_label(_("Search text is regular expression")); + /* if search text is empty then to search for clipboard contents */ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(cbE),(flags&SCFIND_REGEXP)==SCFIND_REGEXP); gtk_box_pack_start(GTK_BOX(vbox),cbE,FALSE,FALSE,2); - cbF=gtk_check_button_new_with_label(_("Seach text is POSIX compatible")); - /* if search text is empty then to seach for clipboard contents */ + cbF=gtk_check_button_new_with_label(_("Search text is POSIX compatible")); + /* if search text is empty then to search for clipboard contents */ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(cbF),(flags&SCFIND_POSIX)==SCFIND_POSIX); gtk_box_pack_start(GTK_BOX(vbox),cbF,FALSE,FALSE,2); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] e4e387: Merge pull request #82 from frlan/Tableconvert_more_generic_rework
by Frank Lanitz 01 Feb '13

01 Feb '13

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Fri, 01 Feb 2013 06:47:18 UTC Commit: e4e387563ab822bc2a5a9ec98cafe09a894b6ea4 https://github.com/geany/geany-plugins/commit/e4e387563ab822bc2a5a9ec98cafe… Log Message: ----------- Merge pull request #82 from frlan/Tableconvert_more_generic_rework Tableconvert more generic rework Modified Paths: -------------- tableconvert/src/tableconvert.c tableconvert/testfiles/test.html tableconvert/testfiles/test.sql tableconvert/testfiles/test.tex Modified: tableconvert/src/tableconvert.c 226 files changed, 108 insertions(+), 118 deletions(-) =================================================================== @@ -1,7 +1,7 @@ /* * tableconvert.c * - * Copyright 2011-2012 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> + * Copyright 2011-2013 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 @@ -41,11 +41,72 @@ enum COUNT_KB }; +typedef struct { + const gchar *start; + const gchar *header_start; + const gchar *header_stop; + const gchar *body_start; + const gchar *body_end; + const gchar *columnsplit; + const gchar *linestart; + const gchar *lineend; + const gchar *linesplit; + const gchar *end; +} TableConvertRule; + +enum { + TC_LATEX = 0, + TC_HTML, + TC_SQL +}; -static GtkWidget *main_menu_item = NULL; +TableConvertRule tablerules[] = { + /* LaTeX */ + { + "\\begin{table}[h]\n\\begin{tabular}{}\n", + "", + "", + "", + "", + " & ", + "\t", + "\\\\", + "\n", + "\\end{tabular}\n\\end{table}" + }, + /* HTML */ + { + "<table>\n", + "<thead>\n", + "</thead>\n", + "<tbody>\n", + "\n</tbody>", + "</td>\n\t<td>", + "<tr>\n\t<td>", + "</td>\n</tr>", + "\n", + "\n</table>" + }, + /* SQL */ + { + "", + "", + "", + "", + "", + ",", + "\t(", + ")", + ",\n", + ";" + } +}; -static GString* convert_to_table_html(gchar **rows, gboolean header) +static GtkWidget *main_menu_item = NULL; + +static gchar* convert_to_table_worker(gchar **rows, gboolean header, + const TableConvertRule *rule) { guint i; guint j; @@ -53,138 +114,62 @@ static GString* convert_to_table_html(gchar **rows, gboolean header) g_return_val_if_fail(rows != NULL, NULL); - /* Adding header to replacement */ - replacement_str = g_string_new("<table>\n"); + /* Adding start of table to replacement */ + replacement_str = g_string_new(rule->start); - /* Adding <thead> if requested */ + /* Adding special header if requested + * e.g. <thead> */ if (header == TRUE) { - g_string_append(replacement_str, "<thead>\n"); + g_string_append(replacement_str, rule->header_start); } /* Iteration onto rows and building up lines of table for * replacement */ - for (i = 0; rows[i] != NULL ; i++) + for (i = 0; rows[i] != NULL; i++) { gchar **columns = NULL; columns = g_strsplit_set(rows[i], "\t", -1); - /* Adding <tbody> after first line if header and body - * is requested */ if (i == 1 && header == TRUE) { - g_string_append(replacement_str, "<tbody>\n"); - } - - 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"); - - /* Adding closing </thead> after first row if header - * is requested */ - if (i == 0 && - header == TRUE) - { - g_string_append(replacement_str, "</thead>\n"); + g_string_append(replacement_str, rule->header_stop); + /* We are assuming, that if someone inserts a head, + * only in this case we will insert some special body. + * Might needs to be discussed further */ + g_string_append(replacement_str, rule->body_start); } - g_free(columns); - } - - /* Adding the footer of table */ - /* Closing </tbody> if requested */ - if (header == TRUE) - { - g_string_append(replacement_str, "</tbody>\n"); - } - g_string_append(replacement_str, "</table>\n"); - return replacement_str; -} - -static GString* convert_to_table_latex(gchar** rows, gboolean header) -{ - guint i; - guint j; - GString *replacement_str = NULL; - - g_return_val_if_fail(rows != NULL, NULL); - - /* Adding header to replacement */ - replacement_str = g_string_new("\\begin{table}[h]\n\\begin{tabular}{}\n"); - - /* Iteration onto rows and building up lines of table for - * replacement */ - for (i = 0; rows[i] != NULL ; i++) - { - gchar **columns = NULL; - columns = g_strsplit_set(rows[i], "\t", -1); + g_string_append(replacement_str, rule->linestart); for (j = 0; columns[j] != NULL; j++) { if (j > 0) { - g_string_append(replacement_str, " & "); + g_string_append(replacement_str, rule->columnsplit); } g_string_append(replacement_str, columns[j]); } - g_string_append(replacement_str, "\\\\\n"); - - g_free(columns); - } - /* Adding the footer of table */ - - g_string_append(replacement_str, "\\end{tabular}\n\\end{table}"); - return replacement_str; -} - -static GString* convert_to_table_sql(gchar** rows) -{ - guint i; - guint j; - GString *replacement_str = NULL; - - g_return_val_if_fail(rows != NULL, NULL); - - /* Adding start */ - replacement_str = g_string_new(""); - - /* Iteration onto rows and building up lines for replacement */ - for (i = 0; rows[i] != NULL ; i++) - { - gchar **columns = NULL; - - g_string_append(replacement_str, "\t('"); - columns = g_strsplit_set(rows[i], "\t", -1); - - for (j = 0; columns[j] != NULL; j++) - { - if (j > 0) - { - g_string_append(replacement_str, "','"); - } - g_string_append(replacement_str, columns[j]); - } + g_string_append(replacement_str, rule->lineend); if (rows[i+1] != NULL) { - g_string_append(replacement_str, "'),\n"); - } - else - { - g_string_append(replacement_str, "')\n"); + g_string_append(replacement_str, rule->linesplit); } + g_strfreev(columns); + } - g_free(columns); + if (header == TRUE) + { + g_string_append(replacement_str, rule->body_end); } - return replacement_str; + + /* Adding the footer of table */ + g_string_append(replacement_str, rule->end); + + return g_string_free(replacement_str, FALSE); } static void convert_to_table(gboolean header) @@ -198,7 +183,6 @@ static void convert_to_table(gboolean header) { gchar *selection = NULL; gchar **rows = NULL; - GString *replacement_str = NULL; gchar *replacement = NULL; /* Actually grabbing selection and splitting it into single @@ -214,57 +198,63 @@ static void convert_to_table(gboolean header) { case GEANY_FILETYPES_NONE: { - g_free(rows); - g_free(replacement); + g_strfreev(rows); return; } case GEANY_FILETYPES_HTML: { - replacement_str = convert_to_table_html(rows, header); + replacement = convert_to_table_worker(rows, + header, + &tablerules[TC_HTML]); break; } case GEANY_FILETYPES_LATEX: { - replacement_str = convert_to_table_latex(rows, header); + replacement = convert_to_table_worker(rows, + header, + &tablerules[TC_LATEX]); break; } case GEANY_FILETYPES_SQL: { - replacement_str = convert_to_table_sql(rows); + replacement = convert_to_table_worker(rows, + header, + &tablerules[TC_SQL]); break; } default: { - replacement_str = NULL; + /* We just don't do anything */ } } /* filetype switch */ } else { /* OK. Something went not as expected. - * We did have a selection but cannot parse it into rows. - * Aborting */ + * We did have a selection but cannot parse it into rows. + * Aborting */ g_warning(_("Something went wrong on parsing selection. Aborting")); return; } /* The replacement should have been prepared at this point. Let's go - * on and put it into document and replace selection with it. */ - if (replacement_str != NULL) + * on and put it into document and replace selection with it. */ + if (replacement != NULL) { - replacement = g_string_free(replacement_str, FALSE); sci_replace_sel(doc->editor->sci, replacement); } - g_free(rows); + g_strfreev(rows); g_free(replacement); } /* in case of there was no selection we are just doing nothing */ return; } + static void kb_convert_to_table(G_GNUC_UNUSED guint key_id) { g_return_if_fail(document_get_current() != NULL); + convert_to_table(TRUE); } @@ -292,7 +282,7 @@ void plugin_init(GeanyData *data) gtk_container_add(GTK_CONTAINER(geany->main_widgets->tools_menu), main_menu_item); ui_widget_set_tooltip_text(main_menu_item, _("Converts current marked list to a table.")); - g_signal_connect(G_OBJECT(main_menu_item), "activate", G_CALLBACK(convert_to_table), NULL); + g_signal_connect(G_OBJECT(main_menu_item), "activate", G_CALLBACK(cb_table_convert), NULL); gtk_widget_show_all(main_menu_item); ui_add_document_sensitive(main_menu_item); } Modified: tableconvert/testfiles/test.html 10 files changed, 10 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,10 @@ +aaaa bbbbb ccccc ddddd fffff +aaaa bbbbb ccccc ddddd fffff +aaaa bbbbb ccccc ddddd fffff +aaaa bbbbb ccccc ddddd fffff +aaaa bbbbb ccccc ddddd fffff +aaaa bbbbb ccccc ddddd fffff +aaaa bbbbb ccccc ddddd fffff +aaaa bbbbb ccccc ddddd fffff +aaaa bbbbb ccccc ddddd fffff +aaaa bbbbb ccccc ddddd fffff Modified: tableconvert/testfiles/test.sql 10 files changed, 10 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,10 @@ +aaaa bbbbb ccccc ddddd fffff +aaaa bbbbb ccccc ddddd fffff +aaaa bbbbb ccccc ddddd fffff +aaaa bbbbb ccccc ddddd fffff +aaaa bbbbb ccccc ddddd fffff +aaaa bbbbb ccccc ddddd fffff +aaaa bbbbb ccccc ddddd fffff +aaaa bbbbb ccccc ddddd fffff +aaaa bbbbb ccccc ddddd fffff +aaaa bbbbb ccccc ddddd fffff Modified: tableconvert/testfiles/test.tex 10 files changed, 10 insertions(+), 0 deletions(-) =================================================================== @@ -0,0 +1,10 @@ +aaaa bbbbb ccccc ddddd fffff +aaaa bbbbb ccccc ddddd fffff +aaaa bbbbb ccccc ddddd fffff +aaaa bbbbb ccccc ddddd fffff +aaaa bbbbb ccccc ddddd fffff +aaaa bbbbb ccccc ddddd fffff +aaaa bbbbb ccccc ddddd fffff +aaaa bbbbb ccccc ddddd fffff +aaaa bbbbb ccccc ddddd fffff +aaaa bbbbb ccccc ddddd fffff -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 904b07: Make rule-parameter const
by Frank Lanitz 01 Feb '13

01 Feb '13

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Fri, 01 Feb 2013 06:33:08 UTC Commit: 904b07a618060e900b4d5fe764ef67e127a44824 https://github.com/geany/geany-plugins/commit/904b07a618060e900b4d5fe764ef6… Log Message: ----------- Make rule-parameter const Modified Paths: -------------- tableconvert/src/tableconvert.c Modified: tableconvert/src/tableconvert.c 3 files changed, 2 insertions(+), 1 deletions(-) =================================================================== @@ -105,7 +105,8 @@ enum { static GtkWidget *main_menu_item = NULL; -static gchar* convert_to_table_worker(gchar **rows, gboolean header, TableConvertRule *rule) +static gchar* convert_to_table_worker(gchar **rows, gboolean header, + const TableConvertRule *rule) { guint i; guint j; -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 02387e: Update HTML help file with slightly changed doc-utils output
by Matthew Brush 01 Feb '13

01 Feb '13

Branch: refs/heads/master Author: Matthew Brush <matt(a)geany.org> Committer: Matthew Brush <matt(a)geany.org> Date: Fri, 01 Feb 2013 03:22:11 UTC Commit: 02387e7b7010b9f806e89bd1fc80ea06327b91c0 https://github.com/geany/geany-plugins/commit/02387e7b7010b9f806e89bd1fc80e… Log Message: ----------- Update HTML help file with slightly changed doc-utils output Modified Paths: -------------- markdown/docs/help.html Modified: markdown/docs/help.html 4 files changed, 0 insertions(+), 4 deletions(-) =================================================================== @@ -343,14 +343,12 @@ <h1 class="title">Markdown</h1> </div> <div class="section" id="features"> <h1><a class="toc-backref" href="#id3">Features</a></h1> -<blockquote> <ul class="simple"> <li>Allows placing the preview in the sidebar or message window areas</li> <li>Updates the preview on-the-fly as you type, automatically.</li> <li>Allows simple customization of fonts and colours and complete control with custom template files.</li> </ul> -</blockquote> </div> <div class="section" id="usage"> <h1><a class="toc-backref" href="#id4">Usage</a></h1> @@ -486,12 +484,10 @@ <h1 class="title">Markdown</h1> <div class="section" id="requirements"> <h1><a class="toc-backref" href="#id7">Requirements</a></h1> <p>The plugin depends on the following libraries:</p> -<blockquote> <ul class="simple"> <li><a class="reference external" href="http://www.gtk.org">GTK+</a> 2.16 or greater</li> <li><a class="reference external" href="http://webkitgtk.org">WebKitGTK+</a> 1.1.18 or greater</li> </ul> -</blockquote> </div> <div class="section" id="license"> <h1><a class="toc-backref" href="#id8">License</a></h1> -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 72e3fe: Fix a few small bugs.
by Matthew Brush 01 Feb '13

01 Feb '13

Branch: refs/heads/master Author: Matthew Brush <matt(a)geany.org> Committer: Matthew Brush <matt(a)geany.org> Date: Fri, 01 Feb 2013 03:18:20 UTC Commit: 72e3febe407a20be0e1c9a9fc4e1057cdc1e6cad https://github.com/geany/geany-plugins/commit/72e3febe407a20be0e1c9a9fc4e10… Log Message: ----------- Fix a few small bugs. * Change 'uint' typo to 'guint'. * Change accidental hardcoded default_value. * Add wrapper function for g_object_class_install_properties since it's only available since GLIB 2.26. * Make PROP_O equal zero because it's always supposed to be zero. Modified Paths: -------------- markdown/src/conf.c Modified: markdown/src/conf.c 21 files changed, 17 insertions(+), 4 deletions(-) =================================================================== @@ -64,7 +64,7 @@ enum { - PROP_0, + PROP_0 = 0, PROP_TEMPLATE_FILE, PROP_FONT_NAME, PROP_CODE_FONT_NAME, @@ -242,7 +242,7 @@ static gboolean on_idle_timeout(MarkdownConfig *conf) static guint markdown_config_get_uint_key(MarkdownConfig *conf, const gchar *group, - const gchar *key, uint default_value) + const gchar *key, guint default_value) { guint out_uint; GError *error = NULL; @@ -251,7 +251,7 @@ static gboolean on_idle_timeout(MarkdownConfig *conf) if (error) { g_debug("Config read failed: %s", error->message); g_error_free(error); error = NULL; - out_uint = 12; + out_uint = default_value; } return out_uint; @@ -339,6 +339,19 @@ static gboolean on_idle_timeout(MarkdownConfig *conf) } static void +markdown_install_class_properties(GObjectClass *gclass, guint n_pspecs, + GParamSpec **pspecs) +{ +#if GLIB_CHECK_VERSION(2, 26, 0) + g_object_class_install_properties(gclass, n_pspecs, pspecs); +#else + guint i; + for (i = 1; i < n_pspecs; i++) + g_object_class_install_property(gclass, i, pspecs[i]); +#endif +} + +static void markdown_config_class_init(MarkdownConfigClass *klass) { GObjectClass *g_object_class; @@ -369,7 +382,7 @@ static gboolean on_idle_timeout(MarkdownConfig *conf) MARKDOWN_CONFIG_VIEW_POS_MAX-1, (guint) MARKDOWN_CONFIG_VIEW_POS_SIDEBAR, G_PARAM_READWRITE); - g_object_class_install_properties(g_object_class, PROP_LAST, md_props); + markdown_install_class_properties(g_object_class, PROP_LAST, md_props); } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

Plugins-Commits February 2013