embedded resources in examples; embedded i18n resources support

examples/example1/dub.json

@@ -9,7 +9,7 @@
     "targetType": "executable",
     "targetName": "example1",
 
-    "copyFiles": ["res"],
+    "stringImportPaths": ["views", "views/res", "views/res/i18n", "views/res/mdpi"],
 
     "dependencies": {
         "dlangui:dlanguilib": "*"

examples/example1/example1.visualdproj

@@ -48,7 +48,7 @@
   <otherDMD>0</otherDMD>
   <program>$(DMDInstallDir)windows\bin\dmd.exe</program>
   <imppath>$(SolutionDir)/src $(SolutionDir)/3rdparty $(SolutionDir)/3rdparty/libpng/source $(SolutionDir)/../DerelictGL3/source  $(SolutionDir)/../DerelictUtil/source  $(SolutionDir)/../DerelictFT/source    $(SolutionDir)/../DerelictSDL2/source   $(SolutionDir)/../de_image/source/interfaces $(SolutionDir)/../de_image/source/png $(SolutionDir)/../dlib</imppath>
-  <fileImppath />
+  <fileImppath>views views/res views/res/i18n views/res/mdpi</fileImppath>
   <outdir>$(ConfigurationName)</outdir>
   <objdir>$(OutDir)</objdir>
   <objname />

examples/example1/src/example1.d

@@ -169,21 +169,25 @@ enum : int {
 /// entry point for dlangui based application
 extern (C) int UIAppMain(string[] args) {
     // resource directory search paths
-    string[] resourceDirs = [
-        appendPath(exePath, "../../../res/"),   // for Visual D and DUB builds
-        appendPath(exePath, "../../../res/mdpi/"),   // for Visual D and DUB builds
-        appendPath(exePath, "../../../../res/"),// for Mono-D builds
-        appendPath(exePath, "../../../../res/mdpi/"),// for Mono-D builds
-		appendPath(exePath, "res/"), // when res dir is located at the same directory as executable
-		appendPath(exePath, "../res/"), // when res dir is located at project directory
-		appendPath(exePath, "../../res/"), // when res dir is located at the same directory as executable
-		appendPath(exePath, "res/mdpi/"), // when res dir is located at the same directory as executable
-		appendPath(exePath, "../res/mdpi/"), // when res dir is located at project directory
-		appendPath(exePath, "../../res/mdpi/") // when res dir is located at the same directory as executable
-	];
-
+    // not required if only embedded resources are used
+    //string[] resourceDirs = [
+    //    appendPath(exePath, "../../../res/"),   // for Visual D and DUB builds
+    //    appendPath(exePath, "../../../res/mdpi/"),   // for Visual D and DUB builds
+    //    appendPath(exePath, "../../../../res/"),// for Mono-D builds
+    //    appendPath(exePath, "../../../../res/mdpi/"),// for Mono-D builds
+    //    appendPath(exePath, "res/"), // when res dir is located at the same directory as executable
+    //    appendPath(exePath, "../res/"), // when res dir is located at project directory
+    //    appendPath(exePath, "../../res/"), // when res dir is located at the same directory as executable
+    //    appendPath(exePath, "res/mdpi/"), // when res dir is located at the same directory as executable
+    //    appendPath(exePath, "../res/mdpi/"), // when res dir is located at project directory
+    //    appendPath(exePath, "../../res/mdpi/") // when res dir is located at the same directory as executable
+    //];
     // setup resource directories - will use only existing directories
-	Platform.instance.resourceDirs = resourceDirs;
+	//Platform.instance.resourceDirs = resourceDirs;
+
+    // embed resources listed in views/resources.list into executable
+    embeddedResourceList.addResources(embedResourcesFromList!("resources.list")());
+
     // select translation file - for english language
 	Platform.instance.uiLanguage = "en";
 	// load theme from file "theme_default.xml"

examples/example1/views/resources.list

@@ -0,0 +1,16 @@
+res/i18n/en.ini
+res/i18n/ru.ini
+res/mdpi/cr3_logo.png
+res/mdpi/document-close.png
+res/mdpi/document-open-recent.png
+res/mdpi/document-open.png
+res/mdpi/document-properties.png
+res/mdpi/document-save-as.png
+res/mdpi/document-save.png
+res/mdpi/edit-copy.png
+res/mdpi/edit-cut.png
+res/mdpi/edit-paste.png
+res/mdpi/edit-redo.png
+res/mdpi/edit-undo.png
+res/mdpi/tx_fabric.jpg
+res/theme_custom1.xml

examples/tetris/src/tetris.d

@@ -28,22 +28,9 @@ extern (C) int UIAppMain(string[] args) {
     //auto power2 = delegate(int X) { return X * X; };
     auto power2 = (int X) => X * X;
 
-    // resource directory search paths
-    string[] resourceDirs = [
-        appendPath(exePath, "../../../res/"),   // for Visual D and DUB builds
-	    appendPath(exePath, "../../../res/mdpi/"),   // for Visual D and DUB builds
-	    appendPath(exePath, "../../../../res/"),// for Mono-D builds
-	    appendPath(exePath, "../../../../res/mdpi/"),// for Mono-D builds
-		appendPath(exePath, "res/"), // when res dir is located at the same directory as executable
-		appendPath(exePath, "../res/"), // when res dir is located at project directory
-		appendPath(exePath, "../../res/"), // when res dir is located at the same directory as executable
-		appendPath(exePath, "res/mdpi/"), // when res dir is located at the same directory as executable
-		appendPath(exePath, "../res/mdpi/"), // when res dir is located at project directory
-		appendPath(exePath, "../../res/mdpi/") // when res dir is located at the same directory as executable
-	];
+    // embed resources listed in views/resources.list into executable
+    embeddedResourceList.addResources(embedResourcesFromList!("resources.list")());
 
-    // setup resource directories - will use only existing directories
-	Platform.instance.resourceDirs = resourceDirs;
     // select translation file - for english language
 	Platform.instance.uiLanguage = "en";
 	// load theme from file "theme_default.xml"

examples/tetris/tetris.visualdproj

@@ -48,7 +48,7 @@
   <otherDMD>0</otherDMD>
   <program>$(DMDInstallDir)windows\bin\dmd.exe</program>
   <imppath>$(SolutionDir)/src $(SolutionDir)/3rdparty $(SolutionDir)/3rdparty/libpng/source $(SolutionDir)/../DerelictGL3/source  $(SolutionDir)/../DerelictUtil/source  $(SolutionDir)/../DerelictFT/source    $(SolutionDir)/../DerelictSDL2/source    $(SolutionDir)/../de_image/source/interfaces $(SolutionDir)/../de_image/source/png $(SolutionDir)/../dlib</imppath>
-  <fileImppath />
+  <fileImppath>views views/res views/mdpi views/i18n</fileImppath>
   <outdir>$(ConfigurationName)</outdir>
   <objdir>$(OutDir)</objdir>
   <objname />
@@ -89,7 +89,6 @@
   <resfile />
   <exefile>$(OutDir)\$(ProjectName).exe</exefile>
   <useStdLibPath>1</useStdLibPath>
-  <cRuntime>2</cRuntime>
   <additionalOptions>-profile</additionalOptions>
   <preBuildCommand />
   <postBuildCommand />
@@ -184,7 +183,6 @@
   <resfile />
   <exefile>$(OutDir)\$(ProjectName).exe</exefile>
   <useStdLibPath>1</useStdLibPath>
-  <cRuntime>1</cRuntime>
   <additionalOptions />
   <preBuildCommand />
   <postBuildCommand />
@@ -192,7 +190,7 @@
  </Config>
  <Folder name="tetris">
   <File path="src\gui.d" />
-  <File path="src\tetris.d" />
   <File path="src\model.d" />
+  <File path="src\tetris.d" />
  </Folder>
 </DProject>

examples/tetris/views/resources.list

@@ -0,0 +1,10 @@
+res/arrow-down.png
+res/arrow-left.png
+res/arrow-right.png
+res/dtetris-logo1.png
+res/levelup.png
+res/pause.png
+res/popup_background.9.png
+res/rotate.png
+res/tetris_logo_big.png
+res/tx_fabric.jpg

src/dlangui/core/i18n.d

@@ -63,9 +63,12 @@ module dlangui.core.i18n;
 import dlangui.core.types;
 import dlangui.core.logger;
 import dlangui.core.files;
+import dlangui.graphics.resources;
 private import dlangui.core.linestream;
 private import std.utf;
 private import std.algorithm;
+private import std.string;
+private import std.file;
 
 /** 
    Container for UI string - either raw value or string resource ID 
@@ -290,10 +293,22 @@ synchronized class UIStringTranslator {
             if (ch == '/' || ch == '\\')
                 hasPathDelimiters = true;
         string[] res;
-        if (!hasPathDelimiters && _resourceDirs.length) {
-            foreach (dir; _resourceDirs)
-                res ~= dir ~ filename;
+        if (!hasPathDelimiters) {
+            string fn = EMBEDDED_RESOURCE_PREFIX ~ "std_" ~ filename;
+            string s = cast(string)loadResourceBytes(fn);
+            if (s)
+                res ~= fn;
+            fn = EMBEDDED_RESOURCE_PREFIX ~ filename;
+            s = cast(string)loadResourceBytes(fn);
+            if (s)
+                res ~= fn;
+            foreach (dir; _resourceDirs) {
+                fn = dir ~ filename;
+                if (exists(fn) && isFile(fn))
+                    res ~= fn;
+            }
         } else {
+            // full path
             res ~= filename;
         }
         return res;
@@ -350,13 +365,9 @@ private shared class UIStringList {
         return null;
     }
     /// load strings from stream
-    bool load(std.stream.InputStream stream) {
-        dlangui.core.linestream.LineStream lines = dlangui.core.linestream.LineStream.create(stream, "");
+    bool load(dstring[] lines) {
         int count = 0;
-        for (;;) {
-            dchar[] s = lines.readLine();
-            if (s is null)
-                break;
+        foreach (s; lines) {
             int eqpos = -1;
             int firstNonspace = -1;
             int lastNonspace = -1;
@@ -379,23 +390,33 @@ private shared class UIStringList {
         return count > 0;
     }
 
+    /// convert to utf32 and split by lines (detecting line endings)
+    static dstring[] splitLines(string src) {
+        dstring dsrc = toUTF32(src);
+        dstring[] split1 = split(dsrc, "\r\n");
+        dstring[] split2 = split(dsrc, "\r");
+        dstring[] split3 = split(dsrc, "\n");
+        if (split1.length >= split2.length && split1.length >= split3.length)
+            return split1;
+        if (split2.length > split3.length)
+            return split2;
+        return split3;
+    }
+
     /// load strings from file (utf8, id=value lines)
     bool load(string[] filenames) {
         clear();
         bool res = false;
         foreach(filename; filenames) {
-            import std.stream;
-            import std.file;
             try {
                 debug Log.d("Loading string resources from file ", filename);
-                if (!exists(filename) || !isFile(filename)) {
-                    Log.e("File does not exist: ", filename);
+                string s = cast(string)loadResourceBytes(filename);
+                if (!s) {
+                    Log.e("Cannot load i18n resource from file ", filename);
                     continue;
                 }
-	            std.stream.File f = new std.stream.File(filename);
-                scope(exit) { f.close(); }
-                res = load(f) || res;
-            } catch (StreamFileException e) {
+                res = load(splitLines(s)) || res;
+            } catch (Exception e) {
                 Log.e("Cannot read string resources from file ", filename);
             }
         }

views/standard_resources.list

@@ -15,8 +15,8 @@ res/exit.png
 res/fileclose.png
 res/fileopen.png
 res/frame_blue.9.png
-res/i18n/en.ini
-res/i18n/ru.ini
+res/i18n/std_en.ini
+res/i18n/std_ru.ini
 res/list_item_background.xml
 res/list_item_background_solid.xml
 res/main_menu_item_background.xml