immibis
/
colobot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Removed old, unused mouse shadow option

master
krzys-h 2015-04-17 21:54:03 +02:00
parent c32e552368
commit e21853d632
9 changed files with 12 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
po/colobot.pot
View File

@ -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 ""

6
po/de.po
View File

@ -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"

6
po/fr.po
View File

@ -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"

6
po/pl.po
View File

@ -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"

6
po/ru.po
View File

@ -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"

1
src/common/event.cpp
View File

@ -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";

1
src/common/event.h
View File

@ -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,

1
src/common/restext.cpp
View File

@ -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");

26
src/ui/maindialog.cpp
View File

@ -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;