Review height and colors of Events

Ref #267
Alignak-monitoring-contrib · Mar 8, 2018 · 26cb1a0 · 26cb1a0
1 parent fa0d262
commit 26cb1a0
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 67 deletions.
diff --git a/alignak_app/qobjects/events/item.py b/alignak_app/qobjects/events/item.py
@@ -27,11 +27,7 @@
 
 import time
 
-from PyQt5.QtCore import QTimer, QSize
-from PyQt5.QtGui import QColor, QIcon
-from PyQt5.QtWidgets import QListWidgetItem
-
-from alignak_app.utils.config import settings
+from PyQt5.Qt import QTimer, QColor, QListWidgetItem
 
 
 class EventItem(QListWidgetItem):
@@ -71,17 +67,8 @@ def initialize(self, event_type, msg, timer=False, spied_on=False, host=None):
         send_at = time.strftime("%a, %d %b %Y %H:%M:%S")
         msg_to_send = '%s. (Send at %s)' % (msg, send_at)
         self.setToolTip(msg_to_send)
-        self.setBackground(QColor(self.get_color_event(event_type)))
-        self.setForeground(QColor("#000"))
-
-        self.setSizeHint(QSize(self.sizeHint().width(), 50))
 
-        if 'TODO' in event_type:
-            self.setIcon(QIcon(settings.get_image('todo')))
-        elif self.host:
-            self.setIcon(QIcon(settings.get_image('event')))
-        else:
-            pass
+        self.setForeground(QColor(self.get_foreground_color(event_type)))
 
     def close_item(self):
         """
@@ -92,7 +79,7 @@ def close_item(self):
         self.setHidden(True)
 
     @staticmethod
-    def get_color_event(event_type):
+    def get_foreground_color(event_type):
         """
         Return corresponding color of event type
 

diff --git a/etc/css/style.css b/etc/css/style.css
@@ -374,14 +374,23 @@ QFrame#vseparator {
 /****** QListWidget ******/
 QListWidget {
     border: none;
-    background-color: transparent;
+    background-color: white;
 }
 
-QListWidget::item:selected {
-    color: black;
+QListWidget::item {
+    height: 34px;
+}
+
+QListWidget::item:hover {
     background-color: white;
     border: 1px solid #1fb4e4;
-    border-radius: 3px;
+    color: #3884c3;
+}
+
+QListWidget::item:selected {
+    background-color: white;
+    color: #3884c3;
+    border: 1px solid #3884c3;
 }
 
 /****** QTableWidget ******/

diff --git a/etc/images.ini b/etc/images.ini
@@ -49,7 +49,6 @@ connected = connected.svg
 disconnected = disconnected.svg
 edit = edit.svg
 error = error.svg
-event = event.svg
 exit = exit.svg
 flapping = flapping.svg
 minimize = minimize.svg
@@ -67,6 +66,5 @@ spy_ok = spy_ok.svg
 tree = tree.svg
 time = time.svg
 token = token.svg
-todo = todo.svg
 user = user.svg
 web = web.svg
diff --git a/etc/images/event.svg b/etc/images/event.svg
diff --git a/etc/images/todo.svg b/etc/images/todo.svg
diff --git a/test/etc/images.ini b/test/etc/images.ini
@@ -49,7 +49,6 @@ connected = connected.svg
 disconnected = disconnected.svg
 edit = edit.svg
 error = error.svg
-event = event.svg
 exit = exit.svg
 flapping = flapping.svg
 minimize = minimize.svg
@@ -67,6 +66,5 @@ spy_ok = spy_ok.svg
 tree = tree.svg
 time = time.svg
 token = token.svg
-todo = todo.svg
 user = user.svg
 web = web.svg