files.ui Design change, cleanup

include/ui/files_ui.py

@@ -11,7 +11,7 @@ from PyQt5 import QtCore, QtGui, QtWidgets
 class Ui_win_files(object):
     def setupUi(self, win_files):
         win_files.setObjectName("win_files")
-        win_files.resize(725, 592)
+        win_files.resize(725, 519)
         self.centralwidget = QtWidgets.QWidget(win_files)
         self.centralwidget.setObjectName("centralwidget")
         self.gridLayout = QtWidgets.QGridLayout(self.centralwidget)
@@ -20,12 +20,12 @@ class Ui_win_files(object):
         self.splitter.setOrientation(QtCore.Qt.Horizontal)
         self.splitter.setChildrenCollapsible(False)
         self.splitter.setObjectName("splitter")
-        self.gridLayoutWidget = QtWidgets.QWidget(self.splitter)
-        self.gridLayoutWidget.setObjectName("gridLayoutWidget")
-        self.vl_local = QtWidgets.QVBoxLayout(self.gridLayoutWidget)
+        self.verticalLayoutWidget = QtWidgets.QWidget(self.splitter)
+        self.verticalLayoutWidget.setObjectName("verticalLayoutWidget")
+        self.vl_local = QtWidgets.QVBoxLayout(self.verticalLayoutWidget)
         self.vl_local.setContentsMargins(0, 0, 0, 0)
         self.vl_local.setObjectName("vl_local")
-        self.gb_select_local = QtWidgets.QGroupBox(self.gridLayoutWidget)
+        self.gb_select_local = QtWidgets.QGroupBox(self.verticalLayoutWidget)
         self.gb_select_local.setObjectName("gb_select_local")
         self.gridLayout_2 = QtWidgets.QGridLayout(self.gb_select_local)
         self.gridLayout_2.setObjectName("gridLayout_2")
@@ -57,7 +57,21 @@ class Ui_win_files(object):
         self.gridLayout_2.addWidget(self.lbl_path_local, 1, 0, 1, 3)
         self.gridLayout_2.setColumnStretch(0, 1)
         self.vl_local.addWidget(self.gb_select_local)
-        self.tree_files_local = QtWidgets.QTreeWidget(self.gridLayoutWidget)
+        self.hl_revpi_2 = QtWidgets.QHBoxLayout()
+        self.hl_revpi_2.setObjectName("hl_revpi_2")
+        spacerItem = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
+        self.hl_revpi_2.addItem(spacerItem)
+        self.btn_to_right = QtWidgets.QPushButton(self.verticalLayoutWidget)
+        self.btn_to_right.setText("")
+        icon2 = QtGui.QIcon()
+        icon2.addPixmap(QtGui.QPixmap(":/action/ico/arrow-right.ico"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
+        self.btn_to_right.setIcon(icon2)
+        self.btn_to_right.setIconSize(QtCore.QSize(24, 24))
+        self.btn_to_right.setAutoDefault(False)
+        self.btn_to_right.setObjectName("btn_to_right")
+        self.hl_revpi_2.addWidget(self.btn_to_right)
+        self.vl_local.addLayout(self.hl_revpi_2)
+        self.tree_files_local = QtWidgets.QTreeWidget(self.verticalLayoutWidget)
         self.tree_files_local.setEditTriggers(QtWidgets.QAbstractItemView.NoEditTriggers)
         self.tree_files_local.setSelectionMode(QtWidgets.QAbstractItemView.MultiSelection)
         self.tree_files_local.setSelectionBehavior(QtWidgets.QAbstractItemView.SelectRows)
@@ -95,15 +109,6 @@ class Ui_win_files(object):
         self.vl_revpi.addWidget(self.gb_select_revpi)
         self.hl_revpi = QtWidgets.QHBoxLayout()
         self.hl_revpi.setObjectName("hl_revpi")
-        self.btn_to_right = QtWidgets.QPushButton(self.gridLayoutWidget_2)
-        self.btn_to_right.setText("")
-        icon2 = QtGui.QIcon()
-        icon2.addPixmap(QtGui.QPixmap(":/action/ico/arrow-right.ico"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
-        self.btn_to_right.setIcon(icon2)
-        self.btn_to_right.setIconSize(QtCore.QSize(24, 24))
-        self.btn_to_right.setAutoDefault(False)
-        self.btn_to_right.setObjectName("btn_to_right")
-        self.hl_revpi.addWidget(self.btn_to_right)
         self.btn_to_left = QtWidgets.QPushButton(self.gridLayoutWidget_2)
         self.btn_to_left.setText("")
         icon3 = QtGui.QIcon()
@@ -122,8 +127,8 @@ class Ui_win_files(object):
         self.btn_delete_revpi.setAutoDefault(False)
         self.btn_delete_revpi.setObjectName("btn_delete_revpi")
         self.hl_revpi.addWidget(self.btn_delete_revpi)
-        spacerItem = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
-        self.hl_revpi.addItem(spacerItem)
+        spacerItem1 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
+        self.hl_revpi.addItem(spacerItem1)
         self.vl_revpi.addLayout(self.hl_revpi)
         self.tree_files_revpi = QtWidgets.QTreeWidget(self.gridLayoutWidget_2)
         self.tree_files_revpi.setEditTriggers(QtWidgets.QAbstractItemView.NoEditTriggers)

include/ui/revpicommander_ui.py

@@ -81,7 +81,6 @@ class Ui_win_revpicommander(object):
         self.act_program = QtWidgets.QAction(win_revpicommander)
         self.act_program.setObjectName("act_program")
         self.act_developer = QtWidgets.QAction(win_revpicommander)
-        self.act_developer.setCheckable(True)
         self.act_developer.setObjectName("act_developer")
         self.act_pictory = QtWidgets.QAction(win_revpicommander)
         self.act_pictory.setObjectName("act_pictory")

include/ui/revpidevelop_ui.py

@@ -1,88 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Form implementation generated from reading ui file 'revpidevelop.ui'
-#
-# Created by: PyQt5 UI code generator 5.10.1
-#
-# WARNING! All changes made in this file will be lost!
-
-from PyQt5 import QtCore, QtGui, QtWidgets
-
-class Ui_wid_develop(object):
-    def setupUi(self, wid_develop):
-        wid_develop.setObjectName("wid_develop")
-        wid_develop.resize(374, 444)
-        sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.MinimumExpanding)
-        sizePolicy.setHorizontalStretch(0)
-        sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(wid_develop.sizePolicy().hasHeightForWidth())
-        wid_develop.setSizePolicy(sizePolicy)
-        self.gridLayout = QtWidgets.QGridLayout(wid_develop)
-        self.gridLayout.setContentsMargins(0, 0, 0, 0)
-        self.gridLayout.setObjectName("gridLayout")
-        self.btn_all = QtWidgets.QPushButton(wid_develop)
-        self.btn_all.setObjectName("btn_all")
-        self.gridLayout.addWidget(self.btn_all, 2, 0, 1, 1)
-        self.btn_upload = QtWidgets.QPushButton(wid_develop)
-        self.btn_upload.setObjectName("btn_upload")
-        self.gridLayout.addWidget(self.btn_upload, 2, 1, 1, 1)
-        self.tree_files = QtWidgets.QTreeWidget(wid_develop)
-        self.tree_files.setEditTriggers(QtWidgets.QAbstractItemView.NoEditTriggers)
-        self.tree_files.setSelectionMode(QtWidgets.QAbstractItemView.MultiSelection)
-        self.tree_files.setSelectionBehavior(QtWidgets.QAbstractItemView.SelectRows)
-        self.tree_files.setIconSize(QtCore.QSize(24, 24))
-        self.tree_files.setObjectName("tree_files")
-        self.tree_files.headerItem().setText(0, "1")
-        self.tree_files.header().setVisible(False)
-        self.gridLayout.addWidget(self.tree_files, 1, 0, 1, 2)
-        self.gb_select = QtWidgets.QGroupBox(wid_develop)
-        self.gb_select.setObjectName("gb_select")
-        self.gridLayout_2 = QtWidgets.QGridLayout(self.gb_select)
-        self.gridLayout_2.setObjectName("gridLayout_2")
-        self.lbl_select = QtWidgets.QLabel(self.gb_select)
-        self.lbl_select.setObjectName("lbl_select")
-        self.gridLayout_2.addWidget(self.lbl_select, 0, 0, 1, 1)
-        self.btn_select = QtWidgets.QPushButton(self.gb_select)
-        icon = QtGui.QIcon()
-        icon.addPixmap(QtGui.QPixmap(":/action/ico/folder-open.ico"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
-        self.btn_select.setIcon(icon)
-        self.btn_select.setIconSize(QtCore.QSize(24, 24))
-        self.btn_select.setObjectName("btn_select")
-        self.gridLayout_2.addWidget(self.btn_select, 0, 1, 1, 1)
-        self.lbl_path = QtWidgets.QLabel(self.gb_select)
-        self.lbl_path.setObjectName("lbl_path")
-        self.gridLayout_2.addWidget(self.lbl_path, 1, 0, 1, 2)
-        self.btn_refresh = QtWidgets.QPushButton(self.gb_select)
-        icon1 = QtGui.QIcon()
-        icon1.addPixmap(QtGui.QPixmap(":/action/ico/refresh.ico"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
-        self.btn_refresh.setIcon(icon1)
-        self.btn_refresh.setIconSize(QtCore.QSize(24, 24))
-        self.btn_refresh.setObjectName("btn_refresh")
-        self.gridLayout_2.addWidget(self.btn_refresh, 0, 2, 1, 1)
-        self.gridLayout_2.setColumnStretch(0, 1)
-        self.gridLayout.addWidget(self.gb_select, 0, 0, 1, 2)
-
-        self.retranslateUi(wid_develop)
-        QtCore.QMetaObject.connectSlotsByName(wid_develop)
-
-    def retranslateUi(self, wid_develop):
-        _translate = QtCore.QCoreApplication.translate
-        self.btn_all.setText(_translate("wid_develop", "Stop / Upload / Start"))
-        self.btn_upload.setText(_translate("wid_develop", "Just upload"))
-        self.gb_select.setTitle(_translate("wid_develop", "File watcher for PLC development"))
-        self.lbl_select.setText(_translate("wid_develop", "Path to development root:"))
-        self.btn_select.setToolTip(_translate("wid_develop", "Open developer root directory"))
-        self.lbl_path.setText(_translate("wid_develop", "/"))
-        self.btn_refresh.setToolTip(_translate("wid_develop", "Reload file list"))
-
-from . import ressources_rc
-
-if __name__ == "__main__":
-    import sys
-    app = QtWidgets.QApplication(sys.argv)
-    wid_develop = QtWidgets.QWidget()
-    ui = Ui_wid_develop()
-    ui.setupUi(wid_develop)
-    wid_develop.show()
-    sys.exit(app.exec_())
-

include/ui_dev/files.ui

@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>725</width>
-    <height>592</height>
+    <height>519</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -23,7 +23,7 @@
       <property name="childrenCollapsible">
        <bool>false</bool>
       </property>
-      <widget class="QWidget" name="gridLayoutWidget">
+      <widget class="QWidget" name="verticalLayoutWidget">
        <layout class="QVBoxLayout" name="vl_local">
         <item>
          <widget class="QGroupBox" name="gb_select_local">
@@ -94,6 +94,43 @@
           </layout>
          </widget>
         </item>
+        <item>
+         <layout class="QHBoxLayout" name="hl_revpi_2">
+          <item>
+           <spacer name="hs_local">
+            <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="QPushButton" name="btn_to_right">
+            <property name="text">
+             <string/>
+            </property>
+            <property name="icon">
+             <iconset resource="ressources.qrc">
+              <normaloff>:/action/ico/arrow-right.ico</normaloff>:/action/ico/arrow-right.ico</iconset>
+            </property>
+            <property name="iconSize">
+             <size>
+              <width>24</width>
+              <height>24</height>
+             </size>
+            </property>
+            <property name="autoDefault">
+             <bool>false</bool>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </item>
         <item>
          <widget class="QTreeWidget" name="tree_files_local">
           <property name="editTriggers">
@@ -179,26 +216,6 @@
         </item>
         <item>
          <layout class="QHBoxLayout" name="hl_revpi">
-          <item>
-           <widget class="QPushButton" name="btn_to_right">
-            <property name="text">
-             <string/>
-            </property>
-            <property name="icon">
-             <iconset resource="ressources.qrc">
-              <normaloff>:/action/ico/arrow-right.ico</normaloff>:/action/ico/arrow-right.ico</iconset>
-            </property>
-            <property name="iconSize">
-             <size>
-              <width>24</width>
-              <height>24</height>
-             </size>
-            </property>
-            <property name="autoDefault">
-             <bool>false</bool>
-            </property>
-           </widget>
-          </item>
           <item>
            <widget class="QPushButton" name="btn_to_left">
             <property name="text">
@@ -240,7 +257,7 @@
            </widget>
           </item>
           <item>
-           <spacer name="horizontalSpacer_2">
+           <spacer name="hs_revpi">
             <property name="orientation">
              <enum>Qt::Horizontal</enum>
             </property>

include/ui_dev/revpicommander.ui

@@ -199,9 +199,6 @@
    </property>
   </action>
   <action name="act_developer">
-   <property name="checkable">
-    <bool>true</bool>
-   </property>
    <property name="text">
     <string>PLC de&amp;veloper...</string>
    </property>

include/ui_dev/revpidevelop.ui

@@ -1,136 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>wid_develop</class>
- <widget class="QWidget" name="wid_develop">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>374</width>
-    <height>444</height>
-   </rect>
-  </property>
-  <property name="sizePolicy">
-   <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
-    <horstretch>0</horstretch>
-    <verstretch>0</verstretch>
-   </sizepolicy>
-  </property>
-  <layout class="QGridLayout" name="gridLayout">
-   <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 row="2" column="0">
-    <widget class="QPushButton" name="btn_all">
-     <property name="text">
-      <string>Stop / Upload / Start</string>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="1">
-    <widget class="QPushButton" name="btn_upload">
-     <property name="text">
-      <string>Just upload</string>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="0" colspan="2">
-    <widget class="QTreeWidget" name="tree_files">
-     <property name="editTriggers">
-      <set>QAbstractItemView::NoEditTriggers</set>
-     </property>
-     <property name="selectionMode">
-      <enum>QAbstractItemView::MultiSelection</enum>
-     </property>
-     <property name="selectionBehavior">
-      <enum>QAbstractItemView::SelectRows</enum>
-     </property>
-     <property name="iconSize">
-      <size>
-       <width>24</width>
-       <height>24</height>
-      </size>
-     </property>
-     <attribute name="headerVisible">
-      <bool>false</bool>
-     </attribute>
-     <column>
-      <property name="text">
-       <string notr="true">1</string>
-      </property>
-     </column>
-    </widget>
-   </item>
-   <item row="0" column="0" colspan="2">
-    <widget class="QGroupBox" name="gb_select">
-     <property name="title">
-      <string>File watcher for PLC development</string>
-     </property>
-     <layout class="QGridLayout" name="gridLayout_2" columnstretch="1,0,0">
-      <item row="0" column="0">
-       <widget class="QLabel" name="lbl_select">
-        <property name="text">
-         <string>Path to development root:</string>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="1">
-       <widget class="QPushButton" name="btn_select">
-        <property name="toolTip">
-         <string>Open developer root directory</string>
-        </property>
-        <property name="icon">
-         <iconset resource="ressources.qrc">
-          <normaloff>:/action/ico/folder-open.ico</normaloff>:/action/ico/folder-open.ico</iconset>
-        </property>
-        <property name="iconSize">
-         <size>
-          <width>24</width>
-          <height>24</height>
-         </size>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="0" colspan="2">
-       <widget class="QLabel" name="lbl_path">
-        <property name="text">
-         <string>/</string>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="2">
-       <widget class="QPushButton" name="btn_refresh">
-        <property name="toolTip">
-         <string>Reload file list</string>
-        </property>
-        <property name="icon">
-         <iconset resource="ressources.qrc">
-          <normaloff>:/action/ico/refresh.ico</normaloff>:/action/ico/refresh.ico</iconset>
-        </property>
-        <property name="iconSize">
-         <size>
-          <width>24</width>
-          <height>24</height>
-         </size>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <resources>
-  <include location="ressources.qrc"/>
- </resources>
- <connections/>
-</ui>