mirror/sqlitebrowser
1
0
Fork 0
mirror of https://github.com/sqlitebrowser/sqlitebrowser.git synced 2026-01-17 09:19:38 -06:00
Code Issues Packages Projects Releases Wiki Activity

Progress dialogs: remove context help button on Windows

Browse Source 
This can be removed on Qt 6, since according to Qt documentation:
> In Qt 6, WindowContextHelpButtonHint will not be set by default.

See issue #3664
This commit is contained in:
mgrojo
2024-06-24 21:02:27 +02:00
parent 775a21970e
commit 75449562ac
6 changed files with 21 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/ExtendedTableWidget.cpp
View File

@@ -626,6 +626,9 @@ void ExtendedTableWidget::copyMimeData(const QModelIndexList& fromIndices, QMime
QProgressDialog progress(this);
progress.setWindowModality(Qt::ApplicationModal);
// Disable context help button on Windows
progress.setWindowFlags(progress.windowFlags()
& ~Qt::WindowContextHelpButtonHint);
progress.setRange(*rowsInIndexes.begin(), *rowsInIndexes.end());
progress.setMinimumDuration(2000);

3
src/ImportCsvDialog.cpp
View File

@@ -151,6 +151,9 @@ public:
totalFileSize(filesize)
{
m_pProgressDlg->setWindowModality(Qt::ApplicationModal);
// Disable context help button on Windows
m_pProgressDlg->setWindowFlags(m_pProgressDlg->windowFlags()
& ~Qt::WindowContextHelpButtonHint);
}
CSVImportProgress(const CSVImportProgress&) = delete;

3
src/MainWindow.cpp
View File

@@ -3281,6 +3281,9 @@ void MainWindow::editEncryption()
// process might take some time.
QProgressDialog progress(this);
progress.setCancelButton(nullptr);
// Disable context help button on Windows
progress.setWindowFlags(progress.windowFlags()
& ~Qt::WindowContextHelpButtonHint);
progress.setWindowModality(Qt::ApplicationModal);
progress.show();
qApp->processEvents();

3
src/RemoteNetwork.cpp
View File

@@ -354,6 +354,9 @@ void RemoteNetwork::prepareProgressDialog(QNetworkReply* reply, bool upload, con
if(!m_progress)
m_progress = new QProgressDialog();
m_progress->reset();
// Disable context help button on Windows
m_progress->setWindowFlags(m_progress->windowFlags()
& ~Qt::WindowContextHelpButtonHint);
m_progress->setWindowModality(Qt::NonModal);
m_progress->setCancelButtonText(tr("Cancel"));

6
src/sqlitedb.cpp
View File

@@ -879,6 +879,9 @@ bool DBBrowserDB::dump(const QString& filePath,
QProgressDialog progress(tr("Exporting database to SQL file..."),
tr("Cancel"), 0, static_cast<int>(numRecordsTotal));
// Disable context help button on Windows
progress.setWindowFlags(progress.windowFlags()
& ~Qt::WindowContextHelpButtonHint);
progress.setWindowModality(Qt::ApplicationModal);
progress.show();
qApp->processEvents();
@@ -1112,6 +1115,9 @@ bool DBBrowserDB::executeMultiSQL(QByteArray query, bool dirty, bool log)
QProgressDialog progress(tr("Executing SQL..."),
tr("Cancel"), 0, 100);
progress.setWindowModality(Qt::ApplicationModal);
// Disable context help button on Windows
progress.setWindowFlags(progress.windowFlags()
& ~Qt::WindowContextHelpButtonHint);
progress.show();
// Execute the statement by looping until SQLite stops giving back a tail string

3
src/sqlitetablemodel.cpp
View File

@@ -997,6 +997,9 @@ bool SqliteTableModel::completeCache () const
progress.setCancelButton(cancelButton);
progress.setWindowModality(Qt::ApplicationModal);
// Disable context help button on Windows
progress.setWindowFlags(progress.windowFlags()
& ~Qt::WindowContextHelpButtonHint);
progress.show();
waitUntilIdle();