summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Baptiste Mardelle <jb@kdenlive.org>2016-09-27 21:45:53 (GMT)
committerJean-Baptiste Mardelle <jb@kdenlive.org>2016-09-27 21:45:53 (GMT)
commit58270892e65c6044eadd2c20fe0cde9a190002f7 (patch)
treed5c1c85c941360d94b79e7e982093c945fe7a42a
parent380e508f3e5712b75aebc22ae8dceb92efcf3a9f (diff)
Rename "Unset/Clear preview zone to Remove..."
REVIEW: 129056 BUG: 367448
-rw-r--r--data/pics/CMakeLists.txt2
-rw-r--r--data/pics/breeze-dark/dk_preview-remove-all.svg4
-rw-r--r--data/pics/breeze-light/lt_preview-remove-all.svg9
-rw-r--r--src/icons.qrc1
-rw-r--r--src/mainwindow.cpp4
5 files changed, 18 insertions, 2 deletions
diff --git a/data/pics/CMakeLists.txt b/data/pics/CMakeLists.txt
index 8f108ff..a6ffe59 100644
--- a/data/pics/CMakeLists.txt
+++ b/data/pics/CMakeLists.txt
@@ -145,6 +145,7 @@ breeze-light/lt_timeline-lift.svg
breeze-light/lt_timeline-insert.svg
breeze-light/lt_preview-add-zone.svg
breeze-light/lt_preview-remove-zone.svg
+breeze-light/lt_preview-remove-all.svg
breeze-light/lt_preview-render-on.svg
breeze-light/lt_preview-render-off.svg
breeze-light/lt_timeline-overwrite.svg
@@ -320,6 +321,7 @@ breeze-dark/dk_timeline-insert.svg
breeze-dark/dk_timeline-overwrite.svg
breeze-dark/dk_preview-add-zone.svg
breeze-dark/dk_preview-remove-zone.svg
+breeze-dark/dk_preview-remove-all.svg
breeze-dark/dk_preview-render-on.svg
breeze-dark/dk_preview-render-off.svg
breeze-dark/dk_tools-wizard.svgz
diff --git a/data/pics/breeze-dark/dk_preview-remove-all.svg b/data/pics/breeze-dark/dk_preview-remove-all.svg
new file mode 100644
index 0000000..9c90071
--- /dev/null
+++ b/data/pics/breeze-dark/dk_preview-remove-all.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="22" height="22">
+ <path style="isolation:auto;mix-blend-mode:normal" d="M6.023 4.994v4h-1v-2h-1v2h-1v1h16v-1H19V7h-1v1.994h-.977v-4h-1v4h-1v-2h-1v2h-1v-2h-1v2h-1v-2h-1v2h-1v-2h-1v2h-1v-4h-1z" color="#000" overflow="visible" fill="#f2f2f2"/>
+ <path d="M9.207 11.5l-.707.707L10.293 14 8.5 15.793l.707.707L11 14.707l1.793 1.793.707-.707L11.707 14l1.793-1.793-.707-.707L11 13.293 9.207 11.5z" fill="#da4453"/>
+</svg>
diff --git a/data/pics/breeze-light/lt_preview-remove-all.svg b/data/pics/breeze-light/lt_preview-remove-all.svg
new file mode 100644
index 0000000..56842c1
--- /dev/null
+++ b/data/pics/breeze-light/lt_preview-remove-all.svg
@@ -0,0 +1,9 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="22" height="22" id="svg2">
+ <defs id="defs3051">
+ <style type="text/css" id="current-color-scheme">
+ .ColorScheme-Text{color:#4d4d4d}
+ </style>
+ </defs>
+ <path style="color:currentColor;fill:currentColor;" class="ColorScheme-Text" d="m 6.0234375,4.9941406 0,4 -1,0 0,-2 -1,0 0,2 -1,0 0,1 16.0000005,0 0,-1 -0.02344,0 L 19,7 l -1,0 0,1.9941406 -0.976562,0 0,-4 -1,0 0,4 -1,0 0,-2 -1,0 0,2 -1,0 0,-2 -1,0 0,2 -1,0 0,-2 -1,0 0,2 -1.0000005,0 0,-2 -1,0 0,2 -1,0 0,-4 -1,0 z" id="path6"/>
+ <path style="fill:#da4453" d="M 9.207,11.5 8.5,12.207 10.293,14 8.5,15.793 9.207,16.5 11,14.707 12.793,16.5 13.5,15.793 11.707,14 13.5,12.207 12.793,11.5 11,13.293 9.207,11.5 Z" class="ColorScheme-Text" id="path8"/>
+</svg>
diff --git a/src/icons.qrc b/src/icons.qrc
index c35cd48..e0c69f6 100644
--- a/src/icons.qrc
+++ b/src/icons.qrc
@@ -22,6 +22,7 @@
<file alias="show-all-effects.svg">../data/pics/breeze-light/lt_show-all-effects.svg</file>
<file alias="show-gpu-effects.svg">../data/pics/breeze-light/lt_show-gpu-effects.svg</file>
<file alias="auto-transition.svg">../data/pics/breeze-light/lt_auto-transition.svg</file>
+ <file alias="preview-remove-all.svg">../data/pics/breeze-light/lt_preview-remove-all.svg</file>
<file alias="linear.svg">../data/pics/breeze-light/lt_linear.svg</file>
<file alias="discrete.svg">../data/pics/breeze-light/lt_discrete.svg</file>
<file alias="smooth.svg">../data/pics/breeze-light/lt_smooth.svg</file>
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 9dd7d3c..9d07ebc 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -1319,8 +1319,8 @@ void MainWindow::setupActions()
addAction(QStringLiteral("remove_extract"), i18n("Extract Timeline Zone"), this, SLOT(slotExtractZone()), KoIconUtils::themedIcon(QStringLiteral("timeline-extract")), Qt::SHIFT + Qt::Key_X);
addAction(QStringLiteral("remove_lift"), i18n("Lift Timeline Zone"), this, SLOT(slotLiftZone()), KoIconUtils::themedIcon(QStringLiteral("timeline-lift")), Qt::Key_Z);
addAction(QStringLiteral("set_render_timeline_zone"), i18n("Add Preview Zone"), this, SLOT(slotDefinePreviewRender()), KoIconUtils::themedIcon(QStringLiteral("preview-add-zone")));
- addAction(QStringLiteral("unset_render_timeline_zone"), i18n("Unset Preview Zone"), this, SLOT(slotRemovePreviewRender()), KoIconUtils::themedIcon(QStringLiteral("preview-remove-zone")));
- addAction(QStringLiteral("clear_render_timeline_zone"), i18n("Clear Preview Zones"), this, SLOT(slotClearPreviewRender()), KoIconUtils::themedIcon(QStringLiteral("preview-remove-zone")));
+ addAction(QStringLiteral("unset_render_timeline_zone"), i18n("Remove Preview Zone"), this, SLOT(slotRemovePreviewRender()), KoIconUtils::themedIcon(QStringLiteral("preview-remove-zone")));
+ addAction(QStringLiteral("clear_render_timeline_zone"), i18n("Remove All Preview Zones"), this, SLOT(slotClearPreviewRender()), KoIconUtils::themedIcon(QStringLiteral("preview-remove-all")));
addAction(QStringLiteral("prerender_timeline_zone"), i18n("Start Preview Render"), this, SLOT(slotPreviewRender()), KoIconUtils::themedIcon(QStringLiteral("preview-render-on")), QKeySequence(Qt::SHIFT + Qt::Key_Return));
addAction(QStringLiteral("stop_prerender_timeline"), i18n("Stop Preview Render"), this, SLOT(slotStopPreviewRender()), KoIconUtils::themedIcon(QStringLiteral("preview-render-off")));