added connectionController and ConnectionButton.qml

client/ui/models/containers_model.cpp

@@ -17,7 +17,7 @@ bool ContainersModel::setData(const QModelIndex &index, const QVariant &value, i
         return false;
     }
 
-    if (role == DefaultRole) {
+    if (role == IsDefaultRole) {
         DockerContainer container = ContainerProps::allContainers().at(index.row());
         m_settings->setDefaultContainer(m_selectedServerIndex, container);
     }
@@ -33,22 +33,23 @@ QVariant ContainersModel::data(const QModelIndex &index, int role) const
         return QVariant();
     }
 
-    DockerContainer c = ContainerProps::allContainers().at(index.row());
-    if (role == NameRole) {
-        return ContainerProps::containerHumanNames().value(c);
-    }
-    if (role == DescRole) {
-        return ContainerProps::containerDescriptions().value(c);
-    }
-    if (role == DefaultRole) {
-        return c == m_settings->defaultContainer(m_selectedServerIndex);
-    }
-    if (role == ServiceTypeRole) {
-        return ContainerProps::containerService(c);
-    }
-    if (role == IsInstalledRole) {
-        return m_settings->containers(m_selectedServerIndex).contains(c);
+    DockerContainer container = ContainerProps::allContainers().at(index.row());
+
+    switch (role) {
+        case NameRole:
+            return ContainerProps::containerHumanNames().value(container);
+        case DescRole:
+            return ContainerProps::containerDescriptions().value(container);
+        case ConfigRole:
+            return m_settings->containerConfig(m_selectedServerIndex, container);
+        case ServiceTypeRole:
+            return ContainerProps::containerService(container);
+        case IsInstalledRole:
+            return m_settings->containers(m_selectedServerIndex).contains(container);
+        case IsDefaultRole:
+            return container == m_settings->defaultContainer(m_selectedServerIndex);
     }
+
     return QVariant();
 }
 
@@ -71,12 +72,17 @@ QString ContainersModel::getCurrentlyInstalledContainerName()
     return data(m_currentlyInstalledContainerIndex, NameRole).toString();
 }
 
+DockerContainer ContainersModel::getDefaultContainer()
+{
+    return m_settings->defaultContainer(m_selectedServerIndex);
+}
+
 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";
+    roles[NameRole] = "name";
+    roles[DescRole] = "description";
+    roles[ServiceTypeRole] = "serviceType";
+    roles[IsInstalledRole] = "isInstalled";
+    roles[IsDefaultRole] = "isDefault";
     return roles;
 }

client/ui/models/containers_model.h

@@ -15,12 +15,13 @@ class ContainersModel : public QAbstractListModel
 public:
     ContainersModel(std::shared_ptr<Settings> settings, QObject *parent = nullptr);
 public:
-    enum SiteRoles {
+    enum ContainersModelRoles {
         NameRole = Qt::UserRole + 1,
         DescRole,
-        DefaultRole,
         ServiceTypeRole,
-        IsInstalledRole
+        ConfigRole,
+        IsInstalledRole,
+        IsDefaultRole
     };
 
     int rowCount(const QModelIndex &parent = QModelIndex()) const override;
@@ -32,6 +33,9 @@ public:
 
     Q_INVOKABLE QString getCurrentlyInstalledContainerName();
 
+public slots:
+    DockerContainer getDefaultContainer();
+
 protected:
     QHash<int, QByteArray> roleNames() const override;
 

client/ui/models/servers_model.cpp

@@ -37,36 +37,23 @@ QVariant ServersModel::data(const QModelIndex &index, int role) const
     const QJsonArray &servers = m_settings->serversArray();
     const QJsonObject server = servers.at(index.row()).toObject();
 
-    if (role == DescRole) {
+    switch (role) {
+    case DescRole: {
         auto description = server.value(config_key::description).toString();
         if (description.isEmpty()) {
             return server.value(config_key::hostName).toString();
         }
         return description;
     }
-    if (role == AddressRole) {
+    case AddressRole:
         return server.value(config_key::hostName).toString();
-    }
-    if (role == IsDefaultRole) {
+    case CredentialsRole:
+        return QVariant::fromValue(m_settings->serverCredentials(index.row()));
+    case 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)

client/ui/models/servers_model.h

@@ -18,6 +18,7 @@ public:
     enum ServersModelRoles {
         DescRole = Qt::UserRole + 1,
         AddressRole,
+        CredentialsRole,
         IsDefaultRole
     };