diff --git a/.tx/config b/.tx/config index 4192cea9a..52bed83f3 100644 --- a/.tx/config +++ b/.tx/config @@ -11,7 +11,7 @@ mode = developer [qbittorrent.qbittorrentdesktop_master] -source_file = src/Icons/qBittorrent.desktop +source_file = src/icons/qBittorrent.desktop source_lang = en type = DESKTOP minimum_perc = 23 diff --git a/AUTHORS b/AUTHORS index f4db303d9..e93cb50fa 100644 --- a/AUTHORS +++ b/AUTHORS @@ -17,7 +17,7 @@ Contributors: * Nick Tiskov Code from other projects: -* files src/qtsingleapp/* src/lineedit/* +* files src/qtsingleapplication/* src/lineedit/* copyright: Nokia Corporation license: LGPL @@ -34,7 +34,7 @@ Code from other projects: license: GPLv2/3 Images Authors: -* files: src/Icons/*.png +* files: src/icons/*.png copyright: Gnome Icon Theme license: GPLv2 url: http://ftp.acc.umu.se/pub/GNOME/sources/gnome-icon-theme @@ -44,21 +44,21 @@ Images Authors: license: LGPL url: http://www.oxygen-icons.org -* files: src/Icons/flags/*.png +* files: src/icons/flags/*.png copyright: Mark James license: Public Domain url: http://www.famfamfam.com -* files: src/Icons/skin/*.png +* files: src/icons/skin/*.png files: src/menuicons/YYxYY/*.png copyright: Mateusz Tobola license: GPLv2 -* file: src/Icons/skin/tabs.gif +* file: src/icons/skin/tabs.gif copyright: Greg Houston license: MIT -* file: src/Icons/skin/qbittorrent_mono* +* file: src/icons/skin/qbittorrent_mono* copyright: Daniel Eguren license: LGPL @@ -77,12 +77,12 @@ Images Authors: * file: src/search_engine/engines/torrentreactor.png copyright: Downloaded from torrentreactor.net -* file: src/Icons/oxygen/checked.png +* file: src/icons/oxygen/checked.png copyright: Victor Buinsky Translations authors: * files: src/lang/*.ts -* file: src/Icons/qBittorrent.desktop +* file: src/icons/qBittorrent.desktop copyright: - Arabic: SDERAWI (abz8868@msn.com), sn51234 (nesseyan@gmail.com) and Ibrahim Saed ibraheem_alex(Transifex) - Armenian: Hrant Ohanyan (hrantohanyan@mail.am) diff --git a/configure b/configure index f81f0a200..d42059295 100755 --- a/configure +++ b/configure @@ -717,6 +717,7 @@ with_geoip_database_embedded with_qtsingleapplication enable_debug enable_gui +enable_webui enable_qt_dbus with_boost with_boost_libdir @@ -1367,6 +1368,7 @@ Optional Features: --disable-silent-rules verbose build output (undo: "make V=0") --enable-debug Enable debug build --disable-gui Disable the GUI for headless running. Disables + --disable-webui Disable the WebUI. QtDBus and the GeoIP Database. --disable-qt-dbus Disable use of QtDBus (GUI only) @@ -4199,6 +4201,14 @@ else fi +# Check whether --enable-webui was given. +if test "${enable_webui+set}" = set; then : + enableval=$enable_webui; +else + enable_webui=yes +fi + + # Check whether --enable-qt-dbus was given. if test "${enable_qt_dbus+set}" = set; then : enableval=$enable_qt_dbus; @@ -4370,19 +4380,36 @@ case "x$enable_gui" in #( "xyes") : { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - QBT_REMOVE_CONFIG="$QBT_REMOVE_CONFIG nox" ;; #( + QBT_REMOVE_CONFIG="$QBT_REMOVE_CONFIG nogui" ;; #( "xno") : { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } enable_qt_dbus=no enable_geoip_database=no - QBT_ADD_CONFIG="$QBT_ADD_CONFIG nox" ;; #( + QBT_ADD_CONFIG="$QBT_ADD_CONFIG nogui" ;; #( *) : { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_gui" >&5 $as_echo "$enable_gui" >&6; } as_fn_error $? "Unknown option \"$enable_gui\". Use either \"yes\" or \"no\"." "$LINENO" 5 ;; esac +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable the WebUI" >&5 +$as_echo_n "checking whether to enable the WebUI... " >&6; } +case "x$enable_webui" in #( + "xyes") : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + QBT_REMOVE_CONFIG="$QBT_REMOVE_CONFIG nowebui" ;; #( + "xno") : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + QBT_ADD_CONFIG="$QBT_ADD_CONFIG nowebui" ;; #( + *) : + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_webui" >&5 +$as_echo "$enable_webui" >&6; } + as_fn_error $? "Unknown option \"$enable_webui\". Use either \"yes\" or \"no\"." "$LINENO" 5 ;; +esac + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether Qt5 should be enabled" >&5 $as_echo_n "checking whether Qt5 should be enabled... " >&6; } case "x$with_qt5" in #( diff --git a/configure.ac b/configure.ac index 0ffdf7065..a358587da 100644 --- a/configure.ac +++ b/configure.ac @@ -42,6 +42,12 @@ AC_ARG_ENABLE(gui, [], [enable_gui=yes]) +AC_ARG_ENABLE(webui, + [AS_HELP_STRING([--disable-webui], + [Disable the WebUI.])], + [], + [enable_webui=yes]) + AC_ARG_ENABLE(qt-dbus, [AS_HELP_STRING([--disable-qt-dbus], [Disable use of QtDBus (GUI only)])], @@ -78,15 +84,26 @@ AC_MSG_CHECKING([whether to enable the GUI]) AS_CASE(["x$enable_gui"], ["xyes"], [AC_MSG_RESULT([yes]) - QBT_REMOVE_CONFIG="$QBT_REMOVE_CONFIG nox"], + QBT_REMOVE_CONFIG="$QBT_REMOVE_CONFIG nogui"], ["xno"], [AC_MSG_RESULT([no]) enable_qt_dbus=[no] enable_geoip_database=[no] - QBT_ADD_CONFIG="$QBT_ADD_CONFIG nox"], + QBT_ADD_CONFIG="$QBT_ADD_CONFIG nogui"], [AC_MSG_RESULT([$enable_gui]) AC_MSG_ERROR([Unknown option "$enable_gui". Use either "yes" or "no".])]) +AC_MSG_CHECKING([whether to enable the WebUI]) +AS_CASE(["x$enable_webui"], + ["xyes"], + [AC_MSG_RESULT([yes]) + QBT_REMOVE_CONFIG="$QBT_REMOVE_CONFIG nowebui"], + ["xno"], + [AC_MSG_RESULT([no]) + QBT_ADD_CONFIG="$QBT_ADD_CONFIG nowebui"], + [AC_MSG_RESULT([$enable_webui]) + AC_MSG_ERROR([Unknown option "$enable_webui". Use either "yes" or "no".])]) + AC_MSG_CHECKING([whether Qt5 should be enabled]) AS_CASE(["x$with_qt5"], ["xno"], diff --git a/src/mac/Info.plist b/dist/mac/Info.plist similarity index 100% rename from src/mac/Info.plist rename to dist/mac/Info.plist diff --git a/src/mac/qBitTorrentDocument.icns b/dist/mac/qBitTorrentDocument.icns similarity index 100% rename from src/mac/qBitTorrentDocument.icns rename to dist/mac/qBitTorrentDocument.icns diff --git a/src/mac/qbittorrent_mac.icns b/dist/mac/qbittorrent_mac.icns similarity index 100% rename from src/mac/qbittorrent_mac.icns rename to dist/mac/qbittorrent_mac.icns diff --git a/src/mac/qt.conf b/dist/mac/qt.conf similarity index 100% rename from src/mac/qt.conf rename to dist/mac/qt.conf diff --git a/src/qt-translations/qt_ar.qm b/dist/qt-translations/qt_ar.qm similarity index 100% rename from src/qt-translations/qt_ar.qm rename to dist/qt-translations/qt_ar.qm diff --git a/src/qt-translations/qt_bg.qm b/dist/qt-translations/qt_bg.qm similarity index 100% rename from src/qt-translations/qt_bg.qm rename to dist/qt-translations/qt_bg.qm diff --git a/src/qt-translations/qt_ca.qm b/dist/qt-translations/qt_ca.qm similarity index 100% rename from src/qt-translations/qt_ca.qm rename to dist/qt-translations/qt_ca.qm diff --git a/src/qt-translations/qt_cs.qm b/dist/qt-translations/qt_cs.qm similarity index 100% rename from src/qt-translations/qt_cs.qm rename to dist/qt-translations/qt_cs.qm diff --git a/src/qt-translations/qt_da.qm b/dist/qt-translations/qt_da.qm similarity index 100% rename from src/qt-translations/qt_da.qm rename to dist/qt-translations/qt_da.qm diff --git a/src/qt-translations/qt_de.qm b/dist/qt-translations/qt_de.qm similarity index 100% rename from src/qt-translations/qt_de.qm rename to dist/qt-translations/qt_de.qm diff --git a/src/qt-translations/qt_es.qm b/dist/qt-translations/qt_es.qm similarity index 100% rename from src/qt-translations/qt_es.qm rename to dist/qt-translations/qt_es.qm diff --git a/src/qt-translations/qt_eu.qm b/dist/qt-translations/qt_eu.qm similarity index 100% rename from src/qt-translations/qt_eu.qm rename to dist/qt-translations/qt_eu.qm diff --git a/src/qt-translations/qt_fi.qm b/dist/qt-translations/qt_fi.qm similarity index 100% rename from src/qt-translations/qt_fi.qm rename to dist/qt-translations/qt_fi.qm diff --git a/src/qt-translations/qt_fr.qm b/dist/qt-translations/qt_fr.qm similarity index 100% rename from src/qt-translations/qt_fr.qm rename to dist/qt-translations/qt_fr.qm diff --git a/src/qt-translations/qt_gl.qm b/dist/qt-translations/qt_gl.qm similarity index 100% rename from src/qt-translations/qt_gl.qm rename to dist/qt-translations/qt_gl.qm diff --git a/src/qt-translations/qt_he.qm b/dist/qt-translations/qt_he.qm similarity index 100% rename from src/qt-translations/qt_he.qm rename to dist/qt-translations/qt_he.qm diff --git a/src/qt-translations/qt_hu.qm b/dist/qt-translations/qt_hu.qm similarity index 100% rename from src/qt-translations/qt_hu.qm rename to dist/qt-translations/qt_hu.qm diff --git a/src/qt-translations/qt_it.qm b/dist/qt-translations/qt_it.qm similarity index 100% rename from src/qt-translations/qt_it.qm rename to dist/qt-translations/qt_it.qm diff --git a/src/qt-translations/qt_ja.qm b/dist/qt-translations/qt_ja.qm similarity index 100% rename from src/qt-translations/qt_ja.qm rename to dist/qt-translations/qt_ja.qm diff --git a/src/qt-translations/qt_ko.qm b/dist/qt-translations/qt_ko.qm similarity index 100% rename from src/qt-translations/qt_ko.qm rename to dist/qt-translations/qt_ko.qm diff --git a/src/qt-translations/qt_lt.qm b/dist/qt-translations/qt_lt.qm similarity index 100% rename from src/qt-translations/qt_lt.qm rename to dist/qt-translations/qt_lt.qm diff --git a/src/qt-translations/qt_nl.qm b/dist/qt-translations/qt_nl.qm similarity index 100% rename from src/qt-translations/qt_nl.qm rename to dist/qt-translations/qt_nl.qm diff --git a/src/qt-translations/qt_pl.qm b/dist/qt-translations/qt_pl.qm similarity index 100% rename from src/qt-translations/qt_pl.qm rename to dist/qt-translations/qt_pl.qm diff --git a/src/qt-translations/qt_pt.qm b/dist/qt-translations/qt_pt.qm similarity index 100% rename from src/qt-translations/qt_pt.qm rename to dist/qt-translations/qt_pt.qm diff --git a/src/qt-translations/qt_pt_BR.qm b/dist/qt-translations/qt_pt_BR.qm similarity index 100% rename from src/qt-translations/qt_pt_BR.qm rename to dist/qt-translations/qt_pt_BR.qm diff --git a/src/qt-translations/qt_ru.qm b/dist/qt-translations/qt_ru.qm similarity index 100% rename from src/qt-translations/qt_ru.qm rename to dist/qt-translations/qt_ru.qm diff --git a/src/qt-translations/qt_sk.qm b/dist/qt-translations/qt_sk.qm similarity index 100% rename from src/qt-translations/qt_sk.qm rename to dist/qt-translations/qt_sk.qm diff --git a/src/qt-translations/qt_sv.qm b/dist/qt-translations/qt_sv.qm similarity index 100% rename from src/qt-translations/qt_sv.qm rename to dist/qt-translations/qt_sv.qm diff --git a/src/qt-translations/qt_tr.qm b/dist/qt-translations/qt_tr.qm similarity index 100% rename from src/qt-translations/qt_tr.qm rename to dist/qt-translations/qt_tr.qm diff --git a/src/qt-translations/qt_uk.qm b/dist/qt-translations/qt_uk.qm similarity index 100% rename from src/qt-translations/qt_uk.qm rename to dist/qt-translations/qt_uk.qm diff --git a/src/qt-translations/qt_zh_CN.qm b/dist/qt-translations/qt_zh_CN.qm similarity index 100% rename from src/qt-translations/qt_zh_CN.qm rename to dist/qt-translations/qt_zh_CN.qm diff --git a/src/qt-translations/qt_zh_TW.qm b/dist/qt-translations/qt_zh_TW.qm similarity index 100% rename from src/qt-translations/qt_zh_TW.qm rename to dist/qt-translations/qt_zh_TW.qm diff --git a/src/menuicons/128x128/apps/qbittorrent.png b/dist/unix/menuicons/128x128/apps/qbittorrent.png similarity index 100% rename from src/menuicons/128x128/apps/qbittorrent.png rename to dist/unix/menuicons/128x128/apps/qbittorrent.png diff --git a/src/menuicons/16x16/apps/qbittorrent.png b/dist/unix/menuicons/16x16/apps/qbittorrent.png similarity index 100% rename from src/menuicons/16x16/apps/qbittorrent.png rename to dist/unix/menuicons/16x16/apps/qbittorrent.png diff --git a/src/Icons/qbittorrent.png b/dist/unix/menuicons/192x192/apps/qbittorrent.png similarity index 100% rename from src/Icons/qbittorrent.png rename to dist/unix/menuicons/192x192/apps/qbittorrent.png diff --git a/src/menuicons/22x22/apps/qbittorrent.png b/dist/unix/menuicons/22x22/apps/qbittorrent.png similarity index 100% rename from src/menuicons/22x22/apps/qbittorrent.png rename to dist/unix/menuicons/22x22/apps/qbittorrent.png diff --git a/src/menuicons/24x24/apps/qbittorrent.png b/dist/unix/menuicons/24x24/apps/qbittorrent.png similarity index 100% rename from src/menuicons/24x24/apps/qbittorrent.png rename to dist/unix/menuicons/24x24/apps/qbittorrent.png diff --git a/src/menuicons/32x32/apps/qbittorrent.png b/dist/unix/menuicons/32x32/apps/qbittorrent.png similarity index 100% rename from src/menuicons/32x32/apps/qbittorrent.png rename to dist/unix/menuicons/32x32/apps/qbittorrent.png diff --git a/src/menuicons/36x36/apps/qbittorrent.png b/dist/unix/menuicons/36x36/apps/qbittorrent.png similarity index 100% rename from src/menuicons/36x36/apps/qbittorrent.png rename to dist/unix/menuicons/36x36/apps/qbittorrent.png diff --git a/src/menuicons/48x48/apps/qbittorrent.png b/dist/unix/menuicons/48x48/apps/qbittorrent.png similarity index 100% rename from src/menuicons/48x48/apps/qbittorrent.png rename to dist/unix/menuicons/48x48/apps/qbittorrent.png diff --git a/src/menuicons/64x64/apps/qbittorrent.png b/dist/unix/menuicons/64x64/apps/qbittorrent.png similarity index 100% rename from src/menuicons/64x64/apps/qbittorrent.png rename to dist/unix/menuicons/64x64/apps/qbittorrent.png diff --git a/src/menuicons/72x72/apps/qbittorrent.png b/dist/unix/menuicons/72x72/apps/qbittorrent.png similarity index 100% rename from src/menuicons/72x72/apps/qbittorrent.png rename to dist/unix/menuicons/72x72/apps/qbittorrent.png diff --git a/src/menuicons/96x96/apps/qbittorrent.png b/dist/unix/menuicons/96x96/apps/qbittorrent.png similarity index 100% rename from src/menuicons/96x96/apps/qbittorrent.png rename to dist/unix/menuicons/96x96/apps/qbittorrent.png diff --git a/src/windows/README.txt b/dist/windows/README.txt similarity index 95% rename from src/windows/README.txt rename to dist/windows/README.txt index 7cce83eff..d1299df41 100644 --- a/src/windows/README.txt +++ b/dist/windows/README.txt @@ -41,7 +41,7 @@ installer-translations translations qt_ar.qm ... - (all the .qm files found in src/qt-translations in every source release) + (all the .qm files found in dist/qt-translations in every source release) qt_zh_TW.qm installer.nsi license.txt @@ -54,7 +54,7 @@ uninstaller.nsi 5. "license.txt" is a text file that contains the text rendered - from src\gpl.html or the text contained in COPYING + from src\gui\gpl.html or the text contained in COPYING 6. "qbittorrent.exe" is the compiled binary file. SCRIPT HACKERS: diff --git a/src/windows/UAC.nsh b/dist/windows/UAC.nsh similarity index 100% rename from src/windows/UAC.nsh rename to dist/windows/UAC.nsh diff --git a/src/windows/installer-translations/afrikaans.nsi b/dist/windows/installer-translations/afrikaans.nsi similarity index 100% rename from src/windows/installer-translations/afrikaans.nsi rename to dist/windows/installer-translations/afrikaans.nsi diff --git a/src/windows/installer-translations/albanian.nsi b/dist/windows/installer-translations/albanian.nsi similarity index 100% rename from src/windows/installer-translations/albanian.nsi rename to dist/windows/installer-translations/albanian.nsi diff --git a/src/windows/installer-translations/arabic.nsi b/dist/windows/installer-translations/arabic.nsi similarity index 100% rename from src/windows/installer-translations/arabic.nsi rename to dist/windows/installer-translations/arabic.nsi diff --git a/src/windows/installer-translations/basque.nsi b/dist/windows/installer-translations/basque.nsi similarity index 100% rename from src/windows/installer-translations/basque.nsi rename to dist/windows/installer-translations/basque.nsi diff --git a/src/windows/installer-translations/belarusian.nsi b/dist/windows/installer-translations/belarusian.nsi similarity index 100% rename from src/windows/installer-translations/belarusian.nsi rename to dist/windows/installer-translations/belarusian.nsi diff --git a/src/windows/installer-translations/bosnian.nsi b/dist/windows/installer-translations/bosnian.nsi similarity index 100% rename from src/windows/installer-translations/bosnian.nsi rename to dist/windows/installer-translations/bosnian.nsi diff --git a/src/windows/installer-translations/breton.nsi b/dist/windows/installer-translations/breton.nsi similarity index 100% rename from src/windows/installer-translations/breton.nsi rename to dist/windows/installer-translations/breton.nsi diff --git a/src/windows/installer-translations/bulgarian.nsi b/dist/windows/installer-translations/bulgarian.nsi similarity index 100% rename from src/windows/installer-translations/bulgarian.nsi rename to dist/windows/installer-translations/bulgarian.nsi diff --git a/src/windows/installer-translations/catalan.nsi b/dist/windows/installer-translations/catalan.nsi similarity index 100% rename from src/windows/installer-translations/catalan.nsi rename to dist/windows/installer-translations/catalan.nsi diff --git a/src/windows/installer-translations/croatian.nsi b/dist/windows/installer-translations/croatian.nsi similarity index 100% rename from src/windows/installer-translations/croatian.nsi rename to dist/windows/installer-translations/croatian.nsi diff --git a/src/windows/installer-translations/czech.nsi b/dist/windows/installer-translations/czech.nsi similarity index 100% rename from src/windows/installer-translations/czech.nsi rename to dist/windows/installer-translations/czech.nsi diff --git a/src/windows/installer-translations/danish.nsi b/dist/windows/installer-translations/danish.nsi similarity index 100% rename from src/windows/installer-translations/danish.nsi rename to dist/windows/installer-translations/danish.nsi diff --git a/src/windows/installer-translations/dutch.nsi b/dist/windows/installer-translations/dutch.nsi similarity index 100% rename from src/windows/installer-translations/dutch.nsi rename to dist/windows/installer-translations/dutch.nsi diff --git a/src/windows/installer-translations/english.nsi b/dist/windows/installer-translations/english.nsi similarity index 100% rename from src/windows/installer-translations/english.nsi rename to dist/windows/installer-translations/english.nsi diff --git a/src/windows/installer-translations/esperanto.nsi b/dist/windows/installer-translations/esperanto.nsi similarity index 100% rename from src/windows/installer-translations/esperanto.nsi rename to dist/windows/installer-translations/esperanto.nsi diff --git a/src/windows/installer-translations/estonian.nsi b/dist/windows/installer-translations/estonian.nsi similarity index 100% rename from src/windows/installer-translations/estonian.nsi rename to dist/windows/installer-translations/estonian.nsi diff --git a/src/windows/installer-translations/farsi.nsi b/dist/windows/installer-translations/farsi.nsi similarity index 100% rename from src/windows/installer-translations/farsi.nsi rename to dist/windows/installer-translations/farsi.nsi diff --git a/src/windows/installer-translations/finnish.nsi b/dist/windows/installer-translations/finnish.nsi similarity index 100% rename from src/windows/installer-translations/finnish.nsi rename to dist/windows/installer-translations/finnish.nsi diff --git a/src/windows/installer-translations/french.nsi b/dist/windows/installer-translations/french.nsi similarity index 100% rename from src/windows/installer-translations/french.nsi rename to dist/windows/installer-translations/french.nsi diff --git a/src/windows/installer-translations/galician.nsi b/dist/windows/installer-translations/galician.nsi similarity index 100% rename from src/windows/installer-translations/galician.nsi rename to dist/windows/installer-translations/galician.nsi diff --git a/src/windows/installer-translations/german.nsi b/dist/windows/installer-translations/german.nsi similarity index 100% rename from src/windows/installer-translations/german.nsi rename to dist/windows/installer-translations/german.nsi diff --git a/src/windows/installer-translations/greek.nsi b/dist/windows/installer-translations/greek.nsi similarity index 100% rename from src/windows/installer-translations/greek.nsi rename to dist/windows/installer-translations/greek.nsi diff --git a/src/windows/installer-translations/hebrew.nsi b/dist/windows/installer-translations/hebrew.nsi similarity index 100% rename from src/windows/installer-translations/hebrew.nsi rename to dist/windows/installer-translations/hebrew.nsi diff --git a/src/windows/installer-translations/hungarian.nsi b/dist/windows/installer-translations/hungarian.nsi similarity index 100% rename from src/windows/installer-translations/hungarian.nsi rename to dist/windows/installer-translations/hungarian.nsi diff --git a/src/windows/installer-translations/icelandic.nsi b/dist/windows/installer-translations/icelandic.nsi similarity index 100% rename from src/windows/installer-translations/icelandic.nsi rename to dist/windows/installer-translations/icelandic.nsi diff --git a/src/windows/installer-translations/indonesian.nsi b/dist/windows/installer-translations/indonesian.nsi similarity index 100% rename from src/windows/installer-translations/indonesian.nsi rename to dist/windows/installer-translations/indonesian.nsi diff --git a/src/windows/installer-translations/irish.nsi b/dist/windows/installer-translations/irish.nsi similarity index 100% rename from src/windows/installer-translations/irish.nsi rename to dist/windows/installer-translations/irish.nsi diff --git a/src/windows/installer-translations/italian.nsi b/dist/windows/installer-translations/italian.nsi similarity index 100% rename from src/windows/installer-translations/italian.nsi rename to dist/windows/installer-translations/italian.nsi diff --git a/src/windows/installer-translations/japanese.nsi b/dist/windows/installer-translations/japanese.nsi similarity index 100% rename from src/windows/installer-translations/japanese.nsi rename to dist/windows/installer-translations/japanese.nsi diff --git a/src/windows/installer-translations/korean.nsi b/dist/windows/installer-translations/korean.nsi similarity index 100% rename from src/windows/installer-translations/korean.nsi rename to dist/windows/installer-translations/korean.nsi diff --git a/src/windows/installer-translations/kurdish.nsi b/dist/windows/installer-translations/kurdish.nsi similarity index 100% rename from src/windows/installer-translations/kurdish.nsi rename to dist/windows/installer-translations/kurdish.nsi diff --git a/src/windows/installer-translations/latvian.nsi b/dist/windows/installer-translations/latvian.nsi similarity index 100% rename from src/windows/installer-translations/latvian.nsi rename to dist/windows/installer-translations/latvian.nsi diff --git a/src/windows/installer-translations/lithuanian.nsi b/dist/windows/installer-translations/lithuanian.nsi similarity index 100% rename from src/windows/installer-translations/lithuanian.nsi rename to dist/windows/installer-translations/lithuanian.nsi diff --git a/src/windows/installer-translations/luxembourgish.nsi b/dist/windows/installer-translations/luxembourgish.nsi similarity index 100% rename from src/windows/installer-translations/luxembourgish.nsi rename to dist/windows/installer-translations/luxembourgish.nsi diff --git a/src/windows/installer-translations/macedonian.nsi b/dist/windows/installer-translations/macedonian.nsi similarity index 100% rename from src/windows/installer-translations/macedonian.nsi rename to dist/windows/installer-translations/macedonian.nsi diff --git a/src/windows/installer-translations/malay.nsi b/dist/windows/installer-translations/malay.nsi similarity index 100% rename from src/windows/installer-translations/malay.nsi rename to dist/windows/installer-translations/malay.nsi diff --git a/src/windows/installer-translations/mongolian.nsi b/dist/windows/installer-translations/mongolian.nsi similarity index 100% rename from src/windows/installer-translations/mongolian.nsi rename to dist/windows/installer-translations/mongolian.nsi diff --git a/src/windows/installer-translations/norwegian.nsi b/dist/windows/installer-translations/norwegian.nsi similarity index 100% rename from src/windows/installer-translations/norwegian.nsi rename to dist/windows/installer-translations/norwegian.nsi diff --git a/src/windows/installer-translations/norwegiannynorsk.nsi b/dist/windows/installer-translations/norwegiannynorsk.nsi similarity index 100% rename from src/windows/installer-translations/norwegiannynorsk.nsi rename to dist/windows/installer-translations/norwegiannynorsk.nsi diff --git a/src/windows/installer-translations/polish.nsi b/dist/windows/installer-translations/polish.nsi similarity index 100% rename from src/windows/installer-translations/polish.nsi rename to dist/windows/installer-translations/polish.nsi diff --git a/src/windows/installer-translations/portuguese.nsi b/dist/windows/installer-translations/portuguese.nsi similarity index 100% rename from src/windows/installer-translations/portuguese.nsi rename to dist/windows/installer-translations/portuguese.nsi diff --git a/src/windows/installer-translations/portugueseBR.nsi b/dist/windows/installer-translations/portugueseBR.nsi similarity index 100% rename from src/windows/installer-translations/portugueseBR.nsi rename to dist/windows/installer-translations/portugueseBR.nsi diff --git a/src/windows/installer-translations/romanian.nsi b/dist/windows/installer-translations/romanian.nsi similarity index 100% rename from src/windows/installer-translations/romanian.nsi rename to dist/windows/installer-translations/romanian.nsi diff --git a/src/windows/installer-translations/russian.nsi b/dist/windows/installer-translations/russian.nsi similarity index 100% rename from src/windows/installer-translations/russian.nsi rename to dist/windows/installer-translations/russian.nsi diff --git a/src/windows/installer-translations/serbian.nsi b/dist/windows/installer-translations/serbian.nsi similarity index 100% rename from src/windows/installer-translations/serbian.nsi rename to dist/windows/installer-translations/serbian.nsi diff --git a/src/windows/installer-translations/serbianlatin.nsi b/dist/windows/installer-translations/serbianlatin.nsi similarity index 100% rename from src/windows/installer-translations/serbianlatin.nsi rename to dist/windows/installer-translations/serbianlatin.nsi diff --git a/src/windows/installer-translations/simpchinese.nsi b/dist/windows/installer-translations/simpchinese.nsi similarity index 100% rename from src/windows/installer-translations/simpchinese.nsi rename to dist/windows/installer-translations/simpchinese.nsi diff --git a/src/windows/installer-translations/slovak.nsi b/dist/windows/installer-translations/slovak.nsi similarity index 100% rename from src/windows/installer-translations/slovak.nsi rename to dist/windows/installer-translations/slovak.nsi diff --git a/src/windows/installer-translations/slovenian.nsi b/dist/windows/installer-translations/slovenian.nsi similarity index 100% rename from src/windows/installer-translations/slovenian.nsi rename to dist/windows/installer-translations/slovenian.nsi diff --git a/src/windows/installer-translations/spanish.nsi b/dist/windows/installer-translations/spanish.nsi similarity index 100% rename from src/windows/installer-translations/spanish.nsi rename to dist/windows/installer-translations/spanish.nsi diff --git a/src/windows/installer-translations/spanishinternational.nsi b/dist/windows/installer-translations/spanishinternational.nsi similarity index 100% rename from src/windows/installer-translations/spanishinternational.nsi rename to dist/windows/installer-translations/spanishinternational.nsi diff --git a/src/windows/installer-translations/swedish.nsi b/dist/windows/installer-translations/swedish.nsi similarity index 100% rename from src/windows/installer-translations/swedish.nsi rename to dist/windows/installer-translations/swedish.nsi diff --git a/src/windows/installer-translations/thai.nsi b/dist/windows/installer-translations/thai.nsi similarity index 100% rename from src/windows/installer-translations/thai.nsi rename to dist/windows/installer-translations/thai.nsi diff --git a/src/windows/installer-translations/tradchinese.nsi b/dist/windows/installer-translations/tradchinese.nsi similarity index 100% rename from src/windows/installer-translations/tradchinese.nsi rename to dist/windows/installer-translations/tradchinese.nsi diff --git a/src/windows/installer-translations/turkish.nsi b/dist/windows/installer-translations/turkish.nsi similarity index 100% rename from src/windows/installer-translations/turkish.nsi rename to dist/windows/installer-translations/turkish.nsi diff --git a/src/windows/installer-translations/ukrainian.nsi b/dist/windows/installer-translations/ukrainian.nsi similarity index 100% rename from src/windows/installer-translations/ukrainian.nsi rename to dist/windows/installer-translations/ukrainian.nsi diff --git a/src/windows/installer-translations/uzbek.nsi b/dist/windows/installer-translations/uzbek.nsi similarity index 100% rename from src/windows/installer-translations/uzbek.nsi rename to dist/windows/installer-translations/uzbek.nsi diff --git a/src/windows/installer-translations/welsh.nsi b/dist/windows/installer-translations/welsh.nsi similarity index 100% rename from src/windows/installer-translations/welsh.nsi rename to dist/windows/installer-translations/welsh.nsi diff --git a/src/windows/installer.nsi b/dist/windows/installer.nsi similarity index 100% rename from src/windows/installer.nsi rename to dist/windows/installer.nsi diff --git a/src/windows/nsis plugins/FindProc Unicode-source.zip b/dist/windows/nsis plugins/FindProc Unicode-source.zip similarity index 100% rename from src/windows/nsis plugins/FindProc Unicode-source.zip rename to dist/windows/nsis plugins/FindProc Unicode-source.zip diff --git a/src/windows/nsis plugins/FindProcDLL Unicode bin.zip b/dist/windows/nsis plugins/FindProcDLL Unicode bin.zip similarity index 100% rename from src/windows/nsis plugins/FindProcDLL Unicode bin.zip rename to dist/windows/nsis plugins/FindProcDLL Unicode bin.zip diff --git a/src/windows/nsis plugins/UAC Unicode.zip b/dist/windows/nsis plugins/UAC Unicode.zip similarity index 100% rename from src/windows/nsis plugins/UAC Unicode.zip rename to dist/windows/nsis plugins/UAC Unicode.zip diff --git a/src/windows/nsis plugins/UAC.zip b/dist/windows/nsis plugins/UAC.zip similarity index 100% rename from src/windows/nsis plugins/UAC.zip rename to dist/windows/nsis plugins/UAC.zip diff --git a/src/windows/nsis plugins/nsisFirewall.zip b/dist/windows/nsis plugins/nsisFirewall.zip similarity index 100% rename from src/windows/nsis plugins/nsisFirewall.zip rename to dist/windows/nsis plugins/nsisFirewall.zip diff --git a/src/windows/options.nsi b/dist/windows/options.nsi similarity index 100% rename from src/windows/options.nsi rename to dist/windows/options.nsi diff --git a/src/windows/qbittorrent.nsi b/dist/windows/qbittorrent.nsi similarity index 100% rename from src/windows/qbittorrent.nsi rename to dist/windows/qbittorrent.nsi diff --git a/src/windows/qt.conf b/dist/windows/qt.conf similarity index 100% rename from src/windows/qt.conf rename to dist/windows/qt.conf diff --git a/src/windows/translations.nsi b/dist/windows/translations.nsi similarity index 100% rename from src/windows/translations.nsi rename to dist/windows/translations.nsi diff --git a/src/windows/uninstaller.nsi b/dist/windows/uninstaller.nsi similarity index 100% rename from src/windows/uninstaller.nsi rename to dist/windows/uninstaller.nsi diff --git a/macxconf.pri b/macxconf.pri index 653a9ec43..c4261d742 100644 --- a/macxconf.pri +++ b/macxconf.pri @@ -12,46 +12,50 @@ exists($$OUT_PWD/../conf.pri) { LIBS += -framework Carbon -framework IOKit CONFIG += c++11 +QT_LANG_PATH = ../dist/qt-translations +DIST_PATH = ../dist/mac + document_icon.path = Contents/Resources -document_icon.files = mac/qBitTorrentDocument.icns +document_icon.files = $$DIST_PATH/qBitTorrentDocument.icns QMAKE_BUNDLE_DATA += document_icon qt_conf.path = Contents/Resources -qt_conf.files = mac/qt.conf +qt_conf.files = $$DIST_PATH/qt.conf QMAKE_BUNDLE_DATA += qt_conf qt_translations.path = Contents/translations -qt_translations.files = qt-translations/qt_ar.qm \ - qt-translations/qt_bg.qm \ - qt-translations/qt_ca.qm \ - qt-translations/qt_cs.qm \ - qt-translations/qt_da.qm \ - qt-translations/qt_de.qm \ - qt-translations/qt_es.qm \ - qt-translations/qt_fi.qm \ - qt-translations/qt_fr.qm \ - qt-translations/qt_gl.qm \ - qt-translations/qt_he.qm \ - qt-translations/qt_hu.qm \ - qt-translations/qt_it.qm \ - qt-translations/qt_ja.qm \ - qt-translations/qt_ko.qm \ - qt-translations/qt_lt.qm \ - qt-translations/qt_nl.qm \ - qt-translations/qt_pl.qm \ - qt-translations/qt_pt.qm \ - qt-translations/qt_pt_BR.qm \ - qt-translations/qt_ru.qm \ - qt-translations/qt_sk.qm \ - qt-translations/qt_sv.qm \ - qt-translations/qt_tr.qm \ - qt-translations/qt_uk.qm \ - qt-translations/qt_zh_CN.qm \ - qt-translations/qt_zh_TW.qm +qt_translations.files = \ + $$QT_LANG_PATH/qt_ar.qm \ + $$QT_LANG_PATH/qt_bg.qm \ + $$QT_LANG_PATH/qt_ca.qm \ + $$QT_LANG_PATH/qt_cs.qm \ + $$QT_LANG_PATH/qt_da.qm \ + $$QT_LANG_PATH/qt_de.qm \ + $$QT_LANG_PATH/qt_es.qm \ + $$QT_LANG_PATH/qt_fi.qm \ + $$QT_LANG_PATH/qt_fr.qm \ + $$QT_LANG_PATH/qt_gl.qm \ + $$QT_LANG_PATH/qt_he.qm \ + $$QT_LANG_PATH/qt_hu.qm \ + $$QT_LANG_PATH/qt_it.qm \ + $$QT_LANG_PATH/qt_ja.qm \ + $$QT_LANG_PATH/qt_ko.qm \ + $$QT_LANG_PATH/qt_lt.qm \ + $$QT_LANG_PATH/qt_nl.qm \ + $$QT_LANG_PATH/qt_pl.qm \ + $$QT_LANG_PATH/qt_pt.qm \ + $$QT_LANG_PATH/qt_pt_BR.qm \ + $$QT_LANG_PATH/qt_ru.qm \ + $$QT_LANG_PATH/qt_sk.qm \ + $$QT_LANG_PATH/qt_sv.qm \ + $$QT_LANG_PATH/qt_tr.qm \ + $$QT_LANG_PATH/qt_uk.qm \ + $$QT_LANG_PATH/qt_zh_CN.qm \ + $$QT_LANG_PATH/qt_zh_TW.qm QMAKE_BUNDLE_DATA += qt_translations -ICON = mac/qbittorrent_mac.icns -QMAKE_INFO_PLIST = mac/Info.plist +ICON = $$DIST_PATH/qbittorrent_mac.icns +QMAKE_INFO_PLIST = $$DIST_PATH/Info.plist DEFINES += WITH_GEOIP_EMBEDDED message("On Mac OS X, GeoIP database must be embedded.") diff --git a/os2conf.pri b/os2conf.pri index 2e49504e8..b0678d4ff 100644 --- a/os2conf.pri +++ b/os2conf.pri @@ -3,11 +3,12 @@ exists(conf.pri) { include(conf.pri) } -LIBS += -ltorrent-rasterbar \ - -lboost_thread \ - -lboost_system \ - -lboost_filesystem \ - -lssl -lcrypto -lidn -lpthread -lz +LIBS += \ + -ltorrent-rasterbar \ + -lboost_thread \ + -lboost_system \ + -lboost_filesystem \ + -lssl -lcrypto -lidn -lpthread -lz RC_FILE = qbittorrent_os2.rc diff --git a/qbittorrent.qc b/qbittorrent.qc deleted file mode 100644 index 6f10673f4..000000000 --- a/qbittorrent.qc +++ /dev/null @@ -1,25 +0,0 @@ - - qbittorrent - qbittorrent.pro - qcm - - - - - - - - - - - - - - - - - - - - - diff --git a/src/app/app.pri b/src/app/app.pri new file mode 100644 index 000000000..6ffe7be19 --- /dev/null +++ b/src/app/app.pri @@ -0,0 +1,40 @@ +INCLUDEPATH += $$PWD + +usesystemqtsingleapplication { + nogui { + CONFIG += qtsinglecoreapplication + } else { + CONFIG += qtsingleapplication + } +} else { + nogui { + include(qtsingleapplication/qtsinglecoreapplication.pri) + } else { + include(qtsingleapplication/qtsingleapplication.pri) + } +} + +!nogui { + macx { + HEADERS += $$PWD/qmacapplication.h + SOURCES += $$PWD/qmacapplication.cpp + } + HEADERS += $$PWD/sessionapplication.h + SOURCES += $$PWD/sessionapplication.cpp +} + +HEADERS += $$PWD/application.h +SOURCES += $$PWD/application.cpp + +nogui: HEADERS += $$PWD/headlessloader.h + +unix: HEADERS += $$PWD/stacktrace.h +strace_win { + HEADERS += $$PWD/stacktrace_win.h + !nogui { + HEADERS += $$PWD/stacktrace_win_dlg.h + FORMS += $$PWD/stacktrace_win_dlg.ui + } +} + +SOURCES += $$PWD/main.cpp diff --git a/src/application.cpp b/src/app/application.cpp similarity index 100% rename from src/application.cpp rename to src/app/application.cpp diff --git a/src/application.h b/src/app/application.h similarity index 100% rename from src/application.h rename to src/app/application.h diff --git a/src/headlessloader.h b/src/app/headlessloader.h similarity index 100% rename from src/headlessloader.h rename to src/app/headlessloader.h diff --git a/src/main.cpp b/src/app/main.cpp similarity index 99% rename from src/main.cpp rename to src/app/main.cpp index b26a6f1e9..2ddde2853 100644 --- a/src/main.cpp +++ b/src/app/main.cpp @@ -404,7 +404,7 @@ void sigabrtHandler(int) #ifndef DISABLE_GUI void showSplashScreen() { - QPixmap splash_img(":/Icons/skin/splash.png"); + QPixmap splash_img(":/icons/skin/splash.png"); QPainter painter(&splash_img); QString version = VERSION; painter.setPen(QPen(Qt::white)); diff --git a/src/qmacapplication.cpp b/src/app/qmacapplication.cpp similarity index 100% rename from src/qmacapplication.cpp rename to src/app/qmacapplication.cpp diff --git a/src/qmacapplication.h b/src/app/qmacapplication.h similarity index 100% rename from src/qmacapplication.h rename to src/app/qmacapplication.h diff --git a/src/qtsingleapp/QtLockedFile b/src/app/qtsingleapplication/QtLockedFile similarity index 100% rename from src/qtsingleapp/QtLockedFile rename to src/app/qtsingleapplication/QtLockedFile diff --git a/src/qtsingleapp/QtSingleApplication b/src/app/qtsingleapplication/QtSingleApplication similarity index 100% rename from src/qtsingleapp/QtSingleApplication rename to src/app/qtsingleapplication/QtSingleApplication diff --git a/src/qtsingleapp/qtlocalpeer.cpp b/src/app/qtsingleapplication/qtlocalpeer.cpp similarity index 100% rename from src/qtsingleapp/qtlocalpeer.cpp rename to src/app/qtsingleapplication/qtlocalpeer.cpp diff --git a/src/qtsingleapp/qtlocalpeer.h b/src/app/qtsingleapplication/qtlocalpeer.h similarity index 100% rename from src/qtsingleapp/qtlocalpeer.h rename to src/app/qtsingleapplication/qtlocalpeer.h diff --git a/src/qtsingleapp/qtlockedfile.cpp b/src/app/qtsingleapplication/qtlockedfile.cpp similarity index 100% rename from src/qtsingleapp/qtlockedfile.cpp rename to src/app/qtsingleapplication/qtlockedfile.cpp diff --git a/src/qtsingleapp/qtlockedfile.h b/src/app/qtsingleapplication/qtlockedfile.h similarity index 100% rename from src/qtsingleapp/qtlockedfile.h rename to src/app/qtsingleapplication/qtlockedfile.h diff --git a/src/qtsingleapp/qtlockedfile_unix.cpp b/src/app/qtsingleapplication/qtlockedfile_unix.cpp similarity index 100% rename from src/qtsingleapp/qtlockedfile_unix.cpp rename to src/app/qtsingleapplication/qtlockedfile_unix.cpp diff --git a/src/qtsingleapp/qtlockedfile_win.cpp b/src/app/qtsingleapplication/qtlockedfile_win.cpp similarity index 100% rename from src/qtsingleapp/qtlockedfile_win.cpp rename to src/app/qtsingleapplication/qtlockedfile_win.cpp diff --git a/src/qtsingleapp/qtsingleapplication.cpp b/src/app/qtsingleapplication/qtsingleapplication.cpp similarity index 100% rename from src/qtsingleapp/qtsingleapplication.cpp rename to src/app/qtsingleapplication/qtsingleapplication.cpp diff --git a/src/qtsingleapp/qtsingleapplication.h b/src/app/qtsingleapplication/qtsingleapplication.h similarity index 100% rename from src/qtsingleapp/qtsingleapplication.h rename to src/app/qtsingleapplication/qtsingleapplication.h diff --git a/src/qtsingleapp/qtsingleapplication.pri b/src/app/qtsingleapplication/qtsingleapplication.pri similarity index 100% rename from src/qtsingleapp/qtsingleapplication.pri rename to src/app/qtsingleapplication/qtsingleapplication.pri diff --git a/src/qtsingleapp/qtsinglecoreapplication.cpp b/src/app/qtsingleapplication/qtsinglecoreapplication.cpp similarity index 100% rename from src/qtsingleapp/qtsinglecoreapplication.cpp rename to src/app/qtsingleapplication/qtsinglecoreapplication.cpp diff --git a/src/qtsingleapp/qtsinglecoreapplication.h b/src/app/qtsingleapplication/qtsinglecoreapplication.h similarity index 100% rename from src/qtsingleapp/qtsinglecoreapplication.h rename to src/app/qtsingleapplication/qtsinglecoreapplication.h diff --git a/src/qtsingleapp/qtsinglecoreapplication.pri b/src/app/qtsingleapplication/qtsinglecoreapplication.pri similarity index 100% rename from src/qtsingleapp/qtsinglecoreapplication.pri rename to src/app/qtsingleapplication/qtsinglecoreapplication.pri diff --git a/src/sessionapplication.cpp b/src/app/sessionapplication.cpp similarity index 100% rename from src/sessionapplication.cpp rename to src/app/sessionapplication.cpp diff --git a/src/sessionapplication.h b/src/app/sessionapplication.h similarity index 100% rename from src/sessionapplication.h rename to src/app/sessionapplication.h diff --git a/src/stacktrace.h b/src/app/stacktrace.h similarity index 100% rename from src/stacktrace.h rename to src/app/stacktrace.h diff --git a/src/stacktrace_win.h b/src/app/stacktrace_win.h similarity index 100% rename from src/stacktrace_win.h rename to src/app/stacktrace_win.h diff --git a/src/stacktrace_win_dlg.h b/src/app/stacktrace_win_dlg.h similarity index 100% rename from src/stacktrace_win_dlg.h rename to src/app/stacktrace_win_dlg.h diff --git a/src/stacktrace_win_dlg.ui b/src/app/stacktrace_win_dlg.ui similarity index 100% rename from src/stacktrace_win_dlg.ui rename to src/app/stacktrace_win_dlg.ui diff --git a/src/core/core.pri b/src/core/core.pri new file mode 100644 index 000000000..006e147b3 --- /dev/null +++ b/src/core/core.pri @@ -0,0 +1,35 @@ +INCLUDEPATH += $$PWD + +unix:!macx:dbus: include(qtnotify/qtnotify.pri) + +include(qtlibtorrent/qtlibtorrent.pri) +include(tracker/tracker.pri) + +HEADERS += \ + $$PWD/misc.h \ + $$PWD/fs_utils.h \ + $$PWD/downloadthread.h \ + $$PWD/torrentpersistentdata.h \ + $$PWD/filesystemwatcher.h \ + $$PWD/scannedfoldersmodel.h \ + $$PWD/qinisettings.h \ + $$PWD/smtp.h \ + $$PWD/dnsupdater.h \ + $$PWD/logger.h \ + $$PWD/httptypes.h \ + $$PWD/httprequestparser.h \ + $$PWD/httpresponsegenerator.h \ + $$PWD/preferences.h + +SOURCES += \ + $$PWD/downloadthread.cpp \ + $$PWD/scannedfoldersmodel.cpp \ + $$PWD/torrentpersistentdata.cpp \ + $$PWD/misc.cpp \ + $$PWD/fs_utils.cpp \ + $$PWD/smtp.cpp \ + $$PWD/dnsupdater.cpp \ + $$PWD/logger.cpp \ + $$PWD/httprequestparser.cpp \ + $$PWD/httpresponsegenerator.cpp \ + $$PWD/preferences.cpp diff --git a/src/dnsupdater.cpp b/src/core/dnsupdater.cpp similarity index 100% rename from src/dnsupdater.cpp rename to src/core/dnsupdater.cpp diff --git a/src/dnsupdater.h b/src/core/dnsupdater.h similarity index 100% rename from src/dnsupdater.h rename to src/core/dnsupdater.h diff --git a/src/downloadthread.cpp b/src/core/downloadthread.cpp similarity index 100% rename from src/downloadthread.cpp rename to src/core/downloadthread.cpp diff --git a/src/downloadthread.h b/src/core/downloadthread.h similarity index 100% rename from src/downloadthread.h rename to src/core/downloadthread.h diff --git a/src/filesystemwatcher.h b/src/core/filesystemwatcher.h similarity index 100% rename from src/filesystemwatcher.h rename to src/core/filesystemwatcher.h diff --git a/src/fs_utils.cpp b/src/core/fs_utils.cpp similarity index 100% rename from src/fs_utils.cpp rename to src/core/fs_utils.cpp diff --git a/src/fs_utils.h b/src/core/fs_utils.h similarity index 100% rename from src/fs_utils.h rename to src/core/fs_utils.h diff --git a/src/webui/httprequestparser.cpp b/src/core/httprequestparser.cpp similarity index 100% rename from src/webui/httprequestparser.cpp rename to src/core/httprequestparser.cpp diff --git a/src/webui/httprequestparser.h b/src/core/httprequestparser.h similarity index 100% rename from src/webui/httprequestparser.h rename to src/core/httprequestparser.h diff --git a/src/webui/httpresponsegenerator.cpp b/src/core/httpresponsegenerator.cpp similarity index 100% rename from src/webui/httpresponsegenerator.cpp rename to src/core/httpresponsegenerator.cpp diff --git a/src/webui/httpresponsegenerator.h b/src/core/httpresponsegenerator.h similarity index 100% rename from src/webui/httpresponsegenerator.h rename to src/core/httpresponsegenerator.h diff --git a/src/webui/httptypes.h b/src/core/httptypes.h similarity index 100% rename from src/webui/httptypes.h rename to src/core/httptypes.h diff --git a/src/logger.cpp b/src/core/logger.cpp similarity index 100% rename from src/logger.cpp rename to src/core/logger.cpp diff --git a/src/logger.h b/src/core/logger.h similarity index 100% rename from src/logger.h rename to src/core/logger.h diff --git a/src/misc.cpp b/src/core/misc.cpp similarity index 100% rename from src/misc.cpp rename to src/core/misc.cpp diff --git a/src/misc.h b/src/core/misc.h similarity index 100% rename from src/misc.h rename to src/core/misc.h diff --git a/src/preferences/preferences.cpp b/src/core/preferences.cpp similarity index 100% rename from src/preferences/preferences.cpp rename to src/core/preferences.cpp diff --git a/src/preferences/preferences.h b/src/core/preferences.h old mode 100755 new mode 100644 similarity index 100% rename from src/preferences/preferences.h rename to src/core/preferences.h diff --git a/src/qinisettings.h b/src/core/qinisettings.h similarity index 100% rename from src/qinisettings.h rename to src/core/qinisettings.h diff --git a/src/qtlibtorrent/alertdispatcher.cpp b/src/core/qtlibtorrent/alertdispatcher.cpp similarity index 100% rename from src/qtlibtorrent/alertdispatcher.cpp rename to src/core/qtlibtorrent/alertdispatcher.cpp diff --git a/src/qtlibtorrent/alertdispatcher.h b/src/core/qtlibtorrent/alertdispatcher.h similarity index 100% rename from src/qtlibtorrent/alertdispatcher.h rename to src/core/qtlibtorrent/alertdispatcher.h diff --git a/src/qtlibtorrent/bandwidthscheduler.h b/src/core/qtlibtorrent/bandwidthscheduler.h similarity index 100% rename from src/qtlibtorrent/bandwidthscheduler.h rename to src/core/qtlibtorrent/bandwidthscheduler.h diff --git a/src/qtlibtorrent/filterparserthread.cpp b/src/core/qtlibtorrent/filterparserthread.cpp similarity index 100% rename from src/qtlibtorrent/filterparserthread.cpp rename to src/core/qtlibtorrent/filterparserthread.cpp diff --git a/src/qtlibtorrent/filterparserthread.h b/src/core/qtlibtorrent/filterparserthread.h similarity index 100% rename from src/qtlibtorrent/filterparserthread.h rename to src/core/qtlibtorrent/filterparserthread.h diff --git a/src/qtlibtorrent/qbtsession.cpp b/src/core/qtlibtorrent/qbtsession.cpp old mode 100755 new mode 100644 similarity index 100% rename from src/qtlibtorrent/qbtsession.cpp rename to src/core/qtlibtorrent/qbtsession.cpp diff --git a/src/qtlibtorrent/qbtsession.h b/src/core/qtlibtorrent/qbtsession.h old mode 100755 new mode 100644 similarity index 100% rename from src/qtlibtorrent/qbtsession.h rename to src/core/qtlibtorrent/qbtsession.h diff --git a/src/qtlibtorrent/qtlibtorrent.pri b/src/core/qtlibtorrent/qtlibtorrent.pri similarity index 100% rename from src/qtlibtorrent/qtlibtorrent.pri rename to src/core/qtlibtorrent/qtlibtorrent.pri diff --git a/src/qtlibtorrent/qtorrenthandle.cpp b/src/core/qtlibtorrent/qtorrenthandle.cpp similarity index 100% rename from src/qtlibtorrent/qtorrenthandle.cpp rename to src/core/qtlibtorrent/qtorrenthandle.cpp diff --git a/src/qtlibtorrent/qtorrenthandle.h b/src/core/qtlibtorrent/qtorrenthandle.h similarity index 100% rename from src/qtlibtorrent/qtorrenthandle.h rename to src/core/qtlibtorrent/qtorrenthandle.h diff --git a/src/qtlibtorrent/shutdownconfirm.cpp b/src/core/qtlibtorrent/shutdownconfirm.cpp similarity index 100% rename from src/qtlibtorrent/shutdownconfirm.cpp rename to src/core/qtlibtorrent/shutdownconfirm.cpp diff --git a/src/qtlibtorrent/shutdownconfirm.h b/src/core/qtlibtorrent/shutdownconfirm.h similarity index 100% rename from src/qtlibtorrent/shutdownconfirm.h rename to src/core/qtlibtorrent/shutdownconfirm.h diff --git a/src/qtlibtorrent/torrentmodel.cpp b/src/core/qtlibtorrent/torrentmodel.cpp similarity index 97% rename from src/qtlibtorrent/torrentmodel.cpp rename to src/core/qtlibtorrent/torrentmodel.cpp index 5df8298bc..25973828a 100644 --- a/src/qtlibtorrent/torrentmodel.cpp +++ b/src/core/qtlibtorrent/torrentmodel.cpp @@ -41,42 +41,42 @@ using namespace libtorrent; namespace { QIcon get_paused_icon() { - static QIcon cached = QIcon(":/Icons/skin/paused.png"); + static QIcon cached = QIcon(":/icons/skin/paused.png"); return cached; } QIcon get_queued_icon() { - static QIcon cached = QIcon(":/Icons/skin/queued.png"); + static QIcon cached = QIcon(":/icons/skin/queued.png"); return cached; } QIcon get_downloading_icon() { - static QIcon cached = QIcon(":/Icons/skin/downloading.png"); + static QIcon cached = QIcon(":/icons/skin/downloading.png"); return cached; } QIcon get_stalled_downloading_icon() { - static QIcon cached = QIcon(":/Icons/skin/stalledDL.png"); + static QIcon cached = QIcon(":/icons/skin/stalledDL.png"); return cached; } QIcon get_uploading_icon() { - static QIcon cached = QIcon(":/Icons/skin/uploading.png"); + static QIcon cached = QIcon(":/icons/skin/uploading.png"); return cached; } QIcon get_stalled_uploading_icon() { - static QIcon cached = QIcon(":/Icons/skin/stalledUP.png"); + static QIcon cached = QIcon(":/icons/skin/stalledUP.png"); return cached; } QIcon get_checking_icon() { - static QIcon cached = QIcon(":/Icons/skin/checking.png"); + static QIcon cached = QIcon(":/icons/skin/checking.png"); return cached; } QIcon get_error_icon() { - static QIcon cached = QIcon(":/Icons/skin/error.png"); + static QIcon cached = QIcon(":/icons/skin/error.png"); return cached; } } diff --git a/src/qtlibtorrent/torrentmodel.h b/src/core/qtlibtorrent/torrentmodel.h similarity index 100% rename from src/qtlibtorrent/torrentmodel.h rename to src/core/qtlibtorrent/torrentmodel.h diff --git a/src/qtlibtorrent/torrentspeedmonitor.cpp b/src/core/qtlibtorrent/torrentspeedmonitor.cpp similarity index 100% rename from src/qtlibtorrent/torrentspeedmonitor.cpp rename to src/core/qtlibtorrent/torrentspeedmonitor.cpp diff --git a/src/qtlibtorrent/torrentspeedmonitor.h b/src/core/qtlibtorrent/torrentspeedmonitor.h similarity index 100% rename from src/qtlibtorrent/torrentspeedmonitor.h rename to src/core/qtlibtorrent/torrentspeedmonitor.h diff --git a/src/qtlibtorrent/torrentstatistics.cpp b/src/core/qtlibtorrent/torrentstatistics.cpp similarity index 100% rename from src/qtlibtorrent/torrentstatistics.cpp rename to src/core/qtlibtorrent/torrentstatistics.cpp diff --git a/src/qtlibtorrent/torrentstatistics.h b/src/core/qtlibtorrent/torrentstatistics.h similarity index 100% rename from src/qtlibtorrent/torrentstatistics.h rename to src/core/qtlibtorrent/torrentstatistics.h diff --git a/src/qtlibtorrent/trackerinfos.h b/src/core/qtlibtorrent/trackerinfos.h similarity index 100% rename from src/qtlibtorrent/trackerinfos.h rename to src/core/qtlibtorrent/trackerinfos.h diff --git a/src/qtnotify/notifications.cpp b/src/core/qtnotify/notifications.cpp similarity index 100% rename from src/qtnotify/notifications.cpp rename to src/core/qtnotify/notifications.cpp diff --git a/src/qtnotify/notifications.h b/src/core/qtnotify/notifications.h similarity index 100% rename from src/qtnotify/notifications.h rename to src/core/qtnotify/notifications.h diff --git a/src/qtnotify/notifications.xml b/src/core/qtnotify/notifications.xml similarity index 100% rename from src/qtnotify/notifications.xml rename to src/core/qtnotify/notifications.xml diff --git a/src/qtnotify/qtnotify.pri b/src/core/qtnotify/qtnotify.pri similarity index 100% rename from src/qtnotify/qtnotify.pri rename to src/core/qtnotify/qtnotify.pri diff --git a/src/scannedfoldersmodel.cpp b/src/core/scannedfoldersmodel.cpp similarity index 100% rename from src/scannedfoldersmodel.cpp rename to src/core/scannedfoldersmodel.cpp diff --git a/src/scannedfoldersmodel.h b/src/core/scannedfoldersmodel.h similarity index 100% rename from src/scannedfoldersmodel.h rename to src/core/scannedfoldersmodel.h diff --git a/src/smtp.cpp b/src/core/smtp.cpp similarity index 100% rename from src/smtp.cpp rename to src/core/smtp.cpp diff --git a/src/smtp.h b/src/core/smtp.h similarity index 100% rename from src/smtp.h rename to src/core/smtp.h diff --git a/src/torrentpersistentdata.cpp b/src/core/torrentpersistentdata.cpp similarity index 100% rename from src/torrentpersistentdata.cpp rename to src/core/torrentpersistentdata.cpp diff --git a/src/torrentpersistentdata.h b/src/core/torrentpersistentdata.h similarity index 100% rename from src/torrentpersistentdata.h rename to src/core/torrentpersistentdata.h diff --git a/src/tracker/qpeer.h b/src/core/tracker/qpeer.h similarity index 100% rename from src/tracker/qpeer.h rename to src/core/tracker/qpeer.h diff --git a/src/tracker/qtracker.cpp b/src/core/tracker/qtracker.cpp similarity index 100% rename from src/tracker/qtracker.cpp rename to src/core/tracker/qtracker.cpp diff --git a/src/tracker/qtracker.h b/src/core/tracker/qtracker.h similarity index 100% rename from src/tracker/qtracker.h rename to src/core/tracker/qtracker.h diff --git a/src/tracker/tracker.pri b/src/core/tracker/tracker.pri similarity index 100% rename from src/tracker/tracker.pri rename to src/core/tracker/tracker.pri diff --git a/src/tracker/trackerannouncerequest.h b/src/core/tracker/trackerannouncerequest.h similarity index 100% rename from src/tracker/trackerannouncerequest.h rename to src/core/tracker/trackerannouncerequest.h diff --git a/src/about.qrc b/src/gui/about.qrc similarity index 100% rename from src/about.qrc rename to src/gui/about.qrc diff --git a/src/about.ui b/src/gui/about.ui similarity index 99% rename from src/about.ui rename to src/gui/about.ui index b08cf2a1b..8dd7d07d3 100644 --- a/src/about.ui +++ b/src/gui/about.ui @@ -89,7 +89,7 @@ - :/Icons/skin/mascot.png + :/icons/skin/mascot.png diff --git a/src/about_imp.h b/src/gui/about_imp.h similarity index 99% rename from src/about_imp.h rename to src/gui/about_imp.h index 4990f528a..3972e5c09 100644 --- a/src/about_imp.h +++ b/src/gui/about_imp.h @@ -67,7 +67,7 @@ class about : public QDialog, private Ui::AboutDlg{ "

"); lb_about->setText(aboutText); // Set icons - logo->setPixmap(QPixmap(QString::fromUtf8(":/Icons/skin/qbittorrent22.png"))); + logo->setPixmap(QPixmap(QString::fromUtf8(":/icons/skin/qbittorrent22.png"))); //Title lb_name->setText(QString::fromUtf8("

qBittorrent")+QString::fromUtf8(" " VERSION"

")); // Thanks diff --git a/src/addnewtorrentdialog.cpp b/src/gui/addnewtorrentdialog.cpp similarity index 100% rename from src/addnewtorrentdialog.cpp rename to src/gui/addnewtorrentdialog.cpp diff --git a/src/addnewtorrentdialog.h b/src/gui/addnewtorrentdialog.h similarity index 100% rename from src/addnewtorrentdialog.h rename to src/gui/addnewtorrentdialog.h diff --git a/src/addnewtorrentdialog.ui b/src/gui/addnewtorrentdialog.ui similarity index 100% rename from src/addnewtorrentdialog.ui rename to src/gui/addnewtorrentdialog.ui diff --git a/src/preferences/advancedsettings.h b/src/gui/advancedsettings.h similarity index 100% rename from src/preferences/advancedsettings.h rename to src/gui/advancedsettings.h diff --git a/src/autoexpandabledialog.cpp b/src/gui/autoexpandabledialog.cpp similarity index 100% rename from src/autoexpandabledialog.cpp rename to src/gui/autoexpandabledialog.cpp diff --git a/src/autoexpandabledialog.h b/src/gui/autoexpandabledialog.h similarity index 100% rename from src/autoexpandabledialog.h rename to src/gui/autoexpandabledialog.h diff --git a/src/autoexpandabledialog.ui b/src/gui/autoexpandabledialog.ui similarity index 100% rename from src/autoexpandabledialog.ui rename to src/gui/autoexpandabledialog.ui diff --git a/src/bandwidth_limit.ui b/src/gui/bandwidth_limit.ui similarity index 100% rename from src/bandwidth_limit.ui rename to src/gui/bandwidth_limit.ui diff --git a/src/confirmdeletiondlg.ui b/src/gui/confirmdeletiondlg.ui similarity index 100% rename from src/confirmdeletiondlg.ui rename to src/gui/confirmdeletiondlg.ui diff --git a/src/deletionconfirmationdlg.h b/src/gui/deletionconfirmationdlg.h similarity index 100% rename from src/deletionconfirmationdlg.h rename to src/gui/deletionconfirmationdlg.h diff --git a/src/downloadfromurldlg.h b/src/gui/downloadfromurldlg.h similarity index 100% rename from src/downloadfromurldlg.h rename to src/gui/downloadfromurldlg.h diff --git a/src/downloadfromurldlg.ui b/src/gui/downloadfromurldlg.ui similarity index 100% rename from src/downloadfromurldlg.ui rename to src/gui/downloadfromurldlg.ui diff --git a/src/executionlog.cpp b/src/gui/executionlog.cpp similarity index 100% rename from src/executionlog.cpp rename to src/gui/executionlog.cpp diff --git a/src/executionlog.h b/src/gui/executionlog.h similarity index 100% rename from src/executionlog.h rename to src/gui/executionlog.h diff --git a/src/executionlog.ui b/src/gui/executionlog.ui similarity index 100% rename from src/executionlog.ui rename to src/gui/executionlog.ui diff --git a/src/gui/geoip/GeoIP.dat b/src/gui/geoip/GeoIP.dat new file mode 100644 index 000000000..44eb02eb7 Binary files /dev/null and b/src/gui/geoip/GeoIP.dat differ diff --git a/src/geoip/README b/src/gui/geoip/README similarity index 100% rename from src/geoip/README rename to src/gui/geoip/README diff --git a/src/geoip/geoip.pri b/src/gui/geoip/geoip.pri similarity index 100% rename from src/geoip/geoip.pri rename to src/gui/geoip/geoip.pri diff --git a/src/geoip/geoip.qrc b/src/gui/geoip/geoip.qrc similarity index 100% rename from src/geoip/geoip.qrc rename to src/gui/geoip/geoip.qrc diff --git a/src/geoip/geoipmanager.cpp b/src/gui/geoip/geoipmanager.cpp similarity index 99% rename from src/geoip/geoipmanager.cpp rename to src/gui/geoip/geoipmanager.cpp index 6b970d52c..1e0c58c55 100644 --- a/src/geoip/geoipmanager.cpp +++ b/src/gui/geoip/geoipmanager.cpp @@ -198,6 +198,6 @@ QString GeoIPManager::CountryISOCodeToName(const char* iso) { QIcon GeoIPManager::CountryISOCodeToIcon(const char* iso) { if (iso[0] == 0 || iso[0] == '!') return QIcon(); const QString isoStr = QString(QByteArray(iso, 2)).toLower(); - return QIcon(":/Icons/flags/"+isoStr+".png"); + return QIcon(":/icons/flags/"+isoStr+".png"); } diff --git a/src/geoip/geoipmanager.h b/src/gui/geoip/geoipmanager.h similarity index 100% rename from src/geoip/geoipmanager.h rename to src/gui/geoip/geoipmanager.h diff --git a/src/gpl.html b/src/gui/gpl.html similarity index 100% rename from src/gpl.html rename to src/gui/gpl.html diff --git a/src/gui/gui.pri b/src/gui/gui.pri new file mode 100644 index 000000000..b297435d2 --- /dev/null +++ b/src/gui/gui.pri @@ -0,0 +1,96 @@ +INCLUDEPATH += $$PWD + +include(lineedit/lineedit.pri) +include(properties/properties.pri) +include(searchengine/searchengine.pri) +include(rss/rss.pri) +include(torrentcreator/torrentcreator.pri) +include(geoip/geoip.pri) +include(powermanagement/powermanagement.pri) + +HEADERS += \ + $$PWD/mainwindow.h \ + $$PWD/transferlistwidget.h \ + $$PWD/transferlistdelegate.h \ + $$PWD/transferlistfilterswidget.h \ + $$PWD/transferlistsortmodel.h \ + $$PWD/torrentcontentmodel.h \ + $$PWD/torrentcontentmodelitem.h \ + $$PWD/torrentcontentmodelfolder.h \ + $$PWD/torrentcontentmodelfile.h \ + $$PWD/torrentcontentfiltermodel.h \ + $$PWD/torrentcontenttreeview.h \ + $$PWD/deletionconfirmationdlg.h \ + $$PWD/statusbar.h \ + $$PWD/reverseresolution.h \ + $$PWD/ico.h \ + $$PWD/speedlimitdlg.h \ + $$PWD/about_imp.h \ + $$PWD/previewselect.h \ + $$PWD/previewlistdelegate.h \ + $$PWD/downloadfromurldlg.h \ + $$PWD/trackerlogin.h \ + $$PWD/hidabletabwidget.h \ + $$PWD/torrentimportdlg.h \ + $$PWD/executionlog.h \ + $$PWD/iconprovider.h \ + $$PWD/updownratiodlg.h \ + $$PWD/loglistwidget.h \ + $$PWD/addnewtorrentdialog.h \ + $$PWD/autoexpandabledialog.h \ + $$PWD/statsdialog.h \ + $$PWD/messageboxraised.h \ + $$PWD/torrentfilterenum.h \ + $$PWD/options_imp.h \ + $$PWD/advancedsettings.h + +SOURCES += \ + $$PWD/mainwindow.cpp \ + $$PWD/ico.cpp \ + $$PWD/transferlistwidget.cpp \ + $$PWD/transferlistsortmodel.cpp \ + $$PWD/transferlistdelegate.cpp \ + $$PWD/transferlistfilterswidget.cpp \ + $$PWD/torrentcontentmodel.cpp \ + $$PWD/torrentcontentmodelitem.cpp \ + $$PWD/torrentcontentmodelfolder.cpp \ + $$PWD/torrentcontentmodelfile.cpp \ + $$PWD/torrentcontentfiltermodel.cpp \ + $$PWD/torrentcontenttreeview.cpp \ + $$PWD/torrentimportdlg.cpp \ + $$PWD/executionlog.cpp \ + $$PWD/speedlimitdlg.cpp \ + $$PWD/previewselect.cpp \ + $$PWD/iconprovider.cpp \ + $$PWD/updownratiodlg.cpp \ + $$PWD/loglistwidget.cpp \ + $$PWD/addnewtorrentdialog.cpp \ + $$PWD/autoexpandabledialog.cpp \ + $$PWD/statsdialog.cpp \ + $$PWD/messageboxraised.cpp \ + $$PWD/statusbar.cpp \ + $$PWD/trackerlogin.cpp \ + $$PWD/options_imp.cpp + +win32|macx { + HEADERS += $$PWD/programupdater.h + SOURCES += $$PWD/programupdater.cpp +} + +FORMS += \ + $$PWD/mainwindow.ui \ + $$PWD/about.ui \ + $$PWD/preview.ui \ + $$PWD/login.ui \ + $$PWD/downloadfromurldlg.ui \ + $$PWD/bandwidth_limit.ui \ + $$PWD/updownratiodlg.ui \ + $$PWD/confirmdeletiondlg.ui \ + $$PWD/torrentimportdlg.ui \ + $$PWD/executionlog.ui \ + $$PWD/addnewtorrentdialog.ui \ + $$PWD/autoexpandabledialog.ui \ + $$PWD/statsdialog.ui \ + $$PWD/options.ui + +RESOURCES += $$PWD/about.qrc diff --git a/src/hidabletabwidget.h b/src/gui/hidabletabwidget.h similarity index 100% rename from src/hidabletabwidget.h rename to src/gui/hidabletabwidget.h diff --git a/src/ico.cpp b/src/gui/ico.cpp similarity index 100% rename from src/ico.cpp rename to src/gui/ico.cpp diff --git a/src/ico.h b/src/gui/ico.h similarity index 100% rename from src/ico.h rename to src/gui/ico.h diff --git a/src/iconprovider.cpp b/src/gui/iconprovider.cpp similarity index 94% rename from src/iconprovider.cpp rename to src/gui/iconprovider.cpp index a26cb44f5..2213993a4 100644 --- a/src/iconprovider.cpp +++ b/src/gui/iconprovider.cpp @@ -64,12 +64,12 @@ QIcon IconProvider::getIcon(const QString &iconId) { #if (defined(Q_OS_UNIX) && !defined(Q_OS_MAC)) if (m_useSystemTheme) { - QIcon icon = QIcon::fromTheme(iconId, QIcon(":/Icons/oxygen/"+iconId+".png")); + QIcon icon = QIcon::fromTheme(iconId, QIcon(":/icons/oxygen/"+iconId+".png")); icon = generateDifferentSizes(icon); return icon; } #endif - return QIcon(":/Icons/oxygen/"+iconId+".png"); + return QIcon(":/icons/oxygen/"+iconId+".png"); } #if (defined(Q_OS_UNIX) && !defined(Q_OS_MAC)) @@ -112,12 +112,12 @@ QString IconProvider::getIconPath(const QString& iconId) QString path = QDir::temp().absoluteFilePath(iconId+".png"); if (!QFile::exists(path)) { const QIcon icon = QIcon::fromTheme(iconId); - if (icon.isNull()) return ":/Icons/oxygen/"+iconId+".png"; + if (icon.isNull()) return ":/icons/oxygen/"+iconId+".png"; QPixmap px = icon.pixmap(32); px.save(path); } return path; } #endif - return ":/Icons/oxygen/"+iconId+".png"; + return ":/icons/oxygen/"+iconId+".png"; } diff --git a/src/iconprovider.h b/src/gui/iconprovider.h similarity index 100% rename from src/iconprovider.h rename to src/gui/iconprovider.h diff --git a/src/lineedit/lineedit.pri b/src/gui/lineedit/lineedit.pri similarity index 100% rename from src/lineedit/lineedit.pri rename to src/gui/lineedit/lineedit.pri diff --git a/src/lineedit/resources/lineeditimages.qrc b/src/gui/lineedit/resources/lineeditimages.qrc similarity index 100% rename from src/lineedit/resources/lineeditimages.qrc rename to src/gui/lineedit/resources/lineeditimages.qrc diff --git a/src/lineedit/resources/lineeditimages/clear_left.png b/src/gui/lineedit/resources/lineeditimages/clear_left.png similarity index 100% rename from src/lineedit/resources/lineeditimages/clear_left.png rename to src/gui/lineedit/resources/lineeditimages/clear_left.png diff --git a/src/lineedit/resources/lineeditimages/search.png b/src/gui/lineedit/resources/lineeditimages/search.png similarity index 100% rename from src/lineedit/resources/lineeditimages/search.png rename to src/gui/lineedit/resources/lineeditimages/search.png diff --git a/src/lineedit/src/lineedit.cpp b/src/gui/lineedit/src/lineedit.cpp similarity index 100% rename from src/lineedit/src/lineedit.cpp rename to src/gui/lineedit/src/lineedit.cpp diff --git a/src/lineedit/src/lineedit.h b/src/gui/lineedit/src/lineedit.h similarity index 100% rename from src/lineedit/src/lineedit.h rename to src/gui/lineedit/src/lineedit.h diff --git a/src/login.ui b/src/gui/login.ui similarity index 100% rename from src/login.ui rename to src/gui/login.ui diff --git a/src/loglistwidget.cpp b/src/gui/loglistwidget.cpp similarity index 100% rename from src/loglistwidget.cpp rename to src/gui/loglistwidget.cpp diff --git a/src/loglistwidget.h b/src/gui/loglistwidget.h similarity index 100% rename from src/loglistwidget.h rename to src/gui/loglistwidget.h diff --git a/src/mainwindow.cpp b/src/gui/mainwindow.cpp old mode 100755 new mode 100644 similarity index 98% rename from src/mainwindow.cpp rename to src/gui/mainwindow.cpp index d0300fe3f..40aa3bedd --- a/src/mainwindow.cpp +++ b/src/gui/mainwindow.cpp @@ -120,19 +120,19 @@ MainWindow::MainWindow(QWidget *parent, const QStringList& torrentCmdLine): QMai // Setting icons #if (defined(Q_OS_UNIX) && !defined(Q_OS_MAC)) if (Preferences::instance()->useSystemIconTheme()) - setWindowIcon(QIcon::fromTheme("qbittorrent", QIcon(QString::fromUtf8(":/Icons/skin/qbittorrent32.png")))); + setWindowIcon(QIcon::fromTheme("qbittorrent", QIcon(QString::fromUtf8(":/icons/skin/qbittorrent32.png")))); else #endif - setWindowIcon(QIcon(QString::fromUtf8(":/Icons/skin/qbittorrent32.png"))); + setWindowIcon(QIcon(QString::fromUtf8(":/icons/skin/qbittorrent32.png"))); addToolbarContextMenu(); actionOpen->setIcon(IconProvider::instance()->getIcon("list-add")); actionDownload_from_URL->setIcon(IconProvider::instance()->getIcon("insert-link")); - actionSet_upload_limit->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/seeding.png"))); - actionSet_download_limit->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/download.png"))); - actionSet_global_upload_limit->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/seeding.png"))); - actionSet_global_download_limit->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/download.png"))); + actionSet_upload_limit->setIcon(QIcon(QString::fromUtf8(":/icons/skin/seeding.png"))); + actionSet_download_limit->setIcon(QIcon(QString::fromUtf8(":/icons/skin/download.png"))); + actionSet_global_upload_limit->setIcon(QIcon(QString::fromUtf8(":/icons/skin/seeding.png"))); + actionSet_global_download_limit->setIcon(QIcon(QString::fromUtf8(":/icons/skin/download.png"))); actionCreate_torrent->setIcon(IconProvider::instance()->getIcon("document-edit")); actionAbout->setIcon(IconProvider::instance()->getIcon("help-about")); actionStatistics->setIcon(IconProvider::instance()->getIcon("view-statistics")); @@ -1311,10 +1311,10 @@ void MainWindow::updateGUI() html += "qBittorrent"; html += ""; html += "
"; - html += " " + tr("DL speed: %1 KiB/s", "e.g: Download speed: 10 KiB/s").arg(misc::accurateDoubleToString(QBtSession::instance()->getPayloadDownloadRate() / 1024., 1)); + html += " " + tr("DL speed: %1 KiB/s", "e.g: Download speed: 10 KiB/s").arg(misc::accurateDoubleToString(QBtSession::instance()->getPayloadDownloadRate() / 1024., 1)); html += "
"; html += "
"; - html += " " + tr("UP speed: %1 KiB/s", "e.g: Upload speed: 10 KiB/s").arg(misc::accurateDoubleToString(QBtSession::instance()->getPayloadUploadRate() / 1024., 1)); + html += " " + tr("UP speed: %1 KiB/s", "e.g: Upload speed: 10 KiB/s").arg(misc::accurateDoubleToString(QBtSession::instance()->getPayloadUploadRate() / 1024., 1)); html += "
"; #else // OSes such as Windows do not support html here @@ -1653,9 +1653,9 @@ QIcon MainWindow::getSystrayIcon() const TrayIcon::Style style = Preferences::instance()->trayIconStyle(); switch(style) { case TrayIcon::MONO_DARK: - return QIcon(":/Icons/skin/qbittorrent_mono_dark.png"); + return QIcon(":/icons/skin/qbittorrent_mono_dark.png"); case TrayIcon::MONO_LIGHT: - return QIcon(":/Icons/skin/qbittorrent_mono_light.png"); + return QIcon(":/icons/skin/qbittorrent_mono_light.png"); default: break; } @@ -1667,9 +1667,9 @@ QIcon MainWindow::getSystrayIcon() const #endif if (icon.isNull()) { - icon.addFile(":/Icons/skin/qbittorrent22.png", QSize(22, 22)); - icon.addFile(":/Icons/skin/qbittorrent16.png", QSize(16, 16)); - icon.addFile(":/Icons/skin/qbittorrent32.png", QSize(32, 32)); + icon.addFile(":/icons/skin/qbittorrent22.png", QSize(22, 22)); + icon.addFile(":/icons/skin/qbittorrent16.png", QSize(16, 16)); + icon.addFile(":/icons/skin/qbittorrent32.png", QSize(32, 32)); } return icon; } diff --git a/src/mainwindow.h b/src/gui/mainwindow.h similarity index 100% rename from src/mainwindow.h rename to src/gui/mainwindow.h diff --git a/src/mainwindow.ui b/src/gui/mainwindow.ui similarity index 99% rename from src/mainwindow.ui rename to src/gui/mainwindow.ui index 358976a8a..76e98190b 100644 --- a/src/mainwindow.ui +++ b/src/gui/mainwindow.ui @@ -197,7 +197,7 @@ - :/Icons/skin/qbittorrent32.png:/Icons/skin/qbittorrent32.png + :/icons/skin/qbittorrent32.png:/icons/skin/qbittorrent32.png Visit &Website diff --git a/src/messageboxraised.cpp b/src/gui/messageboxraised.cpp similarity index 100% rename from src/messageboxraised.cpp rename to src/gui/messageboxraised.cpp diff --git a/src/messageboxraised.h b/src/gui/messageboxraised.h similarity index 100% rename from src/messageboxraised.h rename to src/gui/messageboxraised.h diff --git a/src/preferences/options.ui b/src/gui/options.ui old mode 100755 new mode 100644 similarity index 99% rename from src/preferences/options.ui rename to src/gui/options.ui index 7247112c4..1b50886af --- a/src/preferences/options.ui +++ b/src/gui/options.ui @@ -1555,7 +1555,7 @@ - :/Icons/slow_off.png + :/icons/slow_off.png @@ -1707,7 +1707,7 @@ - :/Icons/slow.png + :/icons/slow.png false diff --git a/src/preferences/options_imp.cpp b/src/gui/options_imp.cpp old mode 100755 new mode 100644 similarity index 99% rename from src/preferences/options_imp.cpp rename to src/gui/options_imp.cpp index d0db28536..18f394ff4 --- a/src/preferences/options_imp.cpp +++ b/src/gui/options_imp.cpp @@ -275,7 +275,7 @@ void options_imp::initializeLanguageCombo() localeStr.chop(3); // Remove ".qm" QLocale locale(localeStr); QString language_name = languageToLocalizedString(locale); - comboI18n->addItem(/*QIcon(":/Icons/flags/"+country+".png"), */language_name, localeStr); + comboI18n->addItem(/*QIcon(":/icons/flags/"+country+".png"), */language_name, localeStr); qDebug() << "Supported locale:" << localeStr; } } @@ -1327,10 +1327,10 @@ void options_imp::setSslKey(const QByteArray &key, bool interactive) { #ifndef QT_NO_OPENSSL if (!key.isEmpty() && !QSslKey(key, QSsl::Rsa).isNull()) { - lblSslKeyStatus->setPixmap(QPixmap(":/Icons/oxygen/security-high.png").scaledToHeight(20, Qt::SmoothTransformation)); + lblSslKeyStatus->setPixmap(QPixmap(":/icons/oxygen/security-high.png").scaledToHeight(20, Qt::SmoothTransformation)); m_sslKey = key; } else { - lblSslKeyStatus->setPixmap(QPixmap(":/Icons/oxygen/security-low.png").scaledToHeight(20, Qt::SmoothTransformation)); + lblSslKeyStatus->setPixmap(QPixmap(":/icons/oxygen/security-low.png").scaledToHeight(20, Qt::SmoothTransformation)); m_sslKey.clear(); if (interactive) QMessageBox::warning(this, tr("Invalid key"), tr("This is not a valid SSL key.")); @@ -1342,10 +1342,10 @@ void options_imp::setSslCertificate(const QByteArray &cert, bool interactive) { #ifndef QT_NO_OPENSSL if (!cert.isEmpty() && !QSslCertificate(cert).isNull()) { - lblSslCertStatus->setPixmap(QPixmap(":/Icons/oxygen/security-high.png").scaledToHeight(20, Qt::SmoothTransformation)); + lblSslCertStatus->setPixmap(QPixmap(":/icons/oxygen/security-high.png").scaledToHeight(20, Qt::SmoothTransformation)); m_sslCert = cert; } else { - lblSslCertStatus->setPixmap(QPixmap(":/Icons/oxygen/security-low.png").scaledToHeight(20, Qt::SmoothTransformation)); + lblSslCertStatus->setPixmap(QPixmap(":/icons/oxygen/security-low.png").scaledToHeight(20, Qt::SmoothTransformation)); m_sslCert.clear(); if (interactive) QMessageBox::warning(this, tr("Invalid certificate"), tr("This is not a valid SSL certificate.")); diff --git a/src/preferences/options_imp.h b/src/gui/options_imp.h old mode 100755 new mode 100644 similarity index 100% rename from src/preferences/options_imp.h rename to src/gui/options_imp.h diff --git a/src/powermanagement/powermanagement.cpp b/src/gui/powermanagement/powermanagement.cpp similarity index 100% rename from src/powermanagement/powermanagement.cpp rename to src/gui/powermanagement/powermanagement.cpp diff --git a/src/powermanagement/powermanagement.h b/src/gui/powermanagement/powermanagement.h similarity index 100% rename from src/powermanagement/powermanagement.h rename to src/gui/powermanagement/powermanagement.h diff --git a/src/powermanagement/powermanagement.pri b/src/gui/powermanagement/powermanagement.pri similarity index 100% rename from src/powermanagement/powermanagement.pri rename to src/gui/powermanagement/powermanagement.pri diff --git a/src/powermanagement/powermanagement_x11.cpp b/src/gui/powermanagement/powermanagement_x11.cpp similarity index 100% rename from src/powermanagement/powermanagement_x11.cpp rename to src/gui/powermanagement/powermanagement_x11.cpp diff --git a/src/powermanagement/powermanagement_x11.h b/src/gui/powermanagement/powermanagement_x11.h similarity index 100% rename from src/powermanagement/powermanagement_x11.h rename to src/gui/powermanagement/powermanagement_x11.h diff --git a/src/preview.ui b/src/gui/preview.ui similarity index 100% rename from src/preview.ui rename to src/gui/preview.ui diff --git a/src/previewlistdelegate.h b/src/gui/previewlistdelegate.h similarity index 100% rename from src/previewlistdelegate.h rename to src/gui/previewlistdelegate.h diff --git a/src/previewselect.cpp b/src/gui/previewselect.cpp similarity index 100% rename from src/previewselect.cpp rename to src/gui/previewselect.cpp diff --git a/src/previewselect.h b/src/gui/previewselect.h similarity index 100% rename from src/previewselect.h rename to src/gui/previewselect.h diff --git a/src/programupdater.cpp b/src/gui/programupdater.cpp similarity index 100% rename from src/programupdater.cpp rename to src/gui/programupdater.cpp diff --git a/src/programupdater.h b/src/gui/programupdater.h similarity index 100% rename from src/programupdater.h rename to src/gui/programupdater.h diff --git a/src/properties/downloadedpiecesbar.cpp b/src/gui/properties/downloadedpiecesbar.cpp similarity index 100% rename from src/properties/downloadedpiecesbar.cpp rename to src/gui/properties/downloadedpiecesbar.cpp diff --git a/src/properties/downloadedpiecesbar.h b/src/gui/properties/downloadedpiecesbar.h similarity index 100% rename from src/properties/downloadedpiecesbar.h rename to src/gui/properties/downloadedpiecesbar.h diff --git a/src/properties/peer.ui b/src/gui/properties/peer.ui similarity index 100% rename from src/properties/peer.ui rename to src/gui/properties/peer.ui diff --git a/src/properties/peeraddition.h b/src/gui/properties/peeraddition.h similarity index 100% rename from src/properties/peeraddition.h rename to src/gui/properties/peeraddition.h diff --git a/src/properties/peerlistdelegate.h b/src/gui/properties/peerlistdelegate.h similarity index 100% rename from src/properties/peerlistdelegate.h rename to src/gui/properties/peerlistdelegate.h diff --git a/src/properties/peerlistsortmodel.h b/src/gui/properties/peerlistsortmodel.h similarity index 100% rename from src/properties/peerlistsortmodel.h rename to src/gui/properties/peerlistsortmodel.h diff --git a/src/properties/peerlistwidget.cpp b/src/gui/properties/peerlistwidget.cpp similarity index 99% rename from src/properties/peerlistwidget.cpp rename to src/gui/properties/peerlistwidget.cpp index a1ad8d5c2..69ebfd355 100644 --- a/src/properties/peerlistwidget.cpp +++ b/src/gui/properties/peerlistwidget.cpp @@ -178,8 +178,8 @@ void PeerListWidget::showPeerListMenu(const QPoint&) copyPeerAct = menu.addAction(IconProvider::instance()->getIcon("edit-copy"), tr("Copy selected")); menu.addSeparator(); #if LIBTORRENT_VERSION_NUM < 10000 - dlLimitAct = menu.addAction(QIcon(":/Icons/skin/download.png"), tr("Limit download rate...")); - upLimitAct = menu.addAction(QIcon(":/Icons/skin/seeding.png"), tr("Limit upload rate...")); + dlLimitAct = menu.addAction(QIcon(":/icons/skin/download.png"), tr("Limit download rate...")); + upLimitAct = menu.addAction(QIcon(":/icons/skin/seeding.png"), tr("Limit upload rate...")); menu.addSeparator(); #endif banAct = menu.addAction(IconProvider::instance()->getIcon("user-group-delete"), tr("Ban peer permanently")); diff --git a/src/properties/peerlistwidget.h b/src/gui/properties/peerlistwidget.h similarity index 100% rename from src/properties/peerlistwidget.h rename to src/gui/properties/peerlistwidget.h diff --git a/src/properties/pieceavailabilitybar.cpp b/src/gui/properties/pieceavailabilitybar.cpp similarity index 100% rename from src/properties/pieceavailabilitybar.cpp rename to src/gui/properties/pieceavailabilitybar.cpp diff --git a/src/properties/pieceavailabilitybar.h b/src/gui/properties/pieceavailabilitybar.h similarity index 100% rename from src/properties/pieceavailabilitybar.h rename to src/gui/properties/pieceavailabilitybar.h diff --git a/src/properties/properties.pri b/src/gui/properties/properties.pri similarity index 100% rename from src/properties/properties.pri rename to src/gui/properties/properties.pri diff --git a/src/properties/propertieswidget.cpp b/src/gui/properties/propertieswidget.cpp similarity index 100% rename from src/properties/propertieswidget.cpp rename to src/gui/properties/propertieswidget.cpp diff --git a/src/properties/propertieswidget.h b/src/gui/properties/propertieswidget.h similarity index 100% rename from src/properties/propertieswidget.h rename to src/gui/properties/propertieswidget.h diff --git a/src/properties/propertieswidget.ui b/src/gui/properties/propertieswidget.ui similarity index 100% rename from src/properties/propertieswidget.ui rename to src/gui/properties/propertieswidget.ui diff --git a/src/properties/proplistdelegate.h b/src/gui/properties/proplistdelegate.h similarity index 100% rename from src/properties/proplistdelegate.h rename to src/gui/properties/proplistdelegate.h diff --git a/src/properties/proptabbar.cpp b/src/gui/properties/proptabbar.cpp similarity index 100% rename from src/properties/proptabbar.cpp rename to src/gui/properties/proptabbar.cpp diff --git a/src/properties/proptabbar.h b/src/gui/properties/proptabbar.h similarity index 100% rename from src/properties/proptabbar.h rename to src/gui/properties/proptabbar.h diff --git a/src/properties/trackerlist.cpp b/src/gui/properties/trackerlist.cpp similarity index 100% rename from src/properties/trackerlist.cpp rename to src/gui/properties/trackerlist.cpp diff --git a/src/properties/trackerlist.h b/src/gui/properties/trackerlist.h similarity index 100% rename from src/properties/trackerlist.h rename to src/gui/properties/trackerlist.h diff --git a/src/properties/trackersadditiondlg.h b/src/gui/properties/trackersadditiondlg.h similarity index 100% rename from src/properties/trackersadditiondlg.h rename to src/gui/properties/trackersadditiondlg.h diff --git a/src/properties/trackersadditiondlg.ui b/src/gui/properties/trackersadditiondlg.ui similarity index 100% rename from src/properties/trackersadditiondlg.ui rename to src/gui/properties/trackersadditiondlg.ui diff --git a/src/reverseresolution.h b/src/gui/reverseresolution.h similarity index 100% rename from src/reverseresolution.h rename to src/gui/reverseresolution.h diff --git a/src/rss/automatedrssdownloader.cpp b/src/gui/rss/automatedrssdownloader.cpp similarity index 100% rename from src/rss/automatedrssdownloader.cpp rename to src/gui/rss/automatedrssdownloader.cpp diff --git a/src/rss/automatedrssdownloader.h b/src/gui/rss/automatedrssdownloader.h similarity index 100% rename from src/rss/automatedrssdownloader.h rename to src/gui/rss/automatedrssdownloader.h diff --git a/src/rss/automatedrssdownloader.ui b/src/gui/rss/automatedrssdownloader.ui similarity index 99% rename from src/rss/automatedrssdownloader.ui rename to src/gui/rss/automatedrssdownloader.ui index 4a10460de..41ce6742c 100644 --- a/src/rss/automatedrssdownloader.ui +++ b/src/gui/rss/automatedrssdownloader.ui @@ -331,7 +331,7 @@ - + @@ -395,7 +395,7 @@ - + diff --git a/src/rss/cookiesdlg.cpp b/src/gui/rss/cookiesdlg.cpp similarity index 100% rename from src/rss/cookiesdlg.cpp rename to src/gui/rss/cookiesdlg.cpp diff --git a/src/rss/cookiesdlg.h b/src/gui/rss/cookiesdlg.h similarity index 100% rename from src/rss/cookiesdlg.h rename to src/gui/rss/cookiesdlg.h diff --git a/src/rss/cookiesdlg.ui b/src/gui/rss/cookiesdlg.ui similarity index 100% rename from src/rss/cookiesdlg.ui rename to src/gui/rss/cookiesdlg.ui diff --git a/src/rss/feedlistwidget.cpp b/src/gui/rss/feedlistwidget.cpp similarity index 100% rename from src/rss/feedlistwidget.cpp rename to src/gui/rss/feedlistwidget.cpp diff --git a/src/rss/feedlistwidget.h b/src/gui/rss/feedlistwidget.h similarity index 100% rename from src/rss/feedlistwidget.h rename to src/gui/rss/feedlistwidget.h diff --git a/src/rss/htmlbrowser.cpp b/src/gui/rss/htmlbrowser.cpp similarity index 100% rename from src/rss/htmlbrowser.cpp rename to src/gui/rss/htmlbrowser.cpp diff --git a/src/rss/htmlbrowser.h b/src/gui/rss/htmlbrowser.h similarity index 100% rename from src/rss/htmlbrowser.h rename to src/gui/rss/htmlbrowser.h diff --git a/src/rss/rss.pri b/src/gui/rss/rss.pri similarity index 100% rename from src/rss/rss.pri rename to src/gui/rss/rss.pri diff --git a/src/rss/rss.ui b/src/gui/rss/rss.ui similarity index 100% rename from src/rss/rss.ui rename to src/gui/rss/rss.ui diff --git a/src/rss/rss_imp.cpp b/src/gui/rss/rss_imp.cpp similarity index 98% rename from src/rss/rss_imp.cpp rename to src/gui/rss/rss_imp.cpp index 38d3d5e24..f99a6e52b 100644 --- a/src/rss/rss_imp.cpp +++ b/src/gui/rss/rss_imp.cpp @@ -327,7 +327,7 @@ void RSSImp::saveFoldersOpenState() void RSSImp::refreshAllFeeds() { foreach (QTreeWidgetItem* item, m_feedList->getAllFeedItems()) - item->setData(0, Qt::DecorationRole, QVariant(QIcon(":/Icons/loading.png"))); + item->setData(0, Qt::DecorationRole, QVariant(QIcon(":/icons/loading.png"))); m_rssManager->refresh(); } @@ -417,12 +417,12 @@ void RSSImp::refreshSelectedItems() continue; // Update UI if (qSharedPointerDynamicCast(file)) { - item->setData(0, Qt::DecorationRole, QVariant(QIcon(":/Icons/loading.png"))); + item->setData(0, Qt::DecorationRole, QVariant(QIcon(":/icons/loading.png"))); } else if (qSharedPointerDynamicCast(file)) { // Update feeds in the folder foreach (QTreeWidgetItem *feed, m_feedList->getAllFeedItems(item)) - feed->setData(0, Qt::DecorationRole, QVariant(QIcon(":/Icons/loading.png"))); + feed->setData(0, Qt::DecorationRole, QVariant(QIcon(":/icons/loading.png"))); } } } @@ -497,11 +497,11 @@ QListWidgetItem* RSSImp::createArticleListItem(const RssArticlePtr& article) item->setData(Article::IdRole, article->guid()); if (article->isRead()) { item->setData(Article::ColorRole, QVariant(QColor("grey"))); - item->setData(Article::IconRole, QVariant(QIcon(":/Icons/sphere.png"))); + item->setData(Article::IconRole, QVariant(QIcon(":/icons/sphere.png"))); } else { item->setData(Article::ColorRole, QVariant(QColor("blue"))); - item->setData(Article::IconRole, QVariant(QIcon(":/Icons/sphere2.png"))); + item->setData(Article::IconRole, QVariant(QIcon(":/icons/sphere2.png"))); } return item; @@ -604,7 +604,7 @@ void RSSImp::refreshTextBrowser() textBrowser->setHtml(html); article->markAsRead(); item->setData(Article::ColorRole, QVariant(QColor("grey"))); - item->setData(Article::IconRole, QVariant(QIcon(":/Icons/sphere.png"))); + item->setData(Article::IconRole, QVariant(QIcon(":/icons/sphere.png"))); // Decrement feed nb unread news updateItemInfos(m_feedList->stickyUnreadItem()); updateItemInfos(m_feedList->getTreeItemFromUrl(item->data(Article::FeedUrlRole).toString())); diff --git a/src/rss/rss_imp.h b/src/gui/rss/rss_imp.h similarity index 100% rename from src/rss/rss_imp.h rename to src/gui/rss/rss_imp.h diff --git a/src/rss/rssarticle.cpp b/src/gui/rss/rssarticle.cpp similarity index 100% rename from src/rss/rssarticle.cpp rename to src/gui/rss/rssarticle.cpp diff --git a/src/rss/rssarticle.h b/src/gui/rss/rssarticle.h similarity index 100% rename from src/rss/rssarticle.h rename to src/gui/rss/rssarticle.h diff --git a/src/rss/rssdownloadrule.cpp b/src/gui/rss/rssdownloadrule.cpp similarity index 100% rename from src/rss/rssdownloadrule.cpp rename to src/gui/rss/rssdownloadrule.cpp diff --git a/src/rss/rssdownloadrule.h b/src/gui/rss/rssdownloadrule.h similarity index 100% rename from src/rss/rssdownloadrule.h rename to src/gui/rss/rssdownloadrule.h diff --git a/src/rss/rssdownloadrulelist.cpp b/src/gui/rss/rssdownloadrulelist.cpp similarity index 100% rename from src/rss/rssdownloadrulelist.cpp rename to src/gui/rss/rssdownloadrulelist.cpp diff --git a/src/rss/rssdownloadrulelist.h b/src/gui/rss/rssdownloadrulelist.h similarity index 100% rename from src/rss/rssdownloadrulelist.h rename to src/gui/rss/rssdownloadrulelist.h diff --git a/src/rss/rssfeed.cpp b/src/gui/rss/rssfeed.cpp similarity index 99% rename from src/rss/rssfeed.cpp rename to src/gui/rss/rssfeed.cpp index a33215fe9..63b23e92f 100644 --- a/src/rss/rssfeed.cpp +++ b/src/gui/rss/rssfeed.cpp @@ -52,7 +52,7 @@ RssFeed::RssFeed(RssManager* manager, RssFolder* parent, const QString& url): m_manager(manager), m_parent(parent), m_url (QUrl::fromEncoded(url.toUtf8()).toString()), - m_icon(":/Icons/oxygen/application-rss+xml.png"), + m_icon(":/icons/oxygen/application-rss+xml.png"), m_unreadCount(0), m_dirty(false), m_inErrorState(false), @@ -232,7 +232,7 @@ QString RssFeed::url() const QIcon RssFeed::icon() const { if (m_inErrorState) - return QIcon(":/Icons/oxygen/unavailable.png"); + return QIcon(":/icons/oxygen/unavailable.png"); return QIcon(m_icon); } diff --git a/src/rss/rssfeed.h b/src/gui/rss/rssfeed.h similarity index 100% rename from src/rss/rssfeed.h rename to src/gui/rss/rssfeed.h diff --git a/src/rss/rssfile.cpp b/src/gui/rss/rssfile.cpp similarity index 100% rename from src/rss/rssfile.cpp rename to src/gui/rss/rssfile.cpp diff --git a/src/rss/rssfile.h b/src/gui/rss/rssfile.h similarity index 100% rename from src/rss/rssfile.h rename to src/gui/rss/rssfile.h diff --git a/src/rss/rssfolder.cpp b/src/gui/rss/rssfolder.cpp similarity index 100% rename from src/rss/rssfolder.cpp rename to src/gui/rss/rssfolder.cpp diff --git a/src/rss/rssfolder.h b/src/gui/rss/rssfolder.h similarity index 100% rename from src/rss/rssfolder.h rename to src/gui/rss/rssfolder.h diff --git a/src/rss/rssmanager.cpp b/src/gui/rss/rssmanager.cpp similarity index 100% rename from src/rss/rssmanager.cpp rename to src/gui/rss/rssmanager.cpp diff --git a/src/rss/rssmanager.h b/src/gui/rss/rssmanager.h similarity index 100% rename from src/rss/rssmanager.h rename to src/gui/rss/rssmanager.h diff --git a/src/rss/rssparser.cpp b/src/gui/rss/rssparser.cpp similarity index 100% rename from src/rss/rssparser.cpp rename to src/gui/rss/rssparser.cpp diff --git a/src/rss/rssparser.h b/src/gui/rss/rssparser.h similarity index 100% rename from src/rss/rssparser.h rename to src/gui/rss/rssparser.h diff --git a/src/rss/rsssettingsdlg.cpp b/src/gui/rss/rsssettingsdlg.cpp similarity index 100% rename from src/rss/rsssettingsdlg.cpp rename to src/gui/rss/rsssettingsdlg.cpp diff --git a/src/rss/rsssettingsdlg.h b/src/gui/rss/rsssettingsdlg.h similarity index 100% rename from src/rss/rsssettingsdlg.h rename to src/gui/rss/rsssettingsdlg.h diff --git a/src/rss/rsssettingsdlg.ui b/src/gui/rss/rsssettingsdlg.ui similarity index 98% rename from src/rss/rsssettingsdlg.ui rename to src/gui/rss/rsssettingsdlg.ui index 956685e39..a6e39f45e 100644 --- a/src/rss/rsssettingsdlg.ui +++ b/src/gui/rss/rsssettingsdlg.ui @@ -34,7 +34,7 @@ - :/Icons/oxygen/application-rss+xml.png + :/icons/oxygen/application-rss+xml.png true diff --git a/src/searchengine/engineselect.ui b/src/gui/searchengine/engineselect.ui similarity index 100% rename from src/searchengine/engineselect.ui rename to src/gui/searchengine/engineselect.ui diff --git a/src/searchengine/engineselectdlg.cpp b/src/gui/searchengine/engineselectdlg.cpp similarity index 100% rename from src/searchengine/engineselectdlg.cpp rename to src/gui/searchengine/engineselectdlg.cpp diff --git a/src/searchengine/engineselectdlg.h b/src/gui/searchengine/engineselectdlg.h similarity index 100% rename from src/searchengine/engineselectdlg.h rename to src/gui/searchengine/engineselectdlg.h diff --git a/src/searchengine/nova/__init__.py b/src/gui/searchengine/nova/__init__.py similarity index 100% rename from src/searchengine/nova/__init__.py rename to src/gui/searchengine/nova/__init__.py diff --git a/src/searchengine/nova/engines/__init__.py b/src/gui/searchengine/nova/engines/__init__.py similarity index 100% rename from src/searchengine/nova/engines/__init__.py rename to src/gui/searchengine/nova/engines/__init__.py diff --git a/src/searchengine/nova/engines/btdigg.png b/src/gui/searchengine/nova/engines/btdigg.png similarity index 100% rename from src/searchengine/nova/engines/btdigg.png rename to src/gui/searchengine/nova/engines/btdigg.png diff --git a/src/searchengine/nova/engines/btdigg.py b/src/gui/searchengine/nova/engines/btdigg.py similarity index 100% rename from src/searchengine/nova/engines/btdigg.py rename to src/gui/searchengine/nova/engines/btdigg.py diff --git a/src/searchengine/nova/engines/extratorrent.png b/src/gui/searchengine/nova/engines/extratorrent.png similarity index 100% rename from src/searchengine/nova/engines/extratorrent.png rename to src/gui/searchengine/nova/engines/extratorrent.png diff --git a/src/searchengine/nova/engines/extratorrent.py b/src/gui/searchengine/nova/engines/extratorrent.py old mode 100755 new mode 100644 similarity index 100% rename from src/searchengine/nova/engines/extratorrent.py rename to src/gui/searchengine/nova/engines/extratorrent.py diff --git a/src/searchengine/nova/engines/kickasstorrents.png b/src/gui/searchengine/nova/engines/kickasstorrents.png similarity index 100% rename from src/searchengine/nova/engines/kickasstorrents.png rename to src/gui/searchengine/nova/engines/kickasstorrents.png diff --git a/src/searchengine/nova/engines/kickasstorrents.py b/src/gui/searchengine/nova/engines/kickasstorrents.py old mode 100755 new mode 100644 similarity index 100% rename from src/searchengine/nova/engines/kickasstorrents.py rename to src/gui/searchengine/nova/engines/kickasstorrents.py diff --git a/src/searchengine/nova/engines/legittorrents.png b/src/gui/searchengine/nova/engines/legittorrents.png similarity index 100% rename from src/searchengine/nova/engines/legittorrents.png rename to src/gui/searchengine/nova/engines/legittorrents.png diff --git a/src/searchengine/nova/engines/legittorrents.py b/src/gui/searchengine/nova/engines/legittorrents.py similarity index 100% rename from src/searchengine/nova/engines/legittorrents.py rename to src/gui/searchengine/nova/engines/legittorrents.py diff --git a/src/searchengine/nova/engines/mininova.png b/src/gui/searchengine/nova/engines/mininova.png similarity index 100% rename from src/searchengine/nova/engines/mininova.png rename to src/gui/searchengine/nova/engines/mininova.png diff --git a/src/searchengine/nova/engines/mininova.py b/src/gui/searchengine/nova/engines/mininova.py similarity index 100% rename from src/searchengine/nova/engines/mininova.py rename to src/gui/searchengine/nova/engines/mininova.py diff --git a/src/searchengine/nova/engines/piratebay.png b/src/gui/searchengine/nova/engines/piratebay.png similarity index 100% rename from src/searchengine/nova/engines/piratebay.png rename to src/gui/searchengine/nova/engines/piratebay.png diff --git a/src/searchengine/nova/engines/piratebay.py b/src/gui/searchengine/nova/engines/piratebay.py similarity index 100% rename from src/searchengine/nova/engines/piratebay.py rename to src/gui/searchengine/nova/engines/piratebay.py diff --git a/src/searchengine/nova/engines/torrentreactor.png b/src/gui/searchengine/nova/engines/torrentreactor.png similarity index 100% rename from src/searchengine/nova/engines/torrentreactor.png rename to src/gui/searchengine/nova/engines/torrentreactor.png diff --git a/src/searchengine/nova/engines/torrentreactor.py b/src/gui/searchengine/nova/engines/torrentreactor.py similarity index 100% rename from src/searchengine/nova/engines/torrentreactor.py rename to src/gui/searchengine/nova/engines/torrentreactor.py diff --git a/src/searchengine/nova/engines/versions.txt b/src/gui/searchengine/nova/engines/versions.txt similarity index 100% rename from src/searchengine/nova/engines/versions.txt rename to src/gui/searchengine/nova/engines/versions.txt diff --git a/src/searchengine/nova/fix_encoding.py b/src/gui/searchengine/nova/fix_encoding.py similarity index 100% rename from src/searchengine/nova/fix_encoding.py rename to src/gui/searchengine/nova/fix_encoding.py diff --git a/src/searchengine/nova/helpers.py b/src/gui/searchengine/nova/helpers.py similarity index 100% rename from src/searchengine/nova/helpers.py rename to src/gui/searchengine/nova/helpers.py diff --git a/src/searchengine/nova/nova2.py b/src/gui/searchengine/nova/nova2.py old mode 100755 new mode 100644 similarity index 100% rename from src/searchengine/nova/nova2.py rename to src/gui/searchengine/nova/nova2.py diff --git a/src/searchengine/nova/nova2dl.py b/src/gui/searchengine/nova/nova2dl.py old mode 100755 new mode 100644 similarity index 100% rename from src/searchengine/nova/nova2dl.py rename to src/gui/searchengine/nova/nova2dl.py diff --git a/src/searchengine/nova/novaprinter.py b/src/gui/searchengine/nova/novaprinter.py similarity index 100% rename from src/searchengine/nova/novaprinter.py rename to src/gui/searchengine/nova/novaprinter.py diff --git a/src/searchengine/nova/socks.py b/src/gui/searchengine/nova/socks.py similarity index 100% rename from src/searchengine/nova/socks.py rename to src/gui/searchengine/nova/socks.py diff --git a/src/searchengine/nova3/__init__.py b/src/gui/searchengine/nova3/__init__.py similarity index 100% rename from src/searchengine/nova3/__init__.py rename to src/gui/searchengine/nova3/__init__.py diff --git a/src/searchengine/nova3/engines/__init__.py b/src/gui/searchengine/nova3/engines/__init__.py similarity index 100% rename from src/searchengine/nova3/engines/__init__.py rename to src/gui/searchengine/nova3/engines/__init__.py diff --git a/src/searchengine/nova3/engines/btdigg.png b/src/gui/searchengine/nova3/engines/btdigg.png similarity index 100% rename from src/searchengine/nova3/engines/btdigg.png rename to src/gui/searchengine/nova3/engines/btdigg.png diff --git a/src/searchengine/nova3/engines/btdigg.py b/src/gui/searchengine/nova3/engines/btdigg.py similarity index 100% rename from src/searchengine/nova3/engines/btdigg.py rename to src/gui/searchengine/nova3/engines/btdigg.py diff --git a/src/searchengine/nova3/engines/extratorrent.png b/src/gui/searchengine/nova3/engines/extratorrent.png similarity index 100% rename from src/searchengine/nova3/engines/extratorrent.png rename to src/gui/searchengine/nova3/engines/extratorrent.png diff --git a/src/searchengine/nova3/engines/extratorrent.py b/src/gui/searchengine/nova3/engines/extratorrent.py old mode 100755 new mode 100644 similarity index 100% rename from src/searchengine/nova3/engines/extratorrent.py rename to src/gui/searchengine/nova3/engines/extratorrent.py diff --git a/src/searchengine/nova3/engines/kickasstorrents.png b/src/gui/searchengine/nova3/engines/kickasstorrents.png similarity index 100% rename from src/searchengine/nova3/engines/kickasstorrents.png rename to src/gui/searchengine/nova3/engines/kickasstorrents.png diff --git a/src/searchengine/nova3/engines/kickasstorrents.py b/src/gui/searchengine/nova3/engines/kickasstorrents.py old mode 100755 new mode 100644 similarity index 100% rename from src/searchengine/nova3/engines/kickasstorrents.py rename to src/gui/searchengine/nova3/engines/kickasstorrents.py diff --git a/src/searchengine/nova3/engines/legittorrents.png b/src/gui/searchengine/nova3/engines/legittorrents.png similarity index 100% rename from src/searchengine/nova3/engines/legittorrents.png rename to src/gui/searchengine/nova3/engines/legittorrents.png diff --git a/src/searchengine/nova3/engines/legittorrents.py b/src/gui/searchengine/nova3/engines/legittorrents.py similarity index 100% rename from src/searchengine/nova3/engines/legittorrents.py rename to src/gui/searchengine/nova3/engines/legittorrents.py diff --git a/src/searchengine/nova3/engines/mininova.png b/src/gui/searchengine/nova3/engines/mininova.png similarity index 100% rename from src/searchengine/nova3/engines/mininova.png rename to src/gui/searchengine/nova3/engines/mininova.png diff --git a/src/searchengine/nova3/engines/mininova.py b/src/gui/searchengine/nova3/engines/mininova.py similarity index 100% rename from src/searchengine/nova3/engines/mininova.py rename to src/gui/searchengine/nova3/engines/mininova.py diff --git a/src/searchengine/nova3/engines/piratebay.png b/src/gui/searchengine/nova3/engines/piratebay.png similarity index 100% rename from src/searchengine/nova3/engines/piratebay.png rename to src/gui/searchengine/nova3/engines/piratebay.png diff --git a/src/searchengine/nova3/engines/piratebay.py b/src/gui/searchengine/nova3/engines/piratebay.py similarity index 100% rename from src/searchengine/nova3/engines/piratebay.py rename to src/gui/searchengine/nova3/engines/piratebay.py diff --git a/src/searchengine/nova3/engines/torrentreactor.png b/src/gui/searchengine/nova3/engines/torrentreactor.png similarity index 100% rename from src/searchengine/nova3/engines/torrentreactor.png rename to src/gui/searchengine/nova3/engines/torrentreactor.png diff --git a/src/searchengine/nova3/engines/torrentreactor.py b/src/gui/searchengine/nova3/engines/torrentreactor.py similarity index 100% rename from src/searchengine/nova3/engines/torrentreactor.py rename to src/gui/searchengine/nova3/engines/torrentreactor.py diff --git a/src/searchengine/nova3/engines/versions.txt b/src/gui/searchengine/nova3/engines/versions.txt similarity index 100% rename from src/searchengine/nova3/engines/versions.txt rename to src/gui/searchengine/nova3/engines/versions.txt diff --git a/src/searchengine/nova3/helpers.py b/src/gui/searchengine/nova3/helpers.py similarity index 100% rename from src/searchengine/nova3/helpers.py rename to src/gui/searchengine/nova3/helpers.py diff --git a/src/searchengine/nova3/nova2.py b/src/gui/searchengine/nova3/nova2.py old mode 100755 new mode 100644 similarity index 100% rename from src/searchengine/nova3/nova2.py rename to src/gui/searchengine/nova3/nova2.py diff --git a/src/searchengine/nova3/nova2dl.py b/src/gui/searchengine/nova3/nova2dl.py old mode 100755 new mode 100644 similarity index 100% rename from src/searchengine/nova3/nova2dl.py rename to src/gui/searchengine/nova3/nova2dl.py diff --git a/src/searchengine/nova3/novaprinter.py b/src/gui/searchengine/nova3/novaprinter.py similarity index 100% rename from src/searchengine/nova3/novaprinter.py rename to src/gui/searchengine/nova3/novaprinter.py diff --git a/src/searchengine/nova3/sgmllib3.py b/src/gui/searchengine/nova3/sgmllib3.py similarity index 100% rename from src/searchengine/nova3/sgmllib3.py rename to src/gui/searchengine/nova3/sgmllib3.py diff --git a/src/searchengine/nova3/socks.py b/src/gui/searchengine/nova3/socks.py similarity index 100% rename from src/searchengine/nova3/socks.py rename to src/gui/searchengine/nova3/socks.py diff --git a/src/searchengine/pluginsource.h b/src/gui/searchengine/pluginsource.h similarity index 100% rename from src/searchengine/pluginsource.h rename to src/gui/searchengine/pluginsource.h diff --git a/src/searchengine/pluginsource.ui b/src/gui/searchengine/pluginsource.ui similarity index 100% rename from src/searchengine/pluginsource.ui rename to src/gui/searchengine/pluginsource.ui diff --git a/src/searchengine/search.qrc b/src/gui/searchengine/search.qrc similarity index 100% rename from src/searchengine/search.qrc rename to src/gui/searchengine/search.qrc diff --git a/src/searchengine/search.ui b/src/gui/searchengine/search.ui similarity index 100% rename from src/searchengine/search.ui rename to src/gui/searchengine/search.ui diff --git a/src/searchengine/searchengine.cpp b/src/gui/searchengine/searchengine.cpp similarity index 100% rename from src/searchengine/searchengine.cpp rename to src/gui/searchengine/searchengine.cpp diff --git a/src/searchengine/searchengine.h b/src/gui/searchengine/searchengine.h similarity index 100% rename from src/searchengine/searchengine.h rename to src/gui/searchengine/searchengine.h diff --git a/src/searchengine/searchengine.pri b/src/gui/searchengine/searchengine.pri similarity index 100% rename from src/searchengine/searchengine.pri rename to src/gui/searchengine/searchengine.pri diff --git a/src/searchengine/searchlistdelegate.h b/src/gui/searchengine/searchlistdelegate.h similarity index 100% rename from src/searchengine/searchlistdelegate.h rename to src/gui/searchengine/searchlistdelegate.h diff --git a/src/searchengine/searchsortmodel.h b/src/gui/searchengine/searchsortmodel.h similarity index 100% rename from src/searchengine/searchsortmodel.h rename to src/gui/searchengine/searchsortmodel.h diff --git a/src/searchengine/searchtab.cpp b/src/gui/searchengine/searchtab.cpp similarity index 100% rename from src/searchengine/searchtab.cpp rename to src/gui/searchengine/searchtab.cpp diff --git a/src/searchengine/searchtab.h b/src/gui/searchengine/searchtab.h similarity index 100% rename from src/searchengine/searchtab.h rename to src/gui/searchengine/searchtab.h diff --git a/src/searchengine/supportedengines.h b/src/gui/searchengine/supportedengines.h similarity index 100% rename from src/searchengine/supportedengines.h rename to src/gui/searchengine/supportedengines.h diff --git a/src/speedlimitdlg.cpp b/src/gui/speedlimitdlg.cpp similarity index 100% rename from src/speedlimitdlg.cpp rename to src/gui/speedlimitdlg.cpp diff --git a/src/speedlimitdlg.h b/src/gui/speedlimitdlg.h similarity index 100% rename from src/speedlimitdlg.h rename to src/gui/speedlimitdlg.h diff --git a/src/statsdialog.cpp b/src/gui/statsdialog.cpp similarity index 100% rename from src/statsdialog.cpp rename to src/gui/statsdialog.cpp diff --git a/src/statsdialog.h b/src/gui/statsdialog.h similarity index 100% rename from src/statsdialog.h rename to src/gui/statsdialog.h diff --git a/src/statsdialog.ui b/src/gui/statsdialog.ui similarity index 100% rename from src/statsdialog.ui rename to src/gui/statsdialog.ui diff --git a/src/statusbar.cpp b/src/gui/statusbar.cpp similarity index 95% rename from src/statusbar.cpp rename to src/gui/statusbar.cpp index 29d2264ad..d775d068a 100644 --- a/src/statusbar.cpp +++ b/src/gui/statusbar.cpp @@ -57,17 +57,17 @@ StatusBar::StatusBar(QStatusBar *bar) connecStatusLblIcon->setFlat(true); connecStatusLblIcon->setFocusPolicy(Qt::NoFocus); connecStatusLblIcon->setCursor(Qt::PointingHandCursor); - connecStatusLblIcon->setIcon(QIcon(":/Icons/skin/firewalled.png")); + connecStatusLblIcon->setIcon(QIcon(":/icons/skin/firewalled.png")); connecStatusLblIcon->setToolTip(QString::fromUtf8("")+tr("Connection status:")+QString::fromUtf8("
")+QString::fromUtf8("")+tr("No direct connections. This may indicate network configuration problems.")+QString::fromUtf8("")); dlSpeedLbl = new QPushButton(bar); - dlSpeedLbl->setIcon(QIcon(":/Icons/skin/download.png")); + dlSpeedLbl->setIcon(QIcon(":/icons/skin/download.png")); connect(dlSpeedLbl, SIGNAL(clicked()), this, SLOT(capDownloadSpeed())); dlSpeedLbl->setFlat(true); dlSpeedLbl->setFocusPolicy(Qt::NoFocus); dlSpeedLbl->setCursor(Qt::PointingHandCursor); upSpeedLbl = new QPushButton(bar); - upSpeedLbl->setIcon(QIcon(":/Icons/skin/seeding.png")); + upSpeedLbl->setIcon(QIcon(":/icons/skin/seeding.png")); connect(upSpeedLbl, SIGNAL(clicked()), this, SLOT(capUploadSpeed())); upSpeedLbl->setFlat(true); upSpeedLbl->setFocusPolicy(Qt::NoFocus); @@ -142,7 +142,7 @@ void StatusBar::showRestartRequired() { // Restart required notification const QString restart_text = tr("qBittorrent needs to be restarted"); QLabel *restartIconLbl = new QLabel(m_bar); - restartIconLbl->setPixmap(QPixmap(":/Icons/oxygen/dialog-warning.png").scaled(QSize(24,24))); + restartIconLbl->setPixmap(QPixmap(":/icons/oxygen/dialog-warning.png").scaled(QSize(24,24))); restartIconLbl->setToolTip(restart_text); m_bar->insertWidget(0,restartIconLbl); QLabel *restartLbl = new QLabel(m_bar); @@ -161,15 +161,15 @@ void StatusBar::refreshStatusBar() { // Update connection status const libtorrent::session_status sessionStatus = QBtSession::instance()->getSessionStatus(); if (!QBtSession::instance()->getSession()->is_listening()) { - connecStatusLblIcon->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/disconnected.png"))); + connecStatusLblIcon->setIcon(QIcon(QString::fromUtf8(":/icons/skin/disconnected.png"))); connecStatusLblIcon->setToolTip(QString::fromUtf8("")+tr("Connection Status:")+QString::fromUtf8("
")+tr("Offline. This usually means that qBittorrent failed to listen on the selected port for incoming connections.")); } else { if (sessionStatus.has_incoming_connections) { // Connection OK - connecStatusLblIcon->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/connected.png"))); + connecStatusLblIcon->setIcon(QIcon(QString::fromUtf8(":/icons/skin/connected.png"))); connecStatusLblIcon->setToolTip(QString::fromUtf8("")+tr("Connection Status:")+QString::fromUtf8("
")+tr("Online")); }else{ - connecStatusLblIcon->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/firewalled.png"))); + connecStatusLblIcon->setIcon(QIcon(QString::fromUtf8(":/icons/skin/firewalled.png"))); connecStatusLblIcon->setToolTip(QString::fromUtf8("")+tr("Connection status:")+QString::fromUtf8("
")+QString::fromUtf8("")+tr("No direct connections. This may indicate network configuration problems.")+QString::fromUtf8("")); } } @@ -197,11 +197,11 @@ void StatusBar::refreshStatusBar() { void StatusBar::updateAltSpeedsBtn(bool alternative) { if (alternative) { - altSpeedsBtn->setIcon(QIcon(":/Icons/slow.png")); + altSpeedsBtn->setIcon(QIcon(":/icons/slow.png")); altSpeedsBtn->setToolTip(tr("Click to switch to regular speed limits")); altSpeedsBtn->setDown(true); } else { - altSpeedsBtn->setIcon(QIcon(":/Icons/slow_off.png")); + altSpeedsBtn->setIcon(QIcon(":/icons/slow_off.png")); altSpeedsBtn->setToolTip(tr("Click to switch to alternative speed limits")); altSpeedsBtn->setDown(false); } diff --git a/src/statusbar.h b/src/gui/statusbar.h similarity index 100% rename from src/statusbar.h rename to src/gui/statusbar.h diff --git a/src/torrentcontentfiltermodel.cpp b/src/gui/torrentcontentfiltermodel.cpp similarity index 100% rename from src/torrentcontentfiltermodel.cpp rename to src/gui/torrentcontentfiltermodel.cpp diff --git a/src/torrentcontentfiltermodel.h b/src/gui/torrentcontentfiltermodel.h similarity index 100% rename from src/torrentcontentfiltermodel.h rename to src/gui/torrentcontentfiltermodel.h diff --git a/src/torrentcontentmodel.cpp b/src/gui/torrentcontentmodel.cpp similarity index 100% rename from src/torrentcontentmodel.cpp rename to src/gui/torrentcontentmodel.cpp diff --git a/src/torrentcontentmodel.h b/src/gui/torrentcontentmodel.h similarity index 100% rename from src/torrentcontentmodel.h rename to src/gui/torrentcontentmodel.h diff --git a/src/torrentcontentmodelfile.cpp b/src/gui/torrentcontentmodelfile.cpp similarity index 100% rename from src/torrentcontentmodelfile.cpp rename to src/gui/torrentcontentmodelfile.cpp diff --git a/src/torrentcontentmodelfile.h b/src/gui/torrentcontentmodelfile.h similarity index 100% rename from src/torrentcontentmodelfile.h rename to src/gui/torrentcontentmodelfile.h diff --git a/src/torrentcontentmodelfolder.cpp b/src/gui/torrentcontentmodelfolder.cpp similarity index 100% rename from src/torrentcontentmodelfolder.cpp rename to src/gui/torrentcontentmodelfolder.cpp diff --git a/src/torrentcontentmodelfolder.h b/src/gui/torrentcontentmodelfolder.h similarity index 100% rename from src/torrentcontentmodelfolder.h rename to src/gui/torrentcontentmodelfolder.h diff --git a/src/torrentcontentmodelitem.cpp b/src/gui/torrentcontentmodelitem.cpp similarity index 100% rename from src/torrentcontentmodelitem.cpp rename to src/gui/torrentcontentmodelitem.cpp diff --git a/src/torrentcontentmodelitem.h b/src/gui/torrentcontentmodelitem.h similarity index 100% rename from src/torrentcontentmodelitem.h rename to src/gui/torrentcontentmodelitem.h diff --git a/src/torrentcontenttreeview.cpp b/src/gui/torrentcontenttreeview.cpp similarity index 100% rename from src/torrentcontenttreeview.cpp rename to src/gui/torrentcontenttreeview.cpp diff --git a/src/torrentcontenttreeview.h b/src/gui/torrentcontenttreeview.h similarity index 100% rename from src/torrentcontenttreeview.h rename to src/gui/torrentcontenttreeview.h diff --git a/src/torrentcreator/createtorrent.ui b/src/gui/torrentcreator/createtorrent.ui similarity index 100% rename from src/torrentcreator/createtorrent.ui rename to src/gui/torrentcreator/createtorrent.ui diff --git a/src/torrentcreator/torrentcreator.pri b/src/gui/torrentcreator/torrentcreator.pri similarity index 100% rename from src/torrentcreator/torrentcreator.pri rename to src/gui/torrentcreator/torrentcreator.pri diff --git a/src/torrentcreator/torrentcreatordlg.cpp b/src/gui/torrentcreator/torrentcreatordlg.cpp similarity index 100% rename from src/torrentcreator/torrentcreatordlg.cpp rename to src/gui/torrentcreator/torrentcreatordlg.cpp diff --git a/src/torrentcreator/torrentcreatordlg.h b/src/gui/torrentcreator/torrentcreatordlg.h similarity index 100% rename from src/torrentcreator/torrentcreatordlg.h rename to src/gui/torrentcreator/torrentcreatordlg.h diff --git a/src/torrentcreator/torrentcreatorthread.cpp b/src/gui/torrentcreator/torrentcreatorthread.cpp similarity index 100% rename from src/torrentcreator/torrentcreatorthread.cpp rename to src/gui/torrentcreator/torrentcreatorthread.cpp diff --git a/src/torrentcreator/torrentcreatorthread.h b/src/gui/torrentcreator/torrentcreatorthread.h similarity index 100% rename from src/torrentcreator/torrentcreatorthread.h rename to src/gui/torrentcreator/torrentcreatorthread.h diff --git a/src/torrentfilterenum.h b/src/gui/torrentfilterenum.h similarity index 100% rename from src/torrentfilterenum.h rename to src/gui/torrentfilterenum.h diff --git a/src/torrentimportdlg.cpp b/src/gui/torrentimportdlg.cpp similarity index 100% rename from src/torrentimportdlg.cpp rename to src/gui/torrentimportdlg.cpp diff --git a/src/torrentimportdlg.h b/src/gui/torrentimportdlg.h similarity index 100% rename from src/torrentimportdlg.h rename to src/gui/torrentimportdlg.h diff --git a/src/torrentimportdlg.ui b/src/gui/torrentimportdlg.ui similarity index 100% rename from src/torrentimportdlg.ui rename to src/gui/torrentimportdlg.ui diff --git a/src/trackerlogin.cpp b/src/gui/trackerlogin.cpp similarity index 97% rename from src/trackerlogin.cpp rename to src/gui/trackerlogin.cpp index d0ab212b7..fabcc9572 100644 --- a/src/trackerlogin.cpp +++ b/src/gui/trackerlogin.cpp @@ -36,7 +36,7 @@ trackerLogin::trackerLogin(QWidget *parent, QTorrentHandle h) { setupUi(this); setAttribute(Qt::WA_DeleteOnClose); - login_logo->setPixmap(QPixmap(QString::fromUtf8(":/Icons/oxygen/encrypted.png"))); + login_logo->setPixmap(QPixmap(QString::fromUtf8(":/icons/oxygen/encrypted.png"))); tracker_url->setText(h.current_tracker()); connect(this, SIGNAL(trackerLoginCancelled(QPair)), parent, SLOT(addUnauthenticatedTracker(QPair))); show(); diff --git a/src/trackerlogin.h b/src/gui/trackerlogin.h similarity index 100% rename from src/trackerlogin.h rename to src/gui/trackerlogin.h diff --git a/src/transferlistdelegate.cpp b/src/gui/transferlistdelegate.cpp similarity index 99% rename from src/transferlistdelegate.cpp rename to src/gui/transferlistdelegate.cpp index a4d306aec..2098fd054 100644 --- a/src/transferlistdelegate.cpp +++ b/src/gui/transferlistdelegate.cpp @@ -236,7 +236,7 @@ QSize TransferListDelegate::sizeHint(const QStyleOptionViewItem & option, const static int icon_height = -1; if (icon_height == -1) { - QIcon icon(":/Icons/skin/downloading.png"); + QIcon icon(":/icons/skin/downloading.png"); QList ic_sizes(icon.availableSizes()); icon_height = ic_sizes[0].height(); } diff --git a/src/transferlistdelegate.h b/src/gui/transferlistdelegate.h similarity index 100% rename from src/transferlistdelegate.h rename to src/gui/transferlistdelegate.h diff --git a/src/transferlistfilterswidget.cpp b/src/gui/transferlistfilterswidget.cpp similarity index 97% rename from src/transferlistfilterswidget.cpp rename to src/gui/transferlistfilterswidget.cpp index b6b84cb01..fa0ba662f 100644 --- a/src/transferlistfilterswidget.cpp +++ b/src/gui/transferlistfilterswidget.cpp @@ -184,25 +184,25 @@ TransferListFiltersWidget::TransferListFiltersWidget(QWidget *parent, TransferLi // Add status filters QListWidgetItem *all = new QListWidgetItem(statusFilters); all->setData(Qt::DisplayRole, QVariant(tr("All") + " (0)")); - all->setData(Qt::DecorationRole, QIcon(":/Icons/skin/filterall.png")); + all->setData(Qt::DecorationRole, QIcon(":/icons/skin/filterall.png")); QListWidgetItem *downloading = new QListWidgetItem(statusFilters); downloading->setData(Qt::DisplayRole, QVariant(tr("Downloading") + " (0)")); - downloading->setData(Qt::DecorationRole, QIcon(":/Icons/skin/downloading.png")); + downloading->setData(Qt::DecorationRole, QIcon(":/icons/skin/downloading.png")); QListWidgetItem *completed = new QListWidgetItem(statusFilters); completed->setData(Qt::DisplayRole, QVariant(tr("Completed") + " (0)")); - completed->setData(Qt::DecorationRole, QIcon(":/Icons/skin/uploading.png")); + completed->setData(Qt::DecorationRole, QIcon(":/icons/skin/uploading.png")); QListWidgetItem *paused = new QListWidgetItem(statusFilters); paused->setData(Qt::DisplayRole, QVariant(tr("Paused") + " (0)")); - paused->setData(Qt::DecorationRole, QIcon(":/Icons/skin/paused.png")); + paused->setData(Qt::DecorationRole, QIcon(":/icons/skin/paused.png")); QListWidgetItem *resumed = new QListWidgetItem(statusFilters); resumed->setData(Qt::DisplayRole, QVariant(tr("Resumed") + " (0)")); - resumed->setData(Qt::DecorationRole, QIcon(":/Icons/skin/resumed.png")); + resumed->setData(Qt::DecorationRole, QIcon(":/icons/skin/resumed.png")); QListWidgetItem *active = new QListWidgetItem(statusFilters); active->setData(Qt::DisplayRole, QVariant(tr("Active") + " (0)")); - active->setData(Qt::DecorationRole, QIcon(":/Icons/skin/filteractive.png")); + active->setData(Qt::DecorationRole, QIcon(":/icons/skin/filteractive.png")); QListWidgetItem *inactive = new QListWidgetItem(statusFilters); inactive->setData(Qt::DisplayRole, QVariant(tr("Inactive") + " (0)")); - inactive->setData(Qt::DecorationRole, QIcon(":/Icons/skin/filterinactive.png")); + inactive->setData(Qt::DecorationRole, QIcon(":/icons/skin/filterinactive.png")); // SIGNAL/SLOT connect(statusFilters, SIGNAL(currentRowChanged(int)), transferList, SLOT(applyStatusFilter(int))); diff --git a/src/transferlistfilterswidget.h b/src/gui/transferlistfilterswidget.h similarity index 100% rename from src/transferlistfilterswidget.h rename to src/gui/transferlistfilterswidget.h diff --git a/src/transferlistsortmodel.cpp b/src/gui/transferlistsortmodel.cpp similarity index 100% rename from src/transferlistsortmodel.cpp rename to src/gui/transferlistsortmodel.cpp diff --git a/src/transferlistsortmodel.h b/src/gui/transferlistsortmodel.h similarity index 100% rename from src/transferlistsortmodel.h rename to src/gui/transferlistsortmodel.h diff --git a/src/transferlistwidget.cpp b/src/gui/transferlistwidget.cpp similarity index 99% rename from src/transferlistwidget.cpp rename to src/gui/transferlistwidget.cpp index f1df423fc..4fd03ee6a 100644 --- a/src/transferlistwidget.cpp +++ b/src/gui/transferlistwidget.cpp @@ -719,11 +719,11 @@ void TransferListWidget::displayListMenu(const QPoint&) connect(&actionDelete, SIGNAL(triggered()), this, SLOT(deleteSelectedTorrents())); QAction actionPreview_file(IconProvider::instance()->getIcon("view-preview"), tr("Preview file..."), 0); connect(&actionPreview_file, SIGNAL(triggered()), this, SLOT(previewSelectedTorrents())); - QAction actionSet_max_ratio(QIcon(QString::fromUtf8(":/Icons/skin/ratio.png")), tr("Limit share ratio..."), 0); + QAction actionSet_max_ratio(QIcon(QString::fromUtf8(":/icons/skin/ratio.png")), tr("Limit share ratio..."), 0); connect(&actionSet_max_ratio, SIGNAL(triggered()), this, SLOT(setMaxRatioSelectedTorrents())); - QAction actionSet_upload_limit(QIcon(QString::fromUtf8(":/Icons/skin/seeding.png")), tr("Limit upload rate..."), 0); + QAction actionSet_upload_limit(QIcon(QString::fromUtf8(":/icons/skin/seeding.png")), tr("Limit upload rate..."), 0); connect(&actionSet_upload_limit, SIGNAL(triggered()), this, SLOT(setUpLimitSelectedTorrents())); - QAction actionSet_download_limit(QIcon(QString::fromUtf8(":/Icons/skin/download.png")), tr("Limit download rate..."), 0); + QAction actionSet_download_limit(QIcon(QString::fromUtf8(":/icons/skin/download.png")), tr("Limit download rate..."), 0); connect(&actionSet_download_limit, SIGNAL(triggered()), this, SLOT(setDlLimitSelectedTorrents())); QAction actionOpen_destination_folder(IconProvider::instance()->getIcon("inode-directory"), tr("Open destination folder"), 0); connect(&actionOpen_destination_folder, SIGNAL(triggered()), this, SLOT(openSelectedTorrentsFolder())); @@ -739,7 +739,7 @@ void TransferListWidget::displayListMenu(const QPoint&) connect(&actionSetTorrentPath, SIGNAL(triggered()), this, SLOT(setSelectedTorrentsLocation())); QAction actionForce_recheck(IconProvider::instance()->getIcon("document-edit-verify"), tr("Force recheck"), 0); connect(&actionForce_recheck, SIGNAL(triggered()), this, SLOT(recheckSelectedTorrents())); - QAction actionCopy_magnet_link(QIcon(":/Icons/magnet.png"), tr("Copy magnet link"), 0); + QAction actionCopy_magnet_link(QIcon(":/icons/magnet.png"), tr("Copy magnet link"), 0); connect(&actionCopy_magnet_link, SIGNAL(triggered()), this, SLOT(copySelectedMagnetURIs())); QAction actionSuper_seeding_mode(tr("Super seeding mode"), 0); actionSuper_seeding_mode.setCheckable(true); diff --git a/src/transferlistwidget.h b/src/gui/transferlistwidget.h similarity index 100% rename from src/transferlistwidget.h rename to src/gui/transferlistwidget.h diff --git a/src/updownratiodlg.cpp b/src/gui/updownratiodlg.cpp similarity index 100% rename from src/updownratiodlg.cpp rename to src/gui/updownratiodlg.cpp diff --git a/src/updownratiodlg.h b/src/gui/updownratiodlg.h similarity index 100% rename from src/updownratiodlg.h rename to src/gui/updownratiodlg.h diff --git a/src/updownratiodlg.ui b/src/gui/updownratiodlg.ui similarity index 100% rename from src/updownratiodlg.ui rename to src/gui/updownratiodlg.ui diff --git a/src/icons.qrc b/src/icons.qrc index 8628ef1f4..5548f8a0f 100644 --- a/src/icons.qrc +++ b/src/icons.qrc @@ -1,371 +1,371 @@ - Icons/qbittorrent.png - Icons/3-state-checkbox.gif - Icons/L.gif - Icons/loading.png - Icons/magnet.png - Icons/slow.png - Icons/slow_off.png - Icons/sphere.png - Icons/sphere2.png - Icons/url.png - Icons/flags/ad.png - Icons/flags/ae.png - Icons/flags/af.png - Icons/flags/ag.png - Icons/flags/ai.png - Icons/flags/al.png - Icons/flags/am.png - Icons/flags/an.png - Icons/flags/ao.png - Icons/flags/ar.png - Icons/flags/as.png - Icons/flags/at.png - Icons/flags/au.png - Icons/flags/aw.png - Icons/flags/ax.png - Icons/flags/az.png - Icons/flags/ba.png - Icons/flags/bb.png - Icons/flags/bd.png - Icons/flags/be.png - Icons/flags/bf.png - Icons/flags/bg.png - Icons/flags/bh.png - Icons/flags/bi.png - Icons/flags/bj.png - Icons/flags/bm.png - Icons/flags/bn.png - Icons/flags/bo.png - Icons/flags/br.png - Icons/flags/bs.png - Icons/flags/bt.png - Icons/flags/bv.png - Icons/flags/bw.png - Icons/flags/by.png - Icons/flags/bz.png - Icons/flags/ca.png - Icons/flags/cc.png - Icons/flags/cd.png - Icons/flags/cf.png - Icons/flags/cg.png - Icons/flags/ch.png - Icons/flags/ci.png - Icons/flags/ck.png - Icons/flags/cl.png - Icons/flags/cm.png - Icons/flags/cn.png - Icons/flags/co.png - Icons/flags/cr.png - Icons/flags/cs.png - Icons/flags/cu.png - Icons/flags/cv.png - Icons/flags/cx.png - Icons/flags/cy.png - Icons/flags/cz.png - Icons/flags/de.png - Icons/flags/dj.png - Icons/flags/dk.png - Icons/flags/dm.png - Icons/flags/do.png - Icons/flags/dz.png - Icons/flags/ec.png - Icons/flags/ee.png - Icons/flags/eg.png - Icons/flags/eh.png - Icons/flags/er.png - Icons/flags/es.png - Icons/flags/et.png - Icons/flags/fi.png - Icons/flags/fj.png - Icons/flags/fk.png - Icons/flags/fm.png - Icons/flags/fo.png - Icons/flags/fr.png - Icons/flags/ga.png - Icons/flags/gb.png - Icons/flags/gd.png - Icons/flags/ge.png - Icons/flags/gf.png - Icons/flags/gh.png - Icons/flags/gi.png - Icons/flags/gl.png - Icons/flags/gm.png - Icons/flags/gn.png - Icons/flags/gp.png - Icons/flags/gq.png - Icons/flags/gr.png - Icons/flags/gs.png - Icons/flags/gt.png - Icons/flags/gu.png - Icons/flags/gw.png - Icons/flags/gy.png - Icons/flags/hk.png - Icons/flags/hm.png - Icons/flags/hn.png - Icons/flags/hr.png - Icons/flags/ht.png - Icons/flags/hu.png - Icons/flags/id.png - Icons/flags/ie.png - Icons/flags/il.png - Icons/flags/in.png - Icons/flags/io.png - Icons/flags/iq.png - Icons/flags/ir.png - Icons/flags/is.png - Icons/flags/it.png - Icons/flags/jm.png - Icons/flags/jo.png - Icons/flags/jp.png - Icons/flags/ke.png - Icons/flags/kg.png - Icons/flags/kh.png - Icons/flags/ki.png - Icons/flags/km.png - Icons/flags/kn.png - Icons/flags/kp.png - Icons/flags/kr.png - Icons/flags/kw.png - Icons/flags/ky.png - Icons/flags/kz.png - Icons/flags/la.png - Icons/flags/lb.png - Icons/flags/lc.png - Icons/flags/li.png - Icons/flags/lk.png - Icons/flags/lr.png - Icons/flags/ls.png - Icons/flags/lt.png - Icons/flags/lu.png - Icons/flags/lv.png - Icons/flags/ly.png - Icons/flags/ma.png - Icons/flags/mc.png - Icons/flags/md.png - Icons/flags/me.png - Icons/flags/mg.png - Icons/flags/mh.png - Icons/flags/mk.png - Icons/flags/ml.png - Icons/flags/mm.png - Icons/flags/mn.png - Icons/flags/mo.png - Icons/flags/mp.png - Icons/flags/mq.png - Icons/flags/mr.png - Icons/flags/ms.png - Icons/flags/mt.png - Icons/flags/mu.png - Icons/flags/mv.png - Icons/flags/mw.png - Icons/flags/mx.png - Icons/flags/my.png - Icons/flags/mz.png - Icons/flags/na.png - Icons/flags/nc.png - Icons/flags/ne.png - Icons/flags/nf.png - Icons/flags/ng.png - Icons/flags/ni.png - Icons/flags/nl.png - Icons/flags/no.png - Icons/flags/np.png - Icons/flags/nr.png - Icons/flags/nu.png - Icons/flags/nz.png - Icons/flags/om.png - Icons/flags/pa.png - Icons/flags/pe.png - Icons/flags/pf.png - Icons/flags/pg.png - Icons/flags/ph.png - Icons/flags/pk.png - Icons/flags/pl.png - Icons/flags/pm.png - Icons/flags/pn.png - Icons/flags/pr.png - Icons/flags/ps.png - Icons/flags/pt.png - Icons/flags/pw.png - Icons/flags/py.png - Icons/flags/qa.png - Icons/flags/re.png - Icons/flags/ro.png - Icons/flags/rs.png - Icons/flags/ru.png - Icons/flags/rw.png - Icons/flags/sa.png - Icons/flags/sb.png - Icons/flags/sc.png - Icons/flags/sd.png - Icons/flags/se.png - Icons/flags/sg.png - Icons/flags/sh.png - Icons/flags/si.png - Icons/flags/sj.png - Icons/flags/sk.png - Icons/flags/sl.png - Icons/flags/sm.png - Icons/flags/sn.png - Icons/flags/so.png - Icons/flags/sr.png - Icons/flags/st.png - Icons/flags/sv.png - Icons/flags/sy.png - Icons/flags/sz.png - Icons/flags/tc.png - Icons/flags/td.png - Icons/flags/tf.png - Icons/flags/tg.png - Icons/flags/th.png - Icons/flags/tj.png - Icons/flags/tk.png - Icons/flags/tl.png - Icons/flags/tm.png - Icons/flags/tn.png - Icons/flags/to.png - Icons/flags/tr.png - Icons/flags/tt.png - Icons/flags/tv.png - Icons/flags/tw.png - Icons/flags/tz.png - Icons/flags/ua.png - Icons/flags/ug.png - Icons/flags/um.png - Icons/flags/us.png - Icons/flags/uy.png - Icons/flags/uz.png - Icons/flags/va.png - Icons/flags/vc.png - Icons/flags/ve.png - Icons/flags/vg.png - Icons/flags/vi.png - Icons/flags/vn.png - Icons/flags/vu.png - Icons/flags/wf.png - Icons/flags/ws.png - Icons/flags/ye.png - Icons/flags/yt.png - Icons/flags/za.png - Icons/flags/zm.png - Icons/flags/zw.png - Icons/oxygen/application-exit.png - Icons/oxygen/application-rss+xml.png - Icons/oxygen/application-x-mswinurl.png - Icons/oxygen/chronometer.png - Icons/oxygen/dialog-cancel.png - Icons/oxygen/dialog-information.png - Icons/oxygen/dialog-warning.png - Icons/oxygen/document-edit-verify.png - Icons/oxygen/document-edit.png - Icons/oxygen/document-encrypt.png - Icons/oxygen/document-import.png - Icons/oxygen/document-new.png - Icons/oxygen/document-properties.png - Icons/oxygen/document-save.png - Icons/oxygen/download.png - Icons/oxygen/edit-clear-history.png - Icons/oxygen/edit-clear.png - Icons/oxygen/edit-copy.png - Icons/oxygen/edit-cut.png - Icons/oxygen/edit-delete.png - Icons/oxygen/edit-find-user.png - Icons/oxygen/edit-find.png - Icons/oxygen/edit-paste.png - Icons/oxygen/edit-rename.png - Icons/oxygen/folder-documents.png - Icons/oxygen/folder-new.png - Icons/oxygen/folder-remote.png - Icons/oxygen/gear.png - Icons/oxygen/gear32.png - Icons/oxygen/go-down.png - Icons/oxygen/go-up.png - Icons/oxygen/help-about.png - Icons/oxygen/help-contents.png - Icons/oxygen/inode-directory.png - Icons/oxygen/insert-link.png - Icons/oxygen/list-add.png - Icons/oxygen/list-remove.png - Icons/oxygen/mail-folder-inbox.png - Icons/oxygen/mail-mark-read.png - Icons/oxygen/media-playback-pause.png - Icons/oxygen/media-playback-start.png - Icons/oxygen/network-server.png - Icons/oxygen/network-wired.png - Icons/oxygen/object-locked.png - Icons/oxygen/preferences-desktop.png - Icons/oxygen/preferences-other.png - Icons/oxygen/preferences-system-network.png - Icons/oxygen/preferences-system.png - Icons/oxygen/preferences-web-browser-cookies.png - Icons/oxygen/security-high.png - Icons/oxygen/security-low.png - Icons/oxygen/services.png - Icons/oxygen/tab-close.png - Icons/oxygen/task-attention.png - Icons/oxygen/text-plain.png - Icons/oxygen/tools-report-bug.png - Icons/oxygen/unavailable.png - Icons/oxygen/user-group-delete.png - Icons/oxygen/user-group-new.png - Icons/oxygen/view-calendar-journal.png - Icons/oxygen/view-categories.png - Icons/oxygen/view-filter.png - Icons/oxygen/view-preview.png - Icons/oxygen/view-refresh.png - Icons/oxygen/view-statistics.png - Icons/oxygen/wallet-open.png - Icons/oxygen/webui.png - Icons/skin/arrow-right.gif - Icons/skin/bg-dropdown.gif - Icons/skin/bg-handle-horizontal.gif - Icons/skin/bg-header.gif - Icons/skin/bg-panel-header.gif - Icons/skin/checking.png - Icons/skin/collapse-expand.gif - Icons/skin/connected.png - Icons/skin/disconnected.png - Icons/skin/dock-tabs.gif - Icons/skin/download.png - Icons/skin/downloading.png - Icons/skin/error.png - Icons/skin/filteractive.png - Icons/skin/filterall.png - Icons/skin/filterinactive.png - Icons/skin/firewalled.png - Icons/skin/handle-icon-horizontal.gif - Icons/skin/handle-icon.gif - Icons/skin/knob.gif - Icons/skin/logo-blank.gif - Icons/skin/logo.gif - Icons/skin/logo2.gif - Icons/skin/mascot.png - Icons/skin/paused.png - Icons/skin/qbittorrent16.png - Icons/skin/qbittorrent22.png - Icons/skin/qbittorrent32.png - Icons/skin/qbittorrent_mono_dark.png - Icons/skin/qbittorrent_mono_light.png - Icons/skin/queued.png - Icons/skin/ratio.png - Icons/skin/seeding.png - Icons/skin/slider-area.gif - Icons/skin/spacer.gif - Icons/skin/spinner-placeholder.gif - Icons/skin/spinner.gif - Icons/skin/splash.png - Icons/skin/stalledDL.png - Icons/skin/stalledUP.png - Icons/skin/tabs.gif - Icons/skin/toolbox-divider.gif - Icons/skin/toolbox-divider2.gif - Icons/skin/resumed.png - Icons/skin/uploading.png - Icons/oxygen/system-log-out.png - Icons/oxygen/go-bottom.png - Icons/oxygen/go-top.png - Icons/oxygen/checked.png + icons/qbittorrent.png + icons/3-state-checkbox.gif + icons/L.gif + icons/loading.png + icons/magnet.png + icons/slow.png + icons/slow_off.png + icons/sphere.png + icons/sphere2.png + icons/url.png + icons/flags/ad.png + icons/flags/ae.png + icons/flags/af.png + icons/flags/ag.png + icons/flags/ai.png + icons/flags/al.png + icons/flags/am.png + icons/flags/an.png + icons/flags/ao.png + icons/flags/ar.png + icons/flags/as.png + icons/flags/at.png + icons/flags/au.png + icons/flags/aw.png + icons/flags/ax.png + icons/flags/az.png + icons/flags/ba.png + icons/flags/bb.png + icons/flags/bd.png + icons/flags/be.png + icons/flags/bf.png + icons/flags/bg.png + icons/flags/bh.png + icons/flags/bi.png + icons/flags/bj.png + icons/flags/bm.png + icons/flags/bn.png + icons/flags/bo.png + icons/flags/br.png + icons/flags/bs.png + icons/flags/bt.png + icons/flags/bv.png + icons/flags/bw.png + icons/flags/by.png + icons/flags/bz.png + icons/flags/ca.png + icons/flags/cc.png + icons/flags/cd.png + icons/flags/cf.png + icons/flags/cg.png + icons/flags/ch.png + icons/flags/ci.png + icons/flags/ck.png + icons/flags/cl.png + icons/flags/cm.png + icons/flags/cn.png + icons/flags/co.png + icons/flags/cr.png + icons/flags/cs.png + icons/flags/cu.png + icons/flags/cv.png + icons/flags/cx.png + icons/flags/cy.png + icons/flags/cz.png + icons/flags/de.png + icons/flags/dj.png + icons/flags/dk.png + icons/flags/dm.png + icons/flags/do.png + icons/flags/dz.png + icons/flags/ec.png + icons/flags/ee.png + icons/flags/eg.png + icons/flags/eh.png + icons/flags/er.png + icons/flags/es.png + icons/flags/et.png + icons/flags/fi.png + icons/flags/fj.png + icons/flags/fk.png + icons/flags/fm.png + icons/flags/fo.png + icons/flags/fr.png + icons/flags/ga.png + icons/flags/gb.png + icons/flags/gd.png + icons/flags/ge.png + icons/flags/gf.png + icons/flags/gh.png + icons/flags/gi.png + icons/flags/gl.png + icons/flags/gm.png + icons/flags/gn.png + icons/flags/gp.png + icons/flags/gq.png + icons/flags/gr.png + icons/flags/gs.png + icons/flags/gt.png + icons/flags/gu.png + icons/flags/gw.png + icons/flags/gy.png + icons/flags/hk.png + icons/flags/hm.png + icons/flags/hn.png + icons/flags/hr.png + icons/flags/ht.png + icons/flags/hu.png + icons/flags/id.png + icons/flags/ie.png + icons/flags/il.png + icons/flags/in.png + icons/flags/io.png + icons/flags/iq.png + icons/flags/ir.png + icons/flags/is.png + icons/flags/it.png + icons/flags/jm.png + icons/flags/jo.png + icons/flags/jp.png + icons/flags/ke.png + icons/flags/kg.png + icons/flags/kh.png + icons/flags/ki.png + icons/flags/km.png + icons/flags/kn.png + icons/flags/kp.png + icons/flags/kr.png + icons/flags/kw.png + icons/flags/ky.png + icons/flags/kz.png + icons/flags/la.png + icons/flags/lb.png + icons/flags/lc.png + icons/flags/li.png + icons/flags/lk.png + icons/flags/lr.png + icons/flags/ls.png + icons/flags/lt.png + icons/flags/lu.png + icons/flags/lv.png + icons/flags/ly.png + icons/flags/ma.png + icons/flags/mc.png + icons/flags/md.png + icons/flags/me.png + icons/flags/mg.png + icons/flags/mh.png + icons/flags/mk.png + icons/flags/ml.png + icons/flags/mm.png + icons/flags/mn.png + icons/flags/mo.png + icons/flags/mp.png + icons/flags/mq.png + icons/flags/mr.png + icons/flags/ms.png + icons/flags/mt.png + icons/flags/mu.png + icons/flags/mv.png + icons/flags/mw.png + icons/flags/mx.png + icons/flags/my.png + icons/flags/mz.png + icons/flags/na.png + icons/flags/nc.png + icons/flags/ne.png + icons/flags/nf.png + icons/flags/ng.png + icons/flags/ni.png + icons/flags/nl.png + icons/flags/no.png + icons/flags/np.png + icons/flags/nr.png + icons/flags/nu.png + icons/flags/nz.png + icons/flags/om.png + icons/flags/pa.png + icons/flags/pe.png + icons/flags/pf.png + icons/flags/pg.png + icons/flags/ph.png + icons/flags/pk.png + icons/flags/pl.png + icons/flags/pm.png + icons/flags/pn.png + icons/flags/pr.png + icons/flags/ps.png + icons/flags/pt.png + icons/flags/pw.png + icons/flags/py.png + icons/flags/qa.png + icons/flags/re.png + icons/flags/ro.png + icons/flags/rs.png + icons/flags/ru.png + icons/flags/rw.png + icons/flags/sa.png + icons/flags/sb.png + icons/flags/sc.png + icons/flags/sd.png + icons/flags/se.png + icons/flags/sg.png + icons/flags/sh.png + icons/flags/si.png + icons/flags/sj.png + icons/flags/sk.png + icons/flags/sl.png + icons/flags/sm.png + icons/flags/sn.png + icons/flags/so.png + icons/flags/sr.png + icons/flags/st.png + icons/flags/sv.png + icons/flags/sy.png + icons/flags/sz.png + icons/flags/tc.png + icons/flags/td.png + icons/flags/tf.png + icons/flags/tg.png + icons/flags/th.png + icons/flags/tj.png + icons/flags/tk.png + icons/flags/tl.png + icons/flags/tm.png + icons/flags/tn.png + icons/flags/to.png + icons/flags/tr.png + icons/flags/tt.png + icons/flags/tv.png + icons/flags/tw.png + icons/flags/tz.png + icons/flags/ua.png + icons/flags/ug.png + icons/flags/um.png + icons/flags/us.png + icons/flags/uy.png + icons/flags/uz.png + icons/flags/va.png + icons/flags/vc.png + icons/flags/ve.png + icons/flags/vg.png + icons/flags/vi.png + icons/flags/vn.png + icons/flags/vu.png + icons/flags/wf.png + icons/flags/ws.png + icons/flags/ye.png + icons/flags/yt.png + icons/flags/za.png + icons/flags/zm.png + icons/flags/zw.png + icons/oxygen/application-exit.png + icons/oxygen/application-rss+xml.png + icons/oxygen/application-x-mswinurl.png + icons/oxygen/chronometer.png + icons/oxygen/dialog-cancel.png + icons/oxygen/dialog-information.png + icons/oxygen/dialog-warning.png + icons/oxygen/document-edit-verify.png + icons/oxygen/document-edit.png + icons/oxygen/document-encrypt.png + icons/oxygen/document-import.png + icons/oxygen/document-new.png + icons/oxygen/document-properties.png + icons/oxygen/document-save.png + icons/oxygen/download.png + icons/oxygen/edit-clear-history.png + icons/oxygen/edit-clear.png + icons/oxygen/edit-copy.png + icons/oxygen/edit-cut.png + icons/oxygen/edit-delete.png + icons/oxygen/edit-find-user.png + icons/oxygen/edit-find.png + icons/oxygen/edit-paste.png + icons/oxygen/edit-rename.png + icons/oxygen/folder-documents.png + icons/oxygen/folder-new.png + icons/oxygen/folder-remote.png + icons/oxygen/gear.png + icons/oxygen/gear32.png + icons/oxygen/go-down.png + icons/oxygen/go-up.png + icons/oxygen/help-about.png + icons/oxygen/help-contents.png + icons/oxygen/inode-directory.png + icons/oxygen/insert-link.png + icons/oxygen/list-add.png + icons/oxygen/list-remove.png + icons/oxygen/mail-folder-inbox.png + icons/oxygen/mail-mark-read.png + icons/oxygen/media-playback-pause.png + icons/oxygen/media-playback-start.png + icons/oxygen/network-server.png + icons/oxygen/network-wired.png + icons/oxygen/object-locked.png + icons/oxygen/preferences-desktop.png + icons/oxygen/preferences-other.png + icons/oxygen/preferences-system-network.png + icons/oxygen/preferences-system.png + icons/oxygen/preferences-web-browser-cookies.png + icons/oxygen/security-high.png + icons/oxygen/security-low.png + icons/oxygen/services.png + icons/oxygen/tab-close.png + icons/oxygen/task-attention.png + icons/oxygen/text-plain.png + icons/oxygen/tools-report-bug.png + icons/oxygen/unavailable.png + icons/oxygen/user-group-delete.png + icons/oxygen/user-group-new.png + icons/oxygen/view-calendar-journal.png + icons/oxygen/view-categories.png + icons/oxygen/view-filter.png + icons/oxygen/view-preview.png + icons/oxygen/view-refresh.png + icons/oxygen/view-statistics.png + icons/oxygen/wallet-open.png + icons/oxygen/webui.png + icons/skin/arrow-right.gif + icons/skin/bg-dropdown.gif + icons/skin/bg-handle-horizontal.gif + icons/skin/bg-header.gif + icons/skin/bg-panel-header.gif + icons/skin/checking.png + icons/skin/collapse-expand.gif + icons/skin/connected.png + icons/skin/disconnected.png + icons/skin/dock-tabs.gif + icons/skin/download.png + icons/skin/downloading.png + icons/skin/error.png + icons/skin/filteractive.png + icons/skin/filterall.png + icons/skin/filterinactive.png + icons/skin/firewalled.png + icons/skin/handle-icon-horizontal.gif + icons/skin/handle-icon.gif + icons/skin/knob.gif + icons/skin/logo-blank.gif + icons/skin/logo.gif + icons/skin/logo2.gif + icons/skin/mascot.png + icons/skin/paused.png + icons/skin/qbittorrent16.png + icons/skin/qbittorrent22.png + icons/skin/qbittorrent32.png + icons/skin/qbittorrent_mono_dark.png + icons/skin/qbittorrent_mono_light.png + icons/skin/queued.png + icons/skin/ratio.png + icons/skin/seeding.png + icons/skin/slider-area.gif + icons/skin/spacer.gif + icons/skin/spinner-placeholder.gif + icons/skin/spinner.gif + icons/skin/splash.png + icons/skin/stalledDL.png + icons/skin/stalledUP.png + icons/skin/tabs.gif + icons/skin/toolbox-divider.gif + icons/skin/toolbox-divider2.gif + icons/skin/resumed.png + icons/skin/uploading.png + icons/oxygen/system-log-out.png + icons/oxygen/go-bottom.png + icons/oxygen/go-top.png + icons/oxygen/checked.png diff --git a/src/Icons/3-state-checkbox.gif b/src/icons/3-state-checkbox.gif similarity index 100% rename from src/Icons/3-state-checkbox.gif rename to src/icons/3-state-checkbox.gif diff --git a/src/Icons/L.gif b/src/icons/L.gif similarity index 100% rename from src/Icons/L.gif rename to src/icons/L.gif diff --git a/src/Icons/flags/ad.png b/src/icons/flags/ad.png similarity index 100% rename from src/Icons/flags/ad.png rename to src/icons/flags/ad.png diff --git a/src/Icons/flags/ae.png b/src/icons/flags/ae.png similarity index 100% rename from src/Icons/flags/ae.png rename to src/icons/flags/ae.png diff --git a/src/Icons/flags/af.png b/src/icons/flags/af.png similarity index 100% rename from src/Icons/flags/af.png rename to src/icons/flags/af.png diff --git a/src/Icons/flags/ag.png b/src/icons/flags/ag.png similarity index 100% rename from src/Icons/flags/ag.png rename to src/icons/flags/ag.png diff --git a/src/Icons/flags/ai.png b/src/icons/flags/ai.png similarity index 100% rename from src/Icons/flags/ai.png rename to src/icons/flags/ai.png diff --git a/src/Icons/flags/al.png b/src/icons/flags/al.png similarity index 100% rename from src/Icons/flags/al.png rename to src/icons/flags/al.png diff --git a/src/Icons/flags/am.png b/src/icons/flags/am.png similarity index 100% rename from src/Icons/flags/am.png rename to src/icons/flags/am.png diff --git a/src/Icons/flags/an.png b/src/icons/flags/an.png similarity index 100% rename from src/Icons/flags/an.png rename to src/icons/flags/an.png diff --git a/src/Icons/flags/ao.png b/src/icons/flags/ao.png similarity index 100% rename from src/Icons/flags/ao.png rename to src/icons/flags/ao.png diff --git a/src/Icons/flags/ar.png b/src/icons/flags/ar.png similarity index 100% rename from src/Icons/flags/ar.png rename to src/icons/flags/ar.png diff --git a/src/Icons/flags/as.png b/src/icons/flags/as.png similarity index 100% rename from src/Icons/flags/as.png rename to src/icons/flags/as.png diff --git a/src/Icons/flags/at.png b/src/icons/flags/at.png similarity index 100% rename from src/Icons/flags/at.png rename to src/icons/flags/at.png diff --git a/src/Icons/flags/au.png b/src/icons/flags/au.png similarity index 100% rename from src/Icons/flags/au.png rename to src/icons/flags/au.png diff --git a/src/Icons/flags/aw.png b/src/icons/flags/aw.png similarity index 100% rename from src/Icons/flags/aw.png rename to src/icons/flags/aw.png diff --git a/src/Icons/flags/ax.png b/src/icons/flags/ax.png similarity index 100% rename from src/Icons/flags/ax.png rename to src/icons/flags/ax.png diff --git a/src/Icons/flags/az.png b/src/icons/flags/az.png similarity index 100% rename from src/Icons/flags/az.png rename to src/icons/flags/az.png diff --git a/src/Icons/flags/ba.png b/src/icons/flags/ba.png similarity index 100% rename from src/Icons/flags/ba.png rename to src/icons/flags/ba.png diff --git a/src/Icons/flags/bb.png b/src/icons/flags/bb.png similarity index 100% rename from src/Icons/flags/bb.png rename to src/icons/flags/bb.png diff --git a/src/Icons/flags/bd.png b/src/icons/flags/bd.png similarity index 100% rename from src/Icons/flags/bd.png rename to src/icons/flags/bd.png diff --git a/src/Icons/flags/be.png b/src/icons/flags/be.png similarity index 100% rename from src/Icons/flags/be.png rename to src/icons/flags/be.png diff --git a/src/Icons/flags/bf.png b/src/icons/flags/bf.png similarity index 100% rename from src/Icons/flags/bf.png rename to src/icons/flags/bf.png diff --git a/src/Icons/flags/bg.png b/src/icons/flags/bg.png similarity index 100% rename from src/Icons/flags/bg.png rename to src/icons/flags/bg.png diff --git a/src/Icons/flags/bh.png b/src/icons/flags/bh.png similarity index 100% rename from src/Icons/flags/bh.png rename to src/icons/flags/bh.png diff --git a/src/Icons/flags/bi.png b/src/icons/flags/bi.png similarity index 100% rename from src/Icons/flags/bi.png rename to src/icons/flags/bi.png diff --git a/src/Icons/flags/bj.png b/src/icons/flags/bj.png similarity index 100% rename from src/Icons/flags/bj.png rename to src/icons/flags/bj.png diff --git a/src/Icons/flags/bm.png b/src/icons/flags/bm.png similarity index 100% rename from src/Icons/flags/bm.png rename to src/icons/flags/bm.png diff --git a/src/Icons/flags/bn.png b/src/icons/flags/bn.png similarity index 100% rename from src/Icons/flags/bn.png rename to src/icons/flags/bn.png diff --git a/src/Icons/flags/bo.png b/src/icons/flags/bo.png similarity index 100% rename from src/Icons/flags/bo.png rename to src/icons/flags/bo.png diff --git a/src/Icons/flags/br.png b/src/icons/flags/br.png similarity index 100% rename from src/Icons/flags/br.png rename to src/icons/flags/br.png diff --git a/src/Icons/flags/bs.png b/src/icons/flags/bs.png similarity index 100% rename from src/Icons/flags/bs.png rename to src/icons/flags/bs.png diff --git a/src/Icons/flags/bt.png b/src/icons/flags/bt.png similarity index 100% rename from src/Icons/flags/bt.png rename to src/icons/flags/bt.png diff --git a/src/Icons/flags/bv.png b/src/icons/flags/bv.png similarity index 100% rename from src/Icons/flags/bv.png rename to src/icons/flags/bv.png diff --git a/src/Icons/flags/bw.png b/src/icons/flags/bw.png similarity index 100% rename from src/Icons/flags/bw.png rename to src/icons/flags/bw.png diff --git a/src/Icons/flags/by.png b/src/icons/flags/by.png similarity index 100% rename from src/Icons/flags/by.png rename to src/icons/flags/by.png diff --git a/src/Icons/flags/bz.png b/src/icons/flags/bz.png similarity index 100% rename from src/Icons/flags/bz.png rename to src/icons/flags/bz.png diff --git a/src/Icons/flags/ca.png b/src/icons/flags/ca.png similarity index 100% rename from src/Icons/flags/ca.png rename to src/icons/flags/ca.png diff --git a/src/Icons/flags/cc.png b/src/icons/flags/cc.png similarity index 100% rename from src/Icons/flags/cc.png rename to src/icons/flags/cc.png diff --git a/src/Icons/flags/cd.png b/src/icons/flags/cd.png similarity index 100% rename from src/Icons/flags/cd.png rename to src/icons/flags/cd.png diff --git a/src/Icons/flags/cf.png b/src/icons/flags/cf.png similarity index 100% rename from src/Icons/flags/cf.png rename to src/icons/flags/cf.png diff --git a/src/Icons/flags/cg.png b/src/icons/flags/cg.png similarity index 100% rename from src/Icons/flags/cg.png rename to src/icons/flags/cg.png diff --git a/src/Icons/flags/ch.png b/src/icons/flags/ch.png similarity index 100% rename from src/Icons/flags/ch.png rename to src/icons/flags/ch.png diff --git a/src/Icons/flags/ci.png b/src/icons/flags/ci.png similarity index 100% rename from src/Icons/flags/ci.png rename to src/icons/flags/ci.png diff --git a/src/Icons/flags/ck.png b/src/icons/flags/ck.png similarity index 100% rename from src/Icons/flags/ck.png rename to src/icons/flags/ck.png diff --git a/src/Icons/flags/cl.png b/src/icons/flags/cl.png similarity index 100% rename from src/Icons/flags/cl.png rename to src/icons/flags/cl.png diff --git a/src/Icons/flags/cm.png b/src/icons/flags/cm.png similarity index 100% rename from src/Icons/flags/cm.png rename to src/icons/flags/cm.png diff --git a/src/Icons/flags/cn.png b/src/icons/flags/cn.png similarity index 100% rename from src/Icons/flags/cn.png rename to src/icons/flags/cn.png diff --git a/src/Icons/flags/co.png b/src/icons/flags/co.png similarity index 100% rename from src/Icons/flags/co.png rename to src/icons/flags/co.png diff --git a/src/Icons/flags/cr.png b/src/icons/flags/cr.png similarity index 100% rename from src/Icons/flags/cr.png rename to src/icons/flags/cr.png diff --git a/src/Icons/flags/cs.png b/src/icons/flags/cs.png similarity index 100% rename from src/Icons/flags/cs.png rename to src/icons/flags/cs.png diff --git a/src/Icons/flags/cu.png b/src/icons/flags/cu.png similarity index 100% rename from src/Icons/flags/cu.png rename to src/icons/flags/cu.png diff --git a/src/Icons/flags/cv.png b/src/icons/flags/cv.png similarity index 100% rename from src/Icons/flags/cv.png rename to src/icons/flags/cv.png diff --git a/src/Icons/flags/cx.png b/src/icons/flags/cx.png similarity index 100% rename from src/Icons/flags/cx.png rename to src/icons/flags/cx.png diff --git a/src/Icons/flags/cy.png b/src/icons/flags/cy.png similarity index 100% rename from src/Icons/flags/cy.png rename to src/icons/flags/cy.png diff --git a/src/Icons/flags/cz.png b/src/icons/flags/cz.png similarity index 100% rename from src/Icons/flags/cz.png rename to src/icons/flags/cz.png diff --git a/src/Icons/flags/de.png b/src/icons/flags/de.png similarity index 100% rename from src/Icons/flags/de.png rename to src/icons/flags/de.png diff --git a/src/Icons/flags/dj.png b/src/icons/flags/dj.png similarity index 100% rename from src/Icons/flags/dj.png rename to src/icons/flags/dj.png diff --git a/src/Icons/flags/dk.png b/src/icons/flags/dk.png similarity index 100% rename from src/Icons/flags/dk.png rename to src/icons/flags/dk.png diff --git a/src/Icons/flags/dm.png b/src/icons/flags/dm.png similarity index 100% rename from src/Icons/flags/dm.png rename to src/icons/flags/dm.png diff --git a/src/Icons/flags/do.png b/src/icons/flags/do.png similarity index 100% rename from src/Icons/flags/do.png rename to src/icons/flags/do.png diff --git a/src/Icons/flags/dz.png b/src/icons/flags/dz.png similarity index 100% rename from src/Icons/flags/dz.png rename to src/icons/flags/dz.png diff --git a/src/Icons/flags/ec.png b/src/icons/flags/ec.png similarity index 100% rename from src/Icons/flags/ec.png rename to src/icons/flags/ec.png diff --git a/src/Icons/flags/ee.png b/src/icons/flags/ee.png similarity index 100% rename from src/Icons/flags/ee.png rename to src/icons/flags/ee.png diff --git a/src/Icons/flags/eg.png b/src/icons/flags/eg.png similarity index 100% rename from src/Icons/flags/eg.png rename to src/icons/flags/eg.png diff --git a/src/Icons/flags/eh.png b/src/icons/flags/eh.png similarity index 100% rename from src/Icons/flags/eh.png rename to src/icons/flags/eh.png diff --git a/src/Icons/flags/er.png b/src/icons/flags/er.png similarity index 100% rename from src/Icons/flags/er.png rename to src/icons/flags/er.png diff --git a/src/Icons/flags/es.png b/src/icons/flags/es.png similarity index 100% rename from src/Icons/flags/es.png rename to src/icons/flags/es.png diff --git a/src/Icons/flags/et.png b/src/icons/flags/et.png similarity index 100% rename from src/Icons/flags/et.png rename to src/icons/flags/et.png diff --git a/src/Icons/flags/fi.png b/src/icons/flags/fi.png similarity index 100% rename from src/Icons/flags/fi.png rename to src/icons/flags/fi.png diff --git a/src/Icons/flags/fj.png b/src/icons/flags/fj.png similarity index 100% rename from src/Icons/flags/fj.png rename to src/icons/flags/fj.png diff --git a/src/Icons/flags/fk.png b/src/icons/flags/fk.png similarity index 100% rename from src/Icons/flags/fk.png rename to src/icons/flags/fk.png diff --git a/src/Icons/flags/fm.png b/src/icons/flags/fm.png similarity index 100% rename from src/Icons/flags/fm.png rename to src/icons/flags/fm.png diff --git a/src/Icons/flags/fo.png b/src/icons/flags/fo.png similarity index 100% rename from src/Icons/flags/fo.png rename to src/icons/flags/fo.png diff --git a/src/Icons/flags/fr.png b/src/icons/flags/fr.png similarity index 100% rename from src/Icons/flags/fr.png rename to src/icons/flags/fr.png diff --git a/src/Icons/flags/ga.png b/src/icons/flags/ga.png similarity index 100% rename from src/Icons/flags/ga.png rename to src/icons/flags/ga.png diff --git a/src/Icons/flags/gb.png b/src/icons/flags/gb.png similarity index 100% rename from src/Icons/flags/gb.png rename to src/icons/flags/gb.png diff --git a/src/Icons/flags/gd.png b/src/icons/flags/gd.png similarity index 100% rename from src/Icons/flags/gd.png rename to src/icons/flags/gd.png diff --git a/src/Icons/flags/ge.png b/src/icons/flags/ge.png similarity index 100% rename from src/Icons/flags/ge.png rename to src/icons/flags/ge.png diff --git a/src/Icons/flags/gf.png b/src/icons/flags/gf.png similarity index 100% rename from src/Icons/flags/gf.png rename to src/icons/flags/gf.png diff --git a/src/Icons/flags/gh.png b/src/icons/flags/gh.png similarity index 100% rename from src/Icons/flags/gh.png rename to src/icons/flags/gh.png diff --git a/src/Icons/flags/gi.png b/src/icons/flags/gi.png similarity index 100% rename from src/Icons/flags/gi.png rename to src/icons/flags/gi.png diff --git a/src/Icons/flags/gl.png b/src/icons/flags/gl.png similarity index 100% rename from src/Icons/flags/gl.png rename to src/icons/flags/gl.png diff --git a/src/Icons/flags/gm.png b/src/icons/flags/gm.png similarity index 100% rename from src/Icons/flags/gm.png rename to src/icons/flags/gm.png diff --git a/src/Icons/flags/gn.png b/src/icons/flags/gn.png similarity index 100% rename from src/Icons/flags/gn.png rename to src/icons/flags/gn.png diff --git a/src/Icons/flags/gp.png b/src/icons/flags/gp.png similarity index 100% rename from src/Icons/flags/gp.png rename to src/icons/flags/gp.png diff --git a/src/Icons/flags/gq.png b/src/icons/flags/gq.png similarity index 100% rename from src/Icons/flags/gq.png rename to src/icons/flags/gq.png diff --git a/src/Icons/flags/gr.png b/src/icons/flags/gr.png similarity index 100% rename from src/Icons/flags/gr.png rename to src/icons/flags/gr.png diff --git a/src/Icons/flags/gs.png b/src/icons/flags/gs.png similarity index 100% rename from src/Icons/flags/gs.png rename to src/icons/flags/gs.png diff --git a/src/Icons/flags/gt.png b/src/icons/flags/gt.png similarity index 100% rename from src/Icons/flags/gt.png rename to src/icons/flags/gt.png diff --git a/src/Icons/flags/gu.png b/src/icons/flags/gu.png similarity index 100% rename from src/Icons/flags/gu.png rename to src/icons/flags/gu.png diff --git a/src/Icons/flags/gw.png b/src/icons/flags/gw.png similarity index 100% rename from src/Icons/flags/gw.png rename to src/icons/flags/gw.png diff --git a/src/Icons/flags/gy.png b/src/icons/flags/gy.png similarity index 100% rename from src/Icons/flags/gy.png rename to src/icons/flags/gy.png diff --git a/src/Icons/flags/hk.png b/src/icons/flags/hk.png similarity index 100% rename from src/Icons/flags/hk.png rename to src/icons/flags/hk.png diff --git a/src/Icons/flags/hm.png b/src/icons/flags/hm.png similarity index 100% rename from src/Icons/flags/hm.png rename to src/icons/flags/hm.png diff --git a/src/Icons/flags/hn.png b/src/icons/flags/hn.png similarity index 100% rename from src/Icons/flags/hn.png rename to src/icons/flags/hn.png diff --git a/src/Icons/flags/hr.png b/src/icons/flags/hr.png similarity index 100% rename from src/Icons/flags/hr.png rename to src/icons/flags/hr.png diff --git a/src/Icons/flags/ht.png b/src/icons/flags/ht.png similarity index 100% rename from src/Icons/flags/ht.png rename to src/icons/flags/ht.png diff --git a/src/Icons/flags/hu.png b/src/icons/flags/hu.png similarity index 100% rename from src/Icons/flags/hu.png rename to src/icons/flags/hu.png diff --git a/src/Icons/flags/icons-set-readme.txt b/src/icons/flags/icons-set-readme.txt similarity index 100% rename from src/Icons/flags/icons-set-readme.txt rename to src/icons/flags/icons-set-readme.txt diff --git a/src/Icons/flags/id.png b/src/icons/flags/id.png similarity index 100% rename from src/Icons/flags/id.png rename to src/icons/flags/id.png diff --git a/src/Icons/flags/ie.png b/src/icons/flags/ie.png similarity index 100% rename from src/Icons/flags/ie.png rename to src/icons/flags/ie.png diff --git a/src/Icons/flags/il.png b/src/icons/flags/il.png similarity index 100% rename from src/Icons/flags/il.png rename to src/icons/flags/il.png diff --git a/src/Icons/flags/in.png b/src/icons/flags/in.png similarity index 100% rename from src/Icons/flags/in.png rename to src/icons/flags/in.png diff --git a/src/Icons/flags/io.png b/src/icons/flags/io.png similarity index 100% rename from src/Icons/flags/io.png rename to src/icons/flags/io.png diff --git a/src/Icons/flags/iq.png b/src/icons/flags/iq.png similarity index 100% rename from src/Icons/flags/iq.png rename to src/icons/flags/iq.png diff --git a/src/Icons/flags/ir.png b/src/icons/flags/ir.png similarity index 100% rename from src/Icons/flags/ir.png rename to src/icons/flags/ir.png diff --git a/src/Icons/flags/is.png b/src/icons/flags/is.png similarity index 100% rename from src/Icons/flags/is.png rename to src/icons/flags/is.png diff --git a/src/Icons/flags/it.png b/src/icons/flags/it.png similarity index 100% rename from src/Icons/flags/it.png rename to src/icons/flags/it.png diff --git a/src/Icons/flags/jm.png b/src/icons/flags/jm.png similarity index 100% rename from src/Icons/flags/jm.png rename to src/icons/flags/jm.png diff --git a/src/Icons/flags/jo.png b/src/icons/flags/jo.png similarity index 100% rename from src/Icons/flags/jo.png rename to src/icons/flags/jo.png diff --git a/src/Icons/flags/jp.png b/src/icons/flags/jp.png similarity index 100% rename from src/Icons/flags/jp.png rename to src/icons/flags/jp.png diff --git a/src/Icons/flags/ke.png b/src/icons/flags/ke.png similarity index 100% rename from src/Icons/flags/ke.png rename to src/icons/flags/ke.png diff --git a/src/Icons/flags/kg.png b/src/icons/flags/kg.png similarity index 100% rename from src/Icons/flags/kg.png rename to src/icons/flags/kg.png diff --git a/src/Icons/flags/kh.png b/src/icons/flags/kh.png similarity index 100% rename from src/Icons/flags/kh.png rename to src/icons/flags/kh.png diff --git a/src/Icons/flags/ki.png b/src/icons/flags/ki.png similarity index 100% rename from src/Icons/flags/ki.png rename to src/icons/flags/ki.png diff --git a/src/Icons/flags/km.png b/src/icons/flags/km.png similarity index 100% rename from src/Icons/flags/km.png rename to src/icons/flags/km.png diff --git a/src/Icons/flags/kn.png b/src/icons/flags/kn.png similarity index 100% rename from src/Icons/flags/kn.png rename to src/icons/flags/kn.png diff --git a/src/Icons/flags/kp.png b/src/icons/flags/kp.png similarity index 100% rename from src/Icons/flags/kp.png rename to src/icons/flags/kp.png diff --git a/src/Icons/flags/kr.png b/src/icons/flags/kr.png similarity index 100% rename from src/Icons/flags/kr.png rename to src/icons/flags/kr.png diff --git a/src/Icons/flags/kw.png b/src/icons/flags/kw.png similarity index 100% rename from src/Icons/flags/kw.png rename to src/icons/flags/kw.png diff --git a/src/Icons/flags/ky.png b/src/icons/flags/ky.png similarity index 100% rename from src/Icons/flags/ky.png rename to src/icons/flags/ky.png diff --git a/src/Icons/flags/kz.png b/src/icons/flags/kz.png similarity index 100% rename from src/Icons/flags/kz.png rename to src/icons/flags/kz.png diff --git a/src/Icons/flags/la.png b/src/icons/flags/la.png similarity index 100% rename from src/Icons/flags/la.png rename to src/icons/flags/la.png diff --git a/src/Icons/flags/lb.png b/src/icons/flags/lb.png similarity index 100% rename from src/Icons/flags/lb.png rename to src/icons/flags/lb.png diff --git a/src/Icons/flags/lc.png b/src/icons/flags/lc.png similarity index 100% rename from src/Icons/flags/lc.png rename to src/icons/flags/lc.png diff --git a/src/Icons/flags/li.png b/src/icons/flags/li.png similarity index 100% rename from src/Icons/flags/li.png rename to src/icons/flags/li.png diff --git a/src/Icons/flags/lk.png b/src/icons/flags/lk.png similarity index 100% rename from src/Icons/flags/lk.png rename to src/icons/flags/lk.png diff --git a/src/Icons/flags/lr.png b/src/icons/flags/lr.png similarity index 100% rename from src/Icons/flags/lr.png rename to src/icons/flags/lr.png diff --git a/src/Icons/flags/ls.png b/src/icons/flags/ls.png similarity index 100% rename from src/Icons/flags/ls.png rename to src/icons/flags/ls.png diff --git a/src/Icons/flags/lt.png b/src/icons/flags/lt.png similarity index 100% rename from src/Icons/flags/lt.png rename to src/icons/flags/lt.png diff --git a/src/Icons/flags/lu.png b/src/icons/flags/lu.png similarity index 100% rename from src/Icons/flags/lu.png rename to src/icons/flags/lu.png diff --git a/src/Icons/flags/lv.png b/src/icons/flags/lv.png similarity index 100% rename from src/Icons/flags/lv.png rename to src/icons/flags/lv.png diff --git a/src/Icons/flags/ly.png b/src/icons/flags/ly.png similarity index 100% rename from src/Icons/flags/ly.png rename to src/icons/flags/ly.png diff --git a/src/Icons/flags/ma.png b/src/icons/flags/ma.png similarity index 100% rename from src/Icons/flags/ma.png rename to src/icons/flags/ma.png diff --git a/src/Icons/flags/mc.png b/src/icons/flags/mc.png similarity index 100% rename from src/Icons/flags/mc.png rename to src/icons/flags/mc.png diff --git a/src/Icons/flags/md.png b/src/icons/flags/md.png similarity index 100% rename from src/Icons/flags/md.png rename to src/icons/flags/md.png diff --git a/src/Icons/flags/me.png b/src/icons/flags/me.png similarity index 100% rename from src/Icons/flags/me.png rename to src/icons/flags/me.png diff --git a/src/Icons/flags/mg.png b/src/icons/flags/mg.png similarity index 100% rename from src/Icons/flags/mg.png rename to src/icons/flags/mg.png diff --git a/src/Icons/flags/mh.png b/src/icons/flags/mh.png similarity index 100% rename from src/Icons/flags/mh.png rename to src/icons/flags/mh.png diff --git a/src/Icons/flags/mk.png b/src/icons/flags/mk.png similarity index 100% rename from src/Icons/flags/mk.png rename to src/icons/flags/mk.png diff --git a/src/Icons/flags/ml.png b/src/icons/flags/ml.png similarity index 100% rename from src/Icons/flags/ml.png rename to src/icons/flags/ml.png diff --git a/src/Icons/flags/mm.png b/src/icons/flags/mm.png similarity index 100% rename from src/Icons/flags/mm.png rename to src/icons/flags/mm.png diff --git a/src/Icons/flags/mn.png b/src/icons/flags/mn.png similarity index 100% rename from src/Icons/flags/mn.png rename to src/icons/flags/mn.png diff --git a/src/Icons/flags/mo.png b/src/icons/flags/mo.png similarity index 100% rename from src/Icons/flags/mo.png rename to src/icons/flags/mo.png diff --git a/src/Icons/flags/mp.png b/src/icons/flags/mp.png similarity index 100% rename from src/Icons/flags/mp.png rename to src/icons/flags/mp.png diff --git a/src/Icons/flags/mq.png b/src/icons/flags/mq.png similarity index 100% rename from src/Icons/flags/mq.png rename to src/icons/flags/mq.png diff --git a/src/Icons/flags/mr.png b/src/icons/flags/mr.png similarity index 100% rename from src/Icons/flags/mr.png rename to src/icons/flags/mr.png diff --git a/src/Icons/flags/ms.png b/src/icons/flags/ms.png similarity index 100% rename from src/Icons/flags/ms.png rename to src/icons/flags/ms.png diff --git a/src/Icons/flags/mt.png b/src/icons/flags/mt.png similarity index 100% rename from src/Icons/flags/mt.png rename to src/icons/flags/mt.png diff --git a/src/Icons/flags/mu.png b/src/icons/flags/mu.png similarity index 100% rename from src/Icons/flags/mu.png rename to src/icons/flags/mu.png diff --git a/src/Icons/flags/mv.png b/src/icons/flags/mv.png similarity index 100% rename from src/Icons/flags/mv.png rename to src/icons/flags/mv.png diff --git a/src/Icons/flags/mw.png b/src/icons/flags/mw.png similarity index 100% rename from src/Icons/flags/mw.png rename to src/icons/flags/mw.png diff --git a/src/Icons/flags/mx.png b/src/icons/flags/mx.png similarity index 100% rename from src/Icons/flags/mx.png rename to src/icons/flags/mx.png diff --git a/src/Icons/flags/my.png b/src/icons/flags/my.png similarity index 100% rename from src/Icons/flags/my.png rename to src/icons/flags/my.png diff --git a/src/Icons/flags/mz.png b/src/icons/flags/mz.png similarity index 100% rename from src/Icons/flags/mz.png rename to src/icons/flags/mz.png diff --git a/src/Icons/flags/na.png b/src/icons/flags/na.png similarity index 100% rename from src/Icons/flags/na.png rename to src/icons/flags/na.png diff --git a/src/Icons/flags/nc.png b/src/icons/flags/nc.png similarity index 100% rename from src/Icons/flags/nc.png rename to src/icons/flags/nc.png diff --git a/src/Icons/flags/ne.png b/src/icons/flags/ne.png similarity index 100% rename from src/Icons/flags/ne.png rename to src/icons/flags/ne.png diff --git a/src/Icons/flags/nf.png b/src/icons/flags/nf.png similarity index 100% rename from src/Icons/flags/nf.png rename to src/icons/flags/nf.png diff --git a/src/Icons/flags/ng.png b/src/icons/flags/ng.png similarity index 100% rename from src/Icons/flags/ng.png rename to src/icons/flags/ng.png diff --git a/src/Icons/flags/ni.png b/src/icons/flags/ni.png similarity index 100% rename from src/Icons/flags/ni.png rename to src/icons/flags/ni.png diff --git a/src/Icons/flags/nl.png b/src/icons/flags/nl.png similarity index 100% rename from src/Icons/flags/nl.png rename to src/icons/flags/nl.png diff --git a/src/Icons/flags/no.png b/src/icons/flags/no.png similarity index 100% rename from src/Icons/flags/no.png rename to src/icons/flags/no.png diff --git a/src/Icons/flags/np.png b/src/icons/flags/np.png similarity index 100% rename from src/Icons/flags/np.png rename to src/icons/flags/np.png diff --git a/src/Icons/flags/nr.png b/src/icons/flags/nr.png similarity index 100% rename from src/Icons/flags/nr.png rename to src/icons/flags/nr.png diff --git a/src/Icons/flags/nu.png b/src/icons/flags/nu.png similarity index 100% rename from src/Icons/flags/nu.png rename to src/icons/flags/nu.png diff --git a/src/Icons/flags/nz.png b/src/icons/flags/nz.png similarity index 100% rename from src/Icons/flags/nz.png rename to src/icons/flags/nz.png diff --git a/src/Icons/flags/om.png b/src/icons/flags/om.png similarity index 100% rename from src/Icons/flags/om.png rename to src/icons/flags/om.png diff --git a/src/Icons/flags/pa.png b/src/icons/flags/pa.png similarity index 100% rename from src/Icons/flags/pa.png rename to src/icons/flags/pa.png diff --git a/src/Icons/flags/pe.png b/src/icons/flags/pe.png similarity index 100% rename from src/Icons/flags/pe.png rename to src/icons/flags/pe.png diff --git a/src/Icons/flags/pf.png b/src/icons/flags/pf.png similarity index 100% rename from src/Icons/flags/pf.png rename to src/icons/flags/pf.png diff --git a/src/Icons/flags/pg.png b/src/icons/flags/pg.png similarity index 100% rename from src/Icons/flags/pg.png rename to src/icons/flags/pg.png diff --git a/src/Icons/flags/ph.png b/src/icons/flags/ph.png similarity index 100% rename from src/Icons/flags/ph.png rename to src/icons/flags/ph.png diff --git a/src/Icons/flags/pk.png b/src/icons/flags/pk.png similarity index 100% rename from src/Icons/flags/pk.png rename to src/icons/flags/pk.png diff --git a/src/Icons/flags/pl.png b/src/icons/flags/pl.png similarity index 100% rename from src/Icons/flags/pl.png rename to src/icons/flags/pl.png diff --git a/src/Icons/flags/pm.png b/src/icons/flags/pm.png similarity index 100% rename from src/Icons/flags/pm.png rename to src/icons/flags/pm.png diff --git a/src/Icons/flags/pn.png b/src/icons/flags/pn.png similarity index 100% rename from src/Icons/flags/pn.png rename to src/icons/flags/pn.png diff --git a/src/Icons/flags/pr.png b/src/icons/flags/pr.png similarity index 100% rename from src/Icons/flags/pr.png rename to src/icons/flags/pr.png diff --git a/src/Icons/flags/ps.png b/src/icons/flags/ps.png similarity index 100% rename from src/Icons/flags/ps.png rename to src/icons/flags/ps.png diff --git a/src/Icons/flags/pt.png b/src/icons/flags/pt.png similarity index 100% rename from src/Icons/flags/pt.png rename to src/icons/flags/pt.png diff --git a/src/Icons/flags/pw.png b/src/icons/flags/pw.png similarity index 100% rename from src/Icons/flags/pw.png rename to src/icons/flags/pw.png diff --git a/src/Icons/flags/py.png b/src/icons/flags/py.png similarity index 100% rename from src/Icons/flags/py.png rename to src/icons/flags/py.png diff --git a/src/Icons/flags/qa.png b/src/icons/flags/qa.png similarity index 100% rename from src/Icons/flags/qa.png rename to src/icons/flags/qa.png diff --git a/src/Icons/flags/re.png b/src/icons/flags/re.png similarity index 100% rename from src/Icons/flags/re.png rename to src/icons/flags/re.png diff --git a/src/Icons/flags/ro.png b/src/icons/flags/ro.png similarity index 100% rename from src/Icons/flags/ro.png rename to src/icons/flags/ro.png diff --git a/src/Icons/flags/rs.png b/src/icons/flags/rs.png similarity index 100% rename from src/Icons/flags/rs.png rename to src/icons/flags/rs.png diff --git a/src/Icons/flags/ru.png b/src/icons/flags/ru.png similarity index 100% rename from src/Icons/flags/ru.png rename to src/icons/flags/ru.png diff --git a/src/Icons/flags/rw.png b/src/icons/flags/rw.png similarity index 100% rename from src/Icons/flags/rw.png rename to src/icons/flags/rw.png diff --git a/src/Icons/flags/sa.png b/src/icons/flags/sa.png similarity index 100% rename from src/Icons/flags/sa.png rename to src/icons/flags/sa.png diff --git a/src/Icons/flags/sb.png b/src/icons/flags/sb.png similarity index 100% rename from src/Icons/flags/sb.png rename to src/icons/flags/sb.png diff --git a/src/Icons/flags/sc.png b/src/icons/flags/sc.png similarity index 100% rename from src/Icons/flags/sc.png rename to src/icons/flags/sc.png diff --git a/src/Icons/flags/sd.png b/src/icons/flags/sd.png similarity index 100% rename from src/Icons/flags/sd.png rename to src/icons/flags/sd.png diff --git a/src/Icons/flags/se.png b/src/icons/flags/se.png similarity index 100% rename from src/Icons/flags/se.png rename to src/icons/flags/se.png diff --git a/src/Icons/flags/sg.png b/src/icons/flags/sg.png similarity index 100% rename from src/Icons/flags/sg.png rename to src/icons/flags/sg.png diff --git a/src/Icons/flags/sh.png b/src/icons/flags/sh.png similarity index 100% rename from src/Icons/flags/sh.png rename to src/icons/flags/sh.png diff --git a/src/Icons/flags/si.png b/src/icons/flags/si.png similarity index 100% rename from src/Icons/flags/si.png rename to src/icons/flags/si.png diff --git a/src/Icons/flags/sj.png b/src/icons/flags/sj.png similarity index 100% rename from src/Icons/flags/sj.png rename to src/icons/flags/sj.png diff --git a/src/Icons/flags/sk.png b/src/icons/flags/sk.png similarity index 100% rename from src/Icons/flags/sk.png rename to src/icons/flags/sk.png diff --git a/src/Icons/flags/sl.png b/src/icons/flags/sl.png similarity index 100% rename from src/Icons/flags/sl.png rename to src/icons/flags/sl.png diff --git a/src/Icons/flags/sm.png b/src/icons/flags/sm.png similarity index 100% rename from src/Icons/flags/sm.png rename to src/icons/flags/sm.png diff --git a/src/Icons/flags/sn.png b/src/icons/flags/sn.png similarity index 100% rename from src/Icons/flags/sn.png rename to src/icons/flags/sn.png diff --git a/src/Icons/flags/so.png b/src/icons/flags/so.png similarity index 100% rename from src/Icons/flags/so.png rename to src/icons/flags/so.png diff --git a/src/Icons/flags/sr.png b/src/icons/flags/sr.png similarity index 100% rename from src/Icons/flags/sr.png rename to src/icons/flags/sr.png diff --git a/src/Icons/flags/st.png b/src/icons/flags/st.png similarity index 100% rename from src/Icons/flags/st.png rename to src/icons/flags/st.png diff --git a/src/Icons/flags/sv.png b/src/icons/flags/sv.png similarity index 100% rename from src/Icons/flags/sv.png rename to src/icons/flags/sv.png diff --git a/src/Icons/flags/sy.png b/src/icons/flags/sy.png similarity index 100% rename from src/Icons/flags/sy.png rename to src/icons/flags/sy.png diff --git a/src/Icons/flags/sz.png b/src/icons/flags/sz.png similarity index 100% rename from src/Icons/flags/sz.png rename to src/icons/flags/sz.png diff --git a/src/Icons/flags/tc.png b/src/icons/flags/tc.png similarity index 100% rename from src/Icons/flags/tc.png rename to src/icons/flags/tc.png diff --git a/src/Icons/flags/td.png b/src/icons/flags/td.png similarity index 100% rename from src/Icons/flags/td.png rename to src/icons/flags/td.png diff --git a/src/Icons/flags/tf.png b/src/icons/flags/tf.png similarity index 100% rename from src/Icons/flags/tf.png rename to src/icons/flags/tf.png diff --git a/src/Icons/flags/tg.png b/src/icons/flags/tg.png similarity index 100% rename from src/Icons/flags/tg.png rename to src/icons/flags/tg.png diff --git a/src/Icons/flags/th.png b/src/icons/flags/th.png similarity index 100% rename from src/Icons/flags/th.png rename to src/icons/flags/th.png diff --git a/src/Icons/flags/tj.png b/src/icons/flags/tj.png similarity index 100% rename from src/Icons/flags/tj.png rename to src/icons/flags/tj.png diff --git a/src/Icons/flags/tk.png b/src/icons/flags/tk.png similarity index 100% rename from src/Icons/flags/tk.png rename to src/icons/flags/tk.png diff --git a/src/Icons/flags/tl.png b/src/icons/flags/tl.png similarity index 100% rename from src/Icons/flags/tl.png rename to src/icons/flags/tl.png diff --git a/src/Icons/flags/tm.png b/src/icons/flags/tm.png similarity index 100% rename from src/Icons/flags/tm.png rename to src/icons/flags/tm.png diff --git a/src/Icons/flags/tn.png b/src/icons/flags/tn.png similarity index 100% rename from src/Icons/flags/tn.png rename to src/icons/flags/tn.png diff --git a/src/Icons/flags/to.png b/src/icons/flags/to.png similarity index 100% rename from src/Icons/flags/to.png rename to src/icons/flags/to.png diff --git a/src/Icons/flags/tr.png b/src/icons/flags/tr.png similarity index 100% rename from src/Icons/flags/tr.png rename to src/icons/flags/tr.png diff --git a/src/Icons/flags/tt.png b/src/icons/flags/tt.png similarity index 100% rename from src/Icons/flags/tt.png rename to src/icons/flags/tt.png diff --git a/src/Icons/flags/tv.png b/src/icons/flags/tv.png similarity index 100% rename from src/Icons/flags/tv.png rename to src/icons/flags/tv.png diff --git a/src/Icons/flags/tw.png b/src/icons/flags/tw.png similarity index 100% rename from src/Icons/flags/tw.png rename to src/icons/flags/tw.png diff --git a/src/Icons/flags/tz.png b/src/icons/flags/tz.png similarity index 100% rename from src/Icons/flags/tz.png rename to src/icons/flags/tz.png diff --git a/src/Icons/flags/ua.png b/src/icons/flags/ua.png similarity index 100% rename from src/Icons/flags/ua.png rename to src/icons/flags/ua.png diff --git a/src/Icons/flags/ug.png b/src/icons/flags/ug.png similarity index 100% rename from src/Icons/flags/ug.png rename to src/icons/flags/ug.png diff --git a/src/Icons/flags/um.png b/src/icons/flags/um.png similarity index 100% rename from src/Icons/flags/um.png rename to src/icons/flags/um.png diff --git a/src/Icons/flags/us.png b/src/icons/flags/us.png similarity index 100% rename from src/Icons/flags/us.png rename to src/icons/flags/us.png diff --git a/src/Icons/flags/uy.png b/src/icons/flags/uy.png similarity index 100% rename from src/Icons/flags/uy.png rename to src/icons/flags/uy.png diff --git a/src/Icons/flags/uz.png b/src/icons/flags/uz.png similarity index 100% rename from src/Icons/flags/uz.png rename to src/icons/flags/uz.png diff --git a/src/Icons/flags/va.png b/src/icons/flags/va.png similarity index 100% rename from src/Icons/flags/va.png rename to src/icons/flags/va.png diff --git a/src/Icons/flags/vc.png b/src/icons/flags/vc.png similarity index 100% rename from src/Icons/flags/vc.png rename to src/icons/flags/vc.png diff --git a/src/Icons/flags/ve.png b/src/icons/flags/ve.png similarity index 100% rename from src/Icons/flags/ve.png rename to src/icons/flags/ve.png diff --git a/src/Icons/flags/vg.png b/src/icons/flags/vg.png similarity index 100% rename from src/Icons/flags/vg.png rename to src/icons/flags/vg.png diff --git a/src/Icons/flags/vi.png b/src/icons/flags/vi.png similarity index 100% rename from src/Icons/flags/vi.png rename to src/icons/flags/vi.png diff --git a/src/Icons/flags/vn.png b/src/icons/flags/vn.png similarity index 100% rename from src/Icons/flags/vn.png rename to src/icons/flags/vn.png diff --git a/src/Icons/flags/vu.png b/src/icons/flags/vu.png similarity index 100% rename from src/Icons/flags/vu.png rename to src/icons/flags/vu.png diff --git a/src/Icons/flags/wf.png b/src/icons/flags/wf.png similarity index 100% rename from src/Icons/flags/wf.png rename to src/icons/flags/wf.png diff --git a/src/Icons/flags/ws.png b/src/icons/flags/ws.png similarity index 100% rename from src/Icons/flags/ws.png rename to src/icons/flags/ws.png diff --git a/src/Icons/flags/ye.png b/src/icons/flags/ye.png similarity index 100% rename from src/Icons/flags/ye.png rename to src/icons/flags/ye.png diff --git a/src/Icons/flags/yt.png b/src/icons/flags/yt.png similarity index 100% rename from src/Icons/flags/yt.png rename to src/icons/flags/yt.png diff --git a/src/Icons/flags/za.png b/src/icons/flags/za.png similarity index 100% rename from src/Icons/flags/za.png rename to src/icons/flags/za.png diff --git a/src/Icons/flags/zm.png b/src/icons/flags/zm.png similarity index 100% rename from src/Icons/flags/zm.png rename to src/icons/flags/zm.png diff --git a/src/Icons/flags/zw.png b/src/icons/flags/zw.png similarity index 100% rename from src/Icons/flags/zw.png rename to src/icons/flags/zw.png diff --git a/src/Icons/loading.png b/src/icons/loading.png similarity index 100% rename from src/Icons/loading.png rename to src/icons/loading.png diff --git a/src/Icons/magnet.png b/src/icons/magnet.png similarity index 100% rename from src/Icons/magnet.png rename to src/icons/magnet.png diff --git a/src/Icons/oxygen/application-exit.png b/src/icons/oxygen/application-exit.png similarity index 100% rename from src/Icons/oxygen/application-exit.png rename to src/icons/oxygen/application-exit.png diff --git a/src/Icons/oxygen/application-rss+xml.png b/src/icons/oxygen/application-rss+xml.png similarity index 100% rename from src/Icons/oxygen/application-rss+xml.png rename to src/icons/oxygen/application-rss+xml.png diff --git a/src/Icons/oxygen/application-x-mswinurl.png b/src/icons/oxygen/application-x-mswinurl.png similarity index 100% rename from src/Icons/oxygen/application-x-mswinurl.png rename to src/icons/oxygen/application-x-mswinurl.png diff --git a/src/Icons/oxygen/checked.png b/src/icons/oxygen/checked.png similarity index 100% rename from src/Icons/oxygen/checked.png rename to src/icons/oxygen/checked.png diff --git a/src/Icons/oxygen/chronometer.png b/src/icons/oxygen/chronometer.png similarity index 100% rename from src/Icons/oxygen/chronometer.png rename to src/icons/oxygen/chronometer.png diff --git a/src/Icons/oxygen/dialog-cancel.png b/src/icons/oxygen/dialog-cancel.png similarity index 100% rename from src/Icons/oxygen/dialog-cancel.png rename to src/icons/oxygen/dialog-cancel.png diff --git a/src/Icons/oxygen/dialog-information.png b/src/icons/oxygen/dialog-information.png similarity index 100% rename from src/Icons/oxygen/dialog-information.png rename to src/icons/oxygen/dialog-information.png diff --git a/src/Icons/oxygen/dialog-warning.png b/src/icons/oxygen/dialog-warning.png similarity index 100% rename from src/Icons/oxygen/dialog-warning.png rename to src/icons/oxygen/dialog-warning.png diff --git a/src/Icons/oxygen/document-edit-verify.png b/src/icons/oxygen/document-edit-verify.png similarity index 100% rename from src/Icons/oxygen/document-edit-verify.png rename to src/icons/oxygen/document-edit-verify.png diff --git a/src/Icons/oxygen/document-edit.png b/src/icons/oxygen/document-edit.png similarity index 100% rename from src/Icons/oxygen/document-edit.png rename to src/icons/oxygen/document-edit.png diff --git a/src/Icons/oxygen/document-encrypt.png b/src/icons/oxygen/document-encrypt.png similarity index 100% rename from src/Icons/oxygen/document-encrypt.png rename to src/icons/oxygen/document-encrypt.png diff --git a/src/Icons/oxygen/document-import.png b/src/icons/oxygen/document-import.png similarity index 100% rename from src/Icons/oxygen/document-import.png rename to src/icons/oxygen/document-import.png diff --git a/src/Icons/oxygen/document-new.png b/src/icons/oxygen/document-new.png similarity index 100% rename from src/Icons/oxygen/document-new.png rename to src/icons/oxygen/document-new.png diff --git a/src/Icons/oxygen/document-properties.png b/src/icons/oxygen/document-properties.png similarity index 100% rename from src/Icons/oxygen/document-properties.png rename to src/icons/oxygen/document-properties.png diff --git a/src/Icons/oxygen/document-save.png b/src/icons/oxygen/document-save.png similarity index 100% rename from src/Icons/oxygen/document-save.png rename to src/icons/oxygen/document-save.png diff --git a/src/Icons/oxygen/download.png b/src/icons/oxygen/download.png similarity index 100% rename from src/Icons/oxygen/download.png rename to src/icons/oxygen/download.png diff --git a/src/Icons/oxygen/edit-clear-history.png b/src/icons/oxygen/edit-clear-history.png similarity index 100% rename from src/Icons/oxygen/edit-clear-history.png rename to src/icons/oxygen/edit-clear-history.png diff --git a/src/Icons/oxygen/edit-clear.png b/src/icons/oxygen/edit-clear.png similarity index 100% rename from src/Icons/oxygen/edit-clear.png rename to src/icons/oxygen/edit-clear.png diff --git a/src/Icons/oxygen/edit-copy.png b/src/icons/oxygen/edit-copy.png similarity index 100% rename from src/Icons/oxygen/edit-copy.png rename to src/icons/oxygen/edit-copy.png diff --git a/src/Icons/oxygen/edit-cut.png b/src/icons/oxygen/edit-cut.png similarity index 100% rename from src/Icons/oxygen/edit-cut.png rename to src/icons/oxygen/edit-cut.png diff --git a/src/Icons/oxygen/edit-delete.png b/src/icons/oxygen/edit-delete.png similarity index 100% rename from src/Icons/oxygen/edit-delete.png rename to src/icons/oxygen/edit-delete.png diff --git a/src/Icons/oxygen/edit-find-user.png b/src/icons/oxygen/edit-find-user.png similarity index 100% rename from src/Icons/oxygen/edit-find-user.png rename to src/icons/oxygen/edit-find-user.png diff --git a/src/Icons/oxygen/edit-find.png b/src/icons/oxygen/edit-find.png similarity index 100% rename from src/Icons/oxygen/edit-find.png rename to src/icons/oxygen/edit-find.png diff --git a/src/Icons/oxygen/edit-paste.png b/src/icons/oxygen/edit-paste.png similarity index 100% rename from src/Icons/oxygen/edit-paste.png rename to src/icons/oxygen/edit-paste.png diff --git a/src/Icons/oxygen/edit-rename.png b/src/icons/oxygen/edit-rename.png similarity index 100% rename from src/Icons/oxygen/edit-rename.png rename to src/icons/oxygen/edit-rename.png diff --git a/src/Icons/oxygen/folder-documents.png b/src/icons/oxygen/folder-documents.png similarity index 100% rename from src/Icons/oxygen/folder-documents.png rename to src/icons/oxygen/folder-documents.png diff --git a/src/Icons/oxygen/folder-new.png b/src/icons/oxygen/folder-new.png similarity index 100% rename from src/Icons/oxygen/folder-new.png rename to src/icons/oxygen/folder-new.png diff --git a/src/Icons/oxygen/folder-remote.png b/src/icons/oxygen/folder-remote.png similarity index 100% rename from src/Icons/oxygen/folder-remote.png rename to src/icons/oxygen/folder-remote.png diff --git a/src/Icons/oxygen/gear.png b/src/icons/oxygen/gear.png similarity index 100% rename from src/Icons/oxygen/gear.png rename to src/icons/oxygen/gear.png diff --git a/src/Icons/oxygen/gear32.png b/src/icons/oxygen/gear32.png similarity index 100% rename from src/Icons/oxygen/gear32.png rename to src/icons/oxygen/gear32.png diff --git a/src/Icons/oxygen/go-bottom.png b/src/icons/oxygen/go-bottom.png similarity index 100% rename from src/Icons/oxygen/go-bottom.png rename to src/icons/oxygen/go-bottom.png diff --git a/src/Icons/oxygen/go-down.png b/src/icons/oxygen/go-down.png similarity index 100% rename from src/Icons/oxygen/go-down.png rename to src/icons/oxygen/go-down.png diff --git a/src/Icons/oxygen/go-top.png b/src/icons/oxygen/go-top.png similarity index 100% rename from src/Icons/oxygen/go-top.png rename to src/icons/oxygen/go-top.png diff --git a/src/Icons/oxygen/go-up.png b/src/icons/oxygen/go-up.png similarity index 100% rename from src/Icons/oxygen/go-up.png rename to src/icons/oxygen/go-up.png diff --git a/src/Icons/oxygen/help-about.png b/src/icons/oxygen/help-about.png similarity index 100% rename from src/Icons/oxygen/help-about.png rename to src/icons/oxygen/help-about.png diff --git a/src/Icons/oxygen/help-contents.png b/src/icons/oxygen/help-contents.png similarity index 100% rename from src/Icons/oxygen/help-contents.png rename to src/icons/oxygen/help-contents.png diff --git a/src/Icons/oxygen/inode-directory.png b/src/icons/oxygen/inode-directory.png similarity index 100% rename from src/Icons/oxygen/inode-directory.png rename to src/icons/oxygen/inode-directory.png diff --git a/src/Icons/oxygen/insert-link.png b/src/icons/oxygen/insert-link.png similarity index 100% rename from src/Icons/oxygen/insert-link.png rename to src/icons/oxygen/insert-link.png diff --git a/src/Icons/oxygen/list-add.png b/src/icons/oxygen/list-add.png similarity index 100% rename from src/Icons/oxygen/list-add.png rename to src/icons/oxygen/list-add.png diff --git a/src/Icons/oxygen/list-remove.png b/src/icons/oxygen/list-remove.png similarity index 100% rename from src/Icons/oxygen/list-remove.png rename to src/icons/oxygen/list-remove.png diff --git a/src/Icons/oxygen/mail-folder-inbox.png b/src/icons/oxygen/mail-folder-inbox.png similarity index 100% rename from src/Icons/oxygen/mail-folder-inbox.png rename to src/icons/oxygen/mail-folder-inbox.png diff --git a/src/Icons/oxygen/mail-mark-read.png b/src/icons/oxygen/mail-mark-read.png similarity index 100% rename from src/Icons/oxygen/mail-mark-read.png rename to src/icons/oxygen/mail-mark-read.png diff --git a/src/Icons/oxygen/media-playback-pause.png b/src/icons/oxygen/media-playback-pause.png similarity index 100% rename from src/Icons/oxygen/media-playback-pause.png rename to src/icons/oxygen/media-playback-pause.png diff --git a/src/Icons/oxygen/media-playback-start.png b/src/icons/oxygen/media-playback-start.png similarity index 100% rename from src/Icons/oxygen/media-playback-start.png rename to src/icons/oxygen/media-playback-start.png diff --git a/src/Icons/oxygen/network-server.png b/src/icons/oxygen/network-server.png similarity index 100% rename from src/Icons/oxygen/network-server.png rename to src/icons/oxygen/network-server.png diff --git a/src/Icons/oxygen/network-wired.png b/src/icons/oxygen/network-wired.png similarity index 100% rename from src/Icons/oxygen/network-wired.png rename to src/icons/oxygen/network-wired.png diff --git a/src/Icons/oxygen/object-locked.png b/src/icons/oxygen/object-locked.png similarity index 100% rename from src/Icons/oxygen/object-locked.png rename to src/icons/oxygen/object-locked.png diff --git a/src/Icons/oxygen/preferences-desktop.png b/src/icons/oxygen/preferences-desktop.png similarity index 100% rename from src/Icons/oxygen/preferences-desktop.png rename to src/icons/oxygen/preferences-desktop.png diff --git a/src/Icons/oxygen/preferences-other.png b/src/icons/oxygen/preferences-other.png similarity index 100% rename from src/Icons/oxygen/preferences-other.png rename to src/icons/oxygen/preferences-other.png diff --git a/src/Icons/oxygen/preferences-system-network.png b/src/icons/oxygen/preferences-system-network.png similarity index 100% rename from src/Icons/oxygen/preferences-system-network.png rename to src/icons/oxygen/preferences-system-network.png diff --git a/src/Icons/oxygen/preferences-system.png b/src/icons/oxygen/preferences-system.png similarity index 100% rename from src/Icons/oxygen/preferences-system.png rename to src/icons/oxygen/preferences-system.png diff --git a/src/Icons/oxygen/preferences-web-browser-cookies.png b/src/icons/oxygen/preferences-web-browser-cookies.png similarity index 100% rename from src/Icons/oxygen/preferences-web-browser-cookies.png rename to src/icons/oxygen/preferences-web-browser-cookies.png diff --git a/src/Icons/oxygen/security-high.png b/src/icons/oxygen/security-high.png similarity index 100% rename from src/Icons/oxygen/security-high.png rename to src/icons/oxygen/security-high.png diff --git a/src/Icons/oxygen/security-low.png b/src/icons/oxygen/security-low.png similarity index 100% rename from src/Icons/oxygen/security-low.png rename to src/icons/oxygen/security-low.png diff --git a/src/Icons/oxygen/services.png b/src/icons/oxygen/services.png similarity index 100% rename from src/Icons/oxygen/services.png rename to src/icons/oxygen/services.png diff --git a/src/Icons/oxygen/system-log-out.png b/src/icons/oxygen/system-log-out.png similarity index 100% rename from src/Icons/oxygen/system-log-out.png rename to src/icons/oxygen/system-log-out.png diff --git a/src/Icons/oxygen/tab-close.png b/src/icons/oxygen/tab-close.png similarity index 100% rename from src/Icons/oxygen/tab-close.png rename to src/icons/oxygen/tab-close.png diff --git a/src/Icons/oxygen/task-attention.png b/src/icons/oxygen/task-attention.png similarity index 100% rename from src/Icons/oxygen/task-attention.png rename to src/icons/oxygen/task-attention.png diff --git a/src/Icons/oxygen/text-plain.png b/src/icons/oxygen/text-plain.png similarity index 100% rename from src/Icons/oxygen/text-plain.png rename to src/icons/oxygen/text-plain.png diff --git a/src/Icons/oxygen/tools-report-bug.png b/src/icons/oxygen/tools-report-bug.png similarity index 100% rename from src/Icons/oxygen/tools-report-bug.png rename to src/icons/oxygen/tools-report-bug.png diff --git a/src/Icons/oxygen/unavailable.png b/src/icons/oxygen/unavailable.png similarity index 100% rename from src/Icons/oxygen/unavailable.png rename to src/icons/oxygen/unavailable.png diff --git a/src/Icons/oxygen/user-group-delete.png b/src/icons/oxygen/user-group-delete.png similarity index 100% rename from src/Icons/oxygen/user-group-delete.png rename to src/icons/oxygen/user-group-delete.png diff --git a/src/Icons/oxygen/user-group-new.png b/src/icons/oxygen/user-group-new.png similarity index 100% rename from src/Icons/oxygen/user-group-new.png rename to src/icons/oxygen/user-group-new.png diff --git a/src/Icons/oxygen/view-calendar-journal.png b/src/icons/oxygen/view-calendar-journal.png similarity index 100% rename from src/Icons/oxygen/view-calendar-journal.png rename to src/icons/oxygen/view-calendar-journal.png diff --git a/src/Icons/oxygen/view-categories.png b/src/icons/oxygen/view-categories.png similarity index 100% rename from src/Icons/oxygen/view-categories.png rename to src/icons/oxygen/view-categories.png diff --git a/src/Icons/oxygen/view-filter.png b/src/icons/oxygen/view-filter.png similarity index 100% rename from src/Icons/oxygen/view-filter.png rename to src/icons/oxygen/view-filter.png diff --git a/src/Icons/oxygen/view-preview.png b/src/icons/oxygen/view-preview.png similarity index 100% rename from src/Icons/oxygen/view-preview.png rename to src/icons/oxygen/view-preview.png diff --git a/src/Icons/oxygen/view-refresh.png b/src/icons/oxygen/view-refresh.png similarity index 100% rename from src/Icons/oxygen/view-refresh.png rename to src/icons/oxygen/view-refresh.png diff --git a/src/Icons/oxygen/view-statistics.png b/src/icons/oxygen/view-statistics.png similarity index 100% rename from src/Icons/oxygen/view-statistics.png rename to src/icons/oxygen/view-statistics.png diff --git a/src/Icons/oxygen/wallet-open.png b/src/icons/oxygen/wallet-open.png similarity index 100% rename from src/Icons/oxygen/wallet-open.png rename to src/icons/oxygen/wallet-open.png diff --git a/src/Icons/oxygen/webui.png b/src/icons/oxygen/webui.png similarity index 100% rename from src/Icons/oxygen/webui.png rename to src/icons/oxygen/webui.png diff --git a/src/Icons/qBittorrent.desktop b/src/icons/qBittorrent.desktop similarity index 100% rename from src/Icons/qBittorrent.desktop rename to src/icons/qBittorrent.desktop diff --git a/src/menuicons/192x192/apps/qbittorrent.png b/src/icons/qbittorrent.png similarity index 100% rename from src/menuicons/192x192/apps/qbittorrent.png rename to src/icons/qbittorrent.png diff --git a/src/Icons/skin/arrow-right.gif b/src/icons/skin/arrow-right.gif similarity index 100% rename from src/Icons/skin/arrow-right.gif rename to src/icons/skin/arrow-right.gif diff --git a/src/Icons/skin/bg-dropdown.gif b/src/icons/skin/bg-dropdown.gif similarity index 100% rename from src/Icons/skin/bg-dropdown.gif rename to src/icons/skin/bg-dropdown.gif diff --git a/src/Icons/skin/bg-handle-horizontal.gif b/src/icons/skin/bg-handle-horizontal.gif similarity index 100% rename from src/Icons/skin/bg-handle-horizontal.gif rename to src/icons/skin/bg-handle-horizontal.gif diff --git a/src/Icons/skin/bg-header.gif b/src/icons/skin/bg-header.gif similarity index 100% rename from src/Icons/skin/bg-header.gif rename to src/icons/skin/bg-header.gif diff --git a/src/Icons/skin/bg-panel-header.gif b/src/icons/skin/bg-panel-header.gif similarity index 100% rename from src/Icons/skin/bg-panel-header.gif rename to src/icons/skin/bg-panel-header.gif diff --git a/src/Icons/skin/checking.png b/src/icons/skin/checking.png similarity index 100% rename from src/Icons/skin/checking.png rename to src/icons/skin/checking.png diff --git a/src/Icons/skin/collapse-expand.gif b/src/icons/skin/collapse-expand.gif similarity index 100% rename from src/Icons/skin/collapse-expand.gif rename to src/icons/skin/collapse-expand.gif diff --git a/src/Icons/skin/connected.png b/src/icons/skin/connected.png similarity index 100% rename from src/Icons/skin/connected.png rename to src/icons/skin/connected.png diff --git a/src/Icons/skin/disconnected.png b/src/icons/skin/disconnected.png similarity index 100% rename from src/Icons/skin/disconnected.png rename to src/icons/skin/disconnected.png diff --git a/src/Icons/skin/dock-tabs.gif b/src/icons/skin/dock-tabs.gif similarity index 100% rename from src/Icons/skin/dock-tabs.gif rename to src/icons/skin/dock-tabs.gif diff --git a/src/Icons/skin/download.png b/src/icons/skin/download.png similarity index 100% rename from src/Icons/skin/download.png rename to src/icons/skin/download.png diff --git a/src/Icons/skin/downloading.png b/src/icons/skin/downloading.png similarity index 100% rename from src/Icons/skin/downloading.png rename to src/icons/skin/downloading.png diff --git a/src/Icons/skin/error.png b/src/icons/skin/error.png similarity index 100% rename from src/Icons/skin/error.png rename to src/icons/skin/error.png diff --git a/src/Icons/skin/filteractive.png b/src/icons/skin/filteractive.png similarity index 100% rename from src/Icons/skin/filteractive.png rename to src/icons/skin/filteractive.png diff --git a/src/Icons/skin/filterall.png b/src/icons/skin/filterall.png similarity index 100% rename from src/Icons/skin/filterall.png rename to src/icons/skin/filterall.png diff --git a/src/Icons/skin/filterinactive.png b/src/icons/skin/filterinactive.png similarity index 100% rename from src/Icons/skin/filterinactive.png rename to src/icons/skin/filterinactive.png diff --git a/src/Icons/skin/firewalled.png b/src/icons/skin/firewalled.png similarity index 100% rename from src/Icons/skin/firewalled.png rename to src/icons/skin/firewalled.png diff --git a/src/Icons/skin/handle-icon-horizontal.gif b/src/icons/skin/handle-icon-horizontal.gif similarity index 100% rename from src/Icons/skin/handle-icon-horizontal.gif rename to src/icons/skin/handle-icon-horizontal.gif diff --git a/src/Icons/skin/handle-icon.gif b/src/icons/skin/handle-icon.gif similarity index 100% rename from src/Icons/skin/handle-icon.gif rename to src/icons/skin/handle-icon.gif diff --git a/src/Icons/skin/knob.gif b/src/icons/skin/knob.gif similarity index 100% rename from src/Icons/skin/knob.gif rename to src/icons/skin/knob.gif diff --git a/src/Icons/skin/logo-blank.gif b/src/icons/skin/logo-blank.gif similarity index 100% rename from src/Icons/skin/logo-blank.gif rename to src/icons/skin/logo-blank.gif diff --git a/src/Icons/skin/logo.gif b/src/icons/skin/logo.gif similarity index 100% rename from src/Icons/skin/logo.gif rename to src/icons/skin/logo.gif diff --git a/src/Icons/skin/logo2.gif b/src/icons/skin/logo2.gif similarity index 100% rename from src/Icons/skin/logo2.gif rename to src/icons/skin/logo2.gif diff --git a/src/Icons/skin/mascot.png b/src/icons/skin/mascot.png similarity index 100% rename from src/Icons/skin/mascot.png rename to src/icons/skin/mascot.png diff --git a/src/Icons/skin/paused.png b/src/icons/skin/paused.png similarity index 100% rename from src/Icons/skin/paused.png rename to src/icons/skin/paused.png diff --git a/src/Icons/skin/qbittorrent16.png b/src/icons/skin/qbittorrent16.png similarity index 100% rename from src/Icons/skin/qbittorrent16.png rename to src/icons/skin/qbittorrent16.png diff --git a/src/Icons/skin/qbittorrent22.png b/src/icons/skin/qbittorrent22.png similarity index 100% rename from src/Icons/skin/qbittorrent22.png rename to src/icons/skin/qbittorrent22.png diff --git a/src/Icons/skin/qbittorrent32.png b/src/icons/skin/qbittorrent32.png similarity index 100% rename from src/Icons/skin/qbittorrent32.png rename to src/icons/skin/qbittorrent32.png diff --git a/src/Icons/skin/qbittorrent_mono.svg b/src/icons/skin/qbittorrent_mono.svg similarity index 100% rename from src/Icons/skin/qbittorrent_mono.svg rename to src/icons/skin/qbittorrent_mono.svg diff --git a/src/Icons/skin/qbittorrent_mono_dark.png b/src/icons/skin/qbittorrent_mono_dark.png similarity index 100% rename from src/Icons/skin/qbittorrent_mono_dark.png rename to src/icons/skin/qbittorrent_mono_dark.png diff --git a/src/Icons/skin/qbittorrent_mono_light.png b/src/icons/skin/qbittorrent_mono_light.png similarity index 100% rename from src/Icons/skin/qbittorrent_mono_light.png rename to src/icons/skin/qbittorrent_mono_light.png diff --git a/src/Icons/skin/queued.png b/src/icons/skin/queued.png similarity index 100% rename from src/Icons/skin/queued.png rename to src/icons/skin/queued.png diff --git a/src/Icons/skin/ratio.png b/src/icons/skin/ratio.png similarity index 100% rename from src/Icons/skin/ratio.png rename to src/icons/skin/ratio.png diff --git a/src/Icons/skin/resumed.png b/src/icons/skin/resumed.png similarity index 100% rename from src/Icons/skin/resumed.png rename to src/icons/skin/resumed.png diff --git a/src/Icons/skin/seeding.png b/src/icons/skin/seeding.png similarity index 100% rename from src/Icons/skin/seeding.png rename to src/icons/skin/seeding.png diff --git a/src/Icons/skin/slider-area.gif b/src/icons/skin/slider-area.gif similarity index 100% rename from src/Icons/skin/slider-area.gif rename to src/icons/skin/slider-area.gif diff --git a/src/Icons/skin/spacer.gif b/src/icons/skin/spacer.gif similarity index 100% rename from src/Icons/skin/spacer.gif rename to src/icons/skin/spacer.gif diff --git a/src/Icons/skin/spinner-placeholder.gif b/src/icons/skin/spinner-placeholder.gif similarity index 100% rename from src/Icons/skin/spinner-placeholder.gif rename to src/icons/skin/spinner-placeholder.gif diff --git a/src/Icons/skin/spinner.gif b/src/icons/skin/spinner.gif similarity index 100% rename from src/Icons/skin/spinner.gif rename to src/icons/skin/spinner.gif diff --git a/src/Icons/skin/splash.png b/src/icons/skin/splash.png similarity index 100% rename from src/Icons/skin/splash.png rename to src/icons/skin/splash.png diff --git a/src/Icons/skin/stalledDL.png b/src/icons/skin/stalledDL.png similarity index 100% rename from src/Icons/skin/stalledDL.png rename to src/icons/skin/stalledDL.png diff --git a/src/Icons/skin/stalledUP.png b/src/icons/skin/stalledUP.png similarity index 100% rename from src/Icons/skin/stalledUP.png rename to src/icons/skin/stalledUP.png diff --git a/src/Icons/skin/tabs.gif b/src/icons/skin/tabs.gif similarity index 100% rename from src/Icons/skin/tabs.gif rename to src/icons/skin/tabs.gif diff --git a/src/Icons/skin/toolbox-divider.gif b/src/icons/skin/toolbox-divider.gif similarity index 100% rename from src/Icons/skin/toolbox-divider.gif rename to src/icons/skin/toolbox-divider.gif diff --git a/src/Icons/skin/toolbox-divider2.gif b/src/icons/skin/toolbox-divider2.gif similarity index 100% rename from src/Icons/skin/toolbox-divider2.gif rename to src/icons/skin/toolbox-divider2.gif diff --git a/src/Icons/skin/uploading.png b/src/icons/skin/uploading.png similarity index 100% rename from src/Icons/skin/uploading.png rename to src/icons/skin/uploading.png diff --git a/src/Icons/slow.png b/src/icons/slow.png similarity index 100% rename from src/Icons/slow.png rename to src/icons/slow.png diff --git a/src/Icons/slow_off.png b/src/icons/slow_off.png similarity index 100% rename from src/Icons/slow_off.png rename to src/icons/slow_off.png diff --git a/src/Icons/sphere.png b/src/icons/sphere.png similarity index 100% rename from src/Icons/sphere.png rename to src/icons/sphere.png diff --git a/src/Icons/sphere2.png b/src/icons/sphere2.png similarity index 100% rename from src/Icons/sphere2.png rename to src/icons/sphere2.png diff --git a/src/Icons/url.png b/src/icons/url.png similarity index 100% rename from src/Icons/url.png rename to src/icons/url.png diff --git a/src/preferences/preferences.pri b/src/preferences/preferences.pri deleted file mode 100644 index 7b9c3e777..000000000 --- a/src/preferences/preferences.pri +++ /dev/null @@ -1,15 +0,0 @@ -INCLUDEPATH += $$PWD - -!contains(DEFINES, DISABLE_GUI) { - - HEADERS += $$PWD/options_imp.h \ - $$PWD/advancedsettings.h - - SOURCES += $$PWD/options_imp.cpp - - FORMS += $$PWD/options.ui -} - -HEADERS += $$PWD/preferences.h - -SOURCES += $$PWD/preferences.cpp diff --git a/src/src.pro b/src/src.pro index 17fc838a5..902b0231a 100644 --- a/src/src.pro +++ b/src/src.pro @@ -3,52 +3,44 @@ TEMPLATE = app CONFIG += qt thread # Windows specific configuration -win32 { - include(../winconf.pri) -} +win32: include(../winconf.pri) # Mac specific configuration -macx { - include(../macxconf.pri) -} +macx: include(../macxconf.pri) # Unix specific configuration -unix:!macx { - include(../unixconf.pri) -} +unix:!macx: include(../unixconf.pri) # eCS(OS/2) specific configuration -os2 { - include(../os2conf.pri) -} +os2: include(../os2conf.pri) -nox { - QT -= gui - TARGET = qbittorrent-nox - DEFINES += DISABLE_GUI +nogui { + QT -= gui + DEFINES += DISABLE_GUI + TARGET = qbittorrent-nox } else { - QT += xml - CONFIG(static) { - DEFINES += QBT_STATIC_QT - QTPLUGIN += qico - } - TARGET = qbittorrent + QT += xml + CONFIG(static) { + DEFINES += QBT_STATIC_QT + QTPLUGIN += qico + } + TARGET = qbittorrent } +nowebui: DEFINES += DISABLE_WEBUI +strace_win: DEFINES += STACKTRACE_WIN QT += network - greaterThan(QT_MAJOR_VERSION, 4): QT += widgets # Vars LANG_PATH = lang -ICONS_PATH = Icons -CONFIG(debug, debug|release):message(Project is built in DEBUG mode.) -CONFIG(release, debug|release):message(Project is built in RELEASE mode.) +CONFIG(debug, debug|release): message(Project is built in DEBUG mode.) +CONFIG(release, debug|release): message(Project is built in RELEASE mode.) # Disable debug output in release mode CONFIG(release, debug|release) { - message(Disabling debug output.) - DEFINES += QT_NO_DEBUG_OUTPUT + message(Disabling debug output.) + DEFINES += QT_NO_DEBUG_OUTPUT } # VERSION DEFINES @@ -62,208 +54,59 @@ DEFINES += QT_USE_FAST_CONCATENATION QT_USE_FAST_OPERATOR_PLUS # filesystem v3 is the default. DEFINES += BOOST_FILESYSTEM_VERSION=2 -INCLUDEPATH += $$PWD +win32: DEFINES += NOMINMAX +include(app/app.pri) +include(core/core.pri) +!nowebui: include(webui/webui.pri) +!nogui: include(gui/gui.pri) # Resource files -RESOURCES += icons.qrc \ - lang.qrc \ - about.qrc - -# Source code -usesystemqtsingleapplication { - nox { - CONFIG += qtsinglecoreapplication - } else { - CONFIG += qtsingleapplication - } -} else { - nox { - include(qtsingleapp/qtsinglecoreapplication.pri) - } else { - include(qtsingleapp/qtsingleapplication.pri) - } -} - -include(qtlibtorrent/qtlibtorrent.pri) -include(webui/webui.pri) -include(tracker/tracker.pri) -include(preferences/preferences.pri) - -!nox { - include(lineedit/lineedit.pri) - include(properties/properties.pri) - include(searchengine/searchengine.pri) - include(rss/rss.pri) - include(torrentcreator/torrentcreator.pri) - include(geoip/geoip.pri) - include(powermanagement/powermanagement.pri) -} - -HEADERS += misc.h \ - fs_utils.h \ - downloadthread.h \ - stacktrace.h \ - torrentpersistentdata.h \ - filesystemwatcher.h \ - scannedfoldersmodel.h \ - qinisettings.h \ - smtp.h \ - dnsupdater.h \ - application.h \ - logger.h - -SOURCES += main.cpp \ - downloadthread.cpp \ - scannedfoldersmodel.cpp \ - torrentpersistentdata.cpp \ - misc.cpp \ - fs_utils.cpp \ - smtp.cpp \ - dnsupdater.cpp \ - application.cpp \ - logger.cpp - -nox { - HEADERS += headlessloader.h -} else { - HEADERS += mainwindow.h\ - transferlistwidget.h \ - transferlistdelegate.h \ - transferlistfilterswidget.h \ - transferlistsortmodel.h \ - torrentcontentmodel.h \ - torrentcontentmodelitem.h \ - torrentcontentmodelfolder.h \ - torrentcontentmodelfile.h \ - torrentcontentfiltermodel.h \ - torrentcontenttreeview.h \ - deletionconfirmationdlg.h \ - statusbar.h \ - reverseresolution.h \ - ico.h \ - speedlimitdlg.h \ - about_imp.h \ - previewselect.h \ - previewlistdelegate.h \ - downloadfromurldlg.h \ - trackerlogin.h \ - hidabletabwidget.h \ - sessionapplication.h \ - torrentimportdlg.h \ - executionlog.h \ - iconprovider.h \ - updownratiodlg.h \ - loglistwidget.h \ - addnewtorrentdialog.h \ - autoexpandabledialog.h \ - statsdialog.h \ - messageboxraised.h \ - torrentfilterenum.h - - SOURCES += mainwindow.cpp \ - ico.cpp \ - transferlistwidget.cpp \ - transferlistsortmodel.cpp \ - transferlistdelegate.cpp \ - transferlistfilterswidget.cpp \ - torrentcontentmodel.cpp \ - torrentcontentmodelitem.cpp \ - torrentcontentmodelfolder.cpp \ - torrentcontentmodelfile.cpp \ - torrentcontentfiltermodel.cpp \ - torrentcontenttreeview.cpp \ - sessionapplication.cpp \ - torrentimportdlg.cpp \ - executionlog.cpp \ - previewselect.cpp \ - iconprovider.cpp \ - updownratiodlg.cpp \ - loglistwidget.cpp \ - addnewtorrentdialog.cpp \ - autoexpandabledialog.cpp \ - statsdialog.cpp \ - messageboxraised.cpp \ - statusbar.cpp \ - trackerlogin.cpp \ - speedlimitdlg.cpp - - win32 { - HEADERS += programupdater.h - SOURCES += programupdater.cpp - DEFINES += NOMINMAX - } - - macx { - HEADERS += qmacapplication.h \ - programupdater.h - - SOURCES += qmacapplication.cpp \ - programupdater.cpp - } - - FORMS += mainwindow.ui \ - about.ui \ - preview.ui \ - login.ui \ - downloadfromurldlg.ui \ - bandwidth_limit.ui \ - updownratiodlg.ui \ - confirmdeletiondlg.ui \ - torrentimportdlg.ui \ - executionlog.ui \ - addnewtorrentdialog.ui \ - autoexpandabledialog.ui \ - statsdialog.ui -} - -DESTDIR = . - -# OS specific config -OTHER_FILES += ../winconf.pri ../macxconf.pri ../unixconf.pri ../os2conf.pri -# compiler specific config -OTHER_FILES += ../winconf-mingw.pri ../winconf-msvc.pri -# version file -OTHER_FILES += ../version.pri +RESOURCES += \ + icons.qrc \ + lang.qrc # Translations -TRANSLATIONS = $$LANG_PATH/qbittorrent_fr.ts \ - $$LANG_PATH/qbittorrent_zh.ts \ - $$LANG_PATH/qbittorrent_zh_TW.ts \ - $$LANG_PATH/qbittorrent_en.ts \ - $$LANG_PATH/qbittorrent_en_AU.ts \ - $$LANG_PATH/qbittorrent_en_GB.ts \ - $$LANG_PATH/qbittorrent_ca.ts \ - $$LANG_PATH/qbittorrent_es.ts \ - $$LANG_PATH/qbittorrent_pl.ts \ - $$LANG_PATH/qbittorrent_ko.ts \ - $$LANG_PATH/qbittorrent_de.ts \ - $$LANG_PATH/qbittorrent_nl.ts \ - $$LANG_PATH/qbittorrent_tr.ts \ - $$LANG_PATH/qbittorrent_sv.ts \ - $$LANG_PATH/qbittorrent_el.ts \ - $$LANG_PATH/qbittorrent_ru.ts \ - $$LANG_PATH/qbittorrent_uk.ts \ - $$LANG_PATH/qbittorrent_bg.ts \ - $$LANG_PATH/qbittorrent_it.ts \ - $$LANG_PATH/qbittorrent_sk.ts \ - $$LANG_PATH/qbittorrent_ro.ts \ - $$LANG_PATH/qbittorrent_pt.ts \ - $$LANG_PATH/qbittorrent_nb.ts \ - $$LANG_PATH/qbittorrent_fi.ts \ - $$LANG_PATH/qbittorrent_da.ts \ - $$LANG_PATH/qbittorrent_ja.ts \ - $$LANG_PATH/qbittorrent_hu.ts \ - $$LANG_PATH/qbittorrent_pt_BR.ts \ - $$LANG_PATH/qbittorrent_cs.ts \ - $$LANG_PATH/qbittorrent_sr.ts \ - $$LANG_PATH/qbittorrent_ar.ts \ - $$LANG_PATH/qbittorrent_hr.ts \ - $$LANG_PATH/qbittorrent_gl.ts \ - $$LANG_PATH/qbittorrent_hy.ts \ - $$LANG_PATH/qbittorrent_lt.ts \ - $$LANG_PATH/qbittorrent_ka.ts \ - $$LANG_PATH/qbittorrent_be.ts \ - $$LANG_PATH/qbittorrent_eu.ts \ - $$LANG_PATH/qbittorrent_he.ts \ - $$LANG_PATH/qbittorrent_vi.ts +TRANSLATIONS = \ + $$LANG_PATH/qbittorrent_fr.ts \ + $$LANG_PATH/qbittorrent_zh.ts \ + $$LANG_PATH/qbittorrent_zh_TW.ts \ + $$LANG_PATH/qbittorrent_en.ts \ + $$LANG_PATH/qbittorrent_en_AU.ts \ + $$LANG_PATH/qbittorrent_en_GB.ts \ + $$LANG_PATH/qbittorrent_ca.ts \ + $$LANG_PATH/qbittorrent_es.ts \ + $$LANG_PATH/qbittorrent_pl.ts \ + $$LANG_PATH/qbittorrent_ko.ts \ + $$LANG_PATH/qbittorrent_de.ts \ + $$LANG_PATH/qbittorrent_nl.ts \ + $$LANG_PATH/qbittorrent_tr.ts \ + $$LANG_PATH/qbittorrent_sv.ts \ + $$LANG_PATH/qbittorrent_el.ts \ + $$LANG_PATH/qbittorrent_ru.ts \ + $$LANG_PATH/qbittorrent_uk.ts \ + $$LANG_PATH/qbittorrent_bg.ts \ + $$LANG_PATH/qbittorrent_it.ts \ + $$LANG_PATH/qbittorrent_sk.ts \ + $$LANG_PATH/qbittorrent_ro.ts \ + $$LANG_PATH/qbittorrent_pt.ts \ + $$LANG_PATH/qbittorrent_nb.ts \ + $$LANG_PATH/qbittorrent_fi.ts \ + $$LANG_PATH/qbittorrent_da.ts \ + $$LANG_PATH/qbittorrent_ja.ts \ + $$LANG_PATH/qbittorrent_hu.ts \ + $$LANG_PATH/qbittorrent_pt_BR.ts \ + $$LANG_PATH/qbittorrent_cs.ts \ + $$LANG_PATH/qbittorrent_sr.ts \ + $$LANG_PATH/qbittorrent_ar.ts \ + $$LANG_PATH/qbittorrent_hr.ts \ + $$LANG_PATH/qbittorrent_gl.ts \ + $$LANG_PATH/qbittorrent_hy.ts \ + $$LANG_PATH/qbittorrent_lt.ts \ + $$LANG_PATH/qbittorrent_ka.ts \ + $$LANG_PATH/qbittorrent_be.ts \ + $$LANG_PATH/qbittorrent_eu.ts \ + $$LANG_PATH/qbittorrent_he.ts \ + $$LANG_PATH/qbittorrent_vi.ts + +DESTDIR = . diff --git a/src/update_qrc_files.py b/src/update_qrc_files.py index 813ff1a05..8fda40e4e 100755 --- a/src/update_qrc_files.py +++ b/src/update_qrc_files.py @@ -45,7 +45,7 @@ lang_file.write(output) lang_file.close() # update search_engine directory -os.chdir('searchengine') +os.chdir('gui/searchengine') search_list = [] for nova_folder in ['nova/', 'nova3']: for root, dirs, files in os.walk(nova_folder): @@ -67,11 +67,11 @@ search_file = open('search.qrc', 'w') search_file.write(output) search_file.close() -os.chdir('..'); +os.chdir('../..'); # update icons files directory icons_list = [] -for root, dirs, files in os.walk('Icons'): +for root, dirs, files in os.walk('icons'): if 'skin_unused' in dirs: dirs.remove('skin_unused') for file in files: diff --git a/src/webui/requesthandler.cpp b/src/webui/requesthandler.cpp index 8f7eaf068..595eb5382 100644 --- a/src/webui/requesthandler.cpp +++ b/src/webui/requesthandler.cpp @@ -145,7 +145,7 @@ void RequestHandler::action_public_index() if (!args_.isEmpty()) { if (args_.back() == "favicon.ico") - path = ":/Icons/skin/qbittorrent16.png"; + path = ":/icons/skin/qbittorrent16.png"; else path = WWW_FOLDER + args_.join("/"); } @@ -198,7 +198,7 @@ void RequestHandler::action_public_theme() } #ifdef DISABLE_GUI - QString url = ":/Icons/oxygen/" + args_.front() + ".png"; + QString url = ":/icons/oxygen/" + args_.front() + ".png"; #else QString url = IconProvider::instance()->getIconPath(args_.front()); #endif @@ -210,7 +210,7 @@ void RequestHandler::action_public_theme() void RequestHandler::action_public_images() { - const QString path = ":/Icons/" + args_.join("/"); + const QString path = ":/icons/" + args_.join("/"); printFile(path); header(HEADER_CACHE_CONTROL, MAX_AGE_MONTH); } diff --git a/src/webui/webui.pri b/src/webui/webui.pri index 26c009443..ba94e2297 100644 --- a/src/webui/webui.pri +++ b/src/webui/webui.pri @@ -2,12 +2,9 @@ INCLUDEPATH += $$PWD HEADERS += $$PWD/httpserver.h \ $$PWD/httpconnection.h \ - $$PWD/httprequestparser.h \ - $$PWD/httpresponsegenerator.h \ $$PWD/btjson.h \ $$PWD/prefjson.h \ $$PWD/jsonutils.h \ - $$PWD/httptypes.h \ $$PWD/extra_translations.h \ $$PWD/webapplication.h \ $$PWD/abstractrequesthandler.h \ diff --git a/unixconf.pri b/unixconf.pri index 6e1cfffa9..a93f50c93 100644 --- a/unixconf.pri +++ b/unixconf.pri @@ -10,17 +10,17 @@ exists($$OUT_PWD/../conf.pri) { } # COMPILATION SPECIFIC -!nox:dbus { - QT += dbus +!nogui:dbus { + QT += dbus } QMAKE_CXXFLAGS += -Wformat -Wformat-security !haiku { - QMAKE_LFLAGS_APP += -rdynamic + QMAKE_LFLAGS_APP += -rdynamic } # Man page -nox { +nogui { man.files = ../doc/qbittorrent-nox.1 } else { man.files = ../doc/qbittorrent.1 @@ -29,62 +29,61 @@ nox { man.path = $$MANPREFIX/man1 INSTALLS += man +DIST_PATH = ../dist/unix + # Menu Icon -!nox { - menuicon.files = Icons/qBittorrent.desktop - menuicon.path = $$PREFIX/share/applications/ - INSTALLS += menuicon - icon16.files = menuicons/16x16/apps/qbittorrent.png - icon16.path = $$PREFIX/share/icons/hicolor/16x16/apps/ - icon22.files = menuicons/22x22/apps/qbittorrent.png - icon22.path = $$PREFIX/share/icons/hicolor/22x22/apps/ - icon24.files = menuicons/24x24/apps/qbittorrent.png - icon24.path = $$PREFIX/share/icons/hicolor/24x24/apps/ - icon32.files = menuicons/32x32/apps/qbittorrent.png - icon32.path = $$PREFIX/share/icons/hicolor/32x32/apps/ - icon36.files = menuicons/36x36/apps/qbittorrent.png - icon36.path = $$PREFIX/share/icons/hicolor/36x36/apps/ - icon48.files = menuicons/48x48/apps/qbittorrent.png - icon48.path = $$PREFIX/share/icons/hicolor/48x48/apps/ - icon64.files = menuicons/64x64/apps/qbittorrent.png - icon64.path = $$PREFIX/share/icons/hicolor/64x64/apps/ - icon72.files = menuicons/72x72/apps/qbittorrent.png - icon72.path = $$PREFIX/share/icons/hicolor/72x72/apps/ - icon96.files = menuicons/96x96/apps/qbittorrent.png - icon96.path = $$PREFIX/share/icons/hicolor/96x96/apps/ - icon128.files = menuicons/128x128/apps/qbittorrent.png - icon128.path = $$PREFIX/share/icons/hicolor/128x128/apps/ - icon192.files = menuicons/192x192/apps/qbittorrent.png - icon192.path = $$PREFIX/share/icons/hicolor/192x192/apps/ +!nogui { + menuicon.files = icons/qBittorrent.desktop + menuicon.path = $$PREFIX/share/applications/ + INSTALLS += menuicon - INSTALLS += icon16 \ - icon22 \ - icon24 \ - icon32 \ - icon36 \ - icon48 \ - icon64 \ - icon72 \ - icon96 \ - icon128 \ - icon192 + icon16.files = $$DIST_PATH/menuicons/16x16/apps/qbittorrent.png + icon16.path = $$PREFIX/share/icons/hicolor/16x16/apps/ + icon22.files = $$DIST_PATH/menuicons/22x22/apps/qbittorrent.png + icon22.path = $$PREFIX/share/icons/hicolor/22x22/apps/ + icon24.files = $$DIST_PATH/menuicons/24x24/apps/qbittorrent.png + icon24.path = $$PREFIX/share/icons/hicolor/24x24/apps/ + icon32.files = $$DIST_PATH/menuicons/32x32/apps/qbittorrent.png + icon32.path = $$PREFIX/share/icons/hicolor/32x32/apps/ + icon36.files = $$DIST_PATH/menuicons/36x36/apps/qbittorrent.png + icon36.path = $$PREFIX/share/icons/hicolor/36x36/apps/ + icon48.files = $$DIST_PATH/menuicons/48x48/apps/qbittorrent.png + icon48.path = $$PREFIX/share/icons/hicolor/48x48/apps/ + icon64.files = $$DIST_PATH/menuicons/64x64/apps/qbittorrent.png + icon64.path = $$PREFIX/share/icons/hicolor/64x64/apps/ + icon72.files = $$DIST_PATH/menuicons/72x72/apps/qbittorrent.png + icon72.path = $$PREFIX/share/icons/hicolor/72x72/apps/ + icon96.files = $$DIST_PATH/menuicons/96x96/apps/qbittorrent.png + icon96.path = $$PREFIX/share/icons/hicolor/96x96/apps/ + icon128.files = $$DIST_PATH/menuicons/128x128/apps/qbittorrent.png + icon128.path = $$PREFIX/share/icons/hicolor/128x128/apps/ + icon192.files = $$DIST_PATH/menuicons/192x192/apps/qbittorrent.png + icon192.path = $$PREFIX/share/icons/hicolor/192x192/apps/ + INSTALLS += \ + icon16 \ + icon22 \ + icon24 \ + icon32 \ + icon36 \ + icon48 \ + icon64 \ + icon72 \ + icon96 \ + icon128 \ + icon192 - pixmap.files = menuicons/128x128/apps/qbittorrent.png - pixmap.path = $$PREFIX/share/pixmaps/ - INSTALLS += pixmap + pixmap.files = $$DIST_PATH/menuicons/128x128/apps/qbittorrent.png + pixmap.path = $$PREFIX/share/pixmaps/ + INSTALLS += pixmap } # INSTALL target.path = $$PREFIX/bin/ INSTALLS += target -dbus { - include(src/qtnotify/qtnotify.pri) -} - -!nox { - # DEFINE added by configure - contains(DEFINES, WITH_GEOIP_EMBEDDED) { - message("You chose to embed GeoIP database in qBittorrent executable.") - } +!nogui { + # DEFINE added by configure + contains(DEFINES, WITH_GEOIP_EMBEDDED) { + message("You chose to embed GeoIP database in qBittorrent executable.") + } } diff --git a/winconf.pri b/winconf.pri index ec3b98fc1..0cc074f83 100644 --- a/winconf.pri +++ b/winconf.pri @@ -43,18 +43,11 @@ CONFIG(debug, debug|release) { #Enable backtrace support CONFIG += strace_win -strace_win:{ - DEFINES += STACKTRACE_WIN - FORMS += stacktrace_win_dlg.ui - HEADERS += stacktrace_win.h \ - stacktrace_win_dlg.h -} - win32-g++ { - include(winconf-mingw.pri) + include(winconf-mingw.pri) } else { - include(winconf-msvc.pri) + include(winconf-msvc.pri) } DEFINES += WITH_GEOIP_EMBEDDED