projects/dwt-linux: dwt/widgets/FileDialog.d comparison

comparison dwt/widgets/FileDialog.d @ 240:ce446666f5a2

Update to SWT 3.4M7

author	Frank Benoit <benoit@tionex.de>
date	Mon, 12 May 2008 19:13:01 +0200
parents	380bad9f6852
children	5a30aa9820f3

comparison

equal deleted inserted replaced

-:06a1f6829310
+:ce446666f5a2
 String [] filterExtensions;
 String filterPath = "";
 String fileName = "";
 String[] fileNames;
 String fullPath = "";
+int filterIndex = -1;
+bool overwrite = false;
 GtkWidget* handle;
 static final char SEPARATOR = tango.io.FileConst.FileConst.PathSeparatorChar;
 static final char EXTENSION_SEPARATOR = ';';
 /**
 *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the parent</li>
 *    <li>ERROR_INVALID_SUBCLASS - if this class is not an allowed subclass</li>
 * </ul>
 */
 public this (Shell parent) {
-this (parent, DWT.PRIMARY_MODAL);
+this (parent, DWT.APPLICATION_MODAL);
 }
 /**
 * Constructs a new instance of this class given its parent
 * and a style value describing its behavior and appearance.
 * <p>
 *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the parent</li>
 *    <li>ERROR_INVALID_SUBCLASS - if this class is not an allowed subclass</li>
 * </ul>
 */
 public this (Shell parent, int style) {
-super (parent, style);
+super (parent, checkStyle (parent, style));
 checkSubclass ();
 }
 String computeResultChooserDialog () {
 /* MULTI is only valid if the native dialog's action is Open */
 fullPath = null;
 fileNames[0] = fullPath[ start + 1 .. $ ];
 OS.g_free (utf8Ptr);
 }
 }
 }
+filterIndex = -1;
+auto filter = OS.gtk_file_chooser_get_filter (handle);
+if (filter !is null) {
+auto filterNamePtr = OS.gtk_file_filter_get_name (filter);
+if (filterNamePtr !is null) {
+String filterName = tango.stdc.stringz.fromStringz(filterNamePtr).dup;
+//OS.g_free (filterNamePtr); //GTK owns this pointer - do not free
+for (int i = 0; i < filterExtensions.length; i++) {
+if (filterNames.length > 0) {
+if (filterNames[i].equals(filterName)) {
+filterIndex = i;
+break;
+}
+} else {
+if (filterExtensions[i].equals(filterName)) {
+filterIndex = i;
+break;
+}
+}
+}
+}
+}
 if (fullPath !is null) {
 int separatorIndex = tango.text.Util.locatePrior( fullPath, SEPARATOR);
 if( separatorIndex is fullPath.length ) separatorIndex = -1;
 fileName = fullPath[separatorIndex + 1 .. $ ];
 filterPath = fullPath[0 .. separatorIndex ];
 }
 return fullPath;
 }
 String computeResultClassicDialog () {
+filterIndex = -1;
 GtkFileSelection* selection = cast(GtkFileSelection*)handle;
 auto entry = selection.selection_entry;
 auto entryText = OS.gtk_entry_get_text (entry);
 String txt = tango.stdc.stringz.fromStringz( entryText );
 if (txt.length is 0) {
 */
 public String [] getFilterExtensions () {
 return filterExtensions;
 }
 /**
+* Get the 0-based index of the file extension filter
+* which was selected by the user, or -1 if no filter
+* was selected.
+* <p>
+* This is an index into the FilterExtensions array and
+* the FilterNames array.
+* </p>
+*
+* @return index the file extension filter index
+*
+* @see #getFilterExtensions
+* @see #getFilterNames
+*
+* @since 3.4
+*/
+public int getFilterIndex () {
+return filterIndex;
+}
+/**
 * Returns the names that describe the filter extensions
 * which the dialog will use to filter the files it shows.
 *
 * @return the list of filter names
 */
 *
 * @see #setFilterExtensions
 */
 public String getFilterPath () {
 return filterPath;
+}
+/**
+* Returns the flag that the dialog will use to
+* determine whether to prompt the user for file
+* overwrite if the selected file already exists.
+*
+* @return true if the dialog will prompt for file overwrite, false otherwise
+*
+* @since 3.4
+*/
+public bool getOverwrite () {
+return overwrite;
 }
 /**
 * Makes the dialog visible and brings it to the front
 * of the display.
 *
 }
 presetChooserDialog ();
 Display display = parent !is null ? parent.getDisplay (): Display.getCurrent ();
 display.addIdleProc ();
 String answer = null;
-if (OS.gtk_dialog_run (handle) is OS.GTK_RESPONSE_OK) {
+Dialog oldModal = null;
+if (OS.gtk_window_get_modal (handle)) {
+oldModal = display.getModalDialog ();
+display.setModalDialog (this);
+}
+uint signalId = 0;
+uint /*long*/ hookId = 0;
+CallbackData emissionData;
+emissionData.display = display;
+if ((style & DWT.RIGHT_TO_LEFT) !is 0) {
+signalId = OS.g_signal_lookup (OS.map.ptr, OS.GTK_TYPE_WIDGET());
+emissionData.data = handle;
+hookId = OS.g_signal_add_emission_hook (signalId, 0, &Display.emissionFunc, &emissionData, null);
+}
+int response = OS.gtk_dialog_run (handle);
+if ((style & DWT.RIGHT_TO_LEFT) !is 0) {
+OS.g_signal_remove_emission_hook (signalId, hookId);
+}
+if (OS.gtk_window_get_modal (handle)) {
+display.setModalDialog (oldModal);
+}
+if (response is OS.GTK_RESPONSE_OK) {
 answer = computeResultChooserDialog ();
 }
 display.removeIdleProc ();
 OS.gtk_widget_destroy (handle);
 return answer;
 }
 presetClassicDialog ();
 Display display = parent !is null ? parent.getDisplay (): Display.getCurrent ();
 display.addIdleProc ();
 String answer = null;
-if (OS.gtk_dialog_run (handle) is OS.GTK_RESPONSE_OK) {
+Dialog oldModal = null;
+if (OS.gtk_window_get_modal (handle)) {
+oldModal = display.getModalDialog ();
+display.setModalDialog (this);
+}
+int signalId = 0;
+int /*long*/ hookId = 0;
+CallbackData emissionData;
+emissionData.display = display;
+if ((style & DWT.RIGHT_TO_LEFT) !is 0) {
+signalId = OS.g_signal_lookup (OS.map.ptr, OS.GTK_TYPE_WIDGET());
+emissionData.data = handle;
+hookId = OS.g_signal_add_emission_hook (signalId, 0, &Display.emissionFunc, &emissionData, null);
+}
+int response = OS.gtk_dialog_run (handle);
+if ((style & DWT.RIGHT_TO_LEFT) !is 0) {
+OS.g_signal_remove_emission_hook (signalId, hookId);
+}
+if (OS.gtk_window_get_modal (handle)) {
+display.setModalDialog (oldModal);
+}
+if (response is OS.GTK_RESPONSE_OK) {
 answer = computeResultClassicDialog ();
 }
 display.removeIdleProc ();
 OS.gtk_widget_destroy (handle);
 return answer;
 /* filename must be a full path */
 if (filterPath[0] !is SEPARATOR) {
 stringBuffer.append (SEPARATOR);
 }
 stringBuffer.append (filterPath);
-if (filterPath[filterPath.length - 1 ] !is SEPARATOR) {
+if (fileName.length > 0 && (style & DWT.SAVE) is 0) {
-stringBuffer.append (SEPARATOR);
+if (filterPath[filterPath.length - 1 ] !is SEPARATOR) {
-}
+stringBuffer.append (SEPARATOR);
-if (fileName.length > 0) {
+}
 stringBuffer.append (fileName);
-} else {
-/* go into the specified directory */
-stringBuffer.append ('.');
-}
 char* buffer = tango.stdc.stringz.toStringz( stringBuffer.toString ());
 /*
 * Bug in GTK. GtkFileChooser may crash on GTK versions 2.4.10 to 2.6
 * when setting a file name that is not a true canonical path.
 * The fix is to use the canonical path.
 */
 auto ptr = OS.realpath (buffer, null);
 if (ptr !is null) {
 OS.gtk_file_chooser_set_filename (handle, ptr);
 OS.g_free (ptr);
+}
+} else {
+char* buffer = tango.stdc.stringz.toStringz( stringBuffer.toString () );
+/*
+* Bug in GTK. GtkFileChooser may crash on GTK versions 2.4.10 to 2.6
+* when setting a file name that is not a true canonical path.
+* The fix is to use the canonical path.
+*/
+auto ptr = OS.realpath (buffer, null);
+if (ptr !is null) {
+OS.gtk_file_chooser_set_current_folder (handle, ptr);
+OS.g_free (ptr);
+}
 }
 } else {
 if (fileName.length > 0) {
 if (fileName[0] is SEPARATOR) {
 char* buffer = tango.stdc.stringz.toStringz(fileName);
 /*
 * Bug in GTK. GtkFileChooser may crash on GTK versions 2.4.10 to 2.6
 * when setting a file name that is not a true canonical path.
 * The fix is to use the canonical path.
 */
 }
 if ((style & DWT.SAVE) !is 0 && fileName.length > 0) {
 char* buffer = tango.stdc.stringz.toStringz(fileName);
 OS.gtk_file_chooser_set_current_name (handle, buffer);
 }
+if ((style & DWT.SAVE) !is 0) {
+if (OS.GTK_VERSION >= OS.buildVERSION (2, 8, 0)) {
+OS.gtk_file_chooser_set_do_overwrite_confirmation (handle, overwrite);
+}
+}
 /* Set the extension filters */
 if (filterNames is null) filterNames = null;
 if (filterExtensions is null) filterExtensions = null;
+GtkFileFilter* initialFilter = null;
 for (int i = 0; i < filterExtensions.length; i++) {
 if (filterExtensions [i] !is null) {
 auto filter = OS.gtk_file_filter_new ();
 if (filterNames.length > i && filterNames [i] !is null) {
 char* name = tango.stdc.stringz.toStringz(filterNames [i]);
 }
 String current = filterExtensions [i][ start .. $ ];
 char* filterString = tango.stdc.stringz.toStringz(current);
 OS.gtk_file_filter_add_pattern (filter, filterString);
 OS.gtk_file_chooser_add_filter (handle, filter);
-}
+if (i is filterIndex) {
+initialFilter = filter;
+}
+}
+}
+if (initialFilter !is null) {
+OS.gtk_file_chooser_set_filter(handle, initialFilter);
 }
 fullPath = null;
 fileNames = null;
 }
 void presetClassicDialog () {
 * @see #setFilterNames to specify the user-friendly
 * names corresponding to the extensions
 */
 public void setFilterExtensions (String [] extensions) {
 filterExtensions = extensions;
+}
+/**
+* Set the 0-based index of the file extension filter
+* which the dialog will use initially to filter the files
+* it shows to the argument.
+* <p>
+* This is an index into the FilterExtensions array and
+* the FilterNames array.
+* </p>
+*
+* @param index the file extension filter index
+*
+* @see #setFilterExtensions
+* @see #setFilterNames
+*
+* @since 3.4
+*/
+public void setFilterIndex (int index) {
+filterIndex = index;
 }
 /**
 * Sets the the names that describe the filter extensions
 * which the dialog will use to filter the files it shows
 * to the argument, which may be null.
 * @see #setFilterExtensions
 */
 public void setFilterPath (String string) {
 filterPath = string;
 }
-}
+/**
+* Sets the flag that the dialog will use to
+* determine whether to prompt the user for file
+* overwrite if the selected file already exists.
+*
+* @param overwrite true if the dialog will prompt for file overwrite, false otherwise
+*
+* @since 3.4
+*/
+public void setOverwrite (bool overwrite) {
+this.overwrite = overwrite;
+}
+}

Mercurial > projects > dwt-linux

comparison dwt/widgets/FileDialog.d @ 240:ce446666f5a2