Browse Source

- Improved the way menu icons are installed to avoid problems on some systems (Thanks JanCR for reporting this)

- Fixed version in desktop file
adaptive-webui-19844
Christophe Dumez 18 years ago
parent
commit
31abae33a1
  1. 1
      Changelog
  2. 1
      TODO
  3. 2
      src/GUI.cpp
  4. 2
      src/Icons/qBittorrent.desktop
  5. 9
      src/bittorrent.cpp
  6. 1
      src/bittorrent.h
  7. 26
      src/src.pro

1
Changelog

@ -45,6 +45,7 @@ @@ -45,6 +45,7 @@
- BUGFIX: Search plugin update - fixed missing new lines in changelog
- BUGFIX: The number of search results was not reset when clicking on 'Clear' button
- BUGFIX: Update torrent progress when its content changed (filtered files)
- BUGFIX: Improved the way menu icons are installed to avoid problems on some systems
- COSMETIC: Redesigned torrent properties a little
- COSMETIC: Redesigned options a little
- COSMETIC: Display more logs messages concerning features

1
TODO

@ -50,6 +50,7 @@ @@ -50,6 +50,7 @@
- make use of finishedChecking alert if hydri applies my patch for this
- Clean up delayed progress column sorting code
- Clean up pause after checking code
- Fix fast resume problems
- Test rss now that it has been rewritten
- Wait for some bug fixes in libtorrent :
- upload/download limit per torrent (Ticket #83)

2
src/GUI.cpp

@ -541,6 +541,7 @@ void GUI::updateDlList(bool force){ @@ -541,6 +541,7 @@ void GUI::updateDlList(bool force){
// No need to update if qBittorrent DL list is hidden
return;
}
BTSession->printPausedTorrents();
LCD_UpSpeed->display(tmp); // UP LCD
LCD_DownSpeed->display(tmp2); // DL LCD
// browse handles
@ -615,6 +616,7 @@ void GUI::updateDlList(bool force){ @@ -615,6 +616,7 @@ void GUI::updateDlList(bool force){
case torrent_status::downloading:
case torrent_status::downloading_metadata:
if(torrentStatus.download_payload_rate > 0){
qDebug("%s is downloading", (const char*)fileHash.toUtf8());
DLListModel->setData(DLListModel->index(row, NAME), QVariant(QIcon(":/Icons/skin/downloading.png")), Qt::DecorationRole);
DLListModel->setData(DLListModel->index(row, ETA), QVariant((qlonglong)BTSession->getETA(fileHash)));
setRowColor(row, "green");

2
src/Icons/qBittorrent.desktop

@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
[Desktop Entry]
Categories=Qt;Application;Network;P2P
Comment=V0.10.0
Comment=V1.0.0
Encoding=UTF-8
Exec=qbittorrent
GenericName=Bittorrent client

9
src/bittorrent.cpp

@ -469,6 +469,14 @@ bool bittorrent::hasFilteredFiles(QString fileHash) const{ @@ -469,6 +469,14 @@ bool bittorrent::hasFilteredFiles(QString fileHash) const{
return false;
}
void bittorrent::printPausedTorrents(){
QString hash;
qDebug("Paused Torrents:");
foreach(hash, pausedTorrents){
qDebug("%s ", (const char*)hash.toUtf8());
}
}
// get the size of the torrent without the filtered files
size_type bittorrent::torrentEffectiveSize(QString hash) const{
torrent_handle h = getTorrentHandle(hash);
@ -687,6 +695,7 @@ void bittorrent::saveFastResumeAndRatioData(){ @@ -687,6 +695,7 @@ void bittorrent::saveFastResumeAndRatioData(){
QString fileHash = QString(misc::toString(h.info_hash()).c_str());
while(!receivedPausedAlert(fileHash)){
qDebug("Sleeping while waiting that %s is paused", misc::toString(h.info_hash()).c_str());
printPausedTorrents();
SleeperThread::msleep(500);
readAlerts();
}

1
src/bittorrent.h

@ -84,6 +84,7 @@ class bittorrent : public QObject{ @@ -84,6 +84,7 @@ class bittorrent : public QObject{
session* getSession() const;
QList<QPair<QString, QString> > getTrackersErrors(QString hash) const;
bool receivedPausedAlert(QString hash) const;
void printPausedTorrents();
public slots:
void addTorrent(QString path, bool fromScanDir = false, bool onStartup = false, QString from_url = QString());

26
src/src.pro

@ -69,9 +69,29 @@ contains(DEBUG_MODE, 0){ @@ -69,9 +69,29 @@ contains(DEBUG_MODE, 0){
menuicon.files = Icons/qBittorrent.desktop
menuicon.path = $$PREFIX/share/applications/
INSTALLS += menuicon
logos.files = menuicons/*
logos.path = $$PREFIX/share/icons/hicolor/
INSTALLS += logos
icon16.files = menuicons/16x16/apps/qbittorrent.png
icon16.path = $$PREFIX/share/icons/hicolor/22x22/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
}
# Windows

Loading…
Cancel
Save