X-Git-Url: https://git.yukkurigames.com/?p=enjoyable.git;a=blobdiff_plain;f=Classes%2FNJOutputViewController.m;h=8d0f817aa1db033719d4fb47f8515de950f6e791;hp=0ca3938b80b6276562c6b0fce5d41f118f59ece1;hb=baa03e73a5af66b725f58fa5efd04bf54b7b2eed;hpb=7c9337b7789b0e940cc71f02c7cb7bd92dd2de70

diff --git a/Classes/NJOutputViewController.m b/Classes/NJOutputViewController.m
index 0ca3938..8d0f817 100644
--- a/Classes/NJOutputViewController.m
+++ b/Classes/NJOutputViewController.m
@@ -54,7 +54,7 @@
     
     if (row != 3) {
         self.mouseDirSelect.selectedSegment = -1;
-        self.mouseSpeedSlider.floatValue = self.mouseSpeedSlider.minValue;
+        self.mouseSpeedSlider.doubleValue = self.mouseSpeedSlider.minValue;
         [self.mouseDirSelect resignIfFirstResponder];
     } else {
         if (self.mouseDirSelect.selectedSegment == -1)
@@ -71,7 +71,7 @@
     
     if (row != 5) {
         self.scrollDirSelect.selectedSegment = -1;
-        self.scrollSpeedSlider.floatValue = self.scrollSpeedSlider.minValue;
+        self.scrollSpeedSlider.doubleValue = self.scrollSpeedSlider.minValue;
         self.smoothCheck.state = NSOffState;
         [self.scrollDirSelect resignIfFirstResponder];
         [self.scrollSpeedSlider resignIfFirstResponder];
@@ -83,7 +83,7 @@
         
 }
 
-- (IBAction)radioChanged:(NSView *)sender {
+- (IBAction)outputTypeChanged:(NSView *)sender {
     [sender.window makeFirstResponder:sender];
     if (self.radioButtons.selectedRow == 1)
         [self.keyInput.window makeFirstResponder:self.keyInput];
@@ -108,7 +108,7 @@
     [self commit];
 }
 
-- (void)mdirChanged:(NSView *)sender {
+- (void)mouseDirectionChanged:(NSView *)sender {
     [self.radioButtons selectCellAtRow:3 column:0];
     [sender.window makeFirstResponder:sender];
     [self commit];
@@ -120,13 +120,13 @@
     [self commit];
 }
 
-- (void)mbtnChanged:(NSView *)sender {
+- (void)mouseButtonChanged:(NSView *)sender {
     [self.radioButtons selectCellAtRow:4 column:0];
     [sender.window makeFirstResponder:sender];
     [self commit];
 }
 
-- (void)sdirChanged:(NSView *)sender {
+- (void)scrollDirectionChanged:(NSView *)sender {
     [self.radioButtons selectCellAtRow:5 column:0];
     [sender.window makeFirstResponder:sender];
     [self commit];
@@ -142,12 +142,12 @@
     [self.radioButtons selectCellAtRow:5 column:0];
     [sender.window makeFirstResponder:sender];
     if (sender.state == NSOnState) {
-        self.scrollSpeedSlider.floatValue =
+        self.scrollSpeedSlider.doubleValue =
             self.scrollSpeedSlider.minValue
             + (self.scrollSpeedSlider.maxValue - self.scrollSpeedSlider.minValue) / 2;
         self.scrollSpeedSlider.enabled = YES;
     } else {
-        self.scrollSpeedSlider.floatValue = self.scrollSpeedSlider.minValue;
+        self.scrollSpeedSlider.doubleValue = self.scrollSpeedSlider.minValue;
         self.scrollSpeedSlider.enabled = NO;
     }
     [self commit];
@@ -174,18 +174,18 @@
         }
         case 3: {
             NJOutputMouseMove *mm = [[NJOutputMouseMove alloc] init];
-            mm.axis = self.mouseDirSelect.selectedSegment;
+            mm.axis = (int)self.mouseDirSelect.selectedSegment;
             mm.speed = self.mouseSpeedSlider.floatValue;
             return mm;
         }
         case 4: {
             NJOutputMouseButton *mb = [[NJOutputMouseButton alloc] init];
-            mb.button = [self.mouseBtnSelect.cell tagForSegment:self.mouseBtnSelect.selectedSegment];
+            mb.button = (int)[self.mouseBtnSelect.cell tagForSegment:self.mouseBtnSelect.selectedSegment];
             return mb;
         }
         case 5: {
             NJOutputMouseScroll *ms = [[NJOutputMouseScroll alloc] init];
-            ms.direction = [self.scrollDirSelect.cell tagForSegment:self.scrollDirSelect.selectedSegment];
+            ms.direction = (int)[self.scrollDirSelect.cell tagForSegment:self.scrollDirSelect.selectedSegment];
             ms.speed = self.scrollSpeedSlider.floatValue;
             ms.smooth = self.smoothCheck.state == NSOnState;
             return ms;