diff options
| -rw-r--r-- | Cydia/ProgressEvent.h | 93 | ||||
| -rw-r--r-- | MobileCydia.mm | 49 | ||||
| -rw-r--r-- | makefile | 2 |
3 files changed, 97 insertions, 47 deletions
diff --git a/Cydia/ProgressEvent.h b/Cydia/ProgressEvent.h new file mode 100644 index 0000000..0aa4d84 --- /dev/null +++ b/Cydia/ProgressEvent.h @@ -0,0 +1,93 @@ +/* Cydia - iPhone UIKit Front-End for Debian APT + * Copyright (C) 2008-2011 Jay Freeman (saurik) +*/ + +/* Modified BSD License {{{ */ +/* + * Redistribution and use in source and binary + * forms, with or without modification, are permitted + * provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the + * above copyright notice, this list of conditions + * and the following disclaimer. + * 2. Redistributions in binary form must reproduce the + * above copyright notice, this list of conditions + * and the following disclaimer in the documentation + * and/or other materials provided with the + * distribution. + * 3. The name of the author may not be used to endorse + * or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +*/ +/* }}} */ + +#ifndef Cydia_ProgressEvent_H +#define Cydia_ProgressEvent_H + +#include <Foundation/Foundation.h> + +#include <CydiaSubstrate/CydiaSubstrate.h> + +#include <apt-pkg/acquire.h> + +@interface CydiaProgressEvent : NSObject { + _H<NSString> message_; + _H<NSString> type_; + + _H<NSArray> item_; + _H<NSString> package_; + _H<NSString> url_; + _H<NSString> version_; +} + ++ (CydiaProgressEvent *) eventWithMessage:(NSString *)message ofType:(NSString *)type; ++ (CydiaProgressEvent *) eventWithMessage:(NSString *)message ofType:(NSString *)type forPackage:(NSString *)package; ++ (CydiaProgressEvent *) eventWithMessage:(NSString *)message ofType:(NSString *)type forItem:(pkgAcquire::ItemDesc &)item; + +- (id) initWithMessage:(NSString *)message ofType:(NSString *)type; + +- (NSString *) message; +- (NSString *) type; + +- (NSArray *) item; +- (NSString *) package; +- (NSString *) url; +- (NSString *) version; + +- (void) setItem:(NSArray *)item; +- (void) setPackage:(NSString *)package; +- (void) setURL:(NSString *)url; +- (void) setVersion:(NSString *)version; + +- (NSString *) compound:(NSString *)value; +- (NSString *) compoundMessage; +- (NSString *) compoundTitle; + +@end + +@protocol ProgressDelegate +- (void) addProgressEvent:(CydiaProgressEvent *)event; +- (void) setProgressPercent:(NSNumber *)percent; +- (void) setProgressStatus:(NSDictionary *)status; +- (void) setProgressCancellable:(NSNumber *)cancellable; +- (bool) isProgressCancelled; +- (void) setTitle:(NSString *)title; +@end + +#endif//Cydia_ProgressEvent_H diff --git a/MobileCydia.mm b/MobileCydia.mm index 7e31233..e26cd87 100644 --- a/MobileCydia.mm +++ b/MobileCydia.mm @@ -120,12 +120,14 @@ extern "C" { #include <Cytore.hpp> +#include "Menes/Menes.h" + #include "CyteKit/PerlCompatibleRegEx.hpp" #include "CyteKit/WebScriptObject-Cyte.h" #include "CyteKit/WebViewController.h" #include "CyteKit/stringWithUTF8Bytes.h" -#include "Menes/Menes.h" +#include "Cydia/ProgressEvent.h" #include "SDURLCache/SDURLCache.h" @@ -990,51 +992,6 @@ bool isSectionVisible(NSString *section) { @end /* }}} */ -/* ProgressEvent Interface/Delegate {{{ */ -@interface CydiaProgressEvent : NSObject { - _H<NSString> message_; - _H<NSString> type_; - - _H<NSArray> item_; - _H<NSString> package_; - _H<NSString> url_; - _H<NSString> version_; -} - -+ (CydiaProgressEvent *) eventWithMessage:(NSString *)message ofType:(NSString *)type; -+ (CydiaProgressEvent *) eventWithMessage:(NSString *)message ofType:(NSString *)type forPackage:(NSString *)package; -+ (CydiaProgressEvent *) eventWithMessage:(NSString *)message ofType:(NSString *)type forItem:(pkgAcquire::ItemDesc &)item; - -- (id) initWithMessage:(NSString *)message ofType:(NSString *)type; - -- (NSString *) message; -- (NSString *) type; - -- (NSArray *) item; -- (NSString *) package; -- (NSString *) url; -- (NSString *) version; - -- (void) setItem:(NSArray *)item; -- (void) setPackage:(NSString *)package; -- (void) setURL:(NSString *)url; -- (void) setVersion:(NSString *)version; - -- (NSString *) compound:(NSString *)value; -- (NSString *) compoundMessage; -- (NSString *) compoundTitle; - -@end - -@protocol ProgressDelegate -- (void) addProgressEvent:(CydiaProgressEvent *)event; -- (void) setProgressPercent:(NSNumber *)percent; -- (void) setProgressStatus:(NSDictionary *)status; -- (void) setProgressCancellable:(NSNumber *)cancellable; -- (bool) isProgressCancelled; -- (void) setTitle:(NSString *)title; -@end -/* }}} */ /* Status Delegation {{{ */ class Status : public pkgAcquireStatus @@ -70,7 +70,7 @@ sysroot: @echo 1>&2 @exit 1 -MobileCydia: sysroot MobileCydia.mm CyteKit/*.h CyteKit/*.mm Menes/*.h Menes/*.mm SDURLCache/SDURLCache.h SDURLCache/SDURLCache.m iPhonePrivate.h lookup3.o Cytore.hpp +MobileCydia: sysroot MobileCydia.mm $(filter-out SDURLCache/SDURLCacheTests.m,$(foreach dir,Menes CyteKit Cydia SDURLCache,$(wildcard $(dir)/*.h $(dir)/*.m $(dir)/*.mm))) iPhonePrivate.h lookup3.o Cytore.hpp $(cycc) $(filter %.mm,$^) $(filter %.o,$^) $(foreach m,$(filter %.m,$^),-x objective-c++ $(m)) $(flags) $(link) $(uikit) -DCYDIA_VERSION='"$(version)"' ldid -Slaunch.xml $@ || { rm -f $@ && false; } |