X-Git-Url: http://git.onelab.eu/?p=sface.git;a=blobdiff_plain;f=sface.py;h=ae4770d01e624d14b3e0fa69b07d31cc96d64e5f;hp=f7192570ebaea8a09efcd0cdfe3236dac69b9a4d;hb=af944fe917c3f4236a162b318d466f3948543019;hpb=e545d8ccf099ea9ab890e24234f7e3e5bcd2b41f

diff --git a/sface.py b/sface.py
index f719257..ae4770d 100644
--- a/sface.py
+++ b/sface.py
@@ -1,18 +1,15 @@
-
 import sys
 sys.path.append(".")
 
+from optparse import OptionParser
+
 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)
-
-    win = SfaWindow()
-    win.show()
-    win.setWindowTitle("Sface: SFA Interface")
-    app.setActiveWindow(win)
     app.setStyleSheet('''
 QTreeView, QLineEdit { 
   border: 2px solid gray;
@@ -21,13 +18,33 @@ QTreeView, QLineEdit {
   margin: 2px;
 }
 
-QLabel {
+ QPushButton {
+   background-color: white;
+   border: 2px solid gray;
+   border-radius: 4px;
+   padding: 6px;
+   margin: 5px;
+ }
+
+ QPushButton:pressed {
+   background-color: #5599FF;
+ }
 
-}
 ''')
 
+
+    win = MainWindow()
+    win.setWindowTitle("Sface: SFA Interface")
+    win.show()
+    app.setActiveWindow(win)
+
     sys.exit(app.exec_())
 
 
 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)