Added pause blur config setting, enabled by default

po/colobot.pot

@@ -359,6 +359,9 @@ msgstr ""
 msgid "Render distance\\Maximum visibility"
 msgstr ""
 
+msgid "Pause blur\\Blur the background on the pause screen"
+msgstr ""
+
 msgid "Particles in the interface\\Steam clouds and sparks in the interface"
 msgstr ""
 
@@ -926,18 +929,6 @@ msgstr ""
 msgid "Camera (\\key camera;)"
 msgstr ""
 
-msgid "Camera to left"
-msgstr ""
-
-msgid "Camera to right"
-msgstr ""
-
-msgid "Camera nearest"
-msgstr ""
-
-msgid "Camera awayest"
-msgstr ""
-
 msgid "Help about selected object"
 msgstr ""
 

po/de.po

@@ -288,9 +288,6 @@ msgstr "Die aufgerufene Funktion existiert nicht"
 msgid "Camera (\\key camera;)"
 msgstr "Kamera (\\key camera;)"
 
-msgid "Camera awayest"
-msgstr "Kamera weiter weg"
-
 msgid "Camera back\\Moves the camera backward"
 msgstr "Kamera weiter\\Bewegung der Kamera rückwärts"
 
@@ -309,19 +306,10 @@ msgstr "Kamera näher\\Bewegung der Kamera vorwärts"
 msgid "Camera left\\Turns the camera left"
 msgstr "Kamera näher\\Bewegung der Kamera vorwärts"
 
-msgid "Camera nearest"
-msgstr "Kamera näher"
-
 #, fuzzy
 msgid "Camera right\\Turns the camera right"
 msgstr "Drehung nach rechts\\Steuer rechts"
 
-msgid "Camera to left"
-msgstr "Kamera links"
-
-msgid "Camera to right"
-msgstr "Kamera rechts"
-
 #, fuzzy
 msgid "Camera up\\Turns the camera up"
 msgstr "Kamera (\\key camera;)"
@@ -1047,6 +1035,9 @@ msgstr "Partikel in den Menüs\\Funken und Sterne in den Menüs"
 msgid "Paste (Ctrl+V)"
 msgstr "Einfügen (Ctrl+V)"
 
+msgid "Pause blur\\Blur the background on the pause screen"
+msgstr ""
+
 msgid "Pause in background\\Pause the game when the window is unfocused"
 msgstr ""
 
@@ -1853,6 +1844,18 @@ msgstr "epsitec.com"
 #~ msgid "COLOBOT"
 #~ msgstr "COLOBOT"
 
+#~ msgid "Camera awayest"
+#~ msgstr "Kamera weiter weg"
+
+#~ msgid "Camera nearest"
+#~ msgstr "Kamera näher"
+
+#~ msgid "Camera to left"
+#~ msgstr "Kamera links"
+
+#~ msgid "Camera to right"
+#~ msgstr "Kamera rechts"
+
 #~ msgid "Can not create this; there are too many objects"
 #~ msgstr "Kein neues Objekt kann erstellt werden (zu viele vorhanden)"
 

po/fr.po

@@ -282,9 +282,6 @@ msgstr "Appel d'une fonction inexistante"
 msgid "Camera (\\key camera;)"
 msgstr "Caméra (\\key camera;)"
 
-msgid "Camera awayest"
-msgstr "Caméra plus loin"
-
 msgid "Camera back\\Moves the camera backward"
 msgstr "Caméra plus loin\\Recule la caméra"
 
@@ -302,19 +299,10 @@ msgstr "Caméra plus proche\\Avance la caméra"
 msgid "Camera left\\Turns the camera left"
 msgstr "Caméra plus proche\\Avance la caméra"
 
-msgid "Camera nearest"
-msgstr "Caméra plus proche"
-
 #, fuzzy
 msgid "Camera right\\Turns the camera right"
 msgstr "Tourner à droite\\Moteur à droite"
 
-msgid "Camera to left"
-msgstr "Caméra à gauche"
-
-msgid "Camera to right"
-msgstr "Caméra à droite"
-
 #, fuzzy
 msgid "Camera up\\Turns the camera up"
 msgstr "Caméra (\\key camera;)"
@@ -1032,6 +1020,9 @@ msgstr "Particules dans l'interface\\Pluie de particules"
 msgid "Paste (Ctrl+V)"
 msgstr "Coller (Ctrl+V)"
 
+msgid "Pause blur\\Blur the background on the pause screen"
+msgstr ""
+
 msgid "Pause in background\\Pause the game when the window is unfocused"
 msgstr ""
 
@@ -1828,9 +1819,21 @@ msgstr "epsitec.com"
 #~ msgid "COLOBOT"
 #~ msgstr "COLOBOT"
 
+#~ msgid "Camera awayest"
+#~ msgstr "Caméra plus loin"
+
 #~ msgid "Camera down\\Decrease camera angle while visiting message origin"
 #~ msgstr "Caméra plus basse\\Réduit l'angle de caméra lors de la vue de l'origine des messages"
 
+#~ msgid "Camera nearest"
+#~ msgstr "Caméra plus proche"
+
+#~ msgid "Camera to left"
+#~ msgstr "Caméra à gauche"
+
+#~ msgid "Camera to right"
+#~ msgstr "Caméra à droite"
+
 #~ msgid "Camera up\\Increase camera angle while visiting message origin"
 #~ msgstr "Caméra plus haute\\Augmente l'angle de caméra lors de la vue de l'origine des messages"
 

po/pl.po

@@ -285,9 +285,6 @@ msgstr "Odwołanie do nieznanej funkcji"
 msgid "Camera (\\key camera;)"
 msgstr "Kamera (\\key camera;)"
 
-msgid "Camera awayest"
-msgstr "Camera awayest"
-
 msgid "Camera back\\Moves the camera backward"
 msgstr "Kamera dalej\\Oddala kamerę"
 
@@ -303,18 +300,9 @@ msgstr "Kamera w dół\\Obraca kamerę w dół"
 msgid "Camera left\\Turns the camera left"
 msgstr "Kamera w lewo\\Obraca kamerę w lewo"
 
-msgid "Camera nearest"
-msgstr "Camera nearest"
-
 msgid "Camera right\\Turns the camera right"
 msgstr "Kamera w prawo\\Obróć kamerę w prawo"
 
-msgid "Camera to left"
-msgstr "Camera to left"
-
-msgid "Camera to right"
-msgstr "Camera to right"
-
 msgid "Camera up\\Turns the camera up"
 msgstr "Kamera w górę\\Obróć kamerę w górę"
 
@@ -1031,6 +1019,9 @@ msgstr "Cząstki w interfejsie\\Para i iskry z silników w interfejsie"
 msgid "Paste (Ctrl+V)"
 msgstr "Wklej (Ctrl+V)"
 
+msgid "Pause blur\\Blur the background on the pause screen"
+msgstr ""
+
 msgid "Pause in background\\Pause the game when the window is unfocused"
 msgstr "Wstrzymaj w tle\\Wstrzymaj grę gdy okno stanie się nieaktywne"
 
@@ -1820,9 +1811,21 @@ msgstr "epsitec.com"
 #~ msgid "Building too close"
 #~ msgstr "Budynek za blisko"
 
+#~ msgid "Camera awayest"
+#~ msgstr "Camera awayest"
+
 #~ msgid "Camera down\\Decrease camera angle while visiting message origin"
 #~ msgstr "Kamera w dół\\Opuść kamerę podczas sprawdzania źródła wiadomości"
 
+#~ msgid "Camera nearest"
+#~ msgstr "Camera nearest"
+
+#~ msgid "Camera to left"
+#~ msgstr "Camera to left"
+
+#~ msgid "Camera to right"
+#~ msgstr "Camera to right"
+
 #~ msgid "Camera up\\Increase camera angle while visiting message origin"
 #~ msgstr "Kamera w górę\\Podnieś kamerę podczas sprawdzania źródła wiadomości"
 

po/ru.po

@@ -286,9 +286,6 @@ msgstr "Вызов неизвестной функции"
 msgid "Camera (\\key camera;)"
 msgstr "Камера (\\key camera;)"
 
-msgid "Camera awayest"
-msgstr "Отдалить камеру"
-
 msgid "Camera back\\Moves the camera backward"
 msgstr "Отдалить камеру\\Перемещение камеры назад"
 
@@ -307,19 +304,10 @@ msgstr "Приблизать камеру\\Перемещение камеры
 msgid "Camera left\\Turns the camera left"
 msgstr "Приблизать камеру\\Перемещение камеры вперед"
 
-msgid "Camera nearest"
-msgstr "Приблизить камеру"
-
 #, fuzzy
 msgid "Camera right\\Turns the camera right"
 msgstr "Повернуть налево\\Поворот налево"
 
-msgid "Camera to left"
-msgstr "Камеру влево"
-
-msgid "Camera to right"
-msgstr "Камеру вправо"
-
 #, fuzzy
 msgid "Camera up\\Turns the camera up"
 msgstr "Камера (\\key camera;)"
@@ -1043,6 +1031,9 @@ msgstr "Частицы в интерфейсе меню\\Пар из труб и
 msgid "Paste (Ctrl+V)"
 msgstr "Вставить (Ctrl+V)"
 
+msgid "Pause blur\\Blur the background on the pause screen"
+msgstr ""
+
 msgid "Pause in background\\Pause the game when the window is unfocused"
 msgstr ""
 
@@ -1844,6 +1835,18 @@ msgstr "epsitec.com"
 #~ msgid "COLOBOT"
 #~ msgstr "КОЛОБОТ"
 
+#~ msgid "Camera awayest"
+#~ msgstr "Отдалить камеру"
+
+#~ msgid "Camera nearest"
+#~ msgstr "Приблизить камеру"
+
+#~ msgid "Camera to left"
+#~ msgstr "Камеру влево"
+
+#~ msgid "Camera to right"
+#~ msgstr "Камеру вправо"
+
 #~ msgid "Can not create this; there are too many objects"
 #~ msgstr "Не удается это создать, слишком много объектов"
 

src/common/event.h

@@ -237,6 +237,7 @@ enum EventType
     EVENT_INTERFACE_LIGHT   = 457,
     EVENT_INTERFACE_PARTI   = 458,
     EVENT_INTERFACE_CLIP    = 459,
+    EVENT_INTERFACE_PAUSE_BLUR = 460,
     EVENT_INTERFACE_RAIN    = 462,
     EVENT_INTERFACE_GLINT   = 463,
     EVENT_INTERFACE_TOOLTIP = 464,

src/common/restext.cpp

@@ -184,6 +184,7 @@ void InitializeRestext()
     stringsEvent[EVENT_INTERFACE_LIGHT]     = TR("Dynamic lighting\\Mobile light sources");
     stringsEvent[EVENT_INTERFACE_PARTI]     = TR("Number of particles\\Explosions, dust, reflections, etc.");
     stringsEvent[EVENT_INTERFACE_CLIP]      = TR("Render distance\\Maximum visibility");
+    stringsEvent[EVENT_INTERFACE_PAUSE_BLUR]= TR("Pause blur\\Blur the background on the pause screen");
     stringsEvent[EVENT_INTERFACE_RAIN]      = TR("Particles in the interface\\Steam clouds and sparks in the interface");
     stringsEvent[EVENT_INTERFACE_GLINT]     = TR("Reflections on the buttons \\Shiny buttons");
     stringsEvent[EVENT_INTERFACE_TOOLTIP]   = TR("Help balloons\\Explain the function of the buttons");

src/common/settings.cpp

@@ -98,6 +98,7 @@ void CSettings::SaveSettings()
     GetConfigFile().SetIntProperty("Setup", "MusicVolume", sound->GetMusicVolume());
     GetConfigFile().SetBoolProperty("Setup", "EditIndentMode", engine->GetEditIndentMode());
     GetConfigFile().SetIntProperty("Setup", "EditIndentValue", engine->GetEditIndentValue());
+    GetConfigFile().SetBoolProperty("Setup", "PauseBlur", engine->GetPauseBlurEnabled());
 
     GetConfigFile().SetIntProperty("Setup", "MipmapLevel", engine->GetTextureMipmapLevel());
     GetConfigFile().SetIntProperty("Setup", "Anisotropy", engine->GetTextureAnisotropyLevel());
@@ -112,7 +113,6 @@ void CSettings::SaveSettings()
 
     // Experimental settings
     GetConfigFile().SetBoolProperty("Experimental", "TerrainShadows", engine->GetTerrainShadows());
-    GetConfigFile().SetBoolProperty("Experimental", "PauseBlur", engine->GetPauseBlur());
 
     CInput::GetInstancePointer()->SaveKeyBindings();
 
@@ -230,6 +230,9 @@ void CSettings::LoadSettings()
     if (GetConfigFile().GetIntProperty("Setup", "EditIndentValue", iValue))
         engine->SetEditIndentValue(iValue);
 
+    if (GetConfigFile().GetBoolProperty("Setup", "PauseBlur", bValue))
+        engine->SetPauseBlurEnabled(bValue);
+
 
     if (GetConfigFile().GetIntProperty("Setup", "MipmapLevel", iValue))
         engine->SetTextureMipmapLevel(iValue);
@@ -271,9 +274,6 @@ void CSettings::LoadSettings()
     if (GetConfigFile().GetBoolProperty("Experimental", "TerrainShadows", bValue))
         engine->SetTerrainShadows(bValue);
 
-    if (GetConfigFile().GetBoolProperty("Experimental", "PauseBlur", bValue))
-        engine->SetPauseBlur(bValue);
-
     CInput::GetInstancePointer()->LoadKeyBindings();
 
 

src/graphics/engine/engine.cpp

@@ -202,7 +202,7 @@ CEngine::CEngine(CApplication *app, CSystemUtils* systemUtils)
     m_editIndentMode = true;
     m_editIndentValue = 4;
     m_tracePrecision = 1.0f;
-    m_pauseBlur = false;
+    m_pauseBlurEnabled = true;
 
 
     m_updateGeometry = false;
@@ -3070,14 +3070,14 @@ EngineMouseType CEngine::GetMouseType()
     return m_mouseType;
 }
 
-void CEngine::SetPauseBlur(bool enable)
+void CEngine::SetPauseBlurEnabled(bool enable)
 {
-    m_pauseBlur = enable;
+    m_pauseBlurEnabled = enable;
 }
 
-bool CEngine::GetPauseBlur()
+bool CEngine::GetPauseBlurEnabled()
 {
-    return m_pauseBlur;
+    return m_pauseBlurEnabled;
 }
 
 const Math::Matrix& CEngine::GetMatView()
@@ -5414,7 +5414,7 @@ void CEngine::SetInterfaceCoordinates()
 
 void CEngine::EnablePauseBlur()
 {
-    if (!m_pauseBlur) return;
+    if (!m_pauseBlurEnabled) return;
 
     m_captureWorld = true;
     m_worldCaptured = false;
@@ -5422,8 +5422,6 @@ void CEngine::EnablePauseBlur()
 
 void CEngine::DisablePauseBlur()
 {
-    if (!m_pauseBlur) return;
-
     m_captureWorld = false;
     m_worldCaptured = false;
 }

src/graphics/engine/engine.h

@@ -1129,8 +1129,8 @@ public:
 
     //@{
     //! Management of pause blur
-    void            SetPauseBlur(bool enable);
+    void            SetPauseBlurEnabled(bool enable);
-    bool            GetPauseBlur();
+    bool            GetPauseBlurEnabled();
     //@}
 
     //! Returns the view matrix
@@ -1386,7 +1386,7 @@ protected:
     float           m_terrainVision;
     bool            m_backForce;
     float           m_tracePrecision;
-    bool            m_pauseBlur;
+    bool            m_pauseBlurEnabled;
 
     bool            m_dirty;
     bool            m_fog;

src/ui/screen/screen_setup_graphics.cpp

@@ -112,6 +112,9 @@ void CScreenSetupGraphics::CreateInterface()
     {
         pc->SetState(STATE_DEAD);
     }
+    pos.y -= 0.048f;
+    pc = pw->CreateCheck(pos, ddim, -1, EVENT_INTERFACE_PAUSE_BLUR);
+    pc->SetState(STATE_SHADOW);
 
     pos.x = ox+sx*8.5f;
     pos.y = 0.65f;
@@ -272,6 +275,11 @@ bool CScreenSetupGraphics::EventProcess(const Event &event)
             UpdateSetupButtons();
             break;
 
+        case EVENT_INTERFACE_PAUSE_BLUR:
+            m_engine->SetPauseBlurEnabled(!m_engine->GetPauseBlurEnabled());
+            UpdateSetupButtons();
+            break;
+
         case EVENT_INTERFACE_SHADOW_SPOTS:
             m_engine->SetShadowMapping(false);
             m_engine->SetShadowMappingQuality(false);
@@ -363,6 +371,12 @@ void CScreenSetupGraphics::UpdateSetupButtons()
         pc->SetState(STATE_CHECK, m_engine->GetLightMode());
     }
 
+    pc = static_cast<CCheck*>(pw->SearchControl(EVENT_INTERFACE_PAUSE_BLUR));
+    if ( pc != nullptr )
+    {
+        pc->SetState(STATE_CHECK, m_engine->GetPauseBlurEnabled());
+    }
+
     pc = static_cast<CCheck*>(pw->SearchControl(EVENT_INTERFACE_SHADOW_SPOTS));
     if ( pc != nullptr )
     {