Changeset 672fd040f6413d28c4cfa7831376d377abc57bc9

Timestamp:

01/06/12 11:54:37 (5 months ago)

Author:

Luper Rouch <luper.rouch@…>

Children:

5253706ae2c35f989c2eb18ee544f2ac3719b64a, 590e140e8c9e1d5aa50c0e5fba841ce6fa66f76f

Parents:

01f3d34a02f0973bb81905a9ffaaf758c27b75a2, 27525b9500535342b873d441b673327303a2ea3a

git-committer:

Luper Rouch <luper.rouch@…> (01/06/12 11:54:37)

Message:

Merge branch 'master' of luper.fr:projects

Files:

• various/cv.html (modified) (1 diff)
• pyflu/pyflu/__init__.py (modified) (1 diff)
• pyflu/pyflu/qt/util.py (modified) (3 diffs)

various/cv.html

@@ -140 +140 @@
                     <li>
                         <span class="job-position">Développeur chez <a href="http://www.stupeflix.com">Stupeflix</a></span>
-                        <small>XP : (Python)+++, (Django)+++, (OpenGL)++</small>
+                        &ndash; <small>XP : (Python)+++, (Django)+++, (OpenGL)++</small>
                         <ul>
                             <li>

pyflu/pyflu/__init__.py

@@ -5 +5 @@
 
 def version():
-    return "0.9.2"
+    return "0.9.3"
 

pyflu/pyflu/qt/util.py

@@ -71 +71 @@
 
 def get_open_path(parent, settings_path=None, filter=None,
-        default_dir=None, default_filename=None):
+        default_dir=None, default_filename=None, select_directory=False):
     """
     Shows an 'open file' dialog and returns the selected path.
@@ -84 +84 @@
 
     If *default_filename* is given, select this file.
+
+    If *select_directory* is ``True``, a directory is selected instead of a 
+    file.
 
     Return None if the user canceled.
@@ -99 +102 @@
     dlg = QFileDialog(parent)
     dlg.setWindowTitle(parent.trUtf8("Open"))
-    dlg.setFileMode(QFileDialog.ExistingFile)
+    if select_directory:
+        dlg.setFileMode(QFileDialog.Directory)
+    else:
+        dlg.setFileMode(QFileDialog.ExistingFile)
     dlg.setAcceptMode(QFileDialog.AcceptOpen)
     dlg.setDirectory(default_dir)