-
Notifications
You must be signed in to change notification settings - Fork 278
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Show correct error message on failure, references #1614
- Loading branch information
Showing
2 changed files
with
11 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| /************************************************************************** | ||
| * Otter Browser: Web browser controlled by the user, not vice-versa. | ||
| * Copyright (C) 2014 - 2016 Piotr Wójcik <[email protected]> | ||
| * Copyright (C) 2015 - 2021 Michal Dutkiewicz aka Emdek <[email protected]> | ||
| * Copyright (C) 2015 - 2022 Michal Dutkiewicz aka Emdek <[email protected]> | ||
| * | ||
| * 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 | ||
|
|
@@ -277,10 +277,18 @@ void DataExchangerDialog::setupResults(DataExchanger *exchanger) | |
| m_ui->buttonBox->addButton(QDialogButtonBox::Abort)->setEnabled(exchanger->canCancel()); | ||
| m_ui->stackedWidget->setCurrentWidget(m_ui->resultsPage); | ||
|
|
||
| if (exchanger->getExchangeDirection() == DataExchanger::ImportDirection) | ||
| { | ||
| connect(exchanger, &DataExchanger::exchangeFinished, this, &DataExchangerDialog::handleImportFinished); | ||
| } | ||
| else | ||
| { | ||
| connect(exchanger, &DataExchanger::exchangeFinished, this, &DataExchangerDialog::handleExportFinished); | ||
| } | ||
|
|
||
| connect(m_ui->buttonBox, &QDialogButtonBox::rejected, exchanger, &DataExchanger::cancel); | ||
| connect(exchanger, &DataExchanger::exchangeStarted, this, &DataExchangerDialog::handleExchangeStarted); | ||
| connect(exchanger, &DataExchanger::exchangeProgress, this, &DataExchangerDialog::handleExchangeProgress); | ||
| connect(exchanger, &DataExchanger::exchangeFinished, this, &DataExchangerDialog::handleExportFinished); | ||
| disconnect(m_ui->buttonBox, &QDialogButtonBox::rejected, this, &DataExchangerDialog::reject); | ||
| } | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| /************************************************************************** | ||
| * Otter Browser: Web browser controlled by the user, not vice-versa. | ||
| * Copyright (C) 2014 - 2015 Piotr Wójcik <[email protected]> | ||
| * Copyright (C) 2015 - 2021 Michal Dutkiewicz aka Emdek <[email protected]> | ||
| * Copyright (C) 2015 - 2022 Michal Dutkiewicz aka Emdek <[email protected]> | ||
| * | ||
| * 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 | ||
|
|
||