[Pkg-anonymity-tools] [onionshare] 86/140: moved images to subfolder (#126)
Ulrike Uhlig
u-guest at moszumanska.debian.org
Mon Sep 29 20:33:50 UTC 2014
This is an automated email from the git hooks/post-receive script.
u-guest pushed a commit to branch master
in repository onionshare.
commit 8d01ad7ec6931ae83efa7fb1dc5c7b60163afcf7
Author: Micah Lee <micah at micahflee.com>
Date: Wed Sep 3 17:36:03 2014 -0700
moved images to subfolder (#126)
---
MANIFEST.in | 10 +++++-----
onionshare_gui/file_selection.py | 2 +-
onionshare_gui/{ => images}/drop_files.png | Bin
onionshare_gui/{ => images}/logo.png | Bin
onionshare_gui/{ => images}/server_started.png | Bin
onionshare_gui/{ => images}/server_stopped.png | Bin
onionshare_gui/{ => images}/server_working.png | Bin
onionshare_gui/onionshare_gui.py | 2 +-
onionshare_gui/server_status.py | 6 +++---
setup/onionshare-osx.spec | 10 +++++-----
setup/onionshare.nsi | 22 ++++++++++++----------
11 files changed, 27 insertions(+), 25 deletions(-)
diff --git a/MANIFEST.in b/MANIFEST.in
index d791cbb..ea6193a 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -5,10 +5,10 @@ include version
include onionshare/index.html
include onionshare/404.html
include onionshare/strings.json
-include onionshare_gui/logo.png
-include onionshare_gui/drop_files.png
-include onionshare_gui/server_stopped.png
-include onionshare_gui/server_started.png
-include onionshare_gui/server_working.png
+include onionshare_gui/images/logo.png
+include onionshare_gui/images/drop_files.png
+include onionshare_gui/images/server_stopped.png
+include onionshare_gui/images/server_started.png
+include onionshare_gui/images/server_working.png
include setup/onionshare.desktop
include setup/onionshare80.xpm
diff --git a/onionshare_gui/file_selection.py b/onionshare_gui/file_selection.py
index a563fd0..0b839df 100644
--- a/onionshare_gui/file_selection.py
+++ b/onionshare_gui/file_selection.py
@@ -36,7 +36,7 @@ class FileList(QtGui.QListWidget):
# drag and drop label
self.drop_label = QtGui.QLabel(QtCore.QString(strings._('gui_drag_and_drop')), parent=self)
self.drop_label.setAlignment(QtCore.Qt.AlignCenter)
- self.drop_label.setStyleSheet('background: url({0}/drop_files.png) no-repeat center center; color: #999999;'.format(common.onionshare_gui_dir))
+ self.drop_label.setStyleSheet('background: url({0}/images/drop_files.png) no-repeat center center; color: #999999;'.format(common.onionshare_gui_dir))
self.drop_label.hide()
self.filenames = []
diff --git a/onionshare_gui/drop_files.png b/onionshare_gui/images/drop_files.png
similarity index 100%
rename from onionshare_gui/drop_files.png
rename to onionshare_gui/images/drop_files.png
diff --git a/onionshare_gui/logo.png b/onionshare_gui/images/logo.png
similarity index 100%
rename from onionshare_gui/logo.png
rename to onionshare_gui/images/logo.png
diff --git a/onionshare_gui/server_started.png b/onionshare_gui/images/server_started.png
similarity index 100%
rename from onionshare_gui/server_started.png
rename to onionshare_gui/images/server_started.png
diff --git a/onionshare_gui/server_stopped.png b/onionshare_gui/images/server_stopped.png
similarity index 100%
rename from onionshare_gui/server_stopped.png
rename to onionshare_gui/images/server_stopped.png
diff --git a/onionshare_gui/server_working.png b/onionshare_gui/images/server_working.png
similarity index 100%
rename from onionshare_gui/server_working.png
rename to onionshare_gui/images/server_working.png
diff --git a/onionshare_gui/onionshare_gui.py b/onionshare_gui/onionshare_gui.py
index dc59c4e..50dae52 100644
--- a/onionshare_gui/onionshare_gui.py
+++ b/onionshare_gui/onionshare_gui.py
@@ -227,7 +227,7 @@ def main():
# create the onionshare icon
global window_icon
- window_icon = QtGui.QIcon("{0}/logo.png".format(common.onionshare_gui_dir))
+ window_icon = QtGui.QIcon("{0}/images/logo.png".format(common.onionshare_gui_dir))
# start the onionshare app
web.set_stay_open(stay_open)
diff --git a/onionshare_gui/server_status.py b/onionshare_gui/server_status.py
index 9494bff..e868da3 100644
--- a/onionshare_gui/server_status.py
+++ b/onionshare_gui/server_status.py
@@ -43,9 +43,9 @@ class ServerStatus(QtGui.QVBoxLayout):
self.file_selection = file_selection
# server layout
- self.status_image_stopped = QtGui.QImage('{0}/server_stopped.png'.format(common.onionshare_gui_dir))
- self.status_image_working = QtGui.QImage('{0}/server_working.png'.format(common.onionshare_gui_dir))
- self.status_image_started = QtGui.QImage('{0}/server_started.png'.format(common.onionshare_gui_dir))
+ self.status_image_stopped = QtGui.QImage('{0}/images/server_stopped.png'.format(common.onionshare_gui_dir))
+ self.status_image_working = QtGui.QImage('{0}/images/server_working.png'.format(common.onionshare_gui_dir))
+ self.status_image_started = QtGui.QImage('{0}/images/server_started.png'.format(common.onionshare_gui_dir))
self.status_image_label = QtGui.QLabel()
self.status_image_label.setFixedWidth(30)
self.start_server_button = QtGui.QPushButton(strings._('gui_start_server'))
diff --git a/setup/onionshare-osx.spec b/setup/onionshare-osx.spec
index deea73d..00d4eb4 100644
--- a/setup/onionshare-osx.spec
+++ b/setup/onionshare-osx.spec
@@ -8,11 +8,11 @@ a.datas += [
('onionshare/strings.json', 'onionshare/strings.json', 'DATA'),
('onionshare/index.html', 'onionshare/index.html', 'DATA'),
('onionshare/404.html', 'onionshare/404.html', 'DATA'),
- ('onionshare_gui/logo.png', 'onionshare_gui/logo.png', 'DATA'),
- ('onionshare_gui/drop_files.png', 'onionshare_gui/drop_files.png', 'DATA'),
- ('onionshare_gui/server_stopped.png', 'onionshare_gui/server_stopped.png', 'DATA'),
- ('onionshare_gui/server_started.png', 'onionshare_gui/server_started.png', 'DATA'),
- ('onionshare_gui/server_working.png', 'onionshare_gui/server_working.png', 'DATA'),
+ ('onionshare_gui/images/logo.png', 'onionshare_gui/images/logo.png', 'DATA'),
+ ('onionshare_gui/images/drop_files.png', 'onionshare_gui/images/drop_files.png', 'DATA'),
+ ('onionshare_gui/images/server_stopped.png', 'onionshare_gui/images/server_stopped.png', 'DATA'),
+ ('onionshare_gui/images/server_started.png', 'onionshare_gui/images/server_started.png', 'DATA'),
+ ('onionshare_gui/images/server_working.png', 'onionshare_gui/images/server_working.png', 'DATA'),
]
pyz = PYZ(a.pure)
exe = EXE(pyz,
diff --git a/setup/onionshare.nsi b/setup/onionshare.nsi
index a086646..6ea7634 100644
--- a/setup/onionshare.nsi
+++ b/setup/onionshare.nsi
@@ -58,11 +58,12 @@ Section "install"
File "${BINPATH}\onionshare_gui\onionshare_gui.pyc"
File "${BINPATH}\onionshare_gui\__init__.py"
File "${BINPATH}\onionshare_gui\__init__.pyc"
- File "${BINPATH}\onionshare_gui\logo.png"
- File "${BINPATH}\onionshare_gui\drop_files.png"
- File "${BINPATH}\onionshare_gui\server_stopped.png"
- File "${BINPATH}\onionshare_gui\server_started.png"
- File "${BINPATH}\onionshare_gui\server_working.png"
+ SetOutPath "$INSTDIR\onionshare_gui\images"
+ File "${BINPATH}\onionshare_gui\images\logo.png"
+ File "${BINPATH}\onionshare_gui\images\drop_files.png"
+ File "${BINPATH}\onionshare_gui\images\server_stopped.png"
+ File "${BINPATH}\onionshare_gui\images\server_started.png"
+ File "${BINPATH}\onionshare_gui\images\server_working.png"
# dependencies
SetOutPath $INSTDIR
@@ -165,11 +166,11 @@ Section "uninstall"
Delete "$INSTDIR\onionshare\strings.json"
Delete "$INSTDIR\onionshare_gui\__init__.py"
Delete "$INSTDIR\onionshare_gui\__init__.pyc"
- Delete "$INSTDIR\onionshare_gui\logo.png"
- Delete "$INSTDIR\onionshare_gui\drop_files.png"
- Delete "$INSTDIR\onionshare_gui\server_stopped.png"
- Delete "$INSTDIR\onionshare_gui\server_started.png"
- Delete "$INSTDIR\onionshare_gui\server_working.png"
+ Delete "$INSTDIR\onionshare_gui\images\logo.png"
+ Delete "$INSTDIR\onionshare_gui\images\drop_files.png"
+ Delete "$INSTDIR\onionshare_gui\images\server_stopped.png"
+ Delete "$INSTDIR\onionshare_gui\images\server_started.png"
+ Delete "$INSTDIR\onionshare_gui\images\server_working.png"
Delete "$INSTDIR\onionshare_gui\onionshare_gui.py"
Delete "$INSTDIR\onionshare_gui\onionshare_gui.pyc"
Delete "$INSTDIR\qt4_plugins\accessible\qtaccessiblewidgets4.dll"
@@ -215,6 +216,7 @@ Section "uninstall"
Delete "$INSTDIR\win32wnet.pyd"
rmDir "$INSTDIR\onionshare"
+ rmDir "$INSTDIR\onionshare_gui\images"
rmDir "$INSTDIR\onionshare_gui"
rmDir "$INSTDIR\Include"
rmDir "$INSTDIR\qt4_plugins\accessible"
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/onionshare.git
More information about the Pkg-anonymity-tools
mailing list