------------------------------------------------------------
revno: 1005
committer: Philipp Wolfer <
ph.wolfer@...>
branch nick: win32
timestamp: Mon 2009-10-26 22:11:05 +0100
message:
Revert changes from revision 979 since it broke native file dialogs :(
modified:
picard/ui/mainwindow.py
--
lp:picard
https://code.launchpad.net/~musicbrainz-developers/picard/trunkYou are subscribed to branch lp:picard.
To unsubscribe from this branch go to
https://code.launchpad.net/~musicbrainz-developers/picard/trunk/+edit-subscription.
=== modified file 'picard/ui/mainwindow.py'
--- picard/ui/mainwindow.py 2009-10-25 18:35:05 +0000
+++ picard/ui/mainwindow.py 2009-10-26 21:11:05 +0000
@@ -494,22 +494,27 @@
current_directory = find_existing_path(unicode(current_directory))
dir_list = []
- (parent, subdir) = os.path.split(current_directory)
- file_dialog = QtGui.QFileDialog(self, "", parent)
- file_dialog.setFileMode(QtGui.QFileDialog.DirectoryOnly)
if not self.config.setting["toolbar_multiselect"]:
- file_dialog.selectFile(subdir)
+ directory = QtGui.QFileDialog.getExistingDirectory(self, "", current_directory)
+ if directory:
+ dir_list.append(directory)
else:
# Use a custom file selection dialog to allow the selection of multiple directories
+ file_dialog = QtGui.QFileDialog(self, "", current_directory)
+ file_dialog.setFileMode(QtGui.QFileDialog.DirectoryOnly)
tree_view = file_dialog.findChild(QtGui.QTreeView)
tree_view.setSelectionMode(QtGui.QAbstractItemView.ExtendedSelection)
list_view = file_dialog.findChild(QtGui.QListView, "listView")
list_view.setSelectionMode(QtGui.QAbstractItemView.ExtendedSelection)
- if file_dialog.exec_() == QtGui.QDialog.Accepted:
- dir_list = file_dialog.selectedFiles()
-
- if len(dir_list) > 0:
+
+ if file_dialog.exec_() == QtGui.QDialog.Accepted:
+ dir_list = file_dialog.selectedFiles()
+
+ if len(dir_list) == 1:
self.config.persist["current_directory"] = dir_list[0]
+ elif len(dir_list) > 1:
+ (parent, dir) = os.path.split(str(dir_list[0]))
+ self.config.persist["current_directory"] = parent
for directory in dir_list:
directory = unicode(directory)
_______________________________________________
MusicBrainz-commits mailing list
MusicBrainz-commits@...
http://lists.musicbrainz.org/mailman/listinfo/musicbrainz-commits
