Merge pull request keepassxreboot#1232 from weslly/fix/toolbarhide

Remove empty context menu from toolbar
fishman · Nov 27, 2017 · d1c26e4 · d1c26e4
2 parents 54d5007 + 5fa76df
commit d1c26e4
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 8 deletions.
diff --git a/share/keepassxc.ini b/share/keepassxc.ini
@@ -1,5 +1,4 @@
 [General]
-ShowToolbar=true
 RememberLastDatabases=true
 RememberLastKeyFiles=true
 OpenPreviousDatabasesOnStartup=true

diff --git a/src/core/Config.cpp b/src/core/Config.cpp
@@ -114,7 +114,6 @@ void Config::init(const QString& fileName)
     m_defaults.insert("AutoSaveAfterEveryChange", false);
     m_defaults.insert("AutoReloadOnChange", true);
     m_defaults.insert("AutoSaveOnExit", false);
-    m_defaults.insert("ShowToolbar", true);
     m_defaults.insert("SearchLimitGroup", false);
     m_defaults.insert("MinimizeOnCopy", false);
     m_defaults.insert("UseGroupIconOnEntryCreation", false);

diff --git a/src/gui/MainWindow.cpp b/src/gui/MainWindow.cpp
@@ -114,6 +114,8 @@ MainWindow::MainWindow()
 {
     m_ui->setupUi(this);
 
+    m_ui->toolBar->setContextMenuPolicy(Qt::PreventContextMenu);
+
     // Setup the search widget in the toolbar
     SearchWidget *search = new SearchWidget();
     search->connectSignals(m_actionMultiplexer);
@@ -822,11 +824,6 @@ void MainWindow::showGroupContextMenu(const QPoint& globalPos)
     m_ui->menuGroups->popup(globalPos);
 }
 
-void MainWindow::saveToolbarState(bool value)
-{
-    config()->set("ShowToolbar", value);
-}
-
 void MainWindow::setShortcut(QAction* action, QKeySequence::StandardKey standard, int fallback)
 {
     if (!QKeySequence::keyBindings(standard).isEmpty()) {

diff --git a/src/gui/MainWindow.h b/src/gui/MainWindow.h
@@ -87,7 +87,6 @@ private slots:
     void updateCopyAttributesMenu();
     void showEntryContextMenu(const QPoint& globalPos);
     void showGroupContextMenu(const QPoint& globalPos);
-    void saveToolbarState(bool value);
     void rememberOpenDatabases(const QString& filePath);
     void applySettingsChanges();
     void trayIconTriggered(QSystemTrayIcon::ActivationReason reason);