Changeset 769c378f66d18dc35bcdc76339da83552f6404a4

Timestamp:

08/30/11 14:13:39 (9 months ago)

Author:

Luper Rouch <luper.rouch@…>

Children:

7f9cb327ac44d3c8931b40d1a24253cf6e3c681a, 18221a9ef61aa11ec5adaa28690516cb44257a36, 08bf1a42b169043a053781d2d139c0022fc65330

Parents:

7cebbdb62a64026be49de41d00e78e6af5cedef2, 2ea9020881fe9a419dc98171219dfb471ea8a2bc

git-committer:

Luper Rouch <luper.rouch@…> (08/30/11 14:13:39)

Message:

Merge branch 'master' of /var/git/repositories/projects

Files:

• pyflu/pyflu/__init__.py (modified) (1 diff)
• pyflu/pyflu/qt/util.py (modified) (3 diffs)
• smplayer_context_menu/.gitignore (added)
• smplayer_context_menu/make.py (added)
• smplayer_context_menu/src/chrome.manifest (added)
• smplayer_context_menu/src/chrome/content/options.xul (added)
• smplayer_context_menu/src/chrome/content/smplayer.js (added)
• smplayer_context_menu/src/chrome/content/smplayerplaylist.js (added)
• smplayer_context_menu/src/chrome/content/smplayerplaylist.xul (added)
• smplayer_context_menu/src/chrome/locale/en-US/options.dtd (added)
• smplayer_context_menu/src/chrome/locale/en-US/smplayerplaylist.dtd (added)
• smplayer_context_menu/src/chrome/locale/en-US/smplayerplaylist.properties (added)
• smplayer_context_menu/src/defaults/preferences/defaults.js (added)
• smplayer_context_menu/src/install.rdf (added)
• smplayer_context_menu/src/platform/Linux/defaults/preferences/defaults.js (added)
• smplayer_context_menu/src/platform/WINNT/defaults/preferences/defaults.js (added)
• smplayer_context_menu/src/todo.txt (added)
• utils/scripts/git-author-stats (added)
• various/cv.html (modified) (1 diff)

pyflu/pyflu/__init__.py

@@ -5 +5 @@
 
 def version():
-    return "0.8.4"
+    return "0.9.1"
 

pyflu/pyflu/qt/util.py

@@ -63 +63 @@
         dlg.setNameFilter(format_file_dialog_filter_string(filter))
     if dlg.exec_() != QDialog.Accepted:
-        return None
+        return
     save_path = unicode(dlg.selectedFiles()[0])
     # Remember save location directory
@@ -70 +70 @@
 
 
-def get_open_path(parent, settings_path=None, filter=None):
+def get_open_path(parent, settings_path=None, filter=None,
+        default_dir=None, default_filename=None):
     """
     Shows an 'open file' dialog and returns the selected path.
 
-    Also remembers the selected folder, so that subsequent calls to this
+    Also remembers the selected directory, so that subsequent calls to this
     function with the same *settings_path* will open in the last selected
-    directory.
+    directory. The default directory can also be forced with *default_dir*.
 
     If *filter* is specified, it must be an iterable containing filters
@@ -82 +83 @@
     details.
 
-    Returns None if the user canceled.
+    If *default_filename* is given, select this file.
+
+    Return None if the user canceled.
     """
     # Get the last used save directory
     settings = QSettings()
+    if default_dir is None:
+        if settings_path is not None:
+            last_dir = unicode(settings.value(settings_path,
+                QVariant(u"")).toString())
+        else:
+            last_dir = QString()
+        default_dir = last_dir 
+    # Get open location
+    dlg = QFileDialog(parent)
+    dlg.setWindowTitle(parent.trUtf8("Open"))
+    dlg.setFileMode(QFileDialog.ExistingFile)
+    dlg.setAcceptMode(QFileDialog.AcceptOpen)
+    dlg.setDirectory(default_dir)
+    if default_filename is not None:
+        dlg.selectFile(default_filename)
+    if filter is not None:
+        dlg.setNameFilter(format_file_dialog_filter_string(filter))
+    if dlg.exec_() != QDialog.Accepted:
+        return
+    open_path = unicode(dlg.selectedFiles()[0])
     if settings_path is not None:
-        last_dir = unicode(settings.value(settings_path,
-            QVariant(u"")).toString())
-    else:
-        last_dir = QString()
-    # Get save location
-    if filter is not None:
-        filter = format_file_dialog_filter_string(filter)
-    else:
-        filter = QString()
-    open_path = QFileDialog.getOpenFileName(parent, parent.trUtf8("Open"), 
-            last_dir, filter)
-    if open_path.isNull():
-        return None
-    open_path = unicode(open_path)
-    if settings_path is not None:
-        # Remember save location directory
+        # Remember opened location directory
         settings.setValue(settings_path, QVariant(dirname(open_path)))
     return open_path

various/cv.html

@@ -304 +304 @@
             </ul>
             </li>
+            <li>
+                <span class="job-location">
+                    <strong>1996, Baccalauréat Scientifique (mention assez bien)</strong>
+                    - lycée technique de Lorgues
+                </span>
+            </li>
+            </ul>
         </ul>