squidy/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2025-12-23 00:47:21 -06:00
Code Issues Packages Projects Releases Wiki Activity

Several OS/2 fixes by Silvan Scherrer

Browse Source
This commit is contained in:
Christophe Dumez
2010-06-22 19:23:28 +00:00
parent 6a8f568d74
commit c66df12f8c
11 changed files with 34 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS
View File

@@ -9,6 +9,7 @@ Contributors:
* Arnaud Demaizière <arnaud@qbittorrent.org> * Arnaud Demaizière <arnaud@qbittorrent.org>
* Grigis Gaëtan <cipher16@gmail.com> * Grigis Gaëtan <cipher16@gmail.com>
* Christian Kandeler <zambesi@users.sourceforge.net> * Christian Kandeler <zambesi@users.sourceforge.net>
* Silvan Scherrer <silvan.scherrer@aroa.ch>
Code from other projects: Code from other projects:
* files src/qtsingleapp/* * files src/qtsingleapp/*

1
Changelog
View File

@@ -7,6 +7,7 @@
- BUGFIX: Use busy cursor for search plugin updates - BUGFIX: Use busy cursor for search plugin updates
- BUGFIX: Free disk space calculation now works if destination folder does not exist - BUGFIX: Free disk space calculation now works if destination folder does not exist
- BUGFIX: Fix "append .!qB extension to incomplete files" feature - BUGFIX: Fix "append .!qB extension to incomplete files" feature
- BUGFIX: Several OS/2 fixes by Silvan Scherrer
- COSMETIC: Display "Alternative speed limits" button as pressed when enabled - COSMETIC: Display "Alternative speed limits" button as pressed when enabled
* Sun Jun 13 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.2.9 * Sun Jun 13 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.2.9

2
src/bittorrent.cpp
View File

@@ -1548,7 +1548,7 @@ void Bittorrent::addConsoleMessage(QString msg, QString) {
if(consoleMessages.size() > 100) { if(consoleMessages.size() > 100) {
consoleMessages.removeFirst(); consoleMessages.removeFirst();
} }
#ifdef Q_WS_WIN #if defined(Q_WS_WIN) || defined(Q_OS_OS2)
msg = msg.replace("/", "\\"); msg = msg.replace("/", "\\");
#endif #endif
consoleMessages.append(QString::fromUtf8("<font color='grey'>")+ QDateTime::currentDateTime().toString(QString::fromUtf8("dd/MM/yyyy hh:mm:ss")) + QString::fromUtf8("</font> - <font color='") + color.name() +QString::fromUtf8("'><i>") + msg + QString::fromUtf8("</i></font>")); consoleMessages.append(QString::fromUtf8("<font color='grey'>")+ QDateTime::currentDateTime().toString(QString::fromUtf8("dd/MM/yyyy hh:mm:ss")) + QString::fromUtf8("</font> - <font color='") + color.name() +QString::fromUtf8("'><i>") + msg + QString::fromUtf8("</i></font>"));

4
src/createtorrent_imp.cpp
View File

@@ -82,7 +82,7 @@ createtorrent::~createtorrent() {
void createtorrent::on_addFolder_button_clicked(){ void createtorrent::on_addFolder_button_clicked(){
QString dir = QFileDialog::getExistingDirectory(this, tr("Select a folder to add to the torrent"), QDir::homePath(), QFileDialog::ShowDirsOnly); QString dir = QFileDialog::getExistingDirectory(this, tr("Select a folder to add to the torrent"), QDir::homePath(), QFileDialog::ShowDirsOnly);
if(!dir.isEmpty()) { if(!dir.isEmpty()) {
#ifdef Q_WS_WIN #if defined(Q_WS_WIN) || defined(Q_OS_OS2)
dir = dir.replace("/", "\\"); dir = dir.replace("/", "\\");
#endif #endif
textInputPath->setText(dir); textInputPath->setText(dir);
@@ -92,7 +92,7 @@ void createtorrent::on_addFolder_button_clicked(){
void createtorrent::on_addFile_button_clicked(){ void createtorrent::on_addFile_button_clicked(){
QString file = QFileDialog::getOpenFileName(this, tr("Select a file to add to the torrent"), QDir::homePath()); QString file = QFileDialog::getOpenFileName(this, tr("Select a file to add to the torrent"), QDir::homePath());
if(!file.isEmpty()) { if(!file.isEmpty()) {
#ifdef Q_WS_WIN #if defined(Q_WS_WIN) || defined(Q_OS_OS2)
file = file.replace("/", "\\"); file = file.replace("/", "\\");
#endif #endif
textInputPath->setText(file); textInputPath->setText(file);

24
src/options_imp.cpp
View File

@@ -401,13 +401,13 @@ void options_imp::saveOptions(){
// Downloads preferences // Downloads preferences
settings.beginGroup("Downloads"); settings.beginGroup("Downloads");
QString save_path = getSavePath(); QString save_path = getSavePath();
#ifdef Q_WS_WIN #if defined(Q_WS_WIN) || defined(Q_OS_OS2)
save_path = save_path.replace("\\", "/"); save_path = save_path.replace("\\", "/");
#endif #endif
settings.setValue(QString::fromUtf8("SavePath"), save_path); settings.setValue(QString::fromUtf8("SavePath"), save_path);
settings.setValue(QString::fromUtf8("TempPathEnabled"), isTempPathEnabled()); settings.setValue(QString::fromUtf8("TempPathEnabled"), isTempPathEnabled());
QString temp_path = getTempPath(); QString temp_path = getTempPath();
#ifdef Q_WS_WIN #if defined(Q_WS_WIN) || defined(Q_OS_OS2)
temp_path = temp_path.replace("\\", "/"); temp_path = temp_path.replace("\\", "/");
#endif #endif
settings.setValue(QString::fromUtf8("TempPath"), temp_path); settings.setValue(QString::fromUtf8("TempPath"), temp_path);
@@ -421,7 +421,7 @@ void options_imp::saveOptions(){
ScanFoldersModel::instance()->makePersistent(settings); ScanFoldersModel::instance()->makePersistent(settings);
addedScanDirs.clear(); addedScanDirs.clear();
QString export_dir = getExportDir(); QString export_dir = getExportDir();
#ifdef Q_WS_WIN #if defined(Q_WS_WIN) || defined(Q_OS_OS2)
export_dir = export_dir.replace("\\", "/"); export_dir = export_dir.replace("\\", "/");
#endif #endif
Preferences::setExportDir(export_dir); Preferences::setExportDir(export_dir);
@@ -511,7 +511,7 @@ void options_imp::saveOptions(){
settings.setValue(QString::fromUtf8("Enabled"), isFilteringEnabled()); settings.setValue(QString::fromUtf8("Enabled"), isFilteringEnabled());
if(isFilteringEnabled()){ if(isFilteringEnabled()){
QString filter_path = textFilterPath->text(); QString filter_path = textFilterPath->text();
#ifdef Q_WS_WIN #if defined(Q_WS_WIN) || defined(Q_OS_OS2)
filter_path = filter_path.replace("\\", "/"); filter_path = filter_path.replace("\\", "/");
#endif #endif
settings.setValue(QString::fromUtf8("File"), filter_path); settings.setValue(QString::fromUtf8("File"), filter_path);
@@ -634,7 +634,7 @@ void options_imp::loadOptions(){
// End General preferences // End General preferences
// Downloads preferences // Downloads preferences
QString save_path = Preferences::getSavePath(); QString save_path = Preferences::getSavePath();
#ifdef Q_WS_WIN #if defined(Q_WS_WIN) || defined(Q_OS_OS2)
save_path = save_path.replace("/", "\\"); save_path = save_path.replace("/", "\\");
#endif #endif
textSavePath->setText(save_path); textSavePath->setText(save_path);
@@ -647,7 +647,7 @@ void options_imp::loadOptions(){
enableTempPathInput(checkTempFolder->isChecked()); enableTempPathInput(checkTempFolder->isChecked());
} }
QString temp_path = Preferences::getTempPath(); QString temp_path = Preferences::getTempPath();
#ifdef Q_WS_WIN #if defined(Q_WS_WIN) || defined(Q_OS_OS2)
temp_path = temp_path.replace("/", "\\"); temp_path = temp_path.replace("/", "\\");
#endif #endif
textTempPath->setText(temp_path); textTempPath->setText(temp_path);
@@ -667,7 +667,7 @@ void options_imp::loadOptions(){
} else { } else {
// enable // enable
checkExportDir->setChecked(true); checkExportDir->setChecked(true);
#ifdef Q_WS_WIN #if defined(Q_WS_WIN) || defined(Q_OS_OS2)
strValue = strValue.replace("/", "\\"); strValue = strValue.replace("/", "\\");
#endif #endif
textExportDir->setText(strValue); textExportDir->setText(strValue);
@@ -1063,7 +1063,7 @@ float options_imp::getDeleteRatio() const{
QString options_imp::getSavePath() const{ QString options_imp::getSavePath() const{
if(textSavePath->text().trimmed().isEmpty()){ if(textSavePath->text().trimmed().isEmpty()){
QString save_path = Preferences::getSavePath(); QString save_path = Preferences::getSavePath();
#ifdef Q_WS_WIN #if defined(Q_WS_WIN) || defined(Q_OS_OS2)
save_path = save_path.replace("/", "\\"); save_path = save_path.replace("/", "\\");
#endif #endif
textSavePath->setText(save_path); textSavePath->setText(save_path);
@@ -1462,7 +1462,7 @@ void options_imp::on_browseExportDirButton_clicked() {
dir = QFileDialog::getExistingDirectory(this, tr("Choose export directory"), QDir::homePath()); dir = QFileDialog::getExistingDirectory(this, tr("Choose export directory"), QDir::homePath());
} }
if(!dir.isNull()){ if(!dir.isNull()){
#ifdef Q_WS_WIN #if defined(Q_WS_WIN) || defined(Q_OS_OS2)
dir = dir.replace("/", "\\"); dir = dir.replace("/", "\\");
#endif #endif
textExportDir->setText(dir); textExportDir->setText(dir);
@@ -1479,7 +1479,7 @@ void options_imp::on_browseFilterButton_clicked() {
ipfilter = QFileDialog::getOpenFileName(this, tr("Choose an ip filter file"), QDir::homePath(), tr("Filters")+QString(" (*.dat *.p2p *.p2b)")); ipfilter = QFileDialog::getOpenFileName(this, tr("Choose an ip filter file"), QDir::homePath(), tr("Filters")+QString(" (*.dat *.p2p *.p2b)"));
} }
if(!ipfilter.isNull()){ if(!ipfilter.isNull()){
#ifdef Q_WS_WIN #if defined(Q_WS_WIN) || defined(Q_OS_OS2)
ipfilter = ipfilter.replace("/", "\\"); ipfilter = ipfilter.replace("/", "\\");
#endif #endif
textFilterPath->setText(ipfilter); textFilterPath->setText(ipfilter);
@@ -1497,7 +1497,7 @@ void options_imp::on_browseSaveDirButton_clicked(){
dir = QFileDialog::getExistingDirectory(this, tr("Choose a save directory"), QDir::homePath()); dir = QFileDialog::getExistingDirectory(this, tr("Choose a save directory"), QDir::homePath());
} }
if(!dir.isNull()){ if(!dir.isNull()){
#ifdef Q_WS_WIN #if defined(Q_WS_WIN) || defined(Q_OS_OS2)
dir = dir.replace("/", "\\"); dir = dir.replace("/", "\\");
#endif #endif
textSavePath->setText(dir); textSavePath->setText(dir);
@@ -1514,7 +1514,7 @@ void options_imp::on_browseTempDirButton_clicked(){
dir = QFileDialog::getExistingDirectory(this, tr("Choose a save directory"), QDir::homePath()); dir = QFileDialog::getExistingDirectory(this, tr("Choose a save directory"), QDir::homePath());
} }
if(!dir.isNull()){ if(!dir.isNull()){
#ifdef Q_WS_WIN #if defined(Q_WS_WIN) || defined(Q_OS_OS2)
dir = dir.replace("/", "\\"); dir = dir.replace("/", "\\");
#endif #endif
textTempPath->setText(dir); textTempPath->setText(dir);

6
src/propertieswidget.cpp
View File

@@ -212,7 +212,7 @@ void PropertiesWidget::updateSavePath(QTorrentHandle& _h) {
QString p = TorrentPersistentData::getSavePath(h.hash()); QString p = TorrentPersistentData::getSavePath(h.hash());
if(p.isEmpty()) if(p.isEmpty())
p = h.save_path(); p = h.save_path();
#ifdef Q_WS_WIN #if defined(Q_WS_WIN) || defined(Q_OS_OS2)
p = p.replace("/", "\\"); p = p.replace("/", "\\");
#endif #endif
save_path->setText(p); save_path->setText(p);
@@ -233,7 +233,7 @@ void PropertiesWidget::loadTorrentInfos(QTorrentHandle &_h) {
QString p = TorrentPersistentData::getSavePath(h.hash()); QString p = TorrentPersistentData::getSavePath(h.hash());
if(p.isEmpty()) if(p.isEmpty())
p = h.save_path(); p = h.save_path();
#ifdef Q_WS_WIN #if defined(Q_WS_WIN) || defined(Q_OS_OS2)
p = p.replace("/", "\\"); p = p.replace("/", "\\");
#endif #endif
save_path->setText(p); save_path->setText(p);
@@ -754,7 +754,7 @@ void PropertiesWidget::renameSelectedFile() {
h.move_storage(savePath.absolutePath()); h.move_storage(savePath.absolutePath());
// Update save_path in dialog // Update save_path in dialog
QString display_path = savePath.absolutePath(); QString display_path = savePath.absolutePath();
#ifdef Q_WS_WIN #if defined(Q_WS_WIN) || defined(Q_OS_OS2)
display_path = display_path.replace("/", "\\"); display_path = display_path.replace("/", "\\");
#endif #endif
save_path->setText(display_path); save_path->setText(display_path);

BIN
src/qbittorrent_os2.ico Normal file
View File

Binary file not shown.

1
src/qbittorrent_os2.rc Normal file
View File

@@ -0,0 +1 @@
ICON 1 DISCARDABLE "qbittorrent_os2.ico"

3
src/qtsingleapp/qtlocalpeer.cpp
View File

@@ -58,6 +58,9 @@ static PProcessIdToSessionId pProcessIdToSessionId = 0;
#if defined(Q_OS_UNIX) #if defined(Q_OS_UNIX)
#include <time.h> #include <time.h>
#endif #endif
#if defined(Q_OS_OS2)
#include <unistd.h>
#endif
#include <QtDebug> #include <QtDebug>

8
src/src.pro
View File

@@ -12,7 +12,7 @@ CONFIG += qt \
# Update this VERSION for each release # Update this VERSION for each release
os2 { os2 {
DEFINES += VERSION=\'\"v2.2.9\'\" DEFINES += VERSION=\'\"v2.2.9\"\'
} else { } else {
DEFINES += VERSION=\\\"v2.2.9\\\" DEFINES += VERSION=\\\"v2.2.9\\\"
} }
@@ -191,12 +191,16 @@ win32 {
} }
os2:LIBS += -ltorrent-rasterbar \ os2 {
LIBS += -ltorrent-rasterbar \
-lboost_thread \ -lboost_thread \
-lboost_system \ -lboost_system \
-lboost_filesystem \ -lboost_filesystem \
-lssl -lcrypto -lidn -lpthread -lssl -lcrypto -lidn -lpthread
RC_FILE = qbittorrent_os2.rc
}
!contains(DEFINES, DISABLE_GUI) { !contains(DEFINES, DISABLE_GUI) {
win32 { win32 {
DEFINES += WITH_GEOIP_EMBEDDED DEFINES += WITH_GEOIP_EMBEDDED

8
src/torrentadditiondlg.h
View File

@@ -94,7 +94,7 @@ public:
readSettings(); readSettings();
//torrentContentList->header()->setResizeMode(0, QHeaderView::Stretch); //torrentContentList->header()->setResizeMode(0, QHeaderView::Stretch);
QString display_path = Preferences::getSavePath(); QString display_path = Preferences::getSavePath();
#ifdef Q_WS_WIN #if defined(Q_WS_WIN) || defined(Q_OS_OS2)
display_path = display_path.replace("/", "\\"); display_path = display_path.replace("/", "\\");
#endif #endif
savePathTxt->setText(display_path); savePathTxt->setText(display_path);
@@ -414,7 +414,7 @@ public slots:
void on_browseButton_clicked(){ void on_browseButton_clicked(){
QString dir; QString dir;
QString save_path = savePathTxt->text(); QString save_path = savePathTxt->text();
#ifdef Q_WS_WIN #if defined(Q_WS_WIN) || defined(Q_OS_OS2)
save_path = save_path.replace("\\", "/"); save_path = save_path.replace("\\", "/");
#endif #endif
save_path = misc::expandPath(save_path); save_path = misc::expandPath(save_path);
@@ -425,7 +425,7 @@ public slots:
dir = QFileDialog::getExistingDirectory(this, tr("Choose save path"), QDir::homePath()); dir = QFileDialog::getExistingDirectory(this, tr("Choose save path"), QDir::homePath());
} }
if(!dir.isNull()){ if(!dir.isNull()){
#ifdef Q_WS_WIN #if defined(Q_WS_WIN) || defined(Q_OS_OS2)
dir = dir.replace("/", "\\"); dir = dir.replace("/", "\\");
#endif #endif
savePathTxt->setText(dir); savePathTxt->setText(dir);
@@ -452,7 +452,7 @@ public slots:
return; return;
} }
QString save_path = savePathTxt->text(); QString save_path = savePathTxt->text();
#ifdef Q_WS_WIN #if defined(Q_WS_WIN) || defined(Q_OS_OS2)
save_path = save_path.replace("\\", "/"); save_path = save_path.replace("\\", "/");
#endif #endif
QDir savePath(misc::expandPath(save_path)); QDir savePath(misc::expandPath(save_path));