Allow multiple image selections when adding favicons #2011
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
TheZ3ro
reviewed
Jun 3, 2018
src/gui/EditWidgetIcons.cpp
Outdated
| if (!icon.isNull()) { | ||
| addCustomIcon(QImage(filename)); | ||
| } else { | ||
| emit messageEditEntry(tr("Can't read icon"), MessageWidget::Error); |
There was a problem hiding this comment.
An improvement: report in the message the filename that can't be loaded.
Also if I load 100 corrupted icons this message will be "spammed" 100 times.
IMHO this needs to be reported at the end of the for cycle with a list of the error filenames.
If the list is too long display only the first N filename
There was a problem hiding this comment.
This was way more complicated than it needed to be, but after some replumbing it works great!
droidmonkey
force-pushed
the
fix/favicon-multiselect
branch
from
1d09b90
to
75aef53
Compare
phoerious
requested changes
Jun 8, 2018
src/gui/EditWidgetIcons.cpp
Outdated
| if (!filename.isEmpty()) { | ||
| auto icon = QImage(filename); | ||
| if (!icon.isNull()) { | ||
| if (!addCustomIcon(QImage(filename))) { |
There was a problem hiding this comment.
They have to be separate because I want to fall through (ie, not an error).
There was a problem hiding this comment.
That would be else if (icon.isNull()).
src/gui/EditWidgetIcons.cpp
Outdated
| } | ||
|
|
||
| if (numexisting > 0) { | ||
| msg += ", " + tr("%1 icons already existed").arg(numexisting); |
There was a problem hiding this comment.
This doesn't work. You cannot assume other languages to append clauses in this order or use commas to separate them. This needs to be two separate messages and it needs proper plural handling as well.
phoerious
reviewed
Jun 8, 2018
src/gui/EditWidgetIcons.cpp
Outdated
| QString msg; | ||
|
|
||
| if (numloaded > 0) { | ||
| msg = tr("Successfully loaded %1 of %2 icons").arg(numloaded).arg(filenames.size()); |
phoerious
reviewed
Jun 8, 2018
src/gui/EditWidgetIcons.cpp
Outdated
| if (!errornames.empty()) { | ||
| // Show the first 8 icons that failed to load | ||
| errornames = errornames.mid(0, 8); | ||
| emit messageEditEntry(msg + "\n" + tr("The following icons failed:") + "\n" + errornames.join("\n"), |
* Error messages now display for 15 seconds and are closable * Add button is always enabled
droidmonkey
force-pushed
the
fix/favicon-multiselect
branch
from
75aef53
to
76102ee
Compare
|
Made corrections and rebased onto develop due to complexity. |
phoerious
approved these changes
Jun 20, 2018
droidmonkey
added a commit
that referenced
this pull request
Mar 19, 2019
- New Database Wizard [#1952] - Advanced Search [#1797] - Automatic update checker [#2648] - KeeShare database synchronization [#2109, #1992, #2738, #2742, #2746, #2739] - Improve favicon fetching; transition to Duck-Duck-Go [#2795, #2011, #2439] - Remove KeePassHttp support [#1752] - CLI: output info to stderr for easier scripting [#2558] - CLI: Add --quiet option [#2507] - CLI: Add create command [#2540] - CLI: Add recursive listing of entries [#2345] - CLI: Fix stdin/stdout encoding on Windows [#2425] - SSH Agent: Support OpenSSH for Windows [#1994] - macOS: TouchID Quick Unlock [#1851] - macOS: Multiple improvements; include CLI in DMG [#2165, #2331, #2583] - Linux: Prevent Klipper from storing secrets in clipboard [#1969] - Linux: Use polling based file watching for NFS [#2171] - Linux: Enable use of browser plugin in Snap build [#2802] - TOTP QR Code Generator [#1167] - High-DPI Scaling for 4k screens [#2404] - Make keyboard shortcuts more consistent [#2431] - Warn user if deleting referenced entries [#1744] - Allow toolbar to be hidden and repositioned [#1819, #2357] - Increase max allowed database timeout to 12 hours [#2173] - Password generator uses existing password length by default [#2318] - Improve alert message box button labels [#2376] - Show message when a database merge makes no changes [#2551] - Browser Integration Enhancements [#1497, #2253, #1904, #2232, #1850, #2218, #2391, #2396, #2542, #2622, #2637, #2790] - Overall Code Improvements [#2316, #2284, #2351, #2402, #2410, #2419, #2422, #2443, #2491, #2506, #2610, #2667, #2709, #2731]
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Quick tweak to let users select multiple icons when adding favicons from the filesystem. Useful for testing too!
Types of changes
Checklist:
-DWITH_ASAN=ON. [REQUIRED]