- FEATURE: Real progress bar in torrent properties that displays downloaded pieces (contribution by

Ishan Arora)

src/src.pro

@@ -17,15 +17,15 @@ DEFINES += VERSION_MINOR=0
 DEFINES += VERSION_BUGFIX=0
 
 contains(DEBUG_MODE, 1){
-  CONFIG += debug
-  CONFIG -= release
-  message(Debug build!)
+    CONFIG += debug
+    CONFIG -= release
+    message(Debug build!)
 }
 contains(DEBUG_MODE, 0){
-  CONFIG -= debug
-  CONFIG += release
-  DEFINES += QT_NO_DEBUG_OUTPUT
-  message(Release build!)
+    CONFIG -= debug
+    CONFIG += release
+    DEFINES += QT_NO_DEBUG_OUTPUT
+    message(Release build!)
 }
 
 # For libtorrent stuff
@@ -35,56 +35,56 @@ contains(DEBUG_MODE, 0){
 # Install
 
 !win32 {
-        # Binary
-        exists(../conf.pri) {
-          include(../conf.pri)
-          # Target
-          target.path = $$BINDIR
-          INSTALLS += target
-        }
+    # Binary
+    exists(../conf.pri){
+        include(../conf.pri)
+        # Target
+        target.path = $$BINDIR
+        INSTALLS += target
+    }
 
-        # Man page
-	man.files = ../doc/qbittorrent.1.gz
-        man.path = $$PREFIX/share/man/man1/
-        INSTALLS += man
+    # Man page
+    man.files = ../doc/qbittorrent.1.gz
+    man.path = $$PREFIX/share/man/man1/
+    INSTALLS += man
 
-        # Menu Icon
-        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/
-        INSTALLS += icon16 icon22 icon24 icon32 icon36 icon48 icon64 icon72 icon96 icon128 icon192
+    # Menu Icon
+    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/
+    INSTALLS += icon16 icon22 icon24 icon32 icon36 icon48 icon64 icon72 icon96 icon128 icon192
 }
 
 QMAKE_CXXFLAGS_RELEASE += -fwrapv -O2
 QMAKE_CXXFLAGS_DEBUG += -fwrapv -O1
 
 CONFIG += link_pkgconfig
-PKGCONFIG += libtorrent libccext2 libccgnu2
+PKGCONFIG += "libtorrent libccext2 libccgnu2"
 
 !contains(DEFINES, HAVE_MAGICK){
-  message(ImageMagick disabled)
+    message(ImageMagick disabled)
 }
 
 QT += network xml
@@ -94,8 +94,8 @@ DEFINES += QT_NO_CAST_TO_ASCII
 
 # Windows
 win32 {
-  LIBS += -ltorrent -lccext2 -lccgnu2
-  #-lMagick++ -lWand -lMagick
+    LIBS += -ltorrent -lccext2 -lccgnu2
+    #-lMagick++ -lWand -lMagick
 }
 
 RESOURCES = icons.qrc \
@@ -142,7 +142,9 @@ HEADERS += GUI.h misc.h options_imp.h about_imp.h \
            allocationDlg.h FinishedListDelegate.h \
            qtorrenthandle.h downloadingTorrents.h \
            engineSelectDlg.h pluginSource.h \
-           arborescence.h qgnomelook.h
+           arborescence.h qgnomelook.h realprogressbar.h \
+ realprogressbarthread.h \
+ qrealarray.h
 FORMS += MainWindow.ui options.ui about.ui \
          properties.ui createtorrent.ui preview.ui \
          login.ui downloadFromURL.ui addTorrentDialog.ui \
@@ -160,5 +162,10 @@ SOURCES += GUI.cpp \
            qtorrenthandle.cpp \
            downloadingTorrents.cpp \
            engineSelectDlg.cpp \
-           downloadThread.cpp
+           downloadThread.cpp \
+           realprogressbar.cpp \
+ realprogressbarthread.cpp \
+ qrealarray.cpp
+
+DESTDIR = .