diff --git a/Changelog b/Changelog index 8d0bd334d..827c45127 100644 --- a/Changelog +++ b/Changelog @@ -1,6 +1,7 @@ * Unknown - Christophe Dumez - v0.8.0 - FEATURE: Based on Qt 4.2 - FEATURE: Brand new trayicon from Qt 4.2 + - COSMETIC: Replaced OSD messages by systray messages * Mon Oct 16 2006 - Christophe Dumez - v0.7.1 - I18N: Updated French, Polish, Dutch, Swedish, Slovak translations diff --git a/TODO b/TODO index a7b89111c..bd68a7fc9 100644 --- a/TODO +++ b/TODO @@ -13,8 +13,7 @@ - Allow to prioritize files within a torrent - Allow to prioritize torrents - Optimize code to use less memory/cpu -- Add some transparency (menus, OSD) -- Rewrite trayicon using QSystemTrayIcon class (waiting for Qt 4.2) +- Add some transparency (menus,...) - Popup when adding a torrent (Save path, select files in the torrent...) (v0.8.0?) - Display remaining HD space (check it before adding a new torrent?) - Add a column "Tracker status"? diff --git a/src/GUI.cpp b/src/GUI.cpp index 314fa50f0..02b055305 100644 --- a/src/GUI.cpp +++ b/src/GUI.cpp @@ -152,6 +152,9 @@ GUI::GUI(QWidget *parent, QStringList torrentCmdLine) : QMainWindow(parent){ connect(actionPreview_file, SIGNAL(triggered()), this, SLOT(previewFileSelection())); connect(infoBar, SIGNAL(customContextMenuRequested(const QPoint&)), this, SLOT(displayInfoBarMenu(const QPoint&))); // Create tray icon + if (!QSystemTrayIcon::isSystemTrayAvailable()){ + std::cerr << "Error: System tray unavailable\n"; + } myTrayIcon = new QSystemTrayIcon(QIcon(":/Icons/qbittorrent22.png"), this); // Start download list refresher refresher = new QTimer(this); @@ -169,6 +172,7 @@ GUI::GUI(QWidget *parent, QStringList torrentCmdLine) : QMainWindow(parent){ myTrayIconMenu->addSeparator(); myTrayIconMenu->addAction(actionExit); myTrayIcon->setContextMenu(myTrayIconMenu); + connect(myTrayIcon, SIGNAL(messageClicked()), this, SLOT(balloonClicked())); // End of Icon Menu connect(myTrayIcon, SIGNAL(activated(QSystemTrayIcon::ActivationReason)), this, SLOT(toggleVisibility(QSystemTrayIcon::ActivationReason))); myTrayIcon->show(); @@ -226,8 +230,6 @@ GUI::GUI(QWidget *parent, QStringList torrentCmdLine) : QMainWindow(parent){ connect(meganova, SIGNAL(stateChanged(int)), this, SLOT(saveCheckedSearchEngines(int))); // Update nova.py search plugin if necessary updateNova(); - // OSD - OSDWindow = new OSD(this); // Supported preview extensions // XXX: might be incomplete supported_preview_extensions<<"AVI"<<"DIVX"<<"MPG"<<"MPEG"<<"MP3"<<"OGG"<<"WMV"<<"WMA"<<"RMV"<<"RMVB"<<"ASF"<<"MOV"<<"WAV"<<"MP2"<<"SWF"<<"AC3"; @@ -249,7 +251,6 @@ GUI::~GUI(){ delete refresher; delete myTrayIcon; delete myTrayIconMenu; - delete OSDWindow; delete tcpServer; delete DLDelegate; delete DLListModel; @@ -272,6 +273,16 @@ void GUI::setInfoBar(const QString& info, const QString& color){ infoBar->append(""+ QTime::currentTime().toString("hh:mm:ss") + " - " + info + ""); } +void GUI::balloonClicked(){ + if(isHidden()){ + show(); + if(isMinimized()){ + showNormal(); + } + raise(); + activateWindow(); + } +} // Buggy with Qt 4.1.2 : should try with another version // void GUI::readParamsOnSocket(){ // QTcpSocket *clientConnection = tcpServer->nextPendingConnection(); @@ -1860,7 +1871,7 @@ void GUI::checkConnectionStatus(){ // Level: info setInfoBar(fileName+tr(" has finished downloading.")); if(options->getUseOSDAlways() || (options->getUseOSDWhenHiddenOnly() && (isMinimized() || isHidden()))) { - OSDWindow->display(fileName+tr(" has finished downloading.")); + myTrayIcon->showMessage(tr("Download finished"), fileName+tr(" has finished downloading.", " has finished downloading."), QSystemTrayIcon::Information, TIME_TRAY_BALLOON); } QString scan_dir = options->getScanDir(); bool isScanningDir = !scan_dir.isNull(); @@ -2173,7 +2184,7 @@ void GUI::on_update_nova_button_clicked(){ // Error | Stopped by user | Finished normally void GUI::searchFinished(int exitcode,QProcess::ExitStatus){ if(options->getUseOSDAlways() || (options->getUseOSDWhenHiddenOnly() && (isMinimized() || isHidden()))) { - OSDWindow->display(tr("Search is finished")); + myTrayIcon->showMessage(tr("Search Engine"), tr("Search is finished"), QSystemTrayIcon::Information, TIME_TRAY_BALLOON); } if(exitcode){ search_status->setText(tr("An error occured during search...")); diff --git a/src/GUI.h b/src/GUI.h index c97692322..e35fd864e 100644 --- a/src/GUI.h +++ b/src/GUI.h @@ -41,10 +41,11 @@ #include "ui_MainWindow.h" #include "options_imp.h" #include "about_imp.h" -#include "OSD.h" #include "previewSelect.h" #include "trackerLogin.h" +#define TIME_TRAY_BALLOON 5000 + class createtorrent; class QTimer; class DLListDelegate; @@ -94,7 +95,6 @@ class GUI : public QMainWindow, private Ui::MainWindow{ bool no_search_results; QByteArray search_result_line_truncated; unsigned long nb_search_results; - OSD *OSDWindow; QTcpServer *tcpServer; QTcpSocket *clientConnection; @@ -133,6 +133,7 @@ class GUI : public QMainWindow, private Ui::MainWindow{ void previewFileSelection(); void previewFile(const QString& filePath); void cleanTempPreviewFile(int, QProcess::ExitStatus); + void balloonClicked(); // Torrent actions void showProperties(const QModelIndex &index); void propertiesSelection(); diff --git a/src/Icons/qBittorrent.desktop b/src/Icons/qBittorrent.desktop index 7f3f8c230..5681901fa 100644 --- a/src/Icons/qBittorrent.desktop +++ b/src/Icons/qBittorrent.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Categories=Qt;Application;Network;P2P -Comment=V0.7.1 +Comment=V0.8.0 Encoding=UTF-8 Exec=qbittorrent GenericName=Bittorrent client diff --git a/src/OSD.cpp b/src/OSD.cpp deleted file mode 100644 index 13d3a317e..000000000 --- a/src/OSD.cpp +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Bittorrent Client using Qt4 and libtorrent. - * Copyright (C) 2006 Christophe Dumez - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * - * Contact : chris@qbittorrent.org - */ - -#include -#include "OSD.h" - -OSD::OSD(QWidget *parent) : QDialog(parent){ - // Hide OSD Timer - hideOSDTimer = new QTimer(this); - hideOSDTimer->setSingleShot(true); - connect(hideOSDTimer, SIGNAL(timeout()), this, SLOT(hide())); - // Window settings - setWindowFlags(Qt::SplashScreen); - setPalette(QPalette(QColor("darkBlue"))); - hboxLayout = new QHBoxLayout(this); - icon = new QLabel(this); - icon->setPixmap(QPixmap(":/Icons/qbittorrent16.png")); - icon->adjustSize(); - msg = new QLabel(this); - msg->setPalette(QPalette(QColor(88, 75, 255, 200))); - icon->setPalette(QPalette(QColor(88, 75, 255, 200))); - msg->setAutoFillBackground(true); - icon->setAutoFillBackground(true); - hboxLayout->addWidget(icon); - hboxLayout->addWidget(msg); - hboxLayout->setSpacing(0); - hboxLayout->setMargin(1); -} - -OSD::~OSD(){ - delete hideOSDTimer; - delete icon; - delete msg; - delete hboxLayout; -} - -void OSD::display(const QString& message){ - if(hideOSDTimer->isActive()){ - hideOSDTimer->stop(); - hide(); - } - msg->setText(""+message+""); - msg->adjustSize(); - adjustSize(); - show(); - hideOSDTimer->start(3000); -} diff --git a/src/OSD.h b/src/OSD.h deleted file mode 100644 index 52f6d2597..000000000 --- a/src/OSD.h +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Bittorrent Client using Qt4 and libtorrent. - * Copyright (C) 2006 Christophe Dumez - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - * - * Contact : chris@qbittorrent.org - */ - -#ifndef OSD_H -#define OSD_H - -#include -#include -#include -#include - -class OSD : public QDialog { - Q_OBJECT - -private: - QTimer *hideOSDTimer; - QHBoxLayout *hboxLayout; - QLabel *icon; - QLabel *msg; - -public: - OSD(QWidget *parent=0); - ~OSD(); - -public slots: - void display(const QString& message); -}; - -#endif diff --git a/src/lang/qbittorrent_bg.qm b/src/lang/qbittorrent_bg.qm index 406335453..b38ebbb61 100644 Binary files a/src/lang/qbittorrent_bg.qm and b/src/lang/qbittorrent_bg.qm differ diff --git a/src/lang/qbittorrent_bg.ts b/src/lang/qbittorrent_bg.ts index 5fabc683d..00edef408 100644 --- a/src/lang/qbittorrent_bg.ts +++ b/src/lang/qbittorrent_bg.ts @@ -381,19 +381,19 @@ Copyright © 2006 на Christophe Dumez<br> OSD - OSD + OSD Always display OSD - Винаги показвай OSD + Винаги показвай OSD Display OSD only if window is minimized or iconified - Покажи OSD само ако минимизиран или иконизиран + Покажи OSD само ако минимизиран или иконизиран Never display OSD - Не показвай OSD + Не показвай OSD KiB/s @@ -427,6 +427,22 @@ Copyright © 2006 на Christophe Dumez<br> Audio/Video player: Аудио/Видео плейър: + + Systray Messages + + + + Always display systray messages + + + + Display systray messages only when window is hidden + + + + Never display systray messages + + GUI @@ -830,6 +846,19 @@ Please close the other one first. Transfers Трансфери + + Download finished + + + + has finished downloading. + <filename> has finished downloading. + е завършил свалянето. + + + Search Engine + Търсачка + MainWindow diff --git a/src/lang/qbittorrent_ca.qm b/src/lang/qbittorrent_ca.qm index ed42268b3..2b72f94a4 100644 Binary files a/src/lang/qbittorrent_ca.qm and b/src/lang/qbittorrent_ca.qm differ diff --git a/src/lang/qbittorrent_ca.ts b/src/lang/qbittorrent_ca.ts index 565d3fc1f..2b285530b 100644 --- a/src/lang/qbittorrent_ca.ts +++ b/src/lang/qbittorrent_ca.ts @@ -404,19 +404,19 @@ Copyright © 2006 by Christophe Dumez<br> OSD - OSD + OSD Always display OSD - Mostrar sempre OSD + Mostrar sempre OSD Display OSD only if window is minimized or iconified - Mostra l'OSD només si la finestra està minimitzada o iconificada + Mostra l'OSD només si la finestra està minimitzada o iconificada Never display OSD - No mostrar OSD mai + No mostrar OSD mai KiB/s @@ -450,6 +450,22 @@ Copyright © 2006 by Christophe Dumez<br> Audio/Video player: Reproductor de Audio/Video: + + Systray Messages + + + + Always display systray messages + + + + Display systray messages only when window is hidden + + + + Never display systray messages + + GUI @@ -873,6 +889,19 @@ Si et plau tanca l'altre primer. Transfers Transferits + + Download finished + + + + has finished downloading. + <filename> has finished downloading. + ha finalitzat la descàrrega. + + + Search Engine + Motor de Busqueda + MainWindow diff --git a/src/lang/qbittorrent_de.qm b/src/lang/qbittorrent_de.qm index e7bbcf895..6cb52d416 100644 Binary files a/src/lang/qbittorrent_de.qm and b/src/lang/qbittorrent_de.qm differ diff --git a/src/lang/qbittorrent_de.ts b/src/lang/qbittorrent_de.ts index 07995f41c..6f8fc572c 100644 --- a/src/lang/qbittorrent_de.ts +++ b/src/lang/qbittorrent_de.ts @@ -331,21 +331,17 @@ Copyright (c) 2006 Christophe Dumez<br> Behaviour Verhalten - - OSD - - Always display OSD - OSD immer anzeigen + OSD immer anzeigen Display OSD only if window is minimized or iconified - OSD nur anzeigen, wenn das Fenster minimiert ist + OSD nur anzeigen, wenn das Fenster minimiert ist Never display OSD - OSD nie anzeigen + OSD nie anzeigen KiB/s @@ -379,6 +375,22 @@ Copyright (c) 2006 Christophe Dumez<br> Audio/Video player: Audio/Video Player: + + Systray Messages + + + + Always display systray messages + + + + Display systray messages only when window is hidden + + + + Never display systray messages + + GUI @@ -790,6 +802,19 @@ Bitte schliessen Sie diesen zuerst. Transfers Transfer + + Download finished + + + + has finished downloading. + <filename> has finished downloading. + ist vollständig heruntergeladen. + + + Search Engine + Such-Maschine + MainWindow diff --git a/src/lang/qbittorrent_el.qm b/src/lang/qbittorrent_el.qm index 7627aab2a..8938aabec 100644 Binary files a/src/lang/qbittorrent_el.qm and b/src/lang/qbittorrent_el.qm differ diff --git a/src/lang/qbittorrent_el.ts b/src/lang/qbittorrent_el.ts index 59f61d056..be38df165 100644 --- a/src/lang/qbittorrent_el.ts +++ b/src/lang/qbittorrent_el.ts @@ -396,19 +396,19 @@ Copyright © 2006 από τον Christophe Dumez<br> OSD - OSD + OSD Always display OSD - Εμφάνιση πάντα OSD + Εμφάνιση πάντα OSD Display OSD only if window is minimized or iconified - Εμφάνιση OSD μόνο αν το παράθυρο είναι ελαχιστοποιημένο ή εικονοποιημένο + Εμφάνιση OSD μόνο αν το παράθυρο είναι ελαχιστοποιημένο ή εικονοποιημένο Never display OSD - Απόκρυψη OSD + Απόκρυψη OSD KiB/s @@ -442,6 +442,22 @@ Copyright © 2006 από τον Christophe Dumez<br> Audio/Video player: Αναπαραγωγή Ήχου/Βίντεο: + + Systray Messages + + + + Always display systray messages + + + + Display systray messages only when window is hidden + + + + Never display systray messages + + GUI @@ -865,6 +881,19 @@ Please close the other one first. Transfers Μεταφορές + + Download finished + + + + has finished downloading. + <filename> has finished downloading. + έχει τελειώσει το κατέβασμα. + + + Search Engine + Μηχανή Αναζήτησης + MainWindow diff --git a/src/lang/qbittorrent_en.ts b/src/lang/qbittorrent_en.ts index c8306ad33..6e0f548ac 100644 --- a/src/lang/qbittorrent_en.ts +++ b/src/lang/qbittorrent_en.ts @@ -271,51 +271,51 @@ Copyright © 2006 by Christophe Dumez<br> - OSD + KiB/s - Always display OSD + 1 KiB DL = - Display OSD only if window is minimized or iconified + KiB UP max. - Never display OSD + DHT (Trackerless): - KiB/s + Disable DHT (Trackerless) support - 1 KiB DL = + Automatically clear finished downloads - KiB UP max. + Preview program - DHT (Trackerless): + Audio/Video player: - Disable DHT (Trackerless) support + Systray Messages - Automatically clear finished downloads + Always display systray messages - Preview program + Display systray messages only when window is hidden - Audio/Video player: + Never display systray messages @@ -613,6 +613,19 @@ Please close the other one first. Transfers + + Download finished + + + + has finished downloading. + <filename> has finished downloading. + + + + Search Engine + + MainWindow diff --git a/src/lang/qbittorrent_es.qm b/src/lang/qbittorrent_es.qm index 2d48bcf0a..89e7fddd0 100644 Binary files a/src/lang/qbittorrent_es.qm and b/src/lang/qbittorrent_es.qm differ diff --git a/src/lang/qbittorrent_es.ts b/src/lang/qbittorrent_es.ts index 10e38d143..0f9f605a3 100644 --- a/src/lang/qbittorrent_es.ts +++ b/src/lang/qbittorrent_es.ts @@ -345,19 +345,19 @@ Copyright © 2006 por Christophe Dumez<br> OSD - OSD + OSD Always display OSD - Mostrar siempre OSD + Mostrar siempre OSD Display OSD only if window is minimized or iconified - Muestra OSD solo si la ventana esta minimizada o iconificada + Muestra OSD solo si la ventana esta minimizada o iconificada Never display OSD - No mostrar nunca OSD + No mostrar nunca OSD KiB/s @@ -391,6 +391,22 @@ Copyright © 2006 por Christophe Dumez<br> Audio/Video player: Reproductor de Audio/Video: + + Systray Messages + + + + Always display systray messages + + + + Display systray messages only when window is hidden + + + + Never display systray messages + + GUI @@ -806,6 +822,19 @@ Por favor cierra el otro antes. Transfers Transferidos + + Download finished + + + + has finished downloading. + <filename> has finished downloading. + se ha terminado de descargar. + + + Search Engine + Motor de Búsqueda + MainWindow diff --git a/src/lang/qbittorrent_fr.qm b/src/lang/qbittorrent_fr.qm index 4ea604a45..02006ed57 100644 Binary files a/src/lang/qbittorrent_fr.qm and b/src/lang/qbittorrent_fr.qm differ diff --git a/src/lang/qbittorrent_fr.ts b/src/lang/qbittorrent_fr.ts index ebdeaaec6..49de18381 100644 --- a/src/lang/qbittorrent_fr.ts +++ b/src/lang/qbittorrent_fr.ts @@ -435,21 +435,17 @@ Copyright © 2006 par Christophe Dumez<br> Behaviour Comportement - - OSD - - Always display OSD - Toujours afficher les OSD + Toujours afficher les OSD Display OSD only if window is minimized or iconified - Afficher les OSD uniquement lorsque la fenêtre n'est pas visible + Afficher les OSD uniquement lorsque la fenêtre n'est pas visible Never display OSD - Ne jamais afficher d'OSD + Ne jamais afficher d'OSD KiB/s @@ -483,6 +479,22 @@ Copyright © 2006 par Christophe Dumez<br> Audio/Video player: Lecteur audio/video : + + Systray Messages + + + + Always display systray messages + + + + Display systray messages only when window is hidden + + + + Never display systray messages + + GUI @@ -941,6 +953,19 @@ Veuillez d'abord le quitter. Transfers Transferts + + Download finished + + + + has finished downloading. + <filename> has finished downloading. + a fini de télécharger. + + + Search Engine + Moteur de recherche + MainWindow diff --git a/src/lang/qbittorrent_it.qm b/src/lang/qbittorrent_it.qm index 3b38cd60c..0fe5903ff 100644 Binary files a/src/lang/qbittorrent_it.qm and b/src/lang/qbittorrent_it.qm differ diff --git a/src/lang/qbittorrent_it.ts b/src/lang/qbittorrent_it.ts index 96b387d67..c6b413385 100644 --- a/src/lang/qbittorrent_it.ts +++ b/src/lang/qbittorrent_it.ts @@ -282,19 +282,19 @@ Copyright © 2006 by Christophe Dumez<br> OSD - OSD + OSD Always display OSD - Mostra sempre l'OSD + Mostra sempre l'OSD Display OSD only if window is minimized or iconified - Mostra l'OSD solo se la finestra è minimizzata o ridotta a icona + Mostra l'OSD solo se la finestra è minimizzata o ridotta a icona Never display OSD - Non mostrare mai l'OSD + Non mostrare mai l'OSD KiB/s @@ -328,6 +328,22 @@ Copyright © 2006 by Christophe Dumez<br> Audio/Video player: Player audio/video: + + Systray Messages + + + + Always display systray messages + + + + Display systray messages only when window is hidden + + + + Never display systray messages + + GUI @@ -631,6 +647,19 @@ Example: Downloading www.example.com/test.torrent Example: Downloading www.example.com/test.torrent Scaricando + + Download finished + + + + has finished downloading. + <filename> has finished downloading. + ha finito il download. + + + Search Engine + + MainWindow diff --git a/src/lang/qbittorrent_ko.qm b/src/lang/qbittorrent_ko.qm index 557c9302d..4fa50c074 100644 Binary files a/src/lang/qbittorrent_ko.qm and b/src/lang/qbittorrent_ko.qm differ diff --git a/src/lang/qbittorrent_ko.ts b/src/lang/qbittorrent_ko.ts index 8964595c6..b7b9537dd 100644 --- a/src/lang/qbittorrent_ko.ts +++ b/src/lang/qbittorrent_ko.ts @@ -346,19 +346,19 @@ list: OSD - OSD(On Screen Display) + OSD(On Screen Display) Always display OSD - OSD 항시 표시 + OSD 항시 표시 Display OSD only if window is minimized or iconified - 창이 최소화할때나 작업창 아이콘이 될때만 OSD 표시 + 창이 최소화할때나 작업창 아이콘이 될때만 OSD 표시 Never display OSD - OSD 표시하지 않기 + OSD 표시하지 않기 KiB/s @@ -392,6 +392,22 @@ list: Audio/Video player: 음악/비디오 재생기: + + Systray Messages + + + + Always display systray messages + + + + Display systray messages only when window is hidden + + + + Never display systray messages + + GUI @@ -835,6 +851,19 @@ Please close the other one first. Transfers 전송 + + Download finished + + + + has finished downloading. + <filename> has finished downloading. + 가 완료되었습니다. + + + Search Engine + 검색 엔진 + MainWindow diff --git a/src/lang/qbittorrent_nb.qm b/src/lang/qbittorrent_nb.qm index 2bdc8d4b4..69f21c019 100644 Binary files a/src/lang/qbittorrent_nb.qm and b/src/lang/qbittorrent_nb.qm differ diff --git a/src/lang/qbittorrent_nb.ts b/src/lang/qbittorrent_nb.ts index 6af4a0fbf..f83500b59 100644 --- a/src/lang/qbittorrent_nb.ts +++ b/src/lang/qbittorrent_nb.ts @@ -275,19 +275,19 @@ Copyright © 2006 av Christophe Dumez<br> OSD - Skjermmeldinger + Skjermmeldinger Always display OSD - Vis alltid skjermmeldinger + Vis alltid skjermmeldinger Display OSD only if window is minimized or iconified - Vis skjermmeldinger kun når vinduet er minimert + Vis skjermmeldinger kun når vinduet er minimert Never display OSD - Vis aldri skjermmeldinger + Vis aldri skjermmeldinger KiB/s @@ -321,6 +321,22 @@ Copyright © 2006 av Christophe Dumez<br> Audio/Video player: Lyd/video avspiller: + + Systray Messages + + + + Always display systray messages + + + + Display systray messages only when window is hidden + + + + Never display systray messages + + GUI @@ -619,6 +635,19 @@ Vennligst avslutt denne først. Transfers Overføringer + + Download finished + + + + has finished downloading. + <filename> has finished downloading. + er ferdig lastet ned. + + + Search Engine + + MainWindow diff --git a/src/lang/qbittorrent_nl.qm b/src/lang/qbittorrent_nl.qm index e8a4b7975..47a769862 100644 Binary files a/src/lang/qbittorrent_nl.qm and b/src/lang/qbittorrent_nl.qm differ diff --git a/src/lang/qbittorrent_nl.ts b/src/lang/qbittorrent_nl.ts index cd7c936b4..5f718f89b 100644 --- a/src/lang/qbittorrent_nl.ts +++ b/src/lang/qbittorrent_nl.ts @@ -406,19 +406,19 @@ Copyright 2006 door Christophe Dumez<br> OSD - OSD + OSD Always display OSD - OSD altijd weergeven + OSD altijd weergeven Display OSD only if window is minimized or iconified - OSD alleen weergeven indien venster geminimaliseerd of in systeemvak + OSD alleen weergeven indien venster geminimaliseerd of in systeemvak Never display OSD - OSD nooit weergeven + OSD nooit weergeven KiB/s @@ -452,6 +452,22 @@ Copyright 2006 door Christophe Dumez<br> Audio/Video player: Audio/Video Speler: + + Systray Messages + + + + Always display systray messages + + + + Display systray messages only when window is hidden + + + + Never display systray messages + + GUI @@ -828,6 +844,19 @@ Stop het eerste proccess eerst. Transfers Overdrachten + + Download finished + + + + has finished downloading. + <filename> has finished downloading. + is klaar met downloaden. + + + Search Engine + Zoekmachine + MainWindow diff --git a/src/lang/qbittorrent_pl.qm b/src/lang/qbittorrent_pl.qm index f091600fa..36ab3a70f 100644 Binary files a/src/lang/qbittorrent_pl.qm and b/src/lang/qbittorrent_pl.qm differ diff --git a/src/lang/qbittorrent_pl.ts b/src/lang/qbittorrent_pl.ts index cd0359a24..cc31d8ad8 100644 --- a/src/lang/qbittorrent_pl.ts +++ b/src/lang/qbittorrent_pl.ts @@ -395,19 +395,19 @@ Wszystkie prawa zastrżeżone © 2006 Christophe Dumez<br> OSD - OSD + OSD Always display OSD - Zawsze wyświetlaj OSD + Zawsze wyświetlaj OSD Display OSD only if window is minimized or iconified - Wyświetlaj OSD tylko jeżeli okno jest zminimalizowane + Wyświetlaj OSD tylko jeżeli okno jest zminimalizowane Never display OSD - Nigdy nie wyświetlaj OSD + Nigdy nie wyświetlaj OSD KiB/s @@ -441,6 +441,22 @@ Wszystkie prawa zastrżeżone © 2006 Christophe Dumez<br> Audio/Video player: Odtwarzacz multimedialny: + + Systray Messages + + + + Always display systray messages + + + + Display systray messages only when window is hidden + + + + Never display systray messages + + GUI @@ -849,6 +865,19 @@ Zamknij najpierw okno podglądu. Transfers Prędkość + + Download finished + + + + has finished downloading. + <filename> has finished downloading. + zakończył sciąganie. + + + Search Engine + Wyszukiwarka + MainWindow diff --git a/src/lang/qbittorrent_pt.qm b/src/lang/qbittorrent_pt.qm index 5bc7aaebd..cd30f5861 100644 Binary files a/src/lang/qbittorrent_pt.qm and b/src/lang/qbittorrent_pt.qm differ diff --git a/src/lang/qbittorrent_pt.ts b/src/lang/qbittorrent_pt.ts index 314db3111..8427ee3c3 100644 --- a/src/lang/qbittorrent_pt.ts +++ b/src/lang/qbittorrent_pt.ts @@ -291,19 +291,19 @@ Copyright ©2006 por Christophe Dumez<br> OSD - OSD + OSD Always display OSD - Sempre mostrar OSD + Sempre mostrar OSD Display OSD only if window is minimized or iconified - Mostrar OSD somente se minimizado ou em ícone + Mostrar OSD somente se minimizado ou em ícone Never display OSD - Nunca mostrar OSD + Nunca mostrar OSD KiB/s @@ -337,6 +337,22 @@ Copyright ©2006 por Christophe Dumez<br> Audio/Video player: + + Systray Messages + + + + Always display systray messages + + + + Display systray messages only when window is hidden + + + + Never display systray messages + + GUI @@ -690,6 +706,19 @@ Please close the other one first. Transfers + + Download finished + + + + has finished downloading. + <filename> has finished downloading. + concluiu o download. + + + Search Engine + Mecanismo de Busca + MainWindow diff --git a/src/lang/qbittorrent_ro.qm b/src/lang/qbittorrent_ro.qm index 18dc61499..2008d49ba 100644 Binary files a/src/lang/qbittorrent_ro.qm and b/src/lang/qbittorrent_ro.qm differ diff --git a/src/lang/qbittorrent_ro.ts b/src/lang/qbittorrent_ro.ts index 5fef9102c..05964f222 100644 --- a/src/lang/qbittorrent_ro.ts +++ b/src/lang/qbittorrent_ro.ts @@ -291,19 +291,19 @@ Copyright © 2006 by Christophe Dumez<br> OSD - OSD + OSD Always display OSD - Întotdeauna arata OSD + Întotdeauna arata OSD Display OSD only if window is minimized or iconified - Arata OSD numai cînd fereastra este minimizata sau iconificata + Arata OSD numai cînd fereastra este minimizata sau iconificata Never display OSD - Nici o data nu afiseaza OSD + Nici o data nu afiseaza OSD KiB/s @@ -337,6 +337,22 @@ Copyright © 2006 by Christophe Dumez<br> Audio/Video player: Audio/Video player: + + Systray Messages + + + + Always display systray messages + + + + Display systray messages only when window is hidden + + + + Never display systray messages + + GUI @@ -692,6 +708,19 @@ Vă rugăm să-l opriţi. Transfers Transferuri + + Download finished + + + + has finished downloading. + <filename> has finished downloading. + am terminat descărcarea. + + + Search Engine + Motor de Căutare + MainWindow diff --git a/src/lang/qbittorrent_ru.qm b/src/lang/qbittorrent_ru.qm index df3816a70..baf2cb86f 100644 Binary files a/src/lang/qbittorrent_ru.qm and b/src/lang/qbittorrent_ru.qm differ diff --git a/src/lang/qbittorrent_ru.ts b/src/lang/qbittorrent_ru.ts index cf595bb10..e6db5e1eb 100644 --- a/src/lang/qbittorrent_ru.ts +++ b/src/lang/qbittorrent_ru.ts @@ -342,19 +342,19 @@ Copyright © 2006 by Christophe Dumez<br> OSD - OSD + OSD Always display OSD - Всегда показывать OSD + Всегда показывать OSD Display OSD only if window is minimized or iconified - Показывать OSD только когда окно минимизировано + Показывать OSD только когда окно минимизировано Never display OSD - Никогда не показывать OSD + Никогда не показывать OSD KiB/s @@ -388,6 +388,22 @@ Copyright © 2006 by Christophe Dumez<br> Audio/Video player: Аудио/Видео проигрователь: + + Systray Messages + + + + Always display systray messages + + + + Display systray messages only when window is hidden + + + + Never display systray messages + + GUI @@ -779,6 +795,19 @@ Please close the other one first. Transfers Передачи + + Download finished + + + + has finished downloading. + <filename> has finished downloading. + скачивание завершено. + + + Search Engine + Поисковик + MainWindow diff --git a/src/lang/qbittorrent_sk.qm b/src/lang/qbittorrent_sk.qm index b7fad8ab8..3f3702889 100644 Binary files a/src/lang/qbittorrent_sk.qm and b/src/lang/qbittorrent_sk.qm differ diff --git a/src/lang/qbittorrent_sk.ts b/src/lang/qbittorrent_sk.ts index b15ba9978..586de99c5 100644 --- a/src/lang/qbittorrent_sk.ts +++ b/src/lang/qbittorrent_sk.ts @@ -300,19 +300,19 @@ Copyright © 2006 by Christophe Dumez<br> OSD - OSD + OSD Always display OSD - Vždy zobrazuj OSD + Vždy zobrazuj OSD Display OSD only if window is minimized or iconified - Zobrazuj OSD iba keď je okno minimalizované alebo ikonifikované + Zobrazuj OSD iba keď je okno minimalizované alebo ikonifikované Never display OSD - Nikdy nezobrazuj OSD + Nikdy nezobrazuj OSD KiB/s @@ -346,6 +346,22 @@ Copyright © 2006 by Christophe Dumez<br> Audio/Video player: Audio/Video prehrávač: + + Systray Messages + + + + Always display systray messages + + + + Display systray messages only when window is hidden + + + + Never display systray messages + + GUI @@ -712,6 +728,19 @@ Najskôr ho prosím zatvorte. Please wait... Čakajte prosím... + + Download finished + + + + has finished downloading. + <filename> has finished downloading. + skončilo sťahovanie. + + + Search Engine + Vyhad + MainWindow diff --git a/src/lang/qbittorrent_sv.qm b/src/lang/qbittorrent_sv.qm index 1936cb59c..108a58076 100644 Binary files a/src/lang/qbittorrent_sv.qm and b/src/lang/qbittorrent_sv.qm differ diff --git a/src/lang/qbittorrent_sv.ts b/src/lang/qbittorrent_sv.ts index c6dc3f920..0e4388ca4 100644 --- a/src/lang/qbittorrent_sv.ts +++ b/src/lang/qbittorrent_sv.ts @@ -282,19 +282,19 @@ Copyright © 2006 by Christophe Dumez<br> OSD - OSD + OSD Always display OSD - Visa alltid OSD + Visa alltid OSD Display OSD only if window is minimized or iconified - Visa endast OSD om ett fönster är minimerat eller ikonifierat + Visa endast OSD om ett fönster är minimerat eller ikonifierat Never display OSD - Visa aldrig OSD + Visa aldrig OSD KiB/s @@ -328,6 +328,22 @@ Copyright © 2006 by Christophe Dumez<br> Audio/Video player: Ljud-/videospelare: + + Systray Messages + + + + Always display systray messages + + + + Display systray messages only when window is hidden + + + + Never display systray messages + + GUI @@ -626,6 +642,19 @@ Stäng den först. Transfers Överföringar + + Download finished + + + + has finished downloading. + <filename> has finished downloading. + har hämtats färdigt. + + + Search Engine + + MainWindow diff --git a/src/lang/qbittorrent_tr.qm b/src/lang/qbittorrent_tr.qm index a036c4f0e..ff11e760d 100644 Binary files a/src/lang/qbittorrent_tr.qm and b/src/lang/qbittorrent_tr.qm differ diff --git a/src/lang/qbittorrent_tr.ts b/src/lang/qbittorrent_tr.ts index 95de524cf..232583dc5 100644 --- a/src/lang/qbittorrent_tr.ts +++ b/src/lang/qbittorrent_tr.ts @@ -396,19 +396,19 @@ Telif Hakkı © 2006 Christophe Dumez<br> OSD - OSD + OSD Always display OSD - Her zaman OSD yi göster + Her zaman OSD yi göster Display OSD only if window is minimized or iconified - OSD yi sadece pencere küçültülmüşken ya da simge durumundayken göster + OSD yi sadece pencere küçültülmüşken ya da simge durumundayken göster Never display OSD - OSD yi asla gösterme + OSD yi asla gösterme KiB/s @@ -442,6 +442,22 @@ Telif Hakkı © 2006 Christophe Dumez<br> Audio/Video player: Ses/Video oynatıcısı: + + Systray Messages + + + + Always display systray messages + + + + Display systray messages only when window is hidden + + + + Never display systray messages + + GUI @@ -857,6 +873,19 @@ Lütfen önce diğerini kapatın. Transfers Aktarımlar + + Download finished + + + + has finished downloading. + <filename> has finished downloading. + download tamamlandı. + + + Search Engine + Arama Motoru + MainWindow diff --git a/src/lang/qbittorrent_uk.qm b/src/lang/qbittorrent_uk.qm index 81481a98e..4ff92a524 100644 Binary files a/src/lang/qbittorrent_uk.qm and b/src/lang/qbittorrent_uk.qm differ diff --git a/src/lang/qbittorrent_uk.ts b/src/lang/qbittorrent_uk.ts index 7eaa59c53..0a2e113d4 100644 --- a/src/lang/qbittorrent_uk.ts +++ b/src/lang/qbittorrent_uk.ts @@ -338,19 +338,19 @@ Copyright © 2006 by Christophe Dumez<br> OSD - OSD + OSD Always display OSD - Завжди показувати OSD + Завжди показувати OSD Display OSD only if window is minimized or iconified - Показувати OSD лише коли вікно мінімізовано + Показувати OSD лише коли вікно мінімізовано Never display OSD - Ніколи не показувати OSD + Ніколи не показувати OSD KiB/s @@ -384,6 +384,22 @@ Copyright © 2006 by Christophe Dumez<br> Audio/Video player: Аудіо/Відео плеєр: + + Systray Messages + + + + Always display systray messages + + + + Display systray messages only when window is hidden + + + + Never display systray messages + + GUI @@ -787,6 +803,19 @@ Please close the other one first. Transfers Трансфери + + Download finished + + + + has finished downloading. + <filename> has finished downloading. + завантажено. + + + Search Engine + Пошуковик + MainWindow diff --git a/src/lang/qbittorrent_zh.qm b/src/lang/qbittorrent_zh.qm index 280264b00..83bf14222 100644 Binary files a/src/lang/qbittorrent_zh.qm and b/src/lang/qbittorrent_zh.qm differ diff --git a/src/lang/qbittorrent_zh.ts b/src/lang/qbittorrent_zh.ts index 050295dc3..ffdb31098 100644 --- a/src/lang/qbittorrent_zh.ts +++ b/src/lang/qbittorrent_zh.ts @@ -325,19 +325,19 @@ Copyright © 2006 by Christophe Dumez<br> OSD - OSD + OSD Always display OSD - 总是显示OSD + 总是显示OSD Display OSD only if window is minimized or iconified - 仅当窗口为最小化或为图标时显示OSD + 仅当窗口为最小化或为图标时显示OSD Never display OSD - 从不显示OSD + 从不显示OSD KiB/s @@ -371,6 +371,22 @@ Copyright © 2006 by Christophe Dumez<br> Audio/Video player: 音频/视频播放器: + + Systray Messages + + + + Always display systray messages + + + + Display systray messages only when window is hidden + + + + Never display systray messages + + GUI @@ -745,6 +761,19 @@ Please close the other one first. Transfers 传输 + + Download finished + + + + has finished downloading. + <filename> has finished downloading. + 下载完毕. + + + Search Engine + 搜索引擎 + MainWindow diff --git a/src/lang/qbittorrent_zh_HK.qm b/src/lang/qbittorrent_zh_HK.qm index 476e3b0f3..f1ca9c186 100644 Binary files a/src/lang/qbittorrent_zh_HK.qm and b/src/lang/qbittorrent_zh_HK.qm differ diff --git a/src/lang/qbittorrent_zh_HK.ts b/src/lang/qbittorrent_zh_HK.ts index 01b0d861b..0a443a3d6 100644 --- a/src/lang/qbittorrent_zh_HK.ts +++ b/src/lang/qbittorrent_zh_HK.ts @@ -325,19 +325,19 @@ Copyright © 2006 by Christophe Dumez<br> OSD - OSD + OSD Always display OSD - 永遠顯示OSD + 永遠顯示OSD Display OSD only if window is minimized or iconified - 顯示OSD當視窗最小化 + 顯示OSD當視窗最小化 Never display OSD - 不要顯示OSD + 不要顯示OSD KiB/s @@ -371,6 +371,22 @@ Copyright © 2006 by Christophe Dumez<br> Audio/Video player: + + Systray Messages + + + + Always display systray messages + + + + Display systray messages only when window is hidden + + + + Never display systray messages + + GUI @@ -726,6 +742,19 @@ Please close the other one first. Transfers + + Download finished + + + + has finished downloading. + <filename> has finished downloading. + 下載完畢. + + + Search Engine + 搜索引擎 + MainWindow diff --git a/src/options.ui b/src/options.ui index b54cb87bb..c0aa70b50 100644 --- a/src/options.ui +++ b/src/options.ui @@ -1,7 +1,4 @@ - - - Dialog @@ -79,50 +76,48 @@ 6 - - - - 0 - - - 6 - - - - - Save Path: - - - proxy_username - - - - - - - 0 - - - 6 - - - - - - - - - - - - ... - - - - - - - + + + 0 + + + 6 + + + + + Save Path: + + + proxy_username + + + + + + + 0 + + + 6 + + + + + + + + + + + + ... + + + + + + @@ -142,463 +137,6 @@ 6 - - - - - 0 - - - 6 - - - - - 0 - - - 6 - - - - - Download Limit: - - - spin_download - - - - - - - Upload Limit: - - - enableScan_checkBox - - - - - - - Max Connects: - - - spin_port_min - - - - - - - Port range: - - - spin_port_min - - - - - - - Share ratio: - - - - - - - DHT (Trackerless): - - - - - - - - - 0 - - - 6 - - - - - 0 - - - 6 - - - - - false - - - - - - 1000000 - - - 1 - - - 200 - - - - - - - - 64 - 0 - - - - KiB/s - - - - - - - Disable - - - true - - - - - - - Qt::Horizontal - - - - 61 - 25 - - - - - - - - - - 0 - - - 6 - - - - - false - - - - - - 1000000 - - - 1 - - - 10 - - - - - - - - 64 - 0 - - - - KiB/s - - - - - - - Disable - - - true - - - - - - - Qt::Horizontal - - - - 61 - 25 - - - - - - - - - - 0 - - - 6 - - - - - false - - - 1000 - - - 1 - - - 600 - - - - - - - - 88 - 0 - - - - connections - - - - - - - true - - - Disable - - - true - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - 0 - - - 6 - - - - - 60000 - - - 1000 - - - 6881 - - - - - - - - - - Qt::AlignCenter - - - - - - - 65525 - - - 1000 - - - 6889 - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - 0 - - - 6 - - - - - 1 KiB DL = - - - - - - - false - - - Qt::AlignHCenter - - - 1 - - - 99.9 - - - 1 - - - 0.1 - - - 1 - - - - - - - - 82 - 0 - - - - KiB UP max. - - - - - - - Disable - - - true - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - Disable DHT (Trackerless) support - - - - - - - - - - - - - - - Enable directory scan (auto add torrent files inside) - - - - - - - - 0 - - - 6 - - - - - false - - - Scanned Dir: - - - proxy_username - - - @@ -608,27 +146,480 @@ 6 - - - false + + + 0 - + + 6 + + + + + Download Limit: + + + spin_download + + + + + + + Upload Limit: + + + enableScan_checkBox + + + + + + + Max Connects: + + + spin_port_min + + + + + + + Port range: + + + spin_port_min + + + + + + + Share ratio: + + + + + + + DHT (Trackerless): + + + + - - - false + + + 0 - - ... + + 6 - + + + + 0 + + + 6 + + + + + false + + + + + + 1000000 + + + 1 + + + 200 + + + + + + + + 64 + 0 + + + + KiB/s + + + + + + + Disable + + + true + + + + + + + Qt::Horizontal + + + + 61 + 25 + + + + + + + + + + 0 + + + 6 + + + + + false + + + + + + 1000000 + + + 1 + + + 10 + + + + + + + + 64 + 0 + + + + KiB/s + + + + + + + Disable + + + true + + + + + + + Qt::Horizontal + + + + 61 + 25 + + + + + + + + + + 0 + + + 6 + + + + + false + + + 1000 + + + 1 + + + 600 + + + + + + + + 88 + 0 + + + + connections + + + + + + + true + + + Disable + + + true + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + 0 + + + 6 + + + + + 60000 + + + 1000 + + + 6881 + + + + + + + + + + Qt::AlignCenter + + + + + + + 65525 + + + 1000 + + + 6889 + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + 0 + + + 6 + + + + + 1 KiB DL = + + + + + + + false + + + Qt::AlignHCenter + + + 1 + + + 99.900000000000006 + + + 1.000000000000000 + + + 0.100000000000000 + + + 1.000000000000000 + + + + + + + + 82 + 0 + + + + KiB UP max. + + + + + + + Disable + + + true + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + Disable DHT (Trackerless) support + + + + + + + + Enable directory scan (auto add torrent files inside) + + + + + + + 0 + + + 6 + + + + + false + + + Scanned Dir: + + + proxy_username + + + + + + + 0 + + + 6 + + + + + false + + + + + + + false + + + ... + + + + + + + @@ -712,85 +703,81 @@ - - - - 0 - - - 6 - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - Add Range - - - - - - - Remove Range - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - + + + 0 + + + 6 + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Add Range + + + + + + + Remove Range + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + - - - - 0 - - - 6 - - - - - ipfilter.dat Path: - - - - - - - - - - ... - - - - - + + + 0 + + + 6 + + + + + ipfilter.dat Path: + + + + + + + + + + ... + + + + @@ -831,79 +818,77 @@ 6 - - - - 0 - - - 6 - - - - - Server IP: - - - - - - - 0.0.0.0 - - - 15 - - - QLineEdit::Normal - - - - - - - Qt::Horizontal - - - - 21 - 20 - - - - - - - - Port: - - - - - - - 65525 - - - 8080 - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - + + + 0 + + + 6 + + + + + Server IP: + + + + + + + 0.0.0.0 + + + 15 + + + QLineEdit::Normal + + + + + + + Qt::Horizontal + + + + 21 + 20 + + + + + + + + Port: + + + + + + + 65525 + + + 8080 + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + @@ -928,76 +913,74 @@ 6 - - - - 0 - - - 6 - - - - - 0 - - - 6 - - - - - User Name: - - - - - - - Password: - - - - - - - - - 0 - - - 6 - - - - - - - - 1000 - - - QLineEdit::Normal - - - - - - - - - - 1000 - - - QLineEdit::Password - - - - - - - + + + 0 + + + 6 + + + + + 0 + + + 6 + + + + + User Name: + + + + + + + Password: + + + + + + + + + 0 + + + 6 + + + + + + + + 1000 + + + QLineEdit::Normal + + + + + + + + + + 1000 + + + QLineEdit::Password + + + + + + @@ -1025,6 +1008,14 @@ Misc + + + 0 + 0 + 452 + 66 + + Localization @@ -1069,7 +1060,7 @@ QComboBox::AdjustToContents - false + 0 @@ -1199,7 +1190,7 @@ - OSD + Systray Messages @@ -1211,7 +1202,7 @@ - Always display OSD + Always display systray messages true @@ -1221,14 +1212,14 @@ - Display OSD only if window is minimized or iconified + Display systray messages only when window is hidden - Never display OSD + Never display systray messages @@ -1299,7 +1290,6 @@ - diff --git a/src/src.pro b/src/src.pro index 6d2747364..eefe355c4 100644 --- a/src/src.pro +++ b/src/src.pro @@ -90,7 +90,7 @@ TRANSLATIONS = $$LANG_PATH/qbittorrent_fr.ts \ # Source code HEADERS += GUI.h misc.h options_imp.h about_imp.h \ - properties_imp.h createtorrent_imp.h OSD.h \ + properties_imp.h createtorrent_imp.h \ DLListDelegate.h SearchListDelegate.h \ PropListDelegate.h previewSelect.h \ PreviewListDelegate.h trackerLogin.h \ @@ -102,6 +102,5 @@ SOURCES += GUI.cpp \ main.cpp \ options_imp.cpp \ properties_imp.cpp \ - createtorrent_imp.cpp \ - OSD.cpp + createtorrent_imp.cpp