diff options
| author | Grant Paul <chpwn@chpwn.com> | 2011-01-04 23:31:15 -0800 |
|---|---|---|
| committer | Grant Paul <chpwn@chpwn.com> | 2011-01-04 23:31:15 -0800 |
| commit | 94511d30a0d4f173055292e80d156d8e58da2716 (patch) | |
| tree | a3d1791e8f2720c8ae7aed09c00d9b1cdcfd4ef8 | |
| parent | f6e1356137e494e0746becbfda851c8858de1c98 (diff) | |
| parent | 9c8730d27cb4ca97a5034de527be90c975144c5e (diff) | |
Merge branch 'master' of saurik.com:cydia into url-tabbar
106 files changed, 171 insertions, 56 deletions
diff --git a/MobileCydia.app/Default-Landscape.png b/MobileCydia.app/Default-Landscape.png Binary files differindex 8788186..a3f4343 100644 --- a/MobileCydia.app/Default-Landscape.png +++ b/MobileCydia.app/Default-Landscape.png diff --git a/MobileCydia.app/Default-Portrait.png b/MobileCydia.app/Default-Portrait.png Binary files differindex 83a73af..240b409 100644 --- a/MobileCydia.app/Default-Portrait.png +++ b/MobileCydia.app/Default-Portrait.png diff --git a/MobileCydia.app/Icon-Small-50.png b/MobileCydia.app/Icon-Small-50.png Binary files differindex d27a6f7..d7d2849 100644 --- a/MobileCydia.app/Icon-Small-50.png +++ b/MobileCydia.app/Icon-Small-50.png diff --git a/MobileCydia.app/Icon-Small.png b/MobileCydia.app/Icon-Small.png Binary files differindex c7f6176..af15d71 100644 --- a/MobileCydia.app/Icon-Small.png +++ b/MobileCydia.app/Icon-Small.png diff --git a/MobileCydia.app/Icon-Small@2x.png b/MobileCydia.app/Icon-Small@2x.png Binary files differindex a741dda..1a73ddb 100644 --- a/MobileCydia.app/Icon-Small@2x.png +++ b/MobileCydia.app/Icon-Small@2x.png diff --git a/MobileCydia.app/Modes/DOWNGRADE.png b/MobileCydia.app/Modes/DOWNGRADE.png Binary files differindex 3c5576f..41c0d70 100644 --- a/MobileCydia.app/Modes/DOWNGRADE.png +++ b/MobileCydia.app/Modes/DOWNGRADE.png diff --git a/MobileCydia.app/Modes/INSTALL.png b/MobileCydia.app/Modes/INSTALL.png Binary files differindex 55c5f18..a83f354 100644 --- a/MobileCydia.app/Modes/INSTALL.png +++ b/MobileCydia.app/Modes/INSTALL.png diff --git a/MobileCydia.app/Modes/PURGE.png b/MobileCydia.app/Modes/PURGE.png Binary files differindex 3311df5..795fa19 100644 --- a/MobileCydia.app/Modes/PURGE.png +++ b/MobileCydia.app/Modes/PURGE.png diff --git a/MobileCydia.app/Modes/REINSTALL.png b/MobileCydia.app/Modes/REINSTALL.png Binary files differindex a200373..0b7754c 100644 --- a/MobileCydia.app/Modes/REINSTALL.png +++ b/MobileCydia.app/Modes/REINSTALL.png diff --git a/MobileCydia.app/Modes/REMOVE.png b/MobileCydia.app/Modes/REMOVE.png Binary files differindex 7408a16..1b2e691 100644 --- a/MobileCydia.app/Modes/REMOVE.png +++ b/MobileCydia.app/Modes/REMOVE.png diff --git a/MobileCydia.app/Modes/UPGRADE.png b/MobileCydia.app/Modes/UPGRADE.png Binary files differindex e74636e..631b7ef 100644 --- a/MobileCydia.app/Modes/UPGRADE.png +++ b/MobileCydia.app/Modes/UPGRADE.png diff --git a/MobileCydia.app/Purposes/commercial.png b/MobileCydia.app/Purposes/commercial.png Binary files differindex 5139ec4..9c411cc 100644 --- a/MobileCydia.app/Purposes/commercial.png +++ b/MobileCydia.app/Purposes/commercial.png diff --git a/MobileCydia.app/Purposes/console.png b/MobileCydia.app/Purposes/console.png Binary files differindex 32afcb5..08d1869 100644 --- a/MobileCydia.app/Purposes/console.png +++ b/MobileCydia.app/Purposes/console.png diff --git a/MobileCydia.app/Purposes/daemon.png b/MobileCydia.app/Purposes/daemon.png Binary files differindex f332f5d..896c9be 100644 --- a/MobileCydia.app/Purposes/daemon.png +++ b/MobileCydia.app/Purposes/daemon.png diff --git a/MobileCydia.app/Purposes/extension.png b/MobileCydia.app/Purposes/extension.png Binary files differindex a9cefa1..59e051b 100644 --- a/MobileCydia.app/Purposes/extension.png +++ b/MobileCydia.app/Purposes/extension.png diff --git a/MobileCydia.app/Purposes/library.png b/MobileCydia.app/Purposes/library.png Binary files differindex eca2032..e275e06 100644 --- a/MobileCydia.app/Purposes/library.png +++ b/MobileCydia.app/Purposes/library.png diff --git a/MobileCydia.app/Purposes/uikit.png b/MobileCydia.app/Purposes/uikit.png Binary files differindex 03791b1..694107f 100644 --- a/MobileCydia.app/Purposes/uikit.png +++ b/MobileCydia.app/Purposes/uikit.png diff --git a/MobileCydia.app/Purposes/x.png b/MobileCydia.app/Purposes/x.png Binary files differindex 48f57d3..2feac90 100644 --- a/MobileCydia.app/Purposes/x.png +++ b/MobileCydia.app/Purposes/x.png diff --git a/MobileCydia.app/Sections/Addons.png b/MobileCydia.app/Sections/Addons.png Binary files differindex 74c9c35..424f565 100644 --- a/MobileCydia.app/Sections/Addons.png +++ b/MobileCydia.app/Sections/Addons.png diff --git a/MobileCydia.app/Sections/Administration.png b/MobileCydia.app/Sections/Administration.png Binary files differindex 0d595d8..65efd3e 100644 --- a/MobileCydia.app/Sections/Administration.png +++ b/MobileCydia.app/Sections/Administration.png diff --git a/MobileCydia.app/Sections/Archiving.png b/MobileCydia.app/Sections/Archiving.png Binary files differindex 4fa3711..9efce56 100644 --- a/MobileCydia.app/Sections/Archiving.png +++ b/MobileCydia.app/Sections/Archiving.png diff --git a/MobileCydia.app/Sections/Blanks.png b/MobileCydia.app/Sections/Blanks.png Binary files differindex bacf1a1..7c0c2a0 100644 --- a/MobileCydia.app/Sections/Blanks.png +++ b/MobileCydia.app/Sections/Blanks.png diff --git a/MobileCydia.app/Sections/Books.png b/MobileCydia.app/Sections/Books.png Binary files differindex 509eac5..512c68b 100644 --- a/MobileCydia.app/Sections/Books.png +++ b/MobileCydia.app/Sections/Books.png diff --git a/MobileCydia.app/Sections/Carrier Bundles.png b/MobileCydia.app/Sections/Carrier Bundles.png Binary files differindex df25b3c..00f36f7 100644 --- a/MobileCydia.app/Sections/Carrier Bundles.png +++ b/MobileCydia.app/Sections/Carrier Bundles.png diff --git a/MobileCydia.app/Sections/Communication.png b/MobileCydia.app/Sections/Communication.png Binary files differindex df25b3c..00f36f7 100644 --- a/MobileCydia.app/Sections/Communication.png +++ b/MobileCydia.app/Sections/Communication.png diff --git a/MobileCydia.app/Sections/Data Storage.png b/MobileCydia.app/Sections/Data Storage.png Binary files differindex 5097038..1bb23fe 100644 --- a/MobileCydia.app/Sections/Data Storage.png +++ b/MobileCydia.app/Sections/Data Storage.png diff --git a/MobileCydia.app/Sections/Development.png b/MobileCydia.app/Sections/Development.png Binary files differindex 57cffe6..806b442 100644 --- a/MobileCydia.app/Sections/Development.png +++ b/MobileCydia.app/Sections/Development.png diff --git a/MobileCydia.app/Sections/Dictionaries.png b/MobileCydia.app/Sections/Dictionaries.png Binary files differindex a5a85b5..e386e76 100644 --- a/MobileCydia.app/Sections/Dictionaries.png +++ b/MobileCydia.app/Sections/Dictionaries.png diff --git a/MobileCydia.app/Sections/Education.png b/MobileCydia.app/Sections/Education.png Binary files differindex 549bf52..4a2a03f 100644 --- a/MobileCydia.app/Sections/Education.png +++ b/MobileCydia.app/Sections/Education.png diff --git a/MobileCydia.app/Sections/Entertainment.png b/MobileCydia.app/Sections/Entertainment.png Binary files differindex 53d32aa..69c8214 100644 --- a/MobileCydia.app/Sections/Entertainment.png +++ b/MobileCydia.app/Sections/Entertainment.png diff --git a/MobileCydia.app/Sections/Fonts.png b/MobileCydia.app/Sections/Fonts.png Binary files differindex 688929a..6fdab33 100644 --- a/MobileCydia.app/Sections/Fonts.png +++ b/MobileCydia.app/Sections/Fonts.png diff --git a/MobileCydia.app/Sections/Games.png b/MobileCydia.app/Sections/Games.png Binary files differindex 0f81c11..6e14c50 100644 --- a/MobileCydia.app/Sections/Games.png +++ b/MobileCydia.app/Sections/Games.png diff --git a/MobileCydia.app/Sections/Health and Fitness.png b/MobileCydia.app/Sections/Health and Fitness.png Binary files differindex d44ffb3..e2db013 100644 --- a/MobileCydia.app/Sections/Health and Fitness.png +++ b/MobileCydia.app/Sections/Health and Fitness.png diff --git a/MobileCydia.app/Sections/Imaging.png b/MobileCydia.app/Sections/Imaging.png Binary files differindex bbaad32..1e8f7fa 100644 --- a/MobileCydia.app/Sections/Imaging.png +++ b/MobileCydia.app/Sections/Imaging.png diff --git a/MobileCydia.app/Sections/Java.png b/MobileCydia.app/Sections/Java.png Binary files differindex e72e139..e6bbc91 100644 --- a/MobileCydia.app/Sections/Java.png +++ b/MobileCydia.app/Sections/Java.png diff --git a/MobileCydia.app/Sections/Keyboards.png b/MobileCydia.app/Sections/Keyboards.png Binary files differindex 8d74898..6b3df89 100644 --- a/MobileCydia.app/Sections/Keyboards.png +++ b/MobileCydia.app/Sections/Keyboards.png diff --git a/MobileCydia.app/Sections/Localization.png b/MobileCydia.app/Sections/Localization.png Binary files differindex 5cb61dc..80d41d3 100644 --- a/MobileCydia.app/Sections/Localization.png +++ b/MobileCydia.app/Sections/Localization.png diff --git a/MobileCydia.app/Sections/Messaging.png b/MobileCydia.app/Sections/Messaging.png Binary files differindex b3722a1..69d18e0 100644 --- a/MobileCydia.app/Sections/Messaging.png +++ b/MobileCydia.app/Sections/Messaging.png diff --git a/MobileCydia.app/Sections/Multimedia.png b/MobileCydia.app/Sections/Multimedia.png Binary files differindex 28caa85..42d0b5e 100644 --- a/MobileCydia.app/Sections/Multimedia.png +++ b/MobileCydia.app/Sections/Multimedia.png diff --git a/MobileCydia.app/Sections/Navigation.png b/MobileCydia.app/Sections/Navigation.png Binary files differindex 0116be7..4829e62 100644 --- a/MobileCydia.app/Sections/Navigation.png +++ b/MobileCydia.app/Sections/Navigation.png diff --git a/MobileCydia.app/Sections/Networking.png b/MobileCydia.app/Sections/Networking.png Binary files differindex 35ca612..a4f04e3 100644 --- a/MobileCydia.app/Sections/Networking.png +++ b/MobileCydia.app/Sections/Networking.png diff --git a/MobileCydia.app/Sections/Packaging.png b/MobileCydia.app/Sections/Packaging.png Binary files differindex 6e798ca..d7d914e 100644 --- a/MobileCydia.app/Sections/Packaging.png +++ b/MobileCydia.app/Sections/Packaging.png diff --git a/MobileCydia.app/Sections/Productivity.png b/MobileCydia.app/Sections/Productivity.png Binary files differindex 3508670..c99c69d 100644 --- a/MobileCydia.app/Sections/Productivity.png +++ b/MobileCydia.app/Sections/Productivity.png diff --git a/MobileCydia.app/Sections/Repositories.png b/MobileCydia.app/Sections/Repositories.png Binary files differindex 0fdaaff..d6fe267 100644 --- a/MobileCydia.app/Sections/Repositories.png +++ b/MobileCydia.app/Sections/Repositories.png diff --git a/MobileCydia.app/Sections/Ringtones.png b/MobileCydia.app/Sections/Ringtones.png Binary files differindex 4f4da74..57fd660 100644 --- a/MobileCydia.app/Sections/Ringtones.png +++ b/MobileCydia.app/Sections/Ringtones.png diff --git a/MobileCydia.app/Sections/Scripting.png b/MobileCydia.app/Sections/Scripting.png Binary files differindex 2cac5c6..22285d2 100644 --- a/MobileCydia.app/Sections/Scripting.png +++ b/MobileCydia.app/Sections/Scripting.png diff --git a/MobileCydia.app/Sections/Security.png b/MobileCydia.app/Sections/Security.png Binary files differindex dce315d..ae142eb 100644 --- a/MobileCydia.app/Sections/Security.png +++ b/MobileCydia.app/Sections/Security.png diff --git a/MobileCydia.app/Sections/Site-Specific Apps.png b/MobileCydia.app/Sections/Site-Specific Apps.png Binary files differindex 969036c..6732d7b 100644 --- a/MobileCydia.app/Sections/Site-Specific Apps.png +++ b/MobileCydia.app/Sections/Site-Specific Apps.png diff --git a/MobileCydia.app/Sections/Social.png b/MobileCydia.app/Sections/Social.png Binary files differindex 79d6e55..6c0cfa4 100644 --- a/MobileCydia.app/Sections/Social.png +++ b/MobileCydia.app/Sections/Social.png diff --git a/MobileCydia.app/Sections/Soundboards.png b/MobileCydia.app/Sections/Soundboards.png Binary files differindex c91f9af..accfcad 100644 --- a/MobileCydia.app/Sections/Soundboards.png +++ b/MobileCydia.app/Sections/Soundboards.png diff --git a/MobileCydia.app/Sections/System.png b/MobileCydia.app/Sections/System.png Binary files differindex 3a70055..19d2c22 100644 --- a/MobileCydia.app/Sections/System.png +++ b/MobileCydia.app/Sections/System.png diff --git a/MobileCydia.app/Sections/Terminal Support.png b/MobileCydia.app/Sections/Terminal Support.png Binary files differindex 3ab1103..d664618 100644 --- a/MobileCydia.app/Sections/Terminal Support.png +++ b/MobileCydia.app/Sections/Terminal Support.png diff --git a/MobileCydia.app/Sections/Text Editors.png b/MobileCydia.app/Sections/Text Editors.png Binary files differindex 5b4129a..5e65d46 100644 --- a/MobileCydia.app/Sections/Text Editors.png +++ b/MobileCydia.app/Sections/Text Editors.png diff --git a/MobileCydia.app/Sections/Themes.png b/MobileCydia.app/Sections/Themes.png Binary files differindex 943ef49..e35b948 100644 --- a/MobileCydia.app/Sections/Themes.png +++ b/MobileCydia.app/Sections/Themes.png diff --git a/MobileCydia.app/Sections/Toys.png b/MobileCydia.app/Sections/Toys.png Binary files differindex fc56838..368eb4c 100644 --- a/MobileCydia.app/Sections/Toys.png +++ b/MobileCydia.app/Sections/Toys.png diff --git a/MobileCydia.app/Sections/Tweaks.png b/MobileCydia.app/Sections/Tweaks.png Binary files differindex 70a30f8..4f588c6 100644 --- a/MobileCydia.app/Sections/Tweaks.png +++ b/MobileCydia.app/Sections/Tweaks.png diff --git a/MobileCydia.app/Sections/Utilities.png b/MobileCydia.app/Sections/Utilities.png Binary files differindex f7dd1e7..fab5d32 100644 --- a/MobileCydia.app/Sections/Utilities.png +++ b/MobileCydia.app/Sections/Utilities.png diff --git a/MobileCydia.app/Sections/Wallpaper.png b/MobileCydia.app/Sections/Wallpaper.png Binary files differindex 3d57101..1060fa0 100644 --- a/MobileCydia.app/Sections/Wallpaper.png +++ b/MobileCydia.app/Sections/Wallpaper.png diff --git a/MobileCydia.app/Sections/WebClips.png b/MobileCydia.app/Sections/WebClips.png Binary files differindex 7baaa68..7ed4053 100644 --- a/MobileCydia.app/Sections/WebClips.png +++ b/MobileCydia.app/Sections/WebClips.png diff --git a/MobileCydia.app/Sections/Widgets.png b/MobileCydia.app/Sections/Widgets.png Binary files differindex df5e5ce..ca8c1ef 100644 --- a/MobileCydia.app/Sections/Widgets.png +++ b/MobileCydia.app/Sections/Widgets.png diff --git a/MobileCydia.app/Sections/X Window.png b/MobileCydia.app/Sections/X Window.png Binary files differindex a81af8a..eac01e9 100644 --- a/MobileCydia.app/Sections/X Window.png +++ b/MobileCydia.app/Sections/X Window.png diff --git a/MobileCydia.app/Sources/cy.sosiphone.com.png b/MobileCydia.app/Sources/cy.sosiphone.com.png Binary files differdeleted file mode 100644 index b848d95..0000000 --- a/MobileCydia.app/Sources/cy.sosiphone.com.png +++ /dev/null diff --git a/MobileCydia.app/Sources/iphone.hackndev.org.png b/MobileCydia.app/Sources/iphone.hackndev.org.png Binary files differdeleted file mode 100644 index 1f701df..0000000 --- a/MobileCydia.app/Sources/iphone.hackndev.org.png +++ /dev/null diff --git a/MobileCydia.app/Sources/iphonehe.com.png b/MobileCydia.app/Sources/iphonehe.com.png Binary files differdeleted file mode 100644 index b20263e..0000000 --- a/MobileCydia.app/Sources/iphonehe.com.png +++ /dev/null diff --git a/MobileCydia.app/Sources/urbanfanatics.com.png b/MobileCydia.app/Sources/urbanfanatics.com.png Binary files differdeleted file mode 100644 index 9cf47c4..0000000 --- a/MobileCydia.app/Sources/urbanfanatics.com.png +++ /dev/null diff --git a/MobileCydia.app/Sources/www.zodttd.com.png b/MobileCydia.app/Sources/www.zodttd.com.png Binary files differdeleted file mode 100644 index 83a3b33..0000000 --- a/MobileCydia.app/Sources/www.zodttd.com.png +++ /dev/null diff --git a/MobileCydia.app/changes@2x.png b/MobileCydia.app/changes@2x.png Binary files differindex 6485a24..aa6a29a 100644 --- a/MobileCydia.app/changes@2x.png +++ b/MobileCydia.app/changes@2x.png diff --git a/MobileCydia.app/chevron@2x.png b/MobileCydia.app/chevron@2x.png Binary files differindex 3851aaf..9905c17 100644 --- a/MobileCydia.app/chevron@2x.png +++ b/MobileCydia.app/chevron@2x.png diff --git a/MobileCydia.app/commercial.png b/MobileCydia.app/commercial.png Binary files differindex d89b332..8599f48 100644 --- a/MobileCydia.app/commercial.png +++ b/MobileCydia.app/commercial.png diff --git a/MobileCydia.app/console.png b/MobileCydia.app/console.png Binary files differindex aa63739..dba3788 100644 --- a/MobileCydia.app/console.png +++ b/MobileCydia.app/console.png diff --git a/MobileCydia.app/email.png b/MobileCydia.app/email.png Binary files differindex abc76d1..1aa20b3 100644 --- a/MobileCydia.app/email.png +++ b/MobileCydia.app/email.png diff --git a/MobileCydia.app/expanded.png b/MobileCydia.app/expanded.png Binary files differindex 4fa3711..9efce56 100644 --- a/MobileCydia.app/expanded.png +++ b/MobileCydia.app/expanded.png diff --git a/MobileCydia.app/filesystem.png b/MobileCydia.app/filesystem.png Binary files differindex 5097038..1bb23fe 100644 --- a/MobileCydia.app/filesystem.png +++ b/MobileCydia.app/filesystem.png diff --git a/MobileCydia.app/home-Selected@2x.png b/MobileCydia.app/home-Selected@2x.png Binary files differindex e5138fd..748be33 100644 --- a/MobileCydia.app/home-Selected@2x.png +++ b/MobileCydia.app/home-Selected@2x.png diff --git a/MobileCydia.app/home@2x.png b/MobileCydia.app/home@2x.png Binary files differindex 4c5ff62..72b7297 100644 --- a/MobileCydia.app/home@2x.png +++ b/MobileCydia.app/home@2x.png diff --git a/MobileCydia.app/icon-72.png b/MobileCydia.app/icon-72.png Binary files differindex 1f5a1de..1dbce13 100644 --- a/MobileCydia.app/icon-72.png +++ b/MobileCydia.app/icon-72.png diff --git a/MobileCydia.app/icon.png b/MobileCydia.app/icon.png Binary files differindex db7616d..61d51dd 100644 --- a/MobileCydia.app/icon.png +++ b/MobileCydia.app/icon.png diff --git a/MobileCydia.app/icon@2x.png b/MobileCydia.app/icon@2x.png Binary files differindex cfe44a2..1ec010c 100644 --- a/MobileCydia.app/icon@2x.png +++ b/MobileCydia.app/icon@2x.png diff --git a/MobileCydia.app/iconClassic.png b/MobileCydia.app/iconClassic.png Binary files differindex 37bdfbc..384c582 100644 --- a/MobileCydia.app/iconClassic.png +++ b/MobileCydia.app/iconClassic.png diff --git a/MobileCydia.app/id.png b/MobileCydia.app/id.png Binary files differindex 26d6165..f168812 100644 --- a/MobileCydia.app/id.png +++ b/MobileCydia.app/id.png diff --git a/MobileCydia.app/install@2x.png b/MobileCydia.app/install@2x.png Binary files differindex 6b2ea99..dfb8212 100644 --- a/MobileCydia.app/install@2x.png +++ b/MobileCydia.app/install@2x.png diff --git a/MobileCydia.app/installed.png b/MobileCydia.app/installed.png Binary files differindex 89017d8..2f86f0a 100644 --- a/MobileCydia.app/installed.png +++ b/MobileCydia.app/installed.png diff --git a/MobileCydia.app/installed@2x.png b/MobileCydia.app/installed@2x.png Binary files differindex 8d6bc3f..ab86df2 100644 --- a/MobileCydia.app/installed@2x.png +++ b/MobileCydia.app/installed@2x.png diff --git a/MobileCydia.app/installing.png b/MobileCydia.app/installing.png Binary files differindex aa27d7c..6332fef 100644 --- a/MobileCydia.app/installing.png +++ b/MobileCydia.app/installing.png diff --git a/MobileCydia.app/manage@2x.png b/MobileCydia.app/manage@2x.png Binary files differindex d2f9b7c..cfb8c13 100644 --- a/MobileCydia.app/manage@2x.png +++ b/MobileCydia.app/manage@2x.png diff --git a/MobileCydia.app/menes/chevron.png b/MobileCydia.app/menes/chevron.png Binary files differindex 1bfefe6..6ff8205 100644 --- a/MobileCydia.app/menes/chevron.png +++ b/MobileCydia.app/menes/chevron.png diff --git a/MobileCydia.app/menes/chevron@2x.png b/MobileCydia.app/menes/chevron@2x.png Binary files differindex 3851aaf..9905c17 100644 --- a/MobileCydia.app/menes/chevron@2x.png +++ b/MobileCydia.app/menes/chevron@2x.png diff --git a/MobileCydia.app/packages.png b/MobileCydia.app/packages.png Binary files differindex d5dde3c..404fe0c 100644 --- a/MobileCydia.app/packages.png +++ b/MobileCydia.app/packages.png diff --git a/MobileCydia.app/removing.png b/MobileCydia.app/removing.png Binary files differindex 2fdb272..935d4c7 100644 --- a/MobileCydia.app/removing.png +++ b/MobileCydia.app/removing.png diff --git a/MobileCydia.app/search@2x.png b/MobileCydia.app/search@2x.png Binary files differindex a7b17f3..74d6381 100644 --- a/MobileCydia.app/search@2x.png +++ b/MobileCydia.app/search@2x.png diff --git a/MobileCydia.app/settings.png b/MobileCydia.app/settings.png Binary files differindex e277493..86f4e78 100644 --- a/MobileCydia.app/settings.png +++ b/MobileCydia.app/settings.png diff --git a/MobileCydia.app/source.png b/MobileCydia.app/source.png Binary files differindex b101a99..2dcfdbc 100644 --- a/MobileCydia.app/source.png +++ b/MobileCydia.app/source.png diff --git a/MobileCydia.app/source@2x.png b/MobileCydia.app/source@2x.png Binary files differindex 7613b1f..65d70c3 100644 --- a/MobileCydia.app/source@2x.png +++ b/MobileCydia.app/source@2x.png diff --git a/MobileCydia.app/sources.png b/MobileCydia.app/sources.png Binary files differindex 88398f2..e8422e4 100644 --- a/MobileCydia.app/sources.png +++ b/MobileCydia.app/sources.png diff --git a/MobileCydia.app/star.png b/MobileCydia.app/star.png Binary files differindex 0695303..f762a24 100644 --- a/MobileCydia.app/star.png +++ b/MobileCydia.app/star.png diff --git a/MobileCydia.app/storage.png b/MobileCydia.app/storage.png Binary files differindex 5c93ee6..3cefef0 100644 --- a/MobileCydia.app/storage.png +++ b/MobileCydia.app/storage.png diff --git a/MobileCydia.app/trusted.png b/MobileCydia.app/trusted.png Binary files differindex ac6aa0c..de249eb 100644 --- a/MobileCydia.app/trusted.png +++ b/MobileCydia.app/trusted.png diff --git a/MobileCydia.app/unknown.png b/MobileCydia.app/unknown.png Binary files differindex e0ff4b2..92d7338 100644 --- a/MobileCydia.app/unknown.png +++ b/MobileCydia.app/unknown.png diff --git a/MobileCydia.app/version.png b/MobileCydia.app/version.png Binary files differindex b03fc57..fd1eec1 100644 --- a/MobileCydia.app/version.png +++ b/MobileCydia.app/version.png diff --git a/MobileCydia.app/warning.png b/MobileCydia.app/warning.png Binary files differindex bf06412..8d3e5df 100644 --- a/MobileCydia.app/warning.png +++ b/MobileCydia.app/warning.png diff --git a/MobileCydia.app/web.png b/MobileCydia.app/web.png Binary files differindex 35ca612..a4f04e3 100644 --- a/MobileCydia.app/web.png +++ b/MobileCydia.app/web.png diff --git a/MobileCydia.mm b/MobileCydia.mm index 57643ee..71f0006 100644 --- a/MobileCydia.mm +++ b/MobileCydia.mm @@ -1345,6 +1345,7 @@ typedef std::map< unsigned long, _H<Source> > SourceMap; pkgSourceList *list_; SourceMap sources_; + CFMutableArrayRef deadSources_; CFMutableArrayRef packages_; _transient NSObject<ConfigurationDelegate, ProgressDelegate> *delegate_; @@ -1354,6 +1355,8 @@ typedef std::map< unsigned long, _H<Source> > SourceMap; int cydiafd_; int statusfd_; FILE *input_; + + std::map<const char *, _H<NSString> > sections_; } + (Database *) sharedInstance; @@ -1387,6 +1390,9 @@ typedef std::map< unsigned long, _H<Source> > SourceMap; - (void) setDelegate:(id)delegate; - (Source *) getSource:(pkgCache::PkgFileIterator)file; + +- (NSString *) mappedSectionForPointer:(const char *)pointer; + @end /* }}} */ /* Delegate Helpers {{{ */ @@ -1824,7 +1830,8 @@ struct ParsedPackage { }; @interface Package : NSObject { - uint32_t era_ : 29; + uint32_t era_ : 26; + uint32_t role_ : 3; uint32_t essential_ : 1; uint32_t obsolete_ : 1; uint32_t ignored_ : 1; @@ -1843,7 +1850,7 @@ struct ParsedPackage { CYString latest_; CYString installed_; - CYString section_; + const char *section_; _transient NSString *section$_; Source *source_; @@ -1852,7 +1859,6 @@ struct ParsedPackage { ParsedPackage *parsed_; NSMutableArray *tags_; - NSString *role_; } - (Package *) initWithVersion:(pkgCache::VerIterator)version withZone:(NSZone *)zone inPool:(apr_pool_t *)pool database:(Database *)database; @@ -1914,7 +1920,6 @@ struct ParsedPackage { - (NSArray *) applications; - (Source *) source; -- (NSString *) role; - (BOOL) matches:(NSString *)text; @@ -2075,15 +2080,10 @@ struct PackageNameOrdering : - (void) dealloc { if (parsed_ != NULL) delete parsed_; - if (source_ != nil) [source_ release]; - if (tags_ != nil) [tags_ release]; - if (role_ != nil) - [role_ release]; - [super dealloc]; } @@ -2217,8 +2217,18 @@ struct PackageNameOrdering : const char *name(tag.Name()); [tags_ addObject:[(NSString *)CYStringCreate(name) autorelease]]; - if (role_ == nil && strncmp(name, "role::", 6) == 0 /*&& strcmp(name, "role::leaper") != 0*/) - role_ = (NSString *) CYStringCreate(name + 6); + if (role_ == 0 && strncmp(name, "role::", 6) == 0 /*&& strcmp(name, "role::leaper") != 0*/) { + if (strcmp(name + 6, "enduser") == 0) + role_ = 1; + else if (strcmp(name + 6, "hacker") == 0) + role_ = 2; + else if (strcmp(name + 6, "developer") == 0) + role_ = 3; + else if (strcmp(name + 6, "cydia") == 0) + role_ = 7; + else + role_ = 4; + } if (strncmp(name, "cydia::", 7) == 0) { if (strcmp(name + 7, "essential") == 0) @@ -2266,7 +2276,7 @@ struct PackageNameOrdering : _end _profile(Package$initWithVersion$Section) - section_.set(NULL, iterator.Section()); + section_ = iterator.Section(); _end _profile(Package$initWithVersion$Flags) @@ -2314,13 +2324,11 @@ struct PackageNameOrdering : - (NSString *) section { if (section$_ == nil) { - if (section_.empty()) + if (section_ == NULL) return nil; - _profile(Package$section) - std::replace(section_.data(), section_.data() + section_.size(), '_', ' '); - NSString *name(section_); - section$_ = [SectionMap_ objectForKey:name] ?: name; + _profile(Package$section$mappedSectionForPointer) + section$_ = [database_ mappedSectionForPointer:section_]; _end } return section$_; } @@ -2470,12 +2478,12 @@ struct PackageNameOrdering : - (BOOL) unfiltered { _profile(Package$unfiltered$obsolete) - if (obsolete_) + if (_unlikely(obsolete_)) return false; _end _profile(Package$unfiltered$hasSupportingRole) - if (![self hasSupportingRole]) + if (_unlikely(![self hasSupportingRole])) return false; _end @@ -2486,7 +2494,11 @@ struct PackageNameOrdering : if (![self unfiltered]) return false; - NSString *section([self section]); + NSString *section; + + _profile(Package$visible$section) + section = [self section]; + _end _profile(Package$visible$isSectionVisible) if (section != nil && !isSectionVisible(section)) @@ -2709,10 +2721,6 @@ struct PackageNameOrdering : return source_ == (Source *) [NSNull null] ? nil : source_; } -- (NSString *) role { - return role_; -} - - (BOOL) matches:(NSString *)text { if (text == nil) return NO; @@ -2735,17 +2743,17 @@ struct PackageNameOrdering : } - (bool) hasSupportingRole { - if (role_ == nil) + if (role_ == 0) return true; - if ([role_ isEqualToString:@"enduser"]) + if (role_ == 1) return true; if ([Role_ isEqualToString:@"User"]) return false; - if ([role_ isEqualToString:@"hacker"]) + if (role_ == 2) return true; if ([Role_ isEqualToString:@"Hacker"]) return false; - if ([role_ isEqualToString:@"developer"]) + if (role_ == 3) return true; if ([Role_ isEqualToString:@"Developer"]) return false; @@ -2867,7 +2875,7 @@ struct PackageNameOrdering : } - (bool) isInstalledAndUnfiltered:(NSNumber *)number { - return ![self uninstalled] && (![number boolValue] && ![role_ isEqualToString:@"cydia"] || [self unfiltered]); + return ![self uninstalled] && (![number boolValue] && role_ != 7 || [self unfiltered]); } - (bool) isVisibleInSection:(NSString *)name { @@ -3032,6 +3040,8 @@ static NSString *Warning_; - (void) dealloc { // XXX: actually implement this thing _assert(false); + if (deadSources_) + CFRelease(deadSources_); [self releasePackages]; apr_pool_destroy(pool_); NSRecycleZone(zone_); @@ -3149,6 +3159,7 @@ static NSString *Warning_; capacity += 1024; packages_ = CFArrayCreateMutable(kCFAllocatorDefault, capacity, NULL); + deadSources_ = CFArrayCreateMutable(kCFAllocatorDefault, 0, &kCFTypeArrayCallBacks); int fds[2]; @@ -3223,6 +3234,7 @@ static NSString *Warning_; NSMutableArray *sources([NSMutableArray arrayWithCapacity:sources_.size()]); for (SourceMap::const_iterator i(sources_.begin()); i != sources_.end(); ++i) [sources addObject:i->second]; + [sources addObjectsFromArray:(NSArray *)deadSources_]; return sources; } @@ -3329,7 +3341,9 @@ static NSString *Warning_; ++era_; [self releasePackages]; + sources_.clear(); + CFArrayRemoveAllValues(deadSources_); _error->Discard(); @@ -3419,14 +3433,19 @@ static NSString *Warning_; } for (pkgSourceList::const_iterator source = list_->begin(); source != list_->end(); ++source) { + bool found = false; std::vector<pkgIndexFile *> *indices = (*source)->GetIndexFiles(); for (std::vector<pkgIndexFile *>::const_iterator index = indices->begin(); index != indices->end(); ++index) // XXX: this could be more intelligent if (dynamic_cast<debPackagesIndex *>(*index) != NULL) { pkgCache::PkgFileIterator cached((*index)->FindInCache(cache_)); - if (!cached.end()) + if (!cached.end()) { sources_[cached->ID] = [[[Source alloc] initWithMetaIndex:*source inPool:pool_] autorelease]; + found = true; + } } + if (!found) + CFArrayAppendValue(deadSources_, [[[Source alloc] initWithMetaIndex:*source inPool:pool_] autorelease]); } { @@ -3676,6 +3695,37 @@ static NSString *Warning_; return i == sources_.end() ? nil : i->second; } +- (NSString *) mappedSectionForPointer:(const char *)section { + _H<NSString> *mapped; + + _profile(Database$mappedSectionForPointer$Cache) + mapped = §ions_[section]; + _end + + if (*mapped == NULL) { + size_t length(strlen(section)); + char spaced[length + 1]; + + _profile(Database$mappedSectionForPointer$Replace) + for (size_t index(0); index != length; ++index) + spaced[index] = section[index] == '_' ? ' ' : section[index]; + spaced[length] = '\0'; + _end + + NSString *string; + + _profile(Database$mappedSectionForPointer$stringWithUTF8String) + string = [NSString stringWithUTF8String:spaced]; + _end + + _profile(Database$mappedSectionForPointer$Map) + string = [SectionMap_ objectForKey:string] ?: string; + _end + + *mapped = string; + } return *mapped; +} + @end /* }}} */ @@ -5180,7 +5230,7 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { } - (void) drawContentRect:(CGRect)rect { - bool highlighted(highlighted_); + bool highlighted(highlighted_ && !editing_); [icon_ drawInRect:CGRectMake(8, 7, 32, 32)]; @@ -7505,7 +7555,10 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { if ([database_ era] != era_) return nil; - Section *section([sections_ objectAtIndex:[path section]]); + NSUInteger sectionIndex([path section]); + if (sectionIndex >= [sections_ count]) + return nil; + Section *section([sections_ objectAtIndex:sectionIndex]); NSInteger row([path row]); return [[[self packageAtIndex:([section row] + row)] retain] autorelease]; } } @@ -7564,22 +7617,27 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { } - (void) _reloadPackages:(NSArray *)packages { - _trace(); - for (Package *package in packages) - if ([package upgradableAndEssential:YES] || [package visible]) - CFArrayAppendValue(packages_, package); + CFRelease(packages_); + packages_ = CFArrayCreateMutable(kCFAllocatorDefault, [packages count], NULL); _trace(); - [(NSMutableArray *) packages_ radixSortUsingFunction:reinterpret_cast<SKRadixFunction>(&PackageChangesRadix) withContext:NULL]; + _profile(ChangesController$_reloadPackages$Filter) + for (Package *package in packages) + if ([package upgradableAndEssential:YES] || [package visible]) + CFArrayAppendValue(packages_, package); + _end + _trace(); + _profile(ChangesController$_reloadPackages$radixSort) + [(NSMutableArray *) packages_ radixSortUsingFunction:reinterpret_cast<SKRadixFunction>(&PackageChangesRadix) withContext:NULL]; + _end _trace(); } - (void) reloadData { +@synchronized (database_) { era_ = [database_ era]; NSArray *packages = [database_ packages]; - CFArrayRemoveAllValues(packages_); - [sections_ removeAllObjects]; #if 1 @@ -7669,7 +7727,9 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { target:self action:@selector(refreshButtonClicked) ] autorelease]]; -} + + PrintTimes(); +} } @end /* }}} */ @@ -7866,6 +7926,8 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { [ignoredCell_ setText:UCLocalize("IGNORE_UPGRADES")]; [ignoredCell_ setAccessoryView:ignoredSwitch_]; [ignoredCell_ setSelectionStyle:UITableViewCellSelectionStyleNone]; + // FIXME: Ignored state is not saved. + [ignoredCell_ setUserInteractionEnabled:NO]; [table_ setDataSource:self]; [table_ setDelegate:self]; @@ -8952,6 +9014,9 @@ typedef enum { _trace(); CydiaApp = self; + if ([self respondsToSelector:@selector(setApplicationSupportsShakeToEdit:)]) + [self setApplicationSupportsShakeToEdit:NO]; + [NSURLCache setSharedURLCache:[[[SDURLCache alloc] initWithMemoryCapacity:524288 diskCapacity:10485760 diff --git a/UICaboodle/BrowserView.mm b/UICaboodle/BrowserView.mm index 921e6aa..2abc02e 100644 --- a/UICaboodle/BrowserView.mm +++ b/UICaboodle/BrowserView.mm @@ -835,19 +835,13 @@ static void $UIWebViewWebViewDelegate$webViewClose$(UIWebViewWebViewDelegate *se [alert dismissWithClickedButtonIndex:-1 animated:YES]; } else if ([context isEqualToString:@"submit"]) { - switch (button) { - case 1: - break; - - case 2: - if (request_ != nil) { - WebThreadLock(); - [webview_ loadRequest:request_]; - WebThreadUnlock(); - } - break; - - _nodefault + if (button == [alert cancelButtonIndex]) { + } else if (button == [alert firstOtherButtonIndex]) { + if (request_ != nil) { + WebThreadLock(); + [webview_ loadRequest:request_]; + WebThreadUnlock(); + } } [alert dismissWithClickedButtonIndex:-1 animated:YES]; diff --git a/UICaboodle/UCPlatform.h b/UICaboodle/UCPlatform.h index 4f2169e..c241232 100644 --- a/UICaboodle/UCPlatform.h +++ b/UICaboodle/UCPlatform.h @@ -54,3 +54,9 @@ while (false) default: \ _assume(false); \ throw; + +#define _likely(expr) \ + __builtin_expect(expr, 1) + +#define _unlikely(expr) \ + __builtin_expect(expr, 0) @@ -12,8 +12,16 @@ endif flags := link := -#dpkg := /Library/Cydia/bin/dpkg-deb -Zlzma +ifeq (o,O) # gzip is actually better +dpkg := /Library/Cydia/bin/dpkg-deb +ifeq ($(wildcard $(dpkg)),$(dpkg)) +dpkg := $(dpkg) -zlzma +else +dpkg := dpkg-deb -zbzip2 +endif +else dpkg := dpkg-deb +endif sdk := $(sdks)/iPhoneOS$(ios).sdk @@ -50,7 +58,7 @@ backrow += -FAppleTV -framework BackRow -framework AppleTV #cycc = cycc -r4.2 -i$(ios) -o$@ gxx := /Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/g++-$(gcc) -cycc = $(gxx) -arch armv6 -o $@ -mcpu=arm1176jzf-s -miphoneos-version-min=2.0 -isysroot $(sdk) -idirafter /usr/include -F/Library/Frameworks +cycc = $(gxx) -mthumb -arch armv6 -o $@ -mcpu=arm1176jzf-s -miphoneos-version-min=2.0 -isysroot $(sdk) -idirafter /usr/include -F/Library/Frameworks all: MobileCydia @@ -92,6 +100,8 @@ package: MobileCydia mkdir -p _/DEBIAN ./control.sh _ >_/DEBIAN/control + find _ -name '*.png' -exec ./pngcrush.sh '{}' ';' + sudo chown -R 0 _ sudo chgrp -R 0 _ sudo chmod 6755 _/Applications/Cydia.app/MobileCydia @@ -99,6 +109,6 @@ package: MobileCydia mkdir -p debs ln -sf debs/cydia_$$(./version.sh)_iphoneos-arm.deb Cydia.deb $(dpkg) -b _ Cydia.deb - readlink Cydia.deb + @echo "$$(stat -L -f "%z" Cydia.deb) $$(stat -f "%Y" Cydia.deb)" .PHONY: all clean sign diff --git a/pngcrush.sh b/pngcrush.sh new file mode 100755 index 0000000..69715fb --- /dev/null +++ b/pngcrush.sh @@ -0,0 +1,40 @@ +#!/bin/bash + +png=$1 +steps=() + +function step() { + "$@" + mv -f {_,}_.png + steps+=($(stat -f "%z" _.png)) +} + +pngcrush=/Developer/Platforms/iPhoneOS.platform/Developer/usr/bin/pngcrush + +grep CgBI "${png}" &>/dev/null && exit 0 + +step cp -fa "${png}" __.png + +#step "${pngcrush}" -q -rem alla -reduce -brute -iphone {,_}_.png + +#step "${pngcrush}" -q -rem alla -reduce -brute {,_}_.png +#step pincrush {,_}_.png + +step "${pngcrush}" -q -rem alla -reduce -iphone {,_}_.png + +#"${pngcrush}" -q -rem alla -reduce -brute -iphone "${png}" 1.png +#"${pngcrush}" -q -iphone _.png 2.png +#ls -la 1.png 2.png + +mv -f _.png "${png}" + +echo -n "${png##*/} " +for ((i = 0; i != ${#steps[@]}; ++i)); do + if [[ $i != 0 ]]; then + echo -n " " + fi + + echo -n "${steps[i]}" +done + +printf $' %.0f%%\n' "$((steps[${#steps[@]}-1] * 100 / steps[0]))" |
