diff --git a/src/libprs500/gui2/images.qrc b/src/libprs500/gui2/images.qrc
deleted file mode 100644
index 89f91664f2..0000000000
--- a/src/libprs500/gui2/images.qrc
+++ /dev/null
@@ -1,70 +0,0 @@
-
-
- images/back.svg
- images/book.svg
- images/search.svg
- images/exec.svg
- images/ok.svg
- images/user_profile.svg
- images/chapters.svg
- images/clear_left.svg
- images/config.svg
- images/convert.svg
- images/dialog_error.svg
- images/dialog_warning.svg
- images/dialog_information.svg
- images/document_open.svg
- images/edit_input.svg
- images/forward.svg
- images/jobs-animated.mng
- images/jobs.svg
- images/library.png
- images/list_remove.svg
- images/lookfeel.svg
- images/metadata.svg
- images/mimetypes/bmp.svg
- images/mimetypes/dir.svg
- images/mimetypes/gif.svg
- images/mimetypes/html.svg
- images/mimetypes/jpeg.svg
- images/mimetypes/mobi.svg
- images/mimetypes/lit.svg
- images/mimetypes/lrf.svg
- images/mimetypes/lrx.svg
- images/mimetypes/pdf.svg
- images/mimetypes/png.svg
- images/mimetypes/rar.svg
- images/mimetypes/rtf.svg
- images/mimetypes/svg.svg
- images/mimetypes/txt.svg
- images/mimetypes/unknown.svg
- images/mimetypes/zero.svg
- images/mimetypes/zip.svg
- images/news.svg
- images/news/bbc.png
- images/news/cnn.png
- images/news/newsweek.png
- images/news/nytimes.png
- images/news/economist.png
- images/news/nasa.png
- images/news/newyorker.png
- images/news/zeitde.png
- images/news/spiegelde.png
- images/news/faznet.png
- images/news/dilbert.png
- images/news/wsj.png
- images/news/portfolio.png
- images/news/barrons.png
- images/next.svg
- images/page.svg
- images/plus.svg
- images/previous.svg
- images/reader.svg
- images/save.svg
- images/sd.svg
- images/sync.svg
- images/trash.svg
- images/view.svg
- images/viewer.svg
-
-
diff --git a/src/libprs500/gui2/images/news/atlantic.png b/src/libprs500/gui2/images/news/atlantic.png
new file mode 100644
index 0000000000..cfdcd62353
Binary files /dev/null and b/src/libprs500/gui2/images/news/atlantic.png differ
diff --git a/src/libprs500/gui2/images/news/chr_mon.png b/src/libprs500/gui2/images/news/chr_mon.png
new file mode 100644
index 0000000000..efc761f435
Binary files /dev/null and b/src/libprs500/gui2/images/news/chr_mon.png differ
diff --git a/src/libprs500/gui2/images/news/jpost.png b/src/libprs500/gui2/images/news/jpost.png
new file mode 100644
index 0000000000..725def454d
Binary files /dev/null and b/src/libprs500/gui2/images/news/jpost.png differ
diff --git a/src/libprs500/gui2/images/news/wired.png b/src/libprs500/gui2/images/news/wired.png
new file mode 100644
index 0000000000..c7acfc5e43
Binary files /dev/null and b/src/libprs500/gui2/images/news/wired.png differ
diff --git a/src/libprs500/gui2/make.py b/src/libprs500/gui2/make.py
index d61fb2ec61..8d84360605 100644
--- a/src/libprs500/gui2/make.py
+++ b/src/libprs500/gui2/make.py
@@ -13,6 +13,7 @@ check_call = partial(subprocess.check_call, shell=True)
sys.path.insert(1, os.path.abspath('..%s..'%os.sep))
from libprs500 import __appname__
+from libprs500.path import path
def find_forms():
forms = []
@@ -43,19 +44,33 @@ def build_forms(forms):
def build_images():
- newest = 0
- for root, dirs, files in os.walk(os.path.join('.', 'images')):
- for name in files:
- newest = max(os.stat(os.path.join(root, name)).st_mtime, newest)
+ p = path('images')
+ mtime = p.mtime
+ for x in p.walk():
+ mtime = max(x.mtime, mtime)
+ images = path('images_rc.py')
+ if not images.exists() or mtime > images.mtime:
+ print 'Compiling images...'
+ files = []
+ for x in p.walk():
+ if '.svn' in x or '.bzr' in x or x.isdir():
+ continue
+ alias = ' alias="library"' if x == p/'library.png' else ''
+ files.append('%s'%(alias, x))
+ qrc = '\n\n%s\n\n'%'\n'.join(files)
+ f = open('images.qrc', 'wb')
+ f.write(qrc)
+ f.close()
+ check_call(' '.join(['pyrcc4', '-o', images, 'images.qrc']))
+ compiler.compileFile(images)
+ os.utime(images, None)
+ os.utime(images, None)
+ print 'Size of images:', '%.2f MB'%(path(images+'c').size/(1024*1024.))
+ os.unlink(f.name)
- newest = max(newest, os.stat('images.qrc').st_mtime)
- if not os.path.exists('images_rc.py') or newest > os.stat('images_rc.py').st_mtime:
- print 'Compiling images'
- check_call(' '.join(['pyrcc4', '-o', 'images_rc.py', 'images.qrc']))
- compiler.compileFile('images_rc.py')
- os.utime('images_rc.py', None)
- os.utime('images_rc.pyc', None)
+
+
def build(forms):
build_forms(forms)