Browse files

Release 2.1.0

  • Loading branch information...
1 parent 7cfd91b commit b0e9ec7461926dad3d7e4bf693d0576f497f8ff9 @jgallen23 committed May 3, 2013
View
7 History.md
@@ -1,4 +1,11 @@
+2.1.0 / 2013-05-03
+==================
+
+ * [grunt] runTest task
+ * [displays] factor in dock size
+ * Merge branch 'feature/workflow'
+
2.0.0 / 2013-04-17
==================
View
183 alfred-workflow/info.plist
@@ -141,7 +141,16 @@
</dict>
</array>
<key>E916DFF6-3FE6-4FFD-BB58-4712FDA62E6F</key>
- <array/>
+ <array>
+ <dict>
+ <key>destinationuid</key>
+ <string>4A3C9A90-372E-404D-AF8F-53F3F4FA6F61</string>
+ <key>modifiers</key>
+ <integer>0</integer>
+ <key>modifiersubtext</key>
+ <string></string>
+ </dict>
+ </array>
<key>F4897C6D-A35C-467D-93C6-690D11710ED9</key>
<array>
<dict>
@@ -157,7 +166,7 @@
<key>createdby</key>
<string>JGAui</string>
<key>description</key>
- <string>Simple Window Manager v2.0.0</string>
+ <string>Simple Window Manager v2.1.0</string>
<key>disabled</key>
<false/>
<key>name</key>
@@ -167,27 +176,21 @@
<dict>
<key>config</key>
<dict>
- <key>action</key>
- <integer>0</integer>
- <key>argument</key>
- <integer>3</integer>
- <key>argumenttext</key>
- <string>bottomleft</string>
- <key>hotkey</key>
- <integer>20</integer>
- <key>hotmod</key>
- <integer>1966080</integer>
- <key>hotstring</key>
- <string>#</string>
- <key>leftcursor</key>
- <false/>
- <key>modsmode</key>
+ <key>argumenttype</key>
<integer>0</integer>
+ <key>keyword</key>
+ <string>layouts</string>
+ <key>subtext</key>
+ <string>Resize Current Window</string>
+ <key>text</key>
+ <string>Layouts</string>
+ <key>withspace</key>
+ <true/>
</dict>
<key>type</key>
- <string>alfred.workflow.trigger.hotkey</string>
+ <string>alfred.workflow.input.keyword</string>
<key>uid</key>
- <string>4BBD7242-BD9D-4D8E-98F9-CB61E3FC3F39</string>
+ <string>E916DFF6-3FE6-4FFD-BB58-4712FDA62E6F</string>
</dict>
<dict>
<key>config</key>
@@ -222,13 +225,13 @@
<key>argument</key>
<integer>3</integer>
<key>argumenttext</key>
- <string>.4 0 1 1</string>
+ <string>right</string>
<key>hotkey</key>
- <integer>39</integer>
+ <integer>124</integer>
<key>hotmod</key>
- <integer>1966080</integer>
+ <integer>12451840</integer>
<key>hotstring</key>
- <string>"</string>
+ <string></string>
<key>leftcursor</key>
<false/>
<key>modsmode</key>
@@ -237,7 +240,7 @@
<key>type</key>
<string>alfred.workflow.trigger.hotkey</string>
<key>uid</key>
- <string>9A1C878F-2C40-4803-BF6D-3A4B00BB17DB</string>
+ <string>2D9B5608-8924-44BB-ACE3-06F124842A7D</string>
</dict>
<dict>
<key>config</key>
@@ -247,13 +250,13 @@
<key>argument</key>
<integer>3</integer>
<key>argumenttext</key>
- <string>centersmall</string>
+ <string>top</string>
<key>hotkey</key>
- <integer>7</integer>
+ <integer>126</integer>
<key>hotmod</key>
- <integer>1966080</integer>
+ <integer>12451840</integer>
<key>hotstring</key>
- <string>X</string>
+ <string></string>
<key>leftcursor</key>
<false/>
<key>modsmode</key>
@@ -262,22 +265,7 @@
<key>type</key>
<string>alfred.workflow.trigger.hotkey</string>
<key>uid</key>
- <string>B35E46CC-D76A-4961-B412-23E2297299F1</string>
- </dict>
- <dict>
- <key>config</key>
- <dict>
- <key>escaping</key>
- <integer>62</integer>
- <key>script</key>
- <string>osascript layouts.scpt "{query}"</string>
- <key>type</key>
- <integer>0</integer>
- </dict>
- <key>type</key>
- <string>alfred.workflow.action.script</string>
- <key>uid</key>
- <string>4A3C9A90-372E-404D-AF8F-53F3F4FA6F61</string>
+ <string>5B360532-D9CC-4FE9-93FB-75AF82787F4E</string>
</dict>
<dict>
<key>config</key>
@@ -287,13 +275,13 @@
<key>argument</key>
<integer>3</integer>
<key>argumenttext</key>
- <string>topleft</string>
+ <string>bottom</string>
<key>hotkey</key>
- <integer>18</integer>
+ <integer>125</integer>
<key>hotmod</key>
- <integer>1966080</integer>
+ <integer>12451840</integer>
<key>hotstring</key>
- <string>!</string>
+ <string></string>
<key>leftcursor</key>
<false/>
<key>modsmode</key>
@@ -302,7 +290,7 @@
<key>type</key>
<string>alfred.workflow.trigger.hotkey</string>
<key>uid</key>
- <string>7BEAB15D-9856-4ABD-AC0A-ACAC34A14F8D</string>
+ <string>6FB3D7CB-E570-4171-8B47-B187079B14FD</string>
</dict>
<dict>
<key>config</key>
@@ -312,13 +300,13 @@
<key>argument</key>
<integer>3</integer>
<key>argumenttext</key>
- <string>0 0 .4 1</string>
+ <string>zoom</string>
<key>hotkey</key>
- <integer>41</integer>
+ <integer>6</integer>
<key>hotmod</key>
<integer>1966080</integer>
<key>hotstring</key>
- <string>:</string>
+ <string>Z</string>
<key>leftcursor</key>
<false/>
<key>modsmode</key>
@@ -327,26 +315,22 @@
<key>type</key>
<string>alfred.workflow.trigger.hotkey</string>
<key>uid</key>
- <string>D492AA39-6473-48DF-8C81-88FBEEC71368</string>
+ <string>3761243B-89C7-4838-8FBA-F867461E846B</string>
</dict>
<dict>
<key>config</key>
<dict>
- <key>argumenttype</key>
+ <key>escaping</key>
+ <integer>62</integer>
+ <key>script</key>
+ <string>osascript layouts.scpt "{query}"</string>
+ <key>type</key>
<integer>0</integer>
- <key>keyword</key>
- <string>layouts</string>
- <key>subtext</key>
- <string>Resize Current Window</string>
- <key>text</key>
- <string>Layouts</string>
- <key>withspace</key>
- <true/>
</dict>
<key>type</key>
- <string>alfred.workflow.input.keyword</string>
+ <string>alfred.workflow.action.script</string>
<key>uid</key>
- <string>E916DFF6-3FE6-4FFD-BB58-4712FDA62E6F</string>
+ <string>4A3C9A90-372E-404D-AF8F-53F3F4FA6F61</string>
</dict>
<dict>
<key>config</key>
@@ -381,13 +365,13 @@
<key>argument</key>
<integer>3</integer>
<key>argumenttext</key>
- <string>zoom</string>
+ <string>centersmall</string>
<key>hotkey</key>
- <integer>6</integer>
+ <integer>7</integer>
<key>hotmod</key>
<integer>1966080</integer>
<key>hotstring</key>
- <string>Z</string>
+ <string>X</string>
<key>leftcursor</key>
<false/>
<key>modsmode</key>
@@ -396,7 +380,7 @@
<key>type</key>
<string>alfred.workflow.trigger.hotkey</string>
<key>uid</key>
- <string>3761243B-89C7-4838-8FBA-F867461E846B</string>
+ <string>B35E46CC-D76A-4961-B412-23E2297299F1</string>
</dict>
<dict>
<key>config</key>
@@ -406,13 +390,13 @@
<key>argument</key>
<integer>3</integer>
<key>argumenttext</key>
- <string>top</string>
+ <string>topleft</string>
<key>hotkey</key>
- <integer>126</integer>
+ <integer>18</integer>
<key>hotmod</key>
- <integer>12451840</integer>
+ <integer>1966080</integer>
<key>hotstring</key>
- <string></string>
+ <string>!</string>
<key>leftcursor</key>
<false/>
<key>modsmode</key>
@@ -421,7 +405,7 @@
<key>type</key>
<string>alfred.workflow.trigger.hotkey</string>
<key>uid</key>
- <string>5B360532-D9CC-4FE9-93FB-75AF82787F4E</string>
+ <string>7BEAB15D-9856-4ABD-AC0A-ACAC34A14F8D</string>
</dict>
<dict>
<key>config</key>
@@ -456,13 +440,13 @@
<key>argument</key>
<integer>3</integer>
<key>argumenttext</key>
- <string>right</string>
+ <string>bottomleft</string>
<key>hotkey</key>
- <integer>124</integer>
+ <integer>20</integer>
<key>hotmod</key>
- <integer>12451840</integer>
+ <integer>1966080</integer>
<key>hotstring</key>
- <string></string>
+ <string>#</string>
<key>leftcursor</key>
<false/>
<key>modsmode</key>
@@ -471,7 +455,7 @@
<key>type</key>
<string>alfred.workflow.trigger.hotkey</string>
<key>uid</key>
- <string>2D9B5608-8924-44BB-ACE3-06F124842A7D</string>
+ <string>4BBD7242-BD9D-4D8E-98F9-CB61E3FC3F39</string>
</dict>
<dict>
<key>config</key>
@@ -481,13 +465,13 @@
<key>argument</key>
<integer>3</integer>
<key>argumenttext</key>
- <string>bottom</string>
+ <string>bottomright</string>
<key>hotkey</key>
- <integer>125</integer>
+ <integer>21</integer>
<key>hotmod</key>
- <integer>12451840</integer>
+ <integer>1966080</integer>
<key>hotstring</key>
- <string></string>
+ <string>$</string>
<key>leftcursor</key>
<false/>
<key>modsmode</key>
@@ -496,7 +480,7 @@
<key>type</key>
<string>alfred.workflow.trigger.hotkey</string>
<key>uid</key>
- <string>6FB3D7CB-E570-4171-8B47-B187079B14FD</string>
+ <string>E1455114-F18E-455A-B9E7-4F66E1A51C1F</string>
</dict>
<dict>
<key>config</key>
@@ -506,13 +490,13 @@
<key>argument</key>
<integer>3</integer>
<key>argumenttext</key>
- <string>bottomright</string>
+ <string>0 0 .4 1</string>
<key>hotkey</key>
- <integer>21</integer>
+ <integer>41</integer>
<key>hotmod</key>
<integer>1966080</integer>
<key>hotstring</key>
- <string>$</string>
+ <string>:</string>
<key>leftcursor</key>
<false/>
<key>modsmode</key>
@@ -521,7 +505,32 @@
<key>type</key>
<string>alfred.workflow.trigger.hotkey</string>
<key>uid</key>
- <string>E1455114-F18E-455A-B9E7-4F66E1A51C1F</string>
+ <string>D492AA39-6473-48DF-8C81-88FBEEC71368</string>
+ </dict>
+ <dict>
+ <key>config</key>
+ <dict>
+ <key>action</key>
+ <integer>0</integer>
+ <key>argument</key>
+ <integer>3</integer>
+ <key>argumenttext</key>
+ <string>.4 0 1 1</string>
+ <key>hotkey</key>
+ <integer>39</integer>
+ <key>hotmod</key>
+ <integer>1966080</integer>
+ <key>hotstring</key>
+ <string>"</string>
+ <key>leftcursor</key>
+ <false/>
+ <key>modsmode</key>
+ <integer>0</integer>
+ </dict>
+ <key>type</key>
+ <string>alfred.workflow.trigger.hotkey</string>
+ <key>uid</key>
+ <string>9A1C878F-2C40-4803-BF6D-3A4B00BB17DB</string>
</dict>
</array>
<key>readme</key>
View
BIN alfred-workflow/layouts.scpt
Binary file not shown.
View
BIN dist/Layouts.alfredworkflow
Binary file not shown.
View
27 dist/layouts.applescript
@@ -1,5 +1,5 @@
-- Layouts
--- v2.0.0
+-- v2.1.0
-- http://projects.jga.me/layouts
-- copyright JGA 2013
-- MIT License
@@ -25,8 +25,31 @@ on getDisplayBounds()
tell application "Finder"
set scrRes to bounds of window of desktop
end tell
+ tell application "System Events"
+ tell dock preferences
+ set dockProperties to get properties
+ end tell
+
+ if autohide of dockProperties is false then
+ tell process "Dock"
+ set dockDimensions to size in list 1
+ set dockWidth to item 1 of dockDimensions
+ set dockHeight to item 2 of dockDimensions
+ end tell
+ set screenEdge to screen edge of dockProperties
+ if screenEdge is bottom then
+ set item 4 of scrRes to (item 4 of scrRes) - dockHeight
+ else if screenEdge is left then
+ set item 1 of scrRes to dockWidth
+ set item 4 of scrRes to (item 4 of scrRes) - dockWidth
+ else if screenEdge is right then
+ set item 3 of scrRes to (item 3 of scrRes) - dockWidth
+ end if
+ end if
+ end tell
+
return scrRes
-end getDisplays
+end getDisplayBounds
on makeLayout(_name, _key, x1, y1, x2, y2)
View
BIN dist/layouts.scpt
Binary file not shown.
View
2 package.json
@@ -1,7 +1,7 @@
{
"name": "Layouts",
"private": true,
- "version": "2.0.0",
+ "version": "2.1.0",
"homepage": "http://projects.jga.me/layouts",
"copyright": "JGA",
"license": "MIT",

0 comments on commit b0e9ec7

Please sign in to comment.