ESCA111/neochat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Account switcher fixes, part 1

Browse Source 
- Make account index notifyable
- Give login window a title
- Fix height of account list
This commit is contained in:
Tobias Fella
2022-11-14 02:30:06 +01:00
parent 0e782c4a93
commit cd461628ab
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/controller.cpp
View File

@@ -121,6 +121,8 @@ Controller::Controller(QObject *parent)
} }
#endif #endif
connect(&AccountRegistry::instance(), &AccountRegistry::accountCountChanged, this, &Controller::activeConnectionIndexChanged);
#ifdef QUOTIENT_07 #ifdef QUOTIENT_07
static int oldAccountCount = 0; static int oldAccountCount = 0;
connect(&AccountRegistry::instance(), &AccountRegistry::accountCountChanged, this, [=]() { connect(&AccountRegistry::instance(), &AccountRegistry::accountCountChanged, this, [=]() {
@@ -688,6 +690,7 @@ void Controller::setActiveConnection(Connection *connection)
} }
NeoChatConfig::self()->save(); NeoChatConfig::self()->save();
Q_EMIT activeConnectionChanged(); Q_EMIT activeConnectionChanged();
Q_EMIT activeConnectionIndexChanged();
} }
void Controller::saveWindowGeometry() void Controller::saveWindowGeometry()

3
src/controller.h
View File

@@ -41,7 +41,7 @@ class Controller : public QObject
Q_PROPERTY(bool hasWindowSystem READ hasWindowSystem CONSTANT) Q_PROPERTY(bool hasWindowSystem READ hasWindowSystem CONSTANT)
Q_PROPERTY(bool isOnline READ isOnline NOTIFY isOnlineChanged) Q_PROPERTY(bool isOnline READ isOnline NOTIFY isOnlineChanged)
Q_PROPERTY(bool encryptionSupported READ encryptionSupported CONSTANT) Q_PROPERTY(bool encryptionSupported READ encryptionSupported CONSTANT)
Q_PROPERTY(int activeConnectionIndex READ activeConnectionIndex CONSTANT) Q_PROPERTY(int activeConnectionIndex READ activeConnectionIndex NOTIFY activeConnectionIndexChanged)
public: public:
static Controller &instance(); static Controller &instance();
@@ -154,6 +154,7 @@ Q_SIGNALS:
void keyVerificationStart(); void keyVerificationStart();
void keyVerificationAccept(const QString &commitment); void keyVerificationAccept(const QString &commitment);
void keyVerificationKey(const QString &sas); void keyVerificationKey(const QString &sas);
void activeConnectionIndexChanged();
public Q_SLOTS: public Q_SLOTS:
void logout(Quotient::Connection *conn, bool serverSideLogout); void logout(Quotient::Connection *conn, bool serverSideLogout);

4
src/qml/Component/UserInfo.qml
View File

@@ -58,7 +58,7 @@ QQC2.ToolBar {
text: i18n("Add Account") text: i18n("Add Account")
subtitle: i18n("Log in to an existing account") subtitle: i18n("Log in to an existing account")
onClicked: { onClicked: {
pageStack.pushDialogLayer("qrc:/WelcomePage.qml") pageStack.pushDialogLayer("qrc:/WelcomePage.qml", {}, {title: i18nc("@title:window", "Login")})
userInfo.accountsListVisible = false userInfo.accountsListVisible = false
accounts.currentIndex = Controller.activeConnectionIndex accounts.currentIndex = Controller.activeConnectionIndex
} }
@@ -100,7 +100,7 @@ QQC2.ToolBar {
} }
width: parent.width width: parent.width
height: contentHeight Layout.preferredHeight: contentHeight
delegate: Kirigami.BasicListItem { delegate: Kirigami.BasicListItem {
leftPadding: topPadding leftPadding: topPadding
leading: Kirigami.Avatar { leading: Kirigami.Avatar {