SG-9210: [minor] Button width fix due to issues in Houdini 17. (#71)

Sets some button min widths to combat styling issues in Houdini 17.

Author: thebeeland

hooks/tk-houdini_actions.py

@@ -163,11 +163,16 @@ def _merge(self, path, sg_publish_data):
 
         # use the default settings, which tries to merge all nodes
         # and is conservative about overwriting and errors                
-        
-        hou.hipFile.merge(path,
-                          node_pattern="*",
-                          overwrite_on_conflict=False,
-                          ignore_load_warnings=False) 
+        #
+        # NOTE: We're ensuring that the path uses forward-slash separators
+        # since some hearly H17 builds had major issues with backslashes on
+        # Windows.
+        hou.hipFile.merge(
+            path.replace(os.path.sep, "/"),
+            node_pattern="*",
+            overwrite_on_conflict=False,
+            ignore_load_warnings=False,
+        )
 
 
     ##############################################################################################################

python/tk_multi_loader/ui/dialog.py

@@ -11,7 +11,7 @@
 class Ui_Dialog(object):
     def setupUi(self, Dialog):
         Dialog.setObjectName("Dialog")
-        Dialog.resize(1226, 766)
+        Dialog.resize(1226, 782)
         self.horizontalLayout_3 = QtGui.QHBoxLayout(Dialog)
         self.horizontalLayout_3.setObjectName("horizontalLayout_3")
         self.left_area = QtGui.QVBoxLayout()
@@ -131,6 +131,7 @@ def setupUi(self, Dialog):
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.check_all.sizePolicy().hasHeightForWidth())
         self.check_all.setSizePolicy(sizePolicy)
+        self.check_all.setMinimumSize(QtCore.QSize(60, 26))
         self.check_all.setObjectName("check_all")
         self.horizontalLayout_6.addWidget(self.check_all)
         self.check_none = QtGui.QToolButton(Dialog)
@@ -139,6 +140,7 @@ def setupUi(self, Dialog):
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.check_none.sizePolicy().hasHeightForWidth())
         self.check_none.setSizePolicy(sizePolicy)
+        self.check_none.setMinimumSize(QtCore.QSize(75, 26))
         self.check_none.setObjectName("check_none")
         self.horizontalLayout_6.addWidget(self.check_none)
         self.label_3 = QtGui.QLabel(Dialog)
@@ -183,7 +185,7 @@ def setupUi(self, Dialog):
         self.thumbnail_mode.setObjectName("thumbnail_mode")
         self.horizontalLayout_2.addWidget(self.thumbnail_mode)
         self.list_mode = QtGui.QToolButton(Dialog)
-        self.list_mode.setMinimumSize(QtCore.QSize(0, 26))
+        self.list_mode.setMinimumSize(QtCore.QSize(26, 26))
         icon2 = QtGui.QIcon()
         icon2.addPixmap(QtGui.QPixmap(":/res/mode_switch_card.png"), QtGui.QIcon.Normal, QtGui.QIcon.Off)
         self.list_mode.setIcon(icon2)
@@ -205,7 +207,7 @@ def setupUi(self, Dialog):
         self.search_publishes.setObjectName("search_publishes")
         self.horizontalLayout_2.addWidget(self.search_publishes)
         self.info = QtGui.QToolButton(Dialog)
-        self.info.setMinimumSize(QtCore.QSize(0, 26))
+        self.info.setMinimumSize(QtCore.QSize(80, 26))
         self.info.setObjectName("info")
         self.horizontalLayout_2.addWidget(self.info)
         self.middle_area.addLayout(self.horizontalLayout_2)

python/tk_multi_loader/ui/resources_rc.py

@@ -11,7 +11,7 @@
 class Ui_PublishHistoryWidget(object):
     def setupUi(self, PublishHistoryWidget):
         PublishHistoryWidget.setObjectName("PublishHistoryWidget")
-        PublishHistoryWidget.resize(394, 93)
+        PublishHistoryWidget.resize(1226, 782)
         self.horizontalLayout_3 = QtGui.QHBoxLayout(PublishHistoryWidget)
         self.horizontalLayout_3.setSpacing(1)
         self.horizontalLayout_3.setContentsMargins(1, 1, 1, 1)
@@ -45,6 +45,7 @@ def setupUi(self, PublishHistoryWidget):
         self.header_label.setObjectName("header_label")
         self.horizontalLayout.addWidget(self.header_label)
         self.button = QtGui.QToolButton(self.box)
+        self.button.setMinimumSize(QtCore.QSize(50, 0))
         self.button.setPopupMode(QtGui.QToolButton.InstantPopup)
         self.button.setToolButtonStyle(QtCore.Qt.ToolButtonTextOnly)
         self.button.setObjectName("button")

python/tk_multi_loader/ui/widget_publish_history.py

@@ -11,7 +11,7 @@
 class Ui_PublishListWidget(object):
     def setupUi(self, PublishListWidget):
         PublishListWidget.setObjectName("PublishListWidget")
-        PublishListWidget.resize(352, 48)
+        PublishListWidget.resize(1226, 782)
         self.horizontalLayout_3 = QtGui.QHBoxLayout(PublishListWidget)
         self.horizontalLayout_3.setSpacing(1)
         self.horizontalLayout_3.setContentsMargins(1, 1, 1, 1)
@@ -63,6 +63,7 @@ def setupUi(self, PublishListWidget):
         self.verticalLayout.addItem(spacerItem1)
         self.horizontalLayout.addLayout(self.verticalLayout)
         self.button = QtGui.QToolButton(self.box)
+        self.button.setMinimumSize(QtCore.QSize(50, 0))
         self.button.setPopupMode(QtGui.QToolButton.InstantPopup)
         self.button.setToolButtonStyle(QtCore.Qt.ToolButtonTextOnly)
         self.button.setObjectName("button")

python/tk_multi_loader/ui/widget_publish_list.py

@@ -11,7 +11,7 @@
 class Ui_PublishThumbWidget(object):
     def setupUi(self, PublishThumbWidget):
         PublishThumbWidget.setObjectName("PublishThumbWidget")
-        PublishThumbWidget.resize(520, 443)
+        PublishThumbWidget.resize(1226, 782)
         self.verticalLayout_2 = QtGui.QVBoxLayout(PublishThumbWidget)
         self.verticalLayout_2.setSpacing(1)
         self.verticalLayout_2.setContentsMargins(0, 0, 0, 0)
@@ -40,6 +40,7 @@ def setupUi(self, PublishThumbWidget):
         self.label.setObjectName("label")
         self.horizontalLayout.addWidget(self.label)
         self.button = QtGui.QToolButton(self.box)
+        self.button.setMinimumSize(QtCore.QSize(50, 0))
         self.button.setPopupMode(QtGui.QToolButton.InstantPopup)
         self.button.setToolButtonStyle(QtCore.Qt.ToolButtonTextOnly)
         self.button.setObjectName("button")

python/tk_multi_loader/ui/widget_publish_thumb.py

@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>1226</width>
-    <height>766</height>
+    <height>782</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -229,6 +229,12 @@ background-image: url(:/res/right_arrow_pressed.png);
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
+         <property name="minimumSize">
+          <size>
+           <width>60</width>
+           <height>26</height>
+          </size>
+         </property>
          <property name="text">
           <string>Select All</string>
          </property>
@@ -242,6 +248,12 @@ background-image: url(:/res/right_arrow_pressed.png);
            <verstretch>0</verstretch>
           </sizepolicy>
          </property>
+         <property name="minimumSize">
+          <size>
+           <width>75</width>
+           <height>26</height>
+          </size>
+         </property>
          <property name="text">
           <string>Select None</string>
          </property>
@@ -356,7 +368,7 @@ background-image: url(:/res/right_arrow_pressed.png);
         <widget class="QToolButton" name="list_mode">
          <property name="minimumSize">
           <size>
-           <width>0</width>
+           <width>26</width>
            <height>26</height>
           </size>
          </property>
@@ -418,7 +430,7 @@ background-image: url(:/res/right_arrow_pressed.png);
         <widget class="QToolButton" name="info">
          <property name="minimumSize">
           <size>
-           <width>0</width>
+           <width>80</width>
            <height>26</height>
           </size>
          </property>

resources/dialog.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>394</width>
-    <height>93</height>
+    <width>1226</width>
+    <height>782</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -88,6 +88,12 @@
           </item>
           <item>
            <widget class="QToolButton" name="button">
+            <property name="minimumSize">
+             <size>
+              <width>50</width>
+              <height>0</height>
+             </size>
+            </property>
             <property name="text">
              <string>Actions</string>
             </property>

resources/widget_publish_history.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>352</width>
-    <height>48</height>
+    <width>1226</width>
+    <height>782</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -148,6 +148,12 @@
       </item>
       <item>
        <widget class="QToolButton" name="button">
+        <property name="minimumSize">
+         <size>
+          <width>50</width>
+          <height>0</height>
+         </size>
+        </property>
         <property name="text">
          <string>Actions</string>
         </property>

resources/widget_publish_list.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>520</width>
-    <height>443</height>
+    <width>1226</width>
+    <height>782</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -78,6 +78,12 @@ Foo</string>
         </item>
         <item>
          <widget class="QToolButton" name="button">
+          <property name="minimumSize">
+           <size>
+            <width>50</width>
+            <height>0</height>
+           </size>
+          </property>
           <property name="text">
            <string>Actions</string>
           </property>