X-Git-Url: http://git.onelab.eu/?p=sface.git;a=blobdiff_plain;f=sface.py;h=a66d7393865f3bc7eeb7a6c085d887e8bff42e42;hp=ea81d0aee401310b73a41c6c0a2e91d75a63396b;hb=32eb5fc79ad9745b7b1c3da1c96f442b0feb965c;hpb=21577912c86f62a62325bde9f6bd8bbe11bb28f1

diff --git a/sface.py b/sface.py
index ea81d0a..a66d739 100644
--- a/sface.py
+++ b/sface.py
@@ -1,21 +1,56 @@
-
 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()
+    app.setStyleSheet('''
+QTreeView, QLineEdit { 
+  border: 2px solid gray;
+  border-radius: 4px;
+  padding: 1px;
+  margin: 2px;
+}
+
+QPushButton {
+  background-color: white;
+  border: 2px solid gray;
+  border-radius: 4px;
+  padding: 6px;
+}
+
+QPushButton:pressed {
+  background-color: #5599FF;
+}
+
+QLabel {
+  font-size: 14px;
+}
+
+''')
+
+
+    win = MainWindow()
+    win.redirectOutputToLog()
     win.setWindowTitle("Sface: SFA Interface")
+    win.show()
+    win.raise_()
+    win.activateWindow()
     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)