Merge branch 'release/1.5.1'

coteditor · May 8, 2014 · 4a5e74d · 4a5e74d
2 parents 8b3db22 + c08b110
commit 4a5e74d
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 171 deletions.
diff --git a/CotEditor/Info.plist b/CotEditor/Info.plist
@@ -84,11 +84,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.5</string>
+	<string>1.5.1</string>
 	<key>CFBundleSignature</key>
 	<string>cEd1</string>
 	<key>CFBundleVersion</key>
-	<string>1.5</string>
+	<string>1.5.1</string>
 	<key>NSAppleScriptEnabled</key>
 	<true/>
 	<key>NSHumanReadableCopyright</key>

diff --git a/CotEditor/Sources/CEKeyBindingManager.m b/CotEditor/Sources/CEKeyBindingManager.m
@@ -38,15 +38,15 @@
 
 @interface CEKeyBindingManager ()
 
-@property (nonatomic, weak) IBOutlet NSWindow *menuEditSheet;  // シートが閉じた時自動的に片付けられるようわざとweakにしている
+@property (nonatomic, strong) IBOutlet NSWindow *menuEditSheet;  // シートが閉じた時自動的に片付けられるようわざとweakにしたいのだが、OS X 10.7 に引っかかるのでstrong
 @property (nonatomic, weak) IBOutlet NSOutlineView *menuOutlineView;
 @property (nonatomic, weak) IBOutlet NSTextField *menuDuplicateTextField;
 @property (nonatomic, weak) IBOutlet NSButton *menuEditKeyButton;
 @property (nonatomic, weak) IBOutlet NSButton *menuDeleteKeyButton;
 @property (nonatomic, weak) IBOutlet NSButton *menuFactoryDefaultsButton;
 @property (nonatomic, weak) IBOutlet NSButton *menuOkButton;
 
-@property (nonatomic, weak) IBOutlet NSWindow *textEditSheet;  // シートが閉じた時自動的に片付けられるようわざとweakにしている
+@property (nonatomic, strong) IBOutlet NSWindow *textEditSheet;  // シートが閉じた時自動的に片付けられるようわざとweakにしたいのだが、OS X 10.7 に引っかかるのでstrong
 @property (nonatomic, weak) IBOutlet NSOutlineView *textOutlineView;
 @property (nonatomic, weak) IBOutlet  NSTextField *textDuplicateTextField;
 @property (nonatomic, weak) IBOutlet NSButton *textEditKeyButton;

diff --git a/CotEditor/Sources/CEToolbarController.m b/CotEditor/Sources/CEToolbarController.m
@@ -40,7 +40,7 @@ @interface CEToolbarController ()
 
 @property (nonatomic) NSToolbar *toolbar;
 
-@property (nonatomic, weak) IBOutlet NSWindow *mainWindow;
+@property (nonatomic, unsafe_unretained) IBOutlet NSWindow *mainWindow;  // NSWindow は 10.7 では weak で持てないため
 @property (nonatomic) IBOutlet NSPopUpButton *lineEndingPopupButton;// Outletだが、片付けられてしまうため strong
 @property (nonatomic) IBOutlet NSPopUpButton *encodingPopupButton;// Outletだが、片付けられてしまうため strong
 @property (nonatomic) IBOutlet NSPopUpButton *syntaxPopupButton;// Outletだが、片付けられてしまうため strong

diff --git a/CotEditor/en.lproj/Version History.rtf b/CotEditor/en.lproj/Version History.rtf
@@ -1,7 +1,7 @@
-{\rtf1\ansi\ansicpg932\cocoartf1265\cocoasubrtf190
+{\rtf1\ansi\ansicpg1252\cocoartf1265\cocoasubrtf190
 \readonlydoc1{\fonttbl\f0\fswiss\fcharset0 Helvetica;\f1\fmodern\fcharset0 Courier;}
 {\colortbl;\red255\green255\blue255;\red103\green103\blue103;}
-\vieww13460\viewh12940\viewkind0
+\paperw12240\paperh15840\vieww13460\viewh12940\viewkind0
 \hyphauto1\hyphfactor90
 \pard\tx565\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802
 
@@ -16,10 +16,21 @@
 \fs24 \cf0 \
 \pard\tx565\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802
 
+\b\fs26 \cf0 1.5.1 [2014-05-09]\
+\pard\tx565\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802
+
+\b0 \cf0 \ul \ulc0 <Fixes>\ulnone \
+- Fix a critical issue that CotEditor 1.5 cannot be launched on OS X 10.7\
+\pard\tx565\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802
+
+\fs24 \cf0 \
+\
+\pard\tx565\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802
+
 \b\fs26 \cf0 1.5 [2014-05-08]\
 \pard\tx565\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802
 
-\b0 \cf0 \ul \ulc0 <New Features>\ulnone \
+\b0 \cf0 \ul <New Features>\ulnone \
 - \'93Glyph Inspector\'94 feature:\
     - Popover information of the selected character, if Cmd + Option + I is pressed or \'93Inspect Glyph\'94 menu item in \'93Edit\'94 menu is selected when exactly a single character is selected.\
 - New color code panel:\
@@ -176,18 +187,21 @@
 \
 \ul <Additions/Changes>\ulnone \
 - Disabled smart dash/quotes feature of Mavericks as default.\
+\pard\tx565\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802
 
-\fs24     - for advanced users: Run \'93
+\fs24 \cf0     - for advanced users: Run \'93
 \f1 defaults write com.aynimac.CotEditor enableSmartQuotes YES
 \f0 \'93
 \f1  
 \f0 in Terminal to enable this feature again.\
     - On the next CotEditor 1.5, this feature will be able to be changed on Preferences.
 \fs26 \
-\ul <Fixes>\ulnone \
+\pard\tx565\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802
+\cf0 \ul <Fixes>\ulnone \
 - Fix an issue on ver. 1.4 that line count was always zero.\
+\pard\tx565\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802
 
-\fs24 \
+\fs24 \cf0 \
 \pard\tx565\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802
 
 \b\fs26 \cf0 1.4 [2014-03-19]\
@@ -243,6 +257,7 @@
 \pard\tx565\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802
 
 \fs26 \cf0 \
+\
 \pard\tx565\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802
 
 \b \cf0 1.3.1 [2012.02.12]\

diff --git a/CotEditor/ja.lproj/Version History.rtf b/CotEditor/ja.lproj/Version History.rtf
@@ -1,8 +1,8 @@
-{\rtf1\ansi\ansicpg932\cocoartf1265\cocoasubrtf190
+{\rtf1\ansi\ansicpg1252\cocoartf1265\cocoasubrtf190
 \readonlydoc1{\fonttbl\f0\fswiss\fcharset0 Helvetica;\f1\fnil\fcharset128 HiraKakuPro-W3;\f2\fmodern\fcharset0 Courier;
 \f3\fnil\fcharset0 LucidaGrande;}
 {\colortbl;\red255\green255\blue255;\red103\green103\blue103;}
-\vieww13460\viewh13880\viewkind0
+\paperw12240\paperh15840\vieww13460\viewh13880\viewkind0
 \pard\tx565\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802
 
 \f0\b\fs30 \cf0 CotEditor\
@@ -15,6 +15,18 @@
 \fs24 \cf0 \
 \pard\tx565\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802
 
+\b \cf0 1.5.1 [2014-05-09]
+\f1\b0 \
+\pard\tx565\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802
+\cf0 \ul \ulc0 \'81\'83\'83\'6f\'83\'4f\'83\'74\'83\'42\'83\'62\'83\'4e\'83\'58\'81\'84\ulnone \
+- OS X 10.7 \'8f\'e3\'82\'c5 CotEditor 1.5 \'82\'aa\'8b\'4e\'93\'ae\'82\'c5\'82\'ab\'82\'c8\'82\'a2\'95\'73\'8b\'ef\'8d\'87\'82\'f0\'8f\'43\'90\'b3
+\f0\fs26 \
+\pard\tx565\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802
+
+\fs24 \cf0 \
+\
+\pard\tx565\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802
+
 \b \cf0 1.5 [2014-05-08]
 \b0 \
 \pard\tx565\tx1133\tx1700\tx2266\tx2832\tx3401\tx3967\tx4535\tx5102\tx5669\tx6235\tx6802