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@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@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.