@@ -225,8 +226,16 @@
mWindowDecorations->setEnabled(true);
mCaptureTransientOnly->setEnabled(false);
break;
- default:
+ case ImageGrabber::FullScreen:
+ case ImageGrabber::CurrentScreen:
+ case ImageGrabber::RectangularRegion:
mWindowDecorations->setEnabled(false);
mCaptureTransientOnly->setEnabled(false);
+ break;
+ case ImageGrabber::TransientWithParent:
+ case ImageGrabber::InvalidChoice:
+ default:
+ qWarning() << "Skipping invalid or unreachable enum value";
+ break;
}
}
diff --git a/src/Gui/SettingsDialog/SaveOptionsPage.cpp b/src/Gui/SettingsDialog/SaveOptionsPage.cpp
--- a/src/Gui/SettingsDialog/SaveOptionsPage.cpp
+++ b/src/Gui/SettingsDialog/SaveOptionsPage.cpp
@@ -90,7 +90,7 @@
// now the save filename format layout
- const QString helpText = i18n(
+ const QString helpText = i18nc("%1 is the default filename of a screenshot",
"You can use the following placeholders in the filename, which will be replaced "
"with actual text when the file is saved:
"
@@ -108,8 +108,9 @@
"To save to a sub-folder, use slashes to describe the desired path, e.g.:
"
""
- "%Y/%M/Screenshot_%Y%M%D_%H%m%S"
- "
"
+ "%Y/%M/%1"
+ "",
+ SpectacleConfig::instance()->defaultFilename() + SpectacleConfig::instance()->defaultTimestampTemplate()
);
QLabel *fmtHelpText = new QLabel(helpText, this);
diff --git a/src/KipiInterface/KSGKipiImageCollectionSelector.h b/src/KipiInterface/KSGKipiImageCollectionSelector.h
--- a/src/KipiInterface/KSGKipiImageCollectionSelector.h
+++ b/src/KipiInterface/KSGKipiImageCollectionSelector.h
@@ -41,7 +41,7 @@
explicit KSGKipiImageCollectionSelector(KIPI::Interface *interface, QWidget *parent);
~KSGKipiImageCollectionSelector() Q_DECL_OVERRIDE;
- QList selectedImageCollections() const;
+ QList selectedImageCollections() const Q_DECL_OVERRIDE;
private:
diff --git a/src/Main.cpp b/src/Main.cpp
--- a/src/Main.cpp
+++ b/src/Main.cpp
@@ -131,6 +131,7 @@
app.setQuitOnLastWindowClosed(false);
break;
case SpectacleCore::GuiMode:
+ default:
break;
}
diff --git a/src/PlatformBackends/X11ImageGrabber.cpp b/src/PlatformBackends/X11ImageGrabber.cpp
--- a/src/PlatformBackends/X11ImageGrabber.cpp
+++ b/src/PlatformBackends/X11ImageGrabber.cpp
@@ -39,7 +39,6 @@
#include
#include
-#include
#include
#include
diff --git a/src/QuickEditor/EditorRoot.qml b/src/QuickEditor/EditorRoot.qml
--- a/src/QuickEditor/EditorRoot.qml
+++ b/src/QuickEditor/EditorRoot.qml
@@ -443,8 +443,7 @@
TextLabel {
id: midHelpTextElement;
- text: i18n("Click anywhere to start drawing a selection rectangle,\n" +
- "or press Esc to cancel.");
+ text: i18n("Click anywhere to start drawing a selection rectangle,\nor press Esc to cancel.");
font.pixelSize: Qt.application.font.pixelSize * 1.2;
anchors.centerIn: parent;
@@ -480,15 +479,13 @@
text: i18n("Shift:");
Layout.alignment: Qt.AlignRight | Qt.AlignTop;
}
- TextLabel { text: i18n("Hold to toggle magnifier \n" +
- "while dragging selection handles"); }
+ TextLabel { text: i18n("Hold to toggle magnifier\nwhile dragging selection handles"); }
TextLabel {
text: i18n("Arrow keys:");
Layout.alignment: Qt.AlignRight | Qt.AlignTop;
}
- TextLabel { text: i18n("Move selection rectangle \n" +
- "Hold Alt to resize, Shift to fine-tune"); }
+ TextLabel { text: i18n("Move selection rectangle.\nHold Alt to resize, Shift to fine-tune"); }
TextLabel {
text: i18n("Right-click:");
diff --git a/src/QuickEditor/QuickEditor.h b/src/QuickEditor/QuickEditor.h
--- a/src/QuickEditor/QuickEditor.h
+++ b/src/QuickEditor/QuickEditor.h
@@ -45,8 +45,8 @@
struct ImageStore;
ImageStore *mImageStore;
- struct QuickEditorPrivate;
- Q_DECLARE_PRIVATE(QuickEditor);
+ class QuickEditorPrivate;
+ Q_DECLARE_PRIVATE(QuickEditor)
QuickEditorPrivate *d_ptr;
};
diff --git a/src/QuickEditor/QuickEditor.cpp b/src/QuickEditor/QuickEditor.cpp
--- a/src/QuickEditor/QuickEditor.cpp
+++ b/src/QuickEditor/QuickEditor.cpp
@@ -56,8 +56,9 @@
QPixmap mPixmap;
};
-struct QuickEditor::QuickEditorPrivate
+class QuickEditor::QuickEditorPrivate
{
+public:
KDeclarative::KDeclarative *mDecl;
QQuickView *mQuickView;
QQmlEngine *mQmlEngine;
diff --git a/src/SpectacleConfig.h b/src/SpectacleConfig.h
--- a/src/SpectacleConfig.h
+++ b/src/SpectacleConfig.h
@@ -42,6 +42,9 @@
static SpectacleConfig* instance();
+ QString defaultFilename() const;
+ QString defaultTimestampTemplate() const;
+
private:
explicit SpectacleConfig(QObject *parent = nullptr);
diff --git a/src/SpectacleConfig.cpp b/src/SpectacleConfig.cpp
--- a/src/SpectacleConfig.cpp
+++ b/src/SpectacleConfig.cpp
@@ -36,6 +36,17 @@
return &instance;
}
+QString SpectacleConfig::defaultFilename() const
+{
+ return QStringLiteral("Screenshot");
+}
+
+QString SpectacleConfig::defaultTimestampTemplate() const
+{
+ // includes separator at the front
+ return QStringLiteral("_%Y%M%D_%H%m%S");
+}
+
// lastSaveAsLocation
QUrl SpectacleConfig::lastSaveAsLocation() const
@@ -217,7 +228,7 @@
QString SpectacleConfig::autoSaveFilenameFormat() const
{
return mGeneralConfig.readEntry(QStringLiteral("save-filename-format"),
- QStringLiteral("Screenshot_%Y%M%D_%H%m%S"));
+ QString(defaultFilename() + defaultTimestampTemplate()));
}
void SpectacleConfig::setAutoSaveFilenameFormat(const QString &format)
diff --git a/src/SpectacleCore.cpp b/src/SpectacleCore.cpp
--- a/src/SpectacleCore.cpp
+++ b/src/SpectacleCore.cpp
@@ -93,6 +93,7 @@
switch (startMode) {
case DBusMode:
+ default:
break;
case BackgroundMode: {
int msec = (KWindowSystem::compositingActive() ? 200 : 50) + delayMsec;
@@ -186,6 +187,7 @@
switch (mStartMode) {
case BackgroundMode:
case DBusMode:
+ default:
{
if (mNotify) {
connect(mExportManager, &ExportManager::imageSaved, this, &SpectacleCore::doNotify);
@@ -215,6 +217,7 @@
emit allDone();
return;
case DBusMode:
+ default:
emit grabFailed();
emit allDone();
return;
@@ -244,6 +247,7 @@
case ImageGrabber::GrabMode::RectangularRegion:
notify->setTitle(i18nc("A rectangular region was captured, heading", "Rectangular Region Captured"));
break;
+ case ImageGrabber::GrabMode::InvalidChoice:
default:
break;
}