Fix css events, add title to spy tab

Ref #256
Alignak-monitoring-contrib · Mar 10, 2018 · 3545948 · 3545948
1 parent 0244247
commit 3545948
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 33 deletions.
diff --git a/alignak_app/qobjects/events/item.py b/alignak_app/qobjects/events/item.py
@@ -25,7 +25,7 @@
     Event item manage creation of ``QListWidgetItem`` for events
 """
 
-from PyQt5.Qt import QTimer, QColor, QListWidgetItem, QIcon
+from PyQt5.Qt import QTimer, QListWidgetItem, QIcon
 
 from alignak_app.utils.config import settings
 from alignak_app.utils.time import get_current_time
@@ -74,9 +74,6 @@ def initialize(self, event_type, msg, timer=False, spied_on=False, host=None):
             )
         )
 
-        # self.setForeground(QColor('#064c79'))
-        self.setForeground(QColor(self.get_foreground_color(event_type)))
-
     def close_item(self):
         """
         Hide items when timer is finished
@@ -85,32 +82,6 @@ def close_item(self):
 
         self.setHidden(True)
 
-    @staticmethod
-    def get_foreground_color(event_type):
-        """
-        Return corresponding color of event type
-
-        :param event_type: the type of event
-        :type event_type: str
-        :return: the associated color with the event
-        :rtype: str
-        """
-
-        available_colors = {
-            '#27ae60': ['OK', 'UP'],
-            '#2980b9': ['UNKNOWN', 'INFO', 'SPY'],
-            '#e67e22': ['WARNING', 'UNREACHABLE', 'WARN'],
-            '#e74c3c': ['DOWN', 'CRITICAL', 'ALERT'],
-            '#f39c12': ['ACK'],
-            '#f1c40f': ['DOWNTIME', 'DOWNTIMESTART (DOWN)'],
-        }
-
-        for key, _ in available_colors.items():
-            if event_type in available_colors[key]:
-                return key
-
-        return '#e74c3c'
-
     @staticmethod
     def get_icon(event_type):
         """

diff --git a/alignak_app/qobjects/events/spy.py b/alignak_app/qobjects/events/spy.py
@@ -28,7 +28,7 @@
 from logging import getLogger
 
 from PyQt5.Qt import QVBoxLayout, Qt, QWidget, QAbstractItemView, QListWidget, pyqtSignal, QSize
-from PyQt5.Qt import QTimer
+from PyQt5.Qt import QTimer, QLabel
 
 from alignak_app.backend.datamanager import data_manager
 from alignak_app.items.item import get_host_msg_and_event_type
@@ -131,13 +131,18 @@ def __init__(self):
 
     def initialize(self):
         """
-        Intialize QWidget
+        Intialize Spy QWidget
 
         """
 
         layout = QVBoxLayout()
         self.setLayout(layout)
 
+        spy_title = QLabel(_('Spy Hosts (double click to stop spying)'))
+        spy_title.setObjectName('itemtitle')
+        spy_title.setMinimumHeight(40)
+        layout.addWidget(spy_title)
+
         self.spy_list_widget.setDragDropMode(QAbstractItemView.DragDrop)
         self.spy_list_widget.setSelectionMode(QAbstractItemView.ExtendedSelection)
         self.spy_list_widget.doubleClicked.connect(self.remove_event)

diff --git a/etc/css/style.css b/etc/css/style.css
@@ -387,7 +387,8 @@ QListWidget {
 }
 
 QListWidget::item {
-    height: 34px;
+    height: 35px;
+    color: #3b4155;
 }
 
 QListWidget::item:hover {