Skip to content

Commit

Permalink
Code improvements and badges
Browse files Browse the repository at this point in the history
* Use QIcon to seamlessly support High DPI displays and pixmap caching
* Add badge support for KeeShare groups and expired entries.
* Replace select icons



Use QIcon instead of QPixmap

* Also make format
  • Loading branch information
droidmonkey committed May 7, 2020
1 parent 96b869b commit 431e45a
Show file tree
Hide file tree
Showing 38 changed files with 287 additions and 367 deletions.
85 changes: 1 addition & 84 deletions COPYING
Original file line number Diff line number Diff line change
Expand Up @@ -58,72 +58,6 @@ Files: share/icons/application/scalable/apps/keepassxc.svg
Copyright: 2016, Lorenzo Stella <[email protected]>
License: LGPL-2

Files: share/icons/database/C00_Password.png
share/icons/database/C01_Package_Network.png
share/icons/database/C02_MessageBox_Warning.png
share/icons/database/C03_Server.png
share/icons/database/C04_Klipper.png
share/icons/database/C05_Edu_Languages.png
share/icons/database/C06_KCMDF.png
share/icons/database/C07_Kate.png
share/icons/database/C08_Socket.png
share/icons/database/C09_Identity.png
share/icons/database/C10_Kontact.png
share/icons/database/C11_Camera.png
share/icons/database/C12_IRKickFlash.png
share/icons/database/C13_KGPG_Key3.png
share/icons/database/C14_Laptop_Power.png
share/icons/database/C15_Scanner.png
share/icons/database/C16_Mozilla_Firebird.png
share/icons/database/C17_CDROM_Unmount.png
share/icons/database/C18_Display.png
share/icons/database/C19_Mail_Generic.png
share/icons/database/C20_Misc.png
share/icons/database/C21_KOrganizer.png
share/icons/database/C22_ASCII.png
share/icons/database/C23_Icons.png
share/icons/database/C24_Connect_Established.png
share/icons/database/C25_Folder_Mail.png
share/icons/database/C26_FileSave.png
share/icons/database/C27_NFS_Unmount.png
share/icons/database/C28_QuickTime.png
share/icons/database/C29_KGPG_Term.png
share/icons/database/C30_Konsole.png
share/icons/database/C31_FilePrint.png
share/icons/database/C32_FSView.png
share/icons/database/C33_Run.png
share/icons/database/C34_Configure.png
share/icons/database/C35_KRFB.png
share/icons/database/C36_Ark.png
share/icons/database/C37_KPercentage.png
share/icons/database/C38_Samba_Unmount.png
share/icons/database/C39_History.png
share/icons/database/C40_Mail_Find.png
share/icons/database/C41_VectorGfx.png
share/icons/database/C42_KCMMemory.png
share/icons/database/C43_EditTrash.png
share/icons/database/C44_KNotes.png
share/icons/database/C45_Cancel.png
share/icons/database/C46_Help.png
share/icons/database/C47_KPackage.png
share/icons/database/C48_Folder.png
share/icons/database/C49_Folder_Blue_Open.png
share/icons/database/C50_Folder_Tar.png
share/icons/database/C51_Decrypted.png
share/icons/database/C52_Encrypted.png
share/icons/database/C53_Apply.png
share/icons/database/C54_Signature.png
share/icons/database/C55_Thumbnail.png
share/icons/database/C56_KAddressBook.png
share/icons/database/C57_View_Text.png
share/icons/database/C58_KGPG.png
share/icons/database/C59_Package_Development.png
share/icons/database/C60_KFM_Home.png
share/icons/database/C61_Services.png
Copyright: 2003-2004, David Vignoni <[email protected]>
License: LGPL-2.1
Comment: from Nuvola icon theme

Files: share/icons/application/scalable/categories/preferences-other.svg
share/icons/application/scalable/apps/keepassxc-dark.svg
share/icons/application/scalable/apps/preferences-system-network-sharing.svg
Expand Down Expand Up @@ -186,24 +120,6 @@ Copyright: 2019 Austin Andrews <http://templarian.com/>
License: SIL OPEN FONT LICENSE Version 1.1
Comment: Taken from Material Design icon set (https://github.com/templarian/MaterialDesign/)

Files: share/icons/database/C62_Tux.png
share/icons/database/C63_Feather.png
share/icons/database/C64_Apple.png
share/icons/database/C67_Certificate.png
share/icons/database/C68_BlackBerry.png
Copyright: Mairin Duffy
Sarah Owens
James Birkett
Dominik Reichl
License: CC0
Comment: C62_Tux.png from https://openclipart.org/detail/103855
C63_Feather.png from http://openclipart.org/detail/122017
C64_Apple.png based on http://openclipart.org/detail/24319
C67_Certificate.png based on https://openclipart.org/detail/16729
C68_BlackBerry.png from https://openclipart.org/detail/4465

Files: share/icons/database/C65_W.png
share/icons/database/C66_Money.png
Copyright: none
License: public-domain

Expand Down Expand Up @@ -234,3 +150,4 @@ Comment: from Freedesktop.org website
Files: share/icons/application/scalable/actions/hibp.svg
Copyright: GPL-2+
Comment: from the Simple Icons repo (https://github.com/simple-icons/simple-icons/)

1 change: 1 addition & 0 deletions share/icons/badges/0_ShareActive.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions share/icons/badges/1_ShareInactive.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions share/icons/badges/2_Expired.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
49 changes: 43 additions & 6 deletions share/icons/database/C00_Password.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed share/icons/database/C45_Cancel.png
Binary file not shown.
1 change: 1 addition & 0 deletions share/icons/database/C45_Cancel.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 1 addition & 3 deletions share/icons/database/C53_Apply.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed share/icons/database/C64_Apple.png
Binary file not shown.
1 change: 1 addition & 0 deletions share/icons/database/C64_Apple.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 6 additions & 2 deletions share/icons/icons.qrc
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@
<file>database/C42_KCMMemory.svg</file>
<file>database/C43_EditTrash.svg</file>
<file>database/C44_KNotes.png</file>
<file>database/C45_Cancel.png</file>
<file>database/C45_Cancel.svg</file>
<file>database/C46_Help.png</file>
<file>database/C47_KPackage.svg</file>
<file>database/C48_Folder.svg</file>
Expand All @@ -146,10 +146,14 @@
<file>database/C61_Services.png</file>
<file>database/C62_Tux.svg</file>
<file>database/C63_Feather.svg</file>
<file>database/C64_Apple.png</file>
<file>database/C64_Apple.svg</file>
<file>database/C65_W.svg</file>
<file>database/C66_Money.svg</file>
<file>database/C67_Certificate.svg</file>
<file>database/C68_BlackBerry.svg</file>

<file>badges/0_ShareActive.svg</file>
<file>badges/1_ShareInactive.svg</file>
<file>badges/2_Expired.svg</file>
</qresource>
</RCC>
Loading

0 comments on commit 431e45a

Please sign in to comment.