1
0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00

Merge remote-tracking branch 'protagonist/patch-2'

compress text about keyboard shortcuts when making screenshots
This commit is contained in:
agilob 2015-08-30 20:42:47 +01:00
commit 9c74488325
No known key found for this signature in database
GPG Key ID: 296F0B764741106C

View File

@ -152,14 +152,14 @@ void ScreenshotGrabber::setupScene(QGraphicsScene* scene)
void ScreenshotGrabber::useNothingSelectedTooltip() void ScreenshotGrabber::useNothingSelectedTooltip()
{ {
helperTooltip->setHtml(tr("Click and drag to select a region.<br>Press <b>Space</b> to hide/show qTox window.<br>Press <b>Escape</b> to cancel.", helperTooltip->setHtml(tr("Click and drag to select a region. Press <b>Space</b> to hide/show qTox window, or <b>Escape</b> to cancel.",
"Help text shown when no region has been selected yet")); "Help text shown when no region has been selected yet"));
adjustTooltipPosition(); adjustTooltipPosition();
} }
void ScreenshotGrabber::useRegionSelectedTooltip() void ScreenshotGrabber::useRegionSelectedTooltip()
{ {
helperTooltip->setHtml(tr("Press <b>Enter</b> to send a screenshot of the selected region or select a new region.<br>Press <b>Space</b> to hide/show qTox window and repeat region selection.<br> Press <b>Escape</b> to cancel.", helperTooltip->setHtml(tr("Press <b>Enter</b> to send a screenshot of the selection, <b>Space</b> to hide/show qTox window, or <b>Escape</b> to cancel.",
"Help text shown when a region has been selected")); "Help text shown when a region has been selected"));
adjustTooltipPosition(); adjustTooltipPosition();
} }