tChanged theme switching, probably fixes #509 as well - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit f87e482d637ea0bea822e66fa8ddb8bee59802fb
DIR parent bc1deaa6ba0fa51bc92eedd9a07a94de668a2984
HTML Author: Maran <maran.hidskes@gmail.com>
Date: Thu, 13 Mar 2014 12:02:55 +0100
Changed theme switching, probably fixes #509 as well
Diffstat:
D data/dark/background.png | 0
M data/dark/style.css | 2 +-
M gui/qt/lite_window.py | 7 ++-----
M gui/qt/main_window.py | 7 -------
M icons.qrc | 1 +
5 files changed, 4 insertions(+), 13 deletions(-)
---
DIR diff --git a/data/dark/background.png b/data/dark/background.png
Binary files differ.
DIR diff --git a/data/dark/style.css b/data/dark/style.css
t@@ -1,6 +1,6 @@
#main_window
{
- background-image: url(background.png);
+ background-image: url(:/icons/dark_background.png);
}
#address_input[readOnly=true], #amount_input[readOnly=true]
DIR diff --git a/gui/qt/lite_window.py b/gui/qt/lite_window.py
t@@ -348,12 +348,10 @@ class MiniWindow(QDialog):
def toggle_theme(self, theme_name):
- old_path = QDir.currentPath()
self.actuator.change_theme(theme_name)
# Recompute style globally
qApp.style().unpolish(self)
qApp.style().polish(self)
- QDir.setCurrent(old_path)
def closeEvent(self, event):
g = self.geometry()
t@@ -659,7 +657,6 @@ class MiniActuator:
self.g = main_window
self.theme_name = self.g.config.get('litegui_theme','Cleanlook')
self.themes = load_theme_paths()
- # see issue 509
self.load_theme()
def load_theme(self):
t@@ -669,8 +666,8 @@ class MiniActuator:
except KeyError:
util.print_error("Theme not found!", self.theme_name)
return
- full_theme_path = ("%s/%s/style.css" % (theme_prefix, theme_path))
- with open(rsrc(full_theme_path)) as style_file:
+ full_theme_path = "%s/%s/style.css" % (theme_prefix, theme_path)
+ with open(full_theme_path) as style_file:
qApp.setStyleSheet(style_file.read())
def theme_names(self):
DIR diff --git a/gui/qt/main_window.py b/gui/qt/main_window.py
t@@ -221,19 +221,12 @@ class ElectrumWindow(QMainWindow):
actuator = lite_window.MiniActuator(self)
- # Should probably not modify the current path but instead
- # change the behaviour of rsrc(...)
- old_path = QDir.currentPath()
actuator.load_theme()
self.mini = lite_window.MiniWindow(actuator, self.go_full, self.config)
driver = lite_window.MiniDriver(self, self.mini)
- # Reset path back to original value now that loading the GUI
- # is completed.
- QDir.setCurrent(old_path)
-
if self.config.get('lite_mode') is True:
self.go_lite()
else:
DIR diff --git a/icons.qrc b/icons.qrc
t@@ -21,5 +21,6 @@
<file>icons/electrum_dark_icon.png</file>
<file>icons/unconfirmed.png</file>
<file>icons/network.png</file>
+ <file>icons/dark_background.png</file>
</qresource>
</RCC>