chore: finished

Author: Decodetalkers

Diff for: qml/MainView.qml

@@ -149,6 +149,11 @@ Page {
                     if (CommandLine.isAuthing) {
                         return;
                     }
+                    var currentDesktop = DesktopModel.get(view.currentIndex).name;
+                    if (DesktopConfigModel.dataIsExist(currentDesktop)) {
+                        var envs = DesktopConfigModel.getFromName(currentDesktop).envs;
+                        CommandLine.env = envs;
+                    }
                     CommandLine.RequestLogin();
                 }
             }
@@ -174,6 +179,11 @@ Page {
                     if (CommandLine.isAuthing) {
                         return;
                     }
+                    var currentDesktop = DesktopModel.get(view.currentIndex).name;
+                    if (DesktopConfigModel.dataIsExist(currentDesktop)) {
+                        var envs = DesktopConfigModel.getFromName(currentDesktop).envs;
+                        CommandLine.env = envs;
+                    }
                     Settings.setStartSession(DesktopModel.get(view.currentIndex).name);
                     Settings.setStartUser(user.text);
                     CommandLine.RequestLogin();
@@ -245,7 +255,17 @@ Page {
                 id: commandField
                 placeholderText: "Command"
                 Layout.alignment: Qt.AlignHCenter
-                text: CommandLine.command
+                text: {
+                    var currentDesktop = DesktopModel.get(view.currentIndex).name;
+                    if (!DesktopConfigModel.dataIsExist(currentDesktop)) {
+                        return CommandLine.command;
+                    }
+                    var map = DesktopConfigModel.getFromName(currentDesktop);
+                    if (!map.hasAlias) {
+                        return CommandLine.command;
+                    }
+                    return map.execAlias;
+                }
                 onEditingFinished: {
                     CommandLine.command = commandField.text;
                 }

Diff for: qml/SettingsItemDelegate.qml

@@ -40,7 +40,7 @@ ItemDelegate {
                 Layout.fillWidth: true
                 visible: model.hasAlias
                 text: model.execAlias
-                onEditingFinished: {
+                onAccepted: {
                     model.execAlias = aliasField.text;
                 }
                 placeholderText: "ExecAlias"

Diff for: src/CommandLine.cpp

@@ -23,6 +23,7 @@ CommandLine::CommandLine(QObject *parent)
   , m_userIcon(QUrl("qrc:/image/account.svg"))
   , m_command(QString())
   , m_isAuthing(false)
+  , m_env(QStringList())
 {
     QSettings setting;
     QString user = setting.value("user").toString();
@@ -64,6 +65,13 @@ CommandLine::setCommand(const QString &command)
     Q_EMIT commandChanged();
 }
 
+void
+CommandLine::setEnv(const QStringList &env)
+{
+    m_env = env;
+    Q_EMIT envChanged();
+}
+
 void
 CommandLine::connectToGreetd()
 {
@@ -137,7 +145,7 @@ CommandLine::handleSuccessed()
 
         request["type"] = "start_session";
         request["cmd"]  = m_command.split(' ');
-        request["env"]  = QStringList();
+        request["env"]  = m_env;
         QJsonDocument json;
 
         json.setObject(QJsonObject::fromVariantMap(request));

Diff for: src/CommandLine.h

@@ -43,6 +43,10 @@ class CommandLine final : public QObject
     inline QString command() { return m_command; }
     void setCommand(const QString &command);
 
+    Q_PROPERTY(QStringList env READ env WRITE setEnv NOTIFY envChanged)
+    inline QStringList env() { return m_env; }
+    void setEnv(const QStringList &env);
+
     Q_PROPERTY(QString errorMessage READ errorMessage NOTIFY errorMessageChanged)
     inline QString errorMessage() { return m_errorMessage; }
 
@@ -69,6 +73,7 @@ class CommandLine final : public QObject
     void userIconChanged();
     void commandChanged();
     void isAuthingChanged();
+    void envChanged();
 
 private slots:
     void handleDataRead();
@@ -95,4 +100,5 @@ private slots:
     QUrl m_userIcon;
     QString m_command;
     bool m_isAuthing;
+    QStringList m_env;
 };

Diff for: src/DesktopConfigListModel.h

@@ -4,6 +4,7 @@
 #include <QList>
 #include <QObject>
 #include <QQmlEngine>
+#include <algorithm>
 
 class DesktopConfigModel final : public QAbstractListModel
 {
@@ -35,13 +36,28 @@ class DesktopConfigModel final : public QAbstractListModel
 
     Q_INVOKABLE void remove(int row);
 
+    Q_INVOKABLE bool dataIsExist(const QString &desktop) const;
+
+    Q_INVOKABLE QVariantMap getFromName(const QString &name) const
+    {
+        QVariantMap data;
+        for (int i = 0; i < m_configs.length(); ++i) {
+            if (m_configs[i].name == name) {
+                data.insert("name", m_configs[i].name);
+                data.insert("hasAlias", m_configs[i].hasAlias);
+                data.insert("execAlias", m_configs[i].execAlias);
+                data.insert("envs", m_configs[i].envs);
+                break;
+            }
+        }
+        return data;
+    }
+
 private:
     int rowCount(const QModelIndex & = QModelIndex()) const override;
     QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
     QHash<int, QByteArray> roleNames() const override;
 
-    bool dataIsExist(const QString &desktop) const;
-
     void get_file_config();
     void save_file_config();