team4alfanous team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Assem Chelli (عاصم شلي) (assem-ch)
  walid <walid@walid.(none)>
------------------------------------------------------------
revno: 367 [merge]
committer: Assem Chelli <assem.ch@xxxxxxxxx>
timestamp: Fri 2012-10-05 01:52:58 +0100
message:
  Merge branch 'master' of github.com:Alfanous-team/alfanous
  
  Conflicts:
  	src/alfanous-desktop/Gui.py
modified:
  src/alfanous-desktop/Gui.py


--
lp:alfanous
https://code.launchpad.net/~team4alfanous/alfanous/alfanous-git

Your team Alfanous team is subscribed to branch lp:alfanous.
To unsubscribe from this branch go to https://code.launchpad.net/~team4alfanous/alfanous/alfanous-git/+edit-subscription

=== modified file 'src/alfanous-desktop/Gui.py'
--- src/alfanous-desktop/Gui.py	2012-10-05 00:16:16 +0000
+++ src/alfanous-desktop/Gui.py	2012-10-05 00:52:58 +0000
@@ -32,7 +32,6 @@
 TODO load Qt resources on realtime or at least compile them on realtime if missed
 """
 
-
 ## Importing modules
 import sys, os, gettext
 from configobj import ConfigObj
@@ -55,10 +54,8 @@
 
 
 ## Load Qt forms & dialogs on real time
-print __file__
 
-THIS_FILE_DIR_PATH = os.path.dirname( __file__ ) + "/"
-print THIS_FILE_DIR_PATH
+THIS_FILE_DIR_PATH = os.path.dirname(os.path.abspath(__file__)) + "/"
 Ui_MainWindow = uic.loadUiType( THIS_FILE_DIR_PATH + "UI/mainform.ui" )[0]
 Ui_aboutDlg = uic.loadUiType( THIS_FILE_DIR_PATH + "UI/aboutDlg.ui" )[0]
 Ui_preferencesDlg = uic.loadUiType( THIS_FILE_DIR_PATH + "UI/preferencesDlg.ui" )[0]