diff --git a/.gitignore b/.gitignore index 0a3a68f6..498a17a7 100644 --- a/.gitignore +++ b/.gitignore @@ -21,10 +21,14 @@ profile DerivedData *.hmap *.ipa +push.command # CocoaPods Pods +Iconset.zip + + ########################################## #.gitignore file @@ -215,4 +219,4 @@ build/ # ...none. Everything is now explained. ########################################## -########################################## \ No newline at end of file +########################################## diff --git a/.gitmodules b/.gitmodules index e69de29b..d3f5a12f 100644 --- a/.gitmodules +++ b/.gitmodules @@ -0,0 +1 @@ + diff --git a/Assets.xcassets/AccountsMainchat.imageset/AccountsMainchat.png b/Assets.xcassets/AccountsMainchat.imageset/AccountsMainchat.png new file mode 100644 index 00000000..7fbc7f3c Binary files /dev/null and b/Assets.xcassets/AccountsMainchat.imageset/AccountsMainchat.png differ diff --git a/Assets.xcassets/AccountsMainchat.imageset/Contents.json b/Assets.xcassets/AccountsMainchat.imageset/Contents.json new file mode 100644 index 00000000..d66807c1 --- /dev/null +++ b/Assets.xcassets/AccountsMainchat.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "AccountsMainchat.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Assets.xcassets/AppIcon.appiconset/Contents.json b/Assets.xcassets/AppIcon.appiconset/Contents.json index 8db8046c..7f52306f 100644 --- a/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -1,68 +1,59 @@ { - "info" : { - "author" : "xcode", - "version" : 1 - }, "images" : [ { - "filename" : "icon_16x16.png", - "size" : "16x16", "idiom" : "mac", - "scale" : "1x" + "scale" : "1x", + "size" : "16x16" }, { - "filename" : "icon_16x16@2x.png", - "size" : "16x16", "idiom" : "mac", - "scale" : "2x" + "scale" : "2x", + "size" : "16x16" }, { - "filename" : "icon_32x32.png", - "size" : "32x32", "idiom" : "mac", - "scale" : "1x" + "scale" : "1x", + "size" : "32x32" }, { - "filename" : "icon_32x32@2x.png", - "size" : "32x32", "idiom" : "mac", - "scale" : "2x" + "scale" : "2x", + "size" : "32x32" }, { - "filename" : "icon_128x128.png", - "size" : "128x128", "idiom" : "mac", - "scale" : "1x" + "scale" : "1x", + "size" : "128x128" }, { - "filename" : "icon_128x128@2x.png", - "size" : "128x128", "idiom" : "mac", - "scale" : "2x" + "scale" : "2x", + "size" : "128x128" }, { - "filename" : "icon_256x256.png", - "size" : "256x256", "idiom" : "mac", - "scale" : "1x" + "scale" : "1x", + "size" : "256x256" }, { - "filename" : "icon_256x256@2x.png", - "size" : "256x256", "idiom" : "mac", - "scale" : "2x" + "scale" : "2x", + "size" : "256x256" }, { - "filename" : "icon_512x512.png", - "size" : "512x512", + "filename" : "Wired-Icon.png", "idiom" : "mac", - "scale" : "1x" + "scale" : "1x", + "size" : "512x512" }, { - "filename" : "icon_512x512@2x.png", - "size" : "512x512", "idiom" : "mac", - "scale" : "2x" + "scale" : "2x", + "size" : "512x512" } - ] -} \ No newline at end of file + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Assets.xcassets/AppIcon.appiconset/Wired-Icon.png b/Assets.xcassets/AppIcon.appiconset/Wired-Icon.png new file mode 100644 index 00000000..c04b2e16 Binary files /dev/null and b/Assets.xcassets/AppIcon.appiconset/Wired-Icon.png differ diff --git a/Assets.xcassets/AppIcon.appiconset/icon_128x128.png b/Assets.xcassets/AppIcon.appiconset/icon_128x128.png deleted file mode 100644 index 3af09b49..00000000 Binary files a/Assets.xcassets/AppIcon.appiconset/icon_128x128.png and /dev/null differ diff --git a/Assets.xcassets/AppIcon.appiconset/icon_128x128@2x.png b/Assets.xcassets/AppIcon.appiconset/icon_128x128@2x.png deleted file mode 100644 index d15463a3..00000000 Binary files a/Assets.xcassets/AppIcon.appiconset/icon_128x128@2x.png and /dev/null differ diff --git a/Assets.xcassets/AppIcon.appiconset/icon_16x16.png b/Assets.xcassets/AppIcon.appiconset/icon_16x16.png deleted file mode 100644 index 17f93223..00000000 Binary files a/Assets.xcassets/AppIcon.appiconset/icon_16x16.png and /dev/null differ diff --git a/Assets.xcassets/AppIcon.appiconset/icon_16x16@2x.png b/Assets.xcassets/AppIcon.appiconset/icon_16x16@2x.png deleted file mode 100644 index bd811976..00000000 Binary files a/Assets.xcassets/AppIcon.appiconset/icon_16x16@2x.png and /dev/null differ diff --git a/Assets.xcassets/AppIcon.appiconset/icon_256x256.png b/Assets.xcassets/AppIcon.appiconset/icon_256x256.png deleted file mode 100644 index d15463a3..00000000 Binary files a/Assets.xcassets/AppIcon.appiconset/icon_256x256.png and /dev/null differ diff --git a/Assets.xcassets/AppIcon.appiconset/icon_256x256@2x.png b/Assets.xcassets/AppIcon.appiconset/icon_256x256@2x.png deleted file mode 100644 index 87118a75..00000000 Binary files a/Assets.xcassets/AppIcon.appiconset/icon_256x256@2x.png and /dev/null differ diff --git a/Assets.xcassets/AppIcon.appiconset/icon_32x32.png b/Assets.xcassets/AppIcon.appiconset/icon_32x32.png deleted file mode 100644 index bd811976..00000000 Binary files a/Assets.xcassets/AppIcon.appiconset/icon_32x32.png and /dev/null differ diff --git a/Assets.xcassets/AppIcon.appiconset/icon_32x32@2x.png b/Assets.xcassets/AppIcon.appiconset/icon_32x32@2x.png deleted file mode 100644 index aa4f6c74..00000000 Binary files a/Assets.xcassets/AppIcon.appiconset/icon_32x32@2x.png and /dev/null differ diff --git a/Assets.xcassets/AppIcon.appiconset/icon_512x512.png b/Assets.xcassets/AppIcon.appiconset/icon_512x512.png deleted file mode 100644 index 87118a75..00000000 Binary files a/Assets.xcassets/AppIcon.appiconset/icon_512x512.png and /dev/null differ diff --git a/Assets.xcassets/AppIcon.appiconset/icon_512x512@2x.png b/Assets.xcassets/AppIcon.appiconset/icon_512x512@2x.png deleted file mode 100644 index efdd97ef..00000000 Binary files a/Assets.xcassets/AppIcon.appiconset/icon_512x512@2x.png and /dev/null differ diff --git a/Assets.xcassets/Appearance.imageset/Appearance.png b/Assets.xcassets/Appearance.imageset/Appearance.png index 355eed6e..db280e1b 100644 Binary files a/Assets.xcassets/Appearance.imageset/Appearance.png and b/Assets.xcassets/Appearance.imageset/Appearance.png differ diff --git a/Assets.xcassets/Back.imageset/Back_dark.png b/Assets.xcassets/Back.imageset/Back_dark.png new file mode 100644 index 00000000..4fbb0757 Binary files /dev/null and b/Assets.xcassets/Back.imageset/Back_dark.png differ diff --git a/Assets.xcassets/Back.imageset/Contents.json b/Assets.xcassets/Back.imageset/Contents.json index cb36c5ec..d9620487 100644 --- a/Assets.xcassets/Back.imageset/Contents.json +++ b/Assets.xcassets/Back.imageset/Contents.json @@ -12,6 +12,7 @@ "value" : "dark" } ], + "filename" : "Back_dark.png", "idiom" : "universal", "scale" : "1x" }, diff --git a/Assets.xcassets/Banlist.imageset/Banlist.png b/Assets.xcassets/Banlist.imageset/Banlist.png index 6dcf72d7..9e09accf 100644 Binary files a/Assets.xcassets/Banlist.imageset/Banlist.png and b/Assets.xcassets/Banlist.imageset/Banlist.png differ diff --git a/Assets.xcassets/Boards.imageset/Boards.png b/Assets.xcassets/Boards.imageset/Boards.png index 02d4c6bc..74965927 100644 Binary files a/Assets.xcassets/Boards.imageset/Boards.png and b/Assets.xcassets/Boards.imageset/Boards.png differ diff --git a/Assets.xcassets/Broadcasts.imageset/Broadcasts.png b/Assets.xcassets/Broadcasts.imageset/Broadcasts.png new file mode 100644 index 00000000..8d4c9f66 Binary files /dev/null and b/Assets.xcassets/Broadcasts.imageset/Broadcasts.png differ diff --git a/Assets.xcassets/Broadcasts.imageset/Contents.json b/Assets.xcassets/Broadcasts.imageset/Contents.json new file mode 100644 index 00000000..1ba0bde7 --- /dev/null +++ b/Assets.xcassets/Broadcasts.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "Broadcasts.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Assets.xcassets/Chat History.imageset/Chat History.png b/Assets.xcassets/Chat History.imageset/Chat History.png index 373ba914..87ce01b5 100644 Binary files a/Assets.xcassets/Chat History.imageset/Chat History.png and b/Assets.xcassets/Chat History.imageset/Chat History.png differ diff --git a/Assets.xcassets/Chat.imageset/Chat.png b/Assets.xcassets/Chat.imageset/Chat.png index d4bc5942..43f033d5 100644 Binary files a/Assets.xcassets/Chat.imageset/Chat.png and b/Assets.xcassets/Chat.imageset/Chat.png differ diff --git a/Assets.xcassets/ClearChat.imageset/ClearChat.png b/Assets.xcassets/ClearChat.imageset/ClearChat.png index 500900b0..95646056 100644 Binary files a/Assets.xcassets/ClearChat.imageset/ClearChat.png and b/Assets.xcassets/ClearChat.imageset/ClearChat.png differ diff --git a/Assets.xcassets/ClearMessages.imageset/ClearMessages.png b/Assets.xcassets/ClearMessages.imageset/ClearMessages.png index cb74f45c..95646056 100644 Binary files a/Assets.xcassets/ClearMessages.imageset/ClearMessages.png and b/Assets.xcassets/ClearMessages.imageset/ClearMessages.png differ diff --git a/Assets.xcassets/ClearNews.imageset/ClearNews.png b/Assets.xcassets/ClearNews.imageset/ClearNews.png index cb74f45c..95646056 100644 Binary files a/Assets.xcassets/ClearNews.imageset/ClearNews.png and b/Assets.xcassets/ClearNews.imageset/ClearNews.png differ diff --git a/Assets.xcassets/ClearTransfers.imageset/ClearTransfers.png b/Assets.xcassets/ClearTransfers.imageset/ClearTransfers.png new file mode 100644 index 00000000..798958ff Binary files /dev/null and b/Assets.xcassets/ClearTransfers.imageset/ClearTransfers.png differ diff --git a/Assets.xcassets/ClearTransfers.imageset/Contents.json b/Assets.xcassets/ClearTransfers.imageset/Contents.json index d66b9e86..8a1e6469 100644 --- a/Assets.xcassets/ClearTransfers.imageset/Contents.json +++ b/Assets.xcassets/ClearTransfers.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "icons8-broom-2.png", + "filename" : "ClearTransfers.png", "idiom" : "universal", "scale" : "1x" }, @@ -16,7 +16,6 @@ "scale" : "1x" }, { - "filename" : "icons8-broom-1.png", "idiom" : "universal", "scale" : "2x" }, @@ -31,7 +30,6 @@ "scale" : "2x" }, { - "filename" : "icons8-broom.png", "idiom" : "universal", "scale" : "3x" }, @@ -49,8 +47,5 @@ "info" : { "author" : "xcode", "version" : 1 - }, - "properties" : { - "template-rendering-intent" : "template" } } diff --git a/Assets.xcassets/ClearTransfers.imageset/icons8-broom-1.png b/Assets.xcassets/ClearTransfers.imageset/icons8-broom-1.png deleted file mode 100644 index 27dd4842..00000000 Binary files a/Assets.xcassets/ClearTransfers.imageset/icons8-broom-1.png and /dev/null differ diff --git a/Assets.xcassets/ClearTransfers.imageset/icons8-broom-2.png b/Assets.xcassets/ClearTransfers.imageset/icons8-broom-2.png deleted file mode 100644 index a8de4c75..00000000 Binary files a/Assets.xcassets/ClearTransfers.imageset/icons8-broom-2.png and /dev/null differ diff --git a/Assets.xcassets/ClearTransfers.imageset/icons8-broom.png b/Assets.xcassets/ClearTransfers.imageset/icons8-broom.png deleted file mode 100644 index 3d902bf3..00000000 Binary files a/Assets.xcassets/ClearTransfers.imageset/icons8-broom.png and /dev/null differ diff --git a/Assets.xcassets/ColumnView.imageset/ColumnView_dark.png b/Assets.xcassets/ColumnView.imageset/ColumnView_dark.png new file mode 100644 index 00000000..a04d5d05 Binary files /dev/null and b/Assets.xcassets/ColumnView.imageset/ColumnView_dark.png differ diff --git a/Assets.xcassets/ColumnView.imageset/Contents.json b/Assets.xcassets/ColumnView.imageset/Contents.json index c777c674..94ec1308 100644 --- a/Assets.xcassets/ColumnView.imageset/Contents.json +++ b/Assets.xcassets/ColumnView.imageset/Contents.json @@ -12,6 +12,7 @@ "value" : "dark" } ], + "filename" : "ColumnView_dark.png", "idiom" : "universal", "scale" : "1x" }, diff --git a/Assets.xcassets/Connect.imageset/Connect.png b/Assets.xcassets/Connect.imageset/Connect.png deleted file mode 100644 index 9610f94c..00000000 Binary files a/Assets.xcassets/Connect.imageset/Connect.png and /dev/null differ diff --git a/Assets.xcassets/Connect.imageset/Contents.json b/Assets.xcassets/Connect.imageset/Contents.json index 4b602082..b9a6b3fe 100644 --- a/Assets.xcassets/Connect.imageset/Contents.json +++ b/Assets.xcassets/Connect.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "Connect.png", + "filename" : "Reconnect.png", "idiom" : "universal", "scale" : "1x" }, diff --git a/Assets.xcassets/Connect.imageset/Reconnect.png b/Assets.xcassets/Connect.imageset/Reconnect.png new file mode 100644 index 00000000..e5e083fb Binary files /dev/null and b/Assets.xcassets/Connect.imageset/Reconnect.png differ diff --git a/Assets.xcassets/ConnectTransfer.imageset/ConnectTransfer.png b/Assets.xcassets/ConnectTransfer.imageset/ConnectTransfer.png deleted file mode 100644 index 3afccb71..00000000 Binary files a/Assets.xcassets/ConnectTransfer.imageset/ConnectTransfer.png and /dev/null differ diff --git a/Assets.xcassets/ConnectTransfer.imageset/Contents.json b/Assets.xcassets/ConnectTransfer.imageset/Contents.json index 81d04ce8..b9a6b3fe 100644 --- a/Assets.xcassets/ConnectTransfer.imageset/Contents.json +++ b/Assets.xcassets/ConnectTransfer.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "ConnectTransfer.png", + "filename" : "Reconnect.png", "idiom" : "universal", "scale" : "1x" }, diff --git a/Assets.xcassets/ConnectTransfer.imageset/Reconnect.png b/Assets.xcassets/ConnectTransfer.imageset/Reconnect.png new file mode 100644 index 00000000..e5e083fb Binary files /dev/null and b/Assets.xcassets/ConnectTransfer.imageset/Reconnect.png differ diff --git a/Assets.xcassets/Console.imageset/Console.png b/Assets.xcassets/Console.imageset/Console.png deleted file mode 100644 index 0ea3bf4b..00000000 Binary files a/Assets.xcassets/Console.imageset/Console.png and /dev/null differ diff --git a/Assets.xcassets/Console.imageset/Contents.json b/Assets.xcassets/Console.imageset/Contents.json index f4f2ee2b..22834b4c 100644 --- a/Assets.xcassets/Console.imageset/Contents.json +++ b/Assets.xcassets/Console.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "Console.png", + "filename" : "Log.png", "idiom" : "universal", "scale" : "1x" }, diff --git a/Assets.xcassets/Console.imageset/Log.png b/Assets.xcassets/Console.imageset/Log.png new file mode 100644 index 00000000..6be3066b Binary files /dev/null and b/Assets.xcassets/Console.imageset/Log.png differ diff --git a/Assets.xcassets/Contents.json b/Assets.xcassets/Contents.json index da4a164c..73c00596 100644 --- a/Assets.xcassets/Contents.json +++ b/Assets.xcassets/Contents.json @@ -1,6 +1,6 @@ { "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -} \ No newline at end of file +} diff --git a/Assets.xcassets/Conversation.imageset/Conversation.png b/Assets.xcassets/Conversation.imageset/Conversation.png index 5d400e0f..f3c81ed3 100644 Binary files a/Assets.xcassets/Conversation.imageset/Conversation.png and b/Assets.xcassets/Conversation.imageset/Conversation.png differ diff --git a/Assets.xcassets/DeleteFile.imageset/Contents.json b/Assets.xcassets/DeleteFile.imageset/Contents.json index b48f7042..198d1d89 100644 --- a/Assets.xcassets/DeleteFile.imageset/Contents.json +++ b/Assets.xcassets/DeleteFile.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "DeleteFile.pdf", + "filename" : "DeleteThread.pdf", "idiom" : "universal" }, { diff --git a/Assets.xcassets/DeleteFile.imageset/DeleteFile.pdf b/Assets.xcassets/DeleteFile.imageset/DeleteFile.pdf deleted file mode 100644 index 9489e340..00000000 Binary files a/Assets.xcassets/DeleteFile.imageset/DeleteFile.pdf and /dev/null differ diff --git a/Assets.xcassets/Disconnect.imageset/Disconnect.pdf b/Assets.xcassets/DeleteFile.imageset/DeleteThread.pdf similarity index 100% rename from Assets.xcassets/Disconnect.imageset/Disconnect.pdf rename to Assets.xcassets/DeleteFile.imageset/DeleteThread.pdf diff --git a/Assets.xcassets/DeleteThread.imageset/Contents.json b/Assets.xcassets/DeleteThread.imageset/Contents.json index 975ff3fc..e0f6b0e5 100644 --- a/Assets.xcassets/DeleteThread.imageset/Contents.json +++ b/Assets.xcassets/DeleteThread.imageset/Contents.json @@ -1,14 +1,17 @@ { "images" : [ { - "filename" : "icons8-supprimer-le-fichier-24.png", - "idiom" : "mac", - "scale" : "1x" + "filename" : "DeleteThread.pdf", + "idiom" : "universal" }, { - "filename" : "icons8-supprimer-le-fichier-48.png", - "idiom" : "mac", - "scale" : "2x" + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "idiom" : "universal" } ], "info" : { diff --git a/Assets.xcassets/DeleteThread.imageset/DeleteThread.pdf b/Assets.xcassets/DeleteThread.imageset/DeleteThread.pdf new file mode 100644 index 00000000..5ad7cc19 Binary files /dev/null and b/Assets.xcassets/DeleteThread.imageset/DeleteThread.pdf differ diff --git a/Assets.xcassets/DeleteThread.imageset/icons8-supprimer-le-fichier-24.png b/Assets.xcassets/DeleteThread.imageset/icons8-supprimer-le-fichier-24.png deleted file mode 100644 index 99b8bf98..00000000 Binary files a/Assets.xcassets/DeleteThread.imageset/icons8-supprimer-le-fichier-24.png and /dev/null differ diff --git a/Assets.xcassets/DeleteThread.imageset/icons8-supprimer-le-fichier-48.png b/Assets.xcassets/DeleteThread.imageset/icons8-supprimer-le-fichier-48.png deleted file mode 100644 index 1a1a748e..00000000 Binary files a/Assets.xcassets/DeleteThread.imageset/icons8-supprimer-le-fichier-48.png and /dev/null differ diff --git a/Assets.xcassets/Disconnect.imageset/Contents.json b/Assets.xcassets/Disconnect.imageset/Contents.json index 6c2042ce..21257cbb 100644 --- a/Assets.xcassets/Disconnect.imageset/Contents.json +++ b/Assets.xcassets/Disconnect.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "Disconnect.pdf", + "filename" : "power.png", "idiom" : "universal" }, { diff --git a/Assets.xcassets/Disconnect.imageset/power.png b/Assets.xcassets/Disconnect.imageset/power.png new file mode 100644 index 00000000..13cf506c Binary files /dev/null and b/Assets.xcassets/Disconnect.imageset/power.png differ diff --git a/Assets.xcassets/Download.imageset/Contents.json b/Assets.xcassets/Download.imageset/Contents.json index 022a85f9..46d3b6df 100644 --- a/Assets.xcassets/Download.imageset/Contents.json +++ b/Assets.xcassets/Download.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "Download.png", + "filename" : "down.png", "idiom" : "universal", "scale" : "1x" }, @@ -12,6 +12,7 @@ "value" : "dark" } ], + "filename" : "Download_dark.png", "idiom" : "universal", "scale" : "1x" }, diff --git a/Assets.xcassets/Download.imageset/Download_dark.png b/Assets.xcassets/Download.imageset/Download_dark.png new file mode 100644 index 00000000..17ba4d81 Binary files /dev/null and b/Assets.xcassets/Download.imageset/Download_dark.png differ diff --git a/Assets.xcassets/Download.imageset/Download.png b/Assets.xcassets/Download.imageset/down.png similarity index 100% rename from Assets.xcassets/Download.imageset/Download.png rename to Assets.xcassets/Download.imageset/down.png diff --git a/Assets.xcassets/DownloadFiles.imageset/Contents.json b/Assets.xcassets/DownloadFiles.imageset/Contents.json new file mode 100644 index 00000000..b842e7b7 --- /dev/null +++ b/Assets.xcassets/DownloadFiles.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "DownloadFiles.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Assets.xcassets/DownloadFiles.imageset/DownloadFiles.png b/Assets.xcassets/DownloadFiles.imageset/DownloadFiles.png new file mode 100644 index 00000000..3f3b7f41 Binary files /dev/null and b/Assets.xcassets/DownloadFiles.imageset/DownloadFiles.png differ diff --git a/Assets.xcassets/DownloadNew.imageset/Contents.json b/Assets.xcassets/DownloadNew.imageset/Contents.json new file mode 100644 index 00000000..ce0d0226 --- /dev/null +++ b/Assets.xcassets/DownloadNew.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "DownloadNew.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Assets.xcassets/DownloadNew.imageset/DownloadNew.png b/Assets.xcassets/DownloadNew.imageset/DownloadNew.png new file mode 100644 index 00000000..aae4c8f9 Binary files /dev/null and b/Assets.xcassets/DownloadNew.imageset/DownloadNew.png differ diff --git a/Assets.xcassets/Events.imageset/Contents.json b/Assets.xcassets/Events.imageset/Contents.json index aebf7593..0b24eaee 100644 --- a/Assets.xcassets/Events.imageset/Contents.json +++ b/Assets.xcassets/Events.imageset/Contents.json @@ -12,7 +12,6 @@ "value" : "dark" } ], - "filename" : "Events_dark.png", "idiom" : "universal", "scale" : "1x" }, diff --git a/Assets.xcassets/Events.imageset/Events.png b/Assets.xcassets/Events.imageset/Events.png index 61798dbd..1842d87d 100644 Binary files a/Assets.xcassets/Events.imageset/Events.png and b/Assets.xcassets/Events.imageset/Events.png differ diff --git a/Assets.xcassets/Events.imageset/Events_dark.png b/Assets.xcassets/Events.imageset/Events_dark.png deleted file mode 100644 index 18547147..00000000 Binary files a/Assets.xcassets/Events.imageset/Events_dark.png and /dev/null differ diff --git a/Assets.xcassets/EventsAccounts.imageset/Contents.json b/Assets.xcassets/EventsAccounts.imageset/Contents.json index d5086cff..5f5c8190 100644 --- a/Assets.xcassets/EventsAccounts.imageset/Contents.json +++ b/Assets.xcassets/EventsAccounts.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "EventsAccounts.png", + "filename" : "EventsUsers.png", "idiom" : "universal", "scale" : "1x" }, diff --git a/Assets.xcassets/EventsAccounts.imageset/EventsAccounts.png b/Assets.xcassets/EventsAccounts.imageset/EventsUsers.png similarity index 81% rename from Assets.xcassets/EventsAccounts.imageset/EventsAccounts.png rename to Assets.xcassets/EventsAccounts.imageset/EventsUsers.png index 4b58c582..81a491b8 100644 Binary files a/Assets.xcassets/EventsAccounts.imageset/EventsAccounts.png and b/Assets.xcassets/EventsAccounts.imageset/EventsUsers.png differ diff --git a/Assets.xcassets/EventsDownloads.imageset/Contents.json b/Assets.xcassets/EventsDownloads.imageset/Contents.json index 5663931e..9cf8242e 100644 --- a/Assets.xcassets/EventsDownloads.imageset/Contents.json +++ b/Assets.xcassets/EventsDownloads.imageset/Contents.json @@ -12,6 +12,7 @@ "value" : "dark" } ], + "filename" : "EventsDownloads_dark.png", "idiom" : "universal", "scale" : "1x" }, diff --git a/Assets.xcassets/EventsDownloads.imageset/EventsDownloads_dark.png b/Assets.xcassets/EventsDownloads.imageset/EventsDownloads_dark.png new file mode 100644 index 00000000..09499932 Binary files /dev/null and b/Assets.xcassets/EventsDownloads.imageset/EventsDownloads_dark.png differ diff --git a/Assets.xcassets/EventsMessages.imageset/EventsMessages.png b/Assets.xcassets/EventsMessages.imageset/EventsMessages.png index 08b0eb95..ab7f4b0e 100644 Binary files a/Assets.xcassets/EventsMessages.imageset/EventsMessages.png and b/Assets.xcassets/EventsMessages.imageset/EventsMessages.png differ diff --git a/Assets.xcassets/FileInfo.imageset/FileInfo.png b/Assets.xcassets/FileInfo.imageset/FileInfo.png index c399c833..e1d30f57 100644 Binary files a/Assets.xcassets/FileInfo.imageset/FileInfo.png and b/Assets.xcassets/FileInfo.imageset/FileInfo.png differ diff --git a/Assets.xcassets/Folder.imageset/Folder.png b/Assets.xcassets/Folder.imageset/Folder.png index 75b8e359..f429f672 100644 Binary files a/Assets.xcassets/Folder.imageset/Folder.png and b/Assets.xcassets/Folder.imageset/Folder.png differ diff --git a/Assets.xcassets/FolderMainchat.imageset/Contents.json b/Assets.xcassets/FolderMainchat.imageset/Contents.json new file mode 100644 index 00000000..6d3a983e --- /dev/null +++ b/Assets.xcassets/FolderMainchat.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "FolderMainchat.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Assets.xcassets/FolderMainchat.imageset/FolderMainchat.png b/Assets.xcassets/FolderMainchat.imageset/FolderMainchat.png new file mode 100644 index 00000000..c551e39a Binary files /dev/null and b/Assets.xcassets/FolderMainchat.imageset/FolderMainchat.png differ diff --git a/Assets.xcassets/Forward.imageset/Contents.json b/Assets.xcassets/Forward.imageset/Contents.json index 62e141ec..82e09940 100644 --- a/Assets.xcassets/Forward.imageset/Contents.json +++ b/Assets.xcassets/Forward.imageset/Contents.json @@ -12,6 +12,7 @@ "value" : "dark" } ], + "filename" : "Forward_dark.png", "idiom" : "universal", "scale" : "1x" }, diff --git a/Assets.xcassets/Forward.imageset/Forward_dark.png b/Assets.xcassets/Forward.imageset/Forward_dark.png new file mode 100644 index 00000000..79a0de37 Binary files /dev/null and b/Assets.xcassets/Forward.imageset/Forward_dark.png differ diff --git a/Assets.xcassets/General.imageset/Contents.json b/Assets.xcassets/General.imageset/Contents.json index 7aeeeb39..f6161a7b 100644 --- a/Assets.xcassets/General.imageset/Contents.json +++ b/Assets.xcassets/General.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "General.png", + "filename" : "Settings.png", "idiom" : "universal", "scale" : "1x" }, diff --git a/Assets.xcassets/General.imageset/General.png b/Assets.xcassets/General.imageset/General.png deleted file mode 100644 index a5a13c18..00000000 Binary files a/Assets.xcassets/General.imageset/General.png and /dev/null differ diff --git a/Assets.xcassets/General.imageset/Settings.png b/Assets.xcassets/General.imageset/Settings.png new file mode 100644 index 00000000..7642c1a1 Binary files /dev/null and b/Assets.xcassets/General.imageset/Settings.png differ diff --git a/Assets.xcassets/Group.imageset/Contents.json b/Assets.xcassets/Group.imageset/Contents.json index b0aa513f..84c66226 100644 --- a/Assets.xcassets/Group.imageset/Contents.json +++ b/Assets.xcassets/Group.imageset/Contents.json @@ -12,6 +12,7 @@ "value" : "dark" } ], + "filename" : "Group_dark.png", "idiom" : "universal", "scale" : "1x" }, diff --git a/Assets.xcassets/Group.imageset/Group_dark.png b/Assets.xcassets/Group.imageset/Group_dark.png new file mode 100644 index 00000000..bd6e3bfd Binary files /dev/null and b/Assets.xcassets/Group.imageset/Group_dark.png differ diff --git a/Assets.xcassets/Kick.imageset/Contents.json b/Assets.xcassets/Kick.imageset/Contents.json index 383ff1ff..ef8aeaf0 100644 --- a/Assets.xcassets/Kick.imageset/Contents.json +++ b/Assets.xcassets/Kick.imageset/Contents.json @@ -12,6 +12,7 @@ "value" : "dark" } ], + "filename" : "Kick_dark.png", "idiom" : "universal", "scale" : "1x" }, diff --git a/Assets.xcassets/Kick.imageset/Kick_dark.png b/Assets.xcassets/Kick.imageset/Kick_dark.png new file mode 100644 index 00000000..1f9fa28a Binary files /dev/null and b/Assets.xcassets/Kick.imageset/Kick_dark.png differ diff --git a/Assets.xcassets/ListView.imageset/Contents.json b/Assets.xcassets/ListView.imageset/Contents.json index b50f73bb..13ede115 100644 --- a/Assets.xcassets/ListView.imageset/Contents.json +++ b/Assets.xcassets/ListView.imageset/Contents.json @@ -12,6 +12,7 @@ "value" : "dark" } ], + "filename" : "ListView_dark.png", "idiom" : "universal", "scale" : "1x" }, diff --git a/Assets.xcassets/ListView.imageset/ListView_dark.png b/Assets.xcassets/ListView.imageset/ListView_dark.png new file mode 100644 index 00000000..88f1be81 Binary files /dev/null and b/Assets.xcassets/ListView.imageset/ListView_dark.png differ diff --git a/Assets.xcassets/Log.imageset/Log.png b/Assets.xcassets/Log.imageset/Log.png index 0ea3bf4b..6be3066b 100644 Binary files a/Assets.xcassets/Log.imageset/Log.png and b/Assets.xcassets/Log.imageset/Log.png differ diff --git a/Assets.xcassets/Messages.imageset/Messages.png b/Assets.xcassets/Messages.imageset/Messages.png index 26973037..93cef612 100644 Binary files a/Assets.xcassets/Messages.imageset/Messages.png and b/Assets.xcassets/Messages.imageset/Messages.png differ diff --git a/Assets.xcassets/Monitor.imageset/Monitor.png b/Assets.xcassets/Monitor.imageset/Monitor.png index b734629a..86d44ec3 100644 Binary files a/Assets.xcassets/Monitor.imageset/Monitor.png and b/Assets.xcassets/Monitor.imageset/Monitor.png differ diff --git a/Assets.xcassets/NewFolder.imageset/NewFolder.png b/Assets.xcassets/NewFolder.imageset/NewFolder.png index 2d61261a..dda9b75f 100644 Binary files a/Assets.xcassets/NewFolder.imageset/NewFolder.png and b/Assets.xcassets/NewFolder.imageset/NewFolder.png differ diff --git a/Assets.xcassets/NewThread.imageset/Contents.json b/Assets.xcassets/NewThread.imageset/Contents.json index e6011429..e71f4fd4 100644 --- a/Assets.xcassets/NewThread.imageset/Contents.json +++ b/Assets.xcassets/NewThread.imageset/Contents.json @@ -1,8 +1,9 @@ { "images" : [ { - "filename" : "plus.pdf", - "idiom" : "mac" + "filename" : "NewThread.pdf", + "idiom" : "universal", + "scale" : "1x" }, { "appearances" : [ @@ -11,7 +12,36 @@ "value" : "dark" } ], - "idiom" : "mac" + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "idiom" : "universal", + "scale" : "3x" } ], "info" : { diff --git a/Assets.xcassets/NewThread.imageset/NewThread.pdf b/Assets.xcassets/NewThread.imageset/NewThread.pdf new file mode 100644 index 00000000..5d81ff19 Binary files /dev/null and b/Assets.xcassets/NewThread.imageset/NewThread.pdf differ diff --git a/Assets.xcassets/NewThread.imageset/plus.pdf b/Assets.xcassets/NewThread.imageset/plus.pdf deleted file mode 100644 index d6cffb0f..00000000 Binary files a/Assets.xcassets/NewThread.imageset/plus.pdf and /dev/null differ diff --git a/Assets.xcassets/NowPlaying.imageset/NowPlaying.png b/Assets.xcassets/NowPlaying.imageset/NowPlaying.png index e104e73f..581c60d8 100644 Binary files a/Assets.xcassets/NowPlaying.imageset/NowPlaying.png and b/Assets.xcassets/NowPlaying.imageset/NowPlaying.png differ diff --git a/Assets.xcassets/OpenFolder.imageset/Contents.json b/Assets.xcassets/OpenFolder.imageset/Contents.json index 764d70a8..656c306b 100644 --- a/Assets.xcassets/OpenFolder.imageset/Contents.json +++ b/Assets.xcassets/OpenFolder.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "OpenFolder.png", + "filename" : "Folder.png", "idiom" : "universal", "scale" : "1x" }, diff --git a/Assets.xcassets/OpenFolder.imageset/Folder.png b/Assets.xcassets/OpenFolder.imageset/Folder.png new file mode 100644 index 00000000..f429f672 Binary files /dev/null and b/Assets.xcassets/OpenFolder.imageset/Folder.png differ diff --git a/Assets.xcassets/OpenFolder.imageset/OpenFolder.png b/Assets.xcassets/OpenFolder.imageset/OpenFolder.png deleted file mode 100644 index deda3917..00000000 Binary files a/Assets.xcassets/OpenFolder.imageset/OpenFolder.png and /dev/null differ diff --git a/Assets.xcassets/PauseTransfer.imageset/Contents.json b/Assets.xcassets/PauseTransfer.imageset/Contents.json index 2fdfa257..941802a3 100644 --- a/Assets.xcassets/PauseTransfer.imageset/Contents.json +++ b/Assets.xcassets/PauseTransfer.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "icons8-pause-1.png", + "filename" : "PauseTransfer.png", "idiom" : "universal", "scale" : "1x" }, @@ -16,7 +16,6 @@ "scale" : "1x" }, { - "filename" : "icons8-pause.png", "idiom" : "universal", "scale" : "2x" }, @@ -31,7 +30,6 @@ "scale" : "2x" }, { - "filename" : "icons8-pause-2.png", "idiom" : "universal", "scale" : "3x" }, @@ -49,8 +47,5 @@ "info" : { "author" : "xcode", "version" : 1 - }, - "properties" : { - "template-rendering-intent" : "template" } } diff --git a/Assets.xcassets/PauseTransfer.imageset/PauseTransfer.png b/Assets.xcassets/PauseTransfer.imageset/PauseTransfer.png new file mode 100644 index 00000000..6e07a925 Binary files /dev/null and b/Assets.xcassets/PauseTransfer.imageset/PauseTransfer.png differ diff --git a/Assets.xcassets/PauseTransfer.imageset/icons8-pause-1.png b/Assets.xcassets/PauseTransfer.imageset/icons8-pause-1.png deleted file mode 100644 index 625d7bc7..00000000 Binary files a/Assets.xcassets/PauseTransfer.imageset/icons8-pause-1.png and /dev/null differ diff --git a/Assets.xcassets/PauseTransfer.imageset/icons8-pause-2.png b/Assets.xcassets/PauseTransfer.imageset/icons8-pause-2.png deleted file mode 100644 index aa89899d..00000000 Binary files a/Assets.xcassets/PauseTransfer.imageset/icons8-pause-2.png and /dev/null differ diff --git a/Assets.xcassets/PauseTransfer.imageset/icons8-pause.png b/Assets.xcassets/PauseTransfer.imageset/icons8-pause.png deleted file mode 100644 index ab16bfca..00000000 Binary files a/Assets.xcassets/PauseTransfer.imageset/icons8-pause.png and /dev/null differ diff --git a/Assets.xcassets/QuickLook.imageset/QuickLook.png b/Assets.xcassets/QuickLook.imageset/QuickLook.png index 7c258147..be3bf56f 100644 Binary files a/Assets.xcassets/QuickLook.imageset/QuickLook.png and b/Assets.xcassets/QuickLook.imageset/QuickLook.png differ diff --git a/Assets.xcassets/ReadThread.imageset/Contents.json b/Assets.xcassets/ReadThread.imageset/Contents.json index f026032a..e68ed742 100644 --- a/Assets.xcassets/ReadThread.imageset/Contents.json +++ b/Assets.xcassets/ReadThread.imageset/Contents.json @@ -12,6 +12,7 @@ "value" : "dark" } ], + "filename" : "ReadThread_dark.png", "idiom" : "universal", "scale" : "1x" }, diff --git a/Assets.xcassets/ReadThread.imageset/ReadThread_dark.png b/Assets.xcassets/ReadThread.imageset/ReadThread_dark.png new file mode 100644 index 00000000..4885e4eb Binary files /dev/null and b/Assets.xcassets/ReadThread.imageset/ReadThread_dark.png differ diff --git a/Assets.xcassets/Reconnect.imageset/Reconnect.png b/Assets.xcassets/Reconnect.imageset/Reconnect.png index 9610f94c..e5e083fb 100644 Binary files a/Assets.xcassets/Reconnect.imageset/Reconnect.png and b/Assets.xcassets/Reconnect.imageset/Reconnect.png differ diff --git a/Assets.xcassets/ReloadAccounts.imageset/Contents.json b/Assets.xcassets/ReloadAccounts.imageset/Contents.json index 44863c3b..d349084d 100644 --- a/Assets.xcassets/ReloadAccounts.imageset/Contents.json +++ b/Assets.xcassets/ReloadAccounts.imageset/Contents.json @@ -12,6 +12,7 @@ "value" : "dark" } ], + "filename" : "ReloadAccounts_dark.png", "idiom" : "universal", "scale" : "1x" }, diff --git a/Assets.xcassets/ReloadAccounts.imageset/ReloadAccounts_dark.png b/Assets.xcassets/ReloadAccounts.imageset/ReloadAccounts_dark.png new file mode 100644 index 00000000..15cf946b Binary files /dev/null and b/Assets.xcassets/ReloadAccounts.imageset/ReloadAccounts_dark.png differ diff --git a/Assets.xcassets/ReloadFiles.imageset/ReloadFiles.png b/Assets.xcassets/ReloadFiles.imageset/ReloadFiles.png index e49c1301..2876498e 100644 Binary files a/Assets.xcassets/ReloadFiles.imageset/ReloadFiles.png and b/Assets.xcassets/ReloadFiles.imageset/ReloadFiles.png differ diff --git a/Assets.xcassets/ReloadNews.imageset/Contents.json b/Assets.xcassets/ReloadNews.imageset/Contents.json index d19138f0..bf68c6c9 100644 --- a/Assets.xcassets/ReloadNews.imageset/Contents.json +++ b/Assets.xcassets/ReloadNews.imageset/Contents.json @@ -12,6 +12,7 @@ "value" : "dark" } ], + "filename" : "ReloadNews_dark.png", "idiom" : "universal", "scale" : "1x" }, diff --git a/Assets.xcassets/ReloadNews.imageset/ReloadNews_dark.png b/Assets.xcassets/ReloadNews.imageset/ReloadNews_dark.png new file mode 100644 index 00000000..15cf946b Binary files /dev/null and b/Assets.xcassets/ReloadNews.imageset/ReloadNews_dark.png differ diff --git a/Assets.xcassets/ReloadTracker.imageset/Contents.json b/Assets.xcassets/ReloadTracker.imageset/Contents.json index 32a28967..98bf37c5 100644 --- a/Assets.xcassets/ReloadTracker.imageset/Contents.json +++ b/Assets.xcassets/ReloadTracker.imageset/Contents.json @@ -12,6 +12,7 @@ "value" : "dark" } ], + "filename" : "ReloadTracker_dark.png", "idiom" : "universal", "scale" : "1x" }, diff --git a/Assets.xcassets/ReloadTracker.imageset/ReloadTracker_dark.png b/Assets.xcassets/ReloadTracker.imageset/ReloadTracker_dark.png new file mode 100644 index 00000000..15cf946b Binary files /dev/null and b/Assets.xcassets/ReloadTracker.imageset/ReloadTracker_dark.png differ diff --git a/Assets.xcassets/RemoveTransfer.imageset/Contents.json b/Assets.xcassets/RemoveTransfer.imageset/Contents.json index 95dfaa6c..d4c016e1 100644 --- a/Assets.xcassets/RemoveTransfer.imageset/Contents.json +++ b/Assets.xcassets/RemoveTransfer.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "icons8-delete_sign.png", + "filename" : "RemoveTransfer.png", "idiom" : "universal", "scale" : "1x" }, @@ -16,7 +16,6 @@ "scale" : "1x" }, { - "filename" : "icons8-delete_sign-1.png", "idiom" : "universal", "scale" : "2x" }, @@ -31,7 +30,6 @@ "scale" : "2x" }, { - "filename" : "icons8-delete_sign-2.png", "idiom" : "universal", "scale" : "3x" }, @@ -49,8 +47,5 @@ "info" : { "author" : "xcode", "version" : 1 - }, - "properties" : { - "template-rendering-intent" : "template" } } diff --git a/Assets.xcassets/RemoveTransfer.imageset/RemoveTransfer.png b/Assets.xcassets/RemoveTransfer.imageset/RemoveTransfer.png new file mode 100644 index 00000000..355155e5 Binary files /dev/null and b/Assets.xcassets/RemoveTransfer.imageset/RemoveTransfer.png differ diff --git a/Assets.xcassets/RemoveTransfer.imageset/icons8-delete_sign-1.png b/Assets.xcassets/RemoveTransfer.imageset/icons8-delete_sign-1.png deleted file mode 100644 index c4c34788..00000000 Binary files a/Assets.xcassets/RemoveTransfer.imageset/icons8-delete_sign-1.png and /dev/null differ diff --git a/Assets.xcassets/RemoveTransfer.imageset/icons8-delete_sign-2.png b/Assets.xcassets/RemoveTransfer.imageset/icons8-delete_sign-2.png deleted file mode 100644 index e93e0836..00000000 Binary files a/Assets.xcassets/RemoveTransfer.imageset/icons8-delete_sign-2.png and /dev/null differ diff --git a/Assets.xcassets/RemoveTransfer.imageset/icons8-delete_sign.png b/Assets.xcassets/RemoveTransfer.imageset/icons8-delete_sign.png deleted file mode 100644 index 8daac4ad..00000000 Binary files a/Assets.xcassets/RemoveTransfer.imageset/icons8-delete_sign.png and /dev/null differ diff --git a/Assets.xcassets/ReplyThread.imageset/Contents.json b/Assets.xcassets/ReplyThread.imageset/Contents.json index aa3b8ce6..24d99572 100644 --- a/Assets.xcassets/ReplyThread.imageset/Contents.json +++ b/Assets.xcassets/ReplyThread.imageset/Contents.json @@ -1,8 +1,9 @@ { "images" : [ { - "filename" : "reply.pdf", - "idiom" : "universal" + "filename" : "ReplyThread.pdf", + "idiom" : "universal", + "scale" : "1x" }, { "appearances" : [ @@ -11,7 +12,37 @@ "value" : "dark" } ], - "idiom" : "universal" + "filename" : "ReplyThread_dark.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "idiom" : "universal", + "scale" : "3x" } ], "info" : { diff --git a/Assets.xcassets/ReplyThread.imageset/ReplyThread.pdf b/Assets.xcassets/ReplyThread.imageset/ReplyThread.pdf new file mode 100644 index 00000000..c89a1ce1 Binary files /dev/null and b/Assets.xcassets/ReplyThread.imageset/ReplyThread.pdf differ diff --git a/Assets.xcassets/ReplyThread.imageset/ReplyThread_dark.png b/Assets.xcassets/ReplyThread.imageset/ReplyThread_dark.png new file mode 100644 index 00000000..40d1d500 Binary files /dev/null and b/Assets.xcassets/ReplyThread.imageset/ReplyThread_dark.png differ diff --git a/Assets.xcassets/ReplyThread.imageset/reply.pdf b/Assets.xcassets/ReplyThread.imageset/reply.pdf deleted file mode 100644 index 780d5bb9..00000000 Binary files a/Assets.xcassets/ReplyThread.imageset/reply.pdf and /dev/null differ diff --git a/Assets.xcassets/RevealInFinder.imageset/RevealInFinder.png b/Assets.xcassets/RevealInFinder.imageset/RevealInFinder.png index f9a558dd..ded31a8f 100644 Binary files a/Assets.xcassets/RevealInFinder.imageset/RevealInFinder.png and b/Assets.xcassets/RevealInFinder.imageset/RevealInFinder.png differ diff --git a/Assets.xcassets/RevealInUserList.imageset/Contents.json b/Assets.xcassets/RevealInUserList.imageset/Contents.json index 3d698850..bde86b68 100644 --- a/Assets.xcassets/RevealInUserList.imageset/Contents.json +++ b/Assets.xcassets/RevealInUserList.imageset/Contents.json @@ -12,6 +12,7 @@ "value" : "dark" } ], + "filename" : "RevealInUserList_dark.png", "idiom" : "universal", "scale" : "1x" }, diff --git a/Assets.xcassets/RevealInUserList.imageset/RevealInUserList_dark.png b/Assets.xcassets/RevealInUserList.imageset/RevealInUserList_dark.png new file mode 100644 index 00000000..49ca06b9 Binary files /dev/null and b/Assets.xcassets/RevealInUserList.imageset/RevealInUserList_dark.png differ diff --git a/Assets.xcassets/Search.imageset/Contents.json b/Assets.xcassets/Search.imageset/Contents.json index 43c73143..3493a7a5 100644 --- a/Assets.xcassets/Search.imageset/Contents.json +++ b/Assets.xcassets/Search.imageset/Contents.json @@ -12,6 +12,7 @@ "value" : "dark" } ], + "filename" : "Search_dark.png", "idiom" : "universal", "scale" : "1x" }, diff --git a/Assets.xcassets/Search.imageset/Search_dark.png b/Assets.xcassets/Search.imageset/Search_dark.png new file mode 100644 index 00000000..e2e61f9e Binary files /dev/null and b/Assets.xcassets/Search.imageset/Search_dark.png differ diff --git a/Assets.xcassets/SearchThreads.imageset/Contents.json b/Assets.xcassets/SearchThreads.imageset/Contents.json index 6f497ca1..29d24837 100644 --- a/Assets.xcassets/SearchThreads.imageset/Contents.json +++ b/Assets.xcassets/SearchThreads.imageset/Contents.json @@ -12,6 +12,7 @@ "value" : "dark" } ], + "filename" : "SearchThreads_dark.png", "idiom" : "universal", "scale" : "1x" }, diff --git a/Assets.xcassets/SearchThreads.imageset/SearchThreads_dark.png b/Assets.xcassets/SearchThreads.imageset/SearchThreads_dark.png new file mode 100644 index 00000000..a4831afc Binary files /dev/null and b/Assets.xcassets/SearchThreads.imageset/SearchThreads_dark.png differ diff --git a/Assets.xcassets/SentMailboxTemplate.imageset/Contents.json b/Assets.xcassets/SentMailboxTemplate.imageset/Contents.json index 7f636716..ef283c3b 100644 --- a/Assets.xcassets/SentMailboxTemplate.imageset/Contents.json +++ b/Assets.xcassets/SentMailboxTemplate.imageset/Contents.json @@ -12,6 +12,7 @@ "value" : "dark" } ], + "filename" : "SentMailboxTemplate_dark.png", "idiom" : "universal", "scale" : "1x" }, diff --git a/Assets.xcassets/SentMailboxTemplate.imageset/SentMailboxTemplate_dark.png b/Assets.xcassets/SentMailboxTemplate.imageset/SentMailboxTemplate_dark.png new file mode 100644 index 00000000..7192ddc2 Binary files /dev/null and b/Assets.xcassets/SentMailboxTemplate.imageset/SentMailboxTemplate_dark.png differ diff --git a/Assets.xcassets/Settings.imageset/Settings.png b/Assets.xcassets/Settings.imageset/Settings.png index a5a13c18..7642c1a1 100644 Binary files a/Assets.xcassets/Settings.imageset/Settings.png and b/Assets.xcassets/Settings.imageset/Settings.png differ diff --git a/Assets.xcassets/Smileys.imageset/Contents.json b/Assets.xcassets/Smileys.imageset/Contents.json index 5fd589df..f0530bfa 100644 --- a/Assets.xcassets/Smileys.imageset/Contents.json +++ b/Assets.xcassets/Smileys.imageset/Contents.json @@ -12,6 +12,7 @@ "value" : "dark" } ], + "filename" : "Smileys_dark.png", "idiom" : "universal", "scale" : "1x" }, diff --git a/Assets.xcassets/Smileys.imageset/Smileys_dark.png b/Assets.xcassets/Smileys.imageset/Smileys_dark.png new file mode 100644 index 00000000..84eb527e Binary files /dev/null and b/Assets.xcassets/Smileys.imageset/Smileys_dark.png differ diff --git a/Assets.xcassets/SplitSizer-horizontal.imageset/Contents.json b/Assets.xcassets/SplitSizer-horizontal.imageset/Contents.json index 29b5e44f..453d3acc 100644 --- a/Assets.xcassets/SplitSizer-horizontal.imageset/Contents.json +++ b/Assets.xcassets/SplitSizer-horizontal.imageset/Contents.json @@ -12,6 +12,7 @@ "value" : "dark" } ], + "filename" : "SplitSizer-horizontal_dark.png", "idiom" : "universal", "scale" : "1x" }, diff --git a/Assets.xcassets/SplitSizer-horizontal.imageset/SplitSizer-horizontal_dark.png b/Assets.xcassets/SplitSizer-horizontal.imageset/SplitSizer-horizontal_dark.png new file mode 100644 index 00000000..ac21ca83 Binary files /dev/null and b/Assets.xcassets/SplitSizer-horizontal.imageset/SplitSizer-horizontal_dark.png differ diff --git a/Assets.xcassets/SplitSizer.imageset/Contents.json b/Assets.xcassets/SplitSizer.imageset/Contents.json index 646bef16..715debb6 100644 --- a/Assets.xcassets/SplitSizer.imageset/Contents.json +++ b/Assets.xcassets/SplitSizer.imageset/Contents.json @@ -12,6 +12,7 @@ "value" : "dark" } ], + "filename" : "SplitSizer_dark.png", "idiom" : "universal", "scale" : "1x" }, diff --git a/Assets.xcassets/SplitSizer.imageset/SplitSizer_dark.png b/Assets.xcassets/SplitSizer.imageset/SplitSizer_dark.png new file mode 100644 index 00000000..ef1e5a08 Binary files /dev/null and b/Assets.xcassets/SplitSizer.imageset/SplitSizer_dark.png differ diff --git a/Assets.xcassets/StartTransfer.imageset/Contents.json b/Assets.xcassets/StartTransfer.imageset/Contents.json index ba3182ac..1aa09ab0 100644 --- a/Assets.xcassets/StartTransfer.imageset/Contents.json +++ b/Assets.xcassets/StartTransfer.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "icons8-play-2.png", + "filename" : "StartTransfer.png", "idiom" : "universal", "scale" : "1x" }, @@ -16,7 +16,6 @@ "scale" : "1x" }, { - "filename" : "icons8-play-1.png", "idiom" : "universal", "scale" : "2x" }, @@ -31,7 +30,6 @@ "scale" : "2x" }, { - "filename" : "icons8-play.png", "idiom" : "universal", "scale" : "3x" }, @@ -49,8 +47,5 @@ "info" : { "author" : "xcode", "version" : 1 - }, - "properties" : { - "template-rendering-intent" : "template" } } diff --git a/Assets.xcassets/StartTransfer.imageset/StartTransfer.png b/Assets.xcassets/StartTransfer.imageset/StartTransfer.png new file mode 100644 index 00000000..cf8188e3 Binary files /dev/null and b/Assets.xcassets/StartTransfer.imageset/StartTransfer.png differ diff --git a/Assets.xcassets/StartTransfer.imageset/icons8-play-1.png b/Assets.xcassets/StartTransfer.imageset/icons8-play-1.png deleted file mode 100644 index 6cbb2d67..00000000 Binary files a/Assets.xcassets/StartTransfer.imageset/icons8-play-1.png and /dev/null differ diff --git a/Assets.xcassets/StartTransfer.imageset/icons8-play-2.png b/Assets.xcassets/StartTransfer.imageset/icons8-play-2.png deleted file mode 100644 index 5104435b..00000000 Binary files a/Assets.xcassets/StartTransfer.imageset/icons8-play-2.png and /dev/null differ diff --git a/Assets.xcassets/StartTransfer.imageset/icons8-play.png b/Assets.xcassets/StartTransfer.imageset/icons8-play.png deleted file mode 100644 index 6b3e9327..00000000 Binary files a/Assets.xcassets/StartTransfer.imageset/icons8-play.png and /dev/null differ diff --git a/Assets.xcassets/StopTransfer.imageset/Contents.json b/Assets.xcassets/StopTransfer.imageset/Contents.json index 1a494936..6cafd6c8 100644 --- a/Assets.xcassets/StopTransfer.imageset/Contents.json +++ b/Assets.xcassets/StopTransfer.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "icons8-stop-2.png", + "filename" : "StopTransfer.png", "idiom" : "universal", "scale" : "1x" }, @@ -16,7 +16,6 @@ "scale" : "1x" }, { - "filename" : "icons8-stop-1.png", "idiom" : "universal", "scale" : "2x" }, @@ -31,7 +30,6 @@ "scale" : "2x" }, { - "filename" : "icons8-stop.png", "idiom" : "universal", "scale" : "3x" }, @@ -49,8 +47,5 @@ "info" : { "author" : "xcode", "version" : 1 - }, - "properties" : { - "template-rendering-intent" : "template" } } diff --git a/Assets.xcassets/StopTransfer.imageset/StopTransfer.png b/Assets.xcassets/StopTransfer.imageset/StopTransfer.png new file mode 100644 index 00000000..c75b408f Binary files /dev/null and b/Assets.xcassets/StopTransfer.imageset/StopTransfer.png differ diff --git a/Assets.xcassets/StopTransfer.imageset/icons8-stop-1.png b/Assets.xcassets/StopTransfer.imageset/icons8-stop-1.png deleted file mode 100644 index 5396dc74..00000000 Binary files a/Assets.xcassets/StopTransfer.imageset/icons8-stop-1.png and /dev/null differ diff --git a/Assets.xcassets/StopTransfer.imageset/icons8-stop-2.png b/Assets.xcassets/StopTransfer.imageset/icons8-stop-2.png deleted file mode 100644 index ae919d7a..00000000 Binary files a/Assets.xcassets/StopTransfer.imageset/icons8-stop-2.png and /dev/null differ diff --git a/Assets.xcassets/StopTransfer.imageset/icons8-stop.png b/Assets.xcassets/StopTransfer.imageset/icons8-stop.png deleted file mode 100644 index f8d90fa5..00000000 Binary files a/Assets.xcassets/StopTransfer.imageset/icons8-stop.png and /dev/null differ diff --git a/Assets.xcassets/Transfers.imageset/Transfers.png b/Assets.xcassets/Transfers.imageset/Transfers.png index 335e53e2..c700cb33 100644 Binary files a/Assets.xcassets/Transfers.imageset/Transfers.png and b/Assets.xcassets/Transfers.imageset/Transfers.png differ diff --git a/Assets.xcassets/UnreadHeader.imageset/Contents.json b/Assets.xcassets/UnreadHeader.imageset/Contents.json index 8b4667e0..a8894f43 100644 --- a/Assets.xcassets/UnreadHeader.imageset/Contents.json +++ b/Assets.xcassets/UnreadHeader.imageset/Contents.json @@ -12,6 +12,7 @@ "value" : "dark" } ], + "filename" : "UnreadHeader_dark.png", "idiom" : "universal", "scale" : "1x" }, diff --git a/Assets.xcassets/UnreadHeader.imageset/UnreadHeader_dark.png b/Assets.xcassets/UnreadHeader.imageset/UnreadHeader_dark.png new file mode 100644 index 00000000..67a30640 Binary files /dev/null and b/Assets.xcassets/UnreadHeader.imageset/UnreadHeader_dark.png differ diff --git a/Assets.xcassets/UnreadPost.imageset/Contents.json b/Assets.xcassets/UnreadPost.imageset/Contents.json index 86a2684f..a8a59039 100644 --- a/Assets.xcassets/UnreadPost.imageset/Contents.json +++ b/Assets.xcassets/UnreadPost.imageset/Contents.json @@ -1,8 +1,9 @@ { "images" : [ { - "filename" : "unread.pdf", - "idiom" : "universal" + "filename" : "UnreadPost.png", + "idiom" : "universal", + "scale" : "1x" }, { "appearances" : [ @@ -11,7 +12,37 @@ "value" : "dark" } ], - "idiom" : "universal" + "filename" : "UnreadPost_dark.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "idiom" : "universal", + "scale" : "3x" } ], "info" : { diff --git a/Assets.xcassets/UnreadPost.imageset/UnreadPost.png b/Assets.xcassets/UnreadPost.imageset/UnreadPost.png new file mode 100644 index 00000000..74fbb601 Binary files /dev/null and b/Assets.xcassets/UnreadPost.imageset/UnreadPost.png differ diff --git a/Assets.xcassets/UnreadPost.imageset/UnreadPost_dark.png b/Assets.xcassets/UnreadPost.imageset/UnreadPost_dark.png new file mode 100644 index 00000000..108b3642 Binary files /dev/null and b/Assets.xcassets/UnreadPost.imageset/UnreadPost_dark.png differ diff --git a/Assets.xcassets/UnreadPost.imageset/unread.pdf b/Assets.xcassets/UnreadPost.imageset/unread.pdf deleted file mode 100644 index 064c9db0..00000000 Binary files a/Assets.xcassets/UnreadPost.imageset/unread.pdf and /dev/null differ diff --git a/Assets.xcassets/UnreadThread.imageset/Contents.json b/Assets.xcassets/UnreadThread.imageset/Contents.json index 86a2684f..fc97993c 100644 --- a/Assets.xcassets/UnreadThread.imageset/Contents.json +++ b/Assets.xcassets/UnreadThread.imageset/Contents.json @@ -1,8 +1,9 @@ { "images" : [ { - "filename" : "unread.pdf", - "idiom" : "universal" + "filename" : "UnreadThread.png", + "idiom" : "universal", + "scale" : "1x" }, { "appearances" : [ @@ -11,7 +12,37 @@ "value" : "dark" } ], - "idiom" : "universal" + "filename" : "UnreadThread_dark.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "idiom" : "universal", + "scale" : "3x" } ], "info" : { diff --git a/Assets.xcassets/UnreadThread.imageset/UnreadThread.png b/Assets.xcassets/UnreadThread.imageset/UnreadThread.png new file mode 100644 index 00000000..b75fee99 Binary files /dev/null and b/Assets.xcassets/UnreadThread.imageset/UnreadThread.png differ diff --git a/Assets.xcassets/UnreadThread.imageset/UnreadThread_dark.png b/Assets.xcassets/UnreadThread.imageset/UnreadThread_dark.png new file mode 100644 index 00000000..108b3642 Binary files /dev/null and b/Assets.xcassets/UnreadThread.imageset/UnreadThread_dark.png differ diff --git a/Assets.xcassets/UnreadThread.imageset/unread.pdf b/Assets.xcassets/UnreadThread.imageset/unread.pdf deleted file mode 100644 index 064c9db0..00000000 Binary files a/Assets.xcassets/UnreadThread.imageset/unread.pdf and /dev/null differ diff --git a/Assets.xcassets/Upload.imageset/Contents.json b/Assets.xcassets/Upload.imageset/Contents.json index 42805e31..6c0d7c21 100644 --- a/Assets.xcassets/Upload.imageset/Contents.json +++ b/Assets.xcassets/Upload.imageset/Contents.json @@ -12,6 +12,7 @@ "value" : "dark" } ], + "filename" : "Upload_dark.png", "idiom" : "universal", "scale" : "1x" }, diff --git a/Assets.xcassets/Upload.imageset/Upload_dark.png b/Assets.xcassets/Upload.imageset/Upload_dark.png new file mode 100644 index 00000000..53b741b6 Binary files /dev/null and b/Assets.xcassets/Upload.imageset/Upload_dark.png differ diff --git a/Assets.xcassets/UploadFiles.imageset/Contents.json b/Assets.xcassets/UploadFiles.imageset/Contents.json new file mode 100644 index 00000000..ae334671 --- /dev/null +++ b/Assets.xcassets/UploadFiles.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "UploadFiles.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Assets.xcassets/UploadFiles.imageset/UploadFiles.png b/Assets.xcassets/UploadFiles.imageset/UploadFiles.png new file mode 100644 index 00000000..87a34fb7 Binary files /dev/null and b/Assets.xcassets/UploadFiles.imageset/UploadFiles.png differ diff --git a/Assets.xcassets/User.imageset/Contents.json b/Assets.xcassets/User.imageset/Contents.json index 548d8935..7d78bdd9 100644 --- a/Assets.xcassets/User.imageset/Contents.json +++ b/Assets.xcassets/User.imageset/Contents.json @@ -12,6 +12,7 @@ "value" : "dark" } ], + "filename" : "User_dark.png", "idiom" : "universal", "scale" : "1x" }, diff --git a/Assets.xcassets/User.imageset/User_dark.png b/Assets.xcassets/User.imageset/User_dark.png new file mode 100644 index 00000000..910bfbfe Binary files /dev/null and b/Assets.xcassets/User.imageset/User_dark.png differ diff --git a/Assets.xcassets/UserInfo.imageset/Contents.json b/Assets.xcassets/UserInfo.imageset/Contents.json index c098bdba..d01d5808 100644 --- a/Assets.xcassets/UserInfo.imageset/Contents.json +++ b/Assets.xcassets/UserInfo.imageset/Contents.json @@ -12,6 +12,7 @@ "value" : "dark" } ], + "filename" : "UserInfo_dark.pdf", "idiom" : "universal", "scale" : "1x" }, diff --git a/Assets.xcassets/UserInfo.imageset/UserInfo_dark.pdf b/Assets.xcassets/UserInfo.imageset/UserInfo_dark.pdf new file mode 100644 index 00000000..e5f463c1 Binary files /dev/null and b/Assets.xcassets/UserInfo.imageset/UserInfo_dark.pdf differ diff --git a/Assets.xcassets/VolumeLoud.imageset/Contents.json b/Assets.xcassets/VolumeLoud.imageset/Contents.json index 51dcc6d2..4a2e38cc 100644 --- a/Assets.xcassets/VolumeLoud.imageset/Contents.json +++ b/Assets.xcassets/VolumeLoud.imageset/Contents.json @@ -12,6 +12,7 @@ "value" : "dark" } ], + "filename" : "VolumeLoud_dark.png", "idiom" : "universal", "scale" : "1x" }, diff --git a/Assets.xcassets/VolumeLoud.imageset/VolumeLoud_dark.png b/Assets.xcassets/VolumeLoud.imageset/VolumeLoud_dark.png new file mode 100644 index 00000000..1d79d2d0 Binary files /dev/null and b/Assets.xcassets/VolumeLoud.imageset/VolumeLoud_dark.png differ diff --git a/Assets.xcassets/VolumeQuiet.imageset/Contents.json b/Assets.xcassets/VolumeQuiet.imageset/Contents.json index dd9f04a2..5ea1a771 100644 --- a/Assets.xcassets/VolumeQuiet.imageset/Contents.json +++ b/Assets.xcassets/VolumeQuiet.imageset/Contents.json @@ -12,6 +12,7 @@ "value" : "dark" } ], + "filename" : "VolumeQuiet_dark.png", "idiom" : "universal", "scale" : "1x" }, diff --git a/Assets.xcassets/VolumeQuiet.imageset/VolumeQuiet_dark.png b/Assets.xcassets/VolumeQuiet.imageset/VolumeQuiet_dark.png new file mode 100644 index 00000000..63487f4f Binary files /dev/null and b/Assets.xcassets/VolumeQuiet.imageset/VolumeQuiet_dark.png differ diff --git a/Assets.xcassets/WiredServer.imageset/Contents.json b/Assets.xcassets/WiredServer.imageset/Contents.json new file mode 100644 index 00000000..76375844 --- /dev/null +++ b/Assets.xcassets/WiredServer.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "Wired Server Icon Globe.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Assets.xcassets/WiredServer.imageset/Wired Server Icon Globe.png b/Assets.xcassets/WiredServer.imageset/Wired Server Icon Globe.png new file mode 100644 index 00000000..460ab390 Binary files /dev/null and b/Assets.xcassets/WiredServer.imageset/Wired Server Icon Globe.png differ diff --git a/Iconset.7z b/Iconset.7z new file mode 100644 index 00000000..a177425c Binary files /dev/null and b/Iconset.7z differ diff --git a/Images/WiredBookmarks.icns b/Images/WiredBookmarks.icns index 099376b4..05eb5125 100644 Binary files a/Images/WiredBookmarks.icns and b/Images/WiredBookmarks.icns differ diff --git a/Images/WiredScheme.icns b/Images/WiredScheme.icns index ba6ee993..b7eafda4 100644 Binary files a/Images/WiredScheme.icns and b/Images/WiredScheme.icns differ diff --git a/Images/WiredServer.icns b/Images/WiredServer.icns deleted file mode 100644 index c1335500..00000000 Binary files a/Images/WiredServer.icns and /dev/null differ diff --git a/Images/WiredSettings.icns b/Images/WiredSettings.icns index 1ac67bc1..52a74493 100644 Binary files a/Images/WiredSettings.icns and b/Images/WiredSettings.icns differ diff --git a/Images/WiredTemplate.icns b/Images/WiredTemplate.icns index 8461baff..42c2666a 100644 Binary files a/Images/WiredTemplate.icns and b/Images/WiredTemplate.icns differ diff --git a/Images/WiredTheme.icns b/Images/WiredTheme.icns index d41e3acd..d83fb0a6 100644 Binary files a/Images/WiredTheme.icns and b/Images/WiredTheme.icns differ diff --git a/Images/WiredTransfer.icns b/Images/WiredTransfer.icns index 25410130..568624e5 100644 Binary files a/Images/WiredTransfer.icns and b/Images/WiredTransfer.icns differ diff --git a/Info.plist b/Info.plist index 74869ce8..81d19e76 100644 --- a/Info.plist +++ b/Info.plist @@ -4,6 +4,8 @@ CFBundleDevelopmentRegion English + CFBundleDisplayName + $(PRODUCT_NAME) CFBundleDocumentTypes @@ -119,22 +121,30 @@ LSApplicationCategoryType public.app-category.lifestyle LSMinimumSystemVersion - 10.10.5 + 10.13 NSAppTransportSecurity NSAllowsArbitraryLoads NSAppleEventsUsageDescription - Now Playing + NSMainNibFile MainMenu NSPrincipalClass WCApplication + SUAllowsAutomaticUpdates + + SUAutomaticallyUpdate + + SUEnableAutomaticChecks + + SUEnableSystemProfiling + SUFeedURL - https://wired.read-write.fr/wiredclient_cast.xml + https://wired.istation.pw/wiredclient/appcast.xml SUPublicEDKey - dsa_pub.pem + IocWX96bR2E4UoPBgFT3KVRVWbut/1HjJVrfChE6l+s= UTExportedTypeDeclarations diff --git a/Podfile b/Podfile index 08dc06bd..95288a73 100644 --- a/Podfile +++ b/Podfile @@ -1,22 +1,28 @@ source 'https://github.com/CocoaPods/Specs.git' use_frameworks! -platform :osx, '10.10' +platform :osx, '10.13' target 'Wired Client' do - pod 'Sparkle' pod 'SBJson4', '~> 4.0.0' pod 'NSDate+TimeAgo' - pod 'OpenSSL-Universal' end target 'WiredNetworking' do project 'vendor/WiredFrameworks/WiredFrameworks.xcodeproj' workspace 'vendor/WiredFrameworks/WiredFrameworks.xcworkspace' - pod 'OpenSSL-Universal' end target 'libwired-osx' do project 'vendor/WiredFrameworks/WiredFrameworks.xcodeproj' workspace 'vendor/WiredFrameworks/WiredFrameworks.xcworkspace' - pod 'OpenSSL-Universal' +end + +post_install do |installer| + installer.pods_project.targets.each do |target| + if target.name == 'SBJson4' || target.name == 'NSDate+TimeAgo' + target.build_configurations.each do |config| + config.build_settings['MACOSX_DEPLOYMENT_TARGET'] = '10.13' + end + end + end end diff --git a/Podfile.lock b/Podfile.lock index cf91c9d3..9c5161c2 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -1,30 +1,20 @@ PODS: - "NSDate+TimeAgo (1.0.6)" - - OpenSSL-Universal (1.0.2.19): - - OpenSSL-Universal/Static (= 1.0.2.19) - - OpenSSL-Universal/Static (1.0.2.19) - SBJson4 (4.0.5) - - Sparkle (1.23.0) DEPENDENCIES: - "NSDate+TimeAgo" - - OpenSSL-Universal - SBJson4 (~> 4.0.0) - - Sparkle SPEC REPOS: https://github.com/CocoaPods/Specs.git: - "NSDate+TimeAgo" - - OpenSSL-Universal - SBJson4 - - Sparkle SPEC CHECKSUMS: "NSDate+TimeAgo": 35601c619b2d59290055e4fe76e61d97677a2360 - OpenSSL-Universal: 8b48cc0d10c1b2923617dfe5c178aa9ed2689355 SBJson4: e1aa705a4104e83fd250420709a57de5efae96ff - Sparkle: 55b1a87ba69d56913375a281546b7c82dec95bb0 -PODFILE CHECKSUM: fa150038f6c8e2bd91237273cf2233fefb2dc11c +PODFILE CHECKSUM: 31f33612770079963f54fc1ccbada503a6870f93 -COCOAPODS: 1.9.1 +COCOAPODS: 1.15.2 diff --git a/README.md b/README.md index cd3f9793..d84c14c2 100755 --- a/README.md +++ b/README.md @@ -1,11 +1,11 @@ # Wired Client Source Code -This repository hosts Wired Client source code. You will find an Xcode project named "WiredClient.xcworkspace" that contains a Wired Client target ready to deploy a 10.10+ compatible application (64-bit). +This repository hosts Wired Client source code. You will find an Xcode project named "WiredClient.xcworkspace" that contains a Wired Client target ready to deploy a 10.13+ compatible application (64-bit). ## Prerequisites - Mac OS X 10.13+ -- Xcode 10.0+ +- Xcode 13.0+ - Homebrew 1.8+ - CocoaPods 1.5+ @@ -13,32 +13,36 @@ This repository hosts Wired Client source code. You will find an Xcode project n 0. Install dependencies using [Homebrew](https://brew.sh): - brew install mogenerator + brew install mogenerator cocoapods -1. Get sources on GitHub: +2. Get sources on GitHub: - git clone https://github.com/nark/WiredClient.git + git clone https://github.com/profdrluigi/WiredClient.git -2. Move into the sources directory: +3. Move into the sources directory: cd WiredClient -4. Install pods: +5. Install pods: pod install -5. Open `WiredClient.xcworkspace` with Xcode +6. Open `WiredClient.xcworkspace` with Xcode -6. Select scheme `Wired Client` and be sure to use "Debug" Build Configuration (Menu > Product > Schemes > Edit Schemes > Run > Info Build configuration) +7. Select scheme `Wired Client` and be sure to use "Release" Build Configuration (Menu > Product > Schemes > Edit Schemes > Run > Info Build configuration) -7. Launch Build, Wired Client.app should launch automatically when finished +8. Launch Build, Wired Client.app should launch automatically when finished ## Troubleshooting -If you encounter an error during compilation with Xcode crying about `wired.h` not found, got to Build Product folder and rename "libwired/" directory to "wired/". Then try to build again. +- If you encounter an error during compilation with Xcode crying about `wired.h` not found, got to Build Product folder and rename "libwired/" directory to "wired/". Then try to build again. -If you encounter any other problem, feel free to report it in the issues section here on GitHub. +- If you got the error that the Application can not be opened because it's damaged you must put it out of the Quarantain. Type in Terminal: + + xattr -rc "/Applications/Wired Client.app" + + (or another Path where you have the App) and you should be good to go. ## Contribute to the project diff --git a/Sources/NSImage+Data.h b/Sources/NSImage+Data.h deleted file mode 100644 index ed8b6599..00000000 --- a/Sources/NSImage+Data.h +++ /dev/null @@ -1,15 +0,0 @@ -// -// NSImage+Data.h -// Wired Client -// -// Created by Rafael Warnault on 03/05/2020. -// - -#import - -@interface NSImage (Data) - -+ (BOOL)isImageAtPath:(NSString *)path; -+ (NSString *)contentTypeForImageData:(NSData *)data; - -@end diff --git a/Sources/NSImage+Data.m b/Sources/NSImage+Data.m deleted file mode 100644 index 336a01c2..00000000 --- a/Sources/NSImage+Data.m +++ /dev/null @@ -1,45 +0,0 @@ -// -// NSImage+Data.m -// Wired Client -// -// Created by Rafael Warnault on 03/05/2020. -// - -#import "NSImage+Data.h" - -@implementation NSImage (Data) - -+ (BOOL)isImageAtPath:(NSString *)path { - NSFileHandle *handle; - NSData *data; - - handle = [NSFileHandle fileHandleForReadingAtPath:path]; - - if (handle == nil) return NO; - - data = [handle readDataOfLength:4]; - - if (data == nil) return NO; - - return ([NSImage contentTypeForImageData:data] != nil); -} - -+ (NSString *)contentTypeForImageData:(NSData *)data { - uint8_t c; - [data getBytes:&c length:1]; - - switch (c) { - case 0xFF: - return @"image/jpeg"; - case 0x89: - return @"image/png"; - case 0x47: - return @"image/gif"; - case 0x49: - case 0x4D: - return @"image/tiff"; - } - return nil; -} - -@end diff --git a/Sources/NSString+Emoji.m b/Sources/NSString+Emoji.m index c426d4bb..a1058ecf 100644 --- a/Sources/NSString+Emoji.m +++ b/Sources/NSString+Emoji.m @@ -16,27 +16,27 @@ @implementation NSString (Emoji) + (void)initializeEmojiCheatCodes { NSDictionary *forwardMap = @{ - @"😄": @[@":smile:", @":D", @":-D"], - @"😆": @[@":laughing:", @"><"], + @"😄": @":smile:", + @"😆": @[@":laughing:", @":D"], @"😊": @":blush:", - @"😃": @[@":smiley:"], // this is a test - @"🙂": @[@":relaxed:", @":-)", @":)"], - @"😏": @[@":smirk:"], + @"😃": @[@":smiley:", @":)", @":-)", @"grgrr47"], // this is a test + @"☺": @":relaxed:", + @"😏": @":smirk:", @"😞": @[@":disappointed:", @":("], @"😍": @":heart_eyes:", - @"😘": @[@":kissing_heart:", @":-*", @":*"], + @"😘": @":kissing_heart:", @"😚": @":kissing_closed_eyes:", @"😳": @":flushed:", @"😥": @":relieved:", @"😌": @":satisfied:", @"😁": @":grin:", @"😉": @[@":wink:", @";)", @";-)"], - @"😜": @[@":wink2:", @";P"], + @"😜": @[@":wink2:", @":P"], @"😝": @":stuck_out_tongue_closed_eyes:", @"😀": @":grinning:", @"😗": @":kissing:", @"😙": @":kissing_smiling_eyes:", - @"😛": @[@":stuck_out_tongue:", @":P", @":-P"], + @"😛": @":stuck_out_tongue:", @"😴": @":sleeping:", @"😟": @":worried:", @"😦": @":frowning:", @@ -79,7 +79,7 @@ + (void)initializeEmojiCheatCodes @"💛": @":yellow_heart:", @"💙": @":blue_heart:", @"💜": @":purple_heart:", - @"❤️": @[@":heart:", @"<3"], + @"❤": @[@":heart:", @"<3"], @"💚": @":green_heart:", @"💔": @":broken_heart:", @"💓": @":heartbeat:", @@ -876,7 +876,7 @@ - (NSString *)stringByReplacingEmojiCheatCodesWithUnicode //if ([self rangeOfString:@":"].location != NSNotFound) { __block NSMutableString *newText = [NSMutableString stringWithString:self]; [s_cheatCodesToUnicode enumerateKeysAndObjectsUsingBlock:^(NSString *key, id obj, BOOL *stop) { - [newText replaceOccurrencesOfString:key withString:obj options:NSCaseInsensitiveSearch range:NSMakeRange(0, newText.length)]; + [newText replaceOccurrencesOfString:key withString:obj options:NSLiteralSearch range:NSMakeRange(0, newText.length)]; }]; return newText; //} @@ -894,7 +894,7 @@ - (NSString *)stringByReplacingEmojiUnicodeWithCheatCodes __block NSMutableString *newText = [NSMutableString stringWithString:self]; [s_unicodeToCheatCodes enumerateKeysAndObjectsUsingBlock:^(id key, id obj, BOOL *stop) { NSString *string = ([obj isKindOfClass:[NSArray class]] ? [obj firstObject] : obj); - [newText replaceOccurrencesOfString:key withString:string options:NSCaseInsensitiveSearch range:NSMakeRange(0, newText.length)]; + [newText replaceOccurrencesOfString:key withString:string options:NSLiteralSearch range:NSMakeRange(0, newText.length)]; }]; return newText; } diff --git a/Sources/WCAccountsController.m b/Sources/WCAccountsController.m index 11baf769..3b3589d1 100644 --- a/Sources/WCAccountsController.m +++ b/Sources/WCAccountsController.m @@ -277,8 +277,8 @@ - (BOOL)_verifyUnsavedAndPerformAction:(WCAccountsAction)action argument:(id)arg [_nameTextField stringValue]]]; } else { [alert setMessageText:[NSSWF: - NSLS(@"Save changes to %u accounts?", @"Save account dialog title (count)"), - [_accounts count]]]; + NSLS(@"Save changes to %lu accounts?", @"Save account dialog title (count)"), + (unsigned long)[_accounts count]]]; } action = [[dictionary objectForKey:@"WCAccountsAction"] integerValue]; @@ -501,12 +501,12 @@ - (void)_readFromAccounts { else [_loginTimeTextField setStringValue:@""]; - [_downloadsTextField setStringValue:[NSSWF:NSLS(@"%u completed, %@ transferred", @"Account transfer stats (count, transferred"), - [(WCUserAccount *) account downloads], + [_downloadsTextField setStringValue:[NSSWF:NSLS(@"%lu completed, %@ transferred", @"Account transfer stats (count, transferred"), + (unsigned long)[(WCUserAccount *) account downloads], [_sizeFormatter stringFromSize:[(WCUserAccount *) account downloadTransferred]]]]; - [_uploadsTextField setStringValue:[NSSWF:NSLS(@"%u completed, %@ transferred", @"Account transfer stats (count, transferred"), - [(WCUserAccount *) account uploads], + [_uploadsTextField setStringValue:[NSSWF:NSLS(@"%lu completed, %@ transferred", @"Account transfer stats (count, transferred"), + (unsigned long)[(WCUserAccount *) account uploads], [_sizeFormatter stringFromSize:[(WCUserAccount *) account uploadTransferred]]]]; } else if([account isKindOfClass:[WCGroupAccount class]]) { @@ -945,8 +945,8 @@ - (void)_reloadFilter { [_shownAccounts addObject:account]; } - [_statusTextField setStringValue:[NSSWF:NSLS(@"%u %@", @"Accounts (count, 'account(s)'"), - [_shownAccounts count], + [_statusTextField setStringValue:[NSSWF:NSLS(@"%lu %@", @"Accounts (count, 'account(s)'"), + (unsigned long)[_shownAccounts count], [_shownAccounts count] == 1 ? NSLS(@"account", @"Account singular") : NSLS(@"accounts", @"Account plural")]]; @@ -1031,7 +1031,7 @@ - (id)init { switch((WCAccountFieldType) [[setting objectForKey:WCAccountFieldTypeKey] integerValue]) { case WCAccountFieldTypeBoolean: buttonCell = [[NSButtonCell alloc] initTextCell:@""]; - [buttonCell setControlSize:NSSmallControlSize]; + [buttonCell setControlSize:NSControlSizeSmall]; [buttonCell setButtonType:NSSwitchButton]; [buttonCell setAllowsMixedState:YES]; [setting setObject:buttonCell forKey:WCAccountsFieldCell]; @@ -1041,7 +1041,7 @@ - (id)init { case WCAccountFieldTypeNumber: case WCAccountFieldTypeString: textFieldCell = [[NSTextFieldCell alloc] initTextCell:@""]; - [textFieldCell setControlSize:NSSmallControlSize]; + [textFieldCell setControlSize:NSControlSizeSmall]; [textFieldCell setEditable:YES]; [textFieldCell setSelectable:YES]; [textFieldCell setFont:[NSFont smallSystemFont]]; @@ -1051,7 +1051,7 @@ - (id)init { case WCAccountFieldTypeEnum: _popUpButtonCell = [[NSPopUpButtonCell alloc] initTextCell:@"" pullsDown:NO]; - [_popUpButtonCell setControlSize:NSSmallControlSize]; + [_popUpButtonCell setControlSize:NSControlSizeSmall]; [_popUpButtonCell setBordered:NO]; [_popUpButtonCell setFont:[NSFont smallSystemFont]]; @@ -1555,7 +1555,7 @@ - (NSString *)deleteDocumentMenuItemTitle { break; default: - return [NSSWF:NSLS(@"Delete %u Items\u2026", @"Delete menu item (count)"), [accounts count]]; + return [NSSWF:NSLS(@"Delete %lu Items\u2026", @"Delete menu item (count)"), (unsigned long)[accounts count]]; break; } } diff --git a/Sources/WCAdministration.m b/Sources/WCAdministration.m index 796a62f1..1ed43b53 100644 --- a/Sources/WCAdministration.m +++ b/Sources/WCAdministration.m @@ -258,7 +258,7 @@ - (void)windowDidLoad { [self _addAdministrationView:_accountsView name:NSLS(@"Accounts", @"Accounts toolbar item") - image:[NSImage imageNamed:@"Accounts"] + image:[NSImage imageNamed:@"AccountsMainchat"] identifier:@"Accounts" controller:_accountsController]; @@ -270,15 +270,15 @@ - (void)windowDidLoad { controller:_banlistController]; window = [[NSWindow alloc] initWithContentRect:NSMakeRect(0.0, 0.0, 100.0, 100.0) - styleMask:NSTitledWindowMask | - NSClosableWindowMask | - NSMiniaturizableWindowMask | - NSResizableWindowMask - backing:NSBackingStoreBuffered - defer:YES]; + styleMask:NSWindowStyleMaskTitled | + NSWindowStyleMaskClosable | + NSWindowStyleMaskMiniaturizable | + NSWindowStyleMaskResizable + backing:NSBackingStoreBuffered + defer:YES]; [window setDelegate:self]; [self setWindow:window]; - [window release]; + _errorQueue = [[WCErrorQueue alloc] initWithWindow:[self window]]; diff --git a/Sources/WCApplication.m b/Sources/WCApplication.m index dd9a6c0f..4a16edc1 100644 --- a/Sources/WCApplication.m +++ b/Sources/WCApplication.m @@ -60,7 +60,7 @@ - (id)init { - (void)sendEvent:(NSEvent *)event { BOOL handled = NO; - if([event type] == NSKeyDown) { + if([event type] == NSEventTypeKeyDown) { if([event character] == NSF12FunctionKey && [event controlKeyModifier]) { handled = [self sendAction:@selector(stats:) to:NULL from:self]; } diff --git a/Sources/WCApplicationController.h b/Sources/WCApplicationController.h index 9892b764..6cb1e68e 100644 --- a/Sources/WCApplicationController.h +++ b/Sources/WCApplicationController.h @@ -47,8 +47,6 @@ extern NSString * const WCExceptionHandlerReceivedExceptionNotification; IBOutlet NSMenu *_debugMenu; IBOutlet NSMenu *_windowMenu; IBOutlet NSMenuItem *_closeWindowMenuItem; - IBOutlet SUUpdater *_updater; - NSString *_clientVersion; NSUInteger _unread; @@ -76,8 +74,7 @@ extern NSString * const WCExceptionHandlerReceivedExceptionNotification; - (void)connectWithBookmark:(NSDictionary *)bookmark; -// Sparkle Check for Update -- (void)checkForUpdate; + // Actions - (IBAction)about:(id)sender; diff --git a/Sources/WCApplicationController.m b/Sources/WCApplicationController.m index ad10e64d..b969d8d9 100644 --- a/Sources/WCApplicationController.m +++ b/Sources/WCApplicationController.m @@ -116,11 +116,9 @@ @implementation WCApplicationController(Private) - (void)_update { if([[WCSettings settings] boolForKey:WCConfirmDisconnect]) - [_disconnectMenuItem setTitle:NSLS(@"Disconnect…", @"Disconnect menu item")]; + [_disconnectMenuItem setTitle:NSLS(@"Disconnect\u2026", @"Disconnect menu item")]; else [_disconnectMenuItem setTitle:NSLS(@"Disconnect", @"Disconnect menu item")]; - - [_updater setAutomaticallyChecksForUpdates:[[WCSettings settings] boolForKey:WCCheckForUpdate]]; } @@ -162,15 +160,15 @@ - (void)_updateBookmarksMenu { if(i <= 10) { [item setKeyEquivalent:[NSSWF:@"%lu", (i == 10) ? 0 : i]]; - [item setKeyEquivalentModifierMask:NSCommandKeyMask]; + [item setKeyEquivalentModifierMask:NSEventModifierFlagCommand]; } else if(i <= 20) { [item setKeyEquivalent:[NSSWF:@"%lu", (i == 20) ? 0 : i - 10]]; - [item setKeyEquivalentModifierMask:NSCommandKeyMask | NSAlternateKeyMask]; + [item setKeyEquivalentModifierMask:NSEventModifierFlagCommand | NSEventModifierFlagOption]; } else if(i <= 30) { [item setKeyEquivalent:[NSSWF:@"%lu", (i == 30) ? 0 : i - 20]]; - [item setKeyEquivalentModifierMask:NSCommandKeyMask | NSShiftKeyMask]; + [item setKeyEquivalentModifierMask:NSEventModifierFlagCommand | NSEventModifierFlagShift]; } [_bookmarksMenu addItem:item]; @@ -701,17 +699,6 @@ - (void)awakeFromNib { [WIDateFormatter setDefaultFormatterBehavior:NSDateFormatterBehavior10_4]; [NSNumberFormatter setDefaultFormatterBehavior:NSNumberFormatterBehavior10_4]; - - // set the auto-update feed URL regarding to the selected configuration (Debug or Release) -#ifdef WCConfigurationRelease - [_updater setFeedURL:[NSURL URLWithString:@"https://wired.read-write.fr/sparkle/wiredclient_cast.xml"]]; -#else - [_updater setFeedURL:[NSURL URLWithString:@"https://wired.read-write.fr/sparkle/wiredclient_debugcast.xml"]]; -#endif - - [_updater setSendsSystemProfile:YES]; - [_updater performSelector:@selector(checkForUpdatesInBackground) afterDelay:5.0f]; - path = [[NSBundle mainBundle] pathForResource:@"wired" ofType:@"xml"]; // verify the P7 specification in debug mode @@ -1066,44 +1053,6 @@ - (void)userNotificationCenter:(NSUserNotificationCenter *)center didActivateNot } - - - - -#pragma mark - - - -- (BOOL)updaterShouldPromptForPermissionToCheckForUpdates:(SUUpdater *)updater { - return NO; -} - - -- (NSArray *)feedParametersForUpdater:(SUUpdater *)updater sendingSystemProfile:(BOOL)sendingProfile { - NSMutableArray *params; - - params = [NSMutableArray array]; - - [params addObject: @{ - @"key": @"debug", -#ifdef WCConfigurationRelease - @"value": @"false" -#else - @"value": @"true" -#endif - }]; - - [params addObject: @{ - @"key": @"appShortVersion", - @"value": [[[NSApp bundle] infoDictionary] valueForKey:@"CFBundleShortVersionString"], - }]; - - return params; -} - - - - - #pragma mark - - (BOOL)validateMenuItem:(NSMenuItem *)item { @@ -1179,18 +1128,6 @@ - (WIDateFormatter *)dateFormatter { } - - -#pragma mark - - -- (void)checkForUpdate { - [_updater checkForUpdates:self]; -} - - - - - #pragma mark - @@ -1238,7 +1175,7 @@ - (IBAction)about:(id)sender { credits = [[[NSMutableAttributedString alloc] initWithRTF:rtf documentAttributes:NULL] autorelease]; style = [[[NSMutableParagraphStyle alloc] init] autorelease]; - [style setAlignment:NSCenterTextAlignment]; + [style setAlignment:NSTextAlignmentCenter]; attributes = [NSDictionary dictionaryWithObjectsAndKeys: [NSFont boldSystemFontOfSize:11.0], NSFontAttributeName, diff --git a/Sources/WCBanlistController.m b/Sources/WCBanlistController.m index 4b9ab2dd..003f57f1 100644 --- a/Sources/WCBanlistController.m +++ b/Sources/WCBanlistController.m @@ -226,7 +226,22 @@ - (void)dealloc { [super dealloc]; } +#pragma mark - +- (void)themeDidChange:(NSDictionary *)theme { + + // Überprüfung und Setzen des Standardwerts für die Schriftgröße + NSNumber *fontSize = [[NSUserDefaults standardUserDefaults] objectForKey:@"BanlistFontSize"]; + if (fontSize == nil) { + fontSize = @15.0; // Standardwert + [[NSUserDefaults standardUserDefaults] setObject:fontSize forKey:@"BanlistFontSize"]; // Schlüssel anlegen + [[NSUserDefaults standardUserDefaults] synchronize]; // Änderungen speichern + } + + [_banlistTableView setRowHeight:[fontSize doubleValue] + 4.0]; + [_banlistTableView setFont:[NSFont systemFontOfSize:[fontSize doubleValue]]]; + +} #pragma mark - @@ -374,7 +389,7 @@ - (NSString *)deleteDocumentMenuItemTitle { break; default: - return [NSSWF:NSLS(@"Delete %u Items\u2026", @"Delete menu item (count)"), [bans count]]; + return [NSSWF:NSLS(@"Delete %lu Items\u2026", @"Delete menu item (count)"), (unsigned long)[bans count]]; break; } } diff --git a/Sources/WCBoard.m b/Sources/WCBoard.m index 7ad9b97b..b47d91bf 100644 --- a/Sources/WCBoard.m +++ b/Sources/WCBoard.m @@ -538,14 +538,12 @@ - (NSUInteger)numberOfUnreadThreadsForConnection:(WCServerConnection *)connectio thread = [_threadsArray objectAtIndex:i]; if(!connection || [thread connection] == connection) { - count2 = [[thread posts] count]; - - // we count the thread only if 0 replies - if([thread isUnread] && count2 == 0) + if([thread isUnread]) unread++; - // we start counting posts at 1 - for(j = 1; j < count2; j++) { + count2 = [[thread posts] count]; + + for(j = 0; j < count2; j++) { post = [thread postAtIndex:j]; if([post isUnread]) diff --git a/Sources/WCBoardPostCellView.h b/Sources/WCBoardPostCellView.h deleted file mode 100644 index 18b521f3..00000000 --- a/Sources/WCBoardPostCellView.h +++ /dev/null @@ -1,52 +0,0 @@ -// -// WCBoardPostCellView.h -// Wired Client -// -// Created by Rafael Warnault on 04/05/2020. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@class WCBoardPostCellView; - -@protocol WCBoardPostCellViewDelegate - -@optional -- (void)postCell:(WCBoardPostCellView *)cell replyButtonClicked:(NSButton *)sender; -- (void)postCell:(WCBoardPostCellView *)cell quoteButtonClicked:(NSButton *)sender; -- (void)postCell:(WCBoardPostCellView *)cell editButtonClicked:(NSButton *)sender; -- (void)postCell:(WCBoardPostCellView *)cell deleteButtonClicked:(NSButton *)sender; - -@end - - -@interface WCBoardPostCellView : NSTableCellView { - NSTrackingArea *_trackingArea; - NSEvent *event; -} - -@property (nonatomic, weak) id delegate; - -@property (nonatomic, retain) IBOutlet NSButton *replyButton; -@property (nonatomic, retain) IBOutlet NSButton *quoteButton; -@property (nonatomic, retain) IBOutlet NSButton *editButton; -@property (nonatomic, retain) IBOutlet NSButton *deleteButton; - -@property (nonatomic, retain) IBOutlet NSTextField *nickTextField; -@property (nonatomic, retain) IBOutlet NSTextField *timeTextField; -@property (nonatomic, retain) IBOutlet NSTextField *messageTextField; -@property (nonatomic, retain) IBOutlet NSImageView *iconImageView; -@property (nonatomic, retain) IBOutlet NSImageView *unreadImageView; - -@property (nonatomic, weak) IBOutlet NSLayoutConstraint *heightConstraint; - -- (IBAction)replyPost:(id)sender; -- (IBAction)quotePost:(id)sender; -- (IBAction)editPost:(id)sender; -- (IBAction)deletePost:(id)sender; - -@end - -NS_ASSUME_NONNULL_END diff --git a/Sources/WCBoardPostCellView.m b/Sources/WCBoardPostCellView.m deleted file mode 100644 index d8f95080..00000000 --- a/Sources/WCBoardPostCellView.m +++ /dev/null @@ -1,101 +0,0 @@ -// -// WCBoardPostCellView.m -// Wired Client -// -// Created by Rafael Warnault on 04/05/2020. -// - -#import "WCBoardPostCellView.h" - -@implementation WCBoardPostCellView - -#pragma mark - - -- (void)ensureTrackingArea { - if (_trackingArea == nil) { - _trackingArea = [[NSTrackingArea alloc] initWithRect:[self bounds] - options:NSTrackingInVisibleRect | NSTrackingActiveAlways | NSTrackingMouseEnteredAndExited - owner:self - userInfo:nil]; - - [self addTrackingArea:_trackingArea]; - } -} - -- (void)updateTrackingAreas { - [super updateTrackingAreas]; - [self ensureTrackingArea]; -} - -- (void)dealloc { - [_trackingArea release]; - - - [super dealloc]; -} - - -#pragma mark - - -- (void)awakeFromNib { - [self setButtonsHidden:YES]; - - [self ensureTrackingArea]; -} - - -- (void)layout { - [super layout]; - - [self ensureTrackingArea]; - [self updateTrackingAreas]; -} - -#pragma mark - - -- (void)mouseEntered:(NSEvent *)theEvent { - [self setButtonsHidden:NO]; - [self.unreadImageView setHidden:YES]; - -} - -- (void)mouseExited:(NSEvent *)theEvent { - [self setButtonsHidden:YES]; -} - - -- (void)setButtonsHidden:(BOOL)hidden { - [self.replyButton setHidden:hidden]; - [self.quoteButton setHidden:hidden]; - [self.editButton setHidden:hidden]; - [self.deleteButton setHidden:hidden]; -} - - -#pragma mark - - -- (IBAction)replyPost:(id)sender { - if(self.delegate && [self.delegate respondsToSelector:@selector(postCell:replyButtonClicked:)]) { - [self.delegate postCell:self replyButtonClicked:sender]; - } -} - -- (IBAction)quotePost:(id)sender { - if(self.delegate && [self.delegate respondsToSelector:@selector(postCell:quoteButtonClicked:)]) { - [self.delegate postCell:self quoteButtonClicked:sender]; - } -} - -- (IBAction)editPost:(id)sender { - if(self.delegate && [self.delegate respondsToSelector:@selector(postCell:editButtonClicked:)]) { - [self.delegate postCell:self editButtonClicked:sender]; - } -} - -- (IBAction)deletePost:(id)sender { - if(self.delegate && [self.delegate respondsToSelector:@selector(postCell:deleteButtonClicked:)]) { - [self.delegate postCell:self deleteButtonClicked:sender]; - } -} - -@end diff --git a/Sources/WCBoardThread.h b/Sources/WCBoardThread.h index 2957c37f..a902506b 100644 --- a/Sources/WCBoardThread.h +++ b/Sources/WCBoardThread.h @@ -44,7 +44,6 @@ BOOL _unread; BOOL _loaded; - BOOL _firstLoad; NSMutableArray *_posts; NSButton *_goToLatestReplyButton; @@ -77,9 +76,6 @@ - (void)setLoaded:(BOOL)loaded; - (BOOL)isLoaded; -- (void)setFirstLoaded:(BOOL)firstLoad; -- (BOOL)firstLoad; - - (NSButton *)goToLatestReplyButton; - (NSArray *)posts; diff --git a/Sources/WCBoardThread.m b/Sources/WCBoardThread.m index 1a000316..9a65ae4b 100644 --- a/Sources/WCBoardThread.m +++ b/Sources/WCBoardThread.m @@ -39,20 +39,11 @@ - (id)_initWithMessage:(WIP7Message *)message connection:(WCServerConnection *)c @implementation WCBoardThread(Private) -- (id)initWithConnection:(WCServerConnection *)connection { - self = [super initWithConnection:connection]; - - _firstLoad = YES; - - return self; -} - - - (id)_initWithMessage:(WIP7Message *)message connection:(WCServerConnection *)connection { WIP7UInt32 replies; WIP7Bool ownThread; - self = [self initWithConnection:connection]; + self = [super initWithConnection:connection]; _goToLatestReplyButton = [[NSButton alloc] init]; [_goToLatestReplyButton setButtonType:NSMomentaryLightButton]; @@ -294,19 +285,6 @@ - (BOOL)isLoaded { - -- (void)setFirstLoaded:(BOOL)firstLoad { - _firstLoad = firstLoad; -} - - - -- (BOOL)firstLoad { - return _firstLoad; -} - - - #pragma mark - - (NSButton *)goToLatestReplyButton { diff --git a/Sources/WCBoardThreadController.h b/Sources/WCBoardThreadController.h index 9e7b2053..8f0f68ef 100644 --- a/Sources/WCBoardThreadController.h +++ b/Sources/WCBoardThreadController.h @@ -26,23 +26,28 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#import "WCBoardPostCellView.h" - @class WCBoardThread, WCBoardPost, WCBoard; -@interface WCBoardThreadController : NSViewController { - IBOutlet NSTableView *_threadTableView; - +@interface WCBoardThreadController : NSViewController { + IBOutlet WebView *_threadWebView; + WCBoard *_board; WCBoardThread *_thread; NSOperationQueue *_loadingQueue; + + NSMutableString *_headerTemplate; + NSString *_footerTemplate; + NSString *_replyTemplate; + NSString *_postTemplate; NSString *_fileLinkBase64String; + NSString *_unreadPostBase64String; NSString *_defaultIconBase64String; NSMutableDictionary *_smileyBase64Strings; + NSString *_templatePath; NSFont *_font; NSColor *_textColor; NSColor *_backgroundColor; @@ -52,8 +57,6 @@ WCBoardPost *_selectPost; NSRect _previousVisibleRect; - - BOOL _scrollEndReached; } - (void)setBoard:(WCBoard *)board; @@ -62,6 +65,9 @@ - (void)setThread:(WCBoardThread *)thread; - (WCBoardThread *)thread; +- (void)setTemplatePath:(NSString *)path; +- (NSString *)templatePath; + - (void)setFont:(NSFont *)font; - (NSFont *)font; @@ -74,15 +80,13 @@ - (void)setBackgroundColor:(NSColor *)backgroundColor; - (NSColor *)backgroundColor; -- (NSTableView *)threadTableView; -//- (NSString *)HTMLString; - -- (NSAttributedString *)attributedStringForText:(NSString *)text; +- (WebView *)threadWebView; +- (NSString *)HTMLString; - (void)reloadData; - (void)reloadDataAndScrollToCurrentPosition; - (void)reloadDataAndSelectPost:(WCBoardPost *)selectPost; -- (void)reloadView; +- (void)reloadTemplate; @end diff --git a/Sources/WCBoardThreadController.m b/Sources/WCBoardThreadController.m index 6a93e15b..b329128d 100644 --- a/Sources/WCBoardThreadController.m +++ b/Sources/WCBoardThreadController.m @@ -37,202 +37,49 @@ #import "WCFile.h" #import "WCFiles.h" #import "WCTransfers.h" -#import "WCBoardPostCellView.h" -#import "NSDate_TimeAgo/NSDate+TimeAgo.h" + @interface WCBoardThreadController(Private) -- (void)_configureCell:(WCBoardPostCellView *)cell forRow:(NSInteger)row; -- (NSAttributedString *)_attributedStringForPostText:(NSString *)text; -@end +- (void)_reloadDataAndScrollToCurrentPosition:(BOOL)scrollToCurrentPosition selectPost:(WCBoardPost *)selectPost; +- (void)_setTitle:(NSString *)title; +@end -@implementation WCBoardThreadController(Private) -- (void)_applyHTMLToMutableString:(NSMutableString *)text { - NSString *substring; - NSRange range; - - [WCChatController applyHTMLTagsForSmileysToMutableString:text]; - - [text replaceOccurrencesOfString:@"&" withString:@"&"]; - [text replaceOccurrencesOfString:@"<" withString:@"<"]; - [text replaceOccurrencesOfString:@">" withString:@">"]; - [text replaceOccurrencesOfString:@"\"" withString:@"""]; - [text replaceOccurrencesOfString:@"\'" withString:@"'"]; - [text replaceOccurrencesOfString:@"\n" withString:@"
"]; - - [text replaceOccurrencesOfRegex:@"\\[code\\](.+?)\\[/code\\]" - withString:@"
$1
" - options:RKLCaseless | RKLDotAll]; - - [text replaceOccurrencesOfRegex:@"\\[b\\](.+?)\\[/b\\]" - withString:@"$1" - options:RKLCaseless | RKLDotAll]; - [text replaceOccurrencesOfRegex:@"\\[u\\](.+?)\\[/u\\]" - withString:@"$1" - options:RKLCaseless | RKLDotAll]; - [text replaceOccurrencesOfRegex:@"\\[i\\](.+?)\\[/i\\]" - withString:@"$1" - options:RKLCaseless | RKLDotAll]; - [text replaceOccurrencesOfRegex:@"\\[color=(.+?)\\](.+?)\\[/color\\]" - withString:@"$2" - options:RKLCaseless | RKLDotAll]; - [text replaceOccurrencesOfRegex:@"\\[center\\](.+?)\\[/center\\]" - withString:@"
$1
" - options:RKLCaseless | RKLDotAll]; - - /* Do this in a custom loop to avoid corrupted strings when using $1 multiple times */ - do { - range = [text rangeOfRegex:@"\\[url]wiredp7://(/.+?)\\[/url\\]" options:RKLCaseless capture:0]; - - if(range.location != NSNotFound) { - substring = [text substringWithRange:[text rangeOfRegex:@"\\[url]wiredp7://(/.+?)\\[/url\\]" options:RKLCaseless capture:1]]; - - [text replaceCharactersInRange:range withString: - [NSSWF:@" %@", - _fileLinkBase64String, substring, substring]]; - } - } while(range.location != NSNotFound); - - [text replaceOccurrencesOfRegex:@"\\[url=(.+?)\\](.+?)\\[/url\\]" - withString:@"$2" - options:RKLCaseless]; - - /* Do this in a custom loop to avoid corrupted strings when using $1 multiple times */ - do { - range = [text rangeOfRegex:@"\\[url](.+?)\\[/url\\]" options:RKLCaseless capture:0]; - - if(range.location != NSNotFound) { - substring = [text substringWithRange:[text rangeOfRegex:@"\\[url](.+?)\\[/url\\]" options:RKLCaseless capture:1]]; - - [text replaceCharactersInRange:range withString:[NSSWF:@"%@", substring, substring]]; - } - } while(range.location != NSNotFound); - - [text replaceOccurrencesOfRegex:@"\\[email=(.+?)\\](.+?)\\[/email\\]" - withString:@"$2" - options:RKLCaseless]; - [text replaceOccurrencesOfRegex:@"\\[email](.+?)\\[/email\\]" - withString:@"$1" - options:RKLCaseless]; - [text replaceOccurrencesOfRegex:@"\\[img](.+?)\\[/img\\]" - withString:@"\"\" " - options:RKLCaseless]; - - [text replaceOccurrencesOfRegex:@"\\[quote=(.+?)\\](.+?)\\[/quote\\]" - withString:[NSSWF:@"
%@
$2
", NSLS(@"$1 wrote:", @"Board quote (nick)")] - options:RKLCaseless | RKLDotAll]; - - [text replaceOccurrencesOfRegex:@"\\[quote\\](.+?)\\[/quote\\]" - withString:@"
$1
" - options:RKLCaseless | RKLDotAll]; -} -- (NSString *)_CSS { - return [NSSWF:@"html { color: %@; font-family: %@, Helvetica; font-size: %lupx; } img { height: auto; } br { margin-bottom: 30px; } pre { font-family: monospace; } blockquote { background: lightyellow; color: black; pre { background: lightgray; } }", - [NSSWF:@"#%.6lx", (unsigned long)[[NSColor controlTextColor] HTMLValue]], - [[self font] fontName], - (NSInteger)[[self font] pointSize]]; -} +@implementation WCBoardThreadController(Private) -- (NSAttributedString *)_attributedStringForPostText:(NSString *)text { - NSString *htmlBody; - NSMutableString *string; - NSData *htmlData; - NSAttributedString *attrString; - NSDictionary *options; +- (void)_reloadDataAndScrollToCurrentPosition:(BOOL)scrollToCurrentPosition selectPost:(WCBoardPost *)selectPost { + NSURL *url; + NSDictionary *theme; + WITemplateBundle *template; - string = [NSMutableString stringWithString:text]; + // get theme and template + theme = [[WCSettings settings] themeWithIdentifier:[[WCSettings settings] objectForKey:WCTheme]]; + template = [[WCSettings settings] templateBundleWithIdentifier:[theme objectForKey:WCThemesTemplate]]; - [self _applyHTMLToMutableString:string]; - - htmlBody = [NSSWF:@"%@", [self _CSS], [string stringByAppendingString:@"\n"]]; - htmlData = [htmlBody dataUsingEncoding:NSUnicodeStringEncoding]; - options = @{NSDocumentTypeDocumentAttribute : NSHTMLTextDocumentType, NSCharacterEncodingDocumentAttribute: @(NSUTF8StringEncoding)}; - attrString = [[NSAttributedString alloc] initWithHTML:htmlData options:options documentAttributes:nil]; + // load the webView + if(template) { + url = [NSURL fileURLWithPath: [template pathForResource:@"boards" + ofType:@"html" + inDirectory:@"htdocs"]]; + + [[_threadWebView mainFrame] loadRequest:[NSURLRequest requestWithURL:url]]; + } - return [attrString autorelease]; + [self reloadTemplate]; } -- (void)_configureCell:(WCBoardPostCellView *)cell forRow:(NSInteger)row { - WCBoardPost *post; - NSString *formattedDate; - NSImage *iconImage; - NSString *icon, *editDate, *postDate, *postID; - NSAttributedString *text; - WCAccount *account; - WIDateFormatter *dateFormatter; - BOOL own, writable, replyDisabled, quoteDisabled, editDisabled, deleteDisabled, smart; - NSArray *posts = [@[_thread] arrayByAddingObjectsFromArray:[_thread posts]]; - - post = [posts objectAtIndex:row]; - - if (post) { - dateFormatter = [[WCApplicationController sharedController] dateFormatter]; - - text = [self attributedStringForText:[post text]]; - icon = (NSString*)(([post icon] && sizeof([post icon]) > 0) ? [post icon] : _defaultIconBase64String); - account = [(WCServerConnection *)[_board connection] account]; - postDate = [dateFormatter stringFromDate:[post postDate]]; - editDate = ([post editDate] ? [dateFormatter stringFromDate:[post editDate]] : @""); - - postID = ([post isKindOfClass:[WCBoardPost class]] ? [post postID] : [(WCBoardThread *)post threadID]); - own = ([post isKindOfClass:[WCBoardPost class]] ? [post isOwnPost] : [(WCBoardThread *)post isOwnThread]); - writable = [_board isWritable]; - smart = ([[[WCBoards boards] selectedBoard] isKindOfClass:[WCSmartBoard class]]); - - quoteDisabled = !(([account boardAddPosts] && writable) || smart); - editDisabled = !((([account boardEditAllThreadsAndPosts] || ([account boardEditOwnThreadsAndPosts] && own)) && writable) || smart); - deleteDisabled = !((([account boardDeleteAllThreadsAndPosts] || ([account boardDeleteOwnThreadsAndPosts] && own)) && writable) || smart); - replyDisabled = !([account boardAddPosts] && writable); - - formattedDate = (editDate.length > 0 ? [NSSWF:@"%@ - Edited on %@", postDate, editDate] : [NSSWF:@"%@", postDate]); - iconImage = [NSImage imageWithData:[NSData dataWithBase64EncodedString:icon]]; - - [cell.nickTextField setStringValue:[post nick]]; - [cell.timeTextField setStringValue:formattedDate]; - - [cell.messageTextField setMaximumNumberOfLines:0]; - [cell.messageTextField setAttributedStringValue:text]; - - [cell.iconImageView setImage:iconImage]; - [cell.unreadImageView setHidden:![post isUnread]]; - - [cell.replyButton setEnabled:!replyDisabled]; - [cell.quoteButton setEnabled:!quoteDisabled]; - [cell.editButton setEnabled:!editDisabled]; - [cell.deleteButton setEnabled:!deleteDisabled]; - - [cell.quoteButton setTitle:NSLS(@"Quote", @"Quote post button title")]; - [cell.editButton setTitle:NSLS(@"Edit", @"Edit post button title")]; - [cell.deleteButton setTitle:NSLS(@"Delete", @"Delete post button title")]; - [cell.replyButton setTitle:NSLS(@"Post Reply", @"Post reply button title")]; - - [cell setObjectValue:post]; - [cell setDelegate:self]; - - cell.heightConstraint.constant = [text size].height; - - [text enumerateAttribute:NSAttachmentAttributeName inRange:NSMakeRange(0, text.length) options:0 usingBlock:^(id _Nullable value, NSRange range, BOOL * _Nonnull stop) { - if (![value isKindOfClass:[NSTextAttachment class]]) - return; - - NSTextAttachment *attachment = (NSTextAttachment*)value; - CGRect bounds = attachment.bounds; - attachment.bounds = bounds; - - cell.heightConstraint.constant = [text size].height ; - }]; - - // [cell.messageTextField sizeToFit]; - } + +- (void)_setTitle:(NSString *)title { + [_threadWebView stringByEvaluatingJavaScriptFromString:[NSSWF:@"document.title='%@'", title]]; } @@ -256,8 +103,17 @@ - (id)init { [_dateFormatter setNaturalLanguageStyle:WIDateFormatterCapitalizedNaturalLanguageStyle]; _fileLinkBase64String = [[[[NSImage imageNamed:@"FileLink"] TIFFRepresentation] base64EncodedString] retain]; + _unreadPostBase64String = [[[[NSImage imageNamed:@"UnreadPost"] TIFFRepresentation] base64EncodedString] retain]; _defaultIconBase64String = [[[[NSImage imageNamed:@"DefaultIcon"] TIFFRepresentation] base64EncodedString] retain]; - + + _smileyBase64Strings = [[NSMutableDictionary alloc] init]; + + [[NSDistributedNotificationCenter defaultCenter] + addObserver:self + selector:@selector(appleInterfaceThemeChanged:) + name:@"AppleInterfaceThemeChangedNotification" + object: nil]; + return self; } @@ -269,6 +125,7 @@ - (void)dealloc { [_loadingQueue release]; [_fileLinkBase64String release]; + [_unreadPostBase64String release]; [_defaultIconBase64String release]; [_font release]; @@ -286,100 +143,132 @@ - (void)dealloc { -- (void)awakeFromNib { - _scrollEndReached = NO; +- (void)awakeFromNib { + [_threadWebView setUIDelegate:(id)self]; + [_threadWebView setFrameLoadDelegate:(id)self]; + [_threadWebView setResourceLoadDelegate:(id)self]; + [_threadWebView setPolicyDelegate:(id)self]; - id clipView = [[_threadTableView enclosingScrollView] contentView]; - [[NSNotificationCenter defaultCenter] addObserver:self - selector:@selector(myBoundsChangeNotificationHandler:) - name:NSViewBoundsDidChangeNotification - object:clipView]; + [self reloadData]; } -- (void)myBoundsChangeNotificationHandler:(NSNotification *)aNotification { - if ([aNotification object] == [[_threadTableView enclosingScrollView] contentView]) { - NSClipView *clipView = [[_threadTableView enclosingScrollView] contentView]; - CGFloat currentPosition = [clipView bounds].origin.y + [clipView bounds].size.height; - CGFloat tableViewHeight = [_threadTableView bounds].size.height; - - if (currentPosition > tableViewHeight) { - _scrollEndReached = YES; - } - } -} -# pragma mark - +#pragma mark - -- (NSAttributedString *)attributedStringForText:(NSString *)text { - //NSString * string = [[text componentsSeparatedByCharactersInSet:[NSCharacterSet newlineCharacterSet]] componentsJoinedByString:@"\n"]; +- (void)webView:(WebView *)webView didFinishLoadForFrame:(WebFrame *)frame { + WITemplateBundle *template; + NSURL *jqueryURL, *functionsURL, *mainURL; + + template = [WITemplateBundle templateWithPath:_templatePath]; + - return [self _attributedStringForPostText:text]; + if(!template) { + NSLog(@"Error: Template not found. (%@)", _templatePath); + return; + } + + jqueryURL = [NSURL fileURLWithPath:[template pathForResource:@"jquery" ofType:@"js" inDirectory:@"htdocs/js"]]; + functionsURL = [NSURL fileURLWithPath:[template pathForResource:@"functions" ofType:@"js" inDirectory:@"htdocs/js"]]; + mainURL = [NSURL fileURLWithPath:[template pathForResource:@"boards" ofType:@"js" inDirectory:@"htdocs/js"]]; + + if(![[NSFileManager defaultManager] fileExistsAtPath:[jqueryURL path]] || + ![[NSFileManager defaultManager] fileExistsAtPath:[functionsURL path]] || + ![[NSFileManager defaultManager] fileExistsAtPath:[mainURL path]]) + { + NSLog(@"Error: Invalid template. Missing script. (%@)", _templatePath); + return; + } + + [_threadWebView appendScriptAtURL:jqueryURL]; + [_threadWebView appendScriptAtURL:functionsURL]; + [_threadWebView appendScriptAtURL:mainURL]; } -#pragma mark - -- (NSInteger)numberOfRowsInTableView:(NSTableView *)tableView { - return _thread ? [[_thread posts] count] + 1 : 0; +- (void)webView:(WebView *)webView didClearWindowObject:(WebScriptObject *)windowObject forFrame:(WebFrame *)frame { + [[_threadWebView windowScriptObject] setValue:[WCBoards boards] forKey:@"Controller"]; } -- (NSView *)tableView:(NSTableView *)tableView viewForTableColumn:(NSTableColumn *)tableColumn row:(NSInteger)row { - WCBoardPostCellView *cell; - - cell = [tableView makeViewWithIdentifier:@"WCBoardPostCellView" owner:self]; + + +- (void)webView:(WebView *)webView decidePolicyForNavigationAction:(NSDictionary *)action request:(NSURLRequest *)request frame:(WebFrame *)frame decisionListener:(id )listener { + NSString *path; + NSURL *url; + WIURL *wiredURL; + WCFile *file; + BOOL handled = NO; + BOOL isDirectory = NO; - [self _configureCell:cell forRow:row]; - - return cell; + if([[action objectForKey:WebActionNavigationTypeKey] unsignedIntegerValue] == WebNavigationTypeOther) { + [listener use]; + } else { + [listener ignore]; + + url = [action objectForKey:WebActionOriginalURLKey]; + wiredURL = [WIURL URLWithURL:url]; + + isDirectory = [[url absoluteString] hasSuffix:@"/"] ? YES : NO; + + if([[wiredURL scheme] isEqualToString:@"wired"] || [[wiredURL scheme] isEqualToString:@"wiredp7"]) { + if([[wiredURL host] length] == 0) { + if([[_thread connection] isConnected]) { + path = [[wiredURL path] stringByRemovingPercentEncoding]; // Updated method + + if(isDirectory) { + [WCFiles filesWithConnection:[_thread connection] + file:[WCFile fileWithDirectory:[path stringByDeletingLastPathComponent] connection:[_thread connection]] + selectFile:[WCFile fileWithDirectory:path connection:[_thread connection]]]; + + } else { + file = [WCFile fileWithFile:path connection:[_thread connection]]; + [[WCTransfers transfers] downloadFiles:[NSArray arrayWithObject:file] + toFolder:[[[WCSettings settings] objectForKey:WCDownloadFolder] stringByStandardizingPath]]; + } + } + + handled = YES; + } + } + + if(!handled) + [[NSWorkspace sharedWorkspace] openURL:[action objectForKey:WebActionOriginalURLKey]]; + } } -#pragma mark - -- (void)postCell:(WCBoardPostCellView *)cell replyButtonClicked:(NSButton *)sender { - [[WCBoards boards] replyToThread]; +- (NSArray *)webView:(WebView *)webView contextMenuItemsForElement:(NSDictionary *)element defaultMenuItems:(NSArray *)defaultMenuItems { +#ifdef WCConfigurationRelease + return NULL; +#else + return defaultMenuItems; +#endif } -- (void)postCell:(WCBoardPostCellView *)cell quoteButtonClicked:(NSButton *)sender { - WCBoardPost *post; - NSString *selectedText; - - post = (WCBoardPost *)[cell objectValue]; - - selectedText = [[[cell messageTextField] stringValue] substringWithRange:[[[cell messageTextField] currentEditor] selectedRange]]; - - if(post) - [[WCBoards boards] replyToPostWithID:[post postID] selectedText:selectedText]; -} -- (void)postCell:(WCBoardPostCellView *)cell editButtonClicked:(NSButton *)sender { - WCBoardPost *post; - - if ([[cell objectValue] isKindOfClass:[WCBoardPost class]]) { - post = (WCBoardPost *)[cell objectValue]; - - if(post) - [[WCBoards boards] editPostWithID:[post postID]]; - } else { - [[WCBoards boards] editPostWithID:[_thread threadID]]; - } +- (void)webView:(WebView *)sender mouseDidMoveOverElement:(NSDictionary *)elementInformation modifierFlags:(NSUInteger)modifierFlags { + // useless but required } -- (void)postCell:(WCBoardPostCellView *)cell deleteButtonClicked:(NSButton *)sender { - WCBoardPost *post; - - post = (WCBoardPost *)[cell objectValue]; - - if(post) - [[WCBoards boards] deletePostWithID:[post postID]]; + + + + + +#pragma mark - + +- (void)appleInterfaceThemeChanged:(NSNotification *) notification { + [self reloadTemplate]; } + #pragma mark - - (void)setBoard:(WCBoard *)board { @@ -416,6 +305,18 @@ - (WCBoardThread *)thread { +- (void)setTemplatePath:(NSString *)path { + [path retain]; + [_templatePath release]; + + _templatePath = path; +} + + +- (NSString *)templatePath { + return _templatePath; +} + - (void)setFont:(NSFont *)font { @@ -476,57 +377,82 @@ - (NSColor *)backgroundColor { return _backgroundColor; } -- (NSTableView *)threadTableView { - return _threadTableView; + + +#pragma mark - + +- (WebView *)threadWebView { + return _threadWebView; } + + +- (NSString *)HTMLString { + return [[[NSString alloc] initWithData:[[[_threadWebView mainFrame] dataSource] data] + encoding:NSUTF8StringEncoding] autorelease]; +} + + + #pragma mark - - (void)reloadData { - _scrollEndReached = NO; - - [_threadTableView reloadData]; - [_threadTableView setNeedsLayout:YES]; - [_threadTableView layoutSubtreeIfNeeded]; - - if([_threadTableView numberOfRows] > 1) - [_threadTableView performSelector:@selector(scrollToBottomAnimated) afterDelay:0.2]; - + [self _reloadDataAndScrollToCurrentPosition:YES selectPost:NULL]; } - (void)reloadDataAndScrollToCurrentPosition { - [self reloadData]; + [self _reloadDataAndScrollToCurrentPosition:YES selectPost:NULL]; } - (void)reloadDataAndSelectPost:(WCBoardPost *)selectPost { - [self reloadData]; - -// [_threadTableView noteNumberOfRowsChanged]; -// -// if([_threadTableView numberOfRows] > 1) -// [_threadTableView performSelector:@selector(scrollToBottomAnimated) afterDelay:0.2]; - // NSArray *syms = [NSThread callStackSymbols]; // if ([syms count] > 1) { // NSLog(@"<%@ %p> %@ - caller: %@ ", [self class], self, NSStringFromSelector(_cmd),[syms objectAtIndex:1]); // } else { // NSLog(@"<%@ %p> %@", [self class], self, NSStringFromSelector(_cmd)); // } -// [self _reloadDataAndScrollToCurrentPosition:NO selectPost:selectPost]; + [self _reloadDataAndScrollToCurrentPosition:NO selectPost:selectPost]; } #pragma mark - -#pragma mark Reload +#pragma mark Reload CSS Template -- (void)reloadView { - [_threadTableView reloadData]; +- (void)reloadTemplate { + WITemplateBundle *template; + + template = [WITemplateBundle templateWithPath:_templatePath]; + + [template setCSSValue:[_font fontName] toAttribute:WITemplateAttributesFontName ofType:WITemplateTypeBoards]; + [template setCSSValue:[NSSWF:@"%.0fpx", [_font pointSize]] toAttribute:WITemplateAttributesFontSize ofType:WITemplateTypeBoards]; + + [template setCSSValue:[NSSWF:@"#%.6x", (unsigned int)[_URLTextColor HTMLValue]] + toAttribute:WITemplateAttributesURLTextColor + ofType:WITemplateTypeBoards]; + + [template setCSSValue:[NSApp darkModeEnabled] ? @"gainsboro" : @"dimgray" + toAttribute:WITemplateAttributesFontColor + ofType:WITemplateTypeBoards]; + + [template setCSSValue:[NSApp darkModeEnabled] ? @"#383838" : @"white" + toAttribute:WITemplateAttributesBackgroundColor + ofType:WITemplateTypeBoards]; + + [template setCSSValue:[NSApp darkModeEnabled] ? @"dimgray" : @"gainsboro" + toAttribute:@"" + ofType:WITemplateTypeBoards]; + + [template saveChangesForType:WITemplateTypeBoards]; + + [_threadWebView reloadStylesheetWithID:@"wc-stylesheet" + withTemplate:template + type:WITemplateTypeBoards]; } diff --git a/Sources/WCBoards.h b/Sources/WCBoards.h index 3e07d80c..d4ff426f 100644 --- a/Sources/WCBoards.h +++ b/Sources/WCBoards.h @@ -26,11 +26,13 @@ * POSSIBILITY OF SUCH DAMAGE. */ +#import "WCWebDataSource.h" + extern NSString * const WCBoardsDidChangeUnreadCountNotification; @class WCBoardThreadController, WCErrorQueue, WCSourceSplitView, WCBoard, WCSmartBoard, WCBoardThread; -@interface WCBoards : WIWindowController { +@interface WCBoards : WIWindowController { IBOutlet WCSourceSplitView *_boardsSplitView; IBOutlet NSImageView *_boardsSplitViewImageView; IBOutlet NSView *_boardsView; @@ -80,7 +82,6 @@ extern NSString * const WCBoardsDidChangeUnreadCountNotification; IBOutlet NSPopUpButton *_postLocationPopUpButton; IBOutlet NSTextField *_subjectTextField; IBOutlet NSTextView *_postTextView; - IBOutlet NSTextView *_postPreviewTextView; IBOutlet NSButton *_postButton; IBOutlet NSPanel *_smartBoardPanel; @@ -172,9 +173,5 @@ extern NSString * const WCBoardsDidChangeUnreadCountNotification; - (void)wiredBoardGetThreadsReply:(WIP7Message *)message; - (void)wiredBoardSubscribeBoardsReply:(WIP7Message *)message; -- (void)replyToThread; -- (void)replyToPostWithID:(NSString *)postID selectedText:(NSString *)selectedText; -- (void)editPostWithID:(NSString *)postID; -- (void)deletePostWithID:(NSString *)postID; @end diff --git a/Sources/WCBoards.m b/Sources/WCBoards.m index 54ba6903..4580be1d 100644 --- a/Sources/WCBoards.m +++ b/Sources/WCBoards.m @@ -106,7 +106,7 @@ - (void)_updatePermissions; - (void)_applyHTMLToMutableString:(NSMutableString *)text; -- (void)_updatePostPreviewTextView; +- (NSDictionary *)_JSONProxyForPost:(id)post; @end @@ -318,10 +318,14 @@ - (void)_setupSplitViews { - (void)_themeDidChange { NSDictionary *theme; + NSString *templatePath; + WITemplateBundle *templateBundle; NSColor *textColor, *URLTextColor, *backgroundColor; NSFont *font; theme = [[WCSettings settings] themeWithIdentifier:[[WCSettings settings] objectForKey:WCTheme]]; + templateBundle = [[WCSettings settings] templateBundleWithIdentifier:[theme objectForKey:WCThemesTemplate]]; + templatePath = [templateBundle bundlePath]; font = WIFontFromString([theme objectForKey:WCThemesBoardsFont]); textColor = [NSApp darkModeEnabled] ? [NSColor whiteColor] : [NSColor textColor]; @@ -334,8 +338,9 @@ - (void)_themeDidChange { [_threadController setTextColor:textColor]; [_threadController setURLTextColor:URLTextColor]; [_threadController setBackgroundColor:backgroundColor]; + [_threadController setTemplatePath:templatePath]; - [_threadController reloadView]; + [_threadController reloadTemplate]; } @@ -575,7 +580,7 @@ - (NSArray *)_selectedThreads { - (BOOL)_isUnreadThread:(WCBoardThread *)thread { if([thread latestReplyID]){ return ![_readIDs containsObject:[thread latestReplyID]]; - } else if([thread threadID]) { + }else if([thread threadID]) { return ![_readIDs containsObject:[thread threadID]]; } return NO; @@ -650,39 +655,27 @@ - (void)_reloadThread { board = [self _selectedBoard]; thread = [self _selectedThread]; - - [self _reloadThread:thread]; -} - - -- (void)_reloadThread:(WCBoardThread *)thread { - WIP7Message *message; - WCBoard *board; - - board = [_boardsByThreadID objectForKey:[thread threadID]]; - - if(thread) { - if(![thread isLoaded]) { - [thread removeAllPosts]; - - message = [WIP7Message messageWithName:@"wired.board.get_thread" spec:WCP7Spec]; - [message setUUID:[thread threadID] forName:@"wired.board.thread"]; - [[thread connection] sendMessage:message fromObserver:self selector:@selector(wiredBoardGetThreadReply:)]; - } + + if(thread) { + if(![thread isLoaded]) { + [thread removeAllPosts]; + + message = [WIP7Message messageWithName:@"wired.board.get_thread" spec:WCP7Spec]; + [message setUUID:[thread threadID] forName:@"wired.board.thread"]; + [[thread connection] sendMessage:message fromObserver:self selector:@selector(wiredBoardGetThreadReply:)]; + } [_threadController setBoard:board]; - [_threadController setThread:thread]; - - if([thread isLoaded]) - [_threadController reloadData]; - } - else { - [_threadController setBoard:NULL]; - [_threadController setThread:NULL]; - [_threadController reloadData]; - } - - + [_threadController setThread:thread]; + + if([thread isLoaded]) + [_threadController reloadData]; + } + else { + [_threadController setBoard:NULL]; + [_threadController setThread:NULL]; + [_threadController reloadData]; + } } @@ -716,7 +709,7 @@ - (void)_reloadThreads:(NSArray *)threads { columnIndexes:columIndexes]; } } - //[self _saveReadIDs]; + [self _saveReadIDs]; } @@ -741,16 +734,16 @@ - (void)_selectThread:(WCBoardThread *)thread { - (void)_reselectThread:(WCBoardThread *)thread { - NSUInteger index = 0; + NSUInteger index = 0; index = [self _indexOfThread:thread]; - + if(index != NSNotFound) { - [_threadsHorizontalTableView scrollRowToVisible:index]; + [_threadsHorizontalTableView selectRowIndexes:[NSIndexSet indexSetWithIndex:index] byExtendingSelection:NO]; + [_threadsVerticalTableView scrollRowToVisible:index]; + [_threadsHorizontalTableView selectRowIndexes:[NSIndexSet indexSetWithIndex:index] byExtendingSelection:NO]; - - [_threadsVerticalTableView scrollRowToVisible:index]; - [_threadsVerticalTableView selectRowIndexes:[NSIndexSet indexSetWithIndex:index] byExtendingSelection:NO]; + [_threadsVerticalTableView scrollRowToVisible:index]; } else { [_threadsHorizontalTableView deselectAll:self]; [_threadsVerticalTableView deselectAll:self]; @@ -790,8 +783,6 @@ - (void)_markThreads:(NSArray *)threads asUnread:(BOOL)unread { } } - - //[self _saveReadIDs]; } @@ -807,8 +798,6 @@ - (void)_markBoard:(WCBoard *)board asUnread:(BOOL)unread { [self _markBoard:eachBoard asUnread:unread]; [self _markThreads:[eachBoard threads] asUnread:unread]; } - - //[self _saveReadIDs]; } @@ -1214,15 +1203,6 @@ - (BOOL)_getBoardInfoForBoard:(WCBoard *)board { #pragma mark - -- (void)_updatePostPreviewTextView { - NSAttributedString *attrString = [_threadController attributedStringForText:[_postTextView string]]; - - if(!attrString) - attrString = [_postTextView attributedString]; - - [_postPreviewTextView setAttributedString:attrString]; -} - - (void)_applyHTMLToMutableString:(NSMutableString *)text { NSString *substring; @@ -1321,6 +1301,57 @@ - (void)_applyHTMLToMutableString:(NSMutableString *)text { +- (NSDictionary *)_JSONProxyForPost:(id)post { + NSString *string, *icon, *editDate, *postID; + NSMutableString *text; + WCBoardThread *thread; + WCBoard *board; + WCAccount *account; + WIDateFormatter *dateFormatter; + BOOL own, writable, replyDisabled, quoteDisabled, editDisabled, deleteDisabled, smart; + + thread = [self _selectedThread]; + board = [_boardsByThreadID objectForKey:[thread threadID]]; + dateFormatter = [[WCApplicationController sharedController] dateFormatter]; + + string = [[[post text] componentsSeparatedByCharactersInSet:[NSCharacterSet newlineCharacterSet]] componentsJoinedByString:@"\n"]; + text = [NSMutableString stringWithString:string]; + icon = (NSString*)(([post icon] && sizeof([post icon]) > 0) ? [post icon] : _defaultIconBase64String); + account = [(WCServerConnection *)[board connection] account]; + editDate = ([post editDate] ? [dateFormatter stringFromDate:[post editDate]] : @""); + + postID = ([post isKindOfClass:[WCBoardPost class]] ? [post postID] : [post threadID]); + own = ([post isKindOfClass:[WCBoardPost class]] ? [post isOwnPost] : [post isOwnThread]); + writable = [board isWritable]; + smart = ([[[WCBoards boards] selectedBoard] isKindOfClass:[WCSmartBoard class]]); + + quoteDisabled = !(([account boardAddPosts] && writable) || smart); + editDisabled = !((([account boardEditAllThreadsAndPosts] || ([account boardEditOwnThreadsAndPosts] && own)) && writable) || smart); + deleteDisabled = !((([account boardDeleteAllThreadsAndPosts] || ([account boardDeleteOwnThreadsAndPosts] && own)) && writable) || smart); + replyDisabled = !([account boardAddPosts] && writable); + + [self _applyHTMLToMutableString:text]; + + return @{ @"postID": postID, + @"fromString": NSLS(@"From:", @"Post header"), + @"from": [post nick], + @"postDateString": NSLS(@"Post Date:", @"Post header"), + @"postDate": [dateFormatter stringFromDate:[post postDate]], + @"editDateString": NSLS(@"Edit Date:", @"Post header"), + @"editDate": editDate, + @"unread": [post isUnread] ? @"true" : @"false", + @"icon": icon, + @"postContent": text, + @"replyDisabled": replyDisabled ? @"true" : @"false", + @"quoteDisabled": quoteDisabled ? @"true" : @"false", + @"editDisabled": deleteDisabled ? @"true" : @"false", + @"deleteDisabled": deleteDisabled ? @"true" : @"false", + @"quoteButtonString": NSLS(@"Quote", @"Quote post button title"), + @"editButtonString": NSLS(@"Edit", @"Edit post button title"), + @"deleteButtonString": NSLS(@"Delete", @"Delete post button title"), + @"replyButtonString": NSLS(@"Post Reply", @"Post reply button title") }; +} + @@ -1567,23 +1598,23 @@ - (void)windowDidBecomeKey:(NSWindow *)window { NSMutableSet *readIDs; WCBoardThread *thread; WCBoardPost *post; - + thread = [self _selectedThread]; - - if(thread && thread == [_threadController thread]) { + + if(thread) { readIDs = [NSMutableSet set]; enumerator = [[thread posts] objectEnumerator]; - + while((post = [enumerator nextObject])) { [post setUnread:NO]; - + [readIDs addObject:[post postID]]; } - + [thread setUnread:NO]; - + [self _reloadThreads:@[thread]]; - + if([readIDs count] > 0) [[NSNotificationCenter defaultCenter] postNotificationName:WCBoardsDidChangeUnreadCountNotification object:readIDs]; } @@ -1821,16 +1852,15 @@ - (void)boardsDidChangeUnreadCount:(NSNotification *)notification { WCBoard *parent; NSArray *threads; NSSet *readIDs; - + threads = nil; if([[notification object] isKindOfClass:[NSSet class]]) { readIDs = [notification object]; - + if(readIDs) [_readIDs addObjectsFromArray:[readIDs allObjects]]; } - if([[notification object] isKindOfClass:[NSArray class]]) { threads = (NSArray *)[notification object]; [self _reloadThreads:threads]; @@ -1842,27 +1872,16 @@ - (void)boardsDidChangeUnreadCount:(NSNotification *)notification { if([[notification object] isKindOfClass:[WCBoardThread class]]) { thread = [notification object]; parent = [_boards boardForPath:[thread board]]; - + if (parent) [self _reloadBoard:parent]; - + threads = @[thread]; - [self _reloadThreads:threads]; } - + [self _reloadBoard:[self selectedBoard]]; [self _reloadFilters]; - - // not the most efficient, but it is needed when a thread is unread in multiple boards (smart boards) - [_threadsVerticalTableView reloadDataForRowIndexes:[_threadsVerticalTableView selectedRowIndexes] columnIndexes:[NSIndexSet indexSetWithIndex:0]]; - [_threadsHorizontalTableView reloadDataForRowIndexes:[_threadsHorizontalTableView selectedRowIndexes] columnIndexes:[NSIndexSet indexSetWithIndex:0]]; - - if ([_boardsOutlineView numberOfRows] > 0) { - [_boardsOutlineView reloadDataForRowIndexes:[NSIndexSet indexSetWithIndexesInRange:NSMakeRange(0, [_boardsOutlineView numberOfRows] -1)] columnIndexes:[NSIndexSet indexSetWithIndex:0]]; - } - - [self _saveReadIDs]; } @@ -1975,7 +1994,7 @@ - (void)wiredBoardGetThreadReply:(WIP7Message *)message { WCBoard *board; WCBoardThread *thread; WCBoardPost *post; - + connection = [message contextInfo]; if([[message name] isEqualToString:@"wired.board.thread"]) { @@ -1992,33 +2011,25 @@ - (void)wiredBoardGetThreadReply:(WIP7Message *)message { threadID = [message UUIDForName:@"wired.board.thread"]; board = [_boardsByThreadID objectForKey:threadID]; thread = [board threadWithID:threadID]; - + if(thread) { post = [WCBoardPost postWithMessage:message connection:connection]; - - if (![thread firstLoad]) { - [post setUnread:![_readIDs containsObject:[post postID]]]; - } else { - [post setUnread:NO]; - [_readIDs addObject:[post postID]]; - } - + + [post setUnread:![_readIDs containsObject:[post postID]]]; + [thread addPost:post]; } } else if([[message name] isEqualToString:@"wired.board.post_list.done"]) { + threadID = [message UUIDForName:@"wired.board.thread"]; board = [_boardsByThreadID objectForKey:threadID]; thread = [board threadWithID:threadID]; if(thread) { [thread setLoaded:YES]; - - if ([thread firstLoad]) { - [thread setFirstLoaded:NO]; - } - if(thread == [_threadController thread] && [self _selectedThread]) { + if(thread == [_threadController thread]) { [_threadController reloadDataAndScrollToCurrentPosition]; } } @@ -2312,12 +2323,13 @@ - (void)wiredBoardThreadChanged:(WIP7Message *)message { [thread setLatestReplyDate:[message dateForName:@"wired.board.latest_reply_date"]]; [thread setNumberOfReplies:replies]; - //[_readIDs removeObject:[thread threadID]]; + [_readIDs removeObject:[thread threadID]]; + [thread setUnread:[self _isUnreadThread:thread]]; [thread setLoaded:NO]; - - //if(thread == [_threadController thread]) - [self _reloadThread:thread]; + + if([[self window] isKeyWindow] && thread == [_threadController thread]) + [self _reloadThread]; for(WCThreadWindow *controller in [WCThreadWindow threadWindows]) { if(thread == [controller thread]) { @@ -2596,13 +2608,6 @@ - (BOOL)textView:(NSTextView *)textView doCommandBySelector:(SEL)selector { } -- (void)textDidChange:(NSNotification *)notification { - if([notification object] == _postTextView) { - [self _updatePostPreviewTextView]; - } -} - - #pragma mark - @@ -2736,41 +2741,34 @@ - (WCBoard *)selectedBoard { - (BOOL)showNextUnreadThread { WCBoardThread *thread; NSRect rect; - NSInteger orientation; - + if([[[self window] firstResponder] isKindOfClass:[NSTextView class]]) return NO; - rect = [[[_threadController threadTableView] enclosingScrollView] documentVisibleRect]; + rect = [[[[[[_threadController threadWebView] mainFrame] frameView] documentView] enclosingScrollView] documentVisibleRect]; rect.origin.y += 0.9 * rect.size.height; - - if([[[_threadController threadTableView] enclosingScrollView] scrollRectToVisible:rect]) + + if([[[[[_threadController threadWebView] mainFrame] frameView] documentView] scrollRectToVisible:rect]) return YES; - + thread = [_boards nextUnreadThreadStartingAtBoard:[self _selectedBoard] thread:[self _selectedThread] forwardsInThreads:([_threadsHorizontalTableView sortOrder] == WISortAscending)]; - + if(!thread) { thread = [_boards nextUnreadThreadStartingAtBoard:NULL thread:NULL forwardsInThreads:([_threadsHorizontalTableView sortOrder] == WISortAscending)]; } - + if(thread) { - orientation = [[WCSettings settings] intForKey:WCThreadsSplitViewOrientation]; - - if(orientation == WCThreadsSplitViewOrientationHorizontal) { - [[self window] makeFirstResponder:_threadsHorizontalTableView]; - } else { - [[self window] makeFirstResponder:_threadsVerticalTableView]; - } - + [[self window] makeFirstResponder:_threadsHorizontalTableView]; + [self _selectThread:thread]; - + return YES; } - + return NO; } @@ -2779,21 +2777,20 @@ - (BOOL)showNextUnreadThread { - (BOOL)showPreviousUnreadThread { WCBoardThread *thread; NSRect rect; - NSInteger orientation; - + if([[[self window] firstResponder] isKindOfClass:[NSTextView class]]) return NO; - rect = [[[_threadController threadTableView] enclosingScrollView] documentVisibleRect]; + rect = [[[[[[_threadController threadWebView] mainFrame] frameView] documentView] enclosingScrollView] documentVisibleRect]; rect.origin.y -= 0.9 * rect.size.height; - - if([[[_threadController threadTableView] enclosingScrollView] scrollRectToVisible:rect]) + + if([[[[[_threadController threadWebView] mainFrame] frameView] documentView] scrollRectToVisible:rect]) return YES; - + thread = [_boards previousUnreadThreadStartingAtBoard:[self _selectedBoard] thread:[self _selectedThread] forwardsInThreads:([_threadsHorizontalTableView sortOrder] == WISortAscending)]; - + if(!thread) { thread = [_boards previousUnreadThreadStartingAtBoard:NULL thread:NULL @@ -2801,19 +2798,13 @@ - (BOOL)showPreviousUnreadThread { } if(thread) { - orientation = [[WCSettings settings] intForKey:WCThreadsSplitViewOrientation]; - - if(orientation == WCThreadsSplitViewOrientationHorizontal) { - [[self window] makeFirstResponder:_threadsHorizontalTableView]; - } else { - [[self window] makeFirstResponder:_threadsVerticalTableView]; - } - + [[self window] makeFirstResponder:_threadsHorizontalTableView]; + [self _selectThread:thread]; - + return YES; } - + return NO; } @@ -2851,7 +2842,6 @@ - (void)replyToThread { [_subjectTextField setStringValue:[thread subject]]; [_postTextView setTypingAttributes:[NSDictionary dictionary]]; [_postTextView setString:@""]; - [_postPreviewTextView setString:@""]; [_postTextView setTextColor:[NSColor controlTextColor]]; [_postButton setTitle:NSLS(@"Reply", @"Reply post button title")]; @@ -2871,7 +2861,8 @@ - (void)replyToThread { -- (void)replyToPostWithID:(NSString *)postID selectedText:(NSString *)selectedText { +- (void)replyToPostWithID:(NSString *)postID { + NSString *text; WCBoard *board; WCBoardThread *thread; @@ -2888,9 +2879,11 @@ - (void)replyToPostWithID:(NSString *)postID selectedText:(NSString *)selectedTe if(!post) return; - - if(selectedText && [selectedText length] > 0) - text = selectedText; + + document = [[[[_threadController threadWebView] mainFrame] frameView] documentView]; + + if([document conformsToProtocol:@protocol(WebDocumentText)]) + text = [(NSView *) document selectedString]; else text = @""; @@ -2969,8 +2962,6 @@ - (void)editPostWithID:(NSString *)postID { [_postTextView setAttributedString:[NSAttributedString attributedStringWithString:(post == NULL) ? [thread text] : [post text]]]; [_postTextView setTextColor:[NSColor controlTextColor]]; [_postButton setTitle:NSLS(@"Edit", @"Edit post button title")]; - - [self _updatePostPreviewTextView]; [_postPanel makeFirstResponder:_postTextView]; @@ -2979,10 +2970,6 @@ - (void)editPostWithID:(NSString *)postID { else window = [self window]; -// [window beginSheet:_postPanel completionHandler:^(NSModalResponse returnCode) { -// -// }]; - [NSApp beginSheet:_postPanel modalForWindow:window modalDelegate:self @@ -3474,7 +3461,6 @@ - (IBAction)addThread:(id)sender { [_subjectTextField setEnabled:YES]; [_subjectTextField setStringValue:@""]; [_postTextView setString:@""]; - [_postPreviewTextView setString:@""]; [_postTextView setTextColor:[NSColor controlTextColor]]; [_postButton setTitle:NSLS(@"Create", @"New thread button title")]; @@ -3864,6 +3850,39 @@ - (id)outlineView:(NSOutlineView *)outlineView child:(NSInteger)index ofItem:(id +//- (id)outlineView:(NSOutlineView *)outlineView objectValueForTableColumn:(NSTableColumn *)tableColumn byItem:(id)item { +// NSDictionary *attributes; +// NSString *label; +// NSUInteger count; +// +// if(tableColumn == _boardTableColumn) { +// label = [item name]; +// +// if([item isRootBoard]) { +// attributes = [NSDictionary dictionaryWithObjectsAndKeys: +// [NSColor colorWithCalibratedRed:96.0 / 255.0 green:110.0 / 255.0 blue:128.0 / 255.0 alpha:1.0], +// NSForegroundColorAttributeName, +// [NSFont boldSystemFontOfSize:11.0], +// NSFontAttributeName, +// NULL]; +// +// return [NSAttributedString attributedStringWithString:[label uppercaseString] attributes:attributes]; +// } else { +// return label; +// } +// } +// else if(tableColumn == _unreadBoardTableColumn) { +// count = [item numberOfUnreadThreadsForConnection:NULL includeChildBoards:![item isExpanded]]; +// +// return [NSImage imageWithPillForCount:count +// inActiveWindow:([NSApp keyWindow] == [self window]) +// onSelectedRow:([_boardsOutlineView rowForItem:item] == [_boardsOutlineView selectedRow])]; +// } +// +// return NULL; +//} + + - (NSView *)outlineView:(NSOutlineView *)outlineView viewForTableColumn:(NSTableColumn *)tableColumn item:(id)item { WCBadgedTableCellView *view; NSFont *font; @@ -3873,7 +3892,7 @@ - (NSView *)outlineView:(NSOutlineView *)outlineView viewForTableColumn:(NSTable view = nil; count = [item numberOfUnreadThreadsForConnection:NULL includeChildBoards:![item isExpanded]]; unread = (count > 0); - + if([item isRootBoard]) { view = [outlineView makeViewWithIdentifier:@"HeaderCell" owner:outlineView]; @@ -3901,7 +3920,7 @@ - (NSView *)outlineView:(NSOutlineView *)outlineView viewForTableColumn:(NSTable [view.button setHidden:!unread]; } else if([item isKindOfClass:[WCBoard class]]) { - view = [outlineView makeViewWithIdentifier:@"DataCell" owner:outlineView]; + view = [outlineView makeViewWithIdentifier:@"DataCell" owner:outlineView]; font = [view.textField.font fontByAddingTrait:(unread ? NSBoldFontMask : NSUnboldFontMask)]; view.imageView.image = [NSImage imageNamed:@"Board"]; @@ -4142,6 +4161,59 @@ - (NSInteger)numberOfRowsInTableView:(NSTableView *)tableView { return [[self _selectedBoard] numberOfThreads]; } + + +//- (id)tableView:(NSTableView *)tableView objectValueForTableColumn:(NSTableColumn *)tableColumn row:(NSInteger)row { +// NSButton *button; +// WCBoardThread *thread; +// +// thread = [self _threadAtIndex:row]; +// +// if(tableView == _threadsHorizontalTableView) { +// if(tableColumn == _unreadThreadTableColumn) +// return [thread isUnread] ? [NSImage imageNamed:@"UnreadThread"] : NULL; +// if(tableColumn == _subjectTableColumn) +// return [thread subject]; +// else if(tableColumn == _nickTableColumn) +// return [thread nick]; +// else if(tableColumn == _repliesTableColumn) +// return [NSNumber numberWithUnsignedInteger:[thread numberOfReplies]]; +// else if(tableColumn == _threadTimeTableColumn) +// return [_dateFormatter stringFromDate:[thread postDate]]; +// else if(tableColumn == _postTimeTableColumn) { +// if([thread latestReplyDate]) { +// button = [thread goToLatestReplyButton]; +// +// [button setTarget:self]; +// [button setAction:@selector(goToLatestReply:)]; +// [button setTag:row]; +// +// return [NSDictionary dictionaryWithObjectsAndKeys: +// [_dateFormatter stringFromDate:[thread latestReplyDate]], +// WCBoardsButtonCellValueKey, +// button, +// WCBoardsButtonCellButtonKey, +// NULL]; +// } else { +// button = [thread goToLatestReplyButton]; +// +// [button setTarget:self]; +// [button setAction:@selector(goToLatestReply:)]; +// [button setTag:row]; +// +// return [NSDictionary dictionaryWithObjectsAndKeys: +// [_dateFormatter stringFromDate:[thread postDate]], +// WCBoardsButtonCellValueKey, +// button, +// WCBoardsButtonCellButtonKey, +// NULL]; +// } +// } +// } +// +// return NULL; +//} + - (NSView *)tableView:(NSTableView *)tableView viewForTableColumn:(NSTableColumn *)tableColumn row:(NSInteger)row { WCThreadTableCellView *view; WCBoardThread *thread; @@ -4224,27 +4296,6 @@ - (void)tableView:(NSTableView *)tableView didClickTableColumn:(NSTableColumn *) - (void)tableViewSelectionDidChange:(NSNotification *)notification { - NSMutableSet *readIDs; - WCBoardThread *thread; - - readIDs = [NSMutableSet set]; - thread = [self _selectedThread]; - - if(thread) { - [thread setUnread:NO]; - - [readIDs addObject:[thread threadID]]; - - for(WCBoardPost *post in [thread posts]) { - [post setUnread:NO]; - - [readIDs addObject:[post postID]]; - } - - [[NSNotificationCenter defaultCenter] postNotificationName:WCBoardsDidChangeUnreadCountNotification - object:readIDs]; - } - [self _reloadThread]; [self _validate]; } @@ -4279,4 +4330,157 @@ - (BOOL)tableView:(NSTableView *)tableView writeRowsWithIndexes:(NSIndexSet *)in return YES; } + + + + + + + +#pragma mark - +#pragma mark WebKit Obj-C/Javascript Selectors + +//+ (NSString *)webScriptNameForSelector:(SEL)selector +//{ +// NSString *name; +// +// if (selector == @selector(loadScriptWithName:)) +// name = @"loadScriptWithName"; +// if (selector == @selector(JSONObjects)) +// name = @"JSONObjects"; +// if (selector == @selector(JSONObjectsUntilDate:withLimit:)) +// name = @"JSONObjectsUntilDateWithLimit"; +// if (selector == @selector(lastMessageDate)) +// name = @"lastMessageDate"; +// +// return name; +//} + +- (NSString *)lastMessageDate { + NSDateFormatter *dateFormatter; + + dateFormatter = [[[NSDateFormatter alloc] init] autorelease]; + [dateFormatter setDateFormat:@"yyyy'-'MM'-'dd'T'HH':'mm':'ss'Z'"]; + [dateFormatter setTimeZone:[NSTimeZone timeZoneForSecondsFromGMT:0]]; + [dateFormatter setCalendar:[[NSCalendar alloc] initWithCalendarIdentifier:NSCalendarIdentifierGregorian]]; + + return [dateFormatter stringFromDate:[[self _selectedThread] latestReplyDate]]; +} + ++ (BOOL)isSelectorExcludedFromWebScript:(SEL)selector { + if(selector == @selector(replyToThread) || + selector == @selector(replyToPostWithID:) || + selector == @selector(deletePostWithID:) || + selector == @selector(editPostWithID:) || + selector == @selector(loadScriptWithName:) || + selector == @selector(JSONObjectsUntilDate:withLimit:) || + selector == @selector(lastMessageDate) || + selector == @selector(JSONObjects)) + return NO; + + return YES; +} + + + +#pragma mark - +#pragma mark WCWebDataSource Methods + +- (BOOL)loadScriptWithName:(NSString *)name { + WITemplateBundle *template; + NSURL *scriptURL; + + template = [WITemplateBundle templateWithPath:[_threadController templatePath]]; + scriptURL = [NSURL fileURLWithPath:[template pathForResource:name ofType:@"js" inDirectory:@"htdocs/js"]]; + + if(![[NSFileManager defaultManager] fileExistsAtPath:[scriptURL path]]) + return NO; + + [[_threadController threadWebView] appendScriptAtURL:scriptURL]; + + return YES; +} + +- (NSString *)JSONObjects { + NSMutableSet *readIDs; + WCBoardThread *thread; + NSMutableArray *posts; + NSString *jsonString; + + jsonString = nil; + readIDs = [NSMutableSet set]; + posts = [NSMutableArray array]; + thread = [self _selectedThread]; + + if(thread) { + [thread setUnread:NO]; + [readIDs addObject:[thread threadID]]; + [posts addObject:[self _JSONProxyForPost:thread]]; + + for(WCBoardPost *post in [thread posts]) { + [post setUnread:NO]; + [readIDs addObject:[post postID]]; + [posts addObject:[self _JSONProxyForPost:post]]; + } + + jsonString = [[SBJson4Writer writer] stringWithObject:posts]; + + [thread setLoaded:YES]; + + [[NSNotificationCenter defaultCenter] postNotificationName:WCBoardsDidChangeUnreadCountNotification + object:readIDs]; + + [[NSNotificationCenter defaultCenter] postNotificationName:WCBoardsDidChangeUnreadCountNotification + object:thread]; + } + + return jsonString; +} + +- (NSString *)JSONObjectsUntilDate:(NSString *)dateString withLimit:(NSUInteger)limit { +// NSPredicate *predicate; +// NSSortDescriptor *descriptor; +// NSDate *date; +// NSDateFormatter *dateFormatter; + NSString *jsonString = nil; +// NSArray *sortedMessages; +// NSCalendar *calendar; +// + // calendar = [[NSCalendar alloc] initWithCalendarIdentifier:NSGregorianCalendar]; + // + // dateFormatter = [[NSDateFormatter alloc] init]; + // [dateFormatter setDateFormat:@"yyyy'-'MM'-'dd'T'HH':'mm':'ss'Z'"]; + // [dateFormatter setTimeZone:[NSTimeZone timeZoneForSecondsFromGMT:0]]; + // [dateFormatter setCalendar:calendar]; + // + // if(dateString != nil) { + // date = [dateFormatter dateFromString:dateString]; + // } else { + // date = [_thread latestReplyDate]; + // } + // + // if(!date) { + // return nil; + // } + // + // predicate = [NSPredicate predicateWithFormat:@"(conversation == %@) && (date <= %@)", _conversation, date]; + // descriptor = [[NSSortDescriptor alloc] initWithKey:@"date" ascending:NO]; + // sortedMessages = [[WCDatabaseController context] fetchEntitiesNammed:@"Message" + // withPredicate:predicate + // descriptor:descriptor + // limit:limit + // error:nil]; + // + // jsonString = [[SBJsonWriter writer] stringWithObject:sortedMessages]; + // + // [descriptor release]; + // [dateFormatter release]; + // [calendar release]; + // + // //NSLog(@"jsonString: %@", jsonString); + + return jsonString; +} + + @end diff --git a/Sources/WCBoardsTextView.m b/Sources/WCBoardsTextView.m index 57d299b8..4f1c1921 100644 --- a/Sources/WCBoardsTextView.m +++ b/Sources/WCBoardsTextView.m @@ -62,29 +62,33 @@ - (NSDragOperation)dragOperationForDraggingInfo:(id )info type:( - (BOOL)readSelectionFromPasteboard:(NSPasteboard *)pasteboard type:(NSString *)type { - NSEnumerator *enumerator; - NSMutableArray *array; - NSArray *sources; - WCFile *file; - - if([type isEqualToString:WCFilePboardType]) { - array = [NSMutableArray array]; - sources = [NSKeyedUnarchiver unarchiveObjectWithData:[pasteboard dataForType:type]]; - enumerator = [sources objectEnumerator]; - - while((file = [enumerator nextObject])) { - [array addObject:[NSSWF:@"wiredp7://%@%@", - [[file path] stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding], - [file isFolder] ? @"/" : @""]]; - } - - [[self window] makeFirstResponder:self]; - [self insertText:[array componentsJoinedByString:@", "]]; - - return YES; - } - - return [super readSelectionFromPasteboard:pasteboard type:type]; + NSEnumerator *enumerator; + NSMutableArray *array; + NSArray *sources; + WCFile *file; + + if([type isEqualToString:WCFilePboardType]) { + array = [NSMutableArray array]; + sources = [NSKeyedUnarchiver unarchiveObjectWithData:[pasteboard dataForType:type]]; + enumerator = [sources objectEnumerator]; + + while((file = [enumerator nextObject])) { + NSString *escapedPath = [[file path] stringByAddingPercentEncodingWithAllowedCharacters:[NSCharacterSet URLPathAllowedCharacterSet]]; + NSString *fileString = [NSString stringWithFormat:@"wiredp7://%@%@", + escapedPath, + [file isFolder] ? @"/" : @""]; + [array addObject:fileString]; + } + + [[self window] makeFirstResponder:self]; + NSRange replacementRange = NSMakeRange([[self string] length], 0); // Appending at the end + [self insertText:[array componentsJoinedByString:@", "] replacementRange:replacementRange]; + + return YES; + } + + return [super readSelectionFromPasteboard:pasteboard type:type]; } + @end diff --git a/Sources/WCBoardsWindow.m b/Sources/WCBoardsWindow.m index 88741e4c..1366e999 100644 --- a/Sources/WCBoardsWindow.m +++ b/Sources/WCBoardsWindow.m @@ -34,7 +34,7 @@ @implementation WCBoardsWindow - (void)sendEvent:(NSEvent *)event { BOOL handled = NO; - if([event type] == NSKeyDown) { + if([event type] == NSEventTypeKeyDown) { if([event character] == ' ') { if([event shiftKeyModifier]) handled = [(WCBoards *)[self delegate] showPreviousUnreadThread]; diff --git a/Sources/WCChatController.h b/Sources/WCChatController.h index 2733e46a..780a8bcb 100644 --- a/Sources/WCChatController.h +++ b/Sources/WCChatController.h @@ -43,7 +43,7 @@ extern NSString * const WCUserPboardType; @class SBJson4Writer, LNWebView, LNScrollView, WCChatTextView, WCChatWindow, WCServerConnection, WCErrorQueue, WCTopic, WCUser; -@interface WCChatController : WIObject { +@interface WCChatController : WIObject { IBOutlet WISplitView *_userListSplitView; IBOutlet NSImageView *_splitResizeView; @@ -53,12 +53,12 @@ extern NSString * const WCUserPboardType; IBOutlet WISplitView *_chatSplitView; IBOutlet NSScrollView *_chatOutputScrollView; IBOutlet LNScrollView *_chatInputScrollView; + //IBOutlet NSTextView *_chatInputTextView; IBOutlet NSTextField *_chatInputTextField; IBOutlet NSMenu *_chatSmileysMenu; IBOutlet NSButton *_showEmoticonsButtons; - //IBOutlet WebView *_chatOutputWebView; - IBOutlet NSTableView *_chatTableView; + IBOutlet WebView *_chatOutputWebView; IBOutlet NSView *_userListView; IBOutlet NSButton *_privateMessageButton; @@ -88,8 +88,6 @@ extern NSString * const WCUserPboardType; WCErrorQueue *_errorQueue; SBJson4Writer *_jsonWriter; - - NSMutableArray *_messages; NSMutableArray *_commandHistory; NSUInteger _currentCommand; @@ -146,8 +144,6 @@ extern NSString * const WCUserPboardType; - (NSView *)view; - (WebView *)webView; -- (NSArray *)messages; - - (void)awakeInWindow:(NSWindow *)window; - (void)loadWindowProperties; - (void)saveWindowProperties; diff --git a/Sources/WCChatController.m b/Sources/WCChatController.m index d50ddee5..bd654a46 100644 --- a/Sources/WCChatController.m +++ b/Sources/WCChatController.m @@ -46,10 +46,8 @@ #import "WCBoard.h" #import "WCPublicChat.h" #import "WCUserTableCellView.h" -#import "WCChatTableCellView.h" #import "iTunes.h" #import "NSString+Emoji.h" -#import "NSImage+Data.h" #define WCPublicChatID 1 @@ -86,10 +84,10 @@ @interface WCChatController(Private) - (void)_updatePreferences; - (void)_updateSaveChatForPanel:(NSSavePanel *)savePanel; +- (void)_adjustChatInputTextFieldHeight; - (void)_setTopic:(WCTopic *)topic; -- (void)_appendRow; - (void)_printTimestamp; - (void)_printTopic; - (void)_printUserJoin:(WCUser *)user; @@ -101,6 +99,8 @@ - (void)_printUserBan:(WCUser *)victim message:(NSString *)message; - (void)_printUserBanned:(WCUser *)victim expirationDate:(NSDate *)date; - (void)_printUserDisconnect:(WCUser *)victim message:(NSString *)message; - (void)_printChat:(NSString *)chat by:(WCUser *)user; +- (void)_printActionChat:(NSString *)chat by:(WCUser *)user; +- (void)_printHTML:(NSString *)html by:(WCUser *)user; - (void)_sendImage:(NSURL *)url; - (void)_sendiTunes; @@ -114,7 +114,7 @@ - (void)_applyHTMLTagsForHighlightsToMutableString:(NSMutableString *)mutableStr - (NSColor *)_highlightColorForChat:(NSString *)chat; - (NSDictionary *)_currentTheme; -- (void)_loadTheme:(NSDictionary *)theme; +- (void)_loadTheme:(NSDictionary *)theme withTemplate:(WITemplateBundle *)template; @end @@ -140,6 +140,11 @@ - (void)_updatePreferences { [_highlightPatterns setArray:highlightPatterns]; [_highlightColors setArray:highlightColors]; } + + WebPreferences *pref = [WebPreferences standardPreferences]; + [pref setAllowsAnimatedImages:[[WCSettings settings] boolForKey:WCChatAnimatedImagesEnabled]]; + [pref setAllowsAnimatedImageLooping:[[WCSettings settings] boolForKey:WCChatAnimatedImagesEnabled]]; + [_chatOutputWebView setPreferences:pref]; } @@ -153,6 +158,10 @@ - (void)_updateSaveChatForPanel:(NSSavePanel *)savePanel { } +- (void)_adjustChatInputTextFieldHeight { + [_chatInputTextField adjustHeightForTopView:_chatOutputWebView bottomView:[_chatInputTextField superview]]; + [_chatOutputWebView scrollToBottom]; +} @@ -284,67 +293,39 @@ - (void)_printUserDisconnect:(WCUser *)victim message:(NSString *)message { - (void)_printChat:(NSString *)chat by:(WCUser *)user { - WIChatLogController *logController; - NSString *nick, *formattedDate, *formattedLogs, *chatString; - NSAttributedString *attrString; - NSMutableAttributedString *mutableOutput; - NSDictionary *message; - BOOL timestamp; - NSFont *font; - NSDictionary *theme; - - theme = [[WCSettings settings] themeWithName:@"Wired"]; - font = WIFontFromString ([theme objectForKey:WCThemesChatFont]); + WIChatLogController *logController; + NSString *nick, *formattedDate, *formattedLogs; + NSMutableString *mutableOutput; + NSDictionary *jsonProxy; + BOOL timestamp; + chat = [[chat componentsSeparatedByCharactersInSet:[NSCharacterSet newlineCharacterSet]] componentsJoinedByString:@"\n"]; + mutableOutput = [NSMutableString stringWithString:chat]; logController = [[WCApplicationController sharedController] logController]; - timestamp = [[[self connection] theme] boolForKey:WCThemesChatTimestampEveryLine]; - nick = [user nick]; - formattedDate = (timestamp) ? [_timestampEveryLineDateFormatter stringFromDate:[NSDate date]] : @""; - formattedLogs = [NSSWF:@"[%@]\t%@: %@\n", [_timestampEveryLineDateFormatter stringFromDate:[NSDate date]], nick, chat]; - chatString = chat; - - if ([chatString hasPrefix:@"", [url absoluteString]]; - -// imageData = [NSData dataWithContentsOfURL:url]; -// image = [NSImage imageWithData:imageData]; -// -// if(image) { -// if (image.size.width > 350) { -// newHeight = 350 / image.size.width * image.size.height; -// image = [image scaledImageWithSize:NSMakeSize(350, newHeight)]; -// } -// -// base64 = [[image TIFFRepresentation] base64EncodedString]; -// html = [NSSWF:@"", base64]; -// } - } else if ([url scheme] == nil && [[url absoluteString] hasPrefix:@"/"]) { - image = [NSImage imageWithContentsOfFile:[url absoluteString]]; - - if(image) { - if (image.size.width > 350) { - newHeight = 350 / image.size.width * image.size.height; - image = [image scaledImageWithSize:NSMakeSize(350, newHeight)]; - } - - base64 = [[image TIFFRepresentation] base64EncodedString]; - html = [NSSWF:@"", base64]; - } + if([[url scheme] containsSubstring:@"http"]) { + html = [NSSWF:@"", [url absoluteString], [url absoluteString]]; + } else { + html = nil; } if(html && [html length] > 0) { @@ -521,14 +475,14 @@ - (void)_sendLocalImage:(NSURL *)url { NSString *html; NSString *base64ImageString; NSData *imageData; - CGFloat newHeight; image = [NSImage imageWithData:[NSData dataWithContentsOfURL:url]]; if (image.size.width > 350) { - newHeight = 350 / image.size.width * image.size.height; - image = [image scaledImageWithSize:NSMakeSize(350, newHeight)]; + image = [image imageByScalingProportionallyToSize:NSMakeSize(350, 1)]; } + + NSLog(@"image : %@", image); imageData = [image TIFFRepresentation]; base64ImageString = [imageData base64EncodedString]; @@ -849,63 +803,6 @@ - (void)_applyHTMLTagsForHighlightsToMutableString:(NSMutableString *)mutableStr -- (void)_applyClickableURLs:(NSMutableAttributedString *)mutableString { - NSRange range; - - range = [[mutableString string] rangeOfRegex:[NSSWF:@"(^|\\s)(%@)(\\.|,|:|\\?|!)?(\\s|$)", [NSString URLRegex]] - options:RKLCaseless | RKLMultiline - capture:0]; - if (range.location != NSNotFound) { - [mutableString addAttribute:NSLinkAttributeName value:[[mutableString string] substringWithRange:range] range:range]; - } - - range = [[mutableString string] rangeOfRegex:[NSSWF:@"(^|\\s)(%@)(\\.|,|:|\\?|!)?(\\s|$)", [NSString schemelessURLRegex]] - options:RKLCaseless | RKLMultiline - capture:0]; - if (range.location != NSNotFound) { - [mutableString addAttribute:NSLinkAttributeName value:[[mutableString string] substringWithRange:range] range:range]; - } - - range = [[mutableString string] rangeOfRegex:[NSSWF:@"(^|\\s)(%@)(\\.|,|:|\\?|!)?(\\s|$)", [NSString mailtoURLRegex]] - options:RKLCaseless | RKLMultiline - capture:0]; - if (range.location != NSNotFound) { - [mutableString addAttribute:NSLinkAttributeName value:[[mutableString string] substringWithRange:range] range:range]; - } -} - - - - -- (void)_applyHighlightsToMutableString:(NSMutableAttributedString *)mutableString { - NSColor *color; - NSAttributedString *highlightString; - NSString *string; - NSRange range; - - color = [self _highlightColorForChat:[mutableString string]]; - - if(!color) - return; - - for(NSString *pattern in _highlightPatterns) { - range = [[mutableString string] rangeOfString:pattern options:NSCaseInsensitiveSearch]; - - if(range.location == NSNotFound) - return; - - string = [[mutableString string] substringWithRange:range]; - - if(string) { - //highlightString = [NSSWF:@"%@", [NSSWF:@"#%.6lx", (unsigned long)[color HTMLValue]], string]; - highlightString = [NSAttributedString attributedStringWithString:string - attributes:@{NSForegroundColorAttributeName: color}]; - [mutableString replaceCharactersInRange:range withAttributedString:highlightString]; - } - } -} - - #pragma mark - - (NSColor *)_highlightColorForChat:(NSString *)chat { @@ -940,7 +837,15 @@ - (NSDictionary *)_currentTheme { [[WCSettings settings] themeWithIdentifier:[[WCSettings settings] objectForKey:WCTheme]]); } -- (void)_loadTheme:(NSDictionary *)theme { +- (void)_loadTheme:(NSDictionary *)theme withTemplate:(WITemplateBundle *)template { + NSString *htmlPath; + + htmlPath = [template htmlPathForType:WITemplateTypeChat]; + + [[_chatOutputWebView preferences] setAutosaves:YES]; + + [[_chatOutputWebView mainFrame] loadRequest:[NSURLRequest requestWithURL:[NSURL fileURLWithPath:htmlPath]]]; + [self themeDidChange:theme]; } @@ -1104,7 +1009,6 @@ + (BOOL)isHTMLString:(NSString *)string { - (id)init { self = [super init]; - _messages = [[NSMutableArray alloc] init]; _commandHistory = [[NSMutableArray alloc] init]; _users = [[NSMutableDictionary alloc] init]; _allUsers = [[NSMutableArray alloc] init]; @@ -1157,7 +1061,6 @@ - (void)dealloc { [_allUsers release]; [_shownUsers release]; - [_messages release]; [_commandHistory release]; [_chatColor release]; @@ -1185,6 +1088,7 @@ - (void)dealloc { - (void)awakeFromNib { NSDictionary *theme; + WITemplateBundle *template; [_userListTableView setTarget:self]; [_userListTableView setDoubleAction:@selector(sendPrivateMessage:)]; @@ -1201,14 +1105,18 @@ - (void)awakeFromNib { [_topicDateFormatter setDateStyle:NSDateFormatterMediumStyle]; [_topicDateFormatter setNaturalLanguageStyle:WIDateFormatterCapitalizedNaturalLanguageStyle]; - [[_topicTextField cell] setBackgroundStyle:NSBackgroundStyleRaised]; - - [_chatTableView registerForDraggedTypes:@[NSFilenamesPboardType, NSPasteboardTypeString]]; - [_chatTableView setDraggingDestinationFeedbackStyle:NSTableViewDraggingDestinationFeedbackStyleNone]; + [_chatOutputWebView setUIDelegate:(id)self]; + [_chatOutputWebView setFrameLoadDelegate:(id)self]; + [_chatOutputWebView setResourceLoadDelegate:(id)self]; + [_chatOutputWebView setPolicyDelegate:(id)self]; + [_chatOutputWebView registerForDraggedTypes:@[NSFilenamesPboardType]]; - theme = [[WCSettings settings] themeWithName:@"Wired"]; + [[_topicTextField cell] setBackgroundStyle:NSBackgroundStyleRaised]; + + theme = [[WCSettings settings] themeWithName:@"Wired"]; + template = [[WCSettings settings] templateBundleWithIdentifier:[theme objectForKey:WCThemesTemplate]]; - [self _loadTheme:theme]; + [self _loadTheme:theme withTemplate:template]; if([[WCSettings settings] boolForKey:WCHideUserList]) [self hideUserList:self]; @@ -1232,6 +1140,7 @@ - (void)appleInterfaceThemeChanged:(NSNotification *) notification { - (void)themeDidChange:(NSDictionary *)theme { + WITemplateBundle *templateBundle; NSColor *textColor, *backgroundColor, *timestampColor, *eventColor, *urlColor; NSFont *font; BOOL reload = NO; @@ -1250,8 +1159,9 @@ - (void)themeDidChange:(NSDictionary *)theme { if(font && ![[_setTopicTextView font] isEqualTo:font]) { [_chatInputTextField setFont:font]; [_setTopicTextView setFont:font]; -// [_chatFont release]; -// _chatFont = [font retain]; + + [_chatFont release]; + _chatFont = [font retain]; } // // if(![[_chatInputTextView backgroundColor] isEqualTo:backgroundColor]) { @@ -1285,12 +1195,6 @@ - (void)themeDidChange:(NSDictionary *)theme { reload = YES; } - if([theme boolForKey:WCThemesChatSeparateEveryLine]) { - [_chatTableView setGridStyleMask:NSTableViewDashedHorizontalGridLineMask]; - } else { - [_chatTableView setGridStyleMask:NSTableViewGridNone]; - } - if([[theme objectForKey:WCThemesUserListAlternateRows] boolValue]) { [_userListTableView setUsesAlternatingRowBackgroundColors:YES]; [_userListTableView setSelectionHighlightStyle:NSTableViewSelectionHighlightStyleRegular]; @@ -1316,7 +1220,52 @@ - (void)themeDidChange:(NSDictionary *)theme { [_userListTableView reloadData]; } - [_chatTableView reloadData]; + // HTML/ CSS template reload + templateBundle = [[WCSettings settings] templateBundleWithIdentifier:[theme objectForKey:WCThemesTemplate]]; + + [templateBundle setCSSValue:[font fontName] + toAttribute:WITemplateAttributesFontName + ofType:WITemplateTypeChat]; + + [templateBundle setCSSValue:[NSSWF:@"%.0fpx", [font pointSize]] + toAttribute:WITemplateAttributesFontSize + ofType:WITemplateTypeChat]; + + [templateBundle setCSSValue:[NSApp darkModeEnabled] ? @"white" : @"dimgray" + toAttribute:WITemplateAttributesFontColor + ofType:WITemplateTypeChat]; + + [templateBundle setCSSValue:[NSApp darkModeEnabled] ? @"#383838" : @"white" + toAttribute:WITemplateAttributesBackgroundColor + ofType:WITemplateTypeChat]; + + [templateBundle setCSSValue:[NSSWF:@"#%.6lx", (unsigned long)[timestampColor HTMLValue]] + toAttribute:WITemplateAttributesTimestampColor + ofType:WITemplateTypeChat]; + + [templateBundle setCSSValue:[NSSWF:@"#%.6lx", (unsigned long)[eventColor HTMLValue]] + toAttribute:WITemplateAttributesEventColor + ofType:WITemplateTypeChat]; + + [templateBundle setCSSValue:[NSSWF:@"#%.6lx", (unsigned long)[urlColor HTMLValue]] + toAttribute:WITemplateAttributesURLTextColor + ofType:WITemplateTypeChat]; + + [templateBundle setCSSValue:[NSApp darkModeEnabled] ? @"dimgray" : @"gainsboro" + toAttribute:@"" + ofType:WITemplateTypeChat]; + + [templateBundle setCSSValue:[NSApp darkModeEnabled] ? @"dimgray" : @"gainsboro" + toAttribute:@"" + ofType:WITemplateTypeChat]; + + [templateBundle saveChangesForType:WITemplateTypeChat]; + + [_chatOutputWebView reloadStylesheetWithID:@"wc-stylesheet" + withTemplate:templateBundle + type:WITemplateTypeChat]; + + [_chatOutputWebView scrollToBottom]; } @@ -1543,10 +1492,15 @@ - (void)wiredChatSayOrMe:(WIP7Message *)message { mutableChat = [NSMutableString stringWithString:chat]; color = [self _highlightColorForChat:chat]; - if([name isEqualToString:@"wired.chat.say"]) - [self _printChat:mutableChat by:user]; - else - [self _printActionChat:mutableChat by:user]; + if([[WCSettings settings] boolForKey:WCChatEmbedHTMLInChatEnabled] && [[self class] isHTMLString:chat] ) { + [self _printHTML:chat by:user]; + + } else { + if([name isEqualToString:@"wired.chat.say"]) + [self _printChat:mutableChat by:user]; + else + [self _printActionChat:mutableChat by:user]; + } if(color != NULL) { [[self connection] postNotificationName:WCChatHighlightedChatDidAppearNotification @@ -1800,7 +1754,8 @@ - (void)menuNeedsUpdate:(NSMenu *)menu { #pragma mark - - (void)controlTextDidChange:(NSNotification *)obj { - + if([obj object] == _chatInputTextField) + [self _adjustChatInputTextFieldHeight]; } @@ -1829,7 +1784,8 @@ - (BOOL)control:(NSControl *)control textView:(NSTextView *)fieldEditor doComman historyModifier = [[WCSettings settings] integerForKey:WCChatHistoryScrollbackModifier]; if(selector == @selector(insertLineBreak:)) { - + [self _adjustChatInputTextFieldHeight]; + } else if(selector == @selector(insertNewline:) || selector == @selector(insertNewlineIgnoringFieldEditor:)) { NSString *string; @@ -1839,6 +1795,7 @@ - (BOOL)control:(NSControl *)control textView:(NSTextView *)fieldEditor doComman length = [string length]; if(length == 0) { + [self _adjustChatInputTextFieldHeight]; return YES; } if(length > WCChatLimit) @@ -1864,8 +1821,8 @@ - (BOOL)control:(NSControl *)control textView:(NSTextView *)fieldEditor doComman } [_chatInputTextField setStringValue:@""]; - - return YES; + [self _adjustChatInputTextFieldHeight]; + return YES; } else if(selector == @selector(insertTab:)) { if([[WCSettings settings] boolForKey:WCChatTabCompleteNicks]) { @@ -2073,12 +2030,7 @@ - (NSView *)view { } - (WebView *)webView { - return nil; -} - - -- (NSArray *)messages { - return _messages; + return _chatOutputWebView; } @@ -2215,13 +2167,12 @@ - (void)printEvent:(NSString *)message { [[self class] applyHTMLTagsForSmileysToMutableString:mutableOutput]; jsonProxy = [NSDictionary dictionaryWithObjectsAndKeys: - @"true", @"event", formattedDate, @"timestamp", mutableOutput, @"message", nil]; - [_messages addObject:jsonProxy]; - [self _appendRow]; - + [_chatOutputWebView stringByEvaluatingJavaScriptFromString: + [NSSWF:@"printEvent(%@);", [_jsonWriter stringWithObject:jsonProxy]]]; + if([[WCSettings settings] boolForKey:WCChatLogsPlainTextEnabled]) [logController appendChatLogAsPlainText:[NSSWF:@"[%@]\t%@\n", formattedDate, output] forConnectionName:[[self connection] name]]; @@ -2234,13 +2185,13 @@ - (void)printChatNowPlaying { - (void)clearChat { - [_messages removeAllObjects]; - [_chatTableView reloadData]; + [_chatOutputWebView clearChildrenElementsOfElementWithID:@"chat-content"]; } - (BOOL)chatIsEmpty { - return [_messages count] == 0; + DOMHTMLElement *chatContentElement = (DOMHTMLElement *)[[[_chatOutputWebView mainFrame] DOMDocument] getElementById:@"chat-content"]; + return ![chatContentElement hasChildNodes]; } @@ -2282,15 +2233,15 @@ - (IBAction)saveChat:(id)sender { [self _updateSaveChatForPanel:savePanel]; -// [savePanel beginSheetModalForWindow:[_userListSplitView window] completionHandler:^(NSInteger result) { -// WIChatLogType type; -// -// if(result == NSModalResponseOK) { -// type = [_saveChatFileFormatPopUpButton indexOfSelectedItem]; -// -// [_chatOutputWebView exportContentToFileAtPath:[[savePanel URL] path] forType:type]; -// } -// }]; + [savePanel beginSheetModalForWindow:[_userListSplitView window] completionHandler:^(NSInteger result) { + WIChatLogType type; + + if(result == NSModalResponseOK) { + type = [_saveChatFileFormatPopUpButton indexOfSelectedItem]; + + [_chatOutputWebView exportContentToFileAtPath:[[savePanel URL] path] forType:type]; + } + }]; } @@ -2300,7 +2251,7 @@ - (void)saveChatPanelDidEnd:(NSSavePanel *)savePanel returnCode:(NSInteger)retur if(returnCode == NSModalResponseOK) { type = [_saveChatFileFormatPopUpButton indexOfSelectedItem]; - //[_chatOutputWebView exportContentToFileAtPath:[[savePanel URL] path] forType:type]; + [_chatOutputWebView exportContentToFileAtPath:[[savePanel URL] path] forType:type]; } } @@ -2311,33 +2262,37 @@ - (IBAction)setTopic:(id)sender { if(_topic && [_topic topic]) { [_setTopicTextView setString:[_topic topic]]; [_setTopicTextView setSelectedRange:NSMakeRange(0, [[_setTopicTextView string] length])]; - } + } + + NSWindow *window = [_userListSplitView window]; - [NSApp beginSheet:_setTopicPanel - modalForWindow:[_userListSplitView window] - modalDelegate:self - didEndSelector:@selector(setTopicSheetDidEnd:returnCode:contextInfo:) - contextInfo:NULL]; + [window beginSheet:_setTopicPanel + completionHandler:^(NSModalResponse returnCode){ + // Hier kannst du Code hinzufügen, der nach dem Blatt abgeschlossen wird. + // Das ist äquivalent zum "didEndSelector" in der vorherigen Methode. + }]; } + - (void)setTopicSheetDidEnd:(NSWindow *)sheet returnCode:(NSInteger)returnCode contextInfo:(void *)contextInfo { - WIP7Message *message; + WIP7Message *message; - if(returnCode == NSAlertDefaultReturn) { - message = [WIP7Message messageWithName:@"wired.chat.set_topic" spec:WCP7Spec]; - [message setUInt32:[self chatID] forName:@"wired.chat.id"]; - [message setString:[_setTopicTextView string] forName:@"wired.chat.topic.topic"]; - [[self connection] sendMessage:message]; - } - - [_setTopicPanel close]; - [_setTopicTextView setString:@""]; + if (returnCode == NSAlertFirstButtonReturn) { + message = [WIP7Message messageWithName:@"wired.chat.set_topic" spec:WCP7Spec]; + [message setUInt32:[self chatID] forName:@"wired.chat.id"]; + [message setString:[_setTopicTextView string] forName:@"wired.chat.topic.topic"]; + [[self connection] sendMessage:message]; + } + + [_setTopicPanel close]; + [_setTopicTextView setString:@""]; } + - (IBAction)sendPrivateMessage:(id)sender { if(![self selectedUser]) return; @@ -2354,35 +2309,32 @@ - (IBAction)getInfo:(id)sender { - (IBAction)kick:(id)sender { - [NSApp beginSheet:_kickMessagePanel - modalForWindow:[_userListSplitView window] - modalDelegate:self - didEndSelector:@selector(kickSheetDidEnd:returnCode:contextInfo:) - contextInfo:[[self selectedUser] retain]]; + [[_userListSplitView window] beginSheet:_kickMessagePanel completionHandler:^(NSModalResponse returnCode) { + [self kickSheetDidEnd:_kickMessagePanel returnCode:returnCode contextInfo:[[self selectedUser] retain]]; + }]; } +- (void)kickSheetDidEnd:(NSWindow *)sheet returnCode:(NSModalResponse)returnCode contextInfo:(void *)contextInfo { + WIP7Message *message; + WCUser *user = ( WCUser *)contextInfo; + if (returnCode == NSModalResponseOK) { + message = [WIP7Message messageWithName:@"wired.chat.kick_user" spec:WCP7Spec]; + [message setUInt32:[user userID] forName:@"wired.user.id"]; + [message setUInt32:[self chatID] forName:@"wired.chat.id"]; + [message setString:[_kickMessageTextField stringValue] forName:@"wired.user.disconnect_message"]; + [[self connection] sendMessage:message fromObserver:self selector:@selector(wiredChatKickUserReply:)]; + } -- (void)kickSheetDidEnd:(NSWindow *)sheet returnCode:(NSInteger)returnCode contextInfo:(void *)contextInfo { - WIP7Message *message; - WCUser *user = contextInfo; - - if(returnCode == NSAlertDefaultReturn) { - message = [WIP7Message messageWithName:@"wired.chat.kick_user" spec:WCP7Spec]; - [message setUInt32:[user userID] forName:@"wired.user.id"]; - [message setUInt32:[self chatID] forName:@"wired.chat.id"]; - [message setString:[_kickMessageTextField stringValue] forName:@"wired.user.disconnect_message"]; - [[self connection] sendMessage:message fromObserver:self selector:@selector(wiredChatKickUserReply:)]; - } - - [user release]; - - [_kickMessagePanel close]; - [_kickMessageTextField setStringValue:@""]; + [_kickMessagePanel close]; + [_kickMessageTextField setStringValue:@""]; + + [user release]; // This line is not needed in ARC (Automatic Reference Counting) environment } + - (IBAction)editAccount:(id)sender { WIP7Message *message; WCUser *user; @@ -2486,13 +2438,145 @@ - (IBAction)fileFormat:(id)sender { #pragma mark - -- (NSInteger)numberOfRowsInTableView:(NSTableView *)tableView { - if (tableView == _userListTableView) - return [_shownUsers count]; - else if (tableView == _chatTableView) - return [_messages count]; +- (void)webView:(WebView *)sender didFinishLoadForFrame:(WebFrame *)frame { + WITemplateBundle *template; + NSURL *jqueryURL, *functionsURL, *mainURL; + NSDictionary *theme; + + theme = [[WCSettings settings] themeWithIdentifier:[[WCSettings settings] objectForKey:WCTheme]]; + template = [[WCSettings settings] templateBundleWithIdentifier:[theme objectForKey:WCThemesTemplate]]; + + if(!template) { + NSLog(@"Error: Template not found. (%@)", _chatTemplate); + return; + } + + jqueryURL = [NSURL fileURLWithPath:[template pathForResource:@"jquery" ofType:@"js" inDirectory:@"htdocs/js"]]; + functionsURL = [NSURL fileURLWithPath:[template pathForResource:@"functions" ofType:@"js" inDirectory:@"htdocs/js"]]; + mainURL = [NSURL fileURLWithPath:[template pathForResource:@"chat" ofType:@"js" inDirectory:@"htdocs/js"]]; + + if(![[NSFileManager defaultManager] fileExistsAtPath:[jqueryURL path]] || + ![[NSFileManager defaultManager] fileExistsAtPath:[functionsURL path]] || + ![[NSFileManager defaultManager] fileExistsAtPath:[mainURL path]]) + { + NSLog(@"Error: Invalid template. Missing script. (%@)", _chatTemplate); + return; + } - return 0; + [[_chatOutputWebView windowScriptObject] setValue:self forKey:@"Controller"]; + + [_chatOutputWebView appendScriptAtURL:jqueryURL]; + [_chatOutputWebView appendScriptAtURL:functionsURL]; + [_chatOutputWebView appendScriptAtURL:mainURL]; + + [_chatOutputWebView scrollToBottom]; +} + + +- (NSArray *)webView:(WebView *)webView contextMenuItemsForElement:(NSDictionary *)element defaultMenuItems:(NSArray *)defaultMenuItems { +#ifdef WCConfigurationRelease + return NULL; +#else + return defaultMenuItems; +#endif +} + + +-(NSURLRequest *)webView:(WebView *)sender + resource:(id)identifier + willSendRequest:(NSURLRequest *)request + redirectResponse:(NSURLResponse *)redirectResponse + fromDataSource:(WebDataSource *)dataSource +{ + if ([request cachePolicy] != NSURLRequestReloadIgnoringCacheData) + { + return [NSURLRequest requestWithURL:[request URL] + cachePolicy:NSURLRequestReloadIgnoringCacheData + timeoutInterval:[request timeoutInterval]]; + } else { + return request; + } +} + +- (void)webView:(WebView *)webView +decidePolicyForNavigationAction:(NSDictionary *)action + request:(NSURLRequest *)request + frame:(WebFrame *)frame +decisionListener:(id )listener +{ + NSString *path; + NSURL *url; + WIURL *wiredURL; + WCFile *file; + NSData *fileData; + NSImage *droppedImage; + BOOL handled = NO; + BOOL isDirectory = NO; + + if([[action objectForKey:WebActionNavigationTypeKey] unsignedIntegerValue] == WebNavigationTypeLinkClicked) { + [listener ignore]; + + url = [action objectForKey:WebActionOriginalURLKey]; + wiredURL = [WIURL URLWithURL:url]; + + isDirectory = [[url absoluteString] hasSuffix:@"/"] ? YES : NO; + + if([[wiredURL scheme] isEqualToString:@"wired"] || [[wiredURL scheme] isEqualToString:@"wiredp7"]) { + if([[wiredURL host] length] == 0) { + if([self connection] && [[self connection] isConnected]) { + path = [[wiredURL path] stringByRemovingPercentEncoding]; + + if(isDirectory) { + [WCFiles filesWithConnection:[self connection] + file:[WCFile fileWithDirectory:[path stringByDeletingLastPathComponent] connection:[self connection]] + selectFile:[WCFile fileWithDirectory:path connection:[self connection]]]; + + } else { + file = [WCFile fileWithFile:path connection:[self connection]]; + [[WCTransfers transfers] downloadFiles:[NSArray arrayWithObject:file] + toFolder:[[[WCSettings settings] objectForKey:WCDownloadFolder] stringByStandardizingPath]]; + } + } + + handled = YES; + } + } + + if(!handled) + [[NSWorkspace sharedWorkspace] openURL:[action objectForKey:WebActionOriginalURLKey]]; + + } else { + url = [action objectForKey:WebActionOriginalURLKey]; + + if (![[url pathExtension] isEqualToString:@"html"]) { + [listener ignore]; + + fileData = [NSData dataWithContentsOfURL:url]; + droppedImage = [NSImage imageWithData:fileData]; + + if (droppedImage) { + [self _sendLocalImage:url]; + } + } + + [listener use]; + } +} + +- (void)webView:(WebView *)sender mouseDidMoveOverElement:(NSDictionary *)elementInformation modifierFlags:(NSUInteger)modifierFlags { + // useless but required +} + +- (NSUInteger)webView:(WebView *)webView +dragDestinationActionMaskForDraggingInfo:(id)draggingInfo { + return WebDragDestinationActionLoad; +} + + +#pragma mark - + +- (NSInteger)numberOfRowsInTableView:(NSTableView *)tableView { + return [_shownUsers count]; } @@ -2508,143 +2592,101 @@ - (NSView *)tableView:(NSTableView *)tableView row:(NSInteger)row { NSDictionary *theme; + WCUserTableCellView *cellView; WCUser *user; - NSColor *timestampColor; - if(tableView == _userListTableView) { - WCUserTableCellView *cellView; - - theme = [self _currentTheme]; - user = [self userAtIndex:row]; - - switch([[theme objectForKey:WCThemesUserListIconSize] integerValue]) { - case WCThemesUserListIconSizeLarge: { - if([[user status] length] > 0) - cellView = [tableView makeViewWithIdentifier:@"WCLargeUserWithStatusTableCellView" owner:tableView]; - else - cellView = [tableView makeViewWithIdentifier:@"WCLargeUserTableCellView" owner:tableView]; - } break; - - case WCThemesUserListIconSizeSmall: { - if([[user status] length] > 0) - cellView = [tableView makeViewWithIdentifier:@"WCSmallUserWithStatusTableCellView" owner:tableView]; - else - cellView = [tableView makeViewWithIdentifier:@"WCSmallUserTableCellView" owner:tableView]; - } break; - } - - //if(row != [tableView selectedRow]) - cellView.nickTextField.textColor = [WCUser colorForColor:[user color] idleTint:[user isIdle]]; - //else - // cellView.nickTextField.textColor = [NSColor whiteColor]; - - [cellView.nickTextField setAllowsEditingTextAttributes:YES]; - - NSDictionary *attributes; - - if([user isIgnored]) { - attributes = [NSDictionary dictionaryWithObjectsAndKeys: - [NSNumber numberWithInteger:NSUnderlinePatternSolid | NSUnderlineStyleSingle], - NSStrikethroughStyleAttributeName, - nil]; - } else { - attributes = [NSDictionary dictionaryWithObjectsAndKeys: - [NSNumber numberWithInteger:NSUnderlinePatternSolid | NSUnderlineStyleNone], - NSStrikethroughStyleAttributeName, - nil]; - } - - cellView.nickTextField.attributedStringValue = [NSAttributedString attributedStringWithString:[user nick] - attributes:attributes]; - cellView.nickTextField.toolTip = [user nick]; - cellView.statusTextField.toolTip = [user status]; - cellView.statusTextField.stringValue = [user status]; - - - NSString *osxMode = [[NSUserDefaults standardUserDefaults] stringForKey:@"AppleInterfaceStyle"]; - if (osxMode == nil) { - cellView.statusTextField.textColor = [NSColor colorWithCalibratedRed:153.0/255.0 green:153.0/255.0 blue:153.0/255.0 alpha:1.0]; //Light mode - } else { - cellView.statusTextField.textColor = [NSColor colorWithCalibratedRed:130.0/255.0 green:130.0/255.0 blue:130.0/255.0 alpha:0.7 ] ; //Dark mode - } - - cellView.imageView.image = [user iconWithIdleTint:YES]; - - return cellView; - } - else if (tableView == _chatTableView) { - NSDictionary *message = [_messages objectAtIndex:row]; - - if ([[message valueForKey:@"me"] isEqualTo:@"true"]) { - WCChatTableCellView *cell = [tableView makeViewWithIdentifier:@"WCChatMeTableCellView" owner:tableView]; - - if(message) { - cell.messageTextField.stringValue = [message valueForKey:@"message"]; - cell.iconImageView.image = [message valueForKey:@"icon"]; - } - - [cell layoutSubtreeIfNeeded]; - - return cell; - } - if ([[message valueForKey:@"event"] isEqualTo:@"true"]) { - WCChatTableCellView *cell = [tableView makeViewWithIdentifier:@"WCChatEventTableCellView" owner:tableView]; - - if(message) { - cell.messageTextField.stringValue = [message valueForKey:@"message"]; - } - - [cell layoutSubtreeIfNeeded]; - - return cell; - - } else { - WCChatTableCellView *cell = [tableView makeViewWithIdentifier:@"WCChatTableCellView" owner:tableView]; - - theme = [self _currentTheme]; - - if(message) { - cell.nickTextField.stringValue = [message valueForKey:@"nick"]; - cell.messageTextField.stringValue = [message valueForKey:@"message"]; - cell.iconImageView.image = [message valueForKey:@"icon"]; - - if([theme boolForKey:WCThemesChatTimestampEveryLine]) { - timestampColor = WIColorFromString([theme objectForKey:WCThemesChatTimestampEveryLineColor]); - - cell.timeTextField.stringValue = [message valueForKey:@"timestamp"]; - cell.timeTextField.textColor = timestampColor; - } else { - cell.timeTextField.stringValue = @""; - } - } - - [cell layoutSubtreeIfNeeded]; + theme = [self _currentTheme]; + user = [self userAtIndex:row]; + + switch([[theme objectForKey:WCThemesUserListIconSize] integerValue]) { + case WCThemesUserListIconSizeLarge: { + if([[user status] length] > 0) + cellView = [tableView makeViewWithIdentifier:@"WCLargeUserWithStatusTableCellView" owner:tableView]; + else + cellView = [tableView makeViewWithIdentifier:@"WCLargeUserTableCellView" owner:tableView]; + } break; - return cell; - } + case WCThemesUserListIconSizeSmall: { + if([[user status] length] > 0) + cellView = [tableView makeViewWithIdentifier:@"WCSmallUserWithStatusTableCellView" owner:tableView]; + else + cellView = [tableView makeViewWithIdentifier:@"WCSmallUserTableCellView" owner:tableView]; + } break; + } + + //if(row != [tableView selectedRow]) + cellView.nickTextField.textColor = [WCUser colorForColor:[user color] idleTint:[user isIdle]]; + //else + // cellView.nickTextField.textColor = [NSColor whiteColor]; + + [cellView.nickTextField setAllowsEditingTextAttributes:YES]; + + NSDictionary *attributes; + + if([user isIgnored]) { + attributes = [NSDictionary dictionaryWithObjectsAndKeys: + [NSNumber numberWithInteger:NSUnderlinePatternSolid | NSUnderlineStyleSingle], + NSStrikethroughStyleAttributeName, + nil]; + } else { + attributes = [NSDictionary dictionaryWithObjectsAndKeys: + [NSNumber numberWithInteger:NSUnderlinePatternSolid | NSUnderlineStyleNone], + NSStrikethroughStyleAttributeName, + nil]; + } + + cellView.nickTextField.attributedStringValue = [NSAttributedString attributedStringWithString:[user nick] + attributes:attributes]; + cellView.nickTextField.toolTip = [user nick]; + cellView.statusTextField.toolTip = [user status]; + cellView.statusTextField.stringValue = [user status]; + + + NSString *osxMode = [[NSUserDefaults standardUserDefaults] stringForKey:@"AppleInterfaceStyle"]; + if (osxMode == nil) { + cellView.statusTextField.textColor = [NSColor colorWithCalibratedRed:153.0/255.0 green:153.0/255.0 blue:153.0/255.0 alpha:1.0]; //Light mode + } else { + cellView.statusTextField.textColor = [NSColor colorWithCalibratedRed:130.0/255.0 green:130.0/255.0 blue:130.0/255.0 alpha:0.7 ] ; //Dark mode } + + cellView.imageView.image = [user iconWithIdleTint:YES]; + + return cellView; - return nil; } + +- (void)tableView:(NSTableView *)tableView willDisplayCell:(id)cell forTableColumn:(NSTableColumn *)column row:(NSInteger)row { + if(tableView == _userListTableView) + NSLog(@"willDisplayCell"); +// WCUser *user; +// +// if(column == _nickTableColumn) { +// user = [self userAtIndex:row]; +// +// [cell setTextColor:[WCUser colorForColor:[user color] idleTint:[user isIdle]]]; +// [cell setIgnored:[user isIgnored]]; +// } +} + + + - (id)tableView:(NSTableView *)tableView objectValueForTableColumn:(NSTableColumn *)column row:(NSInteger)row { - if(tableView == _userListTableView) { - WCUser *user; - - user = [self userAtIndex:row]; - - if(column == _iconTableColumn) - return [user iconWithIdleTint:YES]; - else if(column == _nickTableColumn) { - return [NSDictionary dictionaryWithObjectsAndKeys: - [user nick], WCUserCellNickKey, - [user status], WCUserCellStatusKey, - NULL]; - } - } + WCUser *user; + + user = [self userAtIndex:row]; + + if(column == _iconTableColumn) + return [user iconWithIdleTint:YES]; + else if(column == _nickTableColumn) { + return [NSDictionary dictionaryWithObjectsAndKeys: + [user nick], WCUserCellNickKey, + [user status], WCUserCellStatusKey, + NULL]; + } return NULL; } @@ -2652,11 +2694,7 @@ - (id)tableView:(NSTableView *)tableView objectValueForTableColumn:(NSTableColum - (NSString *)tableView:(NSTableView *)tableView stringValueForRow:(NSInteger)row { - if(tableView == _userListTableView) { - return [[self userAtIndex:row] nick]; - } - - return nil; + return [[self userAtIndex:row] nick]; } @@ -2665,17 +2703,13 @@ - (NSString *)tableView:(NSTableView *)tableView toolTipForCell:(NSCell *)cell r NSMutableString *toolTip; WCUser *user; - if(tableView == _userListTableView) { - user = [self userAtIndex:row]; - toolTip = [[[user nick] mutableCopy] autorelease]; - - if([[user status] length] > 0) - [toolTip appendFormat:@"\n%@", [user status]]; - - return toolTip; - } - - return nil; + user = [self userAtIndex:row]; + toolTip = [[[user nick] mutableCopy] autorelease]; + + if([[user status] length] > 0) + [toolTip appendFormat:@"\n%@", [user status]]; + + return toolTip; } @@ -2683,73 +2717,29 @@ - (NSString *)tableView:(NSTableView *)tableView toolTipForCell:(NSCell *)cell r - (BOOL)tableView:(NSTableView *)tableView writeRowsWithIndexes:(NSIndexSet *)indexes toPasteboard:(NSPasteboard *)pasteboard { WCUser *user; - if(tableView == _userListTableView) { - user = [self userAtIndex:[indexes firstIndex]]; - - [pasteboard declareTypes:[NSArray arrayWithObjects:WCUserPboardType, NSStringPboardType, NULL] owner:NULL]; - [pasteboard setString:[NSSWF:@"%lu", (unsigned long)[user userID]] forType:WCUserPboardType]; - [pasteboard setString:[user nick] forType:NSStringPboardType]; - - - return YES; - } - - return NO; + user = [self userAtIndex:[indexes firstIndex]]; + + [pasteboard declareTypes:[NSArray arrayWithObjects:WCUserPboardType, NSStringPboardType, NULL] owner:NULL]; + [pasteboard setString:[NSSWF:@"%lu", (unsigned long)[user userID]] forType:WCUserPboardType]; + [pasteboard setString:[user nick] forType:NSStringPboardType]; + + return YES; } - (void)tableViewShouldCopyInfo:(NSTableView *)tableView { - if(tableView == _userListTableView) { - NSPasteboard *pasteboard; - WCUser *user; - - user = [self selectedUser]; - - pasteboard = [NSPasteboard generalPasteboard]; - [pasteboard declareTypes:[NSArray arrayWithObjects:NSStringPboardType, NULL] owner:NULL]; - [pasteboard setString:[user nick] forType:NSStringPboardType]; - } -} - - - -#pragma mark - - -- (BOOL)tableView:(NSTableView *)tableView acceptDrop:(id)info row:(NSInteger)row dropOperation:(NSTableViewDropOperation)dropOperation { - if(tableView == _chatTableView) { - NSArray *draggedFilenames = [[info draggingPasteboard] propertyListForType:NSFilenamesPboardType]; - NSString *filepath = [draggedFilenames firstObject]; - NSImage *image = [NSImage imageWithContentsOfFile:filepath]; - - if (!image) return NO; - - NSURL *url = [NSURL fileURLWithPath:filepath]; - - [self _sendLocalImage:url]; - - return YES; - } - - return NO; + NSPasteboard *pasteboard; + WCUser *user; + + user = [self selectedUser]; + + pasteboard = [NSPasteboard generalPasteboard]; + [pasteboard declareTypes:[NSArray arrayWithObjects:NSStringPboardType, NULL] owner:NULL]; + [pasteboard setString:[user nick] forType:NSStringPboardType]; } -- (NSDragOperation)tableView:(NSTableView *)tableView validateDrop:(id)info proposedRow:(NSInteger)row - proposedDropOperation:(NSTableViewDropOperation)dropOperation { - if(tableView == _chatTableView) { - NSArray *draggedFilenames = [[info draggingPasteboard] propertyListForType:NSFilenamesPboardType]; - - if (![NSImage isImageAtPath:[draggedFilenames firstObject]]) { - return NSDragOperationNone; - } - - return NSDragOperationCopy; - } - - return NSDragOperationNone; -} - @@ -2764,8 +2754,8 @@ - (BOOL)textView:(NSTextView *)textView clickedOnLink:(id)link atIndex:(NSUInteg if([[url absoluteString] containsSubstring:@"wired:///"] || [[url absoluteString] containsSubstring:@"wiredp7:///"]) { - path = [[url path] stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding]; - isDirectory = [[url absoluteString] hasSuffix:@"/"] ? YES : NO; + path = [[url path] stringByRemovingPercentEncoding]; // Updated method + isDirectory = [[url absoluteString] hasSuffix:@"/"] ? YES : NO; if(isDirectory) { @@ -2776,12 +2766,12 @@ - (BOOL)textView:(NSTextView *)textView clickedOnLink:(id)link atIndex:(NSUInteg } else { file = [WCFile fileWithFile:path connection:[self connection]]; - [[WCTransfers transfers] downloadFiles:[NSArray arrayWithObject:file] + [[WCTransfers transfers] downloadFiles:[NSArray arrayWithObject:file] toFolder:[[[WCSettings settings] objectForKey:WCDownloadFolder] stringByStandardizingPath]]; } } else { - success = [[NSWorkspace sharedWorkspace] openURL: url]; + success = [[NSWorkspace sharedWorkspace] openURL: url]; } return success; @@ -2791,6 +2781,7 @@ - (BOOL)textView:(NSTextView *)textView clickedOnLink:(id)link atIndex:(NSUInteg + #pragma mark - - (CGFloat)splitView:(NSSplitView *)splitView constrainMinCoordinate:(CGFloat)proposedMin ofSubviewAt:(NSInteger)offset { diff --git a/Sources/WCChatHistory.m b/Sources/WCChatHistory.m index 8535e026..26de6ef9 100644 --- a/Sources/WCChatHistory.m +++ b/Sources/WCChatHistory.m @@ -51,62 +51,28 @@ - (void)_reloadWebView { NSInteger selectedRow; WebArchive *archive; NSString *archivePath; - NSData *data; - + if(!_selectedArchives) { [[_detailWebView mainFrame] loadHTMLString:@"" baseURL:[NSURL URLWithString:@"about:blank"]]; return; } selectedRow = [_detailsTableView selectedRow]; - + if(selectedRow == -1) { [[_detailWebView mainFrame] loadHTMLString:@"" baseURL:[NSURL URLWithString:@"about:blank"]]; return; } - archivePath = [_filteredArchives objectAtIndex:selectedRow]; - data = [NSData dataWithContentsOfFile:archivePath]; - - if ([[archivePath pathExtension] isEqualToString:@"webarchive"]) { - archive = [[WebArchive alloc] initWithData:data]; - - if(archive) - [[_detailWebView mainFrame] loadArchive:archive]; - else - [[_detailWebView mainFrame] loadHTMLString:@"" baseURL:[NSURL URLWithString:@"about:blank"]]; - - [archive release]; - } - else if ([[archivePath pathExtension] isEqualToString:@"plist"]) { - NSMutableAttributedString *attrString = [NSMutableAttributedString attributedString]; - NSArray *messages = [NSKeyedUnarchiver unarchiveObjectWithData:data]; - - for(NSDictionary *message in messages) { - NSMutableAttributedString *line = [NSMutableAttributedString attributedString]; - - NSString *nick = [message valueForKey:@"nick"]; - NSAttributedString *messageString = [message valueForKey:@"message"]; - NSString *timestamp = [message valueForKey:@"timestamp"]; - - [line appendAttributedString:[NSAttributedString attributedStringWithString:timestamp]]; - [line appendAttributedString:[NSAttributedString attributedStringWithString:@" - "]]; - [line appendAttributedString:[NSAttributedString attributedStringWithString:nick]]; - [line appendAttributedString:[NSAttributedString attributedStringWithString:@": "]]; - [line appendAttributedString:messageString]; - [line appendAttributedString:[NSAttributedString attributedStringWithString:@"\n"]]; - - [attrString appendAttributedString:line]; - } - - NSDictionary *documentAttributes = @{NSDocumentTypeDocumentAttribute: NSHTMLTextDocumentType}; - NSData *htmlData = [attrString dataFromRange:NSMakeRange(0, attrString.length) documentAttributes:documentAttributes error:NULL]; - NSString *htmlString = [[NSString alloc] initWithData:htmlData encoding:NSUTF8StringEncoding]; - - [[_detailWebView mainFrame] loadHTMLString:htmlString baseURL:nil]; - } - + archivePath = [_selectedArchives objectAtIndex:selectedRow]; + archive = [[WebArchive alloc] initWithData:[NSData dataWithContentsOfFile:archivePath]]; + if(archive) + [[_detailWebView mainFrame] loadArchive:archive]; + else + [[_detailWebView mainFrame] loadHTMLString:@"" baseURL:[NSURL URLWithString:@"about:blank"]]; + + [archive release]; } @@ -184,10 +150,7 @@ - (void)windowDidLoad { [super windowDidLoad]; [self _expandAllGroups]; - -// [_detailsTableView setDefaultSortOrder:WISortAscending]; -// [_detailsTableView setHighlightedTableColumn:[[_detailsTableView tableColumns] lastObject] sortOrder:WISortAscending]; - + [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(chatHistoryBundleAddedNotification:) name:WIChatHistoryBundleAddedNotification @@ -201,21 +164,30 @@ - (void)windowDidLoad { #pragma mark - - (IBAction)clear:(id)sender { + NSAlert *alert = [[NSAlert alloc] init]; + [alert setMessageText:NSLS(@"Clear History", @"Clear chat history title")]; + [alert setInformativeText:NSLS(@"Are you sure to clear your entire chat history? This operation is not cancellable.", @"Clear chat history message")]; + [alert addButtonWithTitle:@"OK"]; + [alert addButtonWithTitle:NSLS(@"Cancel", @"Clear chat history button")]; - NSAlert *alert = [NSAlert alertWithMessageText:NSLS(@"Clear History", @"Clear chat history title") - defaultButton:@"OK" - alternateButton:NSLS(@"Cancel", @"Clear chat history button") otherButton:nil - informativeTextWithFormat:NSLS(@"Are you sure to clear your entire chat history ? This operation is not cancellable.", @"Clear chat history message")]; - - [alert beginSheetModalForWindow:[_detailsTableView window] - modalDelegate:self - didEndSelector:@selector(clearAlertDidEnd:returnCode:contextInfo:) - contextInfo:nil]; + [alert beginSheetModalForWindow:[_detailsTableView window] + completionHandler:^(NSModalResponse returnCode) { + if (returnCode == NSAlertFirstButtonReturn) { + // OK button clicked, handle clearing chat history + [self clearChatHistory]; + } + }]; +} + +- (void)clearChatHistory { + // Implement the logic to clear chat history here } + - (void)clearAlertDidEnd:(NSAlert *)alert returnCode:(NSInteger)returnCode contextInfo:(void *)contextInfo { + if(returnCode == NSModalResponseOK) { [[[[WCApplicationController sharedController] logController] publicChatHistoryBundle] clearHistory]; [[[[WCApplicationController sharedController] logController] privateChatHistoryBundle] clearHistory]; @@ -414,9 +386,8 @@ - (void)outlineViewSelectionDidChange:(NSNotification *)notification { _selectedArchives = [[self _selectedArtivesForFolderPath:item] retain]; [_filteredArchives addObjectsFromArray:_selectedArchives]; - + [_detailsTableView reloadData]; - [self _reloadWebView]; return; diff --git a/Sources/WCChatWindow.m b/Sources/WCChatWindow.m index 19a52101..68ac201c 100644 --- a/Sources/WCChatWindow.m +++ b/Sources/WCChatWindow.m @@ -36,7 +36,7 @@ - (void)sendEvent:(NSEvent *)event { NSTextField *textField; BOOL handled = NO; - if([event type] == NSKeyDown) { + if([event type] == NSEventTypeKeyDown) { if(!characterSet) { characterSet = [[NSMutableCharacterSet alphanumericCharacterSet] retain]; [characterSet formUnionWithCharacterSet:[NSCharacterSet punctuationCharacterSet]]; diff --git a/Sources/WCConversationController.h b/Sources/WCConversationController.h index 96ee968d..c60730cc 100644 --- a/Sources/WCConversationController.h +++ b/Sources/WCConversationController.h @@ -30,10 +30,11 @@ @class WDConversation, WDMessage; -@interface WCConversationController : WIObject { - IBOutlet NSTableView *_conversationTableView; +@interface WCConversationController : WIObject { + IBOutlet WebView *_conversationWebView; WDConversation *_conversation; + NSString *_templatePath; NSFont *_font; NSColor *_textColor; NSColor *_URLTextColor; @@ -43,11 +44,14 @@ - (void)appendMessage:(WDMessage *)message; - (void)reloadData; -- (void)reloadView; +- (void)reloadTemplate; - (void)setConversation:(WDConversation *)conversation; - (WDConversation *)conversation; +- (void)setTemplatePath:(NSString *)path; +- (NSString *)templatePath; + - (void)setFont:(NSFont *)font; - (NSFont *)font; @@ -60,4 +64,7 @@ - (void)setBackgroundColor:(NSColor *)backgroundColor; - (NSColor *)backgroundColor; +- (WebView *)conversationWebView; +- (NSString *)HTMLString; + @end diff --git a/Sources/WCConversationController.m b/Sources/WCConversationController.m index f6a99c9a..dc3a891f 100644 --- a/Sources/WCConversationController.m +++ b/Sources/WCConversationController.m @@ -38,127 +38,12 @@ #import "WCTransfers.h" #import "WDWiredModel.h" #import "WCDatabaseController.h" -#import "WCMessageTableCellView.h" +#import "SBJsonWriter+WCJsonWriter.h" #import "NSManagedObjectContext+Fetch.h" -#import "NSString+Emoji.h" -#import "NSImage+Data.h" -#import "NSDate_TimeAgo/NSDate+TimeAgo.h" -@interface WCConversationController (Private) -- (void)_configureCell:(WCMessageTableCellView *)cell forRow:(NSInteger)row; -@end - - - -@implementation WCConversationController (Private) - -- (void)_configureCell:(WCMessageTableCellView *)cell forRow:(NSInteger)row { - NSSortDescriptor *descriptor; - WDMessage *message; - - descriptor = [[NSSortDescriptor alloc] initWithKey:@"date" ascending:YES]; - message = [[[[self conversation] messages] sortedArrayUsingDescriptors:@[descriptor]] objectAtIndex:row]; - - if (message != nil) { - cell.nickTextField.stringValue = [message nick]; - cell.serverNameTextField.stringValue = [[self conversation] serverName]; - cell.timeTextField.stringValue = [message.date timeAgoWithLimit:(3600*24*30) dateFormatter:[[WCApplicationController sharedController] dateFormatter]]; - cell.iconImageView.image = [[message user] icon]; - - if(![[message messageString] hasPrefix:@" attachmentCell = [[[NSTextAttachmentCell alloc] initImageCell:image] autorelease]; - - NSTextAttachment *attachment = [[[NSTextAttachment alloc] initWithData:nil ofType:nil] autorelease]; - [attachment setAttachmentCell:attachmentCell]; - - NSAttributedString *attrString = [NSAttributedString attributedStringWithAttachment:attachment]; - - cell.messageTestField.attributedStringValue = attrString; - } - - if (message.directionValue == WDMessageFrom) { - cell.iconImageView.image = [[self conversation] userIcon]; - } else { - cell.iconImageView.image = [NSImage imageWithData: - [NSData dataWithBase64EncodedString:[[WCSettings settings] objectForKey:WCIcon]]]; - } - } -} - - - -- (void)_sendLocalImage:(NSURL *)url { - NSString *html; - NSString *base64ImageString; - NSData *imageData; - - imageData = [NSData dataWithContentsOfURL:url]; - base64ImageString = [imageData base64EncodedString]; - - html = [NSSWF:@"", base64ImageString]; - - if(html && [html length] > 0) { - [[WCMessages messages] sendMessage:html toUser:self.conversation.user]; - } -} - - -- (NSAttributedString *)_attributedStringWithClickableURLs:(NSString *)text { - NSMutableAttributedString *string; - NSRange range; - - string = [NSMutableAttributedString attributedStringWithString:text]; - - [string addAttribute:NSFontAttributeName value:[self font] range:NSMakeRange(0, text.length-1)]; - - range = [text rangeOfRegex:[NSSWF:@"(^|\\s)(%@)(\\.|,|:|\\?|!)?(\\s|$)", [NSString URLRegex]] - options:RKLCaseless | RKLMultiline - capture:0]; - if (range.location != NSNotFound) { - [string addAttribute:NSLinkAttributeName value:[text substringWithRange:range] range:range]; - } - - range = [text rangeOfRegex:[NSSWF:@"(^|\\s)(%@)(\\.|,|:|\\?|!)?(\\s|$)", [NSString schemelessURLRegex]] - options:RKLCaseless | RKLMultiline - capture:0]; - if (range.location != NSNotFound) { - [string addAttribute:NSLinkAttributeName value:[text substringWithRange:range] range:range]; - } - - range = [text rangeOfRegex:[NSSWF:@"(^|\\s)(%@)(\\.|,|:|\\?|!)?(\\s|$)", [NSString mailtoURLRegex]] - options:RKLCaseless | RKLMultiline - capture:0]; - if (range.location != NSNotFound) { - [string addAttribute:NSLinkAttributeName value:[text substringWithRange:range] range:range]; - } - - return string; -} - - -@end - - @implementation WCConversationController @@ -166,18 +51,18 @@ - (id)init { self = [super init]; _conversation = nil; + + [[NSDistributedNotificationCenter defaultCenter] + addObserver:self + selector:@selector(appleInterfaceThemeChanged:) + name:@"AppleInterfaceThemeChangedNotification" + object: nil]; return self; } -- (void)awakeFromNib { - [_conversationTableView registerForDraggedTypes:@[NSFilenamesPboardType]]; - [_conversationTableView setDraggingDestinationFeedbackStyle:NSTableViewDraggingDestinationFeedbackStyleNone]; -} - - - (void)dealloc { [_font release]; @@ -191,6 +76,27 @@ - (void)dealloc { } +- (void)awakeFromNib { + [_conversationWebView setUIDelegate:(id)self]; + [_conversationWebView setFrameLoadDelegate:(id)self]; + [_conversationWebView setResourceLoadDelegate:(id)self]; + [_conversationWebView setPolicyDelegate:(id)self]; + [_conversationWebView registerForDraggedTypes:@[NSFilenamesPboardType]]; + + [self reloadData]; +} + + + + + +#pragma mark - + +- (void)appleInterfaceThemeChanged:(NSNotification *) notification { + [self reloadTemplate]; +} + + #pragma mark - @@ -200,8 +106,8 @@ - (void)setConversation:(WDConversation *)conversation { [_conversation release]; _conversation = conversation; - - [self reloadData]; + + [self reloadTemplate]; } - (WDConversation *)conversation { @@ -210,6 +116,18 @@ - (WDConversation *)conversation { +- (void)setTemplatePath:(NSString *)path { + [path retain]; + [_templatePath release]; + + _templatePath = path; +} + + +- (NSString *)templatePath { + return _templatePath; +} + - (void)setFont:(NSFont *)font { @@ -272,25 +190,88 @@ - (NSColor *)backgroundColor { + +#pragma mark - + +- (WebView *)conversationWebView { + return _conversationWebView; +} + +- (NSString *)HTMLString { + return [[[NSString alloc] initWithData:[[[_conversationWebView mainFrame] dataSource] data] + encoding:NSUTF8StringEncoding] autorelease]; +} + + + + + + #pragma mark - - (void)appendMessage:(WDMessage *)message { - NSInteger lastRow = [[[self conversation] messages] count] == 0 ? 0 : [[[self conversation] messages] count] - 1; - NSIndexSet *lastRowIndexSet = [NSIndexSet indexSetWithIndex:lastRow]; - - [_conversationTableView insertRowsAtIndexes:[NSIndexSet indexSetWithIndex:lastRow] - withAnimation:NSTableViewAnimationEffectFade]; - - [_conversationTableView scrollToBottomAnimated]; + [_conversationWebView stringByEvaluatingJavaScriptFromString: + [NSSWF:@"printMessage(%@);", [[SBJson4Writer writer] stringWithObject:message]]]; +} + + + + + +#pragma mark - + +- (void)reloadData { + NSURL *url; + WITemplateBundle *template; - lastRow = [_conversationTableView numberOfRows] - 1; - lastRowIndexSet = [NSIndexSet indexSetWithIndex:lastRow]; - [_conversationTableView reloadDataForRowIndexes:lastRowIndexSet columnIndexes:[NSIndexSet indexSetWithIndex:0]]; + template = [WITemplateBundle templateWithPath:_templatePath]; - [_conversationTableView scrollToBottomAnimated]; + if(template) { + url = [NSURL fileURLWithPath: [template pathForResource:@"messages" + ofType:@"html" + inDirectory:@"htdocs"]]; + + [[_conversationWebView mainFrame] loadRequest:[NSURLRequest requestWithURL:url]]; + } } +- (void)reloadTemplate { + WITemplateBundle *template; + + template = [WITemplateBundle templateWithPath:_templatePath]; + + // reload CSS in the main thread + [template setCSSValue:[_font fontName] + toAttribute:WITemplateAttributesFontName + ofType:WITemplateTypeMessages]; + + [template setCSSValue:[NSSWF:@"%.0fpx", [_font pointSize]] + toAttribute:WITemplateAttributesFontSize + ofType:WITemplateTypeMessages]; + + [template setCSSValue:[NSSWF:@"#%.6x", (unsigned int)[_URLTextColor HTMLValue]] + toAttribute:WITemplateAttributesURLTextColor + ofType:WITemplateTypeMessages]; + + [template setCSSValue:[NSApp darkModeEnabled] ? @"gainsboro" : @"dimgray" + toAttribute:WITemplateAttributesFontColor + ofType:WITemplateTypeMessages]; + + [template setCSSValue:[NSApp darkModeEnabled] ? @"#383838" : @"white" + toAttribute:WITemplateAttributesBackgroundColor + ofType:WITemplateTypeMessages]; + + [template setCSSValue:[NSApp darkModeEnabled] ? @"dimgray" : @"gainsboro" + toAttribute:@"" + ofType:WITemplateTypeMessages]; + + [template saveChangesForType:WITemplateTypeMessages]; + + [_conversationWebView reloadStylesheetWithID:@"wc-stylesheet" + withTemplate:template + type:WITemplateTypeMessages]; +} @@ -299,61 +280,243 @@ - (void)appendMessage:(WDMessage *)message { #pragma mark - -- (NSInteger)numberOfRowsInTableView:(NSTableView *)tableView { - return [[_conversation messages] count]; +- (void)webView:(WebView *)webView didFinishLoadForFrame:(WebFrame *)frame { + WITemplateBundle *template; + NSURL *jqueryURL, *functionsURL, *mainURL; + + template = [WITemplateBundle templateWithPath:_templatePath]; + + if(!template) { + NSLog(@"Error: Template not found. (%@)", _templatePath); + return; + } + + jqueryURL = [NSURL fileURLWithPath:[template pathForResource:@"jquery" ofType:@"js" inDirectory:@"htdocs/js"]]; + functionsURL = [NSURL fileURLWithPath:[template pathForResource:@"functions" ofType:@"js" inDirectory:@"htdocs/js"]]; + mainURL = [NSURL fileURLWithPath:[template pathForResource:@"messages" ofType:@"js" inDirectory:@"htdocs/js"]]; + + if(![[NSFileManager defaultManager] fileExistsAtPath:[jqueryURL path]] || + ![[NSFileManager defaultManager] fileExistsAtPath:[functionsURL path]] || + ![[NSFileManager defaultManager] fileExistsAtPath:[mainURL path]]) + { + NSLog(@"Error: Invalid template. Missing script. (%@)", _templatePath); + return; + } + + [[_conversationWebView windowScriptObject] setValue:self forKey:@"Controller"]; + + [_conversationWebView appendScriptAtURL:jqueryURL]; + [_conversationWebView appendScriptAtURL:functionsURL]; + [_conversationWebView appendScriptAtURL:mainURL]; + + [_conversationWebView scrollToBottom]; } -- (NSView *)tableView:(NSTableView *)tableView viewForTableColumn:(NSTableColumn *)tableColumn row:(NSInteger)row { - WCMessageTableCellView *cell; + + +- (void)webView:(WebView *)webView decidePolicyForNavigationAction:(NSDictionary *)action request:(NSURLRequest *)request frame:(WebFrame *)frame decisionListener:(id )listener { + WDConversation *conversation; + NSString *path; + NSURL *url; + WIURL *wiredURL; + WCFile *file; + NSData *fileData; + NSImage *droppedImage; + BOOL handled = NO; + BOOL isDirectory = NO; - cell = [tableView makeViewWithIdentifier:@"WCMessageTableCellView" owner:self]; + conversation = [self conversation]; - [self _configureCell:cell forRow:row]; + if([[action objectForKey:WebActionNavigationTypeKey] unsignedIntegerValue] == WebNavigationTypeLinkClicked) { + [listener ignore]; - return cell; + url = [action objectForKey:WebActionOriginalURLKey]; + wiredURL = [WIURL URLWithURL:url]; + + isDirectory = [[url absoluteString] hasSuffix:@"/"] ? YES : NO; + + if([[wiredURL scheme] isEqualToString:@"wired"] || [[wiredURL scheme] isEqualToString:@"wiredp7"]) { + if([[wiredURL host] length] == 0) { + if([conversation connection] && [[conversation connection] isConnected]) { + path = [[wiredURL path] stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding]; + + if(isDirectory) { + [WCFiles filesWithConnection:[conversation connection] + file:[WCFile fileWithDirectory:[path stringByDeletingLastPathComponent] connection:[conversation connection]] + selectFile:[WCFile fileWithDirectory:path connection:[conversation connection]]]; + + } else { + file = [WCFile fileWithFile:path connection:[conversation connection]]; + [[WCTransfers transfers] downloadFiles:[NSArray arrayWithObject:file] + toFolder:[[[WCSettings settings] objectForKey:WCDownloadFolder] stringByStandardizingPath]]; + } + } + + handled = YES; + } + } + + if(!handled) + [[NSWorkspace sharedWorkspace] openURL:[action objectForKey:WebActionOriginalURLKey]]; + + } else { + url = [action objectForKey:WebActionOriginalURLKey]; + + if (![[url pathExtension] isEqualToString:@"html"]) { + [listener ignore]; + + fileData = [NSData dataWithContentsOfURL:url]; + droppedImage = [NSImage imageWithData:fileData]; + + if (droppedImage) { + [self _sendLocalImage:url]; + } + } + + [listener use]; + } } -#pragma mark - -- (BOOL)tableView:(NSTableView *)tableView acceptDrop:(id)info row:(NSInteger)row dropOperation:(NSTableViewDropOperation)dropOperation { - NSArray *draggedFilenames = [[info draggingPasteboard] propertyListForType:NSFilenamesPboardType]; - NSString *filepath = [draggedFilenames firstObject]; - NSImage *image = [NSImage imageWithContentsOfFile:filepath]; +- (NSArray *)webView:(WebView *)webView contextMenuItemsForElement:(NSDictionary *)element defaultMenuItems:(NSArray *)defaultMenuItems { +#ifdef WCConfigurationRelease + return NULL; +#else + return defaultMenuItems; +#endif +} + +- (void)webView:(WebView *)sender mouseDidMoveOverElement:(NSDictionary *)elementInformation modifierFlags:(NSUInteger)modifierFlags { + // useless but required +} + +- (NSUInteger)webView:(WebView *)webView +dragDestinationActionMaskForDraggingInfo:(id)draggingInfo { + return WebDragDestinationActionLoad; +} - if (!image) return NO; - NSURL *url = [NSURL fileURLWithPath:filepath]; +- (void)_sendLocalImage:(NSURL *)url { + NSString *html; + NSString *base64ImageString; + NSData *imageData; - [self _sendLocalImage:url]; + imageData = [NSData dataWithContentsOfURL:url]; + base64ImageString = [imageData base64EncodedString]; - return YES; + html = [NSSWF:@"", base64ImageString]; + + if(html && [html length] > 0) { + [[WCMessages messages] sendMessage:html toUser:self.conversation.user]; + } } -- (NSDragOperation)tableView:(NSTableView *)tableView validateDrop:(id)info proposedRow:(NSInteger)row proposedDropOperation:(NSTableViewDropOperation)dropOperation { - NSArray *draggedFilenames = [[info draggingPasteboard] propertyListForType:NSFilenamesPboardType]; +#pragma mark - + ++ (NSString *)webScriptNameForSelector:(SEL)selector +{ + NSString *name; - if (![NSImage isImageAtPath:[draggedFilenames firstObject]]) { - return NSDragOperationNone; - } + if (selector == @selector(loadScriptWithName:)) + name = @"loadScriptWithName"; + if (selector == @selector(JSONObjectsUntilDate:withLimit:)) + name = @"JSONObjectsUntilDateWithLimit"; + if (selector == @selector(lastMessageDate)) + name = @"lastMessageDate"; - return NSDragOperationCopy; + return name; +} + + ++ (BOOL)isSelectorExcludedFromWebScript:(SEL)selector +{ + if (selector == @selector(loadScriptWithName:)) return NO; + if (selector == @selector(JSONObjectsUntilDate:withLimit:)) return NO; + if (selector == @selector(lastMessageDate)) return NO; + return YES; } + #pragma mark - -- (void)reloadData { - [_conversationTableView reloadData]; +- (BOOL)loadScriptWithName:(NSString *)name { + WITemplateBundle *template; + NSURL *scriptURL; + + template = [WITemplateBundle templateWithPath:_templatePath]; + scriptURL = [NSURL fileURLWithPath:[template pathForResource:name ofType:@"js" inDirectory:@"htdocs/js"]]; + + if(![[NSFileManager defaultManager] fileExistsAtPath:[scriptURL path]]) + return NO; + + [_conversationWebView appendScriptAtURL:scriptURL]; + + return YES; +} + + +- (NSString *)lastMessageDate { + NSDateFormatter *dateFormatter; + + dateFormatter = [[[NSDateFormatter alloc] init] autorelease]; + [dateFormatter setDateFormat:@"yyyy'-'MM'-'dd'T'HH':'mm':'ss'Z'"]; + [dateFormatter setTimeZone:[NSTimeZone timeZoneForSecondsFromGMT:0]]; + [dateFormatter setCalendar:[[NSCalendar alloc] initWithCalendarIdentifier:NSCalendarIdentifierGregorian]]; - [_conversationTableView performSelector:@selector(scrollToBottomAnimated) afterDelay:0.1]; + return [dateFormatter stringFromDate:[_conversation date]]; } -- (void)reloadView { - [_conversationTableView setNeedsDisplay]; + +- (NSString *)JSONObjectsUntilDate:(NSString *)dateString withLimit:(NSUInteger)limit { + NSPredicate *predicate; + NSSortDescriptor *descriptor; + NSDate *date; + NSDateFormatter *dateFormatter; + NSString *jsonString; + NSArray *sortedMessages; + NSCalendar *calendar; + + calendar = [[NSCalendar alloc] initWithCalendarIdentifier:NSCalendarIdentifierGregorian]; + + dateFormatter = [[NSDateFormatter alloc] init]; + [dateFormatter setDateFormat:@"yyyy'-'MM'-'dd'T'HH':'mm':'ss'Z'"]; + [dateFormatter setTimeZone:[NSTimeZone timeZoneForSecondsFromGMT:0]]; + [dateFormatter setCalendar:calendar]; + + if(dateString != nil) { + date = [dateFormatter dateFromString:dateString]; + } else { + date = [_conversation date]; + } + + if(!date) { + [dateFormatter release]; + [calendar release]; + return nil; + } + + predicate = [NSPredicate predicateWithFormat:@"(conversation == %@) && (date <= %@)", _conversation, date]; + descriptor = [[NSSortDescriptor alloc] initWithKey:@"date" ascending:NO]; + sortedMessages = [[WCDatabaseController context] fetchEntitiesNammed:@"Message" + withPredicate:predicate + descriptor:descriptor + limit:limit + error:nil]; + + jsonString = [[SBJson4Writer writer] stringWithObject:sortedMessages]; + + [descriptor release]; + [dateFormatter release]; + [calendar release]; + + //NSLog(@"jsonString: %@", jsonString); + + return jsonString; } @end diff --git a/Sources/WCDynamicTextField.h b/Sources/WCDynamicTextField.h deleted file mode 100644 index 40405858..00000000 --- a/Sources/WCDynamicTextField.h +++ /dev/null @@ -1,18 +0,0 @@ -// -// WCDynamicTextField.h -// Wired Client -// -// Created by Rafael Warnault on 02/05/2020. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface WCDynamicTextField : NSTextField - --(NSSize)intrinsicContentSize; - -@end - -NS_ASSUME_NONNULL_END diff --git a/Sources/WCDynamicTextField.m b/Sources/WCDynamicTextField.m deleted file mode 100644 index 827a8704..00000000 --- a/Sources/WCDynamicTextField.m +++ /dev/null @@ -1,98 +0,0 @@ -// -// WCDynamicTextField.m -// Wired Client -// -// Created by Rafael Warnault on 02/05/2020. -// -// From -// TSTTextGrowth.m -// autoGrowingExample -// -// Created by Scott O'Brien on 1/01/13. -// Fixed by Douglas Heriot on 1/01/13, inspired by -// https://github.com/jerrykrinock/CategoriesObjC/blob/master/NS(Attributed)String%2BGeometrics/NS(Attributed)String%2BGeometrics.m -// https://developer.apple.com/library/mac/#documentation/Cocoa/Conceptual/TextLayout/Tasks/StringHeight.html -// http://stackoverflow.com/questions/14107385/getting-a-nstextfield-to-grow-with-the-text-in-auto-layout -// Copyright (c) 2013 Scott O'Brien. All rights reserved. -// - -#import "WCDynamicTextField.h" - -@interface WCDynamicTextField() -{ - BOOL _hasLastIntrinsicSize; - BOOL _isEditing; - NSSize _lastIntrinsicSize; -} - -@end - -@implementation WCDynamicTextField - -- (id)initWithFrame:(NSRect)frame -{ - self = [super initWithFrame:frame]; - if (self) { - // Initialization code here. - } - - return self; -} - -- (void)textDidBeginEditing:(NSNotification *)notification -{ - [super textDidBeginEditing:notification]; - _isEditing = YES; -} - -- (void)textDidEndEditing:(NSNotification *)notification -{ - [super textDidEndEditing:notification]; - _isEditing = NO; -} - -- (void)textDidChange:(NSNotification *)notification -{ - [super textDidChange:notification]; - [self invalidateIntrinsicContentSize]; -} - --(NSSize)intrinsicContentSize -{ - NSSize intrinsicSize = _lastIntrinsicSize; - - // Only update the size if we’re editing the text, or if we’ve not set it yet - // If we try and update it while another text field is selected, it may shrink back down to only the size of one line (for some reason?) - if(_isEditing || !_hasLastIntrinsicSize) - { - intrinsicSize = [super intrinsicContentSize]; - - // If we’re being edited, get the shared NSTextView field editor, so we can get more info - NSText *fieldEditor = [self.window fieldEditor:NO forObject:self]; - if([fieldEditor isKindOfClass:[NSTextView class]]) - { - NSTextView *textView = (NSTextView *)fieldEditor; - NSRect usedRect = [textView.textContainer.layoutManager usedRectForTextContainer:textView.textContainer]; - - usedRect.size.height += 5.0; // magic number! (the field editor TextView is offset within the NSTextField. It’s easy to get the space above (it’s origin), but it’s difficult to get the default spacing for the bottom, as we may be changing the height - - intrinsicSize.height = usedRect.size.height; - } - - // If you want to set a limit to how far the text view can grow. - if (intrinsicSize.height > 100) - { - intrinsicSize = _lastIntrinsicSize; - } - else - { - _lastIntrinsicSize = intrinsicSize; - _hasLastIntrinsicSize = YES; - } - - } - - return intrinsicSize; -} - -@end diff --git a/Sources/WCEventsController.m b/Sources/WCEventsController.m index f7e67416..9c3d0092 100644 --- a/Sources/WCEventsController.m +++ b/Sources/WCEventsController.m @@ -655,7 +655,7 @@ - (void)_reloadDates { while([date compare:weekDate] == NSOrderedDescending) { components = [[NSCalendar currentCalendar] components:NSCalendarUnitYear | NSCalendarUnitWeekOfYear fromDate:weekDate]; - title = [NSSWF:NSLS(@"Week %u, %u", @"Event archive (week, year)"), [components weekOfYear], [components year]]; + title = [NSSWF:NSLS(@"Week %ld, %ld", @"Event archive (week, year)"), (long)[components weekOfYear], (long)[components year]]; [menuItems addObject:[NSMenuItem itemWithTitle:title representedObject:weekDate]]; @@ -807,6 +807,27 @@ - (void)dealloc { [super dealloc]; } +#pragma mark - + +- (void)themeDidChange:(NSDictionary *)theme { + + // Überprüfung und Setzen des Standardwerts für die Schriftgröße + NSNumber *fontSize = [[NSUserDefaults standardUserDefaults] objectForKey:@"EventsFontSize"]; + if (fontSize == nil) { + fontSize = @15.0; // Standardwert + [[NSUserDefaults standardUserDefaults] setObject:fontSize forKey:@"EventsFontSize"]; // Schlüssel anlegen + [[NSUserDefaults standardUserDefaults] synchronize]; // Änderungen speichern + } + + [_eventsTableView setRowHeight:[fontSize doubleValue] + 4.0]; + [_timeTableColumn setWidth:[fontSize doubleValue] * 10.0]; + [_nickTableColumn setWidth:[fontSize doubleValue] * 12.0]; + [_loginTableColumn setWidth:[fontSize doubleValue] * 6.0]; + [_ipTableColumn setWidth:[fontSize doubleValue] * 7.0]; + [_messageTableColumn setWidth:[fontSize doubleValue] * 40.0]; + [_eventsTableView setFont:[NSFont systemFontOfSize:[fontSize doubleValue]]]; + +} #pragma mark - diff --git a/Sources/WCFile.m b/Sources/WCFile.m index d40b1153..f30d3e6f 100644 --- a/Sources/WCFile.m +++ b/Sources/WCFile.m @@ -242,40 +242,40 @@ + (NSImage *)iconForFolderType:(WCFileType)type width:(CGFloat)width open:(BOOL) + (NSString *)kindForFolderType:(WCFileType)type { - static NSString *folder, *uploads, *dropbox; - - switch(type) { - case WCFileDirectory: - if(!folder) - LSCopyKindStringForTypeInfo('fold', kLSUnknownCreator, NULL, (CFStringRef *) &folder); - return folder; - break; - - case WCFileUploads: - if(!uploads) - uploads = [NSLS(@"Uploads Folder", @"Uploads folder kind") retain]; - - return uploads; - break; - - case WCFileDropBox: - if(!dropbox) - dropbox = [NSLS(@"Drop Box Folder", @"Drop box folder kind") retain]; - - return dropbox; - break; - - case WCFileFile: - default: - return NULL; - break; - } - - return NULL; + static NSString *folder = nil; + static NSString *uploads = nil; + static NSString *dropbox = nil; + + switch(type) { + case WCFileDirectory: + if (!folder) + folder = (NSString *)UTTypeCopyDescription(CFSTR("public.folder")); + return folder; + break; + + case WCFileUploads: + if (!uploads) + uploads = NSLocalizedString(@"Uploads Folder", @"Uploads folder kind"); + return uploads; + break; + + case WCFileDropBox: + if (!dropbox) + dropbox = NSLocalizedString(@"Drop Box Folder", @"Drop box folder kind"); + return dropbox; + break; + + case WCFileFile: + default: + return nil; + break; + } + return nil; } + + (WCFileType)folderTypeForString:(NSString *)string { static NSString *uploads, *dropbox; NSRange range; @@ -529,29 +529,27 @@ - (NSString *)extension { - (NSString *)kind { - if(!_kind) { - if([self isLink]) { - _kind = [NSLS(@"Alias", @"Alias kind") retain]; - } - else if([self isExecutable]) { - _kind = [NSLS(@"Executable File", @"Executable kind") retain]; - } - else if([self isFolder]) { - _kind = [[[self class] kindForFolderType:[self type]] retain]; - } - else { - LSCopyKindStringForTypeInfo(kLSUnknownType, - kLSUnknownCreator, - (CFStringRef) [self extension], - (CFStringRef *) &_kind); - } - } - - return _kind; + if (!_kind) { + if ([self isLink]) { + _kind = [NSLocalizedString(@"Alias", @"Alias kind") retain]; + } else if ([self isExecutable]) { + _kind = [NSLocalizedString(@"Executable File", @"Executable kind") retain]; + } else if ([self isFolder]) { + _kind = [[[self class] kindForFolderType:[self type]] retain]; + } else { + CFStringRef uti = UTTypeCreatePreferredIdentifierForTag(kUTTagClassFilenameExtension, (__bridge CFStringRef)[self extension], NULL); + if (uti) { + _kind = ( NSString *)UTTypeCopyDescription(uti); + CFRelease(uti); + } + } + } + return _kind; } + - (BOOL)isFolder { return ([self type] != WCFileFile); } @@ -687,18 +685,22 @@ - (NSImage *)iconWithWidth:(CGFloat)width open:(BOOL)open { - (NSString *)internalURLString { - NSString *urlString = nil; + NSString *urlString = nil; - urlString = [[@"wiredp7://" stringByAppendingString:[self path]] - stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding]; + NSString *encodedPath = [self path]; + NSString *encodedURLString = [NSString stringWithFormat:@"wiredp7://%@", encodedPath]; + NSCharacterSet *allowedCharacterSet = [NSCharacterSet URLPathAllowedCharacterSet]; + urlString = [encodedURLString stringByAddingPercentEncodingWithAllowedCharacters:allowedCharacterSet]; - if([self isFolder] && ![[self path] hasSuffix:@"/"]) + if ([self isFolder] && ![encodedPath hasSuffix:@"/"]) { urlString = [urlString stringByAppendingString:@"/"]; - - return [urlString stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding]; + } + + return urlString; } + - (NSString *)externalURLString { NSString *urlString, *address; diff --git a/Sources/WCFiles.h b/Sources/WCFiles.h index 97302a77..2b521dae 100644 --- a/Sources/WCFiles.h +++ b/Sources/WCFiles.h @@ -55,7 +55,7 @@ extern NSString * const WCPlacePboardType; IBOutlet NSScrollView *_filesScrollView; IBOutlet WIOutlineView *_filesOutlineView; - IBOutlet NSTableColumn *_nameTableColumn; + IBOutlet NSTableColumn *_nameTableColumn; IBOutlet NSTableColumn *_kindTableColumn; IBOutlet NSTableColumn *_createdTableColumn; IBOutlet NSTableColumn *_modifiedTableColumn; diff --git a/Sources/WCFiles.m b/Sources/WCFiles.m index aa548bea..52dc7e32 100644 --- a/Sources/WCFiles.m +++ b/Sources/WCFiles.m @@ -230,34 +230,31 @@ - (id)_initFilesWithConnection:(WCServerConnection *)connection file:(WCFile *)f #pragma mark - - (void)_themeDidChange { - NSDictionary *theme; - - theme = [[WCSettings settings] themeWithIdentifier:[[WCSettings settings] objectForKey:WCTheme]]; - - [_filesOutlineView setUsesAlternatingRowBackgroundColors:[theme boolForKey:WCThemesFileListAlternateRows]]; + NSDictionary *theme; + printf("Bla"); + theme = [[WCSettings settings] themeWithIdentifier:[[WCSettings settings] objectForKey:WCTheme]]; + + [_filesOutlineView setUsesAlternatingRowBackgroundColors:[theme boolForKey:WCThemesFileListAlternateRows]]; + + // Überprüfung und Setzen des Standardwerts für die Schriftgröße + NSNumber *fontSize = [[NSUserDefaults standardUserDefaults] objectForKey:@"FilesListFontSize"]; + if (fontSize == nil) { + fontSize = @15.0; // Standardwert + [[NSUserDefaults standardUserDefaults] setObject:fontSize forKey:@"FilesListFontSize"]; // Schlüssel anlegen + [[NSUserDefaults standardUserDefaults] synchronize]; // Änderungen speichern + } + + // Luigi: Files Listing + [_filesOutlineView setRowHeight:[fontSize doubleValue] + 4.0]; + [_filesOutlineView setFont:[NSFont systemFontOfSize:[fontSize doubleValue]]]; + + //[_filesTreeView setRowHeight:21.0]; + //[_filesTreeView setFont:[NSFont systemFontOfSize:[fontSize doubleValue]]]; + + _iconWidth = [fontSize doubleValue] + 1.0; +} - switch([[theme objectForKey:WCThemesFileListIconSize] integerValue]) { - case WCThemesFileListIconSizeLarge: - [_filesOutlineView setRowHeight:17.0]; - [_filesOutlineView setFont:[NSFont systemFontOfSize:13.0]]; - - [_filesTreeView setRowHeight:17.0]; - [_filesTreeView setFont:[NSFont systemFontOfSize:13.0]]; - - _iconWidth = 16.0; - break; - case WCThemesFileListIconSizeSmall: - [_filesOutlineView setRowHeight:14.0]; - [_filesOutlineView setFont:[NSFont systemFontOfSize:10.0]]; - - [_filesTreeView setRowHeight:14.0]; - [_filesTreeView setFont:[NSFont systemFontOfSize:10.0]]; - - _iconWidth = 12.0; - break; - } -} @@ -972,18 +969,19 @@ - (NSUInteger)_selectedStyle { } +// Luigi: Tree View does not work anymore. Disabled in .xib too - (void)_selectStyle:(NSUInteger)style { if(style == WCFilesStyleList) { [_filesTabView selectTabViewItemWithIdentifier:@"List"]; [[self window] makeFirstResponder:_filesOutlineView]; - } else { - [_filesTabView selectTabViewItemWithIdentifier:@"Tree"]; - - if(_currentDirectory) - [_filesTreeView selectPath:[_currentDirectory path] byExtendingSelection:NO]; - - [[self window] makeFirstResponder:_filesTreeView]; +// } else { +// [_filesTabView selectTabViewItemWithIdentifier:@"Tree"]; +// +// if(_currentDirectory) +// [_filesTreeView selectPath:[_currentDirectory path] byExtendingSelection:NO]; +// +// [[self window] makeFirstResponder:_filesTreeView]; } } @@ -1752,8 +1750,8 @@ - (NSToolbarItem *)toolbar:(NSToolbar *)toolbar itemForItemIdentifier:(NSString target:self action:@selector(search:)]; - [item setMinSize:NSMakeSize(50.0, [_searchField frame].size.height)]; - [item setMaxSize:NSMakeSize(250.0, [_searchField frame].size.height)]; + //[item setMinSize:NSMakeSize(50.0, [_searchField frame].size.height)]; + //[item setMaxSize:NSMakeSize(250.0, [_searchField frame].size.height)]; return item; } @@ -2265,7 +2263,7 @@ - (NSString *)deleteDocumentMenuItemTitle { break; default: - return [NSSWF:NSLS(@"Delete %u Items\u2026", @"Delete menu item (count)"), [files count]]; + return [NSSWF:NSLS(@"Delete %lu Items\u2026", @"Delete menu item (count)"), (unsigned long)[files count]]; break; } } @@ -2296,7 +2294,7 @@ - (NSString *)quickLookMenuItemTitle { break; default: - return [NSSWF:NSLS(@"Quick Look %u Items", @"Quick Look menu item (count)"), [files count]]; + return [NSSWF:NSLS(@"Quick Look %lu Items", @"Quick Look menu item (count)"), (unsigned long)[files count]]; break; } } @@ -2586,8 +2584,8 @@ - (IBAction)quickLook:(id)sender { NSLS(@"This file is large and make take a while to load.", @"Confirm Quick Look dialog description")]; } else { [alert setMessageText:[NSSWF: - NSLS(@"Are you sure you want to Quick Look %u items?", @"Confirm Quick Look dialog title"), - [files count]]]; + NSLS(@"Are you sure you want to Quick Look %lu items?", @"Confirm Quick Look dialog title"), + (unsigned long)[files count]]]; [alert setInformativeText: NSLS(@"Some of the files are large and make take a while to load.", @"Confirm Quick Look dialog description")]; } diff --git a/Sources/WCFilesWindow.m b/Sources/WCFilesWindow.m index cffe903a..e74a16c1 100644 --- a/Sources/WCFilesWindow.m +++ b/Sources/WCFilesWindow.m @@ -35,7 +35,7 @@ - (void)sendEvent:(NSEvent *)event { unichar key; BOOL handled = NO; - if([event type] == NSKeyDown) { + if([event type] == NSEventTypeKeyDown) { if([event commandKeyModifier]) { key = [event character]; diff --git a/Sources/WCFilterButtonCell.m b/Sources/WCFilterButtonCell.m index 194df138..bc8665d6 100644 --- a/Sources/WCFilterButtonCell.m +++ b/Sources/WCFilterButtonCell.m @@ -38,47 +38,41 @@ - (void)_drawWithFrame:(NSRect)frame inButton:(NSButton *)button; @implementation WCFilterButtonCell(Private) - (void)_drawWithFrame:(NSRect)frame inButton:(NSButton *)button { - NSAttributedString *string; - NSShadow *shadow; - NSDictionary *attributes; - - if(!_leftImage) { - _leftImage = [[NSImage imageNamed:@"FilterButtonLeft"] retain]; - _middleImage = [[NSImage imageNamed:@"FilterButtonMiddle"] retain]; - _rightImage = [[NSImage imageNamed:@"FilterButtonRight"] retain]; - } - - [_leftImage setFlipped:YES]; - [_leftImage drawAtPoint:NSMakePoint(frame.origin.x, frame.origin.y) - fromRect:NSZeroRect - operation:NSCompositeSourceOver - fraction:1.0]; - - [_middleImage setFlipped:YES]; - [_middleImage drawInRect:NSMakeRect(frame.origin.x + 7.0, frame.origin.y, frame.size.width - 14.0, 17.0) - fromRect:NSZeroRect - operation:NSCompositeSourceOver - fraction:1.0]; - - [_rightImage setFlipped:YES]; - [_rightImage drawAtPoint:NSMakePoint(frame.size.width - 7.0, frame.origin.y) - fromRect:NSZeroRect - operation:NSCompositeSourceOver - fraction:1.0]; - - shadow = [[[NSShadow alloc] init] autorelease]; - [shadow setShadowColor:[NSColor darkGrayColor]]; - [shadow setShadowOffset:NSMakeSize(0.0, -1.0)]; - - attributes = [NSDictionary dictionaryWithObjectsAndKeys: - [NSColor whiteColor], NSForegroundColorAttributeName, - [self font], NSFontAttributeName, - shadow, NSShadowAttributeName, - NULL]; - - string = [NSAttributedString attributedStringWithString:[self title] attributes:attributes]; - - [string drawAtPoint:NSMakePoint(frame.origin.x + 7.0, frame.origin.y + 1.0)]; + NSAttributedString *string; + NSShadow *shadow; + NSDictionary *attributes; + + if (!_leftImage) { + _leftImage = [NSImage imageNamed:@"FilterButtonLeft"]; + _middleImage = [NSImage imageNamed:@"FilterButtonMiddle"]; + _rightImage = [NSImage imageNamed:@"FilterButtonRight"]; + } + + NSRect leftImageRect = NSMakeRect(frame.origin.x, frame.origin.y, _leftImage.size.width, _leftImage.size.height); + [_leftImage drawInRect:leftImageRect]; + + NSRect middleImageRect = NSMakeRect(frame.origin.x + _leftImage.size.width, frame.origin.y, frame.size.width - _leftImage.size.width - _rightImage.size.width, _middleImage.size.height); + [_middleImage drawInRect:middleImageRect]; + + NSRect rightImageRect = NSMakeRect(frame.origin.x + frame.size.width - _rightImage.size.width, frame.origin.y, _rightImage.size.width, _rightImage.size.height); + [_rightImage drawInRect:rightImageRect]; + + shadow = [[NSShadow alloc] init]; + [shadow setShadowColor:[NSColor darkGrayColor]]; + [shadow setShadowOffset:NSMakeSize(0.0, -1.0)]; + + attributes = @{NSForegroundColorAttributeName: [NSColor whiteColor], + NSFontAttributeName: [self font], + NSShadowAttributeName: shadow}; + + string = [[NSAttributedString alloc] initWithString:[self title] attributes:attributes]; + + NSSize stringSize = [string size]; + NSRect stringRect = NSMakeRect(frame.origin.x + (_middleImage.size.width - stringSize.width) / 2.0, frame.origin.y + (_middleImage.size.height - stringSize.height) / 2.0, stringSize.width, stringSize.height); + [string drawInRect:stringRect]; + + [shadow release]; + [string release]; } @end diff --git a/Sources/WCFilterView.m b/Sources/WCFilterView.m index f4faf7ee..c63f7141 100644 --- a/Sources/WCFilterView.m +++ b/Sources/WCFilterView.m @@ -49,18 +49,19 @@ static void WCFilterViewShader(void *info, const float *in, float *out) { @implementation WCFilterView - (id)initWithFrame:(NSRect)frame { - static const float domain[2] = { 0, 1 }; - static const float range[8] = { 0, 1, 0, 1, 0, 1, 0, 1 }; - CGFunctionCallbacks callbacks = {0, (void*)&WCFilterViewShader, NULL}; - - self = [super initWithFrame:frame]; - - _gradientFunction = CGFunctionCreate(self, 1, (const CGFloat *)domain, 4, (const double*)range, &callbacks); - - _color1 = [[NSColor colorWithCalibratedRed:208.0 / 255.0 green:208.0 / 255.0 blue:208.0 / 255.0 alpha:1.0] retain]; - _color2 = [[NSColor colorWithCalibratedRed:233.0 / 255.0 green:233.0 / 255.0 blue:233.0 / 255.0 alpha:1.0] retain]; - - return self; + static const float domain[2] = { 0, 1 }; + static const float range[8] = { 0, 1, 0, 1, 0, 1, 0, 1 }; + CGFunctionCallbacks callbacks = {0, (void*)&WCFilterViewShader, NULL}; + + self = [super initWithFrame:frame]; + + // Deactivated because of Window mess + // _gradientFunction = CGFunctionCreate(self, 1, (const CGFloat *)domain, 4, (const double*)range, &callbacks); + + _color1 = [[NSColor colorWithCalibratedRed:208.0 / 255.0 green:208.0 / 255.0 blue:208.0 / 255.0 alpha:1.0] retain]; + _color2 = [[NSColor colorWithCalibratedRed:233.0 / 255.0 green:233.0 / 255.0 blue:233.0 / 255.0 alpha:1.0] retain]; + + return self; } diff --git a/Sources/WCKeychain.m b/Sources/WCKeychain.m index f98e100a..b87ce0b5 100644 --- a/Sources/WCKeychain.m +++ b/Sources/WCKeychain.m @@ -226,138 +226,117 @@ - (void)setPassword:(NSString *)password forURL:(WIURL *)url { - (void)deletePasswordForURL:(WIURL *)url { - SecKeychainItemRef item; - OSStatus err; - SecProtocolType type; - - if([[url scheme] isEqualToString:@"wiredp7"]) - type = kSecProtocolTypeWired; - else - type = kSecProtocolTypeHTTP; - - //NSLog(@"'%@' -> NULL", url); - - err = SecKeychainFindInternetPassword(NULL, - [[url host] UTF8StringLength], - [[url host] UTF8String], - 0, - NULL, - [[url user] UTF8StringLength], - [[url user] UTF8String], - [[url path] UTF8StringLength], - [[url path] UTF8String], - [url port] != WCServerPort ? [url port] : 0, - type, - kSecAuthenticationTypeDefault, - 0, - NULL, - &item); - - if(err != noErr) - return; - - err = SecKeychainItemDelete(item); + OSStatus err; + SecProtocolType type; + + if ([[url scheme] isEqualToString:@"wiredp7"]) + type = kSecProtocolTypeWired; + else + type = kSecProtocolTypeHTTP; + + // Create a dictionary with the query parameters + NSDictionary *query = @{ + (__bridge id)kSecClass: (__bridge id)kSecClassInternetPassword, + (__bridge id)kSecAttrProtocol: @(type), + (__bridge id)kSecAttrServer: [url host], + (__bridge id)kSecAttrAccount: [url user], + (__bridge id)kSecAttrPath: [url path], + (__bridge id)kSecAttrPort: @([url port] != WCServerPort ? [url port] : 0) + }; + + // Try to find the password item + SecKeychainItemRef item = NULL; + err = SecItemCopyMatching((__bridge CFDictionaryRef)query, (CFTypeRef *)&item); + if (err != errSecSuccess) { + NSLog(@"Error while finding password item: %d", (int)err); + return; + } - if(err != noErr) { - NSLog(@"SecKeychainItemDelete: %d", err); + // Delete the password item + err = SecKeychainItemDelete(item); + CFRelease(item); - return; - } + if (err != errSecSuccess) { + NSLog(@"Error while deleting password item: %d", (int)err); + } } + #pragma mark - - (void)setSecretKey:(NSString *)string { - void *password; - NSData *data; - NSString *accountName, *serviceName; - SecKeychainRef keychain; - SecKeychainItemRef item; - OSStatus status; - u_int32_t passwordLen; - - passwordLen = 0; - keychain = NULL; - password = NULL; - accountName = @"wiredclient"; - serviceName = @"wiredclient"; - data = [string dataUsingEncoding:NSUTF8StringEncoding]; - - status = SecKeychainFindGenericPassword(keychain, - [serviceName UTF8StringLength], - [serviceName UTF8String], - [accountName UTF8StringLength], - [accountName UTF8String], - &passwordLen, - &password, - &item); - - if (status == noErr) { - status = SecKeychainItemModifyAttributesAndData(item, - NULL, - [data length], - [data bytes]); - - if(status != noErr) { - NSLog(@"Error while SecKeychainItemModifyAttributesAndData: %d", status); - - return; - } - } else { - status = SecKeychainAddGenericPassword(keychain, - [serviceName UTF8StringLength], - [serviceName UTF8String], - [accountName UTF8StringLength], - [accountName UTF8String], - [data length], - [data bytes], - NULL); - - if (status != noErr) { - NSLog(@"Error while setting Secret Key"); - - return; - } + NSData *data = [string dataUsingEncoding:NSUTF8StringEncoding]; + NSString *accountName = @"wiredclient"; + NSString *serviceName = @"wiredclient"; + NSDictionary *query; + OSStatus status; + + query = @{ + (__bridge id)kSecClass: (__bridge id)kSecClassGenericPassword, + (__bridge id)kSecAttrService: serviceName, + (__bridge id)kSecAttrAccount: accountName, + }; + + // Check if the item already exists + CFTypeRef result = NULL; + status = SecItemCopyMatching((__bridge CFDictionaryRef)query, &result); + if (status == errSecSuccess) { + // Item exists, update the password + NSDictionary *updateAttributes = @{ + (__bridge id)kSecValueData: data + }; + status = SecItemUpdate((__bridge CFDictionaryRef)query, (__bridge CFDictionaryRef)updateAttributes); + } else if (status == errSecItemNotFound) { + // Item doesn't exist, add it + NSMutableDictionary *addQuery = [query mutableCopy]; + [addQuery setObject:data forKey:(__bridge id)kSecValueData]; + status = SecItemAdd((__bridge CFDictionaryRef)addQuery, NULL); + } + + if (status != errSecSuccess) { + NSLog(@"Error while setting Secret Key: %@", [self errorMessageForStatus:status]); } } +- (NSString *)errorMessageForStatus:(OSStatus)status { + CFStringRef errorMessageString = SecCopyErrorMessageString(status, NULL); + NSString *errorMessage = ( NSString *)errorMessageString; + return errorMessage; +} + - (NSString *)secretKey { - NSString *result, *accountName, *serviceName; - NSData *data; - void *password; - SecKeychainRef keychain; - u_int32_t passwordLen; - OSStatus status; - - passwordLen = 0; - keychain = NULL; - result = NULL; - password = NULL; - accountName = @"wiredclient"; - serviceName = @"wiredclient"; - status = SecKeychainFindGenericPassword(keychain, - [serviceName UTF8StringLength], - [serviceName UTF8String], - [accountName UTF8StringLength], - [accountName UTF8String], - &passwordLen, - &password, - NULL); - - if (status == noErr) { - data = [NSData dataWithBytes:password length:passwordLen]; - result = [NSString stringWithData:data encoding:NSUTF8StringEncoding]; - - SecKeychainItemFreeContent(NULL, (void*)password); + NSString *result, *accountName, *serviceName; + NSDictionary *query; + CFTypeRef resultData = NULL; + OSStatus status; + + result = nil; + accountName = @"wiredclient"; + serviceName = @"wiredclient"; + + query = @{ + (__bridge id)kSecClass: (__bridge id)kSecClassGenericPassword, + (__bridge id)kSecAttrService: serviceName, + (__bridge id)kSecAttrAccount: accountName, + (__bridge id)kSecReturnData: @YES + }; + + status = SecItemCopyMatching((__bridge CFDictionaryRef)query, &resultData); + + if (status == noErr && resultData != NULL) { + NSData *data = ( NSData *)resultData; + result = [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding]; } else { - NSLog(@"Error while getting Secret Key"); + NSLog(@"Error while getting Secret Key: %d", (int)status); } + return result; } + @end diff --git a/Sources/WCLogController.m b/Sources/WCLogController.m index 5509cf66..b9df0e3f 100644 --- a/Sources/WCLogController.m +++ b/Sources/WCLogController.m @@ -212,7 +212,23 @@ - (void)dealloc { [super dealloc]; } +#pragma mark - + +- (void)themeDidChange:(NSDictionary *)theme { + + // Überprüfung und Setzen des Standardwerts für die Schriftgröße + NSNumber *fontSize = [[NSUserDefaults standardUserDefaults] objectForKey:@"LogFontSize"]; + if (fontSize == nil) { + fontSize = @15.0; // Standardwert + [[NSUserDefaults standardUserDefaults] setObject:fontSize forKey:@"LogFontSize"]; // Schlüssel anlegen + [[NSUserDefaults standardUserDefaults] synchronize]; // Änderungen speichern + } + + [_logTableView setRowHeight:[fontSize doubleValue] + 4.0]; + [_logTableView setFont:[NSFont systemFontOfSize:[fontSize doubleValue]]]; + [_timeTableColumn setWidth:[fontSize doubleValue] * 9.0]; +} #pragma mark - diff --git a/Sources/WCMessageTableCellView.h b/Sources/WCMessageTableCellView.h deleted file mode 100644 index 02d36c24..00000000 --- a/Sources/WCMessageTableCellView.h +++ /dev/null @@ -1,22 +0,0 @@ -// -// MessageTableCellView.h -// Wired Client -// -// Created by Rafael Warnault on 02/05/2020. -// - -#import - -NS_ASSUME_NONNULL_BEGIN - -@interface WCMessageTableCellView : NSTableCellView - -@property (nonatomic, retain) IBOutlet NSTextField *nickTextField; -@property (nonatomic, retain) IBOutlet NSTextField *timeTextField; -@property (nonatomic, retain) IBOutlet NSTextField *serverNameTextField; -@property (nonatomic, retain) IBOutlet NSTextField *messageTestField; -@property (nonatomic, retain) IBOutlet NSImageView *iconImageView; - -@end - -NS_ASSUME_NONNULL_END diff --git a/Sources/WCMessageTableCellView.m b/Sources/WCMessageTableCellView.m deleted file mode 100644 index 0e5270e6..00000000 --- a/Sources/WCMessageTableCellView.m +++ /dev/null @@ -1,18 +0,0 @@ -// -// MessageTableCellView.m -// Wired Client -// -// Created by Rafael Warnault on 02/05/2020. -// - -#import "WCMessageTableCellView.h" - -@implementation WCMessageTableCellView - -- (void)drawRect:(NSRect)dirtyRect { - [super drawRect:dirtyRect]; - - // Drawing code here. -} - -@end diff --git a/Sources/WCMessages.m b/Sources/WCMessages.m index 9d8abc76..62cbad5a 100644 --- a/Sources/WCMessages.m +++ b/Sources/WCMessages.m @@ -194,17 +194,24 @@ - (void)_themeDidChange { NSDictionary *theme; NSFont *font; NSColor *textColor, *backgroundColor, *URLTextColor; + NSString *templatePath; + WITemplateBundle *templateBundle; theme = [[[self _selectedConversation] connection] theme]; if(!theme) theme = [[WCSettings settings] themeWithIdentifier:[[WCSettings settings] objectForKey:WCTheme]]; - + + templateBundle = [[WCSettings settings] templateBundleWithIdentifier:[theme objectForKey:WCThemesTemplate]]; + font = WIFontFromString([theme objectForKey:WCThemesMessagesFont]); URLTextColor = WIColorFromString([theme objectForKey:WCThemesChatURLsColor]); textColor = [NSApp darkModeEnabled] ? [NSColor whiteColor] : [NSColor textColor]; backgroundColor = [NSApp darkModeEnabled] ? [NSColor darkGrayColor] : [NSColor whiteColor]; - + templatePath = [templateBundle bundlePath]; + + + [_conversationController setTemplatePath:templatePath]; [_conversationController setFont:font]; [_conversationController setTextColor:textColor]; [_conversationController setURLTextColor:URLTextColor]; @@ -213,7 +220,7 @@ - (void)_themeDidChange { [_messageTextField setFont:font]; [_broadcastTextView setFont:font]; - [_conversationController reloadView]; + [_conversationController reloadTemplate]; [_conversationController reloadData]; } @@ -242,7 +249,7 @@ - (void)_showDialogForMessage:(WDMessage *)message { alert = [[NSAlert alloc] init]; [alert setMessageText:title]; [alert setInformativeText:[message messageString]]; - [alert setAlertStyle:NSInformationalAlertStyle]; + [alert setAlertStyle:NSAlertStyleInformational]; [alert runNonModal]; [alert release]; @@ -317,7 +324,7 @@ - (void)_sendMessage { [[WCStats stats] addUnsignedInt:1 forKey:WCStatsMessagesSent]; [_conversationController appendMessage:message]; - + [_messageTextField setStringValue:@""]; } @@ -713,7 +720,7 @@ - (void)_markConversationAsRead:(WDConversation *)conversation { - (void)_migrateToCoreData { NSData *data; - NSMutableArray *array; + NSMutableArray *array; array = [NSMutableArray array]; data = [[WCSettings settings] objectForKey:WCMessageConversations]; @@ -734,29 +741,30 @@ - (void)_migrateToCoreData { nbMessage += [conv numberOfMessages]; } - - NSAlert *alert = [NSAlert alertWithMessageText:NSLS(@"Messages Migration", @"Messages Migration Title") - defaultButton:NSLS(@"Migrate", @"Messages Migration Migrate Button") - alternateButton:NSLS(@"Erase", @"Messages Migration Erase Button") - otherButton:NSLS(@"Quit", @"Messages Migration Quit Button") - informativeTextWithFormat:NSLS(@"Local storage of Messages moved to Core Data.\n\nChoose 'Migrate' in order to recover old messages. Choosing 'Erase' will erase all your messages and start on a fresh database (this cannot be undone).\n\nDepending to the number of messages (%d), the operation could take a while.", @"Messages Migration Message"), nbMessage]; + NSAlert *alert = [[NSAlert alloc] init]; + [alert setMessageText:NSLS(@"Messages Migration", @"Messages Migration Title")]; + [alert setInformativeText:[NSString stringWithFormat:NSLS(@"Local storage of Messages moved to Core Data.\n\nChoose 'Migrate' in order to recover old messages. Choosing 'Erase' will erase all your messages and start on a fresh database (this cannot be undone).\n\nDepending to the number of messages (%ld), the operation could take a while.", @"Messages Migration Message"), (long)nbMessage]]; + [alert addButtonWithTitle:NSLS(@"Migrate", @"Messages Migration Migrate Button")]; + [alert addButtonWithTitle:NSLS(@"Erase", @"Messages Migration Erase Button")]; + [alert addButtonWithTitle:NSLS(@"Quit", @"Messages Migration Quit Button")]; NSInteger result = [alert runModal]; - if(result == NSAlertDefaultReturn) { + if(result == NSAlertFirstButtonReturn) { [self _migrateConversations:array]; } - else if(result == NSAlertAlternateReturn) { + else if(result == NSAlertSecondButtonReturn) { [[WCSettings settings] setObject:@{} forKey:WCMessageConversations]; [[WCSettings settings] setObject:@{} forKey:WCBroadcastConversations]; } - else if(result == NSAlertOtherReturn) { + else if(result == NSAlertThirdButtonReturn) { exit(0); } } } + - (void)_migrateConversations:(NSArray *)conversations { __block NSManagedObjectContext *context; __block NSAutoreleasePool *pool, *subpool; @@ -996,8 +1004,8 @@ - (void)windowDidLoad { [_conversationsOutlineView setTarget:self]; [_conversationsOutlineView setDeleteAction:@selector(deleteConversation:)]; - //[_messagesView setTranslatesAutoresizingMaskIntoConstraints:YES]; - //[_messageTextField setTranslatesAutoresizingMaskIntoConstraints:YES]; + [_messagesView setTranslatesAutoresizingMaskIntoConstraints:YES]; + [_messageTextField setTranslatesAutoresizingMaskIntoConstraints:YES]; [self _themeDidChange]; [self _sortConversations]; @@ -1025,7 +1033,7 @@ - (void)windowDidBecomeKey:(NSWindow *)window { } } - [_conversationController reloadView]; + [_conversationController reloadTemplate]; } @@ -1155,7 +1163,7 @@ - (void)chatUserAppeared:(NSNotification *)notification { user = [notification object]; [self _revalidateConversationsWithUser:user]; - + if([[self _selectedConversation] user] == user) [_conversationController reloadData]; diff --git a/Sources/WCMonitorCell.m b/Sources/WCMonitorCell.m index 3eeecffb..6e45b094 100644 --- a/Sources/WCMonitorCell.m +++ b/Sources/WCMonitorCell.m @@ -146,7 +146,7 @@ - (void)drawWithFrame:(NSRect)frame inView:(NSView *)view { progressIndicator = [(NSDictionary *) [self objectValue] objectForKey:WCMonitorCellProgressIndicatorKey]; if(transfer) { - if([self controlSize] == NSRegularControlSize) { + if([self controlSize] == NSControlSizeRegular) { imageRect = NSMakeRect(frame.origin.x + 2.0, frame.origin.y + 14.0, frame.size.width, @@ -190,7 +190,7 @@ - (void)drawWithFrame:(NSRect)frame inView:(NSView *)view { image = [NSImage imageNamed:[transfer isKindOfClass:[WCDownloadTransfer class]] ? @"Download" : @"Upload"]; //[image compositeToPoint:imageRect.origin operation:NSCompositeSourceOver fraction:1.0]; - [image drawAtPoint:imageRect.origin fromRect:imageRect operation:NSCompositeSourceOver fraction:1.0]; + [image drawAtPoint:imageRect.origin fromRect:imageRect operation:NSCompositingOperationSourceOver fraction:1.0]; [_statusAttributes setObject:_truncatingHeadParagraphStyle forKey:NSParagraphStyleAttributeName]; @@ -222,7 +222,7 @@ - (void)drawWithFrame:(NSRect)frame inView:(NSView *)view { [_transferStatusCell drawWithFrame:transferStatusRect inView:view]; } else if(status) { - if([self controlSize] == NSRegularControlSize) + if([self controlSize] == NSControlSizeRegular) statusRect = NSMakeRect(frame.origin.x, frame.origin.y + 13.0, frame.size.width, 17.0); else statusRect = NSMakeRect(frame.origin.x, frame.origin.y - 1.0, frame.size.width, 17.0); diff --git a/Sources/WCMonitorController.m b/Sources/WCMonitorController.m index d82af4c2..7fd4156a 100644 --- a/Sources/WCMonitorController.m +++ b/Sources/WCMonitorController.m @@ -265,16 +265,16 @@ - (void)themeDidChange:(NSDictionary *)theme { [_usersTableView setRowHeight:46.0]; [_iconTableColumn setWidth:[_iconTableColumn maxWidth]]; - [[_nickTableColumn dataCell] setControlSize:NSRegularControlSize]; - [[_statusTableColumn dataCell] setControlSize:NSRegularControlSize]; + [[_nickTableColumn dataCell] setControlSize:NSControlSizeRegular]; + [[_statusTableColumn dataCell] setControlSize:NSControlSizeRegular]; break; case WCThemesMonitorIconSizeSmall: [_usersTableView setRowHeight:17.0]; [_iconTableColumn setWidth:[_iconTableColumn minWidth]]; - [[_nickTableColumn dataCell] setControlSize:NSSmallControlSize]; - [[_statusTableColumn dataCell] setControlSize:NSSmallControlSize]; + [[_nickTableColumn dataCell] setControlSize:NSControlSizeSmall]; + [[_statusTableColumn dataCell] setControlSize:NSControlSizeSmall]; break; } } diff --git a/Sources/WCPreferences.h b/Sources/WCPreferences.h index 4a437862..4206e8fe 100644 --- a/Sources/WCPreferences.h +++ b/Sources/WCPreferences.h @@ -84,7 +84,6 @@ extern NSString * const WCIconDidChangeNotification; IBOutlet NSButton *_themesShowSmileysButton; IBOutlet NSButton *_themesChatTimestampEveryLineButton; - IBOutlet NSButton *_themesChatSeparateEveryLineButton; IBOutlet NSMatrix *_themesUserListIconSizeMatrix; IBOutlet NSButton *_themesUserListAlternateRowsButton; IBOutlet NSMatrix *_themesFileListIconSizeMatrix; @@ -141,6 +140,9 @@ extern NSString * const WCIconDidChangeNotification; IBOutlet NSButton *_networkCompressionButton; IBOutlet NSView *_bookmarksExportView; + + WITemplateBundleManager *_privateTemplateManager; + WITemplateBundleManager *_publicTemplateManager; NSString *_bookmarksPassword; NSString *_trackerBookmarksPassword; @@ -148,6 +150,7 @@ extern NSString * const WCIconDidChangeNotification; + (WCPreferences *)preferences; +- (BOOL)importTemplateFromFile:(NSString *)path; - (BOOL)importBookmarksFromFile:(NSString *)path; - (BOOL)importTrackerBookmarksFromFile:(NSString *)path; - (NSImage *)imageForTheme:(NSDictionary *)theme size:(NSSize)size; @@ -157,6 +160,13 @@ extern NSString * const WCIconDidChangeNotification; - (IBAction)changeTheme:(id)sender; - (IBAction)changeThemeFont:(id)sender; + +- (IBAction)selectThemeTemplate:(id)sender; +- (IBAction)addThemeTemplate:(id)sender; +- (IBAction)manageThemeTemplates:(id)sender; +- (IBAction)closeManageThemeTemplates:(id)sender; +- (IBAction)deleteThemeTemplate:(id)sender; + - (IBAction)exportBookmarks:(id)sender; - (IBAction)importBookmarks:(id)sender; - (IBAction)exportTrackerBookmarks:(id)sender; diff --git a/Sources/WCPreferences.m b/Sources/WCPreferences.m index c761d768..8d5109e9 100644 --- a/Sources/WCPreferences.m +++ b/Sources/WCPreferences.m @@ -95,26 +95,24 @@ - (void)_bookmarkDidChange:(NSDictionary *)bookmark { #pragma mark - - (void)_updateTheme:(NSMutableDictionary *)theme { - [theme setObject:WIStringFromColor([_themesChatEventsColorWell color]) forKey:WCThemesChatEventsColor]; - [theme setObject:WIStringFromColor([_themesChatTimestampEveryLineColorWell color]) forKey:WCThemesChatTimestampEveryLineColor]; - [theme setObject:WIStringFromColor([_themesChatURLsColorWell color]) forKey:WCThemesChatURLsColor]; - [theme setBool:[_themesShowSmileysButton state] forKey:WCThemesShowSmileys]; - [theme setBool:[_themesChatTimestampEveryLineButton state] forKey:WCThemesChatTimestampEveryLine]; - [theme setBool:[_themesChatSeparateEveryLineButton state] forKey:WCThemesChatSeparateEveryLine]; - - [theme setInteger:[_themesUserListIconSizeMatrix selectedTag] forKey:WCThemesUserListIconSize]; - [theme setBool:[_themesUserListAlternateRowsButton state] forKey:WCThemesUserListAlternateRows]; - - [theme setInteger:[_themesFileListIconSizeMatrix selectedTag] forKey:WCThemesFileListIconSize]; - [theme setBool:[_themesFileListAlternateRowsButton state] forKey:WCThemesFileListAlternateRows]; - - [theme setBool:[_themesTransferListShowProgressBarButton state] forKey:WCThemesTransferListShowProgressBar]; - [theme setBool:[_themesTransferListAlternateRowsButton state] forKey:WCThemesTransferListAlternateRows]; - - [theme setBool:[_themesTrackerListAlternateRowsButton state] forKey:WCThemesTrackerListAlternateRows]; - - [theme setInteger:[_themesMonitorIconSizeMatrix selectedTag] forKey:WCThemesMonitorIconSize]; - [theme setBool:[_themesMonitorAlternateRowsButton state] forKey:WCThemesMonitorAlternateRows]; + [theme setObject:WIStringFromColor([_themesChatEventsColorWell color]) forKey:WCThemesChatEventsColor]; + [theme setObject:WIStringFromColor([_themesChatTimestampEveryLineColorWell color]) forKey:WCThemesChatTimestampEveryLineColor]; + [theme setObject:WIStringFromColor([_themesChatURLsColorWell color]) forKey:WCThemesChatURLsColor]; + [theme setBool:[_themesShowSmileysButton state] forKey:WCThemesShowSmileys]; + [theme setBool:[_themesChatTimestampEveryLineButton state] forKey:WCThemesChatTimestampEveryLine]; + [theme setInteger:[_themesUserListIconSizeMatrix selectedTag] forKey:WCThemesUserListIconSize]; + [theme setBool:[_themesUserListAlternateRowsButton state] forKey:WCThemesUserListAlternateRows]; + + [theme setInteger:[_themesFileListIconSizeMatrix selectedTag] forKey:WCThemesFileListIconSize]; + [theme setBool:[_themesFileListAlternateRowsButton state] forKey:WCThemesFileListAlternateRows]; + + [theme setBool:[_themesTransferListShowProgressBarButton state] forKey:WCThemesTransferListShowProgressBar]; + [theme setBool:[_themesTransferListAlternateRowsButton state] forKey:WCThemesTransferListAlternateRows]; + + [theme setBool:[_themesTrackerListAlternateRowsButton state] forKey:WCThemesTrackerListAlternateRows]; + + [theme setInteger:[_themesMonitorIconSizeMatrix selectedTag] forKey:WCThemesMonitorIconSize]; + [theme setBool:[_themesMonitorAlternateRowsButton state] forKey:WCThemesMonitorAlternateRows]; } @@ -153,7 +151,6 @@ - (void)_reloadTheme { [_themesShowSmileysButton setState:[theme boolForKey:WCThemesShowSmileys]]; [_themesChatTimestampEveryLineButton setState:[theme boolForKey:WCThemesChatTimestampEveryLine]]; - [_themesChatSeparateEveryLineButton setState:[theme boolForKey:WCThemesChatSeparateEveryLine]]; [_themesUserListIconSizeMatrix selectCellWithTag:[theme integerForKey:WCThemesUserListIconSize]]; [_themesUserListAlternateRowsButton setState:[theme boolForKey:WCThemesUserListAlternateRows]]; @@ -415,7 +412,10 @@ + (WCPreferences *)preferences { - (id)init { self = [super initWithWindowNibName:@"Preferences"]; - + + _privateTemplateManager = [[WITemplateBundleManager templateManagerForPath:[[NSBundle mainBundle] resourcePath]] retain]; + _publicTemplateManager = [[WITemplateBundleManager templateManagerForPath:[WCApplicationSupportPath stringByStandardizingPath] isPrivate:NO] retain]; + [self window]; [[NSNotificationCenter defaultCenter] @@ -445,7 +445,10 @@ - (id)init { - (void)dealloc { [[NSNotificationCenter defaultCenter] removeObserver:self]; - + + [_privateTemplateManager release]; + [_publicTemplateManager release]; + [super dealloc]; } @@ -490,7 +493,9 @@ - (void)windowDidLoad { [_highlightsTableView registerForDraggedTypes:[NSArray arrayWithObject:WCIgnorePboardType]]; [_ignoresTableView registerForDraggedTypes:[NSArray arrayWithObject:WCIgnorePboardType]]; + //[self _reloadThemes]; [self _reloadTheme]; + //[self _reloadTemplates]; [self _reloadChatLogsFolder]; [self _reloadEvents]; [self _reloadEvent]; @@ -783,7 +788,7 @@ - (IBAction)changeNetwork:(id)sender { - (IBAction)changeTheme:(id)sender { NSMutableDictionary *theme; - + theme = [[[[WCSettings settings] themeWithName:@"Wired"] mutableCopy] autorelease]; [self _updateTheme:theme]; @@ -795,29 +800,37 @@ - (IBAction)changeTheme:(id)sender { +- (NSUInteger)_selectedThemeRow { + // Implementierung der Methode hier + return 0; // Beispielrückgabewert, passen Sie ihn entsprechend an +} + - (IBAction)changeThemeFont:(id)sender { - NSDictionary *theme; - NSFontManager *fontManager; - - theme = [[WCSettings settings] themeWithName:@"Wired"]; - fontManager = [NSFontManager sharedFontManager]; + NSDictionary *theme; + NSFontManager *fontManager; + + // Konvertierung des Rückgabewerts von [self _selectedThemeRow] in NSUInteger + NSUInteger selectedThemeRow = (NSUInteger)[self _selectedThemeRow]; + + theme = [[[WCSettings settings] objectForKey:WCThemes] objectAtIndex:selectedThemeRow]; + fontManager = [NSFontManager sharedFontManager]; [fontManager setTarget:self]; - - if(sender == _themesChatFontButton) { - [fontManager setSelectedFont:WIFontFromString([theme objectForKey:WCThemesChatFont]) isMultiple:NO]; - [fontManager setAction:@selector(setChatFont:)]; - } - else if(sender == _themesMessagesFontButton) { - [fontManager setSelectedFont:WIFontFromString([theme objectForKey:WCThemesMessagesFont]) isMultiple:NO]; - [fontManager setAction:@selector(setMessagesFont:)]; - } - else if(sender == _themesBoardsFontButton) { - [fontManager setSelectedFont:WIFontFromString([theme objectForKey:WCThemesBoardsFont]) isMultiple:NO]; - [fontManager setAction:@selector(setBoardsFont:)]; - } - - [fontManager orderFrontFontPanel:self]; + + if(sender == _themesChatFontButton) { + [fontManager setSelectedFont:WIFontFromString([theme objectForKey:WCThemesChatFont]) isMultiple:NO]; + [fontManager setAction:@selector(setChatFont:)]; + } + else if(sender == _themesMessagesFontButton) { + [fontManager setSelectedFont:WIFontFromString([theme objectForKey:WCThemesMessagesFont]) isMultiple:NO]; + [fontManager setAction:@selector(setMessagesFont:)]; + } + else if(sender == _themesBoardsFontButton) { + [fontManager setSelectedFont:WIFontFromString([theme objectForKey:WCThemesBoardsFont]) isMultiple:NO]; + [fontManager setAction:@selector(setBoardsFont:)]; + } + + [fontManager orderFrontFontPanel:self]; } @@ -1423,4 +1436,25 @@ - (BOOL)tableView:(NSTableView *)tableView acceptDrop:(id )info return NO; } +- (void)addThemeTemplate:(id)sender __attribute__((ibaction)) { +} + +- (void)deleteThemeTemplate:(id)sender __attribute__((ibaction)) { +} + +- (NSImage *)imageForTheme:(NSDictionary *)theme size:(NSSize)size { +} + +- (BOOL)importTemplateFromFile:(NSString *)path { +} + +- (void)manageThemeTemplates:(id)sender __attribute__((ibaction)) { +} + +- (void)selectThemeTemplate:(id)sender __attribute__((ibaction)) { +} + +- (void)closeManageThemeTemplates:(id)sender __attribute__((ibaction)) { +} + @end diff --git a/Sources/WCPrivateChat.m b/Sources/WCPrivateChat.m index c130355b..50cbe74b 100644 --- a/Sources/WCPrivateChat.m +++ b/Sources/WCPrivateChat.m @@ -108,7 +108,7 @@ - (void)windowWillClose:(NSNotification *)notification { user = [_chatController userWithUserID:[[_chatController connection] userID]]; if([[WCSettings settings] boolForKey:WCChatLogsHistoryEnabled] && ![_chatController chatIsEmpty]) - [[[[WCApplicationController sharedController] logController] privateChatHistoryBundle] addHistoryForMessages:[_chatController messages] + [[[[WCApplicationController sharedController] logController] privateChatHistoryBundle] addHistoryForWebView:[_chatController webView] withConnectionName:[[_chatController connection] name] identity:[user nick]]; diff --git a/Sources/WCPrivateChatController.m b/Sources/WCPrivateChatController.m index f1721a72..56d9bbb8 100644 --- a/Sources/WCPrivateChatController.m +++ b/Sources/WCPrivateChatController.m @@ -45,7 +45,6 @@ - (void)dealloc { - (void)awakeFromNib { [_userListTableView registerForDraggedTypes:[NSArray arrayWithObject:WCUserPboardType]]; - [_chatTableView registerForDraggedTypes:[NSArray arrayWithObject:NSFilenamesPboardType]]; [super awakeFromNib]; } @@ -163,35 +162,28 @@ - (void)setConnection:(WCServerConnection *)connection { #pragma mark - - (NSDragOperation)tableView:(NSTableView *)tableView validateDrop:(id )info proposedRow:(NSInteger)row proposedDropOperation:(NSTableViewDropOperation)operation { - if (tableView == _userListTableView) { - if(row >= 0) - [tableView setDropRow:-1 dropOperation:NSTableViewDropOn]; + if(row >= 0) + [tableView setDropRow:-1 dropOperation:NSTableViewDropOn]; - return NSDragOperationGeneric; - } - return [super tableView:tableView validateDrop:info proposedRow:row proposedDropOperation:operation]; + return NSDragOperationGeneric; } - (BOOL)tableView:(NSTableView *)tableView acceptDrop:(id )info row:(NSInteger)row dropOperation:(NSTableViewDropOperation)operation { - if (tableView == _userListTableView) { - NSPasteboard *pasteboard; - WIP7Message *message; - NSUInteger userID; - - pasteboard = [info draggingPasteboard]; - userID = [[pasteboard stringForType:WCUserPboardType] integerValue]; - - message = [WIP7Message messageWithName:@"wired.chat.invite_user" spec:WCP7Spec]; - [message setUInt32:[self chatID] forName:@"wired.chat.id"]; - [message setUInt32:userID forName:@"wired.user.id"]; - [[self connection] sendMessage:message]; - - return YES; - } - - return [super tableView:tableView acceptDrop:info row:row dropOperation:operation]; + NSPasteboard *pasteboard; + WIP7Message *message; + NSUInteger userID; + + pasteboard = [info draggingPasteboard]; + userID = [[pasteboard stringForType:WCUserPboardType] integerValue]; + + message = [WIP7Message messageWithName:@"wired.chat.invite_user" spec:WCP7Spec]; + [message setUInt32:[self chatID] forName:@"wired.chat.id"]; + [message setUInt32:userID forName:@"wired.user.id"]; + [[self connection] sendMessage:message]; + + return YES; } @@ -204,7 +196,7 @@ - (void)clearChat { user = [self userWithUserID:[[self connection] userID]]; if([[WCSettings settings] boolForKey:WCChatLogsHistoryEnabled] && ![self chatIsEmpty]) - [[[[WCApplicationController sharedController] logController] privateChatHistoryBundle] addHistoryForMessages:[self messages] + [[[[WCApplicationController sharedController] logController] privateChatHistoryBundle] addHistoryForWebView:[self webView] withConnectionName:[[self connection] name] identity:[user nick]]; diff --git a/Sources/WCPublicChat.h b/Sources/WCPublicChat.h index 012c7cf3..b7caf4f4 100644 --- a/Sources/WCPublicChat.h +++ b/Sources/WCPublicChat.h @@ -29,7 +29,7 @@ @class WCPublicChatController, WCServerConnection; @class WCErrorQueue, WCServerContainer, WCServerBonjour, WCServerBookmarks; @class WCServerBookmarkController, WCTrackerBookmarkController; -@class WCTabBarView, WISourceListColoredView; +@class WCTabBarView; @interface WCPublicChat : WIWindowController { IBOutlet NSTabView *_chatTabView; @@ -41,7 +41,6 @@ IBOutlet NSProgressIndicator *_progressIndicator; IBOutlet NSSegmentedControl *_viewsSegmentedControl; IBOutlet NSMenu *_serversOutlineMenu; - IBOutlet WISourceListColoredView *_sourceListColoredView; IBOutlet WCServerBookmarkController *_serverBookmarkController; IBOutlet WCTrackerBookmarkController *_trackerBookmarkController; diff --git a/Sources/WCPublicChat.m b/Sources/WCPublicChat.m index 483bd682..b08513ce 100644 --- a/Sources/WCPublicChat.m +++ b/Sources/WCPublicChat.m @@ -216,7 +216,7 @@ - (void)_removeTabViewItem:(NSTabViewItem *)tabViewItem { user = [chatController userWithUserID:[[chatController connection] userID]]; if([[WCSettings settings] boolForKey:WCChatLogsHistoryEnabled] && ![chatController chatIsEmpty]) - [[[[WCApplicationController sharedController] logController] publicChatHistoryBundle] addHistoryForMessages:[chatController messages] + [[[[WCApplicationController sharedController] logController] publicChatHistoryBundle] addHistoryForWebView:[chatController webView] withConnectionName:[[chatController connection] name] identity:[user nick]]; @@ -573,7 +573,7 @@ - (void)windowDidLoad { [_serversOutlineView setAutosaveName:@"Resources"]; [_serversOutlineView setAutosaveTableColumns:YES]; [_serversOutlineView registerForDraggedTypes:[NSArray arrayWithObjects:WCBookmarkPboardType, WCTrackerBookmarkPboardType, nil]]; - + [self _reloadServers]; [_serversOutlineView expandItem:_bonjour]; @@ -655,7 +655,7 @@ - (NSToolbarItem *)toolbar:(NSToolbar *)toolbar itemForItemIdentifier:(NSString else if([identifier isEqualToString:@"Files"]) { return [NSToolbarItem toolbarItemWithIdentifier:identifier name:NSLS(@"Files", @"Files toolbar item") - content:[NSImage imageNamed:@"Folder"] + content:[NSImage imageNamed:@"FolderMainchat"] target:self action:@selector(files:)]; } @@ -715,10 +715,10 @@ - (NSToolbarItem *)toolbar:(NSToolbar *)toolbar itemForItemIdentifier:(NSString target:self action:@selector(chatHistory:)]; } - else if([identifier isEqualToString:@"Accounts"]) { + else if([identifier isEqualToString:@"AccountsMainchat"]) { return [NSToolbarItem toolbarItemWithIdentifier:identifier name:NSLS(@"Accounts", @"Accounts toolbar item") - content:[NSImage imageNamed:@"Accounts"] + content:[NSImage imageNamed:@"AccountsMainchat"] target:self action:@selector(accounts:)]; } @@ -786,7 +786,7 @@ - (NSArray *)toolbarAllowedItemIdentifiers:(NSToolbar *)toolbar { @"Monitor", @"Events", @"Log", - @"Accounts", + @"AccountsMainchat", @"Banlist", @"Clear", @"Now Playing", @@ -1959,7 +1959,7 @@ - (void)saveAllChatControllerHistory { if([[WCSettings settings] boolForKey:WCChatLogsHistoryEnabled] && ![chatController chatIsEmpty]) { bundle = [[[WCApplicationController sharedController] logController] publicChatHistoryBundle]; - [bundle addHistoryForMessages:[chatController messages] + [bundle addHistoryForWebView:[chatController webView] withConnectionName:[[chatController connection] name] identity:[user nick]]; } diff --git a/Sources/WCPublicChatController.m b/Sources/WCPublicChatController.m index 7ca27986..dba02da1 100644 --- a/Sources/WCPublicChatController.m +++ b/Sources/WCPublicChatController.m @@ -349,7 +349,7 @@ - (void)clearChat { user = [self userWithUserID:[[self connection] userID]]; if([[WCSettings settings] boolForKey:WCChatLogsHistoryEnabled] && ![self chatIsEmpty]) - [[[[WCApplicationController sharedController] logController] publicChatHistoryBundle] addHistoryForMessages:[self messages] + [[[[WCApplicationController sharedController] logController] publicChatHistoryBundle] addHistoryForWebView:[self webView] withConnectionName:[[self connection] name] identity:[user nick]]; diff --git a/Sources/WCServerBookmarkController.m b/Sources/WCServerBookmarkController.m index f14bebb9..973272a2 100644 --- a/Sources/WCServerBookmarkController.m +++ b/Sources/WCServerBookmarkController.m @@ -45,22 +45,16 @@ - (void)_reloadCiphers { NSMenuItem *item; NSDictionary *schemes; NSArray *schemeKeys; - NSString *cipherName, *menuName; - BOOL deprecated; - NSUInteger options = 0; + [[_bookmarksCipherPopUpButton menu] removeAllItems]; schemes = [WCP7Spec encryptionSchemes]; schemeKeys = [[schemes allKeys] sortedArrayUsingSelector:@selector(compare:)]; for(NSNumber *key in schemeKeys) { - options = 1 << ([key unsignedLongLongValue] + 1); - - cipherName = [WCP7Spec nameForEncryptionSchemeID:[key stringValue]]; - deprecated = WI_P7_DEPRECATED_ENCRYPTION_CIPHER(options); - menuName = [NSSWF:@"%@%@", cipherName, (deprecated ? @" (deprecated)": @"")]; - item = [NSMenuItem itemWithTitle:menuName tag:[key intValue]]; - + NSString *name = [WCP7Spec nameForEncryptionSchemeID:[key stringValue]]; + item = [NSMenuItem itemWithTitle:name tag:[key intValue]]; + [[_bookmarksCipherPopUpButton menu] addItem:item]; } } diff --git a/Sources/WCSettings.h b/Sources/WCSettings.h index b458cbca..7d2b8cd5 100644 --- a/Sources/WCSettings.h +++ b/Sources/WCSettings.h @@ -51,6 +51,7 @@ extern NSString * const WCThemes; extern NSString * const WCThemesName; extern NSString * const WCThemesBuiltinName; extern NSString * const WCThemesIdentifier; +extern NSString * const WCThemesTemplate; extern NSString * const WCThemesShowSmileys; extern NSString * const WCThemesChatFont; extern NSString * const WCThemesChatTextColor; @@ -59,7 +60,6 @@ extern NSString * const WCThemesChatEventsColor; extern NSString * const WCThemesChatURLsColor; extern NSString * const WCThemesChatTimestampEveryLineColor; extern NSString * const WCThemesChatTimestampEveryLine; -extern NSString * const WCThemesChatSeparateEveryLine; extern NSString * const WCThemesMessagesFont; extern NSString * const WCThemesMessagesTextColor; extern NSString * const WCThemesMessagesBackgroundColor; @@ -216,6 +216,7 @@ extern NSString * const WCMigrated20B; - (NSDictionary *)bookmarkForURL:(WIURL *)url; - (NSDictionary *)themeWithIdentifier:(NSString *)identifier; - (NSDictionary *)themeWithName:(NSString *)name; +- (WITemplateBundle *)templateBundleWithIdentifier:(NSString *)identifier; - (NSDictionary *)eventWithTag:(NSUInteger)tag; @end diff --git a/Sources/WCSettings.m b/Sources/WCSettings.m index 98fd6c3e..518806c0 100644 --- a/Sources/WCSettings.m +++ b/Sources/WCSettings.m @@ -91,6 +91,7 @@ NSString * const WCThemesName = @"WCThemesName"; NSString * const WCThemesBuiltinName = @"WCThemesBuiltinName"; NSString * const WCThemesIdentifier = @"WCThemesIdentifier"; +NSString * const WCThemesTemplate = @"WCThemesTemplate"; NSString * const WCThemesShowSmileys = @"WCThemesShowSmileys"; NSString * const WCThemesChatFont = @"WCThemesChatFont"; NSString * const WCThemesChatTextColor = @"WCThemesChatTextColor"; @@ -99,7 +100,6 @@ NSString * const WCThemesChatURLsColor = @"WCThemesChatURLsColor"; NSString * const WCThemesChatTimestampEveryLineColor = @"WCThemesChatTimestampEveryLineColor"; NSString * const WCThemesChatTimestampEveryLine = @"WCThemesChatTimestampEveryLine"; -NSString * const WCThemesChatSeparateEveryLine = @"WCThemesChatSeparateEveryLine"; NSString * const WCThemesMessagesFont = @"WCThemesMessagesFont"; NSString * const WCThemesMessagesTextColor = @"WCThemesMessagesTextColor"; NSString * const WCThemesMessagesBackgroundColor = @"WCThemesMessagesBackgroundColor"; @@ -218,6 +218,327 @@ @implementation WCSettings(Private) - (void)_upgrade { +// +// NSEnumerator *enumerator, *keyEnumerator; +// NSDictionary *defaults, *defaultTheme; +// NSArray *themes, *bookmarks; +// NSMutableArray *newThemes, *newBookmarks; +// NSDictionary *theme, *builtinTheme, *bookmark; +// NSMutableDictionary *newTheme, *newBookmark; +// NSString *key, *password, *identifier, *builtinName; +// +// defaults = [self defaults]; +// defaultTheme = [[defaults objectForKey:WCThemes] objectAtIndex:0]; +// +// /* Convert old font/color settings to theme */ +// if([[self objectForKey:WCThemes] isEqualToArray:[NSArray arrayWithObject:defaultTheme]]) { +// newTheme = [[defaultTheme mutableCopy] autorelease]; +// +// if([self objectForKey:_WCChatURLsColor]) { +// [newTheme setObject:WIStringFromColor([NSUnarchiver unarchiveObjectWithData:[self objectForKey:_WCChatURLsColor]]) +// forKey:WCThemesChatURLsColor]; +// } +// +// if([self objectForKey:_WCChatTextColor]) { +// [newTheme setObject:WIStringFromColor([NSUnarchiver unarchiveObjectWithData:[self objectForKey:_WCChatTextColor]]) +// forKey:WCThemesChatTextColor]; +// } +// +// if([self objectForKey:_WCChatBackgroundColor]) { +// [newTheme setObject:WIStringFromColor([NSUnarchiver unarchiveObjectWithData:[self objectForKey:_WCChatBackgroundColor]]) +// forKey:WCThemesChatBackgroundColor]; +// } +// +// if([self objectForKey:_WCChatEventsColor]) { +// [newTheme setObject:WIStringFromColor([NSUnarchiver unarchiveObjectWithData:[self objectForKey:_WCChatEventsColor]]) +// forKey:WCThemesChatEventsColor]; +// } +// +// if([self objectForKey:_WCChatFont]) { +// [newTheme setObject:WIStringFromFont([NSUnarchiver unarchiveObjectWithData:[self objectForKey:_WCChatFont]]) +// forKey:WCThemesChatFont]; +// } +// +// if([self objectForKey:_WCTimestampEveryLine]) { +// [newTheme setObject:[self objectForKey:_WCTimestampEveryLine] +// forKey:WCThemesChatTimestampEveryLine]; +// } +// +// if([self objectForKey:_WCTimestampEveryLineColor]) { +// [newTheme setObject:WIStringFromColor([NSUnarchiver unarchiveObjectWithData:[self objectForKey:_WCTimestampEveryLineColor]]) +// forKey:WCThemesChatTimestampEveryLineColor]; +// } +// +// if([self objectForKey:_WCMessagesTextColor]) { +// [newTheme setObject:WIStringFromColor([NSUnarchiver unarchiveObjectWithData:[self objectForKey:_WCMessagesTextColor]]) +// forKey:WCThemesMessagesTextColor]; +// } +// +// if([self objectForKey:_WCMessagesBackgroundColor]) { +// [newTheme setObject:WIStringFromColor([NSUnarchiver unarchiveObjectWithData:[self objectForKey:_WCMessagesBackgroundColor]]) +// forKey:WCThemesMessagesBackgroundColor]; +// } +// +// if([self objectForKey:_WCMessagesFont]) { +// [newTheme setObject:WIStringFromFont([NSUnarchiver unarchiveObjectWithData:[self objectForKey:_WCMessagesFont]]) +// forKey:WCThemesMessagesFont]; +// } +// +// if([self objectForKey:_WCNewsTextColor]) { +// [newTheme setObject:WIStringFromColor([NSUnarchiver unarchiveObjectWithData:[self objectForKey:_WCNewsTextColor]]) +// forKey:WCThemesBoardsTextColor]; +// } +// +// if([self objectForKey:_WCNewsBackgroundColor]) { +// [newTheme setObject:WIStringFromColor([NSUnarchiver unarchiveObjectWithData:[self objectForKey:_WCNewsBackgroundColor]]) +// forKey:WCThemesBoardsBackgroundColor]; +// } +// +// if([self objectForKey:_WCNewsFont]) { +// [newTheme setObject:WIStringFromFont([NSUnarchiver unarchiveObjectWithData:[self objectForKey:_WCNewsFont]]) +// forKey:WCThemesBoardsFont]; +// } +// +// if([self objectForKey:_WCFilesAlternateRows]) { +// [newTheme setObject:[self objectForKey:_WCFilesAlternateRows] +// forKey:WCThemesFileListAlternateRows]; +// } +// +// if([self objectForKey:_WCTransfersShowProgressBar]) { +// [newTheme setObject:[self objectForKey:_WCTransfersShowProgressBar] +// forKey:WCThemesTransferListShowProgressBar]; +// } +// +// if([self objectForKey:_WCTransfersAlternateRows]) { +// [newTheme setObject:[self objectForKey:_WCTransfersAlternateRows] +// forKey:WCThemesTransferListAlternateRows]; +// } +// +// if([self objectForKey:_WCTrackersAlternateRows]) { +// [newTheme setObject:[self objectForKey:_WCTrackersAlternateRows] +// forKey:WCThemesTrackerListAlternateRows]; +// } +// +// if([self objectForKey:_WCShowSmileys]) { +// [newTheme setObject:[self objectForKey:_WCShowSmileys] +// forKey:WCThemesShowSmileys]; +// } +// +// if(![newTheme isEqualToDictionary:defaultTheme]) { +// [newTheme setObject:@"Wired Client 1.x" forKey:WCThemesName]; +// [newTheme setObject:[NSString UUIDString] forKey:WCThemesIdentifier]; +// +// [self addObject:newTheme toArrayForKey:WCThemes]; +// } +// +// /* +// [self removeObjectForKey:_WCChatTextColor]; +// [self removeObjectForKey:_WCChatBackgroundColor]; +// [self removeObjectForKey:_WCChatEventsColor]; +// [self removeObjectForKey:_WCChatURLsColor]; +// [self removeObjectForKey:_WCChatFont]; +// [self removeObjectForKey:_WCChatUserListAlternateRows]; +// [self removeObjectForKey:_WCChatUserListIconSize]; +// [self removeObjectForKey:_WCTimestampEveryLineColor]; +// [self removeObjectForKey:_WCMessagesTextColor]; +// [self removeObjectForKey:_WCMessagesBackgroundColor]; +// [self removeObjectForKey:_WCMessagesFont]; +// [self removeObjectForKey:_WCMessagesListAlternateRows]; +// [self removeObjectForKey:_WCNewsTextColor]; +// [self removeObjectForKey:_WCNewsBackgroundColor]; +// [self removeObjectForKey:_WCNewsFont]; +// [self removeObjectForKey:_WCFilesAlternateRows]; +// [self removeObjectForKey:_WCTransfersShowProgressBar]; +// [self removeObjectForKey:_WCTransfersAlternateRows]; +// [self removeObjectForKey:_WCTrackersAlternateRows]; +// [self removeObjectForKey:_WCShowSmileys]; +// */ +// } +// +// /* Convert themes */ +// builtinName = NULL; +// identifier = [self objectForKey:WCTheme]; +// themes = [self objectForKey:WCThemes]; +// newThemes = [NSMutableArray array]; +// enumerator = [themes objectEnumerator]; +// +// while((theme = [enumerator nextObject])) { +// if([theme objectForKey:WCThemesBuiltinName]) { +// if([[theme objectForKey:WCThemesIdentifier] isEqualToString:identifier]) +// builtinName = [theme objectForKey:WCThemesBuiltinName]; +// } else { +// newTheme = [[theme mutableCopy] autorelease]; +// keyEnumerator = [defaultTheme keyEnumerator]; +// +// while((key = [keyEnumerator nextObject])) { +// if(![key isEqualToString:WCThemesBuiltinName]) { +// if(![newTheme objectForKey:key]) +// [newTheme setObject:[defaultTheme objectForKey:key] forKey:key]; +// } +// } +// +// [newThemes addObject:newTheme]; +// } +// } +// +// /* Add all default themes */ +// enumerator = [[defaults objectForKey:WCThemes] reverseObjectEnumerator]; +// +// while((builtinTheme = [enumerator nextObject])) { +// if([newThemes count] > 0) +// [newThemes insertObject:builtinTheme atIndex:0]; +// else +// [newThemes addObject:builtinTheme]; +// +// if(builtinName && [[builtinTheme objectForKey:WCThemesBuiltinName] isEqualToString:builtinName]) +// [self setObject:[builtinTheme objectForKey:WCThemesIdentifier] forKey:WCTheme]; +// } +// +// [self setObject:newThemes forKey:WCThemes]; +// +// /* Convert bookmarks */ +// bookmarks = [self objectForKey:WCBookmarks]; +// newBookmarks = [NSMutableArray array]; +// enumerator = [bookmarks objectEnumerator]; +// +// while((bookmark = [enumerator nextObject])) { +// newBookmark = [[bookmark mutableCopy] autorelease]; +// +// if(![newBookmark objectForKey:WCBookmarksIdentifier]) +// [newBookmark setObject:[NSString UUIDString] forKey:WCBookmarksIdentifier]; +// +// if(![newBookmark objectForKey:WCBookmarksNick]) +// [newBookmark setObject:@"" forKey:WCBookmarksNick]; +// +// if(![newBookmark objectForKey:WCBookmarksStatus]) +// [newBookmark setObject:@"" forKey:WCBookmarksStatus]; +// +// password = [newBookmark objectForKey:WCBookmarksPassword]; +// +// if(password) { +// if([password length] > 0) +// [[WCKeychain keychain] setPassword:password forBookmark:newBookmark]; +// +// [newBookmark removeObjectForKey:WCBookmarksPassword]; +// } +// +// [newBookmarks addObject:newBookmark]; +// } +// +// [self setObject:newBookmarks forKey:WCBookmarks]; +// +// /* Convert tracker bookmarks */ +// bookmarks = [self objectForKey:WCTrackerBookmarks]; +// newBookmarks = [NSMutableArray array]; +// enumerator = [bookmarks objectEnumerator]; +// +// while((bookmark = [enumerator nextObject])) { +// newBookmark = [[bookmark mutableCopy] autorelease]; +// +// if(![newBookmark objectForKey:WCTrackerBookmarksIdentifier]) +// [newBookmark setObject:[NSString UUIDString] forKey:WCTrackerBookmarksIdentifier]; +// +// if(![newBookmark objectForKey:WCTrackerBookmarksLogin]) +// [newBookmark setObject:@"" forKey:WCTrackerBookmarksLogin]; +// +// [newBookmarks addObject:newBookmark]; +// } +// +// /* Check download folder */ +// if(![[NSFileManager defaultManager] directoryExistsAtPath:[self objectForKey:WCDownloadFolder]]) +// [self setObject:[@"~/Desktop" stringByExpandingTildeInPath] forKey:WCDownloadFolder]; +// +// [self setObject:newBookmarks forKey:WCTrackerBookmarks]; +// +// +// /* Upgrade to 2.0b54+ */ +// if(![self objectForKey:WCNetworkConnectionTimeout]) +// [self setObject:[NSNumber numberWithInteger:30] forKey:WCNetworkConnectionTimeout]; +// +// if(![self objectForKey:WCNetworkReadTimeout]) +// [self setObject:[NSNumber numberWithInteger:10] forKey:WCNetworkReadTimeout]; +// +// if(![self objectForKey:WCNetworkEncryptionCipher]) +// [self setObject:[NSNumber numberWithInteger:2] forKey:WCNetworkEncryptionCipher]; +// +// if(![self objectForKey:WCNetworkCompressionEnabled]) +// [self setObject:[NSNumber numberWithBool:YES] forKey:WCNetworkCompressionEnabled]; +// +// +// /* Update from 2.0 (243) to 2.0 (244): add WCEventsChatSent */ +// BOOL chatSentEventFound = NO; +// NSArray *events = [self objectForKey:WCEvents]; +// +// for(NSDictionary *event in events) { +// if([[event objectForKey:@"WCEventsEvent"] integerValue] == WCEventsChatSent) { +// chatSentEventFound = YES; +// continue; +// } +// } +// if(!chatSentEventFound) { +// id event = [NSDictionary dictionaryWithObjectsAndKeys:[NSNumber numberWithInt:WCEventsChatSent], WCEventsEvent, NULL]; +// [self addObject:event toArrayForKey:@"WCEvents"]; +// } +// +// +// /* Update from 2.0 (244) to 2.0 (245 - webkit): add template in theme */ +// NSArray *allThemes = [self objectForKey:WCThemes]; +// NSInteger index = 0; +// BOOL neoThemeFound = NO; +// +// // add the neo theme if needed +// for(NSDictionary *theme in allThemes) { +// if([[theme objectForKey:WCThemesName] isEqualToString:@"Neo"]) { +// neoThemeFound = YES; +// continue; +// } +// } +// +// if(!neoThemeFound) { +// NSDictionary *neoTheme; +// +// neoTheme = [self _defaultLightTheme]; +// +// [self addObject:neoTheme toArrayForKey:WCThemes]; +// [self setString:[neoTheme objectForKey:WCThemesIdentifier] forKey:WCTheme]; +// } +// +// // add templates if needed +// allThemes = [self objectForKey:WCThemes]; +// +// for(NSDictionary *theme in allThemes) { +// if(![theme objectForKey:WCThemesTemplate]) { +// NSDictionary *newTheme = [theme mutableCopy]; +// +//// if([[newTheme objectForKey:WCThemesName] isEqualToString:@"Basic"]) +//// [newTheme setValue:@"fr.read-write.Basic" forKey:WCThemesTemplate]; +//// +//// else if([[newTheme objectForKey:WCThemesName] isEqualToString:@"Hacker"]) +//// [newTheme setValue:@"fr.read-write.Hacker" forKey:WCThemesTemplate]; +//// +//// else +// +// if([[newTheme objectForKey:WCThemesName] isEqualToString:@"Neo"]) +// [newTheme setValue:@"fr.read-write.Neo" forKey:WCThemesTemplate]; +// +// [self replaceObjectAtIndex:index withObject:newTheme inArrayForKey:WCThemes]; +// +// [newTheme release]; +// } +// index++; +// } +// +// /* Update from 2.0 (259) to 2.0 (260 - servers sidebar) */ +// if(![self objectForKey:WCHideServerList]) +// [self setObject:[NSNumber numberWithBool:NO] forKey:WCHideServerList]; +// +// if(![self objectForKey:WCHideUserList]) +// [self setObject:[NSNumber numberWithBool:NO] forKey:WCHideUserList]; +// +// /* Update from 2.0 (263) to 2.0 (264 - application menu) */ +// if(![self objectForKey:WCApplicationMenuEnabled]) +// [self setObject:[NSNumber numberWithBool:NO] forKey:WCApplicationMenuEnabled]; + NSLog(@"Upgrade settings..."); if (![self boolForKey:@"WCMigratedTo_2_5__32"]) { @@ -262,6 +583,7 @@ - (NSDictionary *)_defaultTheme { NSLS(@"Wired", @"Theme"), WCThemesName, @"Wired", WCThemesBuiltinName, defaultThemeIdentifier, WCThemesIdentifier, + @"fr.read-write.Neo", WCThemesTemplate, WIStringFromFont([NSFont userFixedPitchFontOfSize:11.0]), WCThemesChatFont, WIStringFromColor([NSColor darkGrayColor]), WCThemesChatTextColor, WIStringFromColor([NSColor whiteColor]), WCThemesChatBackgroundColor, @@ -276,7 +598,6 @@ - (NSDictionary *)_defaultTheme { WIStringFromColor([NSColor whiteColor]), WCThemesBoardsBackgroundColor, [NSNumber numberWithBool:YES], WCThemesShowSmileys, [NSNumber numberWithBool:YES], WCThemesChatTimestampEveryLine, - [NSNumber numberWithBool:NO], WCThemesChatSeparateEveryLine, [NSNumber numberWithInteger:WCThemesUserListIconSizeLarge], WCThemesUserListIconSize, [NSNumber numberWithBool:YES], WCThemesUserListAlternateRows, [NSNumber numberWithBool:YES], WCThemesFileListAlternateRows, @@ -407,7 +728,7 @@ - (NSDictionary *)defaults { WCNick, @"", WCStatus, - @"iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAYAAACqaXHeAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAIGNIUk0AAHolAACAgwAA9CUAAITRAABtXwAA6GwAADyLAAAbWIPnB3gAABvMSURBVHja7Jt5kGXXXd8/55y7vX3rvXt6pmeTRstIGslabMkWCEe2hTAQErCJgYBZK1CVEMdOikCZqhQkjqHixIDKRLZjsFlsQ8rBO1qt0a7ZpFl7pmfp/b3u9/qtdz0nf7yn0bSkkQcwlVTZp+rV6/fu63vv+Z7f8v2e3+8KYwzfzUPyXT6+B8D3APgeAN8D4Lt6WJs/fvgK/sWhk/jc+1+/SKPdYtvEBOOZMZrJIhlvFFUPOdJbYDo1xExX06tkOC5qVKJDHGs7lBc7Q2UxvWU+KY8PT/nlY/PrucmxSpLS2fUTZy+s7tqWmZ8+Uz03uyVI0lddx5nlGrcuKbSv2bFvmCCj2f/cGvlsjpkhj//4/q8wIkrfKQC+M8MAKcfG6wUsrK2xFNTvCK2xH5hKj9+e3jl2bTGbnZrM5JRrpbjjxgxBGNGNO+zZcyPNTnOjm1k/kwrWD2zMBY/N19e+fn3LXaqk8yhLAvof0wL+YUMgSLk2sq25cGF591Ik3mOPFt9z85Zbrxofnmaskieds3Fth5RyUEKhpEQIgZBghCbSSaFtopva652bVuaXf3bn2oquHT35Ny+en/vUj9bcL2Z2ZlFS8p3ib98RAIwx2I7CdS3On1zc3Q7j3xjeuuV90zu2snVsmJLnIozCEg6OdNA6xjct0nYGiYPAoE1MpCMSE2KbiEwhYKaU52o5LKu3XH3/gSNn7j905vhc8+mV/0IQ/lGqXEQKgfn/AYBcNkWrFvPEiZc+nM+Xf/Ntd95BpZxDaSDp0YsSLNsiVl1ct0zFLqNFQmQCPOUghCAWAmkMCQZl+q+IkHbUQLg+99y5heU94zOP7D/0hy+dOPLzG7Nzv5q/prxfCfH/CAADQgrSns3smaVds6urfz6xe8tNV++ZIQkCel1BNu3heh4pT+HZHhmrQFvXqZk2Y842bCwieljCxpAAGoMGAxKJ0AZhxySizcnuOZQjectdw4xte/O+l/afemK5Z/92NnEeQKEBBwgAH+gC0RW57WYxdOVZ4B2/91d0uz4qNnc2tPnG1bds97aMjhB1I4ayeVKehVKQz2TwPBepBHm7TNEapmuapFWOvFWiZzoII9EkhPTo6TZd0yQwHYRRpGWODEXSooitPSacrRTVCMJOsVJt4MSmMzO2/QUEjQEAq0ANOAecAZaARaB1BRYgrijUSSVxlOTk+fpPjewqfXp6yxAp22Z1dY1KPoeTEuRtj5Rno21NxklRdieICUFqcrJAO2kgtcSnQ0fXsYVHSuQYtqYoqXHSIkdaFCioYRy815ifIcGuKOYbC5nTK7O37xjb+dDg4G5gHJgBbh4AMgecBI4CzTcAIHsFAHik6NKsdd7rTWY+XR7PkQQJYRTgKZsQn7VWnS1b87xlYi9h6DAfruGLFgE9NvQqRhs6ps4WuYeyHGXK2k1FTpKXQ6RlHnXJbWmTEOGjTYIR4In0IN9YZGSejN3gWP0l+/GHHrvr3r33/Nb40NYVIAHCwYpagAfcAAwBTw0s5HUAeM+DVzB/lz/aIe86M6z+dO9oGRMnpEouWiVYnsVIKUveTtNJ2gRxRE9HLCfnsKQkLYtU5Dhj1nbycohRtY20KGw6fWwiQnyM0QghcYSHRF00zmp3gcOLhzi1cowTi0c5MHuU5bVVzi6fTcuJ0p3P7/jlH94z9RNw37WXnrZwiVXcCOwfxInNMeDY395++ZinDaVUhmdenC/+9DeWVq/+ievskpTEsUY7MXEcsm10jOFcnrKboa2b9OQGo4URduRuYIe3j932LWRFedN5ExOj0RgMxhikkNjCuXh8tbPEofkXOHjheU4tHePY4ossrs9TbTQgBiIHlbgUinnONTrc+2Ljfzz425lf7f3gB9ihfuvV00gDbwJWBm4RbALg/mduuHy6sBXZKM3Xv7n05NRE+fapUopWJ6AdNBkernDzlpu5trQHYoWQEcr1saTHvtLdbHGuec2kX/ZkbfrMzpHuxeOnq6d4/NRDPDn7BMfmj3By5RQdv0NKpnCtDDk7g5CCUMdIIdBGYDTk82kO1mrc9s8z97zl9uxDmepefnHLf2KCmUsvPw5sHQTI1U0APFL/ncsSnVQux+9/8k/e/ZXjp/76++65gU6zR9d0mBqZ5Id2/wg3FW8lZwpkUxkSoxl2xzYFVU0Chv5qD65py1dWut5d44njj7H/1BM8fPQbHJo/jEQylhvHs1xsSyEtiVAGaUEq4zK1PctKq8v6YoBlK1I5j7WwzbmnFpd//01vG98wZzA+vO+dDzC6986XL5UHrgEWgAubYsBjJ+Yvs/qSsHGB/bNnHty1b5iwE9PoNJgZneFf3v5+9mVvpRAN41ou4lXE5GXTvvT90ok/Ofst/vLpz/HUyWdZbzRJkjbFTIndlauQVp9LSBssT5JKOygXLM8iljE79g5TSWKOH64TdSKMhumREU6lT4x9rHPw3/zAz9z7e4+sPYYZfpgPcOcrebwf++LXBMGPPvng665+OZVi+dnGryXjlK/1rqIX+Ti2x90T/4Rrzc0MJRMoW11WH/SjucGS9sXv/+Kpz/GZb32KR48+RBjGTJenqeRGiIyDsiGdSmOnFflCCjut6JguQ6UsWhlCE+N3Ao6d3cCxLdI5B51x6NZ9TBfGri9xbG7hd94eNj/21l1TcSneJKCmBhli/TUA/Df/1tdMQNmKZjNWH5p48sN2GcJOwkbYZldhFzeN38KQN4JS6o2ZgwBL9Cf/R9/4OP/zkQd4bvYIng0zwzO4jgcyIVOAHWPbWYyqWBmJnVJgG9619zbObSzx0vIcnuPQ64Q4nkvgJ/jdhF47wLIsbM/CkTY5J018ou6c+vzCv377u277yKi3jUEYyAx4wtcGpGkzADvVm161+pB20nzyhYd+tb09LhaES6vhI7IWQ84oZbdM2k5fEXl6Ye55fvmP388zRw6Sykv2TMzg2jbGgpGhHENDefCgMpZDRxHGNhQyGRq9FrONBSIdUW+1ycQpQNJtR0RBgpd1SUKDQNOr++QKkl41wB2Fvzm6/7fnKrU/eOC+H+kANvDjwHPAxuvygE/cs3/z6kuJ6tp8qXn4/VYBOu2QttvFbTrkduaR5sqkRL1d58FvfoJnXjzI9MQI+WwO21E4aQuvYDM6WWRoKI+btjixfhYlFDP5cSr5HOmMx8EzJxFCMFQpsdHoEnRjHM9BCEMSadJFF78VIpFoEdNstPAsCAK8rOXd9abh274KfBB4Fjh8WSbYObtZXDq2xdqZtfG63b5WRYrgRIK/L0J1LGq1dUICjDGvCXyvHrVmDRJBuZAmnXFxs4pU3qE4kiVfSqPdmMWgyu7SNPfs2sfJlXmCJGQj7tAjwJIWtWoLISyEkHTqAaGT4Hg2ylIEnZBWtcPo9Ahr7TU6fkB61ILJmGu6133QxpkEDg1M//Ja4PbsZr1gWRH7Tf0dkQDLSPA0y0urzIxu5fzSBc6vnGcqPU0xXbzs5OMkprZR5czqLAkxTsYiO+pSGs3hZWy0SFBSEfgxK6119o7MsOBVmW/XCIhYadRprHeRRrE23yJdSJEfzhJ2IjqNgCQxYKAwnkMKycL8ArLUV6pqHB6+8MjdG/XGrxVKxSPfVgw9PtfYdDAjLA6s198sypDUgYzCDzrUOw1cZfP43ONMF6axpU3Gy7xuBlmoLfDI4Ud54fQLeF4KOyNJlW1EShOLGIyg3fJBglGar517llqrhWPZ1KtrNGtdSuMFcuUM1fMbrJ9v4mVdbNcilVM4GQudaOzEYWFxkTWzjusqdMdQyEvOhov85tf+7eo1115NEiWb7u9X9n1wMwANldu0X9zxFRti/TpcMDGgBAjJSmOFbM7j8TOPklNZ3r7zXnaM7iSfyWMpC601bb/Dan2FR448zJ/u/190ki5TpTGkbZEYQ8+PcF3B0GiR5tkqJjHUO10c1yZJNO2khwnBVg6F0Rx2xqYY52ktdgmbEaGIEIAwHgQCP+xytnYWmQKlFDptkI7CyRoeXX34rYtjp/6yHXQ3A8CrAOiMvvK3rRR+MxFJNd4mhMAoEAawLEwvZL65gOtZ/OWBP+f00ixvnbmb6eI2spksYRRwfnGe588/yxce/zyrvRW27JhEYEAq/FaC8DXOsIeX8xBGkhiNwiJjZ5Cujadcup7PWtKivtQhO5xmY75N4mukkgOSabCFTZxoTq8do93xyaYtjOyzRekKnGHBxkJ9x8ophZ+Eb+wC7/nc0CuJSwqaQVD46O64bMYkwpOYkxq0QSkbvxdwvnGB6dwWnlp8gqdPPMWYNUHBK9Ly28wH57mwOk9YD6kUy/RqPoXxDFuuHSU/kqZ2rsH6UovGWpdsKUU64xCS4EiHVCpNzspyujdPejhF40yL6tE6oR9hhEGhIDEU8kWkUbx07gjr4QYpZaEjkAZEGihC0jZ4WW90ZmaSjum9MQBv/Vcjm/x3pdbLxI9rR2xVyCFB9BJIr08QbGXRDnrMJXPsmtyBNoYXFw7TqfeIiSndkKNMgUQY3IINFoxvG2LrnnEiO0K5FrWFDfKFFKXhAkEUkrUyvHn0ZvYvHaIaNnAjj2bQo93osnR6hZ1v34rwBdUX61iWxYK4wMrCCq0Nn3Ta6pPbcEBx0iA8sD1Bu9Mtnjq5QChftUv29lcBcKv84qtoIGTTFvYxia81MgciGNBbbXBtmzCKON46zpg7ypZtkzAmCEU/PSZpjZnUpIoeiUmwMxbSU0RRQGu9i5fx8IYd2n4XEkE3DjhYPUmt1cDvROStHOePLFKfa3Dd9HW8uXQHI6lR/GzASm+Zr5//MuuLfr8Q4fTjlAnBtAEXzBpYQtBu+M7suVWMq9/YAp7z37GJBS77Pj9ufwv/bIwyApkT0DH9zUrd/5GjLIQ0LLZWaNJg6toxCmsVXOEhPGhttPGKDoEf0g18Dn9rllTOw1EWW3aNMaKGiY3PQq9Gdb1ObaNBsmHYqHbZ2DiBairee+v7uPfGdzCem6SYLyK3w7qo8dblu/ly6Ut89rk/ZX2jQyFlYXzQDogumMAQaUOm4ITjW0tEMn5jAI5+9BUeYElFT6iOfbMMAzt2ZEthMFAC6n1TMxK0BLkmKNziEIchp+fPkUktU8kOUU6X2L53iurhJqMjQ2SmUiyfqlHI5rC2Coo6y73JD5N3UzwTP8yjwXP02jFd36ez2iHaSHjPXT/Je+/+SbYObSPrZi8q7DHG2eptZyo3zUhphI986SO02wGZwEYWIVkzyJQgCgzFbK5x7a6Zbx8D/uTXL62VJly4MNvwj4YXHCV3YEC3QNgg8v2sIB0QlgEtSNpg5WxMQxPGIefNAgtrC2xctUyYF0SlMWTPYs8NO8jmM8z1FrGRRE7IsNiD6Dgs16pETUNzqc1iZ4W7rrude295BzMjM6Sd1/KMjJdh1+hu7tv7bl6cO8JfPPy/0SMJ0leYLhgXpID2Rnvx+NIsYRy9MQBfe9tjlzA4OFs7nf0Xaz/mPrtykHTJwlQNdA10QMi+ykMD2hAe1KiKwNoqoGPhOIa4C+ceraGGYGGlijsC54LjUFdERpBLORwPjuB2LWYvLLG60kR0Be2zfV+9fuf1bKlsfd3JX9yitDwmCpPctuXNfHX4y/SIEOclckSgSoL4BOQqw+dGKmN0g2+TBi8tlluSmZ3jO970tqvuWX76yMEp09RYBTBiYAlWP+Bg9a1CFgQmhGTeIPOAI1A5A+sWNCEzLVANWDvlk7tOkJ6UVOMW55M1bCBeB2kEOuqfMxs4lNsjlHPFbyu2ivki23ZsZSQzzOzsIm7BYFoQVxN0xzC96y0vTqmtdFRwxZWhKeCfEvLJ80dfkOT5nF0UGMuQLBmUEJg+KYSXOYkGMdgWSNb6ABEMGKQBXTNoRxCdlmTHHCoTNo21HkVL4j9rSBY1egOSIIFnoJ0NuX7mevJe4dsCYCuLdDmFI72Byu+LXx8oZ6zafYWXjnrJqT71vgIA0sDdwBcPHf3CWu2Fhx+XZRA5g6wL0HCpCjYMGKIZuIMcAGOBsASmbjAGLAne7RJpQ60WU3soJqkawl6C7oAmpl0FqrD76l18+Jc+zH233H9Fcrsb+NSbdTrpDXBAKIFwBXFPk8tMPTw3dSttv/e6hZ/XA+Am4BRw5vxV8xQ/ML1w9dd7h2ePV/fmhm2sLGifgXjpn3OTiNb91ddrBnuLJHWbIFo3fWtoQ7xmkHmB7hmsnCDIRTSf7FvLHT+1j58Z/QV+4dZfvHivVyS3e6u8uHCExQtrOJk+f1F5jdWFZP4HP//IV76fXsd/7fTvey0AaSA1qJ6w8beGXRfeQm3p2ANn3NrH7azABAIdmT7xwGBEPx3y8vsAlKQL9iiISUFqWqJbsP5/IkgEzpCmfibps7YM3H/3u3j/7b/AD13/7os34sf+oH9AXdxXfL2xsL7A4TOH+JtvfoloA/LDFkZAaBJSbqp1zft2/pWdWSNOkiuqDucGRcRus9nkffd/YLB5aj049OvefxbFOKs2ZN8CbDD0Y4ERBgacgJc/26DrYJcHK9+LaHWTixW68vYc9938bn72jp/j7j1391c7MfSSHhKFkKJfN9AD8XOpkemEKI6otqocOn+ATz36xxw6d5JUWYINyoOeFuyOrv7d8erTUTDffn0I3/bLrwFADLzZfOxjHwNiBMIuU/Ljx4I/ZFvwgVzOwmjT/5EcWMElQGgDxghiK2HjQEjvzKBOuwJTO0e4+x0/wL1738k9++5hvDwOQBD7xEmCQCJkP7dKLGz1yi7y7OIsq/VlZBlELKnX6hxePMBfH/gCT84exM2D6ym0NIgJTaab0id+58zHD+oDl7WgT//cay2gM3CByrlz52oAhWIh6wlbR8/b/z3YF/yKvMdkFArTM2hhkI5EWBBFMa12SG1tsOWYQNoR3OreyJvfdid3b/9+7rz+Lir5yisXC9oDH++vsGPZWOqVW1pt1vjK6S/xma99iv1HH2NsqsJV269CtBQrnVVOV0+x0dakM+A4NkYZlANJTmN/2f24q+VGB6xBLrqS/gAYFA8rBw4eOLzvpn3VQSFhyCW7GJS7H8x8UP/uUAl6CxDbg46EDjgCRtNZthf2cH35Fm6Zvp0bpm/kmvFrL9YMtEloB22M7gc2S1mbSY6G09U5nlp9lIfmvsoj57/Ombk6dKCUB4ahV4N4ENBtCa5l9c325fgzGaOPu43MA8NXmWzca/Qa2vf9zuUqXq8HQBa4A8g9/MjDzT/77J8Fc7NzZq1ex18OG+v7Fj9buF9fPxKPMpwboiQn2JrfwXUTN3HN5PVsH9uBLV9ZxXbQJIwjhAAlLVIqjW2/Ytqr3VUO1Z7jhea3eGr+MQ7OvcBC2MMpQ3EDvK6HtCVWRRB1NX5Vo6UhiSFJDFqbft+YAFk0hKHGeWDkl1Lz7oO6Ek21eu31dqvVhNe2E10OAOhLnluB64ChldVVd22tltGBTpprndGT5qUfHd8yzJbMDMO5EcrZCkopEh3T9JvEOsYSFrZySNtZ5CV1k6bf5FjrAE+uPsThxjMcXTvA2dYKGz0oFyCvBV6cRmiBk5P4DY1w+gX/7mqCFoY4hjjSRLEh0QajQaYgKsRYnyl8xXuy+D5diSYUptkK281Ws9X4uwLAM888k3r66aevv+P2O26cnJzamc1mJm3HHvcsj8WV5d1nOTFZSZfwwiy5VJFyutyPKOailqIVt6j6i8y1T3K6c5hT3YOci1/kfHicpU7fhPMa0jJH3JEIAVJCr6mRCNJ5Rbos6XYS6vMRYWBIjCFODGGgiQJDkhiEJUhGIvQ3U4v5L1R+LM5qH4VWwjSafqvRbrU3rsgFPvShDwGwvr7OJz7xib7sHBkb3bP7mu0T05PTExNjW4cqlYmx0kTGt4JbxC2dG6e2VIjXBbEKiIVP09RYD5dZCeZZCeZZ9s+z1F0jUWBbkHWgki+xPZ/nmlKab55bp91JIOlP3rUlnVaC7UgSbej1kr6pY+j5Cd22ptfShG1N5BuMbUhGY5In3Fb+syM/L1RyJsqYjIxlVSi9sbaxth4GYfeKAHg9xiWlzEgtcjFJeuAaJQu77JFzgu2t947+RvTOrTc4mE5IqEDafX9UEjwp8WQaR3gYI8jYFnGiiSJNJecwmXY52+r1U6pm0CAhqHdjMNDrJcSBwe8lxHG/hS4INb2uxu9oEk8T2DH6m24j98WR37DgpTAXZtFW1UKsd6Puer2xXr9ce+kVASCEkJViueLa6UqMLguTlNCmrI3I63VpOsX2943+++hHb/zprCzJFGET4j4Z6G+gDC6UaIMlBBlHEicGR0k6UYxCIMSgDmkr/EgTJQZjNGGk6fqaXi+m10v6E+9qQm2I8jG9JMZ8Ln8s/delP1BpfT7JRk6iRdUS1nqShLVao7aaJJehgFcKwGCHWFYK5bLnZEYjHVckuiyEHDJClGVNRc3Evzb1U+13X/fv7KGpLVl0TREnXGyE6Od6+gELGMk4SASdMEZJ0QcMQag1kdY4UqDjuL/aPU3XHwDQ0wRa0xIhnaMG67PFv00fL/yZKEZd7cY61qJqS2tNJ1G12qitxnEcfbsO1ysC4GWOWM6Xy2kvOxabZEgYXRGIYSNFxepKq9PSw72rmvdM/4fomqvfmSJnUuhWv6fXINC6D0DOsVBC0I1iLNnX0hIIkv7kLSmIk5gwSPD9hF5HE3QSQq3pyph6LaD3dbeT/mrl827b+ZYpRWiZtA2yZgmrFsXB8vrGejWKo+RKWnyvHICXSUI6m8llCqNKqVGt4xFjKCNERRpRSKoy03K6e1M/4t809s+S8sgNFqWchx1YWInEkxYCQTOKB8C8kjWUFAMerknihDDQBFFCzyRs+D7rCzGd55VJvpF+PvVS9mHLFWfiTKyBmpRqDcNqt9de3mg1GvoKH4X7ewEAYCmLbDpbSHnpUaXUCDCUaD0shBmSHSvtt81or9Db494W7ii8JR4v3gzlrYpU2kIbgSMUykiE6fv/yxZmhCFBEyQJrU5EfSli47ih85zVSJ5zjzpzqcNuYh0zxbiLLdoCuZLoZDkI/Wq32274YRD/XZu8/14AXCwbKIXnpNIpL1VybHdEKTVqjB7GmAodmY3blHpE03os2CZ3R5POLl1JbzWOPWyw82ClBztHBkwkiFqGcF0QLAkTzoladMqeZ8455Tad466rFkxO93BoGm1Wwihc6fm9mh/0WlEc8fcZ/2AANvcSOLiOl3Zsp2BbdlkpVZFCFoUWBdGT2bhDMdTxcOzEFdK6YDI6g6ddlJYYoUWkAtMTbdFVDdVTq05iL1qOWCVjmtqK27GJ63EcN8I4aoSh3w7CQP9DH/r8jgKwiTsIgeorO1splbKklbaUlZJSpZSRjkikIhYWCQJjQAhtpImRhEYlUUISRiYKEpP0kiTpxnEUxEmM1t/Zp0X+0QB43bghbWxlIYUklgmWVjJFSkgkPr4JZWgsY5lEJ8Q6Jkoi/rHHG2qB75bxvecGvwfAd/n4vwMAWqPRT6rY5jkAAAAASUVORK5CYII=", + @"iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAA1teXP8meAAAAERlWElmTU0AKgAAAAgAAYdpAAQAAAABAAAAGgAAAAAAA6ABAAMAAAABAAEAAKACAAQAAAABAAAAIKADAAQAAAABAAAAIAAAAACshmLzAAALfklEQVRYCU1XaWwc5Rl+5tjZ+/DaXt9JbJzgOGkgEBCnKKIgIKJplYLaCioVqfRQJSSkQqu2alVRqb9a6L+qtEWtigC1FaIHIRUI1ByQw0lInMSOHRvfXt+7s7tzT593HGhn83nGm/H3Xs/zvO+n4P+uMAyzr73yyuOHDr99cGLi6kDVquVDRdFVTVdCFYpcmqYq8hT4QXSHEsq/MNomRMCHMPQDLv/aPQgNPWa2t5am9t1y6ztfffzx3/b39499Ylb55OHkyZN3/uC55146e+7sgBZTYSST0AwdakyHoqqAvMmlxWP8ToNbs6HK9+E125s3/s73+F3g+5ve+AFCx4NrWXAaNvK5vPndp5/+0TPPPPOi2Nbkx7Fjx+557EuPvn316nhHKpOOjChiWFej/QLwowTwJdoU/ySrwbJsgPYDlRYNlXfA98Sozx0lFUxL5ByfmTRVUxHTdFgNy/jnP/7+4PeefVY5cuTIe8rExETh4BcPHh0bHx3MZjNQGB3fpGvMMP+Q6aYhBb7ObWN0IE5L/H8lVPgKHQwDJNuycNYtqKyKqmpoLFZAf8FSQPzjK8xIAMXjg+PDY0aqZs1/4cUXHtEMw/jG4bcPfS2dTgM6jcnmjFyM0wZY+2gl2/JAiw49H0NpezuqcQ9OggbjOrQmA1a1Hjmk5+PMhAefJfDEssQgOZGMRHf+4CUWTp04vVWrVCo/t6xGn9QVuqxrkTMDskEgaY9rTCOjKcTQvaMdPYP9KJU6sLW1Gzf070KuL8uMqZifmAcLh4Ztw8gloBNDnu1GgYgTASEqTsizpmio1cxOvVatDkh9onpLBniJUddzkG8tMn2saYuBXEsOD91xF5pbW9HV3oeufBv6cu0wjDhCOju+9DFO3jGEqfVZnDgzhJkrU9BTcdQ2qoyJ+/vcW0oqJRF7xIum85PJpH9Gg0ZI5CvciLRDwES0drdivbKBQksW+/beiHtv3otEVwGTbQ2glEcx1wY1nYTFYqfTKQy09qMSM7G7YwC33nQzfMPF5PTHZFIctlmPMMO4IgcEoEIRhXctk838mAZjikRP4xJNyDdJHuTas9gy2Ie7D9yProEdKDQX0ZvrwMT0ON746BA2gg3kM3Hu5cC0Ghheu4LRsQksZSzsu++zuHTlIsxKlTQM4Flu5MT/gEAHmFyVn5hQSJwjiDeNs/aNRgNdW7rRtbsPk+0BplUTg7l+3N28D+/MDSGlZpDTMkjbSWQ2PIxcvQBjA5iyJnB25TzOzl/Eg099GVt6e8kewONHAhNgyyWZlmctXcj+lFwmnPkbl2ZoiBNAsRQBVLawNrcCZaCAuEu6eTq2ZDtxS+suFI0cDu59BPNeGR+tjiLtxDB05TwWq8tYtRewqjpIFovYunM7Zs6OwLIbCD2GGUUtHmyWQZeoI1jyFhBwoR8SNDGk42nUF2vY+rk9cJbWMd5YRnOfgVMjJ6CzZvfd+TC+f/mXWJqYhDEXYrfXjXMfXcDMWhluysGWA3FMnFLg2lVsv+MzcOw6NtQKrLkaDO4vNsW2sEakXTCBLJFeZy0zOXK+HlARDSRzcegUjoWZebxXXiF11qGmYhjrcXHhwyHEjy8i76VxqDqM9dUqHAZRo7GGWkd723Wwr5ax7e4bUFu2YS3XkO0soD5vRjFLGXQxHkkmHbHrDrFA8BXzSLUlsDy3DJs00raVsLS8hAJpmSjqaErlMXLkBMp/uYi4ybrbTqRuonBhQO2g/nhnLBi35/DUb55HZd7C1OmP4RGQkUIy/TQXiayWKWR+QhpGGPAJS6OQRLqYRFdnB9XMw+SlS8j3l2B7daLZxuV/nYO/5KAxvYqFoSk67cJjk/EaTiSzgTjh+rBrDez+9sOYy9hIl0owyi5WZmdQoUyDeKLcRTgQqRZf4BP5pc52aKaHyuUyludXsDg7h/XZCsrnJuHS0OwweU0gsrchE6OjuRT8Oo3XHPgNOkKq+aL17JRZZrFh1XDhj29i7OxptA30IbR8NJWaGBhTdO2KeoWkXUSivlFHU0sR5kYN1ZU1rC+twaKBS68NoTGyiu6b+tC6pR3jh8cwe34auWZKMLPmmCwBJdd32QNkEciJTBI2g7DHymhU1pFMJdHeXGKmvMj0pigLCMNNZqqkYHWtgoZpIsYGY9Xq7OE27EoNQTXA2N+G0Ty6hq337YAeM5DtIVDpdb5RxLK/uqls17ojxxVYZg0Jdr+26zpQbM5jZXGewAhhEqiqxt4S4UAYx3KEkgdmJZFNwqCyqayjuW4iyaHEd1y4qgwUHlaGF5CwHOx54jYEGfaLRh3GtjxyN7aifGUZ3kwdcY3KKE2QHFs7OYPSbd2UeArZmYuYWVmSan+qAdIsdZXFJxGkwcNzXeRyBSSo3x1dHdIsMHl5DJXy+qd1a+ulUwUFy8Nl2OUq/XaR39mE67++D6tHF+GNbiAei8NIJKHbcaxNWmhhSa2VCvGjwmWJaCwqg0LuS+f3FD/QZGpxmPKFq/PYeesupJoyFBEXre0diKkJ1tiBy2w4qRRiCZ1zhcNtSB5OTrWlBtyRBRT2diC3vRvld6eRZvaSDCbozSHhJ7E2X0adaigtWWPEov3s8FzstwFpI9SRCSZkm3TrFhKpBDPA+Y+OxVMGcWFA5zxYm9qAsUiQbcuxG7JtypRDWnkUmWp5GTFGrzP6dD6PZCmHzr3bYc5uEEsmquvUAdY+oI1P7Km6EVdjcaaMf5g0Eqx7CuWFZYxeGkeKSBY3ncCBHdhwfeKBZRo7MopMTzu8Jg0hAasqOodUn92SLXxkBfEEcWBwoEkItXyc/+tRrC1VkGJWErLoYCKegMGlb+vr1V1WUuotU5HKosQYfb6tiZONw8aUhWqbcKomag2T3pNmZIVjWhxSA8Q4oim5GAzfwPKHM8hWXdhKlsqooqfYg+X/jGLXtu3wWlw0yCyO6yw6ScgloqVvHxwgD4hCnbMdRyiNNY0x1SLHNc3F6PQIGlfq1AYTJqkVEBecHmBzBgSFRelOwiPva6cWYc2aaBSzUDIBcvkWdOSbkU22k1XyPnHiOAgIQimzz5J7fNb7d+5gPGGzGoux+XDopAMyy+mGNKIkdu/ehaHSabz60suosivq1BGNVJXoM/taUL+4itX352Gxc6oJYoRAvv7OHux/YD+2NJWIJ04CVEgxLtIuePNFtOiEnBP07r6tE1bgNscSRhS9ynnAYA01+Z2Z0JMJfH7PLvTdvAd/+sWvcebQcSSa4yjsacKVFz6AeXRJAB1deUr5vU8+hi888RW0ZQvERR0+dUN6hU/sSMQhl7BJFLNRrYXKO2eOPj/nbfxQwKclaZRRCLVkcOThigBnY+GphlhnGdZw4q13ceStwwh3cAp+fZy9wEGmsxW7H7gddz26H/2Dg9AorkI1g1mNc0UNRxgmPV/SzywJlqozS8PK5cnLvcemLx9Xk0ab49k8MJiUzWUszs9hcWEBaysrqKxtwKzWCCxyn07Z7A+NVZOpJRApZ6liDnGqqEq6akmyiUhPUy+yuRx7SzNKbSWU2ttQbG1BoVBEJp7igMKpey38ViRJ//7g/SffvfjB7yzO8+X5RUxdncDc9Aw21tf5IqOPvGcKeBcQuXRAJFqRcVvOh9LMeHbQstQLTsoUD34lHZ5ZIJUzZNKWnh70bNuKrq5uFJqKaA4Sr36TteKBC7j/tnt+//Lrf9aPzp7+Va1qptKpNDo6OpHPckKqk34cqxvs7y4dlE7H4+7msY1/KycoOVMIhRWe/eS4lmDnE0FKlTi4tjdznjQ4PeeZMQ9r5VV0xgp/eOD2u74jtjdFWZ54vf7GG4PjixPPnhsd3k/ZbBHFcpkqh4OIpExEyBMd4AFU5jnaivQjEnRiRrqcKGZcmKQSwAb1IZNAKpaCHmpWb1v38X29O1848NCBNzctAv8F+iXXpQZMRFsAAAAASUVORK5CYII=", WCIcon, [NSNumber numberWithBool:YES], @@ -647,6 +968,29 @@ - (NSDictionary *)themeWithName:(NSString *)name { +#pragma mark - + +- (WITemplateBundle *)templateBundleWithIdentifier:(NSString *)identifier { + WITemplateBundle *bundle; + + WITemplateBundleManager *privateTemplateManager = [WITemplateBundleManager templateManagerForPath:[[NSBundle mainBundle] resourcePath]]; + WITemplateBundleManager *publicTemplateManager = [WITemplateBundleManager templateManagerForPath:[WCApplicationSupportPath stringByStandardizingPath] isPrivate:NO]; + + bundle = [privateTemplateManager templateWithIdentifier:identifier]; + + if(bundle) + return bundle; + + bundle = [publicTemplateManager templateWithIdentifier:identifier]; + + if(bundle) + return bundle; + + return nil; +} + + + #pragma mark - - (NSDictionary *)eventWithTag:(NSUInteger)tag { diff --git a/Sources/WCSettingsController.m b/Sources/WCSettingsController.m index 7cdb2d14..96e53f4c 100644 --- a/Sources/WCSettingsController.m +++ b/Sources/WCSettingsController.m @@ -145,7 +145,7 @@ - (void)windowDidLoad { [_categoriesTableView registerForDraggedTypes:[NSArray arrayWithObject:WCCategoryPboardType]]; comboBoxCell = [[NSComboBoxCell alloc] init]; - [comboBoxCell setControlSize:NSSmallControlSize]; + [comboBoxCell setControlSize:NSControlSizeSmall]; [comboBoxCell setFont:[NSFont smallSystemFont]]; [comboBoxCell setUsesDataSource:NO]; [comboBoxCell addItemsWithObjectValues:[NSArray arrayWithObjects: diff --git a/Sources/WCSourceImageView.m b/Sources/WCSourceImageView.m index 92bb6b8c..7311bbc1 100644 --- a/Sources/WCSourceImageView.m +++ b/Sources/WCSourceImageView.m @@ -59,10 +59,10 @@ - (void)mouseDown:(NSEvent *)event { previousTooMuchLeft = previousTooMuchRight = NO; while(YES) { - nextEvent = [[self window] nextEventMatchingMask:NSLeftMouseUpMask | NSLeftMouseDraggedMask]; + nextEvent = [[self window] nextEventMatchingMask:NSEventMaskLeftMouseUp | NSEventMaskLeftMouseDragged]; switch([nextEvent type]) { - case NSLeftMouseDragged: + case NSEventTypeLeftMouseDragged: frame = [view frame]; point = [nextEvent locationInWindow]; @@ -114,7 +114,7 @@ - (void)mouseDown:(NSEvent *)event { [_splitView adjustSubviews]; break; - case NSLeftMouseUp: + case NSEventTypeLeftMouseUp: [NSCursor pop]; return; break; diff --git a/Sources/WCSourceSplitView.m b/Sources/WCSourceSplitView.m index 0dda92d8..9bdf22c1 100644 --- a/Sources/WCSourceSplitView.m +++ b/Sources/WCSourceSplitView.m @@ -30,21 +30,21 @@ @implementation WCSourceSplitView -//- (CGFloat)dividerThickness { -// if(self.isVertical) -// return 1.0; -// else -// return 0; -// -// return 1.0; -//} -// -// -// -//- (void)drawDividerInRect:(NSRect)rect { -// [[NSColor darkGrayColor] set]; -// -// NSRectFill(rect); -//} +- (CGFloat)dividerThickness { + if(self.isVertical) + return 1.0; + else + return 0; + + return 1.0; +} + + + +- (void)drawDividerInRect:(NSRect)rect { + [[NSColor darkGrayColor] set]; + + NSRectFill(rect); +} @end diff --git a/Sources/WCThreadWindow.m b/Sources/WCThreadWindow.m index dc728cd6..9f88b18f 100644 --- a/Sources/WCThreadWindow.m +++ b/Sources/WCThreadWindow.m @@ -91,12 +91,16 @@ - (void)dealloc - (void)windowDidLoad { NSDictionary *theme; - NSString *title; + NSString *templatePath, *title; + NSBundle *templateBundle; theme = [[_board connection] theme]; + templateBundle = [[WCSettings settings] templateBundleWithIdentifier:[theme objectForKey:WCThemesTemplate]]; + templatePath = [templateBundle bundlePath]; [_threadController setBoard:_board]; [_threadController setThread:_thread]; + [_threadController setTemplatePath:templatePath]; [_threadController reloadData]; diff --git a/Sources/WCTransferConnection.m b/Sources/WCTransferConnection.m index 7cb9d8d9..6efcbb35 100644 --- a/Sources/WCTransferConnection.m +++ b/Sources/WCTransferConnection.m @@ -79,8 +79,7 @@ - (void)dealloc { - (BOOL)connectWithTimeout:(NSTimeInterval)timeout error:(WCError **)error { WIAddress *address; - NSInteger cipher; - + address = [WIAddress addressWithString:[[self URL] host] error:error]; if(!address) @@ -93,13 +92,10 @@ - (BOOL)connectWithTimeout:(NSTimeInterval)timeout error:(WCError **)error { if(![_socket connectWithTimeout:timeout error:error]) return NO; - - if([[WCSettings settings] objectForKey:WCNetworkEncryptionCipher]) - cipher = [[[WCSettings settings] objectForKey:WCNetworkEncryptionCipher] integerValue]; _p7Socket = [[WIP7Socket alloc] initWithSocket:_socket spec:WCP7Spec]; - if(![_p7Socket connectWithOptions:(WIP7CompressionDeflate | (1 << (cipher + 1)) | WIP7ChecksumSHA256) + if(![_p7Socket connectWithOptions:WIP7EncryptionRSA_AES256_SHA256 | WIP7ChecksumSHA256 serialization:WIP7Binary username:[[self URL] user] password:[[[self URL] password] SHA1] @@ -112,70 +108,6 @@ - (BOOL)connectWithTimeout:(NSTimeInterval)timeout error:(WCError **)error { } -- (BOOL)connectWithTimeout:(NSTimeInterval)timeout bookmark:(NSDictionary *)bookmark error:(WCError **)error { - WIAddress *address; - NSInteger cipher; - NSUInteger options = 0; - - address = [WIAddress addressWithString:[[self URL] host] error:error]; - - if(!address) - return NO; - - [address setPort:[[self URL] port]]; - - _socket = [[WISocket alloc] initWithAddress:address type:WISocketTCP]; - [_socket setInteractive:YES]; - - if(![_socket connectWithTimeout:timeout error:error]) - return NO; - - - if([[WCSettings settings] objectForKey:WCNetworkEncryptionCipher]) - cipher = [[[WCSettings settings] objectForKey:WCNetworkEncryptionCipher] integerValue]; - - if(bookmark && [bookmark objectForKey:WCBookmarksEncryptionCipher]) - cipher = [[bookmark objectForKey:WCBookmarksEncryptionCipher] integerValue]; - - _p7Socket = [[WIP7Socket alloc] initWithSocket:_socket spec:WCP7Spec]; - - options = WIP7CompressionDeflate | (1 << (cipher +1)); - - if (options | WIP7EncryptionRSA_AES128_SHA1 || - options | WIP7EncryptionRSA_AES192_SHA1 || - options | WIP7EncryptionRSA_AES256_SHA1 || - options | WIP7EncryptionRSA_BF128_SHA1 || - options | WIP7EncryptionRSA_3DES192_SHA1) { - options = options | WIP7ChecksumSHA1; - - } else if(options | WIP7EncryptionRSA_AES128_SHA256 || - options | WIP7EncryptionRSA_AES192_SHA256 || - options | WIP7EncryptionRSA_AES256_SHA256 || - options | WIP7EncryptionRSA_BF128_SHA256 || - options | WIP7EncryptionRSA_3DES192_SHA256) { - options = options | WIP7ChecksumSHA256; - - } else if(options | WIP7EncryptionRSA_AES128_SHA512 || - options | WIP7EncryptionRSA_AES192_SHA512 || - options | WIP7EncryptionRSA_AES256_SHA512 || - options | WIP7EncryptionRSA_BF128_SHA512 || - options | WIP7EncryptionRSA_3DES192_SHA512) { - options = options | WIP7ChecksumSHA512; - } - - if(![_p7Socket connectWithOptions:options - serialization:WIP7Binary - username:[[self URL] user] - password:[[[self URL] password] SHA1] - timeout:timeout - error:error]) { - return NO; - } - - return YES; -} - - - (void)disconnect { [_p7Socket close]; [_socket close]; diff --git a/Sources/WCTransfers.m b/Sources/WCTransfers.m index c2765f79..6aaf7d66 100644 --- a/Sources/WCTransfers.m +++ b/Sources/WCTransfers.m @@ -454,8 +454,8 @@ - (BOOL)_downloadFiles:(NSArray *)files toFolder:(NSString *)destination { description = NSLS(@"The file already exists on disk. Overwrite to delete it.", @"Transfers overwrite alert description"); } else { - title = [NSSWF:NSLS(@"Overwrite %u files?", @"Transfers overwrite alert title (count)"), - [existingFiles count]]; + title = [NSSWF:NSLS(@"Overwrite %lu files?", @"Transfers overwrite alert title (count)"), + (unsigned long)[existingFiles count]]; description = NSLS(@"Some files already exist on disk. Overwrite to delete them.", @"Transfers overwrite alert description"); } @@ -1343,15 +1343,10 @@ - (BOOL)_createRemainingDirectoriesOnConnection:(WCTransferConnection *)connecti - (BOOL)_connectConnection:(WCTransferConnection *)connection forTransfer:(WCTransfer *)transfer error:(WCError **)error { WIP7Message *message; - - if([transfer bookmark]) { - if(![connection connectWithTimeout:30.0 bookmark:[transfer bookmark] error:error]) - return NO; - } else { - if(![connection connectWithTimeout:30.0 error:error]) - return NO; - } - + + if(![connection connectWithTimeout:30.0 error:error]) + return NO; + if(![connection writeMessage:[connection clientInfoMessage] timeout:30.0 error:error] || ![connection writeMessage:[connection setNickMessage] timeout:30.0 error:error] || ![connection writeMessage:[connection setStatusMessage] timeout:30.0 error:error] || @@ -1951,11 +1946,12 @@ + (id)transfers { + (BOOL)downloadFileAtPath:(NSString *)path forConnection:(WCServerConnection *)connection { WCFile *file; - path = [path stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding]; - file = [WCFile fileWithFile:path connection:connection]; + // Using stringByRemovingPercentEncoding instead of stringByReplacingPercentEscapesUsingEncoding + path = [path stringByRemovingPercentEncoding]; + file = [WCFile fileWithFile:path connection:connection]; if(file && ![file isFolder]) { - [[WCTransfers transfers] downloadFiles:[NSArray arrayWithObject:file]]; + [[WCTransfers transfers] downloadFiles:@[file]]; // Using modern array literal syntax return YES; } @@ -1965,6 +1961,7 @@ + (BOOL)downloadFileAtPath:(NSString *)path forConnection:(WCServerConnection *) + #pragma mark - - (id)init { @@ -2056,7 +2053,7 @@ - (void)windowDidLoad { NSToolbar *toolbar; NSData *data; WCTransfer *transfer; - + _errorQueue = [[WCErrorQueue alloc] initWithWindow:[self window]]; toolbar = [[NSToolbar alloc] initWithIdentifier:@"Transfers"]; @@ -2102,7 +2099,7 @@ - (NSToolbarItem *)toolbar:(NSToolbar *)toolbar itemForItemIdentifier:(NSString NSString *title; NSControl *control; SEL selector; - + if([identifier isEqualToString:@"Start"]) { selector = @selector(start:); title = NSLS(@"Start", @"Start transfer toolbar item"); @@ -2162,7 +2159,7 @@ - (NSToolbarItem *)toolbar:(NSToolbar *)toolbar itemForItemIdentifier:(NSString [menuRepresentation setTarget:self]; [item setMenuFormRepresentation:menuRepresentation]; [menuRepresentation release]; - + return item; } @@ -2553,7 +2550,7 @@ - (NSString *)deleteDocumentMenuItemTitle { if([transfers count] == 1) return [NSSWF:NSLS(@"Remove \u201c%@\u201d", @"Delete menu item (transfer"), [[transfers objectAtIndex:0] name]]; else if([transfers count] > 1) - return [NSSWF:NSLS(@"Remove %u Items", @"Delete menu item (count"), [transfers count]]; + return [NSSWF:NSLS(@"Remove %lu Items", @"Delete menu item (count"), (unsigned long)[transfers count]]; else return NSLS(@"Delete", @"Delete menu item"); } @@ -2568,7 +2565,7 @@ - (NSString *)quickLookMenuItemTitle { if([transfers count] == 1) return [NSSWF:NSLS(@"Quick Look \u201c%@\u201d", @"Quick Look menu item (transfer"), [[transfers objectAtIndex:0] name]]; else if([transfers count] > 1) - return [NSSWF:NSLS(@"Quick Look %u Items", @"Quick Look menu item (count"), [transfers count]]; + return [NSSWF:NSLS(@"Quick Look %lu Items", @"Quick Look menu item (count"), (unsigned long)[transfers count]]; else return NSLS(@"Quick Look", @"Quick Look menu item"); } diff --git a/Sources/WCUserCell.m b/Sources/WCUserCell.m index e43b7f8e..6c606242 100644 --- a/Sources/WCUserCell.m +++ b/Sources/WCUserCell.m @@ -167,7 +167,7 @@ - (void)drawWithFrame:(NSRect)frame inView:(NSView *)view { status = [(NSDictionary *) [self objectValue] objectForKey:WCUserCellStatusKey]; offset = floor((frame.size.height - 35.0) / 2.0); - if([self controlSize] == NSRegularControlSize) { + if([self controlSize] == NSControlSizeRegular) { if([status length] > 0) rect = NSMakeRect(frame.origin.x, frame.origin.y + offset + 1.0, frame.size.width, 17.0); else @@ -186,7 +186,7 @@ - (void)drawWithFrame:(NSRect)frame inView:(NSView *)view { } } - if([self controlSize] == NSSmallControlSize && [status length] > 0) { + if([self controlSize] == NSControlSizeSmall && [status length] > 0) { [string appendAttributedString: [NSAttributedString attributedStringWithString:[NSSWF:@" %@", status] attributes:_statusAttributes]]; } @@ -194,7 +194,7 @@ - (void)drawWithFrame:(NSRect)frame inView:(NSView *)view { [_nickCell setAttributedStringValue:string]; [_nickCell drawWithFrame:rect inView:view]; - if([self controlSize] == NSRegularControlSize && [status length] > 0) { + if([self controlSize] == NSControlSizeRegular && [status length] > 0) { rect = NSMakeRect(frame.origin.x, frame.origin.y + offset + 19.0, frame.size.width, 14.0); string = [NSAttributedString attributedStringWithString:status attributes:_statusAttributes]; diff --git a/Sources/iTunes.h b/Sources/iTunes.h index b7514f62..5da6f8d6 100644 --- a/Sources/iTunes.h +++ b/Sources/iTunes.h @@ -6,183 +6,171 @@ #import -@class iTunesApplication, iTunesItem, iTunesAirPlayDevice, iTunesArtwork, iTunesEncoder, iTunesEQPreset, iTunesPlaylist, iTunesAudioCDPlaylist, iTunesLibraryPlaylist, iTunesRadioTunerPlaylist, iTunesSource, iTunesSubscriptionPlaylist, iTunesTrack, iTunesAudioCDTrack, iTunesFileTrack, iTunesSharedTrack, iTunesURLTrack, iTunesUserPlaylist, iTunesFolderPlaylist, iTunesVisual, iTunesWindow, iTunesBrowserWindow, iTunesEQWindow, iTunesMiniplayerWindow, iTunesPlaylistWindow, iTunesVideoWindow; +@class iTunesPrintSettings, iTunesApplication, iTunesItem, iTunesArtwork, iTunesEncoder, iTunesEQPreset, iTunesPlaylist, iTunesAudioCDPlaylist, iTunesDevicePlaylist, iTunesLibraryPlaylist, iTunesRadioTunerPlaylist, iTunesSource, iTunesTrack, iTunesAudioCDTrack, iTunesDeviceTrack, iTunesFileTrack, iTunesSharedTrack, iTunesURLTrack, iTunesUserPlaylist, iTunesFolderPlaylist, iTunesVisual, iTunesWindow, iTunesBrowserWindow, iTunesEQWindow, iTunesPlaylistWindow; enum iTunesEKnd { - iTunesEKndTrackListing = 'kTrk' /* a basic listing of tracks within a playlist */, - iTunesEKndAlbumListing = 'kAlb' /* a listing of a playlist grouped by album */, - iTunesEKndCdInsert = 'kCDi' /* a printout of the playlist for jewel case inserts */ + iTunesEKndTrackListing = 'kTrk' /* a basic listing of tracks within a playlist */, + iTunesEKndAlbumListing = 'kAlb' /* a listing of a playlist grouped by album */, + iTunesEKndCdInsert = 'kCDi' /* a printout of the playlist for jewel case inserts */ }; typedef enum iTunesEKnd iTunesEKnd; enum iTunesEnum { - iTunesEnumStandard = 'lwst' /* Standard PostScript error handling */, - iTunesEnumDetailed = 'lwdt' /* print a detailed report of PostScript errors */ + iTunesEnumStandard = 'lwst' /* Standard PostScript error handling */, + iTunesEnumDetailed = 'lwdt' /* print a detailed report of PostScript errors */ }; typedef enum iTunesEnum iTunesEnum; enum iTunesEPlS { - iTunesEPlSStopped = 'kPSS', - iTunesEPlSPlaying = 'kPSP', - iTunesEPlSPaused = 'kPSp', - iTunesEPlSFastForwarding = 'kPSF', - iTunesEPlSRewinding = 'kPSR' + iTunesEPlSStopped = 'kPSS', + iTunesEPlSPlaying = 'kPSP', + iTunesEPlSPaused = 'kPSp', + iTunesEPlSFastForwarding = 'kPSF', + iTunesEPlSRewinding = 'kPSR' }; typedef enum iTunesEPlS iTunesEPlS; enum iTunesERpt { - iTunesERptOff = 'kRpO', - iTunesERptOne = 'kRp1', - iTunesERptAll = 'kAll' + iTunesERptOff = 'kRpO', + iTunesERptOne = 'kRp1', + iTunesERptAll = 'kAll' }; typedef enum iTunesERpt iTunesERpt; -enum iTunesEShM { - iTunesEShMSongs = 'kShS', - iTunesEShMAlbums = 'kShA', - iTunesEShMGroupings = 'kShG' +enum iTunesEVSz { + iTunesEVSzSmall = 'kVSS', + iTunesEVSzMedium = 'kVSM', + iTunesEVSzLarge = 'kVSL' }; -typedef enum iTunesEShM iTunesEShM; +typedef enum iTunesEVSz iTunesEVSz; enum iTunesESrc { - iTunesESrcLibrary = 'kLib', - iTunesESrcAudioCD = 'kACD', - iTunesESrcMP3CD = 'kMCD', - iTunesESrcRadioTuner = 'kTun', - iTunesESrcSharedLibrary = 'kShd', - iTunesESrcITunesStore = 'kITS', - iTunesESrcUnknown = 'kUnk' + iTunesESrcLibrary = 'kLib', + iTunesESrcIPod = 'kPod', + iTunesESrcAudioCD = 'kACD', + iTunesESrcMP3CD = 'kMCD', + iTunesESrcDevice = 'kDev', + iTunesESrcRadioTuner = 'kTun', + iTunesESrcSharedLibrary = 'kShd', + iTunesESrcUnknown = 'kUnk' }; typedef enum iTunesESrc iTunesESrc; enum iTunesESrA { - iTunesESrAAlbums = 'kSrL' /* albums only */, - iTunesESrAAll = 'kAll' /* all text fields */, - iTunesESrAArtists = 'kSrR' /* artists only */, - iTunesESrAComposers = 'kSrC' /* composers only */, - iTunesESrADisplayed = 'kSrV' /* visible text fields */, - iTunesESrANames = 'kSrS' /* track names only */ + iTunesESrAAlbums = 'kSrL' /* albums only */, + iTunesESrAAll = 'kAll' /* all text fields */, + iTunesESrAArtists = 'kSrR' /* artists only */, + iTunesESrAComposers = 'kSrC' /* composers only */, + iTunesESrADisplayed = 'kSrV' /* visible text fields */, + iTunesESrASongs = 'kSrS' /* song names only */ }; typedef enum iTunesESrA iTunesESrA; enum iTunesESpK { - iTunesESpKNone = 'kNon', - iTunesESpKFolder = 'kSpF', - iTunesESpKGenius = 'kSpG', - iTunesESpKLibrary = 'kSpL', - iTunesESpKMusic = 'kSpZ', - iTunesESpKPurchasedMusic = 'kSpM' + iTunesESpKNone = 'kNon', + iTunesESpKBooks = 'kSpA', + iTunesESpKFolder = 'kSpF', + iTunesESpKGenius = 'kSpG', + iTunesESpKITunesU = 'kSpU', + iTunesESpKLibrary = 'kSpL', + iTunesESpKMovies = 'kSpI', + iTunesESpKMusic = 'kSpZ', + iTunesESpKPartyShuffle = 'kSpS', + iTunesESpKPodcasts = 'kSpP', + iTunesESpKPurchasedMusic = 'kSpM', + iTunesESpKTVShows = 'kSpT' }; typedef enum iTunesESpK iTunesESpK; -enum iTunesEMdK { - iTunesEMdKSong = 'kMdS' /* music track */, - iTunesEMdKMusicVideo = 'kVdV' /* music video track */, - iTunesEMdKUnknown = 'kUnk' +enum iTunesEVdK { + iTunesEVdKNone = 'kNon' /* not a video or unknown video kind */, + iTunesEVdKMovie = 'kVdM' /* movie track */, + iTunesEVdKMusicVideo = 'kVdV' /* music video track */, + iTunesEVdKTVShow = 'kVdT' /* TV show track */ }; -typedef enum iTunesEMdK iTunesEMdK; +typedef enum iTunesEVdK iTunesEVdK; enum iTunesERtK { - iTunesERtKUser = 'kRtU' /* user-specified rating */, - iTunesERtKComputed = 'kRtC' /* computed rating */ + iTunesERtKUser = 'kRtU' /* user-specified rating */, + iTunesERtKComputed = 'kRtC' /* iTunes-computed rating */ }; typedef enum iTunesERtK iTunesERtK; -enum iTunesEAPD { - iTunesEAPDComputer = 'kAPC', - iTunesEAPDAirPortExpress = 'kAPX', - iTunesEAPDAppleTV = 'kAPT', - iTunesEAPDAirPlayDevice = 'kAPO', - iTunesEAPDBluetoothDevice = 'kAPB', - iTunesEAPDHomePod = 'kAPH', - iTunesEAPDUnknown = 'kAPU' -}; -typedef enum iTunesEAPD iTunesEAPD; - -enum iTunesEClS { - iTunesEClSUnknown = 'kUnk', - iTunesEClSPurchased = 'kPur', - iTunesEClSMatched = 'kMat', - iTunesEClSUploaded = 'kUpl', - iTunesEClSIneligible = 'kRej', - iTunesEClSRemoved = 'kRem', - iTunesEClSError = 'kErr', - iTunesEClSDuplicate = 'kDup', - iTunesEClSSubscription = 'kSub', - iTunesEClSNoLongerAvailable = 'kRev', - iTunesEClSNotUploaded = 'kUpP' -}; -typedef enum iTunesEClS iTunesEClS; -@protocol iTunesGenericMethods -- (void) printPrintDialog:(BOOL)printDialog withProperties:(NSDictionary *)withProperties kind:(iTunesEKnd)kind theme:(NSString *)theme; // Print the specified object(s) +/* + * Standard Suite + */ + +@interface iTunesPrintSettings : SBObject + +@property (readonly) NSInteger copies; // the number of copies of a document to be printed +@property (readonly) BOOL collating; // Should printed copies be collated? +@property (readonly) NSInteger startingPage; // the first page of the document to be printed +@property (readonly) NSInteger endingPage; // the last page of the document to be printed +@property (readonly) NSInteger pagesAcross; // number of logical pages laid across a physical page +@property (readonly) NSInteger pagesDown; // number of logical pages laid out down a physical page +@property (readonly) iTunesEnum errorHandling; // how errors are handled +@property (copy, readonly) NSDate *requestedPrintTime; // the time at which the desktop printer should print the document +@property (copy, readonly) NSArray *printerFeatures; // printer specific options +@property (copy, readonly) NSString *faxNumber; // for fax number +@property (copy, readonly) NSString *targetPrinter; // for target printer + +- (void) printPrintDialog:(BOOL)printDialog withProperties:(iTunesPrintSettings *)withProperties kind:(iTunesEKnd)kind theme:(NSString *)theme; // Print the specified object(s) - (void) close; // Close an object - (void) delete; // Delete an element from an object - (SBObject *) duplicateTo:(SBObject *)to; // Duplicate one or more object(s) - (BOOL) exists; // Verify if an object exists -- (void) open; // Open the specified object(s) -- (void) save; // Save the specified object(s) +- (void) open; // open the specified object(s) - (void) playOnce:(BOOL)once; // play the current track or the specified track or file. -- (void) select; // select the specified object(s) @end /* - * Music Suite + * iTunes Suite */ // The application program @interface iTunesApplication : SBApplication -- (SBElementArray *) AirPlayDevices; -- (SBElementArray *) browserWindows; -- (SBElementArray *) encoders; -- (SBElementArray *) EQPresets; -- (SBElementArray *) EQWindows; -- (SBElementArray *) miniplayerWindows; -- (SBElementArray *) playlists; -- (SBElementArray *) playlistWindows; -- (SBElementArray *) sources; -- (SBElementArray *) tracks; -- (SBElementArray *) videoWindows; -- (SBElementArray *) visuals; -- (SBElementArray *) windows; - -@property (readonly) BOOL AirPlayEnabled; // is AirPlay currently enabled? -@property (readonly) BOOL converting; // is a track currently being converted? -@property (copy) NSArray *currentAirPlayDevices; // the currently selected AirPlay device(s) +- (SBElementArray *) browserWindows; +- (SBElementArray *) encoders; +- (SBElementArray *) EQPresets; +- (SBElementArray *) EQWindows; +- (SBElementArray *) playlistWindows; +- (SBElementArray *) sources; +- (SBElementArray *) visuals; +- (SBElementArray *) windows; + @property (copy) iTunesEncoder *currentEncoder; // the currently selected encoder (MP3, AIFF, WAV, etc.) @property (copy) iTunesEQPreset *currentEQPreset; // the currently selected equalizer preset @property (copy, readonly) iTunesPlaylist *currentPlaylist; // the playlist containing the currently targeted track -@property (copy, readonly) NSString *currentStreamTitle; // the name of the current track in the playing stream (provided by streaming server) +@property (copy, readonly) NSString *currentStreamTitle; // the name of the current song in the playing stream (provided by streaming server) @property (copy, readonly) NSString *currentStreamURL; // the URL of the playing stream or streaming web site (provided by streaming server) @property (copy, readonly) iTunesTrack *currentTrack; // the current targeted track -@property (copy) iTunesVisual *currentVisual; // the currently selected visual plug-in +@property (copy) iTunesVisual *currentVisual; // the currently selected visual plug-in @property BOOL EQEnabled; // is the equalizer enabled? @property BOOL fixedIndexing; // true if all AppleScript track indices should be independent of the play order of the owning playlist. -@property BOOL frontmost; // is this the active application? -@property BOOL fullScreen; // is the application using the entire screen? +@property BOOL frontmost; // is iTunes the frontmost application? +@property BOOL fullScreen; // are visuals displayed using the entire screen? @property (copy, readonly) NSString *name; // the name of the application @property BOOL mute; // has the sound output been muted? -@property double playerPosition; // the player’s position within the currently playing track in seconds. -@property (readonly) iTunesEPlS playerState; // is the player stopped, paused, or playing? +@property NSInteger playerPosition; // the player’s position within the currently playing track in seconds. +@property (readonly) iTunesEPlS playerState; // is iTunes stopped, paused, or playing? @property (copy, readonly) SBObject *selection; // the selection visible to the user -@property BOOL shuffleEnabled; // are songs played in random order? -@property iTunesEShM shuffleMode; // the playback shuffle mode -@property iTunesERpt songRepeat; // the playback repeat mode @property NSInteger soundVolume; // the sound output volume (0 = minimum, 100 = maximum) -@property (copy, readonly) NSString *version; // the version of the application +@property (copy, readonly) NSString *version; // the version of iTunes @property BOOL visualsEnabled; // are visuals currently being displayed? +@property iTunesEVSz visualSize; // the size of the displayed visual -- (void) printPrintDialog:(BOOL)printDialog withProperties:(NSDictionary *)withProperties kind:(iTunesEKnd)kind theme:(NSString *)theme; // Print the specified object(s) -- (void) run; // Run the application -- (void) quit; // Quit the application -- (iTunesTrack *) add:(NSArray *)x to:(SBObject *)to; // add one or more files to a playlist +- (void) printPrintDialog:(BOOL)printDialog withProperties:(iTunesPrintSettings *)withProperties kind:(iTunesEKnd)kind theme:(NSString *)theme; // Print the specified object(s) +- (void) run; // run iTunes +- (void) quit; // quit iTunes +- (iTunesTrack *) add:(NSArray *)x to:(SBObject *)to; // add one or more files to a playlist - (void) backTrack; // reposition to beginning of current track or go to previous track if already at start of current track -- (iTunesTrack *) convert:(NSArray *)x; // convert one or more files or tracks +- (iTunesTrack *) convert:(NSArray *)x; // convert one or more files or tracks - (void) fastForward; // skip forward in a playing track - (void) nextTrack; // advance to the next track in the current playlist - (void) pause; // pause playback @@ -192,50 +180,44 @@ typedef enum iTunesEClS iTunesEClS; - (void) resume; // disable fast forward/rewind and resume playback, if playing. - (void) rewind; // skip backwards in a playing track - (void) stop; // stop playback -- (void) openLocation:(NSString *)x; // Opens an iTunes Store or audio stream URL +- (void) update; // update the specified iPod +- (void) eject; // eject the specified iPod +- (void) subscribe:(NSString *)x; // subscribe to a podcast feed +- (void) updateAllPodcasts; // update all subscribed podcast feeds +- (void) updatePodcast; // update podcast feed +- (void) openLocation:(NSString *)x; // Opens a Music Store or audio stream URL @end // an item -@interface iTunesItem : SBObject +@interface iTunesItem : SBObject @property (copy, readonly) SBObject *container; // the container of the item - (NSInteger) id; // the id of the item -@property (readonly) NSInteger index; // the index of the item in internal application order +@property (readonly) NSInteger index; // The index of the item in internal application order. @property (copy) NSString *name; // the name of the item -@property (copy, readonly) NSString *persistentID; // the id of the item as a hexadecimal string. This id does not change over time. -@property (copy) NSDictionary *properties; // every property of the item +@property (copy, readonly) NSString *persistentID; // the id of the item as a hexidecimal string. This id does not change over time. -- (void) download; // download a cloud track or playlist +- (void) printPrintDialog:(BOOL)printDialog withProperties:(iTunesPrintSettings *)withProperties kind:(iTunesEKnd)kind theme:(NSString *)theme; // Print the specified object(s) +- (void) close; // Close an object +- (void) delete; // Delete an element from an object +- (SBObject *) duplicateTo:(SBObject *)to; // Duplicate one or more object(s) +- (BOOL) exists; // Verify if an object exists +- (void) open; // open the specified object(s) +- (void) playOnce:(BOOL)once; // play the current track or the specified track or file. - (void) reveal; // reveal and select a track or playlist @end -// an AirPlay device -@interface iTunesAirPlayDevice : iTunesItem - -@property (readonly) BOOL active; // is the device currently being played to? -@property (readonly) BOOL available; // is the device currently available? -@property (readonly) iTunesEAPD kind; // the kind of the device -@property (copy, readonly) NSString *networkAddress; // the network (MAC) address of the device -- (BOOL) protected; // is the device password- or passcode-protected? -@property BOOL selected; // is the device currently selected? -@property (readonly) BOOL supportsAudio; // does the device support audio playback? -@property (readonly) BOOL supportsVideo; // does the device support video playback? -@property NSInteger soundVolume; // the output volume for the device (0 = minimum, 100 = maximum) - - -@end - -// a piece of art within a track or playlist +// a piece of art within a track @interface iTunesArtwork : iTunesItem @property (copy) NSImage *data; // data for this artwork, in the form of a picture @property (copy) NSString *objectDescription; // description of artwork as a string -@property (readonly) BOOL downloaded; // was this artwork downloaded by Music? +@property (readonly) BOOL downloaded; // was this artwork downloaded by iTunes? @property (copy, readonly) NSNumber *format; // the data format for this piece of artwork @property NSInteger kind; // kind or purpose of this piece of artwork -@property (copy) id rawData; // data for this artwork, in original format +@property (copy) NSData *rawData; // data for this artwork, in original format @end @@ -268,32 +250,30 @@ typedef enum iTunesEClS iTunesEClS; @end -// a list of tracks/streams +// a list of songs/streams @interface iTunesPlaylist : iTunesItem -- (SBElementArray *) tracks; -- (SBElementArray *) artworks; +- (SBElementArray *) tracks; -@property (copy) NSString *objectDescription; // the description of the playlist -@property BOOL disliked; // is this playlist disliked? -@property (readonly) NSInteger duration; // the total length of all tracks (in seconds) +@property (readonly) NSInteger duration; // the total length of all songs (in seconds) @property (copy) NSString *name; // the name of the playlist -@property BOOL loved; // is this playlist loved? @property (copy, readonly) iTunesPlaylist *parent; // folder which contains this playlist (if any) -@property (readonly) NSInteger size; // the total size of all tracks (in bytes) +@property BOOL shuffle; // play the songs in this playlist in random order? +@property (readonly) long long size; // the total size of all songs (in bytes) +@property iTunesERpt songRepeat; // playback repeat mode @property (readonly) iTunesESpK specialKind; // special playlist kind -@property (copy, readonly) NSString *time; // the length of all tracks in MM:SS format +@property (copy, readonly) NSString *time; // the length of all songs in MM:SS format @property (readonly) BOOL visible; // is this playlist visible in the Source list? - (void) moveTo:(SBObject *)to; // Move playlist(s) to a new location -- (iTunesTrack *) searchFor:(NSString *)for_ only:(iTunesESrA)only; // search a playlist for tracks matching the search string. Identical to entering search text in the Search field. +- (iTunesTrack *) searchFor:(NSString *)for_ only:(iTunesESrA)only; // search a playlist for tracks matching the search string. Identical to entering search text in the Search field in iTunes. @end // a playlist representing an audio CD @interface iTunesAudioCDPlaylist : iTunesPlaylist -- (SBElementArray *) audioCDTracks; +- (SBElementArray *) audioCDTracks; @property (copy) NSString *artist; // the artist of the CD @property BOOL compilation; // is this CD a compilation album? @@ -306,12 +286,20 @@ typedef enum iTunesEClS iTunesEClS; @end -// the master library playlist +// a playlist representing the contents of a portable device +@interface iTunesDevicePlaylist : iTunesPlaylist + +- (SBElementArray *) deviceTracks; + + +@end + +// the master music library playlist @interface iTunesLibraryPlaylist : iTunesPlaylist -- (SBElementArray *) fileTracks; -- (SBElementArray *) URLTracks; -- (SBElementArray *) sharedTracks; +- (SBElementArray *) fileTracks; +- (SBElementArray *) URLTracks; +- (SBElementArray *) sharedTracks; @end @@ -319,46 +307,37 @@ typedef enum iTunesEClS iTunesEClS; // the radio tuner playlist @interface iTunesRadioTunerPlaylist : iTunesPlaylist -- (SBElementArray *) URLTracks; +- (SBElementArray *) URLTracks; @end -// a media source (library, CD, device, etc.) +// a music source (music library, CD, device, etc.) @interface iTunesSource : iTunesItem -- (SBElementArray *) audioCDPlaylists; -- (SBElementArray *) libraryPlaylists; -- (SBElementArray *) playlists; -- (SBElementArray *) radioTunerPlaylists; -- (SBElementArray *) subscriptionPlaylists; -- (SBElementArray *) userPlaylists; +- (SBElementArray *) audioCDPlaylists; +- (SBElementArray *) devicePlaylists; +- (SBElementArray *) libraryPlaylists; +- (SBElementArray *) playlists; +- (SBElementArray *) radioTunerPlaylists; +- (SBElementArray *) userPlaylists; @property (readonly) long long capacity; // the total size of the source if it has a fixed size @property (readonly) long long freeSpace; // the free space on the source if it has a fixed size @property (readonly) iTunesESrc kind; - -@end - -// a subscription playlist from Apple Music -@interface iTunesSubscriptionPlaylist : iTunesPlaylist - -- (SBElementArray *) fileTracks; -- (SBElementArray *) URLTracks; - +- (void) update; // update the specified iPod +- (void) eject; // eject the specified iPod @end // playable audio source @interface iTunesTrack : iTunesItem -- (SBElementArray *) artworks; +- (SBElementArray *) artworks; @property (copy) NSString *album; // the album name of the track @property (copy) NSString *albumArtist; // the album artist of the track -@property BOOL albumDisliked; // is the album for this track disliked? -@property BOOL albumLoved; // is the album for this track loved? @property NSInteger albumRating; // the rating of the album for this track (0 to 100) @property (readonly) iTunesERtK albumRatingKind; // the rating kind of the album rating for this track @property (copy) NSString *artist; // the artist/source of the track @@ -367,7 +346,6 @@ typedef enum iTunesEClS iTunesEClS; @property BOOL bookmarkable; // is the playback position for this track remembered? @property NSInteger bpm; // the tempo of this track in beats per minute @property (copy) NSString *category; // the category of the track -@property (readonly) iTunesEClS cloudStatus; // the iCloud status of the track @property (copy) NSString *comment; // freeform notes about the track @property BOOL compilation; // is this track from a compilation album? @property (copy) NSString *composer; // the composer of the track @@ -376,9 +354,6 @@ typedef enum iTunesEClS iTunesEClS; @property (copy) NSString *objectDescription; // the description of the track @property NSInteger discCount; // the total number of discs in the source album @property NSInteger discNumber; // the index of the disc containing this track on the source album -@property BOOL disliked; // is this track disliked? -@property (copy, readonly) NSString *downloaderAppleID; // the Apple ID of the person who downloaded this track -@property (copy, readonly) NSString *downloaderName; // the name of the person who downloaded this track @property (readonly) double duration; // the length of the track in seconds @property BOOL enabled; // is this track checked for playback? @property (copy) NSString *episodeID; // the episode ID of the track @@ -389,18 +364,12 @@ typedef enum iTunesEClS iTunesEClS; @property (copy) NSString *genre; // the music/audio genre (category) of the track @property (copy) NSString *grouping; // the grouping (piece) of the track. Generally used to denote movements within a classical work. @property (copy, readonly) NSString *kind; // a text description of the track -@property (copy) NSString *longDescription; // the long description of the track -@property BOOL loved; // is this track loved? +@property (copy) NSString *longDescription; @property (copy) NSString *lyrics; // the lyrics of the track -@property iTunesEMdK mediaKind; // the media kind of the track @property (copy, readonly) NSDate *modificationDate; // the modification date of the content of this track -@property (copy) NSString *movement; // the movement name of the track -@property NSInteger movementCount; // the total number of movements in the work -@property NSInteger movementNumber; // the index of the movement in the work @property NSInteger playedCount; // number of times this track has been played @property (copy) NSDate *playedDate; // the date and time this track was last played -@property (copy, readonly) NSString *purchaserAppleID; // the Apple ID of the person who purchased this track -@property (copy, readonly) NSString *purchaserName; // the name of the person who purchased this track +@property (readonly) BOOL podcast; // is this track a podcast episode? @property NSInteger rating; // the rating of this track (0 to 100) @property (readonly) iTunesERtK ratingKind; // the rating kind of this track @property (copy, readonly) NSDate *releaseDate; // the release date of this track @@ -416,14 +385,14 @@ typedef enum iTunesEClS iTunesEClS; @property (copy) NSString *sortName; // override string to use for the track when sorting by name @property (copy) NSString *sortComposer; // override string to use for the track when sorting by composer @property (copy) NSString *sortShow; // override string to use for the track when sorting by show name -@property (readonly) long long size; // the size of the track (in bytes) +@property (readonly) NSInteger size; // the size of the track (in bytes) @property double start; // the start time of the track in seconds @property (copy, readonly) NSString *time; // the length of the track in MM:SS format @property NSInteger trackCount; // the total number of tracks on the source album @property NSInteger trackNumber; // the index of the track on the source album @property BOOL unplayed; // is this track unplayed? +@property iTunesEVdK videoKind; // kind of video track @property NSInteger volumeAdjustment; // relative volume adjustment of the track (-100% to 100%) -@property (copy) NSString *work; // the work name of the track @property NSInteger year; // the year the track was recorded/released @@ -435,6 +404,12 @@ typedef enum iTunesEClS iTunesEClS; @property (copy, readonly) NSURL *location; // the location of the file represented by this track +@end + +// a track residing on a portable music player +@interface iTunesDeviceTrack : iTunesTrack + + @end // a track representing an audio file (MP3, AIFF, etc.) @@ -457,19 +432,19 @@ typedef enum iTunesEClS iTunesEClS; @property (copy) NSString *address; // the URL for this track +- (void) download; // download podcast episode @end // custom playlists created by the user @interface iTunesUserPlaylist : iTunesPlaylist -- (SBElementArray *) fileTracks; -- (SBElementArray *) URLTracks; -- (SBElementArray *) sharedTracks; +- (SBElementArray *) fileTracks; +- (SBElementArray *) URLTracks; +- (SBElementArray *) sharedTracks; @property BOOL shared; // is this playlist shared? @property (readonly) BOOL smart; // is this a Smart Playlist? -@property (readonly) BOOL genius; // is this a Genius Playlist? @end @@ -490,10 +465,9 @@ typedef enum iTunesEClS iTunesEClS; @interface iTunesWindow : iTunesItem @property NSRect bounds; // the boundary rectangle for the window -@property (readonly) BOOL closeable; // does the window have a close button? -@property (readonly) BOOL collapseable; // does the window have a collapse button? +@property (readonly) BOOL closeable; // does the window have a close box? +@property (readonly) BOOL collapseable; // does the window have a collapse (windowshade) box? @property BOOL collapsed; // is the window collapsed? -@property BOOL fullScreen; // is the window full screen? @property NSPoint position; // the upper left position of the window @property (readonly) BOOL resizable; // is the window resizable? @property BOOL visible; // is the window visible? @@ -503,23 +477,20 @@ typedef enum iTunesEClS iTunesEClS; @end -// the main window +// the main iTunes window @interface iTunesBrowserWindow : iTunesWindow -@property (copy, readonly) SBObject *selection; // the selected tracks +@property BOOL minimized; // is the small player visible? +@property (copy, readonly) SBObject *selection; // the selected songs @property (copy) iTunesPlaylist *view; // the playlist currently displayed in the window @end -// the equalizer window +// the iTunes equalizer window @interface iTunesEQWindow : iTunesWindow - -@end - -// the miniplayer window -@interface iTunesMiniplayerWindow : iTunesWindow +@property BOOL minimized; // is the small EQ window visible? @end @@ -527,15 +498,9 @@ typedef enum iTunesEClS iTunesEClS; // a sub-window showing a single playlist @interface iTunesPlaylistWindow : iTunesWindow -@property (copy, readonly) SBObject *selection; // the selected tracks +@property (copy, readonly) SBObject *selection; // the selected songs @property (copy, readonly) iTunesPlaylist *view; // the playlist displayed in the window @end -// the video window -@interface iTunesVideoWindow : iTunesWindow - - -@end - diff --git a/Templates/Neo/Neo-Info.plist b/Templates/Neo/Neo-Info.plist new file mode 100644 index 00000000..84738c53 --- /dev/null +++ b/Templates/Neo/Neo-Info.plist @@ -0,0 +1,36 @@ + + + + + CFBundleDevelopmentRegion + English + CFBundleExecutable + ${EXECUTABLE_NAME} + CFBundleIconFile + + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + ${PRODUCT_NAME} + CFBundlePackageType + BNDL + CFBundleShortVersionString + $(MARKETING_VERSION) + CFBundleSignature + ???? + CFBundleVersion + $(CURRENT_PROJECT_VERSION) + NSHumanReadableCopyright + Copyright © 2012-2019 Read-Write.fr. All rights reserved. + NSPrincipalClass + + WCTemplateTypes + + Boards + Messages + Chat + + + diff --git a/Templates/Neo/de.lproj/InfoPlist.strings b/Templates/Neo/de.lproj/InfoPlist.strings new file mode 100644 index 00000000..477b28ff --- /dev/null +++ b/Templates/Neo/de.lproj/InfoPlist.strings @@ -0,0 +1,2 @@ +/* Localized versions of Info.plist keys */ + diff --git a/Templates/Neo/en.lproj/InfoPlist.strings b/Templates/Neo/en.lproj/InfoPlist.strings new file mode 100644 index 00000000..477b28ff --- /dev/null +++ b/Templates/Neo/en.lproj/InfoPlist.strings @@ -0,0 +1,2 @@ +/* Localized versions of Info.plist keys */ + diff --git a/Templates/Neo/fr.lproj/InfoPlist.strings b/Templates/Neo/fr.lproj/InfoPlist.strings new file mode 100644 index 00000000..477b28ff --- /dev/null +++ b/Templates/Neo/fr.lproj/InfoPlist.strings @@ -0,0 +1,2 @@ +/* Localized versions of Info.plist keys */ + diff --git a/Templates/Neo/htdocs/boards.html b/Templates/Neo/htdocs/boards.html new file mode 100644 index 00000000..968657cf --- /dev/null +++ b/Templates/Neo/htdocs/boards.html @@ -0,0 +1,81 @@ + + + + Boards + + + +
+ + + + diff --git a/Templates/Neo/htdocs/chat.html b/Templates/Neo/htdocs/chat.html new file mode 100644 index 00000000..0ec9eab0 --- /dev/null +++ b/Templates/Neo/htdocs/chat.html @@ -0,0 +1,10 @@ + + + + Chat + + + +
+ + \ No newline at end of file diff --git a/Templates/Neo/htdocs/css/boards.css b/Templates/Neo/htdocs/css/boards.css new file mode 100644 index 00000000..611a460f --- /dev/null +++ b/Templates/Neo/htdocs/css/boards.css @@ -0,0 +1,183 @@ +* { + padding:0; + margin:0; +} + +html { + background-color: ; +} + +a { color: ; } + +body { + font: normal "", sans-serif; + color: ; + background-color: ; + line-height: 16px; +} + +#thread-content { + padding-left: 10px; + padding-right: 12px; + padding-top: 10px; +} + + +div.post { + margin-bottom: 20px; + background-color: ; + border-radius: 3px; + border: 1px solid #999; +} + + +div.postheader { + font: normal 14px "Helvetica", sans-serif; + background-color: ; + padding: 7px; + font-weight: bold; + min-height: 50px; + border-bottom: 1px solid #999; + border-top-left-radius: 3px; + border-top-right-radius: 3px; +} + +div.postinfo { + width: 315px; + float: left; +} + + +div.postattributes { + margin-left: 10px; +} + +div.postheadertitles { + float: left; +} + +span.postheadertitle { + font-weight: bold; + display: block; + color: gray; + text-align: right; + width: 45px; + margin-left: 10px; + padding-right: 5px; +} + +div.postheadervalues { + +} + +span.postheadervalue { + display: block; +} + + +span.postfrom { + min-width: 400px; + text-align: left; + display: inline-block; + margin-left: 10px; + font-weight: bold; +} + +span.postpostdatestring, span.posteditdatestring { + font: normal 12px "", sans-serif; +} + +span.postpostdate, span.posteditdate { + font: normal 12px "", sans-serif; +} + + +div.posticon { float: left; margin-top: 5px; } + +.postunread { + float: right; + display: block; + padding-top: 6px; +} + +div.postbuttons { + padding: 5px; + margin-right: 5px; + margin-top: 5px; + text-align: right; + width: auto; + float: right; +} + +input.replybutton { + background: transparent url("../img/reply.svg") no-repeat; +} + +input.quotebutton { + background: transparent url("../img/quote.svg") no-repeat; +} + +input.editbutton { + background: transparent url("../img/edit.svg") no-repeat; +} + +input.deletebutton { + background: transparent url("../img/delete.svg") no-repeat; +} + +.postbuttons input[type="button"] { + margin-left: 16px; +} + +input[type="button"] { + height: 20px; + width: 16px; + background-size: 16px 20px; + background-position: center center; + text-align: center; + cursor: pointer; + display: inline-block; + opacity: 0.65; + border: none; + + -webkit-appearance: none; + -webkit-transition: opacity 0.2s ease-in-out; +} + +input[type="button"]:not(.disabled):hover { + opacity: 0.80; +} + + +div.postbody { + padding: 10px; + clear: both; +} + +div.postbody img, div.postbody iframe, div.postbody embed { + max-width: 100%; +} + +div.reply { + padding: 10px; + background-color: ; +} + +div.reply input { + display: inline-block; + min-width: 80px; + padding-left: 15px; + padding-right: 15px; + background-color: rgba(0,255,10,0.1); +} + +blockquote { + margin: 0px 0px 0px 15px; + padding: 8px; + border: 1px solid #bfbfbf; + background-color: ; +} + +pre { margin: 0px; } + +div.center { text-align: center; }; diff --git a/Templates/Neo/htdocs/css/chat.css b/Templates/Neo/htdocs/css/chat.css new file mode 100644 index 00000000..6077e51f --- /dev/null +++ b/Templates/Neo/htdocs/css/chat.css @@ -0,0 +1,92 @@ +/**/ + +* { + padding:0; + margin:0; +} + +body { + font: normal "", sans-serif; + color: ; + background-color: ; + line-height: 16px; +} + +a { color: ; } + +#chat-content { + margin: 10px; + overflow:hidden; +} + +.chat-content-shadow { + box-shadow: 0px 0px 2px rgba(127, 131, 137, 0.4); + border-radius: 3px; + border: 1px solid #999; +} + +.chat-line, .chat-event { + box-shadow: 0px -1px 0px #999; +} + +.chat-line { + width: 100%; + min-height : 10px; + background-color: ; +} + +.chat-line img, .chat-line iframe, .chat-line embed { + max-width: 100%; +} + +.chat-event { + background: ; + text-align: center; + min-height : 10px; + padding: 5px; + padding-bottom: 7px; + color: ; +} + +span.timestamp { + float : left; +} + +.chat-line span.timestamp { + color: ; +} + +.chat-event span.timestamp { + color: ; +} + + +span.nick { + width: 80px; + float : right; + color: ; + text-align: right; + font-weight: bold; + text-overflow: ellipsis; + white-space:nowrap; + overflow:hidden; +} + +table { + border: none; + border-collapse: collapse; + width: 100%; +} + +td { + vertical-align: top; + padding: 5px; + padding-bottom: 8px; +} + +td.sidebar { + width: 130px; + background-color: ; + border-right: 1px solid #999; +} + diff --git a/Templates/Neo/htdocs/css/default_boards.css b/Templates/Neo/htdocs/css/default_boards.css new file mode 100644 index 00000000..8b137891 --- /dev/null +++ b/Templates/Neo/htdocs/css/default_boards.css @@ -0,0 +1 @@ + diff --git a/Templates/Neo/htdocs/css/default_chat.css b/Templates/Neo/htdocs/css/default_chat.css new file mode 100644 index 00000000..e69de29b diff --git a/Templates/Neo/htdocs/css/default_messages.css b/Templates/Neo/htdocs/css/default_messages.css new file mode 100644 index 00000000..e69de29b diff --git a/Templates/Neo/htdocs/css/messages.css b/Templates/Neo/htdocs/css/messages.css new file mode 100644 index 00000000..6cc7aaa7 --- /dev/null +++ b/Templates/Neo/htdocs/css/messages.css @@ -0,0 +1,111 @@ +body { + font: normal "", sans-serif; + background-color: ; + color: ; + margin: 0; + line-height: 16px; +} + +div.messagewrapper { + background-color: ; + padding-left: 10px; + padding-right: 12px; + padding-bottom: 20px; +} + +div.messagewrapper:nth-child(1) { + margin-top:20px; +} + +div.message, div.messagestatus { + border-top: 1px solid rgba(255,255,255,0.65); +} + +div.messagestatus, div.messageinfo { + font-size: 12px; + color: #FFFFFF; +} + +div.messageheader, div.messagebody, div.messagestatus { + padding: 5px 10px 5px 10px; +} + +div.messageheader { + min-height: 32px; + border-bottom: 1px solid #999; + border-top-left-radius: 3px; + border-top-right-radius: 3px; + background: ; +} + +div.message { + background-color: ; + border-radius: 3px; + border: 1px solid #999; + box-shadow: 0px 0px 2px rgba(127, 131, 137, 0.4); +} + +div.messagestatus { + color: white; + background-color: #81b7e9; + background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#81b7e9), color-stop(100%,#5184d2)); + margin-bottom: 20px; +} + +div.icon { + float: left; + margin-right: 10px; +} + +div.messageinfo span.nick { + display: block; +} + +div.messageinfo span.time:after { + content: " - "; + font-size: 10px; + color: #999999; +} + +div.messageinfo span.time, div.messageinfo span.server { + font-size: 10px; + color: ; + +} + +div.messageinfo img { + width: 16px; + height: 16px; + float: right; + margin-bottom: 8px; +} + +div.messagebody { + padding-bottom: 15px; + margin-left: 5px; + margin-top: 5px; + +} + +.from span.nick { + font-weight: bold; + color: #000000; +} + +.to span.nick { + font-weight: bold; + color: #ff0000; +} + +div.loaderWrapper { + position:fixed; + z-index:10; + width:100%; + height: 50px; + left:0; + top:-50px; + height: 50px; + background:yellow; +} + +a { color: ; } diff --git a/Templates/Neo/htdocs/img/delete.svg b/Templates/Neo/htdocs/img/delete.svg new file mode 100755 index 00000000..5c29f6ca --- /dev/null +++ b/Templates/Neo/htdocs/img/delete.svg @@ -0,0 +1,11 @@ + + + + + + + + diff --git a/Templates/Neo/htdocs/img/delete_dark.svg b/Templates/Neo/htdocs/img/delete_dark.svg new file mode 100755 index 00000000..275753d3 --- /dev/null +++ b/Templates/Neo/htdocs/img/delete_dark.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/Templates/Neo/htdocs/img/edit.svg b/Templates/Neo/htdocs/img/edit.svg new file mode 100755 index 00000000..51e7256a --- /dev/null +++ b/Templates/Neo/htdocs/img/edit.svg @@ -0,0 +1,10 @@ + + + + + + + + + diff --git a/Templates/Neo/htdocs/img/edit_dark.svg b/Templates/Neo/htdocs/img/edit_dark.svg new file mode 100755 index 00000000..87d501ec --- /dev/null +++ b/Templates/Neo/htdocs/img/edit_dark.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/Templates/Neo/htdocs/img/quote.svg b/Templates/Neo/htdocs/img/quote.svg new file mode 100755 index 00000000..4a8a6e37 --- /dev/null +++ b/Templates/Neo/htdocs/img/quote.svg @@ -0,0 +1,8 @@ + + + + + + + diff --git a/Templates/Neo/htdocs/img/quote_dark.svg b/Templates/Neo/htdocs/img/quote_dark.svg new file mode 100755 index 00000000..9f3ac488 --- /dev/null +++ b/Templates/Neo/htdocs/img/quote_dark.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/Templates/Neo/htdocs/img/reply.svg b/Templates/Neo/htdocs/img/reply.svg new file mode 100755 index 00000000..f254dcd4 --- /dev/null +++ b/Templates/Neo/htdocs/img/reply.svg @@ -0,0 +1,10 @@ + + + + + + + diff --git a/Templates/Neo/htdocs/img/reply_dark.svg b/Templates/Neo/htdocs/img/reply_dark.svg new file mode 100755 index 00000000..9addcb9b --- /dev/null +++ b/Templates/Neo/htdocs/img/reply_dark.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/Templates/Neo/htdocs/js/boards.js b/Templates/Neo/htdocs/js/boards.js new file mode 100644 index 00000000..7552c1a2 --- /dev/null +++ b/Templates/Neo/htdocs/js/boards.js @@ -0,0 +1,211 @@ + +/* Copyright (c) 2013 Read-Write.fr. All rights reserved. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, + * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + + +/* + * README + * ====== + * + * This script is powered by an Objective-C controller that provides + * a data source interface to let JS access to objects shared by the + * application. + * + * The data source API mainly returns JSON string representations of + * Cocoa objects. The following functions are available from this script: + * + * ## return the number of objects in the data source + * integer numberOfObjects(); + * + * ## return all data source objects as an array of JSON strings + * array JSONObjects(); + * + * ## return paged data source objects as an array of JSON strings + * array JSONObjectsFromOffsetWithLimit(integer offset, integer limit); + * + * ## return one data source object as a JSON string + * string JSONObjectAtIndex(integer index); + * + */ + + +/*************** + * GLOBALS + ***************/ +var PAGE_SIZE = 20; + +var PAGE_OFFSET = 0; +var PAGE_LIMIT = 0; +var OLD_MESSAGE_DATE = null; + + +/*************** + * PUBLIC API + * + * Functions described here are public and designed to be called by + * Objective-C controllers in order to update the view, passing data + * and settings. + ***************/ + +/* Print a message in JSON format. Usualy called by Objective-C to append + * a new message to the view. (DO NOT REMOVE THIS FUNCTON !!!) */ +function printPost(json) { + var post = eval(json); + + // TODO: handle error properly + if(!post) + return; + + // Append the message to the DOM and scroll to bottom of the view + _appendPost(post); +} + + + +/*************** + * PRIVATE API + ***************/ + +/* Append a post object to the DOM */ +function _appendPost(post) { + // format the post object to a HTML string + var html = _formatPostAsHTHML(post); + + // append element to wrapper element + $('#thread-content').append(html); +} + + +/* Prepend a post object to the DOM */ +function _prependPost(post) { + // format the post object to a HTML string + var html = _formatPostAsHTHML(post); + + // append element to wrapper element + $('#thread-content').prepend(html); +} + + +/* Format a post object to a HTML string */ +function _formatPostAsHTHML(post) { + console.log(post); + + var replyDisabled = post["replyDisabled"] == "true" ? "disabled": ""; + var quoteDisabled = post["quoteDisabled"] == "true" ? "disabled": ""; + var editDisabled = post["editDisabled"] == "true" ? "disabled": ""; + var deleteDisabled = post["deleteDisabled"] == "true" ? "disabled": ""; + + // return a HTML string + return '' + + '
' + + '
' + + '
' + + 'icon' + + '
' + + '
' + + '' + post["from"] + '' + + '
' + + '' + post["postDateString"] + '' + + ' ' + post["postDate"] + '' + + '
' + + '
' + + '' + post["editDateString"] + '' + + ' ' + post["editDate"] + '' + + '
' + + '
' + + '' + + '
' + + '
' + + '' + + '' + + '' + + '' + + '
' + + '
' + + '
' + + '
' + post["postContent"] + '
' + + '
'; +} + + + +/* Scroll to the bottom of the HTML document */ +function _scrollToBottom() { + window.scrollTo(0,document.body.scrollHeight); +} + + + +/*************** + * WINDOW + ***************/ + +$(window).scroll(function() { + // if($(window).height() < $(document).height() && $(window).scrollTop() == 0) { + // _addPage(); + // } +}); + + + + + +/*************** + * DOCUMENT + ***************/ + +/* Ready? ... Go! */ +$(document).ready(function(){ + $('#thread-content').hide(); + + var controller = window.Controller; + var posts = eval(controller.JSONObjects()); + + for (var i in posts) { + _appendPost(posts[i]); + _scrollToBottom(); + } + + if ( $("img").length && $("img").attr("src") != "data:image/tiff;base64," ) { + $("img").load(function() { + _scrollToBottom(); + $('#thread-content').fadeIn(); + }); + } else { + $('#thread-content').fadeIn(); + } +}); + + + +/* %99$ bottle$... */ diff --git a/Templates/Neo/htdocs/js/chat.js b/Templates/Neo/htdocs/js/chat.js new file mode 100644 index 00000000..5fcf82ff --- /dev/null +++ b/Templates/Neo/htdocs/js/chat.js @@ -0,0 +1,201 @@ + +/* Copyright (c) 2013 Read-Write.fr. All rights reserved. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, + * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + + +/* + * README + * ====== + * + * This script is powered by an Objective-C controller that provides + * a data source interface to let JS access to objects shared by the + * application. + * + * The data source API mainly returns JSON string representations of + * Cocoa objects. The following functions are available from this script: + * + * ## return the number of objects in the data source + * integer numberOfObjects(); + * + * ## return all data source objects as an array of JSON strings + * array JSONObjects(); + * + * ## return paged data source objects as an array of JSON strings + * array JSONObjectsFromOffsetWithLimit(integer offset, integer limit); + * + * ## return one data source object as a JSON string + * string JSONObjectAtIndex(integer index); + * + */ + + +/*************** + * GLOBALS + ***************/ +var PAGE_SIZE = 20; + +var PAGE_OFFSET = 0; +var PAGE_LIMIT = 0; +var OLD_MESSAGE_DATE = null; + + +/*************** + * PUBLIC API + * + * Functions described here are public and designed to be called by + * Objective-C controllers in order to update the view, passing data + * and settings. + ***************/ + +/* Print a message in JSON format. Usualy called by Objective-C to append + * a new message to the view. (DO NOT REMOVE THIS FUNCTON !!!) */ +function printMessage(json) { + var message = eval(json); + + // TODO: handle error properly + if(!message) + return; + + // Append the message to the DOM and scroll to bottom of the view + _appendMessage(message); + _scrollToBottom(); +} + +function printEvent(json) { + var event = eval(json); + + // TODO: handle error properly + if(!event) + return; + + // Append the event to the DOM and scroll to bottom of the view + _appendEvent(event); + _scrollToBottom(); +} + + + +/*************** + * PRIVATE API + ***************/ + +/* Append a message object to the DOM */ +function _appendMessage(message) { + // format the message object to a HTML string + var html = _formatMessageAsHTHML(message); + + // append element to wrapper element + $('#chat-content').append(html); + + $('img').load(function() { + _scrollToBottom(); + }); +} + +function _appendEvent(event) { + // format the event object to a HTML string + var html = _formatEventAsHTHML(event); + + // append element to wrapper element + $('#chat-content').append(html); + + $('img').load(function() { + _scrollToBottom(); + }); +} + +/* Format a message object to a HTML string */ +function _formatMessageAsHTHML(message) { + return '
' + + '' + + '' + + '' + + '' + + '' + + '
' + + '' + message["timestamp"] + '' + + '' + message["nick"] + '' + + '' + + '' + message["message"] + '' + + '
' + + '
'; +} + +function _formatEventAsHTHML(event) { + return '
' + + '' + event["timestamp"] + '' + + '' + event["message"] + '' + + '
'; +} + + + +/* Scroll to the bottom of the HTML document */ +function _scrollToBottom() { + window.scrollTo(0,document.body.scrollHeight); +} + + + + + +/*************** + * WINDOW + ***************/ + +$(window).scroll(function() { +// if($(window).height() < $(document).height() && $(window).scrollTop() == 0) { +// _addPage(); +// } +}); + +$(window).load(function(){ + $('img').bind('load', function() { + console.log('new image loaded: ' + this.src); + }); +}); + + + + + +/*************** + * DOCUMENT + ***************/ + +/* Ready? ... Go! */ +$(document).ready(function(){ + console.log('ready'); + + $('body').on('DOMNodeInserted', '#chat-content', function(e) { + if($('#chat-content').children().size() > 0) { + $('#chat-content').addClass("chat-content-shadow"); + } + }); +}); + + + +/* %99$ bottle$... */ \ No newline at end of file diff --git a/Templates/Neo/htdocs/js/functions.js b/Templates/Neo/htdocs/js/functions.js new file mode 100644 index 00000000..d472bfb1 --- /dev/null +++ b/Templates/Neo/htdocs/js/functions.js @@ -0,0 +1,91 @@ +/* + * Copyright (c) 2013 Read-Write.fr. All rights reserved. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, + * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +/** @const */ +var ONE_SECOND = 1000; +/** @const */ +var ONE_MINUTE = ONE_SECOND * 60; +/** @const */ +var ONE_HOUR = ONE_MINUTE * 60; +/** @const */ +var ONE_DAY = ONE_HOUR * 24; +/** @const */ +var ONE_WEEK = ONE_DAY * 7; +/** @const */ +var ONE_YEAR = ONE_DAY * 365; + +function createSingularOrPlural(singular, plural, value, divisor) { + value = Math.floor(value / divisor); + + return value < 2 ? singular : plural.replace('?', value); +} + +function getPrettyTimeAgo(timeAgo) { + + if (timeAgo >= ONE_YEAR) { + return "over a year ago"; + } + + if (timeAgo >= ONE_DAY) { + return createSingularOrPlural("yesterday", "? days ago", timeAgo, ONE_DAY); + } + + if (timeAgo >= ONE_HOUR) { + return createSingularOrPlural("about 1 hour ago", "? hours ago", timeAgo, ONE_HOUR); + } + + if (timeAgo >= ONE_MINUTE) { + return createSingularOrPlural("about 1 minute ago", "? minutes ago", timeAgo, ONE_MINUTE); + } + + return createSingularOrPlural("right now", "? seconds ago", timeAgo, ONE_SECOND); +} + +function getMillisecondsSinceDate(dateString) { + var rightNow = new Date(); + var then = new Date(dateString); + + // If we're using jQuery, check if we're using IE to perform a defect fix. + if (window.$ && window.$.browser && window.$.browser.msie) { + then = Date.parse(dateString.replace(/( \+)/, ' UTC$1')); + } + + return rightNow - then; +} + +function timeAgo(dateString) { + + var timeDifference = getMillisecondsSinceDate(dateString); + + if (isNaN(timeDifference) || timeDifference < 0) { + return ""; + } + + return { + tAgo: getPrettyTimeAgo(timeDifference), + timeCheck: timeDifference >= 2 * ONE_HOUR + }; +} \ No newline at end of file diff --git a/Templates/Neo/htdocs/js/jquery.js b/Templates/Neo/htdocs/js/jquery.js new file mode 100644 index 00000000..2be209dd --- /dev/null +++ b/Templates/Neo/htdocs/js/jquery.js @@ -0,0 +1,6 @@ +/*! jQuery v2.0.3 | (c) 2005, 2013 jQuery Foundation, Inc. | jquery.org/license +//@ sourceMappingURL=jquery-2.0.3.min.map +*/ +(function(e,undefined){var t,n,r=typeof undefined,i=e.location,o=e.document,s=o.documentElement,a=e.jQuery,u=e.$,l={},c=[],p="2.0.3",f=c.concat,h=c.push,d=c.slice,g=c.indexOf,m=l.toString,y=l.hasOwnProperty,v=p.trim,x=function(e,n){return new x.fn.init(e,n,t)},b=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,w=/\S+/g,T=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,C=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,k=/^-ms-/,N=/-([\da-z])/gi,E=function(e,t){return t.toUpperCase()},S=function(){o.removeEventListener("DOMContentLoaded",S,!1),e.removeEventListener("load",S,!1),x.ready()};x.fn=x.prototype={jquery:p,constructor:x,init:function(e,t,n){var r,i;if(!e)return this;if("string"==typeof e){if(r="<"===e.charAt(0)&&">"===e.charAt(e.length-1)&&e.length>=3?[null,e,null]:T.exec(e),!r||!r[1]&&t)return!t||t.jquery?(t||n).find(e):this.constructor(t).find(e);if(r[1]){if(t=t instanceof x?t[0]:t,x.merge(this,x.parseHTML(r[1],t&&t.nodeType?t.ownerDocument||t:o,!0)),C.test(r[1])&&x.isPlainObject(t))for(r in t)x.isFunction(this[r])?this[r](t[r]):this.attr(r,t[r]);return this}return i=o.getElementById(r[2]),i&&i.parentNode&&(this.length=1,this[0]=i),this.context=o,this.selector=e,this}return e.nodeType?(this.context=this[0]=e,this.length=1,this):x.isFunction(e)?n.ready(e):(e.selector!==undefined&&(this.selector=e.selector,this.context=e.context),x.makeArray(e,this))},selector:"",length:0,toArray:function(){return d.call(this)},get:function(e){return null==e?this.toArray():0>e?this[this.length+e]:this[e]},pushStack:function(e){var t=x.merge(this.constructor(),e);return t.prevObject=this,t.context=this.context,t},each:function(e,t){return x.each(this,e,t)},ready:function(e){return x.ready.promise().done(e),this},slice:function(){return this.pushStack(d.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(e){var t=this.length,n=+e+(0>e?t:0);return this.pushStack(n>=0&&t>n?[this[n]]:[])},map:function(e){return this.pushStack(x.map(this,function(t,n){return e.call(t,n,t)}))},end:function(){return this.prevObject||this.constructor(null)},push:h,sort:[].sort,splice:[].splice},x.fn.init.prototype=x.fn,x.extend=x.fn.extend=function(){var e,t,n,r,i,o,s=arguments[0]||{},a=1,u=arguments.length,l=!1;for("boolean"==typeof s&&(l=s,s=arguments[1]||{},a=2),"object"==typeof s||x.isFunction(s)||(s={}),u===a&&(s=this,--a);u>a;a++)if(null!=(e=arguments[a]))for(t in e)n=s[t],r=e[t],s!==r&&(l&&r&&(x.isPlainObject(r)||(i=x.isArray(r)))?(i?(i=!1,o=n&&x.isArray(n)?n:[]):o=n&&x.isPlainObject(n)?n:{},s[t]=x.extend(l,o,r)):r!==undefined&&(s[t]=r));return s},x.extend({expando:"jQuery"+(p+Math.random()).replace(/\D/g,""),noConflict:function(t){return e.$===x&&(e.$=u),t&&e.jQuery===x&&(e.jQuery=a),x},isReady:!1,readyWait:1,holdReady:function(e){e?x.readyWait++:x.ready(!0)},ready:function(e){(e===!0?--x.readyWait:x.isReady)||(x.isReady=!0,e!==!0&&--x.readyWait>0||(n.resolveWith(o,[x]),x.fn.trigger&&x(o).trigger("ready").off("ready")))},isFunction:function(e){return"function"===x.type(e)},isArray:Array.isArray,isWindow:function(e){return null!=e&&e===e.window},isNumeric:function(e){return!isNaN(parseFloat(e))&&isFinite(e)},type:function(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?l[m.call(e)]||"object":typeof e},isPlainObject:function(e){if("object"!==x.type(e)||e.nodeType||x.isWindow(e))return!1;try{if(e.constructor&&!y.call(e.constructor.prototype,"isPrototypeOf"))return!1}catch(t){return!1}return!0},isEmptyObject:function(e){var t;for(t in e)return!1;return!0},error:function(e){throw Error(e)},parseHTML:function(e,t,n){if(!e||"string"!=typeof e)return null;"boolean"==typeof t&&(n=t,t=!1),t=t||o;var r=C.exec(e),i=!n&&[];return r?[t.createElement(r[1])]:(r=x.buildFragment([e],t,i),i&&x(i).remove(),x.merge([],r.childNodes))},parseJSON:JSON.parse,parseXML:function(e){var t,n;if(!e||"string"!=typeof e)return null;try{n=new DOMParser,t=n.parseFromString(e,"text/xml")}catch(r){t=undefined}return(!t||t.getElementsByTagName("parsererror").length)&&x.error("Invalid XML: "+e),t},noop:function(){},globalEval:function(e){var t,n=eval;e=x.trim(e),e&&(1===e.indexOf("use strict")?(t=o.createElement("script"),t.text=e,o.head.appendChild(t).parentNode.removeChild(t)):n(e))},camelCase:function(e){return e.replace(k,"ms-").replace(N,E)},nodeName:function(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()},each:function(e,t,n){var r,i=0,o=e.length,s=j(e);if(n){if(s){for(;o>i;i++)if(r=t.apply(e[i],n),r===!1)break}else for(i in e)if(r=t.apply(e[i],n),r===!1)break}else if(s){for(;o>i;i++)if(r=t.call(e[i],i,e[i]),r===!1)break}else for(i in e)if(r=t.call(e[i],i,e[i]),r===!1)break;return e},trim:function(e){return null==e?"":v.call(e)},makeArray:function(e,t){var n=t||[];return null!=e&&(j(Object(e))?x.merge(n,"string"==typeof e?[e]:e):h.call(n,e)),n},inArray:function(e,t,n){return null==t?-1:g.call(t,e,n)},merge:function(e,t){var n=t.length,r=e.length,i=0;if("number"==typeof n)for(;n>i;i++)e[r++]=t[i];else while(t[i]!==undefined)e[r++]=t[i++];return e.length=r,e},grep:function(e,t,n){var r,i=[],o=0,s=e.length;for(n=!!n;s>o;o++)r=!!t(e[o],o),n!==r&&i.push(e[o]);return i},map:function(e,t,n){var r,i=0,o=e.length,s=j(e),a=[];if(s)for(;o>i;i++)r=t(e[i],i,n),null!=r&&(a[a.length]=r);else for(i in e)r=t(e[i],i,n),null!=r&&(a[a.length]=r);return f.apply([],a)},guid:1,proxy:function(e,t){var n,r,i;return"string"==typeof t&&(n=e[t],t=e,e=n),x.isFunction(e)?(r=d.call(arguments,2),i=function(){return e.apply(t||this,r.concat(d.call(arguments)))},i.guid=e.guid=e.guid||x.guid++,i):undefined},access:function(e,t,n,r,i,o,s){var a=0,u=e.length,l=null==n;if("object"===x.type(n)){i=!0;for(a in n)x.access(e,t,a,n[a],!0,o,s)}else if(r!==undefined&&(i=!0,x.isFunction(r)||(s=!0),l&&(s?(t.call(e,r),t=null):(l=t,t=function(e,t,n){return l.call(x(e),n)})),t))for(;u>a;a++)t(e[a],n,s?r:r.call(e[a],a,t(e[a],n)));return i?e:l?t.call(e):u?t(e[0],n):o},now:Date.now,swap:function(e,t,n,r){var i,o,s={};for(o in t)s[o]=e.style[o],e.style[o]=t[o];i=n.apply(e,r||[]);for(o in t)e.style[o]=s[o];return i}}),x.ready.promise=function(t){return n||(n=x.Deferred(),"complete"===o.readyState?setTimeout(x.ready):(o.addEventListener("DOMContentLoaded",S,!1),e.addEventListener("load",S,!1))),n.promise(t)},x.each("Boolean Number String Function Array Date RegExp Object Error".split(" "),function(e,t){l["[object "+t+"]"]=t.toLowerCase()});function j(e){var t=e.length,n=x.type(e);return x.isWindow(e)?!1:1===e.nodeType&&t?!0:"array"===n||"function"!==n&&(0===t||"number"==typeof t&&t>0&&t-1 in e)}t=x(o),function(e,undefined){var t,n,r,i,o,s,a,u,l,c,p,f,h,d,g,m,y,v="sizzle"+-new Date,b=e.document,w=0,T=0,C=st(),k=st(),N=st(),E=!1,S=function(e,t){return e===t?(E=!0,0):0},j=typeof undefined,D=1<<31,A={}.hasOwnProperty,L=[],q=L.pop,H=L.push,O=L.push,F=L.slice,P=L.indexOf||function(e){var t=0,n=this.length;for(;n>t;t++)if(this[t]===e)return t;return-1},R="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",M="[\\x20\\t\\r\\n\\f]",W="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",$=W.replace("w","w#"),B="\\["+M+"*("+W+")"+M+"*(?:([*^$|!~]?=)"+M+"*(?:(['\"])((?:\\\\.|[^\\\\])*?)\\3|("+$+")|)|)"+M+"*\\]",I=":("+W+")(?:\\(((['\"])((?:\\\\.|[^\\\\])*?)\\3|((?:\\\\.|[^\\\\()[\\]]|"+B.replace(3,8)+")*)|.*)\\)|)",z=RegExp("^"+M+"+|((?:^|[^\\\\])(?:\\\\.)*)"+M+"+$","g"),_=RegExp("^"+M+"*,"+M+"*"),X=RegExp("^"+M+"*([>+~]|"+M+")"+M+"*"),U=RegExp(M+"*[+~]"),Y=RegExp("="+M+"*([^\\]'\"]*)"+M+"*\\]","g"),V=RegExp(I),G=RegExp("^"+$+"$"),J={ID:RegExp("^#("+W+")"),CLASS:RegExp("^\\.("+W+")"),TAG:RegExp("^("+W.replace("w","w*")+")"),ATTR:RegExp("^"+B),PSEUDO:RegExp("^"+I),CHILD:RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+M+"*(even|odd|(([+-]|)(\\d*)n|)"+M+"*(?:([+-]|)"+M+"*(\\d+)|))"+M+"*\\)|)","i"),bool:RegExp("^(?:"+R+")$","i"),needsContext:RegExp("^"+M+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+M+"*((?:-\\d)?\\d*)"+M+"*\\)|)(?=[^-]|$)","i")},Q=/^[^{]+\{\s*\[native \w/,K=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,Z=/^(?:input|select|textarea|button)$/i,et=/^h\d$/i,tt=/'|\\/g,nt=RegExp("\\\\([\\da-f]{1,6}"+M+"?|("+M+")|.)","ig"),rt=function(e,t,n){var r="0x"+t-65536;return r!==r||n?t:0>r?String.fromCharCode(r+65536):String.fromCharCode(55296|r>>10,56320|1023&r)};try{O.apply(L=F.call(b.childNodes),b.childNodes),L[b.childNodes.length].nodeType}catch(it){O={apply:L.length?function(e,t){H.apply(e,F.call(t))}:function(e,t){var n=e.length,r=0;while(e[n++]=t[r++]);e.length=n-1}}}function ot(e,t,r,i){var o,s,a,u,l,f,g,m,x,w;if((t?t.ownerDocument||t:b)!==p&&c(t),t=t||p,r=r||[],!e||"string"!=typeof e)return r;if(1!==(u=t.nodeType)&&9!==u)return[];if(h&&!i){if(o=K.exec(e))if(a=o[1]){if(9===u){if(s=t.getElementById(a),!s||!s.parentNode)return r;if(s.id===a)return r.push(s),r}else if(t.ownerDocument&&(s=t.ownerDocument.getElementById(a))&&y(t,s)&&s.id===a)return r.push(s),r}else{if(o[2])return O.apply(r,t.getElementsByTagName(e)),r;if((a=o[3])&&n.getElementsByClassName&&t.getElementsByClassName)return O.apply(r,t.getElementsByClassName(a)),r}if(n.qsa&&(!d||!d.test(e))){if(m=g=v,x=t,w=9===u&&e,1===u&&"object"!==t.nodeName.toLowerCase()){f=gt(e),(g=t.getAttribute("id"))?m=g.replace(tt,"\\$&"):t.setAttribute("id",m),m="[id='"+m+"'] ",l=f.length;while(l--)f[l]=m+mt(f[l]);x=U.test(e)&&t.parentNode||t,w=f.join(",")}if(w)try{return O.apply(r,x.querySelectorAll(w)),r}catch(T){}finally{g||t.removeAttribute("id")}}}return kt(e.replace(z,"$1"),t,r,i)}function st(){var e=[];function t(n,r){return e.push(n+=" ")>i.cacheLength&&delete t[e.shift()],t[n]=r}return t}function at(e){return e[v]=!0,e}function ut(e){var t=p.createElement("div");try{return!!e(t)}catch(n){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function lt(e,t){var n=e.split("|"),r=e.length;while(r--)i.attrHandle[n[r]]=t}function ct(e,t){var n=t&&e,r=n&&1===e.nodeType&&1===t.nodeType&&(~t.sourceIndex||D)-(~e.sourceIndex||D);if(r)return r;if(n)while(n=n.nextSibling)if(n===t)return-1;return e?1:-1}function pt(e){return function(t){var n=t.nodeName.toLowerCase();return"input"===n&&t.type===e}}function ft(e){return function(t){var n=t.nodeName.toLowerCase();return("input"===n||"button"===n)&&t.type===e}}function ht(e){return at(function(t){return t=+t,at(function(n,r){var i,o=e([],n.length,t),s=o.length;while(s--)n[i=o[s]]&&(n[i]=!(r[i]=n[i]))})})}s=ot.isXML=function(e){var t=e&&(e.ownerDocument||e).documentElement;return t?"HTML"!==t.nodeName:!1},n=ot.support={},c=ot.setDocument=function(e){var t=e?e.ownerDocument||e:b,r=t.defaultView;return t!==p&&9===t.nodeType&&t.documentElement?(p=t,f=t.documentElement,h=!s(t),r&&r.attachEvent&&r!==r.top&&r.attachEvent("onbeforeunload",function(){c()}),n.attributes=ut(function(e){return e.className="i",!e.getAttribute("className")}),n.getElementsByTagName=ut(function(e){return e.appendChild(t.createComment("")),!e.getElementsByTagName("*").length}),n.getElementsByClassName=ut(function(e){return e.innerHTML="
",e.firstChild.className="i",2===e.getElementsByClassName("i").length}),n.getById=ut(function(e){return f.appendChild(e).id=v,!t.getElementsByName||!t.getElementsByName(v).length}),n.getById?(i.find.ID=function(e,t){if(typeof t.getElementById!==j&&h){var n=t.getElementById(e);return n&&n.parentNode?[n]:[]}},i.filter.ID=function(e){var t=e.replace(nt,rt);return function(e){return e.getAttribute("id")===t}}):(delete i.find.ID,i.filter.ID=function(e){var t=e.replace(nt,rt);return function(e){var n=typeof e.getAttributeNode!==j&&e.getAttributeNode("id");return n&&n.value===t}}),i.find.TAG=n.getElementsByTagName?function(e,t){return typeof t.getElementsByTagName!==j?t.getElementsByTagName(e):undefined}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){while(n=o[i++])1===n.nodeType&&r.push(n);return r}return o},i.find.CLASS=n.getElementsByClassName&&function(e,t){return typeof t.getElementsByClassName!==j&&h?t.getElementsByClassName(e):undefined},g=[],d=[],(n.qsa=Q.test(t.querySelectorAll))&&(ut(function(e){e.innerHTML="",e.querySelectorAll("[selected]").length||d.push("\\["+M+"*(?:value|"+R+")"),e.querySelectorAll(":checked").length||d.push(":checked")}),ut(function(e){var n=t.createElement("input");n.setAttribute("type","hidden"),e.appendChild(n).setAttribute("t",""),e.querySelectorAll("[t^='']").length&&d.push("[*^$]="+M+"*(?:''|\"\")"),e.querySelectorAll(":enabled").length||d.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),d.push(",.*:")})),(n.matchesSelector=Q.test(m=f.webkitMatchesSelector||f.mozMatchesSelector||f.oMatchesSelector||f.msMatchesSelector))&&ut(function(e){n.disconnectedMatch=m.call(e,"div"),m.call(e,"[s!='']:x"),g.push("!=",I)}),d=d.length&&RegExp(d.join("|")),g=g.length&&RegExp(g.join("|")),y=Q.test(f.contains)||f.compareDocumentPosition?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)while(t=t.parentNode)if(t===e)return!0;return!1},S=f.compareDocumentPosition?function(e,r){if(e===r)return E=!0,0;var i=r.compareDocumentPosition&&e.compareDocumentPosition&&e.compareDocumentPosition(r);return i?1&i||!n.sortDetached&&r.compareDocumentPosition(e)===i?e===t||y(b,e)?-1:r===t||y(b,r)?1:l?P.call(l,e)-P.call(l,r):0:4&i?-1:1:e.compareDocumentPosition?-1:1}:function(e,n){var r,i=0,o=e.parentNode,s=n.parentNode,a=[e],u=[n];if(e===n)return E=!0,0;if(!o||!s)return e===t?-1:n===t?1:o?-1:s?1:l?P.call(l,e)-P.call(l,n):0;if(o===s)return ct(e,n);r=e;while(r=r.parentNode)a.unshift(r);r=n;while(r=r.parentNode)u.unshift(r);while(a[i]===u[i])i++;return i?ct(a[i],u[i]):a[i]===b?-1:u[i]===b?1:0},t):p},ot.matches=function(e,t){return ot(e,null,null,t)},ot.matchesSelector=function(e,t){if((e.ownerDocument||e)!==p&&c(e),t=t.replace(Y,"='$1']"),!(!n.matchesSelector||!h||g&&g.test(t)||d&&d.test(t)))try{var r=m.call(e,t);if(r||n.disconnectedMatch||e.document&&11!==e.document.nodeType)return r}catch(i){}return ot(t,p,null,[e]).length>0},ot.contains=function(e,t){return(e.ownerDocument||e)!==p&&c(e),y(e,t)},ot.attr=function(e,t){(e.ownerDocument||e)!==p&&c(e);var r=i.attrHandle[t.toLowerCase()],o=r&&A.call(i.attrHandle,t.toLowerCase())?r(e,t,!h):undefined;return o===undefined?n.attributes||!h?e.getAttribute(t):(o=e.getAttributeNode(t))&&o.specified?o.value:null:o},ot.error=function(e){throw Error("Syntax error, unrecognized expression: "+e)},ot.uniqueSort=function(e){var t,r=[],i=0,o=0;if(E=!n.detectDuplicates,l=!n.sortStable&&e.slice(0),e.sort(S),E){while(t=e[o++])t===e[o]&&(i=r.push(o));while(i--)e.splice(r[i],1)}return e},o=ot.getText=function(e){var t,n="",r=0,i=e.nodeType;if(i){if(1===i||9===i||11===i){if("string"==typeof e.textContent)return e.textContent;for(e=e.firstChild;e;e=e.nextSibling)n+=o(e)}else if(3===i||4===i)return e.nodeValue}else for(;t=e[r];r++)n+=o(t);return n},i=ot.selectors={cacheLength:50,createPseudo:at,match:J,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(nt,rt),e[3]=(e[4]||e[5]||"").replace(nt,rt),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||ot.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&ot.error(e[0]),e},PSEUDO:function(e){var t,n=!e[5]&&e[2];return J.CHILD.test(e[0])?null:(e[3]&&e[4]!==undefined?e[2]=e[4]:n&&V.test(n)&&(t=gt(n,!0))&&(t=n.indexOf(")",n.length-t)-n.length)&&(e[0]=e[0].slice(0,t),e[2]=n.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(nt,rt).toLowerCase();return"*"===e?function(){return!0}:function(e){return e.nodeName&&e.nodeName.toLowerCase()===t}},CLASS:function(e){var t=C[e+" "];return t||(t=RegExp("(^|"+M+")"+e+"("+M+"|$)"))&&C(e,function(e){return t.test("string"==typeof e.className&&e.className||typeof e.getAttribute!==j&&e.getAttribute("class")||"")})},ATTR:function(e,t,n){return function(r){var i=ot.attr(r,e);return null==i?"!="===t:t?(i+="","="===t?i===n:"!="===t?i!==n:"^="===t?n&&0===i.indexOf(n):"*="===t?n&&i.indexOf(n)>-1:"$="===t?n&&i.slice(-n.length)===n:"~="===t?(" "+i+" ").indexOf(n)>-1:"|="===t?i===n||i.slice(0,n.length+1)===n+"-":!1):!0}},CHILD:function(e,t,n,r,i){var o="nth"!==e.slice(0,3),s="last"!==e.slice(-4),a="of-type"===t;return 1===r&&0===i?function(e){return!!e.parentNode}:function(t,n,u){var l,c,p,f,h,d,g=o!==s?"nextSibling":"previousSibling",m=t.parentNode,y=a&&t.nodeName.toLowerCase(),x=!u&&!a;if(m){if(o){while(g){p=t;while(p=p[g])if(a?p.nodeName.toLowerCase()===y:1===p.nodeType)return!1;d=g="only"===e&&!d&&"nextSibling"}return!0}if(d=[s?m.firstChild:m.lastChild],s&&x){c=m[v]||(m[v]={}),l=c[e]||[],h=l[0]===w&&l[1],f=l[0]===w&&l[2],p=h&&m.childNodes[h];while(p=++h&&p&&p[g]||(f=h=0)||d.pop())if(1===p.nodeType&&++f&&p===t){c[e]=[w,h,f];break}}else if(x&&(l=(t[v]||(t[v]={}))[e])&&l[0]===w)f=l[1];else while(p=++h&&p&&p[g]||(f=h=0)||d.pop())if((a?p.nodeName.toLowerCase()===y:1===p.nodeType)&&++f&&(x&&((p[v]||(p[v]={}))[e]=[w,f]),p===t))break;return f-=i,f===r||0===f%r&&f/r>=0}}},PSEUDO:function(e,t){var n,r=i.pseudos[e]||i.setFilters[e.toLowerCase()]||ot.error("unsupported pseudo: "+e);return r[v]?r(t):r.length>1?(n=[e,e,"",t],i.setFilters.hasOwnProperty(e.toLowerCase())?at(function(e,n){var i,o=r(e,t),s=o.length;while(s--)i=P.call(e,o[s]),e[i]=!(n[i]=o[s])}):function(e){return r(e,0,n)}):r}},pseudos:{not:at(function(e){var t=[],n=[],r=a(e.replace(z,"$1"));return r[v]?at(function(e,t,n,i){var o,s=r(e,null,i,[]),a=e.length;while(a--)(o=s[a])&&(e[a]=!(t[a]=o))}):function(e,i,o){return t[0]=e,r(t,null,o,n),!n.pop()}}),has:at(function(e){return function(t){return ot(e,t).length>0}}),contains:at(function(e){return function(t){return(t.textContent||t.innerText||o(t)).indexOf(e)>-1}}),lang:at(function(e){return G.test(e||"")||ot.error("unsupported lang: "+e),e=e.replace(nt,rt).toLowerCase(),function(t){var n;do if(n=h?t.lang:t.getAttribute("xml:lang")||t.getAttribute("lang"))return n=n.toLowerCase(),n===e||0===n.indexOf(e+"-");while((t=t.parentNode)&&1===t.nodeType);return!1}}),target:function(t){var n=e.location&&e.location.hash;return n&&n.slice(1)===t.id},root:function(e){return e===f},focus:function(e){return e===p.activeElement&&(!p.hasFocus||p.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},enabled:function(e){return e.disabled===!1},disabled:function(e){return e.disabled===!0},checked:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&!!e.checked||"option"===t&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,e.selected===!0},empty:function(e){for(e=e.firstChild;e;e=e.nextSibling)if(e.nodeName>"@"||3===e.nodeType||4===e.nodeType)return!1;return!0},parent:function(e){return!i.pseudos.empty(e)},header:function(e){return et.test(e.nodeName)},input:function(e){return Z.test(e.nodeName)},button:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&"button"===e.type||"button"===t},text:function(e){var t;return"input"===e.nodeName.toLowerCase()&&"text"===e.type&&(null==(t=e.getAttribute("type"))||t.toLowerCase()===e.type)},first:ht(function(){return[0]}),last:ht(function(e,t){return[t-1]}),eq:ht(function(e,t,n){return[0>n?n+t:n]}),even:ht(function(e,t){var n=0;for(;t>n;n+=2)e.push(n);return e}),odd:ht(function(e,t){var n=1;for(;t>n;n+=2)e.push(n);return e}),lt:ht(function(e,t,n){var r=0>n?n+t:n;for(;--r>=0;)e.push(r);return e}),gt:ht(function(e,t,n){var r=0>n?n+t:n;for(;t>++r;)e.push(r);return e})}},i.pseudos.nth=i.pseudos.eq;for(t in{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})i.pseudos[t]=pt(t);for(t in{submit:!0,reset:!0})i.pseudos[t]=ft(t);function dt(){}dt.prototype=i.filters=i.pseudos,i.setFilters=new dt;function gt(e,t){var n,r,o,s,a,u,l,c=k[e+" "];if(c)return t?0:c.slice(0);a=e,u=[],l=i.preFilter;while(a){(!n||(r=_.exec(a)))&&(r&&(a=a.slice(r[0].length)||a),u.push(o=[])),n=!1,(r=X.exec(a))&&(n=r.shift(),o.push({value:n,type:r[0].replace(z," ")}),a=a.slice(n.length));for(s in i.filter)!(r=J[s].exec(a))||l[s]&&!(r=l[s](r))||(n=r.shift(),o.push({value:n,type:s,matches:r}),a=a.slice(n.length));if(!n)break}return t?a.length:a?ot.error(e):k(e,u).slice(0)}function mt(e){var t=0,n=e.length,r="";for(;n>t;t++)r+=e[t].value;return r}function yt(e,t,n){var i=t.dir,o=n&&"parentNode"===i,s=T++;return t.first?function(t,n,r){while(t=t[i])if(1===t.nodeType||o)return e(t,n,r)}:function(t,n,a){var u,l,c,p=w+" "+s;if(a){while(t=t[i])if((1===t.nodeType||o)&&e(t,n,a))return!0}else while(t=t[i])if(1===t.nodeType||o)if(c=t[v]||(t[v]={}),(l=c[i])&&l[0]===p){if((u=l[1])===!0||u===r)return u===!0}else if(l=c[i]=[p],l[1]=e(t,n,a)||r,l[1]===!0)return!0}}function vt(e){return e.length>1?function(t,n,r){var i=e.length;while(i--)if(!e[i](t,n,r))return!1;return!0}:e[0]}function xt(e,t,n,r,i){var o,s=[],a=0,u=e.length,l=null!=t;for(;u>a;a++)(o=e[a])&&(!n||n(o,r,i))&&(s.push(o),l&&t.push(a));return s}function bt(e,t,n,r,i,o){return r&&!r[v]&&(r=bt(r)),i&&!i[v]&&(i=bt(i,o)),at(function(o,s,a,u){var l,c,p,f=[],h=[],d=s.length,g=o||Ct(t||"*",a.nodeType?[a]:a,[]),m=!e||!o&&t?g:xt(g,f,e,a,u),y=n?i||(o?e:d||r)?[]:s:m;if(n&&n(m,y,a,u),r){l=xt(y,h),r(l,[],a,u),c=l.length;while(c--)(p=l[c])&&(y[h[c]]=!(m[h[c]]=p))}if(o){if(i||e){if(i){l=[],c=y.length;while(c--)(p=y[c])&&l.push(m[c]=p);i(null,y=[],l,u)}c=y.length;while(c--)(p=y[c])&&(l=i?P.call(o,p):f[c])>-1&&(o[l]=!(s[l]=p))}}else y=xt(y===s?y.splice(d,y.length):y),i?i(null,s,y,u):O.apply(s,y)})}function wt(e){var t,n,r,o=e.length,s=i.relative[e[0].type],a=s||i.relative[" "],l=s?1:0,c=yt(function(e){return e===t},a,!0),p=yt(function(e){return P.call(t,e)>-1},a,!0),f=[function(e,n,r){return!s&&(r||n!==u)||((t=n).nodeType?c(e,n,r):p(e,n,r))}];for(;o>l;l++)if(n=i.relative[e[l].type])f=[yt(vt(f),n)];else{if(n=i.filter[e[l].type].apply(null,e[l].matches),n[v]){for(r=++l;o>r;r++)if(i.relative[e[r].type])break;return bt(l>1&&vt(f),l>1&&mt(e.slice(0,l-1).concat({value:" "===e[l-2].type?"*":""})).replace(z,"$1"),n,r>l&&wt(e.slice(l,r)),o>r&&wt(e=e.slice(r)),o>r&&mt(e))}f.push(n)}return vt(f)}function Tt(e,t){var n=0,o=t.length>0,s=e.length>0,a=function(a,l,c,f,h){var d,g,m,y=[],v=0,x="0",b=a&&[],T=null!=h,C=u,k=a||s&&i.find.TAG("*",h&&l.parentNode||l),N=w+=null==C?1:Math.random()||.1;for(T&&(u=l!==p&&l,r=n);null!=(d=k[x]);x++){if(s&&d){g=0;while(m=e[g++])if(m(d,l,c)){f.push(d);break}T&&(w=N,r=++n)}o&&((d=!m&&d)&&v--,a&&b.push(d))}if(v+=x,o&&x!==v){g=0;while(m=t[g++])m(b,y,l,c);if(a){if(v>0)while(x--)b[x]||y[x]||(y[x]=q.call(f));y=xt(y)}O.apply(f,y),T&&!a&&y.length>0&&v+t.length>1&&ot.uniqueSort(f)}return T&&(w=N,u=C),b};return o?at(a):a}a=ot.compile=function(e,t){var n,r=[],i=[],o=N[e+" "];if(!o){t||(t=gt(e)),n=t.length;while(n--)o=wt(t[n]),o[v]?r.push(o):i.push(o);o=N(e,Tt(i,r))}return o};function Ct(e,t,n){var r=0,i=t.length;for(;i>r;r++)ot(e,t[r],n);return n}function kt(e,t,r,o){var s,u,l,c,p,f=gt(e);if(!o&&1===f.length){if(u=f[0]=f[0].slice(0),u.length>2&&"ID"===(l=u[0]).type&&n.getById&&9===t.nodeType&&h&&i.relative[u[1].type]){if(t=(i.find.ID(l.matches[0].replace(nt,rt),t)||[])[0],!t)return r;e=e.slice(u.shift().value.length)}s=J.needsContext.test(e)?0:u.length;while(s--){if(l=u[s],i.relative[c=l.type])break;if((p=i.find[c])&&(o=p(l.matches[0].replace(nt,rt),U.test(u[0].type)&&t.parentNode||t))){if(u.splice(s,1),e=o.length&&mt(u),!e)return O.apply(r,o),r;break}}}return a(e,f)(o,t,!h,r,U.test(e)),r}n.sortStable=v.split("").sort(S).join("")===v,n.detectDuplicates=E,c(),n.sortDetached=ut(function(e){return 1&e.compareDocumentPosition(p.createElement("div"))}),ut(function(e){return e.innerHTML="","#"===e.firstChild.getAttribute("href")})||lt("type|href|height|width",function(e,t,n){return n?undefined:e.getAttribute(t,"type"===t.toLowerCase()?1:2)}),n.attributes&&ut(function(e){return e.innerHTML="",e.firstChild.setAttribute("value",""),""===e.firstChild.getAttribute("value")})||lt("value",function(e,t,n){return n||"input"!==e.nodeName.toLowerCase()?undefined:e.defaultValue}),ut(function(e){return null==e.getAttribute("disabled")})||lt(R,function(e,t,n){var r;return n?undefined:(r=e.getAttributeNode(t))&&r.specified?r.value:e[t]===!0?t.toLowerCase():null}),x.find=ot,x.expr=ot.selectors,x.expr[":"]=x.expr.pseudos,x.unique=ot.uniqueSort,x.text=ot.getText,x.isXMLDoc=ot.isXML,x.contains=ot.contains}(e);var D={};function A(e){var t=D[e]={};return x.each(e.match(w)||[],function(e,n){t[n]=!0}),t}x.Callbacks=function(e){e="string"==typeof e?D[e]||A(e):x.extend({},e);var t,n,r,i,o,s,a=[],u=!e.once&&[],l=function(p){for(t=e.memory&&p,n=!0,s=i||0,i=0,o=a.length,r=!0;a&&o>s;s++)if(a[s].apply(p[0],p[1])===!1&&e.stopOnFalse){t=!1;break}r=!1,a&&(u?u.length&&l(u.shift()):t?a=[]:c.disable())},c={add:function(){if(a){var n=a.length;(function s(t){x.each(t,function(t,n){var r=x.type(n);"function"===r?e.unique&&c.has(n)||a.push(n):n&&n.length&&"string"!==r&&s(n)})})(arguments),r?o=a.length:t&&(i=n,l(t))}return this},remove:function(){return a&&x.each(arguments,function(e,t){var n;while((n=x.inArray(t,a,n))>-1)a.splice(n,1),r&&(o>=n&&o--,s>=n&&s--)}),this},has:function(e){return e?x.inArray(e,a)>-1:!(!a||!a.length)},empty:function(){return a=[],o=0,this},disable:function(){return a=u=t=undefined,this},disabled:function(){return!a},lock:function(){return u=undefined,t||c.disable(),this},locked:function(){return!u},fireWith:function(e,t){return!a||n&&!u||(t=t||[],t=[e,t.slice?t.slice():t],r?u.push(t):l(t)),this},fire:function(){return c.fireWith(this,arguments),this},fired:function(){return!!n}};return c},x.extend({Deferred:function(e){var t=[["resolve","done",x.Callbacks("once memory"),"resolved"],["reject","fail",x.Callbacks("once memory"),"rejected"],["notify","progress",x.Callbacks("memory")]],n="pending",r={state:function(){return n},always:function(){return i.done(arguments).fail(arguments),this},then:function(){var e=arguments;return x.Deferred(function(n){x.each(t,function(t,o){var s=o[0],a=x.isFunction(e[t])&&e[t];i[o[1]](function(){var e=a&&a.apply(this,arguments);e&&x.isFunction(e.promise)?e.promise().done(n.resolve).fail(n.reject).progress(n.notify):n[s+"With"](this===r?n.promise():this,a?[e]:arguments)})}),e=null}).promise()},promise:function(e){return null!=e?x.extend(e,r):r}},i={};return r.pipe=r.then,x.each(t,function(e,o){var s=o[2],a=o[3];r[o[1]]=s.add,a&&s.add(function(){n=a},t[1^e][2].disable,t[2][2].lock),i[o[0]]=function(){return i[o[0]+"With"](this===i?r:this,arguments),this},i[o[0]+"With"]=s.fireWith}),r.promise(i),e&&e.call(i,i),i},when:function(e){var t=0,n=d.call(arguments),r=n.length,i=1!==r||e&&x.isFunction(e.promise)?r:0,o=1===i?e:x.Deferred(),s=function(e,t,n){return function(r){t[e]=this,n[e]=arguments.length>1?d.call(arguments):r,n===a?o.notifyWith(t,n):--i||o.resolveWith(t,n)}},a,u,l;if(r>1)for(a=Array(r),u=Array(r),l=Array(r);r>t;t++)n[t]&&x.isFunction(n[t].promise)?n[t].promise().done(s(t,l,n)).fail(o.reject).progress(s(t,u,a)):--i;return i||o.resolveWith(l,n),o.promise()}}),x.support=function(t){var n=o.createElement("input"),r=o.createDocumentFragment(),i=o.createElement("div"),s=o.createElement("select"),a=s.appendChild(o.createElement("option"));return n.type?(n.type="checkbox",t.checkOn=""!==n.value,t.optSelected=a.selected,t.reliableMarginRight=!0,t.boxSizingReliable=!0,t.pixelPosition=!1,n.checked=!0,t.noCloneChecked=n.cloneNode(!0).checked,s.disabled=!0,t.optDisabled=!a.disabled,n=o.createElement("input"),n.value="t",n.type="radio",t.radioValue="t"===n.value,n.setAttribute("checked","t"),n.setAttribute("name","t"),r.appendChild(n),t.checkClone=r.cloneNode(!0).cloneNode(!0).lastChild.checked,t.focusinBubbles="onfocusin"in e,i.style.backgroundClip="content-box",i.cloneNode(!0).style.backgroundClip="",t.clearCloneStyle="content-box"===i.style.backgroundClip,x(function(){var n,r,s="padding:0;margin:0;border:0;display:block;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box",a=o.getElementsByTagName("body")[0];a&&(n=o.createElement("div"),n.style.cssText="border:0;width:0;height:0;position:absolute;top:0;left:-9999px;margin-top:1px",a.appendChild(n).appendChild(i),i.innerHTML="",i.style.cssText="-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;padding:1px;border:1px;display:block;width:4px;margin-top:1%;position:absolute;top:1%",x.swap(a,null!=a.style.zoom?{zoom:1}:{},function(){t.boxSizing=4===i.offsetWidth}),e.getComputedStyle&&(t.pixelPosition="1%"!==(e.getComputedStyle(i,null)||{}).top,t.boxSizingReliable="4px"===(e.getComputedStyle(i,null)||{width:"4px"}).width,r=i.appendChild(o.createElement("div")),r.style.cssText=i.style.cssText=s,r.style.marginRight=r.style.width="0",i.style.width="1px",t.reliableMarginRight=!parseFloat((e.getComputedStyle(r,null)||{}).marginRight)),a.removeChild(n))}),t):t}({});var L,q,H=/(?:\{[\s\S]*\}|\[[\s\S]*\])$/,O=/([A-Z])/g;function F(){Object.defineProperty(this.cache={},0,{get:function(){return{}}}),this.expando=x.expando+Math.random()}F.uid=1,F.accepts=function(e){return e.nodeType?1===e.nodeType||9===e.nodeType:!0},F.prototype={key:function(e){if(!F.accepts(e))return 0;var t={},n=e[this.expando];if(!n){n=F.uid++;try{t[this.expando]={value:n},Object.defineProperties(e,t)}catch(r){t[this.expando]=n,x.extend(e,t)}}return this.cache[n]||(this.cache[n]={}),n},set:function(e,t,n){var r,i=this.key(e),o=this.cache[i];if("string"==typeof t)o[t]=n;else if(x.isEmptyObject(o))x.extend(this.cache[i],t);else for(r in t)o[r]=t[r];return o},get:function(e,t){var n=this.cache[this.key(e)];return t===undefined?n:n[t]},access:function(e,t,n){var r;return t===undefined||t&&"string"==typeof t&&n===undefined?(r=this.get(e,t),r!==undefined?r:this.get(e,x.camelCase(t))):(this.set(e,t,n),n!==undefined?n:t)},remove:function(e,t){var n,r,i,o=this.key(e),s=this.cache[o];if(t===undefined)this.cache[o]={};else{x.isArray(t)?r=t.concat(t.map(x.camelCase)):(i=x.camelCase(t),t in s?r=[t,i]:(r=i,r=r in s?[r]:r.match(w)||[])),n=r.length;while(n--)delete s[r[n]]}},hasData:function(e){return!x.isEmptyObject(this.cache[e[this.expando]]||{})},discard:function(e){e[this.expando]&&delete this.cache[e[this.expando]]}},L=new F,q=new F,x.extend({acceptData:F.accepts,hasData:function(e){return L.hasData(e)||q.hasData(e)},data:function(e,t,n){return L.access(e,t,n)},removeData:function(e,t){L.remove(e,t)},_data:function(e,t,n){return q.access(e,t,n)},_removeData:function(e,t){q.remove(e,t)}}),x.fn.extend({data:function(e,t){var n,r,i=this[0],o=0,s=null;if(e===undefined){if(this.length&&(s=L.get(i),1===i.nodeType&&!q.get(i,"hasDataAttrs"))){for(n=i.attributes;n.length>o;o++)r=n[o].name,0===r.indexOf("data-")&&(r=x.camelCase(r.slice(5)),P(i,r,s[r]));q.set(i,"hasDataAttrs",!0)}return s}return"object"==typeof e?this.each(function(){L.set(this,e)}):x.access(this,function(t){var n,r=x.camelCase(e);if(i&&t===undefined){if(n=L.get(i,e),n!==undefined)return n;if(n=L.get(i,r),n!==undefined)return n;if(n=P(i,r,undefined),n!==undefined)return n}else this.each(function(){var n=L.get(this,r);L.set(this,r,t),-1!==e.indexOf("-")&&n!==undefined&&L.set(this,e,t)})},null,t,arguments.length>1,null,!0)},removeData:function(e){return this.each(function(){L.remove(this,e)})}});function P(e,t,n){var r;if(n===undefined&&1===e.nodeType)if(r="data-"+t.replace(O,"-$1").toLowerCase(),n=e.getAttribute(r),"string"==typeof n){try{n="true"===n?!0:"false"===n?!1:"null"===n?null:+n+""===n?+n:H.test(n)?JSON.parse(n):n}catch(i){}L.set(e,t,n)}else n=undefined;return n}x.extend({queue:function(e,t,n){var r;return e?(t=(t||"fx")+"queue",r=q.get(e,t),n&&(!r||x.isArray(n)?r=q.access(e,t,x.makeArray(n)):r.push(n)),r||[]):undefined},dequeue:function(e,t){t=t||"fx";var n=x.queue(e,t),r=n.length,i=n.shift(),o=x._queueHooks(e,t),s=function(){x.dequeue(e,t) +};"inprogress"===i&&(i=n.shift(),r--),i&&("fx"===t&&n.unshift("inprogress"),delete o.stop,i.call(e,s,o)),!r&&o&&o.empty.fire()},_queueHooks:function(e,t){var n=t+"queueHooks";return q.get(e,n)||q.access(e,n,{empty:x.Callbacks("once memory").add(function(){q.remove(e,[t+"queue",n])})})}}),x.fn.extend({queue:function(e,t){var n=2;return"string"!=typeof e&&(t=e,e="fx",n--),n>arguments.length?x.queue(this[0],e):t===undefined?this:this.each(function(){var n=x.queue(this,e,t);x._queueHooks(this,e),"fx"===e&&"inprogress"!==n[0]&&x.dequeue(this,e)})},dequeue:function(e){return this.each(function(){x.dequeue(this,e)})},delay:function(e,t){return e=x.fx?x.fx.speeds[e]||e:e,t=t||"fx",this.queue(t,function(t,n){var r=setTimeout(t,e);n.stop=function(){clearTimeout(r)}})},clearQueue:function(e){return this.queue(e||"fx",[])},promise:function(e,t){var n,r=1,i=x.Deferred(),o=this,s=this.length,a=function(){--r||i.resolveWith(o,[o])};"string"!=typeof e&&(t=e,e=undefined),e=e||"fx";while(s--)n=q.get(o[s],e+"queueHooks"),n&&n.empty&&(r++,n.empty.add(a));return a(),i.promise(t)}});var R,M,W=/[\t\r\n\f]/g,$=/\r/g,B=/^(?:input|select|textarea|button)$/i;x.fn.extend({attr:function(e,t){return x.access(this,x.attr,e,t,arguments.length>1)},removeAttr:function(e){return this.each(function(){x.removeAttr(this,e)})},prop:function(e,t){return x.access(this,x.prop,e,t,arguments.length>1)},removeProp:function(e){return this.each(function(){delete this[x.propFix[e]||e]})},addClass:function(e){var t,n,r,i,o,s=0,a=this.length,u="string"==typeof e&&e;if(x.isFunction(e))return this.each(function(t){x(this).addClass(e.call(this,t,this.className))});if(u)for(t=(e||"").match(w)||[];a>s;s++)if(n=this[s],r=1===n.nodeType&&(n.className?(" "+n.className+" ").replace(W," "):" ")){o=0;while(i=t[o++])0>r.indexOf(" "+i+" ")&&(r+=i+" ");n.className=x.trim(r)}return this},removeClass:function(e){var t,n,r,i,o,s=0,a=this.length,u=0===arguments.length||"string"==typeof e&&e;if(x.isFunction(e))return this.each(function(t){x(this).removeClass(e.call(this,t,this.className))});if(u)for(t=(e||"").match(w)||[];a>s;s++)if(n=this[s],r=1===n.nodeType&&(n.className?(" "+n.className+" ").replace(W," "):"")){o=0;while(i=t[o++])while(r.indexOf(" "+i+" ")>=0)r=r.replace(" "+i+" "," ");n.className=e?x.trim(r):""}return this},toggleClass:function(e,t){var n=typeof e;return"boolean"==typeof t&&"string"===n?t?this.addClass(e):this.removeClass(e):x.isFunction(e)?this.each(function(n){x(this).toggleClass(e.call(this,n,this.className,t),t)}):this.each(function(){if("string"===n){var t,i=0,o=x(this),s=e.match(w)||[];while(t=s[i++])o.hasClass(t)?o.removeClass(t):o.addClass(t)}else(n===r||"boolean"===n)&&(this.className&&q.set(this,"__className__",this.className),this.className=this.className||e===!1?"":q.get(this,"__className__")||"")})},hasClass:function(e){var t=" "+e+" ",n=0,r=this.length;for(;r>n;n++)if(1===this[n].nodeType&&(" "+this[n].className+" ").replace(W," ").indexOf(t)>=0)return!0;return!1},val:function(e){var t,n,r,i=this[0];{if(arguments.length)return r=x.isFunction(e),this.each(function(n){var i;1===this.nodeType&&(i=r?e.call(this,n,x(this).val()):e,null==i?i="":"number"==typeof i?i+="":x.isArray(i)&&(i=x.map(i,function(e){return null==e?"":e+""})),t=x.valHooks[this.type]||x.valHooks[this.nodeName.toLowerCase()],t&&"set"in t&&t.set(this,i,"value")!==undefined||(this.value=i))});if(i)return t=x.valHooks[i.type]||x.valHooks[i.nodeName.toLowerCase()],t&&"get"in t&&(n=t.get(i,"value"))!==undefined?n:(n=i.value,"string"==typeof n?n.replace($,""):null==n?"":n)}}}),x.extend({valHooks:{option:{get:function(e){var t=e.attributes.value;return!t||t.specified?e.value:e.text}},select:{get:function(e){var t,n,r=e.options,i=e.selectedIndex,o="select-one"===e.type||0>i,s=o?null:[],a=o?i+1:r.length,u=0>i?a:o?i:0;for(;a>u;u++)if(n=r[u],!(!n.selected&&u!==i||(x.support.optDisabled?n.disabled:null!==n.getAttribute("disabled"))||n.parentNode.disabled&&x.nodeName(n.parentNode,"optgroup"))){if(t=x(n).val(),o)return t;s.push(t)}return s},set:function(e,t){var n,r,i=e.options,o=x.makeArray(t),s=i.length;while(s--)r=i[s],(r.selected=x.inArray(x(r).val(),o)>=0)&&(n=!0);return n||(e.selectedIndex=-1),o}}},attr:function(e,t,n){var i,o,s=e.nodeType;if(e&&3!==s&&8!==s&&2!==s)return typeof e.getAttribute===r?x.prop(e,t,n):(1===s&&x.isXMLDoc(e)||(t=t.toLowerCase(),i=x.attrHooks[t]||(x.expr.match.bool.test(t)?M:R)),n===undefined?i&&"get"in i&&null!==(o=i.get(e,t))?o:(o=x.find.attr(e,t),null==o?undefined:o):null!==n?i&&"set"in i&&(o=i.set(e,n,t))!==undefined?o:(e.setAttribute(t,n+""),n):(x.removeAttr(e,t),undefined))},removeAttr:function(e,t){var n,r,i=0,o=t&&t.match(w);if(o&&1===e.nodeType)while(n=o[i++])r=x.propFix[n]||n,x.expr.match.bool.test(n)&&(e[r]=!1),e.removeAttribute(n)},attrHooks:{type:{set:function(e,t){if(!x.support.radioValue&&"radio"===t&&x.nodeName(e,"input")){var n=e.value;return e.setAttribute("type",t),n&&(e.value=n),t}}}},propFix:{"for":"htmlFor","class":"className"},prop:function(e,t,n){var r,i,o,s=e.nodeType;if(e&&3!==s&&8!==s&&2!==s)return o=1!==s||!x.isXMLDoc(e),o&&(t=x.propFix[t]||t,i=x.propHooks[t]),n!==undefined?i&&"set"in i&&(r=i.set(e,n,t))!==undefined?r:e[t]=n:i&&"get"in i&&null!==(r=i.get(e,t))?r:e[t]},propHooks:{tabIndex:{get:function(e){return e.hasAttribute("tabindex")||B.test(e.nodeName)||e.href?e.tabIndex:-1}}}}),M={set:function(e,t,n){return t===!1?x.removeAttr(e,n):e.setAttribute(n,n),n}},x.each(x.expr.match.bool.source.match(/\w+/g),function(e,t){var n=x.expr.attrHandle[t]||x.find.attr;x.expr.attrHandle[t]=function(e,t,r){var i=x.expr.attrHandle[t],o=r?undefined:(x.expr.attrHandle[t]=undefined)!=n(e,t,r)?t.toLowerCase():null;return x.expr.attrHandle[t]=i,o}}),x.support.optSelected||(x.propHooks.selected={get:function(e){var t=e.parentNode;return t&&t.parentNode&&t.parentNode.selectedIndex,null}}),x.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){x.propFix[this.toLowerCase()]=this}),x.each(["radio","checkbox"],function(){x.valHooks[this]={set:function(e,t){return x.isArray(t)?e.checked=x.inArray(x(e).val(),t)>=0:undefined}},x.support.checkOn||(x.valHooks[this].get=function(e){return null===e.getAttribute("value")?"on":e.value})});var I=/^key/,z=/^(?:mouse|contextmenu)|click/,_=/^(?:focusinfocus|focusoutblur)$/,X=/^([^.]*)(?:\.(.+)|)$/;function U(){return!0}function Y(){return!1}function V(){try{return o.activeElement}catch(e){}}x.event={global:{},add:function(e,t,n,i,o){var s,a,u,l,c,p,f,h,d,g,m,y=q.get(e);if(y){n.handler&&(s=n,n=s.handler,o=s.selector),n.guid||(n.guid=x.guid++),(l=y.events)||(l=y.events={}),(a=y.handle)||(a=y.handle=function(e){return typeof x===r||e&&x.event.triggered===e.type?undefined:x.event.dispatch.apply(a.elem,arguments)},a.elem=e),t=(t||"").match(w)||[""],c=t.length;while(c--)u=X.exec(t[c])||[],d=m=u[1],g=(u[2]||"").split(".").sort(),d&&(f=x.event.special[d]||{},d=(o?f.delegateType:f.bindType)||d,f=x.event.special[d]||{},p=x.extend({type:d,origType:m,data:i,handler:n,guid:n.guid,selector:o,needsContext:o&&x.expr.match.needsContext.test(o),namespace:g.join(".")},s),(h=l[d])||(h=l[d]=[],h.delegateCount=0,f.setup&&f.setup.call(e,i,g,a)!==!1||e.addEventListener&&e.addEventListener(d,a,!1)),f.add&&(f.add.call(e,p),p.handler.guid||(p.handler.guid=n.guid)),o?h.splice(h.delegateCount++,0,p):h.push(p),x.event.global[d]=!0);e=null}},remove:function(e,t,n,r,i){var o,s,a,u,l,c,p,f,h,d,g,m=q.hasData(e)&&q.get(e);if(m&&(u=m.events)){t=(t||"").match(w)||[""],l=t.length;while(l--)if(a=X.exec(t[l])||[],h=g=a[1],d=(a[2]||"").split(".").sort(),h){p=x.event.special[h]||{},h=(r?p.delegateType:p.bindType)||h,f=u[h]||[],a=a[2]&&RegExp("(^|\\.)"+d.join("\\.(?:.*\\.|)")+"(\\.|$)"),s=o=f.length;while(o--)c=f[o],!i&&g!==c.origType||n&&n.guid!==c.guid||a&&!a.test(c.namespace)||r&&r!==c.selector&&("**"!==r||!c.selector)||(f.splice(o,1),c.selector&&f.delegateCount--,p.remove&&p.remove.call(e,c));s&&!f.length&&(p.teardown&&p.teardown.call(e,d,m.handle)!==!1||x.removeEvent(e,h,m.handle),delete u[h])}else for(h in u)x.event.remove(e,h+t[l],n,r,!0);x.isEmptyObject(u)&&(delete m.handle,q.remove(e,"events"))}},trigger:function(t,n,r,i){var s,a,u,l,c,p,f,h=[r||o],d=y.call(t,"type")?t.type:t,g=y.call(t,"namespace")?t.namespace.split("."):[];if(a=u=r=r||o,3!==r.nodeType&&8!==r.nodeType&&!_.test(d+x.event.triggered)&&(d.indexOf(".")>=0&&(g=d.split("."),d=g.shift(),g.sort()),c=0>d.indexOf(":")&&"on"+d,t=t[x.expando]?t:new x.Event(d,"object"==typeof t&&t),t.isTrigger=i?2:3,t.namespace=g.join("."),t.namespace_re=t.namespace?RegExp("(^|\\.)"+g.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,t.result=undefined,t.target||(t.target=r),n=null==n?[t]:x.makeArray(n,[t]),f=x.event.special[d]||{},i||!f.trigger||f.trigger.apply(r,n)!==!1)){if(!i&&!f.noBubble&&!x.isWindow(r)){for(l=f.delegateType||d,_.test(l+d)||(a=a.parentNode);a;a=a.parentNode)h.push(a),u=a;u===(r.ownerDocument||o)&&h.push(u.defaultView||u.parentWindow||e)}s=0;while((a=h[s++])&&!t.isPropagationStopped())t.type=s>1?l:f.bindType||d,p=(q.get(a,"events")||{})[t.type]&&q.get(a,"handle"),p&&p.apply(a,n),p=c&&a[c],p&&x.acceptData(a)&&p.apply&&p.apply(a,n)===!1&&t.preventDefault();return t.type=d,i||t.isDefaultPrevented()||f._default&&f._default.apply(h.pop(),n)!==!1||!x.acceptData(r)||c&&x.isFunction(r[d])&&!x.isWindow(r)&&(u=r[c],u&&(r[c]=null),x.event.triggered=d,r[d](),x.event.triggered=undefined,u&&(r[c]=u)),t.result}},dispatch:function(e){e=x.event.fix(e);var t,n,r,i,o,s=[],a=d.call(arguments),u=(q.get(this,"events")||{})[e.type]||[],l=x.event.special[e.type]||{};if(a[0]=e,e.delegateTarget=this,!l.preDispatch||l.preDispatch.call(this,e)!==!1){s=x.event.handlers.call(this,e,u),t=0;while((i=s[t++])&&!e.isPropagationStopped()){e.currentTarget=i.elem,n=0;while((o=i.handlers[n++])&&!e.isImmediatePropagationStopped())(!e.namespace_re||e.namespace_re.test(o.namespace))&&(e.handleObj=o,e.data=o.data,r=((x.event.special[o.origType]||{}).handle||o.handler).apply(i.elem,a),r!==undefined&&(e.result=r)===!1&&(e.preventDefault(),e.stopPropagation()))}return l.postDispatch&&l.postDispatch.call(this,e),e.result}},handlers:function(e,t){var n,r,i,o,s=[],a=t.delegateCount,u=e.target;if(a&&u.nodeType&&(!e.button||"click"!==e.type))for(;u!==this;u=u.parentNode||this)if(u.disabled!==!0||"click"!==e.type){for(r=[],n=0;a>n;n++)o=t[n],i=o.selector+" ",r[i]===undefined&&(r[i]=o.needsContext?x(i,this).index(u)>=0:x.find(i,this,null,[u]).length),r[i]&&r.push(o);r.length&&s.push({elem:u,handlers:r})}return t.length>a&&s.push({elem:this,handlers:t.slice(a)}),s},props:"altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(e,t){return null==e.which&&(e.which=null!=t.charCode?t.charCode:t.keyCode),e}},mouseHooks:{props:"button buttons clientX clientY offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(e,t){var n,r,i,s=t.button;return null==e.pageX&&null!=t.clientX&&(n=e.target.ownerDocument||o,r=n.documentElement,i=n.body,e.pageX=t.clientX+(r&&r.scrollLeft||i&&i.scrollLeft||0)-(r&&r.clientLeft||i&&i.clientLeft||0),e.pageY=t.clientY+(r&&r.scrollTop||i&&i.scrollTop||0)-(r&&r.clientTop||i&&i.clientTop||0)),e.which||s===undefined||(e.which=1&s?1:2&s?3:4&s?2:0),e}},fix:function(e){if(e[x.expando])return e;var t,n,r,i=e.type,s=e,a=this.fixHooks[i];a||(this.fixHooks[i]=a=z.test(i)?this.mouseHooks:I.test(i)?this.keyHooks:{}),r=a.props?this.props.concat(a.props):this.props,e=new x.Event(s),t=r.length;while(t--)n=r[t],e[n]=s[n];return e.target||(e.target=o),3===e.target.nodeType&&(e.target=e.target.parentNode),a.filter?a.filter(e,s):e},special:{load:{noBubble:!0},focus:{trigger:function(){return this!==V()&&this.focus?(this.focus(),!1):undefined},delegateType:"focusin"},blur:{trigger:function(){return this===V()&&this.blur?(this.blur(),!1):undefined},delegateType:"focusout"},click:{trigger:function(){return"checkbox"===this.type&&this.click&&x.nodeName(this,"input")?(this.click(),!1):undefined},_default:function(e){return x.nodeName(e.target,"a")}},beforeunload:{postDispatch:function(e){e.result!==undefined&&(e.originalEvent.returnValue=e.result)}}},simulate:function(e,t,n,r){var i=x.extend(new x.Event,n,{type:e,isSimulated:!0,originalEvent:{}});r?x.event.trigger(i,null,t):x.event.dispatch.call(t,i),i.isDefaultPrevented()&&n.preventDefault()}},x.removeEvent=function(e,t,n){e.removeEventListener&&e.removeEventListener(t,n,!1)},x.Event=function(e,t){return this instanceof x.Event?(e&&e.type?(this.originalEvent=e,this.type=e.type,this.isDefaultPrevented=e.defaultPrevented||e.getPreventDefault&&e.getPreventDefault()?U:Y):this.type=e,t&&x.extend(this,t),this.timeStamp=e&&e.timeStamp||x.now(),this[x.expando]=!0,undefined):new x.Event(e,t)},x.Event.prototype={isDefaultPrevented:Y,isPropagationStopped:Y,isImmediatePropagationStopped:Y,preventDefault:function(){var e=this.originalEvent;this.isDefaultPrevented=U,e&&e.preventDefault&&e.preventDefault()},stopPropagation:function(){var e=this.originalEvent;this.isPropagationStopped=U,e&&e.stopPropagation&&e.stopPropagation()},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=U,this.stopPropagation()}},x.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(e,t){x.event.special[e]={delegateType:t,bindType:t,handle:function(e){var n,r=this,i=e.relatedTarget,o=e.handleObj;return(!i||i!==r&&!x.contains(r,i))&&(e.type=o.origType,n=o.handler.apply(this,arguments),e.type=t),n}}}),x.support.focusinBubbles||x.each({focus:"focusin",blur:"focusout"},function(e,t){var n=0,r=function(e){x.event.simulate(t,e.target,x.event.fix(e),!0)};x.event.special[t]={setup:function(){0===n++&&o.addEventListener(e,r,!0)},teardown:function(){0===--n&&o.removeEventListener(e,r,!0)}}}),x.fn.extend({on:function(e,t,n,r,i){var o,s;if("object"==typeof e){"string"!=typeof t&&(n=n||t,t=undefined);for(s in e)this.on(s,t,n,e[s],i);return this}if(null==n&&null==r?(r=t,n=t=undefined):null==r&&("string"==typeof t?(r=n,n=undefined):(r=n,n=t,t=undefined)),r===!1)r=Y;else if(!r)return this;return 1===i&&(o=r,r=function(e){return x().off(e),o.apply(this,arguments)},r.guid=o.guid||(o.guid=x.guid++)),this.each(function(){x.event.add(this,e,r,n,t)})},one:function(e,t,n,r){return this.on(e,t,n,r,1)},off:function(e,t,n){var r,i;if(e&&e.preventDefault&&e.handleObj)return r=e.handleObj,x(e.delegateTarget).off(r.namespace?r.origType+"."+r.namespace:r.origType,r.selector,r.handler),this;if("object"==typeof e){for(i in e)this.off(i,t,e[i]);return this}return(t===!1||"function"==typeof t)&&(n=t,t=undefined),n===!1&&(n=Y),this.each(function(){x.event.remove(this,e,n,t)})},trigger:function(e,t){return this.each(function(){x.event.trigger(e,t,this)})},triggerHandler:function(e,t){var n=this[0];return n?x.event.trigger(e,t,n,!0):undefined}});var G=/^.[^:#\[\.,]*$/,J=/^(?:parents|prev(?:Until|All))/,Q=x.expr.match.needsContext,K={children:!0,contents:!0,next:!0,prev:!0};x.fn.extend({find:function(e){var t,n=[],r=this,i=r.length;if("string"!=typeof e)return this.pushStack(x(e).filter(function(){for(t=0;i>t;t++)if(x.contains(r[t],this))return!0}));for(t=0;i>t;t++)x.find(e,r[t],n);return n=this.pushStack(i>1?x.unique(n):n),n.selector=this.selector?this.selector+" "+e:e,n},has:function(e){var t=x(e,this),n=t.length;return this.filter(function(){var e=0;for(;n>e;e++)if(x.contains(this,t[e]))return!0})},not:function(e){return this.pushStack(et(this,e||[],!0))},filter:function(e){return this.pushStack(et(this,e||[],!1))},is:function(e){return!!et(this,"string"==typeof e&&Q.test(e)?x(e):e||[],!1).length},closest:function(e,t){var n,r=0,i=this.length,o=[],s=Q.test(e)||"string"!=typeof e?x(e,t||this.context):0;for(;i>r;r++)for(n=this[r];n&&n!==t;n=n.parentNode)if(11>n.nodeType&&(s?s.index(n)>-1:1===n.nodeType&&x.find.matchesSelector(n,e))){n=o.push(n);break}return this.pushStack(o.length>1?x.unique(o):o)},index:function(e){return e?"string"==typeof e?g.call(x(e),this[0]):g.call(this,e.jquery?e[0]:e):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(e,t){var n="string"==typeof e?x(e,t):x.makeArray(e&&e.nodeType?[e]:e),r=x.merge(this.get(),n);return this.pushStack(x.unique(r))},addBack:function(e){return this.add(null==e?this.prevObject:this.prevObject.filter(e))}});function Z(e,t){while((e=e[t])&&1!==e.nodeType);return e}x.each({parent:function(e){var t=e.parentNode;return t&&11!==t.nodeType?t:null},parents:function(e){return x.dir(e,"parentNode")},parentsUntil:function(e,t,n){return x.dir(e,"parentNode",n)},next:function(e){return Z(e,"nextSibling")},prev:function(e){return Z(e,"previousSibling")},nextAll:function(e){return x.dir(e,"nextSibling")},prevAll:function(e){return x.dir(e,"previousSibling")},nextUntil:function(e,t,n){return x.dir(e,"nextSibling",n)},prevUntil:function(e,t,n){return x.dir(e,"previousSibling",n)},siblings:function(e){return x.sibling((e.parentNode||{}).firstChild,e)},children:function(e){return x.sibling(e.firstChild)},contents:function(e){return e.contentDocument||x.merge([],e.childNodes)}},function(e,t){x.fn[e]=function(n,r){var i=x.map(this,t,n);return"Until"!==e.slice(-5)&&(r=n),r&&"string"==typeof r&&(i=x.filter(r,i)),this.length>1&&(K[e]||x.unique(i),J.test(e)&&i.reverse()),this.pushStack(i)}}),x.extend({filter:function(e,t,n){var r=t[0];return n&&(e=":not("+e+")"),1===t.length&&1===r.nodeType?x.find.matchesSelector(r,e)?[r]:[]:x.find.matches(e,x.grep(t,function(e){return 1===e.nodeType}))},dir:function(e,t,n){var r=[],i=n!==undefined;while((e=e[t])&&9!==e.nodeType)if(1===e.nodeType){if(i&&x(e).is(n))break;r.push(e)}return r},sibling:function(e,t){var n=[];for(;e;e=e.nextSibling)1===e.nodeType&&e!==t&&n.push(e);return n}});function et(e,t,n){if(x.isFunction(t))return x.grep(e,function(e,r){return!!t.call(e,r,e)!==n});if(t.nodeType)return x.grep(e,function(e){return e===t!==n});if("string"==typeof t){if(G.test(t))return x.filter(t,e,n);t=x.filter(t,e)}return x.grep(e,function(e){return g.call(t,e)>=0!==n})}var tt=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,nt=/<([\w:]+)/,rt=/<|&#?\w+;/,it=/<(?:script|style|link)/i,ot=/^(?:checkbox|radio)$/i,st=/checked\s*(?:[^=]|=\s*.checked.)/i,at=/^$|\/(?:java|ecma)script/i,ut=/^true\/(.*)/,lt=/^\s*\s*$/g,ct={option:[1,""],thead:[1,"","
"],col:[2,"","
"],tr:[2,"","
"],td:[3,"","
"],_default:[0,"",""]};ct.optgroup=ct.option,ct.tbody=ct.tfoot=ct.colgroup=ct.caption=ct.thead,ct.th=ct.td,x.fn.extend({text:function(e){return x.access(this,function(e){return e===undefined?x.text(this):this.empty().append((this[0]&&this[0].ownerDocument||o).createTextNode(e))},null,e,arguments.length)},append:function(){return this.domManip(arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=pt(this,e);t.appendChild(e)}})},prepend:function(){return this.domManip(arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=pt(this,e);t.insertBefore(e,t.firstChild)}})},before:function(){return this.domManip(arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this)})},after:function(){return this.domManip(arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this.nextSibling)})},remove:function(e,t){var n,r=e?x.filter(e,this):this,i=0;for(;null!=(n=r[i]);i++)t||1!==n.nodeType||x.cleanData(mt(n)),n.parentNode&&(t&&x.contains(n.ownerDocument,n)&&dt(mt(n,"script")),n.parentNode.removeChild(n));return this},empty:function(){var e,t=0;for(;null!=(e=this[t]);t++)1===e.nodeType&&(x.cleanData(mt(e,!1)),e.textContent="");return this},clone:function(e,t){return e=null==e?!1:e,t=null==t?e:t,this.map(function(){return x.clone(this,e,t)})},html:function(e){return x.access(this,function(e){var t=this[0]||{},n=0,r=this.length;if(e===undefined&&1===t.nodeType)return t.innerHTML;if("string"==typeof e&&!it.test(e)&&!ct[(nt.exec(e)||["",""])[1].toLowerCase()]){e=e.replace(tt,"<$1>");try{for(;r>n;n++)t=this[n]||{},1===t.nodeType&&(x.cleanData(mt(t,!1)),t.innerHTML=e);t=0}catch(i){}}t&&this.empty().append(e)},null,e,arguments.length)},replaceWith:function(){var e=x.map(this,function(e){return[e.nextSibling,e.parentNode]}),t=0;return this.domManip(arguments,function(n){var r=e[t++],i=e[t++];i&&(r&&r.parentNode!==i&&(r=this.nextSibling),x(this).remove(),i.insertBefore(n,r))},!0),t?this:this.remove()},detach:function(e){return this.remove(e,!0)},domManip:function(e,t,n){e=f.apply([],e);var r,i,o,s,a,u,l=0,c=this.length,p=this,h=c-1,d=e[0],g=x.isFunction(d);if(g||!(1>=c||"string"!=typeof d||x.support.checkClone)&&st.test(d))return this.each(function(r){var i=p.eq(r);g&&(e[0]=d.call(this,r,i.html())),i.domManip(e,t,n)});if(c&&(r=x.buildFragment(e,this[0].ownerDocument,!1,!n&&this),i=r.firstChild,1===r.childNodes.length&&(r=i),i)){for(o=x.map(mt(r,"script"),ft),s=o.length;c>l;l++)a=r,l!==h&&(a=x.clone(a,!0,!0),s&&x.merge(o,mt(a,"script"))),t.call(this[l],a,l);if(s)for(u=o[o.length-1].ownerDocument,x.map(o,ht),l=0;s>l;l++)a=o[l],at.test(a.type||"")&&!q.access(a,"globalEval")&&x.contains(u,a)&&(a.src?x._evalUrl(a.src):x.globalEval(a.textContent.replace(lt,"")))}return this}}),x.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(e,t){x.fn[e]=function(e){var n,r=[],i=x(e),o=i.length-1,s=0;for(;o>=s;s++)n=s===o?this:this.clone(!0),x(i[s])[t](n),h.apply(r,n.get());return this.pushStack(r)}}),x.extend({clone:function(e,t,n){var r,i,o,s,a=e.cloneNode(!0),u=x.contains(e.ownerDocument,e);if(!(x.support.noCloneChecked||1!==e.nodeType&&11!==e.nodeType||x.isXMLDoc(e)))for(s=mt(a),o=mt(e),r=0,i=o.length;i>r;r++)yt(o[r],s[r]);if(t)if(n)for(o=o||mt(e),s=s||mt(a),r=0,i=o.length;i>r;r++)gt(o[r],s[r]);else gt(e,a);return s=mt(a,"script"),s.length>0&&dt(s,!u&&mt(e,"script")),a},buildFragment:function(e,t,n,r){var i,o,s,a,u,l,c=0,p=e.length,f=t.createDocumentFragment(),h=[];for(;p>c;c++)if(i=e[c],i||0===i)if("object"===x.type(i))x.merge(h,i.nodeType?[i]:i);else if(rt.test(i)){o=o||f.appendChild(t.createElement("div")),s=(nt.exec(i)||["",""])[1].toLowerCase(),a=ct[s]||ct._default,o.innerHTML=a[1]+i.replace(tt,"<$1>")+a[2],l=a[0];while(l--)o=o.lastChild;x.merge(h,o.childNodes),o=f.firstChild,o.textContent=""}else h.push(t.createTextNode(i));f.textContent="",c=0;while(i=h[c++])if((!r||-1===x.inArray(i,r))&&(u=x.contains(i.ownerDocument,i),o=mt(f.appendChild(i),"script"),u&&dt(o),n)){l=0;while(i=o[l++])at.test(i.type||"")&&n.push(i)}return f},cleanData:function(e){var t,n,r,i,o,s,a=x.event.special,u=0;for(;(n=e[u])!==undefined;u++){if(F.accepts(n)&&(o=n[q.expando],o&&(t=q.cache[o]))){if(r=Object.keys(t.events||{}),r.length)for(s=0;(i=r[s])!==undefined;s++)a[i]?x.event.remove(n,i):x.removeEvent(n,i,t.handle);q.cache[o]&&delete q.cache[o]}delete L.cache[n[L.expando]]}},_evalUrl:function(e){return x.ajax({url:e,type:"GET",dataType:"script",async:!1,global:!1,"throws":!0})}});function pt(e,t){return x.nodeName(e,"table")&&x.nodeName(1===t.nodeType?t:t.firstChild,"tr")?e.getElementsByTagName("tbody")[0]||e.appendChild(e.ownerDocument.createElement("tbody")):e}function ft(e){return e.type=(null!==e.getAttribute("type"))+"/"+e.type,e}function ht(e){var t=ut.exec(e.type);return t?e.type=t[1]:e.removeAttribute("type"),e}function dt(e,t){var n=e.length,r=0;for(;n>r;r++)q.set(e[r],"globalEval",!t||q.get(t[r],"globalEval"))}function gt(e,t){var n,r,i,o,s,a,u,l;if(1===t.nodeType){if(q.hasData(e)&&(o=q.access(e),s=q.set(t,o),l=o.events)){delete s.handle,s.events={};for(i in l)for(n=0,r=l[i].length;r>n;n++)x.event.add(t,i,l[i][n])}L.hasData(e)&&(a=L.access(e),u=x.extend({},a),L.set(t,u))}}function mt(e,t){var n=e.getElementsByTagName?e.getElementsByTagName(t||"*"):e.querySelectorAll?e.querySelectorAll(t||"*"):[];return t===undefined||t&&x.nodeName(e,t)?x.merge([e],n):n}function yt(e,t){var n=t.nodeName.toLowerCase();"input"===n&&ot.test(e.type)?t.checked=e.checked:("input"===n||"textarea"===n)&&(t.defaultValue=e.defaultValue)}x.fn.extend({wrapAll:function(e){var t;return x.isFunction(e)?this.each(function(t){x(this).wrapAll(e.call(this,t))}):(this[0]&&(t=x(e,this[0].ownerDocument).eq(0).clone(!0),this[0].parentNode&&t.insertBefore(this[0]),t.map(function(){var e=this;while(e.firstElementChild)e=e.firstElementChild;return e}).append(this)),this)},wrapInner:function(e){return x.isFunction(e)?this.each(function(t){x(this).wrapInner(e.call(this,t))}):this.each(function(){var t=x(this),n=t.contents();n.length?n.wrapAll(e):t.append(e)})},wrap:function(e){var t=x.isFunction(e);return this.each(function(n){x(this).wrapAll(t?e.call(this,n):e)})},unwrap:function(){return this.parent().each(function(){x.nodeName(this,"body")||x(this).replaceWith(this.childNodes)}).end()}});var vt,xt,bt=/^(none|table(?!-c[ea]).+)/,wt=/^margin/,Tt=RegExp("^("+b+")(.*)$","i"),Ct=RegExp("^("+b+")(?!px)[a-z%]+$","i"),kt=RegExp("^([+-])=("+b+")","i"),Nt={BODY:"block"},Et={position:"absolute",visibility:"hidden",display:"block"},St={letterSpacing:0,fontWeight:400},jt=["Top","Right","Bottom","Left"],Dt=["Webkit","O","Moz","ms"];function At(e,t){if(t in e)return t;var n=t.charAt(0).toUpperCase()+t.slice(1),r=t,i=Dt.length;while(i--)if(t=Dt[i]+n,t in e)return t;return r}function Lt(e,t){return e=t||e,"none"===x.css(e,"display")||!x.contains(e.ownerDocument,e)}function qt(t){return e.getComputedStyle(t,null)}function Ht(e,t){var n,r,i,o=[],s=0,a=e.length;for(;a>s;s++)r=e[s],r.style&&(o[s]=q.get(r,"olddisplay"),n=r.style.display,t?(o[s]||"none"!==n||(r.style.display=""),""===r.style.display&&Lt(r)&&(o[s]=q.access(r,"olddisplay",Rt(r.nodeName)))):o[s]||(i=Lt(r),(n&&"none"!==n||!i)&&q.set(r,"olddisplay",i?n:x.css(r,"display"))));for(s=0;a>s;s++)r=e[s],r.style&&(t&&"none"!==r.style.display&&""!==r.style.display||(r.style.display=t?o[s]||"":"none"));return e}x.fn.extend({css:function(e,t){return x.access(this,function(e,t,n){var r,i,o={},s=0;if(x.isArray(t)){for(r=qt(e),i=t.length;i>s;s++)o[t[s]]=x.css(e,t[s],!1,r);return o}return n!==undefined?x.style(e,t,n):x.css(e,t)},e,t,arguments.length>1)},show:function(){return Ht(this,!0)},hide:function(){return Ht(this)},toggle:function(e){return"boolean"==typeof e?e?this.show():this.hide():this.each(function(){Lt(this)?x(this).show():x(this).hide()})}}),x.extend({cssHooks:{opacity:{get:function(e,t){if(t){var n=vt(e,"opacity");return""===n?"1":n}}}},cssNumber:{columnCount:!0,fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":"cssFloat"},style:function(e,t,n,r){if(e&&3!==e.nodeType&&8!==e.nodeType&&e.style){var i,o,s,a=x.camelCase(t),u=e.style;return t=x.cssProps[a]||(x.cssProps[a]=At(u,a)),s=x.cssHooks[t]||x.cssHooks[a],n===undefined?s&&"get"in s&&(i=s.get(e,!1,r))!==undefined?i:u[t]:(o=typeof n,"string"===o&&(i=kt.exec(n))&&(n=(i[1]+1)*i[2]+parseFloat(x.css(e,t)),o="number"),null==n||"number"===o&&isNaN(n)||("number"!==o||x.cssNumber[a]||(n+="px"),x.support.clearCloneStyle||""!==n||0!==t.indexOf("background")||(u[t]="inherit"),s&&"set"in s&&(n=s.set(e,n,r))===undefined||(u[t]=n)),undefined)}},css:function(e,t,n,r){var i,o,s,a=x.camelCase(t);return t=x.cssProps[a]||(x.cssProps[a]=At(e.style,a)),s=x.cssHooks[t]||x.cssHooks[a],s&&"get"in s&&(i=s.get(e,!0,n)),i===undefined&&(i=vt(e,t,r)),"normal"===i&&t in St&&(i=St[t]),""===n||n?(o=parseFloat(i),n===!0||x.isNumeric(o)?o||0:i):i}}),vt=function(e,t,n){var r,i,o,s=n||qt(e),a=s?s.getPropertyValue(t)||s[t]:undefined,u=e.style;return s&&(""!==a||x.contains(e.ownerDocument,e)||(a=x.style(e,t)),Ct.test(a)&&wt.test(t)&&(r=u.width,i=u.minWidth,o=u.maxWidth,u.minWidth=u.maxWidth=u.width=a,a=s.width,u.width=r,u.minWidth=i,u.maxWidth=o)),a};function Ot(e,t,n){var r=Tt.exec(t);return r?Math.max(0,r[1]-(n||0))+(r[2]||"px"):t}function Ft(e,t,n,r,i){var o=n===(r?"border":"content")?4:"width"===t?1:0,s=0;for(;4>o;o+=2)"margin"===n&&(s+=x.css(e,n+jt[o],!0,i)),r?("content"===n&&(s-=x.css(e,"padding"+jt[o],!0,i)),"margin"!==n&&(s-=x.css(e,"border"+jt[o]+"Width",!0,i))):(s+=x.css(e,"padding"+jt[o],!0,i),"padding"!==n&&(s+=x.css(e,"border"+jt[o]+"Width",!0,i)));return s}function Pt(e,t,n){var r=!0,i="width"===t?e.offsetWidth:e.offsetHeight,o=qt(e),s=x.support.boxSizing&&"border-box"===x.css(e,"boxSizing",!1,o);if(0>=i||null==i){if(i=vt(e,t,o),(0>i||null==i)&&(i=e.style[t]),Ct.test(i))return i;r=s&&(x.support.boxSizingReliable||i===e.style[t]),i=parseFloat(i)||0}return i+Ft(e,t,n||(s?"border":"content"),r,o)+"px"}function Rt(e){var t=o,n=Nt[e];return n||(n=Mt(e,t),"none"!==n&&n||(xt=(xt||x("