Merge commit 'origin/master'

diff --git a/sface/mainwindow.py b/sface/mainwindow.py
index b9de6fa..6a0175e 100644 (file)
--- a/sface/mainwindow.py
+++ b/sface/mainwindow.py
@@ -109,7 +109,7 @@ class MainWindow(QWidget):
         layout.addWidget(self.screens)
         layout.addLayout(hlayout)
         self.setLayout(layout)
-        self.resize(800, 600)
+        self.resize(800, 500)
 
         for link in (self.nav.main, self.nav.config, self.nav.help):
             self.connect(link, SIGNAL('linkActivated(QString)'),
@@ -125,7 +125,7 @@ class MainWindow(QWidget):
 
     def showLogWindow(self, link):
         self.logWindow.show()
-        self.logWindow.resize(800, 400)
+        self.logWindow.resize(800, 200)
         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)
-        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 8316581..13140de 100644 (file)
--- a/sface/screens/mainscreen.py
+++ b/sface/screens/mainscreen.py
@@ -451,7 +451,7 @@ class MainScreen(SfaScreen):
         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()

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(" "))
-            print time.strftime('%M:%S'),'Invoking',command
+            print time.strftime('%H:%M:%S'),'Invoking',command
 
     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)
 

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 = '&lt;<b>%s</b>%s&gt;'
         highAttPattern = ' <b>%s</b>="%s"'
         def getHtmlText(plainText, globPattern, attPattern):
-            print "PLAIN TEXT:", plainText
+#            print "PLAIN TEXT:", plainText
             tmp = plainText.split(' ', 1)
-            print "TMP:", tmp
+#            print "TMP:", tmp
             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())
-        print "TEXT:", text
+#        print "TEXT:", text
         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()
-        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)