From 554ec3361e458d7639f99e39d242ac792d5571e7 Mon Sep 17 00:00:00 2001 From: Etoh Date: Sat, 13 Apr 2019 15:03:41 +0100 Subject: [PATCH 1/3] Config dialog: Remove 'update list' button and tweak sizes --- syncplay/ui/GuiConfiguration.py | 36 +++++++++++++++++++++++---------- 1 file changed, 25 insertions(+), 11 deletions(-) diff --git a/syncplay/ui/GuiConfiguration.py b/syncplay/ui/GuiConfiguration.py index 2ef7d65c5..2ae2060dc 100755 --- a/syncplay/ui/GuiConfiguration.py +++ b/syncplay/ui/GuiConfiguration.py @@ -134,7 +134,7 @@ def moreToggled(self): self.mediabrowseButton.show() self.saveMoreState(False) self.stackedLayout.setCurrentIndex(0) - newHeight = self.connectionSettingsGroup.minimumSizeHint().height() + self.mediaplayerSettingsGroup.minimumSizeHint().height() + self.bottomButtonFrame.minimumSizeHint().height() + 3 + newHeight = self.connectionSettingsGroup.minimumSizeHint().height() + self.mediaplayerSettingsGroup.minimumSizeHint().height() + self.bottomButtonFrame.minimumSizeHint().height() + 13 if self.error: newHeight += self.errorLabel.height()+3 self.stackedFrame.setFixedHeight(newHeight) @@ -584,11 +584,7 @@ def addBasicTab(self): i += 1 self.hostCombobox.setEditable(True) self.hostCombobox.setEditText(host) - self.hostCombobox.setFixedWidth(250) self.hostLabel = QLabel(getMessage("host-label"), self) - self.findServerButton = QtWidgets.QPushButton(QtGui.QIcon(resourcespath + 'arrow_refresh.png'), getMessage("update-server-list-label")) - self.findServerButton.clicked.connect(self.updateServerList) - self.findServerButton.setToolTip(getMessage("update-server-list-tooltip")) self.usernameTextbox = QLineEdit(self) self.usernameTextbox.setObjectName("name") @@ -610,12 +606,9 @@ def addBasicTab(self): self.defaultroomLabel.setObjectName("room") self.defaultroomTextbox.setObjectName("room") - self.defaultroomTextbox.setMaxLength(constants.MAX_ROOM_NAME_LENGTH) - self.connectionSettingsLayout = QtWidgets.QGridLayout() self.connectionSettingsLayout.addWidget(self.hostLabel, 0, 0) - self.connectionSettingsLayout.addWidget(self.hostCombobox, 0, 1) - self.connectionSettingsLayout.addWidget(self.findServerButton, 0, 2) + self.connectionSettingsLayout.addWidget(self.hostCombobox, 0, 1, 1, 2) self.connectionSettingsLayout.addWidget(self.serverpassLabel, 1, 0) self.connectionSettingsLayout.addWidget(self.serverpassTextbox, 1, 1, 1, 2) self.connectionSettingsLayout.addWidget(self.usernameLabel, 2, 0) @@ -638,7 +631,7 @@ def addBasicTab(self): self.executablepathCombobox.setEditable(True) self.executablepathCombobox.currentIndexChanged.connect(self.updateExecutableIcon) self.executablepathCombobox.setEditText(self._tryToFillPlayerPath(config['playerPath'], playerpaths)) - self.executablepathCombobox.setFixedWidth(330) + self.executablepathCombobox.setFixedWidth(200) self.executablepathCombobox.editTextChanged.connect(self.updateExecutableIcon) self.executablepathLabel = QLabel(getMessage("executable-path-label"), self) @@ -668,6 +661,26 @@ def addBasicTab(self): self.mediaplayerSettingsLayout.addWidget(self.playerargsTextbox, 2, 2, 1, 2) self.mediaplayerSettingsGroup.setLayout(self.mediaplayerSettingsLayout) + iconWidth = self.executableiconLabel.minimumSizeHint().width() + maxWidth = max( + self.hostLabel.minimumSizeHint().width(), + self.usernameLabel.minimumSizeHint().width(), + self.serverpassLabel.minimumSizeHint().width(), + self.defaultroomLabel.minimumSizeHint().width(), + self.executablepathLabel.minimumSizeHint().width(), + self.mediapathLabel.minimumSizeHint().width(), + self.playerargsLabel.minimumSizeHint().width() + ) + + self.hostLabel.setFixedWidth(maxWidth+iconWidth) + self.usernameLabel.setFixedWidth(maxWidth+iconWidth) + self.serverpassLabel.setFixedWidth(maxWidth+iconWidth) + self.defaultroomLabel.setFixedWidth(maxWidth+iconWidth) + self.executablepathLabel.setFixedWidth(maxWidth-iconWidth) + self.mediapathLabel.setFixedWidth(maxWidth) + self.playerargsLabel.setFixedWidth(maxWidth) + + self.showmoreCheckbox = QCheckBox(getMessage("more-title")) self.showmoreCheckbox.setObjectName(constants.LOAD_SAVE_MANUALLY_MARKER + "more") @@ -1331,7 +1344,7 @@ def __init__(self, config, playerpaths, error, defaultConfig): self.mediapathTextbox.show() self.mediapathLabel.show() self.mediabrowseButton.show() - newHeight = self.connectionSettingsGroup.minimumSizeHint().height()+self.mediaplayerSettingsGroup.minimumSizeHint().height()+self.bottomButtonFrame.minimumSizeHint().height()+3 + newHeight = self.connectionSettingsGroup.minimumSizeHint().height()+self.mediaplayerSettingsGroup.minimumSizeHint().height()+self.bottomButtonFrame.minimumSizeHint().height()+13 if self.error: newHeight += self.errorLabel.height() + 3 self.stackedFrame.setFixedHeight(newHeight) @@ -1340,6 +1353,7 @@ def __init__(self, config, playerpaths, error, defaultConfig): self.tabListWidget.setCurrentRow(0) self.stackedFrame.setFixedHeight(self.stackedFrame.minimumSizeHint().height()) + self.showmoreCheckbox.toggled.connect(self.moreToggled) self.setLayout(self.mainLayout) From 48d6dcda2dabd64dbf332e059c22381d77227cfb Mon Sep 17 00:00:00 2001 From: Etoh Date: Sun, 14 Apr 2019 11:24:02 +0100 Subject: [PATCH 2/3] Config dialog: Align executable input with other inputs --- syncplay/ui/GuiConfiguration.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/syncplay/ui/GuiConfiguration.py b/syncplay/ui/GuiConfiguration.py index 2ae2060dc..5a162aa2e 100755 --- a/syncplay/ui/GuiConfiguration.py +++ b/syncplay/ui/GuiConfiguration.py @@ -661,7 +661,7 @@ def addBasicTab(self): self.mediaplayerSettingsLayout.addWidget(self.playerargsTextbox, 2, 2, 1, 2) self.mediaplayerSettingsGroup.setLayout(self.mediaplayerSettingsLayout) - iconWidth = self.executableiconLabel.minimumSizeHint().width() + iconWidth = self.executableiconLabel.minimumSizeHint().width()+self.stackedLayout.spacing() maxWidth = max( self.hostLabel.minimumSizeHint().width(), self.usernameLabel.minimumSizeHint().width(), From 7ff334ac9776581d006a311732edd878584c884f Mon Sep 17 00:00:00 2001 From: Alberto Sottile Date: Tue, 30 Apr 2019 18:03:57 +0200 Subject: [PATCH 3/3] Config dialog: fix executable input alignment on all platforms --- syncplay/ui/GuiConfiguration.py | 44 ++++++++++++++++----------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/syncplay/ui/GuiConfiguration.py b/syncplay/ui/GuiConfiguration.py index 5a162aa2e..069f2792f 100755 --- a/syncplay/ui/GuiConfiguration.py +++ b/syncplay/ui/GuiConfiguration.py @@ -608,13 +608,14 @@ def addBasicTab(self): self.connectionSettingsLayout = QtWidgets.QGridLayout() self.connectionSettingsLayout.addWidget(self.hostLabel, 0, 0) - self.connectionSettingsLayout.addWidget(self.hostCombobox, 0, 1, 1, 2) + self.connectionSettingsLayout.addWidget(self.hostCombobox, 0, 1) self.connectionSettingsLayout.addWidget(self.serverpassLabel, 1, 0) - self.connectionSettingsLayout.addWidget(self.serverpassTextbox, 1, 1, 1, 2) + self.connectionSettingsLayout.addWidget(self.serverpassTextbox, 1, 1) self.connectionSettingsLayout.addWidget(self.usernameLabel, 2, 0) - self.connectionSettingsLayout.addWidget(self.usernameTextbox, 2, 1, 1, 2) + self.connectionSettingsLayout.addWidget(self.usernameTextbox, 2, 1) self.connectionSettingsLayout.addWidget(self.defaultroomLabel, 3, 0) - self.connectionSettingsLayout.addWidget(self.defaultroomTextbox, 3, 1, 1, 2) + self.connectionSettingsLayout.addWidget(self.defaultroomTextbox, 3, 1) + self.connectionSettingsLayout.setSpacing(10) self.connectionSettingsGroup.setLayout(self.connectionSettingsLayout) self.connectionSettingsGroup.setMaximumHeight(self.connectionSettingsGroup.minimumSizeHint().height()) @@ -625,13 +626,12 @@ def addBasicTab(self): self.mediaplayerSettingsGroup = QtWidgets.QGroupBox(getMessage("media-setting-title")) self.executableiconImage = QtGui.QImage() self.executableiconLabel = QLabel(self) - self.executableiconLabel.setMinimumWidth(16) + self.executableiconLabel.setFixedWidth(16) self.executableiconLabel.setAlignment(Qt.AlignRight | Qt.AlignVCenter) self.executablepathCombobox = QtWidgets.QComboBox(self) self.executablepathCombobox.setEditable(True) self.executablepathCombobox.currentIndexChanged.connect(self.updateExecutableIcon) self.executablepathCombobox.setEditText(self._tryToFillPlayerPath(config['playerPath'], playerpaths)) - self.executablepathCombobox.setFixedWidth(200) self.executablepathCombobox.editTextChanged.connect(self.updateExecutableIcon) self.executablepathLabel = QLabel(getMessage("executable-path-label"), self) @@ -650,18 +650,19 @@ def addBasicTab(self): self.playerargsTextbox.setObjectName(constants.LOAD_SAVE_MANUALLY_MARKER + "player-arguments") self.mediaplayerSettingsLayout = QtWidgets.QGridLayout() - self.mediaplayerSettingsLayout.addWidget(self.executablepathLabel, 0, 0) - self.mediaplayerSettingsLayout.addWidget(self.executableiconLabel, 0, 1) - self.mediaplayerSettingsLayout.addWidget(self.executablepathCombobox, 0, 2) - self.mediaplayerSettingsLayout.addWidget(self.executablebrowseButton, 0, 3) - self.mediaplayerSettingsLayout.addWidget(self.mediapathLabel, 1, 0) - self.mediaplayerSettingsLayout.addWidget(self.mediapathTextbox, 1, 2) - self.mediaplayerSettingsLayout.addWidget(self.mediabrowseButton, 1, 3) + self.mediaplayerSettingsLayout.addWidget(self.executablepathLabel, 0, 0, 1, 1) + self.mediaplayerSettingsLayout.addWidget(self.executableiconLabel, 0, 1, 1, 1) + self.mediaplayerSettingsLayout.addWidget(self.executablepathCombobox, 0, 2, 1, 1) + self.mediaplayerSettingsLayout.addWidget(self.executablebrowseButton, 0, 3, 1, 1) + self.mediaplayerSettingsLayout.addWidget(self.mediapathLabel, 1, 0, 1, 2) + self.mediaplayerSettingsLayout.addWidget(self.mediapathTextbox, 1, 2, 1, 1) + self.mediaplayerSettingsLayout.addWidget(self.mediabrowseButton, 1, 3, 1, 1) self.mediaplayerSettingsLayout.addWidget(self.playerargsLabel, 2, 0, 1, 2) self.mediaplayerSettingsLayout.addWidget(self.playerargsTextbox, 2, 2, 1, 2) + self.mediaplayerSettingsLayout.setSpacing(10) self.mediaplayerSettingsGroup.setLayout(self.mediaplayerSettingsLayout) - iconWidth = self.executableiconLabel.minimumSizeHint().width()+self.stackedLayout.spacing() + iconWidth = self.executableiconLabel.minimumSize().width()+self.mediaplayerSettingsLayout.spacing() maxWidth = max( self.hostLabel.minimumSizeHint().width(), self.usernameLabel.minimumSizeHint().width(), @@ -672,14 +673,13 @@ def addBasicTab(self): self.playerargsLabel.minimumSizeHint().width() ) - self.hostLabel.setFixedWidth(maxWidth+iconWidth) - self.usernameLabel.setFixedWidth(maxWidth+iconWidth) - self.serverpassLabel.setFixedWidth(maxWidth+iconWidth) - self.defaultroomLabel.setFixedWidth(maxWidth+iconWidth) - self.executablepathLabel.setFixedWidth(maxWidth-iconWidth) - self.mediapathLabel.setFixedWidth(maxWidth) - self.playerargsLabel.setFixedWidth(maxWidth) - + self.hostLabel.setMinimumWidth(maxWidth+iconWidth) + self.usernameLabel.setMinimumWidth(maxWidth+iconWidth) + self.serverpassLabel.setMinimumWidth(maxWidth+iconWidth) + self.defaultroomLabel.setMinimumWidth(maxWidth+iconWidth) + self.executablepathLabel.setMinimumWidth(maxWidth) + self.mediapathLabel.setMinimumWidth(maxWidth+iconWidth) + self.playerargsLabel.setMinimumWidth(maxWidth+iconWidth) self.showmoreCheckbox = QCheckBox(getMessage("more-title")) self.showmoreCheckbox.setObjectName(constants.LOAD_SAVE_MANUALLY_MARKER + "more")