[X2Go-Commits] [pyhoca-gui] 02/71: CVix: rearrange CVix files in source tree

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch cvix/2.x
in repository pyhoca-gui.

commit 262f1581bb737fbc314080d3b6bccb48e8bd65f6
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Feb 5 09:35:33 2014 +0100

    CVix: rearrange CVix files in source tree
---
 CVix.py                                            |    6 +++---
 .../nsis_template_CVix.py => CVix_nsis_template.py |    0
 ...CVix_initemplate.py => CVix_session_template.py |    0
 setup_CVix.py => CVix_setup.py                     |    2 +-
 {CVix/icons => icons/CVix}/16x16/CVix.png          |  Bin 486 -> 486 bytes
 {CVix/icons => icons/CVix}/22x22/CVix.png          |  Bin 554 -> 554 bytes
 {CVix/img => img}/CVix.png                         |  Bin 3956205 -> 3956205 bytes
 {CVix/img => img}/cvix_about.png                   |  Bin 61359 -> 61359 bytes
 {CVix/pixmaps => pixmaps}/CVix.ico                 |  Bin 29686 -> 29686 bytes
 9 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/CVix.py b/CVix.py
index 6d568cd..d605156 100755
--- a/CVix.py
+++ b/CVix.py
@@ -40,7 +40,7 @@ import os
 import ConfigParser
 import getpass
 
-import CVix.CVix_initemplate
+import CVix_session_template
 
 from x2go import X2GOCLIENT_OS as _X2GOCLIENT_OS
 from x2go import X2goSessionProfiles
@@ -144,7 +144,7 @@ if sys.argv[0].startswith('./') or sys.argv[0].startswith('python') or sys.argv[
 if not ProgramFiles:
     ProgramFiles = '/Program Files/%s' % PROG_NAME
 
-f = open(os.path.join('CVix', 'customer'), 'r')
+f = open(os.path.join('CVix_customer'), 'r')
 CUSTOMER_HOST = f.read().replace('\n', '').replace('\r', '')
 f.close()
 CUSTOMER_USER = CUSTOMER_HOST.split('.')[0]
@@ -180,7 +180,7 @@ def configFile(ProgramFiles):
 
     if not found:
 
-        profile_config = CVix.CVix_initemplate.SESSION_PROFILE_TEMPLATE
+        profile_config = CVix_session_template.SESSION_PROFILE_TEMPLATE
         customized_config = {
             'sshproxyhost': '{hostname}'.format(hostname=CUSTOMER_HOST),
             'sshproxyport': 3389,
diff --git a/CVix/__init__.py b/CVix/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/CVix/nsis_template_CVix.py b/CVix_nsis_template.py
similarity index 100%
rename from CVix/nsis_template_CVix.py
rename to CVix_nsis_template.py
diff --git a/CVix/CVix_initemplate.py b/CVix_session_template.py
similarity index 100%
rename from CVix/CVix_initemplate.py
rename to CVix_session_template.py
diff --git a/setup_CVix.py b/CVix_setup.py
similarity index 99%
rename from setup_CVix.py
rename to CVix_setup.py
index bec0154..640f712 100755
--- a/setup_CVix.py
+++ b/CVix_setup.py
@@ -129,7 +129,7 @@ sys.path.append(os.path.normpath('../pyhoca-contrib/mswin/ms-vc-runtime'))
 
 from glob import glob
 
-exec("from %s.nsis_template_%s import NSIS_SCRIPT_TEMPLATE" % (PROGRAM_NAME, PROGRAM_NAME))
+exec("from nsis_template_%s import NSIS_SCRIPT_TEMPLATE" % (PROGRAM_NAME, PROGRAM_NAME))
 
 #
 # to build .exe file, run on Windows:
diff --git a/CVix/icons/16x16/CVix.png b/icons/CVix/16x16/CVix.png
similarity index 100%
rename from CVix/icons/16x16/CVix.png
rename to icons/CVix/16x16/CVix.png
diff --git a/CVix/icons/22x22/CVix.png b/icons/CVix/22x22/CVix.png
similarity index 100%
rename from CVix/icons/22x22/CVix.png
rename to icons/CVix/22x22/CVix.png
diff --git a/CVix/img/CVix.png b/img/CVix.png
similarity index 100%
rename from CVix/img/CVix.png
rename to img/CVix.png
diff --git a/CVix/img/cvix_about.png b/img/cvix_about.png
similarity index 100%
rename from CVix/img/cvix_about.png
rename to img/cvix_about.png
diff --git a/CVix/pixmaps/CVix.ico b/pixmaps/CVix.ico
similarity index 100%
rename from CVix/pixmaps/CVix.ico
rename to pixmaps/CVix.ico

--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/pyhoca-gui.git