From 658d52fb4f7de7f3d98474e15b6cae76abb58b21 Mon Sep 17 00:00:00 2001 From: Peter Surda Date: Thu, 28 Apr 2016 00:36:54 +0200 Subject: [PATCH] TTL/Send tab fixes Now stretches correctly and does not unnecessarily shorten the text. --- src/bitmessageqt/bitmessageui.py | 56 +++++++++++++------------------- 1 file changed, 23 insertions(+), 33 deletions(-) diff --git a/src/bitmessageqt/bitmessageui.py b/src/bitmessageqt/bitmessageui.py index 3ed7e4ea..b1b7f7f4 100644 --- a/src/bitmessageqt/bitmessageui.py +++ b/src/bitmessageqt/bitmessageui.py @@ -283,14 +283,17 @@ class Ui_MainWindow(object): self.gridLayout_9.addWidget(self.verticalSplitter_6, 0, 0, 1, 1) self.tabWidgetSend.addTab(self.sendBroadcast, _fromUtf8("")) self.verticalSplitter.addWidget(self.tabWidgetSend) - self.horizontalSplitter_5 = QtGui.QSplitter() - self.horizontalSplitter_5.setObjectName(_fromUtf8("horizontalSplitter_5")) + self.tTLContainer = QtGui.QWidget() + self.tTLContainer.setSizePolicy(QtGui.QSizePolicy.MinimumExpanding, QtGui.QSizePolicy.Fixed) + self.horizontalLayout_5 = QtGui.QHBoxLayout() + self.tTLContainer.setLayout(self.horizontalLayout_5) + self.horizontalLayout_5.setObjectName(_fromUtf8("horizontalLayout_5")) self.pushButtonTTL = QtGui.QPushButton(self.send) -# sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed) -# sizePolicy.setHorizontalStretch(0) -# sizePolicy.setVerticalStretch(0) -# sizePolicy.setHeightForWidth(self.pushButtonTTL.sizePolicy().hasHeightForWidth()) -# self.pushButtonTTL.setSizePolicy(sizePolicy) + sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.MinimumExpanding, QtGui.QSizePolicy.Fixed) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.pushButtonTTL.sizePolicy().hasHeightForWidth()) + self.pushButtonTTL.setSizePolicy(sizePolicy) palette = QtGui.QPalette() brush = QtGui.QBrush(QtGui.QColor(0, 0, 255)) brush.setStyle(QtCore.Qt.SolidPattern) @@ -307,44 +310,31 @@ class Ui_MainWindow(object): self.pushButtonTTL.setFont(font) self.pushButtonTTL.setFlat(True) self.pushButtonTTL.setObjectName(_fromUtf8("pushButtonTTL")) - self.horizontalSplitter_5.addWidget(self.pushButtonTTL) + self.horizontalLayout_5.addWidget(self.pushButtonTTL, 0, QtCore.Qt.AlignRight) self.horizontalSliderTTL = QtGui.QSlider(self.send) self.horizontalSliderTTL.setMinimumSize(QtCore.QSize(35, 0)) self.horizontalSliderTTL.setOrientation(QtCore.Qt.Horizontal) self.horizontalSliderTTL.setInvertedAppearance(False) self.horizontalSliderTTL.setInvertedControls(False) self.horizontalSliderTTL.setObjectName(_fromUtf8("horizontalSliderTTL")) - self.horizontalSplitter_5.addWidget(self.horizontalSliderTTL) + self.horizontalLayout_5.addWidget(self.horizontalSliderTTL, 0, QtCore.Qt.AlignLeft) self.labelHumanFriendlyTTLDescription = QtGui.QLabel(self.send) -# sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Preferred) -# sizePolicy.setHorizontalStretch(0) -# sizePolicy.setVerticalStretch(0) -# sizePolicy.setHeightForWidth(self.labelHumanFriendlyTTLDescription.sizePolicy().hasHeightForWidth()) -# self.labelHumanFriendlyTTLDescription.setSizePolicy(sizePolicy) + sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.MinimumExpanding, QtGui.QSizePolicy.Fixed) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.labelHumanFriendlyTTLDescription.sizePolicy().hasHeightForWidth()) + self.labelHumanFriendlyTTLDescription.setSizePolicy(sizePolicy) self.labelHumanFriendlyTTLDescription.setMinimumSize(QtCore.QSize(45, 0)) self.labelHumanFriendlyTTLDescription.setObjectName(_fromUtf8("labelHumanFriendlyTTLDescription")) - self.horizontalSplitter_5.addWidget(self.labelHumanFriendlyTTLDescription) + self.horizontalLayout_5.addWidget(self.labelHumanFriendlyTTLDescription, 1, QtCore.Qt.AlignLeft) self.pushButtonSend = QtGui.QPushButton(self.send) self.pushButtonSend.setObjectName(_fromUtf8("pushButtonSend")) - self.horizontalSplitter_5.addWidget(self.pushButtonSend) - self.pushButtonTTL.setMaximumSize(QtCore.QSize(32, self.pushButtonSend.height())) - self.labelHumanFriendlyTTLDescription.setMaximumSize(QtCore.QSize(45, self.pushButtonSend.height())) + self.horizontalLayout_5.addWidget(self.pushButtonSend, 0, QtCore.Qt.AlignRight) self.horizontalSliderTTL.setMaximumSize(QtCore.QSize(70, self.pushButtonSend.height())) - self.horizontalSplitter_5.resize(self.horizontalSplitter_5.width(), self.pushButtonSend.height()) - self.horizontalSplitter_5.setStretchFactor(0, 0) - self.horizontalSplitter_5.setStretchFactor(1, 0) - self.horizontalSplitter_5.setStretchFactor(2, 0) - self.horizontalSplitter_5.setStretchFactor(3, 1) - self.horizontalSplitter_5.setCollapsible(0, False) - self.horizontalSplitter_5.setCollapsible(1, False) - self.horizontalSplitter_5.setCollapsible(2, False) - self.horizontalSplitter_5.setCollapsible(3, False) - self.horizontalSplitter_5.handle(1).setEnabled(False) - self.horizontalSplitter_5.handle(2).setEnabled(False) - self.horizontalSplitter_5.handle(3).setEnabled(False) - self.verticalSplitter.addWidget(self.horizontalSplitter_5) - self.verticalSplitter.setStretchFactor(0, 0) - self.verticalSplitter.setStretchFactor(1, 1) + self.verticalSplitter.addWidget(self.tTLContainer) + self.tTLContainer.adjustSize() + self.verticalSplitter.setStretchFactor(1, 0) + self.verticalSplitter.setStretchFactor(0, 1) self.verticalSplitter.setCollapsible(0, False) self.verticalSplitter.setCollapsible(1, False) self.verticalSplitter.handle(1).setEnabled(False)