tMerge pull request #1647 from akshayaurora/test_startup - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit 541257be34af2c8f55cd99eaf9f25e48dc0d41ca
DIR parent ed4db10943caaa2e4197ed5f823a7c05043dd05c
HTML Author: ThomasV <thomasv@electrum.org>
Date: Thu, 28 Jan 2016 13:28:11 +0100
Merge pull request #1647 from akshayaurora/test_startup
kivy:Improve startup speed
Diffstat:
M .gitignore | 2 ++
M electrum | 51 ++++++++++++++++---------------
M electrum-env | 8 ++++----
M gui/kivy/__init__.py | 3 +++
A gui/kivy/data/glsl/default.fs | 4 ++++
A gui/kivy/data/glsl/default.png | 0
A gui/kivy/data/glsl/default.vs | 6 ++++++
A gui/kivy/data/glsl/header.fs | 10 ++++++++++
A gui/kivy/data/glsl/header.vs | 17 +++++++++++++++++
A gui/kivy/data/images/defaulttheme-… | 0
A gui/kivy/data/images/defaulttheme.… | 2 ++
A gui/kivy/data/logo/kivy-icon-32.png | 0
A gui/kivy/data/style.kv | 736 +++++++++++++++++++++++++++++++
M gui/kivy/main.kv | 8 --------
M gui/kivy/main_window.py | 22 ++--------------------
M gui/kivy/tools/buildozer.spec | 12 +++++-------
16 files changed, 817 insertions(+), 64 deletions(-)
---
DIR diff --git a/.gitignore b/.gitignore
t@@ -14,3 +14,5 @@ locale/
packages
env/
.tox/
+.buildozer/
+bin/
DIR diff --git a/electrum b/electrum
t@@ -31,31 +31,32 @@ if is_local or is_android:
elif is_bundle and sys.platform=='darwin':
sys.path.insert(0, os.getcwd() + "/lib/python2.7/packages")
-# pure-python dependencies need to be imported here for pyinstaller
-try:
- import dns
- import aes
- import ecdsa
- import requests
- import six
- import qrcode
- import pbkdf2
- import google.protobuf
-except ImportError as e:
- sys.exit("Error: %s. Try 'sudo pip install <module-name>'"%e.message)
-
-# the following imports are for pyinstaller
-from google.protobuf import descriptor
-from google.protobuf import message
-from google.protobuf import reflection
-from google.protobuf import descriptor_pb2
-
-
-# check that we have the correct version of ecdsa
-try:
- from ecdsa.ecdsa import curve_secp256k1, generator_secp256k1
-except Exception:
- sys.exit("cannot import ecdsa.curve_secp256k1. You probably need to upgrade ecdsa.\nTry: sudo pip install --upgrade ecdsa")
+if not is_android:
+ # pure-python dependencies need to be imported here for pyinstaller
+ try:
+ import dns
+ import aes
+ import ecdsa
+ import requests
+ import six
+ import qrcode
+ import pbkdf2
+ import google.protobuf
+ except ImportError as e:
+ sys.exit("Error: %s. Try 'sudo pip install <module-name>'"%e.message)
+
+ # the following imports are for pyinstaller
+ from google.protobuf import descriptor
+ from google.protobuf import message
+ from google.protobuf import reflection
+ from google.protobuf import descriptor_pb2
+
+
+ # check that we have the correct version of ecdsa
+ try:
+ from ecdsa.ecdsa import curve_secp256k1, generator_secp256k1
+ except Exception:
+ sys.exit("cannot import ecdsa.curve_secp256k1. You probably need to upgrade ecdsa.\nTry: sudo pip install --upgrade ecdsa")
# load local module as electrum
DIR diff --git a/electrum-env b/electrum-env
t@@ -10,11 +10,11 @@
# your package manager.
if [ -e ./env/bin/activate ]; then
- source ./env/bin/activate
+ source ./env/bin/activate
else
- virtualenv env
- source ./env/bin/activate
- python setup.py install
+ virtualenv env
+ source ./env/bin/activate
+ python setup.py install
fi
export PYTHONPATH="/usr/local/lib/python2.7/site-packages:$PYTHONPATH"
DIR diff --git a/gui/kivy/__init__.py b/gui/kivy/__init__.py
t@@ -19,6 +19,9 @@
# Kivy GUI
import sys
+import os
+os.environ['KIVY_DATA_DIR'] = os.path.abspath(os.path.dirname(__file__)) + '/data/'
+
try:
sys.argv = ['']
import kivy
DIR diff --git a/gui/kivy/data/glsl/default.fs b/gui/kivy/data/glsl/default.fs
t@@ -0,0 +1,4 @@
+$HEADER$
+void main (void){
+ gl_FragColor = frag_color * texture2D(texture0, tex_coord0);
+}
DIR diff --git a/gui/kivy/data/glsl/default.png b/gui/kivy/data/glsl/default.png
Binary files differ.
DIR diff --git a/gui/kivy/data/glsl/default.vs b/gui/kivy/data/glsl/default.vs
t@@ -0,0 +1,6 @@
+$HEADER$
+void main (void) {
+ frag_color = color * vec4(1.0, 1.0, 1.0, opacity);
+ tex_coord0 = vTexCoords0;
+ gl_Position = projection_mat * modelview_mat * vec4(vPosition.xy, 0.0, 1.0);
+}
DIR diff --git a/gui/kivy/data/glsl/header.fs b/gui/kivy/data/glsl/header.fs
t@@ -0,0 +1,10 @@
+#ifdef GL_ES
+ precision highp float;
+#endif
+
+/* Outputs from the vertex shader */
+varying vec4 frag_color;
+varying vec2 tex_coord0;
+
+/* uniform texture samplers */
+uniform sampler2D texture0;
DIR diff --git a/gui/kivy/data/glsl/header.vs b/gui/kivy/data/glsl/header.vs
t@@ -0,0 +1,17 @@
+#ifdef GL_ES
+ precision highp float;
+#endif
+
+/* Outputs to the fragment shader */
+varying vec4 frag_color;
+varying vec2 tex_coord0;
+
+/* vertex attributes */
+attribute vec2 vPosition;
+attribute vec2 vTexCoords0;
+
+/* uniform variables */
+uniform mat4 modelview_mat;
+uniform mat4 projection_mat;
+uniform vec4 color;
+uniform float opacity;
DIR diff --git a/gui/kivy/data/images/defaulttheme-0.png b/gui/kivy/data/images/defaulttheme-0.png
Binary files differ.
DIR diff --git a/gui/kivy/data/images/defaulttheme.atlas b/gui/kivy/data/images/defaulttheme.atlas
t@@ -0,0 +1 @@
parazyd.org:70 /git/electrum/commit/541257be34af2c8f55cd99eaf9f25e48dc0d41ca.gph:181: line too long