projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
repair default keyframe load, tweak init default histogram threshold
[goodguy/history.git]
/
cinelerra-5.1
/
cinelerra
/
editpanel.C
diff --git
a/cinelerra-5.1/cinelerra/editpanel.C
b/cinelerra-5.1/cinelerra/editpanel.C
index 32b2e848481e5dcd8a1e13081660df9b1e5a1f2a..b539bda46f1a0ba84cbac969180259a543569001 100644
(file)
--- a/
cinelerra-5.1/cinelerra/editpanel.C
+++ b/
cinelerra-5.1/cinelerra/editpanel.C
@@
-953,6
+953,8
@@
EditCut::~EditCut()
}
int EditCut::keypress_event()
{
}
int EditCut::keypress_event()
{
+ if( ctrl_down() || shift_down() || alt_down() )
+ return 0;
if( get_keypress() == 'x' )
return handle_event();
return 0;
if( get_keypress() == 'x' )
return handle_event();
return 0;
@@
-984,10
+986,12
@@
EditClick2Play::EditClick2Play(MWindow *mwindow, EditPanel *panel, int x, int y)
int EditClick2Play::handle_event()
{
int value = get_value();
int EditClick2Play::handle_event()
{
int value = get_value();
- if( !panel->is_vwindow() )
- mwindow->edl->session->cwindow_click2play = value;
- else
+ if( panel->is_vwindow() ) {
mwindow->edl->session->vwindow_click2play = value;
mwindow->edl->session->vwindow_click2play = value;
+ mwindow->update_vwindow();
+ }
+ else
+ mwindow->edl->session->cwindow_click2play = value;
return 1;
}
int EditClick2Play::keypress_event()
return 1;
}
int EditClick2Play::keypress_event()
@@
-996,10
+1000,12
@@
int EditClick2Play::keypress_event()
if( key == 'p' && !ctrl_down() && !shift_down() && !alt_down() ) {
int value = get_value() ? 0 : 1;
update(value);
if( key == 'p' && !ctrl_down() && !shift_down() && !alt_down() ) {
int value = get_value() ? 0 : 1;
update(value);
- if( !panel->is_vwindow() )
- mwindow->edl->session->cwindow_click2play = value;
- else
+ if( panel->is_vwindow() ) {
mwindow->edl->session->vwindow_click2play = value;
mwindow->edl->session->vwindow_click2play = value;
+ mwindow->update_vwindow();
+ }
+ else
+ mwindow->edl->session->cwindow_click2play = value;
return 1;
}
return 0;
return 1;
}
return 0;
@@
-1011,14
+1017,16
@@
EditCommercial::EditCommercial(MWindow *mwindow, EditPanel *panel, int x, int y)
{
this->mwindow = mwindow;
this->panel = panel;
{
this->mwindow = mwindow;
this->panel = panel;
- set_tooltip(_("Commercial ( shift
X
)"));
+ set_tooltip(_("Commercial ( shift
A
)"));
}
EditCommercial::~EditCommercial()
{
}
int EditCommercial::keypress_event()
{
}
EditCommercial::~EditCommercial()
{
}
int EditCommercial::keypress_event()
{
- if( get_keypress() == 'X' )
+ if( ctrl_down() || !shift_down() || alt_down() )
+ return 0;
+ if( get_keypress() == 'A' )
return handle_event();
return 0;
}
return handle_event();
return 0;
}
@@
-1180,6
+1188,8
@@
EditUndo::~EditUndo()
}
int EditUndo::keypress_event()
{
}
int EditUndo::keypress_event()
{
+ if( ctrl_down() || shift_down() || alt_down() )
+ return 0;
if( get_keypress() == 'z' )
return handle_event();
return 0;
if( get_keypress() == 'z' )
return handle_event();
return 0;
@@
-1202,6
+1212,8
@@
EditRedo::~EditRedo()
}
int EditRedo::keypress_event()
{
}
int EditRedo::keypress_event()
{
+ if( ctrl_down() || !shift_down() || alt_down() )
+ return 0;
if( get_keypress() == 'Z' )
return handle_event();
return 0;
if( get_keypress() == 'Z' )
return handle_event();
return 0;
@@
-1398,7
+1410,7
@@
LockLabelsButton::LockLabelsButton(MWindow *mwindow, int x, int y)
"", 0, 0, 0)
{
this->mwindow = mwindow;
"", 0, 0, 0)
{
this->mwindow = mwindow;
- set_tooltip(_("Lock labels from moving"));
+ set_tooltip(_("Lock labels from moving
with edits
"));
}
int LockLabelsButton::handle_event()
}
int LockLabelsButton::handle_event()