Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add New/Preview Entry Attachments dialog and functionality #11637

Merged
merged 10 commits into from
Jan 12, 2025
Merged

Add New/Preview Entry Attachments dialog and functionality #11637

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
df95ad6
Add New Entry Attachments dialog and functionality
Jan 7, 2025
e00aec9
Add preview functionality for entry attachments
Jan 8, 2025
3f91ffe
Fix read-only preview
Jan 9, 2025
2153105
Enhance attachment type detection with format compatibility checks
Jan 9, 2025
deed178
Add MimeTypes handling and related tests for attachment previews
Jan 10, 2025
c941cda
Add Open and Save functionality to attachment preview dialog
Jan 11, 2025
14db3d5
Merge mimetype code into core/Tools.cpp
droidmonkey Jan 11, 2025
23c567e
Improve code for preview widget
droidmonkey Jan 11, 2025
6feea6a
Refactor attachment widget: remove rename functionality and reorder b…
Jan 11, 2025
3116ded
Final cleanup round
droidmonkey Jan 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
69 changes: 61 additions & 8 deletions share/translations/keepassxc_en.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3826,6 +3826,21 @@ This may cause the affected plugins to malfunction.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>EntryAttachmentsDialog</name>
<message>
<source>Form</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>File name</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>File contents...</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>EntryAttachmentsModel</name>
<message>
Expand Down Expand Up @@ -3863,14 +3878,6 @@ This may cause the affected plugins to malfunction.</source>
<source>Remove</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Rename selected attachment</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Rename</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Open selected attachment</source>
<translation type="unfinished"></translation>
Expand Down Expand Up @@ -3980,6 +3987,18 @@ Error: %1</source>
Would you like to overwrite the existing attachment?</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>New</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Preview</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Failed to preview an attachment: Attachment not found</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>EntryAttributesModel</name>
Expand Down Expand Up @@ -6349,6 +6368,25 @@ Expect some bugs and minor issues, this version is meant for testing purposes.</
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>NewEntryAttachmentsDialog</name>
<message>
<source>Attachment name cannot be empty</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Attachment with the same name already exists</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Save attachment</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>New entry attachment</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>NixUtils</name>
<message>
Expand Down Expand Up @@ -7114,6 +7152,21 @@ Do you want to overwrite it?</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>PreviewEntryAttachmentsDialog</name>
<message>
<source>Preview entry attachment</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>No preview available</source>
<translation type="unfinished"></translation>
</message>
<message>
<source>Image format not supported</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>QMessageBox</name>
<message>
Expand Down
2 changes: 2 additions & 0 deletions src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,8 @@ set(gui_SOURCES
gui/entry/EntryAttachmentsModel.cpp
gui/entry/EntryAttachmentsWidget.cpp
gui/entry/EntryAttributesModel.cpp
gui/entry/NewEntryAttachmentsDialog.cpp
gui/entry/PreviewEntryAttachmentsDialog.cpp
gui/entry/EntryHistoryModel.cpp
gui/entry/EntryModel.cpp
gui/entry/EntryView.cpp
Expand Down
28 changes: 28 additions & 0 deletions src/core/Tools.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -475,4 +475,32 @@ namespace Tools

return pattern;
}

MimeType toMimeType(const QString& mimeName)
{
static QStringList textFormats = {
"text/",
"application/json",
"application/xml",
"application/soap+xml",
"application/x-yaml",
"application/protobuf",
};
static QStringList imageFormats = {"image/"};

static auto isCompatible = [](const QString& format, const QStringList& list) {
return std::any_of(
list.cbegin(), list.cend(), [&format](const auto& item) { return format.startsWith(item); });
};

if (isCompatible(mimeName, imageFormats)) {
return MimeType::Image;
}

if (isCompatible(mimeName, textFormats)) {
return MimeType::PlainText;
}

return MimeType::Unknown;
}
} // namespace Tools
9 changes: 9 additions & 0 deletions src/core/Tools.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,15 @@ namespace Tools
QVariantMap qo2qvm(const QObject* object, const QStringList& ignoredProperties = {"objectName"});

QString substituteBackupFilePath(QString pattern, const QString& databasePath);

enum class MimeType : uint8_t
{
Image,
PlainText,
Unknown
};

MimeType toMimeType(const QString& mimeName);
} // namespace Tools

#endif // KEEPASSX_TOOLS_H
21 changes: 21 additions & 0 deletions src/gui/EntryPreviewWidget.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,6 +288,9 @@
<property name="textInteractionFlags">
<set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
</property>
<property name="blendIn" stdset="0">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
Expand Down Expand Up @@ -325,6 +328,9 @@
<property name="textInteractionFlags">
<set>Qt::TextBrowserInteraction</set>
</property>
<property name="blendIn" stdset="0">
<bool>true</bool>
</property>
</widget>
</item>
<item row="0" column="3">
Expand Down Expand Up @@ -409,6 +415,9 @@
<property name="readOnly">
<bool>true</bool>
</property>
<property name="blendIn" stdset="0">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
Expand Down Expand Up @@ -482,6 +491,9 @@
<property name="readOnly">
<bool>true</bool>
</property>
<property name="blendIn" stdset="0">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
Expand All @@ -494,6 +506,9 @@
<property name="accessibleName">
<string>Tags list</string>
</property>
<property name="blendIn" stdset="0">
<bool>true</bool>
</property>
</widget>
</item>
<item row="1" column="5">
Expand All @@ -516,6 +531,9 @@
<property name="textInteractionFlags">
<set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
</property>
<property name="blendIn" stdset="0">
<bool>true</bool>
</property>
</widget>
</item>
<item row="1" column="3">
Expand Down Expand Up @@ -1109,6 +1127,9 @@
<property name="readOnly">
<bool>true</bool>
</property>
<property name="blendIn" stdset="0">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
Expand Down
55 changes: 55 additions & 0 deletions src/gui/entry/EntryAttachmentsDialog.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>EntryAttachmentsDialog</class>
<widget class="QDialog" name="EntryAttachmentsDialog">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>402</width>
<height>300</height>
</rect>
</property>
<property name="windowTitle">
<string>Form</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QLineEdit" name="titleEdit">
<property name="placeholderText">
<string>File name</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="errorLabel">
<property name="enabled">
<bool>true</bool>
</property>
<property name="styleSheet">
<string notr="true">color: #FF9696</string>
</property>
<property name="text">
<string/>
</property>
</widget>
</item>
<item>
<widget class="QTextEdit" name="attachmentTextEdit">
<property name="placeholderText">
<string>File contents...</string>
</property>
</widget>
</item>
<item>
<widget class="QDialogButtonBox" name="dialogButtons">
<property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
</property>
</widget>
</item>
</layout>
</widget>
<resources/>
<connections/>
</ui>
Loading
Loading