modules/gui/macosx/preferences/prefs_widgets.h

@@ -133,13 +133,6 @@ static NSMenu *o_keys_menu = nil;
 
 @end
 
-@interface KeyConfigControl : VLCConfigControl
-
-- (id)initWithItem:(module_config_t *)_p_item
-          withView:(NSView *)o_parent_view;
-
-@end
-
 @interface ModuleListConfigControl : VLCConfigControl
 
 - (id)initWithItem:(module_config_t *)_p_item

modules/gui/macosx/preferences/prefs_widgets.m

@@ -56,188 +56,6 @@ NSString * const VLCPrefsWidgetModuleDragType = @"VLC media player module";
 #define UP_ARROWHEAD                        "\xE2\x8C\x83"
 #define PLACE_OF_INTEREST_SIGN              "\xE2\x8C\x98"
 
-#define POPULATE_A_KEY(o_menu, string, value)                               \
-{                                                                           \
-    NSMenuItem *o_mi;                                                       \
-/*  Normal */                                                               \
-    o_mi = [[NSMenuItem alloc] initWithTitle:string                         \
-        action:nil keyEquivalent:@""];                                      \
-    [o_mi setKeyEquivalentModifierMask:                                     \
-        0];                                                                 \
-    [o_mi setAlternate: NO];                                                \
-    [o_mi setTag:                                                           \
-        (value)];                                                           \
-    [o_menu addItem: o_mi];                                                 \
-/*  Ctrl */                                                                 \
-    o_mi = [[NSMenuItem alloc] initWithTitle:                               \
-        [toNSStr(UP_ARROWHEAD)                                              \
-          stringByAppendingString: string]                                  \
-        action:nil keyEquivalent:@""];                                      \
-    [o_mi setKeyEquivalentModifierMask:                                     \
-        NSControlKeyMask];                                                  \
-    [o_mi setAlternate: YES];                                               \
-    [o_mi setTag:                                                           \
-        KEY_MODIFIER_CTRL | (value)];                                       \
-    [o_menu addItem: o_mi];                                                 \
-/* Ctrl+Alt */                                                              \
-    o_mi = [[NSMenuItem alloc] initWithTitle:                               \
-        [toNSStr(UP_ARROWHEAD OPTION_KEY)                                   \
-          stringByAppendingString: string]                                  \
-        action:nil keyEquivalent:@""];                                      \
-    [o_mi setKeyEquivalentModifierMask:                                     \
-        NSControlKeyMask | NSAlternateKeyMask];                             \
-    [o_mi setAlternate: YES];                                               \
-    [o_mi setTag:                                                           \
-        (KEY_MODIFIER_CTRL | KEY_MODIFIER_ALT) | (value)];                  \
-    [o_menu addItem: o_mi];                                                 \
-/* Ctrl+Shift */                                                            \
-    o_mi = [[NSMenuItem alloc] initWithTitle:                               \
-        [toNSStr(UP_ARROWHEAD UPWARDS_WHITE_ARROW)                          \
-          stringByAppendingString: string]                                  \
-        action:nil keyEquivalent:@""];                                      \
-    [o_mi setKeyEquivalentModifierMask:                                     \
-       NSControlKeyMask | NSShiftKeyMask];                                  \
-    [o_mi setAlternate: YES];                                               \
-    [o_mi setTag:                                                           \
-        (KEY_MODIFIER_CTRL | KEY_MODIFIER_SHIFT) | (value)];                \
-    [o_menu addItem: o_mi];                                                 \
-/* Ctrl+Apple */                                                            \
-    o_mi = [[NSMenuItem alloc] initWithTitle:                               \
-        [toNSStr(UP_ARROWHEAD PLACE_OF_INTEREST_SIGN)                       \
-          stringByAppendingString: string]                                  \
-        action:nil keyEquivalent:@""];                                      \
-    [o_mi setKeyEquivalentModifierMask:                                     \
-        NSControlKeyMask | NSCommandKeyMask];                               \
-    [o_mi setAlternate: YES];                                               \
-    [o_mi setTag:                                                           \
-        (KEY_MODIFIER_CTRL | KEY_MODIFIER_COMMAND) | (value)];              \
-    [o_menu addItem: o_mi];                                                 \
-/* Ctrl+Alt+Shift */                                                        \
-    o_mi = [[NSMenuItem alloc] initWithTitle:                               \
-        [toNSStr(UP_ARROWHEAD OPTION_KEY UPWARDS_WHITE_ARROW)               \
-          stringByAppendingString: string]                                  \
-        action:nil keyEquivalent:@""];                                      \
-    [o_mi setKeyEquivalentModifierMask:                                     \
-        NSControlKeyMask | NSAlternateKeyMask | NSShiftKeyMask];            \
-    [o_mi setAlternate: YES];                                               \
-    [o_mi setTag:                                                           \
-        (KEY_MODIFIER_CTRL | KEY_MODIFIER_ALT | KEY_MODIFIER_SHIFT) |       \
-             (value)];                                                      \
-    [o_menu addItem: o_mi];                                                 \
-/* Ctrl+Alt+Apple */                                                        \
-    o_mi = [[NSMenuItem alloc] initWithTitle:                               \
-        [toNSStr(UP_ARROWHEAD OPTION_KEY PLACE_OF_INTEREST_SIGN)            \
-          stringByAppendingString: string]                                  \
-        action:nil keyEquivalent:@""];                                      \
-    [o_mi setKeyEquivalentModifierMask:                                     \
-        NSControlKeyMask | NSAlternateKeyMask | NSCommandKeyMask];          \
-    [o_mi setAlternate: YES];                                               \
-    [o_mi setTag:                                                           \
-        (KEY_MODIFIER_CTRL | KEY_MODIFIER_ALT | KEY_MODIFIER_COMMAND) |     \
-            (value)];                                                       \
-    [o_menu addItem: o_mi];                                                 \
-/* Ctrl+Shift+Apple */                                                      \
-    o_mi = [[NSMenuItem alloc] initWithTitle:                               \
-        [toNSStr(UP_ARROWHEAD UPWARDS_WHITE_ARROW PLACE_OF_INTEREST_SIGN)   \
-          stringByAppendingString: string]                                  \
-        action:nil keyEquivalent:@""];                                      \
-    [o_mi setKeyEquivalentModifierMask:                                     \
-        NSControlKeyMask | NSShiftKeyMask | NSCommandKeyMask];              \
-    [o_mi setAlternate: YES];                                               \
-    [o_mi setTag:                                                           \
-        (KEY_MODIFIER_CTRL | KEY_MODIFIER_SHIFT | KEY_MODIFIER_COMMAND) |   \
-            (value)];                                                       \
-    [o_menu addItem: o_mi];                                                 \
-/* Ctrl+Alt+Shift+Apple */                                                  \
-    o_mi = [[NSMenuItem alloc] initWithTitle:                               \
-        [toNSStr(UP_ARROWHEAD OPTION_KEY UPWARDS_WHITE_ARROW PLACE_OF_INTEREST_SIGN) \
-         stringByAppendingString: string]                                   \
-        action:nil keyEquivalent:@""];                                      \
-    [o_mi setKeyEquivalentModifierMask:                                     \
-        NSControlKeyMask | NSAlternateKeyMask | NSShiftKeyMask |            \
-            NSCommandKeyMask];                                              \
-    [o_mi setAlternate: YES];                                               \
-    [o_mi setTag:                                                           \
-        (KEY_MODIFIER_CTRL | KEY_MODIFIER_ALT | KEY_MODIFIER_SHIFT |        \
-            KEY_MODIFIER_COMMAND) | (value)];                               \
-    [o_menu addItem: o_mi];                                                 \
-/* Alt */                                                                   \
-    o_mi = [[NSMenuItem alloc] initWithTitle:                               \
-        [toNSStr(OPTION_KEY) stringByAppendingString: string]               \
-        action:nil keyEquivalent:@""];                                      \
-    [o_mi setKeyEquivalentModifierMask:                                     \
-        NSAlternateKeyMask];                                                \
-    [o_mi setAlternate: YES];                                               \
-    [o_mi setTag:                                                           \
-        KEY_MODIFIER_ALT | (value)];                                        \
-    [o_menu addItem: o_mi];                                                 \
-/* Alt+Shift */                                                             \
-    o_mi = [[NSMenuItem alloc] initWithTitle:                               \
-        [toNSStr(OPTION_KEY UPWARDS_WHITE_ARROW) stringByAppendingString: string] \
-        action:nil keyEquivalent:@""];                                      \
-    [o_mi setKeyEquivalentModifierMask:                                     \
-        NSAlternateKeyMask | NSShiftKeyMask];                               \
-    [o_mi setAlternate: YES];                                               \
-    [o_mi setTag:                                                           \
-        (KEY_MODIFIER_ALT | KEY_MODIFIER_SHIFT) | (value)];                 \
-    [o_menu addItem: o_mi];                                                 \
-/* Alt+Apple */                                                             \
-    o_mi = [[NSMenuItem alloc] initWithTitle:                               \
-        [toNSStr(OPTION_KEY PLACE_OF_INTEREST_SIGN)                         \
-         stringByAppendingString: string] action:nil keyEquivalent:@""];    \
-    [o_mi setKeyEquivalentModifierMask:                                     \
-        NSAlternateKeyMask | NSCommandKeyMask];                             \
-    [o_mi setAlternate: YES];                                               \
-    [o_mi setTag:                                                           \
-        (KEY_MODIFIER_ALT | KEY_MODIFIER_COMMAND) | (value)];               \
-    [o_menu addItem: o_mi];                                                 \
-/* Alt+Shift+Apple */                                                       \
-    o_mi = [[NSMenuItem alloc] initWithTitle:                               \
-        [toNSStr(OPTION_KEY UPWARDS_WHITE_ARROW PLACE_OF_INTEREST_SIGN)     \
-          stringByAppendingString: string]                                  \
-        action:nil keyEquivalent:@""];                                      \
-    [o_mi setKeyEquivalentModifierMask:                                     \
-        NSAlternateKeyMask | NSShiftKeyMask | NSCommandKeyMask];            \
-    [o_mi setAlternate: YES];                                               \
-    [o_mi setTag:                                                           \
-        (KEY_MODIFIER_ALT | KEY_MODIFIER_SHIFT | KEY_MODIFIER_COMMAND) |    \
-            (value)];                                                       \
-    [o_menu addItem: o_mi];                                                 \
-/* Shift */                                                                 \
-    o_mi = [[NSMenuItem alloc] initWithTitle:                               \
-        [toNSStr(UPWARDS_WHITE_ARROW)                                       \
-          stringByAppendingString: string]                                  \
-        action:nil keyEquivalent:@""];                                      \
-    [o_mi setKeyEquivalentModifierMask:                                     \
-        NSShiftKeyMask];                                                    \
-    [o_mi setAlternate: YES];                                               \
-    [o_mi setTag:                                                           \
-        KEY_MODIFIER_SHIFT | (value)];                                      \
-    [o_menu addItem: o_mi];                                                 \
-/* Shift+Apple */                                                           \
-    o_mi = [[NSMenuItem alloc] initWithTitle:                               \
-        [toNSStr(UPWARDS_WHITE_ARROW PLACE_OF_INTEREST_SIGN)                \
-         stringByAppendingString: string]                                   \
-        action:nil keyEquivalent:@""];                                      \
-    [o_mi setKeyEquivalentModifierMask:                                     \
-        NSShiftKeyMask | NSCommandKeyMask];                                 \
-    [o_mi setAlternate: YES];                                               \
-    [o_mi setTag:                                                           \
-        (KEY_MODIFIER_SHIFT | KEY_MODIFIER_COMMAND) | (value)];             \
-    [o_menu addItem: o_mi];                                                 \
-/* Apple */                                                                 \
-    o_mi = [[NSMenuItem alloc] initWithTitle:                               \
-        [toNSStr(PLACE_OF_INTEREST_SIGN)                                    \
-          stringByAppendingString: string]                                  \
-        action:nil keyEquivalent:@""];                                      \
-    [o_mi setKeyEquivalentModifierMask:                                     \
-        NSCommandKeyMask];                                                  \
-    [o_mi setAlternate: YES];                                               \
-    [o_mi setTag:                                                           \
-        KEY_MODIFIER_COMMAND | (value)];                                    \
-    [o_menu addItem: o_mi];                                                 \
-}
-
 #define ADD_LABEL(o_label, superFrame, x_offset, my_y_offset, label,        \
     tooltip)                                                                \
 {                                                                           \
@@ -819,14 +637,13 @@ my_width, tooltip, init_value)                                              \
             else
                 control = [[FloatConfigControl alloc] initWithItem: _p_item withView: parentView];
             break;
-            /* don't display keys in the advanced settings, since the current controls
-             are broken by design. The user is required to change hotkeys in the sprefs
-             and can only change really advanced stuff here..
-             case CONFIG_ITEM_KEY:
-             control = [[KeyConfigControl alloc]
-             initWithItem: _p_item
-             withView: parentView];
-             break; */
+        /* don't display keys in the advanced settings, since the current controls
+         are broken by design. The user is required to change hotkeys in the sprefs
+         and can only change really advanced stuff here..
+
+        case CONFIG_ITEM_KEY:
+            break;
+         */
         case CONFIG_ITEM_MODULE_LIST:
         case CONFIG_ITEM_MODULE_LIST_CAT:
             control = [[ModuleListConfigControl alloc] initWithItem: _p_item withView: parentView];
@@ -1873,87 +1690,6 @@ my_width, tooltip, init_value)                                              \
 }
 @end
 
-@interface KeyConfigControl()
-{
-    NSPopUpButton   *o_popup;
-}
-@end
-
-@implementation KeyConfigControl
-- (id)initWithItem:(module_config_t *)p_item
-          withView:(NSView *)parentView
-{
-    const NSUInteger leftMargin = VLCLibraryUIUnits.largeSpacing;
-    const NSUInteger rightMargin = VLCLibraryUIUnits.largeSpacing;
-
-    NSRect mainFrame = [parentView frame];
-    NSString *labelString, *toolTip;
-    mainFrame.size.height = 22;
-    mainFrame.size.width = mainFrame.size.width - leftMargin - rightMargin + 1;
-    mainFrame.origin.x = leftMargin;
-    mainFrame.origin.y = 0;
-
-    if (self = [super initWithFrame:mainFrame item:p_item]) {
-        self.viewType = CONFIG_ITEM_KEY;
-
-        toolTip = [NSTR(p_item->psz_longtext) stringWrappedToWidth:PREFS_WRAP];
-
-        /* add the label */
-        labelString = NSTR(p_item->psz_text);
-        ADD_LABEL(self.label, mainFrame, 0, -1, labelString, toolTip)
-        [self.label setAutoresizingMask:NSViewNotSizable ];
-        [self addSubview: self.label];
-
-        /* build the popup */
-        ADD_POPUP(o_popup, mainFrame, [self.label frame].origin.x +
-                  [self.label frame].size.width + 3,
-                  -2, 0, toolTip)
-        [o_popup setAutoresizingMask:NSViewWidthSizable ];
-
-        if (o_keys_menu == nil) {
-            o_keys_menu = [[NSMenu alloc] initWithTitle: @"Keys Menu"];
-#warning This does not work anymore. FIXME.
-#if 0
-            for (unsigned int i = 0; i < sizeof(vlc_key) / sizeof(key_descriptor_t); i++)
-                if (vlc_key[i].psz_key_string)
-                    POPULATE_A_KEY(o_keys_menu,toNSStr(vlc_key[i].psz_key_string),
-                                   vlc_key[i].i_key_code)
-#endif
-                    }
-        [o_popup setMenu:[o_keys_menu copyWithZone:nil]];
-        [o_popup selectItem:[[o_popup menu] itemWithTag:p_item->value.i]];
-        [self addSubview: o_popup];
-
-    }
-    return self;
-}
-
-- (void) alignWithXPosition:(int)i_xPos
-{
-    NSRect frame;
-    NSRect superFrame = [self frame];
-    frame = [self.label frame];
-    frame.origin.x = i_xPos - frame.size.width - 3;
-    [self.label setFrame:frame];
-
-    frame = [o_popup frame];
-    frame.origin.x = i_xPos - 1;
-    frame.size.width = superFrame.size.width - frame.origin.x + 2;
-    [o_popup setFrame:frame];
-}
-
-- (int)intValue
-{
-    return (int)[o_popup selectedTag];
-}
-
-- (void)resetValues
-{
-    [o_popup selectItem:[[o_popup menu] itemWithTag:config_GetInt(self.p_item->psz_name)]];
-    [super resetValues];
-}
-@end
-
 @interface ModuleListConfigControl() <NSTextFieldDelegate, NSTableViewDataSource>
 {
     NSTextField     *o_textfield;