git://git.onelab.eu
/
sface.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
40bea90
)
minor tweaks
author
Thierry Parmentelat
<thierry.parmentelat@sophia.inria.fr>
Tue, 8 Mar 2011 13:33:44 +0000
(14:33 +0100)
committer
Thierry Parmentelat
<thierry.parmentelat@sophia.inria.fr>
Tue, 8 Mar 2011 13:33:44 +0000
(14:33 +0100)
sface/mainwindow.py
patch
|
blob
|
history
sface/screens/configscreen.py
patch
|
blob
|
history
sface/screens/mainscreen.py
patch
|
blob
|
history
sface/sfiprocess.py
patch
|
blob
|
history
sface/xmlwidget.py
patch
|
blob
|
history
diff --git
a/sface/mainwindow.py
b/sface/mainwindow.py
index
0b52d95
..
fdd52a5
100644
(file)
--- a/
sface/mainwindow.py
+++ b/
sface/mainwindow.py
@@
-100,7
+100,7
@@
class MainWindow(QWidget):
layout.addWidget(self.screens)
layout.addLayout(hlayout)
self.setLayout(layout)
layout.addWidget(self.screens)
layout.addLayout(hlayout)
self.setLayout(layout)
- self.resize(800,
6
00)
+ self.resize(800,
5
00)
for link in (self.nav.main, self.nav.config):
self.connect(link, SIGNAL('linkActivated(QString)'),
for link in (self.nav.main, self.nav.config):
self.connect(link, SIGNAL('linkActivated(QString)'),
@@
-116,7
+116,7
@@
class MainWindow(QWidget):
def showLogWindow(self, link):
self.logWindow.show()
def showLogWindow(self, link):
self.logWindow.show()
- self.logWindow.resize(800,
4
00)
+ self.logWindow.resize(800,
2
00)
self.logWindow.raise_()
self.logWindow.activateWindow()
self.logWindow.raise_()
self.logWindow.activateWindow()
diff --git
a/sface/screens/configscreen.py
b/sface/screens/configscreen.py
index
97e697c
..
2319313
100644
(file)
--- a/
sface/screens/configscreen.py
+++ b/
sface/screens/configscreen.py
@@
-83,5
+83,5
@@
class ConfigScreen(SfaScreen):
SfaScreen.__init__(self, parent)
widget = ConfigWidget(self)
SfaScreen.__init__(self, parent)
widget = ConfigWidget(self)
- self.init(widget, "Configure", "Configure the OneLab
Federation GUI
")
+ self.init(widget, "Configure", "Configure the OneLab
SFA crawler
")
diff --git
a/sface/screens/mainscreen.py
b/sface/screens/mainscreen.py
index
6ffd7e0
..
547baec
100644
(file)
--- a/
sface/screens/mainscreen.py
+++ b/
sface/screens/mainscreen.py
@@
-457,7
+457,7
@@
class MainScreen(SfaScreen):
SfaScreen.__init__(self, parent)
slice = SliceWidget(self)
SfaScreen.__init__(self, parent)
slice = SliceWidget(self)
- self.init(slice, "Main Window", "OneLab
Federation GUI
")
+ self.init(slice, "Main Window", "OneLab
SFA crawler
")
def rspecUpdated(self):
self.mainwin.rspecWindow.updateView()
def rspecUpdated(self):
self.mainwin.rspecWindow.updateView()
diff --git
a/sface/sfiprocess.py
b/sface/sfiprocess.py
index
eee34bb
..
cd98a31
100644
(file)
--- a/
sface/sfiprocess.py
+++ b/
sface/sfiprocess.py
@@
-131,11
+131,12
@@
class SfiProcess(QObject):
if config.verbose:
self._trace=time.time()
command = "%s %s" % (self.exe, self.args.join(" "))
if config.verbose:
self._trace=time.time()
command = "%s %s" % (self.exe, self.args.join(" "))
- print time.strftime('%M:%S'),'Invoking',command
+ print time.strftime('%
H:%
M:%S'),'Invoking',command
def trace_end (self):
if config.verbose:
def trace_end (self):
if config.verbose:
- command = "%s %s" % (self.exe, self.args.join(" "))
- print time.strftime('%M:%S'),"[%.3f s]"%(time.time()-self._trace),command,'Done'
+# command = "%s %s" % (self.exe, self.args.join(" "))
+ print time.strftime('%H:%M:%S'),"Done [%.3f s]"%(time.time()-self._trace)
+ if config.debug:
self.xmlrpctracker.getAndPrint(self.output)
self.xmlrpctracker.getAndPrint(self.output)
diff --git
a/sface/xmlwidget.py
b/sface/xmlwidget.py
index
a2d3ec2
..
b11f1ed
100644
(file)
--- a/
sface/xmlwidget.py
+++ b/
sface/xmlwidget.py
@@
-263,9
+263,9
@@
class ElemNodeDelegate(QAbstractItemDelegate):
highGlobPattern = '<<b>%s</b>%s>'
highAttPattern = ' <b>%s</b>="%s"'
def getHtmlText(plainText, globPattern, attPattern):
highGlobPattern = '<<b>%s</b>%s>'
highAttPattern = ' <b>%s</b>="%s"'
def getHtmlText(plainText, globPattern, attPattern):
- print "PLAIN TEXT:", plainText
+
#
print "PLAIN TEXT:", plainText
tmp = plainText.split(' ', 1)
tmp = plainText.split(' ', 1)
- print "TMP:", tmp
+
#
print "TMP:", tmp
elemName = tmp[0]
AttListHtml = ''
if len(tmp) > 1:
elemName = tmp[0]
AttListHtml = ''
if len(tmp) > 1:
@@
-281,7
+281,7
@@
class ElemNodeDelegate(QAbstractItemDelegate):
def colorize(color, text):
return '<font color=' + color + '>' + text + '</font>'
text = str(index.model().data(index).property('content').toString())
def colorize(color, text):
return '<font color=' + color + '>' + text + '</font>'
text = str(index.model().data(index).property('content').toString())
- print "TEXT:", text
+
#
print "TEXT:", text
if option.state & QStyle.State_Selected:
htmlText = colorize(palette.highlightedText().color().name(),
getHtmlText(text, highGlobPattern, highAttPattern))
if option.state & QStyle.State_Selected:
htmlText = colorize(palette.highlightedText().color().name(),
getHtmlText(text, highGlobPattern, highAttPattern))
@@
-293,7
+293,7
@@
class ElemNodeDelegate(QAbstractItemDelegate):
if option.state & QStyle.State_Selected \
else palette.base().color()
painter.save()
if option.state & QStyle.State_Selected \
else palette.base().color()
painter.save()
- print "COLOR:", color.name()
+
#
print "COLOR:", color.name()
# voodoo: if not highlighted, filling the rect
# with the base color makes no difference
painter.fillRect(option.rect, color)
# voodoo: if not highlighted, filling the rect
# with the base color makes no difference
painter.fillRect(option.rect, color)