Skip to content

Commit

Permalink
Migrate to use PySide instead of Pyqt4, fix Alfanous-team#296
Browse files Browse the repository at this point in the history
  • Loading branch information
assem-ch committed Feb 22, 2014
1 parent ab35389 commit 971f487
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -302,14 +302,14 @@ help_sphinx:
qt_all: qt_rcc qt_uic

qt_uic:
pyuic4 -o $(DESKTOP_INTERFACE_PATH)aboutDlg_ui.py $(QT_UI_PATH)aboutDlg.ui
pyuic4 -o $(DESKTOP_INTERFACE_PATH)preferencesDlg_ui.py $(QT_UI_PATH)preferencesDlg.ui
pyuic4 -o $(DESKTOP_INTERFACE_PATH)mainform_ui.py $(QT_UI_PATH)mainform.ui #-x
pyside-uic -o $(DESKTOP_INTERFACE_PATH)aboutDlg_ui.py $(QT_UI_PATH)aboutDlg.ui
pyside-uic -o $(DESKTOP_INTERFACE_PATH)preferencesDlg_ui.py $(QT_UI_PATH)preferencesDlg.ui
pyside-uic -o $(DESKTOP_INTERFACE_PATH)mainform_ui.py $(QT_UI_PATH)mainform.ui #-x
#sed 's/\"MainWindow\"\,/\"MainWindow\"\,\_(/g' temp.py | sed 's/\, None\,/\)\, None\,/g'| sed 's/from PyQt4/LOCALPATH="\.\/locale\/"\nimport gettext\n\_\=gettext\.gettext\ngettext\.bindtextdomain\(\"alfanousQT\"\, LOCALPATH\)\ngettext\.textdomain\(\"alfanousQT\"\)\nfrom PyQt4/g'> $(DESKTOP_INTERFACE_PATH)mainform_ui.py
#rm temp.py

qt_rcc:
pyrcc4 $(QT_RC_PATH)main.qrc -o $(DESKTOP_INTERFACE_PATH)main_rc.py
pyside-rcc $(QT_RC_PATH)main.qrc -o $(DESKTOP_INTERFACE_PATH)main_rc.py

## build localization files, this include:
# 1. Desktop interface , see local_desktop_pot
Expand Down
4 changes: 2 additions & 2 deletions src/alfanous-desktop/Gui.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@
from configobj import ConfigObj


from PyQt4 import QtGui, QtCore, uic
from PyQt4.QtCore import QRect
from PySide import QtGui, QtCore
from PySide.QtCore import QRect

sys.path.insert(0, "../../src") ## a relative path, development mode
sys.path.append("alfanous.egg/alfanous") ## an egg, portable
Expand Down

0 comments on commit 971f487

Please sign in to comment.