MeOS version 3.5.880 Update 1

melinsoftware · May 23, 2018 · 00906d2 · 00906d2
1 parent 383eb28
commit 00906d2
Show file tree

Hide file tree

Showing 172 changed files with 2,460 additions and 2,496 deletions.
diff --git a/code/HTMLWriter.cpp b/code/HTMLWriter.cpp
@@ -1,4 +1,4 @@
-/************************************************************************
+/************************************************************************
     MeOS - Orienteering Software
     Copyright (C) 2009-2018 Melin Software HB
 
@@ -16,7 +16,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
     Melin Software HB - software@melin.nu - www.melin.nu
-    Eksoppsvägen 16, SE-75646 UPPSALA, Sweden
+    Eksoppsvägen 16, SE-75646 UPPSALA, Sweden
 
 ************************************************************************/
 
@@ -520,4 +520,4 @@ bool gdioutput::writeTableHTML(ostream &fout,
   fout << "</html>\n";
 
   return true;
-}
+}
diff --git a/code/MeOSFeatures.cpp b/code/MeOSFeatures.cpp
@@ -1,4 +1,4 @@
-/************************************************************************
+/************************************************************************
     MeOS - Orienteering Software
     Copyright (C) 2009-2018 Melin Software HB
 
@@ -16,7 +16,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
     Melin Software HB - software@melin.nu - www.melin.nu
-    Eksoppsvägen 16, SE-75646 UPPSALA, Sweden
+    Eksoppsvägen 16, SE-75646 UPPSALA, Sweden
 
 ************************************************************************/
 
@@ -40,7 +40,7 @@ MeOSFeatures::MeOSFeatures(void)
   add(Network, L"NW", "Several MeOS Clients in a network");
 
   addHead("MeOS Features");
-  add(Speaker, L"SP", "Använd speakerstöd");
+  add(Speaker, L"SP", "Använd speakerstöd");
   add(SeveralStages, L"ST", "Several stages");
   add(Economy, L"EC", "Economy and fees").require(EditClub).require(Clubs);
   add(Vacancy, L"VA", "Vacancies and entry cancellations").require(DrawStartList);

diff --git a/code/MeOSFeatures.h b/code/MeOSFeatures.h
@@ -1,4 +1,4 @@
-#pragma once
+#pragma once
 /************************************************************************
     MeOS - Orienteering Software
     Copyright (C) 2009-2018 Melin Software HB
@@ -17,7 +17,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
     Melin Software HB - software@melin.nu - www.melin.nu
-    Eksoppsvägen 16, SE-75646 UPPSALA, Sweden
+    Eksoppsvägen 16, SE-75646 UPPSALA, Sweden
 
 ************************************************************************/
 

diff --git a/code/Printer.h b/code/Printer.h
@@ -1,4 +1,4 @@
-// printer.h: printing utilities.
+// printer.h: printing utilities.
 
 #pragma once
 
@@ -20,7 +20,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
     Melin Software HB - software@melin.nu - www.melin.nu
-    Eksoppsvägen 16, SE-75646 UPPSALA, Sweden
+    Eksoppsvägen 16, SE-75646 UPPSALA, Sweden
 
 ************************************************************************/
 

diff --git a/code/RestService.cpp b/code/RestService.cpp
@@ -1,4 +1,4 @@
-#include "stdafx.h"
+#include "stdafx.h"
 #include "RestService.h"
 #include "meos_util.h"
 #include "restserver.h"
@@ -42,7 +42,7 @@ void RestService::settings(gdioutput &gdi, oEvent &oe, bool created) {
   if (!server)
     gdi.addInput("Port", itow(port), 10, 0, L"Port:", L"#http://localhost:[PORT]/meos");
   else 
-    gdi.addString("", 0, "Server startad på X#" + itos(port));
+    gdi.addString("", 0, "Server startad på X#" + itos(port));
 
   gdi.popX();
   gdi.addString("", 10, "help:rest");
@@ -53,13 +53,13 @@ void RestService::status(gdioutput &gdi) {
   gdi.addString("", 1, name);
 
   if (server) {
-    gdi.addString("", 0, "Server startad på X#" + itos(port));
+    gdi.addString("", 0, "Server startad på X#" + itos(port));
 
     RestServer::Statistics rs;
     server->getStatistics(rs);
-    gdi.addString("", 0, "Antal förfrågningar: X.#" + itos(rs.numRequests));
+    gdi.addString("", 0, "Antal förfrågningar: X.#" + itos(rs.numRequests));
     gdi.addString("", 0, "Genomsnittlig svarstid: X ms.#" + itos(rs.averageResponseTime));
-    gdi.addString("", 0, "Längsta svarstid: X ms.#" + itos(rs.maxResponseTime));
+    gdi.addString("", 0, "Längsta svarstid: X ms.#" + itos(rs.maxResponseTime));
 
     gdi.dropLine(0.6);
     gdi.addButton("Update", "Uppdatera").setHandler(this);
@@ -72,7 +72,7 @@ void RestService::status(gdioutput &gdi) {
   gdi.fillRight();
   gdi.addButton("Stop", "Stoppa automaten", AutomaticCB).setExtra(getId());
   gdi.fillDown();
-  gdi.addButton("InfoService", "Inställningar...", AutomaticCB).setExtra(getId());
+  gdi.addButton("InfoService", "Inställningar...", AutomaticCB).setExtra(getId());
   gdi.popX();
 }
 
@@ -92,4 +92,4 @@ void RestService::handle(gdioutput &gdi, BaseInfo &info, GuiEventType type) {
     wstring url = L"http://localhost:" + itow(port) + L"/meos";
     ShellExecute(NULL, L"open", url.c_str(), NULL, NULL, SW_SHOWNORMAL);
   }
-}
+}
diff --git a/code/RestService.h b/code/RestService.h
@@ -1,4 +1,4 @@
-/************************************************************************
+/************************************************************************
 MeOS - Orienteering Software
 Copyright (C) 2009-2018 Melin Software HB
 
@@ -16,7 +16,7 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 Melin Software HB - software@melin.nu - www.melin.nu
-Eksoppsvägen 16, SE-75646 UPPSALA, Sweden
+Eksoppsvägen 16, SE-75646 UPPSALA, Sweden
 
 ************************************************************************/
 

diff --git a/code/RunnerDB.cpp b/code/RunnerDB.cpp
@@ -1,4 +1,4 @@
-/************************************************************************
+/************************************************************************
     MeOS - Orienteering Software
     Copyright (C) 2009-2018 Melin Software HB
 
@@ -16,7 +16,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
     Melin Software HB - software@melin.nu - www.melin.nu
-    Eksoppsvägen 16, SE-75646 UPPSALA, Sweden
+    Eksoppsvägen 16, SE-75646 UPPSALA, Sweden
 
 ************************************************************************/
 
@@ -579,7 +579,7 @@ void RunnerDB::setupCNHash() const
 static bool isVowel(int c) {
   return c=='a' || c=='e' || c=='i' ||
          c=='o' || c=='u' || c=='y' ||
-         c=='å' || c=='ä' || c=='ö';
+         c=='å' || c=='ä' || c=='ö';
 }
 
 void RunnerDB::canonizeSplitName(const wstring &name, vector<wstring> &split)
@@ -617,7 +617,7 @@ void RunnerDB::canonizeSplitName(const wstring &name, vector<wstring> &split)
       }
 
       if (outp>4 && out[outp-1]=='s')
-        out[outp-1] = 0; // Identify Linköping och Linköpings
+        out[outp-1] = 0; // Identify Linköping och Linköpings
       split.push_back(out);
     }
     while(cname[k] == ' ')
@@ -1206,17 +1206,17 @@ void RunnerDB::releaseTables() {
 Table *RunnerDB::getRunnerTB()//Table mode
 {
   if (runnerTable == 0) {
-    Table *table=new Table(oe, 20, L"Löpardatabasen", "runnerdb");
+    Table *table=new Table(oe, 20, L"Löpardatabasen", "runnerdb");
 
     table->addColumn("Index", 70, true, true);
     table->addColumn("Id", 70, true, true);
     table->addColumn("Namn", 200, false);
     table->addColumn("Klubb", 200, false);
     table->addColumn("SI", 70, true, true);
     table->addColumn("Nationalitet", 70, false, true);
-    table->addColumn("Kön", 50, false, true);
-    table->addColumn("Födelseår", 70, true, true);
-    table->addColumn("Anmäl", 70, false, true);
+    table->addColumn("Kön", 50, false, true);
+    table->addColumn("Födelseår", 70, true, true);
+    table->addColumn("Anmäl", 70, false, true);
 
     table->setTableProp(Table::CAN_INSERT|Table::CAN_DELETE|Table::CAN_PASTE);
     table->setClearOnHide(false);
@@ -1292,7 +1292,7 @@ Table *RunnerDB::getClubTB()//Table mode
     Table *table = new Table(oe, 20, L"Klubbdatabasen", "clubdb");
 
     table->addColumn("Id", 70, true, true);
-    table->addColumn("Ändrad", 70, false);
+    table->addColumn("Ändrad", 70, false);
 
     table->addColumn("Namn", 200, false);
     oClub::buildTableCol(oe, table);

diff --git a/code/RunnerDB.h b/code/RunnerDB.h
@@ -1,4 +1,4 @@
-#pragma once
+#pragma once
 
 #include <vector>
 #include <map>
@@ -27,7 +27,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
     Melin Software HB - software@melin.nu - www.melin.nu
-    Eksoppsvägen 16, SE-75646 UPPSALA, Sweden
+    Eksoppsvägen 16, SE-75646 UPPSALA, Sweden
 
 ************************************************************************/
 

diff --git a/code/SportIdent.cpp b/code/SportIdent.cpp
@@ -1,4 +1,4 @@
-/************************************************************************
+/************************************************************************
     MeOS - Orienteering Software
     Copyright (C) 2009-2018 Melin Software HB
 
@@ -16,7 +16,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
     Melin Software HB - software@melin.nu - www.melin.nu
-    Eksoppsvägen 16, SE-75646 UPPSALA, Sweden
+    Eksoppsvägen 16, SE-75646 UPPSALA, Sweden
 
 ************************************************************************/
 
@@ -1768,7 +1768,7 @@ void SICard::analyseHour12Time(DWORD zeroTime) {
 void SIPunch::analyseHour12Time(DWORD zeroTime) {
   if (Code != -1 && Time>=0 && Time <=12*3600) {
     if (zeroTime < 12 * 3600) {
-      //Förmiddag
+      //Förmiddag
       if (Time < zeroTime)
         Time += 12 * 3600; //->Eftermiddag
     }
@@ -1896,7 +1896,6 @@ void SportIdent::addCard(const SICard &sic)
 void SportIdent::addPunch(DWORD Time, int Station, int Card, int Mode)
 {
   SICard sic(ConvertedTimeStatus::Hour24);
-  memset(&sic, 0, sizeof(sic));
   sic.CardNumber=Card;
   sic.StartPunch.Code = -1;
   sic.CheckPunch.Code = -1;
@@ -2115,25 +2114,25 @@ void SportIdent::getInfoString(const wstring &com, vector<wstring> &infov)
       info += makeDash(L"-") + itow(k+1);
 
     const SI_StationData &da = si->data[k];
-    if (da.extended) info+=lang.tl(L": Utökat protokoll. ");
-    else info+=lang.tl(L": Äldre protokoll. ");
+    if (da.extended) info+=lang.tl(L": Utökat protokoll. ");
+    else info+=lang.tl(L": Äldre protokoll. ");
 
     switch(da.stationMode){
       case 2:
       case 50:
         info+=lang.tl(L"Kontrol");
         break;
       case 4:
-        info+=lang.tl(L"Mål");
+        info+=lang.tl(L"Mål");
         break;
       case 3:
         info+=lang.tl(L"Start");
         break;
       case 5:
-        info+=lang.tl(L"Läs brickor");
+        info+=lang.tl(L"Läs brickor");
         break;
       case 7:
-        info+=lang.tl(L"Töm");
+        info+=lang.tl(L"Töm");
         break;
       case 10:
         info+=lang.tl(L"Check");
@@ -2142,7 +2141,7 @@ void SportIdent::getInfoString(const wstring &com, vector<wstring> &infov)
         info+=lang.tl(L"SRR Dongle ") + (da.radioChannel == 0? lang.tl(L"red channel.") : lang.tl(L"blue channel."));
         break;
       default:
-        info+=lang.tl(L"Okänd funktion");
+        info+=lang.tl(L"Okänd funktion");
     }
 
     if (da.stationNumber) {
@@ -2152,9 +2151,9 @@ void SportIdent::getInfoString(const wstring &com, vector<wstring> &infov)
     }
 
     info += lang.tl(L" Kommunikation: ");
-    if (da.autoSend) info+=lang.tl(L"skicka stämplar.");
+    if (da.autoSend) info+=lang.tl(L"skicka stämplar.");
     else if (da.handShake) info+=lang.tl(L"handskakning.");
-    else info+=lang.tl(L"[VARNING] ingen/okänd.");
+    else info+=lang.tl(L"[VARNING] ingen/okänd.");
 
     infov.push_back(info);
   }

diff --git a/code/SportIdent.h b/code/SportIdent.h
@@ -1,4 +1,4 @@
-// SportIdent.h: interface for the SportIdent class.
+// SportIdent.h: interface for the SportIdent class.
 //
 //////////////////////////////////////////////////////////////////////
 
@@ -27,7 +27,7 @@
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
     Melin Software HB - software@melin.nu - www.melin.nu
-    Eksoppsvägen 16, SE-75646 UPPSALA, Sweden
+    Eksoppsvägen 16, SE-75646 UPPSALA, Sweden
 
 ************************************************************************/
 const BYTE STX=0x02;

diff --git a/code/StdAfx.cpp b/code/StdAfx.cpp
@@ -1,4 +1,4 @@
-// stdafx.cpp : source file that includes just the standard includes
+// stdafx.cpp : source file that includes just the standard includes
 //meos.pch will be the pre-compiled header
 //stdafx.obj will contain the pre-compiled type information
 

diff --git a/code/StdAfx.h b/code/StdAfx.h
@@ -1,4 +1,4 @@
-// stdafx.h : include file for standard system include files,
+// stdafx.h : include file for standard system include files,
 //  or project specific include files that are used frequently, but
 //      are changed infrequently
 //