Replace Simple/Expert toggle with segment control.

diff --git a/MobileCydia.mm b/MobileCydia.mm
index 63da71f417e2c802256c949fd4933cd5d1c8aca2..f0aeca21e7006e92d0f856a26fc9609ecd030b21 100644 (file)
--- a/MobileCydia.mm
+++ b/MobileCydia.mm
@@ -7841,12 +7841,9 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi
 
 /* Installed Controller {{{ */
 @interface InstalledController : FilteredPackageListController {
 
 /* Installed Controller {{{ */
 @interface InstalledController : FilteredPackageListController {

-    BOOL expert_;

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

-
-- (void) updateRoleButton;

 - (void) queueStatusDidChange;
 
 @end
 - (void) queueStatusDidChange;
 
 @end


@@ -7863,7 +7860,13 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi
 
 - (id) initWithDatabase:(Database *)database {
     if ((self = [super initWithDatabase:database title:UCLocalize("INSTALLED") filter:@selector(isInstalledAndUnfiltered:) with:[NSNumber numberWithBool:YES]]) != nil) {
 
 - (id) initWithDatabase:(Database *)database {
     if ((self = [super initWithDatabase:database title:UCLocalize("INSTALLED") filter:@selector(isInstalledAndUnfiltered:) with:[NSNumber numberWithBool:YES]]) != nil) {

-        [self updateRoleButton];
+        UISegmentedControl *segmented([[[UISegmentedControl alloc] initWithItems:[NSArray arrayWithObjects:UCLocalize("SIMPLE"), UCLocalize("EXPERT"), nil]] autorelease]);
+        [segmented setSelectedSegmentIndex:0];
+        [segmented setSegmentedControlStyle:UISegmentedControlStyleBar];
+        [[self navigationItem] setTitleView:segmented];
+
+        [segmented addTarget:self action:@selector(modeChanged:) forEvents:UIControlEventValueChanged];
+

         [self queueStatusDidChange];
     } return self;
 }
         [self queueStatusDidChange];
     } return self;
 }


@@ -7889,21 +7892,10 @@ static void HomeControllerReachabilityCallback(SCNetworkReachabilityRef reachabi
 #endif
 }
 
 #endif
 }
 

-- (void) updateRoleButton {
-    [[self navigationItem] setRightBarButtonItem:[[[UIBarButtonItem alloc]
-        initWithTitle:(expert_ ? UCLocalize("EXPERT") : UCLocalize("SIMPLE"))
-        style:(expert_ ? UIBarButtonItemStyleDone : UIBarButtonItemStylePlain)
-        target:self
-        action:@selector(roleButtonClicked)
-    ] autorelease]];
-}
-
-- (void) roleButtonClicked {
-    [self setObject:[NSNumber numberWithBool:expert_]];
+- (void) modeChanged:(UISegmentedControl *)segmented {
+    bool simple([segmented selectedSegmentIndex] == 0);
+    [self setObject:[NSNumber numberWithBool:simple]];

     [self reloadData];
     [self reloadData];

-    expert_ = !expert_;
-
-    [self updateRoleButton];

 }
 
 @end
 }
 
 @end