[graphics/krita/krita/6.0] plugins/dockers/recorder: [android] Reinstate recorder export button.
Carsten Hartenfels <[email protected]>
| Newsgroups | gmane.comp.kde.cvs |
|---|---|
| Message-ID | <[email protected]> |
Git commit ec27d80c128102f429534b4b0aa82838389e323d by Carsten Hartenfels.
Committed on 27/07/2026 at 17:19.
Pushed by hartenfels into branch 'krita/6.0'.
[android] Reinstate recorder export button.
This reverts commit a6cd9cf33bc2105cba9fabd63d4164f99c5aa8a3, because
we're gonna implement exporting without ffmpeg in the subsequent
commits.
M +4 -11 plugins/dockers/recorder/recorderdocker_dock.cpp
M +0 -5 plugins/dockers/recorder/recorderdocker_dock.h
https://invent.kde.org/graphics/krita/-/commit/ec27d80c128102f429534b4b0aa82838389e323d
diff --git a/plugins/dockers/recorder/recorderdocker_dock.cpp b/plugins/dockers/recorder/recorderdocker_dock.cpp
index b70a05bdf96..87eb1fa50bd 100644
--- a/plugins/dockers/recorder/recorderdocker_dock.cpp
+++ b/plugins/dockers/recorder/recorderdocker_dock.cpp
@@ -426,16 +426,9 @@ RecorderDockerDock::RecorderDockerDock()
connect(d->recordToggleAction, SIGNAL(toggled(bool)), d->ui->buttonRecordToggle, SLOT(setChecked(bool)));
connect(d->exportAction, SIGNAL(triggered()), d->ui->buttonExport, SIGNAL(clicked()));
-
- if constexpr (PLATFORM_SUPPORTS_FFMPEG) {
- connect(d->ui->buttonRecordToggle, SIGNAL(toggled(bool)), d->ui->buttonExport, SLOT(setDisabled(bool)));
- if (d->recordAutomatically) {
- d->ui->buttonExport->setDisabled(true);
- }
- } else {
- d->ui->buttonExport->setEnabled(false);
- d->ui->buttonExport->setVisible(false);
- }
+ connect(d->ui->buttonRecordToggle, SIGNAL(toggled(bool)), d->ui->buttonExport, SLOT(setDisabled(bool)));
+ if (d->recordAutomatically)
+ d->ui->buttonExport->setDisabled(true);
// Need to register toolbar actions before attaching canvas else it wont appear after restart.
// Is there any better way to do this?
@@ -604,7 +597,7 @@ bool RecorderDockerDock::onRecordButtonToggled(bool checked)
void RecorderDockerDock::onExportButtonClicked()
{
- if (!PLATFORM_SUPPORTS_FFMPEG || !d->canvas)
+ if (!d->canvas)
return;
KisDocument *document = d->canvas->imageView()->document();
diff --git a/plugins/dockers/recorder/recorderdocker_dock.h b/plugins/dockers/recorder/recorderdocker_dock.h
index aa61ac4fb1a..0cf07b1cf28 100644
--- a/plugins/dockers/recorder/recorderdocker_dock.h
+++ b/plugins/dockers/recorder/recorderdocker_dock.h
@@ -69,11 +69,6 @@ private Q_SLOTS:
private:
Q_DISABLE_COPY(RecorderDockerDock)
-#ifdef Q_OS_ANDROID
- static constexpr bool PLATFORM_SUPPORTS_FFMPEG = false;
-#else
- static constexpr bool PLATFORM_SUPPORTS_FFMPEG = true;
-#endif
class Private;
RecorderExportSettings *const exportSettings;
Private *const d;