Differential D22234 Diff 61076 src/Gui/KSMainWindow.cpp

Changeset View

Standalone View

src/Gui/KSMainWindow.cpp

Show First 20 Lines • Show All 298 Lines • ▼ Show 20 Line(s)		277	{
299	});	299		});
300	connect(timer, &QTimer::timeout, this, [=] {	300		connect(timer, &QTimer::timeout, this, [=] {
301	this->hide();	301		this->hide();
302	timer->deleteLater();	302		timer->deleteLater();
303	unityUpdate({ {QStringLiteral("progress-visible"), false} });	303		unityUpdate({ {QStringLiteral("progress-visible"), false} });
304	emit newScreenshotRequest(theCaptureMode, 0, theIncludePointer, theIncludeDecorations);	304		emit newScreenshotRequest(theCaptureMode, 0, theIncludePointer, theIncludeDecorations);
305	});	305		});
306		306
		307		connect(mKSWidget, &KSWidget::screenshotCanceled, timer, [=] {
		308		timer->stop();
		309		timer->deleteLater();
		310		restoreWindowTitle();
		311		unityUpdate({ {QStringLiteral("progress-visible"), false} });
		312		});
		313
		314
307	unityUpdate({ {QStringLiteral("progress-visible"), true},	315		unityUpdate({ {QStringLiteral("progress-visible"), true},
308	{QStringLiteral("progress"), 0 } });	316		{QStringLiteral("progress"), 0 } });
309	timer->start();	317		timer->start();
310	delayAnimation->start();	318		delayAnimation->start();
311	}	319		}
312		320
313	void KSMainWindow::setScreenshotAndShow(const QPixmap &pixmap)	321		void KSMainWindow::setScreenshotAndShow(const QPixmap &pixmap)
314	{	322		{
		323		if (!pixmap.isNull()) {
315	mKSWidget->setScreenshotPixmap(pixmap);	324		mKSWidget->setScreenshotPixmap(pixmap);
316	mExportMenu->imageUpdated();	325		mExportMenu->imageUpdated();
317
318	setWindowTitle(i18nc("@title:window Unsaved Screenshot", "Unsaved[*]"));	326		setWindowTitle(i18nc("@title:window Unsaved Screenshot", "Unsaved[*]"));
			broulikUnsubmitted Not Done Can't you just call `restoreWindowTitle()` in any case? broulik: Can't you just call `restoreWindowTitle()` in any case?
			davidreAuthorUnsubmitted Not Done No because if you saved a screenshot and then take a new one we want to the title to be "Unsaved" and not the filename of the previous saved file. davidre: No because if you saved a screenshot and then take a new one we want to the title to be…
319	setWindowModified(true);	327		setWindowModified(true);
320		328		} else {
		329		restoreWindowTitle();
		330		}
		331		mKSWidget->setButtonState(KSWidget::State::TakeNewScreenshot);
321	show();	332		show();
322	activateWindow();	333		activateWindow();
323		334		/* NOTE windowWidth only produces the right result if it is called after the window is visible.
		335		* Because of this the call is not moved into the if above */
		336		if(!pixmap.isNull()) {
324	resize(QSize(windowWidth(pixmap), DEFAULT_WINDOW_HEIGHT));	337		resize(QSize(windowWidth(pixmap), DEFAULT_WINDOW_HEIGHT));
325	}	338		}
			broulikUnsubmitted Not Done What is this supposed to do? Do you mean `pixmap.isNull()` or `pixmap.size().isEmpty()`? Looks unrelated to the patch, though. broulik: What is this supposed to do? Do you mean `pixmap.isNull()` or `pixmap.size().isEmpty()`? Looks…
			davidreAuthorUnsubmitted Not Done In this patch I also changed that we go through this function if the region selection is canceled (to reset title and and button). I tried to move the `resize` call into the above if but it produced different results and the size was off. This is just another condition that is false when the above happened. I agree it would be better to change it to the same condition as above. davidre: In this patch I also changed that we go through this function if the region selection is…
		339		}
326		340
327	void KSMainWindow::showPrintDialog()	341		void KSMainWindow::showPrintDialog()
328	{	342		{
329	QPrinter *printer = new QPrinter(QPrinter::HighResolution);	343		QPrinter *printer = new QPrinter(QPrinter::HighResolution);
330	QPrintDialog printDialog(printer, this);	344		QPrintDialog printDialog(printer, this);
331	if (printDialog.exec() == QDialog::Accepted) {	345		if (printDialog.exec() == QDialog::Accepted) {
332	ExportManager::instance()->doPrint(printer);	346		ExportManager::instance()->doPrint(printer);
333	return;	347		return;
▲ Show 20 Lines • Show All 147 Lines • ▼ Show 20 Line(s)		494	{
481	SpectacleConfig::instance()->setLastUsedSaveMode(SaveMode::SaveAs);	495		SpectacleConfig::instance()->setLastUsedSaveMode(SaveMode::SaveAs);
482	setDefaultSaveAction();	496		setDefaultSaveAction();
483		497
484	const bool quitChecked = SpectacleConfig::instance()->quitAfterSaveOrCopyChecked();	498		const bool quitChecked = SpectacleConfig::instance()->quitAfterSaveOrCopyChecked();
485	if (ExportManager::instance()->doSaveAs(this, /* notify */ quitChecked) && quitChecked) {	499		if (ExportManager::instance()->doSaveAs(this, /* notify */ quitChecked) && quitChecked) {
486	quit(QuitBehavior::QuitExternally);	500		quit(QuitBehavior::QuitExternally);
487	}	501		}
488	}	502		}
		503
		504		void KSMainWindow::restoreWindowTitle()
		505		{
		506		if (isWindowModified()) {
			broulikUnsubmitted Not Done Can you perhaps move the `setWindowModified()` handling into this method, too? broulik: Can you perhaps move the `setWindowModified()` handling into this method, too?
			davidreAuthorUnsubmitted Not Done Do you think of making this a general method to handle windowModified and title setting? Because otherwise I see no need because windowModified doesn't change when we restore the title. davidre: Do you think of making this a general method to handle windowModified and title setting?
		507		setWindowTitle(i18nc("@title:window Unsaved Screenshot", "Unsaved[*]"));
		508		} else {
		509		setWindowTitle(SpectacleConfig::instance()->lastSaveFile().fileName());
		510		}
		511		}