From: Good Guy Date: Thu, 16 Aug 2018 22:12:31 +0000 (-0600) Subject: add olaf's neophyte update, add binfolder apply btn X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=commitdiff_plain;h=c732a0ac2acad5f857d490ce0e7d4f22b41b1b54 add olaf's neophyte update, add binfolder apply btn --- diff --git a/cinelerra-5.1/cinelerra/binfolder.C b/cinelerra-5.1/cinelerra/binfolder.C index f8d7943a..200f3106 100644 --- a/cinelerra-5.1/cinelerra/binfolder.C +++ b/cinelerra-5.1/cinelerra/binfolder.C @@ -1621,6 +1621,23 @@ int BinFolderDelFilter::handle_event() return 1; } +BinFolderApplyFilter::BinFolderApplyFilter(BinFolderList *folder_list, int x, int y) + : BC_GenericButton(x, y, _("Apply")) +{ + this->folder_list = folder_list; +} +BinFolderApplyFilter::~BinFolderApplyFilter() +{ +} + +int BinFolderApplyFilter::handle_event() +{ + ModifyFolderThread *thread = folder_list->window->thread; + thread->original->copy_from(thread->folder); + thread->agui->async_update_assets(); + return 1; +} + NewFolderGUI::NewFolderGUI(NewFolderThread *thread, int x, int y, int w, int h) : BC_Window(_(PROGRAM_NAME ": New folder"), @@ -1736,6 +1753,8 @@ void ModifyFolderGUI::create_objects() add_subwindow(add_filter = new BinFolderAddFilter(folder_list, x1, y1)); y1 += add_filter->get_h() + 10; add_subwindow(del_filter = new BinFolderDelFilter(folder_list, x1, y1)); + y1 += del_filter->get_h() + 10; + add_subwindow(apply_filter = new BinFolderApplyFilter(folder_list, x1, y1)); add_subwindow(ok_button = new BC_OKButton(this)); add_subwindow(cancel_button = new BC_CancelButton(this)); show_window(); diff --git a/cinelerra-5.1/cinelerra/binfolder.h b/cinelerra-5.1/cinelerra/binfolder.h index cf0c943d..f35017a9 100644 --- a/cinelerra-5.1/cinelerra/binfolder.h +++ b/cinelerra-5.1/cinelerra/binfolder.h @@ -520,6 +520,15 @@ public: BinFolderList *folder_list; }; +class BinFolderApplyFilter : public BC_GenericButton +{ +public: + BinFolderApplyFilter(BinFolderList *folder_list, int x, int y); + ~BinFolderApplyFilter(); + int handle_event(); + BinFolderList *folder_list; +}; + class NewFolderGUI : public BC_Window { public: @@ -565,6 +574,7 @@ public: BinFolderList *folder_list; BinFolderAddFilter *add_filter; BinFolderDelFilter *del_filter; + BinFolderApplyFilter *apply_filter; BC_TextBox *text_box; Atom modify_folder_xatom; BC_OKButton *ok_button; diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/0.png b/cinelerra-5.1/plugins/theme_neophyte/data/0.png deleted file mode 100644 index 53036645..00000000 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/0.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/1.png b/cinelerra-5.1/plugins/theme_neophyte/data/1.png deleted file mode 100644 index 6eac7177..00000000 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/1.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/2.png b/cinelerra-5.1/plugins/theme_neophyte/data/2.png deleted file mode 100644 index 915fe064..00000000 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/2.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/3.png b/cinelerra-5.1/plugins/theme_neophyte/data/3.png deleted file mode 100644 index fccbfb70..00000000 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/3.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/4.png b/cinelerra-5.1/plugins/theme_neophyte/data/4.png deleted file mode 100644 index 74f9f117..00000000 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/4.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/5.png b/cinelerra-5.1/plugins/theme_neophyte/data/5.png deleted file mode 100644 index ef37107d..00000000 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/5.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/6.png b/cinelerra-5.1/plugins/theme_neophyte/data/6.png deleted file mode 100644 index 8e5dbed3..00000000 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/6.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/7.png b/cinelerra-5.1/plugins/theme_neophyte/data/7.png deleted file mode 100644 index e06668f5..00000000 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/7.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/8.png b/cinelerra-5.1/plugins/theme_neophyte/data/8.png deleted file mode 100644 index 4c9fef86..00000000 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/8.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/9.png b/cinelerra-5.1/plugins/theme_neophyte/data/9.png deleted file mode 100644 index e09afffe..00000000 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/9.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/a.png b/cinelerra-5.1/plugins/theme_neophyte/data/a.png deleted file mode 100644 index 12bf179e..00000000 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/a.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/about_bg.png b/cinelerra-5.1/plugins/theme_neophyte/data/about_bg.png new file mode 100644 index 00000000..eb6ec510 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_neophyte/data/about_bg.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/b.png b/cinelerra-5.1/plugins/theme_neophyte/data/b.png deleted file mode 100644 index 9f94f172..00000000 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/b.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/c.png b/cinelerra-5.1/plugins/theme_neophyte/data/c.png deleted file mode 100644 index 644986ad..00000000 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/c.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/camera.png b/cinelerra-5.1/plugins/theme_neophyte/data/camera.png index bd3459e5..bc6437ae 100644 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/camera.png and b/cinelerra-5.1/plugins/theme_neophyte/data/camera.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/cancel.png b/cinelerra-5.1/plugins/theme_neophyte/data/cancel.png index d7e11a7f..f2bca6d0 100644 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/cancel.png and b/cinelerra-5.1/plugins/theme_neophyte/data/cancel.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/check.png b/cinelerra-5.1/plugins/theme_neophyte/data/check.png index 64deb932..6f75a860 100644 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/check.png and b/cinelerra-5.1/plugins/theme_neophyte/data/check.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/colon.png b/cinelerra-5.1/plugins/theme_neophyte/data/colon.png deleted file mode 100644 index 0e1c835c..00000000 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/colon.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/d.png b/cinelerra-5.1/plugins/theme_neophyte/data/d.png deleted file mode 100644 index 3bfdc6bd..00000000 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/d.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/dash.png b/cinelerra-5.1/plugins/theme_neophyte/data/dash.png deleted file mode 100644 index 01321e98..00000000 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/dash.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/e.png b/cinelerra-5.1/plugins/theme_neophyte/data/e.png deleted file mode 100644 index 20892c45..00000000 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/e.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/f.png b/cinelerra-5.1/plugins/theme_neophyte/data/f.png deleted file mode 100644 index 0f5047bb..00000000 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/f.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/heroine_icon.png b/cinelerra-5.1/plugins/theme_neophyte/data/heroine_icon.png index dc9d2bf2..be61e60c 100644 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/heroine_icon.png and b/cinelerra-5.1/plugins/theme_neophyte/data/heroine_icon.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/histogram_carrot_checked.png b/cinelerra-5.1/plugins/theme_neophyte/data/histogram_carrot_checked.png index 8e5840a9..978d9d7e 100644 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/histogram_carrot_checked.png and b/cinelerra-5.1/plugins/theme_neophyte/data/histogram_carrot_checked.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/histogram_carrot_checkedhi.png b/cinelerra-5.1/plugins/theme_neophyte/data/histogram_carrot_checkedhi.png index 1fcfff69..610ec909 100644 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/histogram_carrot_checkedhi.png and b/cinelerra-5.1/plugins/theme_neophyte/data/histogram_carrot_checkedhi.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/histogram_carrot_dn.png b/cinelerra-5.1/plugins/theme_neophyte/data/histogram_carrot_dn.png index 0fb61fb1..67c4aa21 100644 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/histogram_carrot_dn.png and b/cinelerra-5.1/plugins/theme_neophyte/data/histogram_carrot_dn.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/histogram_carrot_hi.png b/cinelerra-5.1/plugins/theme_neophyte/data/histogram_carrot_hi.png index 81d78997..41a9b6d6 100644 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/histogram_carrot_hi.png and b/cinelerra-5.1/plugins/theme_neophyte/data/histogram_carrot_hi.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/histogram_carrot_up.png b/cinelerra-5.1/plugins/theme_neophyte/data/histogram_carrot_up.png index cfd43b2f..7f791c66 100644 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/histogram_carrot_up.png and b/cinelerra-5.1/plugins/theme_neophyte/data/histogram_carrot_up.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/histogram_img.png b/cinelerra-5.1/plugins/theme_neophyte/data/histogram_img.png index 0f7da6eb..9412b773 100644 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/histogram_img.png and b/cinelerra-5.1/plugins/theme_neophyte/data/histogram_img.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/histogram_rgb.png b/cinelerra-5.1/plugins/theme_neophyte/data/histogram_rgb.png index a68050a1..380e2ab9 100644 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/histogram_rgb.png and b/cinelerra-5.1/plugins/theme_neophyte/data/histogram_rgb.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/histogram_toggle.png b/cinelerra-5.1/plugins/theme_neophyte/data/histogram_toggle.png index 0f7da6eb..9412b773 100644 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/histogram_toggle.png and b/cinelerra-5.1/plugins/theme_neophyte/data/histogram_toggle.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/hscroll_handle_dn.png b/cinelerra-5.1/plugins/theme_neophyte/data/hscroll_handle_dn.png index acc2bda6..8a860049 100644 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/hscroll_handle_dn.png and b/cinelerra-5.1/plugins/theme_neophyte/data/hscroll_handle_dn.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/hscroll_handle_hi.png b/cinelerra-5.1/plugins/theme_neophyte/data/hscroll_handle_hi.png index f9740c7c..0e4e427a 100644 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/hscroll_handle_hi.png and b/cinelerra-5.1/plugins/theme_neophyte/data/hscroll_handle_hi.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/hscroll_handle_up.png b/cinelerra-5.1/plugins/theme_neophyte/data/hscroll_handle_up.png index 9f870e2f..e5c6139b 100644 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/hscroll_handle_up.png and b/cinelerra-5.1/plugins/theme_neophyte/data/hscroll_handle_up.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/in_checked.png b/cinelerra-5.1/plugins/theme_neophyte/data/in_checked.png index 0e1b2b0d..b392cc01 100644 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/in_checked.png and b/cinelerra-5.1/plugins/theme_neophyte/data/in_checked.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/in_checkedhi.png b/cinelerra-5.1/plugins/theme_neophyte/data/in_checkedhi.png index 26a5b242..90dcf417 100644 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/in_checkedhi.png and b/cinelerra-5.1/plugins/theme_neophyte/data/in_checkedhi.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/in_dn.png b/cinelerra-5.1/plugins/theme_neophyte/data/in_dn.png index 4bc1d217..f6c2ad19 100644 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/in_dn.png and b/cinelerra-5.1/plugins/theme_neophyte/data/in_dn.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/in_hi.png b/cinelerra-5.1/plugins/theme_neophyte/data/in_hi.png index 12f01f16..a865963f 100644 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/in_hi.png and b/cinelerra-5.1/plugins/theme_neophyte/data/in_hi.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/in_up.png b/cinelerra-5.1/plugins/theme_neophyte/data/in_up.png index d4bd6495..b5bf85eb 100644 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/in_up.png and b/cinelerra-5.1/plugins/theme_neophyte/data/in_up.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/inpoint.png b/cinelerra-5.1/plugins/theme_neophyte/data/inpoint.png index a26c86ba..40a9bc09 100644 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/inpoint.png and b/cinelerra-5.1/plugins/theme_neophyte/data/inpoint.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/label_checked.png b/cinelerra-5.1/plugins/theme_neophyte/data/label_checked.png index c33ca103..92d43898 100644 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/label_checked.png and b/cinelerra-5.1/plugins/theme_neophyte/data/label_checked.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/label_checkedhi.png b/cinelerra-5.1/plugins/theme_neophyte/data/label_checkedhi.png index e912d210..cb0b1cee 100644 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/label_checkedhi.png and b/cinelerra-5.1/plugins/theme_neophyte/data/label_checkedhi.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/labeltoggle_dn.png b/cinelerra-5.1/plugins/theme_neophyte/data/labeltoggle_dn.png index 774dff5b..9318a119 100644 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/labeltoggle_dn.png and b/cinelerra-5.1/plugins/theme_neophyte/data/labeltoggle_dn.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/labeltoggle_up.png b/cinelerra-5.1/plugins/theme_neophyte/data/labeltoggle_up.png index 2fcefea4..caf0eafa 100644 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/labeltoggle_up.png and b/cinelerra-5.1/plugins/theme_neophyte/data/labeltoggle_up.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/labeltoggle_uphi.png b/cinelerra-5.1/plugins/theme_neophyte/data/labeltoggle_uphi.png index 4379299c..dc8b13bb 100644 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/labeltoggle_uphi.png and b/cinelerra-5.1/plugins/theme_neophyte/data/labeltoggle_uphi.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/loadmode_cat.png b/cinelerra-5.1/plugins/theme_neophyte/data/loadmode_cat.png index a103c436..5eaf545b 100644 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/loadmode_cat.png and b/cinelerra-5.1/plugins/theme_neophyte/data/loadmode_cat.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/loadmode_checked.png b/cinelerra-5.1/plugins/theme_neophyte/data/loadmode_checked.png index b3701565..9ce36747 100644 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/loadmode_checked.png and b/cinelerra-5.1/plugins/theme_neophyte/data/loadmode_checked.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/loadmode_checkedhi.png b/cinelerra-5.1/plugins/theme_neophyte/data/loadmode_checkedhi.png index 2a5c484e..acfeff0b 100644 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/loadmode_checkedhi.png and b/cinelerra-5.1/plugins/theme_neophyte/data/loadmode_checkedhi.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/loadmode_dn.png b/cinelerra-5.1/plugins/theme_neophyte/data/loadmode_dn.png index 0f5ceeef..19d43427 100644 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/loadmode_dn.png and b/cinelerra-5.1/plugins/theme_neophyte/data/loadmode_dn.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/loadmode_hi.png b/cinelerra-5.1/plugins/theme_neophyte/data/loadmode_hi.png index dded1505..7da2c458 100644 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/loadmode_hi.png and b/cinelerra-5.1/plugins/theme_neophyte/data/loadmode_hi.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/loadmode_nested.png b/cinelerra-5.1/plugins/theme_neophyte/data/loadmode_nested.png index a1bb86b5..629093e0 100644 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/loadmode_nested.png and b/cinelerra-5.1/plugins/theme_neophyte/data/loadmode_nested.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/loadmode_new.png b/cinelerra-5.1/plugins/theme_neophyte/data/loadmode_new.png index 11d5a0df..45b4475f 100644 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/loadmode_new.png and b/cinelerra-5.1/plugins/theme_neophyte/data/loadmode_new.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/loadmode_newcat.png b/cinelerra-5.1/plugins/theme_neophyte/data/loadmode_newcat.png index ac851116..12706aa5 100644 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/loadmode_newcat.png and b/cinelerra-5.1/plugins/theme_neophyte/data/loadmode_newcat.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/loadmode_newtracks.png b/cinelerra-5.1/plugins/theme_neophyte/data/loadmode_newtracks.png index 017ef88b..e35b40aa 100644 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/loadmode_newtracks.png and b/cinelerra-5.1/plugins/theme_neophyte/data/loadmode_newtracks.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/loadmode_none.png b/cinelerra-5.1/plugins/theme_neophyte/data/loadmode_none.png index 6efb68f3..1078278d 100644 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/loadmode_none.png and b/cinelerra-5.1/plugins/theme_neophyte/data/loadmode_none.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/loadmode_paste.png b/cinelerra-5.1/plugins/theme_neophyte/data/loadmode_paste.png index f1bcef7c..77e91b50 100644 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/loadmode_paste.png and b/cinelerra-5.1/plugins/theme_neophyte/data/loadmode_paste.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/loadmode_resource.png b/cinelerra-5.1/plugins/theme_neophyte/data/loadmode_resource.png index c1efcf44..49f382e5 100644 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/loadmode_resource.png and b/cinelerra-5.1/plugins/theme_neophyte/data/loadmode_resource.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/loadmode_ressource.png b/cinelerra-5.1/plugins/theme_neophyte/data/loadmode_ressource.png new file mode 100644 index 00000000..9fa29a04 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_neophyte/data/loadmode_ressource.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/loadmode_up.png b/cinelerra-5.1/plugins/theme_neophyte/data/loadmode_up.png index 1bd32e7f..ee9893e1 100644 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/loadmode_up.png and b/cinelerra-5.1/plugins/theme_neophyte/data/loadmode_up.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/mixpatch_checked.png b/cinelerra-5.1/plugins/theme_neophyte/data/mixpatch_checked.png new file mode 100644 index 00000000..25830770 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_neophyte/data/mixpatch_checked.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/mixpatch_checkedhi.png b/cinelerra-5.1/plugins/theme_neophyte/data/mixpatch_checkedhi.png new file mode 100644 index 00000000..80d01e8c Binary files /dev/null and b/cinelerra-5.1/plugins/theme_neophyte/data/mixpatch_checkedhi.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/mixpatch_dn.png b/cinelerra-5.1/plugins/theme_neophyte/data/mixpatch_dn.png new file mode 100644 index 00000000..4a3c2e60 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_neophyte/data/mixpatch_dn.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/mixpatch_hi.png b/cinelerra-5.1/plugins/theme_neophyte/data/mixpatch_hi.png new file mode 100644 index 00000000..bca1e037 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_neophyte/data/mixpatch_hi.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/mixpatch_up.png b/cinelerra-5.1/plugins/theme_neophyte/data/mixpatch_up.png new file mode 100644 index 00000000..4175f4d7 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_neophyte/data/mixpatch_up.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/mode_and.png b/cinelerra-5.1/plugins/theme_neophyte/data/mode_and.png index dbbc4e20..d6b5fbc6 100644 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/mode_and.png and b/cinelerra-5.1/plugins/theme_neophyte/data/mode_and.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/mode_burn.png b/cinelerra-5.1/plugins/theme_neophyte/data/mode_burn.png index f465a6ba..aa879f3c 100644 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/mode_burn.png and b/cinelerra-5.1/plugins/theme_neophyte/data/mode_burn.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/mode_darken.png b/cinelerra-5.1/plugins/theme_neophyte/data/mode_darken.png index 2c3f6c8a..53ff297c 100644 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/mode_darken.png and b/cinelerra-5.1/plugins/theme_neophyte/data/mode_darken.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/mode_difference.png b/cinelerra-5.1/plugins/theme_neophyte/data/mode_difference.png index c036b9d9..82916fdc 100644 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/mode_difference.png and b/cinelerra-5.1/plugins/theme_neophyte/data/mode_difference.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/mode_dodge.png b/cinelerra-5.1/plugins/theme_neophyte/data/mode_dodge.png index 68eed2ac..d4cad03b 100644 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/mode_dodge.png and b/cinelerra-5.1/plugins/theme_neophyte/data/mode_dodge.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/mode_dst.png b/cinelerra-5.1/plugins/theme_neophyte/data/mode_dst.png index 933eb89c..d2a7a387 100644 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/mode_dst.png and b/cinelerra-5.1/plugins/theme_neophyte/data/mode_dst.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/mode_dstatop.png b/cinelerra-5.1/plugins/theme_neophyte/data/mode_dstatop.png index 8ac13873..be3a58e8 100644 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/mode_dstatop.png and b/cinelerra-5.1/plugins/theme_neophyte/data/mode_dstatop.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/mode_dstin.png b/cinelerra-5.1/plugins/theme_neophyte/data/mode_dstin.png index 7fab8e1b..a0e14365 100644 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/mode_dstin.png and b/cinelerra-5.1/plugins/theme_neophyte/data/mode_dstin.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/mode_dstout.png b/cinelerra-5.1/plugins/theme_neophyte/data/mode_dstout.png index 09cfb006..49e66da5 100644 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/mode_dstout.png and b/cinelerra-5.1/plugins/theme_neophyte/data/mode_dstout.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/mode_dstover.png b/cinelerra-5.1/plugins/theme_neophyte/data/mode_dstover.png index d9328280..c348a711 100644 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/mode_dstover.png and b/cinelerra-5.1/plugins/theme_neophyte/data/mode_dstover.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/mode_hardlight.png b/cinelerra-5.1/plugins/theme_neophyte/data/mode_hardlight.png index d9b9b64a..0a9b528d 100644 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/mode_hardlight.png and b/cinelerra-5.1/plugins/theme_neophyte/data/mode_hardlight.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/mode_lighten.png b/cinelerra-5.1/plugins/theme_neophyte/data/mode_lighten.png index fa9a5877..eb7b12cd 100644 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/mode_lighten.png and b/cinelerra-5.1/plugins/theme_neophyte/data/mode_lighten.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/mode_max.png b/cinelerra-5.1/plugins/theme_neophyte/data/mode_max.png index de0ffbea..af9ead41 100644 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/mode_max.png and b/cinelerra-5.1/plugins/theme_neophyte/data/mode_max.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/mode_min.png b/cinelerra-5.1/plugins/theme_neophyte/data/mode_min.png index eff2d446..d21b60b5 100644 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/mode_min.png and b/cinelerra-5.1/plugins/theme_neophyte/data/mode_min.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/mode_or.png b/cinelerra-5.1/plugins/theme_neophyte/data/mode_or.png index 9a531226..3cf364d6 100644 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/mode_or.png and b/cinelerra-5.1/plugins/theme_neophyte/data/mode_or.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/mode_overlay.png b/cinelerra-5.1/plugins/theme_neophyte/data/mode_overlay.png index 5351dae8..d9338352 100644 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/mode_overlay.png and b/cinelerra-5.1/plugins/theme_neophyte/data/mode_overlay.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/mode_screen.png b/cinelerra-5.1/plugins/theme_neophyte/data/mode_screen.png index 4d34376a..70fce613 100644 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/mode_screen.png and b/cinelerra-5.1/plugins/theme_neophyte/data/mode_screen.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/mode_softlight.png b/cinelerra-5.1/plugins/theme_neophyte/data/mode_softlight.png index 6a101a63..1f1a40b0 100644 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/mode_softlight.png and b/cinelerra-5.1/plugins/theme_neophyte/data/mode_softlight.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/mode_src.png b/cinelerra-5.1/plugins/theme_neophyte/data/mode_src.png index 1b0038d8..5785e67c 100644 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/mode_src.png and b/cinelerra-5.1/plugins/theme_neophyte/data/mode_src.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/mode_srcatop.png b/cinelerra-5.1/plugins/theme_neophyte/data/mode_srcatop.png index 36426557..90e373f6 100644 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/mode_srcatop.png and b/cinelerra-5.1/plugins/theme_neophyte/data/mode_srcatop.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/mode_srcin.png b/cinelerra-5.1/plugins/theme_neophyte/data/mode_srcin.png index 31bcc425..4bf1a8bb 100644 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/mode_srcin.png and b/cinelerra-5.1/plugins/theme_neophyte/data/mode_srcin.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/mode_srcout.png b/cinelerra-5.1/plugins/theme_neophyte/data/mode_srcout.png index 6119c40a..cc8441be 100644 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/mode_srcout.png and b/cinelerra-5.1/plugins/theme_neophyte/data/mode_srcout.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/mode_srcover.png b/cinelerra-5.1/plugins/theme_neophyte/data/mode_srcover.png index a8ff0f26..3ece8bca 100644 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/mode_srcover.png and b/cinelerra-5.1/plugins/theme_neophyte/data/mode_srcover.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/mode_xor.png b/cinelerra-5.1/plugins/theme_neophyte/data/mode_xor.png index c7f6765a..83867b84 100644 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/mode_xor.png and b/cinelerra-5.1/plugins/theme_neophyte/data/mode_xor.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/out_checked.png b/cinelerra-5.1/plugins/theme_neophyte/data/out_checked.png index 07b6840e..22d9d71d 100644 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/out_checked.png and b/cinelerra-5.1/plugins/theme_neophyte/data/out_checked.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/out_checkedhi.png b/cinelerra-5.1/plugins/theme_neophyte/data/out_checkedhi.png index e0d0bde5..e2d92ca1 100644 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/out_checkedhi.png and b/cinelerra-5.1/plugins/theme_neophyte/data/out_checkedhi.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/out_dn.png b/cinelerra-5.1/plugins/theme_neophyte/data/out_dn.png index c6a1626b..d6014d74 100644 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/out_dn.png and b/cinelerra-5.1/plugins/theme_neophyte/data/out_dn.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/out_hi.png b/cinelerra-5.1/plugins/theme_neophyte/data/out_hi.png index 9548b762..fc4cc29d 100644 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/out_hi.png and b/cinelerra-5.1/plugins/theme_neophyte/data/out_hi.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/out_up.png b/cinelerra-5.1/plugins/theme_neophyte/data/out_up.png index 38a8f7fb..b0baa3a4 100644 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/out_up.png and b/cinelerra-5.1/plugins/theme_neophyte/data/out_up.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/outpoint.png b/cinelerra-5.1/plugins/theme_neophyte/data/outpoint.png index e41870fa..804af1d6 100644 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/outpoint.png and b/cinelerra-5.1/plugins/theme_neophyte/data/outpoint.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/path3954-0.png b/cinelerra-5.1/plugins/theme_neophyte/data/path3954-0.png deleted file mode 100644 index 27104441..00000000 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/path3954-0.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/path3954-1.png b/cinelerra-5.1/plugins/theme_neophyte/data/path3954-1.png deleted file mode 100644 index b48867e8..00000000 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/path3954-1.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/period.png b/cinelerra-5.1/plugins/theme_neophyte/data/period.png deleted file mode 100644 index 072f5e5b..00000000 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/period.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/picture.png b/cinelerra-5.1/plugins/theme_neophyte/data/picture.png index c634d408..643ea15c 100644 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/picture.png and b/cinelerra-5.1/plugins/theme_neophyte/data/picture.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/proxy_p_chkd.png b/cinelerra-5.1/plugins/theme_neophyte/data/proxy_p_chkd.png index 2d7ce462..fa30e1a6 100644 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/proxy_p_chkd.png and b/cinelerra-5.1/plugins/theme_neophyte/data/proxy_p_chkd.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/proxy_p_chkdhi.png b/cinelerra-5.1/plugins/theme_neophyte/data/proxy_p_chkdhi.png index ad7f2f6c..e71d17d7 100644 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/proxy_p_chkdhi.png and b/cinelerra-5.1/plugins/theme_neophyte/data/proxy_p_chkdhi.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/proxy_p_down.png b/cinelerra-5.1/plugins/theme_neophyte/data/proxy_p_down.png index b4b443d0..e36b8da1 100644 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/proxy_p_down.png and b/cinelerra-5.1/plugins/theme_neophyte/data/proxy_p_down.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/proxy_p_hi.png b/cinelerra-5.1/plugins/theme_neophyte/data/proxy_p_hi.png index f607902f..df13dc36 100644 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/proxy_p_hi.png and b/cinelerra-5.1/plugins/theme_neophyte/data/proxy_p_hi.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/proxy_p_up.png b/cinelerra-5.1/plugins/theme_neophyte/data/proxy_p_up.png index ac659593..13041f94 100644 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/proxy_p_up.png and b/cinelerra-5.1/plugins/theme_neophyte/data/proxy_p_up.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/proxy_s_chkd.png b/cinelerra-5.1/plugins/theme_neophyte/data/proxy_s_chkd.png index 8c8b6b7a..9fb6eefc 100644 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/proxy_s_chkd.png and b/cinelerra-5.1/plugins/theme_neophyte/data/proxy_s_chkd.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/proxy_s_chkdhi.png b/cinelerra-5.1/plugins/theme_neophyte/data/proxy_s_chkdhi.png index a90fa9d0..7c13bb52 100644 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/proxy_s_chkdhi.png and b/cinelerra-5.1/plugins/theme_neophyte/data/proxy_s_chkdhi.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/proxy_s_down.png b/cinelerra-5.1/plugins/theme_neophyte/data/proxy_s_down.png index 7ecffa32..e36b8da1 100644 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/proxy_s_down.png and b/cinelerra-5.1/plugins/theme_neophyte/data/proxy_s_down.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/proxy_s_hi.png b/cinelerra-5.1/plugins/theme_neophyte/data/proxy_s_hi.png index 4663f003..d03ee34c 100644 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/proxy_s_hi.png and b/cinelerra-5.1/plugins/theme_neophyte/data/proxy_s_hi.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/proxy_s_up.png b/cinelerra-5.1/plugins/theme_neophyte/data/proxy_s_up.png index a8e02bfc..a69d8fa3 100644 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/proxy_s_up.png and b/cinelerra-5.1/plugins/theme_neophyte/data/proxy_s_up.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/radial_checked.png b/cinelerra-5.1/plugins/theme_neophyte/data/radial_checked.png index f0c6b58f..dd853b27 100644 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/radial_checked.png and b/cinelerra-5.1/plugins/theme_neophyte/data/radial_checked.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/radial_checkedhi.png b/cinelerra-5.1/plugins/theme_neophyte/data/radial_checkedhi.png index b04c3843..1bd3f413 100644 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/radial_checkedhi.png and b/cinelerra-5.1/plugins/theme_neophyte/data/radial_checkedhi.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/radial_dn.png b/cinelerra-5.1/plugins/theme_neophyte/data/radial_dn.png index 5f4361b2..00e139dd 100644 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/radial_dn.png and b/cinelerra-5.1/plugins/theme_neophyte/data/radial_dn.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/radial_hi.png b/cinelerra-5.1/plugins/theme_neophyte/data/radial_hi.png index 1ae82db3..3337428d 100644 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/radial_hi.png and b/cinelerra-5.1/plugins/theme_neophyte/data/radial_hi.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/radial_up.png b/cinelerra-5.1/plugins/theme_neophyte/data/radial_up.png index 2e6f32f7..f5b8f4fb 100644 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/radial_up.png and b/cinelerra-5.1/plugins/theme_neophyte/data/radial_up.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/rename.png b/cinelerra-5.1/plugins/theme_neophyte/data/rename.png index 71e36db8..fcb81bdb 100644 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/rename.png and b/cinelerra-5.1/plugins/theme_neophyte/data/rename.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/scope.png b/cinelerra-5.1/plugins/theme_neophyte/data/scope.png index bef250d8..f76ca479 100644 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/scope.png and b/cinelerra-5.1/plugins/theme_neophyte/data/scope.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/space.png b/cinelerra-5.1/plugins/theme_neophyte/data/space.png deleted file mode 100644 index c8147f05..00000000 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/space.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/text1473-8-6.png b/cinelerra-5.1/plugins/theme_neophyte/data/text1473-8-6.png deleted file mode 100644 index 580e737a..00000000 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/text1473-8-6.png and /dev/null differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/waveform.png b/cinelerra-5.1/plugins/theme_neophyte/data/waveform.png index fb81e31a..b6a52d8c 100644 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/waveform.png and b/cinelerra-5.1/plugins/theme_neophyte/data/waveform.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/waveform_rgb.png b/cinelerra-5.1/plugins/theme_neophyte/data/waveform_rgb.png index c529ce15..c5008755 100644 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/waveform_rgb.png and b/cinelerra-5.1/plugins/theme_neophyte/data/waveform_rgb.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/ypane_up.png b/cinelerra-5.1/plugins/theme_neophyte/data/ypane_up.png index 321bf0c8..8000523f 100644 Binary files a/cinelerra-5.1/plugins/theme_neophyte/data/ypane_up.png and b/cinelerra-5.1/plugins/theme_neophyte/data/ypane_up.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/neophyte.C b/cinelerra-5.1/plugins/theme_neophyte/neophyte.C index bd974dc0..e3e0055e 100644 --- a/cinelerra-5.1/plugins/theme_neophyte/neophyte.C +++ b/cinelerra-5.1/plugins/theme_neophyte/neophyte.C @@ -56,11 +56,12 @@ #define BlackFive 0xf2f2f2 // 5% black #define BabyBlue 0x5f8dd3 // baby-blue #define BabyBlueDark 0x162d50 // baby-blue -3 (inkscape), e.g. dialog Subtitle -#define ComicYellow 0xffcc00 -#define DarkRed 0xaa0000 +// traffic lights +// light green 0x27ae60/0x37c871 - just on the buttons. +#define ComicYellow 0xffcc00 // heads up! +#define DarkRed 0xaa0000 // locked or not switched on. #define LockedRed 0x400000 - PluginClient* new_plugin(PluginServer *server) { return new NEOPHYTETHEMEMain(server); @@ -105,7 +106,15 @@ void NEOPHYTETHEME::initialize() { BC_Resources *resources = BC_WindowBase::get_resources(); - resources->text_default = CreamyWhite; // + // something own, fitting to the theme and independent of the integrated splash screen/about + about_bg = new_image("about_bg.png"); // Preferences: About (logo) + // new_image("mwindow_icon", "cinelerra_icon_mwin.png"); // replacement for the heroine icon, maybe + // new_image("vwindow_icon", "cinelerra_icon_vwin.png"); + // new_image("cwindow_icon", "cinelerra_icon_cwin.png"); + // new_image("awindow_icon", "cinelerra_icon_awin.png"); + // new_image("record_icon", "cinelerra_icon_rec.png"); + + resources->text_default = CreamyWhite; // general text color resources->text_background = BlackNineTwo; // resources->text_background_disarmed = LockedRed; // arm track locked (!) @@ -113,21 +122,23 @@ void NEOPHYTETHEME::initialize() resources->text_border1 = BLACK; // l,t inside resources->text_border3 = BlackSevenTwo; // r,d inside resources->text_border4 = BlackNineTwo; // r,d outside - - resources->text_inactive_highlight = BabyBlueDark; // e.g. Subtitle, baby-blue -3 + resources->text_border2_hi = ComicYellow; // highlighting on mouseover + resources->text_border3_hi = ComicYellow; + + resources->text_inactive_highlight = BabyBlueDark; // e.g. Subtitle (double click on inactive text, choose next or prev and be amazed). resources->text_highlight = BabyBlue; - resources->bg_color = BlackEightFive; // 85% black + resources->bg_color = BlackEightFive; resources->border_light2 = resources->bg_color; resources->border_shadow2 = resources->bg_color; - resources->default_text_color = CreamyWhite; // Timeline, dialogs and much more - resources->menu_title_text = WHITE; // + resources->default_text_color = CreamyWhite; // Timeline, dialogs and much more. + resources->menu_title_text = WHITE; // high contrast resources->popup_title_text = WHITE; // resources->menu_item_text = WHITE; // resources->menu_highlighted_fontcolor = CreamyWhiteBright; - resources->generic_button_margin = 30; // [15] + resources->generic_button_margin = 20; // [15] (Pref top right, 17) resources->pot_needle_color = CreamyWhite; // [resources->text_default] – marginal resources->pot_offset = 1; // only the needle resources->progress_text = resources->text_default; @@ -151,7 +162,7 @@ void NEOPHYTETHEME::initialize() resources->listbox_border3 = BlackSevenTwo; resources->listbox_border4 = BlackNineTwo; // ../../guicast/bcresources.C:684: - resources->listbox_border2_hi = BabyBlue; // Highlighting on mouseover + resources->listbox_border2_hi = BabyBlue; // highlighting on mouseover resources->listbox_border3_hi = BabyBlue; resources->listbox_highlighted = BabyBlue; // recources, loadfiles @@ -172,12 +183,16 @@ void NEOPHYTETHEME::initialize() recordgui_fixed_color = YELLOW; // recordgui_variable_color = RED; // [RED] - channel_position_color = ComicYellow; // Set Format + channel_position_color = ComicYellow; // Set Format, speaker numbers resources->meter_title_w = 25; // (asset) edit info text color - edit_font_color = ALARM; // ? ../../cinelerra/theme.h:282 + edit_font_color = ComicYellow; // ? ../../cinelerra/theme.h:282 + assetedit_color = CreamyWhiteBright; // variable attributes + // flash_color = ALARM; // ../../cinelerra/recordgui.C:135 + timebar_cursor_color = WHITE; // ../../cinelerra/theme.C:73 + // tooltip ../../guicast/bcresources.C:786 resources->tooltip_bg_color = CreamyWhiteBright; // resources->tooltip_fg_color = ALARM; // undefined. @@ -438,7 +453,7 @@ void NEOPHYTETHEME::initialize() "file_size_zero_up.png", "file_size_zero_hi.png", "file_size_zero_dn.png"); - + resources->listbox_column = new_image_set(3, "column_up.png", "column_hi.png", @@ -567,6 +582,9 @@ void NEOPHYTETHEME::initialize() new_image_set("plugin_on", 5, "plugin_on.png", "plugin_onhi.png", "plugin_onselect.png", "plugin_ondn.png", "plugin_onselecthi.png"); new_image_set("plugin_show", 5, "plugin_show.png", "plugin_showhi.png", "plugin_showselect.png", "plugin_showdn.png", "plugin_showselecthi.png"); + // Mixer + new_image_set("mixpatch_data", 5, "mixpatch_up.png", "mixpatch_hi.png", "mixpatch_checked.png", "mixpatch_dn.png", "mixpatch_checkedhi.png"); + // CWindow new_image("cpanel_bg", "cpanel_bg.png"); new_image("cbuttons_left", "cbuttons_left.png"); @@ -688,7 +706,7 @@ void NEOPHYTETHEME::initialize() "proxy_p_down.png", "proxy_p_chkdhi.png"); - proxy_s_toggle = new_image_set(5, + proxy_s_toggle = new_image_set(5, // proxy use ffmpeg scaler "proxy_s_up.png", "proxy_s_hi.png", "proxy_s_chkd.png", @@ -770,7 +788,7 @@ void NEOPHYTETHEME::initialize() new_button("histogram_img.png", editpanel_up, editpanel_hi, editpanel_dn, "histogram_img"); new_button("copy.png", editpanel_up, editpanel_hi, editpanel_dn, "copy"); - new_button("commercial.png", editpanel_up, editpanel_hi, editpanel_dn, "commercial"); + new_button("commercial.png", editpanel_up, editpanel_hi, editpanel_dn, "commercial"); // ? new_button("cut.png", editpanel_up, editpanel_hi, editpanel_dn, "cut"); new_button("fit.png", editpanel_up, editpanel_hi, editpanel_dn, "fit"); new_button("fitautos.png", editpanel_up, editpanel_hi, editpanel_dn, "fitautos"); @@ -854,7 +872,6 @@ void NEOPHYTETHEME::initialize() VFrame *cpanel_checked = new_image("cpanel_checked.png"); VFrame *cpanel_checkedhi = new_image("cpanel_checkedhi.png"); - new_toggle("camera.png", cpanel_up, cpanel_hi, cpanel_checked, cpanel_dn, cpanel_checkedhi, "camera"); new_toggle("crop.png", cpanel_up, cpanel_hi, cpanel_checked, cpanel_dn, cpanel_checkedhi, "crop"); new_toggle("eyedrop.png", cpanel_up, cpanel_hi, cpanel_checked, cpanel_dn, cpanel_checkedhi, "eyedrop");