Plugins-Commits October 2014

plugins-commits@lists.geany.org

1 participants
98 discussions

[geany/geany-plugins] 880219: Merge pull request #171 from b4n/scope/fixes
by zhekov 22 Oct '14

22 Oct '14

Branch: refs/heads/master Author: zhekov <dimitar.zhekov(a)gmail.com> Committer: zhekov <dimitar.zhekov(a)gmail.com> Date: Wed, 22 Oct 2014 17:07:03 UTC Commit: 88021932f3cf4dfc0fecb5107b60281791b21881 https://github.com/geany/geany-plugins/commit/88021932f3cf4dfc0fecb5107b602… Log Message: ----------- Merge pull request #171 from b4n/scope/fixes scope: Don't depend on Geany private prototypes Modified Paths: -------------- scope/src/plugme.c scope/src/plugme.h Modified: scope/src/plugme.c 8 lines changed, 2 insertions(+), 6 deletions(-) =================================================================== @@ -27,7 +27,6 @@ extern GeanyFunctions *geany_functions; /* This file must not depend on Scope */ #include "plugme.h" -#ifndef ui_setup_open_button_callback static gchar *run_file_chooser(const gchar *title, GtkFileChooserAction action, const gchar *utf8_path) { @@ -101,7 +100,7 @@ static void ui_path_box_open_clicked(G_GNUC_UNUSED GtkButton *button, gpointer u /* Setup a GtkButton to run a GtkFileChooser, setting entry text if successful. * title can be NULL. * action is the file chooser mode to use. */ -void ui_setup_open_button_callback(GtkWidget *open_btn, const gchar *title, +void plugme_ui_setup_open_button_callback(GtkWidget *open_btn, const gchar *title, GtkFileChooserAction action, GtkEntry *entry) { GtkWidget *path_entry = GTK_WIDGET(entry); @@ -113,11 +112,9 @@ void ui_setup_open_button_callback(GtkWidget *open_btn, const gchar *title, ui_hookup_widget(open_btn, path_entry, "entry"); g_signal_connect(open_btn, "clicked", G_CALLBACK(ui_path_box_open_clicked), open_btn); } -#endif /* ui_setup_open_button_callback */ -#ifndef editor_get_default_selection /* Note: this is NOT the Geany function, only similar */ -gchar *editor_get_default_selection(GeanyEditor *editor, gboolean use_current_word, +gchar *plugme_editor_get_default_selection(GeanyEditor *editor, gboolean use_current_word, const gchar *wordchars) { ScintillaObject *sci = editor->sci; @@ -138,7 +135,6 @@ gchar *editor_get_default_selection(GeanyEditor *editor, gboolean use_current_wo return text; } -#endif /* editor_get_default_selection */ static void on_config_file_clicked(G_GNUC_UNUSED GtkWidget *widget, gpointer user_data) { Modified: scope/src/plugme.h 12 lines changed, 12 insertions(+), 0 deletions(-) =================================================================== @@ -19,6 +19,18 @@ #ifndef PLUGME_H +#ifndef ui_setup_open_button_callback +void plugme_ui_setup_open_button_callback(GtkWidget *open_btn, const gchar *title, + GtkFileChooserAction action, GtkEntry *entry); +#define ui_setup_open_button_callback plugme_ui_setup_open_button_callback +#endif /* ui_setup_open_button_callback */ + +#ifndef editor_get_default_selection +gchar *plugme_editor_get_default_selection(GeanyEditor *editor, gboolean use_current_word, + const gchar *wordchars); +#define editor_get_default_selection plugme_editor_get_default_selection +#endif /* editor_get_default_selection */ + #ifndef ui_add_config_file_menu_item GtkWidget *plugme_ui_add_config_file_menu_item(const gchar *real_path, const gchar *label, GtkContainer *parent); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 90b442: Merge pull request #168 from b4n/codenav/fixes
by Frank Lanitz 21 Oct '14

21 Oct '14

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Tue, 21 Oct 2014 22:31:43 UTC Commit: 90b442941f3e3a353a468f622f73eb8e55dba864 https://github.com/geany/geany-plugins/commit/90b442941f3e3a353a468f622f73e… Log Message: ----------- Merge pull request #168 from b4n/codenav/fixes A few Codenav fixes Modified Paths: -------------- codenav/src/codenavigation.c codenav/src/switch_head_impl.c codenav/src/switch_head_impl.h Modified: codenav/src/codenavigation.c 8 lines changed, 4 insertions(+), 4 deletions(-) =================================================================== @@ -74,7 +74,7 @@ GtkWidget* config_widget(void); static void -load_configuration(); +load_configuration(void); static void on_configure_add_language(GtkWidget* widget, gpointer data); @@ -114,13 +114,13 @@ void plugin_init(GeanyData *data) * @return void * */ -static void load_configuration() +static void load_configuration(void) { GKeyFile *config = NULL; gchar *config_filename = NULL; gchar **impl_list = NULL, **head_list = NULL; gsize head_list_len, impl_list_len; - int i; + gsize i; /* Load user configuration */ config = g_key_file_new(); @@ -220,7 +220,7 @@ void plugin_cleanup(void) static void on_configure_response(GtkDialog* dialog, gint response, gpointer user_data) { - gint i=0; + gsize i=0; GKeyFile *config = NULL; gchar *config_filename = NULL; Modified: codenav/src/switch_head_impl.c 5 lines changed, 3 insertions(+), 2 deletions(-) =================================================================== @@ -141,7 +141,8 @@ fill_languages_list(const gchar** impl_list, const gchar** head_list, gsize n) { gchar **splitted_list; Language* lang = NULL; - gint i, j; + gsize i; + guint j; languages_clean(); @@ -440,7 +441,7 @@ menu_item_activate(guint key_id) * @return GSList* languages list * */ -GSList* switch_head_impl_get_languages() +GSList* switch_head_impl_get_languages(void) { return languages; } Modified: codenav/src/switch_head_impl.h 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -51,7 +51,7 @@ fill_languages_list(const gchar**, const gchar**, gsize); -GSList* switch_head_impl_get_languages(); +GSList* switch_head_impl_get_languages(void); #endif /* SWITCH_HEAD_IMPL_H */ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] c3e049: geanyctags: disable also the "Find tag" entry when project not loaded
by Jiří Techet 21 Oct '14

21 Oct '14

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Tue, 21 Oct 2014 21:55:32 UTC Commit: c3e049fc08f45030781c081eb6d0d5d1b4610e4b https://github.com/geany/geany-plugins/commit/c3e049fc08f45030781c081eb6d0d… Log Message: ----------- geanyctags: disable also the "Find tag" entry when project not loaded Modified Paths: -------------- geanyctags/src/geanyctags.c Modified: geanyctags/src/geanyctags.c 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -87,6 +87,7 @@ void plugin_cleanup(void); static void set_widgets_sensitive(gboolean sensitive) { gtk_widget_set_sensitive(GTK_WIDGET(s_gt_item), sensitive); + gtk_widget_set_sensitive(GTK_WIDGET(s_ft_item), sensitive); gtk_widget_set_sensitive(GTK_WIDGET(s_context_fdec_item), sensitive); gtk_widget_set_sensitive(GTK_WIDGET(s_context_fdef_item), sensitive); } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 9b07b6: geanyctags: check whether project is open on plugin load
by Jiří Techet 21 Oct '14

21 Oct '14

Branch: refs/heads/master Author: Jiří Techet <techet(a)gmail.com> Committer: Jiří Techet <techet(a)gmail.com> Date: Tue, 21 Oct 2014 21:52:11 UTC Commit: 9b07b6986a06522369d0076c5d92f91adeaead49 https://github.com/geany/geany-plugins/commit/9b07b6986a06522369d0076c5d92f… Log Message: ----------- geanyctags: check whether project is open on plugin load Modified Paths: -------------- geanyctags/src/geanyctags.c Modified: geanyctags/src/geanyctags.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -656,7 +656,7 @@ void plugin_init(G_GNUC_UNUSED GeanyData * data) keybindings_set_item(key_group, KB_FIND_TAG, NULL, 0, 0, "find_tag", _("Find tag"), s_ft_item); - set_widgets_sensitive(FALSE); + set_widgets_sensitive(geany_data->app->project); } void plugin_cleanup(void) -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 099315: gitignore: Add cscope files
by Vadim Kochan 21 Oct '14

21 Oct '14

Branch: refs/heads/master Author: Vadim Kochan <vadim4j(a)gmail.com> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Tue, 21 Oct 2014 20:06:24 UTC Commit: 09931581c1a04f249c1842955517fe326b214bc7 https://github.com/geany/geany-plugins/commit/09931581c1a04f249c1842955517f… Log Message: ----------- gitignore: Add cscope files Modified Paths: -------------- .gitignore Modified: .gitignore 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -13,6 +13,8 @@ deps.mak .libs/ Makefile Makefile.in +cscope.out +cscope.files #----------------------------------------------------------------------- # / (root) -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 5ce234: scope: Don't depend on Geany private prototypes
by Colomban Wendling 21 Oct '14

21 Oct '14

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Tue, 21 Oct 2014 17:35:45 UTC Commit: 5ce234b80c35e094865c3d21672a4cf8a94a702b https://github.com/geany/geany-plugins/commit/5ce234b80c35e094865c3d21672a4… Log Message: ----------- scope: Don't depend on Geany private prototypes This fixes build with latest Geany development version as it now hides most internals behind GEANY_PRIVATE, including non-public prototypes. Modified Paths: -------------- scope/src/plugme.c scope/src/plugme.h Modified: scope/src/plugme.c 8 lines changed, 2 insertions(+), 6 deletions(-) =================================================================== @@ -27,7 +27,6 @@ extern GeanyFunctions *geany_functions; /* This file must not depend on Scope */ #include "plugme.h" -#ifndef ui_setup_open_button_callback static gchar *run_file_chooser(const gchar *title, GtkFileChooserAction action, const gchar *utf8_path) { @@ -101,7 +100,7 @@ static void ui_path_box_open_clicked(G_GNUC_UNUSED GtkButton *button, gpointer u /* Setup a GtkButton to run a GtkFileChooser, setting entry text if successful. * title can be NULL. * action is the file chooser mode to use. */ -void ui_setup_open_button_callback(GtkWidget *open_btn, const gchar *title, +void plugme_ui_setup_open_button_callback(GtkWidget *open_btn, const gchar *title, GtkFileChooserAction action, GtkEntry *entry) { GtkWidget *path_entry = GTK_WIDGET(entry); @@ -113,11 +112,9 @@ void ui_setup_open_button_callback(GtkWidget *open_btn, const gchar *title, ui_hookup_widget(open_btn, path_entry, "entry"); g_signal_connect(open_btn, "clicked", G_CALLBACK(ui_path_box_open_clicked), open_btn); } -#endif /* ui_setup_open_button_callback */ -#ifndef editor_get_default_selection /* Note: this is NOT the Geany function, only similar */ -gchar *editor_get_default_selection(GeanyEditor *editor, gboolean use_current_word, +gchar *plugme_editor_get_default_selection(GeanyEditor *editor, gboolean use_current_word, const gchar *wordchars) { ScintillaObject *sci = editor->sci; @@ -138,7 +135,6 @@ gchar *editor_get_default_selection(GeanyEditor *editor, gboolean use_current_wo return text; } -#endif /* editor_get_default_selection */ static void on_config_file_clicked(G_GNUC_UNUSED GtkWidget *widget, gpointer user_data) { Modified: scope/src/plugme.h 12 lines changed, 12 insertions(+), 0 deletions(-) =================================================================== @@ -19,6 +19,18 @@ #ifndef PLUGME_H +#ifndef ui_setup_open_button_callback +void plugme_ui_setup_open_button_callback(GtkWidget *open_btn, const gchar *title, + GtkFileChooserAction action, GtkEntry *entry); +#define ui_setup_open_button_callback plugme_ui_setup_open_button_callback +#endif /* ui_setup_open_button_callback */ + +#ifndef editor_get_default_selection +gchar *plugme_editor_get_default_selection(GeanyEditor *editor, gboolean use_current_word, + const gchar *wordchars); +#define editor_get_default_selection plugme_editor_get_default_selection +#endif /* editor_get_default_selection */ + #ifndef ui_add_config_file_menu_item GtkWidget *plugme_ui_add_config_file_menu_item(const gchar *real_path, const gchar *label, GtkContainer *parent); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 1494b4: Merge pull request #156 from b4n/debugger/cond-usage-fix
by Alexander Petukhov 21 Oct '14

21 Oct '14

Branch: refs/heads/master Author: Alexander Petukhov <devel(a)apetukhov.ru> Committer: Alexander Petukhov <devel(a)apetukhov.ru> Date: Tue, 21 Oct 2014 14:23:03 UTC Commit: 1494b468d1f4a536254cb9c66b12bddd17bcfc9b https://github.com/geany/geany-plugins/commit/1494b468d1f4a536254cb9c66b12b… Log Message: ----------- Merge pull request #156 from b4n/debugger/cond-usage-fix debugger: Fix GCond usage Modified Paths: -------------- debugger/src/dconfig.c Modified: debugger/src/dconfig.c 12 lines changed, 4 insertions(+), 8 deletions(-) =================================================================== @@ -270,11 +270,9 @@ static void save_to_keyfile(GKeyFile *keyfile) static gpointer saving_thread_func(gpointer data) { GTimeVal interval; - GMutex *m = g_mutex_new(); + g_mutex_lock(change_config_mutex); do { - g_mutex_lock(change_config_mutex); - if ( panel_config_changed || (debug_config_changed && DEBUG_STORE_PLUGIN == dstore) @@ -309,14 +307,12 @@ static gpointer saving_thread_func(gpointer data) debug_config_changed = FALSE; } - - g_mutex_unlock(change_config_mutex); g_get_current_time(&interval); g_time_val_add(&interval, SAVING_INTERVAL); } - while (!g_cond_timed_wait(cond, m, &interval)); - g_mutex_free(m); + while (!g_cond_timed_wait(cond, change_config_mutex, &interval)); + g_mutex_unlock(change_config_mutex); return NULL; } @@ -471,7 +467,7 @@ void config_init(void) void config_destroy(void) { g_cond_signal(cond); - /* ??? g_thread_join(saving_thread); */ + g_thread_join(saving_thread); g_mutex_free(change_config_mutex); g_cond_free(cond); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 8fccf8: Merge pull request #170 from b4n/geanypg/fixes
by Frank Lanitz 21 Oct '14

21 Oct '14

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Tue, 21 Oct 2014 07:56:51 UTC Commit: 8fccf8e8a3474687fe9e9b4f628ab93e29d3fb9d https://github.com/geany/geany-plugins/commit/8fccf8e8a3474687fe9e9b4f628ab… Log Message: ----------- Merge pull request #170 from b4n/geanypg/fixes geanypg: Simplify string building a lot Modified Paths: -------------- geanypg/src/verify_aux.c Modified: geanypg/src/verify_aux.c 60 lines changed, 19 insertions(+), 41 deletions(-) =================================================================== @@ -90,58 +90,37 @@ static char * geanypg_summary(gpgme_sigsum_t summary, char * buffer) return buffer; } -static char * geanypg_result(gpgme_signature_t sig) +static gchar * geanypg_result(gpgme_signature_t sig) { - char * format = - _("status ....: %s\n" - "summary ...:%s\n" - "fingerprint: %s\n" - "created ...: %s" - "expires ...: %s" - "validity ..: %s\n" - "val.reason : %s\n" - "pubkey algo: %s\n" - "digest algo: %s\n" - "pka address: %s\n" - "pka trust .: %s\n" - "other flags:%s%s\n" - "notations .: %s\n"); - char * buffer; char summary[128] = {0}; const char * pubkey = gpgme_pubkey_algo_name(sig->pubkey_algo); const char * hash = gpgme_hash_algo_name(sig->hash_algo); char created[64] = {0}; char expires[64] = {0}; - size_t buffer_size; if (sig->timestamp) - strncpy(created, ctime((time_t*)&sig->timestamp), 64); + strncpy(created, ctime((time_t*)&sig->timestamp), sizeof(created) - 1); else strcpy(created, _("Unknown\n")); if (sig->exp_timestamp) - strncpy(expires, ctime((time_t*)&sig->exp_timestamp), 64); + strncpy(expires, ctime((time_t*)&sig->exp_timestamp), sizeof(expires) - 1); else strcpy(expires, _("Unknown\n")); - buffer_size = strlen(format) + - strlen(gpgme_strerror(sig->status)) + - strlen(geanypg_summary(sig->summary, summary)) + - strlen(sig->fpr ? sig->fpr : _("[None]")) + - strlen(created) + - strlen(expires) + - strlen(geanypg_validity(sig->validity)) + - strlen(gpgme_strerror(sig->status)) + - strlen(pubkey ? pubkey : _("Unknown")) + - strlen(hash ? hash : _("Unknown")) + - strlen(sig->pka_address ? sig->pka_address : _("[None]")) + - strlen(sig->pka_trust == 0 ? _("n/a") : sig->pka_trust == 1 ? _("bad") : sig->pka_trust == 2 ? _("okay"): _("RFU")) + - strlen(sig->wrong_key_usage ? _(" wrong-key-usage") : "") + - strlen(sig->chain_model ? _(" chain-model") : "") + - strlen(sig->notations ? _("yes") : _("no")) + 1; /* and a trailing \0 */ - - buffer = (char *)calloc(buffer_size, 1); - memset(summary, 0, 128); - sprintf(buffer, format, + return g_strdup_printf( + _("status ....: %s\n" + "summary ...:%s\n" + "fingerprint: %s\n" + "created ...: %s" + "expires ...: %s" + "validity ..: %s\n" + "val.reason : %s\n" + "pubkey algo: %s\n" + "digest algo: %s\n" + "pka address: %s\n" + "pka trust .: %s\n" + "other flags:%s%s\n" + "notations .: %s\n"), gpgme_strerror(sig->status), geanypg_summary(sig->summary, summary), sig->fpr ? sig->fpr : _("[None]"), @@ -155,13 +134,12 @@ static char * geanypg_result(gpgme_signature_t sig) sig->pka_trust == 0 ? _("n/a") : sig->pka_trust == 1 ? _("bad") : sig->pka_trust == 2 ? _("okay"): _("RFU"), sig->wrong_key_usage ? _(" wrong-key-usage") : "", sig->chain_model ? _(" chain-model") : "", sig->notations ? _("yes") : _("no")); - return buffer; } void geanypg_check_sig(encrypt_data * ed, gpgme_signature_t sig) { GtkWidget * dialog; char buffer[512] = {0}; - char * result; + gchar * result; strncpy(buffer, sig->fpr, 40); buffer[40] = 0; geanypg_get_keys_with_fp(ed, buffer); @@ -178,7 +156,7 @@ void geanypg_check_sig(encrypt_data * ed, gpgme_signature_t sig) gtk_window_set_title(GTK_WINDOW(dialog), _("Signature")); gtk_dialog_run(GTK_DIALOG(dialog)); - free(result); + g_free(result); gtk_widget_destroy(dialog); } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 27f92b: TableConvert: Small update of documentation
by Frank Lanitz 20 Oct '14

20 Oct '14

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Mon, 20 Oct 2014 18:25:42 UTC Commit: 27f92b9e02020eb98beeb7e45dedaaf33a5ed887 https://github.com/geany/geany-plugins/commit/27f92b9e02020eb98beeb7e45deda… Log Message: ----------- TableConvert: Small update of documentation Modified Paths: -------------- tableconvert/ChangeLog Modified: tableconvert/ChangeLog 5 lines changed, 5 insertions(+), 0 deletions(-) =================================================================== @@ -1,3 +1,8 @@ +2014-10-20 Frank Lanitz <frank(a)frank.uvena.de> + + * Adding support for DokuWiki + + 2014-10-10 Frank Lanitz <frank(a)frank.uvena.de> * Introducing a special menu entry into Tools-menu allowing to convert -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] db6789: TableConvert: Adding DokuWiki as first non-Geany filetype for TableConvert and clean logic up so it should support also other wiki syntaxes in future
by Frank Lanitz 20 Oct '14

20 Oct '14

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: Frank Lanitz <frank(a)frank.uvena.de> Date: Mon, 20 Oct 2014 18:24:58 UTC Commit: db67897fa1daf89fa728d5db25c6f11de32e829e https://github.com/geany/geany-plugins/commit/db67897fa1daf89fa728d5db25c6f… Log Message: ----------- TableConvert: Adding DokuWiki as first non-Geany filetype for TableConvert and clean logic up so it should support also other wiki syntaxes in future Modified Paths: -------------- tableconvert/src/tableconvert.c tableconvert/src/tableconvert.h Modified: tableconvert/src/tableconvert.c 196 lines changed, 123 insertions(+), 73 deletions(-) =================================================================== @@ -39,70 +39,94 @@ GeanyFunctions *geany_functions; TableConvertRule tablerules[] = { /* LaTeX */ { - N_("LaTeX"), - "\\begin{table}[h]\n\\begin{tabular}{}\n", - "", - "", - "", - "", - " & ", - "\t", - "\\\\", - "", - "\\end{tabular}\n\\end{table}" + N_("LaTeX"), /* type */ + "\\begin{table}[h]\n\\begin{tabular}{}\n", /* start */ + "\t", /* header_start */ + "", /* header_stop */ + " & ", /* header_columnsplit */ + "", /* header_linestart */ + "\\\\ \\hline", /* header_lineend */ + "", /* body_start */ + "", /* body_end */ + " & ", /* columnsplit */ + "\t", /* linestart */ + "\\\\", /* lineend */ + "", /* linesplit */ + "\\end{tabular}\n\\end{table}" /* end */ }, /* HTML */ { - N_("HTML"), - "<table>\n", - "<thead>\n", - "</thead>\n", - "<tbody>\n", - "\n</tbody>", - "</td>\n\t<td>", - "<tr>\n\t<td>", - "</td>\n</tr>", - "", - "\n</table>" + N_("HTML"), /* type */ + "<table>\n", /* start */ + "<thead>\n", /* header_start */ + "</thead>\n", /* header_stop */ + "</td>\n\t<td>", /* header_columnsplit */ + "<tr>\n\t<td>", /* header_linestart */ + "</td>\n</tr>\n", /* header_lineend */ + "<tbody>\n", /* body_start */ + "\n</tbody>", /* body_end */ + "</td>\n\t<td>", /* columnsplit */ + "<tr>\n\t<td>", /* linestart */ + "</td>\n</tr>", /* lineend */ + "", /* linesplit */ + "\n</table>" /* end */ }, /* SQL */ + /* Header not yet supported, so treated as normal + * "Body"-SQL. This is handled on function logic + * */ { - N_("SQL"), - "", - "", - "", - "", - "", - "','", - "\t('", - "')", - ",", - ";" - } + N_("SQL"), /* type */ + "", /* start */ + "", /* header_start */ + "", /* header_stop */ + "", /* header_columnsplit */ + "", /* header_linestart */ + "", /* header_lineend */ + "", /* body_start */ + "", /* body_end */ + "','", /* columnsplit */ + "\t('", /* linestart */ + "')", /* lineend */ + ",", /* linesplit */ + ";" /* end */ + }, + /* DokuWiki */ + { + N_("DokuWiki"), /* type */ + "", /* start */ + "", /* header_start */ + "", /* header_stop */ + " ^ ", /* header_columnsplit */ + "^ ", /* header_linestart */ + " ^", /* header_lineend */ + "", /* body_start */ + "", /* body_end */ + " | ", /* columnsplit */ + "| ", /* linestart */ + " |", /* lineend */ + "", /* linesplit */ + "", /* end */ + } }; static gchar* convert_to_table_worker(gchar **rows, gboolean header, - const TableConvertRule *rule) + gint file_type) { guint i; guint j; GString *replacement_str = NULL; GeanyDocument *doc = NULL; + TableConvertRule *rule = &tablerules[file_type]; doc = document_get_current(); g_return_val_if_fail(rows != NULL, NULL); + g_return_if_fail(rule != NULL); /* Adding start of table to replacement */ replacement_str = g_string_new(rule->start); - /* Adding special header if requested - * e.g. <thead> */ - if (header == TRUE) - { - 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++) @@ -110,46 +134,67 @@ static gchar* convert_to_table_worker(gchar **rows, gboolean header, gchar **columns = NULL; columns = g_strsplit_set(rows[i], "\t", -1); - if (i == 1 && + /* Putting in some header if needed */ + if (i == 0 && header == TRUE) { - 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); - } + /* header_start */ + g_string_append(replacement_str, rule->header_start); - g_string_append(replacement_str, rule->linestart); + /* header_linestart */ + g_string_append(replacement_str, rule->header_linestart); - for (j = 0; columns[j] != NULL; j++) - { - if (j > 0) + /* header_columnsplit + columncontent */ + for (j = 0; columns[j] != NULL; j++) { - g_string_append(replacement_str, rule->columnsplit); + if (j > 0) + { + g_string_append(replacement_str, rule->header_columnsplit); + } + g_string_append(replacement_str, columns[j]); } - g_string_append(replacement_str, columns[j]); - } - if (utils_str_equal(rule->lineend, "")) - { + /* header_lineend */ + g_string_append(replacement_str, rule->header_lineend); + + /* header_stop */ + g_string_append(replacement_str, rule->header_stop); + + /* Adding a new line of header assuming it's something + * relevant for every typ */ g_string_append(replacement_str, editor_get_eol_char(doc->editor)); + + /* body_start */ + /* Only insert explicit body start if there is a header */ + g_string_append(replacement_str, rule->body_start); } - else + if (i > 0 || + header == FALSE) { - g_string_append(replacement_str, rule->lineend); - if (doc->file_type->id == GEANY_FILETYPES_SQL || - doc->file_type->id == GEANY_FILETYPES_LATEX) + /* linestart */ + g_string_append(replacement_str, rule->linestart); + + /* columnsplit + column */ + for (j = 0; columns[j] != NULL; j++) { - g_string_append(replacement_str, editor_get_eol_char(doc->editor)); + if (j > 0) + { + g_string_append(replacement_str, rule->columnsplit); + } + g_string_append(replacement_str, columns[j]); } - } - if (rows[i+1] != NULL) - { - g_string_append(replacement_str, rule->linesplit); + /* lineend */ + g_string_append(replacement_str, rule->lineend); + + /* linesplit */ + if (rows[i+1] != NULL && utils_str_equal(rule->linesplit, "")) + { + g_string_append(replacement_str, rule->linesplit); + } + g_string_append(replacement_str, editor_get_eol_char(doc->editor)); + g_strfreev(columns); } - g_strfreev(columns); } if (header == TRUE) @@ -163,6 +208,7 @@ static gchar* convert_to_table_worker(gchar **rows, gboolean header, return g_string_free(replacement_str, FALSE); } + void convert_to_table(gboolean header, gint file_type) { GeanyDocument *doc = NULL; @@ -207,22 +253,22 @@ void convert_to_table(gboolean header, gint file_type) { replacement = convert_to_table_worker(rows, header, - &tablerules[TC_HTML]); + TC_HTML); break; } case GEANY_FILETYPES_LATEX: { replacement = convert_to_table_worker(rows, header, - &tablerules[TC_LATEX]); + TC_LATEX); break; } case GEANY_FILETYPES_SQL: { /* TODO: Check for INTEGER and other datatypes on SQL */ replacement = convert_to_table_worker(rows, - header, - &tablerules[TC_SQL]); + FALSE, + TC_SQL); break; } default: @@ -233,9 +279,13 @@ void convert_to_table(gboolean header, gint file_type) } else { + if (file_type == TC_SQL) + { + header = FALSE; + } replacement = convert_to_table_worker(rows, header, - &tablerules[file_type]); + file_type); } } Modified: tableconvert/src/tableconvert.h 4 lines changed, 4 insertions(+), 0 deletions(-) =================================================================== @@ -45,6 +45,9 @@ typedef struct { const gchar *start; const gchar *header_start; const gchar *header_stop; + const gchar *header_columnsplit; + const gchar *header_linestart; + const gchar *header_lineend; const gchar *body_start; const gchar *body_end; const gchar *columnsplit; @@ -60,6 +63,7 @@ enum { TC_LATEX = 0, TC_HTML, TC_SQL, + TC_DOKUWIKI, TC_END }; -------------- 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 October 2014