Moved textformatter in mainEditor

src/ui/editors/mainEditor.py

@@ -92,6 +92,8 @@ class mainEditor(QWidget, Ui_mainEditor):
             idx = self.mw.treeRedacOutline.currentIndex()
 
         self.setCurrentModelIndex(idx)
+        # Hides textFormat
+        self.textFormat.updateFromIndex(QModelIndex())
         
     def openIndexes(self, indexes, newTab=False):
         for i in indexes:

src/ui/editors/mainEditor_ui.py

@@ -2,8 +2,7 @@
 
 # Form implementation generated from reading ui file 'src/ui/editors/mainEditor_ui.ui'
 #
-# Created: Sun Jun 28 12:58:31 2015
-#      by: PyQt5 UI code generator 5.2.1
+# Created by: PyQt5 UI code generator 5.4.1
 #
 # WARNING! All changes made in this file will be lost!
 
@@ -12,7 +11,7 @@ from PyQt5 import QtCore, QtGui, QtWidgets
 class Ui_mainEditor(object):
     def setupUi(self, mainEditor):
         mainEditor.setObjectName("mainEditor")
-        mainEditor.resize(626, 300)
+        mainEditor.resize(791, 319)
         self.verticalLayout = QtWidgets.QVBoxLayout(mainEditor)
         self.verticalLayout.setContentsMargins(0, 0, 0, 0)
         self.verticalLayout.setObjectName("verticalLayout")
@@ -60,6 +59,17 @@ class Ui_mainEditor(object):
         self.horizontalLayout_19.addWidget(self.sldCorkSizeFactor)
         spacerItem = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
         self.horizontalLayout_19.addItem(spacerItem)
+        self.textFormat = textFormat(mainEditor)
+        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed)
+        sizePolicy.setHorizontalStretch(0)
+        sizePolicy.setVerticalStretch(0)
+        sizePolicy.setHeightForWidth(self.textFormat.sizePolicy().hasHeightForWidth())
+        self.textFormat.setSizePolicy(sizePolicy)
+        self.textFormat.setMinimumSize(QtCore.QSize(20, 20))
+        self.textFormat.setObjectName("textFormat")
+        self.horizontalLayout_19.addWidget(self.textFormat)
+        spacerItem1 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
+        self.horizontalLayout_19.addItem(spacerItem1)
         self.lblRedacWC = QtWidgets.QLabel(mainEditor)
         self.lblRedacWC.setMinimumSize(QtCore.QSize(10, 0))
         self.lblRedacWC.setText("")
@@ -98,3 +108,4 @@ class Ui_mainEditor(object):
         self.btnRedacFolderOutline.setText(_translate("mainEditor", "Outline"))
         self.btnRedacFullscreen.setShortcut(_translate("mainEditor", "F11"))
 
+from ui.editors.textFormat import textFormat

src/ui/editors/mainEditor_ui.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>626</width>
-    <height>300</height>
+    <width>791</width>
+    <height>319</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -119,6 +119,35 @@
        </property>
       </widget>
      </item>
+     <item>
+      <spacer name="horizontalSpacer_3">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item>
+      <widget class="textFormat" name="textFormat" native="true">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="minimumSize">
+        <size>
+         <width>20</width>
+         <height>20</height>
+        </size>
+       </property>
+      </widget>
+     </item>
      <item>
       <spacer name="horizontalSpacer_2">
        <property name="orientation">
@@ -196,6 +225,14 @@
    </item>
   </layout>
  </widget>
+ <customwidgets>
+  <customwidget>
+   <class>textFormat</class>
+   <extends>QWidget</extends>
+   <header>ui.editors.textFormat.h</header>
+   <container>1</container>
+  </customwidget>
+ </customwidgets>
  <resources/>
  <connections/>
  <buttongroups>

src/ui/views/metadataView.py

@@ -57,8 +57,6 @@ class metadataView(QWidget, Ui_metadataView):
             self.txtNotes.setCurrentModelIndexes(indexes)
             
         self.properties.selectionChanged(sourceView)
-        # Hides textFormat
-        self.textFormat.updateFromIndex(QModelIndex())
         self._lastIndexes = indexes
         
     def setDict(self, d):

src/ui/views/metadataView_ui.py

@@ -15,14 +15,6 @@ class Ui_metadataView(object):
         self.verticalLayout = QtWidgets.QVBoxLayout(metadataView)
         self.verticalLayout.setContentsMargins(0, 0, 0, 0)
         self.verticalLayout.setObjectName("verticalLayout")
-        self.textFormat = textFormat(metadataView)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.textFormat.sizePolicy().hasHeightForWidth())
-        self.textFormat.setSizePolicy(sizePolicy)
-        self.textFormat.setObjectName("textFormat")
-        self.verticalLayout.addWidget(self.textFormat)
         self.groupBox_4 = collapsibleGroupBox2(metadataView)
         sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Fixed)
         sizePolicy.setHorizontalStretch(0)
@@ -78,9 +70,8 @@ class Ui_metadataView(object):
         self.txtSummarySentance.setPlaceholderText(_translate("metadataView", "One line summary"))
         self.groupBox_6.setTitle(_translate("metadataView", "Notes"))
 
+from ui.collapsibleGroupBox2 import collapsibleGroupBox2
+from ui.views.propertiesView import propertiesView
 from ui.views.textEditCompleter import textEditCompleter
 from ui.views.textEditView import textEditView
-from ui.editors.textFormat import textFormat
 from ui.views.lineEditView import lineEditView
-from ui.views.propertiesView import propertiesView
-from ui.collapsibleGroupBox2 import collapsibleGroupBox2

src/ui/views/metadataView_ui.ui

@@ -17,16 +17,6 @@
    <property name="margin">
     <number>0</number>
    </property>
-   <item>
-    <widget class="textFormat" name="textFormat" native="true">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-    </widget>
-   </item>
    <item>
     <widget class="collapsibleGroupBox2" name="groupBox_4">
      <property name="sizePolicy">
@@ -138,12 +128,6 @@
    <header>ui.views.propertiesView.h</header>
    <container>1</container>
   </customwidget>
-  <customwidget>
-   <class>textFormat</class>
-   <extends>QWidget</extends>
-   <header>ui.editors.textFormat.h</header>
-   <container>1</container>
-  </customwidget>
   <customwidget>
    <class>textEditCompleter</class>
    <extends>QTextEdit</extends>