Display "Ignore Upgrades" in its own section with its own explanation. Introduces...

diff --git a/MobileCydia.app/English.lproj/Localizable.strings b/MobileCydia.app/English.lproj/Localizable.strings
index 4d1250e335dc5cfd1bf02668582d60f5a20a7792..56cc73a70c13fe7f869412b50eca6108347b8801 100644 (file)
--- a/MobileCydia.app/English.lproj/Localizable.strings
+++ b/MobileCydia.app/English.lproj/Localizable.strings
@@ -86,6 +86,7 @@
 "HOME" = "Home";
 "ID" = "ID";
 "IGNORE_UPGRADES" = "Ignore Upgrades";
+"IGNORE_UPGRADES_EX" = "Activate this switch to keep this package at its current version. Cydia will display this package at the top of Changes if there is an upgrade available, but it will not be included in Upgrade All.";
 "IGNORED_UPGRADES" = "Ignored Upgrades";
 "ILLEGAL_PACKAGE_IDENTIFIER" = "Illegal Package Identifier";
 "INSTALL" = "Install";

diff --git a/MobileCydia.mm b/MobileCydia.mm
index c5b0babb1269bc1b8010e5ec5c0c6ca3e6fd071f..db250f86bb7585cffce50a29c37522e08fab4ea1 100644 (file)
--- a/MobileCydia.mm
+++ b/MobileCydia.mm
@@ -7593,25 +7593,29 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
     if (package_ == nil)
         return 0;
 
-    return 1;
+    if ([package_ installed] == nil)
+        return 1;
+    else
+        return 2;
 }
 
 - (NSInteger) tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section {
     if (package_ == nil)
         return 0;
 
-    if ([package_ installed] == nil)
-        return 1;
-    else
-        return 2;
+    // both sections contain just one item right now.
+    return 1;
 }
 
 - (NSString *) tableView:(UITableView *)tableView titleForHeaderInSection:(NSInteger)section {
-    return UCLocalize("CHANGE_PACKAGE_SETTINGS");
+    return nil;
 }
 
 - (NSString *) tableView:(UITableView *)tableView titleForFooterInSection:(NSInteger)section {
-    return UCLocalize("SHOW_ALL_CHANGES_EX");
+    if (section == 0)
+        return UCLocalize("SHOW_ALL_CHANGES_EX");
+    else
+        return UCLocalize("IGNORE_UPGRADES_EX");
 }
 
 - (void) onSubscribed:(id)control {
@@ -7665,7 +7669,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) {
     if (package_ == nil)
         return nil;
 
-    switch ([indexPath row]) {
+    switch ([indexPath section]) {
         case 0: return subscribedCell_;
         case 1: return ignoredCell_;