mirror of
https://github.com/qbittorrent/qBittorrent.git
synced 2024-11-29 22:20:53 +03:00
Bringing the AddNewTorrentDialog to the front.
This commit is contained in:
parent
89b82778e6
commit
b78ea79d30
4 changed files with 27 additions and 12 deletions
|
@ -140,6 +140,13 @@ void AddNewTorrentDialog::showMagnet(const QString& link)
|
|||
dlg.exec();
|
||||
}
|
||||
|
||||
void AddNewTorrentDialog::showEvent(QShowEvent *event) {
|
||||
QDialog::showEvent(event);
|
||||
activateWindow();
|
||||
raise();
|
||||
}
|
||||
|
||||
|
||||
void AddNewTorrentDialog::showAdvancedSettings(bool show)
|
||||
{
|
||||
if (show) {
|
||||
|
|
|
@ -56,6 +56,9 @@ public:
|
|||
static void showTorrent(const QString& torrent_path, const QString& from_url = QString());
|
||||
static void showMagnet(const QString& torrent_link);
|
||||
|
||||
protected:
|
||||
void showEvent(QShowEvent *event);
|
||||
|
||||
private slots:
|
||||
void showAdvancedSettings(bool show);
|
||||
void displayContentTreeMenu(const QPoint&);
|
||||
|
|
|
@ -206,6 +206,13 @@ int main(int argc, char *argv[]) {
|
|||
if (app.isRunning()) {
|
||||
qDebug("qBittorrent is already running for this user.");
|
||||
// Read torrents given on command line
|
||||
#ifdef Q_OS_WIN
|
||||
DWORD pid = app.getRunningPid();
|
||||
if (pid > 0) {
|
||||
BOOL b = AllowSetForegroundWindow(pid);
|
||||
qDebug("AllowSetForegroundWindow() returns %s", b ? "TRUE" : "FALSE");
|
||||
}
|
||||
#endif
|
||||
QStringList torrentCmdLine = app.arguments();
|
||||
//Pass program parameters if any
|
||||
QString message;
|
||||
|
|
|
@ -263,14 +263,8 @@ MainWindow::MainWindow(QWidget *parent, const QStringList& torrentCmdLine) : QMa
|
|||
// Load Window state and sizes
|
||||
readSettings();
|
||||
|
||||
if (!ui_locked) {
|
||||
if (pref.startMinimized() && systrayIcon) {
|
||||
show();
|
||||
minimizeWindow();
|
||||
// XXX: Using showMinimized() makes it impossible to restore
|
||||
// the window if "Minimize to systray" is enabled.
|
||||
//showMinimized();
|
||||
} else {
|
||||
if (systrayIcon) {
|
||||
if (!(pref.startMinimized() || ui_locked)) {
|
||||
show();
|
||||
activateWindow();
|
||||
raise();
|
||||
|
@ -323,10 +317,14 @@ MainWindow::MainWindow(QWidget *parent, const QStringList& torrentCmdLine) : QMa
|
|||
#endif
|
||||
|
||||
// Make sure the Window is visible if we don't have a tray icon
|
||||
if (!systrayIcon && isHidden()) {
|
||||
show();
|
||||
activateWindow();
|
||||
raise();
|
||||
if (!systrayIcon) {
|
||||
if (pref.startMinimized()) {
|
||||
showMinimized();
|
||||
} else {
|
||||
show();
|
||||
activateWindow();
|
||||
raise();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue