diff --git a/COPYING b/COPYING index 0994addb4..c19ee7353 100644 --- a/COPYING +++ b/COPYING @@ -26,25 +26,43 @@ Files: share/icons/database/*.png Copyright: 2003-2004, David Vignoni License: LGPL-2.1 -Files: share/icons/application/*/apps/keepassx.png, share/icons/application/scalable/apps/keepassx.svgz +Files: share/icons/application/*/apps/keepassx.png, + share/icons/application/scalable/apps/keepassx.svgz Copyright: 2006, Otto Salminen 2009, Miguelito Vieira 2011, Felix Geyer License: GPL-2 -Files: share/icons/application/*/actions/entry-clone.png, share/icons/application/*/actions/entry-edit.png, - share/icons/application/*/actions/entry-new.png, share/icons/application/*/actions/password-generate.png +Files: share/icons/application/*/actions/database-change-key.png, + share/icons/application/*/actions/entry-clone.png, + share/icons/application/*/actions/entry-edit.png, + share/icons/application/*/actions/entry-new.png, + share/icons/application/*/actions/password-generate.png Copyright: 2003-2004, David Vignoni License: LGPL-2.1 -Files: share/icons/application/*/actions/entry-delete.png +Files: share/icons/application/*/actions/entry-delete.png, + share/icons/application/*/actions/group-delete.png, + share/icons/application/*/actions/group-edit.png, + share/icons/application/*/actions/group-new.png Copyright: 2003-2004, David Vignoni 2012, Felix Geyer License: LGPL-2.1 -Files: share/icons/application/*/actions/dialog-close.png, share/icons/application/*/actions/dialog-ok.png, - share/icons/application/*/status/dialog-error.png, share/icons/application/*/status/dialog-information.png, - share/icons/application/*/status/dialog-warning.png, share/icons/application/*/actions/system-search.png +Files: share/icons/application/*/actions/application-exit.png, + share/icons/application/*/actions/configure.png, + share/icons/application/*/actions/dialog-close.png, + share/icons/application/*/actions/dialog-ok.png, + share/icons/application/*/actions/document-close.png, + share/icons/application/*/actions/document-edit.png, + share/icons/application/*/actions/document-new.png, + share/icons/application/*/actions/document-open.png, + share/icons/application/*/actions/document-save.png, + share/icons/application/*/actions/document-save-as.png, + share/icons/application/*/actions/system-search.png, + share/icons/application/*/status/dialog-error.png, + share/icons/application/*/status/dialog-information.png, + share/icons/application/*/status/dialog-warning.png Copyright: 2007, Nuno Pinheiro 2007, David Vignoni 2007, David Miller @@ -57,6 +75,8 @@ Files: src/crypto/salsa20/* Copyright: is in public domain License: - -Files: src/streams/qtiocompressor.*, src/streams/QtIOCompressor, tests/modeltest.* +Files: src/streams/qtiocompressor.*, + src/streams/QtIOCompressor, + tests/modeltest.* Copyright: 2009-2012, Nokia Corporation and/or its subsidiary(-ies) License: LGPL-2.1 or GPL-3 diff --git a/share/icons/application/16x16/actions/application-exit.png b/share/icons/application/16x16/actions/application-exit.png new file mode 100644 index 000000000..4839c6142 Binary files /dev/null and b/share/icons/application/16x16/actions/application-exit.png differ diff --git a/share/icons/application/16x16/actions/configure.png b/share/icons/application/16x16/actions/configure.png new file mode 100644 index 000000000..f5f1bab88 Binary files /dev/null and b/share/icons/application/16x16/actions/configure.png differ diff --git a/share/icons/application/16x16/actions/database-change-key.png b/share/icons/application/16x16/actions/database-change-key.png new file mode 100644 index 000000000..ef0b0301b Binary files /dev/null and b/share/icons/application/16x16/actions/database-change-key.png differ diff --git a/share/icons/application/16x16/actions/document-close.png b/share/icons/application/16x16/actions/document-close.png new file mode 100644 index 000000000..411031eb8 Binary files /dev/null and b/share/icons/application/16x16/actions/document-close.png differ diff --git a/share/icons/application/16x16/actions/document-edit.png b/share/icons/application/16x16/actions/document-edit.png new file mode 100644 index 000000000..67059e358 Binary files /dev/null and b/share/icons/application/16x16/actions/document-edit.png differ diff --git a/share/icons/application/16x16/actions/document-new.png b/share/icons/application/16x16/actions/document-new.png new file mode 100644 index 000000000..b79e90314 Binary files /dev/null and b/share/icons/application/16x16/actions/document-new.png differ diff --git a/share/icons/application/16x16/actions/document-open.png b/share/icons/application/16x16/actions/document-open.png new file mode 100644 index 000000000..530940ce5 Binary files /dev/null and b/share/icons/application/16x16/actions/document-open.png differ diff --git a/share/icons/application/16x16/actions/document-save-as.png b/share/icons/application/16x16/actions/document-save-as.png new file mode 100644 index 000000000..41c52aaa9 Binary files /dev/null and b/share/icons/application/16x16/actions/document-save-as.png differ diff --git a/share/icons/application/16x16/actions/document-save.png b/share/icons/application/16x16/actions/document-save.png new file mode 100644 index 000000000..5a29dae47 Binary files /dev/null and b/share/icons/application/16x16/actions/document-save.png differ diff --git a/share/icons/application/16x16/actions/group-delete.png b/share/icons/application/16x16/actions/group-delete.png new file mode 100644 index 000000000..c5ca349fb Binary files /dev/null and b/share/icons/application/16x16/actions/group-delete.png differ diff --git a/share/icons/application/16x16/actions/group-edit.png b/share/icons/application/16x16/actions/group-edit.png new file mode 100644 index 000000000..a6efbc4d7 Binary files /dev/null and b/share/icons/application/16x16/actions/group-edit.png differ diff --git a/share/icons/application/16x16/actions/group-new.png b/share/icons/application/16x16/actions/group-new.png new file mode 100644 index 000000000..0db0c743f Binary files /dev/null and b/share/icons/application/16x16/actions/group-new.png differ diff --git a/src/gui/MainWindow.cpp b/src/gui/MainWindow.cpp index 2aaea2bb5..e88bc09bc 100644 --- a/src/gui/MainWindow.cpp +++ b/src/gui/MainWindow.cpp @@ -44,12 +44,27 @@ MainWindow::MainWindow() m_ui->actionEntryCopyUsername->setShortcut(Qt::CTRL + Qt::Key_B); m_ui->actionEntryCopyPassword->setShortcut(Qt::CTRL + Qt::Key_C); + m_ui->actionDatabaseNew->setIcon(dataPath()->icon("actions", "document-new")); + m_ui->actionDatabaseOpen->setIcon(dataPath()->icon("actions", "document-open")); + m_ui->actionDatabaseSave->setIcon(dataPath()->icon("actions", "document-save")); + m_ui->actionDatabaseSaveAs->setIcon(dataPath()->icon("actions", "document-save-as")); + m_ui->actionDatabaseClose->setIcon(dataPath()->icon("actions", "document-close")); + m_ui->actionChangeDatabaseSettings->setIcon(dataPath()->icon("actions", "document-edit")); + m_ui->actionChangeMasterKey->setIcon(dataPath()->icon("actions", "database-change-key", false)); + m_ui->actionQuit->setIcon(dataPath()->icon("actions", "application-exit")); + m_ui->actionEntryNew->setIcon(dataPath()->icon("actions", "entry-new", false)); m_ui->actionEntryClone->setIcon(dataPath()->icon("actions", "entry-clone", false)); m_ui->actionEntryEdit->setIcon(dataPath()->icon("actions", "entry-edit", false)); m_ui->actionEntryDelete->setIcon(dataPath()->icon("actions", "entry-delete", false)); - m_ui->actionSearch->setIcon(dataPath()->icon("actions", "system-search", true)); + m_ui->actionGroupNew->setIcon(dataPath()->icon("actions", "group-new", false)); + m_ui->actionGroupEdit->setIcon(dataPath()->icon("actions", "group-edit", false)); + m_ui->actionGroupDelete->setIcon(dataPath()->icon("actions", "group-delete", false)); + + m_ui->actionSettings->setIcon(dataPath()->icon("actions", "configure")); + + m_ui->actionSearch->setIcon(dataPath()->icon("actions", "system-search")); connect(m_ui->tabWidget, SIGNAL(entrySelectionChanged(bool)), SLOT(setMenuActionState()));