From 11993d675105da3acd5d422acca19bd4a3c018ae Mon Sep 17 00:00:00 2001 From: Wenduo Zhou Date: Tue, 10 Mar 2015 17:19:21 -0400 Subject: [PATCH] Put new widgets to grid. Refs #11289. --- .../HFIRPowderReduction/Ui_MainWindow.py | 80 ++++- .../HFIRPowderReduction/Ui_MainWindow.ui | 327 +++++++++--------- 2 files changed, 250 insertions(+), 157 deletions(-) diff --git a/Code/Mantid/scripts/HFIRPowderReduction/Ui_MainWindow.py b/Code/Mantid/scripts/HFIRPowderReduction/Ui_MainWindow.py index dd259c36adbf..42cb030ebcec 100644 --- a/Code/Mantid/scripts/HFIRPowderReduction/Ui_MainWindow.py +++ b/Code/Mantid/scripts/HFIRPowderReduction/Ui_MainWindow.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'Ui_MainWindow.ui' # -# Created: Mon Mar 9 15:26:13 2015 +# Created: Tue Mar 10 10:27:20 2015 # by: PyQt4 UI code generator 4.11.2 # # WARNING! All changes made in this file will be lost! @@ -189,6 +189,72 @@ def setupUi(self, MainWindow): self.tabWidget.addTab(self.tab, _fromUtf8("")) self.tab_2 = QtGui.QWidget() self.tab_2.setObjectName(_fromUtf8("tab_2")) + self.gridLayout_3 = QtGui.QGridLayout(self.tab_2) + self.gridLayout_3.setObjectName(_fromUtf8("gridLayout_3")) + self.verticalLayout_4 = QtGui.QVBoxLayout() + self.verticalLayout_4.setObjectName(_fromUtf8("verticalLayout_4")) + self.horizontalLayout_7 = QtGui.QHBoxLayout() + self.horizontalLayout_7.setObjectName(_fromUtf8("horizontalLayout_7")) + self.label_cache = QtGui.QLabel(self.tab_2) + self.label_cache.setObjectName(_fromUtf8("label_cache")) + self.horizontalLayout_7.addWidget(self.label_cache) + self.lineEdit_cache = QtGui.QLineEdit(self.tab_2) + self.lineEdit_cache.setObjectName(_fromUtf8("lineEdit_cache")) + self.horizontalLayout_7.addWidget(self.lineEdit_cache) + self.pushButton_broseCache = QtGui.QPushButton(self.tab_2) + self.pushButton_broseCache.setObjectName(_fromUtf8("pushButton_broseCache")) + self.horizontalLayout_7.addWidget(self.pushButton_broseCache) + self.checkBox_delCache = QtGui.QCheckBox(self.tab_2) + self.checkBox_delCache.setObjectName(_fromUtf8("checkBox_delCache")) + self.horizontalLayout_7.addWidget(self.checkBox_delCache) + spacerItem7 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) + self.horizontalLayout_7.addItem(spacerItem7) + self.verticalLayout_4.addLayout(self.horizontalLayout_7) + self.horizontalLayout_8 = QtGui.QHBoxLayout() + self.horizontalLayout_8.setObjectName(_fromUtf8("horizontalLayout_8")) + self.radioButton_useServer = QtGui.QRadioButton(self.tab_2) + self.radioButton_useServer.setText(_fromUtf8("")) + self.radioButton_useServer.setObjectName(_fromUtf8("radioButton_useServer")) + self.horizontalLayout_8.addWidget(self.radioButton_useServer) + self.label = QtGui.QLabel(self.tab_2) + self.label.setObjectName(_fromUtf8("label")) + self.horizontalLayout_8.addWidget(self.label) + self.lineEdit = QtGui.QLineEdit(self.tab_2) + self.lineEdit.setObjectName(_fromUtf8("lineEdit")) + self.horizontalLayout_8.addWidget(self.lineEdit) + self.pushButton_chkServer = QtGui.QPushButton(self.tab_2) + self.pushButton_chkServer.setObjectName(_fromUtf8("pushButton_chkServer")) + self.horizontalLayout_8.addWidget(self.pushButton_chkServer) + spacerItem8 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) + self.horizontalLayout_8.addItem(spacerItem8) + self.verticalLayout_4.addLayout(self.horizontalLayout_8) + self.horizontalLayout_9 = QtGui.QHBoxLayout() + self.horizontalLayout_9.setObjectName(_fromUtf8("horizontalLayout_9")) + self.radioButton_userLocal = QtGui.QRadioButton(self.tab_2) + self.radioButton_userLocal.setText(_fromUtf8("")) + self.radioButton_userLocal.setObjectName(_fromUtf8("radioButton_userLocal")) + self.horizontalLayout_9.addWidget(self.radioButton_userLocal) + self.label_localSrc = QtGui.QLabel(self.tab_2) + self.label_localSrc.setObjectName(_fromUtf8("label_localSrc")) + self.horizontalLayout_9.addWidget(self.label_localSrc) + self.lineEdit_localSrc = QtGui.QLineEdit(self.tab_2) + self.lineEdit_localSrc.setObjectName(_fromUtf8("lineEdit_localSrc")) + self.horizontalLayout_9.addWidget(self.lineEdit_localSrc) + self.pushButton_browseLocalSrc = QtGui.QPushButton(self.tab_2) + self.pushButton_browseLocalSrc.setObjectName(_fromUtf8("pushButton_browseLocalSrc")) + self.horizontalLayout_9.addWidget(self.pushButton_browseLocalSrc) + spacerItem9 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum) + self.horizontalLayout_9.addItem(spacerItem9) + self.verticalLayout_4.addLayout(self.horizontalLayout_9) + self.horizontalLayout_4 = QtGui.QHBoxLayout() + self.horizontalLayout_4.setObjectName(_fromUtf8("horizontalLayout_4")) + self.label_2 = QtGui.QLabel(self.tab_2) + self.label_2.setObjectName(_fromUtf8("label_2")) + self.horizontalLayout_4.addWidget(self.label_2) + self.verticalLayout_4.addLayout(self.horizontalLayout_4) + self.gridLayout_3.addLayout(self.verticalLayout_4, 0, 0, 1, 1) + spacerItem10 = QtGui.QSpacerItem(20, 40, QtGui.QSizePolicy.Minimum, QtGui.QSizePolicy.Preferred) + self.gridLayout_3.addItem(spacerItem10, 1, 0, 1, 1) self.tabWidget.addTab(self.tab_2, _fromUtf8("")) self.horizontalLayout_2.addWidget(self.tabWidget) self.verticalLayout.addLayout(self.horizontalLayout_2) @@ -218,7 +284,7 @@ def setupUi(self, MainWindow): self.menubar.addAction(self.menuHelp.menuAction()) self.retranslateUi(MainWindow) - self.tabWidget.setCurrentIndex(0) + self.tabWidget.setCurrentIndex(1) QtCore.QMetaObject.connectSlotsByName(MainWindow) def retranslateUi(self, MainWindow): @@ -239,6 +305,16 @@ def retranslateUi(self, MainWindow): self.pushButton_unitD.setText(_translate("MainWindow", "dSpacing", None)) self.pushButton_unitQ.setText(_translate("MainWindow", "Q", None)) self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab), _translate("MainWindow", "Normalized", None)) + self.label_cache.setToolTip(_translate("MainWindow", "

Cache data file download from server to local disk.

The default is current working directory.

The cached files will be deleted with normal quit.

", None)) + self.label_cache.setText(_translate("MainWindow", "Cache Raw Data File", None)) + self.pushButton_broseCache.setText(_translate("MainWindow", "Browse", None)) + self.checkBox_delCache.setToolTip(_translate("MainWindow", "

Cached files will be deleted upon quitting normally.

", None)) + self.checkBox_delCache.setText(_translate("MainWindow", "Delete Cache Before Quit", None)) + self.label.setText(_translate("MainWindow", "Server Address", None)) + self.pushButton_chkServer.setText(_translate("MainWindow", "Check URL", None)) + self.label_localSrc.setText(_translate("MainWindow", "Local Data Storage", None)) + self.pushButton_browseLocalSrc.setText(_translate("MainWindow", "Browse", None)) + self.label_2.setText(_translate("MainWindow", "Message", None)) self.tabWidget.setTabText(self.tabWidget.indexOf(self.tab_2), _translate("MainWindow", "Advanced Setup", None)) self.menuFile.setTitle(_translate("MainWindow", "File", None)) self.menuView.setTitle(_translate("MainWindow", "View", None)) diff --git a/Code/Mantid/scripts/HFIRPowderReduction/Ui_MainWindow.ui b/Code/Mantid/scripts/HFIRPowderReduction/Ui_MainWindow.ui index 65d48522345e..b7b29ae73034 100644 --- a/Code/Mantid/scripts/HFIRPowderReduction/Ui_MainWindow.ui +++ b/Code/Mantid/scripts/HFIRPowderReduction/Ui_MainWindow.ui @@ -75,6 +75,11 @@ 1 + + + Raw Detectors + + Normalized @@ -197,7 +202,7 @@ - + 0 0 @@ -334,159 +339,171 @@ Advanced Setup - - - - 210 - 40 - 231 - 21 - - - - - - - 70 - 40 - 141 - 16 - - - - <html><head/><body><p>Cache data file download from server to local disk. </p><p>The default is current working directory. </p><p>The cached files will be deleted with normal quit. </p></body></html> - - - Cache Raw Data File - - - - - - 530 - 20 - 114 - 32 - - - - Browse - - - - - - 690 - 50 - 161 - 20 - - - - <html><head/><body><p>Cached files will be deleted upon quitting normally.</p></body></html> - - - Delete Cache Before Quit - - - - - - 80 - 130 - 141 - 16 - - - - Server Address - - - - - - 80 - 190 - 161 - 16 - - - - Local Data Storage - - - - - - 260 - 130 - 251 - 21 - - - - - - - 570 - 180 - 114 - 32 - - - - Browse - - - - - - 270 - 180 - 241 - 21 - - - - - - - 20 - 130 - 31 - 20 - - - - - - - - - - 30 - 190 - 31 - 20 - - - - - - - - - - 570 - 120 - 114 - 32 - - - - Check URL - - + + + + + + + + + <html><head/><body><p>Cache data file download from server to local disk. </p><p>The default is current working directory. </p><p>The cached files will be deleted with normal quit. </p></body></html> + + + Cache Raw Data File + + + + + + + + + + Browse + + + + + + + <html><head/><body><p>Cached files will be deleted upon quitting normally.</p></body></html> + + + Delete Cache Before Quit + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + + + + + + + + + Server Address + + + + + + + + + + Check URL + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + + + + + + + + + Local Data Storage + + + + + + + + + + Browse + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + + Message + + + + + + + + + + + Qt::Vertical + + + QSizePolicy::Preferred + + + + 20 + 40 + + + + + + verticalLayoutWidget + gridLayoutWidget + verticalSpacer_2 @@ -502,7 +519,7 @@ 0 0 1200 - 22 + 25