mirror of
https://github.com/qbittorrent/qBittorrent.git
synced 2025-12-18 06:28:03 -06:00
Compare commits
1 Commits
release-2.
...
release-2.
| Author | SHA1 | Date | |
|---|---|---|---|
|
c7736dd422 |
@@ -1,12 +1,3 @@
|
||||
* Tue Aug 17 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.3.1
|
||||
- BUGFIX: Fix compilation with gcc 4.5
|
||||
- BUGFIX: Fix about dialog layout
|
||||
- BUGFIX: Remember previously selected paths in torrent creation dialog
|
||||
- BUGFIX: Added missing right-click menu icon in Web UI
|
||||
- BUGFIX: Fix speed limit sliders initialization in Web UI
|
||||
- BUGFIX: Priority actions are only effective if the transfer list tab is displayed
|
||||
- BUGFIX: Fix possible folder watching issues on Windows and OS/2
|
||||
|
||||
* Tue Jul 27 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.3.0
|
||||
- FEATURE: Simplified torrent root folder renaming/truncating (< v2.3.0 is no longer forward compatible)
|
||||
- FEATURE: Remember previous save paths in torrent addition dialog
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
[Desktop Entry]
|
||||
Categories=Qt;Network;P2P;
|
||||
Comment=V2.3.1
|
||||
Comment=V2.3.0
|
||||
Exec=qbittorrent %f
|
||||
GenericName=Bittorrent client
|
||||
GenericName[ar]=العميل Bittorrent
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 1.6 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 79 KiB After Width: | Height: | Size: 79 KiB |
@@ -47,7 +47,7 @@
|
||||
<key>CFBundlePackageType</key>
|
||||
<string>APPL</string>
|
||||
<key>CFBundleGetInfoString</key>
|
||||
<string>2.3.1</string>
|
||||
<string>2.3.0</string>
|
||||
<key>CFBundleSignature</key>
|
||||
<string>????</string>
|
||||
<key>CFBundleExecutable</key>
|
||||
|
||||
@@ -47,6 +47,7 @@ class about : public QDialog, private Ui::AboutDlg{
|
||||
setAttribute(Qt::WA_DeleteOnClose);
|
||||
// Set icons
|
||||
logo->setPixmap(QPixmap(QString::fromUtf8(":/Icons/skin/qbittorrent22.png")));
|
||||
mascot_lbl->setPixmap(QPixmap(QString::fromUtf8(":/Icons/skin/mascot.png")));
|
||||
//Title
|
||||
lb_name->setText(QString::fromUtf8("<b><h1>")+tr("qBittorrent")+QString::fromUtf8(" "VERSION"</h1></b>"));
|
||||
// Thanks
|
||||
|
||||
@@ -50,7 +50,6 @@
|
||||
#include "torrentpersistentdata.h"
|
||||
#include "createtorrent_imp.h"
|
||||
#include "misc.h"
|
||||
#include "qinisettings.h"
|
||||
|
||||
using namespace libtorrent;
|
||||
using namespace boost::filesystem;
|
||||
@@ -81,11 +80,8 @@ createtorrent::~createtorrent() {
|
||||
}
|
||||
|
||||
void createtorrent::on_addFolder_button_clicked(){
|
||||
QIniSettings settings("qBittorrent", "qBittorrent");
|
||||
QString last_path = settings.value("CreateTorrent/last_add_path", QDir::homePath()).toString();
|
||||
QString dir = QFileDialog::getExistingDirectory(this, tr("Select a folder to add to the torrent"), last_path, QFileDialog::ShowDirsOnly);
|
||||
QString dir = QFileDialog::getExistingDirectory(this, tr("Select a folder to add to the torrent"), QDir::homePath(), QFileDialog::ShowDirsOnly);
|
||||
if(!dir.isEmpty()) {
|
||||
settings.setValue("CreateTorrent/last_add_path", dir);
|
||||
#if defined(Q_WS_WIN) || defined(Q_OS_OS2)
|
||||
dir = dir.replace("/", "\\");
|
||||
#endif
|
||||
@@ -94,11 +90,8 @@ void createtorrent::on_addFolder_button_clicked(){
|
||||
}
|
||||
|
||||
void createtorrent::on_addFile_button_clicked(){
|
||||
QIniSettings settings("qBittorrent", "qBittorrent");
|
||||
QString last_path = settings.value("CreateTorrent/last_add_path", QDir::homePath()).toString();
|
||||
QString file = QFileDialog::getOpenFileName(this, tr("Select a file to add to the torrent"), last_path);
|
||||
QString file = QFileDialog::getOpenFileName(this, tr("Select a file to add to the torrent"), QDir::homePath());
|
||||
if(!file.isEmpty()) {
|
||||
settings.setValue("CreateTorrent/last_add_path", misc::removeLastPathPart(file));
|
||||
#if defined(Q_WS_WIN) || defined(Q_OS_OS2)
|
||||
file = file.replace("/", "\\");
|
||||
#endif
|
||||
@@ -184,14 +177,14 @@ void createtorrent::on_createButton_clicked(){
|
||||
return;
|
||||
}
|
||||
QStringList trackers = allItems(trackers_list);
|
||||
|
||||
QIniSettings settings("qBittorrent", "qBittorrent");
|
||||
QString last_path = settings.value("CreateTorrent/last_save_path", QDir::homePath()).toString();
|
||||
|
||||
QString destination = QFileDialog::getSaveFileName(this, tr("Select destination torrent file"), last_path, tr("Torrent Files")+QString::fromUtf8(" (*.torrent)"));
|
||||
/*if(!trackers.size()){
|
||||
QMessageBox::critical(0, tr("No tracker path set"), tr("Please set at least one tracker"));
|
||||
return;
|
||||
}*/
|
||||
QString destination = QFileDialog::getSaveFileName(this, tr("Select destination torrent file"), QDir::homePath(), tr("Torrent Files")+QString::fromUtf8(" (*.torrent)"));
|
||||
if(!destination.isEmpty()) {
|
||||
settings.setValue("CreateTorrent/last_save_path", misc::removeLastPathPart(destination));
|
||||
destination += QString::fromUtf8(".torrent");
|
||||
if(!destination.endsWith(QString::fromUtf8(".torrent")))
|
||||
destination += QString::fromUtf8(".torrent");
|
||||
} else {
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -203,11 +203,7 @@ private:
|
||||
void addTorrentsFromDir(const QDir &dir, QStringList &torrents) {
|
||||
const QStringList files = dir.entryList(filters, QDir::Files, QDir::Unsorted);
|
||||
foreach(const QString &file, files)
|
||||
#if defined(Q_WS_WIN) || defined(Q_OS_OS2)
|
||||
torrents << dir.absoluteFilePath(file).replace("/", "\\");
|
||||
#else
|
||||
torrents << dir.absoluteFilePath(file);
|
||||
#endif
|
||||
torrents << dir.canonicalPath() + '/' + file;
|
||||
}
|
||||
|
||||
};
|
||||
|
||||
301
src/icons.qrc
301
src/icons.qrc
@@ -1,177 +1,176 @@
|
||||
<!DOCTYPE RCC><RCC version="1.0">
|
||||
<qresource>
|
||||
<file>Icons/url.png</file>
|
||||
<file>Icons/loading.png</file>
|
||||
<file>Icons/rss16.png</file>
|
||||
<file>Icons/rss32.png</file>
|
||||
<file>Icons/3-state-checkbox.gif</file>
|
||||
<file>Icons/uparrow.png</file>
|
||||
<file>Icons/sphere.png</file>
|
||||
<file>Icons/downarrow.png</file>
|
||||
<file>Icons/slow_off.png</file>
|
||||
<file>Icons/sphere2.png</file>
|
||||
<file>Icons/magnet.png</file>
|
||||
<file>Icons/downarrow.png</file>
|
||||
<file>Icons/url.png</file>
|
||||
<file>Icons/3-state-checkbox.gif</file>
|
||||
<file>Icons/loading.png</file>
|
||||
<file>Icons/slow.png</file>
|
||||
<file>Icons/magnet.png</file>
|
||||
<file>Icons/sphere.png</file>
|
||||
<file>Icons/L.gif</file>
|
||||
<file>Icons/skin/delete_perm22.png</file>
|
||||
<file>Icons/skin/seeding.png</file>
|
||||
<file>Icons/skin/splash.png</file>
|
||||
<file>Icons/skin/preview.png</file>
|
||||
<file>Icons/skin/tabs.gif</file>
|
||||
<file>Icons/skin/delete.png</file>
|
||||
<file>Icons/skin/increase.png</file>
|
||||
<file>Icons/skin/qbittorrent16.png</file>
|
||||
<file>Icons/skin/connected.png</file>
|
||||
<file>Icons/skin/url.png</file>
|
||||
<file>Icons/skin/qbittorrent22.png</file>
|
||||
<file>Icons/skin/disconnected.png</file>
|
||||
<file>Icons/skin/mascot.png</file>
|
||||
<file>Icons/skin/info.png</file>
|
||||
<file>Icons/skin/paused.png</file>
|
||||
<file>Icons/skin/slider-area.gif</file>
|
||||
<file>Icons/skin/pause22.png</file>
|
||||
<file>Icons/skin/stalledDL.png</file>
|
||||
<file>Icons/slow_off.png</file>
|
||||
<file>Icons/uparrow.png</file>
|
||||
<file>Icons/rss16.png</file>
|
||||
<file>Icons/skin/bg-handle-horizontal.gif</file>
|
||||
<file>Icons/skin/play.png</file>
|
||||
<file>Icons/skin/delete_all.png</file>
|
||||
<file>Icons/skin/delete_perm.png</file>
|
||||
<file>Icons/skin/qb_question.png</file>
|
||||
<file>Icons/skin/error.png</file>
|
||||
<file>Icons/skin/settings.png</file>
|
||||
<file>Icons/skin/handle-icon-horizontal.gif</file>
|
||||
<file>Icons/skin/pause.png</file>
|
||||
<file>Icons/skin/qbittorrent32.png</file>
|
||||
<file>Icons/skin/exit.png</file>
|
||||
<file>Icons/skin/knob.gif</file>
|
||||
<file>Icons/skin/open.png</file>
|
||||
<file>Icons/skin/pause_all.png</file>
|
||||
<file>Icons/skin/filterall.png</file>
|
||||
<file>Icons/skin/uploading.png</file>
|
||||
<file>Icons/skin/queued.png</file>
|
||||
<file>Icons/skin/checking.png</file>
|
||||
<file>Icons/skin/handle-icon.gif</file>
|
||||
<file>Icons/skin/filterinactive.png</file>
|
||||
<file>Icons/skin/decrease.png</file>
|
||||
<file>Icons/skin/play22.png</file>
|
||||
<file>Icons/skin/firewalled.png</file>
|
||||
<file>Icons/skin/delete22.png</file>
|
||||
<file>Icons/skin/qbittorrent22.png</file>
|
||||
<file>Icons/skin/new.png</file>
|
||||
<file>Icons/skin/downloading.png</file>
|
||||
<file>Icons/skin/play_all.png</file>
|
||||
<file>Icons/skin/toolbox-divider.gif</file>
|
||||
<file>Icons/skin/preview.png</file>
|
||||
<file>Icons/skin/delete.png</file>
|
||||
<file>Icons/skin/handle-icon-horizontal.gif</file>
|
||||
<file>Icons/skin/handle-icon.gif</file>
|
||||
<file>Icons/skin/knob.gif</file>
|
||||
<file>Icons/skin/url.png</file>
|
||||
<file>Icons/skin/stalledUP.png</file>
|
||||
<file>Icons/skin/filteractive.png</file>
|
||||
<file>Icons/skin/bg-handle-horizontal.gif</file>
|
||||
<file>Icons/skin/connected.png</file>
|
||||
<file>Icons/skin/mascot.png</file>
|
||||
<file>Icons/skin/seeding.png</file>
|
||||
<file>Icons/skin/increase.png</file>
|
||||
<file>Icons/skin/qbittorrent32.png</file>
|
||||
<file>Icons/skin/paused.png</file>
|
||||
<file>Icons/skin/toolbox-divider.gif</file>
|
||||
<file>Icons/skin/stalledDL.png</file>
|
||||
<file>Icons/skin/qb_question.png</file>
|
||||
<file>Icons/skin/download.png</file>
|
||||
<file>Icons/flags/pakistan.png</file>
|
||||
<file>Icons/flags/argentina.png</file>
|
||||
<file>Icons/flags/netherlands.png</file>
|
||||
<file>Icons/flags/australia.png</file>
|
||||
<file>Icons/flags/finland.png</file>
|
||||
<file>Icons/flags/croatia.png</file>
|
||||
<file>Icons/flags/indonesia.png</file>
|
||||
<file>Icons/flags/greece.png</file>
|
||||
<file>Icons/flags/belarus.png</file>
|
||||
<file>Icons/flags/morocco.png</file>
|
||||
<file>Icons/flags/portugal.png</file>
|
||||
<file>Icons/flags/egypt.png</file>
|
||||
<file>Icons/flags/georgia.png</file>
|
||||
<file>Icons/flags/costa_rica.png</file>
|
||||
<file>Icons/flags/denmark.png</file>
|
||||
<file>Icons/flags/bosnia.png</file>
|
||||
<file>Icons/flags/newzealand.png</file>
|
||||
<file>Icons/skin/open.png</file>
|
||||
<file>Icons/skin/play22.png</file>
|
||||
<file>Icons/skin/qbittorrent16.png</file>
|
||||
<file>Icons/skin/slider-area.gif</file>
|
||||
<file>Icons/skin/downloading.png</file>
|
||||
<file>Icons/skin/filterinactive.png</file>
|
||||
<file>Icons/skin/pause22.png</file>
|
||||
<file>Icons/skin/pause_all.png</file>
|
||||
<file>Icons/skin/error.png</file>
|
||||
<file>Icons/skin/delete22.png</file>
|
||||
<file>Icons/skin/checking.png</file>
|
||||
<file>Icons/skin/play_all.png</file>
|
||||
<file>Icons/skin/pause.png</file>
|
||||
<file>Icons/skin/firewalled.png</file>
|
||||
<file>Icons/skin/info.png</file>
|
||||
<file>Icons/skin/tabs.gif</file>
|
||||
<file>Icons/skin/delete_perm.png</file>
|
||||
<file>Icons/skin/queued.png</file>
|
||||
<file>Icons/skin/settings.png</file>
|
||||
<file>Icons/skin/exit.png</file>
|
||||
<file>Icons/skin/delete_all.png</file>
|
||||
<file>Icons/skin/splash.png</file>
|
||||
<file>Icons/skin/disconnected.png</file>
|
||||
<file>Icons/skin/decrease.png</file>
|
||||
<file>Icons/skin/uploading.png</file>
|
||||
<file>Icons/skin/filterall.png</file>
|
||||
<file>Icons/flags/czech.png</file>
|
||||
<file>Icons/flags/serbia.png</file>
|
||||
<file>Icons/flags/singapore.png</file>
|
||||
<file>Icons/flags/italy.png</file>
|
||||
<file>Icons/flags/brazil.png</file>
|
||||
<file>Icons/flags/iceland.png</file>
|
||||
<file>Icons/flags/china.png</file>
|
||||
<file>Icons/flags/luxembourg.png</file>
|
||||
<file>Icons/flags/newzealand.png</file>
|
||||
<file>Icons/flags/austria.png</file>
|
||||
<file>Icons/flags/indonesia.png</file>
|
||||
<file>Icons/flags/united_arab_emirates.png</file>
|
||||
<file>Icons/flags/norway.png</file>
|
||||
<file>Icons/flags/india.png</file>
|
||||
<file>Icons/flags/finland.png</file>
|
||||
<file>Icons/flags/australia.png</file>
|
||||
<file>Icons/flags/netherlands.png</file>
|
||||
<file>Icons/flags/south_africa.png</file>
|
||||
<file>Icons/flags/belarus.png</file>
|
||||
<file>Icons/flags/georgia.png</file>
|
||||
<file>Icons/flags/taiwan.png</file>
|
||||
<file>Icons/flags/south_korea.png</file>
|
||||
<file>Icons/flags/sweden.png</file>
|
||||
<file>Icons/flags/spain_catalunya.png</file>
|
||||
<file>Icons/flags/ireland.png</file>
|
||||
<file>Icons/flags/singapore.png</file>
|
||||
<file>Icons/flags/israel.png</file>
|
||||
<file>Icons/flags/belgium.png</file>
|
||||
<file>Icons/flags/usa.png</file>
|
||||
<file>Icons/flags/costa_rica.png</file>
|
||||
<file>Icons/flags/romania.png</file>
|
||||
<file>Icons/flags/suisse.png</file>
|
||||
<file>Icons/flags/croatia.png</file>
|
||||
<file>Icons/flags/mexico.png</file>
|
||||
<file>Icons/flags/denmark.png</file>
|
||||
<file>Icons/flags/hungary.png</file>
|
||||
<file>Icons/flags/slovenia.png</file>
|
||||
<file>Icons/flags/ukraine.png</file>
|
||||
<file>Icons/flags/turkey.png</file>
|
||||
<file>Icons/flags/algeria.png</file>
|
||||
<file>Icons/flags/japan.png</file>
|
||||
<file>Icons/flags/luxembourg.png</file>
|
||||
<file>Icons/flags/poland.png</file>
|
||||
<file>Icons/flags/iceland.png</file>
|
||||
<file>Icons/flags/greece.png</file>
|
||||
<file>Icons/flags/morocco.png</file>
|
||||
<file>Icons/flags/argentina.png</file>
|
||||
<file>Icons/flags/spain.png</file>
|
||||
<file>Icons/flags/saoudi_arabia.png</file>
|
||||
<file>Icons/flags/norway.png</file>
|
||||
<file>Icons/flags/portugal.png</file>
|
||||
<file>Icons/flags/russia.png</file>
|
||||
<file>Icons/flags/slovakia.png</file>
|
||||
<file>Icons/flags/philippines.png</file>
|
||||
<file>Icons/flags/thailand.png</file>
|
||||
<file>Icons/flags/israel.png</file>
|
||||
<file>Icons/flags/bulgaria.png</file>
|
||||
<file>Icons/flags/czech.png</file>
|
||||
<file>Icons/flags/usa.png</file>
|
||||
<file>Icons/flags/malaysia.png</file>
|
||||
<file>Icons/flags/belgium.png</file>
|
||||
<file>Icons/flags/south_africa.png</file>
|
||||
<file>Icons/flags/slovenia.png</file>
|
||||
<file>Icons/flags/china.png</file>
|
||||
<file>Icons/flags/germany.png</file>
|
||||
<file>Icons/flags/ukraine.png</file>
|
||||
<file>Icons/flags/india.png</file>
|
||||
<file>Icons/flags/spain_catalunya.png</file>
|
||||
<file>Icons/flags/romania.png</file>
|
||||
<file>Icons/flags/united_kingdom.png</file>
|
||||
<file>Icons/flags/united_arab_emirates.png</file>
|
||||
<file>Icons/flags/sweden.png</file>
|
||||
<file>Icons/flags/thailand.png</file>
|
||||
<file>Icons/flags/poland.png</file>
|
||||
<file>Icons/flags/germany.png</file>
|
||||
<file>Icons/flags/bulgaria.png</file>
|
||||
<file>Icons/flags/canada.png</file>
|
||||
<file>Icons/flags/mexico.png</file>
|
||||
<file>Icons/flags/hungary.png</file>
|
||||
<file>Icons/flags/brazil.png</file>
|
||||
<file>Icons/flags/france.png</file>
|
||||
<file>Icons/flags/ireland.png</file>
|
||||
<file>Icons/flags/austria.png</file>
|
||||
<file>Icons/flags/suisse.png</file>
|
||||
<file>Icons/oxygen/peer.png</file>
|
||||
<file>Icons/oxygen/unavailable.png</file>
|
||||
<file>Icons/oxygen/subscribe.png</file>
|
||||
<file>Icons/oxygen/list-remove.png</file>
|
||||
<file>Icons/oxygen/dialog-warning.png</file>
|
||||
<file>Icons/oxygen/mail-folder-inbox.png</file>
|
||||
<file>Icons/oxygen/folder.png</file>
|
||||
<file>Icons/oxygen/edit-copy.png</file>
|
||||
<file>Icons/oxygen/folder-documents.png</file>
|
||||
<file>Icons/oxygen/urlseed.png</file>
|
||||
<file>Icons/oxygen/edit-cut.png</file>
|
||||
<file>Icons/oxygen/gear32.png</file>
|
||||
<file>Icons/oxygen/user-group-delete.png</file>
|
||||
<file>Icons/oxygen/unsubscribe.png</file>
|
||||
<file>Icons/oxygen/tab-close.png</file>
|
||||
<file>Icons/oxygen/file.png</file>
|
||||
<file>Icons/oxygen/services.png</file>
|
||||
<file>Icons/flags/slovakia.png</file>
|
||||
<file>Icons/flags/pakistan.png</file>
|
||||
<file>Icons/flags/egypt.png</file>
|
||||
<file>Icons/flags/italy.png</file>
|
||||
<file>Icons/flags/south_korea.png</file>
|
||||
<file>Icons/flags/saoudi_arabia.png</file>
|
||||
<file>Icons/flags/bosnia.png</file>
|
||||
<file>Icons/flags/japan.png</file>
|
||||
<file>Icons/flags/malaysia.png</file>
|
||||
<file>Icons/flags/philippines.png</file>
|
||||
<file>Icons/oxygen/view-refresh.png</file>
|
||||
<file>Icons/oxygen/feed-subscribe.png</file>
|
||||
<file>Icons/oxygen/remove.png</file>
|
||||
<file>Icons/oxygen/chronometer.png</file>
|
||||
<file>Icons/oxygen/filter.png</file>
|
||||
<file>Icons/oxygen/run-build.png</file>
|
||||
<file>Icons/oxygen/button_ok.png</file>
|
||||
<file>Icons/oxygen/user-group-new.png</file>
|
||||
<file>Icons/oxygen/cookies.png</file>
|
||||
<file>Icons/oxygen/network-server.png</file>
|
||||
<file>Icons/oxygen/unsubscribe16.png</file>
|
||||
<file>Icons/oxygen/list-add.png</file>
|
||||
<file>Icons/oxygen/edit-paste.png</file>
|
||||
<file>Icons/oxygen/folder-remote.png</file>
|
||||
<file>Icons/oxygen/help-about.png</file>
|
||||
<file>Icons/oxygen/encrypted.png</file>
|
||||
<file>Icons/oxygen/file.png</file>
|
||||
<file>Icons/oxygen/folder-remote16.png</file>
|
||||
<file>Icons/oxygen/edit_clear.png</file>
|
||||
<file>Icons/oxygen/bug.png</file>
|
||||
<file>Icons/oxygen/gear.png</file>
|
||||
<file>Icons/oxygen/connection.png</file>
|
||||
<file>Icons/oxygen/document-new.png</file>
|
||||
<file>Icons/oxygen/browse.png</file>
|
||||
<file>Icons/oxygen/proxy.png</file>
|
||||
<file>Icons/oxygen/button_cancel.png</file>
|
||||
<file>Icons/oxygen/preferences-desktop.png</file>
|
||||
<file>Icons/oxygen/bt_settings.png</file>
|
||||
<file>Icons/oxygen/subscribe16.png</file>
|
||||
<file>Icons/oxygen/download.png</file>
|
||||
<file>Icons/oxygen/log.png</file>
|
||||
<file>Icons/oxygen/mail-folder-inbox.png</file>
|
||||
<file>Icons/oxygen/edit-find.png</file>
|
||||
<file>Icons/oxygen/edit-clear.png</file>
|
||||
<file>Icons/oxygen/webui.png</file>
|
||||
<file>Icons/oxygen/folder-new.png</file>
|
||||
<file>Icons/oxygen/folder-remote.png</file>
|
||||
<file>Icons/oxygen/edit-paste.png</file>
|
||||
<file>Icons/oxygen/run-build.png</file>
|
||||
<file>Icons/oxygen/proxy.png</file>
|
||||
<file>Icons/oxygen/services.png</file>
|
||||
<file>Icons/oxygen/user-group-delete.png</file>
|
||||
<file>Icons/oxygen/user-group-new.png</file>
|
||||
<file>Icons/oxygen/log.png</file>
|
||||
<file>Icons/oxygen/unavailable.png</file>
|
||||
<file>Icons/oxygen/button_ok.png</file>
|
||||
<file>Icons/oxygen/button_cancel.png</file>
|
||||
<file>Icons/oxygen/edit-clear.png</file>
|
||||
<file>Icons/oxygen/filter.png</file>
|
||||
<file>Icons/oxygen/encrypted.png</file>
|
||||
<file>Icons/oxygen/edit_clear.png</file>
|
||||
<file>Icons/oxygen/download.png</file>
|
||||
<file>Icons/oxygen/cookies.png</file>
|
||||
<file>Icons/oxygen/gear32.png</file>
|
||||
<file>Icons/oxygen/gear.png</file>
|
||||
<file>Icons/oxygen/remove.png</file>
|
||||
<file>Icons/oxygen/dialog-warning.png</file>
|
||||
<file>Icons/oxygen/peer.png</file>
|
||||
<file>Icons/oxygen/browse.png</file>
|
||||
<file>Icons/oxygen/unsubscribe16.png</file>
|
||||
<file>Icons/oxygen/subscribe.png</file>
|
||||
<file>Icons/oxygen/edit-copy.png</file>
|
||||
<file>Icons/oxygen/chronometer.png</file>
|
||||
<file>Icons/oxygen/bt_settings.png</file>
|
||||
<file>Icons/oxygen/document-new.png</file>
|
||||
<file>Icons/oxygen/preferences-desktop.png</file>
|
||||
<file>Icons/oxygen/tab-close.png</file>
|
||||
<file>Icons/oxygen/webui.png</file>
|
||||
<file>Icons/oxygen/list-remove.png</file>
|
||||
<file>Icons/oxygen/connection.png</file>
|
||||
<file>Icons/oxygen/bug.png</file>
|
||||
<file>Icons/oxygen/help-about.png</file>
|
||||
<file>Icons/oxygen/list-add.png</file>
|
||||
<file>Icons/oxygen/network-server.png</file>
|
||||
<file>Icons/oxygen/folder.png</file>
|
||||
<file>Icons/oxygen/urlseed.png</file>
|
||||
<file>Icons/oxygen/folder-documents.png</file>
|
||||
<file>Icons/oxygen/edit-cut.png</file>
|
||||
<file>Icons/oxygen/unsubscribe.png</file>
|
||||
<file>Icons/oxygen/feed-subscribe.png</file>
|
||||
<file>Icons/oxygen/subscribe16.png</file>
|
||||
</qresource>
|
||||
</RCC>
|
||||
52
src/lang.qrc
52
src/lang.qrc
@@ -1,34 +1,34 @@
|
||||
<!DOCTYPE RCC><RCC version="1.0">
|
||||
<qresource>
|
||||
<file>lang/qbittorrent_nl.qm</file>
|
||||
<file>lang/qbittorrent_hu.qm</file>
|
||||
<file>lang/qbittorrent_ru.qm</file>
|
||||
<file>lang/qbittorrent_zh_TW.qm</file>
|
||||
<file>lang/qbittorrent_tr.qm</file>
|
||||
<file>lang/qbittorrent_fi.qm</file>
|
||||
<file>lang/qbittorrent_es.qm</file>
|
||||
<file>lang/qbittorrent_sk.qm</file>
|
||||
<file>lang/qbittorrent_ja.qm</file>
|
||||
<file>lang/qbittorrent_zh_TW.qm</file>
|
||||
<file>lang/qbittorrent_pt.qm</file>
|
||||
<file>lang/qbittorrent_sv.qm</file>
|
||||
<file>lang/qbittorrent_pl.qm</file>
|
||||
<file>lang/qbittorrent_it.qm</file>
|
||||
<file>lang/qbittorrent_ar.qm</file>
|
||||
<file>lang/qbittorrent_ko.qm</file>
|
||||
<file>lang/qbittorrent_en.qm</file>
|
||||
<file>lang/qbittorrent_ro.qm</file>
|
||||
<file>lang/qbittorrent_bg.qm</file>
|
||||
<file>lang/qbittorrent_ru.qm</file>
|
||||
<file>lang/qbittorrent_nl.qm</file>
|
||||
<file>lang/qbittorrent_nb.qm</file>
|
||||
<file>lang/qbittorrent_fi.qm</file>
|
||||
<file>lang/qbittorrent_uk.qm</file>
|
||||
<file>lang/qbittorrent_cs.qm</file>
|
||||
<file>lang/qbittorrent_pt_BR.qm</file>
|
||||
<file>lang/qbittorrent_el.qm</file>
|
||||
<file>lang/qbittorrent_ca.qm</file>
|
||||
<file>lang/qbittorrent_pt.qm</file>
|
||||
<file>lang/qbittorrent_it.qm</file>
|
||||
<file>lang/qbittorrent_fr.qm</file>
|
||||
<file>lang/qbittorrent_uk.qm</file>
|
||||
<file>lang/qbittorrent_zh.qm</file>
|
||||
<file>lang/qbittorrent_ko.qm</file>
|
||||
<file>lang/qbittorrent_nb.qm</file>
|
||||
<file>lang/qbittorrent_sv.qm</file>
|
||||
<file>lang/qbittorrent_de.qm</file>
|
||||
<file>lang/qbittorrent_sr.qm</file>
|
||||
<file>lang/qbittorrent_pt_BR.qm</file>
|
||||
<file>lang/qbittorrent_da.qm</file>
|
||||
<file>lang/qbittorrent_cs.qm</file>
|
||||
<file>lang/qbittorrent_pl.qm</file>
|
||||
<file>lang/qbittorrent_bg.qm</file>
|
||||
<file>lang/qbittorrent_ar.qm</file>
|
||||
<file>lang/qbittorrent_es.qm</file>
|
||||
<file>lang/qbittorrent_en.qm</file>
|
||||
<file>lang/qbittorrent_hr.qm</file>
|
||||
<file>lang/qbittorrent_ro.qm</file>
|
||||
<file>lang/qbittorrent_sr.qm</file>
|
||||
<file>lang/qbittorrent_hu.qm</file>
|
||||
<file>lang/qbittorrent_da.qm</file>
|
||||
<file>lang/qbittorrent_de.qm</file>
|
||||
<file>lang/qbittorrent_zh.qm</file>
|
||||
<file>lang/qbittorrent_ja.qm</file>
|
||||
<file>lang/qbittorrent_tr.qm</file>
|
||||
<file>lang/qbittorrent_fr.qm</file>
|
||||
</qresource>
|
||||
</RCC>
|
||||
@@ -135,7 +135,7 @@ void sigsegvHandler(int) {
|
||||
std::cerr << "\n\n*************************************************************\n";
|
||||
std::cerr << "Catching SIGSEGV, please report a bug at http://bug.qbittorrent.org\nand provide the following backtrace:\n";
|
||||
print_stacktrace();
|
||||
raise(SIGSEGV);
|
||||
std::raise(SIGSEGV);
|
||||
}
|
||||
void sigabrtHandler(int) {
|
||||
signal(SIGABRT, 0);
|
||||
@@ -143,7 +143,7 @@ void sigabrtHandler(int) {
|
||||
std::cerr << "\n\n*************************************************************\n";
|
||||
std::cerr << "Catching SIGABRT, please report a bug at http://bug.qbittorrent.org\nand provide the following backtrace:\n";
|
||||
print_stacktrace();
|
||||
raise(SIGABRT);
|
||||
std::raise(SIGABRT);
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
@@ -33,7 +33,6 @@
|
||||
|
||||
#include <sstream>
|
||||
#include <QString>
|
||||
#include <QStringList>
|
||||
#include <QThread>
|
||||
#include <ctime>
|
||||
#include <boost/date_time/posix_time/posix_time_types.hpp>
|
||||
@@ -75,14 +74,6 @@ public:
|
||||
return QString(o.str().c_str());
|
||||
}
|
||||
|
||||
static inline QString removeLastPathPart(QString path) {
|
||||
if(path.isEmpty()) return path;
|
||||
path = path.replace("\\", "/");
|
||||
QStringList tmp = path.split("/");
|
||||
tmp.removeLast();
|
||||
return tmp.join("/");
|
||||
}
|
||||
|
||||
static inline sha1_hash QStringToSha1(const QString& s) {
|
||||
std::string str(s.toLocal8Bit().data());
|
||||
std::istringstream i(str);
|
||||
|
||||
@@ -80,15 +80,8 @@ QVariant ScanFoldersModel::data(const QModelIndex &index, int role) const {
|
||||
return QVariant();
|
||||
|
||||
const PathData* pathData = m_pathList.at(index.row());
|
||||
if (index.column() == PathColumn && role == Qt::DisplayRole) {
|
||||
#if defined(Q_WS_WIN) || defined(Q_OS_OS2)
|
||||
QString ret = pathData->path;
|
||||
ret = ret.replace("/", "\\");
|
||||
return ret;
|
||||
#else
|
||||
return pathData->path;
|
||||
#endif
|
||||
}
|
||||
if (index.column() == PathColumn && role == Qt::DisplayRole)
|
||||
return pathData->path;
|
||||
if (index.column() == DownloadAtTorrentColumn && role == Qt::CheckStateRole)
|
||||
return pathData->downloadAtPath ? Qt::Checked : Qt::Unchecked;
|
||||
return QVariant();
|
||||
|
||||
@@ -1,23 +1,23 @@
|
||||
<!DOCTYPE RCC><RCC version="1.0">
|
||||
<qresource>
|
||||
<file>search_engine/nova2.py</file>
|
||||
<file>search_engine/novaprinter.py</file>
|
||||
<file>search_engine/socks.py</file>
|
||||
<file>search_engine/nova2dl.py</file>
|
||||
<file>search_engine/helpers.py</file>
|
||||
<file>search_engine/socks.py</file>
|
||||
<file>search_engine/nova2.py</file>
|
||||
<file>search_engine/engines/isohunt.py</file>
|
||||
<file>search_engine/engines/isohunt.png</file>
|
||||
<file>search_engine/engines/vertor.png</file>
|
||||
<file>search_engine/engines/torrentdownloads.py</file>
|
||||
<file>search_engine/engines/torrentdownloads.png</file>
|
||||
<file>search_engine/engines/piratebay.py</file>
|
||||
<file>search_engine/engines/torrentreactor.py</file>
|
||||
<file>search_engine/engines/piratebay.png</file>
|
||||
<file>search_engine/engines/btjunkie.png</file>
|
||||
<file>search_engine/engines/btjunkie.py</file>
|
||||
<file>search_engine/engines/vertor.py</file>
|
||||
<file>search_engine/engines/torrentreactor.png</file>
|
||||
<file>search_engine/engines/mininova.png</file>
|
||||
<file>search_engine/engines/mininova.py</file>
|
||||
<file>search_engine/engines/torrentdownloads.png</file>
|
||||
<file>search_engine/engines/isohunt.png</file>
|
||||
<file>search_engine/engines/torrentreactor.py</file>
|
||||
<file>search_engine/engines/btjunkie.png</file>
|
||||
<file>search_engine/engines/piratebay.py</file>
|
||||
<file>search_engine/engines/torrentdownloads.py</file>
|
||||
<file>search_engine/engines/torrentreactor.png</file>
|
||||
<file>search_engine/engines/isohunt.py</file>
|
||||
<file>search_engine/engines/btjunkie.py</file>
|
||||
<file>search_engine/engines/piratebay.png</file>
|
||||
<file>search_engine/engines/vertor.py</file>
|
||||
</qresource>
|
||||
</RCC>
|
||||
@@ -12,13 +12,13 @@ CONFIG += qt \
|
||||
|
||||
# Update this VERSION for each release
|
||||
os2 {
|
||||
DEFINES += VERSION=\'\"v2.3.1\"\'
|
||||
DEFINES += VERSION=\'\"v2.3.0\"\'
|
||||
} else {
|
||||
DEFINES += VERSION=\\\"v2.3.1\\\"
|
||||
DEFINES += VERSION=\\\"v2.3.0\\\"
|
||||
}
|
||||
DEFINES += VERSION_MAJOR=2
|
||||
DEFINES += VERSION_MINOR=3
|
||||
DEFINES += VERSION_BUGFIX=1
|
||||
DEFINES += VERSION_BUGFIX=0
|
||||
|
||||
# NORMAL,ALPHA,BETA,RELEASE_CANDIDATE,DEVEL
|
||||
DEFINES += VERSION_TYPE=NORMAL
|
||||
|
||||
@@ -718,8 +718,8 @@ void TransferListWidget::deleteSelectedTorrents() {
|
||||
}
|
||||
}
|
||||
|
||||
// FIXME: Should work only if the tab is displayed
|
||||
void TransferListWidget::increasePrioSelectedTorrents() {
|
||||
if(main_window->getCurrentTabWidget() != this) return;
|
||||
const QStringList hashes = getSelectedTorrentsHashes();
|
||||
foreach(const QString &hash, hashes) {
|
||||
QTorrentHandle h = BTSession->getTorrentHandle(hash);
|
||||
@@ -730,8 +730,8 @@ void TransferListWidget::increasePrioSelectedTorrents() {
|
||||
refreshList();
|
||||
}
|
||||
|
||||
// FIXME: Should work only if the tab is displayed
|
||||
void TransferListWidget::decreasePrioSelectedTorrents() {
|
||||
if(main_window->getCurrentTabWidget() != this) return;
|
||||
const QStringList hashes = getSelectedTorrentsHashes();
|
||||
foreach(const QString &hash, hashes) {
|
||||
QTorrentHandle h = BTSession->getTorrentHandle(hash);
|
||||
|
||||
@@ -88,18 +88,8 @@
|
||||
<attribute name="title">
|
||||
<string>About</string>
|
||||
</attribute>
|
||||
<layout class="QGridLayout" name="gridLayout_2">
|
||||
<item row="0" column="0">
|
||||
<widget class="QLabel" name="mascot_lbl">
|
||||
<property name="text">
|
||||
<string/>
|
||||
</property>
|
||||
<property name="pixmap">
|
||||
<pixmap resource="../icons.qrc">:/Icons/skin/mascot.png</pixmap>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="0" column="1">
|
||||
<layout class="QVBoxLayout" name="verticalLayout">
|
||||
<item>
|
||||
<widget class="QLabel" name="lb_about">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
|
||||
@@ -133,6 +123,13 @@ p, li { white-space: pre-wrap; }
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QLabel" name="mascot_lbl">
|
||||
<property name="text">
|
||||
<string/>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
<widget class="QWidget" name="tab3">
|
||||
@@ -300,8 +297,6 @@ p, li { white-space: pre-wrap; }
|
||||
</layout>
|
||||
</widget>
|
||||
<layoutdefault spacing="6" margin="11"/>
|
||||
<resources>
|
||||
<include location="../icons.qrc"/>
|
||||
</resources>
|
||||
<resources/>
|
||||
<connections/>
|
||||
</ui>
|
||||
|
||||
@@ -30,8 +30,6 @@ MochaUI.extend({
|
||||
var tmp = data.toInt();
|
||||
if(tmp > 0) {
|
||||
maximum = tmp / 1024.
|
||||
} else {
|
||||
maximum = 0
|
||||
}
|
||||
}
|
||||
// Get torrent upload limit
|
||||
@@ -117,8 +115,6 @@ MochaUI.extend({
|
||||
var tmp = data.toInt();
|
||||
if(tmp > 0) {
|
||||
maximum = tmp / 1024.
|
||||
} else {
|
||||
maximum = 0
|
||||
}
|
||||
}
|
||||
// Get torrent download limit
|
||||
|
||||
Reference in New Issue
Block a user