[colobot] 323/390: Removed old, unused mouse shadow option

Didier Raboud odyx at moszumanska.debian.org
Fri Jun 12 14:22:00 UTC 2015


This is an automated email from the git hooks/post-receive script.

odyx pushed a commit to branch upstream/latest
in repository colobot.

commit e21853d632db315a063eab39eceff5d35457fd44
Author: krzys-h <krzys_h at interia.pl>
Date:   Fri Apr 17 21:54:03 2015 +0200

    Removed old, unused mouse shadow option
---
 po/colobot.pot         |  3 ---
 po/de.po               |  6 +++---
 po/fr.po               |  6 +++---
 po/pl.po               |  6 +++---
 po/ru.po               |  6 +++---
 src/common/event.cpp   |  1 -
 src/common/event.h     |  1 -
 src/common/restext.cpp |  1 -
 src/ui/maindialog.cpp  | 26 --------------------------
 9 files changed, 12 insertions(+), 44 deletions(-)

diff --git a/po/colobot.pot b/po/colobot.pot
index 6036509..a1893f3 100644
--- a/po/colobot.pot
+++ b/po/colobot.pot
@@ -393,9 +393,6 @@ msgstr ""
 msgid "Quake at explosions\\The screen shakes at explosions"
 msgstr ""
 
-msgid "Mouse shadow\\Gives the mouse a shadow"
-msgstr ""
-
 msgid "Automatic indent\\When program editing"
 msgstr ""
 
diff --git a/po/de.po b/po/de.po
index 7f9cd72..440f94a 100644
--- a/po/de.po
+++ b/po/de.po
@@ -858,9 +858,6 @@ msgstr "Umkehr X\\Umkehr der Kameradrehung X-Achse"
 msgid "Mouse inversion Y\\Inversion of the scrolling direction on the Y axis"
 msgstr "Umkehr Y\\Umkehr der Kameradrehung Y-Achse"
 
-msgid "Mouse shadow\\Gives the mouse a shadow"
-msgstr "Schatten unter der Maus\\Ein Schatten erscheint unter der Maus"
-
 #, fuzzy
 msgid "Move selected program down"
 msgstr "Gewähltes Programm bearbeiten"
@@ -1825,6 +1822,9 @@ msgstr "www.epsitec.com"
 #~ msgid "Key word help\\More detailed help about key words"
 #~ msgstr "Hilfe über Begriff\\Hilfe über einen Begriff"
 
+#~ msgid "Mouse shadow\\Gives the mouse a shadow"
+#~ msgstr "Schatten unter der Maus\\Ein Schatten erscheint unter der Maus"
+
 #~ msgid "Quit\\Quit COLOBOT"
 #~ msgstr "Schließen\\COLOBOT schließen"
 
diff --git a/po/fr.po b/po/fr.po
index c2bf87f..59f72a9 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -854,9 +854,6 @@ msgid "Mouse inversion Y\\Inversion of the scrolling direction on the Y axis"
 msgstr ""
 "Inversion souris Y\\Inversion de la rotation lorsque la souris touche un bord"
 
-msgid "Mouse shadow\\Gives the mouse a shadow"
-msgstr "Souris ombrée\\Jolie souris avec une ombre"
-
 #, fuzzy
 msgid "Move selected program down"
 msgstr "Édite le programme sélectionné"
@@ -1821,6 +1818,9 @@ msgstr "www.epsitec.com"
 #~ msgid "Key word help\\More detailed help about key words"
 #~ msgstr "Instructions mot-clé\\Explication sur le mot-clé"
 
+#~ msgid "Mouse shadow\\Gives the mouse a shadow"
+#~ msgstr "Souris ombrée\\Jolie souris avec une ombre"
+
 #~ msgid "Quit\\Quit COLOBOT"
 #~ msgstr "Quitter\\Quitter COLOBOT"
 
diff --git a/po/pl.po b/po/pl.po
index 7676f72..1b8cb52 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -860,9 +860,6 @@ msgstr "Odwrócenie myszy X\\Odwrócenie kierunków przewijania w poziomie"
 msgid "Mouse inversion Y\\Inversion of the scrolling direction on the Y axis"
 msgstr "Odwrócenie myszy Y\\Odwrócenie kierunków przewijania w pionie"
 
-msgid "Mouse shadow\\Gives the mouse a shadow"
-msgstr "Cień kursora myszy\\Dodaje cień kursorowi myszy"
-
 msgid "Move selected program down"
 msgstr "Przenieś zaznaczony program w dół"
 
@@ -1821,5 +1818,8 @@ msgstr "www.epsitec.com"
 #~ msgstr ""
 #~ "Pomoc dot. słów kluczowych\\Dokładniejsza pomoc na temat słów kluczowych"
 
+#~ msgid "Mouse shadow\\Gives the mouse a shadow"
+#~ msgstr "Cień kursora myszy\\Dodaje cień kursorowi myszy"
+
 #~ msgid "Speed 3.0x\\Three times faster"
 #~ msgstr "Prędkość 3,0x\\Trzy razy szybciej"
diff --git a/po/ru.po b/po/ru.po
index b039602..6748f4a 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -851,9 +851,6 @@ msgstr "Инверсия мыши по оси X\\Инверсия прокрут
 msgid "Mouse inversion Y\\Inversion of the scrolling direction on the Y axis"
 msgstr "Инверсия мыши по оси Y\\Инверсия прокрутки по оси Y"
 
-msgid "Mouse shadow\\Gives the mouse a shadow"
-msgstr "Тень мыши\\Мышь отбрасывает тень"
-
 #, fuzzy
 msgid "Move selected program down"
 msgstr "Изменить выбранную программу"
@@ -1821,6 +1818,9 @@ msgstr "www.epsitec.com"
 #~ msgid "Key word help\\More detailed help about key words"
 #~ msgstr "Помощь по командам\\Более подробная справку по командам"
 
+#~ msgid "Mouse shadow\\Gives the mouse a shadow"
+#~ msgstr "Тень мыши\\Мышь отбрасывает тень"
+
 #~ msgid "Quit\\Quit COLOBOT"
 #~ msgstr "Выход\\Выход из COLOBOT"
 
diff --git a/src/common/event.cpp b/src/common/event.cpp
index d0ecfb4..f87eefe 100644
--- a/src/common/event.cpp
+++ b/src/common/event.cpp
@@ -209,7 +209,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_GROUND]  = "EVENT_INTERFACE_GROUND";
     EVENT_TYPE_TEXT[EVENT_INTERFACE_GADGET]  = "EVENT_INTERFACE_GADGET";
     EVENT_TYPE_TEXT[EVENT_INTERFACE_FOG]     = "EVENT_INTERFACE_FOG";
diff --git a/src/common/event.h b/src/common/event.h
index 7566ec9..1d14e0b 100644
--- a/src/common/event.h
+++ b/src/common/event.h
@@ -232,7 +232,6 @@ enum EventType
     EVENT_INTERFACE_INVERTX = 468,
     EVENT_INTERFACE_INVERTY = 469,
     EVENT_INTERFACE_EFFECT  = 470,
-    EVENT_INTERFACE_MOUSE   = 471,
     EVENT_INTERFACE_GROUND  = 472,
     EVENT_INTERFACE_GADGET  = 473,
     EVENT_INTERFACE_FOG     = 474,
diff --git a/src/common/restext.cpp b/src/common/restext.cpp
index f117fd3..ebdc359 100644
--- a/src/common/restext.cpp
+++ b/src/common/restext.cpp
@@ -205,7 +205,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("Mouse shadow\\Gives the mouse a shadow");
     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/ui/maindialog.cpp b/src/ui/maindialog.cpp
index 0bd754f..e70419f 100644
--- a/src/ui/maindialog.cpp
+++ b/src/ui/maindialog.cpp
@@ -1303,8 +1303,6 @@ void CMainDialog::ChangePhase(Phase phase)
         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;
         if ( !m_bSimulSetup )
@@ -2530,16 +2528,6 @@ bool CMainDialog::EventProcess(const Event &event)
                 UpdateSetupButtons();
                 break;
 
-            case EVENT_INTERFACE_MOUSE:
-                if (m_app->GetMouseMode() == MOUSE_ENGINE)
-                    m_app->SetMouseMode(MOUSE_SYSTEM);
-                else if (m_app->GetMouseMode() == MOUSE_SYSTEM)
-                    m_app->SetMouseMode(MOUSE_ENGINE);
-
-                ChangeSetupButtons();
-                UpdateSetupButtons();
-                break;
-
             case EVENT_INTERFACE_EDITMODE:
                 m_engine->SetEditIndentMode(!m_engine->GetEditIndentMode());
                 ChangeSetupButtons();
@@ -4695,14 +4683,6 @@ void CMainDialog::UpdateSetupButtons()
         pc->SetState(STATE_CHECK, m_bRain);
     }
 
-    pc = static_cast<CCheck*>(pw->SearchControl(EVENT_INTERFACE_MOUSE));
-    if ( pc != 0 )
-    {
-        /* TODO: nice mouse?
-        pc->SetState(STATE_CHECK, m_engine->GetNiceMouse());
-        pc->SetState(STATE_ENABLE, m_engine->GetNiceMouseCap());*/
-    }
-
     pc = static_cast<CCheck*>(pw->SearchControl(EVENT_INTERFACE_EDITMODE));
     if ( pc != 0 )
     {
@@ -5083,12 +5063,6 @@ void CMainDialog::SetupRecall()
         m_bRain = iValue;
     }
 
-    // TODO
-    // if ( GetProfile().GetLocalProfileInt("Setup", "NiceMouse", iValue) )
-    // {
-    //     m_engine->SetNiceMouse(iValue);
-    // }
-
     if ( GetProfile().GetIntProperty("Setup", "Soluce4", iValue) )
     {
         m_bSoluce4 = iValue;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/colobot.git



More information about the Pkg-games-commits mailing list