Skip to content

Commit

Permalink
Added culebra icon
Browse files Browse the repository at this point in the history
 - Added package data
 - Added wake before refresh (in case the device goes to sleep)
  • Loading branch information
dtmilano committed Jan 30, 2015
1 parent 8bfaf43 commit cfcf95f
Show file tree
Hide file tree
Showing 12 changed files with 21 additions and 9 deletions.
11 changes: 7 additions & 4 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand All @@ -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',
Expand Down
2 changes: 2 additions & 0 deletions src/androidviewclient.egg-info/SOURCES.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion src/androidviewclient.egg-info/requires.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
setuptools
setuptools
1 change: 1 addition & 0 deletions src/androidviewclient.egg-info/top_level.txt
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
share
com
2 changes: 1 addition & 1 deletion src/com/dtmilano/android/adb/adbclient.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
@author: Diego Torres Milano
'''

__version__ = '9.6.1'
__version__ = '10.0.0'

import sys
import warnings
Expand Down
2 changes: 1 addition & 1 deletion src/com/dtmilano/android/controlpanel.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
@author: Ahmed Kasem
'''

__version__ = '9.6.1'
__version__ = '10.0.0'

import sys, os
import Tkinter, tkFileDialog, ttk
Expand Down
6 changes: 6 additions & 0 deletions src/com/dtmilano/android/culebron.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand Down
Empty file added src/share/__init__.py
Empty file.
Empty file added src/share/pixmaps/__init__.py
Empty file.
Binary file added src/share/pixmaps/culebra.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion tools/culebra
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ ___________________/ /__/ /__/ /__/ /________________________________
'''

__version__ = '9.6.1'
__version__ = '10.0.0'

import re
import sys
Expand Down
2 changes: 1 addition & 1 deletion tools/dump
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Created on Feb 3, 2012
@author: diego
'''

__version__ = '9.6.2'
__version__ = '10.0.0'

import sys
import os
Expand Down

0 comments on commit cfcf95f

Please sign in to comment.