Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-07-29 17:48:46 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1232 from weslly/fix/toolbarhide

Browse source 
Remove empty context menu from toolbar
This commit is contained in:
Weslly 2017-11-26 23:31:39 -02:00 • committed by GitHub
commit d1c26e4535
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 2 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

1
share/keepassxc.ini
View file

@ -1,5 +1,4 @@
[General] [General]
ShowToolbar=true
RememberLastDatabases=true RememberLastDatabases=true
RememberLastKeyFiles=true RememberLastKeyFiles=true
OpenPreviousDatabasesOnStartup=true OpenPreviousDatabasesOnStartup=true

1
src/core/Config.cpp
View file

@ -114,7 +114,6 @@ void Config::init(const QString& fileName)
m_defaults.insert("AutoSaveAfterEveryChange", false); m_defaults.insert("AutoSaveAfterEveryChange", false);
m_defaults.insert("AutoReloadOnChange", true); m_defaults.insert("AutoReloadOnChange", true);
m_defaults.insert("AutoSaveOnExit", false); m_defaults.insert("AutoSaveOnExit", false);
m_defaults.insert("ShowToolbar", true);
m_defaults.insert("SearchLimitGroup", false); m_defaults.insert("SearchLimitGroup", false);
m_defaults.insert("MinimizeOnCopy", false); m_defaults.insert("MinimizeOnCopy", false);
m_defaults.insert("UseGroupIconOnEntryCreation", false); m_defaults.insert("UseGroupIconOnEntryCreation", false);

7
src/gui/MainWindow.cpp
View file

@ -114,6 +114,8 @@ MainWindow::MainWindow()
{ {
m_ui->setupUi(this); m_ui->setupUi(this);
m_ui->toolBar->setContextMenuPolicy(Qt::PreventContextMenu);
// Setup the search widget in the toolbar // Setup the search widget in the toolbar
SearchWidget *search = new SearchWidget(); SearchWidget *search = new SearchWidget();
search->connectSignals(m_actionMultiplexer); search->connectSignals(m_actionMultiplexer);
@ -822,11 +824,6 @@ void MainWindow::showGroupContextMenu(const QPoint& globalPos)
m_ui->menuGroups->popup(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) void MainWindow::setShortcut(QAction* action, QKeySequence::StandardKey standard, int fallback)
{ {
if (!QKeySequence::keyBindings(standard).isEmpty()) { if (!QKeySequence::keyBindings(standard).isEmpty()) {

1
src/gui/MainWindow.h
View file

@ -87,7 +87,6 @@ private slots:
void updateCopyAttributesMenu(); void updateCopyAttributesMenu();
void showEntryContextMenu(const QPoint& globalPos); void showEntryContextMenu(const QPoint& globalPos);
void showGroupContextMenu(const QPoint& globalPos); void showGroupContextMenu(const QPoint& globalPos);
void saveToolbarState(bool value);
void rememberOpenDatabases(const QString& filePath); void rememberOpenDatabases(const QString& filePath);
void applySettingsChanges(); void applySettingsChanges();
void trayIconTriggered(QSystemTrayIcon::ActivationReason reason); void trayIconTriggered(QSystemTrayIcon::ActivationReason reason);