Spelling (#214)

Spelling fixed

client/ui/notificationhandler.cpp

@@ -93,7 +93,7 @@ void NotificationHandler::unsecuredNetworkNotification(const QString& networkNam
 
 
     QString title = tr("AmneziaVPN notification");
-    QString message = tr("Unsucured network detected: ") + networkName;
+    QString message = tr("Unsecured network detected: ") + networkName;
 
     notifyInternal(UnsecuredNetwork, title, message, 2000);
 }

client/ui/pages_logic/ServerConfiguringProgressLogic.cpp

@@ -12,7 +12,7 @@ ServerConfiguringProgressLogic::ServerConfiguringProgressLogic(UiLogic *logic, Q
     m_labelWaitInfoVisible{true},
     m_labelWaitInfoText{tr("Please wait, configuring process may take up to 5 minutes")},
     m_progressBarVisible{true},
-    m_progressBarMaximium{100},
+    m_progressBarMaximum{100},
     m_progressBarTextVisible{true},
     m_progressBarText{tr("Configuring...")},
     m_labelServerBusyVisible{false},
@@ -46,8 +46,8 @@ ErrorCode ServerConfiguringProgressLogic::doInstallAction(const std::function<Er
     progress.getValueFunc = [this] (void) -> int {
         return progressBarValue();
     };
-    progress.getMaximiumFunc = [this] (void) -> int {
-        return progressBarMaximium();
+    progress.getMaximumFunc = [this] (void) -> int {
+        return progressBarMaximum();
     };
 
     LabelFunc busyInfo;
@@ -149,7 +149,7 @@ ErrorCode ServerConfiguringProgressLogic::doInstallAction(const std::function<Er
     // just ui progressbar tweak
     timer.stop();
 
-    int remainingVal = progress.getMaximiumFunc() - progress.getValueFunc();
+    int remainingVal = progress.getMaximumFunc() - progress.getValueFunc();
 
     if (remainingVal > 0) {
         QTimer timer1;
@@ -157,7 +157,7 @@ ErrorCode ServerConfiguringProgressLogic::doInstallAction(const std::function<Er
 
         connect(&timer1, &QTimer::timeout, [&](){
             progress.setValueFunc(progress.getValueFunc() + 1);
-            if (progress.getValueFunc() >= progress.getMaximiumFunc()) {
+            if (progress.getValueFunc() >= progress.getMaximumFunc()) {
                 loop1.quit();
             }
         });

client/ui/pages_logic/ServerConfiguringProgressLogic.h

@@ -17,7 +17,7 @@ class ServerConfiguringProgressLogic : public PageLogicBase
     AUTO_PROPERTY(bool, labelWaitInfoVisible)
     AUTO_PROPERTY(QString, labelWaitInfoText)
     AUTO_PROPERTY(bool, progressBarVisible)
-    AUTO_PROPERTY(int, progressBarMaximium)
+    AUTO_PROPERTY(int, progressBarMaximum)
     AUTO_PROPERTY(bool, progressBarTextVisible)
     AUTO_PROPERTY(QString, progressBarText)
     AUTO_PROPERTY(bool, labelServerBusyVisible)
@@ -32,7 +32,7 @@ private:
         std::function<void(bool)> setVisibleFunc;
         std::function<void(int)> setValueFunc;
         std::function<int(void)> getValueFunc;
-        std::function<int(void)> getMaximiumFunc;
+        std::function<int(void)> getMaximumFunc;
         std::function<void(bool)> setTextVisibleFunc;
         std::function<void(const QString&)> setTextFunc;
     };

client/ui/pages_logic/VpnLogic.cpp

@@ -218,7 +218,7 @@ void VpnLogic::onConnect()
     }
 
     if (container == DockerContainer::None) {
-        set_labelErrorText(tr("VPN Protocol not choosen"));
+        set_labelErrorText(tr("VPN Protocol not chosen"));
         set_pushButtonConnectChecked(false);
         return;
     }

client/ui/pages_logic/protocols/CloakLogic.cpp

@@ -21,7 +21,7 @@ CloakLogic::CloakLogic(UiLogic *logic, QObject *parent):
     m_labelInfoVisible{true},
     m_labelInfoText{},
     m_progressBarResetValue{0},
-    m_progressBarResetMaximium{100}
+    m_progressBarResetMaximum{100}
 {
 
 }
@@ -87,8 +87,8 @@ void CloakLogic::onPushButtonSaveClicked()
     progressBarFunc.getValueFunc = [this] (void) -> int {
         return progressBarResetValue();
     };
-    progressBarFunc.getMaximiumFunc = [this] (void) -> int {
-        return progressBarResetMaximium();
+    progressBarFunc.getMaximumFunc = [this] (void) -> int {
+        return progressBarResetMaximum();
     };
     progressBarFunc.setTextVisibleFunc = [this] (bool visible) -> void {
         set_progressBarTextVisible(visible);

client/ui/pages_logic/protocols/CloakLogic.h

@@ -19,7 +19,7 @@ class CloakLogic : public PageProtocolLogicBase
     AUTO_PROPERTY(bool, labelInfoVisible)
     AUTO_PROPERTY(QString, labelInfoText)
     AUTO_PROPERTY(int, progressBarResetValue)
-    AUTO_PROPERTY(int, progressBarResetMaximium)
+    AUTO_PROPERTY(int, progressBarResetMaximum)
     AUTO_PROPERTY(bool, progressBarTextVisible)
     AUTO_PROPERTY(QString, progressBarText)
 

client/ui/pages_logic/protocols/OpenVpnLogic.cpp

@@ -33,7 +33,7 @@ OpenVpnLogic::OpenVpnLogic(UiLogic *logic, QObject *parent):
     m_labelProtoOpenVpnInfoVisible{true},
     m_labelProtoOpenVpnInfoText{},
     m_progressBarResetValue{0},
-    m_progressBarResetMaximium{100}
+    m_progressBarResetMaximum{100}
 {
 
 }
@@ -51,17 +51,17 @@ void OpenVpnLogic::updateProtocolPage(const QJsonObject &openvpnConfig, DockerCo
     set_lineEditSubnetText(openvpnConfig.value(config_key::subnet_address).
                                       toString(protocols::openvpn::defaultSubnetAddress));
 
-    QString trasnsport;
+    QString transport;
     if (container == DockerContainer::ShadowSocks || container == DockerContainer::Cloak) {
-        trasnsport = "tcp";
+        transport = "tcp";
         set_radioButtonUdpEnabled(false);
         set_radioButtonTcpEnabled(false);
     } else {
-        trasnsport = openvpnConfig.value(config_key::transport_proto).
+        transport = openvpnConfig.value(config_key::transport_proto).
                 toString(protocols::openvpn::defaultTransportProto);
     }
-    set_radioButtonUdpChecked(trasnsport == protocols::openvpn::defaultTransportProto);
-    set_radioButtonTcpChecked(trasnsport != protocols::openvpn::defaultTransportProto);
+    set_radioButtonUdpChecked(transport == protocols::openvpn::defaultTransportProto);
+    set_radioButtonTcpChecked(transport != protocols::openvpn::defaultTransportProto);
 
     set_comboBoxVpnCipherText(openvpnConfig.value(config_key::cipher).
                                       toString(protocols::openvpn::defaultCipher));
@@ -137,8 +137,8 @@ void OpenVpnLogic::onPushButtonSaveClicked()
     progressBarFunc.getValueFunc = [this] (void) -> int {
         return progressBarResetValue();
     };
-    progressBarFunc.getMaximiumFunc = [this] (void) -> int {
-        return progressBarResetMaximium();
+    progressBarFunc.getMaximumFunc = [this] (void) -> int {
+        return progressBarResetMaximum();
     };
     progressBarFunc.setTextVisibleFunc = [this] (bool visible) -> void {
         set_progressBarTextVisible(visible);

client/ui/pages_logic/protocols/OpenVpnLogic.h

@@ -33,7 +33,7 @@ class OpenVpnLogic : public PageProtocolLogicBase
     AUTO_PROPERTY(bool, labelProtoOpenVpnInfoVisible)
     AUTO_PROPERTY(QString, labelProtoOpenVpnInfoText)
     AUTO_PROPERTY(int, progressBarResetValue)
-    AUTO_PROPERTY(int, progressBarResetMaximium)
+    AUTO_PROPERTY(int, progressBarResetMaximum)
     AUTO_PROPERTY(bool, progressBarTextVisible)
     AUTO_PROPERTY(QString, progressBarText)
 

client/ui/pages_logic/protocols/ShadowSocksLogic.cpp

@@ -19,7 +19,7 @@ ShadowSocksLogic::ShadowSocksLogic(UiLogic *logic, QObject *parent):
     m_labelInfoVisible{true},
     m_labelInfoText{},
     m_progressBarResetValue{0},
-    m_progressBarResetMaximium{100}
+    m_progressBarResetMaximum{100}
 {
 
 }
@@ -79,8 +79,8 @@ void ShadowSocksLogic::onPushButtonSaveClicked()
     progressBarFunc.getValueFunc = [this] (void) -> int {
         return progressBarResetValue();
     };
-    progressBarFunc.getMaximiumFunc = [this] (void) -> int {
-        return progressBarResetMaximium();
+    progressBarFunc.getMaximumFunc = [this] (void) -> int {
+        return progressBarResetMaximum();
     };
     progressBarFunc.setTextVisibleFunc = [this] (bool visible) -> void {
         set_progressBarTextVisible(visible);

client/ui/pages_logic/protocols/ShadowSocksLogic.h

@@ -17,7 +17,7 @@ class ShadowSocksLogic : public PageProtocolLogicBase
     AUTO_PROPERTY(bool, labelInfoVisible)
     AUTO_PROPERTY(QString, labelInfoText)
     AUTO_PROPERTY(int, progressBarResetValue)
-    AUTO_PROPERTY(int, progressBarResetMaximium)
+    AUTO_PROPERTY(int, progressBarResetMaximum)
     AUTO_PROPERTY(bool, progressBarTextVisible)
     AUTO_PROPERTY(QString, progressBarText)
 

client/ui/qml/Pages/PageServerConfiguringProgress.qml

@@ -77,7 +77,7 @@ PageBase {
         enabled: ServerConfiguringProgressLogic.pageEnabled
         anchors.fill: pb_cancel
         from: 0
-        to: ServerConfiguringProgressLogic.progressBarMaximium
+        to: ServerConfiguringProgressLogic.progressBarMaximum
         value: ServerConfiguringProgressLogic.progressBarValue
         visible: ServerConfiguringProgressLogic.progressBarVisible
         background: Rectangle {

client/ui/qml/Pages/PageSetupWizardVPNMode.qml

@@ -37,7 +37,7 @@ PageBase {
                 Layout.fillWidth: true
                 verticalAlignment: Text.AlignTop
                 text: qsTr('Optional.\n
-You can enable VPN mode "For selected sites" and add blocked sites you need to visit manually. If you will choose this option, you will need add every bloked site you want to visit to the access list. You may switch between modes later.\n\nPlease note, you should add addresses to the list after VPN connection established. You may add any domain, URL or IP address, it will be resolved to IP address.')
+You can enable VPN mode "For selected sites" and add blocked sites you need to visit manually. If you will choose this option, you will need add every blocked site you want to visit to the access list. You may switch between modes later.\n\nPlease note, you should add addresses to the list after VPN connection established. You may add any domain, URL or IP address, it will be resolved to IP address.')
             }
 
             CheckBoxType {

client/ui/qml/Pages/Protocols/PageProtoCloak.qml

@@ -133,7 +133,7 @@ PageProtocolBase {
         anchors.horizontalCenter: parent.horizontalCenter
         anchors.fill: pb_save
         from: 0
-        to: logic.progressBarResetMaximium
+        to: logic.progressBarResetMaximum
         value: logic.progressBarResetValue
         background: Rectangle {
             implicitWidth: parent.width

client/ui/qml/Pages/Protocols/PageProtoOpenVPN.qml

@@ -393,7 +393,7 @@ PageProtocolBase {
                         id: progress_save
                         anchors.fill: pb_save
                         from: 0
-                        to: logic.progressBarResetMaximium
+                        to: logic.progressBarResetMaximum
                         value: logic.progressBarResetValue
                         visible: logic.progressBarResetVisible
                         background: Rectangle {

client/ui/qml/Pages/Protocols/PageProtoShadowSocks.qml

@@ -113,7 +113,7 @@ PageProtocolBase {
         id: progressBar_reset
         anchors.fill: pb_save
         from: 0
-        to: logic.progressBarResetMaximium
+        to: logic.progressBarResetMaximum
         value: logic.progressBarResetValue
         visible: logic.progressBarResetVisible
         background: Rectangle {

client/ui/qml/Pages/Share/PageShareProtoSftp.qml

@@ -15,7 +15,7 @@ PageShareProtocolBase {
 
     Caption {
         id: caption
-        text: qsTr("Share SFTF settings")
+        text: qsTr("Share SFTP settings")
     }
 
  }

client/ui/qml/main.qml

@@ -124,7 +124,7 @@ Window  {
                              for (var i=0; i<folderModelPages.count; i++) {
                                  createPagesObjects(folderModelPages.get(i, "filePath"), PageType.Basic);
                              }
-                             UiLogic.initalizeUiLogic()
+                             UiLogic.initializeUiLogic()
                          }
     }
 
@@ -156,7 +156,7 @@ Window  {
 
     function createPagesObjects(file, type) {
         if (file.indexOf("Base") !== -1) return; // skip Base Pages
-        //console.debug("Creating compenent " + file + " for " + type);
+        //console.debug("Creating component " + file + " for " + type);
 
         var c = Qt.createComponent("qrc" + file);
 
@@ -178,7 +178,7 @@ Window  {
                         sharePages[obj.protocol] = obj
                     }
 
-//                    console.debug("Created compenent " + component.url + " for " + type);
+//                    console.debug("Created component " + component.url + " for " + type);
                 }
             } else if (component.status === Component.Error) {
                 console.debug("Error loading component:", component.errorString());

client/ui/uilogic.cpp

@@ -126,7 +126,7 @@ UiLogic::~UiLogic()
     qDebug() << "Application closed";
 }
 
-void UiLogic::initalizeUiLogic()
+void UiLogic::initializeUiLogic()
 {
 #ifdef Q_OS_ANDROID
     connect(AndroidController::instance(), &AndroidController::initialized, [this](bool status, bool connected, const QDateTime& connectionDate) {
@@ -307,8 +307,8 @@ void UiLogic::installServer(QPair<DockerContainer, QJsonObject> &container)
     progressBarFunc.getValueFunc = [this] (void) -> int {
         return pageLogic<ServerConfiguringProgressLogic>()->progressBarValue();
     };
-    progressBarFunc.getMaximiumFunc = [this] (void) -> int {
-        return pageLogic<ServerConfiguringProgressLogic>()->progressBarMaximium();
+    progressBarFunc.getMaximumFunc = [this] (void) -> int {
+        return pageLogic<ServerConfiguringProgressLogic>()->progressBarMaximum();
     };
     progressBarFunc.setTextVisibleFunc = [this] (bool visible) -> void {
         pageLogic<ServerConfiguringProgressLogic>()->set_progressBarTextVisible(visible);

client/ui/uilogic.h

@@ -104,7 +104,7 @@ public:
     Q_INVOKABLE virtual void onUpdatePage() {} // UiLogic is set as logic class for some qml pages
     Q_INVOKABLE void onUpdateAllPages();
 
-    Q_INVOKABLE void initalizeUiLogic();
+    Q_INVOKABLE void initializeUiLogic();
     Q_INVOKABLE void onCloseWindow();
 
     Q_INVOKABLE QString containerName(int container);