BUGFIX: Only one log window can be opened at a time

This commit is contained in:
Christophe Dumez 2010-03-03 13:07:27 +00:00
parent 19368bcefa
commit 3d546a4c5d
3 changed files with 11 additions and 1 deletions

View File

@ -13,6 +13,7 @@
- FEATURE: Global transfer information are displayed in the new Web UI status bar - FEATURE: Global transfer information are displayed in the new Web UI status bar
- FEATURE: Allow to change the priority of several files at once - FEATURE: Allow to change the priority of several files at once
- FEATURE: Support for multiple scan folders (Patch by Christian Kandeler) - FEATURE: Support for multiple scan folders (Patch by Christian Kandeler)
- BUGFIX: Only one log window can be opened at a time
- COSMETIC: Improved style management - COSMETIC: Improved style management
* Mon Jan 18 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.1.0 * Mon Jan 18 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.1.0

View File

@ -418,7 +418,11 @@ void GUI::on_actionSet_global_upload_limit_triggered() {
} }
void GUI::on_actionShow_console_triggered() { void GUI::on_actionShow_console_triggered() {
new consoleDlg(this, BTSession); if(!console) {
console = new consoleDlg(this, BTSession);
} else {
console->setFocus();
}
} }
void GUI::on_actionSet_global_download_limit_triggered() { void GUI::on_actionSet_global_download_limit_triggered() {
@ -921,6 +925,9 @@ void GUI::on_actionOptions_triggered() {
if(!options) { if(!options) {
options = new options_imp(this); options = new options_imp(this);
connect(options, SIGNAL(status_changed()), this, SLOT(optionsSaved())); connect(options, SIGNAL(status_changed()), this, SLOT(optionsSaved()));
} else {
// Get focus
options->setFocus();
} }
} }

View File

@ -55,6 +55,7 @@ class TransferListFiltersWidget;
class QSplitter; class QSplitter;
class PropertiesWidget; class PropertiesWidget;
class StatusBar; class StatusBar;
class consoleDlg;
class GUI : public QMainWindow, private Ui::MainWindow{ class GUI : public QMainWindow, private Ui::MainWindow{
Q_OBJECT Q_OBJECT
@ -68,6 +69,7 @@ private:
QTabWidget *tabs; QTabWidget *tabs;
StatusBar *status_bar; StatusBar *status_bar;
QPointer<options_imp> options; QPointer<options_imp> options;
QPointer<consoleDlg> console;
QPointer<QSystemTrayIcon> systrayIcon; QPointer<QSystemTrayIcon> systrayIcon;
QPointer<QTimer> systrayCreator; QPointer<QTimer> systrayCreator;
QMenu *myTrayIconMenu; QMenu *myTrayIconMenu;