add option to open video with external program by default
This commit is contained in:
parent
74a4e36f90
commit
88d86405f8
|
@ -2913,6 +2913,11 @@ Reason: %4</translation>
|
|||
<source>Open images with external program</source>
|
||||
<translation>Open images with external program</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location line="+2"/>
|
||||
<source>Open videos with external program</source>
|
||||
<translation>Open videos with external program</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location line="+2"/>
|
||||
<source>Decrypt messages in sidebar</source>
|
||||
|
|
|
@ -52,7 +52,7 @@ Item {
|
|||
height: parent.height - fileInfoLabel.height
|
||||
|
||||
TapHandler {
|
||||
onTapped: mediaControls.showControls()
|
||||
onTapped: Settings.openVideoExternal ? room.openMedia(eventId) : mediaControls.showControls()
|
||||
}
|
||||
|
||||
Image {
|
||||
|
|
|
@ -85,6 +85,7 @@ UserSettings::load(std::optional<QString> profile)
|
|||
avatarCircles_ = settings.value(QStringLiteral("user/avatar_circles"), true).toBool();
|
||||
useIdenticon_ = settings.value(QStringLiteral("user/use_identicon"), true).toBool();
|
||||
openImageExternal_ = settings.value(QStringLiteral("user/open_image_external"), false).toBool();
|
||||
openVideoExternal_ = settings.value(QStringLiteral("user/open_video_external"), false).toBool();
|
||||
decryptSidebar_ = settings.value(QStringLiteral("user/decrypt_sidebar"), true).toBool();
|
||||
privacyScreen_ = settings.value(QStringLiteral("user/privacy_screen"), false).toBool();
|
||||
privacyScreenTimeout_ =
|
||||
|
@ -698,6 +699,16 @@ UserSettings::setOpenImageExternal(bool state)
|
|||
save();
|
||||
}
|
||||
|
||||
void
|
||||
UserSettings::setOpenVideoExternal(bool state)
|
||||
{
|
||||
if (state == openVideoExternal_)
|
||||
return;
|
||||
openVideoExternal_ = state;
|
||||
emit openVideoExternalChanged(openVideoExternal_);
|
||||
save();
|
||||
}
|
||||
|
||||
void
|
||||
UserSettings::applyTheme()
|
||||
{
|
||||
|
@ -776,6 +787,7 @@ UserSettings::save()
|
|||
settings.setValue(QStringLiteral("currentProfile"), profile_);
|
||||
settings.setValue(QStringLiteral("use_identicon"), useIdenticon_);
|
||||
settings.setValue(QStringLiteral("open_image_external"), openImageExternal_);
|
||||
settings.setValue(QStringLiteral("open_video_external"), openVideoExternal_);
|
||||
|
||||
settings.endGroup(); // user
|
||||
|
||||
|
@ -882,6 +894,8 @@ UserSettingsModel::data(const QModelIndex &index, int role) const
|
|||
return tr("Use identicons");
|
||||
case OpenImageExternal:
|
||||
return tr("Open images with external program");
|
||||
case OpenVideoExternal:
|
||||
return tr("Open videos with external program");
|
||||
case DecryptSidebar:
|
||||
return tr("Decrypt messages in sidebar");
|
||||
case PrivacyScreen:
|
||||
|
@ -1008,6 +1022,8 @@ UserSettingsModel::data(const QModelIndex &index, int role) const
|
|||
return i->useIdenticon();
|
||||
case OpenImageExternal:
|
||||
return i->openImageExternal();
|
||||
case OpenVideoExternal:
|
||||
return i->openVideoExternal();
|
||||
case DecryptSidebar:
|
||||
return i->decryptSidebar();
|
||||
case PrivacyScreen:
|
||||
|
@ -1152,7 +1168,10 @@ UserSettingsModel::data(const QModelIndex &index, int role) const
|
|||
return tr("Display an identicon instead of a letter when no avatar is set.");
|
||||
case OpenImageExternal:
|
||||
return tr("Click to open image with external program. \nSame as Right-Click>Open "
|
||||
"in External Program");
|
||||
"in external program");
|
||||
case OpenVideoExternal:
|
||||
return tr("Click to open video with external program. \nSame as Right-Click>Open "
|
||||
"in external program");
|
||||
case DecryptSidebar:
|
||||
return tr("Decrypt the messages shown in the sidebar.\nOnly affects messages in "
|
||||
"encrypted chats.");
|
||||
|
@ -1250,6 +1269,7 @@ UserSettingsModel::data(const QModelIndex &index, int role) const
|
|||
case AvatarCircles:
|
||||
case UseIdenticon:
|
||||
case OpenImageExternal:
|
||||
case OpenVideoExternal:
|
||||
case DecryptSidebar:
|
||||
case PrivacyScreen:
|
||||
case MobileMode:
|
||||
|
@ -1549,6 +1569,13 @@ UserSettingsModel::setData(const QModelIndex &index, const QVariant &value, int
|
|||
} else
|
||||
return false;
|
||||
}
|
||||
case OpenVideoExternal: {
|
||||
if (value.userType() == QMetaType::Bool) {
|
||||
i->setOpenVideoExternal(value.toBool());
|
||||
return true;
|
||||
} else
|
||||
return false;
|
||||
}
|
||||
case DecryptSidebar: {
|
||||
if (value.userType() == QMetaType::Bool) {
|
||||
i->setDecryptSidebar(value.toBool());
|
||||
|
@ -1812,6 +1839,9 @@ UserSettingsModel::UserSettingsModel(QObject *p)
|
|||
connect(s.get(), &UserSettings::openImageExternalChanged, this, [this]() {
|
||||
emit dataChanged(index(OpenImageExternal), index(OpenImageExternal), {Value});
|
||||
});
|
||||
connect(s.get(), &UserSettings::openVideoExternalChanged, this, [this]() {
|
||||
emit dataChanged(index(OpenVideoExternal), index(OpenVideoExternal), {Value});
|
||||
});
|
||||
connect(s.get(), &UserSettings::privacyScreenChanged, this, [this]() {
|
||||
emit dataChanged(index(PrivacyScreen), index(PrivacyScreen), {Value});
|
||||
emit dataChanged(index(PrivacyScreenTimeout), index(PrivacyScreenTimeout), {Enabled});
|
||||
|
|
|
@ -105,7 +105,10 @@ class UserSettings : public QObject
|
|||
Q_PROPERTY(bool disableCertificateValidation READ disableCertificateValidation WRITE
|
||||
setDisableCertificateValidation NOTIFY disableCertificateValidationChanged)
|
||||
Q_PROPERTY(bool useIdenticon READ useIdenticon WRITE setUseIdenticon NOTIFY useIdenticonChanged)
|
||||
Q_PROPERTY(bool openImageExternal READ openImageExternal WRITE setOpenImageExternal NOTIFY openImageExternalChanged)
|
||||
Q_PROPERTY(bool openImageExternal READ openImageExternal WRITE setOpenImageExternal NOTIFY
|
||||
openImageExternalChanged)
|
||||
Q_PROPERTY(bool openVideoExternal READ openVideoExternal WRITE setOpenVideoExternal NOTIFY
|
||||
openVideoExternalChanged)
|
||||
|
||||
Q_PROPERTY(QStringList hiddenPins READ hiddenPins WRITE setHiddenPins NOTIFY hiddenPinsChanged)
|
||||
Q_PROPERTY(QStringList recentReactions READ recentReactions WRITE setRecentReactions NOTIFY
|
||||
|
@ -186,6 +189,7 @@ public:
|
|||
void setRecentReactions(QStringList recent);
|
||||
void setUseIdenticon(bool state);
|
||||
void setOpenImageExternal(bool state);
|
||||
void setOpenVideoExternal(bool state);
|
||||
void setCollapsedSpaces(QList<QStringList> spaces);
|
||||
|
||||
QString theme() const { return !theme_.isEmpty() ? theme_ : defaultTheme_; }
|
||||
|
@ -249,6 +253,7 @@ public:
|
|||
QStringList recentReactions() const { return recentReactions_; }
|
||||
bool useIdenticon() const { return useIdenticon_ && JdenticonProvider::isAvailable(); }
|
||||
bool openImageExternal() const { return openImageExternal_; }
|
||||
bool openVideoExternal() const { return openVideoExternal_; }
|
||||
QList<QStringList> collapsedSpaces() const { return collapsedSpaces_; }
|
||||
|
||||
signals:
|
||||
|
@ -301,6 +306,7 @@ signals:
|
|||
void disableCertificateValidationChanged(bool disabled);
|
||||
void useIdenticonChanged(bool state);
|
||||
void openImageExternalChanged(bool state);
|
||||
void openVideoExternalChanged(bool state);
|
||||
void hiddenPinsChanged();
|
||||
void hiddenWidgetsChanged();
|
||||
void recentReactionsChanged();
|
||||
|
@ -366,6 +372,7 @@ private:
|
|||
QList<QStringList> collapsedSpaces_;
|
||||
bool useIdenticon_;
|
||||
bool openImageExternal_;
|
||||
bool openVideoExternal_;
|
||||
|
||||
QSettings settings;
|
||||
|
||||
|
@ -390,6 +397,7 @@ class UserSettingsModel : public QAbstractListModel
|
|||
AvatarCircles,
|
||||
UseIdenticon,
|
||||
OpenImageExternal,
|
||||
OpenVideoExternal,
|
||||
PrivacyScreen,
|
||||
PrivacyScreenTimeout,
|
||||
|
||||
|
@ -497,4 +505,3 @@ public:
|
|||
Q_INVOKABLE void requestCrossSigningSecrets();
|
||||
Q_INVOKABLE void downloadCrossSigningSecrets();
|
||||
};
|
||||
|
||||
|
|
|
@ -133,4 +133,3 @@ Q_DECLARE_METATYPE(mtx::events::msg::KeyVerificationMac)
|
|||
Q_DECLARE_METATYPE(mtx::events::msg::KeyVerificationReady)
|
||||
Q_DECLARE_METATYPE(mtx::events::msg::KeyVerificationRequest)
|
||||
Q_DECLARE_METATYPE(mtx::events::msg::KeyVerificationStart)
|
||||
|
||||
|
|
Loading…
Reference in New Issue