Merge pull request #2449 from glassez/redesign

First preparations for Redesign (#2433)

.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

AUTHORS

@@ -17,7 +17,7 @@ Contributors:
 * Nick Tiskov <daymansmail@gmail.com>
 
 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 <mjames@gmail.com>
   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 <tobejodok@qbittorrent.org>
   license: GPLv2
 
-* file: src/Icons/skin/tabs.gif
+* file: src/icons/skin/tabs.gif
   copyright: Greg Houston <gregory.houston@gmail.com>
   license: MIT
 
-* file: src/Icons/skin/qbittorrent_mono*
+* file: src/icons/skin/qbittorrent_mono*
   copyright: Daniel Eguren <deguren@gmail.com>
   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 <allok.victor@gmail.com>
 
 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)

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 #(

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"],

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: