Update examples

FreeSlave · Apr 25, 2016 · b9b6220 · b9b6220
1 parent e8645c1
commit b9b6220
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -145,6 +145,7 @@ By default search only in hicolor theme:
 You can specify additional theme:
 
     dub run :findicon -- --theme=gnome folder
+    dub run :findicon -- --theme=oxygen text-plain
 
 And preferred size:
 

diff --git a/examples/findicon/source/app.d b/examples/findicon/source/app.d
@@ -2,6 +2,7 @@ import std.stdio;
 import std.getopt;
 import std.algorithm;
 import std.array;
+import std.typecons;
 
 import isfreedesktop;
 import icontheme;
@@ -13,19 +14,22 @@ int main(string[] args)
     string[] baseDirs;
     string extensionsStr;
     bool useCache;
+    auto allowFallbackFlag = Yes.allowFallbackIcon;
 
     try {
         getopt(args, "theme", "Icon theme to search icon in. If not set it tries to find fallback.", &theme, 
                "size", "Preferred size of icon. If not set it will look for biggest icon.", &size,
                "baseDir", "Base icon path to search themes. This option can be repeated to specify multiple paths.", &baseDirs,
                "extensions", "Possible icon files extensions to search separated by ':'. By default .png and .xpm will be used.", &extensionsStr,
-               "useCache", "Use icon theme cache when possible", &useCache
+               "useCache", "Use icon theme cache when possible", &useCache,
+               "allowFallback", "Allow non-themed fallback icon if could not find in themes", &allowFallbackFlag
               );
 
         if (args.length < 2) {
             throw new Exception("Icon is not set");
         }
 
+
         string iconName = args[1];
 
         string[] searchIconDirs;
@@ -74,9 +78,9 @@ int main(string[] args)
 
         string iconPath;
         if (size) {
-            iconPath = findClosestIcon(iconName, size, iconThemes, searchIconDirs, extensions);
+            iconPath = findClosestIcon(iconName, size, iconThemes, searchIconDirs, extensions, allowFallbackFlag);
         } else {
-            iconPath = findLargestIcon(iconName, iconThemes, searchIconDirs, extensions);
+            iconPath = findLargestIcon(iconName, iconThemes, searchIconDirs, extensions, allowFallbackFlag);
         }
 
         if (iconPath.length) {

diff --git a/examples/test/source/app.d b/examples/test/source/app.d
@@ -55,7 +55,7 @@ int main(string[] args)
             writeln("Reading icon theme file: ", path);
         }
         try {
-            theme = new IconThemeFile(path, IconThemeFile.ReadOptions.ignoreGroupDuplicates);
+            theme = new IconThemeFile(path, IconThemeFile.ReadOptions.noOptions);
         }
         catch(IniLikeException e) {
             stderr.writefln("Error reading %s: at %s: %s", path, e.lineNumber, e.msg);

diff --git a/source/icontheme/file.d b/source/icontheme/file.d
@@ -293,7 +293,7 @@ final class IconThemeFile : IniLikeFile
     /**
      * Default options for desktop file reading.
      */
-    enum defaultReadOptions = ReadOptions.ignoreUnknownGroups | ReadOptions.skipUnknownGroups | ReadOptions.preserveComments;
+    enum defaultReadOptions = ReadOptions.ignoreUnknownGroups | ReadOptions.skipUnknownGroups | ReadOptions.preserveComments | IconThemeFile.ReadOptions.ignoreGroupDuplicates;
 
 protected:
     @trusted bool isDirectoryName(string groupName)