Fixed whitespace in OpenPanel.
Updated localization scripts to account for new nib.CQTexperiment
parent
c28e8d058d
commit
d88d245f46
|
@ -19,6 +19,7 @@ if ! [ -d Prferences/General/$language.lproj ]; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
nibtool -d Localizations/$language/MainUI.strings English.lproj/MainMenu.nib -W $language.lproj/MainMenu.nib
|
nibtool -d Localizations/$language/MainUI.strings English.lproj/MainMenu.nib -W $language.lproj/MainMenu.nib
|
||||||
|
nibtool -d Localizations/$language/OpenURLPanel.strings English.lproj/OpenURLPanel.nib -W $language.lproj/OpenURLPanel.nib
|
||||||
nibtool -d Localizations/$language/PreferencesUI.strings Preferences/General/English.lproj/Preferences.nib -W Preferences/General/$language.lproj/Preferences.nib
|
nibtool -d Localizations/$language/PreferencesUI.strings Preferences/General/English.lproj/Preferences.nib -W Preferences/General/$language.lproj/Preferences.nib
|
||||||
cp Localizations/$language/MainProgram.strings $language.lproj/Localizable.strings
|
cp Localizations/$language/MainProgram.strings $language.lproj/Localizable.strings
|
||||||
|
|
||||||
|
|
|
@ -3,6 +3,7 @@ if ! [ -d Localizations/English ]; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
nibtool -L English.lproj/MainMenu.nib > Localizations/English/MainUI.strings
|
nibtool -L English.lproj/MainMenu.nib > Localizations/English/MainUI.strings
|
||||||
|
nibtool -L English.lproj/OpenURLPanel.nib > Localizations/English/OpenURLPanel.strings
|
||||||
|
|
||||||
nibtool -L Preferences/General/English.lproj/Preferences.nib > Localizations/English/PreferencesUI.strings
|
nibtool -L Preferences/General/English.lproj/Preferences.nib > Localizations/English/PreferencesUI.strings
|
||||||
|
|
||||||
|
|
|
@ -68,26 +68,26 @@
|
||||||
BOOL mIsSheet;
|
BOOL mIsSheet;
|
||||||
}
|
}
|
||||||
|
|
||||||
// class methods
|
// class methods
|
||||||
+ (id)openURLPanel;
|
+ (id)openURLPanel;
|
||||||
|
|
||||||
// getters
|
// getters
|
||||||
- (NSString *)urlString;
|
- (NSString *)urlString;
|
||||||
- (NSURL *)url;
|
- (NSURL *)url;
|
||||||
|
|
||||||
// setters
|
// setters
|
||||||
- (void)setURLArray:(NSMutableArray *)urlArray;
|
- (void)setURLArray:(NSMutableArray *)urlArray;
|
||||||
|
|
||||||
// delegates
|
// delegates
|
||||||
- (void)awakeFromNib;
|
- (void)awakeFromNib;
|
||||||
|
|
||||||
// notifications
|
// notifications
|
||||||
- (void)writeURLs:(NSNotification *)notification;
|
- (void)writeURLs:(NSNotification *)notification;
|
||||||
|
|
||||||
// actions
|
// actions
|
||||||
- (IBAction)doOpenURL:(id)sender;
|
- (IBAction)doOpenURL:(id)sender;
|
||||||
|
|
||||||
// methods
|
// methods
|
||||||
- (void)beginSheetWithWindow:(NSWindow *)window delegate:(id)delegate didEndSelector:(SEL)didEndSelector contextInfo:(void *)contextInfo;
|
- (void)beginSheetWithWindow:(NSWindow *)window delegate:(id)delegate didEndSelector:(SEL)didEndSelector contextInfo:(void *)contextInfo;
|
||||||
- (void)close;
|
- (void)close;
|
||||||
|
|
||||||
|
|
|
@ -53,17 +53,17 @@
|
||||||
|
|
||||||
#import "OpenURLPanel.h"
|
#import "OpenURLPanel.h"
|
||||||
|
|
||||||
// user defaults keys
|
// user defaults keys
|
||||||
#define kUserDefaultURLsKey @"UserDefaultURLsKey"
|
#define kUserDefaultURLsKey @"UserDefaultURLsKey"
|
||||||
|
|
||||||
// maximum urls
|
// maximum urls
|
||||||
#define kMaximumURLs 15
|
#define kMaximumURLs 15
|
||||||
|
|
||||||
@implementation OpenURLPanel
|
@implementation OpenURLPanel
|
||||||
|
|
||||||
static OpenURLPanel *openURLPanel = nil;
|
static OpenURLPanel *openURLPanel = nil;
|
||||||
|
|
||||||
// class methods
|
// class methods
|
||||||
+ (id)openURLPanel
|
+ (id)openURLPanel
|
||||||
{
|
{
|
||||||
if (openURLPanel == nil)
|
if (openURLPanel == nil)
|
||||||
|
@ -92,7 +92,7 @@ static OpenURLPanel *openURLPanel = nil;
|
||||||
[super dealloc];
|
[super dealloc];
|
||||||
}
|
}
|
||||||
|
|
||||||
// getters
|
// getters
|
||||||
- (NSString *)urlString
|
- (NSString *)urlString
|
||||||
{
|
{
|
||||||
NSString *urlString = nil;
|
NSString *urlString = nil;
|
||||||
|
@ -123,7 +123,7 @@ static OpenURLPanel *openURLPanel = nil;
|
||||||
return url;
|
return url;
|
||||||
}
|
}
|
||||||
|
|
||||||
// setters
|
// setters
|
||||||
- (void)setURLArray:(NSMutableArray *)urlLArray
|
- (void)setURLArray:(NSMutableArray *)urlLArray
|
||||||
{
|
{
|
||||||
[urlLArray retain];
|
[urlLArray retain];
|
||||||
|
@ -131,7 +131,7 @@ static OpenURLPanel *openURLPanel = nil;
|
||||||
mUrlArray = urlLArray;
|
mUrlArray = urlLArray;
|
||||||
}
|
}
|
||||||
|
|
||||||
// delegates
|
// delegates
|
||||||
- (void)awakeFromNib
|
- (void)awakeFromNib
|
||||||
{
|
{
|
||||||
NSArray *urls;
|
NSArray *urls;
|
||||||
|
@ -144,7 +144,7 @@ static OpenURLPanel *openURLPanel = nil;
|
||||||
[mUrlComboBox addItemsWithObjectValues:urls];
|
[mUrlComboBox addItemsWithObjectValues:urls];
|
||||||
}
|
}
|
||||||
|
|
||||||
// notifications
|
// notifications
|
||||||
- (void)writeURLs:(NSNotification *)notification
|
- (void)writeURLs:(NSNotification *)notification
|
||||||
{
|
{
|
||||||
NSUserDefaults *userDefaults;
|
NSUserDefaults *userDefaults;
|
||||||
|
@ -160,7 +160,7 @@ static OpenURLPanel *openURLPanel = nil;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// actions
|
// actions
|
||||||
- (IBAction)doOpenURL:(id)sender
|
- (IBAction)doOpenURL:(id)sender
|
||||||
{
|
{
|
||||||
NSString *urlString;
|
NSString *urlString;
|
||||||
|
@ -217,11 +217,12 @@ static OpenURLPanel *openURLPanel = nil;
|
||||||
{
|
{
|
||||||
callback = [mDelegate methodForSelector:mDidEndSelector];
|
callback = [mDelegate methodForSelector:mDidEndSelector];
|
||||||
callback(mDelegate, mDidEndSelector, self, [sender tag], mContextInfo);
|
callback(mDelegate, mDidEndSelector, self, [sender tag], mContextInfo);
|
||||||
|
|
||||||
[self close];
|
[self close];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// methods
|
// methods
|
||||||
- (void)beginSheetWithWindow:(NSWindow *)window delegate:(id)delegate didEndSelector:(SEL)didEndSelector contextInfo:(void *)contextInfo
|
- (void)beginSheetWithWindow:(NSWindow *)window delegate:(id)delegate didEndSelector:(SEL)didEndSelector contextInfo:(void *)contextInfo
|
||||||
{
|
{
|
||||||
// will this run as a sheet
|
// will this run as a sheet
|
||||||
|
|
Loading…
Reference in New Issue