-
Notifications
You must be signed in to change notification settings - Fork 95
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
manual conflict resolve ui_mscolab_connect_dialog.ui file
- Loading branch information
1 parent
458a978
commit 2d59aa5
Showing
2 changed files
with
252 additions
and
19 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1,249 @@ | ||
| # should re compile | ||
| # -*- coding: utf-8 -*- | ||
|
|
||
| # Form implementation generated from reading ui file 'ui_mscolab_connect_dialog.ui' | ||
| # | ||
| # Created by: PyQt5 UI code generator 5.12.3 | ||
| # | ||
| # WARNING! All changes made in this file will be lost! | ||
|
|
||
|
|
||
| from PyQt5 import QtCore, QtGui, QtWidgets | ||
|
|
||
|
|
||
| class Ui_MSColabConnectDialog(object): | ||
| def setupUi(self, MSColabConnectDialog): | ||
| MSColabConnectDialog.setObjectName("MSColabConnectDialog") | ||
| MSColabConnectDialog.resize(478, 271) | ||
| self.gridLayout_4 = QtWidgets.QGridLayout(MSColabConnectDialog) | ||
| self.gridLayout_4.setObjectName("gridLayout_4") | ||
| self.horizontalLayout_2 = QtWidgets.QHBoxLayout() | ||
| self.horizontalLayout_2.setObjectName("horizontalLayout_2") | ||
| self.urlLabel = QtWidgets.QLabel(MSColabConnectDialog) | ||
| self.urlLabel.setObjectName("urlLabel") | ||
| self.horizontalLayout_2.addWidget(self.urlLabel) | ||
| self.urlCb = QtWidgets.QComboBox(MSColabConnectDialog) | ||
| self.urlCb.setEditable(True) | ||
| self.urlCb.setObjectName("urlCb") | ||
| self.horizontalLayout_2.addWidget(self.urlCb) | ||
| self.connectBtn = QtWidgets.QPushButton(MSColabConnectDialog) | ||
| self.connectBtn.setAutoDefault(True) | ||
| self.connectBtn.setObjectName("connectBtn") | ||
| self.horizontalLayout_2.addWidget(self.connectBtn) | ||
| self.disconnectBtn = QtWidgets.QPushButton(MSColabConnectDialog) | ||
| self.disconnectBtn.setObjectName("disconnectBtn") | ||
| self.horizontalLayout_2.addWidget(self.disconnectBtn) | ||
| self.horizontalLayout_2.setStretch(1, 1) | ||
| self.gridLayout_4.addLayout(self.horizontalLayout_2, 0, 0, 1, 1) | ||
| self.line = QtWidgets.QFrame(MSColabConnectDialog) | ||
| self.line.setFrameShape(QtWidgets.QFrame.HLine) | ||
| self.line.setFrameShadow(QtWidgets.QFrame.Sunken) | ||
| self.line.setObjectName("line") | ||
| self.gridLayout_4.addWidget(self.line, 1, 0, 1, 1) | ||
| self.stackedWidget = QtWidgets.QStackedWidget(MSColabConnectDialog) | ||
| self.stackedWidget.setObjectName("stackedWidget") | ||
| self.loginPage = QtWidgets.QWidget() | ||
| self.loginPage.setObjectName("loginPage") | ||
| self.gridLayout_3 = QtWidgets.QGridLayout(self.loginPage) | ||
| self.gridLayout_3.setContentsMargins(100, 0, 100, 0) | ||
| self.gridLayout_3.setObjectName("gridLayout_3") | ||
| self.loginBtn = QtWidgets.QPushButton(self.loginPage) | ||
| self.loginBtn.setAutoDefault(True) | ||
| self.loginBtn.setObjectName("loginBtn") | ||
| self.gridLayout_3.addWidget(self.loginBtn, 3, 0, 1, 2) | ||
| self.addUserBtn = QtWidgets.QPushButton(self.loginPage) | ||
| self.addUserBtn.setAutoDefault(False) | ||
| self.addUserBtn.setObjectName("addUserBtn") | ||
| self.gridLayout_3.addWidget(self.addUserBtn, 4, 1, 1, 1) | ||
| self.loginTopicLabel = QtWidgets.QLabel(self.loginPage) | ||
| font = QtGui.QFont() | ||
| font.setPointSize(16) | ||
| self.loginTopicLabel.setFont(font) | ||
| self.loginTopicLabel.setObjectName("loginTopicLabel") | ||
| self.gridLayout_3.addWidget(self.loginTopicLabel, 0, 0, 1, 2, QtCore.Qt.AlignHCenter) | ||
| self.clickNewUserLabel = QtWidgets.QLabel(self.loginPage) | ||
| self.clickNewUserLabel.setObjectName("clickNewUserLabel") | ||
| self.gridLayout_3.addWidget(self.clickNewUserLabel, 4, 0, 1, 1) | ||
| self.loginWithIDPBtn = QtWidgets.QPushButton(self.loginPage) | ||
| self.loginWithIDPBtn.setObjectName("loginWithIDPBtn") | ||
| self.gridLayout_3.addWidget(self.loginWithIDPBtn, 5, 0, 1, 2) | ||
| self.loginEmailLe = QtWidgets.QLineEdit(self.loginPage) | ||
| self.loginEmailLe.setObjectName("loginEmailLe") | ||
| self.gridLayout_3.addWidget(self.loginEmailLe, 1, 0, 1, 2) | ||
| self.loginPasswordLe = QtWidgets.QLineEdit(self.loginPage) | ||
| self.loginPasswordLe.setEchoMode(QtWidgets.QLineEdit.Password) | ||
| self.loginPasswordLe.setObjectName("loginPasswordLe") | ||
| self.gridLayout_3.addWidget(self.loginPasswordLe, 2, 0, 1, 2) | ||
| self.stackedWidget.addWidget(self.loginPage) | ||
| self.newuserPage = QtWidgets.QWidget() | ||
| self.newuserPage.setObjectName("newuserPage") | ||
| self.gridLayout_2 = QtWidgets.QGridLayout(self.newuserPage) | ||
| self.gridLayout_2.setContentsMargins(50, 0, 50, 0) | ||
| self.gridLayout_2.setSpacing(5) | ||
| self.gridLayout_2.setObjectName("gridLayout_2") | ||
| self.newUsernameLe = QtWidgets.QLineEdit(self.newuserPage) | ||
| self.newUsernameLe.setObjectName("newUsernameLe") | ||
| self.gridLayout_2.addWidget(self.newUsernameLe, 1, 1, 1, 1) | ||
| self.newPasswordLabel = QtWidgets.QLabel(self.newuserPage) | ||
| self.newPasswordLabel.setObjectName("newPasswordLabel") | ||
| self.gridLayout_2.addWidget(self.newPasswordLabel, 3, 0, 1, 1, QtCore.Qt.AlignRight) | ||
| self.newConfirmPasswordLabel = QtWidgets.QLabel(self.newuserPage) | ||
| self.newConfirmPasswordLabel.setObjectName("newConfirmPasswordLabel") | ||
| self.gridLayout_2.addWidget(self.newConfirmPasswordLabel, 4, 0, 1, 1, QtCore.Qt.AlignRight) | ||
| self.newUserTopicLabel = QtWidgets.QLabel(self.newuserPage) | ||
| font = QtGui.QFont() | ||
| font.setPointSize(16) | ||
| self.newUserTopicLabel.setFont(font) | ||
| self.newUserTopicLabel.setObjectName("newUserTopicLabel") | ||
| self.gridLayout_2.addWidget(self.newUserTopicLabel, 0, 1, 1, 1, QtCore.Qt.AlignLeft) | ||
| self.newEmailLe = QtWidgets.QLineEdit(self.newuserPage) | ||
| self.newEmailLe.setObjectName("newEmailLe") | ||
| self.gridLayout_2.addWidget(self.newEmailLe, 2, 1, 1, 1) | ||
| self.newEmailLabel = QtWidgets.QLabel(self.newuserPage) | ||
| self.newEmailLabel.setObjectName("newEmailLabel") | ||
| self.gridLayout_2.addWidget(self.newEmailLabel, 2, 0, 1, 1, QtCore.Qt.AlignRight) | ||
| self.newUserBb = QtWidgets.QDialogButtonBox(self.newuserPage) | ||
| self.newUserBb.setLayoutDirection(QtCore.Qt.LeftToRight) | ||
| self.newUserBb.setStandardButtons(QtWidgets.QDialogButtonBox.Cancel|QtWidgets.QDialogButtonBox.Ok) | ||
| self.newUserBb.setObjectName("newUserBb") | ||
| self.gridLayout_2.addWidget(self.newUserBb, 5, 1, 1, 1, QtCore.Qt.AlignLeft) | ||
| self.newPasswordLe = QtWidgets.QLineEdit(self.newuserPage) | ||
| self.newPasswordLe.setEchoMode(QtWidgets.QLineEdit.Password) | ||
| self.newPasswordLe.setObjectName("newPasswordLe") | ||
| self.gridLayout_2.addWidget(self.newPasswordLe, 3, 1, 1, 1) | ||
| self.newUsernameLabel = QtWidgets.QLabel(self.newuserPage) | ||
| self.newUsernameLabel.setObjectName("newUsernameLabel") | ||
| self.gridLayout_2.addWidget(self.newUsernameLabel, 1, 0, 1, 1, QtCore.Qt.AlignRight) | ||
| self.newConfirmPasswordLe = QtWidgets.QLineEdit(self.newuserPage) | ||
| self.newConfirmPasswordLe.setEchoMode(QtWidgets.QLineEdit.Password) | ||
| self.newConfirmPasswordLe.setObjectName("newConfirmPasswordLe") | ||
| self.gridLayout_2.addWidget(self.newConfirmPasswordLe, 4, 1, 1, 1) | ||
| self.stackedWidget.addWidget(self.newuserPage) | ||
| self.httpAuthPage = QtWidgets.QWidget() | ||
| self.httpAuthPage.setObjectName("httpAuthPage") | ||
| self.verticalLayout_4 = QtWidgets.QVBoxLayout(self.httpAuthPage) | ||
| self.verticalLayout_4.setContentsMargins(0, 0, 0, 0) | ||
| self.verticalLayout_4.setObjectName("verticalLayout_4") | ||
| self.httpTopicLabel = QtWidgets.QLabel(self.httpAuthPage) | ||
| self.httpTopicLabel.setEnabled(True) | ||
| sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Minimum) | ||
| sizePolicy.setHorizontalStretch(0) | ||
| sizePolicy.setVerticalStretch(0) | ||
| sizePolicy.setHeightForWidth(self.httpTopicLabel.sizePolicy().hasHeightForWidth()) | ||
| self.httpTopicLabel.setSizePolicy(sizePolicy) | ||
| self.httpTopicLabel.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignTop) | ||
| self.httpTopicLabel.setObjectName("httpTopicLabel") | ||
| self.verticalLayout_4.addWidget(self.httpTopicLabel) | ||
| self.gridLayout = QtWidgets.QGridLayout() | ||
| self.gridLayout.setSizeConstraint(QtWidgets.QLayout.SetDefaultConstraint) | ||
| self.gridLayout.setObjectName("gridLayout") | ||
| self.httpPasswordLe = QtWidgets.QLineEdit(self.httpAuthPage) | ||
| self.httpPasswordLe.setEchoMode(QtWidgets.QLineEdit.Password) | ||
| self.httpPasswordLe.setObjectName("httpPasswordLe") | ||
| self.gridLayout.addWidget(self.httpPasswordLe, 0, 1, 1, 1) | ||
| self.httpPasswordLabel = QtWidgets.QLabel(self.httpAuthPage) | ||
| self.httpPasswordLabel.setObjectName("httpPasswordLabel") | ||
| self.gridLayout.addWidget(self.httpPasswordLabel, 0, 0, 1, 1) | ||
| self.verticalLayout_4.addLayout(self.gridLayout) | ||
| spacerItem = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) | ||
| self.verticalLayout_4.addItem(spacerItem) | ||
| self.stackedWidget.addWidget(self.httpAuthPage) | ||
| self.idpAuthPage = QtWidgets.QWidget() | ||
| self.idpAuthPage.setEnabled(True) | ||
| self.idpAuthPage.setObjectName("idpAuthPage") | ||
| self.layoutWidget = QtWidgets.QWidget(self.idpAuthPage) | ||
| self.layoutWidget.setGeometry(QtCore.QRect(0, 20, 451, 141)) | ||
| self.layoutWidget.setObjectName("layoutWidget") | ||
| self.idpAuthGridLayout = QtWidgets.QGridLayout(self.layoutWidget) | ||
| self.idpAuthGridLayout.setSizeConstraint(QtWidgets.QLayout.SetDefaultConstraint) | ||
| self.idpAuthGridLayout.setContentsMargins(0, 0, 0, 0) | ||
| self.idpAuthGridLayout.setObjectName("idpAuthGridLayout") | ||
| self.idpAuthTokenLabel = QtWidgets.QLabel(self.layoutWidget) | ||
| self.idpAuthTokenLabel.setObjectName("idpAuthTokenLabel") | ||
| self.idpAuthGridLayout.addWidget(self.idpAuthTokenLabel, 0, 0, 1, 1) | ||
| self.idpAuthPasswordLe = QtWidgets.QLineEdit(self.layoutWidget) | ||
| self.idpAuthPasswordLe.setText("") | ||
| self.idpAuthPasswordLe.setEchoMode(QtWidgets.QLineEdit.Normal) | ||
| self.idpAuthPasswordLe.setObjectName("idpAuthPasswordLe") | ||
| self.idpAuthGridLayout.addWidget(self.idpAuthPasswordLe, 0, 1, 1, 1) | ||
| self.idpAuthTokenSubmitBtn = QtWidgets.QPushButton(self.layoutWidget) | ||
| self.idpAuthTokenSubmitBtn.setObjectName("idpAuthTokenSubmitBtn") | ||
| self.idpAuthGridLayout.addWidget(self.idpAuthTokenSubmitBtn, 1, 1, 1, 1) | ||
| spacerItem1 = QtWidgets.QSpacerItem(20, 40, QtWidgets.QSizePolicy.Minimum, QtWidgets.QSizePolicy.Expanding) | ||
| self.idpAuthGridLayout.addItem(spacerItem1, 3, 0, 1, 2) | ||
| self.idpAuthTopicLabel = QtWidgets.QLabel(self.idpAuthPage) | ||
| self.idpAuthTopicLabel.setEnabled(True) | ||
| self.idpAuthTopicLabel.setGeometry(QtCore.QRect(0, 0, 456, 15)) | ||
| sizePolicy = QtWidgets.QSizePolicy(QtWidgets.QSizePolicy.Preferred, QtWidgets.QSizePolicy.Minimum) | ||
| sizePolicy.setHorizontalStretch(0) | ||
| sizePolicy.setVerticalStretch(0) | ||
| sizePolicy.setHeightForWidth(self.idpAuthTopicLabel.sizePolicy().hasHeightForWidth()) | ||
| self.idpAuthTopicLabel.setSizePolicy(sizePolicy) | ||
| self.idpAuthTopicLabel.setAlignment(QtCore.Qt.AlignLeading|QtCore.Qt.AlignLeft|QtCore.Qt.AlignTop) | ||
| self.idpAuthTopicLabel.setObjectName("idpAuthTopicLabel") | ||
| self.stackedWidget.addWidget(self.idpAuthPage) | ||
| self.gridLayout_4.addWidget(self.stackedWidget, 2, 0, 1, 1) | ||
| self.line_2 = QtWidgets.QFrame(MSColabConnectDialog) | ||
| self.line_2.setFrameShape(QtWidgets.QFrame.HLine) | ||
| self.line_2.setFrameShadow(QtWidgets.QFrame.Sunken) | ||
| self.line_2.setObjectName("line_2") | ||
| self.gridLayout_4.addWidget(self.line_2, 3, 0, 1, 1) | ||
| self.statusHL = QtWidgets.QHBoxLayout() | ||
| self.statusHL.setContentsMargins(-1, 0, -1, -1) | ||
| self.statusHL.setObjectName("statusHL") | ||
| self.statusLabel = QtWidgets.QLabel(MSColabConnectDialog) | ||
| self.statusLabel.setStyleSheet("") | ||
| self.statusLabel.setObjectName("statusLabel") | ||
| self.statusHL.addWidget(self.statusLabel) | ||
| self.statusHL.setStretch(0, 1) | ||
| self.gridLayout_4.addLayout(self.statusHL, 4, 0, 1, 1) | ||
|
|
||
| self.retranslateUi(MSColabConnectDialog) | ||
| self.stackedWidget.setCurrentIndex(3) | ||
| QtCore.QMetaObject.connectSlotsByName(MSColabConnectDialog) | ||
| MSColabConnectDialog.setTabOrder(self.urlCb, self.connectBtn) | ||
| MSColabConnectDialog.setTabOrder(self.connectBtn, self.loginEmailLe) | ||
| MSColabConnectDialog.setTabOrder(self.loginEmailLe, self.loginPasswordLe) | ||
| MSColabConnectDialog.setTabOrder(self.loginPasswordLe, self.loginBtn) | ||
| MSColabConnectDialog.setTabOrder(self.loginBtn, self.addUserBtn) | ||
| MSColabConnectDialog.setTabOrder(self.addUserBtn, self.newUsernameLe) | ||
| MSColabConnectDialog.setTabOrder(self.newUsernameLe, self.newEmailLe) | ||
| MSColabConnectDialog.setTabOrder(self.newEmailLe, self.newPasswordLe) | ||
| MSColabConnectDialog.setTabOrder(self.newPasswordLe, self.newConfirmPasswordLe) | ||
| MSColabConnectDialog.setTabOrder(self.newConfirmPasswordLe, self.httpPasswordLe) | ||
|
|
||
| def retranslateUi(self, MSColabConnectDialog): | ||
| _translate = QtCore.QCoreApplication.translate | ||
| MSColabConnectDialog.setWindowTitle(_translate("MSColabConnectDialog", "Connect to MSColab")) | ||
| self.urlLabel.setText(_translate("MSColabConnectDialog", "MSColab URL:")) | ||
| self.urlCb.setToolTip(_translate("MSColabConnectDialog", "Enter Mscolab Server URL")) | ||
| self.connectBtn.setToolTip(_translate("MSColabConnectDialog", "Connect to entered URL")) | ||
| self.connectBtn.setText(_translate("MSColabConnectDialog", "Connect")) | ||
| self.connectBtn.setShortcut(_translate("MSColabConnectDialog", "Return")) | ||
| self.disconnectBtn.setText(_translate("MSColabConnectDialog", "Disconnect")) | ||
| self.loginBtn.setToolTip(_translate("MSColabConnectDialog", "Login using entered credentials")) | ||
| self.loginBtn.setText(_translate("MSColabConnectDialog", "Login")) | ||
| self.loginBtn.setShortcut(_translate("MSColabConnectDialog", "Return")) | ||
| self.addUserBtn.setToolTip(_translate("MSColabConnectDialog", "Add new user to the server")) | ||
| self.addUserBtn.setText(_translate("MSColabConnectDialog", "Add user")) | ||
| self.loginTopicLabel.setText(_translate("MSColabConnectDialog", "Login Details:")) | ||
| self.clickNewUserLabel.setText(_translate("MSColabConnectDialog", "Click here if new user")) | ||
| self.loginWithIDPBtn.setText(_translate("MSColabConnectDialog", "Login by Identity Provider")) | ||
| self.loginEmailLe.setPlaceholderText(_translate("MSColabConnectDialog", "Email ID")) | ||
| self.loginPasswordLe.setPlaceholderText(_translate("MSColabConnectDialog", "Password")) | ||
| self.newUsernameLe.setPlaceholderText(_translate("MSColabConnectDialog", "John Doe")) | ||
| self.newPasswordLabel.setText(_translate("MSColabConnectDialog", "Password:")) | ||
| self.newConfirmPasswordLabel.setText(_translate("MSColabConnectDialog", "Confirm Password:")) | ||
| self.newUserTopicLabel.setText(_translate("MSColabConnectDialog", "New User Details")) | ||
| self.newEmailLe.setPlaceholderText(_translate("MSColabConnectDialog", "[email protected]")) | ||
| self.newEmailLabel.setText(_translate("MSColabConnectDialog", "Email:")) | ||
| self.newPasswordLe.setPlaceholderText(_translate("MSColabConnectDialog", "New Password")) | ||
| self.newUsernameLabel.setText(_translate("MSColabConnectDialog", "Username:")) | ||
| self.newConfirmPasswordLe.setPlaceholderText(_translate("MSColabConnectDialog", "Confirm New Password")) | ||
| self.httpTopicLabel.setText(_translate("MSColabConnectDialog", "HTTP Server Authentication")) | ||
| self.httpPasswordLe.setPlaceholderText(_translate("MSColabConnectDialog", "Server Auth Password")) | ||
| self.httpPasswordLabel.setText(_translate("MSColabConnectDialog", "Password:")) | ||
| self.idpAuthTokenLabel.setText(_translate("MSColabConnectDialog", "Token")) | ||
| self.idpAuthPasswordLe.setPlaceholderText(_translate("MSColabConnectDialog", "Identity Provider Auth Token")) | ||
| self.idpAuthTokenSubmitBtn.setText(_translate("MSColabConnectDialog", "Submit")) | ||
| self.idpAuthTopicLabel.setText(_translate("MSColabConnectDialog", "Identity Provider Authentication")) | ||
| self.statusLabel.setText(_translate("MSColabConnectDialog", "Status:")) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters