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