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

Cleanup

Browse Source
This commit is contained in:
Florian Bruhin 2014-06-13 07:41:51 +02:00
parent ac43a0b5cb
commit 4dc33102b7
4 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
qutebrowser/browser/downloads.py
View File

@ -134,12 +134,11 @@ class DownloadItem(QObject):
return None return None
return (self.bytes_total - self.bytes_done) / self.speed return (self.bytes_total - self.bytes_done) / self.speed
def bg_color(self): def bg_color(self):
"""Background color to be shown.""" """Background color to be shown."""
start = config.get('colors', 'download.bg.start') start = config.get('colors', 'downloads.bg.start')
stop = config.get('colors', 'download.bg.stop') stop = config.get('colors', 'downloads.bg.stop')
system = config.get('colors', 'download.bg.system') system = config.get('colors', 'downloads.bg.system')
if self.percentage is None: if self.percentage is None:
return start return start
else: else:

12
qutebrowser/config/configdata.py
View File

@ -895,23 +895,23 @@ DATA = OrderedDict([
'color-stop(100%,#FFC542))'), 'color-stop(100%,#FFC542))'),
"Background color for hints."), "Background color for hints."),
('download.fg', ('downloads.fg',
SettingValue(types.QtColor(), '#ffffff'), SettingValue(types.QtColor(), '#ffffff'),
"Foreground color for downloads."), "Foreground color for downloads."),
('download.bg.bar', ('downloads.bg.bar',
SettingValue(types.Color(), '#555555'), SettingValue(types.Color(), '#555555'),
"Background color for the download bar."), "Background color for the download bar."),
('download.bg.start', ('downloads.bg.start',
SettingValue(types.QtColor(), '#0000aa'), SettingValue(types.QtColor(), '#0000aa'),
"Color gradient start for downloads."), "Color gradient start for downloads."),
('download.bg.stop', ('downloads.bg.stop',
SettingValue(types.QtColor(), '#00aa00'), SettingValue(types.QtColor(), '#00aa00'),
"Color gradient end for downloads."), "Color gradient end for downloads."),
('download.bg.system', ('downloads.bg.system',
SettingValue(types.ColorSystem(), 'rgb'), SettingValue(types.ColorSystem(), 'rgb'),
"Color gradient interpolation system for downloads."), "Color gradient interpolation system for downloads."),
)), )),
@ -936,7 +936,7 @@ DATA = OrderedDict([
SettingValue(types.Font(), '8pt ${_monospace}'), SettingValue(types.Font(), '8pt ${_monospace}'),
"Font used in the statusbar."), "Font used in the statusbar."),
('download', ('downloads',
SettingValue(types.Font(), '8pt ${_monospace}'), SettingValue(types.Font(), '8pt ${_monospace}'),
"Font used for the downloadbar."), "Font used for the downloadbar."),

2
qutebrowser/models/downloadmodel.py
View File

@ -71,7 +71,7 @@ class DownloadModel(QAbstractListModel):
if role == Qt.DisplayRole: if role == Qt.DisplayRole:
data = str(item) data = str(item)
elif role == Qt.ForegroundRole: elif role == Qt.ForegroundRole:
data = config.get('colors', 'download.fg') data = config.get('colors', 'downloads.fg')
elif role == Qt.BackgroundRole: elif role == Qt.BackgroundRole:
data = item.bg_color() data = item.bg_color()
else: else:

4
qutebrowser/widgets/downloads.py
View File

@ -30,8 +30,8 @@ class DownloadView(QListView):
STYLESHEET = """ STYLESHEET = """
QListView {{ QListView {{
{color[download.bg.bar]} {color[downloads.bg.bar]}
{font[download]} {font[downloads]}
}} }}
""" """