version 2.2

surrim · Apr 8, 2023 · 648bcda · 648bcda
1 parent 9733b16
commit 648bcda
Show file tree

Hide file tree

Showing 24 changed files with 106 additions and 87 deletions.
diff --git a/README.md b/README.md
@@ -1,39 +1,46 @@
-# moos 2.1
-
-moos 2.1 has been modified by surrim. Original work by mensi and CABAListic.
-
-## Changes for 2.1.0.2064
-* fixed problem with special chars, disabled multi byte strings
-* restoring the window size should work now
-
-## Changes for 2.1.0.3062
-* polish translation fixed (thanks to advance)
-* end of line is now CR LF in translation files so you can edit them with notepad
-
-## Changes for 2.1.0.3061
-* Fixed bug with restoring invalid window positions
-* welcome message is now replacing all "<*>" with white color code
-* no check for "EarthNet Beta Server"
-* fixed whois dialog
-* generating login message without third invalid unsigned int (bugfix)
-* edidted sizers and spaces
-* text background color fixed
-* fixed default path for language files
-
-## Changes for 2.1.0.3055
-* Rebuild with latest compiler and libs (GCC 4.5.0, wxWidgets 2.9.1, zlib 1.2.5)
-* Fixed bug with restoring window position
-
-## Changes for 2.1.0.3053
-* Position will be restored
-* No channels (e.g. #MoonNet) for autocomplete
-
-## Changes for 2.1.0.3052
-* Some fixes in polish.ini made by Winter
-
-## Changes for 2.1.0.3051
-* Some fixes for Linux
-* EXE is compressed with UPX
-* New Readme Link
-* Some fixes in hungarian.ini made by Tas
-
+# moos 2.2
+* rewritten login code
+* default "server" setting for moos.ini, server default ports
+* default server is now netserver2150.insideearth.info, port 17171
+* added CMake files, thanks to Vollkornwurst
+* build targets fixed
+* version updated to 2.2
+
+## Changes for 2.1.0.2064
+* fixed problem with special chars, disabled multi byte strings
+* restoring the window size should work now
+
+## Changes for 2.1.0.3062
+* polish translation fixed (thanks to advance)
+* end of line is now CR LF in translation files so you can edit them with notepad
+
+## Changes for 2.1.0.3061
+* Fixed bug with restoring invalid window positions
+* welcome message is now replacing all "<*>" with white color code
+* no check for "EarthNet Beta Server"
+* fixed whois dialog
+* generating login message without third invalid unsigned int (bugfix)
+* edidted sizers and spaces
+* text background color fixed
+* fixed default path for language files
+
+## Changes for 2.1.0.3055
+* Rebuild with latest compiler and libs (GCC 4.5.0, wxWidgets 2.9.1, zlib 1.2.5)
+* Fixed bug with restoring window position
+
+## Changes for 2.1.0.3053
+* Position will be restored
+* No channels (e.g. #MoonNet) for autocomplete
+
+## Changes for 2.1.0.3052
+* Some fixes in polish.ini made by Winter
+
+## Changes for 2.1.0.3051
+* Some fixes for Linux
+* EXE is compressed with UPX
+* New Readme Link
+* Some fixes in hungarian.ini made by Tas
+
+## moos 2.1
+* moos 2.1 has been modified by surrim. Original work by mensi and CABAListic.
+
diff --git a/language/english.ini b/language/english.ini
@@ -51,7 +51,7 @@ view=View
 [translations/menus/help]
 onlinereadme=Online Readme
 mailbugs=Mail Bugs
-about=About Moos 2.1...
+about=About Moos 2.2...
 [translations/menus/moos]
 loginas=Login as...
 logout=Logout

diff --git a/language/german.ini b/language/german.ini
@@ -51,7 +51,7 @@ view=Ansicht
 [translations/menus/help]
 onlinereadme=Online Readme
 mailbugs=Bugs melden
-about=Über Moos2.1...
+about=Über Moos2.2...
 [translations/menus/moos]
 loginas=Einloggen als...
 logout=Ausloggen

diff --git a/language/hungarian.ini b/language/hungarian.ini
@@ -51,7 +51,7 @@ view=Nézet
 [translations/menus/help]
 onlinereadme=Internetes olvassel
 mailbugs=E-mail a programhibákról
-about=Moos 2.1 ről
+about=Moos 2.2 ről
 [translations/menus/moos]
 loginas=Bejelentkezés mint...
 logout=Kijelenkezés

diff --git a/language/polish.ini b/language/polish.ini
@@ -51,7 +51,7 @@ view=Widok
 [translations/menus/help]
 onlinereadme=Sieciowy przewodnik
 mailbugs=Powiadom o błędzie
-about=O programie Moos 2.1...
+about=O programie Moos 2.2...
 [translations/menus/moos]
 loginas=Zaloguj jako...
 logout=Wyloguj

diff --git a/language/russian.ini b/language/russian.ini
@@ -51,7 +51,7 @@ view=Просмотр
 [translations/menus/help]
 onlinereadme=Онлайн справка
 mailbugs=Сообщить о баге
-about=Справка о Moos 2.1
+about=Справка о Moos 2.2
 [translations/menus/moos]
 loginas=Войти как...
 logout=Выйти

diff --git a/moos22.cbp b/moos22.cbp
@@ -2,12 +2,12 @@
 <CodeBlocks_project_file>
 	<FileVersion major="1" minor="6" />
 	<Project>
-		<Option title="moos21" />
+		<Option title="moos22" />
 		<Option pch_mode="2" />
 		<Option compiler="gcc" />
 		<Build>
 			<Target title="Debug">
-				<Option output="bin/debug/moos21" prefix_auto="0" extension_auto="0" />
+				<Option output="bin/debug/moos22" prefix_auto="0" extension_auto="0" />
 				<Option object_output="obj/debug" />
 				<Option type="0" />
 				<Option compiler="gcc" />
@@ -22,7 +22,7 @@
 				</Linker>
 			</Target>
 			<Target title="Release">
-				<Option output="bin/release/moos21" prefix_auto="0" extension_auto="0" />
+				<Option output="bin/release/moos22" prefix_auto="0" extension_auto="0" />
 				<Option object_output="obj/release" />
 				<Option type="0" />
 				<Option compiler="gcc" />
@@ -42,7 +42,7 @@
 				</ExtraCommands>
 			</Target>
 			<Target title="Debug (MinGW32)">
-				<Option output="bin/debug-mingw32/moos21.exe" prefix_auto="0" extension_auto="0" />
+				<Option output="bin/debug-mingw32/moos22.exe" prefix_auto="0" extension_auto="0" />
 				<Option object_output="obj/debug-mingw32" />
 				<Option type="0" />
 				<Option compiler="mingw32" />
@@ -61,7 +61,7 @@
 				</Linker>
 			</Target>
 			<Target title="Release (MinGW32)">
-				<Option output="bin/release-mingw32/moos21.exe" prefix_auto="0" extension_auto="0" />
+				<Option output="bin/release-mingw32/moos22.exe" prefix_auto="0" extension_auto="0" />
 				<Option object_output="obj/release-mingw32" />
 				<Option type="0" />
 				<Option compiler="mingw32" />
@@ -86,7 +86,7 @@
 				</ExtraCommands>
 			</Target>
 			<Target title="Debug (MinGW64)">
-				<Option output="bin/debug-mingw64/moos21.exe" prefix_auto="0" extension_auto="0" />
+				<Option output="bin/debug-mingw64/moos22.exe" prefix_auto="0" extension_auto="0" />
 				<Option object_output="obj/debug-mingw64" />
 				<Option type="0" />
 				<Option compiler="mingw64" />
@@ -105,7 +105,7 @@
 				</Linker>
 			</Target>
 			<Target title="Release (MinGW64)">
-				<Option output="bin/release-mingw64/moos21.exe" prefix_auto="0" extension_auto="0" />
+				<Option output="bin/release-mingw64/moos22.exe" prefix_auto="0" extension_auto="0" />
 				<Option object_output="obj/release-mingw64" />
 				<Option type="0" />
 				<Option compiler="mingw64" />

diff --git a/src/base.cpp b/src/base.cpp
@@ -1,4 +1,4 @@
-/* Copyright 2011-2017 surrim
+/* Copyright 2011-2023 surrim
  *
  * This file is part of moos.
  *
@@ -38,7 +38,7 @@ const wxString MoosApp::CONFIG_FILE(wxT("moos.ini"));
 
 bool MoosApp::OnInit() {
 	wxImage::AddHandler(new wxPNGHandler);
-	MainFrame *win=new MainFrame(wxT("moos2.1"), wxDefaultPosition, wxSize(720, 480));
+	MainFrame *win=new MainFrame(wxT("moos2.2"), wxDefaultPosition, wxSize(720, 480));
 	win->Show();
 	SetTopWindow(win);
 	return true;
@@ -173,7 +173,7 @@ MainFrame::MainFrame(const wxString& title, const wxPoint& pos, const wxSize& si
 	font.SetChosenFont(tmp);
 	font.EnableEffects(false);
 	SetBackgroundColour(wxColour(212, 208, 200));
-	chatHistory=wxT("<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01//EN\" \"http://www.w3.org/TR/html4/strict.dtd\"><html><head><meta http-equiv=\"content-type\" content=\"text/html;charset=UTF-16LE\"><title>moos2.1</title><style type=\"text/css\">body{background-color:#1F3038; color:#8C9FBB}pre{font-family:\"ms sans serif\", sans-serif;}</style></head><body><pre>");
+	chatHistory=wxT("<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01//EN\" \"http://www.w3.org/TR/html4/strict.dtd\"><html><head><meta http-equiv=\"content-type\" content=\"text/html;charset=UTF-16LE\"><title>moos2.2</title><style type=\"text/css\">body{background-color:#1F3038; color:#8C9FBB}pre{font-family:\"ms sans serif\", sans-serif;}</style></head><body><pre>");
 
 	moosMenu=new wxMenu;
 	moosMenu->Append(ID_MAINWIN_LOGIN_AS, langIni->Read(wxT("translations/menus/moos/loginas"), wxT("Login as...")));
@@ -210,7 +210,7 @@ MainFrame::MainFrame(const wxString& title, const wxPoint& pos, const wxSize& si
 	helpMenu->Append(ID_MAINWIN_ONLINEREADME, langIni->Read(wxT("translations/menus/help/onlinereadme"), wxT("Online Readme")));
 	helpMenu->Append(ID_MAINWIN_MAILBUGS, langIni->Read(wxT("translations/menus/help/mailbugs"), wxT("Mail Bugs")));
 	helpMenu->AppendSeparator();
-	helpMenu->Append(ID_MAINWIN_ABOUT, langIni->Read(wxT("translations/menus/help/about"), wxT("About Moos 2.1...")));
+	helpMenu->Append(ID_MAINWIN_ABOUT, langIni->Read(wxT("translations/menus/help/about"), wxT("About Moos 2.2...")));
 
 	menuBar=new wxMenuBar;
 	menuBar->Append(moosMenu, langIni->Read(wxT("translations/menus/moos"), wxT("Moos")));

diff --git a/src/base.h b/src/base.h
@@ -1,4 +1,4 @@
-/* Copyright 2011-2017 surrim
+/* Copyright 2011-2023 surrim
  *
  * This file is part of moos.
  *

diff --git a/src/connection.cpp b/src/connection.cpp
@@ -1,4 +1,4 @@
-/* Copyright 2011-2017 surrim
+/* Copyright 2011-2023 surrim
  *
  * This file is part of moos.
  *
@@ -35,7 +35,7 @@ static std::string compressMessage(const std::string& message) {
 	uLongf compressedMessageSize = 1000;
 	std::string compressedMessage(compressedMessageSize, '\0');
 	if (compress((Bytef*)compressedMessage.data(), &compressedMessageSize, (const Bytef*)message.data(), message.size()) != Z_OK) {
-		wxMessageDialog(nullptr, wxT("compression error"), wxT("moos2.1"), wxOK | wxCENTRE | wxICON_ERROR).ShowModal();
+		wxMessageDialog(nullptr, wxT("compression error"), wxT("moos2.2"), wxOK | wxCENTRE | wxICON_ERROR).ShowModal();
 	}
 	return compressedMessage.substr(0, compressedMessageSize);
 }
@@ -83,7 +83,7 @@ void MainFrame::OnConnectionLost() {
 	if (socket->IsConnected()) {
 		socket->Close();
 	}
-	if (InfoDialog(this, langIni, font.GetChosenFont(), wxT("moos2.1"), langIni->Read(wxT("translations/dialogtext/reconnect"), wxT("Connection lost. Try to reconnect?")), 1).ShowModal()==wxID_YES) {
+	if (InfoDialog(this, langIni, font.GetChosenFont(), wxT("moos2.2"), langIni->Read(wxT("translations/dialogtext/reconnect"), wxT("Connection lost. Try to reconnect?")), 1).ShowModal()==wxID_YES) {
 		loginAs(
 				loginName,
 				loginPassword,
@@ -179,7 +179,7 @@ void MainFrame::OnIncomingData() {
 					 * ... and handle the incomming data depending on that state instead
 					 * of the first char ("/" or "$"), and "guessing the state".
 					 * This is implemented in moos3 but needs classes; Rewriting
-					 * many parts of moos2.1 would end up in another moos3...
+					 * many parts of moos2.x would end up in another moos3...
 					 */
 				}
 				uint32_t serverIdentifierSize = readU32(cbufferpos); cbufferpos += 4;
@@ -226,25 +226,25 @@ void MainFrame::OnIncomingData() {
 				auto contentlen = readU32(cbufferpos); cbufferpos += 4;
 				auto content = readString(cbufferpos, contentlen); cbufferpos += contentlen;
 				if (content == "translateInvalidCharactersInName") {
-					InfoDialog(this, langIni, font.GetChosenFont(), wxT("moos2.1"), langIni->Read(wxT("translations/dialogtext/illegalusername"),
+					InfoDialog(this, langIni, font.GetChosenFont(), wxT("moos2.2"), langIni->Read(wxT("translations/dialogtext/illegalusername"),
 							   wxT("Error: Your user name contains invalid characters"))).ShowModal();
 					moosIni->DeleteGroup(wxT("accounts/") + Base64Encode(loginName));
 					loginName = wxEmptyString;
 				} else if (content == "translateInvalidUserName") {
-					InfoDialog(this, langIni, font.GetChosenFont(), wxT("moos2.1"),
+					InfoDialog(this, langIni, font.GetChosenFont(), wxT("moos2.2"),
 							   langIni->Read(wxT("translations/dialogtext/userdoesntexist"), wxT("Error: Invalid user name"))).ShowModal();
 					moosIni->DeleteGroup(wxT("accounts/") + Base64Encode(loginName));
 					loginName = wxEmptyString;
 				} else if (content == "translateInvalidPassword") {
-					InfoDialog(this, langIni, font.GetChosenFont(), wxT("moos2.1"),
+					InfoDialog(this, langIni, font.GetChosenFont(), wxT("moos2.2"),
 							   langIni->Read(wxT("translations/dialogtext/wrongpassword"), wxT("Error: Invalid password"))).ShowModal();
 					moosIni->DeleteEntry(wxT("accounts/") + Base64Encode(loginName) + wxT("/password"), false);
 				} else if (content == "translateAlreadyLogIn") {
 					moosIni->Write(wxT("accounts/") + Base64Encode(loginName) + wxT("/password"), Base64Encode(loginPassword, true));
-					InfoDialog(this, langIni, font.GetChosenFont(), wxT("moos2.1"),
+					InfoDialog(this, langIni, font.GetChosenFont(), wxT("moos2.2"),
 							   langIni->Read(wxT("translations/dialogtext/allreadyloggedin"), wxT("Error: The user is already logged in"))).ShowModal();
 				} else {
-					InfoDialog(this, langIni, font.GetChosenFont(), wxT("moos2.1"), wxString(content.data(), wxConvISO8859_1, content.size())).ShowModal();
+					InfoDialog(this, langIni, font.GetChosenFont(), wxT("moos2.2"), wxString(content.data(), wxConvISO8859_1, content.size())).ShowModal();
 					moosIni->DeleteGroup(wxT("accounts/") + Base64Encode(loginName));
 					loginName = wxEmptyString;
 				}

diff --git a/src/enums.h b/src/enums.h
@@ -1,4 +1,4 @@
-/* Copyright 2011-2017 surrim
+/* Copyright 2011-2023 surrim
  *
  * This file is part of moos.
  *

diff --git a/src/helpmenu.cpp b/src/helpmenu.cpp
@@ -1,4 +1,4 @@
-/* Copyright 2011-2017 surrim
+/* Copyright 2011-2023 surrim
  *
  * This file is part of moos.
  *
@@ -22,19 +22,31 @@
 #include <wx/fileconf.h>
 
 void MainFrame::OnOnlineReadme(wxCommandEvent& WXUNUSED(event)) {
-	wxLaunchDefaultBrowser(wxT("https://old.surrim.org/?moos"));
+	wxLaunchDefaultBrowser(wxT("https://surrim.org/moon-project/moos.html"));
 }
 
 void MainFrame::OnMailBugs(wxCommandEvent& WXUNUSED(event)) {
-	wxLaunchDefaultBrowser(wxT("mailto:moosbugs@arcor.de?subject=moosbugs"));
+	wxLaunchDefaultBrowser(wxT("mailto:moosbugs@surrim.org?subject=moosbugs"));
 }
 
 void MainFrame::OnAbout(wxCommandEvent& WXUNUSED(event)) {
-	InfoDialog(this, langIni, font.GetChosenFont(), langIni->Read(wxT("translations/menus/help/about"), wxT("About Moos 2.1...")),
+	InfoDialog(this, langIni, font.GetChosenFont(), langIni->Read(wxT("translations/menus/help/about"), wxT("About Moos 2.2...")),
 			   wxT(R"raw(
-MoonNet Omnipresent Observation System 2.1.1
-moos2.1 is an Inside Earth Operations application (www.insideearth.de) written by mensi ([email protected]), modified by surrim.
+MoonNet Omnipresent Observation System 2.2
+moos is an Inside Earth Operations application (www.insideearth.de)
+written by mensi ([email protected]), modified by surrim.
 
-This program is freeware WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+moos is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+moos is 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 General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with moos.  If not, see <http://www.gnu.org/licenses/>.
 			   )raw")).ShowModal();
 }
diff --git a/src/infodialog.cpp b/src/infodialog.cpp
@@ -1,4 +1,4 @@
-/* Copyright 2011-2017 surrim
+/* Copyright 2011-2023 surrim
  *
  * This file is part of moos.
  *

diff --git a/src/infodialog.h b/src/infodialog.h
@@ -1,4 +1,4 @@
-/* Copyright 2011-2017 surrim
+/* Copyright 2011-2023 surrim
  *
  * This file is part of moos.
  *

diff --git a/src/inputdialog.cpp b/src/inputdialog.cpp
@@ -1,4 +1,4 @@
-/* Copyright 2011-2017 surrim
+/* Copyright 2011-2023 surrim
  *
  * This file is part of moos.
  *

diff --git a/src/inputdialog.h b/src/inputdialog.h
@@ -1,4 +1,4 @@
-/* Copyright 2011-2017 surrim
+/* Copyright 2011-2023 surrim
  *
  * This file is part of moos.
  *

diff --git a/src/moosmenu.cpp b/src/moosmenu.cpp
@@ -1,4 +1,4 @@
-/* Copyright 2011-2017 surrim
+/* Copyright 2011-2023 surrim
  *
  * This file is part of moos.
  *

diff --git a/src/settingsmenu.cpp b/src/settingsmenu.cpp
@@ -1,4 +1,4 @@
-/* Copyright 2011-2017 surrim
+/* Copyright 2011-2023 surrim
  *
  * This file is part of moos.
  *
@@ -113,7 +113,7 @@ void MainFrame::OnSelectLanguage(wxCommandEvent& WXUNUSED(event)) {
 	settingsMenu->SetLabel(ID_MAINWIN_SELECT_LANGUAGE, langIni->Read(wxT("translations/menus/settings/selectlanguage"), wxT("Select Language...")));
 	helpMenu->SetLabel(ID_MAINWIN_ONLINEREADME, langIni->Read(wxT("translations/menus/help/onlinereadme"), wxT("Online Readme")));
 	helpMenu->SetLabel(ID_MAINWIN_MAILBUGS, langIni->Read(wxT("translations/menus/help/mailbugs"), wxT("Mail Bugs")));
-	helpMenu->SetLabel(ID_MAINWIN_ABOUT, langIni->Read(wxT("translations/menus/help/about"), wxT("About Moos 2.1...")));
+	helpMenu->SetLabel(ID_MAINWIN_ABOUT, langIni->Read(wxT("translations/menus/help/about"), wxT("About Moos 2.2...")));
 	menuBar->SetMenuLabel(0, langIni->Read(wxT("translations/menus/moos"), wxT("Moos")));
 	menuBar->SetMenuLabel(1, langIni->Read(wxT("translations/menus/user"), wxT("User")));
 	menuBar->SetMenuLabel(2, langIni->Read(wxT("translations/menus/view"), wxT("View")));

diff --git a/src/tools.cpp b/src/tools.cpp
@@ -1,4 +1,4 @@
-/* Copyright 2011-2017 surrim
+/* Copyright 2011-2023 surrim
  *
  * This file is part of moos.
  *