[vlc-commits] macosx: sharedDialogs: rename properties for l10n strings

[David Fuhrmann]

vlc | branch: master | David Fuhrmann <dfuhrmann at videolan.org> | Tue Aug 11 10:22:41 2015 +0200| [858e2e65103f88d291653c50e904840d61de55a4] | committer: David Fuhrmann

macosx: sharedDialogs: rename properties for l10n strings

This should make it clearer what a l10n string and a IBOutlet is.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=858e2e65103f88d291653c50e904840d61de55a4
---

 modules/gui/macosx/AudioEffects.m   |   32 ++++++++++++++++----------------
 modules/gui/macosx/ConvertAndSave.m |   16 ++++++++--------
 modules/gui/macosx/SharedDialogs.h  |   16 ++++++++--------
 modules/gui/macosx/SharedDialogs.m  |   16 ++++++++--------
 modules/gui/macosx/VideoEffects.m   |   16 ++++++++--------
 5 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/modules/gui/macosx/AudioEffects.m b/modules/gui/macosx/AudioEffects.m
index 2dc8ecb..c0dde23 100644
--- a/modules/gui/macosx/AudioEffects.m
+++ b/modules/gui/macosx/AudioEffects.m
@@ -361,10 +361,10 @@
 - (void)addAudioEffectsProfile:(id)sender
 {
     /* show panel */
-    [_textfieldPanel setTitle: _NS("Duplicate current profile for a new profile")];
-    [_textfieldPanel setSubTitle: _NS("Enter a name for the new profile:")];
-    [_textfieldPanel setCancelButtonLabel: _NS("Cancel")];
-    [_textfieldPanel setOKButtonLabel: _NS("Save")];
+    [_textfieldPanel setTitleString:_NS("Duplicate current profile for a new profile")];
+    [_textfieldPanel setSubTitleString:_NS("Enter a name for the new profile:")];
+    [_textfieldPanel setCancelButtonString:_NS("Cancel")];
+    [_textfieldPanel setOkButtonString:_NS("Save")];
 
     __weak typeof(self) _self = self;
     [_textfieldPanel runModalForWindow:self.window completionHandler:^(NSInteger returnCode, NSString *resultingText) {
@@ -414,10 +414,10 @@
 - (void)removeAudioEffectsProfile:(id)sender
 {
     /* show panel */
-    [_popupPanel setTitle:_NS("Remove a preset")];
-    [_popupPanel setSubTitle:_NS("Select the preset you would like to remove:")];
-    [_popupPanel setOKButtonLabel:_NS("Remove")];
-    [_popupPanel setCancelButtonLabel:_NS("Cancel")];
+    [_popupPanel setTitleString:_NS("Remove a preset")];
+    [_popupPanel setSubTitleString:_NS("Select the preset you would like to remove:")];
+    [_popupPanel setOkButtonString:_NS("Remove")];
+    [_popupPanel setCancelButtonString:_NS("Cancel")];
     [_popupPanel setPopupButtonContent:[[NSUserDefaults standardUserDefaults] objectForKey:@"AudioEffectProfileNames"]];
 
     __weak typeof(self) _self = self;
@@ -661,10 +661,10 @@ static bool GetEqualizerStatus(intf_thread_t *p_custom_intf,
 - (IBAction)addPresetAction:(id)sender
 {
     /* show panel */
-    [_textfieldPanel setTitle: _NS("Save current selection as new preset")];
-    [_textfieldPanel setSubTitle: _NS("Enter a name for the new preset:")];
-    [_textfieldPanel setCancelButtonLabel: _NS("Cancel")];
-    [_textfieldPanel setOKButtonLabel: _NS("Save")];
+    [_textfieldPanel setTitleString:_NS("Save current selection as new preset")];
+    [_textfieldPanel setSubTitleString:_NS("Enter a name for the new preset:")];
+    [_textfieldPanel setCancelButtonString:_NS("Cancel")];
+    [_textfieldPanel setOkButtonString:_NS("Save")];
 
     __weak typeof(self) _self = self;
     [_textfieldPanel runModalForWindow:self.window completionHandler:^(NSInteger returnCode, NSString *resultingText) {
@@ -704,10 +704,10 @@ static bool GetEqualizerStatus(intf_thread_t *p_custom_intf,
 
 - (IBAction)deletePresetAction:(id)sender
 {
-    [_popupPanel setTitle:_NS("Remove a preset")];
-    [_popupPanel setSubTitle:_NS("Select the preset you would like to remove:")];
-    [_popupPanel setOKButtonLabel:_NS("Remove")];
-    [_popupPanel setCancelButtonLabel:_NS("Cancel")];
+    [_popupPanel setTitleString:_NS("Remove a preset")];
+    [_popupPanel setSubTitleString:_NS("Select the preset you would like to remove:")];
+    [_popupPanel setOkButtonString:_NS("Remove")];
+    [_popupPanel setCancelButtonString:_NS("Cancel")];
     [_popupPanel setPopupButtonContent:[[NSUserDefaults standardUserDefaults] objectForKey:@"EQTitles"]];
 
     __weak typeof(self) _self = self;
diff --git a/modules/gui/macosx/ConvertAndSave.m b/modules/gui/macosx/ConvertAndSave.m
index ad6a76f..08f543b 100644
--- a/modules/gui/macosx/ConvertAndSave.m
+++ b/modules/gui/macosx/ConvertAndSave.m
@@ -329,10 +329,10 @@
 - (IBAction)deleteProfileAction:(id)sender
 {
     /* show panel */
-    [_popupPanel setTitle:_NS("Remove a profile")];
-    [_popupPanel setSubTitle:_NS("Select the profile you would like to remove:")];
-    [_popupPanel setOKButtonLabel:_NS("Remove")];
-    [_popupPanel setCancelButtonLabel:_NS("Cancel")];
+    [_popupPanel setTitleString:_NS("Remove a profile")];
+    [_popupPanel setSubTitleString:_NS("Select the profile you would like to remove:")];
+    [_popupPanel setOkButtonString:_NS("Remove")];
+    [_popupPanel setCancelButtonString:_NS("Cancel")];
     [_popupPanel setPopupButtonContent:self.profileNames];
 
     __weak typeof(self) _self = self;
@@ -466,10 +466,10 @@
 - (IBAction)newProfileAction:(id)sender
 {
     /* show panel */
-    [_textfieldPanel setTitle: _NS("Save as new profile")];
-    [_textfieldPanel setSubTitle: _NS("Enter a name for the new profile:")];
-    [_textfieldPanel setCancelButtonLabel: _NS("Cancel")];
-    [_textfieldPanel setOKButtonLabel: _NS("Save")];
+    [_textfieldPanel setTitleString: _NS("Save as new profile")];
+    [_textfieldPanel setSubTitleString: _NS("Enter a name for the new profile:")];
+    [_textfieldPanel setCancelButtonString: _NS("Cancel")];
+    [_textfieldPanel setOkButtonString: _NS("Save")];
 
     __weak typeof(self) _self = self;
     [_textfieldPanel runModalForWindow:_customizePanel completionHandler:^(NSInteger returnCode, NSString *resultingText) {
diff --git a/modules/gui/macosx/SharedDialogs.h b/modules/gui/macosx/SharedDialogs.h
index bf0183f..ffe3efd 100644
--- a/modules/gui/macosx/SharedDialogs.h
+++ b/modules/gui/macosx/SharedDialogs.h
@@ -31,10 +31,10 @@
 @property (weak) IBOutlet NSButton *cancelButton;
 @property (weak) IBOutlet NSButton *okButton;
 
- at property (readwrite, assign) NSString *title;
- at property (readwrite, assign) NSString *subTitle;
- at property (readwrite, assign) NSString *OKButtonLabel;
- at property (readwrite, assign) NSString *CancelButtonLabel;
+ at property (readwrite, assign) NSString *titleString;
+ at property (readwrite, assign) NSString *subTitleString;
+ at property (readwrite, assign) NSString *okButtonString;
+ at property (readwrite, assign) NSString *cancelButtonString;
 
 /**
  * Completion handler for textfield panel
@@ -63,10 +63,10 @@ typedef void(^TextfieldPanelCompletionBlock)(NSInteger returnCode, NSString *res
 @property (weak) IBOutlet NSButton *cancelButton;
 @property (weak) IBOutlet NSButton *okButton;
 
- at property (readwrite, assign) NSString *title;
- at property (readwrite, assign) NSString *subTitle;
- at property (readwrite, assign) NSString *OKButtonLabel;
- at property (readwrite, assign) NSString *CancelButtonLabel;
+ at property (readwrite, assign) NSString *titleString;
+ at property (readwrite, assign) NSString *subTitleString;
+ at property (readwrite, assign) NSString *okButtonString;
+ at property (readwrite, assign) NSString *cancelButtonString;
 @property (readwrite, assign) NSArray *popupButtonContent;
 
 /**
diff --git a/modules/gui/macosx/SharedDialogs.m b/modules/gui/macosx/SharedDialogs.m
index 622da35..695e7ed 100644
--- a/modules/gui/macosx/SharedDialogs.m
+++ b/modules/gui/macosx/SharedDialogs.m
@@ -53,10 +53,10 @@
 {
     [self window];
 
-    [_titleLabel setStringValue:self.title];
-    [_subtitleLabel setStringValue:self.subTitle];
-    [_cancelButton setTitle:self.CancelButtonLabel];
-    [_okButton setTitle:self.OKButtonLabel];
+    [_titleLabel setStringValue:self.titleString];
+    [_subtitleLabel setStringValue:self.subTitleString];
+    [_cancelButton setTitle:self.cancelButtonString];
+    [_okButton setTitle:self.okButtonString];
     [_textField setStringValue:@""];
 
     _completionBlock = [handler copy];
@@ -94,10 +94,10 @@
 {
     [self window];
 
-    [_titleLabel setStringValue:self.title];
-    [_subtitleLabel setStringValue:self.subTitle];
-    [_cancelButton setTitle:self.CancelButtonLabel];
-    [_okButton setTitle:self.OKButtonLabel];
+    [_titleLabel setStringValue:self.titleString];
+    [_subtitleLabel setStringValue:self.subTitleString];
+    [_cancelButton setTitle:self.cancelButtonString];
+    [_okButton setTitle:self.okButtonString];
     [_popupButton removeAllItems];
     for (NSString *value in self.popupButtonContent)
         [[_popupButton menu] addItemWithTitle:value action:nil keyEquivalent:@""];
diff --git a/modules/gui/macosx/VideoEffects.m b/modules/gui/macosx/VideoEffects.m
index 48c6c0f..4d9272a 100644
--- a/modules/gui/macosx/VideoEffects.m
+++ b/modules/gui/macosx/VideoEffects.m
@@ -669,10 +669,10 @@
 - (void)addProfile:(id)sender
 {
     /* show panel */
-    [_textfieldPanel setTitle: _NS("Duplicate current profile for a new profile")];
-    [_textfieldPanel setSubTitle: _NS("Enter a name for the new profile:")];
-    [_textfieldPanel setCancelButtonLabel: _NS("Cancel")];
-    [_textfieldPanel setOKButtonLabel: _NS("Save")];
+    [_textfieldPanel setTitleString:_NS("Duplicate current profile for a new profile")];
+    [_textfieldPanel setSubTitleString:_NS("Enter a name for the new profile:")];
+    [_textfieldPanel setCancelButtonString:_NS("Cancel")];
+    [_textfieldPanel setOkButtonString:_NS("Save")];
 
     __weak typeof(self) _self = self;
     [_textfieldPanel runModalForWindow:self.window completionHandler:^(NSInteger returnCode, NSString *resultingText) {
@@ -727,10 +727,10 @@
 - (void)removeProfile:(id)sender
 {
     /* show panel */
-    [_popupPanel setTitle:_NS("Remove a preset")];
-    [_popupPanel setSubTitle:_NS("Select the preset you would like to remove:")];
-    [_popupPanel setOKButtonLabel:_NS("Remove")];
-    [_popupPanel setCancelButtonLabel:_NS("Cancel")];
+    [_popupPanel setTitleString:_NS("Remove a preset")];
+    [_popupPanel setSubTitleString:_NS("Select the preset you would like to remove:")];
+    [_popupPanel setOkButtonString:_NS("Remove")];
+    [_popupPanel setCancelButtonString:_NS("Cancel")];
     [_popupPanel setPopupButtonContent:[[NSUserDefaults standardUserDefaults] objectForKey:@"VideoEffectProfileNames"]];
 
     __weak typeof(self) _self = self;