Merge pull request #807 from isanae/logging-rework

Logging rework

1 files changed, 57 insertions, 31 deletions

diff --git a/src/mainwindow.ui b/src/mainwindow.ui
index 70d1cf39..6c6d0bca 100644
--- a/src/mainwindow.ui
+++ b/src/mainwindow.ui
@@ -1286,23 +1286,6 @@ p, li { white-space: pre-wrap; }
         </item>
        </layout>
       </widget>
-      <widget class="QTreeView" name="logList">
-       <property name="contextMenuPolicy">
-        <enum>Qt::ActionsContextMenu</enum>
-       </property>
-       <property name="selectionMode">
-        <enum>QAbstractItemView::NoSelection</enum>
-       </property>
-       <property name="uniformRowHeights">
-        <bool>true</bool>
-       </property>
-       <property name="itemsExpandable">
-        <bool>false</bool>
-       </property>
-       <property name="headerHidden">
-        <bool>true</bool>
-       </property>
-      </widget>
      </widget>
     </item>
    </layout>
@@ -1403,6 +1386,7 @@ p, li { white-space: pre-wrap; }
      <addaction name="actionToolBarIconsAndText"/>
     </widget>
     <addaction name="menuToolbars"/>
+    <addaction name="actionViewLog"/>
     <addaction name="separator"/>
     <addaction name="actionNotifications"/>
    </widget>
@@ -1417,6 +1401,49 @@ p, li { white-space: pre-wrap; }
    <addaction name="menuRun"/>
    <addaction name="menuHelp"/>
   </widget>
+  <widget class="QDockWidget" name="logDock">
+   <property name="features">
+    <set>QDockWidget::AllDockWidgetFeatures</set>
+   </property>
+   <property name="windowTitle">
+    <string>Log</string>
+   </property>
+   <attribute name="dockWidgetArea">
+    <number>8</number>
+   </attribute>
+   <widget class="QWidget" name="dockWidgetContents">
+    <layout class="QVBoxLayout" name="verticalLayout_6">
+     <property name="leftMargin">
+      <number>0</number>
+     </property>
+     <property name="topMargin">
+      <number>0</number>
+     </property>
+     <property name="rightMargin">
+      <number>0</number>
+     </property>
+     <property name="bottomMargin">
+      <number>0</number>
+     </property>
+     <item>
+      <widget class="LogList" name="logList">
+       <property name="contextMenuPolicy">
+        <enum>Qt::CustomContextMenu</enum>
+       </property>
+       <property name="rootIsDecorated">
+        <bool>false</bool>
+       </property>
+       <property name="uniformRowHeights">
+        <bool>true</bool>
+       </property>
+       <attribute name="headerVisible">
+        <bool>false</bool>
+       </attribute>
+      </widget>
+     </item>
+    </layout>
+   </widget>
+  </widget>
   <action name="actionInstallMod">
    <property name="icon">
     <iconset resource="resources.qrc">
@@ -1618,20 +1645,6 @@ p, li { white-space: pre-wrap; }
     <string>Endorse Mod Organizer</string>
    </property>
   </action>
-  <action name="actionCopy_Log_to_Clipboard">
-   <property name="text">
-    <string>Copy &amp;Log</string>
-   </property>
-   <property name="iconText">
-    <string>Copy &amp;Log</string>
-   </property>
-   <property name="toolTip">
-    <string>Copy log to clipboard</string>
-   </property>
-   <property name="statusTip">
-    <string>Copy log to clipboard</string>
-   </property>
-  </action>
   <action name="actionChange_Game">
    <property name="icon">
     <iconset resource="resources.qrc">
@@ -1736,6 +1749,14 @@ p, li { white-space: pre-wrap; }
     <string>Status &amp;bar</string>
    </property>
   </action>
+  <action name="actionViewLog">
+   <property name="checkable">
+    <bool>true</bool>
+   </property>
+   <property name="text">
+    <string>Log</string>
+   </property>
+  </action>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <customwidgets>
@@ -1769,6 +1790,11 @@ p, li { white-space: pre-wrap; }
    <extends>QWidget</extends>
    <header>sortabletreewidget.h</header>
   </customwidget>
+  <customwidget>
+   <class>LogList</class>
+   <extends>QTreeView</extends>
+   <header>loglist.h</header>
+  </customwidget>
  </customwidgets>
  <resources>
   <include location="resources.qrc"/>