Plugins-Commits September 2011

plugins-commits@lists.geany.org

6 participants
30 discussions

SF.net SVN: geany-plugins:[2207] trunk/geany-plugins/pretty-printer/src/ PrettyPrinter.c
by colombanw＠users.sourceforge.net 21 Sep '11

21 Sep '11

Revision: 2207 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=2207&view=rev Author: colombanw Date: 2011-09-21 16:56:38 +0000 (Wed, 21 Sep 2011) Log Message: ----------- PrettyPrinter: fix printError() A va_list isn't equal to the argument it represents, and needs an appropriate function expecting itself a va_list. Also, it is not possible to do implicit concatenation of strings when one of the strings is not a literal. Modified Paths: -------------- trunk/geany-plugins/pretty-printer/src/PrettyPrinter.c Modified: trunk/geany-plugins/pretty-printer/src/PrettyPrinter.c =================================================================== --- trunk/geany-plugins/pretty-printer/src/PrettyPrinter.c 2011-09-21 16:56:19 UTC (rev 2206) +++ trunk/geany-plugins/pretty-printer/src/PrettyPrinter.c 2011-09-21 16:56:38 UTC (rev 2207) @@ -1085,9 +1085,10 @@ va_list va; va_start(va, msg); #ifdef HAVE_GLIB - g_warning(msg, va); + g_logv(G_LOG_DOMAIN, G_LOG_LEVEL_WARNING, msg, va); #else - PP_ERROR(msg, va); + vfprintf(stderr, msg, va); + putc('\n', stderr); #endif va_end(va); 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:[2206] trunk/geany-plugins/pretty-printer/src
by colombanw＠users.sourceforge.net 21 Sep '11

21 Sep '11

Revision: 2206 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=2206&view=rev Author: colombanw Date: 2011-09-21 16:56:19 +0000 (Wed, 21 Sep 2011) Log Message: ----------- PrettyPrinter: use proper C prototypes Modified Paths: -------------- trunk/geany-plugins/pretty-printer/src/ConfigUI.c trunk/geany-plugins/pretty-printer/src/ConfigUI.h trunk/geany-plugins/pretty-printer/src/PrettyPrinter.c trunk/geany-plugins/pretty-printer/src/PrettyPrinter.h Modified: trunk/geany-plugins/pretty-printer/src/ConfigUI.c =================================================================== --- trunk/geany-plugins/pretty-printer/src/ConfigUI.c 2011-09-19 21:54:03 UTC (rev 2205) +++ trunk/geany-plugins/pretty-printer/src/ConfigUI.c 2011-09-21 16:56:19 UTC (rev 2206) @@ -82,7 +82,7 @@ return container; } -void saveSettings() +void saveSettings(void) { PrettyPrintingOptions* ppo = prettyPrintingOptions; Modified: trunk/geany-plugins/pretty-printer/src/ConfigUI.h =================================================================== --- trunk/geany-plugins/pretty-printer/src/ConfigUI.h 2011-09-19 21:54:03 UTC (rev 2205) +++ trunk/geany-plugins/pretty-printer/src/ConfigUI.h 2011-09-21 16:56:19 UTC (rev 2206) @@ -32,6 +32,6 @@ //========================================== FUNCTIONS ======================================================== GtkWidget* createPrettyPrinterConfigUI(GtkDialog* dialog); -void saveSettings(); +void saveSettings(void); #endif Modified: trunk/geany-plugins/pretty-printer/src/PrettyPrinter.c =================================================================== --- trunk/geany-plugins/pretty-printer/src/PrettyPrinter.c 2011-09-19 21:54:03 UTC (rev 2205) +++ trunk/geany-plugins/pretty-printer/src/PrettyPrinter.c 2011-09-21 16:56:19 UTC (rev 2206) @@ -25,33 +25,33 @@ static void putCharsInBuffer(const char* charsToAdd); //put the chars into the new char buffer static void putNextCharsInBuffer(int nbChars); //put the next nbChars of the input buffer into the new buffer static int readWhites(bool considerLineBreakAsWhite); //read the next whites into the input buffer -static char readNextChar(); //read the next char into the input buffer; -static char getNextChar(); //returns the next char but do not increase the input buffer index (use readNextChar for that) -static char getPreviousInsertedChar(); //returns the last inserted char into the new buffer +static char readNextChar(void); //read the next char into the input buffer; +static char getNextChar(void); //returns the next char but do not increase the input buffer index (use readNextChar for that) +static char getPreviousInsertedChar(void); //returns the last inserted char into the new buffer static bool isWhite(char c); //check if the specified char is a white static bool isSpace(char c); //check if the specified char is a space static bool isLineBreak(char c); //check if the specified char is a new line static bool 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 bool isInlineNodeAllowed(); //check if it is possible to have an inline node +static int putNewLine(void); //put a new line into the new char buffer with the correct number of whites (indentation) +static bool isInlineNodeAllowed(void); //check if it is possible to have an inline node static bool isOnSingleLine(int skip, char stop1, char stop2); //check if the current node data is on one line (for inlining) static void resetBackwardIndentation(bool resetLineBreak); //reset the indentation for the current depth (just reset the index in fact) //specific parsing functions -static int processElements(); //returns the number of elements processed -static void processElementAttribute(); //process on attribute of a node -static void processElementAttributes(); //process all the attributes of a node -static void processHeader(); //process the header <?xml version="..." ?> -static void processNode(); //process an XML node -static void processTextNode(); //process a text node -static void processComment(); //process a comment -static void processCDATA(); //process a CDATA node -static void processDoctype(); //process a DOCTYPE node -static void processDoctypeElement(); //process a DOCTYPE ELEMENT node +static int processElements(void); //returns the number of elements processed +static void processElementAttribute(void); //process on attribute of a node +static void processElementAttributes(void); //process all the attributes of a node +static void processHeader(void); //process the header <?xml version="..." ?> +static void processNode(void); //process an XML node +static void processTextNode(void); //process a text node +static void processComment(void); //process a comment +static void processCDATA(void); //process a CDATA node +static void processDoctype(void); //process a DOCTYPE node +static void processDoctypeElement(void); //process a DOCTYPE ELEMENT node //debug function static void printError(const char *msg, ...); //just print a message like the printf method -static void printDebugStatus(); //just print some variables into the console for debugging +static void printDebugStatus(void); //just print some variables into the console for debugging //============================================ PRIVATE PROPERTIES ====================================== @@ -145,7 +145,7 @@ return result; } -PrettyPrintingOptions* createDefaultPrettyPrintingOptions() +PrettyPrintingOptions* createDefaultPrettyPrintingOptions(void) { PrettyPrintingOptions* defaultOptions = (PrettyPrintingOptions*)malloc(sizeof(PrettyPrintingOptions)); if (defaultOptions == NULL) @@ -212,12 +212,12 @@ } } -char getPreviousInsertedChar() +char getPreviousInsertedChar(void) { return xmlPrettyPrinted[xmlPrettyPrintedIndex-1]; } -int putNewLine() +int putNewLine(void) { putCharsInBuffer(options->newLineChars); int spaces = currentDepth*options->indentLength; @@ -230,12 +230,12 @@ return spaces; } -char getNextChar() +char getNextChar(void) { return inputBuffer[inputBufferIndex]; } -char readNextChar() +char readNextChar(void) { return inputBuffer[inputBufferIndex++]; } @@ -278,7 +278,7 @@ c == '\r'); } -bool isInlineNodeAllowed() +bool isInlineNodeAllowed(void) { //the last action was not an opening => inline not allowed if (!lastNodeOpen) { return FALSE; } @@ -403,7 +403,7 @@ //----------------------------------------------------------------------------------------------------------------------------------------- //######################################################################################################################################### -int processElements() +int processElements(void) { int counter = 0; ++currentDepth; @@ -474,7 +474,7 @@ return counter; } -void processElementAttribute() +void processElementAttribute(void) { //process the attribute name char nextChar = readNextChar(); @@ -502,7 +502,7 @@ putCharInBuffer(quote); } -void processElementAttributes() +void processElementAttributes(void) { char current = getNextChar(); //should not be a white if (isWhite(current)) @@ -529,7 +529,7 @@ } } -void processHeader() +void processHeader(void) { int firstChar = inputBuffer[inputBufferIndex]; //should be '<' int secondChar = inputBuffer[inputBufferIndex+1]; //must be '?' @@ -556,7 +556,7 @@ } } -void processNode() +void processNode(void) { int opening = readNextChar(); if (opening != '<') @@ -632,7 +632,7 @@ { //the tag is just closed (maybe some content) putNextCharsInBuffer(1); - subElementsProcessed = processElements(TRUE); + subElementsProcessed = processElements(); } else { @@ -694,7 +694,7 @@ currentNodeName = NULL; } -void processComment() +void processComment(void) { bool inlineAllowed = FALSE; if (options->inlineComment) { inlineAllowed = isInlineNodeAllowed(); } @@ -799,7 +799,7 @@ lastNodeOpen = FALSE; } -void processTextNode() +void processTextNode(void) { //checks if inline is allowed bool inlineTextAllowed = FALSE; @@ -891,7 +891,7 @@ lastNodeOpen = FALSE; } -void processCDATA() +void processCDATA(void) { bool inlineAllowed = FALSE; if (options->inlineCdata) { inlineAllowed = isInlineNodeAllowed(); } @@ -1013,7 +1013,7 @@ lastNodeOpen = FALSE; } -void processDoctype() +void processDoctype(void) { putNextCharsInBuffer(9); //put the '<!DOCTYPE' into the buffer @@ -1074,7 +1074,7 @@ } } -void processDoctypeElement() +void processDoctypeElement(void) { printError("ELEMENT is currently not supported by PrettyPrinter\n"); result = PRETTY_PRINTING_NOT_SUPPORTED_YET; @@ -1094,7 +1094,7 @@ printDebugStatus(); } -void printDebugStatus() +void printDebugStatus(void) { #ifdef HAVE_GLIB g_debug("\n===== INPUT =====\n%s\n=================\ninputLength = %d\ninputIndex = %d\noutputLength = %d\noutputIndex = %d\n", Modified: trunk/geany-plugins/pretty-printer/src/PrettyPrinter.h =================================================================== --- trunk/geany-plugins/pretty-printer/src/PrettyPrinter.h 2011-09-19 21:54:03 UTC (rev 2205) +++ trunk/geany-plugins/pretty-printer/src/PrettyPrinter.h 2011-09-21 16:56:19 UTC (rev 2206) @@ -85,6 +85,6 @@ //========================================== FUNCTIONS ========================================================= int processXMLPrettyPrinting(char** xml, int* length, PrettyPrintingOptions* ppOptions); //process the pretty-printing on a valid xml string (no check done !!!). The ppOptions ARE NOT FREE-ED after processing. The method returns 0 if the pretty-printing has been done. -PrettyPrintingOptions* createDefaultPrettyPrintingOptions(); //creates a default PrettyPrintingOptions object +PrettyPrintingOptions* createDefaultPrettyPrintingOptions(void); //creates a default PrettyPrintingOptions object #endif 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:[2205] trunk/geany-plugins/debugger/src
by cesspit＠users.sourceforge.net 19 Sep '11

19 Sep '11

Revision: 2205 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=2205&view=rev Author: cesspit Date: 2011-09-19 21:54:03 +0000 (Mon, 19 Sep 2011) Log Message: ----------- debugger: moving gdb to a personal process group in hope to predict SIGINT passing to Geany, fixing bug with async breakpoint operation, caret policy is set only for the time of moving to the line where debug stops Modified Paths: -------------- trunk/geany-plugins/debugger/src/callbacks.c trunk/geany-plugins/debugger/src/dbm_gdb.c trunk/geany-plugins/debugger/src/debug.c trunk/geany-plugins/debugger/src/utils.c Modified: trunk/geany-plugins/debugger/src/callbacks.c =================================================================== --- trunk/geany-plugins/debugger/src/callbacks.c 2011-09-19 20:29:04 UTC (rev 2204) +++ trunk/geany-plugins/debugger/src/callbacks.c 2011-09-19 21:54:03 UTC (rev 2205) @@ -169,9 +169,6 @@ /* set tab size for calltips */ scintilla_send_message(doc->editor->sci, SCI_CALLTIPUSESTYLE, 20, (long)NULL); - /* set caret policy */ - scintilla_send_message(doc->editor->sci, SCI_SETYCARETPOLICY, CARET_SLOP | CARET_JUMPS | CARET_EVEN , 3); - /* set breakpoint and frame markers */ set_markers_for_file(file); Modified: trunk/geany-plugins/debugger/src/dbm_gdb.c =================================================================== --- trunk/geany-plugins/debugger/src/dbm_gdb.c 2011-09-19 20:29:04 UTC (rev 2204) +++ trunk/geany-plugins/debugger/src/dbm_gdb.c 2011-09-19 21:54:03 UTC (rev 2205) @@ -536,6 +536,9 @@ return FALSE; } + /* move gdb to it's own process group */ + setpgid(gdb_pid, 0); + /* set handler for gdb process exit event */ g_child_watch_add(gdb_pid, on_gdb_exit, NULL); gdb_src = g_child_watch_source_new(gdb_pid); Modified: trunk/geany-plugins/debugger/src/debug.c =================================================================== --- trunk/geany-plugins/debugger/src/debug.c 2011-09-19 20:29:04 UTC (rev 2204) +++ trunk/geany-plugins/debugger/src/debug.c 2011-09-19 21:54:03 UTC (rev 2205) @@ -645,6 +645,9 @@ { interrupt_cb(interrupt_data); interrupt_data = NULL; + + active_module->resume(); + return; } Modified: trunk/geany-plugins/debugger/src/utils.c =================================================================== --- trunk/geany-plugins/debugger/src/utils.c 2011-09-19 20:29:04 UTC (rev 2204) +++ trunk/geany-plugins/debugger/src/utils.c 2011-09-19 21:54:03 UTC (rev 2205) @@ -38,22 +38,29 @@ /* * opens position in a editor */ -void editor_open_position(char* file, int line) +void editor_open_position(const gchar *filename, int line) { GeanyDocument* doc = NULL; - gboolean already_open = (doc = document_get_current()) && !strcmp(DOC_FILENAME(doc), file); + gboolean already_open = (doc = document_get_current()) && !strcmp(DOC_FILENAME(doc), filename); if (!already_open) - doc = document_open_file(file, FALSE, NULL, NULL); + doc = document_open_file(filename, FALSE, NULL, NULL); if (doc) { + /* temporarily set debug caret policy */ + scintilla_send_message(doc->editor->sci, SCI_SETYCARETPOLICY, CARET_SLOP | CARET_JUMPS | CARET_EVEN, 3); + sci_goto_line(doc->editor->sci, line - 1, TRUE); + + /* revert to default edit caret policy */ + scintilla_send_message(doc->editor->sci, SCI_SETYCARETPOLICY, CARET_EVEN, 0); + scintilla_send_message(doc->editor->sci, SCI_SETFOCUS, TRUE, 0); } else { - dialogs_show_msgbox(GTK_MESSAGE_ERROR, _("Can't find a source file \"%s\""), file); + dialogs_show_msgbox(GTK_MESSAGE_ERROR, _("Can't find a source file \"%s\""), filename); } } 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:[2204] trunk/geany-plugins
by colombanw＠users.sourceforge.net 19 Sep '11

19 Sep '11

Revision: 2204 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=2204&view=rev Author: colombanw Date: 2011-09-19 20:29:04 +0000 (Mon, 19 Sep 2011) Log Message: ----------- Debugger: fix distribution of XPMs Modified Paths: -------------- trunk/geany-plugins/build/debugger.m4 trunk/geany-plugins/debugger/src/Makefile.am Added Paths: ----------- trunk/geany-plugins/debugger/src/xpm/Makefile.am Modified: trunk/geany-plugins/build/debugger.m4 =================================================================== --- trunk/geany-plugins/build/debugger.m4 2011-09-18 13:28:35 UTC (rev 2203) +++ trunk/geany-plugins/build/debugger.m4 2011-09-19 20:29:04 UTC (rev 2204) @@ -7,6 +7,7 @@ AC_CONFIG_FILES([ debugger/Makefile debugger/src/Makefile + debugger/src/xpm/Makefile debugger/img/Makefile ]) ]) Modified: trunk/geany-plugins/debugger/src/Makefile.am =================================================================== --- trunk/geany-plugins/debugger/src/Makefile.am 2011-09-18 13:28:35 UTC (rev 2203) +++ trunk/geany-plugins/debugger/src/Makefile.am 2011-09-19 20:29:04 UTC (rev 2204) @@ -1,6 +1,8 @@ include $(top_srcdir)/build/vars.build.mk include $(top_srcdir)/build/vars.docs.mk +SUBDIRS = xpm + if ENABLE_DEBUGGER geanyplugins_LTLIBRARIES = debugger.la else Added: trunk/geany-plugins/debugger/src/xpm/Makefile.am =================================================================== --- trunk/geany-plugins/debugger/src/xpm/Makefile.am (rev 0) +++ trunk/geany-plugins/debugger/src/xpm/Makefile.am 2011-09-19 20:29:04 UTC (rev 2204) @@ -0,0 +1,7 @@ + +EXTRA_DIST = \ + breakpoint_condition.xpm \ + breakpoint_disabled.xpm \ + breakpoint.xpm \ + frame_current.xpm \ + frame.xpm 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:[2203] trunk/geany-plugins/gproject/README
by techet＠users.sourceforge.net 18 Sep '11

18 Sep '11

Revision: 2203 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=2203&view=rev Author: techet Date: 2011-09-18 13:28:35 +0000 (Sun, 18 Sep 2011) Log Message: ----------- gproject: Escape * in README Modified Paths: -------------- trunk/geany-plugins/gproject/README Modified: trunk/geany-plugins/gproject/README =================================================================== --- trunk/geany-plugins/gproject/README 2011-09-18 13:27:39 UTC (rev 2202) +++ trunk/geany-plugins/gproject/README 2011-09-18 13:28:35 UTC (rev 2203) @@ -73,7 +73,7 @@ Upon project creation, you should define the list of file patterns under the Project->Properties Project tab. For instance, for a typical open source C project, -use patterns "*.c *h *.am *.ac" to see the source files together with +use patterns "\*.c \*h \*.am \*.ac" to see the source files together with automake and autoconf files. After closing the dialog, the files matching the patterns should appear in the sidebar under the Project tab (unless the GProject plugin was loaded after the project - see Known Issues for more details). 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:[2202] trunk/geany-plugins/gproject/src
by techet＠users.sourceforge.net 18 Sep '11

18 Sep '11

Revision: 2202 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=2202&view=rev Author: techet Date: 2011-09-18 13:27:39 +0000 (Sun, 18 Sep 2011) Log Message: ----------- Eliminate some compiler warnings Modified Paths: -------------- trunk/geany-plugins/gproject/src/gproject-sidebar.c trunk/geany-plugins/gproject/src/gproject-utils.c Modified: trunk/geany-plugins/gproject/src/gproject-sidebar.c =================================================================== --- trunk/geany-plugins/gproject/src/gproject-sidebar.c 2011-09-18 12:03:57 UTC (rev 2201) +++ trunk/geany-plugins/gproject/src/gproject-sidebar.c 2011-09-18 13:27:39 UTC (rev 2202) @@ -526,7 +526,6 @@ GSList *lst = NULL; GSList *path_list = NULL; GSList *elem, *header_patterns, *source_patterns; - GtkTreeModel *model; gtk_tree_store_clear(s_file_store); @@ -547,8 +546,6 @@ path_list = g_slist_prepend(path_list, path_split); } - model = GTK_TREE_MODEL(s_file_store); - if (path_list != NULL) create_branch(0, path_list, NULL, header_patterns, source_patterns); else Modified: trunk/geany-plugins/gproject/src/gproject-utils.c =================================================================== --- trunk/geany-plugins/gproject/src/gproject-utils.c 2011-09-18 12:03:57 UTC (rev 2201) +++ trunk/geany-plugins/gproject/src/gproject-utils.c 2011-09-18 13:27:39 UTC (rev 2202) @@ -138,7 +138,10 @@ doc = document_find_by_filename(utf8_name); if (!doc) - doc = document_open_file(name, FALSE, NULL, NULL); + { +// doc = document_open_file(name, FALSE, NULL, NULL); + document_open_file(name, FALSE, NULL, NULL); + } else { GtkNotebook *notebook; 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:[2201] trunk/geany-plugins/debugger/src
by cesspit＠users.sourceforge.net 18 Sep '11

18 Sep '11

Revision: 2201 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=2201&view=rev Author: cesspit Date: 2011-09-18 12:03:57 +0000 (Sun, 18 Sep 2011) Log Message: ----------- debugger: saving debug panel layout config on a separate thread Modified Paths: -------------- trunk/geany-plugins/debugger/src/Makefile.am trunk/geany-plugins/debugger/src/dconfig.c trunk/geany-plugins/debugger/src/dpaned.c Added Paths: ----------- trunk/geany-plugins/debugger/src/pconfig.c trunk/geany-plugins/debugger/src/pconfig.h Modified: trunk/geany-plugins/debugger/src/Makefile.am =================================================================== --- trunk/geany-plugins/debugger/src/Makefile.am 2011-09-18 11:31:46 UTC (rev 2200) +++ trunk/geany-plugins/debugger/src/Makefile.am 2011-09-18 12:03:57 UTC (rev 2201) @@ -41,6 +41,8 @@ ltree.h \ markers.c \ markers.h \ + pconfig.c \ + pconfig.h \ plugin.c \ stree.c \ stree.h \ Modified: trunk/geany-plugins/debugger/src/dconfig.c =================================================================== --- trunk/geany-plugins/debugger/src/dconfig.c 2011-09-18 11:31:46 UTC (rev 2200) +++ trunk/geany-plugins/debugger/src/dconfig.c 2011-09-18 12:03:57 UTC (rev 2201) @@ -52,7 +52,7 @@ /* saving interval */ #define SAVING_INTERVAL 2000000 -/* idle callback staff */ +/* saving thread staff */ static GMutex *change_config_mutex; static GCond *cond; static GThread *saving_thread; @@ -85,7 +85,7 @@ /* * function for a config file background saving if changed */ -gpointer saving_thread_func(gpointer data) +static gpointer saving_thread_func(gpointer data) { GTimeVal interval; GMutex *m = g_mutex_new(); @@ -153,7 +153,7 @@ /* * checks whether a config file is founs in the folder */ -gboolean dconfig_is_found_at(gchar *folder) +gboolean dconfig_is_found_at(gchar *folder) { gchar *config = g_build_path(G_DIR_SEPARATOR_S, folder, CONFIG_NAME, NULL); gboolean res = g_file_test(config, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_REGULAR); Modified: trunk/geany-plugins/debugger/src/dpaned.c =================================================================== --- trunk/geany-plugins/debugger/src/dpaned.c 2011-09-18 11:31:46 UTC (rev 2200) +++ trunk/geany-plugins/debugger/src/dpaned.c 2011-09-18 12:03:57 UTC (rev 2201) @@ -38,13 +38,14 @@ #include "debug.h" #include "btnpanel.h" #include "stree.h" +#include "pconfig.h" #define NOTEBOOK_GROUP 438948394 #define HPANED_BORDER_WIDTH 4 #define CONNECT_PAGE_SIGNALS(X) \ - swicth_left_handler_id = g_signal_connect(G_OBJECT(debug_notebook_left), "switch-page", G_CALLBACK(on_change_current_page), NULL); \ - swicth_right_handler_id = g_signal_connect(G_OBJECT(debug_notebook_right), "switch-page", G_CALLBACK(on_change_current_page), NULL); \ + switch_left_handler_id = g_signal_connect(G_OBJECT(debug_notebook_left), "switch-page", G_CALLBACK(on_change_current_page), NULL); \ + switch_right_handler_id = g_signal_connect(G_OBJECT(debug_notebook_right), "switch-page", G_CALLBACK(on_change_current_page), NULL); \ g_signal_connect(G_OBJECT(debug_notebook_left), "page-reordered", G_CALLBACK(on_page_reordered), NULL); \ g_signal_connect(G_OBJECT(debug_notebook_right), "page-reordered", G_CALLBACK(on_page_reordered), NULL); \ add_left_handler_id = g_signal_connect(G_OBJECT(debug_notebook_left), "page-added", G_CALLBACK(on_page_added), NULL); \ @@ -53,8 +54,8 @@ remove_right_handler_id = g_signal_connect(G_OBJECT(debug_notebook_right), "page-removed", G_CALLBACK(on_page_removed), NULL); #define DISCONNECT_PAGE_SIGNALS(X) \ - g_signal_handler_disconnect(G_OBJECT(debug_notebook_left), swicth_left_handler_id); \ - g_signal_handler_disconnect(G_OBJECT(debug_notebook_right), swicth_right_handler_id); \ + g_signal_handler_disconnect(G_OBJECT(debug_notebook_left), switch_left_handler_id); \ + g_signal_handler_disconnect(G_OBJECT(debug_notebook_right), switch_right_handler_id); \ g_signal_handler_disconnect(G_OBJECT(debug_notebook_left), reorder_left_handler_id); \ g_signal_handler_disconnect(G_OBJECT(debug_notebook_right), reorder_right_handler_id); \ g_signal_handler_disconnect(G_OBJECT(debug_notebook_left), add_left_handler_id); \ @@ -68,12 +69,6 @@ #define DISCONNECT_ALLOCATED_PAGE_SIGNALS(X) \ g_signal_handler_disconnect(G_OBJECT(hpaned), allocate_handler_id); \ -/* config file path */ -static gchar *config_path = NULL; - -/* config GKeyFile */ -static GKeyFile *key_file = NULL; - /* pane */ static GtkWidget *hpaned = NULL; @@ -81,37 +76,18 @@ static GtkWidget *debug_notebook_left = NULL; static GtkWidget *debug_notebook_right = NULL; - /* notebook signal handler ids */ - static gulong allocate_handler_id; - -static gulong swicth_left_handler_id; -static gulong swicth_right_handler_id; - +static gulong switch_left_handler_id; +static gulong switch_right_handler_id; static gulong reorder_left_handler_id; static gulong reorder_right_handler_id; - static gulong add_left_handler_id; static gulong add_right_handler_id; - static gulong remove_left_handler_id; static gulong remove_right_handler_id; -/* keeps current tabbed mode */ -static gboolean is_tabbed; - /* - * save config to a file - */ -static void save_config() -{ - gchar *data = g_key_file_to_data(key_file, NULL, NULL); - g_file_set_contents(config_path, data, -1, NULL); - g_free(data); -} - -/* * first allocation handler to properly set paned position */ static void on_size_allocate(GtkWidget *widget,GdkRectangle *allocation, gpointer user_data) @@ -127,28 +103,42 @@ */ static void on_page_added(GtkNotebook *notebook, GtkWidget *child, guint page_num, gpointer user_data) { - gboolean left = (GTK_NOTEBOOK(debug_notebook_left) == notebook); + gboolean is_left = (GTK_NOTEBOOK(debug_notebook_left) == notebook); + gboolean is_tabbed = pconfig_get_tabbed(); - const gchar *group = is_tabbed ? "two_panels_mode" : "one_panel_mode"; - const gchar *tabs_key = is_tabbed ? (left ? "left_tabs" : "right_tabs") : "tabs"; - + int *tabs = NULL; gsize length; - int *tabs = g_key_file_get_integer_list(key_file, group, tabs_key, &length, NULL); - int *new_tabs = g_malloc((length + 1) * sizeof(int)); + if (!is_tabbed) + tabs = pconfig_get_tabs(&length); + else if (is_left) + tabs = pconfig_get_left_tabs(&length); + else + tabs = pconfig_get_right_tabs(&length); + + int *array = g_malloc((length + 2) * sizeof(int)); + int *new_tabs = array + 1; memcpy(new_tabs, tabs, length * sizeof(int)); memmove(new_tabs + page_num + 1, new_tabs + page_num, (length - page_num) * sizeof(int)); - GtkWidget *page = gtk_notebook_get_nth_page(GTK_NOTEBOOK(left ? debug_notebook_left : debug_notebook_right), page_num); + GtkWidget *page = gtk_notebook_get_nth_page(GTK_NOTEBOOK(is_left ? debug_notebook_left : debug_notebook_right), page_num); tab_id id = tabs_get_tab_id(page); new_tabs[page_num] = id; - g_key_file_set_integer_list(key_file, group, tabs_key, new_tabs, length + 1); + int config_part; + if (!is_tabbed) + config_part = CP_OT_TABS; + else if (is_left) + config_part = CP_TT_LTABS; + else + config_part = CP_TT_RTABS; - save_config(); + array[0] = length + 1; + memcpy(array + 1, new_tabs, length + 1); + pconfig_set(config_part, array, 0); g_free(tabs); - g_free(new_tabs); + g_free(array); } /* @@ -156,17 +146,21 @@ */ static void on_page_reordered(GtkNotebook *notebook, GtkWidget *child, guint page_num, gpointer user_data) { - gboolean left = (GTK_NOTEBOOK(debug_notebook_left) == notebook); + gboolean is_left = (GTK_NOTEBOOK(debug_notebook_left) == notebook); + gboolean is_tabbed = pconfig_get_tabbed(); - const gchar *group = is_tabbed ? "two_panels_mode" : "one_panel_mode"; - const gchar *tabs_key = is_tabbed ? (left ? "left_tabs" : "right_tabs") : "tabs"; - const gchar *selected_key = is_tabbed ? (left ? "left_selected_tab_index" : "right_selected_tab_index") : "selected_tab_index"; - + int *tabs = NULL; gsize length; - int *tabs = g_key_file_get_integer_list(key_file, group, tabs_key, &length, NULL); + if (!is_tabbed) + tabs = pconfig_get_tabs(&length); + else if (is_left) + tabs = pconfig_get_left_tabs(&length); + else + tabs = pconfig_get_right_tabs(&length); + int prev_index; - GtkWidget *page = gtk_notebook_get_nth_page(GTK_NOTEBOOK(left ? debug_notebook_left : debug_notebook_right), page_num); + GtkWidget *page = gtk_notebook_get_nth_page(GTK_NOTEBOOK(is_left ? debug_notebook_left : debug_notebook_right), page_num); tab_id id = tabs_get_tab_id(page); for (prev_index = 0; prev_index < length; prev_index++) { @@ -184,12 +178,36 @@ tabs[i + 1] = tmp; } - g_key_file_set_integer_list(key_file, group, tabs_key, tabs, length); - g_key_file_set_integer(key_file, group, selected_key, page_num); - - save_config(); - + int config_part_tabs; + int config_part_selected_index; + if (!is_tabbed) + { + config_part_tabs = CP_OT_TABS; + config_part_selected_index = CP_OT_SELECTED; + } + else if (is_left) + { + config_part_tabs = CP_TT_LTABS; + config_part_selected_index = CP_TT_LSELECTED; + } + else + { + config_part_tabs = CP_TT_RTABS; + config_part_selected_index = CP_TT_RSELECTED; + } + + int *array = g_malloc((length + 1) * sizeof(int)); + array[0] = length; + memcpy(array + 1, tabs, length * sizeof(int)); + + pconfig_set( + config_part_tabs, array, + config_part_selected_index, page_num, + 0 + ); + g_free(tabs); + g_free(array); } /* @@ -197,18 +215,32 @@ */ static void on_page_removed(GtkNotebook *notebook, GtkWidget *child, guint page_num, gpointer user_data) { - gboolean left = (GTK_NOTEBOOK(debug_notebook_left) == notebook); + gboolean is_left = (GTK_NOTEBOOK(debug_notebook_left) == notebook); + gboolean is_tabbed = pconfig_get_tabbed(); - const gchar *group = is_tabbed ? "two_panels_mode" : "one_panel_mode"; - const gchar *tabs_key = is_tabbed ? (left ? "left_tabs" : "right_tabs") : "tabs"; - + int *tabs = NULL; gsize length; - int *tabs = g_key_file_get_integer_list(key_file, group, tabs_key, &length, NULL); - memmove(tabs + page_num, tabs + page_num + 1, (length - page_num - 1) * sizeof(int)); - g_key_file_set_integer_list(key_file, group, tabs_key, tabs, length - 1); + if (!is_tabbed) + tabs = pconfig_get_tabs(&length); + else if (is_left) + tabs = pconfig_get_left_tabs(&length); + else + tabs = pconfig_get_right_tabs(&length); + + memmove(tabs + page_num, tabs + page_num + 1, (length - page_num - 1) * sizeof(int)); + memmove(tabs + 1, tabs, (length - 1) * sizeof(int)); + tabs[0] = length - 1; - save_config(); + int config_part; + if (!is_tabbed) + config_part = CP_OT_TABS; + else if (is_left) + config_part = CP_TT_LTABS; + else + config_part = CP_TT_RTABS; + + pconfig_set(config_part, tabs, 0); g_free(tabs); } @@ -218,38 +250,23 @@ */ static gboolean on_change_current_page(GtkNotebook *notebook, gpointer arg1, guint arg2, gpointer user_data) { - gboolean left = (GTK_NOTEBOOK(debug_notebook_left) == notebook); + gboolean is_left = (GTK_NOTEBOOK(debug_notebook_left) == notebook); + gboolean is_tabbed = pconfig_get_tabbed(); - const gchar *group = is_tabbed ? "two_panels_mode" : "one_panel_mode"; - const gchar *selected_key = is_tabbed ? (left ? "left_selected_tab_index" : "right_selected_tab_index") : "selected_tab_index"; + int config_part; + if (!is_tabbed) + config_part = CP_OT_SELECTED; + else if (is_left) + config_part = CP_TT_LSELECTED; + else + config_part = CP_TT_RSELECTED; + + pconfig_set(config_part, (gpointer)arg2, 0); - g_key_file_set_integer(key_file, group, selected_key, arg2); - - save_config(); - return TRUE; } /* - * set default values in the GKeyFile - */ -void dpaned_set_defaults(GKeyFile *kf) -{ - g_key_file_set_boolean(key_file, "tabbed_mode", "enabled", FALSE); - - int all_tabs[] = { TID_TARGET, TID_BREAKS, TID_LOCALS, TID_WATCH, TID_STACK, TID_TERMINAL, TID_MESSAGES }; - g_key_file_set_integer_list(key_file, "one_panel_mode", "tabs", all_tabs, sizeof(all_tabs) / sizeof(int)); - g_key_file_set_integer(key_file, "one_panel_mode", "selected_tab_index", 0); - - int left_tabs[] = { TID_TARGET, TID_BREAKS, TID_LOCALS, TID_WATCH }; - g_key_file_set_integer_list(key_file, "two_panels_mode", "left_tabs", left_tabs, sizeof(left_tabs) / sizeof(int)); - g_key_file_set_integer(key_file, "two_panels_mode", "left_selected_tab_index", 0); - int right_tabs[] = { TID_STACK, TID_TERMINAL, TID_MESSAGES }; - g_key_file_set_integer_list(key_file, "two_panels_mode", "right_tabs", right_tabs, sizeof(right_tabs) / sizeof(int)); - g_key_file_set_integer(key_file, "two_panels_mode", "right_selected_tab_index", 0); -} - -/* * create GUI and check config */ void dpaned_init() @@ -259,8 +276,8 @@ gtk_container_set_border_width(GTK_CONTAINER(hpaned), HPANED_BORDER_WIDTH); /* create notebooks */ - debug_notebook_left = gtk_notebook_new (); - debug_notebook_right = gtk_notebook_new (); + debug_notebook_left = gtk_notebook_new(); + debug_notebook_right = gtk_notebook_new(); /* setup notebooks */ gtk_notebook_set_scrollable(GTK_NOTEBOOK(debug_notebook_left), TRUE); @@ -274,29 +291,17 @@ gtk_paned_add1(GTK_PANED(hpaned), debug_notebook_left); gtk_paned_add2(GTK_PANED(hpaned), debug_notebook_right); - /* read config */ - gchar *config_dir = g_build_path(G_DIR_SEPARATOR_S, geany_data->app->configdir, "plugins", "debugger", NULL); - config_path = g_build_path(G_DIR_SEPARATOR_S, config_dir, "debugger.conf", NULL); - - g_mkdir_with_parents(config_dir, S_IRUSR | S_IWUSR | S_IXUSR); + /* load config */ + pconfig_init(); - key_file = g_key_file_new(); - if (!g_key_file_load_from_file(key_file, config_path, G_KEY_FILE_NONE, NULL)) - { - dpaned_set_defaults(key_file); - gchar *data = g_key_file_to_data(key_file, NULL, NULL); - g_file_set_contents(config_path, data, -1, NULL); - g_free(data); - } - - is_tabbed = g_key_file_get_boolean(key_file, "tabbed_mode", "enabled", NULL); + gboolean is_tabbed = pconfig_get_tabbed(); if (is_tabbed) { gsize length; int *tab_ids, i; /* left */ - tab_ids = g_key_file_get_integer_list(key_file, "two_panels_mode", "left_tabs", &length, NULL); + tab_ids = pconfig_get_left_tabs(&length); for (i = 0; i < length; i++) { GtkWidget *tab = tabs_get_tab((tab_id)tab_ids[i]); @@ -309,7 +314,7 @@ g_free(tab_ids); /* right */ - tab_ids = g_key_file_get_integer_list(key_file, "two_panels_mode", "right_tabs", &length, NULL); + tab_ids = pconfig_get_right_tabs(&length); for (i = 0; i < length; i++) { GtkWidget *tab = tabs_get_tab((tab_id)tab_ids[i]); @@ -323,10 +328,8 @@ gtk_widget_show_all(hpaned); - gtk_notebook_set_current_page(GTK_NOTEBOOK(debug_notebook_left), - g_key_file_get_integer(key_file, "two_panels_mode", "left_selected_tab_index", NULL)); - gtk_notebook_set_current_page(GTK_NOTEBOOK(debug_notebook_right), - g_key_file_get_integer(key_file, "two_panels_mode", "right_selected_tab_index", NULL)); + gtk_notebook_set_current_page(GTK_NOTEBOOK(debug_notebook_left), pconfig_get_left_selected_tab_index()); + gtk_notebook_set_current_page(GTK_NOTEBOOK(debug_notebook_right),pconfig_get_right_selected_tab_index()); } else { @@ -334,7 +337,7 @@ gtk_container_remove(GTK_CONTAINER(hpaned), debug_notebook_right); gsize length; - int *tab_ids = g_key_file_get_integer_list(key_file, "one_panel_mode", "tabs", &length, NULL); + int *tab_ids = pconfig_get_tabs(&length); int i; for (i = 0; i < length; i++) { @@ -347,12 +350,9 @@ } gtk_widget_show_all(hpaned); - gtk_notebook_set_current_page(GTK_NOTEBOOK(debug_notebook_left), - g_key_file_get_integer(key_file, "one_panel_mode", "selected_tab_index", NULL)); + gtk_notebook_set_current_page(GTK_NOTEBOOK(debug_notebook_left), pconfig_get_selected_tab_index()); } - g_free(config_dir); - CONNECT_PAGE_SIGNALS(); CONNECT_ALLOCATED_PAGE_SIGNALS(); } @@ -362,10 +362,9 @@ */ void dpaned_destroy() { - g_key_file_free(key_file); - g_free(config_path); - DISCONNECT_PAGE_SIGNALS(); + + pconfig_destroy(); } /* @@ -381,8 +380,6 @@ */ void dpaned_set_tabbed(gboolean tabbed) { - is_tabbed = tabbed; - DISCONNECT_PAGE_SIGNALS(); if (!tabbed) @@ -391,7 +388,7 @@ gtk_container_remove(GTK_CONTAINER(hpaned), debug_notebook_right); gsize length; - int *tab_ids = g_key_file_get_integer_list(key_file, "one_panel_mode", "tabs", &length, NULL); + int *tab_ids = pconfig_get_tabs(&length); int i; for (i = 0; i < length; i++) { @@ -407,8 +404,7 @@ } } - gtk_notebook_set_current_page(GTK_NOTEBOOK(debug_notebook_left), - g_key_file_get_integer(key_file, "one_panel_mode", "selected_tab_index", NULL)); + gtk_notebook_set_current_page(GTK_NOTEBOOK(debug_notebook_left), pconfig_get_selected_tab_index()); gtk_widget_show_all(hpaned); } @@ -418,7 +414,7 @@ g_object_unref(debug_notebook_right); gsize length; - int *tab_ids = g_key_file_get_integer_list(key_file, "two_panels_mode", "right_tabs", &length, NULL); + int *tab_ids = pconfig_get_right_tabs(&length); int i; for (i = 0; i < length; i++) { @@ -431,19 +427,15 @@ gtk_notebook_set_tab_reorderable(GTK_NOTEBOOK(debug_notebook_right), tab, TRUE); } - gtk_notebook_set_current_page(GTK_NOTEBOOK(debug_notebook_left), - g_key_file_get_integer(key_file, "two_panels_mode", "left_selected_tab_index", NULL)); - gtk_notebook_set_current_page(GTK_NOTEBOOK(debug_notebook_right), - g_key_file_get_integer(key_file, "two_panels_mode", "right_selected_tab_index", NULL)); + gtk_notebook_set_current_page(GTK_NOTEBOOK(debug_notebook_left), pconfig_get_left_selected_tab_index()); + gtk_notebook_set_current_page(GTK_NOTEBOOK(debug_notebook_right), pconfig_get_right_selected_tab_index()); gtk_widget_show_all(hpaned); } CONNECT_PAGE_SIGNALS(); - g_key_file_set_boolean(key_file, "tabbed_mode", "enabled", is_tabbed); - - save_config(); + pconfig_set(CP_TABBED_MODE, (gpointer)tabbed, 0); } /* @@ -451,5 +443,5 @@ */ gboolean dpaned_get_tabbed() { - return is_tabbed; + return pconfig_get_tabbed(); } Added: trunk/geany-plugins/debugger/src/pconfig.c =================================================================== --- trunk/geany-plugins/debugger/src/pconfig.c (rev 0) +++ trunk/geany-plugins/debugger/src/pconfig.c 2011-09-18 12:03:57 UTC (rev 2201) @@ -0,0 +1,235 @@ +/* + * + * pconfig.c + * + * Copyright 2011 Alexander Petukhov <devel(at)apetukhov.ru> + * + * 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. + */ + +/* + * Debug paned config. + */ + +#include <sys/stat.h> + +#include "geanyplugin.h" +extern GeanyFunctions *geany_functions; +extern GeanyData *geany_data; + +#include "pconfig.h" +#include "tabs.h" + +/* config file path */ +static gchar *config_path = NULL; + +/* config GKeyFile */ +static GKeyFile *key_file = NULL; + +/* saving interval */ +#define SAVING_INTERVAL 2000000 + +/* saving thread staff */ +static GMutex *change_config_mutex; +static GCond *cond; +static GThread *saving_thread; +static gboolean config_changed = FALSE; + +/* + * function for a config file background saving if changed + */ +static gpointer saving_thread_func(gpointer data) +{ + GTimeVal interval; + GMutex *m = g_mutex_new(); + do + { + g_mutex_lock(change_config_mutex); + if (config_changed) + { + gchar *config_data = g_key_file_to_data(key_file, NULL, NULL); + g_file_set_contents(config_path, config_data, -1, NULL); + g_free(config_data); + + 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); + + return NULL; +} + +/* + * set default values in the GKeyFile + */ +void pconfig_set_defaults(GKeyFile *kf) +{ + g_key_file_set_boolean(key_file, "tabbed_mode", "enabled", FALSE); + + int all_tabs[] = { TID_TARGET, TID_BREAKS, TID_LOCALS, TID_WATCH, TID_STACK, TID_TERMINAL, TID_MESSAGES }; + g_key_file_set_integer_list(key_file, "one_panel_mode", "tabs", all_tabs, sizeof(all_tabs) / sizeof(int)); + g_key_file_set_integer(key_file, "one_panel_mode", "selected_tab_index", 0); + + int left_tabs[] = { TID_TARGET, TID_BREAKS, TID_LOCALS, TID_WATCH }; + g_key_file_set_integer_list(key_file, "two_panels_mode", "left_tabs", left_tabs, sizeof(left_tabs) / sizeof(int)); + g_key_file_set_integer(key_file, "two_panels_mode", "left_selected_tab_index", 0); + int right_tabs[] = { TID_STACK, TID_TERMINAL, TID_MESSAGES }; + g_key_file_set_integer_list(key_file, "two_panels_mode", "right_tabs", right_tabs, sizeof(right_tabs) / sizeof(int)); + g_key_file_set_integer(key_file, "two_panels_mode", "right_selected_tab_index", 0); +} + +/* + * initialize + */ +void pconfig_init() +{ + /* read config */ + gchar *config_dir = g_build_path(G_DIR_SEPARATOR_S, geany_data->app->configdir, "plugins", "debugger", NULL); + config_path = g_build_path(G_DIR_SEPARATOR_S, config_dir, "debugger.conf", NULL); + + g_mkdir_with_parents(config_dir, S_IRUSR | S_IWUSR | S_IXUSR); + g_free(config_dir); + + key_file = g_key_file_new(); + if (!g_key_file_load_from_file(key_file, config_path, G_KEY_FILE_NONE, NULL)) + { + pconfig_set_defaults(key_file); + gchar *data = g_key_file_to_data(key_file, NULL, NULL); + g_file_set_contents(config_path, data, -1, NULL); + g_free(data); + } + + change_config_mutex = g_mutex_new(); + cond = g_cond_new(); + saving_thread = g_thread_create(saving_thread_func, NULL, TRUE, NULL); +} + +/* + * destroy + */ +void pconfig_destroy() +{ + g_cond_signal(cond); + /* ??? g_thread_join(saving_thread); */ + + g_mutex_free(change_config_mutex); + g_cond_free(cond); + + g_free(config_path); +} + +/* + * set one or several config values + */ +void pconfig_set(int config_part, gpointer config_value, ...) +{ + g_mutex_lock(change_config_mutex); + + va_list ap; + va_start(ap, config_value); + + while(config_part) + { + switch (config_part) + { + case CP_TABBED_MODE: + { + g_key_file_set_boolean(key_file, "tabbed_mode", "enabled", (gboolean)config_value); + break; + } + case CP_OT_TABS: + { + int *array = (int*)config_value; + g_key_file_set_integer_list(key_file, "one_panel_mode", "tabs", array + 1, array[0]); + break; + } + case CP_OT_SELECTED: + { + g_key_file_set_integer(key_file, "one_panel_mode", "selected_tab_index", (int)config_value); + break; + } + case CP_TT_LTABS: + { + int *array = (int*)config_value; + g_key_file_set_integer_list(key_file, "two_panels_mode", "left_tabs", array + 1, array[0]); + break; + } + case CP_TT_LSELECTED: + { + g_key_file_set_integer(key_file, "two_panels_mode", "left_selected_tab_index", (int)config_value); + break; + } + case CP_TT_RTABS: + { + int *array = (int*)config_value; + g_key_file_set_integer_list(key_file, "two_panels_mode", "right_tabs", array + 1, array[0]); + break; + } + case CP_TT_RSELECTED: + { + g_key_file_set_integer(key_file, "two_panels_mode", "right_selected_tab_index", (int)config_value); + break; + } + } + + config_part = va_arg(ap, int); + if (config_part) + { + config_value = va_arg(ap, gpointer); + } + } + + config_changed = TRUE; + g_mutex_unlock(change_config_mutex); +} + +/* + * config parts getters + */ + +gboolean pconfig_get_tabbed() +{ + return g_key_file_get_boolean(key_file, "tabbed_mode", "enabled", NULL); +} +int* pconfig_get_tabs(gsize *length) +{ + return g_key_file_get_integer_list(key_file, "one_panel_mode", "tabs", length, NULL); +} +int pconfig_get_selected_tab_index() +{ + return g_key_file_get_integer(key_file, "one_panel_mode", "selected_tab_index", NULL); +} +int* pconfig_get_left_tabs(gsize *length) +{ + return g_key_file_get_integer_list(key_file, "two_panels_mode", "left_tabs", length, NULL); +} +int pconfig_get_left_selected_tab_index() +{ + return g_key_file_get_integer(key_file, "two_panels_mode", "left_selected_tab_index", NULL); +} +int* pconfig_get_right_tabs(gsize *length) +{ + return g_key_file_get_integer_list(key_file, "two_panels_mode", "right_tabs", length, NULL); +} +int pconfig_get_right_selected_tab_index() +{ + return g_key_file_get_integer(key_file, "two_panels_mode", "right_selected_tab_index", NULL); +} Added: trunk/geany-plugins/debugger/src/pconfig.h =================================================================== --- trunk/geany-plugins/debugger/src/pconfig.h (rev 0) +++ trunk/geany-plugins/debugger/src/pconfig.h 2011-09-18 12:03:57 UTC (rev 2201) @@ -0,0 +1,47 @@ +/* + * pconfig.h + * + * Copyright 2011 Alexander Petukhov <devel(at)apetukhov.ru> + * + * 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 <stdarg.h> + +/* config parts */ +#define CP_TABBED_MODE 1 +#define CP_OT_TABS 2 +#define CP_OT_SELECTED 3 +#define CP_TT_LTABS 4 +#define CP_TT_LSELECTED 5 +#define CP_TT_RTABS 6 +#define CP_TT_RSELECTED 7 + +void pconfig_init(); +void pconfig_destroy(); + +void pconfig_set(int config_part, gpointer config_value, ...); + +gboolean pconfig_get_tabbed(); + +int* pconfig_get_tabs(gsize *length); +int pconfig_get_selected_tab_index(); + +int* pconfig_get_left_tabs(gsize *length); +int pconfig_get_left_selected_tab_index(); + +int* pconfig_get_right_tabs(gsize *length); +int pconfig_get_right_selected_tab_index(); 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:[2200] trunk/geany-plugins/po/nl.po
by alvesh88＠users.sourceforge.net 18 Sep '11

18 Sep '11

Revision: 2200 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=2200&view=rev Author: alvesh88 Date: 2011-09-18 11:31:46 +0000 (Sun, 18 Sep 2011) Log Message: ----------- Update of dutch translation. Modified Paths: -------------- trunk/geany-plugins/po/nl.po Modified: trunk/geany-plugins/po/nl.po =================================================================== --- trunk/geany-plugins/po/nl.po 2011-09-16 13:47:03 UTC (rev 2199) +++ trunk/geany-plugins/po/nl.po 2011-09-18 11:31:46 UTC (rev 2200) @@ -19,15 +19,15 @@ #: ../addons/src/ao_bookmarklist.c:179 msgid "(Empty Line)" -msgstr "" +msgstr "(Lege regel)" #: ../addons/src/ao_bookmarklist.c:304 msgid "_Remove Bookmark" -msgstr "" +msgstr "Verwijder bladwijzer" #: ../addons/src/ao_bookmarklist.c:330 msgid "No." -msgstr "Nee" +msgstr "Nee." #: ../addons/src/ao_bookmarklist.c:338 ../devhelp/src/dhp-object.c:498 msgid "Contents" @@ -35,7 +35,7 @@ #: ../addons/src/ao_bookmarklist.c:371 ../treebrowser/src/treebrowser.c:607 msgid "Bookmarks" -msgstr "" +msgstr "Bladwijzers" #. complete update #: ../addons/src/ao_tasks.c:368 ../geanyvc/src/geanyvc.c:2254 @@ -44,7 +44,7 @@ #: ../addons/src/ao_tasks.c:377 msgid "_Hide Message Window" -msgstr "" +msgstr "_Verberg berichtenvenster" #: ../addons/src/ao_tasks.c:407 ../debugger/src/stree.c:214 msgid "File" @@ -67,7 +67,7 @@ #: ../addons/src/ao_tasks.c:473 #, fuzzy msgid "Tasks" -msgstr "Taak" +msgstr "Taken" #: ../addons/src/ao_tasks.c:535 msgid "Context:" @@ -75,18 +75,19 @@ #: ../addons/src/ao_xmltagging.c:52 msgid "XML tagging" -msgstr "" +msgstr "XML labelen" #: ../addons/src/ao_xmltagging.c:63 msgid "Tag name to be inserted:" -msgstr "" +msgstr "In te voegen label naam:" #: ../addons/src/ao_xmltagging.c:67 #, c-format msgid "" "%s will be replaced with your current selection. Please keep care on your " "selection" -msgstr "" +msgstr "De huidige selectie zal vervangen worden door \"%s\". Houd alstubieft " +"de selectie in de gaten" #: ../addons/src/ao_openuri.c:162 msgid "Open URI" @@ -94,27 +95,27 @@ #: ../addons/src/ao_openuri.c:168 msgid "Copy URI" -msgstr "" +msgstr "Kopiëer URI" #: ../addons/src/ao_doclist.c:204 msgid "Close Ot_her Documents" -msgstr "" +msgstr "Sluit andere documenten" #: ../addons/src/ao_doclist.c:209 msgid "C_lose All" -msgstr "Alles sluiten" +msgstr "S_luit alle documenten" #: ../addons/src/ao_doclist.c:239 msgid "Show Document List" -msgstr "" +msgstr "Laat documentlijst zien" #: ../addons/src/addons.c:52 msgid "Addons" -msgstr "" +msgstr "Toevoegingen" #: ../addons/src/addons.c:53 msgid "Various small addons for Geany." -msgstr "" +msgstr "Verscheidene kleine toevoegingen voor Geany" #: ../addons/src/addons.c:290 msgid "Focus Bookmark List" @@ -122,15 +123,15 @@ #: ../addons/src/addons.c:292 msgid "Focus Tasks List" -msgstr "" +msgstr "Focus bladwijzerlijst" #: ../addons/src/addons.c:294 msgid "Update Tasks List" -msgstr "" +msgstr "Update takenlijst" #: ../addons/src/addons.c:296 msgid "Run XML tagging" -msgstr "" +msgstr "XML labelen uitvoeren" #: ../addons/src/addons.c:396 ../geanylatex/src/geanylatex.c:234 #: ../geanysendmail/src/geanysendmail.c:125 @@ -138,82 +139,86 @@ #: ../spellcheck/src/scplugin.c:146 ../treebrowser/src/treebrowser.c:1816 #: ../updatechecker/src/updatechecker.c:253 msgid "Plugin configuration directory could not be created." -msgstr "" +msgstr "Plug-in configuratiemap kon niet worden aangemaakt." #: ../addons/src/addons.c:423 msgid "Show toolbar item to show a list of currently open documents" -msgstr "" +msgstr "Laat een toolbar item zien om een lijst met geopende documenten" +"te tonen" #: ../addons/src/addons.c:427 msgid "Sort documents by _name" -msgstr "" +msgstr "Sorteer documenten op _naam" #: ../addons/src/addons.c:429 msgid "Sort the documents in the list by their filename" -msgstr "" +msgstr "Sorteer de documenten in de lijst op hun bestandsnaam" #: ../addons/src/addons.c:432 msgid "Sort documents by _occurrence" -msgstr "" +msgstr "Sorteer documenten op aantal v_oorkomens" #: ../addons/src/addons.c:434 msgid "Sort the documents in the order of the document tabs" -msgstr "" +msgstr "Sorteer de documenten in de volgorde van de tabs" #: ../addons/src/addons.c:437 msgid "Sort documents by _occurrence (reversed)" -msgstr "" +msgstr "Sorteer documenten op aantal v_oorkomens (achteruit)" #: ../addons/src/addons.c:439 msgid "Sort the documents in the order of the document tabs (reversed)" -msgstr "" +msgstr "Sorteer de documenten in de volgorde van de tabs (achteruit)" #. TODO fix the string #: ../addons/src/addons.c:467 msgid "Show a 'Open URI' menu item in the editor menu" -msgstr "" +msgstr "Laat een 'Open URI' menu item in het editor menu zien" #: ../addons/src/addons.c:473 msgid "Show available Tasks in the Messages Window" -msgstr "" +msgstr "Laat beschikbare taken in het berichtenvenster zien" #: ../addons/src/addons.c:479 msgid "Show tasks of all documents" -msgstr "" +msgstr "Laat alle taken van alle documenten zien" #: ../addons/src/addons.c:483 msgid "" "Whether to show the tasks of all open documents in the list or only those of " "the current document." msgstr "" +"Laat de taken van alle open documenten in de lijst zien of alleen die van het " +"huidige document" #: ../addons/src/addons.c:490 msgid "Specify a semicolon separated list of search tokens." -msgstr "" +msgstr "Geef een lijst van zoektermen gescheiden door puntkommas" + #: ../addons/src/addons.c:492 msgid "Search tokens:" -msgstr "" +msgstr "Zoektermen:" #: ../addons/src/addons.c:509 msgid "Show status icon in the Notification Area" -msgstr "" +msgstr "Laat het status icoon in het Meldingsgebied" #: ../addons/src/addons.c:515 msgid "Show defined bookmarks (marked lines) in the sidebar" -msgstr "" +msgstr "Laat bladwijzers (gemarkeerde regels) in de zijbalk zien" #: ../addons/src/addons.c:521 msgid "Mark all occurrences of a word when double-clicking it" -msgstr "" +msgstr "Markeer alle verschijningen van een gedubbelklikt woord" #: ../addons/src/addons.c:527 msgid "Strip trailing blank lines" -msgstr "" +msgstr "Verwijder lege regels aan het einde van het bestand" #: ../addons/src/addons.c:533 msgid "XML tagging for selection" -msgstr "" +msgstr "XML labelen voor selectie" #. All plugins must set name, description, version and author. #: ../codenav/src/codenavigation.c:44 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:[2199] trunk/geany-plugins/debugger/src
by cesspit＠users.sourceforge.net 16 Sep '11

16 Sep '11

Revision: 2199 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=2199&view=rev Author: cesspit Date: 2011-09-16 13:47:03 +0000 (Fri, 16 Sep 2011) Log Message: ----------- debugger: preventing multiple config saving operations when performing enabling/disabling/removing several breaks from breakpoints panel, refactoring Modified Paths: -------------- trunk/geany-plugins/debugger/src/bptree.c trunk/geany-plugins/debugger/src/breakpoints.c trunk/geany-plugins/debugger/src/breakpoints.h trunk/geany-plugins/debugger/src/btnpanel.c trunk/geany-plugins/debugger/src/callbacks.c trunk/geany-plugins/debugger/src/dconfig.c trunk/geany-plugins/debugger/src/dconfig.h trunk/geany-plugins/debugger/src/debug.c trunk/geany-plugins/debugger/src/debug.h trunk/geany-plugins/debugger/src/dpaned.c trunk/geany-plugins/debugger/src/markers.c trunk/geany-plugins/debugger/src/plugin.c trunk/geany-plugins/debugger/src/stree.c trunk/geany-plugins/debugger/src/tpage.c Modified: trunk/geany-plugins/debugger/src/bptree.c =================================================================== --- trunk/geany-plugins/debugger/src/bptree.c 2011-09-15 15:23:09 UTC (rev 2198) +++ trunk/geany-plugins/debugger/src/bptree.c 2011-09-16 13:47:03 UTC (rev 2199) @@ -35,7 +35,6 @@ #include "geanyplugin.h" -#include "breakpoint.h" #include "breakpoints.h" #include "bptree.h" #include "utils.h" @@ -85,21 +84,6 @@ move_to_line_cb on_break_clicked = NULL; /* - * traversed comparing functions - */ -static gboolean compare_path_references(gpointer key, gpointer value, gpointer user_data) -{ - GtkTreeRowReference *being_clicked = (GtkTreeRowReference*)user_data; - GtkTreeRowReference *compared = (GtkTreeRowReference*)value; - - return !gtk_tree_path_compare ( - gtk_tree_row_reference_get_path(being_clicked), - gtk_tree_row_reference_get_path(compared) - ); - -} - -/* * gets tree row reference for an unsected row at the same depth */ GtkTreeRowReference* get_unselected_sibling(GtkTreePath *path) @@ -350,48 +334,18 @@ gboolean current_state = gtk_cell_renderer_toggle_get_active(cell_renderer); /* check if this is a file row */ - GtkTreeRowReference *path_reference = gtk_tree_row_reference_new(model, tree_path); - if(g_hash_table_find(files, compare_path_references, (gpointer)path_reference)) + if(1 == gtk_tree_path_get_depth(tree_path)) { - GtkTreeIter child; - gtk_tree_model_iter_children(model, &child, &iter); - gchar *file; gtk_tree_model_get ( model, &iter, FILEPATH, &file, -1); - - dconfig_set_modifyable(FALSE); - do - { - gboolean enabled; - gtk_tree_model_get ( - model, - &child, - ENABLED, &enabled, - -1); - - if (!current_state ^ enabled) - { - int line; - gtk_tree_model_get ( - model, - &child, - LINE, &line, - -1); - breaks_switch(file, line); - } - } - while(gtk_tree_model_iter_next(model, &child)); - gtk_tree_store_set(store, &iter, ENABLED, !current_state, -1); + breaks_set_enabled_for_file(file, !current_state); g_free(file); - - dconfig_set_modifyable(TRUE); - dconfig_set_changed(); } else { @@ -400,15 +354,12 @@ gchar *file; int line; - gboolean parent_enabed; gtk_tree_model_get ( model, &parent_iter, FILEPATH, &file, - ENABLED, &parent_enabed, -1); - gtk_tree_model_get ( model, &iter, @@ -417,15 +368,6 @@ breaks_switch(file, line); - if (current_state && parent_enabed) - { - gtk_tree_store_set(store, &parent_iter, ENABLED, FALSE, -1); - } - else if (!current_state && !parent_enabed) - { - update_file_node(&parent_iter); - } - g_free(file); } @@ -437,6 +379,10 @@ */ static gboolean on_key_pressed(GtkWidget *widget, GdkEvent *event, gpointer user_data) { + /* do not process event is page is readonly (debug is running) */ + if (readonly) + return FALSE; + guint keyval = ((GdkEventKey*)event)->keyval; /* get selected rows */ @@ -448,9 +394,6 @@ { /* "delete selected rows" */ - /* get references to rows to keep references actual when altering model */ - GList *references = NULL; - /* get new selection */ GtkTreeRowReference *new_selection = NULL; GtkTreePath *first_path = (GtkTreePath*)rows->data; @@ -469,107 +412,72 @@ gtk_tree_path_free(file_path); } + /* collect GList of breakpoints to remove + if file row is met - add all unselected breaks to the list as well */ GList *iter = rows; + GList *breaks = NULL; while (iter) { GtkTreePath *path = (GtkTreePath*)iter->data; - references = g_list_append(references, gtk_tree_row_reference_new(model, path)); - iter = iter->next; - } - - /* remove break rows leaving file rows for the next step */ - dconfig_set_modifyable(FALSE); - iter = references; - while (iter) - { - GtkTreeRowReference *reference = (GtkTreeRowReference*)iter->data; - if (gtk_tree_row_reference_valid(reference)) - { - GtkTreePath *path = gtk_tree_row_reference_get_path(reference); - if (gtk_tree_path_get_depth(path) > 1) - { - GtkTreeIter titer, piter; - gtk_tree_model_get_iter(model, &titer, path); - gtk_tree_model_iter_parent(model, &piter, &titer); - - gchar *filename = NULL; - gtk_tree_model_get(model, &piter, FILEPATH, &filename, -1); - - gint line; - gtk_tree_model_get(model, &titer, LINE, &line, -1); - - breaks_remove(filename, line); - - g_free(filename); - } - } - iter = iter->next; - } - - /* remove file rows and children if exist */ - iter = references; - while (iter) - { - GtkTreeRowReference *reference = (GtkTreeRowReference*)iter->data; - if (gtk_tree_row_reference_valid(reference)) + GtkTreeIter titer; + gtk_tree_model_get_iter(model, &titer, path); + + if (1 == gtk_tree_path_get_depth(path)) { - GtkTreePath *path = gtk_tree_row_reference_get_path(reference); - if (1 == gtk_tree_path_get_depth(path)) + GtkTreeIter citer; + gtk_tree_model_iter_children(model, &citer, &titer); + + do { - GtkTreeIter child, parent; - gtk_tree_model_get_iter(model, &parent, path); - - gchar *filename = NULL; - gtk_tree_model_get(model, &parent, FILEPATH, &filename, -1); - - GList *child_references = NULL; - if(gtk_tree_model_iter_children(model, &child, &parent)) + if (!gtk_tree_selection_iter_is_selected(selection, &citer)) { - /* collect all child nodes references */ - do - { - GtkTreePath *child_path = gtk_tree_model_get_path(model, &child); - child_references = g_list_append(child_references, gtk_tree_row_reference_new(model, child_path)); - gtk_tree_path_free(child_path); - } - while(gtk_tree_model_iter_next(model, &child)); - } - - /* traverse through refernces, removing breakpoints */ - GList *citer = child_references; - while(citer) - { - GtkTreePath *child_path = gtk_tree_row_reference_get_path((GtkTreeRowReference*)citer->data); - GtkTreeIter child_iter; - gtk_tree_model_get_iter(model, &child_iter, child_path); - + gchar *file = NULL; gint line; - gtk_tree_model_get(model, &child_iter, LINE, &line, -1); - breaks_remove(filename, line); + gtk_tree_model_get(model, &titer, FILEPATH, &file, -1); + gtk_tree_model_get(model, &citer, LINE, &line, -1); - citer = citer->next; + breakpoint *bp = breaks_lookup_breakpoint(file, line); + + breaks = g_list_append(breaks, bp); + + g_free(file); } - - /* free children references list */ - g_list_foreach (child_references, (GFunc)gtk_tree_row_reference_free, NULL); - g_list_free (child_references); - - g_free(filename); } + while(gtk_tree_model_iter_next(model, &citer)); } - + else + { + GtkTreeIter piter; + gtk_tree_model_iter_parent(model, &piter, &titer); + + gchar *file = NULL; + gtk_tree_model_get(model, &piter, FILEPATH, &file, -1); + + gint line; + gtk_tree_model_get(model, &titer, LINE, &line, -1); + + breakpoint *bp = breaks_lookup_breakpoint(file, line); + + breaks = g_list_append(breaks, bp); + + g_free(file); + } iter = iter->next; } + + if (1 == g_list_length(breaks)) + { + breakpoint *bp = (breakpoint*)breaks->data; + g_list_free(breaks); + breaks_remove(bp->file, bp->line); + } + else + { + breaks_remove_list(breaks); + } - /* free rows list */ - g_list_foreach (references, (GFunc)gtk_tree_row_reference_free, NULL); - g_list_free (references); - - dconfig_set_modifyable(TRUE); - dconfig_set_changed(TRUE); - if (new_selection) { /* get path to select */ Modified: trunk/geany-plugins/debugger/src/breakpoints.c =================================================================== --- trunk/geany-plugins/debugger/src/breakpoints.c 2011-09-15 15:23:09 UTC (rev 2198) +++ trunk/geany-plugins/debugger/src/breakpoints.c 2011-09-16 13:47:03 UTC (rev 2199) @@ -30,7 +30,6 @@ #include "geanyplugin.h" extern GeanyFunctions *geany_functions; -#include "breakpoint.h" #include "breakpoints.h" #include "utils.h" #include "markers.h" @@ -85,36 +84,82 @@ } /* - * Helper functions + * functions to perform markers and tree vew operation when breakpoint + * is finally updated/added/removed */ - -/* - * Remove breakpoint while iterating through GTree. - * arguments: - * bp - breakpoint - */ -void handle_break_remove(breakpoint* bp, gboolean success); -void breaks_remove_internal(breakpoint *bp) +static void on_add(breakpoint *bp) { - handle_break_remove(bp, TRUE); + /* add to breakpoints tab */ + bptree_add_breakpoint(bp); + /* add marker */ + markers_add_breakpoint(bp); } +static void on_remove(breakpoint *bp) +{ + /* remove marker */ + markers_remove_breakpoint(bp); + /* remove from breakpoints tab */ + bptree_remove_breakpoint(bp); + /* remove from internal storage */ + GTree *tree = g_hash_table_lookup(files, bp->file); + g_tree_remove(tree, GINT_TO_POINTER(bp->line)); +} +static void on_set_hits_count(breakpoint *bp) +{ + bptree_set_hitscount(bp); + markers_remove_breakpoint(bp); + markers_add_breakpoint(bp); +} +static void on_set_condition(breakpoint* bp) +{ + /* set condition in breaks tree */ + bptree_set_condition(bp); + markers_remove_breakpoint(bp); + markers_add_breakpoint(bp); +} +static void on_switch(breakpoint *bp) +{ + /* remove old and set new marker */ + markers_remove_breakpoint(bp); + markers_add_breakpoint(bp); + + /* set checkbox in breaks tree */ + bptree_set_enabled(bp); +} +static void on_set_enabled_list(GList *breaks, gboolean enabled) +{ + GList *iter = breaks; + while (iter) + { + breakpoint *bp = (breakpoint*)iter->data; + + if (bp->enabled ^ enabled) + { + bp->enabled = enabled; + + /* remove old and set new marker */ + markers_remove_breakpoint(bp); + markers_add_breakpoint(bp); + + /* set checkbox in breaks tree */ + bptree_set_enabled(bp); + } + iter = iter->next; + } +} +static void on_remove_list(GList *list) +{ + GList *iter; + for (iter = list; iter; iter = iter->next) + { + on_remove((breakpoint*)iter->data); + } +} /* - * lookup for breakpoint - * arguments: - * file - breakpoints filename - * line - breakpoints line + * Helper functions */ -breakpoint* lookup_breakpoint(const gchar* file, int line) -{ - breakpoint* bp = NULL; - GTree* tree = NULL; - if ( (tree = (GTree*)g_hash_table_lookup(files, file)) ) - bp = g_tree_lookup(tree, GINT_TO_POINTER(line)); - return bp; -} - /* * compare pointers as integers * return value similar to strcmp @@ -129,92 +174,50 @@ } /* - * Handlers for breakpoints activities. - * Are called directly from breaks_set_... functions - * or from async_callback if break was set asyncronously. - * + * functions that are called when a breakpoint is altered while debuginng session is active. + * Therefore, these functions try to alter break in debug session first and if successful - + * do what on_... do or simply call on_... function directly */ - -/* - * handles new break creation - * arguments: - * bp - breakpoint to handle - * success - success of operation - */ -void handle_break_new(breakpoint* bp, gboolean success) +static void breaks_add_debug(breakpoint* bp) { - if (success) + if (debug_set_break(bp, BSA_NEW_BREAK)) { - /* add to breakpoints tab */ - bptree_add_breakpoint(bp); - /* add marker */ - markers_add_breakpoint(bp); + /* add markers, update treeview */ + on_add(bp); /* mark config for saving */ dconfig_set_changed(); } else dialogs_show_msgbox(GTK_MESSAGE_ERROR, "%s", debug_error_message()); } - -/* - * handles break removing - * arguments: - * bp - breakpoint to handle - * success - success of operation - */ -void handle_break_remove(breakpoint* bp, gboolean success) +static void breaks_remove_debug(breakpoint* bp) { - if (success) + if (debug_remove_break(bp)) { - /* remove marker */ - markers_remove_breakpoint(bp); - /* remove from breakpoints tab */ - bptree_remove_breakpoint(bp); - /* remove from internal storage */ - GTree *tree = g_hash_table_lookup(files,bp->file); - g_tree_remove(tree, GINT_TO_POINTER(bp->line)); - + /* remove markers, update treeview */ + on_remove(bp); /* mark config for saving */ dconfig_set_changed(); } else dialogs_show_msgbox(GTK_MESSAGE_ERROR, "%s", debug_error_message()); } - -/* - * handles breakpoints hits count set - * arguments: - * bp - breakpoint to handle - * success - success of operation - */ -void handle_hitscount_set(breakpoint* bp, gboolean success) +static void breaks_set_hits_count_debug(breakpoint* bp) { - if (success) + if (debug_set_break(bp, BSA_UPDATE_HITS_COUNT)) { - bptree_set_hitscount(bp); - markers_remove_breakpoint(bp); - markers_add_breakpoint(bp); + on_set_hits_count(bp); /* mark config for saving */ dconfig_set_changed(); } else dialogs_show_msgbox(GTK_MESSAGE_ERROR, "%s", debug_error_message()); } - -/* - * handles breakpoints condition set - * arguments: - * bp - breakpoint to handle - * success - success of operation - */ -void handle_condition_set(breakpoint* bp, gboolean success) +static void breaks_set_condition_debug(breakpoint* bp) { - if (success) + if (debug_set_break(bp, BSA_UPDATE_CONDITION)) { - /* set condition in breaks tree */ - bptree_set_condition(bp); - markers_remove_breakpoint(bp); - markers_add_breakpoint(bp); + on_set_condition(bp); /* mark config for saving */ dconfig_set_changed(); } @@ -228,55 +231,80 @@ dialogs_show_msgbox(GTK_MESSAGE_ERROR, "%s", debug_error_message()); } } +static void breaks_switch_debug(breakpoint* bp) +{ + if (debug_set_break(bp, BSA_UPDATE_ENABLE)) + { + on_switch(bp); + /* mark config for saving */ + dconfig_set_changed(); + } + else + { + bp->enabled = !bp->enabled; + dialogs_show_msgbox(GTK_MESSAGE_ERROR, "%s", debug_error_message()); + } +} +static void breaks_set_disabled_list_debug(GList *list) +{ + GList *iter; + for (iter = list; iter; iter = iter->next) + { + breakpoint *bp = (breakpoint*)iter->data; + if (bp->enabled) + { + bp->enabled = FALSE; + if (debug_set_break(bp, BSA_UPDATE_ENABLE)) + { + on_switch(bp); + } + else + { + bp->enabled = TRUE; + } + } + } + g_list_free(list); -/* - * handles breakpoints enabled/disabled switch - * arguments: - * bp - breakpoint to handle - * success - success of operation - */ -void handle_switch(breakpoint* bp, gboolean success) + dconfig_set_changed(TRUE); +} +static void breaks_set_enabled_list_debug(GList *list) { - /* remove old and set new marker */ - markers_remove_breakpoint(bp); - markers_add_breakpoint(bp); + GList *iter; + for (iter = list; iter; iter = iter->next) + { + breakpoint *bp = (breakpoint*)iter->data; + if (!bp->enabled) + { + bp->enabled = TRUE; + if (debug_set_break(bp, BSA_UPDATE_ENABLE)) + { + on_switch(bp); + } + else + { + bp->enabled = FALSE; + } + } + } + g_list_free(list); - /* set checkbox in breaks tree */ - bptree_set_enabled(bp); - - /* mark config for saving */ - dconfig_set_changed(); + dconfig_set_changed(TRUE); } +static void breaks_remove_list_debug(GList *list) +{ + GList *iter; + for (iter = list; iter; iter = iter->next) + { + breakpoint *bp = (breakpoint*)iter->data; + if (debug_remove_break(bp)) + { + on_remove((breakpoint*)iter->data); + } + } + g_list_free(list); -/* - * Async action callback. - * Called from debug module, when debugging session is interrupted - * and ready to perform action specified by "bsa" with "bp" breakpoint - * (activity type is passed to debug module when calling its "request_interrupt" function - * and then is passed to "async_callback") - * arguments: - * bp - breakpoint to handle - * bsa - type of activity (remove/add/change property) - */ -void async_callback(breakpoint* bp, break_set_activity bsa) -{ - /* perform requested operation */ - gboolean success = BSA_REMOVE == bsa ? debug_remove_break(bp) : debug_set_break(bp, bsa); - - /* handle relevant case */ - if (BSA_REMOVE == bsa) - handle_break_remove(bp, success); - else if (BSA_NEW_BREAK == bsa) - handle_break_new(bp, success); - else if (BSA_UPDATE_ENABLE == bsa) - handle_switch(bp, success); - else if (BSA_UPDATE_HITS_COUNT == bsa) - handle_hitscount_set(bp, success); - else if (BSA_UPDATE_CONDITION == bsa) - handle_condition_set(bp, success); - - /* resume debug session */ - debug_run(); + dconfig_set_changed(TRUE); } /* @@ -341,7 +369,7 @@ /* allocate memory */ breakpoint* bp = break_new_full(file, line, condition, enabled, hitscount); - /* check whether GTree for this file exists and create if not*/ + /* check whether GTree for this file exists and create if doesn't */ GTree *tree; if (!(tree = g_hash_table_lookup(files, bp->file))) { @@ -355,10 +383,15 @@ /* handle creation instantly if debugger is idle or stopped and request debug module interruption overwise */ - if (DBS_IDLE == state || DBS_STOPPED == state) - handle_break_new(bp, DBS_IDLE == state || debug_set_break(bp, BSA_NEW_BREAK)); + if (DBS_IDLE == state) + { + on_add(bp); + dconfig_set_changed(TRUE); + } + else if (DBS_STOPPED == state) + breaks_add_debug(bp); else if (DBS_STOP_REQUESTED != state) - debug_request_interrupt(async_callback, bp, BSA_NEW_BREAK); + debug_request_interrupt((bs_callback)breaks_add_debug, (gpointer)bp); } /* @@ -377,28 +410,91 @@ /* lookup for breakpoint */ breakpoint* bp = NULL; - if (!(bp = lookup_breakpoint(file, line))) + if (!(bp = breaks_lookup_breakpoint(file, line))) return; /* handle removing instantly if debugger is idle or stopped and request debug module interruption overwise */ - if (DBS_IDLE == state || DBS_STOPPED == state) - handle_break_remove(bp, DBS_IDLE == state || debug_remove_break(bp)); + if (DBS_IDLE == state) + { + on_remove(bp); + dconfig_set_changed(TRUE); + } + else if (DBS_STOPPED == state) + breaks_remove_debug(bp); else if (DBS_STOP_REQUESTED != state) - debug_request_interrupt(async_callback, bp, BSA_REMOVE); + debug_request_interrupt((bs_callback)breaks_remove_debug, (gpointer)bp); } /* + * Remove all breakpoints in the list. + * arguments: + * list - list f breakpoints + */ +void breaks_remove_list(GList *list) +{ + /* do not process async break manipulation on modules + that do not support async interuppt */ + enum dbs state = debug_get_state(); + if (DBS_RUNNING == state && !debug_supports_async_breaks()) + return; + + /* handle removing instantly if debugger is idle or stopped + and request debug module interruption overwise */ + if (DBS_IDLE == state) + { + on_remove_list(list); + g_list_free(list); + + dconfig_set_changed(TRUE); + } + else if (DBS_STOPPED == state) + breaks_remove_list_debug(list); + else if (DBS_STOP_REQUESTED != state) + debug_request_interrupt((bs_callback)breaks_remove_list_debug, (gpointer)list); +} + +/* * Removes all breakpoints. * arguments: */ void breaks_remove_all() { - g_hash_table_foreach(files, hash_table_foreach_call_function, (gpointer)breaks_remove_internal); + g_hash_table_foreach(files, hash_table_foreach_call_function, (gpointer)on_remove); g_hash_table_remove_all(files); } /* + * sets all breakpoints fo the file enabled or disabled. + * arguments: + * file - list of breakpoints + * enabled - anble or disable breakpoints + */ +void breaks_set_enabled_for_file(const const char *file, gboolean enabled) +{ + /* do not process async break manipulation on modules + that do not support async interuppt */ + enum dbs state = debug_get_state(); + if (DBS_RUNNING == state && !debug_supports_async_breaks()) + return; + + GList *breaks = breaks_get_for_document(file); + + /* handle switching instantly if debugger is idle or stopped + and request debug module interruption overwise */ + if (DBS_IDLE == state) + { + on_set_enabled_list(breaks, enabled); + g_list_free(breaks); + dconfig_set_changed(TRUE); + } + else if (DBS_STOPPED == state) + enabled ? breaks_set_enabled_list_debug(breaks) : breaks_set_disabled_list_debug(breaks); + else if (DBS_STOP_REQUESTED != state) + debug_request_interrupt((bs_callback)(enabled ? breaks_set_enabled_list_debug : breaks_set_disabled_list_debug), (gpointer)breaks); +} + +/* * Switch breakpoints state. * arguments: * file - breakpoints filename @@ -414,7 +510,7 @@ /* lookup for breakpoint */ breakpoint* bp = NULL; - if (!(bp = lookup_breakpoint(file, line))) + if (!(bp = breaks_lookup_breakpoint(file, line))) return; /* change activeness */ @@ -422,10 +518,15 @@ /* handle switching instantly if debugger is idle or stopped and request debug module interruption overwise */ - if (DBS_IDLE == state || DBS_STOPPED == state) - handle_switch(bp, state == DBS_IDLE || debug_set_break(bp, BSA_UPDATE_ENABLE)); + if (DBS_IDLE == state) + { + on_switch(bp); + dconfig_set_changed(TRUE); + } + else if (DBS_STOPPED == state) + breaks_switch_debug(bp); else if (DBS_STOP_REQUESTED != state) - debug_request_interrupt(async_callback, bp, BSA_UPDATE_ENABLE); + debug_request_interrupt((bs_callback)breaks_switch_debug, (gpointer)bp); } /* @@ -435,7 +536,7 @@ * line - breakpoints line * count - breakpoints hitscount */ -void breaks_set_hits_count(char* file, int line, int count) +void breaks_set_hits_count(const char* file, int line, int count) { /* do not process async break manipulation on modules that do not support async interuppt */ @@ -445,7 +546,7 @@ /* lookup for breakpoint */ breakpoint* bp = NULL; - if (!(bp = lookup_breakpoint(file, line))) + if (!(bp = breaks_lookup_breakpoint(file, line))) return; /* change hits count */ @@ -453,10 +554,15 @@ /* handle setting hits count instantly if debugger is idle or stopped and request debug module interruption overwise */ - if (state == DBS_IDLE || state == DBS_STOPPED) - handle_hitscount_set(bp, state == DBS_IDLE || debug_set_break(bp, BSA_UPDATE_HITS_COUNT)); + if (state == DBS_IDLE) + { + on_set_hits_count(bp); + dconfig_set_changed(TRUE); + } + else if(state == DBS_STOPPED) + breaks_set_hits_count_debug(bp); else if (state != DBS_STOP_REQUESTED) - debug_request_interrupt(async_callback, bp, BSA_UPDATE_HITS_COUNT); + debug_request_interrupt((bs_callback)breaks_set_hits_count_debug, (gpointer)bp); } /* @@ -466,7 +572,7 @@ * line - breakpoints line * condition - breakpoints line */ -void breaks_set_condition(char* file, int line, char* condition) +void breaks_set_condition(const char* file, int line, const char* condition) { /* do not process async break manipulation on modules that do not support async interuppt */ @@ -476,7 +582,7 @@ /* lookup for breakpoint */ breakpoint* bp = NULL; - if (!(bp = lookup_breakpoint(file, line))) + if (!(bp = breaks_lookup_breakpoint(file, line))) return; /* change condition */ @@ -484,10 +590,15 @@ /* handle setting condition instantly if debugger is idle or stopped and request debug module interruption overwise */ - if (state == DBS_IDLE || state == DBS_STOPPED) - handle_condition_set(bp, DBS_IDLE == state || debug_set_break(bp, BSA_UPDATE_CONDITION)); + if (state == DBS_IDLE) + { + on_set_condition(bp); + dconfig_set_changed(TRUE); + } + else if (state == DBS_STOPPED) + breaks_set_condition_debug(bp); else if (state != DBS_STOP_REQUESTED) - debug_request_interrupt(async_callback, bp, BSA_UPDATE_CONDITION); + debug_request_interrupt((bs_callback)breaks_set_condition_debug, (gpointer)bp); } /* @@ -497,7 +608,7 @@ * line_from - old line number * line_to - new line number */ -void breaks_move_to_line(char* file, int line_from, int line_to) +void breaks_move_to_line(const char* file, int line_from, int line_to) { /* first look for the tree for the given file */ GTree *tree = NULL; @@ -546,7 +657,7 @@ * arguments: * file - file name to get breaks for */ -GList *breaks_get_for_document(const char* file) +GList* breaks_get_for_document(const char* file) { GList *breaks = NULL; GTree *tree = g_hash_table_lookup(files, file); @@ -558,6 +669,22 @@ } /* + * lookup for breakpoint + * arguments: + * file - breakpoints filename + * line - breakpoints line + */ +breakpoint* breaks_lookup_breakpoint(const gchar* file, int line) +{ + breakpoint* bp = NULL; + GTree* tree = NULL; + if ( (tree = (GTree*)g_hash_table_lookup(files, file)) ) + bp = g_tree_lookup(tree, GINT_TO_POINTER(line)); + + return bp; +} + +/* * Gets all breakpoints * arguments: */ Modified: trunk/geany-plugins/debugger/src/breakpoints.h =================================================================== --- trunk/geany-plugins/debugger/src/breakpoints.h 2011-09-15 15:23:09 UTC (rev 2198) +++ trunk/geany-plugins/debugger/src/breakpoints.h 2011-09-16 13:47:03 UTC (rev 2199) @@ -19,6 +19,8 @@ * MA 02110-1301, USA. */ +#include "breakpoint.h" + typedef enum _break_state { BS_NOT_SET, BS_ENABLED, @@ -31,12 +33,14 @@ void breaks_destroy(); void breaks_add(const char* file, int line, char* condition, int enable, int hitscount); void breaks_remove(const char* file, int line); +void breaks_remove_list(GList *list); void breaks_remove_all(); -void breaks_switch(const char* file, int line); -void breaks_set_hits_count(char* file, int line, int count); -void breaks_set_condition(char* file, int line, char* condition); -void breaks_move_to_line(char* file, int line_from, int line_to); -break_state breaks_get_state(const char* file, int line); +void breaks_switch(const char *file, int line); +void breaks_set_hits_count(const char *file, int line, int count); +void breaks_set_condition(const char *file, int line, const char* condition); +void breaks_set_enabled_for_file(const const char *file, gboolean enabled); +void breaks_move_to_line(const char* file, int line_from, int line_to); +break_state breaks_get_state(const char* file, int line); GList* breaks_get_for_document(const char* file); GList* breaks_get_all(); - +breakpoint* breaks_lookup_breakpoint(const gchar* file, int line); Modified: trunk/geany-plugins/debugger/src/btnpanel.c =================================================================== --- trunk/geany-plugins/debugger/src/btnpanel.c 2011-09-15 15:23:09 UTC (rev 2198) +++ trunk/geany-plugins/debugger/src/btnpanel.c 2011-09-16 13:47:03 UTC (rev 2199) @@ -30,11 +30,10 @@ extern GeanyPlugin *geany_plugin; #include "gui.h" -#include "breakpoint.h" +#include "breakpoints.h" #include "debug.h" #include "dconfig.h" #include "tpage.h" -#include "breakpoints.h" #include "watch_model.h" #include "wtree.h" #include "dpaned.h" Modified: trunk/geany-plugins/debugger/src/callbacks.c =================================================================== --- trunk/geany-plugins/debugger/src/callbacks.c 2011-09-15 15:23:09 UTC (rev 2198) +++ trunk/geany-plugins/debugger/src/callbacks.c 2011-09-16 13:47:03 UTC (rev 2199) @@ -27,7 +27,6 @@ #include <string.h> #include "geanyplugin.h" -#include "breakpoint.h" #include "breakpoints.h" #include "debug.h" #include "keys.h" @@ -289,6 +288,8 @@ } iter = iter->next; } + + dconfig_set_changed(); g_list_free(breaks); } Modified: trunk/geany-plugins/debugger/src/dconfig.c =================================================================== --- trunk/geany-plugins/debugger/src/dconfig.c 2011-09-15 15:23:09 UTC (rev 2198) +++ trunk/geany-plugins/debugger/src/dconfig.c 2011-09-16 13:47:03 UTC (rev 2199) @@ -32,11 +32,10 @@ extern GeanyPlugin *geany_plugin; #include "dconfig.h" -#include "breakpoint.h" +#include "breakpoints.h" #include "debug.h" #include "watch_model.h" #include "wtree.h" -#include "breakpoints.h" #include "tpage.h" #include "bptree.h" @@ -110,14 +109,6 @@ } /* - * set "modifyable" flag that shows that a background thread have to save config - */ -void dconfig_set_modifyable(gboolean newstate) -{ - modifyable = newstate; -} - -/* * set "changed" flag to save it on "saving_thread" thread */ void dconfig_set_changed() Modified: trunk/geany-plugins/debugger/src/dconfig.h =================================================================== --- trunk/geany-plugins/debugger/src/dconfig.h 2011-09-15 15:23:09 UTC (rev 2198) +++ trunk/geany-plugins/debugger/src/dconfig.h 2011-09-16 13:47:03 UTC (rev 2199) @@ -26,6 +26,5 @@ gboolean dconfig_load(gchar *folder); void dconfig_set_changed(); -void dconfig_set_modifyable(gboolean newstate); Modified: trunk/geany-plugins/debugger/src/debug.c =================================================================== --- trunk/geany-plugins/debugger/src/debug.c 2011-09-15 15:23:09 UTC (rev 2198) +++ trunk/geany-plugins/debugger/src/debug.c 2011-09-16 13:47:03 UTC (rev 2199) @@ -47,10 +47,9 @@ extern GeanyData *geany_data; #include "tpage.h" -#include "breakpoint.h" +#include "breakpoints.h" #include "debug.h" #include "utils.h" -#include "breakpoints.h" #include "stree.h" #include "watch_model.h" #include "wtree.h" @@ -92,8 +91,7 @@ * after interruption */ bs_callback interrupt_cb = NULL; -breakpoint* interrupt_data = NULL; -break_set_activity interrupt_flags; +gpointer interrupt_data = NULL; /* flag to set when debug stop is requested while debugger is running. * Then this flag is set to TRUE, and debug_request_interrupt function is called @@ -645,7 +643,7 @@ /* check for async activities pending */ if (interrupt_data) { - interrupt_cb(interrupt_data, interrupt_flags); + interrupt_cb(interrupt_data); interrupt_data = NULL; return; } @@ -1240,11 +1238,10 @@ * bp - breakpoint to deal with * flags - whar to do with breakpoint */ -void debug_request_interrupt(bs_callback cb, breakpoint* bp, break_set_activity flags) +void debug_request_interrupt(bs_callback cb, gpointer data) { interrupt_cb = cb; - interrupt_flags = flags; - interrupt_data = bp; + interrupt_data = data; active_module->request_interrupt(); } Modified: trunk/geany-plugins/debugger/src/debug.h =================================================================== --- trunk/geany-plugins/debugger/src/debug.h 2011-09-15 15:23:09 UTC (rev 2198) +++ trunk/geany-plugins/debugger/src/debug.h 2011-09-16 13:47:03 UTC (rev 2199) @@ -32,7 +32,7 @@ }; /* function type to execute on interrupt */ -typedef void (*bs_callback)(breakpoint*, break_set_activity); +typedef void (*bs_callback)(gpointer); void debug_init(); enum dbs debug_get_state(); @@ -44,8 +44,8 @@ void debug_execute_until(const gchar *file, int line); gboolean debug_set_break(breakpoint* bp, break_set_activity bsa); gboolean debug_remove_break(breakpoint* bp); -void debug_request_interrupt(bs_callback cb, breakpoint* bp, break_set_activity flags); -gchar* debug_error_message(); +void debug_request_interrupt(bs_callback cb, gpointer data); +gchar* debug_error_message(); GList* debug_get_modules(); int debug_get_module_index(const gchar *modulename); gboolean debug_supports_async_breaks(); Modified: trunk/geany-plugins/debugger/src/dpaned.c =================================================================== --- trunk/geany-plugins/debugger/src/dpaned.c 2011-09-15 15:23:09 UTC (rev 2198) +++ trunk/geany-plugins/debugger/src/dpaned.c 2011-09-16 13:47:03 UTC (rev 2199) @@ -34,7 +34,6 @@ extern GeanyData *geany_data; #include "tabs.h" -#include "breakpoint.h" #include "breakpoints.h" #include "debug.h" #include "btnpanel.h" @@ -115,7 +114,7 @@ /* * first allocation handler to properly set paned position */ -void on_size_allocate(GtkWidget *widget,GdkRectangle *allocation, gpointer user_data) +static void on_size_allocate(GtkWidget *widget,GdkRectangle *allocation, gpointer user_data) { DISCONNECT_ALLOCATED_PAGE_SIGNALS(); Modified: trunk/geany-plugins/debugger/src/markers.c =================================================================== --- trunk/geany-plugins/debugger/src/markers.c 2011-09-15 15:23:09 UTC (rev 2198) +++ trunk/geany-plugins/debugger/src/markers.c 2011-09-16 13:47:03 UTC (rev 2199) @@ -29,7 +29,6 @@ extern GeanyFunctions *geany_functions; extern GeanyData *geany_data; -#include "breakpoint.h" #include "breakpoints.h" #include "xpm/breakpoint.xpm" Modified: trunk/geany-plugins/debugger/src/plugin.c =================================================================== --- trunk/geany-plugins/debugger/src/plugin.c 2011-09-15 15:23:09 UTC (rev 2198) +++ trunk/geany-plugins/debugger/src/plugin.c 2011-09-16 13:47:03 UTC (rev 2199) @@ -28,7 +28,6 @@ #endif #include "geanyplugin.h" -#include "breakpoint.h" #include "breakpoints.h" #include "callbacks.h" #include "debug.h" Modified: trunk/geany-plugins/debugger/src/stree.c =================================================================== --- trunk/geany-plugins/debugger/src/stree.c 2011-09-15 15:23:09 UTC (rev 2198) +++ trunk/geany-plugins/debugger/src/stree.c 2011-09-16 13:47:03 UTC (rev 2199) @@ -31,7 +31,6 @@ #include "breakpoints.h" #include "utils.h" -#include "breakpoint.h" #include "debug_module.h" #include "xpm/frame_current.xpm" Modified: trunk/geany-plugins/debugger/src/tpage.c =================================================================== --- trunk/geany-plugins/debugger/src/tpage.c 2011-09-15 15:23:09 UTC (rev 2198) +++ trunk/geany-plugins/debugger/src/tpage.c 2011-09-16 13:47:03 UTC (rev 2199) @@ -33,7 +33,6 @@ extern GeanyFunctions *geany_functions; extern GeanyData *geany_data; -#include "breakpoint.h" #include "breakpoints.h" #include "utils.h" #include "watch_model.h" 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:[2198] trunk/geany-plugins/po
by frlan＠users.sourceforge.net 15 Sep '11

15 Sep '11

Revision: 2198 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=2198&view=rev Author: frlan Date: 2011-09-15 15:23:09 +0000 (Thu, 15 Sep 2011) Log Message: ----------- Update of Dutch translation Modified Paths: -------------- trunk/geany-plugins/po/ChangeLog trunk/geany-plugins/po/nl.po Modified: trunk/geany-plugins/po/ChangeLog =================================================================== --- trunk/geany-plugins/po/ChangeLog 2011-09-13 21:30:56 UTC (rev 2197) +++ trunk/geany-plugins/po/ChangeLog 2011-09-15 15:23:09 UTC (rev 2198) @@ -1,3 +1,9 @@ +2011-09-15 Frank Lanitz <frlan(a)frank.uvena.de> + + * nl.po: Update of Dutch translation. Thanks to Peter Scholtens + and Hans Alves. + + 2011-08-22 Frank Lanitz <frank(at)frank(dot)uvena(dot)de> * POTFILES.in: Added new files of debugger plugin. Modified: trunk/geany-plugins/po/nl.po =================================================================== --- trunk/geany-plugins/po/nl.po 2011-09-13 21:30:56 UTC (rev 2197) +++ trunk/geany-plugins/po/nl.po 2011-09-15 15:23:09 UTC (rev 2198) @@ -7,9 +7,9 @@ msgstr "" "Project-Id-Version: geany-plugins 0.21\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-08-15 18:28+0200\n" -"PO-Revision-Date: 2011-08-14 21:37+0200\n" -"Last-Translator: hans <alves.h88(a)gmail.com>\n" +"POT-Creation-Date: 2011-09-15 17:20+0200\n" +"PO-Revision-Date: 2011-09-13 20:24+0100\n" +"Last-Translator: Peter Scholtens <peter.scholtens(a)xs4all.nl>\n" "Language-Team: Dutch\n" "Language: nl\n" "MIME-Version: 1.0\n" @@ -27,11 +27,11 @@ #: ../addons/src/ao_bookmarklist.c:330 msgid "No." -msgstr "" +msgstr "Nee" -#: ../addons/src/ao_bookmarklist.c:338 ../devhelp/src/dhp-object.c:495 +#: ../addons/src/ao_bookmarklist.c:338 ../devhelp/src/dhp-object.c:498 msgid "Contents" -msgstr "" +msgstr "Inhoud" #: ../addons/src/ao_bookmarklist.c:371 ../treebrowser/src/treebrowser.c:607 msgid "Bookmarks" @@ -46,31 +46,28 @@ msgid "_Hide Message Window" msgstr "" -#. file -#: ../addons/src/ao_tasks.c:407 ../debugger/src/bptree.c:380 -#: ../debugger/src/stree.c:158 +#: ../addons/src/ao_tasks.c:407 ../debugger/src/stree.c:214 msgid "File" -msgstr "" +msgstr "Bestand" -#. line -#: ../addons/src/ao_tasks.c:418 ../debugger/src/bptree.c:387 -#: ../debugger/src/stree.c:166 +#: ../addons/src/ao_tasks.c:418 ../debugger/src/bptree.c:708 +#: ../debugger/src/stree.c:220 msgid "Line" -msgstr "" +msgstr "Regel" -#. Type -#: ../addons/src/ao_tasks.c:429 ../debugger/src/vtree.c:160 +#: ../addons/src/ao_tasks.c:429 ../debugger/src/vtree.c:143 #: ../geanylatex/src/bibtexlabels.c:68 msgid "Type" msgstr "" #: ../addons/src/ao_tasks.c:440 msgid "Task" -msgstr "" +msgstr "Taak" #: ../addons/src/ao_tasks.c:473 +#, fuzzy msgid "Tasks" -msgstr "" +msgstr "Taak" #: ../addons/src/ao_tasks.c:535 msgid "Context:" @@ -105,7 +102,7 @@ #: ../addons/src/ao_doclist.c:209 msgid "C_lose All" -msgstr "" +msgstr "Alles sluiten" #: ../addons/src/ao_doclist.c:239 msgid "Show Document List" @@ -261,162 +258,201 @@ msgid "Implementations extensions" msgstr "" -#: ../debugger/src/plugin.c:50 +#: ../debugger/src/plugin.c:56 msgid "Debugger" msgstr "" -#: ../debugger/src/plugin.c:51 +#: ../debugger/src/plugin.c:57 msgid "Various debuggers integration." msgstr "" -#. Target frame -#: ../debugger/src/plugin.c:91 ../debugger/src/tpage.c:825 -msgid "Target" -msgstr "" - -#: ../debugger/src/plugin.c:97 ../geanygdb/src/gdb-ui-break.c:504 -msgid "Breakpoints" -msgstr "" - -#: ../debugger/src/plugin.c:113 ../debugger/src/keys.c:69 +#: ../debugger/src/plugin.c:124 ../debugger/src/keys.c:70 #: ../geanygdb/src/geanygdb.c:393 msgid "Debug" msgstr "" -#. Name -#: ../debugger/src/vtree.c:136 ../debugger/src/tpage.c:901 +#: ../debugger/src/vtree.c:122 ../debugger/src/envtree.c:393 msgid "Name" msgstr "" -#. Value -#: ../debugger/src/vtree.c:151 ../debugger/src/tpage.c:910 +#: ../debugger/src/vtree.c:135 ../debugger/src/envtree.c:398 msgid "Value" msgstr "" +#: ../debugger/src/tpage.c:98 +msgid "Choose target file" +msgstr "" + +#. target +#: ../debugger/src/tpage.c:235 +msgid "Target:" +msgstr "" + +#: ../debugger/src/tpage.c:238 +msgid "Browse" +msgstr "" + +#. debugger +#: ../debugger/src/tpage.c:243 +msgid "Debugger:" +msgstr "" + +#. arguments +#: ../debugger/src/tpage.c:256 +msgid "Command Line Arguments" +msgstr "" + +#. environment +#: ../debugger/src/tpage.c:267 +msgid "Environment Variables" +msgstr "" + #. if name is empty - offer to delete variable -#: ../debugger/src/tpage.c:286 ../debugger/src/tpage.c:386 -#: ../debugger/src/debug.c:229 +#: ../debugger/src/envtree.c:243 ../debugger/src/envtree.c:346 +#: ../debugger/src/debug.c:239 msgid "Delete variable?" msgstr "" -#: ../debugger/src/tpage.c:498 -msgid "Config saved successfully" +#: ../debugger/src/bptree.c:680 +msgid "Location" msgstr "" -#: ../debugger/src/tpage.c:525 ../debugger/src/tpage.c:610 -msgid "Error reading config file" +#: ../debugger/src/bptree.c:690 +msgid "Condition" msgstr "" -#: ../debugger/src/tpage.c:538 +#: ../debugger/src/bptree.c:702 +msgid "Hit count" +msgstr "" + +#: ../debugger/src/bptree.c:715 ../geanygdb/src/gdb-ui-break.c:163 +msgid "Enabled" +msgstr "" + +#: ../debugger/src/bptree.c:877 #, c-format -msgid "Configuration error: debugger module '%s' is not found" +msgid "line %i" msgstr "" -#: ../debugger/src/tpage.c:615 -msgid "Some breakpoints can't be set as the files are missed" +#: ../debugger/src/debug.c:1087 +#, c-format +msgid "" +"Breakpoint at %s:%i cannot be set\n" +"Debugger message: %s" msgstr "" -#: ../debugger/src/tpage.c:622 -msgid "Config loaded successfully" +#: ../debugger/src/dbm_gdb.c:335 +msgid "Program received a signal" msgstr "" -#: ../debugger/src/tpage.c:658 -msgid "Choose target file" +#: ../debugger/src/dbm_gdb.c:535 +msgid "Failed to spawn gdb process" msgstr "" -#: ../debugger/src/tpage.c:833 -msgid "Browse" +#: ../debugger/src/dbm_gdb.c:572 +msgid "Error configuring GDB" msgstr "" -#: ../debugger/src/tpage.c:845 -msgid "Debugger:" +#: ../debugger/src/dbm_gdb.c:594 +msgid "Error loading file" msgstr "" -#. Arguments frame -#: ../debugger/src/tpage.c:868 -msgid "Arguments" +#: ../debugger/src/utils.c:56 +#, c-format +msgid "Can't find a source file \"%s\"" msgstr "" -#: ../debugger/src/tpage.c:883 -msgid "Environment variables" +#: ../debugger/src/stree.c:202 ../geanylatex/src/bibtexlabels.c:46 +msgid "Address" msgstr "" -#. enabled -#: ../debugger/src/bptree.c:350 ../geanygdb/src/gdb-ui-break.c:163 -msgid "Enabled" +#: ../debugger/src/stree.c:208 +msgid "Function" msgstr "" -#. hits count -#: ../debugger/src/bptree.c:358 -msgid "Hit count" +#: ../debugger/src/tabs.c:128 +msgid "Target" msgstr "" -#. condition -#: ../debugger/src/bptree.c:371 -msgid "Condition" +#: ../debugger/src/tabs.c:131 ../geanygdb/src/gdb-ui-break.c:504 +msgid "Breakpoints" msgstr "" -#: ../debugger/src/debug.c:842 +#: ../debugger/src/tabs.c:134 msgid "Watch" msgstr "" -#: ../debugger/src/debug.c:856 +#: ../debugger/src/tabs.c:137 msgid "Locals" msgstr "" -#: ../debugger/src/debug.c:871 +#: ../debugger/src/tabs.c:140 msgid "Call Stack" msgstr "" -#: ../debugger/src/debug.c:901 -msgid "Debug terminal" +#: ../debugger/src/tabs.c:143 +msgid "Debug Terminal" msgstr "" -#: ../debugger/src/debug.c:917 -msgid "Debugger messages" +#: ../debugger/src/tabs.c:146 +msgid "Debugger Messages" msgstr "" -#: ../debugger/src/debug.c:1054 -#, c-format -msgid "" -"Breakpoint at %s:%i cannot be set\n" -"Debugger message: %s" +#: ../debugger/src/watch_model.c:161 +msgid "Can't evaluate expression" msgstr "" -#: ../debugger/src/dbm_gdb.c:332 -msgid "Program received a signal" +#: ../debugger/src/callbacks.c:256 +msgid "To edit source files stop debugging session" msgstr "" -#: ../debugger/src/dbm_gdb.c:531 -msgid "Failed to spawn gdb process" +#: ../debugger/src/btnpanel.c:70 ../debugger/src/btnpanel.c:77 +msgid "Error reading config file" msgstr "" -#: ../debugger/src/dbm_gdb.c:568 -msgid "Error configuring GDB" +#: ../debugger/src/btnpanel.c:129 ../debugger/src/btnpanel.c:251 +msgid "Run" msgstr "" -#: ../debugger/src/dbm_gdb.c:590 -msgid "Error loading file" +#: ../debugger/src/btnpanel.c:137 +#, fuzzy +msgid "Restart" +msgstr "Rapport" + +#: ../debugger/src/btnpanel.c:140 +msgid "Stop" msgstr "" -#. adress -#: ../debugger/src/stree.c:142 ../geanylatex/src/bibtexlabels.c:46 -msgid "Address" +#: ../debugger/src/btnpanel.c:149 +msgid "Step over" msgstr "" -#. function -#: ../debugger/src/stree.c:150 -msgid "Function" +#: ../debugger/src/btnpanel.c:152 +msgid "Step into" msgstr "" -#: ../debugger/src/watch_model.c:161 -msgid "Can't evaluate expression" +#: ../debugger/src/btnpanel.c:161 +msgid "Step out" msgstr "" -#: ../debugger/src/callbacks.c:206 -msgid "To edit source files stop debugging session" +#: ../debugger/src/btnpanel.c:164 +msgid "Run to cursor" msgstr "" +#: ../debugger/src/btnpanel.c:174 +msgid "Load settings" +msgstr "" + +#: ../debugger/src/btnpanel.c:182 +#, fuzzy +msgid "Tabs" +msgstr "Taak" + +#: ../debugger/src/btnpanel.c:246 +#, fuzzy +msgid "Continue" +msgstr "Inhoud" + #. never search for more than this many chars #: ../devhelp/src/dhp.h:38 msgid "Documentation" @@ -426,43 +462,43 @@ msgid "Code" msgstr "" -#: ../devhelp/src/dhp-object.c:384 +#: ../devhelp/src/dhp-object.c:387 msgid "Search for 'Tag' Documentation in" msgstr "" -#: ../devhelp/src/dhp-object.c:387 ../devhelp/src/dhp-object.c:504 +#: ../devhelp/src/dhp-object.c:390 ../devhelp/src/dhp-object.c:507 msgid "Devhelp" msgstr "" -#: ../devhelp/src/dhp-object.c:394 +#: ../devhelp/src/dhp-object.c:397 msgid "Manual Pages" msgstr "" -#: ../devhelp/src/dhp-object.c:400 +#: ../devhelp/src/dhp-object.c:403 msgid "Google Code" msgstr "" -#: ../devhelp/src/dhp-object.c:444 +#: ../devhelp/src/dhp-object.c:447 msgid "Go back one page" msgstr "" -#: ../devhelp/src/dhp-object.c:445 +#: ../devhelp/src/dhp-object.c:448 msgid "Go forward one page" msgstr "" -#: ../devhelp/src/dhp-object.c:446 +#: ../devhelp/src/dhp-object.c:449 msgid "Zoom in" msgstr "" -#: ../devhelp/src/dhp-object.c:447 +#: ../devhelp/src/dhp-object.c:450 msgid "Zoom out" msgstr "" -#: ../devhelp/src/dhp-object.c:498 +#: ../devhelp/src/dhp-object.c:501 msgid "Search" msgstr "" -#: ../devhelp/src/dhp-object.c:1316 +#: ../devhelp/src/dhp-object.c:1319 #, c-format msgid "Search for '%s' Documentation in" msgstr "" @@ -724,11 +760,11 @@ #: ../geanydoc/src/geanydoc.c:369 msgid "Command 0:" -msgstr "" +msgstr "Commando 0:" #: ../geanydoc/src/geanydoc.c:375 msgid "Command 1:" -msgstr "" +msgstr "Commando 1:" #: ../geanydoc/src/geanydoc.c:393 msgid "%w will be replaced with current word\n" @@ -826,7 +862,7 @@ #: ../geanygdb/src/gdb-io-read.c:609 msgid "Unknown signal" -msgstr "" +msgstr "Onbekend signaal" #: ../geanygdb/src/gdb-io-read.c:626 #, c-format @@ -835,7 +871,7 @@ #: ../geanygdb/src/gdb-io-read.c:627 msgid "(unknown)" -msgstr "" +msgstr "onbekend" #: ../geanygdb/src/gdb-io-read.c:633 msgid "Program exited normally.\n" @@ -882,7 +918,7 @@ #: ../geanygdb/src/gdb-io-run.c:538 msgid "reason:" -msgstr "" +msgstr "Reden" #: ../geanygdb/src/gdb-io-run.c:604 ../geanygdb/src/gdb-io-run.c:669 #, c-format @@ -1187,7 +1223,7 @@ #: ../geanygdb/src/gdb-ui-main.c:618 msgid "Target file must be ELF 32-bit x86 executable." -msgstr "" +msgstr "Doelbestand moet een 32-bit ELF executable zijn." #: ../geanygdb/src/gdb-ui-main.c:624 msgid "You don't have permission to read this file." @@ -1792,11 +1828,11 @@ msgid "Math" msgstr "" -#: ../geanylatex/src/latexenvironments.c:195 +#: ../geanylatex/src/latexenvironments.c:194 msgid "Insert Environment" msgstr "" -#: ../geanylatex/src/latexenvironments.c:209 +#: ../geanylatex/src/latexenvironments.c:208 msgid "Environment:" msgstr "" @@ -1814,19 +1850,19 @@ #: ../geanylatex/src/bibtexlabels.c:27 msgid "Article (@Article)" -msgstr "" +msgstr "Artikel (@Article)" #: ../geanylatex/src/bibtexlabels.c:28 msgid "Book (@Book)" -msgstr "" +msgstr "Boek (@Book)" #: ../geanylatex/src/bibtexlabels.c:29 msgid "Booklet (@Booklet)" -msgstr "" +msgstr "Boekje (@Booklet)" #: ../geanylatex/src/bibtexlabels.c:30 msgid "Conference (@Conference)" -msgstr "" +msgstr "Conferentie (@Conference)" #: ../geanylatex/src/bibtexlabels.c:31 msgid "Inbook (@Inbook)" @@ -1854,7 +1890,7 @@ #: ../geanylatex/src/bibtexlabels.c:37 msgid "PhdThesis (@PhdThesis)" -msgstr "" +msgstr "Promotieverslag (@PhdThesis)" #: ../geanylatex/src/bibtexlabels.c:38 msgid "Proceedings (@Proceedings)" @@ -1862,11 +1898,11 @@ #: ../geanylatex/src/bibtexlabels.c:39 msgid "Techreport (@Techreport)" -msgstr "" +msgstr "Technisch rapport (@Techreport)" #: ../geanylatex/src/bibtexlabels.c:40 msgid "Unpublished (@Unpublished)" -msgstr "" +msgstr "Ongepubliceerd (@Unpublished)" #: ../geanylatex/src/bibtexlabels.c:47 msgid "Annote" @@ -1882,7 +1918,7 @@ #: ../geanylatex/src/bibtexlabels.c:50 msgid "Chapter" -msgstr "" +msgstr "Hoofdstuk" #: ../geanylatex/src/bibtexlabels.c:51 msgid "Crossref" @@ -1966,7 +2002,7 @@ #: ../geanylatex/src/bibtexlabels.c:103 msgid "Address of publisher" -msgstr "" +msgstr "Adres van uitgever" #: ../geanylatex/src/bibtexlabels.c:104 msgid "Annotation for annotated bibliography styles" @@ -2134,162 +2170,162 @@ msgid "Modus of autocompletion" msgstr "" -#: ../geanylatex/src/geanylatex.c:801 +#: ../geanylatex/src/geanylatex.c:799 msgid "Insert Label" msgstr "" -#: ../geanylatex/src/geanylatex.c:803 +#: ../geanylatex/src/geanylatex.c:801 msgid "Label name:" msgstr "" -#: ../geanylatex/src/geanylatex.c:825 +#: ../geanylatex/src/geanylatex.c:823 msgid "Insert Command" msgstr "" -#: ../geanylatex/src/geanylatex.c:827 +#: ../geanylatex/src/geanylatex.c:825 msgid "Command name:" msgstr "" -#: ../geanylatex/src/geanylatex.c:871 +#: ../geanylatex/src/geanylatex.c:868 msgid "Insert Reference" msgstr "" -#: ../geanylatex/src/geanylatex.c:884 +#: ../geanylatex/src/geanylatex.c:881 msgid "Reference name:" msgstr "" -#: ../geanylatex/src/geanylatex.c:909 +#: ../geanylatex/src/geanylatex.c:906 msgid "_Standard Reference" msgstr "" -#: ../geanylatex/src/geanylatex.c:914 +#: ../geanylatex/src/geanylatex.c:911 msgid "_Page Reference" msgstr "" -#: ../geanylatex/src/geanylatex.c:919 +#: ../geanylatex/src/geanylatex.c:916 msgid "_Add both" msgstr "" -#: ../geanylatex/src/geanylatex.c:1116 +#: ../geanylatex/src/geanylatex.c:1113 msgid "More" msgstr "" -#: ../geanylatex/src/geanylatex.c:1172 +#: ../geanylatex/src/geanylatex.c:1169 msgid "Add additional package" msgstr "" -#: ../geanylatex/src/geanylatex.c:1185 +#: ../geanylatex/src/geanylatex.c:1182 msgid "Package name:" msgstr "" -#: ../geanylatex/src/geanylatex.c:1188 +#: ../geanylatex/src/geanylatex.c:1185 msgid "Package options:" msgstr "" -#: ../geanylatex/src/geanylatex.c:1236 +#: ../geanylatex/src/geanylatex.c:1233 msgid "Insert BibTeX Reference" msgstr "" -#: ../geanylatex/src/geanylatex.c:1249 +#: ../geanylatex/src/geanylatex.c:1246 msgid "BibTeX reference name:" msgstr "" -#: ../geanylatex/src/geanylatex.c:1673 +#: ../geanylatex/src/geanylatex.c:1670 msgid "Dear Sir or Madame" msgstr "" -#: ../geanylatex/src/geanylatex.c:1674 +#: ../geanylatex/src/geanylatex.c:1671 msgid "With kind regards" msgstr "" -#: ../geanylatex/src/geanylatex.c:1682 +#: ../geanylatex/src/geanylatex.c:1679 msgid "No template assigned. Aborting" msgstr "" #. Building the wizard-dialog and showing it -#: ../geanylatex/src/geanylatex.c:1709 +#: ../geanylatex/src/geanylatex.c:1706 msgid "LaTeX-Wizard" msgstr "" #. Templates #. * Adds custom templates if there are any. If there are none just #. * adds default one -#: ../geanylatex/src/geanylatex.c:1724 +#: ../geanylatex/src/geanylatex.c:1721 msgid "Template:" msgstr "" -#: ../geanylatex/src/geanylatex.c:1728 +#: ../geanylatex/src/geanylatex.c:1725 msgid "Set the template which should be used for creating the new document" msgstr "" -#: ../geanylatex/src/geanylatex.c:1737 +#: ../geanylatex/src/geanylatex.c:1734 msgid "Default" msgstr "" #. Documentclass -#: ../geanylatex/src/geanylatex.c:1748 +#: ../geanylatex/src/geanylatex.c:1745 msgid "Documentclass:" msgstr "" -#: ../geanylatex/src/geanylatex.c:1751 +#: ../geanylatex/src/geanylatex.c:1748 msgid "Choose the kind of document you want to write" -msgstr "" +msgstr "Kies het soort document dat je wilt schrijven" -#: ../geanylatex/src/geanylatex.c:1753 +#: ../geanylatex/src/geanylatex.c:1750 msgid "Book" -msgstr "" +msgstr "Boek" -#: ../geanylatex/src/geanylatex.c:1755 +#: ../geanylatex/src/geanylatex.c:1752 msgid "Article" -msgstr "" +msgstr "Artikel" -#: ../geanylatex/src/geanylatex.c:1757 +#: ../geanylatex/src/geanylatex.c:1754 msgid "Report" -msgstr "" +msgstr "Rapport" -#: ../geanylatex/src/geanylatex.c:1759 +#: ../geanylatex/src/geanylatex.c:1756 msgid "Letter" -msgstr "" +msgstr "Brief" -#: ../geanylatex/src/geanylatex.c:1761 +#: ../geanylatex/src/geanylatex.c:1758 msgid "Presentation" -msgstr "" +msgstr "Presentatie:" #. Encoding -#: ../geanylatex/src/geanylatex.c:1771 +#: ../geanylatex/src/geanylatex.c:1768 msgid "Encoding:" msgstr "" -#: ../geanylatex/src/geanylatex.c:1775 +#: ../geanylatex/src/geanylatex.c:1772 msgid "Set the encoding for your new document" msgstr "" #. fontsize -#: ../geanylatex/src/geanylatex.c:1791 +#: ../geanylatex/src/geanylatex.c:1788 msgid "Font size:" msgstr "" -#: ../geanylatex/src/geanylatex.c:1797 +#: ../geanylatex/src/geanylatex.c:1794 msgid "Set the default font size of your new document" msgstr "" #. Author -#: ../geanylatex/src/geanylatex.c:1809 +#: ../geanylatex/src/geanylatex.c:1806 msgid "Author:" -msgstr "" +msgstr "Auteur:" -#: ../geanylatex/src/geanylatex.c:1812 +#: ../geanylatex/src/geanylatex.c:1809 msgid "" "Sets the value of the \\author command. In most cases this should be your " "name" msgstr "" #. Date -#: ../geanylatex/src/geanylatex.c:1826 +#: ../geanylatex/src/geanylatex.c:1823 msgid "Date:" msgstr "" -#: ../geanylatex/src/geanylatex.c:1829 +#: ../geanylatex/src/geanylatex.c:1826 msgid "" "Sets the value of the \\date command inside header of your new created LaTeX-" "document. Keeping it at \\today is a good decision if you don't need any " @@ -2297,295 +2333,300 @@ msgstr "" #. Title of the new document -#: ../geanylatex/src/geanylatex.c:1841 +#: ../geanylatex/src/geanylatex.c:1838 msgid "Title:" msgstr "" -#: ../geanylatex/src/geanylatex.c:1844 +#: ../geanylatex/src/geanylatex.c:1841 msgid "Sets the title of your new document." msgstr "" #. Papersize -#: ../geanylatex/src/geanylatex.c:1853 +#: ../geanylatex/src/geanylatex.c:1850 msgid "Paper size:" msgstr "" -#: ../geanylatex/src/geanylatex.c:1856 +#: ../geanylatex/src/geanylatex.c:1853 msgid "Choose the paper format for the newly created document" msgstr "" #. Paper direction -#: ../geanylatex/src/geanylatex.c:1869 +#: ../geanylatex/src/geanylatex.c:1866 msgid "Paper Orientation:" msgstr "" -#: ../geanylatex/src/geanylatex.c:1872 +#: ../geanylatex/src/geanylatex.c:1869 msgid "Choose the paper orientation for the newly created document" msgstr "" -#: ../geanylatex/src/geanylatex.c:1893 +#: ../geanylatex/src/geanylatex.c:1890 msgid "Use KOMA-script classes if possible" msgstr "" -#: ../geanylatex/src/geanylatex.c:1895 +#: ../geanylatex/src/geanylatex.c:1892 msgid "" "Uses the KOMA-script classes by Markus Kohm.\n" "Keep in mind: To compile your document these classes have to be installed " "before." msgstr "" -#: ../geanylatex/src/geanylatex.c:1902 +#: ../geanylatex/src/geanylatex.c:1899 msgid "Use draft mode" msgstr "" -#: ../geanylatex/src/geanylatex.c:1904 +#: ../geanylatex/src/geanylatex.c:1901 msgid "" "Set the draft flag inside new created documents to get documents with a " "number of debugging helpers" msgstr "" -#: ../geanylatex/src/geanylatex.c:1921 +#: ../geanylatex/src/geanylatex.c:1918 msgid "Run LaTeX-Wizard" msgstr "" -#: ../geanylatex/src/geanylatex.c:1923 +#: ../geanylatex/src/geanylatex.c:1920 msgid "Insert \\label" msgstr "" -#: ../geanylatex/src/geanylatex.c:1925 +#: ../geanylatex/src/geanylatex.c:1922 msgid "Insert \\ref" msgstr "" -#: ../geanylatex/src/geanylatex.c:1927 +#: ../geanylatex/src/geanylatex.c:1924 msgid "Insert linebreak \\\\ " msgstr "" -#: ../geanylatex/src/geanylatex.c:1930 +#: ../geanylatex/src/geanylatex.c:1927 msgid "Insert command" msgstr "" -#: ../geanylatex/src/geanylatex.c:1932 +#: ../geanylatex/src/geanylatex.c:1929 msgid "Turn input replacement on/off" msgstr "" -#: ../geanylatex/src/geanylatex.c:1936 +#: ../geanylatex/src/geanylatex.c:1933 msgid "Replace special characters" msgstr "" -#: ../geanylatex/src/geanylatex.c:1939 +#: ../geanylatex/src/geanylatex.c:1936 msgid "Run insert environment dialog" msgstr "" -#: ../geanylatex/src/geanylatex.c:1941 +#: ../geanylatex/src/geanylatex.c:1938 msgid "Insert \\item" msgstr "" -#: ../geanylatex/src/geanylatex.c:1943 +#: ../geanylatex/src/geanylatex.c:1940 msgid "Format selection in bold font face" msgstr "" -#: ../geanylatex/src/geanylatex.c:1945 +#: ../geanylatex/src/geanylatex.c:1942 msgid "Format selection in italic font face" msgstr "" -#: ../geanylatex/src/geanylatex.c:1947 +#: ../geanylatex/src/geanylatex.c:1944 msgid "Format selection in typewriter font face" msgstr "" -#: ../geanylatex/src/geanylatex.c:1949 +#: ../geanylatex/src/geanylatex.c:1946 msgid "Format selection centered" msgstr "" -#: ../geanylatex/src/geanylatex.c:1951 +#: ../geanylatex/src/geanylatex.c:1948 msgid "Format selection left-aligned" msgstr "" -#: ../geanylatex/src/geanylatex.c:1953 +#: ../geanylatex/src/geanylatex.c:1950 msgid "Format selection right-aligned" msgstr "" -#: ../geanylatex/src/geanylatex.c:1956 +#: ../geanylatex/src/geanylatex.c:1953 msgid "Insert description list" msgstr "" -#: ../geanylatex/src/geanylatex.c:1959 +#: ../geanylatex/src/geanylatex.c:1956 msgid "Insert itemize list" msgstr "" -#: ../geanylatex/src/geanylatex.c:1962 +#: ../geanylatex/src/geanylatex.c:1959 msgid "Insert enumerate list" msgstr "" -#: ../geanylatex/src/geanylatex.c:1965 +#: ../geanylatex/src/geanylatex.c:1962 msgid "Set selection one level up" msgstr "" -#: ../geanylatex/src/geanylatex.c:1968 +#: ../geanylatex/src/geanylatex.c:1965 msgid "Set selection one level down" msgstr "" -#: ../geanylatex/src/geanylatex.c:1971 +#: ../geanylatex/src/geanylatex.c:1968 msgid "Insert \\usepackage{}" msgstr "" -#: ../geanylatex/src/geanylatex.c:1974 +#: ../geanylatex/src/geanylatex.c:1971 msgid "Insert BibTeX reference dialog" msgstr "" -#: ../geanylatex/src/geanylatex.c:1981 +#: ../geanylatex/src/geanylatex.c:1978 msgid "" "GeanyLaTeX is a plugin to improve support for LaTeX in Geany.\n" "\n" "Please report all bugs or feature requests to one of the authors." msgstr "" -#: ../geanylatex/src/geanylatex.c:2017 +#: ../geanylatex/src/geanylatex.c:2014 msgid "" "glatex_set_autocompletion_contextsize has been initialized with an invalid " "value. Default value taken. Please check your configuration file" msgstr "" -#: ../geanylatex/src/geanylatex.c:2039 ../geanylatex/src/geanylatex.c:2046 +#: ../geanylatex/src/geanylatex.c:2036 ../geanylatex/src/geanylatex.c:2043 msgid "page \\pageref{{{reference}}}" msgstr "" -#: ../geanylatex/src/geanylatex.c:2043 ../geanylatex/src/geanylatex.c:2050 +#: ../geanylatex/src/geanylatex.c:2040 ../geanylatex/src/geanylatex.c:2047 msgid "\\ref{{{reference}}}, page \\pageref{{{reference}}}" msgstr "" #. Then we build up the menu and finally add it -#: ../geanylatex/src/geanylatex.c:2095 +#: ../geanylatex/src/geanylatex.c:2092 msgid "_LaTeX" msgstr "" -#: ../geanylatex/src/geanylatex.c:2102 ../geanylatex/src/geanylatex.c:2293 +#: ../geanylatex/src/geanylatex.c:2099 ../geanylatex/src/geanylatex.c:2290 msgid "LaTeX-_Wizard" msgstr "" -#: ../geanylatex/src/geanylatex.c:2105 ../geanylatex/src/geanylatex.c:2296 +#: ../geanylatex/src/geanylatex.c:2102 ../geanylatex/src/geanylatex.c:2293 msgid "Starts a Wizard to easily create LaTeX-documents" msgstr "" -#: ../geanylatex/src/geanylatex.c:2110 +#: ../geanylatex/src/geanylatex.c:2107 msgid "I_nsert Special Character" msgstr "" -#: ../geanylatex/src/geanylatex.c:2112 +#: ../geanylatex/src/geanylatex.c:2109 msgid "Helps to use some not very common letters and signs" msgstr "" -#: ../geanylatex/src/geanylatex.c:2122 +#: ../geanylatex/src/geanylatex.c:2119 msgid "Insert _Reference" msgstr "" -#: ../geanylatex/src/geanylatex.c:2124 +#: ../geanylatex/src/geanylatex.c:2121 msgid "Inserting references to the document" msgstr "" -#: ../geanylatex/src/geanylatex.c:2129 +#: ../geanylatex/src/geanylatex.c:2126 msgid "Insert _Label" msgstr "" -#: ../geanylatex/src/geanylatex.c:2131 +#: ../geanylatex/src/geanylatex.c:2128 msgid "Helps at inserting labels to a document" msgstr "" -#: ../geanylatex/src/geanylatex.c:2137 +#: ../geanylatex/src/geanylatex.c:2134 msgid "Insert _Environment" msgstr "" -#: ../geanylatex/src/geanylatex.c:2139 +#: ../geanylatex/src/geanylatex.c:2136 msgid "Helps at inserting an environment a document" msgstr "" -#: ../geanylatex/src/geanylatex.c:2145 +#: ../geanylatex/src/geanylatex.c:2142 msgid "Insert P_ackage" msgstr "" -#: ../geanylatex/src/geanylatex.c:2147 +#: ../geanylatex/src/geanylatex.c:2144 msgid "A small dialog to insert \\usepackage{} into header of current file" msgstr "" -#: ../geanylatex/src/geanylatex.c:2153 +#: ../geanylatex/src/geanylatex.c:2150 msgid "Insert B_ibTeX reference" msgstr "" -#: ../geanylatex/src/geanylatex.c:2155 +#: ../geanylatex/src/geanylatex.c:2152 msgid "Helps to insert a reference out of BibTeX files" msgstr "" -#: ../geanylatex/src/geanylatex.c:2160 +#: ../geanylatex/src/geanylatex.c:2157 msgid "_BibTeX entries" msgstr "" -#: ../geanylatex/src/geanylatex.c:2176 +#: ../geanylatex/src/geanylatex.c:2173 msgid "_Format" msgstr "" #. Add font size menu -#: ../geanylatex/src/geanylatex.c:2193 +#: ../geanylatex/src/geanylatex.c:2190 msgid "F_ont size" msgstr "" -#: ../geanylatex/src/geanylatex.c:2211 +#: ../geanylatex/src/geanylatex.c:2208 msgid "_Special Character Replacement" msgstr "" -#: ../geanylatex/src/geanylatex.c:2219 +#: ../geanylatex/src/geanylatex.c:2216 msgid "Bulk _Replace Special Characters" msgstr "" -#: ../geanylatex/src/geanylatex.c:2221 +#: ../geanylatex/src/geanylatex.c:2218 msgid "_Replace selected special characters with TeX substitutes" msgstr "" -#: ../geanylatex/src/geanylatex.c:2229 +#: ../geanylatex/src/geanylatex.c:2226 msgid "Toggle _Special Character Replacement" msgstr "" -#: ../geanylatex/src/geanylatex.c:2240 +#: ../geanylatex/src/geanylatex.c:2237 msgid "Insert _Command" msgstr "" -#: ../geanylatex/src/geanylatex.c:2242 +#: ../geanylatex/src/geanylatex.c:2239 msgid "Inserting costumized command to document" msgstr "" -#: ../geanylatex/src/letters.c:39 +#: ../geanylatex/src/letters.c:40 +#, fuzzy +msgid "LaTeX letters" +msgstr "Griekse letters" + +#: ../geanylatex/src/letters.c:41 msgid "Greek letters" -msgstr "" +msgstr "Griekse letters" -#: ../geanylatex/src/letters.c:40 +#: ../geanylatex/src/letters.c:42 msgid "German umlauts" -msgstr "" +msgstr "Duitse umlauts" -#: ../geanylatex/src/letters.c:41 +#: ../geanylatex/src/letters.c:43 msgid "Misc" -msgstr "" +msgstr "Overige" -#: ../geanylatex/src/letters.c:42 +#: ../geanylatex/src/letters.c:44 msgid "Arrow characters" -msgstr "" +msgstr "Pijlen" -#: ../geanylatex/src/letters.c:43 +#: ../geanylatex/src/letters.c:45 msgid "Relational" msgstr "" -#: ../geanylatex/src/letters.c:44 +#: ../geanylatex/src/letters.c:46 msgid "Binary operation" -msgstr "" +msgstr "Binaire operatoren" #: ../geanylatex/src/formatpatterns.c:38 msgid "Italic" -msgstr "" +msgstr "Schreefschrift" #: ../geanylatex/src/formatpatterns.c:39 msgid "Bold" -msgstr "" +msgstr "Vet" #: ../geanylatex/src/formatpatterns.c:40 msgid "Underline" -msgstr "" +msgstr "Onderstreep" #: ../geanylatex/src/formatpatterns.c:41 msgid "Typewriter" @@ -2593,7 +2634,7 @@ #: ../geanylatex/src/formatpatterns.c:42 msgid "Small Caps" -msgstr "" +msgstr "Kleine hoofdletters" #: ../geanylatex/src/formatpatterns.c:43 msgid "Slanted" @@ -4183,31 +4224,31 @@ msgid "Shift Right" msgstr "" -#: ../tableconvert/src/tableconvert.c:35 +#: ../tableconvert/src/tableconvert.c:34 msgid "Tableconvert" msgstr "" -#: ../tableconvert/src/tableconvert.c:36 +#: ../tableconvert/src/tableconvert.c:35 msgid "A little plugin to convert lists into tables" msgstr "" #. OK. Something went not as expected. #. * We did have a selection but cannot parse it into rows. #. * Aborting -#: ../tableconvert/src/tableconvert.c:166 -msgid "Something went went wrong on parsing selection. Aborting" +#: ../tableconvert/src/tableconvert.c:249 +msgid "Something went wrong on parsing selection. Aborting" msgstr "" -#: ../tableconvert/src/tableconvert.c:197 +#: ../tableconvert/src/tableconvert.c:280 msgid "Convert selection to table" msgstr "" #. Build up menu entry -#: ../tableconvert/src/tableconvert.c:212 +#: ../tableconvert/src/tableconvert.c:295 msgid "_Convert to table" msgstr "" -#: ../tableconvert/src/tableconvert.c:215 +#: ../tableconvert/src/tableconvert.c:298 msgid "Converts current marked list to a table." msgstr "" 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 September 2011