From 8c7e4c81df29e7d2c745a76517dc0d68711b4eea Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Sat, 24 Sep 2016 15:46:48 +0000
Subject: [PATCH] correct readonly status when creating the parameter
---
contrib/mobile/iOS/Onelab/Onelab-Info.plist | 2 +-
contrib/mobile/iOS/Onelab/Parameter.mm | 12 ++++++++++++
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/contrib/mobile/iOS/Onelab/Onelab-Info.plist b/contrib/mobile/iOS/Onelab/Onelab-Info.plist
index aad21154bd..6ee524ebe6 100644
--- a/contrib/mobile/iOS/Onelab/Onelab-Info.plist
+++ b/contrib/mobile/iOS/Onelab/Onelab-Info.plist
@@ -39,7 +39,7 @@
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
- <string>1.3.1.6</string>
+ <string>1.3.1.7</string>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>UIFileSharingEnabled</key>
diff --git a/contrib/mobile/iOS/Onelab/Parameter.mm b/contrib/mobile/iOS/Onelab/Parameter.mm
index 0bb9760b2f..91f9d5bebb 100644
--- a/contrib/mobile/iOS/Onelab/Parameter.mm
+++ b/contrib/mobile/iOS/Onelab/Parameter.mm
@@ -61,6 +61,8 @@
button = [UIButton buttonWithType:UIButtonTypeSystem];
[button addTarget:self action:@selector(selectValue) forControlEvents:UIControlEventTouchDown];
[button setTitle:[Utils getStringFromCString:string.getValue().c_str()] forState:UIControlStateNormal];
+ [button setEnabled:(string.getReadOnly() ? FALSE : TRUE)];
+ [label setEnabled:(string.getReadOnly() ? FALSE : TRUE)];
}
return self;
}
@@ -132,6 +134,8 @@
[button addTarget:self action:@selector(selectValue) forControlEvents:UIControlEventTouchDown];
[button setTitle:[Utils getStringFromCString:number.getValueLabel(number.getValue()).c_str()]
forState:UIControlStateNormal];
+ [button setEnabled:(number.getReadOnly() ? FALSE : TRUE)];
+ [label setEnabled:(number.getReadOnly() ? FALSE : TRUE)];
}
return self;
}
@@ -218,6 +222,8 @@
checkbox = [[UISwitch alloc] init];
[checkbox setOn:(number.getValue() == 1)];
[checkbox addTarget:self action:@selector(valueChange:) forControlEvents:UIControlEventValueChanged];
+ [checkbox setEnabled:(number.getReadOnly() ? FALSE : TRUE)];
+ [label setEnabled:(number.getReadOnly() ? FALSE : TRUE)];
}
return self;
}
@@ -272,6 +278,8 @@
[stepper addTarget:self action:@selector(stepperValueChanged:) forControlEvents:UIControlEventValueChanged];
[label setText:[NSString stringWithFormat:@"%@ %d", [Utils getStringFromCString:number.getShortName().c_str()],
(int)number.getValue()]];
+ [stepper setEnabled:(number.getReadOnly() ? FALSE : TRUE)];
+ [label setEnabled:(number.getReadOnly() ? FALSE : TRUE)];
}
return self;
}
@@ -331,6 +339,8 @@
[slider addTarget:self action:@selector(sliderValueChanged:) forControlEvents:UIControlEventTouchUpInside];
[label setText:[NSString stringWithFormat:@"%@ %g", [Utils getStringFromCString:number.getShortName().c_str()],
number.getValue()]];
+ [slider setEnabled:(number.getReadOnly() ? FALSE : TRUE)];
+ [label setEnabled:(number.getReadOnly() ? FALSE : TRUE)];
}
return self;
}
@@ -395,6 +405,8 @@
nil];
[numberToolbar sizeToFit];
textbox.inputAccessoryView = numberToolbar;
+ [textbox setEnabled:(number.getReadOnly() ? FALSE : TRUE)];
+ [label setEnabled:(number.getReadOnly() ? FALSE : TRUE)];
}
return self;
}
--
GitLab