Commits October 2006

commits@lists.geany.org

2 participants
93 discussions

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

25 Oct '06

Revision: 929 http://svn.sourceforge.net/geany/?rev=929&view=rev Author: eht16 Date: 2006-10-24 16:50:50 -0700 (Tue, 24 Oct 2006) Log Message: ----------- Removed unneeded macro GEANY_MAX_TAGS_COUNT. Moved macro GEANY_USE_WIN32_DIALOG to geany.h. Modified Paths: -------------- trunk/ChangeLog trunk/src/dialogs.c trunk/src/geany.h trunk/win32-config.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-10-24 19:46:46 UTC (rev 928) +++ trunk/ChangeLog 2006-10-24 23:50:50 UTC (rev 929) @@ -4,6 +4,9 @@ * win32-config.h, src/dialogs.c: Use GTK's file open dialog also under Windows to have the extended options(kept old dialog code for optional use). + * win32-config.h, src/dialogs.c, src/geany.h: + Removed unneeded macro GEANY_MAX_TAGS_COUNT. + Moved macro GEANY_USE_WIN32_DIALOG to geany.h. 2006-10-24 Nick Treleaven <nick.treleaven(a)btinternet.com> Modified: trunk/src/dialogs.c =================================================================== --- trunk/src/dialogs.c 2006-10-24 19:46:46 UTC (rev 928) +++ trunk/src/dialogs.c 2006-10-24 23:50:50 UTC (rev 929) @@ -48,7 +48,7 @@ #include "encodings.h" -#ifndef USE_WIN32_DIALOG +#if ! GEANY_USE_WIN32_DIALOG static GtkWidget *add_file_open_extra_widget(); #endif @@ -56,7 +56,7 @@ /* This shows the file selection dialog to open a file. */ void dialogs_show_open_file () { -#ifdef USE_WIN32_DIALOG +#if GEANY_USE_WIN32_DIALOG win32_show_file_dialog(TRUE); #else /* X11, not win32: use GTK_FILE_CHOOSER */ gchar *initdir; Modified: trunk/src/geany.h =================================================================== --- trunk/src/geany.h 2006-10-24 19:46:46 UTC (rev 928) +++ trunk/src/geany.h 2006-10-24 23:50:50 UTC (rev 929) @@ -38,7 +38,7 @@ #define GEANY_FILEDEFS_SUBDIR "filedefs" #define GEANY_CODENAME "Kintaro" #define GEANY_HOMEPAGE "http://geany.uvena.de/" -#define GEANY_MAX_TAGS_COUNT 1000 +#define GEANY_USE_WIN32_DIALOG 0 #define GEANY_CHECK_FILE_DELAY 30 #define GEANY_WORDCHARS "_#&abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789\\" #define GEANY_MAX_WORD_LENGTH 192 Modified: trunk/win32-config.h =================================================================== --- trunk/win32-config.h 2006-10-24 19:46:46 UTC (rev 928) +++ trunk/win32-config.h 2006-10-24 23:50:50 UTC (rev 929) @@ -324,5 +324,3 @@ /* Define if you want to detect a running instance */ #define HAVE_SOCKET 1 -/* #define USE_WIN32_DIALOG 1 */ - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [928] trunk/win32-config.h
by eht16＠users.sourceforge.net 25 Oct '06

25 Oct '06

Revision: 928 http://svn.sourceforge.net/geany/?rev=928&view=rev Author: eht16 Date: 2006-10-24 12:46:46 -0700 (Tue, 24 Oct 2006) Log Message: ----------- Updated version for Windows Modified Paths: -------------- trunk/win32-config.h Modified: trunk/win32-config.h =================================================================== --- trunk/win32-config.h 2006-10-24 18:21:16 UTC (rev 927) +++ trunk/win32-config.h 2006-10-24 19:46:46 UTC (rev 928) @@ -286,7 +286,7 @@ /* #undef TM_IN_SYS_TIME */ /* Version number of package */ -#define VERSION "0.9" +#define VERSION "0.10" /* Define to empty if `const' does not conform to ANSI C. */ /* #undef const */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [927] trunk
by eht16＠users.sourceforge.net 24 Oct '06

24 Oct '06

Revision: 927 http://svn.sourceforge.net/geany/?rev=927&view=rev Author: eht16 Date: 2006-10-24 11:21:16 -0700 (Tue, 24 Oct 2006) Log Message: ----------- Use GTK's file open dialog also under Windows to have the extended options. Modified Paths: -------------- trunk/ChangeLog trunk/src/dialogs.c trunk/win32-config.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-10-24 18:02:38 UTC (rev 926) +++ trunk/ChangeLog 2006-10-24 18:21:16 UTC (rev 927) @@ -1,6 +1,9 @@ 2006-10-24 Enrico Tröger <enrico.troeger(a)uvena.de> * src/build.c, src/socket.c: Fixed compiler warnings under Windows. + * win32-config.h, src/dialogs.c: + Use GTK's file open dialog also under Windows to have the extended + options(kept old dialog code for optional use). 2006-10-24 Nick Treleaven <nick.treleaven(a)btinternet.com> Modified: trunk/src/dialogs.c =================================================================== --- trunk/src/dialogs.c 2006-10-24 18:02:38 UTC (rev 926) +++ trunk/src/dialogs.c 2006-10-24 18:21:16 UTC (rev 927) @@ -48,7 +48,7 @@ #include "encodings.h" -#ifndef G_OS_WIN32 +#ifndef USE_WIN32_DIALOG static GtkWidget *add_file_open_extra_widget(); #endif @@ -56,7 +56,7 @@ /* This shows the file selection dialog to open a file. */ void dialogs_show_open_file () { -#ifdef G_OS_WIN32 +#ifdef USE_WIN32_DIALOG win32_show_file_dialog(TRUE); #else /* X11, not win32: use GTK_FILE_CHOOSER */ gchar *initdir; @@ -154,7 +154,7 @@ } -#ifndef G_OS_WIN32 +#ifndef USE_WIN32_DIALOG static GtkWidget *add_file_open_extra_widget() { GtkWidget *vbox, *table, *file_entry, *check_hidden; @@ -217,6 +217,7 @@ // the ebox is for the tooltip, because gtk_combo_box can't show tooltips filetype_ebox = gtk_event_box_new(); filetype_combo = gtk_combo_box_new_text(); + gtk_combo_box_set_wrap_width(GTK_COMBO_BOX(filetype_combo), 2); gtk_tooltips_set_tip(tooltips, filetype_ebox, _("Explicitly defines a filetype for the file, if it would not be detected by filename extension.\nNote if you choose multiple files, they will all be opened with the chosen filetype."), NULL); gtk_container_add(GTK_CONTAINER(filetype_ebox), filetype_combo); Modified: trunk/win32-config.h =================================================================== --- trunk/win32-config.h 2006-10-24 18:02:38 UTC (rev 926) +++ trunk/win32-config.h 2006-10-24 18:21:16 UTC (rev 927) @@ -323,3 +323,6 @@ /* Define if you want to detect a running instance */ #define HAVE_SOCKET 1 + +/* #define USE_WIN32_DIALOG 1 */ + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [926] trunk
by eht16＠users.sourceforge.net 24 Oct '06

24 Oct '06

Revision: 926 http://svn.sourceforge.net/geany/?rev=926&view=rev Author: eht16 Date: 2006-10-24 11:02:38 -0700 (Tue, 24 Oct 2006) Log Message: ----------- Fixed compiler warnings under Windows. Modified Paths: -------------- trunk/ChangeLog trunk/src/build.c trunk/src/socket.c Property Changed: ---------------- trunk/src/socket.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-10-24 16:29:17 UTC (rev 925) +++ trunk/ChangeLog 2006-10-24 18:02:38 UTC (rev 926) @@ -1,3 +1,8 @@ +2006-10-24 Enrico Tröger <enrico.troeger(a)uvena.de> + + * src/build.c, src/socket.c: Fixed compiler warnings under Windows. + + 2006-10-24 Nick Treleaven <nick.treleaven(a)btinternet.com> * src/sciwrappers.h, src/sciwrappers.c, src/document.h, Modified: trunk/src/build.c =================================================================== --- trunk/src/build.c 2006-10-24 16:29:17 UTC (rev 925) +++ trunk/src/build.c 2006-10-24 18:02:38 UTC (rev 926) @@ -181,7 +181,7 @@ object_file = g_strdup_printf("%s.o", noext); g_free(noext); - + return object_file; } @@ -194,7 +194,7 @@ argv = g_new0(gchar*, 3); argv[0] = g_strdup(app->tools_make_cmd); - + if (build_opts == GBO_MAKE_OBJECT) { argv[1] = get_object_filename(idx); @@ -795,7 +795,9 @@ GtkWidget *menu, *item, *image, *separator; GtkAccelGroup *accel_group = gtk_accel_group_new(); GtkTooltips *tooltips = GTK_TOOLTIPS(lookup_widget(app->window, "tooltips")); +#ifndef G_OS_WIN32 filetype *ft = filetypes[GEANY_FILETYPES_LATEX]; +#endif menu = gtk_menu_new(); @@ -970,7 +972,7 @@ gtk_widget_set_sensitive(ft->menu_items->item_make_custom, have_path); if (ft->menu_items->item_make_object != NULL) gtk_widget_set_sensitive(ft->menu_items->item_make_object, have_path); - + switch (ft->id) { case GEANY_FILETYPES_LATEX: Modified: trunk/src/socket.c =================================================================== --- trunk/src/socket.c 2006-10-24 16:29:17 UTC (rev 925) +++ trunk/src/socket.c 2006-10-24 18:02:38 UTC (rev 926) @@ -259,7 +259,7 @@ sock = socket(AF_INET, SOCK_STREAM, 0); if (! SOCKET_IS_VALID(sock)) { - geany_debug("fd_open_inet(): socket() failed: %ld\n", WSAGetLastError()); + geany_debug("fd_open_inet(): socket() failed: %d\n", WSAGetLastError()); return -1; } @@ -302,7 +302,7 @@ sock = socket(AF_INET, SOCK_STREAM, 0); if (! SOCKET_IS_VALID(sock)) { - geany_debug("fd_connect_inet(): socket() failed: %ld\n", WSAGetLastError()); + geany_debug("fd_connect_inet(): socket() failed: %d\n", WSAGetLastError()); return -1; } Property changes on: trunk/src/socket.c ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [925] trunk/src/document.c
by eht16＠users.sourceforge.net 24 Oct '06

24 Oct '06

Revision: 925 http://svn.sourceforge.net/geany/?rev=925&view=rev Author: eht16 Date: 2006-10-24 09:29:17 -0700 (Tue, 24 Oct 2006) Log Message: ----------- Added GEANY_DEBUG ifdef around the doc() function. Modified Paths: -------------- trunk/src/document.c Modified: trunk/src/document.c =================================================================== --- trunk/src/document.c 2006-10-24 16:23:25 UTC (rev 924) +++ trunk/src/document.c 2006-10-24 16:29:17 UTC (rev 925) @@ -1816,8 +1816,9 @@ // useful debugging function (usually debug macros aren't enabled) +#ifdef GEANY_DEBUG document *doc(gint idx) { return DOC_IDX_VALID(idx) ? &doc_list[idx] : NULL; } - +#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: [924] trunk
by ntrel＠users.sourceforge.net 24 Oct '06

24 Oct '06

Revision: 924 http://svn.sourceforge.net/geany/?rev=924&view=rev Author: ntrel Date: 2006-10-24 09:23:25 -0700 (Tue, 24 Oct 2006) Log Message: ----------- Change Messages and Compiler window to go to line with a single click instead of double click. Modified Paths: -------------- trunk/ChangeLog trunk/src/callbacks.c trunk/src/msgwindow.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-10-24 16:15:29 UTC (rev 923) +++ trunk/ChangeLog 2006-10-24 16:23:25 UTC (rev 924) @@ -6,6 +6,11 @@ encoding or BOM changes. Add sci_is_modified(). Added useful doc() function used only when debugging. + * src/search.c: + Reorder Replace All buttons. + * src/msgwindow.c src/callbacks.c: + Change Messages and Compiler window to go to line with a single + click instead of double click. 2006-10-23 Enrico Tröger <enrico.troeger(a)uvena.de> Modified: trunk/src/callbacks.c =================================================================== --- trunk/src/callbacks.c 2006-10-24 16:15:29 UTC (rev 923) +++ trunk/src/callbacks.c 2006-10-24 16:23:25 UTC (rev 924) @@ -1335,25 +1335,30 @@ { // user_data might be NULL, GPOINTER_TO_INT returns 0 if called with NULL - if (event->type == GDK_2BUTTON_PRESS) + if (event->button == 1) { - if (GPOINTER_TO_INT(user_data) == MSG_MESSAGE) - { // double click in the message treeview (results of 'Find usage') - msgwin_goto_messages_file_line(); + switch (GPOINTER_TO_INT(user_data)) + { + case TREEVIEW_SYMBOL: + { // allow reclicking of taglist treeview item + GtkTreeSelection *select = + gtk_tree_view_get_selection(GTK_TREE_VIEW(widget)); + on_taglist_tree_selection_changed(select, NULL); + break; + } + case MSG_COMPILER: + { // single click in the compiler treeview + msgwin_goto_compiler_file_line(); + break; + } + case MSG_MESSAGE: + { // single click in the message treeview (results of 'Find usage') + msgwin_goto_messages_file_line(); + break; + } } - else if (GPOINTER_TO_INT(user_data) == MSG_COMPILER) - { // double click in the compiler treeview - msgwin_goto_compiler_file_line(); - } } - if (event->button == 1 && GPOINTER_TO_INT(user_data) == TREEVIEW_SYMBOL) - { // allow reclicking of taglist treeview item - GtkTreeSelection *select = - gtk_tree_view_get_selection(GTK_TREE_VIEW(widget)); - on_taglist_tree_selection_changed(select, NULL); - } - if (event->button == 3) { // popupmenu to hide or clear the active treeview if (GPOINTER_TO_INT(user_data) == MSG_STATUS) Modified: trunk/src/msgwindow.c =================================================================== --- trunk/src/msgwindow.c 2006-10-24 16:15:29 UTC (rev 923) +++ trunk/src/msgwindow.c 2006-10-24 16:23:25 UTC (rev 924) @@ -113,7 +113,8 @@ gtk_tree_view_set_enable_search(GTK_TREE_VIEW(msgwindow.tree_msg), FALSE); gtk_widget_modify_font(msgwindow.tree_msg, pango_font_description_from_string(app->msgwin_font)); - g_signal_connect(G_OBJECT(msgwindow.tree_msg), "button-press-event", + // use button-release-event so the selection has changed (connect_after button-press-event doesn't work) + g_signal_connect(G_OBJECT(msgwindow.tree_msg), "button-release-event", G_CALLBACK(on_tree_view_button_press_event), GINT_TO_POINTER(MSG_MESSAGE)); // selection handling @@ -140,7 +141,8 @@ gtk_tree_view_set_enable_search(GTK_TREE_VIEW(msgwindow.tree_compiler), FALSE); gtk_widget_modify_font(msgwindow.tree_compiler, pango_font_description_from_string(app->msgwin_font)); - g_signal_connect(G_OBJECT(msgwindow.tree_compiler), "button-press-event", + // use button-release-event so the selection has changed (connect_after button-press-event doesn't work) + g_signal_connect(G_OBJECT(msgwindow.tree_compiler), "button-release-event", G_CALLBACK(on_tree_view_button_press_event), GINT_TO_POINTER(MSG_COMPILER)); // selection handling This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [923] trunk/src/search.c
by ntrel＠users.sourceforge.net 24 Oct '06

24 Oct '06

Revision: 923 http://svn.sourceforge.net/geany/?rev=923&view=rev Author: ntrel Date: 2006-10-24 09:15:29 -0700 (Tue, 24 Oct 2006) Log Message: ----------- Reorder Replace All buttons. Modified Paths: -------------- trunk/src/search.c Modified: trunk/src/search.c =================================================================== --- trunk/src/search.c 2006-10-24 13:41:34 UTC (rev 922) +++ trunk/src/search.c 2006-10-24 16:15:29 UTC (rev 923) @@ -386,15 +386,15 @@ g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(send_replace_dialog_response), GINT_TO_POINTER(GEANY_RESPONSE_REPLACE_IN_SEL)); - button = gtk_button_new_with_mnemonic(_("In F_ile")); + button = gtk_button_new_with_mnemonic(_("In Sessi_on")); gtk_container_add(GTK_CONTAINER(bbox), button); g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(send_replace_dialog_response), - GINT_TO_POINTER(GEANY_RESPONSE_REPLACE_IN_FILE)); + GINT_TO_POINTER(GEANY_RESPONSE_REPLACE_IN_SESSION)); - button = gtk_button_new_with_mnemonic(_("In Sessi_on")); + button = gtk_button_new_with_mnemonic(_("In F_ile")); gtk_container_add(GTK_CONTAINER(bbox), button); g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(send_replace_dialog_response), - GINT_TO_POINTER(GEANY_RESPONSE_REPLACE_IN_SESSION)); + GINT_TO_POINTER(GEANY_RESPONSE_REPLACE_IN_FILE)); gtk_size_group_add_widget(GTK_SIZE_GROUP(button_size), button); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [922] trunk
by ntrel＠users.sourceforge.net 24 Oct '06

24 Oct '06

Revision: 922 http://svn.sourceforge.net/geany/?rev=922&view=rev Author: ntrel Date: 2006-10-24 06:41:34 -0700 (Tue, 24 Oct 2006) Log Message: ----------- Fix setting document unchanged state when using Undo/Redo for encoding or BOM changes. Add sci_is_modified(). Added useful doc() function used only when debugging. Modified Paths: -------------- trunk/ChangeLog trunk/src/document.c trunk/src/document.h trunk/src/sciwrappers.c trunk/src/sciwrappers.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-10-23 20:56:11 UTC (rev 921) +++ trunk/ChangeLog 2006-10-24 13:41:34 UTC (rev 922) @@ -1,3 +1,13 @@ +2006-10-24 Nick Treleaven <nick.treleaven(a)btinternet.com> + + * src/sciwrappers.h, src/sciwrappers.c, src/document.h, + src/document.c: + Fix setting document unchanged state when using Undo/Redo for + encoding or BOM changes. + Add sci_is_modified(). + Added useful doc() function used only when debugging. + + 2006-10-23 Enrico Tröger <enrico.troeger(a)uvena.de> * src/encodings.c, src/encodings.h, src/document.c, src/callbacks.c, Modified: trunk/src/document.c =================================================================== --- trunk/src/document.c 2006-10-23 20:56:11 UTC (rev 921) +++ trunk/src/document.c 2006-10-24 13:41:34 UTC (rev 922) @@ -179,6 +179,7 @@ ui_save_buttons_toggle(doc_list[idx].changed); ui_set_window_title(idx); + ui_update_statusbar(idx, -1); } } @@ -318,6 +319,8 @@ // store important pointers in the tab list this->file_name = (filename) ? g_strdup(filename) : NULL; this->encoding = NULL; + this->saved_encoding.encoding = NULL; + this->saved_encoding.has_bom = FALSE; this->tm_file = NULL; this->iter = iter; this->file_type = NULL; @@ -357,6 +360,7 @@ msgwin_status_add(_("File %s closed."), (doc_list[idx].file_name) ? doc_list[idx].file_name : GEANY_STRING_UNTITLED); g_free(doc_list[idx].encoding); + g_free(doc_list[idx].saved_encoding.encoding); g_free(doc_list[idx].file_name); tm_workspace_remove_object(doc_list[idx].tm_file, TRUE); doc_list[idx].is_valid = FALSE; @@ -383,6 +387,15 @@ } +// used to keep a record of the unchanged document state encoding +static void store_saved_encoding(gint idx) +{ + g_free(doc_list[idx].saved_encoding.encoding); + doc_list[idx].saved_encoding.encoding = g_strdup(doc_list[idx].encoding); + doc_list[idx].saved_encoding.has_bom = doc_list[idx].has_bom; +} + + /* This creates a new document, by clearing the text widget and setting the current filename to NULL. */ void document_new_file(filetype *ft) @@ -406,6 +419,9 @@ sci_empty_undo_buffer(doc_list[idx].sci); doc_list[idx].encoding = g_strdup(encodings[app->pref_editor_default_encoding].charset); + // store the opened encoding for undo/redo + store_saved_encoding(idx); + //document_set_filetype(idx, (ft == NULL) ? filetypes[GEANY_FILETYPES_ALL] : ft); document_set_filetype(idx, ft); // also clears taglist if (ft == NULL) filetypes[GEANY_FILETYPES_ALL]->style_func_ptr(doc_list[idx].sci); @@ -665,6 +681,7 @@ doc_list[idx].file_name = g_strdup(utf8_filename); doc_list[idx].encoding = enc; doc_list[idx].has_bom = bom; + store_saved_encoding(idx); // store the opened encoding for undo/redo if (cl_options.goto_line >= 0) { // goto line which was specified on command line and then undefine the line @@ -835,6 +852,9 @@ return FALSE; } + // store the opened encoding for undo/redo + store_saved_encoding(idx); + // ignore the following things if we are quitting if (! app->quitting) { @@ -1636,6 +1656,16 @@ } +static void update_changed_state(gint idx) +{ + doc_list[idx].changed = + (sci_is_modified(doc_list[idx].sci) || + doc_list[idx].has_bom != doc_list[idx].saved_encoding.has_bom || + ! utils_strcmp(doc_list[idx].encoding, doc_list[idx].saved_encoding.encoding)); + document_set_text_changed(idx); +} + + void document_undo(gint idx) { undo_action *action; @@ -1689,6 +1719,7 @@ } g_free(action); // free the action which was taken from the stack + update_changed_state(idx); ui_update_popup_reundo_items(idx); //geany_debug("%s: new stack height: %d", __func__, g_trash_stack_height(&doc_list[idx].undo_actions)); } @@ -1757,6 +1788,7 @@ } g_free(action); // free the action which was taken from the stack + update_changed_state(idx); ui_update_popup_reundo_items(idx); //geany_debug("%s: new stack height: %d", __func__, g_trash_stack_height(&doc_list[idx].redo_actions)); } @@ -1783,4 +1815,9 @@ } +// useful debugging function (usually debug macros aren't enabled) +document *doc(gint idx) +{ + return DOC_IDX_VALID(idx) ? &doc_list[idx] : NULL; +} Modified: trunk/src/document.h =================================================================== --- trunk/src/document.h 2006-10-23 20:56:11 UTC (rev 921) +++ trunk/src/document.h 2006-10-24 13:41:34 UTC (rev 922) @@ -35,6 +35,13 @@ #include "filetypes.h" +typedef struct FileEncoding +{ + gchar *encoding; + gboolean has_bom; +} FileEncoding; + + /* structure for representing an open tab with all its related stuff. */ typedef struct document { @@ -61,6 +68,7 @@ time_t mtime; GTrashStack *undo_actions; GTrashStack *redo_actions; + FileEncoding saved_encoding; } document; Modified: trunk/src/sciwrappers.c =================================================================== --- trunk/src/sciwrappers.c 2006-10-23 20:56:11 UTC (rev 921) +++ trunk/src/sciwrappers.c 2006-10-24 13:41:34 UTC (rev 922) @@ -273,6 +273,12 @@ } +gboolean sci_is_modified(ScintillaObject *sci) +{ + return (SSM(sci, SCI_GETMODIFY, 0, 0) != 0); +} + + void sci_zoom_in( ScintillaObject* sci ) { SSM( sci, SCI_ZOOMIN,0,0); Modified: trunk/src/sciwrappers.h =================================================================== --- trunk/src/sciwrappers.h 2006-10-23 20:56:11 UTC (rev 921) +++ trunk/src/sciwrappers.h 2006-10-24 13:41:34 UTC (rev 922) @@ -45,6 +45,7 @@ void sci_empty_undo_buffer (ScintillaObject* sci); void sci_end_undo_action (ScintillaObject* sci); void sci_start_undo_action (ScintillaObject* sci); +gboolean sci_is_modified (ScintillaObject *sci); void sci_set_visible_eols (ScintillaObject* sci, gboolean set ); gboolean sci_get_visible_eols (ScintillaObject* sci); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [921] trunk
by eht16＠users.sourceforge.net 24 Oct '06

24 Oct '06

Revision: 921 http://svn.sourceforge.net/geany/?rev=921&view=rev Author: eht16 Date: 2006-10-23 13:56:11 -0700 (Mon, 23 Oct 2006) Log Message: ----------- Don't allow changing the encoding or setting a BOM if the file is read only. Modified Paths: -------------- trunk/ChangeLog trunk/src/callbacks.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-10-23 20:32:37 UTC (rev 920) +++ trunk/ChangeLog 2006-10-23 20:56:11 UTC (rev 921) @@ -3,6 +3,8 @@ * src/encodings.c, src/encodings.h, src/document.c, src/callbacks.c, src/dialogs.c: Added new encoding "None" to open files without any character conversions (fixes #1580456). + * src/callbacks.c: Don't allow changing the encoding or setting a BOM + if the file is read only. 2006-10-22 Enrico Tröger <enrico.troeger(a)uvena.de> Modified: trunk/src/callbacks.c =================================================================== --- trunk/src/callbacks.c 2006-10-23 20:32:37 UTC (rev 920) +++ trunk/src/callbacks.c 2006-10-23 20:56:11 UTC (rev 921) @@ -2153,6 +2153,11 @@ if (app->ignore_callback || ! DOC_IDX_VALID(idx) || encodings[i].charset == NULL || utils_strcmp(encodings[i].charset, doc_list[idx].encoding)) return; + if (doc_list[idx].readonly) + { + utils_beep(); + return; + } document_undo_add(idx, UNDO_ENCODING, g_strdup(doc_list[idx].encoding)); document_set_encoding(idx, encodings[i].charset); @@ -2206,6 +2211,11 @@ gint idx = document_get_cur_idx(); if (idx == -1 || ! doc_list[idx].is_valid) return; + if (doc_list[idx].readonly) + { + utils_beep(); + return; + } document_undo_add(idx, UNDO_BOM, GINT_TO_POINTER(doc_list[idx].has_bom)); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [920] trunk
by eht16＠users.sourceforge.net 24 Oct '06

24 Oct '06

Revision: 920 http://svn.sourceforge.net/geany/?rev=920&view=rev Author: eht16 Date: 2006-10-23 13:32:37 -0700 (Mon, 23 Oct 2006) Log Message: ----------- Added new encoding "None" to open files without any character conversions (fixes #1580456). Modified Paths: -------------- trunk/ChangeLog trunk/src/callbacks.c trunk/src/dialogs.c trunk/src/document.c trunk/src/document.h trunk/src/encodings.c trunk/src/encodings.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2006-10-23 00:05:42 UTC (rev 919) +++ trunk/ChangeLog 2006-10-23 20:32:37 UTC (rev 920) @@ -1,3 +1,10 @@ +2006-10-23 Enrico Tröger <enrico.troeger(a)uvena.de> + + * src/encodings.c, src/encodings.h, src/document.c, src/callbacks.c, + src/dialogs.c: Added new encoding "None" to open files without any + character conversions (fixes #1580456). + + 2006-10-22 Enrico Tröger <enrico.troeger(a)uvena.de> * src/geany.h, src/keyfile.c, src/main.c: Modified: trunk/src/callbacks.c =================================================================== --- trunk/src/callbacks.c 2006-10-23 00:05:42 UTC (rev 919) +++ trunk/src/callbacks.c 2006-10-23 20:32:37 UTC (rev 920) @@ -758,8 +758,6 @@ if (filetype_idx >= 0 && filetype_idx < GEANY_FILETYPES_ALL) ft = filetypes[filetype_idx]; if (encoding_idx >= 0 && encoding_idx < GEANY_ENCODINGS_MAX) charset = encodings[encoding_idx].charset; - else if (encoding_idx == GEANY_ENCODINGS_MAX) - charset = "none"; filelist = gtk_file_chooser_get_filenames(GTK_FILE_CHOOSER(app->open_filesel)); flist = filelist; Modified: trunk/src/dialogs.c =================================================================== --- trunk/src/dialogs.c 2006-10-23 00:05:42 UTC (rev 919) +++ trunk/src/dialogs.c 2006-10-23 20:32:37 UTC (rev 920) @@ -120,9 +120,9 @@ gtk_combo_box_append_text(GTK_COMBO_BOX(encoding_combo), encoding_string); g_free(encoding_string); } - gtk_combo_box_append_text(GTK_COMBO_BOX(encoding_combo), _("Do not any conversion")); + //gtk_combo_box_append_text(GTK_COMBO_BOX(encoding_combo), _("Do not any conversion")); gtk_combo_box_append_text(GTK_COMBO_BOX(encoding_combo), _("Detect from file")); - gtk_combo_box_set_active(GTK_COMBO_BOX(encoding_combo), GEANY_ENCODINGS_MAX + 1); + gtk_combo_box_set_active(GTK_COMBO_BOX(encoding_combo), GEANY_ENCODINGS_MAX); g_signal_connect((gpointer) app->open_filesel, "selection-changed", G_CALLBACK(on_file_open_selection_changed), NULL); Modified: trunk/src/document.c =================================================================== --- trunk/src/document.c 2006-10-23 00:05:42 UTC (rev 919) +++ trunk/src/document.c 2006-10-23 20:32:37 UTC (rev 920) @@ -240,7 +240,7 @@ /* creates a new tab in the notebook and does all related stuff * finally it returns the index of the created document */ -gint document_create_new_sci(const gchar *filename) +static gint document_create_new_sci(const gchar *filename) { ScintillaObject *sci; PangoFontDescription *pfd; @@ -617,11 +617,10 @@ if (forced_enc != NULL) { // the encoding should be ignored(requested by user), so open the file "as it is" - if (utils_strcmp(forced_enc, "none")) + if (utils_strcmp(forced_enc, encodings[GEANY_ENCODING_NONE].charset)) { - /// TODO enc = NULL breaks several tests, e.g. encodings_select_radio_item. Will be fixed soon. bom = FALSE; - enc = NULL; + enc = g_strdup(encodings[GEANY_ENCODING_NONE].charset); } else if (! handle_forced_encoding(&data, &size, forced_enc, &enc, &bom)) { @@ -744,8 +743,9 @@ gint bytes_written, len; gchar *locale_filename = NULL; - if (idx == -1) return FALSE; - if (! force && ! doc_list[idx].changed) return FALSE; + if (! DOC_IDX_VALID(idx)) return FALSE; + // the changed flag should exclude the readonly flag, but check it anyway for safety + if (! force && (! doc_list[idx].changed || doc_list[idx].readonly)) return FALSE; if (doc_list[idx].file_name == NULL) { @@ -779,8 +779,9 @@ sci_get_text(doc_list[idx].sci, len, data); } - // save in original encoding, skip when it is already UTF-8 - if (doc_list[idx].encoding != NULL && ! utils_strcmp(doc_list[idx].encoding, "UTF-8")) + // save in original encoding, skip when it is already UTF-8 or has the encoding "None" + if (doc_list[idx].encoding != NULL && ! utils_strcmp(doc_list[idx].encoding, "UTF-8") && + ! utils_strcmp(doc_list[idx].encoding, encodings[GEANY_ENCODING_NONE].charset)) { GError *conv_error = NULL; gchar* conv_file_contents = NULL; Modified: trunk/src/document.h =================================================================== --- trunk/src/document.h 2006-10-23 00:05:42 UTC (rev 919) +++ trunk/src/document.h 2006-10-23 20:32:37 UTC (rev 920) @@ -105,11 +105,6 @@ void document_apply_update_prefs(ScintillaObject *sci); -/* creates a new tab in the notebook and does all related stuff - * finally it returns the index of the created document */ -gint document_create_new_sci(const gchar*); - - /* removes the given notebook tab and clears the related entry in the document list */ gboolean document_remove(guint page_num); Modified: trunk/src/encodings.c =================================================================== --- trunk/src/encodings.c 2006-10-23 00:05:42 UTC (rev 919) +++ trunk/src/encodings.c 2006-10-23 20:32:37 UTC (rev 920) @@ -114,6 +114,8 @@ fill(11, EASTASIAN, GEANY_ENCODING_ISO_2022_KR, "ISO-2022-KR", _("Korean")); fill(12, EASTASIAN, GEANY_ENCODING_JOHAB, "JOHAB", _("Korean")); fill(13, EASTASIAN, GEANY_ENCODING_UHC, "UHC", _("Korean")); + + fill(0, NONE, GEANY_ENCODING_NONE, "None", _("Without encoding")); } @@ -253,7 +255,7 @@ case ASIAN: submenu = menu_asian; group_size = 9; break; case MIDDLEEASTERN: submenu = menu_middleeast; group_size = 7; break; case UNICODE: submenu = menu_utf8; group_size = 8; break; - default: submenu = menu[k]; group_size = 0; + default: submenu = menu[k]; group_size = 1; } while (order < group_size) // the biggest group has 13 elements Modified: trunk/src/encodings.h =================================================================== --- trunk/src/encodings.h 2006-10-23 00:05:42 UTC (rev 919) +++ trunk/src/encodings.h 2006-10-23 20:32:37 UTC (rev 920) @@ -145,6 +145,8 @@ GEANY_ENCODING_WINDOWS_1256, GEANY_ENCODING_WINDOWS_1257, GEANY_ENCODING_WINDOWS_1258, + + GEANY_ENCODING_NONE, GEANY_ENCODINGS_MAX } GeanyEncodingIndex; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

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

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits October 2006