From: Joe Wreschnig Date: Thu, 7 Mar 2013 21:03:24 +0000 (+0100) Subject: More size tweaking. X-Git-Tag: version-1.0~2 X-Git-Url: https://git.yukkurigames.com/?a=commitdiff_plain;h=ba6488fd986229dadcf8a7c7dcc028d2c1ddecf5;p=enjoyable.git More size tweaking. --- diff --git a/Classes/EnjoyableApplicationDelegate.h b/Classes/EnjoyableApplicationDelegate.h index b795a92..dfb82fc 100644 --- a/Classes/EnjoyableApplicationDelegate.h +++ b/Classes/EnjoyableApplicationDelegate.h @@ -7,12 +7,9 @@ // @class NJDeviceController; -@class NJOutputController; @class NJMappingsController; -@interface EnjoyableApplicationDelegate : NSObject -{ +@interface EnjoyableApplicationDelegate : NSObject { IBOutlet NSMenu *dockMenuBase; IBOutlet NSWindow *window; } diff --git a/Classes/EnjoyableApplicationDelegate.m b/Classes/EnjoyableApplicationDelegate.m index 5c68476..6fb5141 100644 --- a/Classes/EnjoyableApplicationDelegate.m +++ b/Classes/EnjoyableApplicationDelegate.m @@ -107,34 +107,6 @@ [self.mappingsController activateMapping:chosen]; } -#define OUTPUT_PANE_MIN_WIDTH 390 -#define INPUT_PANE_MIN_WIDTH 160 - -- (CGFloat)splitView:(NSSplitView *)splitView constrainMinCoordinate:(CGFloat)proposedMinimumPosition ofSubviewAt:(NSInteger)dividerIndex { - return INPUT_PANE_MIN_WIDTH; -} - -- (CGFloat)splitView:(NSSplitView *)sender constrainMaxCoordinate:(CGFloat)proposedMax ofSubviewAt:(NSInteger)offset { - return proposedMax - OUTPUT_PANE_MIN_WIDTH; -} - -- (void)splitView:(NSSplitView *)splitView resizeSubviewsWithOldSize:(NSSize)oldSize { - NSView *inputView = splitView.subviews[0]; - NSView *outputView = splitView.subviews[1]; - if (outputView.frame.size.width < OUTPUT_PANE_MIN_WIDTH) { - NSSize frameSize = splitView.frame.size; - CGFloat inputWidth = frameSize.width - OUTPUT_PANE_MIN_WIDTH - splitView.dividerThickness; - inputView.frame = NSMakeRect(inputWidth, frameSize.height, - inputView.frame.size.width, - inputView.frame.size.height); - outputView.frame = NSMakeRect(inputWidth + splitView.dividerThickness, - 0, - OUTPUT_PANE_MIN_WIDTH, - frameSize.height); - } else - [splitView adjustSubviews]; -} - - (NSMenu *)applicationDockMenu:(NSApplication *)sender { NSMenu *menu = [[NSMenu alloc] init]; int added = 0; diff --git a/Resources/English.lproj/MainMenu.xib b/Resources/English.lproj/MainMenu.xib index b60d2fe..895e1d2 100644 --- a/Resources/English.lproj/MainMenu.xib +++ b/Resources/English.lproj/MainMenu.xib @@ -29,7 +29,6 @@ NSSegmentedControl NSSlider NSSliderCell - NSSplitView NSTableColumn NSTableView NSTextField @@ -208,7 +207,7 @@ - List + Show List l 1048576 2147483647 @@ -331,7 +330,7 @@ 15 2 - {{355, 59}, {640, 320}} + {{355, 59}, {620, 323}} 1685585920 Enjoyable NSWindow @@ -480,653 +479,632 @@ - {640, 320} + {620, 323} 256 - + - 274 + 275 - - - 256 - - - - 274 - {{20, 20}, {162, 280}} - - - - _NS:22 - YES - - 603979776 - 134217728 - Tm8gaW5wdXQgZGV2aWNlcyB3ZXJlIGZvdW5kLgoKQ29ubmVjdCBhIGRldmljZSB0byBiZWdpbiBtYXBw + + + 274 + {{20, 20}, {194, 283}} + + + + _NS:22 + YES + + 603979776 + 134217728 + Tm8gaW5wdXQgZGV2aWNlcyB3ZXJlIGZvdW5kLgoKQ29ubmVjdCBhIGRldmljZSB0byBiZWdpbiBtYXBw aW5nLg - - LucidaGrande-Bold - 14 - 16 - - _NS:22 - - -2041823232 - 134 - - - 400 - 75 - - NO + + LucidaGrande-Bold + 14 + 16 - - - 274 + _NS:22 + + -2041823232 + 134 + + + 400 + 75 + + NO + + + + 274 + + + + 2304 - - - 2304 - - - - 256 - - {200, 318} - - - - YES - NO - YES - - - 256 - {{474, 0}, {16, 17}} - - - - 197 - 16 - 1000 - - 75497536 - 2048 - - - LucidaGrande - 11 - 3100 - - - 3 - MC4zMzMzMzI5OQA - - - 6 - System - headerTextColor - - 3 - MAA - - - - - 67108928 - 2624 - Text Cell - - - - 6 - System - controlBackgroundColor - - 3 - MC42NjY2NjY2NjY3AA - - - - 6 - System - controlTextColor - - + + + 256 + + {232, 321} + + + + YES + NO + YES + + + 256 + {{474, 0}, {16, 17}} + + + + 229 + 16 + 1000 + + 75497536 + 2048 + + + LucidaGrande + 11 + 3100 + + + 3 + MC4zMzMzMzI5OQA + + + 6 + System + headerTextColor + + 3 + MAA - 1 - YES - - - 3 - 2 - - 3 - MQA - - 6 - System - gridColor - - 3 - MC41AA + + 67108928 + 2624 + Text Cell + + + + 6 + System + controlBackgroundColor + + 3 + MC42NjY2NjY2NjY3AA + + + + 6 + System + controlTextColor + - 20 - 306184192 - - - 4 - 15 - 0 - YES - 0 - 1 - -1 - NO + 1 + YES + - {{1, 1}, {200, 318}} - - - - - - 4 - - - - -2147483392 - {{1, 1}, {8, 298}} - - - - NO - - _doScroller: - 0.4210526 - - - - -2147483392 - {{-100, -100}, {473, 15}} - - - - NO - 1 - - _doScroller: - 0.99789030000000001 + 3 + 2 + + 3 + MQA + + + 6 + System + gridColor + + 3 + MC41AA + + + 20 + 306184192 + + + 4 + 15 + 0 + YES + 0 + 1 + -1 + NO - {202, 320} - + {{1, 1}, {232, 321}} + - - 150034 - - - - QSAAAEEgAABBsAAAQbAAAA - 0.25 - 4 - 1 + + + + 4 - - {202, 320} - - - - NSView - - - - 256 - - - - 265 - {{228, 21}, {130, 12}} - + + + -2147483392 + {{1, 1}, {8, 298}} + - - _NS:9 - YES - - -2080374784 - 262144 - - _NS:9 - - 30 - 0.0 - 15 - 0.0 - 0 - 1 - NO - NO - + NO + + _doScroller: + 0.4210526 - - - 265 - {{228, 107}, {176, 12}} - + + + -2147483392 + {{-100, -100}, {473, 15}} + - - _NS:9 - YES - - -2080374784 - 262144 - - _NS:9 - - 20 - 0.0 - 4 - 0.0 - 0 - 1 - NO - NO - + NO + 1 + + _doScroller: + 0.99789030000000001 - - - 265 - {{226, 117}, {180, 20}} - - - - _NS:9 - YES - - 67108864 - 131072 - - _NS:9 - - - - 44 - ← - YES - 0 - - - 44 - → - 1 - 0 - - - 42 - ↑ - 0 - - - 41 - ↓ - 0 - - - 1 + + {234, 323} + + + + 150034 + + + + QSAAAEEgAABBsAAAQbAAAA + 0.25 + 4 + 1 + + + {234, 323} + + + + _NS:9 + NSView + + + + 285 + + + + 265 + {{191, 24}, {130, 12}} + + + + _NS:9 + YES + + -2080374784 + 262144 + + _NS:9 + + 30 + 0.0 + 15 + 0.0 + 0 + 1 + NO + NO + + NO + + + + 265 + {{191, 108}, {176, 12}} + + + + _NS:9 + YES + + -2080374784 + 262144 + + _NS:9 + + 20 + 0.0 + 4 + 0.0 + 0 + 1 + NO + NO + + NO + + + + 265 + {{189, 117}, {180, 20}} + + + + _NS:9 + YES + + 67108864 + 131072 + + _NS:9 + + + + 44 + ← + YES + 0 - NO - - - - 265 - {{226, 31}, {180, 20}} - - - - _NS:9 - YES - - 67108864 - 131072 - - _NS:9 - - - - 64 - ↑ - Scroll up continuously - YES - 0 - - - 63 - ↓ - Scroll down continuously - 1 - 0 - - - ⤒ - Scroll up one step - 0 - - - ⤓ - Scroll down one step - 0 - - - 1 + + 44 + → + 1 + 0 - NO - - - - 265 - {{226, 67}, {180, 24}} - - - - _NS:9 - YES - - 67108864 - 0 - - LucidaGrande - 13 - 16 - - _NS:9 - - - - 87 - Left - YES - 0 - - - 86 - Right - 1 - 0 - - - 1 + + 42 + ↑ + 0 - NO - - - - 265 - {{228, 197}, {176, 24}} - - - - _NS:9 - NJKeyInputField - - - - 265 - {{225, 152}, {182, 26}} - - - - YES - - -1539309504 - 2048 - - - 109199360 - 129 - - - 400 - 75 - - YES - - OtherViews - - - -1 - 1 - YES - YES - 2 + + 41 + ↓ + 0 - NO - - - - 268 - {{20, 16}, {200, 256}} - - - - NO - 6 - 1 - - - 603979776 - 0 - Do nothing - - - 1 - 1211912448 - 0 - - NSImage - NSRadioButton - - - NSRadioButton - - - - 200 - 25 - - - 603979776 - 0 - Press a key - - - 1211912448 - 0 - - - - 400 - 75 - - - 603979776 - 0 - Switch to mapping - - - 1211912448 - 0 - - - - 400 - 75 - - - 603979776 - 0 - Move the mouse - - - 1211912448 - 0 - - - - 400 - 75 - - - 603979776 - 0 - Press a mouse button - - - 1211912448 - 0 - - - - 400 - 75 - - - 603979776 - 0 - Scroll the mouse - - - 1211912448 - 0 - - - - 400 - 75 - - - {200, 41} - {4, 2} - 1353195520 - NSActionCell - - 603979776 - 0 - Radio - - 1211912448 - 0 - - - - 400 - 75 + + 1 + + NO + + + + 265 + {{189, 33}, {180, 20}} + + + + _NS:9 + YES + + 67108864 + 131072 + + _NS:9 + + + + 64 + ↑ + Scroll up continuously + YES + 0 - -1 - -1 - - 6 - System - controlColor - + + 63 + ↓ + Scroll down continuously + 1 + 0 - - + + ⤒ + Scroll up one step + 0 + + + ⤓ + Scroll down one step + 0 + + + 1 + + NO + + + + 265 + {{189, 70}, {180, 24}} + + + + _NS:9 + YES + + 67108864 + 0 + + LucidaGrande + 13 + 16 - - - 266 - {{0, 289}, {429, 17}} - - - - YES - - 67108928 - 138414656 - - - LucidaGrande-Bold - 13 - 16 - - No input selected - - - + _NS:9 + + + + 87 + Left + YES + 0 - NO + + 86 + Right + 1 + 0 + + + 1 + + NO + + + + 265 + {{191, 196}, {176, 23}} + + + + _NS:9 + NJKeyInputField + + + + 265 + {{188, 153}, {182, 26}} + + + + YES + + -1539309504 + 2048 + + + 109199360 + 129 + + + 400 + 75 + + YES + + OtherViews + - - - 10 - {{12, 278}, {405, 5}} - - - - {0, 0} - - 67108864 - 0 - Box - - - 6 - System - textBackgroundColor - - - - 3 - MCAwLjgwMDAwMDAxAA - + -1 + 1 + YES + YES + 2 + + NO + + + + 268 + {{24, 20}, {163, 250}} + + + + NO + 6 + 1 + + + 603979776 + 0 + Do nothing + + + 1 + 1211912448 + 0 + + NSImage + NSRadioButton - 3 - 2 - 0 - NO + + NSRadioButton + + + + 200 + 25 + + + 603979776 + 0 + Press a key: + + + 1211912448 + 0 + + + + 400 + 75 + + + 603979776 + 0 + Switch to mapping: + + + 1211912448 + 0 + + + + 400 + 75 + + + 603979776 + 0 + Move the mouse: + + + 1211912448 + 0 + + + + 400 + 75 + + + 603979776 + 0 + Press a mouse button: + + + 1211912448 + 0 + + + + 400 + 75 + + + 603979776 + 0 + Scroll the mouse: + + + 1211912448 + 0 + + + + 400 + 75 - {{211, 0}, {429, 320}} - + {163, 40} + {4, 2} + 1353195520 + NSActionCell + + 603979776 + 0 + Radio + + 1211912448 + 0 + + + + 400 + 75 + + -1 + -1 + + 6 + System + controlColor + + + + + + + + 266 + {{9, 286}, {369, 17}} + + + + YES + + 67108928 + 138414656 + + + LucidaGrande-Bold + 13 + 16 + + No input selected + + + + + NO + + + + 10 + {{12, 276}, {363, 5}} + - - NSView + + {0, 0} + + 67108864 + 0 + Box + + + 6 + System + textBackgroundColor + + + + 3 + MCAwLjgwMDAwMDAxAA + + + 3 + 2 + 0 + NO - {640, 320} + {{233, 0}, {387, 323}} - - YES - Main Split - - YES - - - - - - - - - + + _NS:9 + NSView - {640, 320} + {620, 323} - + {{0, 0}, {1440, 878}} - {640, 375} + {620, 378} {10000000000000, 10000000000000} Enjoyable YES @@ -1502,14 +1480,6 @@ aW5nLg 518 - - - outlineView - - - - 648 - mappingsController @@ -1550,6 +1520,14 @@ aW5nLg 879 + + + outlineView + + + + 648 + connectDevicePrompt @@ -1720,59 +1698,43 @@ aW5nLg - delegate - - - - 892 - - - - radioButtons + mappingsController - + - 692 + 821 - title + inputController - + - 709 + 828 - - radioChanged: + + mouseDirSelect - + - 731 + 756 - mouseBtnSelect + mappingPopup - + - 746 + 823 - mbtnChanged: - - - - 747 - - - - scrollDirSelect + mdirChanged: - + - 751 + 757 @@ -1784,19 +1746,19 @@ aW5nLg - mouseDirSelect + scrollSpeedSlider - + - 756 + 891 - mdirChanged: + radioChanged: - + - 757 + 731 @@ -1807,36 +1769,28 @@ aW5nLg 781 - - mappingsController + + mbtnChanged: - + - 821 + 747 - - mappingPopup + + mouseSpeedChanged: - + - 823 + 885 - inputController - - - - 828 - - - - mouseSpeedChanged: + radioButtons - + - 885 + 692 @@ -1856,19 +1810,35 @@ aW5nLg - scrollSpeedSlider + scrollDirSelect - + - 891 + 751 - keyDelegate - - - - 818 + mouseBtnSelect + + + + 746 + + + + title + + + + 709 + + + + keyDelegate + + + + 818 @@ -2114,7 +2084,8 @@ aW5nLg 453 - + + @@ -2204,241 +2175,16 @@ aW5nLg - - 652 - - - - - - - - - 653 - - - - - - - Input Devices Pane - - - 634 - - - - - - - - - - 637 - - - - - - Input Device List - - - 636 - - - - - 635 - - - - - 639 - - - - - - Device/Input Name - - - 642 - - - - - 654 - - - - - - - - - - - - - - - Output Editor Pane - 686 - - 656 - - - - - - - - - - - - Output Types - - - 657 - - - Disabled - - - 658 - - - Key Press - - - 699 - - - Switch Mapping - - - 700 - - - - - - Mapping Choice List - - - 701 - - - - - - - - 702 - - - - - - 706 - - - - - - Input Name - - - 707 - - - - - 708 - - - 723 - - 733 - - - Mouse Movement - - - 734 - - - Mouse Button - - - 735 - - - Mouse Scroll - - - 659 - - - - - 744 - - - - - - Mouse Button Selector - - - 745 - - - - - 749 - - - - - - Mouse Scroll Selector - - - 750 - - - - - 754 - - - - - - Mouse Motion Selector - - - 755 - - - - - 778 - - - 812 @@ -2568,32 +2314,6 @@ aW5nLg - - 883 - - - - - - - - 884 - - - - - 887 - - - - - - - - 888 - - - 893 @@ -2622,19 +2342,258 @@ aW5nLg + + 916 + + + + + + + 913 - + 914 + + 917 + + + + + + + + + + + + + + + + + 708 + + + + + 706 + + + + + + Input Name + + + 656 + + + + + + + + + + + + Output Types + + + 700 + + + + + + Mapping Choice List + + + 778 + + + + + 744 + + + + + + Mouse Button Selector + + + 749 + + + + + + Mouse Scroll Selector + + + 754 + + + + + + Mouse Motion Selector + + + 883 + + + + + + + + 887 + + + + + + + + 888 + + + + + 884 + + + + + 755 + + + + + 750 + + + + + 745 + + + + + 701 + + + + + + + + 702 + + + + + 657 + + + Disabled + + + 659 + + + + + 658 + + + Key Press + + + 699 + + + Switch Mapping + + + 733 + + + Mouse Movement + + + 734 + + + Mouse Button + + + 735 + + + Mouse Scroll + + + 707 + + + + + 634 + + + + + + + + + + 635 + + + + + 636 + + + + + 637 + + + + + + Input Device List + + + 639 + + + + + + Device/Input Name + + + 642 + + + @@ -2703,9 +2662,6 @@ aW5nLg com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -2811,13 +2767,15 @@ aW5nLg com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - 915 + 917