Commits July 2006

commits@lists.geany.org

2 participants
142 discussions

SF.net SVN: geany: [633] trunk/pixmaps/geany.ico
by eht16＠users.sourceforge.net 25 Jul '06

25 Jul '06

Revision: 633 Author: eht16 Date: 2006-07-25 14:04:50 -0700 (Tue, 25 Jul 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=633&view=rev Log Message: ----------- Needed for the Windows build. Added Paths: ----------- trunk/pixmaps/geany.ico Added: trunk/pixmaps/geany.ico =================================================================== (Binary files differ) Property changes on: trunk/pixmaps/geany.ico ___________________________________________________________________ Name: svn:mime-type + application/octet-stream This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [632] trunk
by eht16＠users.sourceforge.net 25 Jul '06

25 Jul '06

Revision: 632 Author: eht16 Date: 2006-07-25 11:09:08 -0700 (Tue, 25 Jul 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=632&view=rev Log Message: ----------- Applied patch to fix building with gcc 2.95, removed unneeded file from EXTRA_DIST. Modified Paths: -------------- trunk/ChangeLog trunk/Makefile.am trunk/tagmanager/get.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-07-25 17:45:34 UTC (rev 631) +++ trunk/ChangeLog 2006-07-25 18:09:08 UTC (rev 632) @@ -12,6 +12,12 @@ * src/callbacks.c: Fixed broken Find usage. Put "No matches" message also in the message window. + * Makefile.am, geany_windres.rc, configure.in, src/Makefile.am, + scintilla/Makefile.am, src/callbacks.c, tagmanager/tm_work_object.c, + tagmanager/ctags.c, tagmanager/get.c: + Small changes to get cross compiling using mingw32 suite working. + * tagmanager/get.c: Applied patch to fix building with gcc 2.95 + (closes #1528516, thanks). 2006-07-24 Enrico Tröger <enrico.troeger(a)uvena.de> Modified: trunk/Makefile.am =================================================================== --- trunk/Makefile.am 2006-07-25 17:45:34 UTC (rev 631) +++ trunk/Makefile.am 2006-07-25 18:09:08 UTC (rev 632) @@ -8,7 +8,6 @@ geany.spec \ geany.glade \ geany_windres.rc \ - geany_windres.h \ geany.gladep \ data/global.tags \ data/php.tags \ Modified: trunk/tagmanager/get.c =================================================================== --- trunk/tagmanager/get.c 2006-07-25 17:45:34 UTC (rev 631) +++ trunk/tagmanager/get.c 2006-07-25 18:09:08 UTC (rev 632) @@ -331,12 +331,9 @@ static boolean directiveIf (const int c) { - DebugStatement ( const boolean ignore0 = isIgnore (); ) const boolean ignore = pushConditional ((boolean) (c != '0')); Cpp.directive.state = DRCTV_NONE; - DebugStatement ( debugCppNest (TRUE, Cpp.directive.nestLevel); - if (ignore != ignore0) debugCppIgnore (ignore); ) return ignore; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [631] trunk
by eht16＠users.sourceforge.net 25 Jul '06

25 Jul '06

Revision: 631 Author: eht16 Date: 2006-07-25 10:45:34 -0700 (Tue, 25 Jul 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=631&view=rev Log Message: ----------- Small changes to get cross compiling using mingw32 suite working. Modified Paths: -------------- trunk/Makefile.am trunk/configure.in trunk/scintilla/Makefile.am trunk/src/Makefile.am trunk/src/callbacks.c trunk/tagmanager/ctags.c trunk/tagmanager/get.c trunk/tagmanager/tm_work_object.c Added Paths: ----------- trunk/geany_windres.rc.in Modified: trunk/Makefile.am =================================================================== --- trunk/Makefile.am 2006-07-25 13:14:51 UTC (rev 630) +++ trunk/Makefile.am 2006-07-25 17:45:34 UTC (rev 631) @@ -7,6 +7,8 @@ geany.desktop.in \ geany.spec \ geany.glade \ + geany_windres.rc \ + geany_windres.h \ geany.gladep \ data/global.tags \ data/php.tags \ @@ -40,7 +42,6 @@ fi \ done - dist-hook: if test -d pixmaps; then \ mkdir $(distdir)/pixmaps; \ @@ -51,6 +52,19 @@ done \ fi +if MINGW +install-win32: + GEANY_INSTALL_DIR=geany; \ + mkdir $(GEANY_INSTALL_DIR); \ + cp ChangeLog $(GEANY_INSTALL_DIR)/ChangeLog.txt; \ + cp TODO $(GEANY_INSTALL_DIR)/ToDo.txt; \ + cp COPYING $(GEANY_INSTALL_DIR)/ChangeLog.txt; \ + cp AUTHORS $(GEANY_INSTALL_DIR)/Authors.txt; \ + cp README $(GEANY_INSTALL_DIR)/ReadMe.txt; \ + cp THANKS $(GEANY_INSTALL_DIR)/Thanks.txt; \ + @# to be finished +endif + BZIP2_ENV =--best dist-bzip2: distdir Modified: trunk/configure.in =================================================================== --- trunk/configure.in 2006-07-25 13:14:51 UTC (rev 630) +++ trunk/configure.in 2006-07-25 17:45:34 UTC (rev 631) @@ -3,7 +3,10 @@ AC_INIT(configure.in) AM_INIT_AUTOMAKE(geany, 0.8) +MAJOR_VERSION="0" +MINOR_VERSION="8" + AM_CONFIG_HEADER(config.h) AC_ISC_POSIX @@ -39,7 +42,7 @@ # Checks for library functions. AC_FUNC_CLOSEDIR_VOID AC_FUNC_ERROR_AT_LINE -AC_REPLACE_FNMATCH +#AC_REPLACE_FNMATCH AC_FUNC_LSTAT AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK AC_FUNC_MALLOC @@ -48,7 +51,7 @@ AC_TYPE_SIGNAL AC_FUNC_STAT AC_FUNC_VPRINTF -AC_CHECK_FUNCS([gethostname ftruncate fgetpos getcwd gettimeofday isascii mblen memset putenv realpath regcomp setenv strcasecmp strchr strdup strerror strrchr strspn strstr strtol]) +AC_CHECK_FUNCS([gethostname ftruncate fgetpos getcwd gettimeofday isascii mblen memset mkstemp putenv realpath regcomp setenv strcasecmp strchr strdup strerror strrchr strspn strstr strtol]) # autoscan end @@ -58,8 +61,10 @@ if test -d ".svn" -a -x "${SVN}" then REVISION=r`$SVN info|grep 'Last Changed Rev'|cut -d' ' -f4` + VERSION_STRING="$VERSION ($REVISION)" else REVISION="-1" + VERSION_STRING="$VERSION" fi AC_DEFINE_UNQUOTED([REVISION], "$REVISION", [subversion revision number]) @@ -86,10 +91,6 @@ AC_ARG_ENABLE(vte, AC_HELP_STRING([--enable-vte],[enable if you want virtual termninal support [[default=yes]]]), [want_vte="$enableval"], [want_vte="yes"]) -if test "x$want_vte" = "xyes"; then - AC_DEFINE(HAVE_VTE, 1, [Define if you want VTE support]) -fi - # if test "$want_vte" = "yes"; then # PKG_CHECK_MODULES(VTE, [vte], # [AC_DEFINE(HAVE_VTE, 1, [Define if you want VTE support])], @@ -99,10 +100,20 @@ # [AC_MSG_ERROR([VTE support enabled, but VTE not found])], []) # fi -# Check for random number paths -AC_CHECK_FILE([/dev/urandom], AC_DEFINE([HAVE_DEVURANDOM], [1], [Define that you found /dev/urandom])) -AC_CHECK_FILE([/dev/random], AC_DEFINE([HAVE_DEVRANDOM], [1], [Define that you found /dev/random])) +# Check for random number paths (skip when cross compiling) +if test "x$build" = "x$target"; then + AC_CHECK_FILE([/dev/urandom], AC_DEFINE([HAVE_DEVURANDOM], [1], [Define that you found /dev/urandom])) + AC_CHECK_FILE([/dev/random], AC_DEFINE([HAVE_DEVRANDOM], [1], [Define that you found /dev/random])) +fi +if test "x$target" = "xi386-mingw32msvc"; then + AC_DEFINE_UNQUOTED([WIN32], 1, [we are cross compiling for WIN32]) + want_vte="no" + AC_EXEEXT +fi +AM_CONDITIONAL(MINGW, test "x$target" = "xi386-mingw32msvc") + + GTK_VERSION=`$PKG_CONFIG --modversion gtk+-2.0` # just for a laugh (it has absolutely no effect) @@ -133,11 +144,19 @@ fi fi +if test "x$want_vte" = "xyes"; then + AC_DEFINE(HAVE_VTE, 1, [Define if you want VTE support]) +fi + GEANY_PIXMAPS_DIR=`eval echo ${datadir}/pixmaps` AC_SUBST(GEANY_PIXMAPS_DIR) GEANY_DATA_DIR=`eval echo ${datadir}/geany` AC_SUBST(GEANY_DATA_DIR) +AC_SUBST([MINOR_VERSION]) +AC_SUBST([MAJOR_VERSION]) +AC_SUBST([VERSION_STRING]) + AC_OUTPUT([ Makefile tagmanager/Makefile @@ -150,10 +169,16 @@ doc/geany.1 geany.spec geany.desktop +geany_windres.rc ]) echo "----------------------------------------" echo "Install Geany in : ${prefix}" +if test "x${build}" != "x" -a "x${target}" != "x" +then + echo "Building Geany on : ${build}" + echo "Building Geany for : ${target}" +fi echo "Using GTK version : ${GTK_VERSION}" echo "Use virtual terminal support : ${want_vte}" echo "Use named pipe support : ${want_pipe}" Added: trunk/geany_windres.rc.in =================================================================== --- trunk/geany_windres.rc.in (rev 0) +++ trunk/geany_windres.rc.in 2006-07-25 17:45:34 UTC (rev 631) @@ -0,0 +1,32 @@ + +#include <windows.h> // include for version info constants + + +A ICON MOVEABLE PURE LOADONCALL DISCARDABLE "../pixmaps/geany.ico" + +1 VERSIONINFO +FILEVERSION @MAJOR_VERSION@,@MINOR_VERSION@,0,0 +PRODUCTVERSION @MAJOR_VERSION@,@MINOR_VERSION@,0,0 +FILETYPE VFT_APP +{ + BLOCK "StringFileInfo" + { + BLOCK "040704E4" + { + VALUE "CompanyName", "" + VALUE "FileVersion", "@VERSION_STRING@" + VALUE "FileDescription", "Small and lighweight IDE (built using mingw gcc)" + VALUE "InternalName", "geany" + VALUE "LegalCopyright", "Copyright 2005-2006 by Enrico Troeger" + VALUE "LegalTrademarks", "" + VALUE "OriginalFilename", "geany" + VALUE "ProductName", "geany" + VALUE "ProductVersion", "@VERSION_STRING@" + } + } + BLOCK "VarFileInfo" + { + VALUE "Translation", 0x0407, 1252 + } +} + Modified: trunk/scintilla/Makefile.am =================================================================== --- trunk/scintilla/Makefile.am 2006-07-25 13:14:51 UTC (rev 630) +++ trunk/scintilla/Makefile.am 2006-07-25 17:45:34 UTC (rev 631) @@ -55,8 +55,11 @@ libscintilla_a_SOURCES = $(SRCS) -INCLUDES=-I$(top_srcdir) -Iinclude \ -@PACKAGE_CFLAGS@ +if MINGW +INCLUDES=-I$(top_srcdir) -Iinclude -I/usr/local/cross-tools/include @PACKAGE_CFLAGS@ +else +INCLUDES=-I$(top_srcdir) -Iinclude @PACKAGE_CFLAGS@ +endif libscintilla_a_LIBADD = scintilla-marshal.o Modified: trunk/src/Makefile.am =================================================================== --- trunk/src/Makefile.am 2006-07-25 13:14:51 UTC (rev 630) +++ trunk/src/Makefile.am 2006-07-25 17:45:34 UTC (rev 631) @@ -1,18 +1,12 @@ ## Process this file with automake to produce Makefile.in # $Id$ -INCLUDES = \ - -DPACKAGE_DATA_DIR=\""$(datadir)"\" \ - -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ - -I../scintilla/include \ - -I../tagmanager/include \ - @PACKAGE_CFLAGS@ -EXTRA_DIST = images.c gb.c win32.c win32.h +EXTRA_DIST = images.c gb.c bin_PROGRAMS = geany -geany_SOURCES = \ +SRCS = \ main.c geany.h \ search.c search.h \ notebook.c notebook.h \ @@ -32,12 +26,42 @@ sciwrappers.c sciwrappers.h \ document.c document.h \ utils.c utils.h \ - vte.c vte.h \ support.c support.h \ interface.c interface.h \ callbacks.c callbacks.h -#AM_CFLAGS = -Wall -pipe -#AM_CFLAGS = -DGEANY_DEBUG -Wall -pipe -AM_CFLAGS = -DGEANY_DEBUG -g -Wall -pipe + + +if MINGW +# build Geany for Windows +WINDRES = /usr/local/cross-tools/bin/i386-mingw32msvc-windres + +geany_SOURCES = $(SRCS) win32.c win32.h +geany_LDADD = ../scintilla/libscintilla.a ../tagmanager/libtagmanager.a -lstdc++ @PACKAGE_LIBS@ \ + $(INTLLIBS) -lgdi32 -limm32 -lshell32 -lole32 -luuid -liberty -lcomdlg32 -lcomctl32 \ + geany_windres.res +AM_CFLAGS = -DGEANY_DEBUG -Wall -pipe -mms-bitfields +#AM_CFLAGS = -DGEANY_DEBUG -Wall -pipe -mms-bitfields -g -O0 +geany_LDFLAGS = -mwindows + +INCLUDES = \ + -DPACKAGE_DATA_DIR=\"data\" -DPACKAGE_LOCALE_DIR=\"data\" -I../scintilla/include \ + -I../tagmanager/include @PACKAGE_CFLAGS@ + +geany_windres.res: + $(WINDRES) -i ../geany_windres.rc --input-format=rc -o geany_windres.res -O coff; + +else +# build Geany for all other platforms +AM_CFLAGS = -DGEANY_DEBUG -Wall -pipe +geany_SOURCES = $(SRCS) vte.c vte.h geany_LDADD = @PACKAGE_LIBS@ -lstdc++ ../scintilla/libscintilla.a ../tagmanager/libtagmanager.a $(INTLLIBS) + +INCLUDES = \ + -DPACKAGE_DATA_DIR=\""$(datadir)"\" -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ + -I../scintilla/include -I../tagmanager/include @PACKAGE_CFLAGS@ + +endif + +#geany_SOURCES = $(SRCS) +#geany_LDADD = @PACKAGE_LIBS@ -lstdc++ ../scintilla/libscintilla.a ../tagmanager/libtagmanager.a $(INTLLIBS) Modified: trunk/src/callbacks.c =================================================================== --- trunk/src/callbacks.c 2006-07-25 13:14:51 UTC (rev 630) +++ trunk/src/callbacks.c 2006-07-25 17:45:34 UTC (rev 631) @@ -1232,7 +1232,7 @@ gchar *text; if (idx < 0) return; - text = malloc(sci_get_selected_text_length(doc_list[idx].sci) + 1); + text = g_malloc(sci_get_selected_text_length(doc_list[idx].sci) + 1); sci_get_selected_text(doc_list[idx].sci, text); sci_replace_sel(doc_list[idx].sci, g_ascii_strup(text, -1)); g_free(text); Modified: trunk/tagmanager/ctags.c =================================================================== --- trunk/tagmanager/ctags.c 2006-07-25 13:14:51 UTC (rev 630) +++ trunk/tagmanager/ctags.c 2006-07-25 17:45:34 UTC (rev 631) @@ -20,6 +20,7 @@ * INCLUDE FILES */ #include "general.h" /* must always come first */ +#include <glib.h> #ifdef HAVE_STDLIB_H # include <stdlib.h> /* to declare malloc (), realloc () */ @@ -341,7 +342,7 @@ extern void *eMalloc (const size_t size) { - void *buffer = malloc (size); + void *buffer = g_malloc (size); if (buffer == NULL) error (FATAL, "out of memory"); @@ -366,7 +367,7 @@ buffer = eMalloc (size); else { - buffer = realloc (ptr, size); + buffer = g_realloc (ptr, size); if (buffer == NULL) error (FATAL, "out of memory"); } Modified: trunk/tagmanager/get.c =================================================================== --- trunk/tagmanager/get.c 2006-07-25 13:14:51 UTC (rev 630) +++ trunk/tagmanager/get.c 2006-07-25 17:45:34 UTC (rev 631) @@ -13,6 +13,7 @@ * INCLUDE FILES */ #include "general.h" /* must always come first */ +#include <glib.h> #include <string.h> @@ -637,7 +638,7 @@ pos1 = ftell(File.fp); if (pos2 > pos1) { - result = (char *) malloc(sizeof(char ) * (pos2 - pos1 + 2)); + result = (char *) g_malloc(sizeof(char ) * (pos2 - pos1 + 2)); if (result != NULL) { fread(result, sizeof(char), pos2 - pos1 + 1, File.fp); @@ -664,7 +665,7 @@ { int i = 0, pos = 0; ParseState state = st_none_t, prev_state = st_none_t; - + while (buf[i] != '\0') { switch(buf[i]) Modified: trunk/tagmanager/tm_work_object.c =================================================================== --- trunk/tagmanager/tm_work_object.c 2006-07-25 13:14:51 UTC (rev 630) +++ trunk/tagmanager/tm_work_object.c 2006-07-25 17:45:34 UTC (rev 631) @@ -7,6 +7,8 @@ * */ +#include "general.h" /* must always come first */ + #include <stdio.h> #include <limits.h> #include <stdlib.h> @@ -25,7 +27,7 @@ gchar path[PATH_MAX+1]; memset(path, '\0', PATH_MAX+1); #ifdef G_OS_WIN32 - return lrealpath(file_name, path); + return lrealpath(file_name); #else realpath(file_name, path); #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: [630] trunk
by eht16＠users.sourceforge.net 25 Jul '06

25 Jul '06

Revision: 630 Author: eht16 Date: 2006-07-25 06:14:51 -0700 (Tue, 25 Jul 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=630&view=rev Log Message: ----------- Fixed broken Find usage. Put "No matches" message also in the message window. Modified Paths: -------------- trunk/ChangeLog trunk/src/callbacks.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-07-25 12:46:08 UTC (rev 629) +++ trunk/ChangeLog 2006-07-25 13:14:51 UTC (rev 630) @@ -9,6 +9,9 @@ Added simple wrapper function win32_open_browser(). * src/dialogs.c, src/main.c, src/document.c, src/callbacks.c: Removed some unneeded functions to avoid duplicate code. + * src/callbacks.c: + Fixed broken Find usage. + Put "No matches" message also in the message window. 2006-07-24 Enrico Tröger <enrico.troeger(a)uvena.de> Modified: trunk/src/callbacks.c =================================================================== --- trunk/src/callbacks.c 2006-07-25 12:46:08 UTC (rev 629) +++ trunk/src/callbacks.c 2006-07-25 13:14:51 UTC (rev 630) @@ -1358,8 +1358,7 @@ { ttf.chrg.cpMin = 0; ttf.chrg.cpMax = sci_get_length(doc_list[i].sci); - ttf.lpstrText = g_malloc(sizeof search_text); - strncpy(ttf.lpstrText, search_text, sizeof search_text); + ttf.lpstrText = search_text; while (1) { pos = sci_find_text(doc_list[i].sci, flags, &ttf); @@ -1381,11 +1380,15 @@ g_free(string); ttf.chrg.cpMin = ttf.chrgText.cpMax + 1; } - g_free(ttf.lpstrText); } } if (line == -1) // no matches were found (searching from unnamed file) - msgwin_status_add(_("No matches found for '%s'."), search_text); + { + gchar *text = g_strdup_printf(_("No matches found for '%s'."), search_text); + msgwin_status_add(text); + msgwin_msg_add(-1, -1, text); + g_free(text); + } g_free(search_text); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [629] trunk
by eht16＠users.sourceforge.net 25 Jul '06

25 Jul '06

Revision: 629 Author: eht16 Date: 2006-07-25 05:46:08 -0700 (Tue, 25 Jul 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=629&view=rev Log Message: ----------- Removed some unneeded functions to avoid duplicate code. Modified Paths: -------------- trunk/ChangeLog trunk/src/callbacks.c trunk/src/dialogs.c trunk/src/dialogs.h trunk/src/document.c trunk/src/main.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-07-25 12:44:42 UTC (rev 628) +++ trunk/ChangeLog 2006-07-25 12:46:08 UTC (rev 629) @@ -3,6 +3,12 @@ * src/encodings.c, src/document.c, src/keyfile.c, src/main.c: Save default encoding for new files as charset string. * src/filetypes.c: Reordered the filetypes (just a cosmetic change). + * src/win32.c, src/utils.c: + Removed title argument from win32_message_dialog because it is + defined by the dialog type. + Added simple wrapper function win32_open_browser(). + * src/dialogs.c, src/main.c, src/document.c, src/callbacks.c: + Removed some unneeded functions to avoid duplicate code. 2006-07-24 Enrico Tröger <enrico.troeger(a)uvena.de> Modified: trunk/src/callbacks.c =================================================================== --- trunk/src/callbacks.c 2006-07-25 12:44:42 UTC (rev 628) +++ trunk/src/callbacks.c 2006-07-25 12:46:08 UTC (rev 629) @@ -848,7 +848,9 @@ } else { - dialogs_show_file_open_error(); + dialogs_show_error( + _("You have opened too many files. There is a limit of %d concurrent open files."), + GEANY_MAX_OPEN_FILES); g_slist_foreach(flist, (GFunc)g_free, NULL); break; } Modified: trunk/src/dialogs.c =================================================================== --- trunk/src/dialogs.c 2006-07-25 12:44:42 UTC (rev 628) +++ trunk/src/dialogs.c 2006-07-25 12:46:08 UTC (rev 629) @@ -42,9 +42,7 @@ #include "win32.h" #include "sciwrappers.h" #include "support.h" -//#include "interface.h" #include "utils.h" -#include "prefs.h" #include "keybindings.h" @@ -148,7 +146,9 @@ } else { - dialogs_show_file_open_error(); + dialogs_show_error( + _("You have opened too many files. There is a limit of %d concurrent open files."), + GEANY_MAX_OPEN_FILES); } } @@ -157,7 +157,7 @@ void dialogs_show_save_as () { #ifdef GEANY_WIN32 - win32_show_file_dialog(FALSE); + win32_show_file_dialog(FALSE); #else gint idx = document_get_cur_idx(); @@ -212,53 +212,6 @@ } - -void dialogs_show_file_open_error(void) -{ - /// TODO rewrite the messages - gchar *pri = g_strdup_printf(_("There is a limit of %d concurrent open tabs."), GEANY_MAX_OPEN_FILES); - gchar *sec = _("error: too many open files"); -#ifdef GEANY_WIN32 - win32_message_dialog(GTK_MESSAGE_INFO, sec, pri); -#else - GtkWidget *dialog; - - dialog = gtk_message_dialog_new(GTK_WINDOW(app->window), GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, sec); - gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog), pri); - gtk_dialog_run (GTK_DIALOG (dialog)); - gtk_widget_destroy (dialog); -#endif - g_free(pri); -} - - -/// TODO replace by dialogs_show_question -gboolean dialogs_show_not_found(const gchar *text) -{ - GtkWidget *dialog; - gchar *string; - gint ret; - - string = g_strdup_printf(_("The match \"%s\" was not found. Wrap search around the document?"), text); -#ifdef GEANY_WIN32 - dialog = NULL; - ret = MessageBox(NULL, string, _("Question"), MB_YESNO | MB_ICONWARNING); - g_free(string); - if (ret == IDYES) return TRUE; - else return FALSE; -#else - dialog = gtk_message_dialog_new(GTK_WINDOW(app->window), GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO, "%s", string); - g_free(string); - ret = gtk_dialog_run(GTK_DIALOG (dialog)); - gtk_widget_destroy(dialog); - if (ret == GTK_RESPONSE_YES) return TRUE; - else return FALSE; -#endif -} - - void dialogs_show_info(const gchar *text, ...) { #ifndef GEANY_WIN32 @@ -272,11 +225,11 @@ va_end(args); #ifdef GEANY_WIN32 - win32_message_dialog(GTK_MESSAGE_INFO, _("Information"), string); + win32_message_dialog(GTK_MESSAGE_INFO, string); #else dialog = gtk_message_dialog_new(GTK_WINDOW(app->window), GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_MESSAGE_INFO, GTK_BUTTONS_OK, string); + GTK_MESSAGE_INFO, GTK_BUTTONS_OK, "%s", string); gtk_dialog_run (GTK_DIALOG (dialog)); gtk_widget_destroy (dialog); #endif @@ -297,10 +250,10 @@ va_end(args); #ifdef GEANY_WIN32 - win32_message_dialog(GTK_MESSAGE_ERROR, _("Error"), string); + win32_message_dialog(GTK_MESSAGE_ERROR, string); #else dialog = gtk_message_dialog_new(NULL, GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, string); + GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, "%s", string); gtk_dialog_run(GTK_DIALOG(dialog)); gtk_widget_destroy(dialog); #endif @@ -329,10 +282,10 @@ msg = g_strdup(_("The file is not saved.\nDo you want to save it before closing?")); } #ifdef GEANY_WIN32 - ret = win32_message_dialog_unsaved(_("Error"), msg); + ret = win32_message_dialog_unsaved(msg); #else dialog = gtk_message_dialog_new(GTK_WINDOW(app->window), GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE, msg); + GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE, "%s", msg); gtk_dialog_add_button(GTK_DIALOG(dialog), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL); @@ -1378,30 +1331,6 @@ } -/// TODO remove this function and use dialogs_show_question instead -gboolean dialogs_show_mkcfgdir_error(gint error_nr) -{ -#ifndef GEANY_WIN32 - GtkWidget *dialog; -#endif - gchar string[255]; - gint ret; - - snprintf(string, 255, _("Configuration directory could not be created (%s).\nThere could be some problems using %s without a configuration directory.\nStart %s anyway?"), - g_strerror(error_nr), PACKAGE, PACKAGE); -#ifdef GEANY_WIN32 - ret = win32_message_dialog(GTK_MESSAGE_ERROR, _("Error"), string); -#else - dialog = gtk_message_dialog_new(NULL, GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_MESSAGE_ERROR, GTK_BUTTONS_YES_NO, string); - ret = gtk_dialog_run(GTK_DIALOG(dialog)); - gtk_widget_destroy(dialog); - if (ret == GTK_RESPONSE_YES) return TRUE; - else return FALSE; -#endif -} - - void dialogs_show_file_properties(gint idx) { GtkWidget *dialog, *label, *table, *hbox, *image, *perm_table, *check; @@ -1779,10 +1708,10 @@ va_end(args); #ifdef GEANY_WIN32 - ret = win32_message_dialog(GTK_MESSAGE_QUESTION, _("Question"), string); + ret = win32_message_dialog(GTK_MESSAGE_QUESTION, string); #else dialog = gtk_message_dialog_new(NULL, GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO, string); + GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO, "%s", string); if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_YES) ret = TRUE; gtk_widget_destroy(dialog); Modified: trunk/src/dialogs.h =================================================================== --- trunk/src/dialogs.h 2006-07-25 12:44:42 UTC (rev 628) +++ trunk/src/dialogs.h 2006-07-25 12:46:08 UTC (rev 629) @@ -15,7 +15,7 @@ * * 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., 675 Mass Ave, Cambridge, MA 02139, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * * $Id$ */ @@ -30,10 +30,6 @@ /* This shows the file selection dialog to save a file. */ void dialogs_show_save_as(); -void dialogs_show_file_open_error(void); - -gboolean dialogs_show_not_found(const gchar *text); - void dialogs_show_info(const gchar *text, ...); void dialogs_show_error(const gchar *text, ...); @@ -69,8 +65,6 @@ GtkWidget *dialogs_add_file_open_extra_widget(void); -gboolean dialogs_show_mkcfgdir_error(gint error_nr); - void dialogs_show_file_properties(gint idx); gboolean dialogs_show_question(const gchar *text, ...); Modified: trunk/src/document.c =================================================================== --- trunk/src/document.c 2006-07-25 12:44:42 UTC (rev 628) +++ trunk/src/document.c 2006-07-25 12:46:08 UTC (rev 629) @@ -348,7 +348,9 @@ if (idx == -1) { - dialogs_show_file_open_error(); + dialogs_show_error( + _("You have opened too many files. There is a limit of %d concurrent open files."), + GEANY_MAX_OPEN_FILES); return; } @@ -377,7 +379,9 @@ } else { - dialogs_show_file_open_error(); + dialogs_show_error( + _("You have opened too many files. There is a limit of %d concurrent open files."), + GEANY_MAX_OPEN_FILES); } } @@ -799,6 +803,8 @@ } +#define SEARCH_NOT_FOUND_TXT _("The match \"%s\" was not found. Wrap search around the document?") + /* special search function, used from the find entry in the toolbar */ void document_find_next(gint idx, const gchar *text, gint flags, gboolean find_button, gboolean inc) { @@ -823,7 +829,7 @@ { if (find_button) { - if (dialogs_show_not_found(text)) + if (dialogs_show_question(SEARCH_NOT_FOUND_TXT, text)) { sci_goto_pos(doc_list[idx].sci, 0, FALSE); document_find_next(idx, text, flags, TRUE, inc); @@ -872,7 +878,7 @@ } else { - if (dialogs_show_not_found(text)) + if (dialogs_show_question(SEARCH_NOT_FOUND_TXT, text)) { sci_goto_pos(doc_list[idx].sci, (search_backwards) ? sci_get_length(doc_list[idx].sci) : 0, TRUE); return document_find_text(idx, text, flags, search_backwards); Modified: trunk/src/main.c =================================================================== --- trunk/src/main.c 2006-07-25 12:44:42 UTC (rev 628) +++ trunk/src/main.c 2006-07-25 12:46:08 UTC (rev 629) @@ -491,10 +491,16 @@ else config_dir = g_strconcat(GEANY_HOME_DIR, G_DIR_SEPARATOR_S, ".", PACKAGE, NULL); mkdir_result = utils_make_settings_dir(config_dir); - if (mkdir_result != 0 && ! dialogs_show_mkcfgdir_error(mkdir_result)) + if (mkdir_result != 0) { - g_free(config_dir); - return (0); + if (! dialogs_show_question( + _("Configuration directory could not be created (%s).\nThere could be some problems " + "using %s without a configuration directory.\nStart %s anyway?"), + g_strerror(mkdir_result), PACKAGE, PACKAGE)) + { + g_free(config_dir); + return (0); + } } #ifdef HAVE_FIFO @@ -573,7 +579,9 @@ } else { - dialogs_show_file_open_error(); + dialogs_show_error( + _("You have opened too many files. There is a limit of %d concurrent open files."), + GEANY_MAX_OPEN_FILES); break; } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [628] trunk/src
by eht16＠users.sourceforge.net 25 Jul '06

25 Jul '06

Revision: 628 Author: eht16 Date: 2006-07-25 05:44:42 -0700 (Tue, 25 Jul 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=628&view=rev Log Message: ----------- Removed title argument from win32_message_dialog because it is defined by the dialog type. Added simple wrapper function win32_open_browser(). Modified Paths: -------------- trunk/src/utils.c trunk/src/win32.c trunk/src/win32.h Modified: trunk/src/utils.c =================================================================== --- trunk/src/utils.c 2006-07-25 10:13:35 UTC (rev 627) +++ trunk/src/utils.c 2006-07-25 12:44:42 UTC (rev 628) @@ -48,6 +48,7 @@ #include "treeviews.h" #include "sciwrappers.h" #include "dialogs.h" +#include "win32.h" #include "utils.h" @@ -57,7 +58,7 @@ void utils_start_browser(const gchar *uri) { #ifdef GEANY_WIN32 - ShellExecute(NULL, "open", uri, NULL, NULL, SW_SHOWNORMAL); + win32_open_browser(uri); #else const gchar *argv[3]; Modified: trunk/src/win32.c =================================================================== --- trunk/src/win32.c 2006-07-25 10:13:35 UTC (rev 627) +++ trunk/src/win32.c 2006-07-25 12:44:42 UTC (rev 628) @@ -130,7 +130,7 @@ { gchar error[100]; snprintf(error, sizeof error, "File dialog box error (%x)", (int)CommDlgExtendedError()); - win32_message_dialog(GTK_MESSAGE_ERROR, _("Error"), error); + win32_message_dialog(GTK_MESSAGE_ERROR, error); } g_free(fname); return; @@ -146,7 +146,9 @@ { // open a single file if (gtk_notebook_get_n_pages(GTK_NOTEBOOK(app->notebook)) >= GEANY_MAX_OPEN_FILES) { - dialogs_show_file_open_error(); + dialogs_show_error( + _("You have opened too many files. There is a limit of %d concurrent open files."), + GEANY_MAX_OPEN_FILES); } else { @@ -292,7 +294,7 @@ { gchar error[100]; snprintf(error, sizeof error, "File dialog box error (%x)", (int)CommDlgExtendedError()); - win32_message_dialog(GTK_MESSAGE_ERROR, _("Error"), error); + win32_message_dialog(GTK_MESSAGE_ERROR, error); } g_strfreev(field); g_free(fname); @@ -322,19 +324,35 @@ /* Creates a native Windows message box of the given type and returns always TRUE * or FALSE representing th pressed Yes or No button. * If type is not GTK_MESSAGE_QUESTION, it returns always TRUE. */ -gboolean win32_message_dialog(GtkMessageType type, const gchar *title, const gchar *msg) +gboolean win32_message_dialog(GtkMessageType type, const gchar *msg) { gboolean ret = TRUE; gint rc; guint t; + const gchar *title; static wchar_t w_msg[512]; static wchar_t w_title[512]; switch (type) { - case GTK_MESSAGE_ERROR: t = MB_OK | MB_ICONERROR; break; - case GTK_MESSAGE_QUESTION: t = MB_YESNO | MB_ICONQUESTION; break; - default: t = MB_OK | MB_ICONINFORMATION; break; + case GTK_MESSAGE_ERROR: + { + t = MB_OK | MB_ICONERROR; + title = _("Error"); + break; + } + case GTK_MESSAGE_QUESTION: + { + t = MB_YESNO | MB_ICONQUESTION; + title = _("Question"); + break; + } + default: + { + t = MB_OK | MB_ICONINFORMATION; + title = _("Information"); + break; + } } // convert the Unicode chars to wide chars @@ -353,16 +371,15 @@ /* Special dialog to ask for an action when closing an unsaved file */ -gint win32_message_dialog_unsaved(const gchar *title, const gchar *msg) +gint win32_message_dialog_unsaved(const gchar *msg) { static wchar_t w_msg[512]; static wchar_t w_title[512]; gint ret; // convert the Unicode chars to wide chars - /// TODO test if LANG == C then possibly skip conversion MultiByteToWideChar(CP_UTF8, 0, msg, -1, w_msg, sizeof(w_msg)/sizeof(w_msg[0])); - MultiByteToWideChar(CP_UTF8, 0, title, -1, w_title, sizeof(w_title)/sizeof(w_title[0])); + MultiByteToWideChar(CP_UTF8, 0, _("Question"), -1, w_title, sizeof(w_title)/sizeof(w_title[0])); ret = MessageBoxW(NULL, w_msg, w_title, MB_YESNOCANCEL | MB_ICONQUESTION); switch(ret) @@ -375,4 +392,10 @@ return ret; } +/* Just a simple wrapper function to open a browser window */ +void win32_open_browser(const gchar *uri) +{ + ShellExecute(NULL, "open", uri, NULL, NULL, SW_SHOWNORMAL); +} + #endif Modified: trunk/src/win32.h =================================================================== --- trunk/src/win32.h 2006-07-25 10:13:35 UTC (rev 627) +++ trunk/src/win32.h 2006-07-25 12:44:42 UTC (rev 628) @@ -21,18 +21,9 @@ */ - #ifdef GEANY_WIN32 -/*void set_app_font(const char *fontname); - -char *default_windows_menu_fontspec(void); - -void try_to_get_windows_font(void); -*/ -//gchar *win32_get_filters(void); - void win32_show_pref_file_dialog(GtkEntry *item); void win32_show_file_dialog(gboolean file_open); @@ -44,9 +35,12 @@ /* Creates a native Windows message box of the given type and returns always TRUE * or FALSE representing th pressed Yes or No button. * If type is not GTK_MESSAGE_QUESTION, it returns always TRUE. */ -gboolean win32_message_dialog(GtkMessageType type, const gchar *title, const gchar *msg); +gboolean win32_message_dialog(GtkMessageType type, const gchar *msg); /* Special dialog to ask for an action when closing an unsaved file */ -gint win32_message_dialog_unsaved(const gchar *title, const gchar *msg); +gint win32_message_dialog_unsaved(const gchar *msg); +/* Just a simple wrapper function to open a browser window */ +void win32_open_browser(const gchar *uri); + #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: [627] trunk
by eht16＠users.sourceforge.net 25 Jul '06

25 Jul '06

Revision: 627 Author: eht16 Date: 2006-07-25 03:13:35 -0700 (Tue, 25 Jul 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=627&view=rev Log Message: ----------- Reordered the filetypes (just a cosmetic change). Modified Paths: -------------- trunk/ChangeLog trunk/src/filetypes.c trunk/src/filetypes.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-07-25 09:12:51 UTC (rev 626) +++ trunk/ChangeLog 2006-07-25 10:13:35 UTC (rev 627) @@ -2,6 +2,7 @@ * src/encodings.c, src/document.c, src/keyfile.c, src/main.c: Save default encoding for new files as charset string. + * src/filetypes.c: Reordered the filetypes (just a cosmetic change). 2006-07-24 Enrico Tröger <enrico.troeger(a)uvena.de> Modified: trunk/src/filetypes.c =================================================================== --- trunk/src/filetypes.c 2006-07-25 09:12:51 UTC (rev 626) +++ trunk/src/filetypes.c 2006-07-25 10:13:35 UTC (rev 627) @@ -91,6 +91,25 @@ filetypes_create_menu_item(filetype_menu, filetypes[GEANY_FILETYPES_CPP]->title, filetypes[GEANY_FILETYPES_CPP]); filetypes_create_newmenu_item(template_menu, filetypes[GEANY_FILETYPES_CPP]->title, filetypes[GEANY_FILETYPES_CPP]); +#define D + filetypes[GEANY_FILETYPES_D] = g_new0(filetype, 1); + filetypes[GEANY_FILETYPES_D]->id = GEANY_FILETYPES_D; + filetypes[GEANY_FILETYPES_D]->lang = 17; + filetypes[GEANY_FILETYPES_D]->name = g_strdup("D"); + filetypes[GEANY_FILETYPES_D]->has_tags = TRUE; + filetypes[GEANY_FILETYPES_D]->title = g_strdup(_("D source file")); + filetypes[GEANY_FILETYPES_D]->extension = g_strdup("d"); + filetypes[GEANY_FILETYPES_D]->pattern = g_new0(gchar*, 3); + filetypes[GEANY_FILETYPES_D]->pattern[0] = g_strdup("*.d"); + filetypes[GEANY_FILETYPES_D]->pattern[1] = g_strdup("*.di"); + filetypes[GEANY_FILETYPES_D]->pattern[2] = NULL; + filetypes[GEANY_FILETYPES_D]->comment_open = g_strdup("//"); + filetypes[GEANY_FILETYPES_D]->comment_close = NULL; + filetypes[GEANY_FILETYPES_D]->style_func_ptr = styleset_d; + filetypes_init_build_programs(filetypes[GEANY_FILETYPES_D]); + filetypes_create_menu_item(filetype_menu, filetypes[GEANY_FILETYPES_D]->title, filetypes[GEANY_FILETYPES_D]); + filetypes_create_newmenu_item(template_menu, filetypes[GEANY_FILETYPES_D]->title, filetypes[GEANY_FILETYPES_D]); + #define JAVA filetypes[GEANY_FILETYPES_JAVA] = g_new0(filetype, 1); filetypes[GEANY_FILETYPES_JAVA]->id = GEANY_FILETYPES_JAVA; @@ -109,6 +128,63 @@ filetypes_create_menu_item(filetype_menu, filetypes[GEANY_FILETYPES_JAVA]->title, filetypes[GEANY_FILETYPES_JAVA]); filetypes_create_newmenu_item(template_menu, filetypes[GEANY_FILETYPES_JAVA]->title, filetypes[GEANY_FILETYPES_JAVA]); +#define PAS // to avoid warnings when building under Windows, the symbol PASCAL is there defined + filetypes[GEANY_FILETYPES_PASCAL] = g_new0(filetype, 1); + filetypes[GEANY_FILETYPES_PASCAL]->id = GEANY_FILETYPES_PASCAL; + filetypes[GEANY_FILETYPES_PASCAL]->lang = 4; + filetypes[GEANY_FILETYPES_PASCAL]->name = g_strdup("Pascal"); + filetypes[GEANY_FILETYPES_PASCAL]->has_tags = TRUE; + filetypes[GEANY_FILETYPES_PASCAL]->title = g_strdup(_("Pascal source file")); + filetypes[GEANY_FILETYPES_PASCAL]->extension = g_strdup("pas"); + filetypes[GEANY_FILETYPES_PASCAL]->pattern = g_new0(gchar*, 6); + filetypes[GEANY_FILETYPES_PASCAL]->pattern[0] = g_strdup("*.pas"); + filetypes[GEANY_FILETYPES_PASCAL]->pattern[1] = g_strdup("*.pp"); + filetypes[GEANY_FILETYPES_PASCAL]->pattern[2] = g_strdup("*.inc"); + filetypes[GEANY_FILETYPES_PASCAL]->pattern[3] = g_strdup("*.dpr"); + filetypes[GEANY_FILETYPES_PASCAL]->pattern[4] = g_strdup("*.dpk"); + filetypes[GEANY_FILETYPES_PASCAL]->pattern[5] = NULL; + filetypes[GEANY_FILETYPES_PASCAL]->style_func_ptr = styleset_pascal; + filetypes[GEANY_FILETYPES_PASCAL]->comment_open = g_strdup("{"); + filetypes[GEANY_FILETYPES_PASCAL]->comment_close = g_strdup("}"); + filetypes_init_build_programs(filetypes[GEANY_FILETYPES_PASCAL]); + filetypes_create_menu_item(filetype_menu, filetypes[GEANY_FILETYPES_PASCAL]->title, filetypes[GEANY_FILETYPES_PASCAL]); + filetypes_create_newmenu_item(template_menu, filetypes[GEANY_FILETYPES_PASCAL]->title, filetypes[GEANY_FILETYPES_PASCAL]); + +#define ASM + filetypes[GEANY_FILETYPES_ASM] = g_new0(filetype, 1); + filetypes[GEANY_FILETYPES_ASM]->id = GEANY_FILETYPES_ASM; + filetypes[GEANY_FILETYPES_ASM]->lang = 9; + filetypes[GEANY_FILETYPES_ASM]->name = g_strdup("ASM"); + filetypes[GEANY_FILETYPES_ASM]->has_tags = TRUE; + filetypes[GEANY_FILETYPES_ASM]->title = g_strdup(_("Assembler source file")); + filetypes[GEANY_FILETYPES_ASM]->extension = g_strdup("asm"); + filetypes[GEANY_FILETYPES_ASM]->pattern = g_new0(gchar*, 2); + filetypes[GEANY_FILETYPES_ASM]->pattern[0] = g_strdup("*.asm"); + filetypes[GEANY_FILETYPES_ASM]->pattern[1] = NULL; + filetypes[GEANY_FILETYPES_ASM]->style_func_ptr = styleset_asm; + filetypes[GEANY_FILETYPES_ASM]->comment_open = g_strdup(";"); + filetypes[GEANY_FILETYPES_ASM]->comment_close = NULL; + filetypes_init_build_programs(filetypes[GEANY_FILETYPES_ASM]); + filetypes_create_menu_item(filetype_menu, filetypes[GEANY_FILETYPES_ASM]->title, filetypes[GEANY_FILETYPES_ASM]); + +#define CAML + filetypes[GEANY_FILETYPES_CAML] = g_new0(filetype, 1); + filetypes[GEANY_FILETYPES_CAML]->id = GEANY_FILETYPES_CAML; + filetypes[GEANY_FILETYPES_CAML]->lang = -2; + filetypes[GEANY_FILETYPES_CAML]->name = g_strdup("CAML"); + filetypes[GEANY_FILETYPES_CAML]->has_tags = FALSE; + filetypes[GEANY_FILETYPES_CAML]->title = g_strdup(_("(O)Caml source file")); + filetypes[GEANY_FILETYPES_CAML]->extension = g_strdup("ml"); + filetypes[GEANY_FILETYPES_CAML]->pattern = g_new0(gchar*, 3); + filetypes[GEANY_FILETYPES_CAML]->pattern[0] = g_strdup("*.ml"); + filetypes[GEANY_FILETYPES_CAML]->pattern[1] = g_strdup("*.mli"); + filetypes[GEANY_FILETYPES_CAML]->pattern[2] = NULL; + filetypes[GEANY_FILETYPES_CAML]->style_func_ptr = styleset_caml; + filetypes[GEANY_FILETYPES_CAML]->comment_open = g_strdup("(*"); + filetypes[GEANY_FILETYPES_CAML]->comment_close = g_strdup("*)"); + filetypes_init_build_programs(filetypes[GEANY_FILETYPES_CAML]); + filetypes_create_menu_item(filetype_menu, filetypes[GEANY_FILETYPES_CAML]->title, filetypes[GEANY_FILETYPES_CAML]); + #define PERL filetypes[GEANY_FILETYPES_PERL] = g_new0(filetype, 1); filetypes[GEANY_FILETYPES_PERL]->id = GEANY_FILETYPES_PERL; @@ -151,41 +227,6 @@ filetypes_create_menu_item(filetype_menu, filetypes[GEANY_FILETYPES_PHP]->title, filetypes[GEANY_FILETYPES_PHP]); filetypes_create_newmenu_item(template_menu, filetypes[GEANY_FILETYPES_PHP]->title, filetypes[GEANY_FILETYPES_PHP]); -#define XML - filetypes[GEANY_FILETYPES_XML] = g_new0(filetype, 1); - filetypes[GEANY_FILETYPES_XML]->id = GEANY_FILETYPES_XML; - filetypes[GEANY_FILETYPES_XML]->lang = -2; - filetypes[GEANY_FILETYPES_XML]->name = g_strdup("XML"); - filetypes[GEANY_FILETYPES_XML]->has_tags = FALSE; - filetypes[GEANY_FILETYPES_XML]->title = g_strdup(_("XML source file")); - filetypes[GEANY_FILETYPES_XML]->extension = g_strdup("xml"); - filetypes[GEANY_FILETYPES_XML]->pattern = g_new0(gchar*, 3); - filetypes[GEANY_FILETYPES_XML]->pattern[0] = g_strdup("*.xml"); - filetypes[GEANY_FILETYPES_XML]->pattern[1] = g_strdup("*.sgml"); - filetypes[GEANY_FILETYPES_XML]->pattern[2] = NULL; - filetypes[GEANY_FILETYPES_XML]->style_func_ptr = styleset_xml; - filetypes[GEANY_FILETYPES_XML]->comment_open = g_strdup(""); - filetypes_init_build_programs(filetypes[GEANY_FILETYPES_XML]); - filetypes_create_menu_item(filetype_menu, filetypes[GEANY_FILETYPES_XML]->title, filetypes[GEANY_FILETYPES_XML]); - -#define DOCBOOK - filetypes[GEANY_FILETYPES_DOCBOOK] = g_new0(filetype, 1); - filetypes[GEANY_FILETYPES_DOCBOOK]->id = GEANY_FILETYPES_DOCBOOK; - filetypes[GEANY_FILETYPES_DOCBOOK]->lang = 12; - filetypes[GEANY_FILETYPES_DOCBOOK]->name = g_strdup("Docbook"); - filetypes[GEANY_FILETYPES_DOCBOOK]->has_tags = TRUE; - filetypes[GEANY_FILETYPES_DOCBOOK]->title = g_strdup(_("Docbook source file")); - filetypes[GEANY_FILETYPES_DOCBOOK]->extension = g_strdup("docbook"); - filetypes[GEANY_FILETYPES_DOCBOOK]->pattern = g_new0(gchar*, 2); - filetypes[GEANY_FILETYPES_DOCBOOK]->pattern[0] = g_strdup("*.docbook"); - filetypes[GEANY_FILETYPES_DOCBOOK]->pattern[1] = NULL; - filetypes[GEANY_FILETYPES_DOCBOOK]->style_func_ptr = styleset_docbook; - filetypes[GEANY_FILETYPES_DOCBOOK]->comment_open = g_strdup(""); - filetypes_init_build_programs(filetypes[GEANY_FILETYPES_DOCBOOK]); - filetypes_create_menu_item(filetype_menu, filetypes[GEANY_FILETYPES_DOCBOOK]->title, filetypes[GEANY_FILETYPES_DOCBOOK]); - #define PYTHON filetypes[GEANY_FILETYPES_PYTHON] = g_new0(filetype, 1); filetypes[GEANY_FILETYPES_PYTHON]->id = GEANY_FILETYPES_PYTHON; @@ -204,46 +245,43 @@ filetypes_init_build_programs(filetypes[GEANY_FILETYPES_PYTHON]); filetypes_create_menu_item(filetype_menu, filetypes[GEANY_FILETYPES_PYTHON]->title, filetypes[GEANY_FILETYPES_PYTHON]); -#define LATEX - filetypes[GEANY_FILETYPES_LATEX] = g_new0(filetype, 1); - filetypes[GEANY_FILETYPES_LATEX]->id = GEANY_FILETYPES_LATEX; - filetypes[GEANY_FILETYPES_LATEX]->lang = 8; - filetypes[GEANY_FILETYPES_LATEX]->name = g_strdup("LaTeX"); - filetypes[GEANY_FILETYPES_LATEX]->has_tags = TRUE; - filetypes[GEANY_FILETYPES_LATEX]->title = g_strdup(_("LaTeX source file")); - filetypes[GEANY_FILETYPES_LATEX]->extension = g_strdup("tex"); - filetypes[GEANY_FILETYPES_LATEX]->pattern = g_new0(gchar*, 4); - filetypes[GEANY_FILETYPES_LATEX]->pattern[0] = g_strdup("*.tex"); - filetypes[GEANY_FILETYPES_LATEX]->pattern[1] = g_strdup("*.sty"); - filetypes[GEANY_FILETYPES_LATEX]->pattern[2] = g_strdup("*.idx"); - filetypes[GEANY_FILETYPES_LATEX]->pattern[3] = NULL; - filetypes[GEANY_FILETYPES_LATEX]->style_func_ptr = styleset_latex; - filetypes[GEANY_FILETYPES_LATEX]->comment_open = g_strdup("%"); - filetypes[GEANY_FILETYPES_LATEX]->comment_close = NULL; - filetypes_init_build_programs(filetypes[GEANY_FILETYPES_LATEX]); - filetypes_create_menu_item(filetype_menu, filetypes[GEANY_FILETYPES_LATEX]->title, filetypes[GEANY_FILETYPES_LATEX]); +#define RUBY + filetypes[GEANY_FILETYPES_RUBY] = g_new0(filetype, 1); + filetypes[GEANY_FILETYPES_RUBY]->id = GEANY_FILETYPES_RUBY; + filetypes[GEANY_FILETYPES_RUBY]->lang = 14; + filetypes[GEANY_FILETYPES_RUBY]->name = g_strdup("Ruby"); + filetypes[GEANY_FILETYPES_RUBY]->has_tags = TRUE; + filetypes[GEANY_FILETYPES_RUBY]->title = g_strdup(_("Ruby source file")); + filetypes[GEANY_FILETYPES_RUBY]->extension = g_strdup("rb"); + filetypes[GEANY_FILETYPES_RUBY]->pattern = g_new0(gchar*, 3); + filetypes[GEANY_FILETYPES_RUBY]->pattern[0] = g_strdup("*.rb"); + filetypes[GEANY_FILETYPES_RUBY]->pattern[1] = g_strdup("*.rhtml"); + filetypes[GEANY_FILETYPES_RUBY]->pattern[2] = NULL; + filetypes[GEANY_FILETYPES_RUBY]->style_func_ptr = styleset_ruby; + filetypes[GEANY_FILETYPES_RUBY]->comment_open = g_strdup("#"); + filetypes[GEANY_FILETYPES_RUBY]->comment_close = NULL; + filetypes_init_build_programs(filetypes[GEANY_FILETYPES_RUBY]); + filetypes_create_menu_item(filetype_menu, filetypes[GEANY_FILETYPES_RUBY]->title, filetypes[GEANY_FILETYPES_RUBY]); + filetypes_create_newmenu_item(template_menu, filetypes[GEANY_FILETYPES_RUBY]->title, filetypes[GEANY_FILETYPES_RUBY]); -#define PAS // to avoid warnings when building under Windows, the symbol PASCAL is there defined - filetypes[GEANY_FILETYPES_PASCAL] = g_new0(filetype, 1); - filetypes[GEANY_FILETYPES_PASCAL]->id = GEANY_FILETYPES_PASCAL; - filetypes[GEANY_FILETYPES_PASCAL]->lang = 4; - filetypes[GEANY_FILETYPES_PASCAL]->name = g_strdup("Pascal"); - filetypes[GEANY_FILETYPES_PASCAL]->has_tags = TRUE; - filetypes[GEANY_FILETYPES_PASCAL]->title = g_strdup(_("Pascal source file")); - filetypes[GEANY_FILETYPES_PASCAL]->extension = g_strdup("pas"); - filetypes[GEANY_FILETYPES_PASCAL]->pattern = g_new0(gchar*, 6); - filetypes[GEANY_FILETYPES_PASCAL]->pattern[0] = g_strdup("*.pas"); - filetypes[GEANY_FILETYPES_PASCAL]->pattern[1] = g_strdup("*.pp"); - filetypes[GEANY_FILETYPES_PASCAL]->pattern[2] = g_strdup("*.inc"); - filetypes[GEANY_FILETYPES_PASCAL]->pattern[3] = g_strdup("*.dpr"); - filetypes[GEANY_FILETYPES_PASCAL]->pattern[4] = g_strdup("*.dpk"); - filetypes[GEANY_FILETYPES_PASCAL]->pattern[5] = NULL; - filetypes[GEANY_FILETYPES_PASCAL]->style_func_ptr = styleset_pascal; - filetypes[GEANY_FILETYPES_PASCAL]->comment_open = g_strdup("{"); - filetypes[GEANY_FILETYPES_PASCAL]->comment_close = g_strdup("}"); - filetypes_init_build_programs(filetypes[GEANY_FILETYPES_PASCAL]); - filetypes_create_menu_item(filetype_menu, filetypes[GEANY_FILETYPES_PASCAL]->title, filetypes[GEANY_FILETYPES_PASCAL]); - filetypes_create_newmenu_item(template_menu, filetypes[GEANY_FILETYPES_PASCAL]->title, filetypes[GEANY_FILETYPES_PASCAL]); +#define TCL + filetypes[GEANY_FILETYPES_TCL] = g_new0(filetype, 1); + filetypes[GEANY_FILETYPES_TCL]->id = GEANY_FILETYPES_TCL; + filetypes[GEANY_FILETYPES_TCL]->lang = 15; + filetypes[GEANY_FILETYPES_TCL]->name = g_strdup("Tcl"); + filetypes[GEANY_FILETYPES_TCL]->has_tags = TRUE; + filetypes[GEANY_FILETYPES_TCL]->title = g_strdup(_("Tcl source file")); + filetypes[GEANY_FILETYPES_TCL]->extension = g_strdup("tcl"); + filetypes[GEANY_FILETYPES_TCL]->pattern = g_new0(gchar*, 4); + filetypes[GEANY_FILETYPES_TCL]->pattern[0] = g_strdup("*.tcl"); + filetypes[GEANY_FILETYPES_TCL]->pattern[1] = g_strdup("*.tk"); + filetypes[GEANY_FILETYPES_TCL]->pattern[2] = g_strdup("*.wish"); + filetypes[GEANY_FILETYPES_TCL]->pattern[3] = NULL; + filetypes[GEANY_FILETYPES_TCL]->style_func_ptr = styleset_tcl; + filetypes[GEANY_FILETYPES_TCL]->comment_open = g_strdup("#"); + filetypes[GEANY_FILETYPES_TCL]->comment_close = NULL; + filetypes_init_build_programs(filetypes[GEANY_FILETYPES_TCL]); + filetypes_create_menu_item(filetype_menu, filetypes[GEANY_FILETYPES_TCL]->title, filetypes[GEANY_FILETYPES_TCL]); #define SH filetypes[GEANY_FILETYPES_SH] = g_new0(filetype, 1); @@ -287,6 +325,41 @@ filetypes_init_build_programs(filetypes[GEANY_FILETYPES_MAKE]); filetypes_create_menu_item(filetype_menu, filetypes[GEANY_FILETYPES_MAKE]->title, filetypes[GEANY_FILETYPES_MAKE]); +#define XML + filetypes[GEANY_FILETYPES_XML] = g_new0(filetype, 1); + filetypes[GEANY_FILETYPES_XML]->id = GEANY_FILETYPES_XML; + filetypes[GEANY_FILETYPES_XML]->lang = -2; + filetypes[GEANY_FILETYPES_XML]->name = g_strdup("XML"); + filetypes[GEANY_FILETYPES_XML]->has_tags = FALSE; + filetypes[GEANY_FILETYPES_XML]->title = g_strdup(_("XML source file")); + filetypes[GEANY_FILETYPES_XML]->extension = g_strdup("xml"); + filetypes[GEANY_FILETYPES_XML]->pattern = g_new0(gchar*, 3); + filetypes[GEANY_FILETYPES_XML]->pattern[0] = g_strdup("*.xml"); + filetypes[GEANY_FILETYPES_XML]->pattern[1] = g_strdup("*.sgml"); + filetypes[GEANY_FILETYPES_XML]->pattern[2] = NULL; + filetypes[GEANY_FILETYPES_XML]->style_func_ptr = styleset_xml; + filetypes[GEANY_FILETYPES_XML]->comment_open = g_strdup(""); + filetypes_init_build_programs(filetypes[GEANY_FILETYPES_XML]); + filetypes_create_menu_item(filetype_menu, filetypes[GEANY_FILETYPES_XML]->title, filetypes[GEANY_FILETYPES_XML]); + +#define DOCBOOK + filetypes[GEANY_FILETYPES_DOCBOOK] = g_new0(filetype, 1); + filetypes[GEANY_FILETYPES_DOCBOOK]->id = GEANY_FILETYPES_DOCBOOK; + filetypes[GEANY_FILETYPES_DOCBOOK]->lang = 12; + filetypes[GEANY_FILETYPES_DOCBOOK]->name = g_strdup("Docbook"); + filetypes[GEANY_FILETYPES_DOCBOOK]->has_tags = TRUE; + filetypes[GEANY_FILETYPES_DOCBOOK]->title = g_strdup(_("Docbook source file")); + filetypes[GEANY_FILETYPES_DOCBOOK]->extension = g_strdup("docbook"); + filetypes[GEANY_FILETYPES_DOCBOOK]->pattern = g_new0(gchar*, 2); + filetypes[GEANY_FILETYPES_DOCBOOK]->pattern[0] = g_strdup("*.docbook"); + filetypes[GEANY_FILETYPES_DOCBOOK]->pattern[1] = NULL; + filetypes[GEANY_FILETYPES_DOCBOOK]->style_func_ptr = styleset_docbook; + filetypes[GEANY_FILETYPES_DOCBOOK]->comment_open = g_strdup(""); + filetypes_init_build_programs(filetypes[GEANY_FILETYPES_DOCBOOK]); + filetypes_create_menu_item(filetype_menu, filetypes[GEANY_FILETYPES_DOCBOOK]->title, filetypes[GEANY_FILETYPES_DOCBOOK]); + #define CSS filetypes[GEANY_FILETYPES_CSS] = g_new0(filetype, 1); filetypes[GEANY_FILETYPES_CSS]->id = GEANY_FILETYPES_CSS; @@ -304,44 +377,6 @@ filetypes_init_build_programs(filetypes[GEANY_FILETYPES_CSS]); filetypes_create_menu_item(filetype_menu, filetypes[GEANY_FILETYPES_CSS]->title, filetypes[GEANY_FILETYPES_CSS]); -#define CONF - filetypes[GEANY_FILETYPES_CONF] = g_new0(filetype, 1); - filetypes[GEANY_FILETYPES_CONF]->id = GEANY_FILETYPES_CONF; - filetypes[GEANY_FILETYPES_CONF]->lang = 10; - filetypes[GEANY_FILETYPES_CONF]->name = g_strdup("Conf"); - filetypes[GEANY_FILETYPES_CONF]->has_tags = TRUE; - filetypes[GEANY_FILETYPES_CONF]->title = g_strdup(_("Config file")); - filetypes[GEANY_FILETYPES_CONF]->extension = g_strdup("conf"); - filetypes[GEANY_FILETYPES_CONF]->pattern = g_new0(gchar*, 6); - filetypes[GEANY_FILETYPES_CONF]->pattern[0] = g_strdup("*.conf"); - filetypes[GEANY_FILETYPES_CONF]->pattern[1] = g_strdup("*.ini"); - filetypes[GEANY_FILETYPES_CONF]->pattern[2] = g_strdup("config"); - filetypes[GEANY_FILETYPES_CONF]->pattern[3] = g_strdup("*rc"); - filetypes[GEANY_FILETYPES_CONF]->pattern[4] = g_strdup("*.cfg"); - filetypes[GEANY_FILETYPES_CONF]->pattern[5] = NULL; - filetypes[GEANY_FILETYPES_CONF]->style_func_ptr = styleset_conf; - filetypes[GEANY_FILETYPES_CONF]->comment_open = g_strdup("#"); - filetypes[GEANY_FILETYPES_CONF]->comment_close = NULL; - filetypes_init_build_programs(filetypes[GEANY_FILETYPES_CONF]); - filetypes_create_menu_item(filetype_menu, filetypes[GEANY_FILETYPES_CONF]->title, filetypes[GEANY_FILETYPES_CONF]); - -#define ASM - filetypes[GEANY_FILETYPES_ASM] = g_new0(filetype, 1); - filetypes[GEANY_FILETYPES_ASM]->id = GEANY_FILETYPES_ASM; - filetypes[GEANY_FILETYPES_ASM]->lang = 9; - filetypes[GEANY_FILETYPES_ASM]->name = g_strdup("ASM"); - filetypes[GEANY_FILETYPES_ASM]->has_tags = TRUE; - filetypes[GEANY_FILETYPES_ASM]->title = g_strdup(_("Assembler source file")); - filetypes[GEANY_FILETYPES_ASM]->extension = g_strdup("asm"); - filetypes[GEANY_FILETYPES_ASM]->pattern = g_new0(gchar*, 2); - filetypes[GEANY_FILETYPES_ASM]->pattern[0] = g_strdup("*.asm"); - filetypes[GEANY_FILETYPES_ASM]->pattern[1] = NULL; - filetypes[GEANY_FILETYPES_ASM]->style_func_ptr = styleset_asm; - filetypes[GEANY_FILETYPES_ASM]->comment_open = g_strdup(";"); - filetypes[GEANY_FILETYPES_ASM]->comment_close = NULL; - filetypes_init_build_programs(filetypes[GEANY_FILETYPES_ASM]); - filetypes_create_menu_item(filetype_menu, filetypes[GEANY_FILETYPES_ASM]->title, filetypes[GEANY_FILETYPES_ASM]); - #define SQL filetypes[GEANY_FILETYPES_SQL] = g_new0(filetype, 1); filetypes[GEANY_FILETYPES_SQL]->id = GEANY_FILETYPES_SQL; @@ -359,23 +394,24 @@ filetypes_init_build_programs(filetypes[GEANY_FILETYPES_SQL]); filetypes_create_menu_item(filetype_menu, filetypes[GEANY_FILETYPES_SQL]->title, filetypes[GEANY_FILETYPES_SQL]); -#define CAML - filetypes[GEANY_FILETYPES_CAML] = g_new0(filetype, 1); - filetypes[GEANY_FILETYPES_CAML]->id = GEANY_FILETYPES_CAML; - filetypes[GEANY_FILETYPES_CAML]->lang = -2; - filetypes[GEANY_FILETYPES_CAML]->name = g_strdup("CAML"); - filetypes[GEANY_FILETYPES_CAML]->has_tags = FALSE; - filetypes[GEANY_FILETYPES_CAML]->title = g_strdup(_("(O)Caml source file")); - filetypes[GEANY_FILETYPES_CAML]->extension = g_strdup("ml"); - filetypes[GEANY_FILETYPES_CAML]->pattern = g_new0(gchar*, 3); - filetypes[GEANY_FILETYPES_CAML]->pattern[0] = g_strdup("*.ml"); - filetypes[GEANY_FILETYPES_CAML]->pattern[1] = g_strdup("*.mli"); - filetypes[GEANY_FILETYPES_CAML]->pattern[2] = NULL; - filetypes[GEANY_FILETYPES_CAML]->style_func_ptr = styleset_caml; - filetypes[GEANY_FILETYPES_CAML]->comment_open = g_strdup("(*"); - filetypes[GEANY_FILETYPES_CAML]->comment_close = g_strdup("*)"); - filetypes_init_build_programs(filetypes[GEANY_FILETYPES_CAML]); - filetypes_create_menu_item(filetype_menu, filetypes[GEANY_FILETYPES_CAML]->title, filetypes[GEANY_FILETYPES_CAML]); +#define LATEX + filetypes[GEANY_FILETYPES_LATEX] = g_new0(filetype, 1); + filetypes[GEANY_FILETYPES_LATEX]->id = GEANY_FILETYPES_LATEX; + filetypes[GEANY_FILETYPES_LATEX]->lang = 8; + filetypes[GEANY_FILETYPES_LATEX]->name = g_strdup("LaTeX"); + filetypes[GEANY_FILETYPES_LATEX]->has_tags = TRUE; + filetypes[GEANY_FILETYPES_LATEX]->title = g_strdup(_("LaTeX source file")); + filetypes[GEANY_FILETYPES_LATEX]->extension = g_strdup("tex"); + filetypes[GEANY_FILETYPES_LATEX]->pattern = g_new0(gchar*, 4); + filetypes[GEANY_FILETYPES_LATEX]->pattern[0] = g_strdup("*.tex"); + filetypes[GEANY_FILETYPES_LATEX]->pattern[1] = g_strdup("*.sty"); + filetypes[GEANY_FILETYPES_LATEX]->pattern[2] = g_strdup("*.idx"); + filetypes[GEANY_FILETYPES_LATEX]->pattern[3] = NULL; + filetypes[GEANY_FILETYPES_LATEX]->style_func_ptr = styleset_latex; + filetypes[GEANY_FILETYPES_LATEX]->comment_open = g_strdup("%"); + filetypes[GEANY_FILETYPES_LATEX]->comment_close = NULL; + filetypes_init_build_programs(filetypes[GEANY_FILETYPES_LATEX]); + filetypes_create_menu_item(filetype_menu, filetypes[GEANY_FILETYPES_LATEX]->title, filetypes[GEANY_FILETYPES_LATEX]); #define OMS filetypes[GEANY_FILETYPES_OMS] = g_new0(filetype, 1); @@ -394,63 +430,27 @@ filetypes_init_build_programs(filetypes[GEANY_FILETYPES_OMS]); filetypes_create_menu_item(filetype_menu, filetypes[GEANY_FILETYPES_OMS]->title, filetypes[GEANY_FILETYPES_OMS]); -#define RUBY - filetypes[GEANY_FILETYPES_RUBY] = g_new0(filetype, 1); - filetypes[GEANY_FILETYPES_RUBY]->id = GEANY_FILETYPES_RUBY; - filetypes[GEANY_FILETYPES_RUBY]->lang = 14; - filetypes[GEANY_FILETYPES_RUBY]->name = g_strdup("Ruby"); - filetypes[GEANY_FILETYPES_RUBY]->has_tags = TRUE; - filetypes[GEANY_FILETYPES_RUBY]->title = g_strdup(_("Ruby source file")); - filetypes[GEANY_FILETYPES_RUBY]->extension = g_strdup("rb"); - filetypes[GEANY_FILETYPES_RUBY]->pattern = g_new0(gchar*, 3); - filetypes[GEANY_FILETYPES_RUBY]->pattern[0] = g_strdup("*.rb"); - filetypes[GEANY_FILETYPES_RUBY]->pattern[1] = g_strdup("*.rhtml"); - filetypes[GEANY_FILETYPES_RUBY]->pattern[2] = NULL; - filetypes[GEANY_FILETYPES_RUBY]->style_func_ptr = styleset_ruby; - filetypes[GEANY_FILETYPES_RUBY]->comment_open = g_strdup("#"); - filetypes[GEANY_FILETYPES_RUBY]->comment_close = NULL; - filetypes_init_build_programs(filetypes[GEANY_FILETYPES_RUBY]); - filetypes_create_menu_item(filetype_menu, filetypes[GEANY_FILETYPES_RUBY]->title, filetypes[GEANY_FILETYPES_RUBY]); - filetypes_create_newmenu_item(template_menu, filetypes[GEANY_FILETYPES_RUBY]->title, filetypes[GEANY_FILETYPES_RUBY]); +#define CONF + filetypes[GEANY_FILETYPES_CONF] = g_new0(filetype, 1); + filetypes[GEANY_FILETYPES_CONF]->id = GEANY_FILETYPES_CONF; + filetypes[GEANY_FILETYPES_CONF]->lang = 10; + filetypes[GEANY_FILETYPES_CONF]->name = g_strdup("Conf"); + filetypes[GEANY_FILETYPES_CONF]->has_tags = TRUE; + filetypes[GEANY_FILETYPES_CONF]->title = g_strdup(_("Config file")); + filetypes[GEANY_FILETYPES_CONF]->extension = g_strdup("conf"); + filetypes[GEANY_FILETYPES_CONF]->pattern = g_new0(gchar*, 6); + filetypes[GEANY_FILETYPES_CONF]->pattern[0] = g_strdup("*.conf"); + filetypes[GEANY_FILETYPES_CONF]->pattern[1] = g_strdup("*.ini"); + filetypes[GEANY_FILETYPES_CONF]->pattern[2] = g_strdup("config"); + filetypes[GEANY_FILETYPES_CONF]->pattern[3] = g_strdup("*rc"); + filetypes[GEANY_FILETYPES_CONF]->pattern[4] = g_strdup("*.cfg"); + filetypes[GEANY_FILETYPES_CONF]->pattern[5] = NULL; + filetypes[GEANY_FILETYPES_CONF]->style_func_ptr = styleset_conf; + filetypes[GEANY_FILETYPES_CONF]->comment_open = g_strdup("#"); + filetypes[GEANY_FILETYPES_CONF]->comment_close = NULL; + filetypes_init_build_programs(filetypes[GEANY_FILETYPES_CONF]); + filetypes_create_menu_item(filetype_menu, filetypes[GEANY_FILETYPES_CONF]->title, filetypes[GEANY_FILETYPES_CONF]); -#define TCL - filetypes[GEANY_FILETYPES_TCL] = g_new0(filetype, 1); - filetypes[GEANY_FILETYPES_TCL]->id = GEANY_FILETYPES_TCL; - filetypes[GEANY_FILETYPES_TCL]->lang = 15; - filetypes[GEANY_FILETYPES_TCL]->name = g_strdup("Tcl"); - filetypes[GEANY_FILETYPES_TCL]->has_tags = TRUE; - filetypes[GEANY_FILETYPES_TCL]->title = g_strdup(_("Tcl source file")); - filetypes[GEANY_FILETYPES_TCL]->extension = g_strdup("tcl"); - filetypes[GEANY_FILETYPES_TCL]->pattern = g_new0(gchar*, 4); - filetypes[GEANY_FILETYPES_TCL]->pattern[0] = g_strdup("*.tcl"); - filetypes[GEANY_FILETYPES_TCL]->pattern[1] = g_strdup("*.tk"); - filetypes[GEANY_FILETYPES_TCL]->pattern[2] = g_strdup("*.wish"); - filetypes[GEANY_FILETYPES_TCL]->pattern[3] = NULL; - filetypes[GEANY_FILETYPES_TCL]->style_func_ptr = styleset_tcl; - filetypes[GEANY_FILETYPES_TCL]->comment_open = g_strdup("#"); - filetypes[GEANY_FILETYPES_TCL]->comment_close = NULL; - filetypes_init_build_programs(filetypes[GEANY_FILETYPES_TCL]); - filetypes_create_menu_item(filetype_menu, filetypes[GEANY_FILETYPES_TCL]->title, filetypes[GEANY_FILETYPES_TCL]); - -#define D - filetypes[GEANY_FILETYPES_D] = g_new0(filetype, 1); - filetypes[GEANY_FILETYPES_D]->id = GEANY_FILETYPES_D; - filetypes[GEANY_FILETYPES_D]->lang = 17; - filetypes[GEANY_FILETYPES_D]->name = g_strdup("D"); - filetypes[GEANY_FILETYPES_D]->has_tags = TRUE; - filetypes[GEANY_FILETYPES_D]->title = g_strdup(_("D source file")); - filetypes[GEANY_FILETYPES_D]->extension = g_strdup("d"); - filetypes[GEANY_FILETYPES_D]->pattern = g_new0(gchar*, 3); - filetypes[GEANY_FILETYPES_D]->pattern[0] = g_strdup("*.d"); - filetypes[GEANY_FILETYPES_D]->pattern[1] = g_strdup("*.di"); - filetypes[GEANY_FILETYPES_D]->pattern[2] = NULL; - filetypes[GEANY_FILETYPES_D]->comment_open = g_strdup("//"); - filetypes[GEANY_FILETYPES_D]->comment_close = NULL; - filetypes[GEANY_FILETYPES_D]->style_func_ptr = styleset_d; - filetypes_init_build_programs(filetypes[GEANY_FILETYPES_D]); - filetypes_create_menu_item(filetype_menu, filetypes[GEANY_FILETYPES_D]->title, filetypes[GEANY_FILETYPES_D]); - filetypes_create_newmenu_item(template_menu, filetypes[GEANY_FILETYPES_D]->title, filetypes[GEANY_FILETYPES_D]); - #define ALL filetypes[GEANY_FILETYPES_ALL] = g_new0(filetype, 1); filetypes[GEANY_FILETYPES_ALL]->id = GEANY_FILETYPES_ALL; @@ -467,7 +467,6 @@ filetypes[GEANY_FILETYPES_ALL]->comment_close = NULL; filetypes_init_build_programs(filetypes[GEANY_FILETYPES_ALL]); filetypes_create_menu_item(filetype_menu, _("None"), filetypes[GEANY_FILETYPES_ALL]); - } Modified: trunk/src/filetypes.h =================================================================== --- trunk/src/filetypes.h 2006-07-25 09:12:51 UTC (rev 626) +++ trunk/src/filetypes.h 2006-07-25 10:13:35 UTC (rev 627) @@ -29,29 +29,33 @@ { GEANY_FILETYPES_C = 0, // 0 GEANY_FILETYPES_CPP, // 1 - GEANY_FILETYPES_JAVA, // 2 - GEANY_FILETYPES_PERL, // 3 - GEANY_FILETYPES_PHP, // 4 - GEANY_FILETYPES_XML, // 5 - GEANY_FILETYPES_DOCBOOK, // 6 - GEANY_FILETYPES_PYTHON, // 7 - GEANY_FILETYPES_LATEX, // 8 - GEANY_FILETYPES_PASCAL, // 9 - GEANY_FILETYPES_SH, // 10 - GEANY_FILETYPES_MAKE, // 11 - GEANY_FILETYPES_CSS, // 12 - GEANY_FILETYPES_CONF, // 13 - GEANY_FILETYPES_ASM, // 14 - GEANY_FILETYPES_SQL, // 15 - GEANY_FILETYPES_CAML, // 16 - GEANY_FILETYPES_OMS, // 17 - GEANY_FILETYPES_RUBY, // 18 - GEANY_FILETYPES_TCL, // 19 - GEANY_FILETYPES_D, // 20 - GEANY_FILETYPES_ALL, // 21 - GEANY_MAX_FILE_TYPES // 22 + GEANY_FILETYPES_D, // 2 + GEANY_FILETYPES_JAVA, // 3 + GEANY_FILETYPES_PASCAL, // 4 + GEANY_FILETYPES_ASM, // 5 + GEANY_FILETYPES_CAML, // 6 + GEANY_FILETYPES_PERL, // 7 + GEANY_FILETYPES_PHP, // 8 + GEANY_FILETYPES_PYTHON, // 9 + GEANY_FILETYPES_RUBY, // 10 + GEANY_FILETYPES_TCL, // 11 + GEANY_FILETYPES_SH, // 12 + GEANY_FILETYPES_MAKE, // 13 + GEANY_FILETYPES_XML, // 14 + GEANY_FILETYPES_DOCBOOK, // 15 +/* + GEANY_FILETYPES_HTML, // 16 +*/ + GEANY_FILETYPES_CSS, // 17 + GEANY_FILETYPES_SQL, // 18 + GEANY_FILETYPES_LATEX, // 19 + GEANY_FILETYPES_OMS, // 20 + GEANY_FILETYPES_CONF, // 21 + GEANY_FILETYPES_ALL, // 22 + GEANY_MAX_FILE_TYPES // 23 }; + struct build_menu_items { GtkWidget *menu; @@ -74,6 +78,7 @@ typedef struct filetype { guint id; + guint uid; // unique id as reference for saved filetype in config file langType lang; // represents the langType of tagmanager(see the table // in tagmanager/parsers.h), -1 represents all, -2 none gchar *name; // will be used as name for tagmanager This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [626] trunk
by eht16＠users.sourceforge.net 25 Jul '06

25 Jul '06

Revision: 626 Author: eht16 Date: 2006-07-25 02:12:51 -0700 (Tue, 25 Jul 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=626&view=rev Log Message: ----------- Save default encoding for new files as charset string. Modified Paths: -------------- trunk/ChangeLog trunk/src/document.c trunk/src/encodings.c trunk/src/keyfile.c trunk/src/main.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-07-25 08:27:12 UTC (rev 625) +++ trunk/ChangeLog 2006-07-25 09:12:51 UTC (rev 626) @@ -1,3 +1,9 @@ +2006-07-25 Enrico Tröger <enrico.troeger(a)uvena.de> + + * src/encodings.c, src/document.c, src/keyfile.c, src/main.c: + Save default encoding for new files as charset string. + + 2006-07-24 Enrico Tröger <enrico.troeger(a)uvena.de> * src/geany.h, tagmanager/strlist.c, tagmanager/tm_project.c, @@ -4,7 +10,9 @@ tagmanager/parse.c, tagmanager/general.h, tagmanager/ctags.c, tagmanager/tm_workspace.c: Fixed some cross compiling/Win32 issues. * geany.glade, src/callbacks.c, src/document.c, src/interface.c, - src/main.c: Added menu item to the document menu to add/remove BOM. + src/main.c: + Added menu item to the document menu to add/remove BOM. + Replaced switch_notebook_page by ignore_callback flag. * src/win32.c, src/dialogs.c: Convert Unicode strings to wide characters to avoid weird display. * src/document.c: Set CR/LF as EOL mode on new files on Windows. Modified: trunk/src/document.c =================================================================== --- trunk/src/document.c 2006-07-25 08:27:12 UTC (rev 625) +++ trunk/src/document.c 2006-07-25 09:12:51 UTC (rev 626) @@ -356,8 +356,7 @@ sci_set_text(doc_list[idx].sci, template); g_free(template); - doc_list[idx].encoding = g_strdup( - encodings_get_charset(&encodings[app->pref_editor_default_encoding])); + doc_list[idx].encoding = g_strdup(encodings[app->pref_editor_default_encoding].charset); document_set_filetype(idx, ft); utils_set_window_title(idx); utils_build_show_hide(idx); Modified: trunk/src/encodings.c =================================================================== --- trunk/src/encodings.c 2006-07-25 08:27:12 UTC (rev 625) +++ trunk/src/encodings.c 2006-07-25 09:12:51 UTC (rev 626) @@ -121,6 +121,8 @@ { gint i; + if (charset == NULL) return &encodings[GEANY_ENCODING_UTF_8]; + i = 0; while (i < GEANY_ENCODINGS_MAX) { Modified: trunk/src/keyfile.c =================================================================== --- trunk/src/keyfile.c 2006-07-25 08:27:12 UTC (rev 625) +++ trunk/src/keyfile.c 2006-07-25 09:12:51 UTC (rev 626) @@ -30,6 +30,7 @@ #include "utils.h" #include "document.h" #include "sciwrappers.h" +#include "encodings.h" static gchar *scribble_text = NULL; @@ -118,7 +119,6 @@ g_key_file_set_integer_list(config, PACKAGE, "geometry", app->geometry, 4); } g_key_file_set_integer(config, PACKAGE, "pref_editor_tab_width", app->pref_editor_tab_width); - g_key_file_set_integer(config, PACKAGE, "pref_editor_default_encoding", app->pref_editor_default_encoding); g_key_file_set_boolean(config, PACKAGE, "pref_main_confirm_exit", app->pref_main_confirm_exit); g_key_file_set_boolean(config, PACKAGE, "pref_main_load_session", app->pref_main_load_session); g_key_file_set_boolean(config, PACKAGE, "pref_main_save_winpos", app->pref_main_save_winpos); @@ -135,6 +135,7 @@ g_key_file_set_boolean(config, PACKAGE, "pref_editor_new_line", app->pref_editor_new_line); g_key_file_set_boolean(config, PACKAGE, "pref_editor_replace_tabs", app->pref_editor_replace_tabs); g_key_file_set_boolean(config, PACKAGE, "pref_editor_trail_space", app->pref_editor_trail_space); + g_key_file_set_string(config, PACKAGE, "pref_editor_default_encoding", encodings[app->pref_editor_default_encoding].charset); g_key_file_set_string(config, PACKAGE, "pref_template_developer", app->pref_template_developer); g_key_file_set_string(config, PACKAGE, "pref_template_company", app->pref_template_company); g_key_file_set_string(config, PACKAGE, "pref_template_mail", app->pref_template_mail); @@ -288,8 +289,18 @@ app->pref_editor_tab_width = utils_get_setting_integer(config, PACKAGE, "pref_editor_tab_width", 4); - // set default encoding to UTF8 (Unicode) - index 16 - app->pref_editor_default_encoding = utils_get_setting_integer(config, PACKAGE, "pref_editor_default_encoding", 16); + tmp_string = utils_get_setting_string(config, PACKAGE, "pref_editor_default_encoding", + encodings[GEANY_ENCODING_UTF_8].charset); + if (tmp_string) + { + const GeanyEncoding *enc = encodings_get_from_charset(tmp_string); + if (enc != NULL) + app->pref_editor_default_encoding = enc->idx; + else + app->pref_editor_default_encoding = GEANY_ENCODING_UTF_8; + + g_free(tmp_string); + } app->pref_main_confirm_exit = utils_get_setting_boolean(config, PACKAGE, "pref_main_confirm_exit", TRUE); app->pref_main_load_session = utils_get_setting_boolean(config, PACKAGE, "pref_main_load_session", TRUE); app->pref_main_save_winpos = utils_get_setting_boolean(config, PACKAGE, "pref_main_save_winpos", TRUE); Modified: trunk/src/main.c =================================================================== --- trunk/src/main.c 2006-07-25 08:27:12 UTC (rev 625) +++ trunk/src/main.c 2006-07-25 09:12:51 UTC (rev 626) @@ -508,11 +508,11 @@ main_init(); gtk_widget_set_size_request(app->window, GEANY_WINDOW_MINIMAL_WIDTH, GEANY_WINDOW_MINIMAL_HEIGHT); gtk_window_set_default_size(GTK_WINDOW(app->window), GEANY_WINDOW_DEFAULT_WIDTH, GEANY_WINDOW_DEFAULT_HEIGHT); + encodings_init(); configuration_load(); keybindings_init(); notebook_init(); templates_init(); - encodings_init(); document_init_doclist(); // do this here to let cmdline options overwrite configuration settings #ifdef HAVE_VTE This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [625] trunk/src
by eht16＠users.sourceforge.net 25 Jul '06

25 Jul '06

Revision: 625 Author: eht16 Date: 2006-07-25 01:27:12 -0700 (Tue, 25 Jul 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=625&view=rev Log Message: ----------- Don't include windows.h in geany.h. Modified Paths: -------------- trunk/src/geany.h trunk/src/win32.c Modified: trunk/src/geany.h =================================================================== --- trunk/src/geany.h 2006-07-25 00:10:36 UTC (rev 624) +++ trunk/src/geany.h 2006-07-25 08:27:12 UTC (rev 625) @@ -44,8 +44,6 @@ #if defined(G_OS_WIN32) || defined(WIN32) -# include <windows.h> -# include <commdlg.h> # define GEANY_WIN32 # define GEANY_DATA_DIR PACKAGE_DATA_DIR #else Modified: trunk/src/win32.c =================================================================== --- trunk/src/win32.c 2006-07-25 00:10:36 UTC (rev 624) +++ trunk/src/win32.c 2006-07-25 08:27:12 UTC (rev 625) @@ -27,6 +27,9 @@ #ifdef GEANY_WIN32 +#include <windows.h> +#include <commdlg.h> + #include <string.h> #include <ctype.h> #include <math.h> @@ -336,15 +339,15 @@ // convert the Unicode chars to wide chars /// TODO test if LANG == C then possibly skip conversion - MultiByteToWideChar(CP_UTF8, 0, msg, -1, w_msg, sizeof(w_msg)/sizeof(w_msg[0])); + MultiByteToWideChar(CP_UTF8, 0, msg, -1, w_msg, sizeof(w_msg)/sizeof(w_msg[0])); MultiByteToWideChar(CP_UTF8, 0, title, -1, w_title, sizeof(w_title)/sizeof(w_title[0])); // display the message box rc = MessageBoxW(NULL, w_msg, w_title, t); - + if (type == GTK_MESSAGE_QUESTION && rc != IDYES) ret = FALSE; - + return ret; } @@ -358,7 +361,7 @@ // convert the Unicode chars to wide chars /// TODO test if LANG == C then possibly skip conversion - MultiByteToWideChar(CP_UTF8, 0, msg, -1, w_msg, sizeof(w_msg)/sizeof(w_msg[0])); + MultiByteToWideChar(CP_UTF8, 0, msg, -1, w_msg, sizeof(w_msg)/sizeof(w_msg[0])); MultiByteToWideChar(CP_UTF8, 0, title, -1, w_title, sizeof(w_title)/sizeof(w_title[0])); ret = MessageBoxW(NULL, w_msg, w_title, MB_YESNOCANCEL | MB_ICONQUESTION); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [624] trunk
by eht16＠users.sourceforge.net 25 Jul '06

25 Jul '06

Revision: 624 Author: eht16 Date: 2006-07-24 17:10:36 -0700 (Mon, 24 Jul 2006) ViewCVS: http://svn.sourceforge.net/geany/?rev=624&view=rev Log Message: ----------- Set CR/LF as EOL mode on new files on Windows. Modified Paths: -------------- trunk/ChangeLog trunk/src/document.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-07-25 00:09:28 UTC (rev 623) +++ trunk/ChangeLog 2006-07-25 00:10:36 UTC (rev 624) @@ -7,6 +7,7 @@ src/main.c: Added menu item to the document menu to add/remove BOM. * src/win32.c, src/dialogs.c: Convert Unicode strings to wide characters to avoid weird display. + * src/document.c: Set CR/LF as EOL mode on new files on Windows. 2006-07-24 Nick Treleaven <nick.treleaven(a)btinternet.com> Modified: trunk/src/document.c =================================================================== --- trunk/src/document.c 2006-07-25 00:09:28 UTC (rev 623) +++ trunk/src/document.c 2006-07-25 00:10:36 UTC (rev 624) @@ -365,7 +365,11 @@ doc_list[idx].mtime = time(NULL); doc_list[idx].changed = FALSE; document_set_text_changed(idx); +#ifdef GEANY_WIN32 + sci_set_eol_mode(doc_list[idx].sci, SC_EOL_CRLF); +#else sci_set_eol_mode(doc_list[idx].sci, SC_EOL_LF); +#endif sci_set_line_numbers(doc_list[idx].sci, app->show_linenumber_margin, 0); sci_empty_undo_buffer(doc_list[idx].sci); sci_goto_pos(doc_list[idx].sci, 0, TRUE); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits July 2006