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

Change help message from static to a CaptureWidget attribute

Browse Source 
Signed-off-by: Haris Gušić <harisgusic.dev@gmail.com>
This commit is contained in:
Haris Gušić
2021-10-12 22:25:44 +02:00
parent 4df2447b3e
commit 0854fa8b84
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -219,7 +219,8 @@ CaptureWidget::CaptureWidget(uint id,
QGuiAppCurrentScreen().currentScreen()->geometry());
if (m_config.showHelp()) {
pushHelpMessage();
initHelpMessage();
OverlayMessage::push(m_helpMessage);
}
updateCursor();
@@ -317,9 +318,9 @@ void CaptureWidget::initButtons()
m_buttonHandler->setButtons(vectorButtons);
}
void CaptureWidget::pushHelpMessage()
void CaptureWidget::initHelpMessage()
{
static QList<QPair<QString, QString>> keyMap;
QList<QPair<QString, QString>> keyMap;
if (keyMap.isEmpty()) {
keyMap << QPair(tr("Mouse"), tr("Select screenshot area"));
using CT = CaptureTool;
@@ -342,7 +343,7 @@ void CaptureWidget::pushHelpMessage()
tr("Open side panel"));
keyMap << QPair(tr("Esc"), tr("Exit"));
}
OverlayMessage::pushKeyMap(keyMap);
m_helpMessage = OverlayMessage::compileFromKeyMap(keyMap);
}
QPixmap CaptureWidget::pixmap()
@@ -1022,8 +1023,8 @@ void CaptureWidget::initSelection()
}
});
connect(m_selection, &SelectionWidget::visibilityChanged, this, [this]() {
if (!m_selection->isVisible() && ConfigHandler().showHelp()) {
pushHelpMessage();
if (!m_selection->isVisible()) {
OverlayMessage::push(m_helpMessage);
}
});
}