Better Queue UI. Discoverable. WebKit JS/objc bridge.

diff --git a/Cydia.app/confirm.html b/Cydia.app/confirm.html
index f5c2c90b0066b38d76b0c59ab4216b1b9970baef..846f465230fb9b999f36b950459e6f40d9176821 100644 (file)
--- a/Cydia.app/confirm.html
+++ b/Cydia.app/confirm.html
@@ -32,5 +32,11 @@
 <fieldset id="modifications">
 </fieldset>
 
 <fieldset id="modifications">
 </fieldset>
 

+<fieldset class="queue" style="margin-top: 25px;">
+<a href="javascript:queue();" style="text-align: center; color: #2a3f70; font-size: 15px; background-image: none;">
+    <label localize="CONTINUE_QUEUING"></label>
+</div></a>
+</fieldset>
+

 </panel>
 </body></html>
 </panel>
 </body></html>

diff --git a/Cydia.app/confirm.js b/Cydia.app/confirm.js
index 5ef99bf4e70298c1b21b73e5294f73d442431c7d..cc00bf4727fbdd9a9d5fd5908351f2a73eb216cc 100644 (file)
--- a/Cydia.app/confirm.js
+++ b/Cydia.app/confirm.js
@@ -15,6 +15,8 @@ $(function () {
         $("#resuming").html($.xml(resuming));
     } else for (var i = 0; i != issues.length; ++i) {
         document.title = cydia.localize("CANNOT_COMPLY");
         $("#resuming").html($.xml(resuming));
     } else for (var i = 0; i != issues.length; ++i) {
         document.title = cydia.localize("CANNOT_COMPLY");

+        
+        $(".queue").remove();

 
         $("._issues").remove();
 
 
         $("._issues").remove();
 

diff --git a/Cydia.mm b/Cydia.mm
index 03d69bc17dab4642d46bb3876d1d44e4b709effe..4400c3df11c668311ddf07f570254d3add56c948 100644 (file)
--- a/Cydia.mm
+++ b/Cydia.mm
@@ -4057,11 +4057,19 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
     }
 }
 
     }
 }
 

+- (id) invokeDefaultMethodWithArguments:(NSArray *)args {
+    [self dismissModalViewControllerAnimated:YES];
+    [delegate_ cancelAndClear:NO];
+    
+    return nil;
+}
+

 - (void) webView:(WebView *)sender didClearWindowObject:(WebScriptObject *)window forFrame:(WebFrame *)frame {
     [super webView:sender didClearWindowObject:window forFrame:frame];
     [window setValue:changes_ forKey:@"changes"];
     [window setValue:issues_ forKey:@"issues"];
     [window setValue:sizes_ forKey:@"sizes"];
 - (void) webView:(WebView *)sender didClearWindowObject:(WebScriptObject *)window forFrame:(WebFrame *)frame {
     [super webView:sender didClearWindowObject:window forFrame:frame];
     [window setValue:changes_ forKey:@"changes"];
     [window setValue:issues_ forKey:@"issues"];
     [window setValue:sizes_ forKey:@"sizes"];

+    [window setValue:self forKey:@"queue"];

 }
 
 - (id) initWithDatabase:(Database *)database {
 }
 
 - (id) initWithDatabase:(Database *)database {


@@ -4152,7 +4160,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
         [self loadURL:[NSURL fileURLWithPath:[[NSBundle mainBundle] pathForResource:@"confirm" ofType:@"html"]]];
 
         UIBarButtonItem *leftItem = [[UIBarButtonItem alloc]
         [self loadURL:[NSURL fileURLWithPath:[[NSBundle mainBundle] pathForResource:@"confirm" ofType:@"html"]]];
 
         UIBarButtonItem *leftItem = [[UIBarButtonItem alloc]

-            initWithTitle:[NSString stringWithFormat:UCLocalize("SLASH_DELIMITED"), UCLocalize("CANCEL"), UCLocalize("QUEUE")]
+            initWithTitle:UCLocalize("CANCEL")//[NSString stringWithFormat:UCLocalize("SLASH_DELIMITED"), UCLocalize("CANCEL"), UCLocalize("QUEUE")]

             style:UIBarButtonItemStylePlain
             target:self
             action:@selector(cancelButtonClicked)
             style:UIBarButtonItemStylePlain
             target:self
             action:@selector(cancelButtonClicked)


@@ -4179,7 +4187,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 }
 
 - (void) cancelButtonClicked {
 }
 
 - (void) cancelButtonClicked {

-    UIActionSheet *sheet = [[UIActionSheet alloc]
+    /*UIActionSheet *sheet = [[UIActionSheet alloc]

         initWithTitle:nil
         delegate:self
         cancelButtonTitle:nil
         initWithTitle:nil
         delegate:self
         cancelButtonTitle:nil


@@ -4192,7 +4200,9 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
     [sheet addButtonWithTitle:UCLocalize("CONTINUE_QUEUING")];
     [sheet setContext:@"cancel"];
 
     [sheet addButtonWithTitle:UCLocalize("CONTINUE_QUEUING")];
     [sheet setContext:@"cancel"];
 

-    [delegate_ showActionSheet:[sheet autorelease] fromItem:[[self navigationItem] leftBarButtonItem]];
+    [delegate_ showActionSheet:[sheet autorelease] fromItem:[[self navigationItem] leftBarButtonItem]];*/
+    [self dismissModalViewControllerAnimated:YES];
+    [delegate_ cancelAndClear:YES];

 }
 
 #if !AlwaysReload
 }
 
 #if !AlwaysReload


@@ -5067,9 +5077,9 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
     return files_ == nil ? 0 : [files_ count];
 }
 
     return files_ == nil ? 0 : [files_ count];
 }
 

-- (float) tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath {
-    return 24;
-}
+/*- (CGFloat) tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath {
+    return 24.0f;
+}*/

 
 - (UITableViewCell *) tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
     static NSString *reuseIdentifier = @"Cell";
 
 - (UITableViewCell *) tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
     static NSString *reuseIdentifier = @"Cell";


@@ -5094,6 +5104,8 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
         files_ = [[NSMutableArray arrayWithCapacity:32] retain];
 
         list_ = [[UITableView alloc] initWithFrame:[[self view] bounds]];
         files_ = [[NSMutableArray arrayWithCapacity:32] retain];
 
         list_ = [[UITableView alloc] initWithFrame:[[self view] bounds]];

+        [list_ setAutoresizingMask:UIViewAutoresizingFlexibleBoth];
+        [list_ setRowHeight:24.0f];

         [[self view] addSubview:list_];
 
         [list_ setDataSource:self];
         [[self view] addSubview:list_];
 
         [list_ setDataSource:self];


@@ -5436,10 +5448,9 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
     [list_ deselectRowAtIndexPath:[list_ indexPathForSelectedRow] animated:animated];
 }
 
     [list_ deselectRowAtIndexPath:[list_ indexPathForSelectedRow] animated:animated];
 }
 

-- (CGFloat) tableView:(UITableView *)table heightForRowAtIndexPath:(NSIndexPath *)path {
-    return 73;
+/*- (CGFloat) tableView:(UITableView *)table heightForRowAtIndexPath:(NSIndexPath *)path {

     return [PackageCell heightForPackage:[self packageAtIndexPath:path]];
     return [PackageCell heightForPackage:[self packageAtIndexPath:path]];

-}
+}*/

 
 - (NSIndexPath *) tableView:(UITableView *)table willSelectRowAtIndexPath:(NSIndexPath *)path {
     Package *package([self packageAtIndexPath:path]);
 
 - (NSIndexPath *) tableView:(UITableView *)table willSelectRowAtIndexPath:(NSIndexPath *)path {
     Package *package([self packageAtIndexPath:path]);


@@ -5471,6 +5482,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
 
         list_ = [[UITableView alloc] initWithFrame:[self bounds] style:UITableViewStylePlain];
         [list_ setAutoresizingMask:UIViewAutoresizingFlexibleBoth];
 
         list_ = [[UITableView alloc] initWithFrame:[self bounds] style:UITableViewStylePlain];
         [list_ setAutoresizingMask:UIViewAutoresizingFlexibleBoth];

+        [list_ setRowHeight:73.0f];

         [self addSubview:list_];
 
         [list_ setDataSource:self];
         [self addSubview:list_];
 
         [list_ setDataSource:self];


@@ -6766,9 +6778,9 @@ freeing the view controllers on tab change */
     return editing_ ? [sections_ count] : [filtered_ count] + 1;
 }
 
     return editing_ ? [sections_ count] : [filtered_ count] + 1;
 }
 

-- (CGFloat) tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath {
-    return 45;
-}
+/*- (CGFloat) tableView:(UITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath {
+    return 45.0f;
+}*/

 
 - (UITableViewCell *) tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
     static NSString *reuseIdentifier = @"SectionCell";
 
 - (UITableViewCell *) tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath {
     static NSString *reuseIdentifier = @"SectionCell";


@@ -6824,6 +6836,7 @@ freeing the view controllers on tab change */
 
         list_ = [[UITableView alloc] initWithFrame:[[self view] bounds]];
         [list_ setAutoresizingMask:UIViewAutoresizingFlexibleBoth];
 
         list_ = [[UITableView alloc] initWithFrame:[[self view] bounds]];
         [list_ setAutoresizingMask:UIViewAutoresizingFlexibleBoth];

+        [list_ setRowHeight:45.0f];

         [[self view] addSubview:list_];
 
         [list_ setDataSource:self];
         [[self view] addSubview:list_];
 
         [list_ setDataSource:self];


@@ -7019,10 +7032,9 @@ freeing the view controllers on tab change */
     return cell;
 }
 
     return cell;
 }
 

-- (CGFloat) tableView:(UITableView *)table heightForRowAtIndexPath:(NSIndexPath *)path {
-    return 73;
+/*- (CGFloat) tableView:(UITableView *)table heightForRowAtIndexPath:(NSIndexPath *)path {

     return [PackageCell heightForPackage:[self packageAtIndexPath:path]];
     return [PackageCell heightForPackage:[self packageAtIndexPath:path]];

-}
+}*/

 
 - (NSIndexPath *) tableView:(UITableView *)table willSelectRowAtIndexPath:(NSIndexPath *)path {
     Package *package([self packageAtIndexPath:path]);
 
 - (NSIndexPath *) tableView:(UITableView *)table willSelectRowAtIndexPath:(NSIndexPath *)path {
     Package *package([self packageAtIndexPath:path]);


@@ -7054,6 +7066,7 @@ freeing the view controllers on tab change */
 
         list_ = [[UITableView alloc] initWithFrame:[[self view] bounds] style:UITableViewStylePlain];
         [list_ setAutoresizingMask:UIViewAutoresizingFlexibleBoth];
 
         list_ = [[UITableView alloc] initWithFrame:[[self view] bounds] style:UITableViewStylePlain];
         [list_ setAutoresizingMask:UIViewAutoresizingFlexibleBoth];

+        [list_ setRowHeight:73.0f];

         [[self view] addSubview:list_];
 
         [list_ setDataSource:self];
         [[self view] addSubview:list_];
 
         [list_ setDataSource:self];