Skip to content

Commit df1a0f9

Browse files
debugdebug
committed
Minor vfxConfigManager UI tweaks
1 parent b6ab1c2 commit df1a0f9

13 files changed

+111
-60
lines changed

‎scripts/ingestIt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,7 @@ class DirectoryItem(QtWidgets.QTreeWidgetItem):
340340
self.__vendorInfo = metadataUtils.getVendor(os.path.basename(self.path))
341341

342342
if self.__vendorInfo is not None:
343-
self.setText(2, self.__vendorInfo['name'])
343+
self.setText(2, self.__vendorInfo.name)
344344
else:
345345
self.setText(2, "")
346346

‎scripts/vfxConfigManager‎

100644100755
Lines changed: 46 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ import vfxClientToolkit.api.logger as vfxLogger
1919

2020
LOGGER = vfxLogger.getLogger()
2121

22+
2223
class ConfigManagerUi(QtWidgets.QMainWindow):
2324

2425
TITLE = "{title} - Configuration Manager".format(title=__pretty_title__)
@@ -168,7 +169,11 @@ class SettingsWidget(QtWidgets.QWidget):
168169
helpButton = QtWidgets.QPushButton("Open Help")
169170
buttonLayout.addWidget(helpButton)
170171
helpButton.released.connect(partial(self.__openWebHelp, self.__settings['metadata']['help_url']))
172+
layoutSpacer = QtWidgets.QSpacerItem(0, 0,
173+
QtWidgets.QSizePolicy.Expanding,
174+
QtWidgets.QSizePolicy.Expanding)
171175

176+
layout.addItem(layoutSpacer)
172177
layout.addLayout(buttonLayout)
173178

174179
self.setLayout(layout)
@@ -220,6 +225,7 @@ class SettingsWidget(QtWidgets.QWidget):
220225

221226
return settings
222227

228+
223229
class AbstractSettingsWidget(QtWidgets.QWidget):
224230

225231
def __init__(self, label, data, parentWidget):
@@ -286,6 +292,7 @@ class SettingsStringWidget(AbstractSettingsWidget):
286292
#lame name
287293
self.__lineEdit.setText(settingIn)
288294

295+
289296
class SettingsIntWidget(AbstractSettingsWidget):
290297

291298
def __init__(self, label, data, parentWidget):
@@ -304,6 +311,11 @@ class SettingsIntWidget(AbstractSettingsWidget):
304311
self.__spinBox.setFixedWidth(300)
305312
self.__spinBox.setMaximum(9999)
306313

314+
layoutSpacer = QtWidgets.QSpacerItem(0, 0,
315+
QtWidgets.QSizePolicy.Expanding,
316+
QtWidgets.QSizePolicy.Expanding)
317+
318+
layout.addItem(layoutSpacer)
307319
layout.addWidget(self.__spinBox)
308320
layout.addWidget(toolTipIcon)
309321
self.setLayout(layout)
@@ -332,7 +344,10 @@ class SettingsListDictWidget(AbstractSettingsWidget):
332344
layout.addWidget(label)
333345
toolTipIcon = ToolTipIcon(self.data['tooltip'])
334346
self.__combo = CheckComboBox()
335-
347+
layoutSpacer = QtWidgets.QSpacerItem(0, 0,
348+
QtWidgets.QSizePolicy.Expanding,
349+
QtWidgets.QSizePolicy.Expanding)
350+
layout.addItem(layoutSpacer)
336351
layout.addWidget(self.__combo)
337352

338353
if self.data['callback'] != None:
@@ -372,10 +387,16 @@ class SettingsPathWidget(AbstractSettingsWidget):
372387
label = QtWidgets.QLabel("{0}:".format(self.data['pretty_name']))
373388

374389
layout.addWidget(label)
390+
391+
layoutSpacer = QtWidgets.QSpacerItem(0, 0,
392+
QtWidgets.QSizePolicy.Expanding,
393+
QtWidgets.QSizePolicy.Expanding)
394+
layout.addItem(layoutSpacer)
395+
375396
toolTipIcon = ToolTipIcon(self.data['tooltip'])
376397

377398
self.__pathLineEdit = QtWidgets.QLineEdit()
378-
399+
self.__pathLineEdit.setFixedWidth(300)
379400
layout.addWidget(self.__pathLineEdit)
380401

381402
if self.data['callback'] != None:
@@ -402,6 +423,7 @@ class SettingsPathWidget(AbstractSettingsWidget):
402423
def setSetting(self, settingIn):
403424
self.__pathLineEdit.setText(settingIn)
404425

426+
405427
class SettingsStringListWidget(AbstractSettingsWidget):
406428

407429
def __init__(self, label, data, parentWidget):
@@ -417,6 +439,12 @@ class SettingsStringListWidget(AbstractSettingsWidget):
417439
toolTipIcon = ToolTipIcon(self.data['tooltip'])
418440

419441
self.__listCombo = QtWidgets.QComboBox()
442+
self.__listCombo.setFixedWidth(300)
443+
444+
layoutSpacer = QtWidgets.QSpacerItem(0, 0,
445+
QtWidgets.QSizePolicy.Expanding,
446+
QtWidgets.QSizePolicy.Expanding)
447+
layout.addItem(layoutSpacer)
420448

421449
layout.addWidget(self.__listCombo)
422450

@@ -428,9 +456,11 @@ class SettingsStringListWidget(AbstractSettingsWidget):
428456

429457
self.__addButton = QtWidgets.QPushButton("")
430458
self.__addButton.setIcon(QtGui.QIcon(PLUS_ICON))
459+
self.__addButton.setFixedWidth(40)
431460

432461
self.__minusButton = QtWidgets.QPushButton("")
433462
self.__minusButton.setIcon(QtGui.QIcon(MINUS_ICON))
463+
self.__minusButton.setFixedWidth(40)
434464

435465
layout.addWidget(self.__addButton)
436466
layout.addWidget(self.__minusButton)
@@ -443,6 +473,7 @@ class SettingsStringListWidget(AbstractSettingsWidget):
443473
items = []
444474
for i in range(self.__listCombo.count()):
445475
items.append(self.__listCombo.itemText(i))
476+
446477
return {self.label: items}
447478

448479
def __enactCallbackButton(self):
@@ -465,12 +496,12 @@ class SettingsStringListWidget(AbstractSettingsWidget):
465496

466497
def removeItem(self):
467498
self.__listCombo.removeItem(self.__listCombo.findText(self.__listCombo.currentText()))
468-
pass
469499

470500
def __setupSignals(self):
471501
self.__addButton.released.connect(self.addItem)
472502
self.__minusButton.released.connect(self.removeItem)
473503

504+
474505
class SettingsCustomWidget(AbstractSettingsWidget):
475506

476507
def __init__(self, label, data, parentWidget, password=False):
@@ -486,11 +517,23 @@ class SettingsCustomWidget(AbstractSettingsWidget):
486517
layout.addWidget(label)
487518
toolTipIcon = ToolTipIcon(self.data['tooltip'])
488519

520+
layoutSpacer = QtWidgets.QSpacerItem(0, 0,
521+
QtWidgets.QSizePolicy.Expanding,
522+
QtWidgets.QSizePolicy.Expanding)
523+
layout.addItem(layoutSpacer)
524+
525+
489526
if self.data['callback'] != None:
490527
callbackButton = QtWidgets.QPushButton(self.data['callback']['label'])
528+
callbackButton.setFixedWidth(200)
491529
callbackButton.released.connect(self.__enactCallbackButton)
492530

493531
layout.addWidget(callbackButton)
532+
533+
layoutSpacer = QtWidgets.QSpacerItem(0, 0,
534+
QtWidgets.QSizePolicy.Expanding,
535+
QtWidgets.QSizePolicy.Expanding)
536+
layout.addItem(layoutSpacer)
494537
layout.addWidget(toolTipIcon)
495538
self.setLayout(layout)
496539

@@ -510,8 +553,6 @@ class SettingsCustomWidget(AbstractSettingsWidget):
510553
func(self)
511554

512555

513-
514-
515556
class ToolTipIcon(QtWidgets.QLabel):
516557

517558
def __init__(self, tooltip):

‎scripts/vfxTray‎

100644100755
File mode changed.

‎vfxClientToolkit/api/sg.py‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
import re
22
import datetime
3+
import ssl
34

45
import shotgun_api3
56
from vfxClientToolkit.api.config import ConfigBundle
67
import vfxClientToolkit.api.entities as vfxEntities
78

8-
#Sequence, Shot, Version, Playlist
9-
9+
ssl._create_default_https_context = ssl._create_unverified_context
1010

1111
cb = ConfigBundle()
1212
CONFIG_DATA = cb.getContexts()
1313

14+
1415
def getShotgunHandle():
1516
"""
1617
Returns `shotgun_api3.Shotgun` object using the API key from the configuration files.
@@ -323,6 +324,7 @@ def getAllDeliveries(sg):
323324
else:
324325
return indices[0]
325326

327+
326328
def schemaRead(entityType, fieldName):
327329
"""
328330
Returns all delivery entities in Shotgun.
@@ -340,6 +342,7 @@ def schemaRead(entityType, fieldName):
340342

341343
return values
342344

345+
343346
def getVendors():
344347
"""
345348
Returns all delivery entities in Shotgun.

‎vfxClientToolkit/configs/vfxCTK_config_email.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,28 +18,28 @@
1818
"data_type": "string",
1919
"pretty_name": "User name",
2020
"callback": null,
21-
"tooltip": "misc",
21+
"tooltip": "Username for SMTP server.",
2222
"value": null
2323
},
2424
"password": {
2525
"pretty_name": "Password",
2626
"data_type": "password",
2727
"callback": null,
28-
"tooltip": "misc",
28+
"tooltip": "Password for specified username.",
2929
"value": null
3030
},
3131
"smtp": {
3232
"pretty_name": "SMTP Server",
3333
"data_type": "string",
3434
"callback": null,
35-
"tooltip": "misc",
35+
"tooltip": "SMTP server address.",
3636
"value": null
3737
},
3838
"port": {
3939
"pretty_name": "Port Num",
4040
"data_type": "int",
4141
"callback": null,
42-
"tooltip": "misc",
42+
"tooltip": "Port number.",
4343
"value": null
4444
}
4545
}

‎vfxClientToolkit/configs/vfxCTK_config_filesystem.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"module": "vfxClientToolkit.configs.utils.filesystem",
1818
"label": "Browse"
1919
},
20-
"tooltip": "misc",
20+
"tooltip": "File path root where all published and tracked files are stored.",
2121
"value": null
2222
},
2323
"posix_prefix": {

‎vfxClientToolkit/configs/vfxCTK_config_fml.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"label": "Browse"
1818
},
1919
"pretty_name": "Path to RV Binary",
20-
"tooltip": "misc",
20+
"tooltip": "Path to the RV executable.",
2121
"value": null
2222
}
2323
}

‎vfxClientToolkit/configs/vfxCTK_config_mailIt.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"pretty_name": "Sequence(s) Whitelist",
66
"data_type": "list",
77
"callback": null,
8-
"tooltip": "misc",
8+
"tooltip": "Sequences that should be included when iterating over playlist",
99
"value": null
1010
},
1111
"recipients_by_vendor": {
@@ -17,7 +17,7 @@
1717
},
1818
"data_type": "custom",
1919
"type": "Group",
20-
"tooltip": "misc",
20+
"tooltip": "Users to receive notification mail separated by vendor",
2121
"value": {
2222
"vendor": null,
2323
"name": null
@@ -27,7 +27,7 @@
2727
"pretty_name": "Recipients for all mail",
2828
"data_type": "list",
2929
"callback": null,
30-
"tooltip": "misc",
30+
"tooltip": "Recipients that receive mail regardless of vendor",
3131
"value": null
3232
}
3333
},

‎vfxClientToolkit/configs/vfxCTK_config_mrFilmOut.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"data_type": "dict",
1414
"pretty_name": "Dropbox Credentials",
1515
"callback": null,
16-
"tooltip": "misc",
16+
"tooltip": "Dropbox User API Credentials",
1717
"value": {
1818
"access_token": null,
1919
"namespace_id": null
@@ -23,7 +23,7 @@
2323
"pretty_name": "Dropbox Root",
2424
"data_type": "string",
2525
"callback": null,
26-
"tooltip": "misc",
26+
"tooltip": "Path root that files are uploaded to.",
2727
"value": null
2828
},
2929
"default_write_location": {
@@ -34,14 +34,14 @@
3434
"module": "vfxClientToolkit.configs.utils.filesystem",
3535
"label": "Browse"
3636
},
37-
"tooltip": "misc",
37+
"tooltip": "Path that files are written to locally",
3838
"value": null
3939
},
4040
"email_recipients": {
4141
"pretty_name": "Email Recipients",
4242
"data_type": "list",
4343
"callback": null,
44-
"tooltip": "misc",
44+
"tooltip": "List of people that receive notification mail upon filmOut",
4545
"value": null
4646
}
4747
}

‎vfxClientToolkit/configs/vfxCTK_config_push.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@
1818
"pretty_name": "Token Value",
1919
"data_type": "string",
2020
"callback": null,
21-
"tooltip": "misc",
21+
"tooltip": "API Token Key",
2222
"value": null
2323
},
2424
"user": {
2525
"pretty_name": "User Key",
2626
"data_type": "string",
2727
"callback": null,
28-
"tooltip": "misc",
28+
"tooltip": "Uesr Key",
2929
"value": null
3030
}
3131
}

0 commit comments

Comments
 (0)