Merge branch 'smartschool_backport'

Author: Stef Geelen

QuickDialog.podspec

@@ -13,6 +13,7 @@ Pod::Spec.new do |s|
                    'and efficient, you can create forms with multiple text fields, or with ' \
                    'thousands of items with no sweat!'
 
+  s.source_files = 'quickdialog', 'extras', '*.{h,m}'
   s.requires_arc = true
   s.default_subspec = "Core"
 
@@ -21,9 +22,12 @@ Pod::Spec.new do |s|
   end
 
   s.subspec "Extras" do |sp|
-    sp.dependency 'QuickDialog/Core'
     sp.source_files = 'extras', '*.{h,m}'
   end
 
-
+  s.prefix_header_contents = <<-EOS
+#ifdef __OBJC__
+    #import "QuickDialog.h"
+#endif
+EOS
 end

extras/QPickerTableViewCell.h

@@ -8,6 +8,8 @@
 
 #import "QEntryTableViewCell.h"
 
+extern NSString * const QPickerTableViewCellIdentifier;
+
 @interface QPickerTableViewCell : QEntryTableViewCell <UIPickerViewDataSource, UIPickerViewDelegate>
 {
     UIPickerView *_pickerView;

quickdialog/QBooleanElement.m

@@ -1,13 +1,13 @@
-//                                
+//
 // Copyright 2011 ESCOZ Inc  - http://escoz.com
-// 
-// Licensed under the Apache License, Version 2.0 (the "License"); you may not use this 
-// file except in compliance with the License. You may obtain a copy of the License at 
-// 
-// http://www.apache.org/licenses/LICENSE-2.0 
-// 
+//
+// Licensed under the Apache License, Version 2.0 (the "License"); you may not use this
+// file except in compliance with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
 // Unless required by applicable law or agreed to in writing, software distributed under
-// the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF 
+// the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
 // ANY KIND, either express or implied. See the License for the specific language governing
 // permissions and limitations under the License.
 //
@@ -100,12 +100,19 @@ - (void)selected:(QuickDialogTableView *)tableView controller:(QuickDialogContro
 - (void)buttonPressed:(UIButton *)boolButton {
     self.boolValue = !boolButton.selected;
     boolButton.selected = _boolValue;
-    [self performAccessoryAction];
+    if (_controller!=nil && self.controllerAccessoryAction!=nil) {
+        SEL selector = NSSelectorFromString(self.controllerAccessoryAction);
+        if ([_controller respondsToSelector:selector]) {
+            [(id)_controller performSelector:selector withObject:_controller];
+        }  else {
+            NSLog(@"No method '%@' was found on controller %@", self.controllerAccessoryAction, [_controller class]);
+        }
+    }
 }
 
 -(void)setBoolValue:(BOOL)boolValue {
     _boolValue = boolValue;
-    
+
     [self handleEditingChanged];
 }
 
@@ -117,8 +124,8 @@ - (void)switched:(id)boolSwitch {
 }
 
 - (void)fetchValueIntoObject:(id)obj {
-	if (_key==nil)
-		return;
+        if (_key==nil)
+                return;
     [obj setValue:[NSNumber numberWithBool:self.boolValue] forKey:_key];
 }
 

quickdialog/QElement.m

@@ -1,13 +1,13 @@
-//                                
+//
 // Copyright 2011 ESCOZ Inc  - http://escoz.com
-// 
-// Licensed under the Apache License, Version 2.0 (the "License"); you may not use this 
-// file except in compliance with the License. You may obtain a copy of the License at 
-// 
-// http://www.apache.org/licenses/LICENSE-2.0 
-// 
+//
+// Licensed under the Apache License, Version 2.0 (the "License"); you may not use this
+// file except in compliance with the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
 // Unless required by applicable law or agreed to in writing, software distributed under
-// the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF 
+// the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
 // ANY KIND, either express or implied. See the License for the specific language governing
 // permissions and limitations under the License.
 //
@@ -59,14 +59,14 @@ - (QElement *)initWithKey:(NSString *)key {
 
 - (UITableViewCell *)getCellForTableView:(QuickDialogTableView *)tableView controller:(QuickDialogController *)controller {
     _controller = controller;
-    
+
     QTableViewCell *cell= [self getOrCreateEmptyCell:tableView];
 
     [cell applyAppearanceForElement:self];
 
-    cell.textLabel.text = nil; 
-    cell.detailTextLabel.text = nil; 
-    cell.imageView.image = nil; 
+    cell.textLabel.text = nil;
+    cell.detailTextLabel.text = nil;
+    cell.imageView.image = nil;
     cell.selectionStyle = UITableViewCellSelectionStyleNone;
     cell.showsReorderControl = YES;
     cell.accessoryView = nil;
@@ -82,17 +82,29 @@ - (QTableViewCell *)getOrCreateEmptyCell:(QuickDialogTableView *)tableView {
     return cell;
 }
 
+- (void)handleElementSelected:(QuickDialogController *)controller {
+    if (_onSelected!= nil)
+        _onSelected();
 
+    if (self.controllerAction!=NULL && !controller.quickDialogTableView.editing){
+        SEL selector = NSSelectorFromString(self.controllerAction);
+        if ([controller respondsToSelector:selector]) {
+            [(id)controller performSelector:selector withObject:controller];
+        }  else {
+            NSLog(@"No method '%@' was found on controller %@", self.controllerAction, [controller class]);
+        }
+    }
+}
 
 - (void)selectedAccessory:(QuickDialogTableView *)tableView  controller:(QuickDialogController *)controller indexPath:(NSIndexPath *)indexPath{
     if (self.controllerAccessoryAction!=NULL){
-            SEL selector = NSSelectorFromString(self.controllerAccessoryAction);
-            if ([controller respondsToSelector:selector]) {
-                ((void (*)(id, SEL, id)) objc_msgSend)(controller, selector, self);
-            }  else {
-                NSLog(@"No method '%@' was found on controller %@", self.controllerAccessoryAction, [controller class]);
-            }
+        SEL selector = NSSelectorFromString(self.controllerAccessoryAction);
+        if ([controller respondsToSelector:selector]) {
+            [(id)controller performSelector:selector withObject:controller];
+        }  else {
+            NSLog(@"No method '%@' was found on controller %@", self.controllerAccessoryAction, [controller class]);
         }
+    }
 }
 
 - (void)selected:(QuickDialogTableView *)tableView controller:(QuickDialogController *)controller indexPath:(NSIndexPath *)indexPath {
@@ -144,7 +156,7 @@ - (void)performAction
     if (self.controllerAction!=NULL){
         SEL selector = NSSelectorFromString(self.controllerAction);
         if ([_controller respondsToSelector:selector]) {
-			((void (*)(id, SEL, id)) objc_msgSend)(_controller, selector, self);
+                        ((void (*)(id, SEL, id)) objc_msgSend)(_controller, selector, self);
         }  else {
             NSLog(@"No method '%@' was found on controller %@", self.controllerAction, [_controller class]);
         }