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

Port away from Controller::activeConnectionIndex

Browse Source
This commit is contained in:
Tobias Fella
2023-11-05 17:07:08 +01:00
committed by Joshua Goins
parent e9e1e223f7
commit 6ba2b715c3
3 changed files with 9 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/controller.cpp
View File

@@ -346,7 +346,6 @@ void Controller::setActiveConnection(NeoChatConnection *connection)
} }
NeoChatConfig::self()->save(); NeoChatConfig::self()->save();
Q_EMIT activeConnectionChanged(); Q_EMIT activeConnectionChanged();
Q_EMIT activeConnectionIndexChanged();
} }
void Controller::saveWindowGeometry() void Controller::saveWindowGeometry()
@@ -407,14 +406,6 @@ void Controller::setApplicationProxy()
QNetworkProxy::setApplicationProxy(proxy); QNetworkProxy::setApplicationProxy(proxy);
} }
int Controller::activeConnectionIndex() const
{
auto result = std::find_if(m_accountRegistry.accounts().begin(), m_accountRegistry.accounts().end(), [this](const auto &it) {
return it == m_connection;
});
return result - m_accountRegistry.accounts().begin();
}
bool Controller::isFlatpak() const bool Controller::isFlatpak() const
{ {
#ifdef NEOCHAT_FLATPAK #ifdef NEOCHAT_FLATPAK

8
src/controller.h
View File

@@ -46,11 +46,6 @@ class Controller : public QObject
*/ */
Q_PROPERTY(NeoChatConnection *activeConnection READ activeConnection WRITE setActiveConnection NOTIFY activeConnectionChanged) Q_PROPERTY(NeoChatConnection *activeConnection READ activeConnection WRITE setActiveConnection NOTIFY activeConnectionChanged)
/**
* @brief The row number in the accounts directory of the active connection.
*/
Q_PROPERTY(int activeConnectionIndex READ activeConnectionIndex NOTIFY activeConnectionIndexChanged)
/** /**
* @brief Whether the OS NeoChat is running on supports sytem tray icons. * @brief Whether the OS NeoChat is running on supports sytem tray icons.
*/ */
@@ -99,8 +94,6 @@ public:
*/ */
void dropConnection(NeoChatConnection *c); void dropConnection(NeoChatConnection *c);
int activeConnectionIndex() const;
/** /**
* @brief Save an access token to the keychain for the given account. * @brief Save an access token to the keychain for the given account.
*/ */
@@ -169,7 +162,6 @@ Q_SIGNALS:
void passwordStatus(Controller::PasswordStatus status); void passwordStatus(Controller::PasswordStatus status);
void userConsentRequired(QUrl url); void userConsentRequired(QUrl url);
void isOnlineChanged(bool isOnline); void isOnlineChanged(bool isOnline);
void activeConnectionIndexChanged();
public Q_SLOTS: public Q_SLOTS:
void saveWindowGeometry(); void saveWindowGeometry();

11
src/qml/UserInfo.qml
View File

@@ -160,8 +160,6 @@ RowLayout {
id: accounts id: accounts
implicitHeight: contentHeight implicitHeight: contentHeight
currentIndex: Controller.activeConnectionIndex
header: Kirigami.Separator {} header: Kirigami.Separator {}
footer: Delegates.RoundedItemDelegate { footer: Delegates.RoundedItemDelegate {
@@ -227,6 +225,15 @@ RowLayout {
} }
} }
onVisibleChanged: {
for (let i = 0; i < accounts.count; i++) {
if (model.data(model.index(i, 0), Qt.DisplayRole) === root.connection.localUser.id) {
accounts.currentIndex = i;
break;
}
}
}
delegate: Delegates.RoundedItemDelegate { delegate: Delegates.RoundedItemDelegate {
id: userDelegate id: userDelegate