Mercurial Repositories > MQTT Monitor / changeset

--- a/MqttMonitor/MqttMonitorWidget.py	Sat Sep 15 20:13:22 2018 +0200
+++ b/MqttMonitor/MqttMonitorWidget.py	Sun Sep 16 18:08:53 2018 +0200
@@ -91,9 +91,6 @@
         self.logLevelComboBox.setCurrentIndex(
             self.logLevelComboBox.count() - 1)
         
-        # TODO: Log Edit improvements:
-        #   1. add capability to search
-        
         self.__logMessagesBackgrounds = {
             MqttClient.LogDebug: QBrush(Qt.white),
             MqttClient.LogInfo: QBrush(Qt.lightGray),
@@ -104,6 +101,13 @@
             # reuse LogDisabled for unknown log levels
         }
         
+        self.logSearchWidget.attachTextEdit(self.logEdit)
+        try:
+            self.logSearchWidget.setWidthForHeight(False)
+        except AttributeError:
+            # eric < 18.10
+            pass
+        
         self.brokerWidget.setCurrentIndex(0)
         
         self.__connectionModeProfile = True

--- a/MqttMonitor/MqttMonitorWidget.ui	Sat Sep 15 20:13:22 2018 +0200
+++ b/MqttMonitor/MqttMonitorWidget.ui	Sun Sep 16 18:08:53 2018 +0200
@@ -144,7 +144,7 @@
    <item>
     <widget class="QTabWidget" name="brokerWidget">
      <property name="currentIndex">
-      <number>1</number>
+      <number>3</number>
      </property>
      <widget class="QWidget" name="pubSubTab">
       <attribute name="title">
@@ -1293,6 +1293,13 @@
         </layout>
        </item>
        <item>
+        <widget class="E5TextEditSearchWidget" name="logSearchWidget" native="true">
+         <property name="focusPolicy">
+          <enum>Qt::WheelFocus</enum>
+         </property>
+        </widget>
+       </item>
+       <item>
         <widget class="QPlainTextEdit" name="logEdit">
          <property name="tabChangesFocus">
           <bool>true</bool>
@@ -1412,9 +1419,10 @@
   <tabstop>publishPayloadFilePicker</tabstop>
   <tabstop>publishQosSpinBox</tabstop>
   <tabstop>publishRetainCheckBox</tabstop>
+  <tabstop>publishButton</tabstop>
   <tabstop>publishClearButton</tabstop>
-  <tabstop>publishButton</tabstop>
   <tabstop>clearPublishCheckBox</tabstop>
+  <tabstop>messagesSearchWidget</tabstop>
   <tabstop>messagesEdit</tabstop>
   <tabstop>saveMessagesButton</tabstop>
   <tabstop>clearMessagesButton</tabstop>
@@ -1422,6 +1430,7 @@
   <tabstop>brokerStatusButton</tabstop>
   <tabstop>scrollArea</tabstop>
   <tabstop>logLevelComboBox</tabstop>
+  <tabstop>logSearchWidget</tabstop>
   <tabstop>logEdit</tabstop>
   <tabstop>saveLogMessagesButton</tabstop>
   <tabstop>clearLogMessagesButton</tabstop>