AZEN-SGG/amnezia-client
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

added saving the selected server and protocol to the config

Browse source
This commit is contained in:
vladimir.kuznetsov 2023-05-12 11:36:09 +08:00
parent b66f4bf2be
commit e3e7503a7c
6 changed files with 160 additions and 97 deletions
Download patch file Download diff file Expand all files Collapse all files

37
client/ui/models/containers_model.cpp
View file

@ -1,10 +1,8 @@
#include "containers_model.h"
ContainersModel::ContainersModel(std::shared_ptr<Settings> settings, QObject *parent) :
m_settings(settings),
QAbstractListModel(parent)
ContainersModel::ContainersModel(std::shared_ptr<Settings> settings, QObject *parent) : m_settings(settings), QAbstractListModel(parent)
{
setSelectedServerIndex(m_settings->defaultServerIndex());
}
int ContainersModel::rowCount(const QModelIndex &parent) const
@ -13,14 +11,19 @@ int ContainersModel::rowCount(const QModelIndex &parent) const
return ContainerProps::allContainers().size();
}
QHash<int, QByteArray> ContainersModel::roleNames() const {
QHash<int, QByteArray> roles;
roles[NameRole] = "name_role";
roles[DescRole] = "desc_role";
roles[DefaultRole] = "default_role";
roles[ServiceTypeRole] = "service_type_role";
roles[IsInstalledRole] = "is_installed_role";
return roles;
bool ContainersModel::setData(const QModelIndex &index, const QVariant &value, int role)
{
if (!index.isValid() || index.row() < 0 || index.row() >= ContainerProps::allContainers().size()) {
return false;
}
if (role == DefaultRole) {
DockerContainer container = ContainerProps::allContainers().at(index.row());
m_settings->setDefaultContainer(m_selectedServerIndex, container);
}
emit dataChanged(index, index);
return true;
}
QVariant ContainersModel::data(const QModelIndex &index, int role) const
@ -67,3 +70,13 @@ QString ContainersModel::getCurrentlyInstalledContainerName()
{
return data(m_currentlyInstalledContainerIndex, NameRole).toString();
}
QHash<int, QByteArray> ContainersModel::roleNames() const {
QHash<int, QByteArray> roles;
roles[NameRole] = "name_role";
roles[DescRole] = "desc_role";
roles[DefaultRole] = "default_role";
roles[ServiceTypeRole] = "service_type_role";
roles[IsInstalledRole] = "is_installed_role";
return roles;
}

1
client/ui/models/containers_model.h
View file

@ -25,6 +25,7 @@ public:
int rowCount(const QModelIndex &parent = QModelIndex()) const override;
bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override;
QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
Q_INVOKABLE void setSelectedServerIndex(int index);
Q_INVOKABLE void setCurrentlyInstalledContainerIndex(int index);

118
client/ui/models/servers_model.cpp
View file

@ -2,34 +2,83 @@
ServersModel::ServersModel(std::shared_ptr<Settings> settings, QObject *parent) : m_settings(settings), QAbstractListModel(parent)
{
refresh();
}
void ServersModel::refresh()
{
beginResetModel();
const QJsonArray &servers = m_settings->serversArray();
int defaultServer = m_settings->defaultServerIndex();
QVector<ServerModelContent> serverListContent;
for(int i = 0; i < servers.size(); i++) {
ServerModelContent content;
auto server = servers.at(i).toObject();
content.desc = server.value(config_key::description).toString();
content.address = server.value(config_key::hostName).toString();
if (content.desc.isEmpty()) {
content.desc = content.address;
}
content.isDefault = (i == defaultServer);
serverListContent.push_back(content);
}
m_data = serverListContent;
endResetModel();
}
int ServersModel::rowCount(const QModelIndex &parent) const
{
Q_UNUSED(parent);
return static_cast<int>(m_data.size());
return static_cast<int>(m_settings->serversCount());
}
bool ServersModel::setData(const QModelIndex &index, const QVariant &value, int role)
{
if (!index.isValid() || index.row() < 0
|| index.row() >= static_cast<int>(m_settings->serversCount())) {
return false;
}
// if (role == DescRole) {
// return m_data[index.row()].desc;
// }
// if (role == AddressRole) {
// return m_data[index.row()].address;
// }
// if (role == IsDefaultRole) {
// return m_data[index.row()].isDefault;
// }
}
QVariant ServersModel::data(const QModelIndex &index, int role) const
{
if (!index.isValid() || index.row() < 0 || index.row() >= static_cast<int>(m_settings->serversCount())) {
return QVariant();
}
const QJsonArray &servers = m_settings->serversArray();
const QJsonObject server = servers.at(index.row()).toObject();
if (role == DescRole) {
auto description = server.value(config_key::description).toString();
if (description.isEmpty()) {
return server.value(config_key::hostName).toString();
}
return description;
}
if (role == AddressRole) {
return server.value(config_key::hostName).toString();
}
if (role == IsDefaultRole) {
return index.row() == m_settings->defaultServerIndex();
}
return QVariant();
// if (!index.isValid() || index.row() < 0
// || index.row() >= static_cast<int>(m_data.size())) {
// return QVariant();
// }
// if (role == DescRole) {
// return m_data[index.row()].desc;
// }
// if (role == AddressRole) {
// return m_data[index.row()].address;
// }
// if (role == IsDefaultRole) {
// return m_data[index.row()].isDefault;
// }
// return QVariant();
}
void ServersModel::setDefaultServerIndex(int index)
{
// beginResetModel();
m_settings->setDefaultServer(index);
// endResetModel();
}
int ServersModel::getDefaultServerIndex()
{
return m_settings->defaultServerIndex();
}
QHash<int, QByteArray> ServersModel::roleNames() const {
@ -39,28 +88,3 @@ QHash<int, QByteArray> ServersModel::roleNames() const {
roles[IsDefaultRole] = "is_default";
return roles;
}
QVariant ServersModel::data(const QModelIndex &index, int role) const
{
if (!index.isValid() || index.row() < 0
|| index.row() >= static_cast<int>(m_data.size())) {
return QVariant();
}
if (role == DescRole) {
return m_data[index.row()].desc;
}
if (role == AddressRole) {
return m_data[index.row()].address;
}
if (role == IsDefaultRole) {
return m_data[index.row()].isDefault;
}
return QVariant();
}
void ServersModel::setDefaultServerIndex(int index)
{
}

13
client/ui/models/servers_model.h
View file

@ -15,24 +15,27 @@ class ServersModel : public QAbstractListModel
{
Q_OBJECT
public:
ServersModel(std::shared_ptr<Settings> settings, QObject *parent = nullptr);
public:
enum SiteRoles {
enum ServersModelRoles {
DescRole = Qt::UserRole + 1,
AddressRole,
IsDefaultRole
};
void refresh();
ServersModel(std::shared_ptr<Settings> settings, QObject *parent = nullptr);
int rowCount(const QModelIndex &parent = QModelIndex()) const override;
bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override;
QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
public slots:
void setDefaultServerIndex(int index);
int getDefaultServerIndex();
protected:
QHash<int, QByteArray> roleNames() const override;
private:
QVector<ServerModelContent> m_data;
std::shared_ptr<Settings> m_settings;
};