Plugins-Commits September 2009

plugins-commits@lists.geany.org

8 participants
93 discussions

SF.net SVN: geany-plugins:[918] trunk/geany-plugins/pretty-printer/src
by ctabin＠users.sourceforge.net 05 Sep '09

05 Sep '09

Revision: 918 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=918&view=rev Author: ctabin Date: 2009-09-05 14:46:23 +0000 (Sat, 05 Sep 2009) Log Message: ----------- Pretty-print : Doctype supporte added, bugfix on cdata processing Modified Paths: -------------- trunk/geany-plugins/pretty-printer/src/Makefile.am trunk/geany-plugins/pretty-printer/src/PluginEntry.c trunk/geany-plugins/pretty-printer/src/PluginEntry.h trunk/geany-plugins/pretty-printer/src/PrettyPrinter.c Added Paths: ----------- trunk/geany-plugins/pretty-printer/src/ConfigUI.c trunk/geany-plugins/pretty-printer/src/ConfigUI.h Added: trunk/geany-plugins/pretty-printer/src/ConfigUI.c =================================================================== --- trunk/geany-plugins/pretty-printer/src/ConfigUI.c (rev 0) +++ trunk/geany-plugins/pretty-printer/src/ConfigUI.c 2009-09-05 14:46:23 UTC (rev 918) @@ -0,0 +1,77 @@ +/** + * Copyright (C) 2009 Cedric Tabin + * + * 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 "ConfigUI.h" + +GtkWidget* createPrettyPrinterConfigUI(GtkDialog* dialog) +{ + //default printing options + if (prettyPrintingOptions == NULL) { prettyPrintingOptions = createDefaultPrettyPrintingOptions(); } + + //TODO create configuration widget +} + +void saveSettings() +{ + //TODO save settings into a file +} + + +/* +GtkWidget* plugin_configure(GtkDialog * dialog) +{ + //default printing options + if (prettyPrintingOptions == NULL) { prettyPrintingOptions = createDefaultPrettyPrintingOptions(); } + + GtkWidget* globalBox = gtk_hbox_new(TRUE, 4); + GtkWidget* rightBox = gtk_vbox_new(FALSE, 6); + GtkWidget* centerBox = gtk_vbox_new(FALSE, 6); + GtkWidget* leftBox = gtk_vbox_new(FALSE, 6); + + GtkWidget* textLabel = gtk_label_new("Text nodes"); + GtkWidget* textOneLine = gtk_check_button_new_with_label("One line"); + GtkWidget* textInline = gtk_check_button_new_with_label("Inline"); + + GtkWidget* cdataLabel = gtk_label_new("CDATA nodes"); + GtkWidget* cdataOneLine = gtk_check_button_new_with_label("One line"); + GtkWidget* cdataInline = gtk_check_button_new_with_label("Inline"); + + GtkWidget* commentLabel = gtk_label_new("Comments"); + GtkWidget* commentOneLine = gtk_check_button_new_with_label("One line"); + GtkWidget* commentInline = gtk_check_button_new_with_label("Inline"); + + gtk_box_pack_start(GTK_BOX(globalBox), leftBox, FALSE, FALSE, 3); + gtk_box_pack_start(GTK_BOX(globalBox), centerBox, FALSE, FALSE, 3); + gtk_box_pack_start(GTK_BOX(globalBox), rightBox, FALSE, FALSE, 3); + + gtk_box_pack_start(GTK_BOX(leftBox), textLabel, FALSE, FALSE, 3); + gtk_box_pack_start(GTK_BOX(centerBox), textOneLine, FALSE, FALSE, 3); + gtk_box_pack_start(GTK_BOX(rightBox), textInline, FALSE, FALSE, 3); + + gtk_box_pack_start(GTK_BOX(leftBox), cdataLabel, FALSE, FALSE, 3); + gtk_box_pack_start(GTK_BOX(centerBox), cdataOneLine, FALSE, FALSE, 3); + gtk_box_pack_start(GTK_BOX(rightBox), cdataInline, FALSE, FALSE, 3); + + gtk_box_pack_start(GTK_BOX(leftBox), commentLabel, FALSE, FALSE, 3); + gtk_box_pack_start(GTK_BOX(centerBox), commentOneLine, FALSE, FALSE, 3); + gtk_box_pack_start(GTK_BOX(rightBox), commentInline, FALSE, FALSE, 3); + + gtk_widget_show_all(globalBox); + return globalBox; +} +*/ Added: trunk/geany-plugins/pretty-printer/src/ConfigUI.h =================================================================== --- trunk/geany-plugins/pretty-printer/src/ConfigUI.h (rev 0) +++ trunk/geany-plugins/pretty-printer/src/ConfigUI.h 2009-09-05 14:46:23 UTC (rev 918) @@ -0,0 +1,36 @@ +/** + * Copyright (C) 2009 Cedric Tabin + * + * 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. + */ + +#ifndef PP_CONFIG_UI_H +#define PP_CONFIG_UI_H + +//========================================== INCLUDES ========================================================= + +#include <gtk/gtk.h> +#include "PrettyPrinter.h" + +//========================================== VARIABLES ======================================================== + +PrettyPrintingOptions* prettyPrintingOptions; + +//========================================== FUNCTIONS ======================================================== + +GtkWidget* createPrettyPrinterConfigUI(GtkDialog* dialog); +void saveSettings(); + +#endif Modified: trunk/geany-plugins/pretty-printer/src/Makefile.am =================================================================== --- trunk/geany-plugins/pretty-printer/src/Makefile.am 2009-09-03 21:08:56 UTC (rev 917) +++ trunk/geany-plugins/pretty-printer/src/Makefile.am 2009-09-05 14:46:23 UTC (rev 918) @@ -6,7 +6,9 @@ PluginEntry.h \ PluginEntry.c \ PrettyPrinter.c \ - PrettyPrinter.h + PrettyPrinter.h \ + ConfigUI.h \ + ConfigUI.c -pretty_print_la_CFLAGS = $(AM_CFLAGS) $(LIBXML_CFLAGS) +pretty_print_la_CFLAGS = $(AM_CFLAGS) $(LIBXML_CFLAGS) -Wall pretty_print_la_LIBADD = $(COMMONLIBS) $(LIBXML_LIBS) Modified: trunk/geany-plugins/pretty-printer/src/PluginEntry.c =================================================================== --- trunk/geany-plugins/pretty-printer/src/PluginEntry.c 2009-09-03 21:08:56 UTC (rev 917) +++ trunk/geany-plugins/pretty-printer/src/PluginEntry.c 2009-09-05 14:46:23 UTC (rev 918) @@ -26,20 +26,20 @@ //========================================== PLUGIN INFORMATION ========================================================== PLUGIN_VERSION_CHECK(130) -PLUGIN_SET_INFO("XML PrettyPrinter", "Formats an XML and make it readable for human.", - "1.0", "Cédric Tabin - http://www.astorm.ch"); +PLUGIN_SET_INFO("XML PrettyPrinter", "Formats an XML and makes it readable for human.", + "1.1", "Cédric Tabin - http://www.astorm.ch"); //========================================== DECLARATIONS ================================================================ GeanyPlugin* geany_plugin; GeanyData* geany_data; GeanyFunctions* geany_functions; -PrettyPrintingOptions* prettyPrintingOptions; -static GtkWidget *main_menu_item = NULL; //the main menu of the plugin +static GtkWidget* main_menu_item = NULL; //the main menu of the plugin //declaration of the functions -static void item_activate_cb(GtkMenuItem *menuitem, gpointer gdata); +static void xml_format(GtkMenuItem *menuitem, gpointer gdata); +static void config_closed(GtkWidget* configWidget, gint response, gpointer data); void plugin_init(GeanyData *data); void plugin_cleanup(void); @@ -56,7 +56,7 @@ gtk_container_add(GTK_CONTAINER(geany->main_widgets->tools_menu), main_menu_item); //add activation callback - g_signal_connect(main_menu_item, "activate", G_CALLBACK(item_activate_cb), NULL); + g_signal_connect(main_menu_item, "activate", G_CALLBACK(xml_format), NULL); } void plugin_cleanup(void) @@ -65,10 +65,28 @@ gtk_widget_destroy(main_menu_item); } +//TODO uncomment when configuration widget ready +/*GtkWidget* plugin_configure(GtkDialog * dialog) +{ + //creates the configuration widget + GtkWidget* widget = createPrettyPrinterConfigUI(dialog); + g_signal_connect(dialog, "response", G_CALLBACK(config_closed), NULL); + return widget; +}*/ + //========================================== LISTENERS =================================================================== -void item_activate_cb(GtkMenuItem *menuitem, gpointer gdata) +void config_closed(GtkWidget* configWidget, gint response, gpointer gdata) { + //if the user clicked OK or APPLY, then save the settings + if (response == GTK_RESPONSE_OK || response == GTK_RESPONSE_APPLY) + { + saveSettings(); + } +} + +void xml_format(GtkMenuItem* menuitem, gpointer gdata) +{ //default printing options if (prettyPrintingOptions == NULL) { prettyPrintingOptions = createDefaultPrettyPrintingOptions(); } @@ -104,8 +122,11 @@ //updates the document sci_set_text(sco, buffer); - sci_set_current_position(sco, 0, TRUE); + //set the line + int xOffset = scintilla_send_message(sco, SCI_GETXOFFSET, NULL, NULL); + scintilla_send_message(sco, SCI_LINESCROLL, -xOffset, 0); //TODO update with the right function-call for geany-0.19 + //sets the type GeanyFiletype* fileType = filetypes_index(GEANY_FILETYPES_XML); document_set_filetype(doc, fileType); @@ -113,48 +134,3 @@ //free all xmlFreeDoc(xmlDoc); } - -//TODO create configuration widget -/* -GtkWidget* plugin_configure(GtkDialog * dialog) -{ - //default printing options - if (prettyPrintingOptions == NULL) { prettyPrintingOptions = createDefaultPrettyPrintingOptions(); } - - GtkWidget* globalBox = gtk_hbox_new(TRUE, 4); - GtkWidget* rightBox = gtk_vbox_new(FALSE, 6); - GtkWidget* centerBox = gtk_vbox_new(FALSE, 6); - GtkWidget* leftBox = gtk_vbox_new(FALSE, 6); - - GtkWidget* textLabel = gtk_label_new("Text nodes"); - GtkWidget* textOneLine = gtk_check_button_new_with_label("One line"); - GtkWidget* textInline = gtk_check_button_new_with_label("Inline"); - - GtkWidget* cdataLabel = gtk_label_new("CDATA nodes"); - GtkWidget* cdataOneLine = gtk_check_button_new_with_label("One line"); - GtkWidget* cdataInline = gtk_check_button_new_with_label("Inline"); - - GtkWidget* commentLabel = gtk_label_new("Comments"); - GtkWidget* commentOneLine = gtk_check_button_new_with_label("One line"); - GtkWidget* commentInline = gtk_check_button_new_with_label("Inline"); - - gtk_box_pack_start(GTK_BOX(globalBox), leftBox, FALSE, FALSE, 3); - gtk_box_pack_start(GTK_BOX(globalBox), centerBox, FALSE, FALSE, 3); - gtk_box_pack_start(GTK_BOX(globalBox), rightBox, FALSE, FALSE, 3); - - gtk_box_pack_start(GTK_BOX(leftBox), textLabel, FALSE, FALSE, 3); - gtk_box_pack_start(GTK_BOX(centerBox), textOneLine, FALSE, FALSE, 3); - gtk_box_pack_start(GTK_BOX(rightBox), textInline, FALSE, FALSE, 3); - - gtk_box_pack_start(GTK_BOX(leftBox), cdataLabel, FALSE, FALSE, 3); - gtk_box_pack_start(GTK_BOX(centerBox), cdataOneLine, FALSE, FALSE, 3); - gtk_box_pack_start(GTK_BOX(rightBox), cdataInline, FALSE, FALSE, 3); - - gtk_box_pack_start(GTK_BOX(leftBox), commentLabel, FALSE, FALSE, 3); - gtk_box_pack_start(GTK_BOX(centerBox), commentOneLine, FALSE, FALSE, 3); - gtk_box_pack_start(GTK_BOX(rightBox), commentInline, FALSE, FALSE, 3); - - gtk_widget_show_all(globalBox); - return globalBox; -} -*/ Modified: trunk/geany-plugins/pretty-printer/src/PluginEntry.h =================================================================== --- trunk/geany-plugins/pretty-printer/src/PluginEntry.h 2009-09-03 21:08:56 UTC (rev 917) +++ trunk/geany-plugins/pretty-printer/src/PluginEntry.h 2009-09-05 14:46:23 UTC (rev 918) @@ -24,25 +24,14 @@ #include <stdlib.h> #include <stdio.h> -#include <geany.h> -#include <ui_utils.h> -#include <plugindata.h> -#include <editor.h> -#include <document.h> -#include <filetypes.h> -#include <geanyfunctions.h> -#include <Scintilla.h> +#include <geanyplugin.h> #include <libxml/parser.h> #include <libxml/tree.h> -#include <glib/gmacros.h> #include "PrettyPrinter.h" +#include "ConfigUI.h" //========================================== PROPERTIES ======================================================== - - //========================================== FUNCTIONS ========================================================= -// ??? - #endif Modified: trunk/geany-plugins/pretty-printer/src/PrettyPrinter.c =================================================================== --- trunk/geany-plugins/pretty-printer/src/PrettyPrinter.c 2009-09-03 21:08:56 UTC (rev 917) +++ trunk/geany-plugins/pretty-printer/src/PrettyPrinter.c 2009-09-05 14:46:23 UTC (rev 918) @@ -30,6 +30,7 @@ static char getPreviousInsertedChar(); //returns the last inserted char into the new buffer static gboolean isWhite(char c); //check if the specified char is a white static gboolean isLineBreak(char c); //check if the specified char is a new line +static gboolean isQuote(char c); //check if the specified char is a quote (simple or double) static int putNewLine(); //put a new line into the new char buffer with the correct number of whites (indentation) static gboolean isInlineNodeAllowed(); //check if it is possible to have an inline node static void resetBackwardIndentation(gboolean resetLineBreak); //reset the indentation for the current depth (just reset the index in fact) @@ -140,7 +141,7 @@ PrettyPrintingOptions* options = (PrettyPrintingOptions*)malloc(sizeof(PrettyPrintingOptions)); if (options == NULL) { - printError("createDefaultPrettyPrintingOptions : Unable to allocate memory"); + g_error("Unable to allocate memory for PrettyPrintingOptions"); return NULL; } @@ -238,6 +239,14 @@ return counter; } +gboolean isQuote(char c) +{ + if (c == '\'') return TRUE; + if (c == '"') return TRUE; + + return FALSE; +} + gboolean isWhite(char c) { if (c == ' ') return TRUE; @@ -321,7 +330,11 @@ void resetBackwardIndentation(gboolean resetLineBreak) { xmlPrettyPrintedIndex -= (currentDepth*options->indentLength); - if (resetLineBreak) { --xmlPrettyPrintedIndex; } + if (resetLineBreak) + { + int len = strlen(options->newLineChars); + xmlPrettyPrintedIndex -= len; + } } //######################################################################################################################################### @@ -773,7 +786,8 @@ while(loop) { char nextChar = readNextChar(); - if (oldChar == ']' && nextChar == ']') { loop = FALSE; } //end of cdata + char nextChar2 = getNextChar(); + if (oldChar == ']' && nextChar == ']' && nextChar2 == '>') { loop = FALSE; } //end of cdata if (!isLineBreak(nextChar)) //the cdata simply continues { @@ -813,8 +827,63 @@ void processDoctype() { - printError("DOCTYPE is currently not supported by PrettyPrinter\n"); - result = PRETTY_PRINTING_NOT_SUPPORTED_YET; + putNextCharsInBuffer(9); //put the '<!DOCTYPE' into the buffer + + gboolean loop = TRUE; + while(loop) + { + readWhites(); + putCharInBuffer(' '); //only one space for the attributes + + int nextChar = readNextChar(); + while(!isWhite(nextChar) && + !isQuote(nextChar) && //begins a quoted text + nextChar != '=' && //begins an attribute + nextChar != '>' && //end of doctype + nextChar != '[') //inner <!ELEMENT> types + { + putCharInBuffer(nextChar); + nextChar = readNextChar(); + } + + if (isWhite(nextChar)) {} //do nothing, just let the next loop do the job + else if (isQuote(nextChar) || nextChar == '=') + { + if (nextChar == '=') + { + putCharInBuffer(nextChar); + nextChar = readNextChar(); //now we should have a quote + + if (!isQuote(nextChar)) + { + printError("processDoctype : the next char should be a quote (not '%c')", nextChar); + result = PRETTY_PRINTING_INVALID_CHAR_ERROR; + return; + } + } + + //simply process the content + char quote = nextChar; + do + { + putCharInBuffer(nextChar); + nextChar = readNextChar(); + } + while (nextChar != quote); + putCharInBuffer(nextChar); //now the last char is the last quote + } + else if (nextChar == '>') //end of doctype + { + putCharInBuffer(nextChar); + loop = FALSE; + } + else //the char is a '[' => not supported yet + { + printError("DOCTYPE inner ELEMENT is currently not supported by PrettyPrinter\n"); + result = PRETTY_PRINTING_NOT_SUPPORTED_YET; + loop = FALSE; + } + } } void processDoctypeElement() This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

Nightly build failed: Plugins GTK 2.8 build test
by noreply＠nightly.geany.org 05 Sep '09

05 Sep '09

Plugins GTK 2.8 build test failed at: waf build See http://nightly.geany.org/misc/build_gtk28_plugins_stderr.log for details. Error messages: ../../gtk28_test_plugins/codenav/src/codenavigation.c: In function 'switch_menu_item_activate': ../../gtk28_test_plugins/codenav/src/codenavigation.c:209: error: 'g_strcmp0' undeclared (first use in this function) ../../gtk28_test_plugins/codenav/src/codenavigation.c:209: error: (Each undeclared identifier is reported only once ../../gtk28_test_plugins/codenav/src/codenavigation.c:209: error: for each function it appears in.) ... ../../gtk28_test_plugins/codenav/src/codenavigation.c:209: error: for each function it appears in.) ../../gtk28_test_plugins/codenav/src/codenavigation.c:251: warning: comparison between signed and unsigned ../../gtk28_test_plugins/codenav/src/codenavigation.c:260: warning: implicit declaration of function 'g_strcmp0' ../../gtk28_test_plugins/codenav/src/codenavigation.c:311: warning: ISO C90 forbids mixed declarations and code Build failed -> task failed (err #1): {task: cc codenavigation.c -> codenavigation_2.o} http://nightly.geany.org/

1 0

Nightly build failed: Plugins GTK 2.8 build test
by noreply＠nightly.geany.org 04 Sep '09

04 Sep '09

1 0

SF.net SVN: geany-plugins:[917] trunk/geany-plugins/configure.ac
by hyperair＠users.sourceforge.net 03 Sep '09

03 Sep '09

Revision: 917 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=917&view=rev Author: hyperair Date: 2009-09-03 21:08:56 +0000 (Thu, 03 Sep 2009) Log Message: ----------- Update version of package to 0.17.1 Should have been done earlier, but was forgotten (change was done in a separate branch) Modified Paths: -------------- trunk/geany-plugins/configure.ac Modified: trunk/geany-plugins/configure.ac =================================================================== --- trunk/geany-plugins/configure.ac 2009-09-02 21:37:20 UTC (rev 916) +++ trunk/geany-plugins/configure.ac 2009-09-03 21:08:56 UTC (rev 917) @@ -1,5 +1,5 @@ AC_PREREQ([2.61]) -AC_INIT([geany-plugins], [0.17]) +AC_INIT([geany-plugins], [0.17.1]) AM_INIT_AUTOMAKE([1.8 foreign dist-bzip2 tar-ustar subdir-objects]) AC_CONFIG_SRCDIR([po/LINGUAS]) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

Nightly build failed: Plugins GTK 2.8 build test
by noreply＠nightly.geany.org 03 Sep '09

03 Sep '09

1 0

SF.net SVN: geany-plugins:[916] trunk/geany-plugins/geanygdb/src/ gdb-ui-main.c
by dmaphy＠users.sourceforge.net 02 Sep '09

02 Sep '09

Revision: 916 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=916&view=rev Author: dmaphy Date: 2009-09-02 21:37:20 +0000 (Wed, 02 Sep 2009) Log Message: ----------- fix compilation error (sorry!) Modified Paths: -------------- trunk/geany-plugins/geanygdb/src/gdb-ui-main.c Modified: trunk/geany-plugins/geanygdb/src/gdb-ui-main.c =================================================================== --- trunk/geany-plugins/geanygdb/src/gdb-ui-main.c 2009-09-02 21:23:27 UTC (rev 915) +++ trunk/geany-plugins/geanygdb/src/gdb-ui-main.c 2009-09-02 21:37:20 UTC (rev 916) @@ -395,24 +395,24 @@ if (cb) { - g_signal_connect(G_OBJECT(btn), "clicked", G_CALLBACK(cb), NULL); + g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(cb), NULL); } if (tip) { - gdbui_set_tip(btn, tip); + gdbui_set_tip(button, tip); } if (img && gdbui_setup.options.show_icons) { - gtk_button_set_image(GTK_BUTTON(btn), + gtk_button_set_image(GTK_BUTTON(button), gtk_image_new_from_stock(img, GTK_ICON_SIZE_BUTTON)); } - return btn; + return button; } 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:[915] trunk/geany-plugins/geanygdb/src/ gdb-ui-main.c
by dmaphy＠users.sourceforge.net 02 Sep '09

02 Sep '09

Revision: 915 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=915&view=rev Author: dmaphy Date: 2009-09-02 21:23:27 +0000 (Wed, 02 Sep 2009) Log Message: ----------- write make_btn() a bit cleaner Modified Paths: -------------- trunk/geany-plugins/geanygdb/src/gdb-ui-main.c Modified: trunk/geany-plugins/geanygdb/src/gdb-ui-main.c =================================================================== --- trunk/geany-plugins/geanygdb/src/gdb-ui-main.c 2009-09-02 20:41:09 UTC (rev 914) +++ trunk/geany-plugins/geanygdb/src/gdb-ui-main.c 2009-09-02 21:23:27 UTC (rev 915) @@ -366,37 +366,52 @@ static const gboolean disable_mnemonics = TRUE; static GtkWidget * -make_btn(gchar * text, GtkCallback cb, gchar * img, gchar * tip) +make_btn(const gchar *text, GtkCallback cb, gchar *img, gchar *tip) { - GtkWidget *btn; - if (text && disable_mnemonics) + GtkWidget *button; + + if (disable_mnemonics) { gchar *p; - gchar *buf = g_strdup(text); - for (p = buf; *p; p++) + gchar *buffer = g_strdup(text); + + for (p = buffer; *p; p++) { if (*p == '_') { memmove(p, p + 1, strlen(p)); } } - text = buf; - g_free(buf); + + button = gtk_button_new_with_label(buffer); + g_free(buffer); } - btn = text ? gtk_button_new_with_mnemonic(text) : gtk_button_new(); + + else + { + gtk_button_new_with_mnemonic(text); + } + + if (cb) { g_signal_connect(G_OBJECT(btn), "clicked", G_CALLBACK(cb), NULL); } + + if (tip) { gdbui_set_tip(btn, tip); } + + if (img && gdbui_setup.options.show_icons) { gtk_button_set_image(GTK_BUTTON(btn), gtk_image_new_from_stock(img, GTK_ICON_SIZE_BUTTON)); } + + return btn; } 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:[914] trunk/geany-plugins/geanygdb/src/ gdb-ui-main.c
by dmaphy＠users.sourceforge.net 02 Sep '09

02 Sep '09

Revision: 914 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=914&view=rev Author: dmaphy Date: 2009-09-02 20:41:09 +0000 (Wed, 02 Sep 2009) Log Message: ----------- g_free() unneeded buffers Modified Paths: -------------- trunk/geany-plugins/geanygdb/src/gdb-ui-main.c Modified: trunk/geany-plugins/geanygdb/src/gdb-ui-main.c =================================================================== --- trunk/geany-plugins/geanygdb/src/gdb-ui-main.c 2009-09-02 20:29:40 UTC (rev 913) +++ trunk/geany-plugins/geanygdb/src/gdb-ui-main.c 2009-09-02 20:41:09 UTC (rev 914) @@ -381,6 +381,7 @@ } } text = buf; + g_free(buf); } btn = text ? gtk_button_new_with_mnemonic(text) : gtk_button_new(); if (cb) 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:[913] trunk/geany-plugins/geanygdb
by dmaphy＠users.sourceforge.net 02 Sep '09

02 Sep '09

Revision: 913 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=913&view=rev Author: dmaphy Date: 2009-09-02 20:29:40 +0000 (Wed, 02 Sep 2009) Log Message: ----------- fix an issue with button labels, where some localizations may caused a stack overflow; rember the last targetpath Modified Paths: -------------- trunk/geany-plugins/geanygdb/ChangeLog trunk/geany-plugins/geanygdb/src/gdb-ui-main.c Modified: trunk/geany-plugins/geanygdb/ChangeLog =================================================================== --- trunk/geany-plugins/geanygdb/ChangeLog 2009-09-01 15:37:53 UTC (rev 912) +++ trunk/geany-plugins/geanygdb/ChangeLog 2009-09-02 20:29:40 UTC (rev 913) @@ -1,3 +1,8 @@ +2009-09-02 Dominic Hopf <dmaphy(a)googlemail.com> + * fix an issue with button labels, where some localizations may caused a stack + overflow + * rember the last targetpath + 2009-05-07 Dominic Hopf <dmaphy(a)googlemail.com> * install ttyhelper and geanydebug.so to /usr/lib/geany/ patch by Chow Loong Jin, thanks! Modified: trunk/geany-plugins/geanygdb/src/gdb-ui-main.c =================================================================== --- trunk/geany-plugins/geanygdb/src/gdb-ui-main.c 2009-09-01 15:37:53 UTC (rev 912) +++ trunk/geany-plugins/geanygdb/src/gdb-ui-main.c 2009-09-02 20:29:40 UTC (rev 913) @@ -74,7 +74,13 @@ #define blue "#0000FF" #define yellow "#FFFF00" +/* + * targetpath is to remember the path of the executable. Will be set in + * load_click() + */ +gchar* targetpath = NULL; + void gdbui_enable(gboolean enabled) { @@ -366,8 +372,7 @@ if (text && disable_mnemonics) { gchar *p; - gchar buf[32]; - strncpy(buf, text, sizeof(buf)); + gchar *buf = g_strdup(text); for (p = buf; *p; p++) { if (*p == '_') @@ -486,6 +491,12 @@ GTK_FILE_CHOOSER_ACTION_OPEN, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, NULL); + + if (targetpath != NULL) + { + gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER(dlg), targetpath); + } + do { if (errmsg) @@ -493,9 +504,12 @@ err_func(errmsg); errmsg = NULL; } + if (gtk_dialog_run(GTK_DIALOG(dlg)) == GTK_RESPONSE_ACCEPT) { gchar *fn = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dlg)); + targetpath = gtk_file_chooser_get_current_folder(GTK_FILE_CHOOSER(dlg)); + if (fn) { if (access(fn, R_OK) == 0) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

Nightly build failed: Plugins GTK 2.8 build test
by noreply＠nightly.geany.org 02 Sep '09

02 Sep '09

1 0

← Newer
1
2
3
4
5
6
7
8
9
10
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

Plugins-Commits September 2009