Add new icons

deanishe · Nov 6, 2014 · baeeefc · baeeefc
1 parent a4ad4fe
commit baeeefc
Show file tree

Hide file tree

Showing 28 changed files with 55 additions and 11 deletions.
diff --git a/alfred-workflow.zip b/alfred-workflow.zip
diff --git a/docs/_static/ICON_ACCOUNT.png b/docs/_static/ICON_ACCOUNT.png
diff --git a/docs/_static/ICON_BURN.png b/docs/_static/ICON_BURN.png
diff --git a/docs/_static/ICON_CLOCK.png b/docs/_static/ICON_CLOCK.png
diff --git a/docs/_static/ICON_COLOR.png b/docs/_static/ICON_COLOR.png
diff --git a/docs/_static/ICON_COLOUR.png b/docs/_static/ICON_COLOUR.png
diff --git a/docs/_static/ICON_EJECT.png b/docs/_static/ICON_EJECT.png
diff --git a/docs/_static/ICON_ERROR.png b/docs/_static/ICON_ERROR.png
diff --git a/docs/_static/ICON_FAVORITE.png b/docs/_static/ICON_FAVORITE.png
diff --git a/docs/_static/ICON_FAVOURITE.png b/docs/_static/ICON_FAVOURITE.png
diff --git a/docs/_static/ICON_GROUP.png b/docs/_static/ICON_GROUP.png
diff --git a/docs/_static/ICON_HELP.png b/docs/_static/ICON_HELP.png
diff --git a/docs/_static/ICON_HOME.png b/docs/_static/ICON_HOME.png
diff --git a/docs/_static/ICON_INFO.png b/docs/_static/ICON_INFO.png
diff --git a/docs/_static/ICON_NETWORK.png b/docs/_static/ICON_NETWORK.png
diff --git a/docs/_static/ICON_NOTE.png b/docs/_static/ICON_NOTE.png
diff --git a/docs/_static/ICON_SETTINGS.png b/docs/_static/ICON_SETTINGS.png
diff --git a/docs/_static/ICON_SWIRL.png b/docs/_static/ICON_SWIRL.png
diff --git a/docs/_static/ICON_SWITCH.png b/docs/_static/ICON_SWITCH.png
diff --git a/docs/_static/ICON_SYNC.png b/docs/_static/ICON_SYNC.png
diff --git a/docs/_static/ICON_TRASH.png b/docs/_static/ICON_TRASH.png
diff --git a/docs/_static/ICON_USER.png b/docs/_static/ICON_USER.png
diff --git a/docs/_static/ICON_WARNING.png b/docs/_static/ICON_WARNING.png
diff --git a/docs/_static/ICON_WEB.png b/docs/_static/ICON_WEB.png
diff --git a/docs/user-manual/icons.rst b/docs/user-manual/icons.rst
@@ -33,10 +33,14 @@ more) can be found in
 +-------------------+----------------------------------------+
 |``ICON_BURN``      |.. image:: ../_static/ICON_BURN.png     |
 +-------------------+----------------------------------------+
+|``ICON_CLOCK``     |.. image:: ../_static/ICON_CLOCK.png    |
++-------------------+----------------------------------------+
 |``ICON_COLOR``     |.. image:: ../_static/ICON_COLOR.png    |
 +-------------------+----------------------------------------+
 |``ICON_COLOUR``    |.. image:: ../_static/ICON_COLOUR.png   |
 +-------------------+----------------------------------------+
+|``ICON_EJECT``     |.. image:: ../_static/ICON_EJECT.png    |
++-------------------+----------------------------------------+
 |``ICON_ERROR``     |.. image:: ../_static/ICON_ERROR.png    |
 +-------------------+----------------------------------------+
 |``ICON_FAVORITE``  |.. image:: ../_static/ICON_FAVORITE.png |
@@ -47,6 +51,8 @@ more) can be found in
 +-------------------+----------------------------------------+
 |``ICON_HELP``      |.. image:: ../_static/ICON_HELP.png     |
 +-------------------+----------------------------------------+
+|``ICON_HOME``      |.. image:: ../_static/ICON_HOME.png     |
++-------------------+----------------------------------------+
 |``ICON_INFO``      |.. image:: ../_static/ICON_INFO.png     |
 +-------------------+----------------------------------------+
 |``ICON_NETWORK``   |.. image:: ../_static/ICON_NETWORK.png  |
@@ -55,6 +61,10 @@ more) can be found in
 +-------------------+----------------------------------------+
 |``ICON_SETTINGS``  |.. image:: ../_static/ICON_SETTINGS.png |
 +-------------------+----------------------------------------+
+|``ICON_SWIRL``     |.. image:: ../_static/ICON_SWIRL.png    |
++-------------------+----------------------------------------+
+|``ICON_SWITCH``    |.. image:: ../_static/ICON_SWITCH.png   |
++-------------------+----------------------------------------+
 |``ICON_SYNC``      |.. image:: ../_static/ICON_SYNC.png     |
 +-------------------+----------------------------------------+
 |``ICON_TRASH``     |.. image:: ../_static/ICON_TRASH.png    |

diff --git a/extras/gen_icon_table.py b/extras/gen_icon_table.py
@@ -20,7 +20,8 @@
 import subprocess
 import workflow
 
-outdir = os.path.join(os.path.dirname(__file__), 'doc', '_static')
+outdir = os.path.join(os.path.dirname(os.path.dirname(__file__)),
+                      'docs', '_static')
 
 
 def make_thumbnail(infile, outfile):
@@ -53,6 +54,7 @@ def make_thumbnail(infile, outfile):
 print('| Name'.ljust(col1 + 1) + '| Preview'.ljust(col2 + 1) + '|')
 print('+' + ('=' * col1) + '+' + ('=' * col2) + '+')
 for name, image in entries:
-    print('|``{}``'.format(name).ljust(col1 + 1) + '|' + image.ljust(col2) + '|')
+    print('|``{}``'.format(name).ljust(col1 + 1) + '|' +
+          image.ljust(col2) + '|')
     print('+' + ('-' * col1) + '+' + ('-' * col2) + '+')
 
diff --git a/workflow/__init__.py b/workflow/__init__.py
@@ -29,14 +29,41 @@
 from .workflow import PasswordNotFound, KeychainError
 
 # Icons
-from .workflow import (ICON_ERROR, ICON_WARNING, ICON_NOTE, ICON_INFO,
-                       ICON_FAVORITE, ICON_FAVOURITE, ICON_USER, ICON_GROUP,
-                       ICON_HELP, ICON_NETWORK, ICON_WEB, ICON_COLOR,
-                       ICON_COLOUR, ICON_SYNC, ICON_SETTINGS, ICON_TRASH,
-                       ICON_BURN, ICON_ACCOUNT)
+from .workflow import (
+    ICON_ACCOUNT,
+    ICON_BURN,
+    ICON_CLOCK,
+    ICON_COLOR,
+    ICON_COLOUR,
+    ICON_EJECT,
+    ICON_ERROR,
+    ICON_FAVORITE,
+    ICON_FAVOURITE,
+    ICON_GROUP,
+    ICON_HELP,
+    ICON_HOME,
+    ICON_INFO,
+    ICON_NETWORK,
+    ICON_NOTE,
+    ICON_SETTINGS,
+    ICON_SWIRL,
+    ICON_SWITCH,
+    ICON_SYNC,
+    ICON_TRASH,
+    ICON_USER,
+    ICON_WARNING,
+    ICON_WEB,
+)
 
 # Filter matching rules
-from .workflow import (MATCH_ALL, MATCH_ALLCHARS, MATCH_ATOM,
-                       MATCH_CAPITALS, MATCH_INITIALS,
-                       MATCH_INITIALS_CONTAIN, MATCH_INITIALS_STARTSWITH,
-                       MATCH_STARTSWITH, MATCH_SUBSTRING)
+from .workflow import (
+    MATCH_ALL,
+    MATCH_ALLCHARS,
+    MATCH_ATOM,
+    MATCH_CAPITALS,
+    MATCH_INITIALS,
+    MATCH_INITIALS_CONTAIN,
+    MATCH_INITIALS_STARTSWITH,
+    MATCH_STARTSWITH,
+    MATCH_SUBSTRING,
+)
diff --git a/workflow/workflow.py b/workflow/workflow.py
@@ -54,18 +54,23 @@
 
 ICON_ACCOUNT = os.path.join(ICON_ROOT, 'Accounts.icns')
 ICON_BURN = os.path.join(ICON_ROOT, 'BurningIcon.icns')
+ICON_CLOCK = os.path.join(ICON_ROOT, 'Clock.icns')
 ICON_COLOR = os.path.join(ICON_ROOT, 'ProfileBackgroundColor.icns')
 ICON_COLOUR = ICON_COLOR  # Queen's English, if you please
+ICON_EJECT = os.path.join(ICON_ROOT, 'EjectMediaIcon.icns')
 # Shown when a workflow throws an error
 ICON_ERROR = os.path.join(ICON_ROOT, 'AlertStopIcon.icns')
 ICON_FAVORITE = os.path.join(ICON_ROOT, 'ToolbarFavoritesIcon.icns')
 ICON_FAVOURITE = ICON_FAVORITE
 ICON_GROUP = os.path.join(ICON_ROOT, 'GroupIcon.icns')
 ICON_HELP = os.path.join(ICON_ROOT, 'HelpIcon.icns')
+ICON_HOME = os.path.join(ICON_ROOT, 'HomeFolderIcon.icns')
 ICON_INFO = os.path.join(ICON_ROOT, 'ToolbarInfo.icns')
 ICON_NETWORK = os.path.join(ICON_ROOT, 'GenericNetworkIcon.icns')
 ICON_NOTE = os.path.join(ICON_ROOT, 'AlertNoteIcon.icns')
 ICON_SETTINGS = os.path.join(ICON_ROOT, 'ToolbarAdvanced.icns')
+ICON_SWIRL = os.path.join(ICON_ROOT, 'ErasingIcon.icns')
+ICON_SWITCH = os.path.join(ICON_ROOT, 'General.icns')
 ICON_SYNC = os.path.join(ICON_ROOT, 'Sync.icns')
 ICON_TRASH = os.path.join(ICON_ROOT, 'TrashIcon.icns')
 ICON_USER = os.path.join(ICON_ROOT, 'UserIcon.icns')