Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2024-09-19 23:56:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add clipboard-text and refresh icons to resources

Browse Source
This commit is contained in:
Jonathan White 2020-03-18 22:54:49 -04:00 committed by Janek Bevendorff
parent 243f68e0e8
commit 7168bcdbe5
5 changed files with 33 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
share/icons/icons.qrc
View File

@ -9,6 +9,7 @@
<file>application/scalable/actions/auto-type.svg</file>
<file>application/scalable/actions/bugreport.svg</file>
<file>application/scalable/actions/chronometer.svg</file>
<file>application/scalable/actions/clipboard-text.svg</file>
<file>application/scalable/actions/configure.svg</file>
<file>application/scalable/actions/database-change-key.svg</file>
<file>application/scalable/actions/database-lock.svg</file>
@ -49,6 +50,7 @@
<file>application/scalable/actions/password-generator.svg</file>
<file>application/scalable/actions/password-show-off.svg</file>
<file>application/scalable/actions/password-show-on.svg</file>
<file>application/scalable/actions/refresh.svg</file>
<file>application/scalable/actions/sort-alphabetical-ascending.svg</file>
<file>application/scalable/actions/sort-alphabetical-descending.svg</file>
<file>application/scalable/actions/statistics.svg</file>

13
src/gui/MainWindow.ui
View File

@ -195,6 +195,19 @@
<property name="rightMargin">
<number>60</number>
</property>
<item>
<spacer name="verticalSpacer_2">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="PasswordGeneratorWidget" name="passwordGeneratorWidget" native="true">
<property name="focusPolicy">

2
src/gui/PasswordEdit.cpp
View File

@ -57,7 +57,7 @@ PasswordEdit::PasswordEdit(QWidget* parent)
setFont(passwordFont);
m_toggleVisibleAction = new QAction(
resources()->icon("password-show"),
resources()->icon("password-show-off"),
tr("Toggle Password (%1)").arg(QKeySequence(Qt::CTRL + Qt::Key_H).toString(QKeySequence::NativeText)),
nullptr);
m_toggleVisibleAction->setCheckable(true);

3
src/gui/PasswordGeneratorWidget.cpp
View File

@ -103,7 +103,8 @@ PasswordGeneratorWidget::~PasswordGeneratorWidget()
{
}
PasswordGeneratorWidget* PasswordGeneratorWidget::popupGenerator(QWidget* parent) {
PasswordGeneratorWidget* PasswordGeneratorWidget::popupGenerator(QWidget* parent)
{
auto pwGenerator = new PasswordGeneratorWidget(parent);
pwGenerator->setWindowModality(Qt::ApplicationModal);
pwGenerator->setWindowFlags(Qt::Dialog | Qt::MSWindowsFixedSizeDialogHint);

30
src/gui/PasswordGeneratorWidget.ui
View File

@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>622</width>
<height>433</height>
<height>455</height>
</rect>
</property>
<property name="windowTitle">
@ -155,8 +155,21 @@ QProgressBar::chunk {
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QToolButton" name="buttonGenerate">
<property name="focusPolicy">
<enum>Qt::TabFocus</enum>
</property>
<property name="accessibleDescription">
<string>Regenerate password</string>
</property>
<property name="shortcut">
<string notr="true">Ctrl+R</string>
</property>
</widget>
</item>
<item row="0" column="2">
<widget class="QPushButton" name="buttonCopy">
<widget class="QToolButton" name="buttonCopy">
<property name="focusPolicy">
<enum>Qt::TabFocus</enum>
</property>
@ -171,19 +184,6 @@ QProgressBar::chunk {
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QPushButton" name="buttonGenerate">
<property name="focusPolicy">
<enum>Qt::TabFocus</enum>
</property>
<property name="accessibleDescription">
<string>Regenerate password</string>
</property>
<property name="shortcut">
<string notr="true">Ctrl+R</string>
</property>
</widget>
</item>
</layout>
</item>
<item>