Еще изменения

consolegui/application/Box.py

@@ -71,8 +71,7 @@ class MainWgt(QtGui.QMainWindow):
         self.main_frame = QtGui.QScrollArea(self)
         self.main_frame.setFrameShape(QtGui.QFrame.Shape.NoFrame)
         self.main_frame.setObjectName('MF')
-        self.main_frame.setStyleSheet("#MF "
-        "{background-color: #E4E1E0;}")
+        self.main_frame.setStyleSheet("#MF " "{background-color: #FFFFFF;}")
 
         self.MainFrameWgt = StartWidget(self)
         self.main_frame.setWidget (self.MainFrameWgt)
@@ -306,6 +305,7 @@ class MainWgt(QtGui.QMainWindow):
 
         else:
             self.delete_MainFrameWgt()
+            # TODO: remove short frame
             if self.ClientObj.expert or meth_result.expert:
                 self.MainFrameWgt = MainFrameRes(self, self.ClientObj, \
                                                  method_name, meth_result)
@@ -326,6 +326,7 @@ class MainWgt(QtGui.QMainWindow):
 
     def main_view_process(self, method_name, meth_result, pid):
         self.delete_MainFrameWgt()
+        # TODO: remove shortframe
         if self.ClientObj.expert:
             self.MainFrameWgt = MainFrameRes(self, self.ClientObj, \
                                                     method_name, meth_result)

consolegui/application/ControlButton.py

@@ -15,6 +15,7 @@
 #  limitations under the License.
 
 from PySide import QtGui, QtCore
+from more import LabelWordWrap
 
 class MethodNameWgt(QtGui.QWidget):
     def __init__(self, parent, ClientObj):
@@ -98,16 +99,51 @@ class ControlButtonWgt(QtGui.QWidget):
         self.setObjectName('ControlButton')
         self.setStyleSheet("QWidget#ControlButton "
 #                           "{background-color: #FF0000;}")
-                           "{background-color: #E4E1E0;}")
+                           "{background-color: #FFFFFF;}")
 
-        self.hlayout = QtGui.QHBoxLayout(self)
+        self.main_layout = QtGui.QVBoxLayout(self)
+        self.main_layout.setContentsMargins(28,8,0,28)
+        self.question_label = LabelWordWrap("")
+        #self.question_label.hide()
+        self.main_layout.addWidget(self.question_label)
+
+
+        self.hlayout = QtGui.QHBoxLayout()
         self.hlayout.setAlignment(QtCore.Qt.AlignLeft | QtCore.Qt.AlignVCenter)
-        self.hlayout.setContentsMargins(28,8,28,8)
+        self.hlayout.setContentsMargins(0,0,28,0)
         self.hlayout.setSpacing(0)
+        self.main_layout.addItem(QtGui.QSpacerItem( 0, 0, \
+                                              QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Expanding ))
+        self.main_layout.addLayout(self.hlayout)
 
-        self.setLayout(self.hlayout)
-        self.setFixedHeight(56)
+        #self.setLayout(self.hlayout)
+        self.setFixedHeight(90)
         self.hide()
+        self.confirmWgt = None
+        self.break_button = None
+
+    def set_confirm_question(self, message):
+        self.question_label.setText(message)
+        self.question_label.show()
+
+    def set_confirmation(self, wgt):
+        if self.confirmWgt:
+            self.hlayout.removeWidget(self.confirmWgt)
+        self.confirmWgt = wgt
+        self.hlayout.insertWidget(0,wgt)
+
+    def close_confirmation(self):
+        self.question_label.hide()
+        if self.confirmWgt:
+            self.hlayout.removeWidget(self.confirmWgt)
+            self.confirmWgt.close()
+            self.confirmWgt = None
+
+    def set_break_button(self, wgt):
+        if self.break_button:
+            self.break_button.close()
+        self.break_button = wgt
+        self.hlayout.addWidget(wgt)
 
     def _hide(self):
         if hasattr (self, 'button_widget'):

consolegui/application/MainFrameResult.py

@@ -846,7 +846,7 @@ class MainFrameRes(QtGui.QWidget):
         if self.progress_list:
             self.progress_list[-1].hide()
         self.message = ConfirmDialog(self, item, sid, pid)
-        self.work_layout.control.insertWidget(0, self.message)
+        self._parent.control_button.set_confirmation(self.message)
         self.message.show()
 
     def send_Choice(self, sid, pid, item):
@@ -854,7 +854,7 @@ class MainFrameRes(QtGui.QWidget):
         if self.progress_list:
             self.progress_list[-1].hide()
         self.message = ChoiceDialog(self, item, sid, pid)
-        self.work_layout.control.insertWidget(0, self.message)
+        self._parent.control_button.set_confirmation(self.message)
         self.message.show()
 
     def send_Message(self, sid, pid, item):
@@ -890,6 +890,7 @@ class MainFrameRes(QtGui.QWidget):
         if hasattr(self,"passwd") and self.passwd:
             self.passwd.close()
             self.passwd = None
+        self._parent.control_button.close_confirmation()
 
     def closeEvent(self, event):
         self.timer.stop()
@@ -900,6 +901,7 @@ class MainFrameRes(QtGui.QWidget):
         self.closeDialogs()
         event.accept()
 
+
 class MessageDialog(QtGui.QWidget):
     # answer to the server question
     def __init__(self, parent, item, sid, pid, isPassword = False):
@@ -978,6 +980,7 @@ class MessageDialog(QtGui.QWidget):
         else:
             self.send_button.setEnabled(True)
 
+
 class ButtonDialog(QtGui.QWidget):
     button_size = 144
 
@@ -1012,11 +1015,13 @@ class ButtonDialog(QtGui.QWidget):
             button.setShortcut(QtGui.QKeySequence(shortcut))
         button.clicked.connect(self.send(answer, label))
         button.setFixedWidth(self.button_size)
+        button.setFixedHeight(32)
         self.layout.addWidget(button)
 
     def send(self, answer, human_answer=None):
         # Call server method
         def wrapper():
+            self._parent._parent.control_button.close_confirmation()
             if human_answer and self.header_label:
                 self.header_label.setText(
                     self.header_label.text() + " " +
@@ -1040,13 +1045,14 @@ class ButtonDialog(QtGui.QWidget):
         self._parent.show_result(result)
         self.close()
 
+
 class ConfirmDialog(ButtonDialog):
     """
     Диалог подтверждения действия
     """
     def init(self, item):
-        self.header_label = \
-            self._parent.show_message("<b>%s</b>" % item.message, space=20)
+        self._parent._parent.control_button.set_confirm_question(
+            "<b>%s</b>" % item.message)
         self.createButton(_("Yes"), "yes", [QtCore.Qt.Key_Enter,
                                             QtCore.Qt.Key_Return])
         self.createButton(_("No"), "no", QtCore.Qt.Key_Escape)
@@ -1059,8 +1065,8 @@ class ChoiceDialog(ButtonDialog):
     def init(self, item):
         message, answers = item.message.split('|')
 
-        self.header_label = \
-            self._parent.show_message("<b>%s</b>" % message, space=20)
+        self._parent._parent.control_button.set_confirm_question(
+            "<b>%s</b>" % message)
 
         reAnswer = re.compile("^(.*)\((.*)\)$")
         answers = imap_regexp(reAnswer, answers.split(','))

consolegui/application/SelectTable.py

@@ -54,7 +54,7 @@ class SelectedTableWidget(QtGui.QTableWidget):
         self.verticalHeader().hide()
 
         item_background = 'transparent' if brief else 'rgba(255,255,255,255)'
-        self.background_color = 'transparent' if brief else '#E4E1E0'
+        self.background_color = 'transparent' if brief else '#FFFFFF'
 
         self.horizontalHeader().setStyleSheet \
                          ("QHeaderView {background-color: transparent;"
@@ -132,7 +132,7 @@ class SelectedTableWidget(QtGui.QTableWidget):
     def setErrorBorder(self):
         self.setStyleSheet("QTableWidget {"
                          "border: 1px solid red;"
-                         "background-color: #E4E1E0;}"
+                         "background-color: #FFFFFF;}"
                          "QTableWidget::item {padding: 0px;"
                          "border-left: 1px solid #B3ABA7;"
                          "background-color: rgba(255,255,255,255);}")

consolegui/application/mainframe.py

@@ -104,7 +104,7 @@ class MainFrame(QtGui.QWidget):
 
         self.setObjectName('MainFrame')
         self.setStyleSheet("QWidget#MainFrame "
-                           "{background-color: #E4E1E0;}")
+                           "{background-color: #FFFFFF;}")
         #                  " QWidget { border: 1px solid blue;}")
         # x = 0 - space for image
         x = 1
@@ -508,6 +508,8 @@ class MainFrame(QtGui.QWidget):
             self.view_dict[field.name] = ReadonlyCheckBox(self)
         else:
             self.view_dict[field.name] = QCheckBox(self)
+            self.view_dict[field.name].setStyleSheet(
+                "QCheckBox:hover {background-color:#FFFFFF}")
 
         self.view_dict[field.name].setFocusPolicy(QtCore.Qt.NoFocus)
 

consolegui/application/more.py

@@ -1471,7 +1471,7 @@ class SelectList(QtGui.QGroupBox):
             'stop: 0 gray, stop: 0.7 gray, stop: 1 transparent);'
 
             'background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,'
-            'stop: 0 #eeeeee, stop: 0.8 transparent, stop: 1 transparent);'
+            'stop: 0 #f0f0f0, stop: 0.8 transparent, stop: 1 transparent);'
             'border-bottom: 0px;'
             'border-top-left-radius: 4px;'
             'border-top-right-radius: 4px;}'
@@ -2246,13 +2246,11 @@ class ResultLayout(QtGui.QVBoxLayout):
         self.setSpacing(2)
         self.content = QtGui.QVBoxLayout()
         self.content.setAlignment(QtCore.Qt.AlignTop)
-        self.control = QtGui.QHBoxLayout()
-        self.control.setAlignment(QtCore.Qt.AlignTop)
         self.addLayout(self.content)
-        self.addLayout(self.control)
 
         self.kill_process_button = self._create_button(_('Break the process'))
-        self.control.addWidget(self.kill_process_button)
+        self.kill_process_button.setFixedHeight(32)
+        parent._parent.control_button.set_break_button(self.kill_process_button)
 
     def _addWidget(self, widget):
         self.content.addWidget(widget)
@@ -2268,7 +2266,7 @@ class ResultLayout(QtGui.QVBoxLayout):
         return button
 
     def hide_kill_button(self):
-        self.removeWidget(self.kill_process_button)
+        #self.removeWidget(self.kill_process_button)
         self.kill_process_button.close()
 
 
@@ -2315,27 +2313,29 @@ class TaskWidget(QtGui.QWidget):
         self._layout.setSpacing(8)
         self.status = False
 
-    def set_status(self, icon):
+    def set_status(self, message=None, color=None):
         if not self.status:
             point_lbl = LabelTaskWgt('', self)
             self._layout.addWidget(point_lbl)
 
             self.image_lbl = QtGui.QLabel(self)
-            self.image_lbl.setFixedSize(16, 16)
+            self.image_lbl.setFixedHeight(16)
             self._layout.addWidget(self.image_lbl)
             self._layout.setStretch(1, 5)
 
-            self.image_lbl.setPixmap(icon.pixmap(16))
+            #self.image_lbl.setPixmap(icon.pixmap(16))
+            self.image_lbl.setStyleSheet('color:%s;'%color)
+            self.image_lbl.setText("%s"%message.upper())
             self.status = True
 
     def set_ok(self):
-        self.set_status(QtGui.QIcon(self.console_ok))
+        self.set_status("ok",color="green")
 
     def set_error(self):
-        self.set_status(QtGui.QIcon(self.console_cancel))
+        self.set_status("failed", color="red")
 
     def set_skip(self):
-        self.set_status(QtGui.QIcon.fromTheme(self.console_skip))
+        self.set_status("skip", color="gold")
 
 
 class ButtonsWidget(QtGui.QWidget):