Frame13/ayon-core
1
0
Fork 1
mirror of https://github.com/ynput/ayon-core.git synced 2026-01-01 16:34:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into enhancement/OP-2075_version-handling

Browse source
This commit is contained in:
iLLiCiTiT 2021-12-08 17:36:33 +01:00
commit c70f77eed3
101 changed files with 2176 additions and 520 deletions
Download patch file Download diff file Expand all files Collapse all files

3
openpype/tools/settings/local_settings/apps_widget.py
View file

@ -5,6 +5,7 @@ from .widgets import (
ExpandingWidget
)
from openpype.tools.settings import CHILD_OFFSET
from openpype.tools.utils import PlaceholderLineEdit
class AppVariantWidget(QtWidgets.QWidget):
@ -45,7 +46,7 @@ class AppVariantWidget(QtWidgets.QWidget):
content_layout.addWidget(warn_label)
return
executable_input_widget = QtWidgets.QLineEdit(content_widget)
executable_input_widget = PlaceholderLineEdit(content_widget)
executable_input_widget.setPlaceholderText(self.exec_placeholder)
content_layout.addWidget(executable_input_widget)

3
openpype/tools/settings/local_settings/general_widget.py
View file

@ -3,6 +3,7 @@ import getpass
from Qt import QtWidgets, QtCore
from openpype.lib import is_admin_password_required
from openpype.widgets import PasswordDialog
from openpype.tools.utils import PlaceholderLineEdit
class LocalGeneralWidgets(QtWidgets.QWidget):
@ -11,7 +12,7 @@ class LocalGeneralWidgets(QtWidgets.QWidget):
self._loading_local_settings = False
username_input = QtWidgets.QLineEdit(self)
username_input = PlaceholderLineEdit(self)
username_input.setPlaceholderText(getpass.getuser())
is_admin_input = QtWidgets.QCheckBox(self)

3
openpype/tools/settings/local_settings/mongo_widget.py
View file

@ -6,6 +6,7 @@ from Qt import QtWidgets
from pymongo.errors import ServerSelectionTimeoutError
from openpype.api import change_openpype_mongo_url
from openpype.tools.utils import PlaceholderLineEdit
class OpenPypeMongoWidget(QtWidgets.QWidget):
@ -25,7 +26,7 @@ class OpenPypeMongoWidget(QtWidgets.QWidget):
mongo_url_label = QtWidgets.QLabel("OpenPype Mongo URL", self)
# Input
mongo_url_input = QtWidgets.QLineEdit(self)
mongo_url_input = PlaceholderLineEdit(self)
mongo_url_input.setPlaceholderText("< OpenPype Mongo URL >")
mongo_url_input.setText(os.environ["OPENPYPE_MONGO"])

3
openpype/tools/settings/local_settings/projects_widget.py
View file

@ -2,6 +2,7 @@ import platform
import copy
from Qt import QtWidgets, QtCore, QtGui
from openpype.tools.settings.settings import ProjectListWidget
from openpype.tools.utils import PlaceholderLineEdit
from openpype.settings.constants import (
PROJECT_ANATOMY_KEY,
DEFAULT_PROJECT_KEY
@ -45,7 +46,7 @@ class DynamicInputItem(QtCore.QObject):
parent
):
super(DynamicInputItem, self).__init__()
input_widget = QtWidgets.QLineEdit(parent)
input_widget = PlaceholderLineEdit(parent)
settings_value = input_def.get("value")
placeholder = input_def.get("placeholder")

1
openpype/tools/settings/settings/widgets.py
View file

@ -12,6 +12,7 @@ from openpype.tools.utils.widgets import ImageButton
from openpype.tools.utils.lib import paint_image_with_color
from openpype.widgets.nice_checkbox import NiceCheckbox
from openpype.tools.utils import PlaceholderLineEdit
from openpype.settings.lib import get_system_settings
from .images import (
get_pixmap,