benkyd/flameshot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolving merge conflicts

Browse Source
This commit is contained in:
Jeremy Borgman
2021-01-08 09:58:52 -06:00
parent c84b6df7d3 b1ba67ac4d
commit 73fe772b70
90 changed files with 7190 additions and 3036 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/utils/confighandler.cpp
View File

@@ -60,7 +60,10 @@ QVector<CaptureToolButton::ButtonType> ConfigHandler::getButtons()
<< CaptureToolButton::TYPE_COPY << CaptureToolButton::TYPE_SAVE
<< CaptureToolButton::TYPE_EXIT
<< CaptureToolButton::TYPE_IMAGEUPLOADER
#if not(defined(Q_OS_MAC) || defined(Q_OS_MAC64) || defined(Q_OS_MACOS) || \
defined(Q_OS_MACX))
<< CaptureToolButton::TYPE_OPEN_APP
#endif
<< CaptureToolButton::TYPE_PIN << CaptureToolButton::TYPE_TEXT
<< CaptureToolButton::TYPE_CIRCLECOUNT;
}
@@ -230,6 +233,16 @@ void ConfigHandler::setShowSidePanelButton(const bool showSidePanelButton)
showSidePanelButton);
}
void ConfigHandler::setIgnoreUpdateToVersion(const QString& text)
{
m_settings.setValue(QStringLiteral("ignoreUpdateToVersion"), text);
}
QString ConfigHandler::ignoreUpdateToVersion()
{
return m_settings.value(QStringLiteral("ignoreUpdateToVersion")).toString();
}
bool ConfigHandler::desktopNotificationValue()
{
bool res = true;
@@ -559,3 +572,28 @@ const QString& ConfigHandler::shortcut(const QString& shortcutName)
m_settings.endGroup();
return m_strRes;
}
void ConfigHandler::setValue(const QString& group,
const QString& key,
const QVariant& value)
{
if (!group.isEmpty()) {
m_settings.beginGroup(group);
}
m_settings.setValue(key, value);
if (!group.isEmpty()) {
m_settings.endGroup();
}
}
QVariant& ConfigHandler::value(const QString& group, const QString& key)
{
if (!group.isEmpty()) {
m_settings.beginGroup(group);
}
m_varRes = m_settings.value(key);
if (!group.isEmpty()) {
m_settings.endGroup();
}
return m_varRes;
}