Merge pull request #1 from Armor-Network/klomar-update-urls

Updating urls
Armor-Network · Oct 15, 2021 · 8f2cd5c · 8f2cd5c
2 parents 9d1f262 + 68fb86f
commit 8f2cd5c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/aboutdialog.ui b/src/aboutdialog.ui
@@ -41,7 +41,7 @@
       </sizepolicy>
      </property>
      <property name="text">
-      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Armor GUI version %1&lt;/p&gt;&lt;p&gt;Armor is the next generation anonymous cryptocurrency based on CryptoNote.&lt;/p&gt;&lt;p&gt;%4 The Armor Network developers&lt;/p&gt;&lt;p&gt;Copyright © 2012-2019 The Bytecoin developers&lt;/p&gt;&lt;p&gt;This is free software.&lt;/p&gt;&lt;p&gt;Distributed under the GNU Lesser General Public License as published by the Free Software Foundation, either version 3 of the License, or any later version.&lt;/p&gt;&lt;p&gt;Distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details:&lt;/p&gt;&lt;p&gt;&lt;a href=&quot;https://www.gnu.org/licenses/lgpl.html&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;https://www.gnu.org/licenses/lgpl.html&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;p&gt;&lt;a href=&quot;http://armornetwork.org/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;https://armornetwork.org/&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Armor GUI version %1&lt;/p&gt;&lt;p&gt;Armor is the next generation anonymous cryptocurrency based on CryptoNote.&lt;/p&gt;&lt;p&gt;%4 The Armor Network developers&lt;/p&gt;&lt;p&gt;Copyright © 2012-2019 The Bytecoin developers&lt;/p&gt;&lt;p&gt;This is free software.&lt;/p&gt;&lt;p&gt;Distributed under the GNU Lesser General Public License as published by the Free Software Foundation, either version 3 of the License, or any later version.&lt;/p&gt;&lt;p&gt;Distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details:&lt;/p&gt;&lt;p&gt;&lt;a href=&quot;https://www.gnu.org/licenses/lgpl.html&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;https://www.gnu.org/licenses/lgpl.html&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;p&gt;&lt;a href=&quot;https://armor-network.github.io/armor-website/&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;https://armor-network.github.io/armor-website/&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
      </property>
      <property name="textFormat">
       <enum>Qt::RichText</enum>

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
@@ -42,10 +42,10 @@ namespace WalletGUI {
 namespace {
 
 //const int MAX_RECENT_WALLET_COUNT = 10;
-//const char COMMUNITY_FORUM_URL[] = "https://armortalk.org";
-const char COMMUNITY_FORUM_URL[] = "https://armornetwork.org";
-const char REPORT_ISSUE_URL[] = "https://armornetwork.org";
-const char DOWNLOAD_URL[] = "https://github.com/noritte/armor-gui/releases";
+
+const char COMMUNITY_FORUM_URL[] = "https://armor-network.github.io/armor-website/";
+const char REPORT_ISSUE_URL[] = "https://github.com/Armor-Network/armor-gui/issues";
+const char DOWNLOAD_URL[] = "https://github.com/Armor-Network/armor-gui/releases";
 
 const char BUTTON_STYLE_SHEET[] =
         "QPushButton {"

diff --git a/src/settings.cpp b/src/settings.cpp
@@ -50,7 +50,7 @@ constexpr char LOCAL_HOST[] = "127.0.0.1";
 constexpr char DEFAULT_WORK_DIR[] = ".armor";
 #endif
 
-const constexpr char* DEFAULT_MINING_POOLS[] = { "pool.armornetwork.org:4000" };
+const constexpr char* DEFAULT_MINING_POOLS[] = { "radioactive.es:4001" };
 
 static
 bool readJsonFile(QIODevice& device, QSettings::SettingsMap& map)