Ability to use custom icon styles + dark icon set.

cola/gitcfg.py

@@ -413,3 +413,7 @@ def color(self, key, default):
         except Exception:
             r, g, b = struct.unpack(struct_layout, unhexlify(default))
         return (r, g, b)
+
+    def icon_style(self):
+        theme = self.get('cola.iconstyle', None)
+        return theme

cola/icons.py

@@ -6,6 +6,7 @@
 
 from qtpy import QtGui
 
+from . import gitcfg
 from . import qtcompat
 from . import resources
 from .compat import ustr
@@ -31,9 +32,14 @@
     '.cxx':     'file-code.svg',
 }
 
+cfg = gitcfg.current()
+style = cfg.icon_style()
 
 def install():
-    icon_dir = resources.icon_dir()
+    if not style or style == "light":
+        icon_dir = resources.icon_dir()
+    else:
+        icon_dir = resources.icon_dir(style)
     qtcompat.add_search_path('icons', icon_dir)
 
 

cola/resources.py

@@ -57,9 +57,16 @@ def share(*args):
     return prefix('share', 'git-cola', *args)
 
 
-def icon_dir():
+def icon_dir(style=None):
     """Return the path to the style dir within the cola install tree."""
-    return share('icons')
+    if style:
+        style_dir = share('icons', style)
+        if os.path.isdir(style_dir):
+            return style_dir
+        else:
+            return share('icons')
+    else:
+        return share('icons')
 
 
 def config_home(*args):

share/doc/git-cola/git-cola.rst

@@ -416,6 +416,13 @@ cola.fontdiff
 -------------
 Specifies the font to use for `git cola`'s diff display.
 
+cola.iconstyle
+--------------
+Specifies the icon style to use throughout `git-cola`. The style specified
+must be the name of the subdirectory containing the icons, which in turn must be
+placed in the main "icons" directory. If unset, or set to "light", then the
+default style will be used.
+
 cola.inotify
 ------------
 Set to `false` to disable file system change monitoring.  Defaults to `true`,

share/git-cola/icons/dark/README.md

@@ -0,0 +1,118 @@
+Git Cola Dark Icons
+--------------
+All icons in this directory, besides color inversion, 
+are unmodified original ones. All kudos and copyrights go to their 
+respective authors ( see original readme bellow ).
+
+2017 Filip Danilovic
+
+--------------------
+
+Git Cola Icons
+--------------
+
+The following icons are based on the based on the original .png icon designs
+for git-cola's File Browser by Uri Okrent.
+
+staged.svg
+modified.svg
+partial.svg
+upstream.svg
+
+Copyright (C) 2011 Uri Okrent
+Copyright (C) 2015-2016 David Aguilar and contributors
+
+License: MIT
+
+
+Git Logo
+--------
+Git Logo by Jason Long is licensed under the
+Creative Commons Attribution 3.0 Unported License.
+http://git-scm.com/downloads/logos
+
+git-cola.svg is based on the original Git Logo.
+
+
+Octicons
+--------
+The following files are from Github's
+[octicons](https://github.com/github/octicons) icon set:
+
+check.svg
+circle-slash.svg
+desktop-download.svg
+diff.svg
+ellipsis.svg
+eye.svg
+file-binary.svg
+file-code.svg
+file-directory.svg
+file-media.svg
+file-text.svg
+file-zip.svg
+fold.svg
+gear.svg
+git-branch.svg
+git-compare.svg
+git-merge.svg
+link-external.svg
+pencil.svg
+plus.svg
+primitive-dot.svg
+question.svg
+question-plain.svg
+repo-pull.svg
+repo-push.svg
+repo.svg
+screen-full.svg
+search.svg
+star.svg
+sync.svg
+tag.svg
+telescope.svg
+trashcan.svg
+unfold.svg
+x.svg
+
+Copyright (C) 2012-2015 GitHub
+License: [MIT](http://choosealicense.com/licenses/mit/)
+
+
+Gnome High Contrast Icons
+-------------------------
+The following files are from the Gnome High Contrast Icon set:
+
+zoom-fit-best.svg
+zoom-in.svg
+zoom-out.svg
+
+License: LGPL v2+
+
+
+Flaticon.com Icons
+------------------
+
+The following files are designed by Freepik from http://www.flaticons.com/
+
+edit-undo.svg
+
+License: [Flatpik Basic License](http://cdn.flaticon.com/license/license.pdf)
+
+
+The following files are by Linh Pham from http://flaticons.com/
+
+edit-copy.svg
+
+License: [Creative Commons BY 3.0](http://creativecommons.org/licenses/by/3.0/)
+
+
+Google Icons
+------------
+
+The following files are by Google:
+
+edit-select-all.svg
+file-download.svg
+
+License: [Creative Commons BY 3.0](http://creativecommons.org/licenses/by/3.0/)