Merge pull request #272 from iBridges-for-iRods/develop

v.1.1.2
iBridges-for-iRODS · Oct 7, 2024 · 3395ded · 3395ded
2 parents 3caa89a + 1344811
commit 3395ded
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 16 deletions.
diff --git a/ibridgesgui/ui_files/tabBrowser.py b/ibridgesgui/ui_files/tabBrowser.py
@@ -1,6 +1,6 @@
 # Form implementation generated from reading ui file 'ibridgesgui/ui_files/tabBrowser.ui'
 #
-# Created by: PyQt6 UI code generator 6.6.1
+# Created by: PyQt6 UI code generator 6.7.1
 #
 # WARNING: Any manual changes made to this file will be lost when pyuic6 is
 # run again.  Do not edit this file unless you know what you are doing.
@@ -12,7 +12,7 @@
 class Ui_tabBrowser(object):
     def setupUi(self, tabBrowser):
         tabBrowser.setObjectName("tabBrowser")
-        tabBrowser.resize(1278, 818)
+        tabBrowser.resize(1278, 843)
         tabBrowser.setStyleSheet("QWidget\n"
 "{\n"
 "    background-color: rgb(211,211,211);\n"
@@ -110,12 +110,9 @@ def setupUi(self, tabBrowser):
         self.horizontalLayout_5.addWidget(self.rename_button)
         spacerItem1 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Policy.Expanding, QtWidgets.QSizePolicy.Policy.Minimum)
         self.horizontalLayout_5.addItem(spacerItem1)
-        self.upload_file_button = QtWidgets.QPushButton(parent=tabBrowser)
-        self.upload_file_button.setObjectName("upload_file_button")
-        self.horizontalLayout_5.addWidget(self.upload_file_button)
-        self.upload_dir_button = QtWidgets.QPushButton(parent=tabBrowser)
-        self.upload_dir_button.setObjectName("upload_dir_button")
-        self.horizontalLayout_5.addWidget(self.upload_dir_button)
+        self.upload_button = QtWidgets.QPushButton(parent=tabBrowser)
+        self.upload_button.setObjectName("upload_button")
+        self.horizontalLayout_5.addWidget(self.upload_button)
         self.download_button = QtWidgets.QPushButton(parent=tabBrowser)
         self.download_button.setObjectName("download_button")
         self.horizontalLayout_5.addWidget(self.download_button)
@@ -165,7 +162,7 @@ def setupUi(self, tabBrowser):
         self.horizontalLayout = QtWidgets.QHBoxLayout(self.metadata)
         self.horizontalLayout.setObjectName("horizontalLayout")
         self.meta_table = QtWidgets.QTableWidget(parent=self.metadata)
-        self.meta_table.setMinimumSize(QtCore.QSize(600, 300))
+        self.meta_table.setMinimumSize(QtCore.QSize(600, 200))
         self.meta_table.setStyleSheet("")
         self.meta_table.setSizeAdjustPolicy(QtWidgets.QAbstractScrollArea.SizeAdjustPolicy.AdjustToContents)
         self.meta_table.setEditTriggers(QtWidgets.QAbstractItemView.EditTrigger.NoEditTriggers)
@@ -256,7 +253,7 @@ def setupUi(self, tabBrowser):
         self.horizontalLayout_2 = QtWidgets.QHBoxLayout(self.permissions)
         self.horizontalLayout_2.setObjectName("horizontalLayout_2")
         self.acl_table = QtWidgets.QTableWidget(parent=self.permissions)
-        self.acl_table.setMinimumSize(QtCore.QSize(600, 0))
+        self.acl_table.setMinimumSize(QtCore.QSize(600, 200))
         self.acl_table.setStyleSheet("")
         self.acl_table.setSizeAdjustPolicy(QtWidgets.QAbstractScrollArea.SizeAdjustPolicy.AdjustToContents)
         self.acl_table.setEditTriggers(QtWidgets.QAbstractItemView.EditTrigger.NoEditTriggers)
@@ -382,8 +379,7 @@ def retranslateUi(self, tabBrowser):
         self.input_path.setText(_translate("tabBrowser", "/zoneName/home/user"))
         self.create_coll_button.setText(_translate("tabBrowser", "Create Collection"))
         self.rename_button.setText(_translate("tabBrowser", "Rename/Move"))
-        self.upload_file_button.setText(_translate("tabBrowser", "Upload File"))
-        self.upload_dir_button.setText(_translate("tabBrowser", "Upload Folder"))
+        self.upload_button.setText(_translate("tabBrowser", "Upload"))
         self.download_button.setText(_translate("tabBrowser", "Download"))
         self.delete_button.setText(_translate("tabBrowser", "Delete"))
         self.browser_table.setSortingEnabled(False)

diff --git a/ibridgesgui/ui_files/tabBrowser.ui b/ibridgesgui/ui_files/tabBrowser.ui
@@ -329,7 +329,7 @@ QTabWidget#info_tabs
          <property name="minimumSize">
           <size>
            <width>600</width>
-           <height>300</height>
+           <height>200</height>
           </size>
          </property>
          <property name="styleSheet">
@@ -502,7 +502,7 @@ QTabWidget#info_tabs
          <property name="minimumSize">
           <size>
            <width>600</width>
-           <height>0</height>
+           <height>200</height>
           </size>
          </property>
          <property name="styleSheet">

diff --git a/pyproject.toml b/pyproject.toml
@@ -72,6 +72,10 @@ extension-pkg-whitelist="PyQt6"
 disable=["E0611", "E0401", "E0401", "E1101",
          "W0718", "fixme", "too-many-arguments",
          "R0912", "R0916", "R0911", "R0801", "R0902"]
+
+[tool.pylint.'MESSAGES CONTROL']
+disable="too-many-positional-arguments"
+
 max-line-length=100
 max-locals=35
 max-args=10

diff --git a/requirements_dev.txt b/requirements_dev.txt
@@ -1,4 +1,4 @@
 flake8==7.1.1
-pylint==3.2.5
-pytest==8.3.2
+pylint==3.3.1
+pytest==8.3.3
 pytest-cov==5.0.0