Changeset 011e337903f128585ded468d9eb44af4da4ab308


Ignore:
Timestamp:
10/02/11 22:16:18 (8 months ago)
Author:
Luper Rouch <luper.rouch@…>
Children:
daf4d93546742e4c066544a5556291e996ca523e
Parents:
18221a9ef61aa11ec5adaa28690516cb44257a36, 8f58c7d21e0ea861ac11c68763b100679d92efa9
git-committer:
Luper Rouch <luper.rouch@…> (10/02/11 22:16:18)
Message:

Merge branch 'master' of luper.fr:projects

Files:
2 added
11 edited

Legend:

Unmodified
Added
Removed

  • pyflu/pyflu/__init__.py

    r2ea9020 r08bf1a4  
    55 
    66def version(): 
    7     return "0.9.1" 
     7    return "0.9.2" 
    88 

  • pyflu/pyflu/qt/bug_report/__init__.py

    r613c5fb r08bf1a4  
    11import sys 
     2import thread 
     3from PyQt4.QtCore import QObject, pyqtSignal, Qt 
    24from pyflu.qt.bug_report.dialog import BugReportDialog 
    35from pyflu.qt.bug_report.tb import install_ext_editor_url_handler 
    … …  
    68 
    79bug_report_dlg = None 
     10tb_sender = None 
     11 
     12 
     13class TracebackSender(QObject): 
     14    """ 
     15    An intermediary to send tracebacks from other threads. 
     16    """ 
     17 
     18    traceback_sent = pyqtSignal(object, object, object, object) 
    819 
    920 
    1021def excepthook(type, value, tb): 
    11     bug_report_dlg.show() 
    12     bug_report_dlg.add_tb(type, value, tb) 
     22    thread_id = thread.get_ident() 
     23    tb_sender.traceback_sent.emit(thread_id, type, value, tb) 
    1324 
    1425 
    … …  
    2132    errors (for example just after the QApplication has been created). 
    2233    """ 
    23     global bug_report_dlg 
     34    global bug_report_dlg, tb_sender 
    2435    settings.BUG_REPORT_EMAIL = bug_report_email 
    2536    bug_report_dlg = BugReportDialog(parent) 
     37    tb_sender = TracebackSender() 
     38    tb_sender.traceback_sent.connect(bug_report_dlg.add_tb,  
     39            Qt.QueuedConnection) 
    2640    sys.excepthook = excepthook 
    2741    install_ext_editor_url_handler() 

  • pyflu/pyflu/qt/bug_report/dialog.py

    r5d9b893 r08bf1a4  
    3535        self.traceback_text.clear() 
    3636 
    37     def add_tb(self, type, value, tb): 
    38         thread_id = thread.get_ident() 
     37    def add_tb(self, thread_id, type, value, tb): 
     38        if not self.isVisible(): 
     39            self.show() 
    3940        if thread_id == self.main_thread_id and self.main_traceback is None: 
    4041            self.main_traceback = (type, value, tb) 

  • smplayer_context_menu/src/chrome/content/smplayer.js

    r6b9f8c6 rbb8bf09  
    55                smplayer.prefs = Components.classes["@mozilla.org/preferences-service;1"] 
    66                        .getService(Components.interfaces.nsIPrefService) 
    7                         .getBranch("smplayerplaylist."); 
     7                        .getBranch("extensions.smplayerplaylist."); 
    88                smplayer.path = smplayer.prefs.getCharPref("location"); 
    99                smplayer.msg = document.getElementById("smplayerplaylistStrings"); 

  • smplayer_context_menu/src/install.rdf

    r6b9f8c6 rbb8bf09  
    66  <Description about="urn:mozilla:install-manifest"> 
    77    <em:id>smplayerplaylist@luperrouch.fr</em:id> 
    8     <em:version>0.1.1</em:version> 
     8    <em:version>0.1.2</em:version> 
    99    <em:type>2</em:type> 
    1010        <em:optionsURL>chrome://smplayerplaylist/content/options.xul</em:optionsURL> 

  • various/config/awesome/rc-bill.lua

    rcedc35b r5e8a64f  
    8080shifty.config.apps = { 
    8181     { match = { "Gvim" }, tag = "dev" }, 
     82     { match = { "Eclipse" }, tag = "dev" }, 
    8283     { match = { "MPlayer" }, float = true }, 
    8384     { match = { "xchat", "irssi" }, tag = "chat" }, 
    … …  
    9697     { match = { "qjackctl.bin" }, tag = "jack" }, 
    9798     { match = { "NX" }, tag = "nx" }, 
     99     { match = { "Spotify" }, tag = "web" }, 
    98100 
    99101     { match = { "" }, buttons = awful.util.table.join( 
    … …  
    141143chromiumlauncher = quicklauncher(beautiful.app_chromium, "chromium-browser") 
    142144browserlauncher = quicklauncher(beautiful.app_browser, "nautilus") 
     145eclipselauncher = quicklauncher(beautiful.app_eclipse, "/home/flupke/apps/eclipse/eclipse") 
    143146-- }}} 
    144147 
    … …  
    287290            chromiumlauncher, 
    288291            browserlauncher, 
     292            eclipselauncher, 
    289293            myseparator, 
    290294            mytaglist[s], 
    … …  
    455459    { rule = { class = "MPlayer" }, 
    456460      properties = { floating = true } }, 
     461    { rule = { class = "VLC" }, 
     462      properties = { floating = true } }, 
    457463    { rule = { class = "pinentry" }, 
    458464      properties = { floating = true } }, 
    … …  
    495501-- run_once("chromium-browser") 
    496502run_once("clementine") 
    497 -- }}} 
     503run_once("spotify") 
     504run_once("xinput", "set-button-map 'Evoluent VerticalMouse 4' 1 2 3 4 5 6 7 9 10 8 11 12 13 14") 
     505run_once("skype") 
     506run_once("dropbox", "start") 
     507-- }}} 

  • various/config/awesome/themes/zenburn/theme.lua

    r83e11a5 r5e8a64f  
    143143theme.app_chromium = prefix .. "icons/chromium-browser.png" 
    144144theme.app_browser = prefix .. "icons/user-home.png" 
     145theme.app_eclipse = prefix .. "icons/eclipse.png" 
    145146-- }}} 
    146147 

  • various/config/bill/hosts

    ra25b687 r8f58c7d  
    1 127.0.0.1       bill.luper.fr bill localhost.localdomain localhost marcel.delacave.local marcel 
    2 82.238.202.53 delacave.hd.free.fr 
     1127.0.0.1       bill.luper.fr bill localhost.localdomain localhost marcel.delacave.local marcel mam.delacave.local 
     2#82.238.202.53 delacave.hd.free.fr 
     381.64.177.54 delacave.hd.free.fr 
    34 
    45# The following lines are desirable for IPv6 capable hosts 

  • various/config/vimrc-linux

    ra25b687 r7ef2b9f  
    2525set viminfo+=! " make sure it can save viminf 
    2626" None of these should be word dividers, so make them not be 
    27 set isk+=_,@,%,# 
     27set isk+=_,@,% 
    2828set showmatch " blink corresponding parenthese when closing 
    2929" Include python additional libs in path 
    … …  
    111111au FileType rst set tw=79 
    112112au FileType html set tw=0 
     113au FileType xhtml set tw=0 
     114au FileType htmldjango set tw=0 
    113115au FileType sass set shiftwidth=4 
    114116" Put . back to word dividers for python 

  • various/config/zshrc

    r2adf274 rf3c29f7  
    7171alias scpresume='rsync --partial --progress --rsh=ssh' 
    7272alias socks-git='source $HOME/bin/socks-git' 
     73alias ack='ack-grep' 
    7374#if [[ $HOSTNAME == "kamna" ]] { 
    7475#       alias emacs='emacs -l ~/.emacs.kamna' 

  • pyflu/pyflu/update/qt.py

    rd8e9cb2 r18221a9  
    1313from pyflu.update.remote import find_patches_groups 
    1414from pyflu.update.version import Version 
    15 from pyflu.qt.util import get_or_create_app 
    1615 
    1716 
    … …  
    8180        pb.setValue(0) 
    8281        pb.setRange(0, length) 
    83         app = get_or_create_app() 
    84         app.processEvents() 
     82        QCoreApplication.processEvents() 
    8583 
    8684    def update_long_operation(self, index): 
    8785        pb = getattr(self, self.progress_bar_name) 
    8886        pb.setValue(index) 
    89         app = get_or_create_app() 
    90         app.processEvents() 
     87        QCoreApplication.processEvents() 
    9188 
    9289    def _download_next(self): 
Note: See TracChangeset for help on using the changeset viewer.