Added culebra icon

dtmilano · dtmilano · commit cfcf95fa7d1f · 2015-01-29T22:02:20.000-05:00
- Added package data
 - Added wake before refresh (in case the device goes to sleep)
diff --git a/setup.py b/setup.py
@@ -3,10 +3,11 @@
 from setuptools import setup, find_packages
 
 setup(name='androidviewclient',
-    version='9.6.1',
-    description='''AndroidViewClient is a 100% pure python tool that
-        simplifies test script creation providing higher level operations and the ability of
-        obtaining the tree of Views present at any given moment on the device or emulator screen.
+    version='10.0.0',
+    description='''AndroidViewClient is a 100% pure python library and tools
+        that simplifies test script creation providing higher level
+        operations and the ability of obtaining the tree of Views present at
+        any given moment on the device or emulator screen.
         ''',
     license='Apache',
     keywords='android uiautomator viewclient monkeyrunner test automation',
@@ -15,6 +16,8 @@
     url='https://github.com/dtmilano/AndroidViewClient/',
     packages=find_packages('src'),
     package_dir={'':'src'},
+    package_data={'':['*.png']},
+    include_package_data=True,
     scripts=['tools/culebra', 'tools/dump'],
     classifiers=['Development Status :: 5 - Production/Stable',
                  'Intended Audience :: Developers',
diff --git a/src/androidviewclient.egg-info/SOURCES.txt b/src/androidviewclient.egg-info/SOURCES.txt
@@ -15,5 +15,7 @@ src/com/dtmilano/android/window.py
 src/com/dtmilano/android/adb/__init__.py
 src/com/dtmilano/android/adb/adbclient.py
 src/com/dtmilano/android/adb/androidkeymap.py
+src/share/__init__.py
+src/share/pixmaps/__init__.py
 tools/culebra
 tools/dump
diff --git a/src/androidviewclient.egg-info/requires.txt b/src/androidviewclient.egg-info/requires.txt
@@ -1 +1 @@
-setuptools
+setuptools
diff --git a/src/androidviewclient.egg-info/top_level.txt b/src/androidviewclient.egg-info/top_level.txt
@@ -1 +1,2 @@
+share
 com
diff --git a/src/com/dtmilano/android/adb/adbclient.py b/src/com/dtmilano/android/adb/adbclient.py
@@ -17,7 +17,7 @@
 @author: Diego Torres Milano
 '''
 
-__version__ = '9.6.1'
+__version__ = '10.0.0'
 
 import sys
 import warnings
diff --git a/src/com/dtmilano/android/controlpanel.py b/src/com/dtmilano/android/controlpanel.py
@@ -19,7 +19,7 @@
     @author: Ahmed Kasem
     '''
 
-__version__ = '9.6.1'
+__version__ = '10.0.0'
 
 import sys, os
 import Tkinter, tkFileDialog, ttk
diff --git a/src/com/dtmilano/android/culebron.py b/src/com/dtmilano/android/culebron.py
@@ -30,6 +30,7 @@
 import platform
 from Tkconstants import DISABLED
 from __builtin__ import False
+from pkg_resources import Requirement, resource_filename
 
 try:
     from PIL import Image, ImageTk
@@ -157,6 +158,10 @@ def __init__(self, vc, printOperation, scale=1):
         self.serialno = vc.serialno
         self.scale = scale
         self.window = Tkinter.Tk()
+        icon = resource_filename(Requirement.parse("androidviewclient"),
+            "share/pixmaps/culebra.png")
+        self.window.tk.call('wm', 'iconphoto',  self.window._w,
+            ImageTk.PhotoImage(file=icon))
         self.mainMenu = MainMenu(self)
         self.window.config(menu=self.mainMenu)
         self.statusBar = StatusBar(self.window)
@@ -630,6 +635,7 @@ def onKeyPressed(self, event):
     
     def refresh(self):
             self.showVignette()
+            self.device.wake()
             display = copy.copy(self.device.display)
             self.device.initDisplayProperties()
             changed = False
diff --git a/src/share/__init__.py b/src/share/__init__.py
diff --git a/src/share/pixmaps/__init__.py b/src/share/pixmaps/__init__.py
diff --git a/src/share/pixmaps/culebra.png b/src/share/pixmaps/culebra.png
diff --git a/tools/culebra b/tools/culebra
@@ -20,7 +20,7 @@ ___________________/  /__/  /__/  /__/  /________________________________
 
 ''' 
 
-__version__ = '9.6.1'
+__version__ = '10.0.0'
 
 import re
 import sys
diff --git a/tools/dump b/tools/dump
@@ -6,7 +6,7 @@ Created on Feb 3, 2012
 @author: diego
 '''
 
-__version__ = '9.6.2'
+__version__ = '10.0.0'
 
 import sys
 import os
