Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: update MSUI Help Section #2613

Open
wants to merge 5 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45,858 changes: 23,115 additions & 22,743 deletions mslib/msui/qt5/resources_rc.py

Large diffs are not rendered by default.

95 changes: 69 additions & 26 deletions mslib/msui/qt5/ui_mscolab_help_dialog.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@

# Form implementation generated from reading ui file 'ui_mscolab_help_dialog.ui'
#
# Created by: PyQt5 UI code generator 5.12.3
# Created by: PyQt5 UI code generator 5.15.9
#
# WARNING! All changes made in this file will be lost!
# WARNING: Any manual changes made to this file will be lost when pyuic5 is
# run again. Do not edit this file unless you know what you are doing.


from PyQt5 import QtCore, QtGui, QtWidgets
Expand Down Expand Up @@ -91,6 +92,36 @@ def setupUi(self, mscolabHelpDialog):
self.verticalLayout_3.setStretch(3, 1)
self.gridLayout_4.addLayout(self.verticalLayout_3, 0, 0, 1, 1)
self.tabWidget.addTab(self.connectingTab, "")
self.uploadImageTab = QtWidgets.QWidget()
self.uploadImageTab.setObjectName("uploadImageTab")
self.gridLayout_2 = QtWidgets.QGridLayout(self.uploadImageTab)
self.gridLayout_2.setContentsMargins(0, 0, 0, 0)
self.gridLayout_2.setObjectName("gridLayout_2")
self.verticalLayout_2 = QtWidgets.QVBoxLayout()
self.verticalLayout_2.setObjectName("verticalLayout_2")
self.textEdit_2 = QtWidgets.QTextEdit(self.uploadImageTab)
self.textEdit_2.setEnabled(True)
self.textEdit_2.setVerticalScrollBarPolicy(QtCore.Qt.ScrollBarAsNeeded)
self.textEdit_2.setHorizontalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOff)
self.textEdit_2.setUndoRedoEnabled(False)
self.textEdit_2.setReadOnly(True)
self.textEdit_2.setObjectName("textEdit_2")
self.verticalLayout_2.addWidget(self.textEdit_2)
self.horizontalLayout_2 = QtWidgets.QHBoxLayout()
self.horizontalLayout_2.setObjectName("horizontalLayout_2")
spacerItem6 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
self.horizontalLayout_2.addItem(spacerItem6)
self.label_2 = QtWidgets.QLabel(self.uploadImageTab)
self.label_2.setText("")
self.label_2.setPixmap(QtGui.QPixmap(":/images/mscolab-help/upload-profile.png"))
self.label_2.setScaledContents(True)
self.label_2.setObjectName("label_2")
self.horizontalLayout_2.addWidget(self.label_2)
spacerItem7 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
self.horizontalLayout_2.addItem(spacerItem7)
self.verticalLayout_2.addLayout(self.horizontalLayout_2)
self.gridLayout_2.addLayout(self.verticalLayout_2, 0, 0, 1, 1)
self.tabWidget.addTab(self.uploadImageTab, "")
self.createOperationTab = QtWidgets.QWidget()
self.createOperationTab.setObjectName("createOperationTab")
self.gridLayout_3 = QtWidgets.QGridLayout(self.createOperationTab)
Expand All @@ -106,16 +137,16 @@ def setupUi(self, mscolabHelpDialog):
self.verticalLayout_4.addWidget(self.textEdit_20)
self.horizontalLayout_11 = QtWidgets.QHBoxLayout()
self.horizontalLayout_11.setObjectName("horizontalLayout_11")
spacerItem6 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
self.horizontalLayout_11.addItem(spacerItem6)
spacerItem8 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
self.horizontalLayout_11.addItem(spacerItem8)
self.label_13 = QtWidgets.QLabel(self.createOperationTab)
self.label_13.setText("")
self.label_13.setPixmap(QtGui.QPixmap(":/images/mscolab-help/add-operation.png"))
self.label_13.setScaledContents(True)
self.label_13.setObjectName("label_13")
self.horizontalLayout_11.addWidget(self.label_13)
spacerItem7 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
self.horizontalLayout_11.addItem(spacerItem7)
spacerItem9 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
self.horizontalLayout_11.addItem(spacerItem9)
self.verticalLayout_4.addLayout(self.horizontalLayout_11)
self.gridLayout_3.addLayout(self.verticalLayout_4, 0, 0, 1, 1)
self.tabWidget.addTab(self.createOperationTab, "")
Expand All @@ -136,16 +167,16 @@ def setupUi(self, mscolabHelpDialog):
self.verticalLayout_5.addWidget(self.textEdit_22)
self.horizontalLayout_12 = QtWidgets.QHBoxLayout()
self.horizontalLayout_12.setObjectName("horizontalLayout_12")
spacerItem8 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
self.horizontalLayout_12.addItem(spacerItem8)
spacerItem10 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
self.horizontalLayout_12.addItem(spacerItem10)
self.label_14 = QtWidgets.QLabel(self.adminTab)
self.label_14.setText("")
self.label_14.setPixmap(QtGui.QPixmap(":/images/mscolab-help/admin-window.png"))
self.label_14.setScaledContents(True)
self.label_14.setObjectName("label_14")
self.horizontalLayout_12.addWidget(self.label_14)
spacerItem9 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
self.horizontalLayout_12.addItem(spacerItem9)
spacerItem11 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
self.horizontalLayout_12.addItem(spacerItem11)
self.verticalLayout_5.addLayout(self.horizontalLayout_12)
self.gridLayout_5.addLayout(self.verticalLayout_5, 0, 0, 1, 1)
self.tabWidget.addTab(self.adminTab, "")
Expand All @@ -166,16 +197,16 @@ def setupUi(self, mscolabHelpDialog):
self.verticalLayout_6.addWidget(self.textEdit_23)
self.horizontalLayout_13 = QtWidgets.QHBoxLayout()
self.horizontalLayout_13.setObjectName("horizontalLayout_13")
spacerItem10 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
self.horizontalLayout_13.addItem(spacerItem10)
spacerItem12 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
self.horizontalLayout_13.addItem(spacerItem12)
self.label = QtWidgets.QLabel(self.chatTab)
self.label.setText("")
self.label.setPixmap(QtGui.QPixmap(":/images/mscolab-help/chat-window.png"))
self.label.setScaledContents(True)
self.label.setObjectName("label")
self.horizontalLayout_13.addWidget(self.label)
spacerItem11 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
self.horizontalLayout_13.addItem(spacerItem11)
spacerItem13 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
self.horizontalLayout_13.addItem(spacerItem13)
self.verticalLayout_6.addLayout(self.horizontalLayout_13)
self.gridLayout_7.addLayout(self.verticalLayout_6, 0, 0, 1, 1)
self.tabWidget.addTab(self.chatTab, "")
Expand All @@ -196,16 +227,16 @@ def setupUi(self, mscolabHelpDialog):
self.verticalLayout_7.addWidget(self.textEdit_24)
self.horizontalLayout_14 = QtWidgets.QHBoxLayout()
self.horizontalLayout_14.setObjectName("horizontalLayout_14")
spacerItem12 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
self.horizontalLayout_14.addItem(spacerItem12)
spacerItem14 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
self.horizontalLayout_14.addItem(spacerItem14)
self.label_16 = QtWidgets.QLabel(self.versionTab)
self.label_16.setText("")
self.label_16.setPixmap(QtGui.QPixmap(":/images/mscolab-help/version-window.png"))
self.label_16.setScaledContents(True)
self.label_16.setObjectName("label_16")
self.horizontalLayout_14.addWidget(self.label_16)
spacerItem13 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
self.horizontalLayout_14.addItem(spacerItem13)
spacerItem15 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
self.horizontalLayout_14.addItem(spacerItem15)
self.verticalLayout_7.addLayout(self.horizontalLayout_14)
self.gridLayout_9.addLayout(self.verticalLayout_7, 0, 0, 1, 1)
self.tabWidget.addTab(self.versionTab, "")
Expand All @@ -224,24 +255,24 @@ def setupUi(self, mscolabHelpDialog):
self.verticalLayout_8.addWidget(self.textEdit_25)
self.horizontalLayout_15 = QtWidgets.QHBoxLayout()
self.horizontalLayout_15.setObjectName("horizontalLayout_15")
spacerItem14 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
self.horizontalLayout_15.addItem(spacerItem14)
spacerItem16 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
self.horizontalLayout_15.addItem(spacerItem16)
self.label_17 = QtWidgets.QLabel(self.operationWorkTab)
self.label_17.setText("")
self.label_17.setPixmap(QtGui.QPixmap(":/images/mscolab-help/merge-window.png"))
self.label_17.setScaledContents(True)
self.label_17.setObjectName("label_17")
self.horizontalLayout_15.addWidget(self.label_17)
spacerItem15 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
self.horizontalLayout_15.addItem(spacerItem15)
spacerItem17 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
self.horizontalLayout_15.addItem(spacerItem17)
self.verticalLayout_8.addLayout(self.horizontalLayout_15)
self.gridLayout_8.addLayout(self.verticalLayout_8, 0, 0, 1, 1)
self.tabWidget.addTab(self.operationWorkTab, "")
self.verticalLayout.addWidget(self.tabWidget)
self.horizontalLayout = QtWidgets.QHBoxLayout()
self.horizontalLayout.setObjectName("horizontalLayout")
spacerItem16 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
self.horizontalLayout.addItem(spacerItem16)
spacerItem18 = QtWidgets.QSpacerItem(40, 20, QtWidgets.QSizePolicy.Expanding, QtWidgets.QSizePolicy.Minimum)
self.horizontalLayout.addItem(spacerItem18)
self.okayBtn = QtWidgets.QPushButton(mscolabHelpDialog)
self.okayBtn.setObjectName("okayBtn")
self.horizontalLayout.addWidget(self.okayBtn)
Expand Down Expand Up @@ -271,6 +302,19 @@ def retranslateUi(self, mscolabHelpDialog):
"<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:\'.SF NS Text\';\"><br /></p>\n"
"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-family:\'.SF NS Text\';\">The status bar will notify if/not the new user is registered on the server. If successfully registered, you\'ll be taken to the login page where you can login with the new user credentials.</span></p></body></html>"))
self.tabWidget.setTabText(self.tabWidget.indexOf(self.connectingTab), _translate("mscolabHelpDialog", "Connecting"))
self.textEdit_2.setHtml(_translate("mscolabHelpDialog", "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
"<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n"
"p, li { white-space: pre-wrap; }\n"
"</style></head><body style=\" font-family:\'.AppleSystemUIFont\'; font-size:13pt; font-weight:400; font-style:normal;\">\n"
"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-family:\'.SF NS Text\';\">1. After logging in, the </span><span style=\" font-family:\'.SF NS Text\'; font-weight:600;\">main window </span><span style=\" font-family:\'.SF NS Text\';\"> will open.</span></p>\n"
"<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:\'.SF NS Text\';\"><br /></p>\n"
"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-family:\'.SF NS Text\';\">2. On the top-right corner, you will see your </span><span style=\" font-family:\'.SF NS Text\'; font-weight:600;\">username</span><span style=\" font-family:\'.SF NS Text\';\"> (used to log in) and a </span><span style=\" font-family:\'.SF NS Text\'; font-weight:600;\">box </span><span style=\" font-family:\'.SF NS Text\';\"> next to it.</span></p>\n"
"<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:\'.SF NS Text\';\"><br /></p>\n"
"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-family:\'.SF NS Text\';\">3. Click on the box and choose </span><span style=\" font-family:\'.SF NS Text\'; font-weight:600;\">Profile</span><span style=\" font-family:\'.SF NS Text\';\"> from the drop-down options.</span></p>\n"
"<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:\'.SF NS Text\';\"><br /></p>\n"
"<p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-family:\'.SF NS Text\';\">4. In the Profile window, click the </span><span style=\" font-family:\'.SF NS Text\'; font-weight:600;\">Change Avatar</span><span style=\" font-family:\'.SF NS Text\';\"> button and select the picture you want to upload.</span></p>\n"
"</body></html>"))
self.tabWidget.setTabText(self.tabWidget.indexOf(self.uploadImageTab), _translate("mscolabHelpDialog", "Upload Profile Picture"))
self.textEdit_20.setHtml(_translate("mscolabHelpDialog", "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
"<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n"
"p, li { white-space: pre-wrap; }\n"
Expand Down Expand Up @@ -349,5 +393,4 @@ def retranslateUi(self, mscolabHelpDialog):
"<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:\'.SF NS Text\';\"><br /></p></body></html>"))
self.tabWidget.setTabText(self.tabWidget.indexOf(self.operationWorkTab), _translate("mscolabHelpDialog", "Working on a Operation"))
self.okayBtn.setText(_translate("mscolabHelpDialog", "Okay"))

from . import resources_rc
from . import resources_rc
Binary file modified mslib/msui/resources/mscolab-help/chat-window.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 2 additions & 1 deletion mslib/msui/resources/resources.qrc
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
<RCC>
<qresource prefix="/images">
<file>mscolab-help/connect.png</file>
<file>mscolab-help/chat-window.png</file>
<file>mscolab-help/add-user.png</file>
<file>mscolab-help/merge-window.png</file>
<file>mscolab-help/admin-window.png</file>
<file>mscolab-help/version-window.png</file>
<file>mscolab-help/add-operation.png</file>
<file>mscolab-help/chat-window.png</file>
<file>mscolab-help/upload-profile.png</file>
</qresource>
<qresource prefix="/gravatars">
<file>default-gravatars/a.png</file>
Expand Down
Loading
Loading