Add new icons from Surenix.

[winterboard.git] / Settings.mm

diff --git a/Settings.mm b/Settings.mm
index 956d7e5acd7ad470e63bd234c0a6a9434d18c7bc..e94022a338ef4a6aac4f38ccc1dc47e3c3a54feb 100644 (file)
--- a/Settings.mm
+++ b/Settings.mm
@@ -1,5 +1,5 @@
 /* WinterBoard - Theme Manager for the iPhone
 /* WinterBoard - Theme Manager for the iPhone

- * Copyright (C) 2009  Jay Freeman (saurik)
+ * Copyright (C) 2009-2010  Jay Freeman (saurik)

 */
 
 /*
 */
 
 /*


@@ -37,12 +37,15 @@
 
 #import <Foundation/Foundation.h>
 #import <UIKit/UIKit.h>
 
 #import <Foundation/Foundation.h>
 #import <UIKit/UIKit.h>

+#import <Preferences/PSRootController.h>
+#import <Preferences/PSViewController.h>

 #import <Preferences/PSListController.h>
 #import <Preferences/PSSpecifier.h>
 #import <Preferences/PSTableCell.h>
 #import <UIKit/UINavigationButton.h>
 
 #include <dlfcn.h>
 #import <Preferences/PSListController.h>
 #import <Preferences/PSSpecifier.h>
 #import <Preferences/PSTableCell.h>
 #import <UIKit/UINavigationButton.h>
 
 #include <dlfcn.h>

+#include <objc/runtime.h>

 
 static BOOL (*IsIconHiddenDisplayId)(NSString *);
 static BOOL (*HideIconViaDisplayId)(NSString *);
 
 static BOOL (*IsIconHiddenDisplayId)(NSString *);
 static BOOL (*HideIconViaDisplayId)(NSString *);


@@ -234,7 +237,8 @@ static NSString *_plist;
         [_tableView setDelegate:self];
         [_tableView setEditing:YES];
         [_tableView setAllowsSelectionDuringEditing:YES];
         [_tableView setDelegate:self];
         [_tableView setEditing:YES];
         [_tableView setAllowsSelectionDuringEditing:YES];

-        [self showLeftButton:@"WinterBoard" withStyle:1 rightButton:nil withStyle:0];
+        if ([self respondsToSelector:@selector(setView:)])
+            [self setView:_tableView];

     }
     return self;
 }
     }
     return self;
 }


@@ -364,11 +368,26 @@ static NSString *_plist;
     [super dealloc];
 }
 
     [super dealloc];
 }
 

-- (void) _optimizeThemes {
+- (void) __optimizeThemes {

     system("/usr/libexec/winterboard/Optimize");
 }
 
 - (void) optimizeThemes {
     system("/usr/libexec/winterboard/Optimize");
 }
 
 - (void) optimizeThemes {

+    UIActionSheet *sheet([[[UIActionSheet alloc]
+        initWithTitle:@"Optimize Themes"
+        buttons:[NSArray arrayWithObjects:@"Optimize", @"Cancel", nil]
+        defaultButtonIndex:1
+        delegate:self
+        context:@"optimize"
+    ] autorelease]);
+
+    [sheet setBodyText:@"Please note that this setting /replaces/ the PNG files that came with the theme. PNG files that have been iPhone-optimized cannot be viewed on a normal computer unless they are first deoptimized. You can use Cydia to reinstall themes that have been optimized in order to revert to the original PNG files."];
+    [sheet setNumberOfRows:1];
+    [sheet setDestructiveButtonIndex:0];
+    [sheet popupAlertAnimated:YES];
+}
+
+- (void) _optimizeThemes {

     UIView *view([self view]);
     UIWindow *window([view window]);
 
     UIView *view([self view]);
     UIWindow *window([view window]);
 


@@ -379,7 +398,7 @@ static NSString *_plist;
 
     [window addSubview:hud];
     [hud show:YES];
 
     [window addSubview:hud];
     [hud show:YES];

-    [self wb$yieldToSelector:@selector(_optimizeThemes)];
+    [self wb$yieldToSelector:@selector(__optimizeThemes)];

     [hud removeFromSuperview];
 
     [window setUserInteractionEnabled:YES];
     [hud removeFromSuperview];
 
     [window setUserInteractionEnabled:YES];


@@ -387,6 +406,22 @@ static NSString *_plist;
     [self settingsChanged];
 }
 
     [self settingsChanged];
 }
 

+- (void) alertSheet:(UIActionSheet *)sheet buttonClicked:(int)button {
+    NSString *context([sheet context]);
+
+    if ([context isEqualToString:@"optimize"]) {
+        switch (button) {
+            case 1:
+                [self performSelector:@selector(_optimizeThemes) withObject:nil afterDelay:0];
+            break;
+        }
+
+        [sheet dismiss];
+    } else
+        [super alertSheet:sheet buttonClicked:button];
+
+}
+

 - (void) suspend {
     if (!settingsChanged)
         return;
 - (void) suspend {
     if (!settingsChanged)
         return;


@@ -404,10 +439,37 @@ static NSString *_plist;
     unlink("/User/Library/Caches/com.apple.springboard-imagecache-smallicons");
     unlink("/User/Library/Caches/com.apple.springboard-imagecache-smallicons.plist");
 
     unlink("/User/Library/Caches/com.apple.springboard-imagecache-smallicons");
     unlink("/User/Library/Caches/com.apple.springboard-imagecache-smallicons.plist");
 

+    unlink("/User/Library/Cache/com.apple.SpringBoard.folderSwitcherLinen");
+    unlink("/User/Library/Cache/com.apple.SpringBoard.notificationCenterLinen");
+
+    unlink("/User/Library/Cache/com.apple.SpringBoard.folderSwitcherLinen.0");
+    unlink("/User/Library/Cache/com.apple.SpringBoard.folderSwitcherLinen.1");
+    unlink("/User/Library/Cache/com.apple.SpringBoard.folderSwitcherLinen.2");
+    unlink("/User/Library/Cache/com.apple.SpringBoard.folderSwitcherLinen.3");
+

     system("rm -rf /User/Library/Caches/SpringBoardIconCache");
     system("rm -rf /User/Library/Caches/SpringBoardIconCache-small");
     system("rm -rf /User/Library/Caches/SpringBoardIconCache");
     system("rm -rf /User/Library/Caches/SpringBoardIconCache-small");

+    system("rm -rf /User/Library/Caches/com.apple.IconsCache");
+    system("rm -rf /User/Library/Caches/com.apple.springboard.sharedimagecache");

 
 

-    system("killall SpringBoard");
+    system("killall lsd SpringBoard");
+}
+
+- (void) cancelChanges {
+    [_settings release];
+    [_plist release];
+    _plist = [[NSString stringWithFormat:@"%@/Library/Preferences/com.saurik.WinterBoard.plist", NSHomeDirectory()] retain];
+    _settings = [([NSMutableDictionary dictionaryWithContentsOfFile:_plist] ?: [NSMutableDictionary dictionary]) retain];
+
+    [_settings setObject:[NSNumber numberWithBool:IsIconHiddenDisplayId(WinterBoardDisplayID)] forKey:@"IconHidden"];
+    [self reloadSpecifiers];
+    if (![[PSViewController class] instancesRespondToSelector:@selector(showLeftButton:withStyle:rightButton:withStyle:)]) {
+        [[self navigationItem] setLeftBarButtonItem:nil];
+        [[self navigationItem] setRightBarButtonItem:nil];
+    } else {
+        [self showLeftButton:nil withStyle:0 rightButton:nil withStyle:0];
+    }
+    settingsChanged = NO;

 }
 
 - (void) navigationBarButtonClicked:(int)buttonIndex {
 }
 
 - (void) navigationBarButtonClicked:(int)buttonIndex {


@@ -416,19 +478,32 @@ static NSString *_plist;
         return;
     }
 
         return;
     }
 

-    if (buttonIndex == 0)
-        settingsChanged = NO;
+    if (buttonIndex == 0) {
+        [self cancelChanges];
+        return;
+    }

 
     [self suspend];
     [self.rootController popController];
 }
 
 
     [self suspend];
     [self.rootController popController];
 }
 

+- (void) settingsConfirmButtonClicked:(UIBarButtonItem *)button {
+    [self navigationBarButtonClicked:button.tag];
+}
+

 - (void) viewWillRedisplay {
     if (settingsChanged)
         [self settingsChanged];
     [super viewWillRedisplay];
 }
 
 - (void) viewWillRedisplay {
     if (settingsChanged)
         [self settingsChanged];
     [super viewWillRedisplay];
 }
 

+- (void) viewWillAppear:(BOOL)animated {
+    if (settingsChanged)
+        [self settingsChanged];
+    if ([super respondsToSelector:@selector(viewWillAppear:)])
+        [super viewWillAppear:animated];
+}
+

 - (void) pushController:(id)controller {
     [self hideNavigationBarButtons];
     [super pushController:controller];
 - (void) pushController:(id)controller {
     [self hideNavigationBarButtons];
     [super pushController:controller];


@@ -441,7 +516,18 @@ static NSString *_plist;
 }
 
 - (void) settingsChanged {
 }
 
 - (void) settingsChanged {

-    [self showLeftButton:@"Respring" withStyle:2 rightButton:@"Cancel" withStyle:0];
+    if (![[PSViewController class] instancesRespondToSelector:@selector(showLeftButton:withStyle:rightButton:withStyle:)]) {
+        UIBarButtonItem *respringButton([[UIBarButtonItem alloc] initWithTitle:@"Respring" style:UIBarButtonItemStyleDone target:self action:@selector(settingsConfirmButtonClicked:)]);
+        UIBarButtonItem *cancelButton([[UIBarButtonItem alloc] initWithTitle:@"Cancel" style:UIBarButtonItemStylePlain target:self action:@selector(settingsConfirmButtonClicked:)]);
+        cancelButton.tag = 0;
+        respringButton.tag = 1;
+        [[self navigationItem] setLeftBarButtonItem:respringButton];
+        [[self navigationItem] setRightBarButtonItem:cancelButton];
+        [respringButton release];
+        [cancelButton release];
+    } else {
+        [self showLeftButton:@"Respring" withStyle:2 rightButton:@"Cancel" withStyle:0];
+    }

     settingsChanged = YES;
 }
 
     settingsChanged = YES;
 }
 


@@ -469,3 +555,23 @@ static NSString *_plist;
 }
 
 @end
 }
 
 @end

+
+#define WBSAddMethod(_class, _sel, _imp, _type) \
+    if (![[_class class] instancesRespondToSelector:@selector(_sel)]) \
+        class_addMethod([_class class], @selector(_sel), (IMP)_imp, _type)
+void $PSRootController$popController(PSRootController *self, SEL _cmd) {
+    [self popViewControllerAnimated:YES];
+}
+
+void $PSViewController$hideNavigationBarButtons(PSRootController *self, SEL _cmd) {
+}
+
+id $PSViewController$initForContentSize$(PSRootController *self, SEL _cmd, CGRect contentSize) {
+    return [self init];
+}
+
+static __attribute__((constructor)) void __wbsInit() {
+    WBSAddMethod(PSRootController, popController, $PSRootController$popController, "v@:");
+    WBSAddMethod(PSViewController, hideNavigationBarButtons, $PSViewController$hideNavigationBarButtons, "v@:");
+    WBSAddMethod(PSViewController, initForContentSize:, $PSViewController$initForContentSize$, "@@:{ff}");
+}