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
manage signals between screens through sfascreen
[sface.git]
/
sface.py
diff --git
a/sface.py
b/sface.py
index
f719257
..
256c8be
100644
(file)
--- a/
sface.py
+++ b/
sface.py
@@
-1,18
+1,15
@@
-
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 = SfaWindow()
- win.show()
- win.setWindowTitle("Sface: SFA Interface")
- app.setActiveWindow(win)
app.setStyleSheet('''
QTreeView, QLineEdit {
border: 2px solid gray;
app.setStyleSheet('''
QTreeView, QLineEdit {
border: 2px solid gray;
@@
-21,13
+18,39
@@
QTreeView, QLineEdit {
margin: 2px;
}
margin: 2px;
}
-QLabel {
+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__":
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)
main(sys.argv)