Merge pull request #1606 from falbrechtskirchinger/pin-windows

Allow excluding windows from being closed via Escape key

Author: Flamefire

data/RTTR/assets/base/io_new/015_pinicup.bmp

@@ -21,6 +21,7 @@
 #include "ogl/glArchivItem_Bitmap_RLE.h"
 #include "ogl/glArchivItem_Bitmap_Raw.h"
 #include "ogl/glArchivItem_Bob.h"
+#include "ogl/glArchivItem_Sound_Wave.h"
 #include "ogl/glFont.h"
 #include "ogl/glSmartBitmap.h"
 #include "ogl/glTexturePacker.h"
@@ -385,6 +386,17 @@ void Loader::LoadDummyMapFiles()
     }
 }
 
+void Loader::LoadDummySoundFiles()
+{
+    libsiedler2::Archiv& archive = files_["sound"].archive;
+    archive.alloc(116);
+    for(unsigned id = 51; id < archive.size(); id++)
+    {
+        auto snd = std::make_unique<glArchivItem_Sound_Wave>();
+        archive.set(id, std::move(snd));
+    }
+}
+
 namespace {
 struct NationResourcesSource
 {

data/RTTR/assets/base/io_new/016_pinicsel.bmp

@@ -86,6 +86,7 @@ class Loader
     /// Creates archives with empty files for the GUI (for testing purposes)
     void LoadDummyGUIFiles();
     void LoadDummyMapFiles();
+    void LoadDummySoundFiles();
     /// Load a file and save it into the loader repo
     bool Load(const boost::filesystem::path& path, const libsiedler2::ArchivItem_Palette* palette = nullptr);
     bool Load(const ResourceId& resId, const libsiedler2::ArchivItem_Palette* palette = nullptr);

data/RTTR/assets/base/io_new/017_pinicdn.bmp

@@ -139,6 +139,7 @@ void Settings::LoadDefaults()
     // {
     interface.autosave_interval = 0;
     interface.revert_mouse = false;
+    interface.enableWindowPinning = false;
     // }
 
     // addons
@@ -296,6 +297,7 @@ void Settings::Load()
         // {
         interface.autosave_interval = iniInterface->getIntValue("autosave_interval");
         interface.revert_mouse = iniInterface->getBoolValue("revert_mouse");
+        interface.enableWindowPinning = iniInterface->getValue("enable_window_pinning", false);
         // }
 
         // addons
@@ -353,6 +355,7 @@ void Settings::LoadIngame()
             settings.restorePos = DrawPoint(iniWindow->getValue("restore_pos_x", lastPos.x),
                                             iniWindow->getValue("restore_pos_y", lastPos.y));
             settings.isOpen = iniWindow->getIntValue("is_open");
+            settings.isPinned = iniWindow->getValue("is_pinned", false);
             settings.isMinimized = iniWindow->getValue("is_minimized", false);
         }
     } catch(std::runtime_error& e)
@@ -456,6 +459,7 @@ void Settings::Save()
     // {
     iniInterface->setValue("autosave_interval", interface.autosave_interval);
     iniInterface->setValue("revert_mouse", interface.revert_mouse);
+    iniInterface->setValue("enable_window_pinning", interface.enableWindowPinning);
     // }
 
     // addons
@@ -513,6 +517,7 @@ void Settings::SaveIngame()
             iniWindow->setValue("restore_pos_y", settings.restorePos.y);
         }
         iniWindow->setValue("is_open", settings.isOpen);
+        iniWindow->setValue("is_pinned", settings.isPinned);
         iniWindow->setValue("is_minimized", settings.isMinimized);
     }
 

data/RTTR/assets/base/io_new/018_unpinicup.bmp

@@ -27,6 +27,7 @@ struct PersistentWindowSettings
     DrawPoint lastPos = DrawPoint::Invalid();
     DrawPoint restorePos = DrawPoint::Invalid();
     bool isOpen = false;
+    bool isPinned = false;
     bool isMinimized = false;
 };
 
@@ -104,6 +105,7 @@ class Settings : public Singleton<Settings, SingletonPolicies::WithLongevity>
     {
         unsigned autosave_interval;
         bool revert_mouse;
+        bool enableWindowPinning;
     } interface;
 
     struct