updated lists of files that were removed with changing gui to Qt native

3 files changed, 2 insertions, 29 deletions

diff --git a/MANIFEST.in b/MANIFEST.in
index 6796a0a7..9f80ad18 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -5,12 +5,6 @@ include version
 include onionshare/index.html
 include onionshare/404.html
 include onionshare/strings.json
-include onionshare_gui/onionshare-icon.png
-include onionshare_gui/templates/index.html
-include onionshare_gui/static/jquery-1.11.1.min.js
-include onionshare_gui/static/helpers.js
-include onionshare_gui/static/onionshare.js
-include onionshare_gui/static/style.css
 include onionshare_gui/static/loader.gif
 include onionshare_gui/static/logo.png
 include setup/onionshare.desktop
diff --git a/setup/onionshare-osx.spec b/setup/onionshare-osx.spec
index 9371d2f0..29941afa 100644
--- a/setup/onionshare-osx.spec
+++ b/setup/onionshare-osx.spec
@@ -8,14 +8,8 @@ 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/onionshare-icon.png', 'onionshare_gui/onionshare-icon.png', 'DATA'),

-    ('onionshare_gui/static/jquery-1.11.1.min.js', 'onionshare_gui/static/jquery-1.11.1.min.js', 'DATA'),

-    ('onionshare_gui/static/helpers.js', 'onionshare_gui/static/helpers.js', 'DATA'),

-    ('onionshare_gui/static/onionshare.js', 'onionshare_gui/static/onionshare.js', 'DATA'),

-    ('onionshare_gui/static/style.css', 'onionshare_gui/static/style.css', 'DATA'),

     ('onionshare_gui/static/loader.gif', 'onionshare_gui/static/loader.gif', 'DATA'),

     ('onionshare_gui/static/logo.png', 'onionshare_gui/static/logo.png', 'DATA'),

-    ('onionshare_gui/templates/index.html', 'onionshare_gui/templates/index.html', 'DATA'),

 ]

 pyz = PYZ(a.pure)

 exe = EXE(pyz,

diff --git a/setup/onionshare.nsi b/setup/onionshare.nsi
index 8fd368f3..654a0b64 100644
--- a/setup/onionshare.nsi
+++ b/setup/onionshare.nsi
@@ -5,8 +5,8 @@
 # change these with each release

 !define INSTALLSIZE 46124

 !define VERSIONMAJOR 0

-!define VERSIONMINOR 4

-!define VERSIONSTRING "0.4"

+!define VERSIONMINOR 5

+!define VERSIONSTRING "0.5dev"

 

 RequestExecutionLevel admin

 

@@ -59,18 +59,11 @@ Section "install"
     File "${BINPATH}\onionshare_gui\onionshare_gui.pyc"

     File "${BINPATH}\onionshare_gui\webapp.py"

     File "${BINPATH}\onionshare_gui\webapp.pyc"

-    File "${BINPATH}\onionshare_gui\onionshare-icon.png"

     File "${BINPATH}\onionshare_gui\__init__.py"

     File "${BINPATH}\onionshare_gui\__init__.pyc"

-    SetOutPath "$INSTDIR\onionshare_gui\templates"

-    File "${BINPATH}\onionshare_gui\templates\index.html"

     SetOutPath "$INSTDIR\onionshare_gui\static"

     File "${BINPATH}\onionshare_gui\static\logo.png"

-    File "${BINPATH}\onionshare_gui\static\jquery-1.11.1.min.js"

-    File "${BINPATH}\onionshare_gui\static\onionshare.js"

-    File "${BINPATH}\onionshare_gui\static\style.css"

     File "${BINPATH}\onionshare_gui\static\loader.gif"

-    File "${BINPATH}\onionshare_gui\static\helpers.js"

 

     # dependencies

     SetOutPath $INSTDIR

@@ -182,20 +175,13 @@ Section "uninstall"
     Delete "$INSTDIR\onionshare\strings.json"

     Delete "$INSTDIR\onionshare_gui\__init__.py"

     Delete "$INSTDIR\onionshare_gui\__init__.pyc"

-    Delete "$INSTDIR\onionshare_gui\templates"

-    Delete "$INSTDIR\onionshare_gui\templates\index.html"

     Delete "$INSTDIR\onionshare_gui\static"

     Delete "$INSTDIR\onionshare_gui\static\logo.png"

-    Delete "$INSTDIR\onionshare_gui\static\jquery-1.11.1.min.js"

-    Delete "$INSTDIR\onionshare_gui\static\onionshare.js"

-    Delete "$INSTDIR\onionshare_gui\static\style.css"

     Delete "$INSTDIR\onionshare_gui\static\loader.gif"

-    Delete "$INSTDIR\onionshare_gui\static\helpers.js"

     Delete "$INSTDIR\onionshare_gui\onionshare_gui.py"

     Delete "$INSTDIR\onionshare_gui\onionshare_gui.pyc"

     Delete "$INSTDIR\onionshare_gui\webapp.py"

     Delete "$INSTDIR\onionshare_gui\webapp.pyc"

-    Delete "$INSTDIR\onionshare_gui\onionshare-icon.png"

     Delete "$INSTDIR\qt4_plugins\accessible\qtaccessiblewidgets4.dll"

     Delete "$INSTDIR\qt4_plugins\graphicssystems\qglgraphicssystem4.dll"

     Delete "$INSTDIR\qt4_plugins\bearer\qnativewifibearer4.dll"

@@ -247,7 +233,6 @@ Section "uninstall"
     Delete "$INSTDIR\QtXml4.dll"

 

 	rmDir "$INSTDIR\onionshare"

-    rmDir "$INSTDIR\onionshare_gui\templates"

     rmDir "$INSTDIR\onionshare_gui\static"

     rmDir "$INSTDIR\onionshare_gui"

     rmDir "$INSTDIR\Include"