diff --git a/app/ui/icons/icons.cpp b/app/ui/icons/icons.cpp
index 635aaf807..917dd7315 100644
--- a/app/ui/icons/icons.cpp
+++ b/app/ui/icons/icons.cpp
@@ -77,6 +77,10 @@ QIcon icon::Diamond;
QIcon icon::Plus;
QIcon icon::Minus;
QIcon icon::AddEffect;
+QIcon icon::EyeOpened;
+QIcon icon::EyeClosed;
+QIcon icon::LockOpened;
+QIcon icon::LockClosed;
void icon::LoadAll(const QString& theme)
{
@@ -131,6 +135,11 @@ void icon::LoadAll(const QString& theme)
Plus = Create(theme, "plus");
Minus = Create(theme, "minus");
AddEffect = Create(theme, "add-effect");
+
+ EyeOpened = Create(theme, "eye-opened");
+ EyeClosed = Create(theme, "eye-closed");
+ LockOpened = Create(theme, "lock-opened");
+ LockClosed = Create(theme, "lock-closed");
}
QIcon icon::Create(const QString& theme, const QString &name)
diff --git a/app/ui/icons/icons.h b/app/ui/icons/icons.h
index 2bca32bb5..b44be7357 100644
--- a/app/ui/icons/icons.h
+++ b/app/ui/icons/icons.h
@@ -87,6 +87,10 @@ extern QIcon Diamond;
extern QIcon Plus;
extern QIcon Minus;
extern QIcon AddEffect;
+extern QIcon EyeOpened;
+extern QIcon EyeClosed;
+extern QIcon LockOpened;
+extern QIcon LockClosed;
/**
* @brief Create an icon object loaded from file
diff --git a/app/ui/style/olive-dark/olive-dark.qrc b/app/ui/style/olive-dark/olive-dark.qrc
deleted file mode 100644
index 4d3efbfcb..000000000
--- a/app/ui/style/olive-dark/olive-dark.qrc
+++ /dev/null
@@ -1,290 +0,0 @@
-
-
- style.css
- palette.ini
- png/add-button.16.png
- png/add-button.32.png
- png/add-button.64.png
- png/add-button.128.png
- png/add-effect.16.png
- png/add-effect.32.png
- png/add-effect.64.png
- png/add-effect.128.png
- png/add-transition.16.png
- png/add-transition.32.png
- png/add-transition.64.png
- png/add-transition.128.png
- png/align-center.16.png
- png/align-center.32.png
- png/align-center.64.png
- png/align-center.128.png
- png/align-justify-all.16.png
- png/align-justify-all.32.png
- png/align-justify-all.64.png
- png/align-justify-all.128.png
- png/align-justify-center.16.png
- png/align-justify-center.32.png
- png/align-justify-center.64.png
- png/align-justify-center.128.png
- png/align-justify-left.16.png
- png/align-justify-left.32.png
- png/align-justify-left.64.png
- png/align-justify-left.128.png
- png/align-justify-right.16.png
- png/align-justify-right.32.png
- png/align-justify-right.64.png
- png/align-justify-right.128.png
- png/align-left.16.png
- png/align-left.32.png
- png/align-left.64.png
- png/align-left.128.png
- png/align-right.16.png
- png/align-right.32.png
- png/align-right.64.png
- png/align-right.128.png
- png/arrow.16.png
- png/arrow.32.png
- png/arrow.64.png
- png/arrow.128.png
- png/audiosource.16.png
- png/audiosource.32.png
- png/audiosource.64.png
- png/audiosource.128.png
- png/beam.16.png
- png/beam.32.png
- png/beam.64.png
- png/beam.128.png
- png/box.16.png
- png/box.32.png
- png/box.64.png
- png/box.128.png
- png/clock.16.png
- png/clock.32.png
- png/clock.64.png
- png/clock.128.png
- png/copy.16.png
- png/copy.32.png
- png/copy.64.png
- png/copy.128.png
- png/diamond.16.png
- png/diamond.32.png
- png/diamond.64.png
- png/diamond.128.png
- png/dirup.16.png
- png/dirup.32.png
- png/dirup.64.png
- png/dirup.128.png
- png/error.16.png
- png/error.32.png
- png/error.64.png
- png/error.128.png
- png/export.16.png
- png/export.32.png
- png/export.64.png
- png/export.128.png
- png/eye_closed.16.png
- png/eye_closed.32.png
- png/eye_closed.64.png
- png/eye_closed.128.png
- png/eye_opened.16.png
- png/eye_opened.32.png
- png/eye_opened.64.png
- png/eye_opened.128.png
- png/ff.16.png
- png/ff.32.png
- png/ff.64.png
- png/ff.128.png
- png/filter.16.png
- png/filter.32.png
- png/filter.64.png
- png/filter.128.png
- png/folder.16.png
- png/folder.32.png
- png/folder.64.png
- png/folder.128.png
- png/hand.16.png
- png/hand.32.png
- png/hand.64.png
- png/hand.128.png
- png/iconview.16.png
- png/iconview.32.png
- png/iconview.64.png
- png/iconview.128.png
- png/imagesource.16.png
- png/imagesource.32.png
- png/imagesource.64.png
- png/imagesource.128.png
- png/import.16.png
- png/import.32.png
- png/import.64.png
- png/import.128.png
- png/listview.16.png
- png/listview.32.png
- png/listview.64.png
- png/listview.128.png
- png/magnet.16.png
- png/magnet.32.png
- png/magnet.64.png
- png/magnet.128.png
- png/map.16.png
- png/map.32.png
- png/map.64.png
- png/map.128.png
- png/minus.16.png
- png/minus.32.png
- png/minus.64.png
- png/minus.128.png
- png/new.16.png
- png/new.32.png
- png/new.64.png
- png/new.128.png
- png/next.16.png
- png/next.32.png
- png/next.64.png
- png/next.128.png
- png/nodes_btt.16.png
- png/nodes_btt.32.png
- png/nodes_btt.64.png
- png/nodes_btt.128.png
- png/nodes_ltr.16.png
- png/nodes_ltr.32.png
- png/nodes_ltr.64.png
- png/nodes_ltr.128.png
- png/nodes_rtl.16.png
- png/nodes_rtl.32.png
- png/nodes_rtl.64.png
- png/nodes_rtl.128.png
- png/nodes_ttb.16.png
- png/nodes_ttb.32.png
- png/nodes_ttb.64.png
- png/nodes_ttb.128.png
- png/open.16.png
- png/open.32.png
- png/open.64.png
- png/open.128.png
- png/padlock_closed.16.png
- png/padlock_closed.32.png
- png/padlock_closed.64.png
- png/padlock_closed.128.png
- png/padlock_opened.16.png
- png/padlock_opened.32.png
- png/padlock_opened.64.png
- png/padlock_opened.128.png
- png/paste.16.png
- png/paste.32.png
- png/paste.64.png
- png/paste.128.png
- png/pause.16.png
- png/pause.32.png
- png/pause.64.png
- png/pause.128.png
- png/play.16.png
- png/play.32.png
- png/play.64.png
- png/play.128.png
- png/plus.16.png
- png/plus.32.png
- png/plus.64.png
- png/plus.128.png
- png/prev.16.png
- png/prev.32.png
- png/prev.64.png
- png/prev.128.png
- png/razor.16.png
- png/razor.32.png
- png/razor.64.png
- png/razor.128.png
- png/record.16.png
- png/record.32.png
- png/record.64.png
- png/record.128.png
- png/redo.16.png
- png/redo.32.png
- png/redo.64.png
- png/redo.128.png
- png/rew.16.png
- png/rew.32.png
- png/rew.64.png
- png/rew.128.png
- png/ripple.16.png
- png/ripple.32.png
- png/ripple.64.png
- png/ripple.128.png
- png/rolling.16.png
- png/rolling.32.png
- png/rolling.64.png
- png/rolling.128.png
- png/save.16.png
- png/save.32.png
- png/save.64.png
- png/save.128.png
- png/sequence.16.png
- png/sequence.32.png
- png/sequence.64.png
- png/sequence.128.png
- png/slide.16.png
- png/slide.32.png
- png/slide.64.png
- png/slide.128.png
- png/slip.16.png
- png/slip.32.png
- png/slip.64.png
- png/slip.128.png
- png/smooth_edges.16.png
- png/smooth_edges.32.png
- png/smooth_edges.64.png
- png/smooth_edges.128.png
- png/text-bold.16.png
- png/text-bold.32.png
- png/text-bold.64.png
- png/text-bold.128.png
- png/text-italic.16.png
- png/text-italic.32.png
- png/text-italic.64.png
- png/text-italic.128.png
- png/text-underline.16.png
- png/text-underline.32.png
- png/text-underline.64.png
- png/text-underline.128.png
- png/transition-tool.16.png
- png/transition-tool.32.png
- png/transition-tool.64.png
- png/transition-tool.128.png
- png/treeview.16.png
- png/treeview.32.png
- png/treeview.64.png
- png/treeview.128.png
- png/tri-down.16.png
- png/tri-down.32.png
- png/tri-down.64.png
- png/tri-down.128.png
- png/tri-left.16.png
- png/tri-left.32.png
- png/tri-left.64.png
- png/tri-left.128.png
- png/tri-right.16.png
- png/tri-right.32.png
- png/tri-right.64.png
- png/tri-right.128.png
- png/tri-up.16.png
- png/tri-up.32.png
- png/tri-up.64.png
- png/tri-up.128.png
- png/undo.16.png
- png/undo.32.png
- png/undo.64.png
- png/undo.128.png
- png/videosource.16.png
- png/videosource.32.png
- png/videosource.64.png
- png/videosource.128.png
- png/zoomin.16.png
- png/zoomin.32.png
- png/zoomin.64.png
- png/zoomin.128.png
- png/zoomout.16.png
- png/zoomout.32.png
- png/zoomout.64.png
- png/zoomout.128.png
-
-
diff --git a/app/ui/style/olive-dark/png/eye_closed.128.disabled.png b/app/ui/style/olive-dark/png/eye-closed.128.disabled.png
similarity index 87%
rename from app/ui/style/olive-dark/png/eye_closed.128.disabled.png
rename to app/ui/style/olive-dark/png/eye-closed.128.disabled.png
index 7fb3fcc85..64232e150 100644
Binary files a/app/ui/style/olive-dark/png/eye_closed.128.disabled.png and b/app/ui/style/olive-dark/png/eye-closed.128.disabled.png differ
diff --git a/app/ui/style/olive-dark/png/eye_closed.128.png b/app/ui/style/olive-dark/png/eye-closed.128.png
similarity index 100%
rename from app/ui/style/olive-dark/png/eye_closed.128.png
rename to app/ui/style/olive-dark/png/eye-closed.128.png
diff --git a/app/ui/style/olive-dark/png/eye-closed.16.disabled.png b/app/ui/style/olive-dark/png/eye-closed.16.disabled.png
new file mode 100644
index 000000000..9a7f7bce3
Binary files /dev/null and b/app/ui/style/olive-dark/png/eye-closed.16.disabled.png differ
diff --git a/app/ui/style/olive-dark/png/eye_closed.16.png b/app/ui/style/olive-dark/png/eye-closed.16.png
similarity index 100%
rename from app/ui/style/olive-dark/png/eye_closed.16.png
rename to app/ui/style/olive-dark/png/eye-closed.16.png
diff --git a/app/ui/style/olive-dark/png/eye-closed.32.disabled.png b/app/ui/style/olive-dark/png/eye-closed.32.disabled.png
new file mode 100644
index 000000000..41ab1b29f
Binary files /dev/null and b/app/ui/style/olive-dark/png/eye-closed.32.disabled.png differ
diff --git a/app/ui/style/olive-dark/png/eye_closed.32.png b/app/ui/style/olive-dark/png/eye-closed.32.png
similarity index 100%
rename from app/ui/style/olive-dark/png/eye_closed.32.png
rename to app/ui/style/olive-dark/png/eye-closed.32.png
diff --git a/app/ui/style/olive-dark/png/eye_closed.64.disabled.png b/app/ui/style/olive-dark/png/eye-closed.64.disabled.png
similarity index 79%
rename from app/ui/style/olive-dark/png/eye_closed.64.disabled.png
rename to app/ui/style/olive-dark/png/eye-closed.64.disabled.png
index dac37d284..6f7ea3d8a 100644
Binary files a/app/ui/style/olive-dark/png/eye_closed.64.disabled.png and b/app/ui/style/olive-dark/png/eye-closed.64.disabled.png differ
diff --git a/app/ui/style/olive-dark/png/eye_closed.64.png b/app/ui/style/olive-dark/png/eye-closed.64.png
similarity index 100%
rename from app/ui/style/olive-dark/png/eye_closed.64.png
rename to app/ui/style/olive-dark/png/eye-closed.64.png
diff --git a/app/ui/style/olive-dark/png/eye_opened.128.disabled.png b/app/ui/style/olive-dark/png/eye-opened.128.disabled.png
similarity index 91%
rename from app/ui/style/olive-dark/png/eye_opened.128.disabled.png
rename to app/ui/style/olive-dark/png/eye-opened.128.disabled.png
index ce2219ccd..7948b1ba8 100644
Binary files a/app/ui/style/olive-dark/png/eye_opened.128.disabled.png and b/app/ui/style/olive-dark/png/eye-opened.128.disabled.png differ
diff --git a/app/ui/style/olive-dark/png/eye_opened.128.png b/app/ui/style/olive-dark/png/eye-opened.128.png
similarity index 100%
rename from app/ui/style/olive-dark/png/eye_opened.128.png
rename to app/ui/style/olive-dark/png/eye-opened.128.png
diff --git a/app/ui/style/olive-dark/png/eye_opened.16.disabled.png b/app/ui/style/olive-dark/png/eye-opened.16.disabled.png
similarity index 69%
rename from app/ui/style/olive-dark/png/eye_opened.16.disabled.png
rename to app/ui/style/olive-dark/png/eye-opened.16.disabled.png
index 58bea24c0..e76c9ad41 100644
Binary files a/app/ui/style/olive-dark/png/eye_opened.16.disabled.png and b/app/ui/style/olive-dark/png/eye-opened.16.disabled.png differ
diff --git a/app/ui/style/olive-dark/png/eye_opened.16.png b/app/ui/style/olive-dark/png/eye-opened.16.png
similarity index 100%
rename from app/ui/style/olive-dark/png/eye_opened.16.png
rename to app/ui/style/olive-dark/png/eye-opened.16.png
diff --git a/app/ui/style/olive-dark/png/eye_opened.32.disabled.png b/app/ui/style/olive-dark/png/eye-opened.32.disabled.png
similarity index 62%
rename from app/ui/style/olive-dark/png/eye_opened.32.disabled.png
rename to app/ui/style/olive-dark/png/eye-opened.32.disabled.png
index e18729159..0782c06c4 100644
Binary files a/app/ui/style/olive-dark/png/eye_opened.32.disabled.png and b/app/ui/style/olive-dark/png/eye-opened.32.disabled.png differ
diff --git a/app/ui/style/olive-dark/png/eye_opened.32.png b/app/ui/style/olive-dark/png/eye-opened.32.png
similarity index 100%
rename from app/ui/style/olive-dark/png/eye_opened.32.png
rename to app/ui/style/olive-dark/png/eye-opened.32.png
diff --git a/app/ui/style/olive-dark/png/eye_opened.64.disabled.png b/app/ui/style/olive-dark/png/eye-opened.64.disabled.png
similarity index 80%
rename from app/ui/style/olive-dark/png/eye_opened.64.disabled.png
rename to app/ui/style/olive-dark/png/eye-opened.64.disabled.png
index 4a9b22f4c..e790d74a6 100644
Binary files a/app/ui/style/olive-dark/png/eye_opened.64.disabled.png and b/app/ui/style/olive-dark/png/eye-opened.64.disabled.png differ
diff --git a/app/ui/style/olive-dark/png/eye_opened.64.png b/app/ui/style/olive-dark/png/eye-opened.64.png
similarity index 100%
rename from app/ui/style/olive-dark/png/eye_opened.64.png
rename to app/ui/style/olive-dark/png/eye-opened.64.png
diff --git a/app/ui/style/olive-dark/png/eye_closed.16.disabled.png b/app/ui/style/olive-dark/png/eye_closed.16.disabled.png
deleted file mode 100644
index 653ea0b07..000000000
Binary files a/app/ui/style/olive-dark/png/eye_closed.16.disabled.png and /dev/null differ
diff --git a/app/ui/style/olive-dark/png/eye_closed.32.disabled.png b/app/ui/style/olive-dark/png/eye_closed.32.disabled.png
deleted file mode 100644
index bf93f5271..000000000
Binary files a/app/ui/style/olive-dark/png/eye_closed.32.disabled.png and /dev/null differ
diff --git a/app/ui/style/olive-dark/png/padlock_closed.128.disabled.png b/app/ui/style/olive-dark/png/lock-closed.128.disabled.png
similarity index 80%
rename from app/ui/style/olive-dark/png/padlock_closed.128.disabled.png
rename to app/ui/style/olive-dark/png/lock-closed.128.disabled.png
index 512f02bad..27f47aff1 100644
Binary files a/app/ui/style/olive-dark/png/padlock_closed.128.disabled.png and b/app/ui/style/olive-dark/png/lock-closed.128.disabled.png differ
diff --git a/app/ui/style/olive-dark/png/padlock_closed.128.png b/app/ui/style/olive-dark/png/lock-closed.128.png
similarity index 100%
rename from app/ui/style/olive-dark/png/padlock_closed.128.png
rename to app/ui/style/olive-dark/png/lock-closed.128.png
diff --git a/app/ui/style/olive-dark/png/padlock_closed.16.disabled.png b/app/ui/style/olive-dark/png/lock-closed.16.disabled.png
similarity index 64%
rename from app/ui/style/olive-dark/png/padlock_closed.16.disabled.png
rename to app/ui/style/olive-dark/png/lock-closed.16.disabled.png
index afa9cfe1a..731218e01 100644
Binary files a/app/ui/style/olive-dark/png/padlock_closed.16.disabled.png and b/app/ui/style/olive-dark/png/lock-closed.16.disabled.png differ
diff --git a/app/ui/style/olive-dark/png/padlock_closed.16.png b/app/ui/style/olive-dark/png/lock-closed.16.png
similarity index 100%
rename from app/ui/style/olive-dark/png/padlock_closed.16.png
rename to app/ui/style/olive-dark/png/lock-closed.16.png
diff --git a/app/ui/style/olive-dark/png/padlock_closed.32.disabled.png b/app/ui/style/olive-dark/png/lock-closed.32.disabled.png
similarity index 69%
rename from app/ui/style/olive-dark/png/padlock_closed.32.disabled.png
rename to app/ui/style/olive-dark/png/lock-closed.32.disabled.png
index 6d6a4ee8b..6b0103111 100644
Binary files a/app/ui/style/olive-dark/png/padlock_closed.32.disabled.png and b/app/ui/style/olive-dark/png/lock-closed.32.disabled.png differ
diff --git a/app/ui/style/olive-dark/png/padlock_closed.32.png b/app/ui/style/olive-dark/png/lock-closed.32.png
similarity index 100%
rename from app/ui/style/olive-dark/png/padlock_closed.32.png
rename to app/ui/style/olive-dark/png/lock-closed.32.png
diff --git a/app/ui/style/olive-dark/png/padlock_closed.64.disabled.png b/app/ui/style/olive-dark/png/lock-closed.64.disabled.png
similarity index 76%
rename from app/ui/style/olive-dark/png/padlock_closed.64.disabled.png
rename to app/ui/style/olive-dark/png/lock-closed.64.disabled.png
index e0e1f2adc..c559d8d58 100644
Binary files a/app/ui/style/olive-dark/png/padlock_closed.64.disabled.png and b/app/ui/style/olive-dark/png/lock-closed.64.disabled.png differ
diff --git a/app/ui/style/olive-dark/png/padlock_closed.64.png b/app/ui/style/olive-dark/png/lock-closed.64.png
similarity index 100%
rename from app/ui/style/olive-dark/png/padlock_closed.64.png
rename to app/ui/style/olive-dark/png/lock-closed.64.png
diff --git a/app/ui/style/olive-dark/png/padlock_opened.128.disabled.png b/app/ui/style/olive-dark/png/lock-opened.128.disabled.png
similarity index 86%
rename from app/ui/style/olive-dark/png/padlock_opened.128.disabled.png
rename to app/ui/style/olive-dark/png/lock-opened.128.disabled.png
index 9f78b430c..3c58f7462 100644
Binary files a/app/ui/style/olive-dark/png/padlock_opened.128.disabled.png and b/app/ui/style/olive-dark/png/lock-opened.128.disabled.png differ
diff --git a/app/ui/style/olive-dark/png/padlock_opened.128.png b/app/ui/style/olive-dark/png/lock-opened.128.png
similarity index 100%
rename from app/ui/style/olive-dark/png/padlock_opened.128.png
rename to app/ui/style/olive-dark/png/lock-opened.128.png
diff --git a/app/ui/style/olive-dark/png/padlock_opened.16.disabled.png b/app/ui/style/olive-dark/png/lock-opened.16.disabled.png
similarity index 71%
rename from app/ui/style/olive-dark/png/padlock_opened.16.disabled.png
rename to app/ui/style/olive-dark/png/lock-opened.16.disabled.png
index fd6567ccf..d58eb0b8c 100644
Binary files a/app/ui/style/olive-dark/png/padlock_opened.16.disabled.png and b/app/ui/style/olive-dark/png/lock-opened.16.disabled.png differ
diff --git a/app/ui/style/olive-dark/png/padlock_opened.16.png b/app/ui/style/olive-dark/png/lock-opened.16.png
similarity index 100%
rename from app/ui/style/olive-dark/png/padlock_opened.16.png
rename to app/ui/style/olive-dark/png/lock-opened.16.png
diff --git a/app/ui/style/olive-dark/png/padlock_opened.32.disabled.png b/app/ui/style/olive-dark/png/lock-opened.32.disabled.png
similarity index 69%
rename from app/ui/style/olive-dark/png/padlock_opened.32.disabled.png
rename to app/ui/style/olive-dark/png/lock-opened.32.disabled.png
index 3d5aed04a..4e55805ea 100644
Binary files a/app/ui/style/olive-dark/png/padlock_opened.32.disabled.png and b/app/ui/style/olive-dark/png/lock-opened.32.disabled.png differ
diff --git a/app/ui/style/olive-dark/png/padlock_opened.32.png b/app/ui/style/olive-dark/png/lock-opened.32.png
similarity index 100%
rename from app/ui/style/olive-dark/png/padlock_opened.32.png
rename to app/ui/style/olive-dark/png/lock-opened.32.png
diff --git a/app/ui/style/olive-dark/png/padlock_opened.64.disabled.png b/app/ui/style/olive-dark/png/lock-opened.64.disabled.png
similarity index 79%
rename from app/ui/style/olive-dark/png/padlock_opened.64.disabled.png
rename to app/ui/style/olive-dark/png/lock-opened.64.disabled.png
index 5b6a3590f..4c34add69 100644
Binary files a/app/ui/style/olive-dark/png/padlock_opened.64.disabled.png and b/app/ui/style/olive-dark/png/lock-opened.64.disabled.png differ
diff --git a/app/ui/style/olive-dark/png/padlock_opened.64.png b/app/ui/style/olive-dark/png/lock-opened.64.png
similarity index 100%
rename from app/ui/style/olive-dark/png/padlock_opened.64.png
rename to app/ui/style/olive-dark/png/lock-opened.64.png
diff --git a/app/ui/style/olive-dark/svg/eye_closed.svg b/app/ui/style/olive-dark/svg/eye-closed.svg
similarity index 100%
rename from app/ui/style/olive-dark/svg/eye_closed.svg
rename to app/ui/style/olive-dark/svg/eye-closed.svg
diff --git a/app/ui/style/olive-dark/svg/eye_opened.svg b/app/ui/style/olive-dark/svg/eye-opened.svg
similarity index 100%
rename from app/ui/style/olive-dark/svg/eye_opened.svg
rename to app/ui/style/olive-dark/svg/eye-opened.svg
diff --git a/app/ui/style/olive-dark/svg/padlock_closed.svg b/app/ui/style/olive-dark/svg/lock-closed.svg
similarity index 100%
rename from app/ui/style/olive-dark/svg/padlock_closed.svg
rename to app/ui/style/olive-dark/svg/lock-closed.svg
diff --git a/app/ui/style/olive-dark/svg/padlock_opened.svg b/app/ui/style/olive-dark/svg/lock-opened.svg
similarity index 100%
rename from app/ui/style/olive-dark/svg/padlock_opened.svg
rename to app/ui/style/olive-dark/svg/lock-opened.svg
diff --git a/app/ui/style/olive-light/olive-light.qrc b/app/ui/style/olive-light/olive-light.qrc
deleted file mode 100644
index 16800275d..000000000
--- a/app/ui/style/olive-light/olive-light.qrc
+++ /dev/null
@@ -1,290 +0,0 @@
-
-
- style.css
- palette.ini
- png/add-button.16.png
- png/add-button.32.png
- png/add-button.64.png
- png/add-button.128.png
- png/add-effect.16.png
- png/add-effect.32.png
- png/add-effect.64.png
- png/add-effect.128.png
- png/add-transition.16.png
- png/add-transition.32.png
- png/add-transition.64.png
- png/add-transition.128.png
- png/align-center.16.png
- png/align-center.32.png
- png/align-center.64.png
- png/align-center.128.png
- png/align-justify-all.16.png
- png/align-justify-all.32.png
- png/align-justify-all.64.png
- png/align-justify-all.128.png
- png/align-justify-center.16.png
- png/align-justify-center.32.png
- png/align-justify-center.64.png
- png/align-justify-center.128.png
- png/align-justify-left.16.png
- png/align-justify-left.32.png
- png/align-justify-left.64.png
- png/align-justify-left.128.png
- png/align-justify-right.16.png
- png/align-justify-right.32.png
- png/align-justify-right.64.png
- png/align-justify-right.128.png
- png/align-left.16.png
- png/align-left.32.png
- png/align-left.64.png
- png/align-left.128.png
- png/align-right.16.png
- png/align-right.32.png
- png/align-right.64.png
- png/align-right.128.png
- png/arrow.16.png
- png/arrow.32.png
- png/arrow.64.png
- png/arrow.128.png
- png/audiosource.16.png
- png/audiosource.32.png
- png/audiosource.64.png
- png/audiosource.128.png
- png/beam.16.png
- png/beam.32.png
- png/beam.64.png
- png/beam.128.png
- png/box.16.png
- png/box.32.png
- png/box.64.png
- png/box.128.png
- png/clock.16.png
- png/clock.32.png
- png/clock.64.png
- png/clock.128.png
- png/copy.16.png
- png/copy.32.png
- png/copy.64.png
- png/copy.128.png
- png/diamond.16.png
- png/diamond.32.png
- png/diamond.64.png
- png/diamond.128.png
- png/dirup.16.png
- png/dirup.32.png
- png/dirup.64.png
- png/dirup.128.png
- png/error.16.png
- png/error.32.png
- png/error.64.png
- png/error.128.png
- png/export.16.png
- png/export.32.png
- png/export.64.png
- png/export.128.png
- png/eye_closed.16.png
- png/eye_closed.32.png
- png/eye_closed.64.png
- png/eye_closed.128.png
- png/eye_opened.16.png
- png/eye_opened.32.png
- png/eye_opened.64.png
- png/eye_opened.128.png
- png/ff.16.png
- png/ff.32.png
- png/ff.64.png
- png/ff.128.png
- png/filter.16.png
- png/filter.32.png
- png/filter.64.png
- png/filter.128.png
- png/folder.16.png
- png/folder.32.png
- png/folder.64.png
- png/folder.128.png
- png/hand.16.png
- png/hand.32.png
- png/hand.64.png
- png/hand.128.png
- png/iconview.16.png
- png/iconview.32.png
- png/iconview.64.png
- png/iconview.128.png
- png/imagesource.16.png
- png/imagesource.32.png
- png/imagesource.64.png
- png/imagesource.128.png
- png/import.16.png
- png/import.32.png
- png/import.64.png
- png/import.128.png
- png/listview.16.png
- png/listview.32.png
- png/listview.64.png
- png/listview.128.png
- png/magnet.16.png
- png/magnet.32.png
- png/magnet.64.png
- png/magnet.128.png
- png/map.16.png
- png/map.32.png
- png/map.64.png
- png/map.128.png
- png/minus.16.png
- png/minus.32.png
- png/minus.64.png
- png/minus.128.png
- png/new.16.png
- png/new.32.png
- png/new.64.png
- png/new.128.png
- png/next.16.png
- png/next.32.png
- png/next.64.png
- png/next.128.png
- png/nodes_btt.16.png
- png/nodes_btt.32.png
- png/nodes_btt.64.png
- png/nodes_btt.128.png
- png/nodes_ltr.16.png
- png/nodes_ltr.32.png
- png/nodes_ltr.64.png
- png/nodes_ltr.128.png
- png/nodes_rtl.16.png
- png/nodes_rtl.32.png
- png/nodes_rtl.64.png
- png/nodes_rtl.128.png
- png/nodes_ttb.16.png
- png/nodes_ttb.32.png
- png/nodes_ttb.64.png
- png/nodes_ttb.128.png
- png/open.16.png
- png/open.32.png
- png/open.64.png
- png/open.128.png
- png/padlock_closed.16.png
- png/padlock_closed.32.png
- png/padlock_closed.64.png
- png/padlock_closed.128.png
- png/padlock_opened.16.png
- png/padlock_opened.32.png
- png/padlock_opened.64.png
- png/padlock_opened.128.png
- png/paste.16.png
- png/paste.32.png
- png/paste.64.png
- png/paste.128.png
- png/pause.16.png
- png/pause.32.png
- png/pause.64.png
- png/pause.128.png
- png/play.16.png
- png/play.32.png
- png/play.64.png
- png/play.128.png
- png/plus.16.png
- png/plus.32.png
- png/plus.64.png
- png/plus.128.png
- png/prev.16.png
- png/prev.32.png
- png/prev.64.png
- png/prev.128.png
- png/razor.16.png
- png/razor.32.png
- png/razor.64.png
- png/razor.128.png
- png/record.16.png
- png/record.32.png
- png/record.64.png
- png/record.128.png
- png/redo.16.png
- png/redo.32.png
- png/redo.64.png
- png/redo.128.png
- png/rew.16.png
- png/rew.32.png
- png/rew.64.png
- png/rew.128.png
- png/ripple.16.png
- png/ripple.32.png
- png/ripple.64.png
- png/ripple.128.png
- png/rolling.16.png
- png/rolling.32.png
- png/rolling.64.png
- png/rolling.128.png
- png/save.16.png
- png/save.32.png
- png/save.64.png
- png/save.128.png
- png/sequence.16.png
- png/sequence.32.png
- png/sequence.64.png
- png/sequence.128.png
- png/slide.16.png
- png/slide.32.png
- png/slide.64.png
- png/slide.128.png
- png/slip.16.png
- png/slip.32.png
- png/slip.64.png
- png/slip.128.png
- png/smooth_edges.16.png
- png/smooth_edges.32.png
- png/smooth_edges.64.png
- png/smooth_edges.128.png
- png/text-bold.16.png
- png/text-bold.32.png
- png/text-bold.64.png
- png/text-bold.128.png
- png/text-italic.16.png
- png/text-italic.32.png
- png/text-italic.64.png
- png/text-italic.128.png
- png/text-underline.16.png
- png/text-underline.32.png
- png/text-underline.64.png
- png/text-underline.128.png
- png/transition-tool.16.png
- png/transition-tool.32.png
- png/transition-tool.64.png
- png/transition-tool.128.png
- png/treeview.16.png
- png/treeview.32.png
- png/treeview.64.png
- png/treeview.128.png
- png/tri-down.16.png
- png/tri-down.32.png
- png/tri-down.64.png
- png/tri-down.128.png
- png/tri-left.16.png
- png/tri-left.32.png
- png/tri-left.64.png
- png/tri-left.128.png
- png/tri-right.16.png
- png/tri-right.32.png
- png/tri-right.64.png
- png/tri-right.128.png
- png/tri-up.16.png
- png/tri-up.32.png
- png/tri-up.64.png
- png/tri-up.128.png
- png/undo.16.png
- png/undo.32.png
- png/undo.64.png
- png/undo.128.png
- png/videosource.16.png
- png/videosource.32.png
- png/videosource.64.png
- png/videosource.128.png
- png/zoomin.16.png
- png/zoomin.32.png
- png/zoomin.64.png
- png/zoomin.128.png
- png/zoomout.16.png
- png/zoomout.32.png
- png/zoomout.64.png
- png/zoomout.128.png
-
-
diff --git a/app/ui/style/olive-light/png/eye_closed.128.disabled.png b/app/ui/style/olive-light/png/eye_closed.128.disabled.png
deleted file mode 100644
index fd260cbf4..000000000
Binary files a/app/ui/style/olive-light/png/eye_closed.128.disabled.png and /dev/null differ
diff --git a/app/ui/style/olive-light/png/eye_closed.128.png b/app/ui/style/olive-light/png/eye_closed.128.png
deleted file mode 100644
index ce7ed0c90..000000000
Binary files a/app/ui/style/olive-light/png/eye_closed.128.png and /dev/null differ
diff --git a/app/ui/style/olive-light/png/eye_closed.16.disabled.png b/app/ui/style/olive-light/png/eye_closed.16.disabled.png
deleted file mode 100644
index 2e1f71ad5..000000000
Binary files a/app/ui/style/olive-light/png/eye_closed.16.disabled.png and /dev/null differ
diff --git a/app/ui/style/olive-light/png/eye_closed.16.png b/app/ui/style/olive-light/png/eye_closed.16.png
deleted file mode 100644
index 9da421f66..000000000
Binary files a/app/ui/style/olive-light/png/eye_closed.16.png and /dev/null differ
diff --git a/app/ui/style/olive-light/png/eye_closed.32.disabled.png b/app/ui/style/olive-light/png/eye_closed.32.disabled.png
deleted file mode 100644
index 804bf35e0..000000000
Binary files a/app/ui/style/olive-light/png/eye_closed.32.disabled.png and /dev/null differ
diff --git a/app/ui/style/olive-light/png/eye_closed.32.png b/app/ui/style/olive-light/png/eye_closed.32.png
deleted file mode 100644
index 775e81a0e..000000000
Binary files a/app/ui/style/olive-light/png/eye_closed.32.png and /dev/null differ
diff --git a/app/ui/style/olive-light/png/eye_closed.64.disabled.png b/app/ui/style/olive-light/png/eye_closed.64.disabled.png
deleted file mode 100644
index 6f0eeb262..000000000
Binary files a/app/ui/style/olive-light/png/eye_closed.64.disabled.png and /dev/null differ
diff --git a/app/ui/style/olive-light/png/eye_closed.64.png b/app/ui/style/olive-light/png/eye_closed.64.png
deleted file mode 100644
index 58a0c9d11..000000000
Binary files a/app/ui/style/olive-light/png/eye_closed.64.png and /dev/null differ
diff --git a/app/ui/style/olive-light/png/eye_opened.128.disabled.png b/app/ui/style/olive-light/png/eye_opened.128.disabled.png
deleted file mode 100644
index 83477eb70..000000000
Binary files a/app/ui/style/olive-light/png/eye_opened.128.disabled.png and /dev/null differ
diff --git a/app/ui/style/olive-light/png/eye_opened.128.png b/app/ui/style/olive-light/png/eye_opened.128.png
deleted file mode 100644
index ea511c3cd..000000000
Binary files a/app/ui/style/olive-light/png/eye_opened.128.png and /dev/null differ
diff --git a/app/ui/style/olive-light/png/eye_opened.16.disabled.png b/app/ui/style/olive-light/png/eye_opened.16.disabled.png
deleted file mode 100644
index 11c713cfc..000000000
Binary files a/app/ui/style/olive-light/png/eye_opened.16.disabled.png and /dev/null differ
diff --git a/app/ui/style/olive-light/png/eye_opened.16.png b/app/ui/style/olive-light/png/eye_opened.16.png
deleted file mode 100644
index 3e11a118d..000000000
Binary files a/app/ui/style/olive-light/png/eye_opened.16.png and /dev/null differ
diff --git a/app/ui/style/olive-light/png/eye_opened.32.disabled.png b/app/ui/style/olive-light/png/eye_opened.32.disabled.png
deleted file mode 100644
index 5900f0c78..000000000
Binary files a/app/ui/style/olive-light/png/eye_opened.32.disabled.png and /dev/null differ
diff --git a/app/ui/style/olive-light/png/eye_opened.32.png b/app/ui/style/olive-light/png/eye_opened.32.png
deleted file mode 100644
index 78c2a7ffe..000000000
Binary files a/app/ui/style/olive-light/png/eye_opened.32.png and /dev/null differ
diff --git a/app/ui/style/olive-light/png/eye_opened.64.disabled.png b/app/ui/style/olive-light/png/eye_opened.64.disabled.png
deleted file mode 100644
index 0914bb98a..000000000
Binary files a/app/ui/style/olive-light/png/eye_opened.64.disabled.png and /dev/null differ
diff --git a/app/ui/style/olive-light/png/eye_opened.64.png b/app/ui/style/olive-light/png/eye_opened.64.png
deleted file mode 100644
index bb285b7cf..000000000
Binary files a/app/ui/style/olive-light/png/eye_opened.64.png and /dev/null differ
diff --git a/app/ui/style/olive-light/png/padlock_closed.128.disabled.png b/app/ui/style/olive-light/png/padlock_closed.128.disabled.png
deleted file mode 100644
index 7ee3d319b..000000000
Binary files a/app/ui/style/olive-light/png/padlock_closed.128.disabled.png and /dev/null differ
diff --git a/app/ui/style/olive-light/png/padlock_closed.128.png b/app/ui/style/olive-light/png/padlock_closed.128.png
deleted file mode 100644
index c6f012368..000000000
Binary files a/app/ui/style/olive-light/png/padlock_closed.128.png and /dev/null differ
diff --git a/app/ui/style/olive-light/png/padlock_closed.16.disabled.png b/app/ui/style/olive-light/png/padlock_closed.16.disabled.png
deleted file mode 100644
index 1446d1e75..000000000
Binary files a/app/ui/style/olive-light/png/padlock_closed.16.disabled.png and /dev/null differ
diff --git a/app/ui/style/olive-light/png/padlock_closed.16.png b/app/ui/style/olive-light/png/padlock_closed.16.png
deleted file mode 100644
index ec52ca5ce..000000000
Binary files a/app/ui/style/olive-light/png/padlock_closed.16.png and /dev/null differ
diff --git a/app/ui/style/olive-light/png/padlock_closed.32.disabled.png b/app/ui/style/olive-light/png/padlock_closed.32.disabled.png
deleted file mode 100644
index 9c9ec96d3..000000000
Binary files a/app/ui/style/olive-light/png/padlock_closed.32.disabled.png and /dev/null differ
diff --git a/app/ui/style/olive-light/png/padlock_closed.32.png b/app/ui/style/olive-light/png/padlock_closed.32.png
deleted file mode 100644
index e4c244669..000000000
Binary files a/app/ui/style/olive-light/png/padlock_closed.32.png and /dev/null differ
diff --git a/app/ui/style/olive-light/png/padlock_closed.64.disabled.png b/app/ui/style/olive-light/png/padlock_closed.64.disabled.png
deleted file mode 100644
index 5c7512f0a..000000000
Binary files a/app/ui/style/olive-light/png/padlock_closed.64.disabled.png and /dev/null differ
diff --git a/app/ui/style/olive-light/png/padlock_closed.64.png b/app/ui/style/olive-light/png/padlock_closed.64.png
deleted file mode 100644
index 3a6c19f59..000000000
Binary files a/app/ui/style/olive-light/png/padlock_closed.64.png and /dev/null differ
diff --git a/app/ui/style/olive-light/png/padlock_opened.128.disabled.png b/app/ui/style/olive-light/png/padlock_opened.128.disabled.png
deleted file mode 100644
index 1ea41f8e5..000000000
Binary files a/app/ui/style/olive-light/png/padlock_opened.128.disabled.png and /dev/null differ
diff --git a/app/ui/style/olive-light/png/padlock_opened.128.png b/app/ui/style/olive-light/png/padlock_opened.128.png
deleted file mode 100644
index 0b934f698..000000000
Binary files a/app/ui/style/olive-light/png/padlock_opened.128.png and /dev/null differ
diff --git a/app/ui/style/olive-light/png/padlock_opened.16.disabled.png b/app/ui/style/olive-light/png/padlock_opened.16.disabled.png
deleted file mode 100644
index 0284d485d..000000000
Binary files a/app/ui/style/olive-light/png/padlock_opened.16.disabled.png and /dev/null differ
diff --git a/app/ui/style/olive-light/png/padlock_opened.16.png b/app/ui/style/olive-light/png/padlock_opened.16.png
deleted file mode 100644
index df8209536..000000000
Binary files a/app/ui/style/olive-light/png/padlock_opened.16.png and /dev/null differ
diff --git a/app/ui/style/olive-light/png/padlock_opened.32.disabled.png b/app/ui/style/olive-light/png/padlock_opened.32.disabled.png
deleted file mode 100644
index db7edeb07..000000000
Binary files a/app/ui/style/olive-light/png/padlock_opened.32.disabled.png and /dev/null differ
diff --git a/app/ui/style/olive-light/png/padlock_opened.32.png b/app/ui/style/olive-light/png/padlock_opened.32.png
deleted file mode 100644
index 992796261..000000000
Binary files a/app/ui/style/olive-light/png/padlock_opened.32.png and /dev/null differ
diff --git a/app/ui/style/olive-light/png/padlock_opened.64.disabled.png b/app/ui/style/olive-light/png/padlock_opened.64.disabled.png
deleted file mode 100644
index 517ca21d6..000000000
Binary files a/app/ui/style/olive-light/png/padlock_opened.64.disabled.png and /dev/null differ
diff --git a/app/ui/style/olive-light/png/padlock_opened.64.png b/app/ui/style/olive-light/png/padlock_opened.64.png
deleted file mode 100644
index bea866a6e..000000000
Binary files a/app/ui/style/olive-light/png/padlock_opened.64.png and /dev/null differ
diff --git a/app/ui/style/olive-light/svg/eye_closed.svg b/app/ui/style/olive-light/svg/eye-closed.svg
similarity index 100%
rename from app/ui/style/olive-light/svg/eye_closed.svg
rename to app/ui/style/olive-light/svg/eye-closed.svg
diff --git a/app/ui/style/olive-light/svg/eye_opened.svg b/app/ui/style/olive-light/svg/eye-opened.svg
similarity index 100%
rename from app/ui/style/olive-light/svg/eye_opened.svg
rename to app/ui/style/olive-light/svg/eye-opened.svg
diff --git a/app/ui/style/olive-light/svg/padlock_closed.svg b/app/ui/style/olive-light/svg/lock-closed.svg
similarity index 100%
rename from app/ui/style/olive-light/svg/padlock_closed.svg
rename to app/ui/style/olive-light/svg/lock-closed.svg
diff --git a/app/ui/style/olive-light/svg/padlock_opened.svg b/app/ui/style/olive-light/svg/lock-opened.svg
similarity index 100%
rename from app/ui/style/olive-light/svg/padlock_opened.svg
rename to app/ui/style/olive-light/svg/lock-opened.svg
diff --git a/app/widget/timelinewidget/trackview/trackviewitem.cpp b/app/widget/timelinewidget/trackview/trackviewitem.cpp
index e62b4321d..d4a41b403 100644
--- a/app/widget/timelinewidget/trackview/trackviewitem.cpp
+++ b/app/widget/timelinewidget/trackview/trackviewitem.cpp
@@ -28,6 +28,7 @@
#include
#include "core.h"
+#include "ui/icons/icons.h"
#include "widget/menu/menu.h"
#include "widget/timelinewidget/undo/timelineundogeneral.h"
@@ -56,15 +57,21 @@ TrackViewItem::TrackViewItem(Track* track, QWidget *parent) :
connect(line_edit_, &FocusableLineEdit::Cancelled, this, &TrackViewItem::LineEditCancelled);
stack_->addWidget(line_edit_);
- mute_button_ = CreateMSLButton(tr("M"), Qt::red);
+ mute_button_ = CreateMSLButton(Qt::red);
+ mute_button_->setChecked(track->IsMuted());
+ UpdateMuteButton(track->IsMuted());
connect(mute_button_, &QPushButton::toggled, track_, &Track::SetMuted);
+ connect(mute_button_, &QPushButton::toggled, this, &TrackViewItem::UpdateMuteButton);
layout->addWidget(mute_button_);
/*solo_button_ = CreateMSLButton(tr("S"), Qt::yellow);
layout->addWidget(solo_button_);*/
- lock_button_ = CreateMSLButton(tr("L"), Qt::gray);
+ lock_button_ = CreateMSLButton(Qt::gray);
+ lock_button_->setCheckable(track->IsLocked());
+ UpdateLockButton(track->IsLocked());
connect(lock_button_, &QPushButton::toggled, track_, &Track::SetLocked);
+ connect(lock_button_, &QPushButton::toggled, this, &TrackViewItem::UpdateLockButton);
layout->addWidget(lock_button_);
setMinimumHeight(mute_button_->height());
@@ -74,9 +81,9 @@ TrackViewItem::TrackViewItem(Track* track, QWidget *parent) :
connect(this, &QWidget::customContextMenuRequested, this, &TrackViewItem::ShowContextMenu);
}
-QPushButton *TrackViewItem::CreateMSLButton(const QString& text, const QColor& checked_color) const
+QPushButton *TrackViewItem::CreateMSLButton(const QColor& checked_color) const
{
- QPushButton* button = new QPushButton(text);
+ QPushButton* button = new QPushButton();
button->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Expanding);
button->setCheckable(true);
button->setStyleSheet(QStringLiteral("QPushButton::checked { background: %1; }").arg(checked_color.name()));
@@ -169,4 +176,14 @@ void TrackViewItem::DeleteAllEmptyTracks()
}
}
+void TrackViewItem::UpdateMuteButton(bool e)
+{
+ mute_button_->setIcon(e ? icon::EyeClosed : icon::EyeOpened);
+}
+
+void TrackViewItem::UpdateLockButton(bool e)
+{
+ lock_button_->setIcon(e ? icon::LockClosed : icon::LockOpened);
+}
+
}
diff --git a/app/widget/timelinewidget/trackview/trackviewitem.h b/app/widget/timelinewidget/trackview/trackviewitem.h
index 9d1c04506..000a562f0 100644
--- a/app/widget/timelinewidget/trackview/trackviewitem.h
+++ b/app/widget/timelinewidget/trackview/trackviewitem.h
@@ -39,7 +39,7 @@ public:
QWidget* parent = nullptr);
private:
- QPushButton* CreateMSLButton(const QString &text, const QColor &checked_color) const;
+ QPushButton* CreateMSLButton(const QColor &checked_color) const;
QStackedWidget* stack_;
@@ -67,6 +67,10 @@ private slots:
void DeleteAllEmptyTracks();
+ void UpdateMuteButton(bool e);
+
+ void UpdateLockButton(bool e);
+
};
}