commit f8e51e332343097c88140978ab97345b00b3888c
parent fbda9dac79944451de6b5ab701b3d426c905114d
Author: ThomasV <thomasv@electrum.org>
Date: Sun, 18 Oct 2015 12:43:20 +0200
remove themes, check python3 in setup.py
Diffstat:
9 files changed, 7 insertions(+), 229 deletions(-)
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,4 +1,5 @@
-include README LICENCE RELEASE-NOTES AUTHORS
+include LICENCE RELEASE-NOTES AUTHORS
+include README.rst
include electrum.conf.sample
include electrum.desktop
include *.py
@@ -12,4 +13,4 @@ include app.fil
include icons.qrc
recursive-include icons *
recursive-include scripts *
-recursive-include docs *
+
diff --git a/gui/qt/themes/README b/gui/qt/themes/README
@@ -1,12 +0,0 @@
-To add a new theme, simply create a new directory in the electrum data directory (either ./data or your system wide local data).
-
-Inside your directory create a file called name.cfg with the name of that theme.
-
-Create another file called style.css - this will be your CSS for the theme (see other themes for reference).
-
-Documentation on Qt's stylesheets (used by Electrum):
-
-Overview: http://qt-project.org/doc/qt-4.8/stylesheet.html
-Examples: http://qt-project.org/doc/qt-4.8/stylesheet-examples.html
-Reference manual: http://doc.qt.nokia.com/4.7-snapshot/stylesheet-reference.html
-
diff --git a/gui/qt/themes/cleanlook/name.cfg b/gui/qt/themes/cleanlook/name.cfg
@@ -1 +0,0 @@
-Cleanlook
diff --git a/gui/qt/themes/cleanlook/style.css b/gui/qt/themes/cleanlook/style.css
@@ -1,62 +0,0 @@
-#main_window
-{
- background: qlineargradient(x1: 0, y1: 0, x2:0,y2:1, stop: 0 white , stop: 1 #E8E8E8);
-}
-
-MiniWindow QPushButton {
- color: #777;
- border: 1px solid #CCC;
- border-radius: 0px;
- background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
- stop: 0 white, stop: 1 #E6E6E6);
- min-height: 30px;
- min-width: 30px;
-}
-
-#send_button{
- color: #FFF;
- border: 1px solid #3786E6;
- border-radius: 4px;
- background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
- stop: 0 #72B2F8, stop: 1 #3484E6);
- padding: 2px;
- width: 20px;
-}
-
-#send_button:disabled{
- color: #D3E8FE;
- border: 1px solid #6DAEF7;
- border-radius: 4px;
- background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
- stop: 0 #A5CFFA, stop: 1 #72B2F8);
-}
-#address_input, #amount_input, #label_input
-{
- color: #000;
- padding: 5px;
- border-radius: 5px;
- min-height: 23px;
- border: 1px solid #AAA9A9;
- width: 200px;
-}
-
-#address_input[isValid=true]
-{
- color: #4D9948;
-}
-
-#address_input[isValid=false]
-{
- color: #CE4141;
-}
-
-#balance_label
-{
- color: #333;
-}
-
-#history
-{
- color: #888;
-}
-
diff --git a/gui/qt/themes/dark/name.cfg b/gui/qt/themes/dark/name.cfg
@@ -1 +0,0 @@
-Dark
diff --git a/gui/qt/themes/dark/style.css b/gui/qt/themes/dark/style.css
@@ -1,35 +0,0 @@
-#main_window
-{
- background-image: url(:/icons/dark_background.png);
-}
-
-#address_input[readOnly=true], #amount_input[readOnly=true]
-{
- font: italic;
- color: gray;
-}
-#address_input[readOnly=false], #amount_input[readOnly=false]
-{
- font: normal;
- color: black;
-}
-
-#valid_address::indicator
-{
- width: 24px;
- height: 24px;
-}
-#valid_address::indicator:checked
-{
- image: url(confirmed.png);
-}
-#valid_address::indicator:unchecked
-{
- image: url(unconfirmed.png);
-}
-
-#balance_label
-{
- color: white;
-}
-
diff --git a/gui/qt/themes/sahara/name.cfg b/gui/qt/themes/sahara/name.cfg
@@ -1 +0,0 @@
-Sahara
diff --git a/gui/qt/themes/sahara/style.css b/gui/qt/themes/sahara/style.css
@@ -1,102 +0,0 @@
-#main_window
-{
- background: qlineargradient(x1: 0, y1: 0, x2:0,y2:1, stop: 0 white , stop: 1 #F2E3BE);
-}
-
-MiniWindow QPushButton {
- color: #C1A76D;
- border: 1px solid #A7811C;
- border-radius: 0px;
- background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
- stop: 0 white, stop: 1 #F2E3BE);
- min-height: 25px;
- min-width: 30px;
-}
-
-#send_button{
- color: #FEEBA7;
- border: 1px solid #AD8B35;
- border-radius: 4px;
- background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
- stop: 0 #E0A035, stop: 1 #AD8B35);
- min-width: 80px;
- min-height: 23px;
- padding: 2px;
-}
-
-#send_button:disabled{
- color: #FEEDD3;
- border: 1px solid #F7D46D;
- border-radius: 4px;
- background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
- stop: 0 #FAEEA5, stop: 1 #DBC050);
- min-width: 80px;
- min-height: 23px;
- padding: 2px;
-}
-
-#receive_button
-{
- color: #FEEBA7;
- border: 1px solid #AD8B35;
- border-radius: 4px;
- background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
- stop: 0 #E0A035, stop: 1 #AD8B35);
- min-height: 25px;
- min-width: 30px;
-}
-#receive_button[isActive=true]
-{
- color: #FEEBA7;
- background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,
- stop: 0 #E0A035, stop: 1 #987620);
-}
-
-#address_input, #amount_input
-{
- color: #000;
- padding: 5px;
- border-radius: 4px;
- border: 1px solid #CBAE69;
- width: 225px;
-}
-
-#address_input[isValid=true]
-{
- color: #4D9948;
- padding: 5px;
- border-radius: 4px;
- border: 1px solid #CBAE69;
- width: 225px;
- margin-top: 4px;
-}
-
-#address_input[isValid=false]
-{
- color: #CE4141;
- padding: 5px;
- border-radius: 4px;
- border: 1px solid #CBAE69;
- width: 225px;
- margin-top: 4px;
-}
-
-#address_input[isValid=placeholder]
-{
- color: #DEC58D;
- padding: 5px;
- border-radius: 4px;
- border: 1px solid #CBAE69;
- width: 225px;
- margin-top: 4px;
-}
-#balance_label
-{
- color: #7E5907;
-}
-
-#history
-{
- color: #8B6914;
-}
-
diff --git a/setup.py b/setup.py
@@ -8,23 +8,22 @@ import sys
import platform
import imp
-
version = imp.load_source('version', 'lib/version.py')
if sys.version_info[:3] < (2, 7, 0):
sys.exit("Error: Electrum requires Python version >= 2.7.0...")
-
-
+if sys.version_info[:3] >= (3, 0, 0):
+ sys.exit("Error: Electrum requires Python 2")
data_files = []
-if platform.system() in [ 'Linux', 'FreeBSD', 'DragonFly']:
+
+if platform.system() in ['Linux', 'FreeBSD', 'DragonFly']:
usr_share = os.path.join(sys.prefix, "share")
data_files += [
(os.path.join(usr_share, 'applications/'), ['electrum.desktop']),
(os.path.join(usr_share, 'pixmaps/'), ['icons/electrum.png'])
]
-
setup(
name="Electrum",
version=version.ELECTRUM_VERSION,
@@ -48,14 +47,6 @@ setup(
'www/index.html',
'wordlist/*.txt',
'locale/*/LC_MESSAGES/electrum.mo',
- ],
- 'electrum_gui': [
- "qt/themes/cleanlook/name.cfg",
- "qt/themes/cleanlook/style.css",
- "qt/themes/sahara/name.cfg",
- "qt/themes/sahara/style.css",
- "qt/themes/dark/name.cfg",
- "qt/themes/dark/style.css",
]
},
scripts=['electrum'],
