git://git.onelab.eu
/
sface.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git.onelab.eu:/git/sface
[sface.git]
/
sface.py
diff --git
a/sface.py
b/sface.py
index
f719257
..
d90c634
100644
(file)
--- a/
sface.py
+++ b/
sface.py
@@
-1,15
+1,17
@@
-
import sys
sys.path.append(".")
import sys
sys.path.append(".")
+from optparse import OptionParser
+
from PyQt4.QtGui import *
from PyQt4.QtGui import *
-from sface.sfawindow import SfaWindow
+from sface.mainwindow import MainWindow
+from sface.config import config
def main(args):
app = QApplication(args)
def main(args):
app = QApplication(args)
- win =
Sfa
Window()
+ win =
Main
Window()
win.show()
win.setWindowTitle("Sface: SFA Interface")
app.setActiveWindow(win)
win.show()
win.setWindowTitle("Sface: SFA Interface")
app.setActiveWindow(win)
@@
-30,4
+32,9
@@
QLabel {
if __name__ == "__main__":
if __name__ == "__main__":
+ parser=OptionParser()
+ config.add_options_to_OptionParser(parser)
+ (options,args)=parser.parse_args()
+ config.update_from_OptionParser(options)
+ config.display("After command-line")
main(sys.argv)
main(sys.argv)