From 6745cb0c498747d4e77e4e701de53d0c0247da17 Mon Sep 17 00:00:00 2001
From: Mitternacht822 <sb@amnezia.org>
Date: Wed, 30 Apr 2025 17:35:24 +0400
Subject: [PATCH] added the ability to change port after installing xray

---
 .../ui/models/protocols/xrayConfigModel.cpp   |  3 +++
 client/ui/models/protocols/xrayConfigModel.h  |  3 ++-
 .../qml/Pages2/PageProtocolXraySettings.qml   | 23 ++++++++++++++++++-
 3 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/client/ui/models/protocols/xrayConfigModel.cpp b/client/ui/models/protocols/xrayConfigModel.cpp
index 84bbb2f7..5490cd1e 100644
--- a/client/ui/models/protocols/xrayConfigModel.cpp
+++ b/client/ui/models/protocols/xrayConfigModel.cpp
@@ -20,6 +20,7 @@ bool XrayConfigModel::setData(const QModelIndex &index, const QVariant &value, i
 
     switch (role) {
     case Roles::SiteRole: m_protocolConfig.insert(config_key::site, value.toString()); break;
+    case Roles::PortRole: m_protocolConfig.insert(config_key::port, value.toString()); break;
     }
 
     emit dataChanged(index, index, QList { role });
@@ -34,6 +35,7 @@ QVariant XrayConfigModel::data(const QModelIndex &index, int role) const
 
     switch (role) {
     case Roles::SiteRole: return m_protocolConfig.value(config_key::site).toString(protocols::xray::defaultSite);
+    case Roles::PortRole: return m_protocolConfig.value(config_key::port).toString();
     }
 
     return QVariant();
@@ -67,6 +69,7 @@ QHash<int, QByteArray> XrayConfigModel::roleNames() const
     QHash<int, QByteArray> roles;
 
     roles[SiteRole] = "site";
+    roles[PortRole] = "port";
 
     return roles;
 }
diff --git a/client/ui/models/protocols/xrayConfigModel.h b/client/ui/models/protocols/xrayConfigModel.h
index cb57f858..41aac589 100644
--- a/client/ui/models/protocols/xrayConfigModel.h
+++ b/client/ui/models/protocols/xrayConfigModel.h
@@ -12,7 +12,8 @@ class XrayConfigModel : public QAbstractListModel
 
 public:
     enum Roles {
-        SiteRole
+        SiteRole,
+        PortRole
     };
 
     explicit XrayConfigModel(QObject *parent = nullptr);
diff --git a/client/ui/qml/Pages2/PageProtocolXraySettings.qml b/client/ui/qml/Pages2/PageProtocolXraySettings.qml
index 90705d3e..e33f5763 100644
--- a/client/ui/qml/Pages2/PageProtocolXraySettings.qml
+++ b/client/ui/qml/Pages2/PageProtocolXraySettings.qml
@@ -103,8 +103,29 @@ PageType {
                             }
                         }
 
+                        TextFieldWithHeaderType {
+                            id: portTextField
+                            Layout.fillWidth: true
+                            Layout.topMargin: 16
+
+                            enabled: delegateItem.isEnabled
+
+                            headerText: qsTr("Port")
+                            textField.text: port
+                            textField.maximumLength: 5
+                            textField.validator: IntValidator { bottom: 1; top: 65535 }
+
+                            textField.onEditingFinished: {
+                                if (textField.text !== port) {
+                                    port = textField.text
+                                }
+                            }
+
+                            checkEmptyText: true
+                        }
+
                         BasicButtonType {
-                            id: basicButton
+                            id: saveButton
                             Layout.fillWidth: true
                             Layout.topMargin: 24
                             Layout.bottomMargin: 24