From 7494eb338adb3a381a8c86efb7bcaa994d7879a7 Mon Sep 17 00:00:00 2001
From: chriskiehl <audionautic@gmail.com>
Date: Sun, 24 Aug 2014 18:44:19 -0400
Subject: [PATCH] Made azeirah's suggested changes to setup.py

---
 .idea/workspace.xml      | 13 +++++++++----
 MANIFEST                 | 11 +++++++++++
 MANIFEST.in              |  3 ++-
 gooey/images/__init__.py |  0
 setup.py                 | 20 +++++++++++++-------
 5 files changed, 35 insertions(+), 12 deletions(-)
 create mode 100644 gooey/images/__init__.py

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index b2130e4..29e9eba 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -551,7 +551,11 @@
       <created>1408910743754</created>
       <updated>1408910743754</updated>
     </task>
-    <option name="localTasksCounter" value="12" />
+    <task id="LOCAL-00012" summary="Updated /dist">
+      <created>1408910822475</created>
+      <updated>1408910822475</updated>
+    </task>
+    <option name="localTasksCounter" value="13" />
     <servers />
   </component>
   <component name="TodoView" selected-index="4">
@@ -583,12 +587,12 @@
       <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32937366" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32937366" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.24960506" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.1637704" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
+      <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.1637704" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
       <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.39956802" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
       <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
       <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="true" content_ui="tabs" />
       <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.19978401" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
-      <window_info id="Version Control" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.16630669" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
+      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.16630669" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
       <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
       <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
       <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
@@ -622,7 +626,8 @@
     <MESSAGE value="Fixed setup.py again (I think)" />
     <MESSAGE value="Merge branch 'patch-1' of git://github.com/svisser/Gooey into svisser-patch-1&#10;&#10;Conflicts:&#10;&#9;setup.py&#10;" />
     <MESSAGE value="Added data_files to setup.py" />
-    <option name="LAST_COMMIT_MESSAGE" value="Added data_files to setup.py" />
+    <MESSAGE value="Updated /dist" />
+    <option name="LAST_COMMIT_MESSAGE" value="Updated /dist" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
diff --git a/MANIFEST b/MANIFEST
index 9557647..245f9b9 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -37,8 +37,19 @@ gooey\gui\option_reader.py
 gooey\gui\option_reader_unittest.py
 gooey\gui\runtime_display_panel.py
 gooey\gui\styling.py
+gooey\images\__init__.py
+gooey\images\alessandro_rei_checkmark.png
+gooey\images\computer.png
+gooey\images\computer2.png
+gooey\images\computer3.png
+gooey\images\icon.ico
+gooey\images\images.jpg
+gooey\images\loader.gif
+gooey\images\settings2.png
 gooey\languages\__init__.py
 gooey\languages\eng.py
+gooey\languages\english.json
+gooey\languages\french.json
 gooey\mockapplications\__init__.py
 gooey\mockapplications\example_argparse_souce_in_main.py
 gooey\mockapplications\example_argparse_souce_in_try.py
diff --git a/MANIFEST.in b/MANIFEST.in
index 35d6621..f8b4808 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,2 +1,3 @@
 include *.txt
-recursive-include docs *.txt
\ No newline at end of file
+include *.png
+include *.json
\ No newline at end of file
diff --git a/gooey/images/__init__.py b/gooey/images/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/setup.py b/setup.py
index bb83cc3..97522a2 100644
--- a/setup.py
+++ b/setup.py
@@ -6,17 +6,27 @@ with open('README.md') as readme:
 
 local_path = os.path.join(os.path.dirname(__file__), 'gooey') 
 
-images = [image for image in os.listdir(os.path.join(local_path, 'images'))]
+imagepath = os.path.join(local_path, 'images')
+langpath  = os.path.join(local_path, 'languages')
 
-languages = [lang 
-            for lang in os.listdir(os.path.join(local_path, 'languages'))
+images = [os.path.join(imagepath, image) for image in os.listdir(imagepath)]
+
+languages = [os.path.join(langpath, lang)
+            for lang in os.listdir(langpath)
             if '.py' not in lang]
 
+print(images)
+print(languages)
+
 setup(
     name='Gooey',
     version='0.1.0',
     author='Chris Kiehl',
     author_email='ckiehl@gmail.com',
+    data_files=[
+      ('', images), 
+      ('', languages)
+    ],
     packages=[
       'gooey',
       'gooey.gui',
@@ -25,10 +35,6 @@ setup(
       'gooey.mockapplications',
     ],
 
-    data_files=[
-      ('gooey/images', images), 
-      ('gooey/languages', languages)
-    ],
     url='http://pypi.python.org/pypi/Gooey/',
     license='LICENSE.txt',
     description='Turn (almost) any command line program into a full GUI application with one line',