GH-4071 Heavily refactor and rearchitect account system
This makes the account system much more modular and makes it treat errors as something recoverable, unless they come directly from the MSA refresh token becoming invalid.
This commit is contained in:
Petr Mrázek
134
launcher/ui/widgets/ErrorFrame.cpp
Normal file
134
launcher/ui/widgets/ErrorFrame.cpp
Normal file
@ -0,0 +1,134 @@
|
||||
/* Copyright 2013-2021 MultiMC Contributors
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
#include <QMessageBox>
|
||||
#include <QtGui>
|
||||
|
||||
#include "ErrorFrame.h"
|
||||
#include "ui_ErrorFrame.h"
|
||||
|
||||
#include "ui/dialogs/CustomMessageBox.h"
|
||||
|
||||
void ErrorFrame::clear()
|
||||
{
|
||||
setTitle(QString());
|
||||
setDescription(QString());
|
||||
}
|
||||
|
||||
ErrorFrame::ErrorFrame(QWidget *parent) :
|
||||
QFrame(parent),
|
||||
ui(new Ui::ErrorFrame)
|
||||
{
|
||||
ui->setupUi(this);
|
||||
ui->label_Description->setHidden(true);
|
||||
ui->label_Title->setHidden(true);
|
||||
updateHiddenState();
|
||||
}
|
||||
|
||||
ErrorFrame::~ErrorFrame()
|
||||
{
|
||||
delete ui;
|
||||
}
|
||||
|
||||
void ErrorFrame::updateHiddenState()
|
||||
{
|
||||
if(ui->label_Description->isHidden() && ui->label_Title->isHidden())
|
||||
{
|
||||
setHidden(true);
|
||||
}
|
||||
else
|
||||
{
|
||||
setHidden(false);
|
||||
}
|
||||
}
|
||||
|
||||
void ErrorFrame::setTitle(QString text)
|
||||
{
|
||||
if(text.isEmpty())
|
||||
{
|
||||
ui->label_Title->setHidden(true);
|
||||
}
|
||||
else
|
||||
{
|
||||
ui->label_Title->setText(text);
|
||||
ui->label_Title->setHidden(false);
|
||||
}
|
||||
updateHiddenState();
|
||||
}
|
||||
|
||||
void ErrorFrame::setDescription(QString text)
|
||||
{
|
||||
if(text.isEmpty())
|
||||
{
|
||||
ui->label_Description->setHidden(true);
|
||||
updateHiddenState();
|
||||
return;
|
||||
}
|
||||
else
|
||||
{
|
||||
ui->label_Description->setHidden(false);
|
||||
updateHiddenState();
|
||||
}
|
||||
ui->label_Description->setToolTip("");
|
||||
QString intermediatetext = text.trimmed();
|
||||
bool prev(false);
|
||||
QChar rem('\n');
|
||||
QString finaltext;
|
||||
finaltext.reserve(intermediatetext.size());
|
||||
foreach(const QChar& c, intermediatetext)
|
||||
{
|
||||
if(c == rem && prev){
|
||||
continue;
|
||||
}
|
||||
prev = c == rem;
|
||||
finaltext += c;
|
||||
}
|
||||
QString labeltext;
|
||||
labeltext.reserve(300);
|
||||
if(finaltext.length() > 290)
|
||||
{
|
||||
ui->label_Description->setOpenExternalLinks(false);
|
||||
ui->label_Description->setTextFormat(Qt::TextFormat::RichText);
|
||||
desc = text;
|
||||
// This allows injecting HTML here.
|
||||
labeltext.append("<html><body>" + finaltext.left(287) + "<a href=\"#mod_desc\">...</a></body></html>");
|
||||
QObject::connect(ui->label_Description, &QLabel::linkActivated, this, &ErrorFrame::ellipsisHandler);
|
||||
}
|
||||
else
|
||||
{
|
||||
ui->label_Description->setTextFormat(Qt::TextFormat::PlainText);
|
||||
labeltext.append(finaltext);
|
||||
}
|
||||
ui->label_Description->setText(labeltext);
|
||||
}
|
||||
|
||||
void ErrorFrame::ellipsisHandler(const QString &link)
|
||||
{
|
||||
if(!currentBox)
|
||||
{
|
||||
currentBox = CustomMessageBox::selectable(this, QString(), desc);
|
||||
connect(currentBox, &QMessageBox::finished, this, &ErrorFrame::boxClosed);
|
||||
currentBox->show();
|
||||
}
|
||||
else
|
||||
{
|
||||
currentBox->setText(desc);
|
||||
}
|
||||
}
|
||||
|
||||
void ErrorFrame::boxClosed(int result)
|
||||
{
|
||||
currentBox = nullptr;
|
||||
}
|
||||
49
launcher/ui/widgets/ErrorFrame.h
Normal file
49
launcher/ui/widgets/ErrorFrame.h
Normal file
@ -0,0 +1,49 @@
|
||||
/* Copyright 2013-2021 MultiMC Contributors
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <QFrame>
|
||||
|
||||
namespace Ui
|
||||
{
|
||||
class ErrorFrame;
|
||||
}
|
||||
|
||||
class ErrorFrame : public QFrame
|
||||
{
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
explicit ErrorFrame(QWidget *parent = 0);
|
||||
~ErrorFrame();
|
||||
|
||||
void setTitle(QString text);
|
||||
void setDescription(QString text);
|
||||
|
||||
void clear();
|
||||
|
||||
public slots:
|
||||
void ellipsisHandler(const QString& link );
|
||||
void boxClosed(int result);
|
||||
|
||||
private:
|
||||
void updateHiddenState();
|
||||
|
||||
private:
|
||||
Ui::ErrorFrame *ui;
|
||||
QString desc;
|
||||
class QMessageBox * currentBox = nullptr;
|
||||
};
|
||||
92
launcher/ui/widgets/ErrorFrame.ui
Normal file
92
launcher/ui/widgets/ErrorFrame.ui
Normal file
@ -0,0 +1,92 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<ui version="4.0">
|
||||
<class>ErrorFrame</class>
|
||||
<widget class="QFrame" name="ErrorFrame">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>527</width>
|
||||
<height>113</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Preferred" vsizetype="Minimum">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="maximumSize">
|
||||
<size>
|
||||
<width>16777215</width>
|
||||
<height>120</height>
|
||||
</size>
|
||||
</property>
|
||||
<layout class="QVBoxLayout" name="verticalLayout_2">
|
||||
<property name="spacing">
|
||||
<number>6</number>
|
||||
</property>
|
||||
<property name="leftMargin">
|
||||
<number>0</number>
|
||||
</property>
|
||||
<property name="topMargin">
|
||||
<number>0</number>
|
||||
</property>
|
||||
<property name="rightMargin">
|
||||
<number>0</number>
|
||||
</property>
|
||||
<property name="bottomMargin">
|
||||
<number>0</number>
|
||||
</property>
|
||||
<item>
|
||||
<widget class="QLabel" name="label_Title">
|
||||
<property name="text">
|
||||
<string notr="true"/>
|
||||
</property>
|
||||
<property name="textFormat">
|
||||
<enum>Qt::RichText</enum>
|
||||
</property>
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
|
||||
</property>
|
||||
<property name="wordWrap">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="openExternalLinks">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="textInteractionFlags">
|
||||
<set>Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse|Qt::TextBrowserInteraction|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QLabel" name="label_Description">
|
||||
<property name="toolTip">
|
||||
<string notr="true"/>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string notr="true"/>
|
||||
</property>
|
||||
<property name="textFormat">
|
||||
<enum>Qt::RichText</enum>
|
||||
</property>
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
|
||||
</property>
|
||||
<property name="wordWrap">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="openExternalLinks">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
<property name="textInteractionFlags">
|
||||
<set>Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse|Qt::TextBrowserInteraction|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
<resources/>
|
||||
<connections/>
|
||||
</ui>
|
||||
Reference in New Issue
Block a user