Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

2.0 #738

Open
wants to merge 24 commits into
base: master
Choose a base branch
from
Open

2.0 #738

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Added extras and forms back
  • Loading branch information
escoz committed May 27, 2014
commit 907e6a6a669147422ce117a4ecc3ca847e66c0c4
18 changes: 12 additions & 6 deletions Classes/Core/QuickDialog.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,19 +21,25 @@

#import "QuickDialogTableView.h"
#import "QuickDialogTableDelegate.h"

#import "QElement.h"
#import "QuickDialogEntryElementDelegate.h"
#import "QTextField.h"

#import "QAppearance.h"
#import "QFlatAppearance.h"


#import "QElement.h"
#import "QRootElement.h"
#import "QEntryElement.h"
#import "QElement+Appearance.h"
#import "QLoadingElement.h"

#import "QTableViewCell.h"
#import "QRootElement+JsonBuilder.h"
#import "QLoadingElement.h"
#import "QRootElement.h"
#import "QuickDialogController+Loading.h"
#import "QEntryTableViewCell.h"

#import "QRootBuilder.h"
#import "QRootElement+JsonBuilder.h"
#import "QDynamicDataSection.h"



6 changes: 4 additions & 2 deletions Classes/Extras/QColorPickerElement.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,12 @@
// Copyright (c) 2012 Quickfire Software. All rights reserved.
//

#import "QLabelElement.h"
#import "../Core/QuickDialog.h"
#import "../Forms/QRadioElement.h"
#import "../Forms/QRadioItemElement.h"

@interface QColorPickerElement : QRadioElement


- (void)setSelectedColor:(id)o;
- (void)setSelectedColor:(id)color;
@end
11 changes: 6 additions & 5 deletions Classes/Extras/QColorPickerElement.m
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,10 @@ - (void)updateCell:(QEntryTableViewCell *)cell selectedValue:(id)selectedValue {
- (UIImage *)getImageFromItem:(NSArray *)selectedValue {
id color = [selectedValue objectAtIndex:1];
if ([color isKindOfClass:[UIColor class]])
return [color imageByDrawingCircleOfColor];
return [color qd_imageByDrawingCircleOfColor];
if ([color isKindOfClass:[NSString class]])
return [[QColorPickerElement colorFromHexString:color] imageByDrawingCircleOfColor];
return [[UIColor blackColor] imageByDrawingCircleOfColor];
return [[QColorPickerElement colorFromHexString:color] qd_imageByDrawingCircleOfColor];
return [[UIColor blackColor] qd_imageByDrawingCircleOfColor];
}


Expand Down Expand Up @@ -81,9 +81,10 @@ + (UIColor *)colorFromHexString:(NSString *)hexString {
return [UIColor colorWithRed:((rgbValue & 0xFF0000) >> 16)/255.0 green:((rgbValue & 0xFF00) >> 8)/255.0 blue:(rgbValue & 0xFF)/255.0 alpha:1.0];
}

- (void)setSelectedColor:(NSString *)colorName {
- (void)setSelectedColor:(NSString *)color
{
for (NSArray *item in _items){
if ([colorName isEqualToString:[item objectAtIndex:0]]) {
if ([color isEqualToString:[item objectAtIndex:0]]) {
self.selected = [_items indexOfObject:item];
return;
}
Expand Down
4 changes: 1 addition & 3 deletions Classes/Extras/QMailElement.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,9 @@
// Copyright (c) 2013 ConferencesBox. All rights reserved.
//

#import <Foundation/Foundation.h>
#import <MessageUI/MessageUI.h>

#import "QuickDialog.h"
#import "QLabelElement.h"
#import "../Core/QuickDialog.h"

@interface QMailElement : QLabelElement <MFMailComposeViewControllerDelegate> {

Expand Down
3 changes: 1 addition & 2 deletions Classes/Extras/QMapElement.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,9 @@
// permissions and limitations under the License.
//

#import <Foundation/Foundation.h>
#import <CoreLocation/CoreLocation.h>

#import "QRootElement.h"
#import "../Core/QuickDialog.h"

/**
QMapElement: when selected, shows a fullscreen map with the location selected. Requires a lat/long value.
Expand Down
2 changes: 1 addition & 1 deletion Classes/Extras/QMapElement.m
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

#import "QMapViewController.h"
#import "QMapElement.h"
#import "QuickDialog.h"
#import "../Core/QuickDialog.h"

@implementation QMapElement

Expand Down
21 changes: 0 additions & 21 deletions Classes/Extras/QPickerElement.h

This file was deleted.

76 changes: 0 additions & 76 deletions Classes/Extras/QPickerElement.m

This file was deleted.

13 changes: 0 additions & 13 deletions Classes/Extras/QPickerTabDelimitedStringParser.h

This file was deleted.

24 changes: 0 additions & 24 deletions Classes/Extras/QPickerTabDelimitedStringParser.m

This file was deleted.

25 changes: 0 additions & 25 deletions Classes/Extras/QPickerTableViewCell.h

This file was deleted.

Loading