Revision: 4868
          http://skim-app.svn.sourceforge.net/skim-app/?rev=4868&view=rev
Author:   hofman
Date:     2008-10-26 10:15:54 +0000 (Sun, 26 Oct 2008)

Log Message:
-----------
Change text note font pref keys to be consistent with other pref keys

Modified Paths:
--------------
    trunk/Dutch.lproj/PreferenceWindow.nib/classes.nib
    trunk/Dutch.lproj/PreferenceWindow.nib/info.nib
    trunk/Dutch.lproj/PreferenceWindow.nib/keyedobjects.nib
    trunk/English.lproj/PreferenceWindow.nib/classes.nib
    trunk/English.lproj/PreferenceWindow.nib/info.nib
    trunk/English.lproj/PreferenceWindow.nib/keyedobjects.nib
    trunk/French.lproj/PreferenceWindow.nib/classes.nib
    trunk/French.lproj/PreferenceWindow.nib/keyedobjects.nib
    trunk/InitialUserDefaults.plist
    trunk/PDFAnnotationFreeText_SKExtensions.m
    trunk/SKStringConstants.h
    trunk/SKStringConstants.m
    trunk/ru.lproj/PreferenceWindow.nib/classes.nib
    trunk/ru.lproj/PreferenceWindow.nib/info.nib
    trunk/ru.lproj/PreferenceWindow.nib/keyedobjects.nib

Modified: trunk/Dutch.lproj/PreferenceWindow.nib/classes.nib
===================================================================
--- trunk/Dutch.lproj/PreferenceWindow.nib/classes.nib  2008-10-26 10:05:40 UTC 
(rev 4867)
+++ trunk/Dutch.lproj/PreferenceWindow.nib/classes.nib  2008-10-26 10:15:54 UTC 
(rev 4868)
@@ -13,24 +13,10 @@
                        <string>NSController</string>
                </dict>
                <dict>
-                       <key>CLASS</key>
-                       <string>NSView</string>
-                       <key>LANGUAGE</key>
-                       <string>ObjC</string>
-                       <key>SUPERCLASS</key>
-                       <string>NSResponder</string>
-               </dict>
-               <dict>
-                       <key>CLASS</key>
-                       <string>NSMenuItem</string>
-                       <key>LANGUAGE</key>
-                       <string>ObjC</string>
-                       <key>SUPERCLASS</key>
-                       <string>NSObject</string>
-               </dict>
-               <dict>
                        <key>ACTIONS</key>
                        <dict>
+                               <key>changeAttributes</key>
+                               <string>id</string>
                                <key>changeDiscreteThumbnailSizes</key>
                                <string>id</string>
                                <key>changeFont</key>
@@ -103,19 +89,6 @@
                <dict>
                        <key>ACTIONS</key>
                        <dict>
-                               <key></key>
-                               <string>id</string>
-                       </dict>
-                       <key>CLASS</key>
-                       <string>FirstResponder</string>
-                       <key>LANGUAGE</key>
-                       <string>ObjC</string>
-                       <key>SUPERCLASS</key>
-                       <string>NSObject</string>
-               </dict>
-               <dict>
-                       <key>ACTIONS</key>
-                       <dict>
                                <key>changeDashPattern</key>
                                <string>id</string>
                                <key>changeEndLineStyle</key>
@@ -134,11 +107,11 @@
                </dict>
                <dict>
                        <key>CLASS</key>
-                       <string>NSCell</string>
+                       <string>NSTextFieldCell</string>
                        <key>LANGUAGE</key>
                        <string>ObjC</string>
                        <key>SUPERCLASS</key>
-                       <string>NSObject</string>
+                       <string>NSActionCell</string>
                </dict>
                <dict>
                        <key>CLASS</key>
@@ -149,6 +122,13 @@
                        <string>NSResponder</string>
                </dict>
                <dict>
+                       <key>ACTIONS</key>
+                       <dict>
+                               <key>changeAttributesFromFontManager</key>
+                               <string>id</string>
+                               <key>changeFontFromFontManager</key>
+                               <string>id</string>
+                       </dict>
                        <key>CLASS</key>
                        <string>SKFontWell</string>
                        <key>LANGUAGE</key>
@@ -163,14 +143,51 @@
                </dict>
                <dict>
                        <key>CLASS</key>
+                       <string>NSView</string>
+                       <key>LANGUAGE</key>
+                       <string>ObjC</string>
+                       <key>SUPERCLASS</key>
                        <string>NSResponder</string>
+               </dict>
+               <dict>
+                       <key>CLASS</key>
+                       <string>NSMenuItem</string>
                        <key>LANGUAGE</key>
                        <string>ObjC</string>
                        <key>SUPERCLASS</key>
                        <string>NSObject</string>
                </dict>
                <dict>
+                       <key>ACTIONS</key>
+                       <dict>
+                               <key></key>
+                               <string>id</string>
+                       </dict>
                        <key>CLASS</key>
+                       <string>FirstResponder</string>
+                       <key>LANGUAGE</key>
+                       <string>ObjC</string>
+                       <key>SUPERCLASS</key>
+                       <string>NSObject</string>
+               </dict>
+               <dict>
+                       <key>CLASS</key>
+                       <string>NSCell</string>
+                       <key>LANGUAGE</key>
+                       <string>ObjC</string>
+                       <key>SUPERCLASS</key>
+                       <string>NSObject</string>
+               </dict>
+               <dict>
+                       <key>CLASS</key>
+                       <string>NSResponder</string>
+                       <key>LANGUAGE</key>
+                       <string>ObjC</string>
+                       <key>SUPERCLASS</key>
+                       <string>NSObject</string>
+               </dict>
+               <dict>
+                       <key>CLASS</key>
                        <string>SKLineWell</string>
                        <key>LANGUAGE</key>
                        <string>ObjC</string>

Modified: trunk/Dutch.lproj/PreferenceWindow.nib/info.nib
===================================================================
--- trunk/Dutch.lproj/PreferenceWindow.nib/info.nib     2008-10-26 10:05:40 UTC 
(rev 4867)
+++ trunk/Dutch.lproj/PreferenceWindow.nib/info.nib     2008-10-26 10:15:54 UTC 
(rev 4868)
@@ -3,14 +3,14 @@
 <plist version="1.0">
 <dict>
        <key>IBFramework Version</key>
-       <string>672</string>
+       <string>677</string>
        <key>IBLastKnownRelativeProjectPath</key>
        <string>../Skim.xcodeproj</string>
        <key>IBOldestOS</key>
        <integer>5</integer>
        <key>IBOpenObjects</key>
        <array>
-               <integer>6</integer>
+               <integer>170</integer>
        </array>
        <key>IBSystem Version</key>
        <string>9F33</string>

Modified: trunk/Dutch.lproj/PreferenceWindow.nib/keyedobjects.nib
===================================================================
(Binary files differ)

Modified: trunk/English.lproj/PreferenceWindow.nib/classes.nib
===================================================================
--- trunk/English.lproj/PreferenceWindow.nib/classes.nib        2008-10-26 
10:05:40 UTC (rev 4867)
+++ trunk/English.lproj/PreferenceWindow.nib/classes.nib        2008-10-26 
10:15:54 UTC (rev 4868)
@@ -15,6 +15,8 @@
                <dict>
                        <key>ACTIONS</key>
                        <dict>
+                               <key>changeAttributes</key>
+                               <string>id</string>
                                <key>changeDiscreteThumbnailSizes</key>
                                <string>id</string>
                                <key>changeFont</key>
@@ -105,6 +107,14 @@
                </dict>
                <dict>
                        <key>CLASS</key>
+                       <string>NSTextFieldCell</string>
+                       <key>LANGUAGE</key>
+                       <string>ObjC</string>
+                       <key>SUPERCLASS</key>
+                       <string>NSActionCell</string>
+               </dict>
+               <dict>
+                       <key>CLASS</key>
                        <string>NSWindow</string>
                        <key>LANGUAGE</key>
                        <string>ObjC</string>
@@ -116,6 +126,8 @@
                        <dict>
                                <key>changeAttributesFromFontManager</key>
                                <string>id</string>
+                               <key>changeFontFromFontManager</key>
+                               <string>id</string>
                        </dict>
                        <key>CLASS</key>
                        <string>SKFontWell</string>

Modified: trunk/English.lproj/PreferenceWindow.nib/info.nib
===================================================================
--- trunk/English.lproj/PreferenceWindow.nib/info.nib   2008-10-26 10:05:40 UTC 
(rev 4867)
+++ trunk/English.lproj/PreferenceWindow.nib/info.nib   2008-10-26 10:15:54 UTC 
(rev 4868)
@@ -10,7 +10,7 @@
        <integer>5</integer>
        <key>IBOpenObjects</key>
        <array>
-               <integer>6</integer>
+               <integer>170</integer>
        </array>
        <key>IBSystem Version</key>
        <string>9F33</string>

Modified: trunk/English.lproj/PreferenceWindow.nib/keyedobjects.nib
===================================================================
(Binary files differ)

Modified: trunk/French.lproj/PreferenceWindow.nib/classes.nib
===================================================================
--- trunk/French.lproj/PreferenceWindow.nib/classes.nib 2008-10-26 10:05:40 UTC 
(rev 4867)
+++ trunk/French.lproj/PreferenceWindow.nib/classes.nib 2008-10-26 10:15:54 UTC 
(rev 4868)
@@ -72,19 +72,19 @@
                </dict>
                <dict>
                        <key>CLASS</key>
-                       <string>NSMenu</string>
+                       <string>NSWindowController</string>
                        <key>LANGUAGE</key>
                        <string>ObjC</string>
                        <key>SUPERCLASS</key>
-                       <string>NSObject</string>
+                       <string>NSResponder</string>
                </dict>
                <dict>
                        <key>CLASS</key>
-                       <string>NSWindowController</string>
+                       <string>NSMenu</string>
                        <key>LANGUAGE</key>
                        <string>ObjC</string>
                        <key>SUPERCLASS</key>
-                       <string>NSResponder</string>
+                       <string>NSObject</string>
                </dict>
                <dict>
                        <key>ACTIONS</key>

Modified: trunk/French.lproj/PreferenceWindow.nib/keyedobjects.nib
===================================================================
(Binary files differ)

Modified: trunk/InitialUserDefaults.plist
===================================================================
--- trunk/InitialUserDefaults.plist     2008-10-26 10:05:40 UTC (rev 4867)
+++ trunk/InitialUserDefaults.plist     2008-10-26 10:15:54 UTC (rev 4868)
@@ -85,9 +85,9 @@
         <string>Helvetica</string>
         <key>SKAnchoredNoteFontSize</key>
         <real>12.0</real>
-        <key>SKTextNoteFontName</key>
+        <key>SKFreeTextNoteFontName</key>
         <string>LucidaGrande</string>
-        <key>SKTextNoteFontSize</key>
+        <key>SKFreeTextNoteFontSize</key>
         <real>11.0</real>
         <key>SKFreeTextNoteColor</key>
         <data>
@@ -326,8 +326,8 @@
             <string>SKCircleNoteInteriorColor</string>
             <string>SKSquareNoteInteriorColor</string>
             <string>SKFreeTextNoteFontColor</string>
-            <string>SKTextNoteFontName</string>
-            <string>SKTextNoteFontSize</string>
+            <string>SKFreeTextNoteFontName</string>
+            <string>SKFreeTextNoteFontSize</string>
             <string>SKAnchoredNoteFontName</string>
             <string>SKAnchoredNoteFontSize</string>
             <string>SKFreeTextNoteLineWidth</string>

Modified: trunk/PDFAnnotationFreeText_SKExtensions.m
===================================================================
--- trunk/PDFAnnotationFreeText_SKExtensions.m  2008-10-26 10:05:40 UTC (rev 
4867)
+++ trunk/PDFAnnotationFreeText_SKExtensions.m  2008-10-26 10:15:54 UTC (rev 
4868)
@@ -56,8 +56,8 @@
 
 - (id)initSkimNoteWithBounds:(NSRect)bounds {
     if (self = [super initSkimNoteWithBounds:bounds]) {
-        NSFont *font = [NSFont fontWithName:[[NSUserDefaults 
standardUserDefaults] stringForKey:SKTextNoteFontNameKey]
-                                       size:[[NSUserDefaults 
standardUserDefaults] floatForKey:SKTextNoteFontSizeKey]];
+        NSFont *font = [NSFont fontWithName:[[NSUserDefaults 
standardUserDefaults] stringForKey:SKFreeTextNoteFontNameKey]
+                                       size:[[NSUserDefaults 
standardUserDefaults] floatForKey:SKFreeTextNoteFontSizeKey]];
         if (font)
             [self setFont:font];
         [self setColor:[[NSUserDefaults standardUserDefaults] 
colorForKey:SKFreeTextNoteColorKey]];

Modified: trunk/SKStringConstants.h
===================================================================
--- trunk/SKStringConstants.h   2008-10-26 10:05:40 UTC (rev 4867)
+++ trunk/SKStringConstants.h   2008-10-26 10:15:54 UTC (rev 4868)
@@ -62,8 +62,8 @@
 extern NSString *SKGreekingThresholdKey;
 extern NSString *SKReadingBarColorKey;
 extern NSString *SKReadingBarInvertKey;
-extern NSString *SKTextNoteFontNameKey;
-extern NSString *SKTextNoteFontSizeKey;
+extern NSString *SKFreeTextNoteFontNameKey;
+extern NSString *SKFreeTextNoteFontSizeKey;
 extern NSString *SKAnchoredNoteFontNameKey;
 extern NSString *SKAnchoredNoteFontSizeKey;
 extern NSString *SKFreeTextNoteColorKey;

Modified: trunk/SKStringConstants.m
===================================================================
--- trunk/SKStringConstants.m   2008-10-26 10:05:40 UTC (rev 4867)
+++ trunk/SKStringConstants.m   2008-10-26 10:15:54 UTC (rev 4868)
@@ -63,8 +63,8 @@
 NSString *SKGreekingThresholdKey = @"SKGreekingThreshold";
 NSString *SKReadingBarColorKey = @"SKReadingBarColor";
 NSString *SKReadingBarInvertKey = @"SKReadingBarInvert";
-NSString *SKTextNoteFontNameKey = @"SKTextNoteFontName";
-NSString *SKTextNoteFontSizeKey = @"SKTextNoteFontSize";
+NSString *SKFreeTextNoteFontNameKey = @"SKFreeTextNoteFontName";
+NSString *SKFreeTextNoteFontSizeKey = @"SKFreeTextNoteFontSize";
 NSString *SKAnchoredNoteFontNameKey = @"SKAnchoredNoteFontName";
 NSString *SKAnchoredNoteFontSizeKey = @"SKAnchoredNoteFontSize";
 NSString *SKFreeTextNoteColorKey = @"SKFreeTextNoteColor";

Modified: trunk/ru.lproj/PreferenceWindow.nib/classes.nib
===================================================================
--- trunk/ru.lproj/PreferenceWindow.nib/classes.nib     2008-10-26 10:05:40 UTC 
(rev 4867)
+++ trunk/ru.lproj/PreferenceWindow.nib/classes.nib     2008-10-26 10:15:54 UTC 
(rev 4868)
@@ -13,24 +13,10 @@
                        <string>NSController</string>
                </dict>
                <dict>
-                       <key>CLASS</key>
-                       <string>NSView</string>
-                       <key>LANGUAGE</key>
-                       <string>ObjC</string>
-                       <key>SUPERCLASS</key>
-                       <string>NSResponder</string>
-               </dict>
-               <dict>
-                       <key>CLASS</key>
-                       <string>NSMenuItem</string>
-                       <key>LANGUAGE</key>
-                       <string>ObjC</string>
-                       <key>SUPERCLASS</key>
-                       <string>NSObject</string>
-               </dict>
-               <dict>
                        <key>ACTIONS</key>
                        <dict>
+                               <key>changeAttributes</key>
+                               <string>id</string>
                                <key>changeDiscreteThumbnailSizes</key>
                                <string>id</string>
                                <key>changeFont</key>
@@ -86,14 +72,6 @@
                </dict>
                <dict>
                        <key>CLASS</key>
-                       <string>NSMenu</string>
-                       <key>LANGUAGE</key>
-                       <string>ObjC</string>
-                       <key>SUPERCLASS</key>
-                       <string>NSObject</string>
-               </dict>
-               <dict>
-                       <key>CLASS</key>
                        <string>NSWindowController</string>
                        <key>LANGUAGE</key>
                        <string>ObjC</string>
@@ -101,13 +79,8 @@
                        <string>NSResponder</string>
                </dict>
                <dict>
-                       <key>ACTIONS</key>
-                       <dict>
-                               <key></key>
-                               <string>id</string>
-                       </dict>
                        <key>CLASS</key>
-                       <string>FirstResponder</string>
+                       <string>NSMenu</string>
                        <key>LANGUAGE</key>
                        <string>ObjC</string>
                        <key>SUPERCLASS</key>
@@ -134,11 +107,11 @@
                </dict>
                <dict>
                        <key>CLASS</key>
-                       <string>NSCell</string>
+                       <string>NSTextFieldCell</string>
                        <key>LANGUAGE</key>
                        <string>ObjC</string>
                        <key>SUPERCLASS</key>
-                       <string>NSObject</string>
+                       <string>NSActionCell</string>
                </dict>
                <dict>
                        <key>CLASS</key>
@@ -149,6 +122,13 @@
                        <string>NSResponder</string>
                </dict>
                <dict>
+                       <key>ACTIONS</key>
+                       <dict>
+                               <key>changeAttributesFromFontManager</key>
+                               <string>id</string>
+                               <key>changeFontFromFontManager</key>
+                               <string>id</string>
+                       </dict>
                        <key>CLASS</key>
                        <string>SKFontWell</string>
                        <key>LANGUAGE</key>
@@ -163,14 +143,51 @@
                </dict>
                <dict>
                        <key>CLASS</key>
+                       <string>NSView</string>
+                       <key>LANGUAGE</key>
+                       <string>ObjC</string>
+                       <key>SUPERCLASS</key>
                        <string>NSResponder</string>
+               </dict>
+               <dict>
+                       <key>CLASS</key>
+                       <string>NSMenuItem</string>
                        <key>LANGUAGE</key>
                        <string>ObjC</string>
                        <key>SUPERCLASS</key>
                        <string>NSObject</string>
                </dict>
                <dict>
+                       <key>ACTIONS</key>
+                       <dict>
+                               <key></key>
+                               <string>id</string>
+                       </dict>
                        <key>CLASS</key>
+                       <string>FirstResponder</string>
+                       <key>LANGUAGE</key>
+                       <string>ObjC</string>
+                       <key>SUPERCLASS</key>
+                       <string>NSObject</string>
+               </dict>
+               <dict>
+                       <key>CLASS</key>
+                       <string>NSCell</string>
+                       <key>LANGUAGE</key>
+                       <string>ObjC</string>
+                       <key>SUPERCLASS</key>
+                       <string>NSObject</string>
+               </dict>
+               <dict>
+                       <key>CLASS</key>
+                       <string>NSResponder</string>
+                       <key>LANGUAGE</key>
+                       <string>ObjC</string>
+                       <key>SUPERCLASS</key>
+                       <string>NSObject</string>
+               </dict>
+               <dict>
+                       <key>CLASS</key>
                        <string>SKLineWell</string>
                        <key>LANGUAGE</key>
                        <string>ObjC</string>

Modified: trunk/ru.lproj/PreferenceWindow.nib/info.nib
===================================================================
--- trunk/ru.lproj/PreferenceWindow.nib/info.nib        2008-10-26 10:05:40 UTC 
(rev 4867)
+++ trunk/ru.lproj/PreferenceWindow.nib/info.nib        2008-10-26 10:15:54 UTC 
(rev 4868)
@@ -3,13 +3,15 @@
 <plist version="1.0">
 <dict>
        <key>IBFramework Version</key>
-       <string>670</string>
+       <string>677</string>
        <key>IBLastKnownRelativeProjectPath</key>
        <string>../Skim.xcodeproj</string>
        <key>IBOldestOS</key>
        <integer>5</integer>
        <key>IBOpenObjects</key>
-       <array/>
+       <array>
+               <integer>170</integer>
+       </array>
        <key>IBSystem Version</key>
        <string>9F33</string>
        <key>targetFramework</key>

Modified: trunk/ru.lproj/PreferenceWindow.nib/keyedobjects.nib
===================================================================
(Binary files differ)


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit

Reply via email to