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

Fix failing builds

Browse Source 
Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>
This commit is contained in:
Haris Gušić
2021-10-08 22:08:35 +02:00
parent c59cd049b7
commit f0adfabd47
2 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/core/capturerequest.cpp
View File

@@ -45,7 +45,9 @@ QByteArray CaptureRequest::serialize() const
{
QByteArray data;
QDataStream stream(&data, QIODevice::WriteOnly);
stream << m_mode << m_delay << m_tasks << m_data << m_forcedID << m_id
// Convert enums to integers
qint32 tasks = m_tasks, mode = m_mode;
stream << mode << m_delay << tasks << m_data << m_forcedID << m_id
<< m_path;
return data;
}
@@ -54,13 +56,18 @@ CaptureRequest CaptureRequest::deserialize(const QByteArray& data)
{
QDataStream stream(data);
CaptureRequest request;
stream >> request.m_mode;
qint32 tasks, mode;
stream >> mode;
stream >> request.m_delay;
stream >> request.m_tasks;
stream >> tasks;
stream >> request.m_data;
stream >> request.m_forcedID;
stream >> request.m_id;
stream >> request.m_path;
// Convert integers to enums
request.m_tasks = static_cast<ExportTask>(tasks);
request.m_mode = static_cast<CaptureMode>(mode);
return request;
}

10
src/widgets/capture/capturewidget.cpp
View File

@@ -319,7 +319,7 @@ void CaptureWidget::initButtons()
void CaptureWidget::initHelpMessage()
{
QList<QPair<QString, QString>> keyMap;
keyMap << QPair("Mouse", "Select screenshot area");
keyMap << QPair(tr("Mouse"), tr("Select screenshot area"));
using CT = CaptureTool;
for (auto toolType : { CT::TYPE_ACCEPT, CT::TYPE_SAVE, CT::TYPE_COPY }) {
if (!m_tools.contains(toolType)) {
@@ -333,10 +333,10 @@ void CaptureWidget::initHelpMessage()
keyMap << QPair(shortcut, tool->description());
}
}
keyMap << QPair("Mouse Wheel", "Change tool size");
keyMap << QPair("Right Click", "Show color picker");
keyMap << QPair("Space", "Open side panel");
keyMap << QPair("Esc", "Exit");
keyMap << QPair(tr("Mouse Wheel"), tr("Change tool size"));
keyMap << QPair(tr("Right Click"), tr("Show color picker"));
keyMap << QPair(tr("Space"), tr("Open side panel"));
keyMap << QPair(tr("Esc"), tr("Exit"));
OverlayMessage::pushKeyMap(keyMap);
}