Differential D23316 Diff 71001 src/Gui/KSMainWindow.cpp

Changeset View

Standalone View

View Options

src/Gui/KSMainWindow.cpp

Show All 17 Lines
18 * Boston, MA 02110-1301, USA. 18​ * Boston, MA 02110-1301, USA.
19 * 19​ *
20 * SPDX-License-Identifier: LGPL-2.0-or-later 20​ * SPDX-License-Identifier: LGPL-2.0-or-later
21 */ 21​ */
22 22​
23#include "KSMainWindow.h" 23​#include "KSMainWindow.h"
24 24​
25#include "Config.h" 25​#include "Config.h"
26​#include "settings.h"
26#include "SettingsDialog/SettingsDialog.h" 27​#include "SettingsDialog/SettingsDialog.h"
28​#include "SettingsDialog/GeneralOptionsPage.h"
29​#include "SettingsDialog/SaveOptionsPage.h"
30​#include "SettingsDialog/ShortcutsOptionsPage.h"
27 31​
28#include <QApplication> 32​#include <QApplication>
29#include <QClipboard> 33​#include <QClipboard>
30#include <QDesktopServices> 34​#include <QDesktopServices>
31#include <QDBusConnection> 35​#include <QDBusConnection>
32#include <QDBusMessage> 36​#include <QDBusMessage>
33#include <QKeyEvent> 37​#include <QKeyEvent>
34#include <QPrintDialog> 38​#include <QPrintDialog>
35#include <QPushButton> 39​#include <QPushButton>
36#include <QTimer> 40​#include <QTimer>
37#include <QtMath> 41​#include <QtMath>
38#include <QVariantAnimation> 42​#include <QVariantAnimation>
39#include <QVBoxLayout> 43​#include <QVBoxLayout>
40 44​
41#ifdef XCB_FOUND 45​#ifdef XCB_FOUND
42#include <QX11Info> 46​#include <QX11Info>
43#include <xcb/xcb.h> 47​#include <xcb/xcb.h>
44#endif 48​#endif
45 49​
46#include <KAboutData> 50​#include <KAboutData>
47#include <KGuiItem> 51​#include <KGuiItem>
48#include <KHelpMenu> 52​#include <KHelpMenu>
49#include <KIO/OpenFileManagerWindowJob> 53​#include <KIO/OpenFileManagerWindowJob>
54​#include <KRun>
50#include <KLocalizedString> 55​#include <KLocalizedString>
56​#include <KConfigGroup>
57​#include <KSharedConfig>
51#include <KStandardAction> 58​#include <KStandardAction>
52#include <KWindowSystem> 59​#include <KWindowSystem>
53 60​
54static const int DEFAULT_WINDOW_HEIGHT = 420; 61​static const int DEFAULT_WINDOW_HEIGHT = 420;
55static const int DEFAULT_WINDOW_WIDTH = 840; 62​static const int DEFAULT_WINDOW_WIDTH = 840;
56static const int MAXIMUM_WINDOW_WIDTH = 1000; 63​static const int MAXIMUM_WINDOW_WIDTH = 1000;
57 64​
58KSMainWindow::KSMainWindow(const Platform::GrabModes &theGrabModes, const Platform::ShutterModes &theShutterModes, QWidget *parent) : 65​KSMainWindow::KSMainWindow(const Platform::GrabModes &theGrabModes, const Platform::ShutterModes &theShutterModes, QWidget *parent) :
▲ Show 20 Lines • Show All 110 Lines • ▼ Show 20 Line(s)123{
169 mDialogButtonBox->addButton(mSaveButton, QDialogButtonBox::ActionRole); 176​ mDialogButtonBox->addButton(mSaveButton, QDialogButtonBox::ActionRole);
170 177​
171 // the help menu 178​ // the help menu
172 KHelpMenu *helpMenu = new KHelpMenu(this, KAboutData::applicationData(), true); 179​ KHelpMenu *helpMenu = new KHelpMenu(this, KAboutData::applicationData(), true);
173 mDialogButtonBox->button(QDialogButtonBox::Help)->setMenu(helpMenu->menu()); 180​ mDialogButtonBox->button(QDialogButtonBox::Help)->setMenu(helpMenu->menu());
174 181​
175 // the tools menu 182​ // the tools menu
176 mToolsMenu->addAction(QIcon::fromTheme(QStringLiteral("document-open-folder")), 183​ mToolsMenu->addAction(QIcon::fromTheme(QStringLiteral("document-open-folder")),
177 i18n("Open Screenshots Folder"), 184​ i18n("Open Default Screenshots Folder"),
178 this, &KSMainWindow::openScreenshotsFolder); 185​ this, &KSMainWindow::openScreenshotsFolder);
179 mToolsMenu->addAction(KStandardAction::print(this, &KSMainWindow::showPrintDialog, this)); 186​ mToolsMenu->addAction(KStandardAction::print(this, &KSMainWindow::showPrintDialog, this));
180 mScreenRecorderToolsMenu = mToolsMenu->addMenu(i18n("Record Screen")); 187​ mScreenRecorderToolsMenu = mToolsMenu->addMenu(i18n("Record Screen"));
181 mScreenRecorderToolsMenu->setIcon(QIcon::fromTheme(QStringLiteral("media-record"))); 188​ mScreenRecorderToolsMenu->setIcon(QIcon::fromTheme(QStringLiteral("media-record")));
182 connect(mScreenRecorderToolsMenu, &QMenu::aboutToShow, this, [this]() 189​ connect(mScreenRecorderToolsMenu, &QMenu::aboutToShow, this, [this]()
183 { 190​ {
184 KMoreToolsMenuFactory *moreToolsMenuFactory = new KMoreToolsMenuFactory(QStringLiteral("spectacle/screenrecorder-tools")); 191​ KMoreToolsMenuFactory *moreToolsMenuFactory = new KMoreToolsMenuFactory(QStringLiteral("spectacle/screenrecorder-tools"));
185 moreToolsMenuFactory->setParentWidget(this); 192​ moreToolsMenuFactory->setParentWidget(this);
Show All 37 Lines
223 230​
224 // Allow Ctrl+Q to quit the app 231​ // Allow Ctrl+Q to quit the app
225 QAction *actionQuit = KStandardAction::quit(qApp, &QApplication::quit, this); 232​ QAction *actionQuit = KStandardAction::quit(qApp, &QApplication::quit, this);
226 actionQuit->setShortcut(QKeySequence::Quit); 233​ actionQuit->setShortcut(QKeySequence::Quit);
227 addAction(actionQuit); 234​ addAction(actionQuit);
228 235​
229 // message: open containing folder 236​ // message: open containing folder
230 mOpenContaining = new QAction(QIcon::fromTheme(QStringLiteral("document-open-folder")), i18n("Open Containing Folder"), mMessageWidget); 237​ mOpenContaining = new QAction(QIcon::fromTheme(QStringLiteral("document-open-folder")), i18n("Open Containing Folder"), mMessageWidget);
231 connect(mOpenContaining, &QAction::triggered, [=] { KIO::highlightInFileManager({SpectacleConfig::instance()->lastSaveFile()});}); 238​ connect(mOpenContaining, &QAction::triggered, [=] { KIO::highlightInFileManager({Settings::lastSaveLocation()});});
232 239​
233 mHideMessageWidgetTimer = new QTimer(this); 240​ mHideMessageWidgetTimer = new QTimer(this);
234 connect(mHideMessageWidgetTimer, &QTimer::timeout, 241​// connect(mHideMessageWidgetTimer, &QTimer::timeout,
235 mMessageWidget, &KMessageWidget::animatedHide); 242​// mMessageWidget, &KMessageWidget::animatedHide);
236 mHideMessageWidgetTimer->setInterval(10000); 243​ mHideMessageWidgetTimer->setInterval(10000);
237 // done with the init 244​ // done with the init
238} 245​}
239 246​
240int KSMainWindow::windowWidth(const QPixmap &pixmap) const 247​int KSMainWindow::windowWidth(const QPixmap &pixmap) const
241{ 248​{
242 // Calculates what the width of the window should be for the captured image to perfectly fit 249​ // Calculates what the width of the window should be for the captured image to perfectly fit
243 // the area reserved for the image, with the height already set. 250​ // the area reserved for the image, with the height already set.
244 251​
245 const float pixmapAspectRatio = (float)pixmap.width() / pixmap.height(); 252​ const float pixmapAspectRatio = (float)pixmap.width() / pixmap.height();
246 const int imageHeight = mKSWidget->height() - 2 * layout()->spacing(); 253​ const int imageHeight = mKSWidget->height() - 2 * layout()->spacing();
247 const int imageWidth = pixmapAspectRatio * imageHeight; 254​ const int imageWidth = pixmapAspectRatio * imageHeight;
248 255​
249 int alignedWindowWidth = qMin(mKSWidget->imagePaddingWidth() + imageWidth, MAXIMUM_WINDOW_WIDTH); 256​ int alignedWindowWidth = qMin(mKSWidget->imagePaddingWidth() + imageWidth, MAXIMUM_WINDOW_WIDTH);
250 alignedWindowWidth += layout()->contentsMargins().left() + layout()->contentsMargins().right(); 257​ alignedWindowWidth += layout()->contentsMargins().left() + layout()->contentsMargins().right();
251 alignedWindowWidth += 2; // margins is removing 1 - 1 pixel for some reason 258​ alignedWindowWidth += 2; // margins is removing 1 - 1 pixel for some reason
252 ​
253 return alignedWindowWidth; 259​ return alignedWindowWidth;
254} 260​}
255 261​
256void KSMainWindow::setDefaultSaveAction() 262​void KSMainWindow::setDefaultSaveAction()
257{ 263​{
258 switch (SpectacleConfig::instance()->lastUsedSaveMode()) { 264​ switch (Settings::lastUsedSaveMode()) {
ervinUnsubmitted
Done

Smells like you could have used an enum for that one.

ervin: Smells like you could have used an enum for that one.
259 case SaveMode::SaveAs: 265​ case Settings::SaveAs:
260 default: ​
261 mSaveButton->setDefaultAction(mSaveAsAction); 266​ mSaveButton->setDefaultAction(mSaveAsAction);
262 mSaveButton->setText(i18n("Save As...")); 267​ mSaveButton->setText(i18n("Save As..."));
263 break; 268​ break;
264 case SaveMode::Save: 269​ case Settings::Save:
265 mSaveButton->setDefaultAction(mSaveAction); 270​ mSaveButton->setDefaultAction(mSaveAction);
266 break; 271​ break;
267 } 272​ }
268} 273​}
269 274​
270// overrides 275​// overrides
271 276​
272void KSMainWindow::moveEvent(QMoveEvent *event) 277​void KSMainWindow::moveEvent(QMoveEvent *event)
▲ Show 20 Lines • Show All 89 Lines • ▼ Show 20 Line(s)366 if (printDialog.exec() == QDialog::Accepted) {
362 ExportManager::instance()->doPrint(printer); 367​ ExportManager::instance()->doPrint(printer);
363 return; 368​ return;
364 } 369​ }
365 delete printer; 370​ delete printer;
366} 371​}
367 372​
368void KSMainWindow::openScreenshotsFolder() 373​void KSMainWindow::openScreenshotsFolder()
369{ 374​{
370 // Highlight last screenshot in file manager if user saved at least once ever 375​ new KRun(Settings::defaultSaveLocation(), this);
371 // (since last save and saveas file names are stored in spectaclerc), otherwise, ​
372 // if in save mode, open default save location from configure > save > location ​
373 // if in save as mode, open last save as files location ​
374 // failsafe for either option is default save location from configure > save > location ​
375 SpectacleConfig *cfgManager = SpectacleConfig::instance(); ​
376 ExportManager *exportManager = ExportManager::instance(); ​
377 QUrl location; ​
378 ​
379 switch(cfgManager->lastUsedSaveMode()) { ​
380 case SaveMode::Save: ​
381 location = cfgManager->lastSaveFile(); ​
382 if (!exportManager->isFileExists(location)) { ​
383 location = cfgManager->defaultSaveLocation(); ​
384 } ​
385 break; ​
386 case SaveMode::SaveAs: ​
387 location = cfgManager->lastSaveAsFile(); // already has a "/" at the end ​
388 if (!exportManager->isFileExists(location)) { ​
389 location = cfgManager->lastSaveAsLocation(); ​
390 } ​
391 break; ​
392 } ​
393 ​
394 KIO::highlightInFileManager({location}); ​
395} 376​}
396 377​
397void KSMainWindow::quit(const QuitBehavior quitBehavior) 378​void KSMainWindow::quit(const QuitBehavior quitBehavior)
398{ 379​{
399 qApp->setQuitOnLastWindowClosed(false); 380​ qApp->setQuitOnLastWindowClosed(false);
400 hide(); 381​ hide();
401 382​
402 if (quitBehavior == QuitBehavior::QuitImmediately) { 383​ if (quitBehavior == QuitBehavior::QuitImmediately) {
▲ Show 20 Lines • Show All 56 Lines • ▼ Show 20 Line(s)439 showInlineMessage(i18n("The shared image link (<a href=\"%1\">%1</a>) has been copied to the clipboard.", message),
459 KMessageWidget::Positive, MessageDuration::Persistent); 440​ KMessageWidget::Positive, MessageDuration::Persistent);
460 QApplication::clipboard()->setText(message); 441​ QApplication::clipboard()->setText(message);
461 } 442​ }
462 } 443​ }
463} 444​}
464 445​
465void KSMainWindow::copy() 446​void KSMainWindow::copy()
466{ 447​{
467 const bool quitChecked = SpectacleConfig::instance()->quitAfterSaveOrCopyChecked(); 448​ const bool quitChecked = Settings::quitAfterSaveCopyExport();
468 ExportManager::instance()->doCopyToClipboard(); 449​ ExportManager::instance()->doCopyToClipboard();
469 if (quitChecked) { 450​ if (quitChecked) {
470 quit(QuitBehavior::QuitExternally); 451​ quit(QuitBehavior::QuitExternally);
471 } 452​ }
472} 453​}
473 454​
474void KSMainWindow::imageCopied() 455​void KSMainWindow::imageCopied()
475{ 456​{
476 showInlineMessage(i18n("The screenshot has been copied to the clipboard."), 457​ showInlineMessage(i18n("The screenshot has been copied to the clipboard."),
477 KMessageWidget::Information); 458​ KMessageWidget::Information);
478} 459​}
479 460​
480void KSMainWindow::showPreferencesDialog() 461​void KSMainWindow::showPreferencesDialog()
481{ 462​{
482 SettingsDialog prefDialog(this); 463​ if (KConfigDialog::showDialog(QStringLiteral("settings"))) {
483 prefDialog.exec(); 464​ return;
465​ }
466​ (new SettingsDialog(this))->show();
crossiUnsubmitted
Done

Style related, consider putting return statement in a new line.
Also, KDE code style requires to use curly braces even when the body of a conditional statement contains only one line.

crossi: Style related, consider putting return statement in a new line. Also, KDE code style requires…
484} 467​}
485 468​
486void KSMainWindow::imageSaved(const QUrl &location) 469​void KSMainWindow::imageSaved(const QUrl &location)
487{ 470​{
488 setWindowTitle(location.fileName()); 471​ setWindowTitle(location.fileName());
489 setWindowModified(false); 472​ setWindowModified(false);
490 showInlineMessage(i18n("The screenshot was saved as <a href=\"%1\">%2</a>", 473​ showInlineMessage(i18n("The screenshot was saved as <a href=\"%1\">%2</a>",
491 location.toString(), location.fileName()), KMessageWidget::Positive, 474​ location.toString(), location.fileName()), KMessageWidget::Positive,
492 MessageDuration::AutoHide, {mOpenContaining}); 475​ MessageDuration::AutoHide, {mOpenContaining});
493} 476​}
494 477​
495void KSMainWindow::imageSavedAndCopied(const QUrl &location) 478​void KSMainWindow::imageSavedAndCopied(const QUrl &location)
496{ 479​{
497 setWindowTitle(location.fileName()); 480​ setWindowTitle(location.fileName());
498 setWindowModified(false); 481​ setWindowModified(false);
499 showInlineMessage(i18n("The screenshot was copied to the clipboard and saved as <a href=\"%1\">%2</a>", 482​ showInlineMessage(i18n("The screenshot was copied to the clipboard and saved as <a href=\"%1\">%2</a>",
500 location.toString(), location.fileName()), KMessageWidget::Positive, 483​ location.toString(), location.fileName()), KMessageWidget::Positive,
501 MessageDuration::AutoHide, {mOpenContaining}); 484​ MessageDuration::AutoHide, {mOpenContaining});
502} 485​}
503 486​
504void KSMainWindow::save() 487​void KSMainWindow::save()
505{ 488​{
506 SpectacleConfig::instance()->setLastUsedSaveMode(SaveMode::Save); 489​ Settings::setLastUsedSaveMode(Settings::Save);
507 setDefaultSaveAction(); 490​ setDefaultSaveAction();
508 491​
509 const bool quitChecked = SpectacleConfig::instance()->quitAfterSaveOrCopyChecked(); 492​ const bool quitChecked = Settings::quitAfterSaveCopyExport();
510 ExportManager::instance()->doSave(QUrl(), /* notify */ quitChecked); 493​ ExportManager::instance()->doSave(QUrl(), /* notify */ quitChecked);
511 if (quitChecked) { 494​ if (quitChecked) {
512 quit(QuitBehavior::QuitExternally); 495​ quit(QuitBehavior::QuitExternally);
513 } 496​ }
514} 497​}
515 498​
516void KSMainWindow::saveAs() 499​void KSMainWindow::saveAs()
517{ 500​{
518 SpectacleConfig::instance()->setLastUsedSaveMode(SaveMode::SaveAs); 501​ Settings::setLastUsedSaveMode(Settings::SaveAs);
519 setDefaultSaveAction(); 502​ setDefaultSaveAction();
520 503​
521 const bool quitChecked = SpectacleConfig::instance()->quitAfterSaveOrCopyChecked(); 504​ const bool quitChecked = Settings::quitAfterSaveCopyExport();
522 if (ExportManager::instance()->doSaveAs(this, /* notify */ quitChecked) && quitChecked) { 505​ if (ExportManager::instance()->doSaveAs(this, /* notify */ quitChecked) && quitChecked) {
523 quit(QuitBehavior::QuitExternally); 506​ quit(QuitBehavior::QuitExternally);
524 } 507​ }
525} 508​}
526 509​
527void KSMainWindow::restoreWindowTitle() 510​void KSMainWindow::restoreWindowTitle()
528{ 511​{
529 if (isWindowModified()) { 512​ if (isWindowModified()) {
530 setWindowTitle(i18nc("@title:window Unsaved Screenshot", "Unsaved[*]")); 513​ setWindowTitle(i18nc("@title:window Unsaved Screenshot", "Unsaved[*]"));
531 } else { 514​ } else {
532 setWindowTitle(SpectacleConfig::instance()->lastSaveFile().fileName()); 515​ setWindowTitle(Settings::lastSaveLocation().fileName());
533 } 516​ }
534} 517​}
535 518​
536/* This event handler enables all Buttons to be activated with Enter. Normally only QPushButton can 519​/* This event handler enables all Buttons to be activated with Enter. Normally only QPushButton can
537 * be activated with Enter but we also use QToolButtons so we handle the event ourselves */ 520​ * be activated with Enter but we also use QToolButtons so we handle the event ourselves */
538void KSMainWindow::keyPressEvent(QKeyEvent* event) 521​void KSMainWindow::keyPressEvent(QKeyEvent* event)
539{ 522​{
540 if (event->key() == Qt::Key_Return) { 523​ if (event->key() == Qt::Key_Return) {
Show All 14 Lines