From: Good Guy Date: Mon, 22 Jul 2019 00:13:52 +0000 (-0600) Subject: add unclear btn icons, make both bksp and ctrl-m mute edit selection X-Git-Tag: 2019-08~14 X-Git-Url: https://git.cinelerra-gg.org/git/?a=commitdiff_plain;h=b41dd1dd566139b56bafbe84e95be600b2f5ddfc;p=goodguy%2Fcinelerra.git add unclear btn icons, make both bksp and ctrl-m mute edit selection --- diff --git a/cinelerra-5.1/cinelerra/cwindowtool.C b/cinelerra-5.1/cinelerra/cwindowtool.C index 3a0d72b8..04457c83 100644 --- a/cinelerra-5.1/cinelerra/cwindowtool.C +++ b/cinelerra-5.1/cinelerra/cwindowtool.C @@ -1750,7 +1750,7 @@ int CWindowMaskEnable::handle_event() CWindowMaskUnclear::CWindowMaskUnclear(MWindow *mwindow, CWindowMaskGUI *gui, int x, int y) - : BC_Button(x, y, mwindow->theme->get_image_set("reset_button")) + : BC_Button(x, y, mwindow->theme->get_image_set("unclear_button")) { this->mwindow = mwindow; this->gui = gui; diff --git a/cinelerra-5.1/cinelerra/mwindowgui.C b/cinelerra-5.1/cinelerra/mwindowgui.C index b3209c83..5716c37e 100644 --- a/cinelerra-5.1/cinelerra/mwindowgui.C +++ b/cinelerra-5.1/cinelerra/mwindowgui.C @@ -1235,6 +1235,7 @@ int MWindowGUI::keypress_event() break; case 'M': collapse = 1; + case BACKSPACE: case 'm': mwindow->cut_selected_edits(0, collapse); result = 1; diff --git a/cinelerra-5.1/plugins/theme_blond/blondtheme.C b/cinelerra-5.1/plugins/theme_blond/blondtheme.C index 51aa61aa..6314eac8 100644 --- a/cinelerra-5.1/plugins/theme_blond/blondtheme.C +++ b/cinelerra-5.1/plugins/theme_blond/blondtheme.C @@ -282,6 +282,12 @@ void BlondTheme::initialize() "reset_dn.png", "reset_button"); + new_button("unclear.png", + "unclear_up.png", + "unclear_hi.png", + "unclear_dn.png", + "unclear_button"); + resources->cancel_images = new_button("cancel.png", "filebox_bigbutton_up.png", "filebox_bigbutton_hi.png", diff --git a/cinelerra-5.1/plugins/theme_blond/data/unclear.png b/cinelerra-5.1/plugins/theme_blond/data/unclear.png new file mode 100644 index 00000000..8e631961 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blond/data/unclear.png differ diff --git a/cinelerra-5.1/plugins/theme_blond/data/unclear_dn.png b/cinelerra-5.1/plugins/theme_blond/data/unclear_dn.png new file mode 100644 index 00000000..9d9eefe6 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blond/data/unclear_dn.png differ diff --git a/cinelerra-5.1/plugins/theme_blond/data/unclear_hi.png b/cinelerra-5.1/plugins/theme_blond/data/unclear_hi.png new file mode 100644 index 00000000..d0863324 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blond/data/unclear_hi.png differ diff --git a/cinelerra-5.1/plugins/theme_blond/data/unclear_up.png b/cinelerra-5.1/plugins/theme_blond/data/unclear_up.png new file mode 100644 index 00000000..bf161e8e Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blond/data/unclear_up.png differ diff --git a/cinelerra-5.1/plugins/theme_blond_cv/blondcvtheme.C b/cinelerra-5.1/plugins/theme_blond_cv/blondcvtheme.C index 5ff85860..93e19e12 100644 --- a/cinelerra-5.1/plugins/theme_blond_cv/blondcvtheme.C +++ b/cinelerra-5.1/plugins/theme_blond_cv/blondcvtheme.C @@ -335,6 +335,12 @@ void BlondCVTheme::initialize() "reset_dn.png", "reset_button"); + new_button("unclear.png", + "unclear_up.png", + "unclear_hi.png", + "unclear_dn.png", + "unclear_button"); + resources->cancel_images = new_button("cancel.png", "generic_up.png", "generic_hi.png", diff --git a/cinelerra-5.1/plugins/theme_blond_cv/data/unclear.png b/cinelerra-5.1/plugins/theme_blond_cv/data/unclear.png new file mode 100644 index 00000000..8e631961 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blond_cv/data/unclear.png differ diff --git a/cinelerra-5.1/plugins/theme_blond_cv/data/unclear_dn.png b/cinelerra-5.1/plugins/theme_blond_cv/data/unclear_dn.png new file mode 100644 index 00000000..d8c9dc5a Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blond_cv/data/unclear_dn.png differ diff --git a/cinelerra-5.1/plugins/theme_blond_cv/data/unclear_hi.png b/cinelerra-5.1/plugins/theme_blond_cv/data/unclear_hi.png new file mode 100644 index 00000000..83b42a8d Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blond_cv/data/unclear_hi.png differ diff --git a/cinelerra-5.1/plugins/theme_blond_cv/data/unclear_up.png b/cinelerra-5.1/plugins/theme_blond_cv/data/unclear_up.png new file mode 100644 index 00000000..ac9b2bc9 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blond_cv/data/unclear_up.png differ diff --git a/cinelerra-5.1/plugins/theme_blue/bluetheme.C b/cinelerra-5.1/plugins/theme_blue/bluetheme.C index 2a99932b..fb1160ab 100644 --- a/cinelerra-5.1/plugins/theme_blue/bluetheme.C +++ b/cinelerra-5.1/plugins/theme_blue/bluetheme.C @@ -282,6 +282,12 @@ void BlueDotTheme::initialize() "reset_dn.png", "reset_button"); + new_button("unclear.png", + "unclear_up.png", + "unclear_hi.png", + "unclear_dn.png", + "unclear_button"); + resources->cancel_images = new_button("cancel.png", "filebox_bigbutton_up.png", "filebox_bigbutton_hi.png", diff --git a/cinelerra-5.1/plugins/theme_blue/data/unclear.png b/cinelerra-5.1/plugins/theme_blue/data/unclear.png new file mode 100644 index 00000000..21316f04 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blue/data/unclear.png differ diff --git a/cinelerra-5.1/plugins/theme_blue/data/unclear_dn.png b/cinelerra-5.1/plugins/theme_blue/data/unclear_dn.png new file mode 100644 index 00000000..35a37147 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blue/data/unclear_dn.png differ diff --git a/cinelerra-5.1/plugins/theme_blue/data/unclear_hi.png b/cinelerra-5.1/plugins/theme_blue/data/unclear_hi.png new file mode 100644 index 00000000..9fb80b7b Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blue/data/unclear_hi.png differ diff --git a/cinelerra-5.1/plugins/theme_blue/data/unclear_up.png b/cinelerra-5.1/plugins/theme_blue/data/unclear_up.png new file mode 100644 index 00000000..fc52498d Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blue/data/unclear_up.png differ diff --git a/cinelerra-5.1/plugins/theme_blue_dot/bluedottheme.C b/cinelerra-5.1/plugins/theme_blue_dot/bluedottheme.C index 5304adf1..3a0bd3d6 100644 --- a/cinelerra-5.1/plugins/theme_blue_dot/bluedottheme.C +++ b/cinelerra-5.1/plugins/theme_blue_dot/bluedottheme.C @@ -293,6 +293,12 @@ void BlueDotTheme::initialize() "reset_dn.png", "reset_button"); + new_button("unclear.png", + "unclear_up.png", + "unclear_hi.png", + "unclear_dn.png", + "unclear_button"); + resources->cancel_images = new_button("cancel.png", "generic_up.png", "generic_hi.png", diff --git a/cinelerra-5.1/plugins/theme_blue_dot/data/unclear.png b/cinelerra-5.1/plugins/theme_blue_dot/data/unclear.png new file mode 100644 index 00000000..c3915883 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blue_dot/data/unclear.png differ diff --git a/cinelerra-5.1/plugins/theme_blue_dot/data/unclear_dn.png b/cinelerra-5.1/plugins/theme_blue_dot/data/unclear_dn.png new file mode 100644 index 00000000..80cb7a62 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blue_dot/data/unclear_dn.png differ diff --git a/cinelerra-5.1/plugins/theme_blue_dot/data/unclear_hi.png b/cinelerra-5.1/plugins/theme_blue_dot/data/unclear_hi.png new file mode 100644 index 00000000..88ca0fff Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blue_dot/data/unclear_hi.png differ diff --git a/cinelerra-5.1/plugins/theme_blue_dot/data/unclear_up.png b/cinelerra-5.1/plugins/theme_blue_dot/data/unclear_up.png new file mode 100644 index 00000000..996aa58c Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blue_dot/data/unclear_up.png differ diff --git a/cinelerra-5.1/plugins/theme_bright/brighttheme.C b/cinelerra-5.1/plugins/theme_bright/brighttheme.C index ffb70f32..c953613f 100644 --- a/cinelerra-5.1/plugins/theme_bright/brighttheme.C +++ b/cinelerra-5.1/plugins/theme_bright/brighttheme.C @@ -289,6 +289,12 @@ void BrightTheme::initialize() "reset_dn.png", "reset_button"); + new_button("unclear.png", + "unclear_up.png", + "unclear_hi.png", + "unclear_dn.png", + "unclear_button"); + resources->cancel_images = new_button("cancel.png", "bigbutton_up.png", "bigbutton_hi.png", diff --git a/cinelerra-5.1/plugins/theme_bright/data/unclear.png b/cinelerra-5.1/plugins/theme_bright/data/unclear.png new file mode 100644 index 00000000..15299274 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_bright/data/unclear.png differ diff --git a/cinelerra-5.1/plugins/theme_bright/data/unclear_dn.png b/cinelerra-5.1/plugins/theme_bright/data/unclear_dn.png new file mode 100644 index 00000000..8f117f2a Binary files /dev/null and b/cinelerra-5.1/plugins/theme_bright/data/unclear_dn.png differ diff --git a/cinelerra-5.1/plugins/theme_bright/data/unclear_hi.png b/cinelerra-5.1/plugins/theme_bright/data/unclear_hi.png new file mode 100644 index 00000000..c9005881 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_bright/data/unclear_hi.png differ diff --git a/cinelerra-5.1/plugins/theme_bright/data/unclear_up.png b/cinelerra-5.1/plugins/theme_bright/data/unclear_up.png new file mode 100644 index 00000000..830d9b3c Binary files /dev/null and b/cinelerra-5.1/plugins/theme_bright/data/unclear_up.png differ diff --git a/cinelerra-5.1/plugins/theme_cakewalk/cakewalk.C b/cinelerra-5.1/plugins/theme_cakewalk/cakewalk.C index ed6294ff..b4f82f09 100644 --- a/cinelerra-5.1/plugins/theme_cakewalk/cakewalk.C +++ b/cinelerra-5.1/plugins/theme_cakewalk/cakewalk.C @@ -272,6 +272,11 @@ void CAKEWALKTHEME::initialize() "reset_hi.png", "reset_dn.png", "reset_button"); + new_button("unclear.png", + "unclear_up.png", + "unclear_hi.png", + "unclear_dn.png", + "unclear_button"); resources->cancel_images = new_button( "cancel.png", "filebox_bigbutton_up.png", diff --git a/cinelerra-5.1/plugins/theme_cakewalk/data/unclear.png b/cinelerra-5.1/plugins/theme_cakewalk/data/unclear.png new file mode 100644 index 00000000..e24890da Binary files /dev/null and b/cinelerra-5.1/plugins/theme_cakewalk/data/unclear.png differ diff --git a/cinelerra-5.1/plugins/theme_cakewalk/data/unclear_dn.png b/cinelerra-5.1/plugins/theme_cakewalk/data/unclear_dn.png new file mode 100644 index 00000000..260d66a4 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_cakewalk/data/unclear_dn.png differ diff --git a/cinelerra-5.1/plugins/theme_cakewalk/data/unclear_hi.png b/cinelerra-5.1/plugins/theme_cakewalk/data/unclear_hi.png new file mode 100644 index 00000000..d7a212f2 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_cakewalk/data/unclear_hi.png differ diff --git a/cinelerra-5.1/plugins/theme_cakewalk/data/unclear_up.png b/cinelerra-5.1/plugins/theme_cakewalk/data/unclear_up.png new file mode 100644 index 00000000..260d66a4 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_cakewalk/data/unclear_up.png differ diff --git a/cinelerra-5.1/plugins/theme_hulk/data/unclear.png b/cinelerra-5.1/plugins/theme_hulk/data/unclear.png new file mode 100644 index 00000000..52309832 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_hulk/data/unclear.png differ diff --git a/cinelerra-5.1/plugins/theme_hulk/data/unclear_dn.png b/cinelerra-5.1/plugins/theme_hulk/data/unclear_dn.png new file mode 100644 index 00000000..6290fe52 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_hulk/data/unclear_dn.png differ diff --git a/cinelerra-5.1/plugins/theme_hulk/data/unclear_hi.png b/cinelerra-5.1/plugins/theme_hulk/data/unclear_hi.png new file mode 100644 index 00000000..51f166c7 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_hulk/data/unclear_hi.png differ diff --git a/cinelerra-5.1/plugins/theme_hulk/data/unclear_up.png b/cinelerra-5.1/plugins/theme_hulk/data/unclear_up.png new file mode 100644 index 00000000..bcbdc94d Binary files /dev/null and b/cinelerra-5.1/plugins/theme_hulk/data/unclear_up.png differ diff --git a/cinelerra-5.1/plugins/theme_hulk/hulktheme.C b/cinelerra-5.1/plugins/theme_hulk/hulktheme.C index 1fc23d87..cf0b6d2f 100644 --- a/cinelerra-5.1/plugins/theme_hulk/hulktheme.C +++ b/cinelerra-5.1/plugins/theme_hulk/hulktheme.C @@ -283,6 +283,12 @@ void HULKTHEME::initialize() "reset_dn.png", "reset_button"); + new_button("unclear.png", + "unclear_up.png", + "unclear_hi.png", + "unclear_dn.png", + "unclear_button"); + resources->cancel_images = new_button("cancel.png", "filebox_bigbutton_up.png", "filebox_bigbutton_hi.png", diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/unclear.png b/cinelerra-5.1/plugins/theme_neophyte/data/unclear.png new file mode 100644 index 00000000..c785fd8b Binary files /dev/null and b/cinelerra-5.1/plugins/theme_neophyte/data/unclear.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/unclear_dn.png b/cinelerra-5.1/plugins/theme_neophyte/data/unclear_dn.png new file mode 100644 index 00000000..482709c0 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_neophyte/data/unclear_dn.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/unclear_hi.png b/cinelerra-5.1/plugins/theme_neophyte/data/unclear_hi.png new file mode 100644 index 00000000..54eec7a2 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_neophyte/data/unclear_hi.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/unclear_up.png b/cinelerra-5.1/plugins/theme_neophyte/data/unclear_up.png new file mode 100644 index 00000000..312a2b26 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_neophyte/data/unclear_up.png differ diff --git a/cinelerra-5.1/plugins/theme_neophyte/neophyte.C b/cinelerra-5.1/plugins/theme_neophyte/neophyte.C index cce41497..987c761e 100644 --- a/cinelerra-5.1/plugins/theme_neophyte/neophyte.C +++ b/cinelerra-5.1/plugins/theme_neophyte/neophyte.C @@ -361,6 +361,12 @@ void NEOPHYTETHEME::initialize() "reset_hi.png", "reset_dn.png", "reset_button"); + new_button( + "unclear.png", + "unclear_up.png", + "unclear_hi.png", + "unclear_dn.png", + "unclear_button"); resources->cancel_images = new_button( "cancel.png", "filebox_bigbutton_up.png", diff --git a/cinelerra-5.1/plugins/theme_pinklady/data/unclear.png b/cinelerra-5.1/plugins/theme_pinklady/data/unclear.png new file mode 100644 index 00000000..1c21d1c7 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_pinklady/data/unclear.png differ diff --git a/cinelerra-5.1/plugins/theme_pinklady/data/unclear_dn.png b/cinelerra-5.1/plugins/theme_pinklady/data/unclear_dn.png new file mode 100644 index 00000000..d9eef067 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_pinklady/data/unclear_dn.png differ diff --git a/cinelerra-5.1/plugins/theme_pinklady/data/unclear_hi.png b/cinelerra-5.1/plugins/theme_pinklady/data/unclear_hi.png new file mode 100644 index 00000000..0ff5bf47 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_pinklady/data/unclear_hi.png differ diff --git a/cinelerra-5.1/plugins/theme_pinklady/data/unclear_up.png b/cinelerra-5.1/plugins/theme_pinklady/data/unclear_up.png new file mode 100644 index 00000000..a89301fb Binary files /dev/null and b/cinelerra-5.1/plugins/theme_pinklady/data/unclear_up.png differ diff --git a/cinelerra-5.1/plugins/theme_pinklady/pinkladytheme.C b/cinelerra-5.1/plugins/theme_pinklady/pinkladytheme.C index c4a2c9e0..d57d281f 100644 --- a/cinelerra-5.1/plugins/theme_pinklady/pinkladytheme.C +++ b/cinelerra-5.1/plugins/theme_pinklady/pinkladytheme.C @@ -268,6 +268,12 @@ void PINKLADY::initialize() "reset_dn.png", "reset_button"); + new_button("unclear.png", + "unclear_up.png", + "unclear_hi.png", + "unclear_dn.png", + "unclear_button"); + resources->cancel_images = new_button("cancel.png", "filebox_bigbutton_up.png", "filebox_bigbutton_hi.png", diff --git a/cinelerra-5.1/plugins/theme_suv/data/unclear.png b/cinelerra-5.1/plugins/theme_suv/data/unclear.png new file mode 100644 index 00000000..c785fd8b Binary files /dev/null and b/cinelerra-5.1/plugins/theme_suv/data/unclear.png differ diff --git a/cinelerra-5.1/plugins/theme_suv/data/unclear_dn.png b/cinelerra-5.1/plugins/theme_suv/data/unclear_dn.png new file mode 100644 index 00000000..3ce3ed80 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_suv/data/unclear_dn.png differ diff --git a/cinelerra-5.1/plugins/theme_suv/data/unclear_hi.png b/cinelerra-5.1/plugins/theme_suv/data/unclear_hi.png new file mode 100644 index 00000000..1ad1a999 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_suv/data/unclear_hi.png differ diff --git a/cinelerra-5.1/plugins/theme_suv/data/unclear_up.png b/cinelerra-5.1/plugins/theme_suv/data/unclear_up.png new file mode 100644 index 00000000..d633ed4e Binary files /dev/null and b/cinelerra-5.1/plugins/theme_suv/data/unclear_up.png differ diff --git a/cinelerra-5.1/plugins/theme_suv/suv.C b/cinelerra-5.1/plugins/theme_suv/suv.C index e07e9492..a919c2f3 100644 --- a/cinelerra-5.1/plugins/theme_suv/suv.C +++ b/cinelerra-5.1/plugins/theme_suv/suv.C @@ -279,6 +279,12 @@ void SUV::initialize() "reset_dn.png", "reset_button"); + new_button("unclear.png", + "unclear_up.png", + "unclear_hi.png", + "unclear_dn.png", + "unclear_button"); + resources->cancel_images = new_button("cancel.png", "filebox_bigbutton_up.png", "filebox_bigbutton_hi.png", diff --git a/cinelerra-5.1/plugins/theme_unflat/data/unclear.png b/cinelerra-5.1/plugins/theme_unflat/data/unclear.png new file mode 100644 index 00000000..aa7c7567 Binary files /dev/null and b/cinelerra-5.1/plugins/theme_unflat/data/unclear.png differ diff --git a/cinelerra-5.1/plugins/theme_unflat/data/unclear_dn.png b/cinelerra-5.1/plugins/theme_unflat/data/unclear_dn.png new file mode 100644 index 00000000..8bb6c13b Binary files /dev/null and b/cinelerra-5.1/plugins/theme_unflat/data/unclear_dn.png differ diff --git a/cinelerra-5.1/plugins/theme_unflat/data/unclear_hi.png b/cinelerra-5.1/plugins/theme_unflat/data/unclear_hi.png new file mode 100644 index 00000000..5f2cfe9c Binary files /dev/null and b/cinelerra-5.1/plugins/theme_unflat/data/unclear_hi.png differ diff --git a/cinelerra-5.1/plugins/theme_unflat/data/unclear_up.png b/cinelerra-5.1/plugins/theme_unflat/data/unclear_up.png new file mode 100644 index 00000000..d64532fc Binary files /dev/null and b/cinelerra-5.1/plugins/theme_unflat/data/unclear_up.png differ diff --git a/cinelerra-5.1/plugins/theme_unflat/unflattheme.C b/cinelerra-5.1/plugins/theme_unflat/unflattheme.C index 9dac9196..050b3a30 100644 --- a/cinelerra-5.1/plugins/theme_unflat/unflattheme.C +++ b/cinelerra-5.1/plugins/theme_unflat/unflattheme.C @@ -277,6 +277,12 @@ void UNFLATTHEME::initialize() "reset_dn.png", "reset_button"); + new_button("unclear.png", + "unclear_up.png", + "unclear_hi.png", + "unclear_dn.png", + "unclear_button"); + resources->cancel_images = new_button("cancel.png", "filebox_bigbutton_up.png", "filebox_bigbutton_hi.png",