From 6d8a5bab3170aaef7aed0293d8ecb962ba2528bc Mon Sep 17 00:00:00 2001 From: krzys-h Date: Sun, 24 Jan 2016 15:24:56 +0100 Subject: [PATCH] Removed system mouse option Not really needed, as it is an SDL cursor not system cursor, which is no better than ours --- po/colobot.pot | 3 --- po/de.po | 3 --- po/fr.po | 6 +++--- po/pl.po | 6 +++--- po/ru.po | 3 --- src/common/event.cpp | 1 - src/common/event.h | 1 - src/common/restext.cpp | 1 - src/common/settings.cpp | 16 ---------------- src/common/settings.h | 4 ---- src/ui/mainui.cpp | 2 +- src/ui/screen/screen_setup_game.cpp | 17 ----------------- 12 files changed, 7 insertions(+), 56 deletions(-) diff --git a/po/colobot.pot b/po/colobot.pot index eb7538a1..cf3b4e2a 100644 --- a/po/colobot.pot +++ b/po/colobot.pot @@ -379,9 +379,6 @@ msgstr "" msgid "Quake at explosions\\The screen shakes at explosions" msgstr "" -msgid "System mouse\\Use system mouse cursor" -msgstr "" - msgid "Automatic indent\\When program editing" msgstr "" diff --git a/po/de.po b/po/de.po index 05f592fb..f4c84e80 100644 --- a/po/de.po +++ b/po/de.po @@ -1451,9 +1451,6 @@ msgstr "Überlebenskit" msgid "Switch bots <-> buildings" msgstr "Anzeige Roboter <-> Bauten" -msgid "System mouse\\Use system mouse cursor" -msgstr "" - msgid "Take off to finish the mission" msgstr "Abheben nach vollbrachter Mission" diff --git a/po/fr.po b/po/fr.po index df972dca..a67ba2cc 100644 --- a/po/fr.po +++ b/po/fr.po @@ -1436,9 +1436,6 @@ msgstr "Sac de survie" msgid "Switch bots <-> buildings" msgstr "Permute robots <-> bâtiments" -msgid "System mouse\\Use system mouse cursor" -msgstr "Souris système\\Utiliser le curseur de la souris système" - msgid "Take off to finish the mission" msgstr "Décolle pour terminer la mission" @@ -1898,6 +1895,9 @@ msgstr "www.epsitec.com" #~ msgid "Sunbeams\\Sunbeams in the sky" #~ msgstr "Rayons du soleil\\Rayons selon l'orientation" +#~ msgid "System mouse\\Use system mouse cursor" +#~ msgstr "Souris système\\Utiliser le curseur de la souris système" + #~ msgid "Textures\\Quality of textures " #~ msgstr "Qualité des textures\\Qualité des images" diff --git a/po/pl.po b/po/pl.po index f4cbf2cb..8bf211a7 100644 --- a/po/pl.po +++ b/po/pl.po @@ -1444,9 +1444,6 @@ msgstr "Zestaw przetrwania" msgid "Switch bots <-> buildings" msgstr "Przełącz roboty <-> budynki" -msgid "System mouse\\Use system mouse cursor" -msgstr "Systemowy kursor\\Użyj systemowego kursora myszy" - msgid "Take off to finish the mission" msgstr "Odleć, aby zakończyć misję" @@ -1888,6 +1885,9 @@ msgstr "www.epsitec.com" #~ msgid "Sunbeams\\Sunbeams in the sky" #~ msgstr "Promienie słoneczne\\Promienie słoneczne na niebie" +#~ msgid "System mouse\\Use system mouse cursor" +#~ msgstr "Systemowy kursor\\Użyj systemowego kursora myszy" + #~ msgid "Textures\\Quality of textures " #~ msgstr "Tekstury\\Jakość tekstur " diff --git a/po/ru.po b/po/ru.po index c29a8bff..189963e3 100644 --- a/po/ru.po +++ b/po/ru.po @@ -1443,9 +1443,6 @@ msgstr "Аптечка" msgid "Switch bots <-> buildings" msgstr "Переключение между ботами и зданиями" -msgid "System mouse\\Use system mouse cursor" -msgstr "" - msgid "Take off to finish the mission" msgstr "Взлететь, чтобы закончить миссию" diff --git a/src/common/event.cpp b/src/common/event.cpp index 0ebc23eb..1684ad5e 100644 --- a/src/common/event.cpp +++ b/src/common/event.cpp @@ -211,7 +211,6 @@ void InitializeEventTypeTexts() EVENT_TYPE_TEXT[EVENT_INTERFACE_INVERTX] = "EVENT_INTERFACE_INVERTX"; EVENT_TYPE_TEXT[EVENT_INTERFACE_INVERTY] = "EVENT_INTERFACE_INVERTY"; EVENT_TYPE_TEXT[EVENT_INTERFACE_EFFECT] = "EVENT_INTERFACE_EFFECT"; - EVENT_TYPE_TEXT[EVENT_INTERFACE_MOUSE] = "EVENT_INTERFACE_MOUSE"; EVENT_TYPE_TEXT[EVENT_INTERFACE_FOG] = "EVENT_INTERFACE_FOG"; EVENT_TYPE_TEXT[EVENT_INTERFACE_EDITMODE]= "EVENT_INTERFACE_EDITMODE"; EVENT_TYPE_TEXT[EVENT_INTERFACE_EDITVALUE]= "EVENT_INTERFACE_EDITVALUE"; diff --git a/src/common/event.h b/src/common/event.h index 5b5680a4..88fd2821 100644 --- a/src/common/event.h +++ b/src/common/event.h @@ -240,7 +240,6 @@ enum EventType EVENT_INTERFACE_INVERTX = 468, EVENT_INTERFACE_INVERTY = 469, EVENT_INTERFACE_EFFECT = 470, - EVENT_INTERFACE_MOUSE = 471, EVENT_INTERFACE_FOG = 474, EVENT_INTERFACE_EDITMODE= 476, EVENT_INTERFACE_EDITVALUE= 477, diff --git a/src/common/restext.cpp b/src/common/restext.cpp index 1427a1bf..5811fd7a 100644 --- a/src/common/restext.cpp +++ b/src/common/restext.cpp @@ -193,7 +193,6 @@ void InitializeRestext() stringsEvent[EVENT_INTERFACE_INVERTX] = TR("Mouse inversion X\\Inversion of the scrolling direction on the X axis"); stringsEvent[EVENT_INTERFACE_INVERTY] = TR("Mouse inversion Y\\Inversion of the scrolling direction on the Y axis"); stringsEvent[EVENT_INTERFACE_EFFECT] = TR("Quake at explosions\\The screen shakes at explosions"); - stringsEvent[EVENT_INTERFACE_MOUSE] = TR("System mouse\\Use system mouse cursor"); stringsEvent[EVENT_INTERFACE_EDITMODE] = TR("Automatic indent\\When program editing"); stringsEvent[EVENT_INTERFACE_EDITVALUE] = TR("Big indent\\Indent 2 or 4 spaces per level defined by braces"); stringsEvent[EVENT_INTERFACE_SOLUCE4] = TR("Access to solutions\\Show program \"4: Solution\" in the exercises"); diff --git a/src/common/settings.cpp b/src/common/settings.cpp index 093ed6db..ed2677c9 100644 --- a/src/common/settings.cpp +++ b/src/common/settings.cpp @@ -40,7 +40,6 @@ CSettings::CSettings() m_interfaceRain = true; m_soluce4 = true; m_movies = true; - m_systemMouse = false; m_fontSize = 19.0f; m_windowPos = Math::Point(0.15f, 0.17f); @@ -94,7 +93,6 @@ void CSettings::SaveSettings() GetConfigFile().SetIntProperty("Setup", "MusicVolume", sound->GetMusicVolume()); GetConfigFile().SetBoolProperty("Setup", "EditIndentMode", engine->GetEditIndentMode()); GetConfigFile().SetIntProperty("Setup", "EditIndentValue", engine->GetEditIndentValue()); - GetConfigFile().SetBoolProperty("Setup", "SystemMouse", m_systemMouse); GetConfigFile().SetIntProperty("Setup", "MipmapLevel", engine->GetTextureMipmapLevel()); GetConfigFile().SetIntProperty("Setup", "Anisotropy", engine->GetTextureAnisotropyLevel()); @@ -218,11 +216,6 @@ void CSettings::LoadSettings() if (GetConfigFile().GetIntProperty("Setup", "EditIndentValue", iValue)) engine->SetEditIndentValue(iValue); - if (GetConfigFile().GetBoolProperty("Setup", "SystemMouse", m_systemMouse)) - { - app->SetMouseMode(m_systemMouse ? MOUSE_SYSTEM : MOUSE_ENGINE); - } - if (GetConfigFile().GetIntProperty("Setup", "MipmapLevel", iValue)) engine->SetTextureMipmapLevel(iValue); @@ -323,15 +316,6 @@ bool CSettings::GetMovies() return m_movies; } -void CSettings::SetSystemMouse(bool systemMouse) -{ - m_systemMouse = systemMouse; -} -bool CSettings::GetSystemMouse() -{ - return m_systemMouse; -} - void CSettings::SetFontSize(float size) { diff --git a/src/common/settings.h b/src/common/settings.h index ce256e50..a6006e41 100644 --- a/src/common/settings.h +++ b/src/common/settings.h @@ -52,9 +52,6 @@ public: void SetMovies(bool movies); bool GetMovies(); - void SetSystemMouse(bool systemMouse); - bool GetSystemMouse(); - //! Managing the size of the default fonts //@{ @@ -89,7 +86,6 @@ protected: bool m_interfaceRain; bool m_soluce4; bool m_movies; - bool m_systemMouse; float m_fontSize; Math::Point m_windowPos; diff --git a/src/ui/mainui.cpp b/src/ui/mainui.cpp index 2cc52979..47393a8f 100644 --- a/src/ui/mainui.cpp +++ b/src/ui/mainui.cpp @@ -123,7 +123,7 @@ void CMainUserInterface::ShowLoadingScreen(bool show) m_screenLoading->DestroyInterface(); m_currentScreen = nullptr; } - m_app->SetMouseMode(m_settings->GetSystemMouse() ? MOUSE_SYSTEM : MOUSE_ENGINE); + m_app->SetMouseMode(MOUSE_ENGINE); } } diff --git a/src/ui/screen/screen_setup_game.cpp b/src/ui/screen/screen_setup_game.cpp index f59dc9f1..db5e1547 100644 --- a/src/ui/screen/screen_setup_game.cpp +++ b/src/ui/screen/screen_setup_game.cpp @@ -121,9 +121,6 @@ void CScreenSetupGame::CreateInterface() pc = pw->CreateCheck(pos, ddim, -1, EVENT_INTERFACE_RAIN); pc->SetState(STATE_SHADOW); pos.y -= 0.048f; - pc = pw->CreateCheck(pos, ddim, -1, EVENT_INTERFACE_MOUSE); - pc->SetState(STATE_SHADOW); - pos.y -= 0.048f; pos.y -= 0.048f; pc = pw->CreateCheck(pos, ddim, -1, EVENT_INTERFACE_EDITMODE); pc->SetState(STATE_SHADOW); @@ -162,14 +159,6 @@ bool CScreenSetupGame::EventProcess(const Event &event) UpdateSetupButtons(); break; - case EVENT_INTERFACE_MOUSE: - m_settings->SetSystemMouse(!m_settings->GetSystemMouse()); - m_app->SetMouseMode(m_settings->GetSystemMouse() ? MOUSE_SYSTEM : MOUSE_ENGINE); - - ChangeSetupButtons(); - UpdateSetupButtons(); - break; - case EVENT_INTERFACE_EDITMODE: m_engine->SetEditIndentMode(!m_engine->GetEditIndentMode()); ChangeSetupButtons(); @@ -282,12 +271,6 @@ void CScreenSetupGame::UpdateSetupButtons() pc->SetState(STATE_CHECK, m_settings->GetInterfaceRain()); } - pc = static_cast(pw->SearchControl(EVENT_INTERFACE_MOUSE)); - if ( pc != nullptr ) - { - pc->SetState(STATE_CHECK, m_settings->GetSystemMouse()); - } - pc = static_cast(pw->SearchControl(EVENT_INTERFACE_EDITMODE)); if ( pc != nullptr ) {