Merge branch 'master' of github.com:fikovnik/ShiftIt

README.md

@@ -1,78 +1,49 @@
-<h1><img src="http://github.com/fikovnik/ShiftIt/raw/master/artwork/ShiftIt.png" width="72" height="72" valign="middle"/>ShiftIt </h1>
+<h1><img src="https://github.com/fikovnik/ShiftIt/raw/master/artwork/ShiftIt.png" width="72" height="72" valign="middle"/>ShiftIt </h1>
 
 *Managing window size and position in OSX*
 
 Overview
 --------
 
-ShiftIt is an application for OSX that allows you to quickly manipulate window position and size using keyboard shortcuts. For discussing any sort of stuff about this app, please post to our [google group][9]
+ShiftIt is an application for OSX that allows you to quickly manipulate window position and size using keyboard shortcuts. It intends to become a full featured window organizer for OSX.
+It is a fork from the original [ShiftIt][1] by [Aravindkumar Rajendiran][2] which is not longer under development.
 
-This is a fork from the original [ShiftIt][2] by [Aravindkumar Rajendiran][3] which is not longer under development.
+License: [GNU General Public License v3][3]
 
-License: [GNU General Public License v3][4]
+For discussing any sort of stuff about this app, please post to our [google group][4]
 
+Related Work
+------------
 
-Changes since initial fork:
----------------------------
-
-**v1.3:**
-
-  - Added application & status menu icons - thanks to free icons available at [mysitemyway][5] - credit: fikovnik
-  - Added ability to reconfigure hotkeys in Preferences - credit: Skandocious
-
-**v1.4:**
-
-  - Large code revamp to utilize [ShortcutRecorder][8] framework for capturing key bindings
-
-**v1.5: (devel)**
-
-  - Almost completely rewritten the original code base
-  - Fixed many bugs especially related with positioning on multiple displays
-  - Added X11 support
-  - more in [RoadMap][10]
-
-ShortcutRecorder
-----------------
-
-Version 1.4 of ShiftIt employs the [ShortcutRecorder][8] framework for capturing key bindings during hotkey reconfiguration.
+ShiftIt is far not the only application that is trying to somehow organize windows. If you are looking for some commercial solution than you can check [SizeUp][9] (which seemed to be the inspiration for the original Rajendiran's ShiftIt). Plenty of others can be found at [alternative.to][10].
 
-Copyright (c) 2006, contributors to ShortcutRecorder. (See the contributors listed in detail later in the file, or see <http://wafflesoftware.net/shortcut/contributors/>.)
+<span id="a2itemwidget"></span>
+<script src="http://api.alternativeto.net/software/shiftit/widgetjs/light" type="text/javascript"></script>
 
-All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
+3rd Party Frameworks
+--------------------
 
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-    * The name of the contributors may not be used to endorse or promote 
-      products derived from this software without specific prior written
-      permission.
+From version 1.4 of ShiftIt employs the [ShortcutRecorder][11] framework (New BSD license) for capturing key bindings during hotkey reconfiguration.
 
-THIS SOFTWARE IS PROVIDED BY THE CONTRIBUTORS "AS IS" AND ANY
-EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+From version 1.5 of ShiftIt uses [FMT][12] framework (MIT license) for some utility functions like handling login items, hot keys, ...
 
-Related Work
-------------
-
-There is a feature full commerical application called [SizeUp][6] that seems to be an inspiration for the original ShiftIt. If you are looking for a full-featured, paid application similar to ShiftIt then [SizeUp][7] is way to go.
+Change Log:
+---------------------------
 
-  [2]: http://code.google.com/p/shiftit/
-  [3]: http://ca.linkedin.com/in/aravind88
-  [4]: http://www.gnu.org/licenses/gpl.html
-  [5]: http://icons.mysitemyway.com/free-clipart-icons/1/stick-shift-vehicle-icon--id/128009/style-id/924/simple-black-square-icons/transport-travel/
-  [6]: http://www.irradiatedsoftware.com/sizeup/
-  [7]: http://www.irradiatedsoftware.com/sizeup/
-  [8]: http://code.google.com/p/shortcutrecorder/
-  [9]: http://groups.google.com/group/shiftitapp
-  [10]: http://github.com/fikovnik/ShiftIt/wiki/RoadMap
+  - [1.5][5]
+  - [1.4.1][6]
+  - [1.4][7]
+  - [1.3][8]
+
+  [1]: http://code.google.com/p/shiftit/
+  [2]: http://ca.linkedin.com/in/aravind88
+  [3]: http://www.gnu.org/licenses/gpl.html
+  [4]: http://groups.google.com/group/shiftitapp
+  [5]: http://nkuyu.net/apps/shiftit/release-notes-1.5.html
+  [6]: http://nkuyu.net/apps/shiftit/release-notes-1.4.1.html
+  [7]: http://nkuyu.net/apps/shiftit/release-notes-1.4.html
+  [8]: http://nkuyu.net/apps/shiftit/release-notes-1.3.html
+  [9]: http://www.irradiatedsoftware.com/sizeup/
+  [10]: http://alternativeto.net/software/shiftit/
+  [11]: http://code.google.com/p/shortcutrecorder/
+  [12]: https://github.com/fikovnik/FMT

ShiftIt/ShiftIt.xcodeproj/project.pbxproj

@@ -339,7 +339,14 @@
 			isa = PBXProject;
 			buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "ShiftIt" */;
 			compatibilityVersion = "Xcode 3.1";
+			developmentRegion = English;
 			hasScannedForEncodings = 1;
+			knownRegions = (
+				English,
+				Japanese,
+				French,
+				German,
+			);
 			mainGroup = 29B97314FDCFA39411CA2CEA /* ShiftIt */;
 			projectDirPath = "";
 			projectRoot = "";
@@ -599,7 +606,7 @@
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IBC_PLUGINS = ShortcutRecorder.framework/Versions/A/Resources/ShortcutRecorder.ibplugin;
 				OTHER_CFLAGS = (
-					"-NDEBUG",
+					"-DNDEBUG",
 					"-DX11",
 				);
 				OTHER_LDFLAGS = (