diff -pruN 1.1.3-5/CMakeLists.txt 1.2.0~beta2-0ubuntu10/CMakeLists.txt
--- 1.1.3-5/CMakeLists.txt 2014-06-19 11:33:13.000000000 +0000
+++ 1.2.0~beta2-0ubuntu10/CMakeLists.txt 2014-06-19 11:33:12.000000000 +0000
@@ -9,15 +9,28 @@ INCLUDE(CheckFunctionExists)
INCLUDE(CheckIncludeFiles)
INCLUDE(FindPkgConfig)
INCLUDE(FindBoost)
+INCLUDE(FindJNI)
find_package(Qt4 REQUIRED)
include_directories(src)
+ADD_DEFINITIONS(-DBOOST_FILESYSTEM_NARROW_ONLY)
+
+# If you remove the following line, the Boost ASIO code used in pion will make libtorrent's Boost ASIO code crash
+# due to a curious symbol name conflict
+#ADD_DEFINITIONS(-fvisibility-inlines-hidden)
+
ADD_CUSTOM_TARGET(uninstall
COMMAND ${CMAKE_COMMAND} -E echo Use 'xargs rm < install_manifest.txt' to uninstall this program
)
+IF(NOT DEFINED CMAKE_INSTALL_LIBDIR)
+ SET(CMAKE_INSTALL_LIBDIR "${CMAKE_INSTALL_PREFIX}/lib")
+ENDIF(NOT DEFINED CMAKE_INSTALL_LIBDIR)
+
+#set(WITH_CXX0X ON)
+
if(WITH_EVERYTHING)
set(WITH_BITTORRENT ON)
set(WITH_JABBER ON)
@@ -25,20 +38,35 @@ if(WITH_EVERYTHING)
set(WITH_DOCUMENTATION ON)
set(WITH_WEBINTERFACE ON)
set(WITH_CURL ON)
+ set(WITH_JPLUGINS ON)
endif(WITH_EVERYTHING)
+if(WITH_CXX0X)
+ ADD_DEFINITIONS(-std=c++0x)
+else(WITH_CXX0X)
+ ADD_DEFINITIONS(-Dunique_ptr=auto_ptr)
+endif(WITH_CXX0X)
+
+if(WITH_JPLUGINS)
+ set(WITH_CURL ON)
+
+ find_package(JNI REQUIRED)
+
+ include_directories(${JNI_INCLUDE_DIRS})
+endif(WITH_JPLUGINS)
+
if(WITH_BITTORRENT)
- pkg_check_modules(libtorrent REQUIRED "libtorrent-rasterbar >= 0.14.6")
+ pkg_check_modules(libtorrent REQUIRED "libtorrent-rasterbar >= 0.16.0")
if(libtorrent_FOUND)
message(STATUS "libtorrent ${libtorrent_VERSION} found OK")
include_directories(${libtorrent_INCLUDE_DIRS})
- if(libtorrent_VERSION GREATER 0.14.99)
- set(LIBTORRENT_0_15 TRUE)
- endif(libtorrent_VERSION GREATER 0.14.99)
+ #if(libtorrent_VERSION GREATER 0.14.99)
+ set(LIBTORRENT_0_15 TRUE)
+ #endif(libtorrent_VERSION GREATER 0.14.99)
else(libtorrent_FOUND)
- message(FATAL_ERROR "No Rasterbar libtorrent")
+ message(FATAL_ERROR "No Rasterbar libtorrent found")
endif(libtorrent_FOUND)
SET(Boost_USE_MULTITHREAD ON)
@@ -49,7 +77,7 @@ if(WITH_BITTORRENT)
message(STATUS "boost-datetime found OK")
include_directories(${Boost_INCLUDE_DIRS})
else(Boost_FOUND)
- message(FATAL_ERROR "No boost-datetime")
+ message(FATAL_ERROR "No boost-datetime found")
endif(Boost_FOUND)
#set(asio_DIR ${CMAKE_MODULE_PATH})
@@ -63,6 +91,7 @@ if(WITH_BITTORRENT)
#endif(ASIO_FOUND)
set(QT_USE_QTWEBKIT TRUE)
+ ADD_DEFINITIONS(-DTORRENT_USE_OPENSSL -DBOOST_ASIO_DYN_LINK)
endif(WITH_BITTORRENT)
if(WITH_JABBER)
@@ -78,7 +107,7 @@ if(WITH_JABBER)
set(GLOOX_1_0 TRUE)
endif(gloox_VERSION LESS 1.0)
else(gloox_FOUND)
- message(FATAL_ERROR "No gloox")
+ message(FATAL_ERROR "No libgloox found")
endif(gloox_FOUND)
endif(WITH_JABBER)
@@ -88,22 +117,22 @@ if(WITH_CURL)
if(curl_FOUND)
include_directories(${curl_INCLUDE_DIRS})
else(curl_FOUND)
- message(FATAR_ERROR "No curl")
+ message(FATAR_ERROR "No libcurl found")
endif(curl_FOUND)
endif(WITH_CURL)
+ADD_DEFINITIONS(-Wl,--stack,524 288)
if(CMAKE_BUILD_TYPE MATCHES Debug)
ADD_DEFINITIONS(-ggdb)
- #ADD_DEFINITIONS(-DDEBUG)
+ ADD_DEFINITIONS(-DDEBUG_BUILD)
ADD_DEFINITIONS(-DNDEBUG)
ADD_DEFINITIONS(-Wall)
else(CMAKE_BUILD_TYPE MATCHES Debug)
ADD_DEFINITIONS(-ggdb)
ADD_DEFINITIONS(-DNDEBUG)
+ ADD_DEFINITIONS(-Wall)
endif(CMAKE_BUILD_TYPE MATCHES Debug)
-ADD_DEFINITIONS(-DBOOST_FILESYSTEM_VERSION=2)
-
CHECK_INCLUDE_FILES(sys/epoll.h HAVE_SYS_EPOLL_H)
CHECK_FUNCTION_EXISTS(kqueue HAVE_KQUEUE)
CONFIGURE_FILE(config.h.in config.h)
@@ -119,14 +148,34 @@ if(WITH_DOCUMENTATION)
set(QT_USE_QTHELP TRUE)
endif(WITH_DOCUMENTATION)
if(WITH_WEBINTERFACE)
- set(QT_USE_QTSCRIPT TRUE)
+ pkg_check_modules(pion-net REQUIRED "pion-net >= 3.0.0")
+
+ if(pion-net_FOUND)
+ include_directories(${pion-net_INCLUDE_DIRS})
+ #message(STATUS "Pion libdir: ${pion-net_LIBDIR}")
+
+ #FILE(GLOB pion_FileService "${pion-net_LIBDIR}/pion/plugins/FileService.*")
+ #if(pion_FileService MATCHES "^$")
+ # message(FATAL_ERROR "Pion-net FileService plugin not found (libpion-net-plugins?) - ${pion_FileService}")
+ #endif(pion_FileService MATCHES "^$")
+ else(pion-net_FOUND)
+ message(FATAL_ERROR "No pion-net library found")
+ endif(pion-net_FOUND)
endif(WITH_WEBINTERFACE)
+#set(CMAKE_REQUIRED_INCLUDES "sys/types.h")
+CHECK_INCLUDE_FILES("sys/types.h;attr/xattr.h" HAVE_XATTR_H)
+
+if (HAVE_XATTR_H)
+ SET(XATTR_LIBRARIES "-lattr")
+endif (HAVE_XATTR_H)
+
include( ${QT_USE_FILE} )
add_definitions(${QT_DEFINITIONS})
include_directories(./ ../ ${CMAKE_CURRENT_BINARY_DIR} ${QT_INCLUDE_DIR})
set(fatrat_SRCS
+ src/MyApplication.cpp
src/Auth.cpp
src/AboutDlg.cpp
src/AppTools.cpp
@@ -163,10 +212,18 @@ set(fatrat_SRCS
src/QueueDlg.cpp
src/ClipboardMonitor.cpp
src/SettingsClipboardMonitorForm.cpp
+ src/TransferFactory.cpp
src/filterlineedit.cpp
src/fancylineedit.cpp
- src/engines/OutputBuffer.cpp
+ #src/notify/Notification.cpp
+ src/dbus/NotificationsProxy.cpp
+ src/dbus/KNotify.cpp
+ src/engines/MetalinkSettings.cpp
+ src/engines/PlaceholderTransfer.cpp
src/poller/Poller.cpp
+ src/captcha/Captcha.cpp
+ src/captcha/CaptchaQt.cpp
+ src/captcha/CaptchaQtDlg.cpp
src/rss/RssFetcher.cpp
src/rss/SettingsRssForm.cpp
@@ -180,13 +237,15 @@ set(fatrat_SRCS
src/dbus/DbusAdaptor.cpp
src/dbus/DbusImpl.cpp
src/tools/HashDlg.cpp
- src/tools/RapidTools.cpp
- src/tools/VideoFetcher.cpp
+ src/util/ExtendedAttributes.cpp
+ src/util/BalloonTip.cpp
)
if(HAVE_SYS_EPOLL_H)
+ set(POSIX_LINUX TRUE)
set(fatrat_SRCS ${fatrat_SRCS} src/poller/EpollPoller.cpp)
elseif(HAVE_KQUEUE)
+ set(POSIX_BSD TRUE)
set(fatrat_SRCS ${fatrat_SRCS} src/poller/KqueuePoller.cpp)
endif(HAVE_SYS_EPOLL_H)
@@ -229,13 +288,18 @@ set(fatrat_MOC_HDRS
src/ReportBugDlg.h
src/ClipboardMonitor.h
src/SettingsClipboardMonitorForm.h
+ src/TransferFactory.h
src/filterlineedit.h
src/fancylineedit.h
- src/engines/OutputBuffer.h
+ src/ClickableLabel.h
+ #src/notify/Notification.h
+ src/dbus/NotificationsProxy.h
+ src/dbus/KNotify.h
+ src/engines/MetalinkSettings.h
+ src/captcha/CaptchaQt.h
+ src/captcha/CaptchaQtDlg.h
src/tools/HashDlg.h
- src/tools/RapidTools.h
- src/tools/VideoFetcher.h
src/rss/RssFetcher.h
src/rss/SettingsRssForm.h
@@ -246,6 +310,8 @@ set(fatrat_MOC_HDRS
src/tooltips/QueueToolTip.h
src/tooltips/TrayToolTip.h
src/tooltips/BaseToolTip.h
+
+ src/util/BalloonTip.h
)
set(fatrat_UIS
@@ -269,10 +335,9 @@ set(fatrat_UIS
src/UserAuthDlg.ui
src/WidgetHostDlg.ui
src/ReportBugDlg.ui
+ src/captcha/CaptchaQtDlg.ui
src/tools/HashDlg.ui
- src/tools/RapidTools.ui
- src/tools/VideoFetcher.ui
src/rss/SettingsRssForm.ui
src/rss/RssFeedDlg.ui
@@ -284,6 +349,7 @@ set(fatrat_UIS
src/engines/HttpOptsWidget.ui
src/engines/HttpUrlOptsDlg.ui
src/engines/SettingsHttpForm.ui
+ src/engines/SettingsMetalinkForm.ui
)
if(WITH_CURL)
@@ -294,31 +360,97 @@ if(WITH_CURL)
src/engines/CurlPoller.cpp
src/engines/CurlUser.cpp
src/engines/CurlStat.cpp
+ src/engines/CurlPollingMaster.cpp
+ src/engines/UrlClient.cpp
src/engines/GeneralDownloadForms.cpp
src/engines/HttpFtpSettings.cpp
- src/engines/RapidshareUpload.cpp
- src/engines/RapidshareUploadProgress.cpp
- src/engines/RapidshareFreeDownload.cpp
- src/engines/RapidshareStatusWidget.cpp
+ src/engines/HttpDetails.cpp
+ src/engines/HttpDetailsBar.cpp
+ src/engines/HttpMirrorsDlg.cpp
+ src/engines/MetalinkDownload.cpp
)
set(fatrat_MOC_HDRS
${fatrat_MOC_HDRS}
src/engines/CurlDownload.h
src/engines/CurlUpload.h
+ src/engines/UrlClient.h
src/engines/HttpFtpSettings.h
+ src/engines/HttpDetails.h
+ src/engines/HttpDetailsBar.h
+ src/engines/HttpMirrorsDlg.h
src/engines/GeneralDownloadForms.h
- src/engines/RapidshareUpload.h
- src/engines/RapidshareFreeDownload.h
- src/engines/RapidshareStatusWidget.h
+ src/engines/MetalinkDownload.h
)
set(fatrat_UIS
${fatrat_UIS}
- src/engines/RapidshareOptsForm.ui
- src/engines/RapidshareUploadDetailsForm.ui
- src/engines/RapidshareFreeDownloadOptsForm.ui
+ src/engines/HttpDetails.ui
+ src/engines/HttpMirrorsDlg.ui
)
endif(WITH_CURL)
+if(WITH_JPLUGINS)
+ set(fatrat_SRCS
+ ${fatrat_SRCS}
+ src/java/JString.cpp
+ src/java/JClass.cpp
+ src/java/JObject.cpp
+ src/java/JArray.cpp
+ src/java/JScope.cpp
+ src/java/JException.cpp
+ src/java/JValue.cpp
+ src/java/JSignature.cpp
+ src/java/JByteBuffer.cpp
+ src/java/JMap.cpp
+ src/java/JVM.cpp
+ src/java/JPlugin.cpp
+ src/java/JExtractorPlugin.cpp
+ src/java/JTransferPlugin.cpp
+ src/java/JDownloadPlugin.cpp
+ src/java/JUploadPlugin.cpp
+ src/java/JLinkCheckerPlugin.cpp
+ src/java/JNativeMethod.cpp
+ src/java/JSettings.cpp
+ src/java/JBackgroundWorker.cpp
+ src/java/JSingleCObject.cpp
+ src/java/JAccountStatusPlugin.cpp
+ src/engines/JavaAccountStatusWidget.cpp
+ src/engines/ExtensionDownloadDlg.cpp
+ src/engines/JavaPersistentVariables.cpp
+ src/engines/JavaDownload.cpp
+ src/engines/JavaExtractor.cpp
+ src/engines/JavaUpload.cpp
+ src/engines/SettingsJavaPluginForm.cpp
+ src/ExtensionMgr.cpp
+ src/java/JSearchPlugin.cpp
+ src/tools/FileSharingSearch.cpp
+ )
+ set(fatrat_MOC_HDRS
+ ${fatrat_MOC_HDRS}
+ src/engines/JavaDownload.h
+ src/engines/JavaExtractor.h
+ src/engines/JavaUpload.h
+ src/java/JPlugin.h
+ src/java/JTransferPlugin.h
+ src/java/JDownloadPlugin.h
+ src/java/JAccountStatusPlugin.h
+ src/java/JLinkCheckerPlugin.h
+ src/engines/JavaAccountStatusWidget.h
+ src/engines/ExtensionDownloadDlg.h
+ src/engines/SettingsJavaPluginForm.h
+ src/java/JBackgroundWorker.h
+ src/ExtensionMgr.h
+ src/tools/FileSharingSearch.h
+ )
+ set(fatrat_UIS
+ ${fatrat_UIS}
+ src/engines/ExtensionDownloadDlg.ui
+ src/engines/JavaDownloadOptsForm.ui
+ src/engines/SettingsJavaPluginForm.ui
+ src/engines/JavaAccountStatusWidget.ui
+ src/tools/FileSharingSearch.ui
+ )
+endif(WITH_JPLUGINS)
+
if(WITH_BITTORRENT)
set(fatrat_SRCS
${fatrat_SRCS}
@@ -385,14 +517,22 @@ if(WITH_WEBINTERFACE)
src/remote/HttpService.cpp
src/remote/SettingsWebForm.cpp
src/remote/XmlRpcService.cpp
+ src/remote/pion/FileService.cpp
+ src/remote/CertGenDlg.cpp
+ src/captcha/CaptchaHttp.cpp
)
set(fatrat_MOC_HDRS
${fatrat_MOC_HDRS}
+ src/remote/XmlRpcService.h
+ src/remote/SettingsWebForm.h
+ src/remote/CertGenDlg.h
src/remote/HttpService.h
+ src/captcha/CaptchaHttp.h
)
set(fatrat_UIS
${fatrat_UIS}
src/remote/SettingsWebForm.ui
+ src/remote/CertGenDlg.ui
)
endif(WITH_WEBINTERFACE)
@@ -422,15 +562,22 @@ qt4_wrap_ui(fatrat_UIS_H ${fatrat_UIS})
qt4_add_resources(fatrat_QRC_H gfx/resources.qrc)
qt4_add_translation(lrelease_outputs locale/fatrat_cs_CZ.ts
locale/fatrat_pl_PL.ts locale/fatrat_tr_TR.ts locale/fatrat_sk_SK.ts locale/fatrat_ru_RU.ts locale/fatrat_fr_FR.ts
-locale/fatrat_uk_UA.ts)
+locale/fatrat_uk_UA.ts locale/fatrat_es_AR.ts locale/fatrat_es_ES.ts locale/fatrat_ca_ES.ts locale/fatrat_zh_CN.ts
+locale/fatrat_zh_TW.ts locale/fatrat_sr_RS.ts locale/fatrat_sr_BA.ts locale/fatrat_de_DE.ts)
add_executable(fatrat ${fatrat_SRCS} ${fatrat_MOC_SRCS} ${fatrat_UIS_H}
${fatrat_QRC_H} ${lrelease_outputs})
+add_executable(fatrat-conf src/fatrat-conf.cpp)
-target_link_libraries(fatrat ${QT_LIBRARIES} ${libtorrent_LDFLAGS} ${gloox_LDFLAGS} ${curl_LDFLAGS} ${Boost_LIBRARIES} ${QT_ADDITIONAL_LIBS} -lpthread -ldl -export-dynamic)
+# This used to be a workaround until it started causing the exact opposite... oh dear!
+#STRING(REPLACE "-mt" "" pion-net_LIBRARIES "${pion-net_LIBRARIES}")
+#message(STATUS ${pion-net_LIBRARIES})
+target_link_libraries(fatrat -ldl -lpthread ${QT_LIBRARIES} ${libtorrent_LDFLAGS} ${gloox_LDFLAGS} ${curl_LDFLAGS} ${Boost_LIBRARIES} ${pion-net_LIBRARIES} ${QT_ADDITIONAL_LIBS} ${XATTR_LIBRARIES} -lpthread -ldl -export-dynamic)
+target_link_libraries(fatrat-conf ${QT_LIBRARIES})
set(fatrat_DEV_HEADERS
${CMAKE_CURRENT_SOURCE_DIR}/src/fatrat.h
+ ${CMAKE_CURRENT_BINARY_DIR}/config.h
${CMAKE_CURRENT_SOURCE_DIR}/src/DelayedIcon.h
${CMAKE_CURRENT_SOURCE_DIR}/src/AppTools.h
${CMAKE_CURRENT_SOURCE_DIR}/src/Transfer.h
@@ -448,8 +595,9 @@ set(fatrat_DEV_HEADERS_ENGINES
${CMAKE_CURRENT_SOURCE_DIR}/src/engines/CurlDownload.h
${CMAKE_CURRENT_SOURCE_DIR}/src/engines/CurlUser.h
${CMAKE_CURRENT_SOURCE_DIR}/src/engines/CurlPoller.h
- ${CMAKE_CURRENT_SOURCE_DIR}/src/engines/OutputBuffer.h
${CMAKE_CURRENT_SOURCE_DIR}/src/engines/CurlStat.h
+ ${CMAKE_CURRENT_SOURCE_DIR}/src/engines/StaticTransferMessage.h
+ ${CMAKE_CURRENT_SOURCE_DIR}/src/engines/UrlClient.h
)
install(FILES
@@ -478,35 +626,34 @@ if(WITH_NLS)
install(FILES ${lrelease_outputs} DESTINATION share/fatrat/lang)
endif(WITH_NLS)
+if(WITH_CURL)
+ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/mirrors.txt DESTINATION share/fatrat/data)
+endif(WITH_CURL)
+
if(WITH_BITTORRENT)
- install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/btsearch.xml DESTINATION share/fatrat/data)
+ FILE( GLOB btsearch ${CMAKE_CURRENT_SOURCE_DIR}/data/btsearch/*.xml )
+ install(FILES ${btsearch} DESTINATION share/fatrat/data/btsearch)
+
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/btlinks.txt DESTINATION share/fatrat/data)
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/bttrackers.txt DESTINATION share/fatrat/data)
endif(WITH_BITTORRENT)
if(WITH_WEBINTERFACE)
- FILE( GLOB rm_pngs ${CMAKE_CURRENT_SOURCE_DIR}/data/remote/*.png )
- install(FILES ${rm_pngs} DESTINATION share/fatrat/data/remote)
-
- FILE( GLOB rm_qsps ${CMAKE_CURRENT_SOURCE_DIR}/data/remote/*.qsp )
- install(FILES ${rm_qsps} DESTINATION share/fatrat/data/remote)
-
- install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/remote/index.js DESTINATION share/fatrat/data/remote)
- install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/remote/style.css DESTINATION share/fatrat/data/remote)
-
- FILE( GLOB rm_move ${CMAKE_CURRENT_SOURCE_DIR}/data/remote/move/*.png )
- install(FILES ${rm_move} DESTINATION share/fatrat/data/remote/move)
-
- FILE( GLOB rm_queue ${CMAKE_CURRENT_SOURCE_DIR}/data/remote/queue/*.png )
- install(FILES ${rm_queue} DESTINATION share/fatrat/data/remote/queue)
-
- FILE( GLOB rm_states ${CMAKE_CURRENT_SOURCE_DIR}/data/remote/states/*.png )
- install(FILES ${rm_states} DESTINATION share/fatrat/data/remote/states)
-
- FILE( GLOB rm_filedialog ${CMAKE_CURRENT_SOURCE_DIR}/data/remote/filedialog/* )
- install(FILES ${rm_filedialog} DESTINATION share/fatrat/data/remote/filedialog)
+ #FILE( GLOB_RECURSE remfiles ${CMAKE_CURRENT_SOURCE_DIR}/data/remote/* )
+ install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/data/remote DESTINATION share/fatrat/data)
+ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/genssl.cnf DESTINATION share/fatrat/data)
+ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/genssl.sh DESTINATION share/fatrat/data PERMISSIONS
+ OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
endif(WITH_WEBINTERFACE)
+if(WITH_JPLUGINS)
+ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/java/findjvm.sh DESTINATION share/fatrat/data/java PERMISSIONS
+ OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/java/fatrat-jplugins.jar DESTINATION share/fatrat/data/java)
+ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/java/extension.policy DESTINATION share/fatrat/data/java)
+ install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/data/java/libs DESTINATION share/fatrat/data/java)
+endif(WITH_JPLUGINS)
+
if(WITH_DOCUMENTATION)
execute_process(COMMAND qcollectiongenerator
${CMAKE_CURRENT_SOURCE_DIR}/doc/fatrat.qhcp -o
@@ -517,4 +664,6 @@ endif(WITH_DOCUMENTATION)
install(FILES doc/fatrat.1 DESTINATION share/man/man1)
-install(TARGETS fatrat DESTINATION bin)
+install(TARGETS fatrat fatrat-conf DESTINATION bin)
+# install(SCRIPT CreateSymlinks.cmake)
+
diff -pruN 1.1.3-5/config.h.in 1.2.0~beta2-0ubuntu10/config.h.in
--- 1.1.3-5/config.h.in 2010-09-06 09:43:46.000000000 +0000
+++ 1.2.0~beta2-0ubuntu10/config.h.in 2012-07-14 11:44:27.000000000 +0000
@@ -1,12 +1,20 @@
#ifndef CONFIG_H
#define CONFIG_H
+#define CMAKE_BUILD_TYPE "${CMAKE_BUILD_TYPE}"
+
#cmakedefine WITH_BITTORRENT
#cmakedefine WITH_NLS
#cmakedefine WITH_JABBER
#cmakedefine WITH_WEBINTERFACE
#cmakedefine WITH_DOCUMENTATION
#cmakedefine WITH_CURL
+#cmakedefine WITH_JPLUGINS
+#cmakedefine WITH_CXX0X
+
+#ifdef WITH_WEBINTERFACE
+# define PION_NET_PLUGINS "${pion-net_LIBDIR}/pion/plugins"
+#endif
#cmakedefine ENABLE_FAKEDOWNLOAD
@@ -18,11 +26,22 @@
#cmakedefine LIBTORRENT_0_15
+#cmakedefine POSIX_LINUX
+#cmakedefine POSIX_BSD
+#cmakedefine POSIX_SOLARIS
+
+#cmakedefine HAVE_XATTR_H
+
+#define USER_PROFILE_PATH "/.local/share/fatrat"
#define DATA_LOCATION "${CMAKE_INSTALL_PREFIX}/share/fatrat"
-#define PLUGIN_LOCATION "${CMAKE_INSTALL_PREFIX}/lib/fatrat/plugins"
+#define PLUGIN_LOCATION "${CMAKE_INSTALL_LIBDIR}/fatrat/plugins"
#ifndef _LARGEFILE64_SOURCE
# define _LARGEFILE64_SOURCE
#endif
+#ifdef BOOST_POSIX_API
+# undef BOOST_POSIX_API
+#endif
+
#endif
diff -pruN 1.1.3-5/CreateSymlinks.cmake 1.2.0~beta2-0ubuntu10/CreateSymlinks.cmake
--- 1.1.3-5/CreateSymlinks.cmake 1970-01-01 00:00:00.000000000 +0000
+++ 1.2.0~beta2-0ubuntu10/CreateSymlinks.cmake 2012-07-14 11:44:27.000000000 +0000
@@ -0,0 +1 @@
+EXECUTE_PROCESS(COMMAND ln -s fatrat "$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/fatrat-nogui")
diff -pruN 1.1.3-5/data/btlinks.txt 1.2.0~beta2-0ubuntu10/data/btlinks.txt
--- 1.1.3-5/data/btlinks.txt 2010-09-06 09:43:46.000000000 +0000
+++ 1.2.0~beta2-0ubuntu10/data/btlinks.txt 2012-07-14 11:44:27.000000000 +0000
@@ -1,3 +1,6 @@
-http://www\.mininova\.org/get/(\d+)
-http://www\.bt-chat\.com/download1\.php\?id=(\d+)
+http://www\.mininova\.org/get/\d+
+http://www\.bt-chat\.com/download1\.php\?id=\d+
http://tracker\.cztorrent\.net/download/\d+
+http://www\.newtorrents\.info/down\.php\?id=\d+
+http://www\.demonoid\.me/files/download.+
+http://re\.zoink\.it/[0-9a-z]+
diff -pruN 1.1.3-5/data/btsearch/btjunkie.org.xml 1.2.0~beta2-0ubuntu10/data/btsearch/btjunkie.org.xml
--- 1.1.3-5/data/btsearch/btjunkie.org.xml 1970-01-01 00:00:00.000000000 +0000
+++ 1.2.0~beta2-0ubuntu10/data/btsearch/btjunkie.org.xml 2012-07-14 11:44:27.000000000 +0000
@@ -0,0 +1,15 @@
+ New transfer
Operation successful, '+result.length+' transfer(s) added.
'); - error = false; -} -?> - -- '); - else - print(''); - ?> -
- - diff -pruN 1.1.3-5/data/remote/add_transfer.qsp 1.2.0~beta2-0ubuntu10/data/remote/add_transfer.qsp --- 1.1.3-5/data/remote/add_transfer.qsp 2010-09-06 09:43:46.000000000 +0000 +++ 1.2.0~beta2-0ubuntu10/data/remote/add_transfer.qsp 1970-01-01 00:00:00.000000000 +0000 @@ -1,104 +0,0 @@ - - - - -New transfer
- - - - Binary files 1.1.3-5/data/remote/applet/commons-codec.jar and 1.2.0~beta2-0ubuntu10/data/remote/applet/commons-codec.jar differ Binary files 1.1.3-5/data/remote/applet/commons-io.jar and 1.2.0~beta2-0ubuntu10/data/remote/applet/commons-io.jar differ Binary files 1.1.3-5/data/remote/applet/commons-logging.jar and 1.2.0~beta2-0ubuntu10/data/remote/applet/commons-logging.jar differ Binary files 1.1.3-5/data/remote/applet/fatrat-applet.jar and 1.2.0~beta2-0ubuntu10/data/remote/applet/fatrat-applet.jar differ Binary files 1.1.3-5/data/remote/applet/ws-commons-util.jar and 1.2.0~beta2-0ubuntu10/data/remote/applet/ws-commons-util.jar differ Binary files 1.1.3-5/data/remote/applet/xmlrpc-client.jar and 1.2.0~beta2-0ubuntu10/data/remote/applet/xmlrpc-client.jar differ Binary files 1.1.3-5/data/remote/applet/xmlrpc-common.jar and 1.2.0~beta2-0ubuntu10/data/remote/applet/xmlrpc-common.jar differ diff -pruN 1.1.3-5/data/remote/applet.html 1.2.0~beta2-0ubuntu10/data/remote/applet.html --- 1.1.3-5/data/remote/applet.html 1970-01-01 00:00:00.000000000 +0000 +++ 1.2.0~beta2-0ubuntu10/data/remote/applet.html 2012-07-14 11:44:27.000000000 +0000 @@ -0,0 +1,47 @@ + + + + + ++The applet is a very early snapsphot. It may not provide the expected feature set yet. +
+ + + + + + + Binary files 1.1.3-5/data/remote/browse.png and 1.2.0~beta2-0ubuntu10/data/remote/browse.png differ diff -pruN 1.1.3-5/data/remote/browse.qsp 1.2.0~beta2-0ubuntu10/data/remote/browse.qsp --- 1.1.3-5/data/remote/browse.qsp 2010-09-06 09:43:46.000000000 +0000 +++ 1.2.0~beta2-0ubuntu10/data/remote/browse.qsp 1970-01-01 00:00:00.000000000 +0000 @@ -1,79 +0,0 @@ - - - - -Browse files
- - -File name | Size | ['+ files[i] + '] | <DIR> | '); - } - else - { - size = formatSize(info.size, false); - print('
'+files[i]+' | '+size+' |
[..] | <DIR> |
- -
- - diff -pruN 1.1.3-5/data/remote/captcha.html 1.2.0~beta2-0ubuntu10/data/remote/captcha.html --- 1.1.3-5/data/remote/captcha.html 1970-01-01 00:00:00.000000000 +0000 +++ 1.2.0~beta2-0ubuntu10/data/remote/captcha.html 2012-07-14 11:44:27.000000000 +0000 @@ -0,0 +1,83 @@ + + + + + + + + + + + ++Please re-type the following captcha. This dialog will be automatically dismissed in seconds. +
+ + + + + + Binary files 1.1.3-5/data/remote/css/icons/add.png and 1.2.0~beta2-0ubuntu10/data/remote/css/icons/add.png differ Binary files 1.1.3-5/data/remote/css/icons/browse.png and 1.2.0~beta2-0ubuntu10/data/remote/css/icons/browse.png differ Binary files 1.1.3-5/data/remote/css/icons/close.png and 1.2.0~beta2-0ubuntu10/data/remote/css/icons/close.png differ Binary files 1.1.3-5/data/remote/css/icons/configure.png and 1.2.0~beta2-0ubuntu10/data/remote/css/icons/configure.png differ Binary files 1.1.3-5/data/remote/css/icons/delete.png and 1.2.0~beta2-0ubuntu10/data/remote/css/icons/delete.png differ Binary files 1.1.3-5/data/remote/css/icons/delete_with_data.png and 1.2.0~beta2-0ubuntu10/data/remote/css/icons/delete_with_data.png differ Binary files 1.1.3-5/data/remote/css/icons/download.png and 1.2.0~beta2-0ubuntu10/data/remote/css/icons/download.png differ Binary files 1.1.3-5/data/remote/css/icons/down.png and 1.2.0~beta2-0ubuntu10/data/remote/css/icons/down.png differ Binary files 1.1.3-5/data/remote/css/icons/graph.png and 1.2.0~beta2-0ubuntu10/data/remote/css/icons/graph.png differ Binary files 1.1.3-5/data/remote/css/icons/help.png and 1.2.0~beta2-0ubuntu10/data/remote/css/icons/help.png differ Binary files 1.1.3-5/data/remote/css/icons/move/bottom.png and 1.2.0~beta2-0ubuntu10/data/remote/css/icons/move/bottom.png differ Binary files 1.1.3-5/data/remote/css/icons/move/down.png and 1.2.0~beta2-0ubuntu10/data/remote/css/icons/move/down.png differ Binary files 1.1.3-5/data/remote/css/icons/move/top.png and 1.2.0~beta2-0ubuntu10/data/remote/css/icons/move/top.png differ Binary files 1.1.3-5/data/remote/css/icons/move/up.png and 1.2.0~beta2-0ubuntu10/data/remote/css/icons/move/up.png differ Binary files 1.1.3-5/data/remote/css/icons/queue/add.png and 1.2.0~beta2-0ubuntu10/data/remote/css/icons/queue/add.png differ Binary files 1.1.3-5/data/remote/css/icons/queue/properties.png and 1.2.0~beta2-0ubuntu10/data/remote/css/icons/queue/properties.png differ Binary files 1.1.3-5/data/remote/css/icons/queue/remove.png and 1.2.0~beta2-0ubuntu10/data/remote/css/icons/queue/remove.png differ Binary files 1.1.3-5/data/remote/css/icons/reload.png and 1.2.0~beta2-0ubuntu10/data/remote/css/icons/reload.png differ Binary files 1.1.3-5/data/remote/css/icons/states/active.png and 1.2.0~beta2-0ubuntu10/data/remote/css/icons/states/active.png differ Binary files 1.1.3-5/data/remote/css/icons/states/active_upload.png and 1.2.0~beta2-0ubuntu10/data/remote/css/icons/states/active_upload.png differ Binary files 1.1.3-5/data/remote/css/icons/states/completed.png and 1.2.0~beta2-0ubuntu10/data/remote/css/icons/states/completed.png differ Binary files 1.1.3-5/data/remote/css/icons/states/completed_upload.png and 1.2.0~beta2-0ubuntu10/data/remote/css/icons/states/completed_upload.png differ Binary files 1.1.3-5/data/remote/css/icons/states/failed.png and 1.2.0~beta2-0ubuntu10/data/remote/css/icons/states/failed.png differ Binary files 1.1.3-5/data/remote/css/icons/states/failed_upload.png and 1.2.0~beta2-0ubuntu10/data/remote/css/icons/states/failed_upload.png differ Binary files 1.1.3-5/data/remote/css/icons/states/forcedactive.png and 1.2.0~beta2-0ubuntu10/data/remote/css/icons/states/forcedactive.png differ Binary files 1.1.3-5/data/remote/css/icons/states/forcedactive_upload.png and 1.2.0~beta2-0ubuntu10/data/remote/css/icons/states/forcedactive_upload.png differ Binary files 1.1.3-5/data/remote/css/icons/states/paused.png and 1.2.0~beta2-0ubuntu10/data/remote/css/icons/states/paused.png differ Binary files 1.1.3-5/data/remote/css/icons/states/paused_upload.png and 1.2.0~beta2-0ubuntu10/data/remote/css/icons/states/paused_upload.png differ Binary files 1.1.3-5/data/remote/css/icons/states/waiting.png and 1.2.0~beta2-0ubuntu10/data/remote/css/icons/states/waiting.png differ Binary files 1.1.3-5/data/remote/css/icons/states/waiting_upload.png and 1.2.0~beta2-0ubuntu10/data/remote/css/icons/states/waiting_upload.png differ Binary files 1.1.3-5/data/remote/css/icons/upload.png and 1.2.0~beta2-0ubuntu10/data/remote/css/icons/upload.png differ diff -pruN 1.1.3-5/data/remote/css/icons.css 1.2.0~beta2-0ubuntu10/data/remote/css/icons.css --- 1.1.3-5/data/remote/css/icons.css 1970-01-01 00:00:00.000000000 +0000 +++ 1.2.0~beta2-0ubuntu10/data/remote/css/icons.css 2012-07-14 11:44:27.000000000 +0000 @@ -0,0 +1,42 @@ +.fatrat-icon-add { background-image: url(icons/add.png); } +.fatrat-icon-delete { background-image: url(icons/delete.png); } +.fatrat-icon-delete-with-data { background-image: url(icons/delete_with_data.png); } +.fatrat-icon-delete-completed { background-image: url(icons/states/completed.png); } + +.fatrat-icon-resume { background-image: url(icons/states/active.png); } +.fatrat-icon-force-resume { background-image: url(icons/states/forcedactive.png); } +.fatrat-icon-pause { background-image: url(icons/states/paused.png); } + +.fatrat-icon-settings { background-image: url(icons/configure.png); } +.fatrat-icon-help { background-image: url(icons/help.png); } + +.fatrat-icon-move-top { background-image: url(icons/move/top.png); } +.fatrat-icon-move-up { background-image: url(icons/move/up.png); } +.fatrat-icon-move-down { background-image: url(icons/move/down.png); } +.fatrat-icon-move-bottom { background-image: url(icons/move/bottom.png); } + +.fatrat-icon-queue-add { background-image: url(icons/queue/add.png); } +.fatrat-icon-queue-delete { background-image: url(icons/queue/remove.png); } + +.fatrat-transfer-state { padding-left: 26px; background-position: 4px; background-repeat: no-repeat } +.fatrat-transfer-active { background-image: url(icons/states/active.png); } +.fatrat-transfer-active-ul { background-image: url(icons/states/active_upload.png); } +.fatrat-transfer-forcedactive { background-image: url(icons/states/forcedactive.png); } +.fatrat-transfer-forcedactive-ul { background-image: url(icons/states/forcedactive_upload.png); } +.fatrat-transfer-waiting { background-image: url(icons/states/waiting.png); } +.fatrat-transfer-waiting-ul { background-image: url(icons/states/waiting_upload.png); } +.fatrat-transfer-paused { background-image: url(icons/states/paused.png); } +.fatrat-transfer-paused-ul { background-image: url(icons/states/paused_upload.png); } +.fatrat-transfer-failed { background-image: url(icons/states/failed_upload.png); } +.fatrat-transfer-failed-ul { background-image: url(icons/states/failed_upload.png); } +.fatrat-transfer-completed { background-image: url(icons/states/completed.png); } +.fatrat-transfer-completed-ul { background-image: url(icons/states/completed_upload.png); } + +.ui-icon-closethick { background-image: url(icons/close.png) !important; background-position: 0px 0px !important; } + +.downlink { + background-image: url(icons/down.png) !important; + padding-left: 26px !important; + background-repeat: no-repeat !important; + background-position: 8px !important; +} diff -pruN 1.1.3-5/data/remote/css/jquery.contextMenu.css 1.2.0~beta2-0ubuntu10/data/remote/css/jquery.contextMenu.css --- 1.1.3-5/data/remote/css/jquery.contextMenu.css 1970-01-01 00:00:00.000000000 +0000 +++ 1.2.0~beta2-0ubuntu10/data/remote/css/jquery.contextMenu.css 2012-07-14 11:44:27.000000000 +0000 @@ -0,0 +1,75 @@ +/* Generic context menu styles */ +.contextMenu { + position: absolute; + width: 135px; + z-index: 99999; + border: solid 1px #CCC; + background: #FFF; + padding: 0px; + margin: 0px; + display: none; +} + +.contextMenu LI { + list-style: none; + padding: 0px; + margin: 0px; +} + +.contextMenu A { + color: #333; + text-decoration: none; + display: block; + line-height: 20px; + height: 20px; + background-position: 6px center; + background-repeat: no-repeat; + outline: none; + padding: 1px 5px; + padding-left: 28px; +} + +.contextMenu LI.hover A { + color: #FFF; + background-color: #3399FF; +} + +.contextMenu LI.disabled A { + color: #AAA; + cursor: default; +} + +.contextMenu LI.hover.disabled A { + background-color: transparent; +} + +.contextMenu LI.separator { + border-top: solid 1px #CCC; +} + +/* + Adding Icons + + You can add icons to the context menu by adding + classes to the respective LI element(s) +*/ + +/*.contextMenu LI.edit A { background-image: url(images/page_white_edit.png); } +.contextMenu LI.cut A { background-image: url(images/cut.png); } +.contextMenu LI.copy A { background-image: url(images/page_white_copy.png); } +.contextMenu LI.paste A { background-image: url(images/page_white_paste.png); } +.contextMenu LI.delete A { background-image: url(images/page_white_delete.png); } +.contextMenu LI.quit A { background-image: url(images/door.png); } +*/ + +.menu-resume a { background-image: url(icons/states/active.png); } +.menu-force-resume a { background-image: url(icons/states/forcedactive.png); } +.menu-pause a { background-image: url(icons/states/paused.png); } +.menu-move-to-top a { background-image: url(icons/move/top.png); } +.menu-move-up a { background-image: url(icons/move/up.png); } +.menu-move-down a { background-image: url(icons/move/down.png); } +.menu-move-to-bottom a { background-image: url(icons/move/bottom.png); } +.menu-delete a { background-image: url(icons/delete.png); } +.menu-delete-data a { background-image: url(icons/delete_with_data.png); } +.menu-properties a { background-image: url(icons/queue/properties.png); } + Binary files 1.1.3-5/data/remote/css/jstree/d.gif and 1.2.0~beta2-0ubuntu10/data/remote/css/jstree/d.gif differ Binary files 1.1.3-5/data/remote/css/jstree/d.png and 1.2.0~beta2-0ubuntu10/data/remote/css/jstree/d.png differ Binary files 1.1.3-5/data/remote/css/jstree/file.png and 1.2.0~beta2-0ubuntu10/data/remote/css/jstree/file.png differ Binary files 1.1.3-5/data/remote/css/jstree/folder.png and 1.2.0~beta2-0ubuntu10/data/remote/css/jstree/folder.png differ diff -pruN 1.1.3-5/data/remote/css/jstree/style.css 1.2.0~beta2-0ubuntu10/data/remote/css/jstree/style.css --- 1.1.3-5/data/remote/css/jstree/style.css 1970-01-01 00:00:00.000000000 +0000 +++ 1.2.0~beta2-0ubuntu10/data/remote/css/jstree/style.css 2012-07-14 11:44:27.000000000 +0000 @@ -0,0 +1,73 @@ +/* + * jsTree default theme 1.0 + * Supported features: dots/no-dots, icons/no-icons, focused, loading + * Supported plugins: ui (hovered, clicked), checkbox, contextmenu, search + */ + +.jstree-default li, +.jstree-default ins { background-image:url("d.png"); background-repeat:no-repeat; background-color:transparent; } +.jstree-default li { background-position:-90px 0; background-repeat:repeat-y; } +.jstree-default li.jstree-last { background:transparent; } +.jstree-default .jstree-open > ins { background-position:-72px 0; } +.jstree-default .jstree-closed > ins { background-position:-54px 0; } +.jstree-default .jstree-leaf > ins { background-position:-36px 0; } + +.jstree-default .jstree-hovered { background:#e7f4f9; border:1px solid #d8f0fa; padding:0 2px 0 1px; } +.jstree-default .jstree-clicked { background:#beebff; border:1px solid #99defd; padding:0 2px 0 1px; } +.jstree-default a .jstree-icon { background-position:-56px -19px; } +.jstree-default a.jstree-loading .jstree-icon { background:url("throbber.gif") center center no-repeat !important; } + +.jstree-default.jstree-focused { background:#ffffee; } + +.jstree-default .jstree-no-dots li, +.jstree-default .jstree-no-dots .jstree-leaf > ins { background:transparent; } +.jstree-default .jstree-no-dots .jstree-open > ins { background-position:-18px 0; } +.jstree-default .jstree-no-dots .jstree-closed > ins { background-position:0 0; } + +.jstree-default .jstree-no-icons a .jstree-icon { display:none; } + +.jstree-default .jstree-search { font-style:italic; } + +.jstree-default .jstree-no-icons .jstree-checkbox { display:inline-block; } +.jstree-default .jstree-no-checkboxes .jstree-checkbox { display:none !important; } +.jstree-default .jstree-checked > a > .jstree-checkbox { background-position:-38px -19px; } +.jstree-default .jstree-unchecked > a > .jstree-checkbox { background-position:-2px -19px; } +.jstree-default .jstree-undetermined > a > .jstree-checkbox { background-position:-20px -19px; } +.jstree-default .jstree-checked > a > .jstree-checkbox:hover { background-position:-38px -37px; } +.jstree-default .jstree-unchecked > a > .jstree-checkbox:hover { background-position:-2px -37px; } +.jstree-default .jstree-undetermined > a > .jstree-checkbox:hover { background-position:-20px -37px; } + +#vakata-dragged.jstree-default ins { background:transparent !important; } +#vakata-dragged.jstree-default .jstree-ok { background:url("d.png") -2px -53px no-repeat !important; } +#vakata-dragged.jstree-default .jstree-invalid { background:url("d.png") -18px -53px no-repeat !important; } +#jstree-marker.jstree-default { background:url("d.png") -41px -57px no-repeat !important; } + +.jstree-default a.jstree-search { color:aqua; } + +#vakata-contextmenu.jstree-default-context, +#vakata-contextmenu.jstree-default-context li ul { background:#f0f0f0; border:1px solid #979797; -moz-box-shadow: 1px 1px 2px #999; -webkit-box-shadow: 1px 1px 2px #999; box-shadow: 1px 1px 2px #999; } +#vakata-contextmenu.jstree-default-context li { } +#vakata-contextmenu.jstree-default-context a { color:black; } +#vakata-contextmenu.jstree-default-context a:hover, +#vakata-contextmenu.jstree-default-context .vakata-hover > a { padding:0 5px; background:#e8eff7; border:1px solid #aecff7; color:black; -moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px; } +#vakata-contextmenu.jstree-default-context li.jstree-contextmenu-disabled a, +#vakata-contextmenu.jstree-default-context li.jstree-contextmenu-disabled a:hover { color:silver; background:transparent; border:0; padding:1px 4px; } +#vakata-contextmenu.jstree-default-context li.vakata-separator { background:white; border-top:1px solid #e0e0e0; margin:0; } +#vakata-contextmenu.jstree-default-context li ul { margin-left:-4px; } + +/* IE6 BEGIN */ +.jstree-default li, +.jstree-default ins, +#vakata-dragged.jstree-default .jstree-invalid, +#vakata-dragged.jstree-default .jstree-ok, +#jstree-marker.jstree-default { _background-image:url("d.gif"); } +.jstree-default .jstree-open ins { _background-position:-72px 0; } +.jstree-default .jstree-closed ins { _background-position:-54px 0; } +.jstree-default .jstree-leaf ins { _background-position:-36px 0; } +.jstree-default a ins.jstree-icon { _background-position:-56px -19px; } +#vakata-contextmenu.jstree-default-context ins { _display:none; } +#vakata-contextmenu.jstree-default-context li { _zoom:1; } +.jstree-default .jstree-undetermined a .jstree-checkbox { _background-position:-20px -19px; } +.jstree-default .jstree-checked a .jstree-checkbox { _background-position:-38px -19px; } +.jstree-default .jstree-unchecked a .jstree-checkbox { _background-position:-2px -19px; } +/* IE6 END */ \ No newline at end of file Binary files 1.1.3-5/data/remote/css/jstree/throbber.gif and 1.2.0~beta2-0ubuntu10/data/remote/css/jstree/throbber.gif differ diff -pruN 1.1.3-5/data/remote/css/style.css 1.2.0~beta2-0ubuntu10/data/remote/css/style.css --- 1.1.3-5/data/remote/css/style.css 1970-01-01 00:00:00.000000000 +0000 +++ 1.2.0~beta2-0ubuntu10/data/remote/css/style.css 2012-07-14 11:44:27.000000000 +0000 @@ -0,0 +1,348 @@ +html, body { + font-size: 12px; + font-family: sans-serif; + background-color: white; + color: black; + height: 100%; + width: 100%; + + padding: 0; + margin: 0; + overflow: auto; +} + +table#bigtable { + height: 100%; + width: 100%; +} + +#logo { + padding: 10px; +} + +#toolbar { + padding: 1ex; +} + +#errors { + padding: 1ex; + display: none; +} + +#refresh-settings { + float: right; + line-height: 2.4em; +} + +#credits { + display: none; + width: 640px; +} + +#footer { + font-size: 75%; + text-align: center; + margin-top: 1em; +} + +.top-title { + text-align: center; + padding: 0 1ex 0 1ex; + margin-bottom: 1ex; +} + + +.ui-layout-resizer { background: #888; } + +.ui-layout-pane { padding: 1ex; } + +#tabs-transfers { + /*display: table;*/ + width: 100%; + padding: 0; +} + +#queues-pane { + /*display: table-cell;*/ + position: absolute; + width: 20%; + /*min-width: 200px;*/ + padding: 1ex; + vertical-align: top; +} + +#queues { + background-color: white; + border: 1px solid #CCC; +} + +#transfers-pane { + /*display: table-cell;*/ + position: relative; + left: 21%; + width: 78%; + overflow: auto; + /*width: 80%;*/ + padding: 1ex; + /*overflow: scroll;*/ +} + +#transfers-wrapper { + height: 90%; + background-color: white; + border: 1px solid #CCC; +} + +.queue-item { + text-align: center; + padding-top: 1ex; + padding-bottom: 1ex; + cursor: pointer; +} + +#queues .ui-selected, #queues .ui-selecting { + background: #567dbc; + color: white; + border: 1px solid #567dbc; +} + +.queue-item:not(.ui-selected):hover { + border: 1px solid #bfcde4 !important; + background: #cbdaf1 !important; +} + +table#transfers { + background: white; + border-collapse:collapse; + /*height: 100%;*/ + width: 100%; + border: none; +} + +table#transfers th { + text-align: left; + padding-left: 1ex; + border-bottom: 1px solid #DDD; + height: 1ex; +} + +table#transfers th:nth-child(n+2) { + border-left: 1px solid #DDD; +} + +table#transfers tr:nth-child(2n) { + background: #F7F7F7; +} + +table#transfers thead { + +} + +table#transfers tr { + cursor: default; + border-spacing: 0; + max-height: 1ex; +} + +table#transfers tr.ui-selected { + background: #418bd4; + color: white; +} + +.progressbar { + text-align: center !important; + line-height: 2em; +} + +.progressbar > span { + float: right; + width: 100%; +} + +#tabs-tsg-img, #tabs-qsg-img { + visibility: hidden; +} + +/* http://labnol.blogspot.com/2006/10/html-css-trick-for-displaying-code.html */ +pre { + white-space: pre-wrap; /* css-3 */ + white-space: -moz-pre-wrap !important; /* Mozilla, since 1999 */ + white-space: -pre-wrap; /* Opera 4-6 */ + white-space: -o-pre-wrap; /* Opera 7 */ + word-wrap: break-word; /* Internet Explorer 5.5+ */ +} + +#transfer-log, #global-log { + height: 40ex; + overflow: auto; +} + +#delete-dialog, #delete-dialog-with-data { + display: none; +} + +#delete-dialog img, #delete-dialog-with-data img { + float: left; + margin-right: 3ex; +} + +.transfer-properties { + float: right; + cursor: pointer; + z-index: 10; +} + +.dialog { + display: none; +} + +#transfer-properties table, #queue-properties table { + width: 100%; +} + +#transfer-properties-target, #transfer-properties-comment, #new-transfer-links, #new-transfer-destination-queue, #new-transfer-target, #queue-properties { + width: 100%; +} + +#tabs-details, #tabs-log { + overflow: auto; +} + +#new-transfer { + width: 50%; +} + +#new-transfer table { + width: 100%; +} + +#details-subclass { + height: 100% !important; +} + +#settings-list { + width: 180px; + border-right: 1px solid #DDD; + height: 380px; + overflow: auto; + background-color: white; + border: 1px solid #BBB; +} + +#settings-list .settings-item { + padding: 0.5ex 0 0.5ex 0; + cursor: pointer; + border: 0px; +} + +#settings-list .settings-item img { + vertical-align: middle; + padding-left: 3px; + max-width: 24px; + max-height: 24px; +} + +#settings-list .settings-item span { + padding-left: 1ex; +} + +#settings-list .settings-item.ui-selected, #settings-list .settings-item.ui-selecting { + color: white; + background: #567dbc; +} + +#settings-wrapper { + position: relative; +} + +#settings-pane { + /*margin-left: 185px;*/ + position: absolute; + top: 0px; + left: 190px; + width: 480px; + height: 380px; + overflow: auto; +} + +#settings-pane table { + width: 99%; +} + +#settings-pane td { + cursor: default; +} + +#settings-pane table input[type=number], #settings-pane table input[type=text], #settings-pane table input[type=password], #settings-pane table select { + width: 100%; +} + +fieldset { + border: 1px solid #BBB; + border-radius: 3px; +} + +input[type=number], input[type=text], input[type=password] { + border: 1px solid #BBB; +} + +#popup-permissions a { + color: #AAA; +} + +#popup-permissions { + float: right; + display: none; + font-weight: normal; + color: #AAA; + line-height: 2.4em; + padding-right: 2em; +} + +#fatrat-chrome-comm-div { + display: none; +} + +#details-download-parent { + min-height: 300px !important; +} + +#statusbar { + height: 18px; + position: absolute; + bottom: 3px; + margin-left: 1.6ex; + width: 98%; +} + +#statusbar-speedlimit { + float: right; + cursor: default; +} + +#statusbar-speedlimit-down, #statusbar-speedlimit-up { + padding: 0px 10px 0px 20px; + background-repeat: no-repeat; + height: 20px; +} + +#statusbar-speedlimit-down { + background-image: url(icons/move/down.png); +} + +#statusbar-speedlimit-up { + background-image: url(icons/move/up.png); +} + +#modeswitch { + float: right; + margin-right: 2ex; +} + +#modeswitch a { color: blue; } +#modeswitch a:visited { color: blue; } + +#modeswitch .active { + font-weight: bold; + color: black; +} Binary files 1.1.3-5/data/remote/css/ui-lightness/images/ui-anim_basic_16x16.gif and 1.2.0~beta2-0ubuntu10/data/remote/css/ui-lightness/images/ui-anim_basic_16x16.gif differ Binary files 1.1.3-5/data/remote/css/ui-lightness/images/ui-bg_diagonals-thick_18_b81900_40x40.png and 1.2.0~beta2-0ubuntu10/data/remote/css/ui-lightness/images/ui-bg_diagonals-thick_18_b81900_40x40.png differ Binary files 1.1.3-5/data/remote/css/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png and 1.2.0~beta2-0ubuntu10/data/remote/css/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png differ Binary files 1.1.3-5/data/remote/css/ui-lightness/images/ui-bg_flat_10_000000_40x100.png and 1.2.0~beta2-0ubuntu10/data/remote/css/ui-lightness/images/ui-bg_flat_10_000000_40x100.png differ Binary files 1.1.3-5/data/remote/css/ui-lightness/images/ui-bg_glass_100_f6f6f6_1x400.png and 1.2.0~beta2-0ubuntu10/data/remote/css/ui-lightness/images/ui-bg_glass_100_f6f6f6_1x400.png differ Binary files 1.1.3-5/data/remote/css/ui-lightness/images/ui-bg_glass_100_fdf5ce_1x400.png and 1.2.0~beta2-0ubuntu10/data/remote/css/ui-lightness/images/ui-bg_glass_100_fdf5ce_1x400.png differ Binary files 1.1.3-5/data/remote/css/ui-lightness/images/ui-bg_glass_65_ffffff_1x400.png and 1.2.0~beta2-0ubuntu10/data/remote/css/ui-lightness/images/ui-bg_glass_65_ffffff_1x400.png differ Binary files 1.1.3-5/data/remote/css/ui-lightness/images/ui-bg_gloss-wave_35_f6a828_500x100.png and 1.2.0~beta2-0ubuntu10/data/remote/css/ui-lightness/images/ui-bg_gloss-wave_35_f6a828_500x100.png differ Binary files 1.1.3-5/data/remote/css/ui-lightness/images/ui-bg_highlight-soft_100_eeeeee_1x100.png and 1.2.0~beta2-0ubuntu10/data/remote/css/ui-lightness/images/ui-bg_highlight-soft_100_eeeeee_1x100.png differ Binary files 1.1.3-5/data/remote/css/ui-lightness/images/ui-bg_highlight-soft_75_ffe45c_1x100.png and 1.2.0~beta2-0ubuntu10/data/remote/css/ui-lightness/images/ui-bg_highlight-soft_75_ffe45c_1x100.png differ Binary files 1.1.3-5/data/remote/css/ui-lightness/images/ui-icons_222222_256x240.png and 1.2.0~beta2-0ubuntu10/data/remote/css/ui-lightness/images/ui-icons_222222_256x240.png differ Binary files 1.1.3-5/data/remote/css/ui-lightness/images/ui-icons_228ef1_256x240.png and 1.2.0~beta2-0ubuntu10/data/remote/css/ui-lightness/images/ui-icons_228ef1_256x240.png differ Binary files 1.1.3-5/data/remote/css/ui-lightness/images/ui-icons_ef8c08_256x240.png and 1.2.0~beta2-0ubuntu10/data/remote/css/ui-lightness/images/ui-icons_ef8c08_256x240.png differ Binary files 1.1.3-5/data/remote/css/ui-lightness/images/ui-icons_ffd27a_256x240.png and 1.2.0~beta2-0ubuntu10/data/remote/css/ui-lightness/images/ui-icons_ffd27a_256x240.png differ Binary files 1.1.3-5/data/remote/css/ui-lightness/images/ui-icons_ffffff_256x240.png and 1.2.0~beta2-0ubuntu10/data/remote/css/ui-lightness/images/ui-icons_ffffff_256x240.png differ diff -pruN 1.1.3-5/data/remote/css/ui-lightness/jquery-ui-1.8.2.custom.css 1.2.0~beta2-0ubuntu10/data/remote/css/ui-lightness/jquery-ui-1.8.2.custom.css --- 1.1.3-5/data/remote/css/ui-lightness/jquery-ui-1.8.2.custom.css 1970-01-01 00:00:00.000000000 +0000 +++ 1.2.0~beta2-0ubuntu10/data/remote/css/ui-lightness/jquery-ui-1.8.2.custom.css 2012-07-14 11:44:27.000000000 +0000 @@ -0,0 +1,500 @@ +/* +* jQuery UI CSS Framework +* Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about) +* Dual licensed under the MIT (MIT-LICENSE.txt) and GPL (GPL-LICENSE.txt) licenses. +*/ + +/* Layout helpers +----------------------------------*/ +.ui-helper-hidden { display: none; } +.ui-helper-hidden-accessible { position: absolute; left: -99999999px; } +.ui-helper-reset { margin: 0; padding: 0; border: 0; outline: 0; line-height: 1.3; text-decoration: none; font-size: 100%; list-style: none; } +.ui-helper-clearfix:after { content: "."; display: block; height: 0; clear: both; visibility: hidden; } +.ui-helper-clearfix { display: inline-block; } +/* required comment for clearfix to work in Opera \*/ +* html .ui-helper-clearfix { height:1%; } +.ui-helper-clearfix { display:block; } +/* end clearfix */ +.ui-helper-zfix { width: 100%; height: 100%; top: 0; left: 0; position: absolute; opacity: 0; filter:Alpha(Opacity=0); } + + +/* Interaction Cues +----------------------------------*/ +.ui-state-disabled { cursor: default !important; } + + +/* Icons +----------------------------------*/ + +/* states and images */ +.ui-icon { display: block; text-indent: -99999px; overflow: hidden; background-repeat: no-repeat; } + + +/* Misc visuals +----------------------------------*/ + +/* Overlays */ +.ui-widget-overlay { position: absolute; top: 0; left: 0; width: 100%; height: 100%; } + + +/* +* jQuery UI CSS Framework +* Copyright (c) 2010 AUTHORS.txt (http://jqueryui.com/about) +* Dual licensed under the MIT (MIT-LICENSE.txt) and GPL (GPL-LICENSE.txt) licenses. +* To view and modify this theme, visit http://jqueryui.com/themeroller/?ffDefault=Trebuchet%20MS,%20Tahoma,%20Verdana,%20Arial,%20sans-serif&fwDefault=bold&fsDefault=1.1em&cornerRadius=4px&bgColorHeader=f6a828&bgTextureHeader=12_gloss_wave.png&bgImgOpacityHeader=35&borderColorHeader=e78f08&fcHeader=ffffff&iconColorHeader=ffffff&bgColorContent=eeeeee&bgTextureContent=03_highlight_soft.png&bgImgOpacityContent=100&borderColorContent=dddddd&fcContent=333333&iconColorContent=222222&bgColorDefault=f6f6f6&bgTextureDefault=02_glass.png&bgImgOpacityDefault=100&borderColorDefault=cccccc&fcDefault=1c94c4&iconColorDefault=ef8c08&bgColorHover=fdf5ce&bgTextureHover=02_glass.png&bgImgOpacityHover=100&borderColorHover=fbcb09&fcHover=c77405&iconColorHover=ef8c08&bgColorActive=ffffff&bgTextureActive=02_glass.png&bgImgOpacityActive=65&borderColorActive=fbd850&fcActive=eb8f00&iconColorActive=ef8c08&bgColorHighlight=ffe45c&bgTextureHighlight=03_highlight_soft.png&bgImgOpacityHighlight=75&borderColorHighlight=fed22f&fcHighlight=363636&iconColorHighlight=228ef1&bgColorError=b81900&bgTextureError=08_diagonals_thick.png&bgImgOpacityError=18&borderColorError=cd0a0a&fcError=ffffff&iconColorError=ffd27a&bgColorOverlay=666666&bgTextureOverlay=08_diagonals_thick.png&bgImgOpacityOverlay=20&opacityOverlay=50&bgColorShadow=000000&bgTextureShadow=01_flat.png&bgImgOpacityShadow=10&opacityShadow=20&thicknessShadow=5px&offsetTopShadow=-5px&offsetLeftShadow=-5px&cornerRadiusShadow=5px +*/ + + +/* Component containers +----------------------------------*/ +.ui-widget { font-family: sans-serif; font-size: 1.1em; } +.ui-widget .ui-widget { font-size: 1em; } +.ui-widget input, .ui-widget select, .ui-widget textarea, .ui-widget button { font-family: sans-serif; font-size: 1em; } +.ui-widget-content { border: 1px solid #dddddd; background: #eeeeee url(images/ui-bg_highlight-soft_100_eeeeee_1x100.png) 50% top repeat-x; color: #333333; } +.ui-widget-content a { color: #333333; } +.ui-widget-header { border: 1px solid #ccc; /*background: #f6a828 url(images/ui-bg_gloss-wave_35_f6a828_500x100.png) 50% 50% repeat-x;*/ color: #ffffff; font-weight: bold; } +.ui-widget-header a { color: #ffffff; } +.ui-progressbar-value, .ui-dialog-titlebar { background: #567DBC; } + +/*.ui-dialog-titlebar { + background-color: #275786; +}*/ + +/* Interaction states +----------------------------------*/ +.ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default { border: 1px solid #cccccc; background: #f6f6f6 url(images/ui-bg_glass_100_f6f6f6_1x400.png) 50% 50% repeat-x; font-weight: bold; color: #1c94c4; } +.ui-state-default a, .ui-state-default a:link, .ui-state-default a:visited { color: #1C94C4; text-decoration: none; } +.ui-state-hover, .ui-widget-content .ui-state-hover, .ui-widget-header .ui-state-hover, .ui-state-focus, .ui-widget-content .ui-state-focus, .ui-widget-header .ui-state-focus { /*border: 1px solid #1C94C4;*/ background: #fff; font-weight: bold; color: #c77405; } +.ui-state-hover a, .ui-state-hover a:hover { color: #c77405; text-decoration: none; } +.ui-state-active, .ui-widget-content .ui-state-active, .ui-widget-header .ui-state-active { border: 1px solid #999; background: #ffffff; font-weight: bold; color: #c77405; } +.ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited { color: #c77405; text-decoration: none; } +.ui-widget :active { outline: none; } + +.ui-widget-header label { color: black; } +.top-title { cursor: default; } + +/* Interaction Cues +----------------------------------*/ +.ui-state-highlight, .ui-widget-content .ui-state-highlight, .ui-widget-header .ui-state-highlight {border: 1px solid #fed22f; background: #ffe45c url(images/ui-bg_highlight-soft_75_ffe45c_1x100.png) 50% top repeat-x; color: #363636; } +.ui-state-highlight a, .ui-widget-content .ui-state-highlight a,.ui-widget-header .ui-state-highlight a { color: #363636; } +.ui-state-error, .ui-widget-content .ui-state-error, .ui-widget-header .ui-state-error {border: 1px solid #cd0a0a; background: #b81900 url(images/ui-bg_diagonals-thick_18_b81900_40x40.png) 50% 50% repeat; color: #ffffff; } +.ui-state-error a, .ui-widget-content .ui-state-error a, .ui-widget-header .ui-state-error a { color: #ffffff; } +.ui-state-error-text, .ui-widget-content .ui-state-error-text, .ui-widget-header .ui-state-error-text { color: #ffffff; } +.ui-priority-primary, .ui-widget-content .ui-priority-primary, .ui-widget-header .ui-priority-primary { font-weight: bold; } +.ui-priority-secondary, .ui-widget-content .ui-priority-secondary, .ui-widget-header .ui-priority-secondary { opacity: .7; filter:Alpha(Opacity=70); font-weight: normal; } +.ui-state-disabled, .ui-widget-content .ui-state-disabled, .ui-widget-header .ui-state-disabled { opacity: .35; filter:Alpha(Opacity=35); background-image: none; } + +/* Icons +----------------------------------*/ + +/* states and images */ +.ui-icon { width: 16px; height: 16px; } +/* +.ui-icon { width: 16px; height: 16px; background-image: url(images/ui-icons_222222_256x240.png); } +.ui-widget-content .ui-icon {background-image: url(images/ui-icons_222222_256x240.png); } +.ui-widget-header .ui-icon {background-image: url(images/ui-icons_ffffff_256x240.png); } +.ui-state-default .ui-icon { background-image: url(images/ui-icons_ef8c08_256x240.png); } +.ui-state-hover .ui-icon, .ui-state-focus .ui-icon {background-image: url(images/ui-icons_ef8c08_256x240.png); } +.ui-state-active .ui-icon {background-image: url(images/ui-icons_ef8c08_256x240.png); } +.ui-state-highlight .ui-icon {background-image: url(images/ui-icons_228ef1_256x240.png); } +.ui-state-error .ui-icon, .ui-state-error-text .ui-icon {background-image: url(images/ui-icons_ffd27a_256x240.png); } +*/ + +/* positioning */ +.ui-icon-carat-1-n { background-position: 0 0; } +.ui-icon-carat-1-ne { background-position: -16px 0; } +.ui-icon-carat-1-e { background-position: -32px 0; } +.ui-icon-carat-1-se { background-position: -48px 0; } +.ui-icon-carat-1-s { background-position: -64px 0; } +.ui-icon-carat-1-sw { background-position: -80px 0; } +.ui-icon-carat-1-w { background-position: -96px 0; } +.ui-icon-carat-1-nw { background-position: -112px 0; } +.ui-icon-carat-2-n-s { background-position: -128px 0; } +.ui-icon-carat-2-e-w { background-position: -144px 0; } +.ui-icon-triangle-1-n { background-position: 0 -16px; } +.ui-icon-triangle-1-ne { background-position: -16px -16px; } +.ui-icon-triangle-1-e { background-position: -32px -16px; width: 16px; height: 16px; background-image: url(images/ui-icons_222222_256x240.png); } +.ui-icon-triangle-1-se { background-position: -48px -16px; } +.ui-icon-triangle-1-s { background-position: -64px -16px; width: 16px; height: 16px; background-image: url(images/ui-icons_222222_256x240.png); } +.ui-icon-triangle-1-sw { background-position: -80px -16px; } +.ui-icon-triangle-1-w { background-position: -96px -16px; } +.ui-icon-triangle-1-nw { background-position: -112px -16px; } +.ui-icon-triangle-2-n-s { background-position: -128px -16px; } +.ui-icon-triangle-2-e-w { background-position: -144px -16px; } +.ui-icon-arrow-1-n { background-position: 0 -32px; } +.ui-icon-arrow-1-ne { background-position: -16px -32px; } +.ui-icon-arrow-1-e { background-position: -32px -32px; } +.ui-icon-arrow-1-se { background-position: -48px -32px; } +.ui-icon-arrow-1-s { background-position: -64px -32px; } +.ui-icon-arrow-1-sw { background-position: -80px -32px; } +.ui-icon-arrow-1-w { background-position: -96px -32px; } +.ui-icon-arrow-1-nw { background-position: -112px -32px; } +.ui-icon-arrow-2-n-s { background-position: -128px -32px; } +.ui-icon-arrow-2-ne-sw { background-position: -144px -32px; } +.ui-icon-arrow-2-e-w { background-position: -160px -32px; } +.ui-icon-arrow-2-se-nw { background-position: -176px -32px; } +.ui-icon-arrowstop-1-n { background-position: -192px -32px; } +.ui-icon-arrowstop-1-e { background-position: -208px -32px; } +.ui-icon-arrowstop-1-s { background-position: -224px -32px; } +.ui-icon-arrowstop-1-w { background-position: -240px -32px; } +.ui-icon-arrowthick-1-n { background-position: 0 -48px; } +.ui-icon-arrowthick-1-ne { background-position: -16px -48px; } +.ui-icon-arrowthick-1-e { background-position: -32px -48px; } +.ui-icon-arrowthick-1-se { background-position: -48px -48px; } +.ui-icon-arrowthick-1-s { background-position: -64px -48px; } +.ui-icon-arrowthick-1-sw { background-position: -80px -48px; } +.ui-icon-arrowthick-1-w { background-position: -96px -48px; } +.ui-icon-arrowthick-1-nw { background-position: -112px -48px; } +.ui-icon-arrowthick-2-n-s { background-position: -128px -48px; } +.ui-icon-arrowthick-2-ne-sw { background-position: -144px -48px; } +.ui-icon-arrowthick-2-e-w { background-position: -160px -48px; } +.ui-icon-arrowthick-2-se-nw { background-position: -176px -48px; } +.ui-icon-arrowthickstop-1-n { background-position: -192px -48px; } +.ui-icon-arrowthickstop-1-e { background-position: -208px -48px; } +.ui-icon-arrowthickstop-1-s { background-position: -224px -48px; } +.ui-icon-arrowthickstop-1-w { background-position: -240px -48px; } +.ui-icon-arrowreturnthick-1-w { background-position: 0 -64px; } +.ui-icon-arrowreturnthick-1-n { background-position: -16px -64px; } +.ui-icon-arrowreturnthick-1-e { background-position: -32px -64px; } +.ui-icon-arrowreturnthick-1-s { background-position: -48px -64px; } +.ui-icon-arrowreturn-1-w { background-position: -64px -64px; } +.ui-icon-arrowreturn-1-n { background-position: -80px -64px; } +.ui-icon-arrowreturn-1-e { background-position: -96px -64px; } +.ui-icon-arrowreturn-1-s { background-position: -112px -64px; } +.ui-icon-arrowrefresh-1-w { background-position: -128px -64px; } +.ui-icon-arrowrefresh-1-n { background-position: -144px -64px; } +.ui-icon-arrowrefresh-1-e { background-position: -160px -64px; } +.ui-icon-arrowrefresh-1-s { background-position: -176px -64px; } +.ui-icon-arrow-4 { background-position: 0 -80px; } +.ui-icon-arrow-4-diag { background-position: -16px -80px; } +.ui-icon-extlink { background-position: -32px -80px; } +.ui-icon-newwin { background-position: -48px -80px; } +.ui-icon-refresh { background-position: -64px -80px; } +.ui-icon-shuffle { background-position: -80px -80px; } +.ui-icon-transfer-e-w { background-position: -96px -80px; } +.ui-icon-transferthick-e-w { background-position: -112px -80px; } +.ui-icon-folder-collapsed { background-position: 0 -96px; } +.ui-icon-folder-open { background-position: -16px -96px; } +.ui-icon-document { background-position: -32px -96px; } +.ui-icon-document-b { background-position: -48px -96px; } +.ui-icon-note { background-position: -64px -96px; } +.ui-icon-mail-closed { background-position: -80px -96px; } +.ui-icon-mail-open { background-position: -96px -96px; } +.ui-icon-suitcase { background-position: -112px -96px; } +.ui-icon-comment { background-position: -128px -96px; } +.ui-icon-person { background-position: -144px -96px; } +.ui-icon-print { background-position: -160px -96px; } +.ui-icon-trash { background-position: -176px -96px; } +.ui-icon-locked { background-position: -192px -96px; } +.ui-icon-unlocked { background-position: -208px -96px; } +.ui-icon-bookmark { background-position: -224px -96px; } +.ui-icon-tag { background-position: -240px -96px; } +.ui-icon-home { background-position: 0 -112px; } +.ui-icon-flag { background-position: -16px -112px; } +.ui-icon-calendar { background-position: -32px -112px; } +.ui-icon-cart { background-position: -48px -112px; } +.ui-icon-pencil { background-position: -64px -112px; } +.ui-icon-clock { background-position: -80px -112px; } +.ui-icon-disk { background-position: -96px -112px; } +.ui-icon-calculator { background-position: -112px -112px; } +.ui-icon-zoomin { background-position: -128px -112px; } +.ui-icon-zoomout { background-position: -144px -112px; } +.ui-icon-search { background-position: -160px -112px; } +.ui-icon-wrench { background-position: -176px -112px; } +.ui-icon-gear { background-position: -192px -112px; } +.ui-icon-heart { background-position: -208px -112px; } +.ui-icon-star { background-position: -224px -112px; } +.ui-icon-link { background-position: -240px -112px; } +.ui-icon-cancel { background-position: 0 -128px; } +.ui-icon-plus { background-position: -16px -128px; } +.ui-icon-plusthick { background-position: -32px -128px; } +.ui-icon-minus { background-position: -48px -128px; } +.ui-icon-minusthick { background-position: -64px -128px; } +.ui-icon-close { background-position: -80px -128px; } +.ui-icon-closethick { background-position: -96px -128px; } +.ui-icon-key { background-position: -112px -128px; } +.ui-icon-lightbulb { background-position: -128px -128px; } +.ui-icon-scissors { background-position: -144px -128px; } +.ui-icon-clipboard { background-position: -160px -128px; } +.ui-icon-copy { background-position: -176px -128px; } +.ui-icon-contact { background-position: -192px -128px; } +.ui-icon-image { background-position: -208px -128px; } +.ui-icon-video { background-position: -224px -128px; } +.ui-icon-script { background-position: -240px -128px; } +.ui-icon-alert { background-position: 0 -144px; } +.ui-icon-info { background-position: -16px -144px; } +.ui-icon-notice { background-position: -32px -144px; } +.ui-icon-help { background-position: -48px -144px; } +.ui-icon-check { background-position: -64px -144px; } +.ui-icon-bullet { background-position: -80px -144px; } +.ui-icon-radio-off { background-position: -96px -144px; } +.ui-icon-radio-on { background-position: -112px -144px; } +.ui-icon-pin-w { background-position: -128px -144px; } +.ui-icon-pin-s { background-position: -144px -144px; } +.ui-icon-play { background-position: 0 -160px; } +.ui-icon-pause { background-position: -16px -160px; } +.ui-icon-seek-next { background-position: -32px -160px; } +.ui-icon-seek-prev { background-position: -48px -160px; } +.ui-icon-seek-end { background-position: -64px -160px; } +.ui-icon-seek-start { background-position: -80px -160px; } +/* ui-icon-seek-first is deprecated, use ui-icon-seek-start instead */ +.ui-icon-seek-first { background-position: -80px -160px; } +.ui-icon-stop { background-position: -96px -160px; } +.ui-icon-eject { background-position: -112px -160px; } +.ui-icon-volume-off { background-position: -128px -160px; } +.ui-icon-volume-on { background-position: -144px -160px; } +.ui-icon-power { background-position: 0 -176px; } +.ui-icon-signal-diag { background-position: -16px -176px; } +.ui-icon-signal { background-position: -32px -176px; } +.ui-icon-battery-0 { background-position: -48px -176px; } +.ui-icon-battery-1 { background-position: -64px -176px; } +.ui-icon-battery-2 { background-position: -80px -176px; } +.ui-icon-battery-3 { background-position: -96px -176px; } +.ui-icon-circle-plus { background-position: 0 -192px; } +.ui-icon-circle-minus { background-position: -16px -192px; } +.ui-icon-circle-close { background-position: -32px -192px; } +.ui-icon-circle-triangle-e { background-position: -48px -192px; } +.ui-icon-circle-triangle-s { background-position: -64px -192px; } +.ui-icon-circle-triangle-w { background-position: -80px -192px; } +.ui-icon-circle-triangle-n { background-position: -96px -192px; } +.ui-icon-circle-arrow-e { background-position: -112px -192px; } +.ui-icon-circle-arrow-s { background-position: -128px -192px; } +.ui-icon-circle-arrow-w { background-position: -144px -192px; } +.ui-icon-circle-arrow-n { background-position: -160px -192px; } +.ui-icon-circle-zoomin { background-position: -176px -192px; } +.ui-icon-circle-zoomout { background-position: -192px -192px; } +.ui-icon-circle-check { background-position: -208px -192px; } +.ui-icon-circlesmall-plus { background-position: 0 -208px; } +.ui-icon-circlesmall-minus { background-position: -16px -208px; } +.ui-icon-circlesmall-close { background-position: -32px -208px; } +.ui-icon-squaresmall-plus { background-position: -48px -208px; } +.ui-icon-squaresmall-minus { background-position: -64px -208px; } +.ui-icon-squaresmall-close { background-position: -80px -208px; } +.ui-icon-grip-dotted-vertical { background-position: 0 -224px; } +.ui-icon-grip-dotted-horizontal { background-position: -16px -224px; } +.ui-icon-grip-solid-vertical { background-position: -32px -224px; } +.ui-icon-grip-solid-horizontal { background-position: -48px -224px; } +.ui-icon-gripsmall-diagonal-se { background-position: -64px -224px; } +.ui-icon-grip-diagonal-se { background-position: -80px -224px; } + + +/* Misc visuals +----------------------------------*/ + +/* Corner radius */ +.ui-corner-tl { -moz-border-radius-topleft: 4px; -webkit-border-top-left-radius: 4px; border-top-left-radius: 4px; } +.ui-corner-tr { -moz-border-radius-topright: 4px; -webkit-border-top-right-radius: 4px; border-top-right-radius: 4px; } +.ui-corner-bl { -moz-border-radius-bottomleft: 4px; -webkit-border-bottom-left-radius: 4px; border-bottom-left-radius: 4px; } +.ui-corner-br { -moz-border-radius-bottomright: 4px; -webkit-border-bottom-right-radius: 4px; border-bottom-right-radius: 4px; } +.ui-corner-top { -moz-border-radius-topleft: 4px; -webkit-border-top-left-radius: 4px; border-top-left-radius: 4px; -moz-border-radius-topright: 4px; -webkit-border-top-right-radius: 4px; border-top-right-radius: 4px; } +.ui-corner-bottom { -moz-border-radius-bottomleft: 4px; -webkit-border-bottom-left-radius: 4px; border-bottom-left-radius: 4px; -moz-border-radius-bottomright: 4px; -webkit-border-bottom-right-radius: 4px; border-bottom-right-radius: 4px; } +.ui-corner-right { -moz-border-radius-topright: 4px; -webkit-border-top-right-radius: 4px; border-top-right-radius: 4px; -moz-border-radius-bottomright: 4px; -webkit-border-bottom-right-radius: 4px; border-bottom-right-radius: 4px; } +.ui-corner-left { -moz-border-radius-topleft: 4px; -webkit-border-top-left-radius: 4px; border-top-left-radius: 4px; -moz-border-radius-bottomleft: 4px; -webkit-border-bottom-left-radius: 4px; border-bottom-left-radius: 4px; } +.ui-corner-all { -moz-border-radius: 4px; -webkit-border-radius: 4px; border-radius: 4px; } + +/* Overlays */ +.ui-widget-overlay { background: #666666 url(images/ui-bg_diagonals-thick_20_666666_40x40.png) 50% 50% repeat; opacity: .50;filter:Alpha(Opacity=50); } +.ui-widget-shadow { margin: -5px 0 0 -5px; padding: 5px; background: #000000 url(images/ui-bg_flat_10_000000_40x100.png) 50% 50% repeat-x; opacity: .20;filter:Alpha(Opacity=20); -moz-border-radius: 5px; -webkit-border-radius: 5px; border-radius: 5px; }/* Resizable +----------------------------------*/ +.ui-resizable { position: relative;} +.ui-resizable-handle { position: absolute;font-size: 0.1px;z-index: 99999; display: block;} +.ui-resizable-disabled .ui-resizable-handle, .ui-resizable-autohide .ui-resizable-handle { display: none; } +.ui-resizable-n { cursor: n-resize; height: 7px; width: 100%; top: -5px; left: 0; } +.ui-resizable-s { cursor: s-resize; height: 7px; width: 100%; bottom: -5px; left: 0; } +.ui-resizable-e { cursor: e-resize; width: 7px; right: -5px; top: 0; height: 100%; } +.ui-resizable-w { cursor: w-resize; width: 7px; left: -5px; top: 0; height: 100%; } +.ui-resizable-se { cursor: se-resize; width: 12px; height: 12px; right: 1px; bottom: 1px; } +.ui-resizable-sw { cursor: sw-resize; width: 9px; height: 9px; left: -5px; bottom: -5px; } +.ui-resizable-nw { cursor: nw-resize; width: 9px; height: 9px; left: -5px; top: -5px; } +.ui-resizable-ne { cursor: ne-resize; width: 9px; height: 9px; right: -5px; top: -5px;}/* Selectable +----------------------------------*/ +.ui-selectable-helper { border:1px dotted black } +/* Accordion +----------------------------------*/ +.ui-accordion .ui-accordion-header { cursor: pointer; position: relative; margin-top: 1px; zoom: 1; } +.ui-accordion .ui-accordion-li-fix { display: inline; } +.ui-accordion .ui-accordion-header-active { border-bottom: 0 !important; } +.ui-accordion .ui-accordion-header a { display: block; font-size: 1em; padding: .5em .5em .5em .7em; } +/* IE7-/Win - Fix extra vertical space in lists */ +.ui-accordion a { zoom: 1; } +.ui-accordion-icons .ui-accordion-header a { padding-left: 2.2em; } +.ui-accordion .ui-accordion-header .ui-icon { position: absolute; left: .5em; top: 50%; margin-top: -8px; } +.ui-accordion .ui-accordion-content { padding: 1em 2.2em; border-top: 0; margin-top: -2px; position: relative; top: 1px; margin-bottom: 2px; overflow: auto; display: none; zoom: 1; } +.ui-accordion .ui-accordion-content-active { display: block; }/* Autocomplete +----------------------------------*/ +.ui-autocomplete { position: absolute; cursor: default; } +.ui-autocomplete-loading { background: white url('images/ui-anim_basic_16x16.gif') right center no-repeat; } + +/* workarounds */ +* html .ui-autocomplete { width:1px; } /* without this, the menu expands to 100% in IE6 */ + +/* Menu +----------------------------------*/ +.ui-menu { + list-style:none; + padding: 2px; + margin: 0; + display:block; +} +.ui-menu .ui-menu { + margin-top: -3px; +} +.ui-menu .ui-menu-item { + margin:0; + padding: 0; + zoom: 1; + float: left; + clear: left; + width: 100%; +} +.ui-menu .ui-menu-item a { + text-decoration:none; + display:block; + padding:.2em .4em; + line-height:1.5; + zoom:1; +} +.ui-menu .ui-menu-item a.ui-state-hover, +.ui-menu .ui-menu-item a.ui-state-active { + font-weight: normal; + margin: -1px; +} +/* Button +----------------------------------*/ + +.ui-button { display: inline-block; position: relative; padding: 0; margin-right: .1em; text-decoration: none !important; cursor: pointer; text-align: center; zoom: 1; overflow: visible; } /* the overflow property removes extra width in IE */ +.ui-button-icon-only { width: 2.2em; } /* to make room for the icon, a width needs to be set here */ +button.ui-button-icon-only { width: 2.4em; } /* button elements seem to need a little more width */ +.ui-button-icons-only { width: 3.4em; } +button.ui-button-icons-only { width: 3.7em; } + +/*button text element */ +.ui-button .ui-button-text { display: block; line-height: 1.4; } +.ui-button-text-only .ui-button-text { padding: .4em 1em; font-weight: normal; } +.ui-button-icon-only .ui-button-text, .ui-button-icons-only .ui-button-text { padding: .4em; text-indent: -9999999px; } +.ui-button-text-icon .ui-button-text, .ui-button-text-icons .ui-button-text { padding: .4em 1em .4em 2.1em; } +.ui-button-text-icons .ui-button-text { padding-left: 2.1em; padding-right: 2.1em; } +/* no icon support for input elements, provide padding by default */ +input.ui-button { padding: .4em 1em; } + +/*button icon element(s) */ +.ui-button-icon-only .ui-icon, .ui-button-text-icon .ui-icon, .ui-button-text-icons .ui-icon, .ui-button-icons-only .ui-icon { position: absolute; top: 50%; margin-top: -8px; } +.ui-button-icon-only .ui-icon { left: 50%; margin-left: -8px; } +.ui-button-text-icon .ui-button-icon-primary, .ui-button-text-icons .ui-button-icon-primary, .ui-button-icons-only .ui-button-icon-primary { left: .5em; } +.ui-button-text-icons .ui-button-icon-secondary, .ui-button-icons-only .ui-button-icon-secondary { right: .5em; } + +/*button sets*/ +.ui-buttonset { margin-right: 7px; } +.ui-buttonset .ui-button { margin-left: 0; margin-right: -.3em; } + +/* workarounds */ +button.ui-button::-moz-focus-inner { border: 0; padding: 0; } /* reset extra padding in Firefox */ + + + + + +/* Dialog +----------------------------------*/ +.ui-dialog { position: absolute; padding: .2em; width: 300px; overflow: hidden; } +.ui-dialog .ui-dialog-titlebar { padding: .5em 1em .3em; position: relative; } +.ui-dialog .ui-dialog-title { float: left; margin: .1em 16px .2em 0; } +.ui-dialog .ui-dialog-titlebar-close { position: absolute; right: .3em; top: 50%; width: 19px; margin: -10px 0 0 0; padding: 1px; height: 18px; } +.ui-dialog .ui-dialog-titlebar-close span { display: block; margin: 1px; } +.ui-dialog .ui-dialog-titlebar-close:hover, .ui-dialog .ui-dialog-titlebar-close:focus { padding: 0; } +.ui-dialog .ui-dialog-content { border: 0; padding: .5em 1em; background: none; overflow: auto; zoom: 1; } +.ui-dialog .ui-dialog-buttonpane { text-align: left; border-width: 1px 0 0 0; background-image: none; margin: .5em 0 0 0; padding: .3em 1em .5em .4em; } +.ui-dialog .ui-dialog-buttonpane button { float: right; margin: .5em .4em .5em 0; cursor: pointer; padding: .2em .6em .3em .6em; line-height: 1.4em; width:auto; overflow:visible; } +.ui-dialog .ui-resizable-se { width: 14px; height: 14px; right: 3px; bottom: 3px; } +.ui-draggable .ui-dialog-titlebar { cursor: move; } +/* Slider +----------------------------------*/ +.ui-slider { position: relative; text-align: left; } +.ui-slider .ui-slider-handle { position: absolute; z-index: 2; width: 1.2em; height: 1.2em; cursor: default; } +.ui-slider .ui-slider-range { position: absolute; z-index: 1; font-size: .7em; display: block; border: 0; background-position: 0 0; } + +.ui-slider-horizontal { height: .8em; } +.ui-slider-horizontal .ui-slider-handle { top: -.3em; margin-left: -.6em; } +.ui-slider-horizontal .ui-slider-range { top: 0; height: 100%; } +.ui-slider-horizontal .ui-slider-range-min { left: 0; } +.ui-slider-horizontal .ui-slider-range-max { right: 0; } + +.ui-slider-vertical { width: .8em; height: 100px; } +.ui-slider-vertical .ui-slider-handle { left: -.3em; margin-left: 0; margin-bottom: -.6em; } +.ui-slider-vertical .ui-slider-range { left: 0; width: 100%; } +.ui-slider-vertical .ui-slider-range-min { bottom: 0; } +.ui-slider-vertical .ui-slider-range-max { top: 0; }/* Tabs +----------------------------------*/ +.ui-tabs { position: relative; padding: .2em .2em 5ex .2em; zoom: 1; } /* position: relative prevents IE scroll bug (element with position: relative inside container with overflow: auto appear as "fixed") */ +.ui-tabs .ui-tabs-nav { margin: 0; padding: .2em .2em 0; } +.ui-tabs .ui-tabs-nav li { list-style: none; float: left; position: relative; top: 1px; margin: 0 .2em 1px 0; border-bottom: 0 !important; padding: 0; white-space: nowrap; font-weight: normal; } +.ui-tabs .ui-tabs-nav li a { float: left; padding: .5em 1em; text-decoration: none; } +.ui-tabs .ui-tabs-nav li.ui-tabs-selected { margin-bottom: 0; padding-bottom: 1px; } +.ui-tabs .ui-tabs-nav li.ui-tabs-selected a, .ui-tabs .ui-tabs-nav li.ui-state-disabled a, .ui-tabs .ui-tabs-nav li.ui-state-processing a { cursor: pointer; } +.ui-tabs .ui-tabs-nav li a, .ui-tabs.ui-tabs-collapsible .ui-tabs-nav li.ui-tabs-selected a { cursor: pointer; } /* first selector in group seems obsolete, but required to overcome bug in Opera applying cursor: text overall if defined elsewhere... */ +.ui-tabs .ui-tabs-panel { display: block; border-width: 0; padding: 1ex 1ex; background: none; } +.ui-tabs .ui-tabs-hide { display: none !important; } +/* Datepicker +----------------------------------*/ +.ui-datepicker { width: 17em; padding: .2em .2em 0; } +.ui-datepicker .ui-datepicker-header { position:relative; padding:.2em 0; } +.ui-datepicker .ui-datepicker-prev, .ui-datepicker .ui-datepicker-next { position:absolute; top: 2px; width: 1.8em; height: 1.8em; } +.ui-datepicker .ui-datepicker-prev-hover, .ui-datepicker .ui-datepicker-next-hover { top: 1px; } +.ui-datepicker .ui-datepicker-prev { left:2px; } +.ui-datepicker .ui-datepicker-next { right:2px; } +.ui-datepicker .ui-datepicker-prev-hover { left:1px; } +.ui-datepicker .ui-datepicker-next-hover { right:1px; } +.ui-datepicker .ui-datepicker-prev span, .ui-datepicker .ui-datepicker-next span { display: block; position: absolute; left: 50%; margin-left: -8px; top: 50%; margin-top: -8px; } +.ui-datepicker .ui-datepicker-title { margin: 0 2.3em; line-height: 1.8em; text-align: center; } +.ui-datepicker .ui-datepicker-title select { font-size:1em; margin:1px 0; } +.ui-datepicker select.ui-datepicker-month-year {width: 100%;} +.ui-datepicker select.ui-datepicker-month, +.ui-datepicker select.ui-datepicker-year { width: 49%;} +.ui-datepicker table {width: 100%; font-size: .9em; border-collapse: collapse; margin:0 0 .4em; } +.ui-datepicker th { padding: .7em .3em; text-align: center; font-weight: bold; border: 0; } +.ui-datepicker td { border: 0; padding: 1px; } +.ui-datepicker td span, .ui-datepicker td a { display: block; padding: .2em; text-align: right; text-decoration: none; } +.ui-datepicker .ui-datepicker-buttonpane { background-image: none; margin: .7em 0 0 0; padding:0 .2em; border-left: 0; border-right: 0; border-bottom: 0; } +.ui-datepicker .ui-datepicker-buttonpane button { float: right; margin: .5em .2em .4em; cursor: pointer; padding: .2em .6em .3em .6em; width:auto; overflow:visible; } +.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current { float:left; } + +/* with multiple calendars */ +.ui-datepicker.ui-datepicker-multi { width:auto; } +.ui-datepicker-multi .ui-datepicker-group { float:left; } +.ui-datepicker-multi .ui-datepicker-group table { width:95%; margin:0 auto .4em; } +.ui-datepicker-multi-2 .ui-datepicker-group { width:50%; } +.ui-datepicker-multi-3 .ui-datepicker-group { width:33.3%; } +.ui-datepicker-multi-4 .ui-datepicker-group { width:25%; } +.ui-datepicker-multi .ui-datepicker-group-last .ui-datepicker-header { border-left-width:0; } +.ui-datepicker-multi .ui-datepicker-group-middle .ui-datepicker-header { border-left-width:0; } +.ui-datepicker-multi .ui-datepicker-buttonpane { clear:left; } +.ui-datepicker-row-break { clear:both; width:100%; } + +/* RTL support */ +.ui-datepicker-rtl { direction: rtl; } +.ui-datepicker-rtl .ui-datepicker-prev { right: 2px; left: auto; } +.ui-datepicker-rtl .ui-datepicker-next { left: 2px; right: auto; } +.ui-datepicker-rtl .ui-datepicker-prev:hover { right: 1px; left: auto; } +.ui-datepicker-rtl .ui-datepicker-next:hover { left: 1px; right: auto; } +.ui-datepicker-rtl .ui-datepicker-buttonpane { clear:right; } +.ui-datepicker-rtl .ui-datepicker-buttonpane button { float: left; } +.ui-datepicker-rtl .ui-datepicker-buttonpane button.ui-datepicker-current { float:right; } +.ui-datepicker-rtl .ui-datepicker-group { float:right; } +.ui-datepicker-rtl .ui-datepicker-group-last .ui-datepicker-header { border-right-width:0; border-left-width:1px; } +.ui-datepicker-rtl .ui-datepicker-group-middle .ui-datepicker-header { border-right-width:0; border-left-width:1px; } + +/* IE6 IFRAME FIX (taken from datepicker 1.5.3 */ +.ui-datepicker-cover { + display: none; /*sorry for IE5*/ + display/**/: block; /*sorry for IE5*/ + position: absolute; /*must have*/ + z-index: -1; /*must have*/ + filter: mask(); /*must have*/ + top: -4px; /*must have*/ + left: -4px; /*must have*/ + width: 200px; /*must have*/ + height: 200px; /*must have*/ +}/* Progressbar +----------------------------------*/ +.ui-progressbar { height:2em; text-align: left; } +.ui-progressbar .ui-progressbar-value {margin: -1px; height:100%; } \ No newline at end of file Binary files 1.1.3-5/data/remote/delete.png and 1.2.0~beta2-0ubuntu10/data/remote/delete.png differ Binary files 1.1.3-5/data/remote/delete_with_data.png and 1.2.0~beta2-0ubuntu10/data/remote/delete_with_data.png differ diff -pruN 1.1.3-5/data/remote/details.qsp 1.2.0~beta2-0ubuntu10/data/remote/details.qsp --- 1.1.3-5/data/remote/details.qsp 2010-09-06 09:43:46.000000000 +0000 +++ 1.2.0~beta2-0ubuntu10/data/remote/details.qsp 1970-01-01 00:00:00.000000000 +0000 @@ -1,91 +0,0 @@ - - - - -Saved.
'); - } - - function escapeAmpersand(text) - { - text = new String(text); - return text.split('&').join('&'); - } -?> - -Transfer details
- - - - Binary files 1.1.3-5/data/remote/download.png and 1.2.0~beta2-0ubuntu10/data/remote/download.png differ Binary files 1.1.3-5/data/remote/down.png and 1.2.0~beta2-0ubuntu10/data/remote/down.png differ diff -pruN 1.1.3-5/data/remote/filedialog/ajaxrequest.qsp 1.2.0~beta2-0ubuntu10/data/remote/filedialog/ajaxrequest.qsp --- 1.1.3-5/data/remote/filedialog/ajaxrequest.qsp 2010-09-06 09:43:46.000000000 +0000 +++ 1.2.0~beta2-0ubuntu10/data/remote/filedialog/ajaxrequest.qsp 1970-01-01 00:00:00.000000000 +0000 @@ -1,20 +0,0 @@ - -'); - -for(i=0;iChoose a directory
- -+ | + | + | + |
+ | + | ||
+ | + | + | |
+ | + | + | |
+ | + | ||
+ | + + | +||
+ | + | ||
+ | |||
+ | |||
+ |
+ | + + | +
+ | + + | +
+ | + + | +
+ | + |
+ |
+ + | +
+ |
+ |
+ + | +
+ | + |
+ | + |
Username: Use "admin" or "fatrat", both are equivalent. | +|
+ + | +
Name | +Progress | +Size | +Speed | +Speed | +Time Remaining | +Message | +
---|
++ + +
++
+ + Do you really want to delete the selected transfers? +
++ + Do you really want to delete the selected transfers including the data? +
+Target: | ++ |
Max download speed (KB/s): | ++ |
Max upload speed (KB/s): | ++ |
Comment: | ++ |
Queue: | ++ |
URLs: | +|
+ + | +|
Local file (i.e. torrent): | ++ + | +
Target: | ++ |
Download as: | ++ + | +
+ Max download speed (KB/s): + | ++ + + + | +
+ Max upload speed (KB/s): + | ++ + | +
Name: | ++ |
Target directory: | ++ |
+ | + |
Download speed limit (KB/s): | ++ |
Upload speed limit (KB/s): | ++ |
+ + | +
FatRat - Copyright © 2006-2008 Luboš Doležel
- - - Binary files 1.1.3-5/data/remote/logo.png and 1.2.0~beta2-0ubuntu10/data/remote/logo.png differ Binary files 1.1.3-5/data/remote/minus.png and 1.2.0~beta2-0ubuntu10/data/remote/minus.png differ Binary files 1.1.3-5/data/remote/move/bottom.png and 1.2.0~beta2-0ubuntu10/data/remote/move/bottom.png differ Binary files 1.1.3-5/data/remote/move/down.png and 1.2.0~beta2-0ubuntu10/data/remote/move/down.png differ Binary files 1.1.3-5/data/remote/move/top.png and 1.2.0~beta2-0ubuntu10/data/remote/move/top.png differ Binary files 1.1.3-5/data/remote/move/up.png and 1.2.0~beta2-0ubuntu10/data/remote/move/up.png differ Binary files 1.1.3-5/data/remote/plus.png and 1.2.0~beta2-0ubuntu10/data/remote/plus.png differ Binary files 1.1.3-5/data/remote/queue/add.png and 1.2.0~beta2-0ubuntu10/data/remote/queue/add.png differ Binary files 1.1.3-5/data/remote/queue/properties.png and 1.2.0~beta2-0ubuntu10/data/remote/queue/properties.png differ Binary files 1.1.3-5/data/remote/queue/remove.png and 1.2.0~beta2-0ubuntu10/data/remote/queue/remove.png differ diff -pruN 1.1.3-5/data/remote/queue.qsp 1.2.0~beta2-0ubuntu10/data/remote/queue.qsp --- 1.1.3-5/data/remote/queue.qsp 2010-09-06 09:43:46.000000000 +0000 +++ 1.2.0~beta2-0ubuntu10/data/remote/queue.qsp 1970-01-01 00:00:00.000000000 +0000 @@ -1,163 +0,0 @@ - - - - - -Created.
'); - } -?> - - - -Queue details
- - - - - Binary files 1.1.3-5/data/remote/reload.png and 1.2.0~beta2-0ubuntu10/data/remote/reload.png differ diff -pruN 1.1.3-5/data/remote/scripts/base64.js 1.2.0~beta2-0ubuntu10/data/remote/scripts/base64.js --- 1.1.3-5/data/remote/scripts/base64.js 1970-01-01 00:00:00.000000000 +0000 +++ 1.2.0~beta2-0ubuntu10/data/remote/scripts/base64.js 2012-07-14 11:44:27.000000000 +0000 @@ -0,0 +1,99 @@ +/* + CryptoMX Tools + Copyright (C) 2004 - 2006 Derek Buitenhuis + + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License + as published by the Free Software Foundation; either version 2 + of the License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +*/ + + +var keyStr = "ABCDEFGHIJKLMNOP" + + "QRSTUVWXYZabcdef" + + "ghijklmnopqrstuv" + + "wxyz0123456789+/" + + "="; + + function encode64(input) { + var output = ""; + var chr1, chr2, chr3 = ""; + var enc1, enc2, enc3, enc4 = ""; + var i = 0; + + do { + chr1 = input.charCodeAt(i++); + chr2 = input.charCodeAt(i++); + chr3 = input.charCodeAt(i++); + + enc1 = chr1 >> 2; + enc2 = ((chr1 & 3) << 4) | (chr2 >> 4); + enc3 = ((chr2 & 15) << 2) | (chr3 >> 6); + enc4 = chr3 & 63; + + if (isNaN(chr2)) { + enc3 = enc4 = 64; + } else if (isNaN(chr3)) { + enc4 = 64; + } + + output = output + + keyStr.charAt(enc1) + + keyStr.charAt(enc2) + + keyStr.charAt(enc3) + + keyStr.charAt(enc4); + chr1 = chr2 = chr3 = ""; + enc1 = enc2 = enc3 = enc4 = ""; + } while (i < input.length); + + return output; + } + + function decode64(input) { + var output = ""; + var chr1, chr2, chr3 = ""; + var enc1, enc2, enc3, enc4 = ""; + var i = 0; + + // remove all characters that are not A-Z, a-z, 0-9, +, /, or = + var base64test = /[^A-Za-z0-9\+\/\=]/g; + if (base64test.exec(input)) { + return; + } + input = input.replace(/[^A-Za-z0-9\+\/\=]/g, ""); + + do { + enc1 = keyStr.indexOf(input.charAt(i++)); + enc2 = keyStr.indexOf(input.charAt(i++)); + enc3 = keyStr.indexOf(input.charAt(i++)); + enc4 = keyStr.indexOf(input.charAt(i++)); + + chr1 = (enc1 << 2) | (enc2 >> 4); + chr2 = ((enc2 & 15) << 4) | (enc3 >> 2); + chr3 = ((enc3 & 3) << 6) | enc4; + + output = output + String.fromCharCode(chr1); + + if (enc3 != 64) { + output = output + String.fromCharCode(chr2); + } + if (enc4 != 64) { + output = output + String.fromCharCode(chr3); + } + + chr1 = chr2 = chr3 = ""; + enc1 = enc2 = enc3 = enc4 = ""; + + } while (i < input.length); + + return output; + } \ No newline at end of file diff -pruN 1.1.3-5/data/remote/scripts/client.js 1.2.0~beta2-0ubuntu10/data/remote/scripts/client.js --- 1.1.3-5/data/remote/scripts/client.js 1970-01-01 00:00:00.000000000 +0000 +++ 1.2.0~beta2-0ubuntu10/data/remote/scripts/client.js 2012-07-14 11:44:27.000000000 +0000 @@ -0,0 +1,1249 @@ +var client; +var rpcMethods = ["getQueues", "getTransferClasses", "Queue.getTransfers", + "Transfer.setProperties", "Transfer.getAdvancedProperties", "Transfer.delete", + "Queue.moveTransfers", "Queue.setProperties", "Queue.create", "getTransferClasses", + "Queue.addTransfers", "Queue.addTransferWithData", "Settings.apply", + "Settings.setValue", "Settings.getValue", "Settings.getPages", "Transfer.getSpeedData", + "Queue.getSpeedData" ]; +var queues, transfers; +var currentQueue, currentTransfers = []; +var interval, graphMinutes = 5; +var transferClasses, settingsPages; +var settingsStore = []; + +function clientInit() { + client = XmlRpc.getObject("/xmlrpc", rpcMethods); + + client.getTransferClasses(function(data) { + transferClasses = data; + var options = $("#new-transfer-class").attr('options'); + + $.each(transferClasses, function(index, cls) { + if (cls.mode == "Download") + options[options.length] = new Option(cls.longName, cls.shortName, true, true); + }); + }); + client.Settings_getPages(function(data) { + settingsPages = data; + + var list = $("#settings-list"); + for(var i=0;i=0))l||m.push(v);else if(l)h[p]=false;return false},ID:function(g){return g[1].replace(/\\/g,"")},TAG:function(g){return g[1].toLowerCase()}, +CHILD:function(g){if(g[1]==="nth"){var h=/(-?)(\d*)n((?:\+|-)?\d*)/.exec(g[2]==="even"&&"2n"||g[2]==="odd"&&"2n+1"||!/\D/.test(g[2])&&"0n+"+g[2]||g[2]);g[2]=h[1]+(h[2]||1)-0;g[3]=h[3]-0}g[0]=e++;return g},ATTR:function(g,h,l,m,q,p){h=g[1].replace(/\\/g,"");if(!p&&n.attrMap[h])g[1]=n.attrMap[h];if(g[2]==="~=")g[4]=" "+g[4]+" ";return g},PSEUDO:function(g,h,l,m,q){if(g[1]==="not")if((f.exec(g[3])||"").length>1||/^\w/.test(g[3]))g[3]=k(g[3],null,null,h);else{g=k.filter(g[3],h,l,true^q);l||m.push.apply(m, +g);return false}else if(n.match.POS.test(g[0])||n.match.CHILD.test(g[0]))return true;return g},POS:function(g){g.unshift(true);return g}},filters:{enabled:function(g){return g.disabled===false&&g.type!=="hidden"},disabled:function(g){return g.disabled===true},checked:function(g){return g.checked===true},selected:function(g){return g.selected===true},parent:function(g){return!!g.firstChild},empty:function(g){return!g.firstChild},has:function(g,h,l){return!!k(l[3],g).length},header:function(g){return/h\d/i.test(g.nodeName)}, +text:function(g){return"text"===g.type},radio:function(g){return"radio"===g.type},checkbox:function(g){return"checkbox"===g.type},file:function(g){return"file"===g.type},password:function(g){return"password"===g.type},submit:function(g){return"submit"===g.type},image:function(g){return"image"===g.type},reset:function(g){return"reset"===g.type},button:function(g){return"button"===g.type||g.nodeName.toLowerCase()==="button"},input:function(g){return/input|select|textarea|button/i.test(g.nodeName)}}, +setFilters:{first:function(g,h){return h===0},last:function(g,h,l,m){return h===m.length-1},even:function(g,h){return h%2===0},odd:function(g,h){return h%2===1},lt:function(g,h,l){return hl[3]-0},nth:function(g,h,l){return l[3]-0===h},eq:function(g,h,l){return l[3]-0===h}},filter:{PSEUDO:function(g,h,l,m){var q=h[1],p=n.filters[q];if(p)return p(g,l,h,m);else if(q==="contains")return(g.textContent||g.innerText||a([g])||"").indexOf(h[3])>=0;else if(q==="not"){h= +h[3];l=0;for(m=h.length;l =0}},ID:function(g,h){return g.nodeType===1&&g.getAttribute("id")===h},TAG:function(g,h){return h==="*"&&g.nodeType===1||g.nodeName.toLowerCase()===h},CLASS:function(g,h){return(" "+(g.className||g.getAttribute("class"))+" ").indexOf(h)>-1},ATTR:function(g,h){var l=h[1];g=n.attrHandle[l]?n.attrHandle[l](g):g[l]!=null?g[l]:g.getAttribute(l);l=g+"";var m=h[2];h=h[4];return g==null?m==="!=":m=== +"="?l===h:m==="*="?l.indexOf(h)>=0:m==="~="?(" "+l+" ").indexOf(h)>=0:!h?l&&g!==false:m==="!="?l!==h:m==="^="?l.indexOf(h)===0:m==="$="?l.substr(l.length-h.length)===h:m==="|="?l===h||l.substr(0,h.length+1)===h+"-":false},POS:function(g,h,l,m){var q=n.setFilters[h[2]];if(q)return q(g,l,h,m)}}},r=n.match.POS;for(var u in n.match){n.match[u]=new RegExp(n.match[u].source+/(?![^\[]*\])(?![^\(]*\))/.source);n.leftMatch[u]=new RegExp(/(^(?:.|\r|\n)*?)/.source+n.match[u].source.replace(/\\(\d+)/g,function(g, +h){return"\\"+(h-0+1)}))}var z=function(g,h){g=Array.prototype.slice.call(g,0);if(h){h.push.apply(h,g);return h}return g};try{Array.prototype.slice.call(s.documentElement.childNodes,0)}catch(C){z=function(g,h){h=h||[];if(j.call(g)==="[object Array]")Array.prototype.push.apply(h,g);else if(typeof g.length==="number")for(var l=0,m=g.length;l ";var l=s.documentElement;l.insertBefore(g,l.firstChild);if(s.getElementById(h)){n.find.ID=function(m,q,p){if(typeof q.getElementById!=="undefined"&&!p)return(q=q.getElementById(m[1]))?q.id===m[1]||typeof q.getAttributeNode!=="undefined"&& +q.getAttributeNode("id").nodeValue===m[1]?[q]:w:[]};n.filter.ID=function(m,q){var p=typeof m.getAttributeNode!=="undefined"&&m.getAttributeNode("id");return m.nodeType===1&&p&&p.nodeValue===q}}l.removeChild(g);l=g=null})();(function(){var g=s.createElement("div");g.appendChild(s.createComment(""));if(g.getElementsByTagName("*").length>0)n.find.TAG=function(h,l){l=l.getElementsByTagName(h[1]);if(h[1]==="*"){h=[];for(var m=0;l[m];m++)l[m].nodeType===1&&h.push(l[m]);l=h}return l};g.innerHTML=""; +if(g.firstChild&&typeof g.firstChild.getAttribute!=="undefined"&&g.firstChild.getAttribute("href")!=="#")n.attrHandle.href=function(h){return h.getAttribute("href",2)};g=null})();s.querySelectorAll&&function(){var g=k,h=s.createElement("div");h.innerHTML="";if(!(h.querySelectorAll&&h.querySelectorAll(".TEST").length===0)){k=function(m,q,p,v){q=q||s;if(!v&&q.nodeType===9&&!x(q))try{return z(q.querySelectorAll(m),p)}catch(t){}return g(m,q,p,v)};for(var l in g)k[l]=g[l];h=null}}(); +(function(){var g=s.createElement("div");g.innerHTML="";if(!(!g.getElementsByClassName||g.getElementsByClassName("e").length===0)){g.lastChild.className="e";if(g.getElementsByClassName("e").length!==1){n.order.splice(1,0,"CLASS");n.find.CLASS=function(h,l,m){if(typeof l.getElementsByClassName!=="undefined"&&!m)return l.getElementsByClassName(h[1])};g=null}}})();var E=s.compareDocumentPosition?function(g,h){return!!(g.compareDocumentPosition(h)&16)}: +function(g,h){return g!==h&&(g.contains?g.contains(h):true)},x=function(g){return(g=(g?g.ownerDocument||g:0).documentElement)?g.nodeName!=="HTML":false},ga=function(g,h){var l=[],m="",q;for(h=h.nodeType?[h]:h;q=n.match.PSEUDO.exec(g);){m+=q[0];g=g.replace(n.match.PSEUDO,"")}g=n.relative[g]?g+"*":g;q=0;for(var p=h.length;q =0===d})};c.fn.extend({find:function(a){for(var b=this.pushStack("","find",a),d=0,f=0,e=this.length;f
0)for(var j=d;j 0},closest:function(a,b){if(c.isArray(a)){var d=[],f=this[0],e,j= +{},i;if(f&&a.length){e=0;for(var o=a.length;e -1:c(f).is(e)){d.push({selector:i,elem:f});delete j[i]}}f=f.parentNode}}return d}var k=c.expr.match.POS.test(a)?c(a,b||this.context):null;return this.map(function(n,r){for(;r&&r.ownerDocument&&r!==b;){if(k?k.index(r)>-1:c(r).is(a))return r;r=r.parentNode}return null})},index:function(a){if(!a||typeof a=== +"string")return c.inArray(this[0],a?c(a):this.parent().children());return c.inArray(a.jquery?a[0]:a,this)},add:function(a,b){a=typeof a==="string"?c(a,b||this.context):c.makeArray(a);b=c.merge(this.get(),a);return this.pushStack(qa(a[0])||qa(b[0])?b:c.unique(b))},andSelf:function(){return this.add(this.prevObject)}});c.each({parent:function(a){return(a=a.parentNode)&&a.nodeType!==11?a:null},parents:function(a){return c.dir(a,"parentNode")},parentsUntil:function(a,b,d){return c.dir(a,"parentNode", +d)},next:function(a){return c.nth(a,2,"nextSibling")},prev:function(a){return c.nth(a,2,"previousSibling")},nextAll:function(a){return c.dir(a,"nextSibling")},prevAll:function(a){return c.dir(a,"previousSibling")},nextUntil:function(a,b,d){return c.dir(a,"nextSibling",d)},prevUntil:function(a,b,d){return c.dir(a,"previousSibling",d)},siblings:function(a){return c.sibling(a.parentNode.firstChild,a)},children:function(a){return c.sibling(a.firstChild)},contents:function(a){return c.nodeName(a,"iframe")? +a.contentDocument||a.contentWindow.document:c.makeArray(a.childNodes)}},function(a,b){c.fn[a]=function(d,f){var e=c.map(this,b,d);eb.test(a)||(f=d);if(f&&typeof f==="string")e=c.filter(f,e);e=this.length>1?c.unique(e):e;if((this.length>1||gb.test(f))&&fb.test(a))e=e.reverse();return this.pushStack(e,a,R.call(arguments).join(","))}});c.extend({filter:function(a,b,d){if(d)a=":not("+a+")";return c.find.matches(a,b)},dir:function(a,b,d){var f=[];for(a=a[b];a&&a.nodeType!==9&&(d===w||a.nodeType!==1||!c(a).is(d));){a.nodeType=== +1&&f.push(a);a=a[b]}return f},nth:function(a,b,d){b=b||1;for(var f=0;a;a=a[d])if(a.nodeType===1&&++f===b)break;return a},sibling:function(a,b){for(var d=[];a;a=a.nextSibling)a.nodeType===1&&a!==b&&d.push(a);return d}});var Ja=/ jQuery\d+="(?:\d+|null)"/g,V=/^\s+/,Ka=/(<([\w:]+)[^>]*?)\/>/g,hb=/^(?:area|br|col|embed|hr|img|input|link|meta|param)$/i,La=/<([\w:]+)/,ib=/"+d+">"},F={option:[1,""],legend:[1,""],thead:[1," ","
"],tr:[2,"","
"],td:[3,""],col:[2,"
"," "],area:[1,""],_default:[0,"",""]};F.optgroup=F.option;F.tbody=F.tfoot=F.colgroup=F.caption=F.thead;F.th=F.td;if(!c.support.htmlSerialize)F._default=[1,"div
"," ",""];c.fn.extend({text:function(a){if(c.isFunction(a))return this.each(function(b){var d= +c(this);d.text(a.call(this,b,d.text()))});if(typeof a!=="object"&&a!==w)return this.empty().append((this[0]&&this[0].ownerDocument||s).createTextNode(a));return c.text(this)},wrapAll:function(a){if(c.isFunction(a))return this.each(function(d){c(this).wrapAll(a.call(this,d))});if(this[0]){var b=c(a,this[0].ownerDocument).eq(0).clone(true);this[0].parentNode&&b.insertBefore(this[0]);b.map(function(){for(var d=this;d.firstChild&&d.firstChild.nodeType===1;)d=d.firstChild;return d}).append(this)}return this}, +wrapInner:function(a){if(c.isFunction(a))return this.each(function(b){c(this).wrapInner(a.call(this,b))});return this.each(function(){var b=c(this),d=b.contents();d.length?d.wrapAll(a):b.append(a)})},wrap:function(a){return this.each(function(){c(this).wrapAll(a)})},unwrap:function(){return this.parent().each(function(){c.nodeName(this,"body")||c(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,true,function(a){this.nodeType===1&&this.appendChild(a)})}, +prepend:function(){return this.domManip(arguments,true,function(a){this.nodeType===1&&this.insertBefore(a,this.firstChild)})},before:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,false,function(b){this.parentNode.insertBefore(b,this)});else if(arguments.length){var a=c(arguments[0]);a.push.apply(a,this.toArray());return this.pushStack(a,"before",arguments)}},after:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,false,function(b){this.parentNode.insertBefore(b, +this.nextSibling)});else if(arguments.length){var a=this.pushStack(this,"after",arguments);a.push.apply(a,c(arguments[0]).toArray());return a}},remove:function(a,b){for(var d=0,f;(f=this[d])!=null;d++)if(!a||c.filter(a,[f]).length){if(!b&&f.nodeType===1){c.cleanData(f.getElementsByTagName("*"));c.cleanData([f])}f.parentNode&&f.parentNode.removeChild(f)}return this},empty:function(){for(var a=0,b;(b=this[a])!=null;a++)for(b.nodeType===1&&c.cleanData(b.getElementsByTagName("*"));b.firstChild;)b.removeChild(b.firstChild); +return this},clone:function(a){var b=this.map(function(){if(!c.support.noCloneEvent&&!c.isXMLDoc(this)){var d=this.outerHTML,f=this.ownerDocument;if(!d){d=f.createElement("div");d.appendChild(this.cloneNode(true));d=d.innerHTML}return c.clean([d.replace(Ja,"").replace(/=([^="'>\s]+\/)>/g,'="$1">').replace(V,"")],f)[0]}else return this.cloneNode(true)});if(a===true){ra(this,b);ra(this.find("*"),b.find("*"))}return b},html:function(a){if(a===w)return this[0]&&this[0].nodeType===1?this[0].innerHTML.replace(Ja, +""):null;else if(typeof a==="string"&&!ta.test(a)&&(c.support.leadingWhitespace||!V.test(a))&&!F[(La.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(Ka,Ma);try{for(var b=0,d=this.length;b0||e.cacheable||this.length>1?k.cloneNode(true):k)}o.length&&c.each(o,Qa)}return this}});c.fragments={};c.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){c.fn[a]=function(d){var f=[];d=c(d);var e=this.length===1&&this[0].parentNode;if(e&&e.nodeType===11&&e.childNodes.length===1&&d.length===1){d[b](this[0]); +return this}else{e=0;for(var j=d.length;e 0?this.clone(true):this).get();c.fn[b].apply(c(d[e]),i);f=f.concat(i)}return this.pushStack(f,a,d.selector)}}});c.extend({clean:function(a,b,d,f){b=b||s;if(typeof b.createElement==="undefined")b=b.ownerDocument||b[0]&&b[0].ownerDocument||s;for(var e=[],j=0,i;(i=a[j])!=null;j++){if(typeof i==="number")i+="";if(i){if(typeof i==="string"&&!jb.test(i))i=b.createTextNode(i);else if(typeof i==="string"){i=i.replace(Ka,Ma);var o=(La.exec(i)||["", +""])[1].toLowerCase(),k=F[o]||F._default,n=k[0],r=b.createElement("div");for(r.innerHTML=k[1]+i+k[2];n--;)r=r.lastChild;if(!c.support.tbody){n=ib.test(i);o=o==="table"&&!n?r.firstChild&&r.firstChild.childNodes:k[1]===" "&&!n?r.childNodes:[];for(k=o.length-1;k>=0;--k)c.nodeName(o[k],"tbody")&&!o[k].childNodes.length&&o[k].parentNode.removeChild(o[k])}!c.support.leadingWhitespace&&V.test(i)&&r.insertBefore(b.createTextNode(V.exec(i)[0]),r.firstChild);i=r.childNodes}if(i.nodeType)e.push(i);else e= +c.merge(e,i)}}if(d)for(j=0;e[j];j++)if(f&&c.nodeName(e[j],"script")&&(!e[j].type||e[j].type.toLowerCase()==="text/javascript"))f.push(e[j].parentNode?e[j].parentNode.removeChild(e[j]):e[j]);else{e[j].nodeType===1&&e.splice.apply(e,[j+1,0].concat(c.makeArray(e[j].getElementsByTagName("script"))));d.appendChild(e[j])}return e},cleanData:function(a){for(var b,d,f=c.cache,e=c.event.special,j=c.support.deleteExpando,i=0,o;(o=a[i])!=null;i++)if(d=o[c.expando]){b=f[d];if(b.events)for(var k in b.events)e[k]? +c.event.remove(o,k):Ca(o,k,b.handle);if(j)delete o[c.expando];else o.removeAttribute&&o.removeAttribute(c.expando);delete f[d]}}});var kb=/z-?index|font-?weight|opacity|zoom|line-?height/i,Na=/alpha\([^)]*\)/,Oa=/opacity=([^)]*)/,ha=/float/i,ia=/-([a-z])/ig,lb=/([A-Z])/g,mb=/^-?\d+(?:px)?$/i,nb=/^-?\d/,ob={position:"absolute",visibility:"hidden",display:"block"},pb=["Left","Right"],qb=["Top","Bottom"],rb=s.defaultView&&s.defaultView.getComputedStyle,Pa=c.support.cssFloat?"cssFloat":"styleFloat",ja= +function(a,b){return b.toUpperCase()};c.fn.css=function(a,b){return X(this,a,b,true,function(d,f,e){if(e===w)return c.curCSS(d,f);if(typeof e==="number"&&!kb.test(f))e+="px";c.style(d,f,e)})};c.extend({style:function(a,b,d){if(!a||a.nodeType===3||a.nodeType===8)return w;if((b==="width"||b==="height")&&parseFloat(d)<0)d=w;var f=a.style||a,e=d!==w;if(!c.support.opacity&&b==="opacity"){if(e){f.zoom=1;b=parseInt(d,10)+""==="NaN"?"":"alpha(opacity="+d*100+")";a=f.filter||c.curCSS(a,"filter")||"";f.filter= +Na.test(a)?a.replace(Na,b):b}return f.filter&&f.filter.indexOf("opacity=")>=0?parseFloat(Oa.exec(f.filter)[1])/100+"":""}if(ha.test(b))b=Pa;b=b.replace(ia,ja);if(e)f[b]=d;return f[b]},css:function(a,b,d,f){if(b==="width"||b==="height"){var e,j=b==="width"?pb:qb;function i(){e=b==="width"?a.offsetWidth:a.offsetHeight;f!=="border"&&c.each(j,function(){f||(e-=parseFloat(c.curCSS(a,"padding"+this,true))||0);if(f==="margin")e+=parseFloat(c.curCSS(a,"margin"+this,true))||0;else e-=parseFloat(c.curCSS(a, +"border"+this+"Width",true))||0})}a.offsetWidth!==0?i():c.swap(a,ob,i);return Math.max(0,Math.round(e))}return c.curCSS(a,b,d)},curCSS:function(a,b,d){var f,e=a.style;if(!c.support.opacity&&b==="opacity"&&a.currentStyle){f=Oa.test(a.currentStyle.filter||"")?parseFloat(RegExp.$1)/100+"":"";return f===""?"1":f}if(ha.test(b))b=Pa;if(!d&&e&&e[b])f=e[b];else if(rb){if(ha.test(b))b="float";b=b.replace(lb,"-$1").toLowerCase();e=a.ownerDocument.defaultView;if(!e)return null;if(a=e.getComputedStyle(a,null))f= +a.getPropertyValue(b);if(b==="opacity"&&f==="")f="1"}else if(a.currentStyle){d=b.replace(ia,ja);f=a.currentStyle[b]||a.currentStyle[d];if(!mb.test(f)&&nb.test(f)){b=e.left;var j=a.runtimeStyle.left;a.runtimeStyle.left=a.currentStyle.left;e.left=d==="fontSize"?"1em":f||0;f=e.pixelLeft+"px";e.left=b;a.runtimeStyle.left=j}}return f},swap:function(a,b,d){var f={};for(var e in b){f[e]=a.style[e];a.style[e]=b[e]}d.call(a);for(e in b)a.style[e]=f[e]}});if(c.expr&&c.expr.filters){c.expr.filters.hidden=function(a){var b= +a.offsetWidth,d=a.offsetHeight,f=a.nodeName.toLowerCase()==="tr";return b===0&&d===0&&!f?true:b>0&&d>0&&!f?false:c.curCSS(a,"display")==="none"};c.expr.filters.visible=function(a){return!c.expr.filters.hidden(a)}}var sb=J(),tb=/