rnhmjoj/qutebrowser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Refactor app.py

Browse Source
This commit is contained in:
Florian Bruhin 2014-01-19 18:20:57 +01:00
parent 0dd204b182
commit 9f9f5c41f7
2 changed files with 58 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
qutebrowser/__main__.py
View File

@ -1,4 +1,6 @@
from qutebrowser import app from qutebrowser.app import QuteBrowser
import sys
if __name__ == '__main__': if __name__ == '__main__':
app.main() app = QuteBrowser()
sys.exit(app.exec_())

89
qutebrowser/app.py
View File

@ -6,17 +6,34 @@ from qutebrowser.widgets.mainwindow import MainWindow
from qutebrowser.commands.keys import KeyParser from qutebrowser.commands.keys import KeyParser
import qutebrowser.commands.utils as cmdutils import qutebrowser.commands.utils as cmdutils
def parseopts(): class QuteBrowser(QApplication):
parser = argparse.ArgumentParser("usage: %(prog)s [options]") def __init__(self):
parser.add_argument('-l', '--log', dest='loglevel', help='Set loglevel', super().__init__(sys.argv)
default=0) args = self.parseopts()
args = parser.parse_args() self.initlog()
return args
def initlog(args): self.mainwindow = MainWindow()
self.commandparser = cmdutils.CommandParser()
self.keyparser = KeyParser(self.mainwindow)
self.keyparser.set_cmd_text.connect(self.mainwindow.status.cmd.set_cmd)
self.mainwindow.status.cmd.got_cmd.connect(self.commandparser.parse)
self.mainwindow.status.cmd.got_cmd.connect(self.mainwindow.setFocus)
self.commandparser.error.connect(self.mainwindow.status.disp_error)
self.init_cmds()
self.mainwindow.show()
def parseopts(self):
parser = argparse.ArgumentParser("usage: %(prog)s [options]")
parser.add_argument('-l', '--log', dest='loglevel',
help='Set loglevel', default=0)
self.args = parser.parse_args()
def initlog(self):
""" Initialisation of the log """ """ Initialisation of the log """
if (args.loglevel): if self.args.loglevel:
loglevel = args.loglevel loglevel = self.args.loglevel
else: else:
loglevel = 'info' loglevel = 'info'
numeric_level = getattr(logging, loglevel.upper(), None) numeric_level = getattr(logging, loglevel.upper(), None)
@ -24,42 +41,28 @@ def initlog(args):
raise ValueError('Invalid log level: %s' % loglevel) raise ValueError('Invalid log level: %s' % loglevel)
logging.basicConfig( logging.basicConfig(
level=numeric_level, level=numeric_level,
format='%(asctime)s [%(levelname)s] [%(module)s:%(funcName)s:%(lineno)s] %(message)s', format='%(asctime)s [%(levelname)s] '
'[%(module)s:%(funcName)s:%(lineno)s] %(message)s',
datefmt='%Y-%m-%d %H:%M:%S') datefmt='%Y-%m-%d %H:%M:%S')
def main(): def init_cmds(self):
args = parseopts()
initlog(args)
app = QApplication(sys.argv)
mw = MainWindow()
cp = cmdutils.CommandParser()
kp = KeyParser(mw)
kp.set_cmd_text.connect(mw.status.cmd.set_cmd)
mw.status.cmd.got_cmd.connect(cp.parse)
mw.status.cmd.got_cmd.connect(mw.setFocus)
cp.error.connect(mw.status.disp_error)
cmdutils.register_all() cmdutils.register_all()
cmds = cmdutils.cmd_dict cmds = cmdutils.cmd_dict
cmds['open'].signal.connect(mw.tabs.openurl) cmds['open'].signal.connect(self.mainwindow.tabs.openurl)
cmds['tabopen'].signal.connect(mw.tabs.tabopen) cmds['tabopen'].signal.connect(self.mainwindow.tabs.tabopen)
cmds['quit'].signal.connect(QApplication.closeAllWindows) # FIXME cmds['quit'].signal.connect(QApplication.closeAllWindows) # FIXME
cmds['tabclose'].signal.connect(mw.tabs.close_act) cmds['tabclose'].signal.connect(self.mainwindow.tabs.close_act)
cmds['tabprev'].signal.connect(mw.tabs.switch_prev) cmds['tabprev'].signal.connect(self.mainwindow.tabs.switch_prev)
cmds['tabnext'].signal.connect(mw.tabs.switch_next) cmds['tabnext'].signal.connect(self.mainwindow.tabs.switch_next)
cmds['reload'].signal.connect(mw.tabs.reload_act) cmds['reload'].signal.connect(self.mainwindow.tabs.reload_act)
cmds['stop'].signal.connect(mw.tabs.stop_act) cmds['stop'].signal.connect(self.mainwindow.tabs.stop_act)
cmds['back'].signal.connect(mw.tabs.back_act) cmds['back'].signal.connect(self.mainwindow.tabs.back_act)
cmds['forward'].signal.connect(mw.tabs.forward_act) cmds['forward'].signal.connect(self.mainwindow.tabs.forward_act)
cmds['print'].signal.connect(mw.tabs.print_act) cmds['print'].signal.connect(self.mainwindow.tabs.print_act)
cmds['scrolldown'].signal.connect(mw.tabs.scroll_down_act) cmds['scrolldown'].signal.connect(self.mainwindow.tabs.scroll_down_act)
cmds['scrollup'].signal.connect(mw.tabs.scroll_up_act) cmds['scrollup'].signal.connect(self.mainwindow.tabs.scroll_up_act)
cmds['scrollleft'].signal.connect(mw.tabs.scroll_left_act) cmds['scrollleft'].signal.connect(self.mainwindow.tabs.scroll_left_act)
cmds['scrollright'].signal.connect(mw.tabs.scroll_right_act) cmds['scrollright'].signal.connect(
cmds['undo'].signal.connect(mw.tabs.undo_close) self.mainwindow.tabs.scroll_right_act)
kp.from_cmd_dict(cmds) cmds['undo'].signal.connect(self.mainwindow.tabs.undo_close)
self.keyparser.from_cmd_dict(cmdutils.cmd_dict)
mw.show()
sys.exit(app.exec_())