projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add bump floatautos, add time_references for align timecodes, add menuitem create_key...
[goodguy/cinelerra.git]
/
cinelerra-5.1
/
cinelerra
/
mwindowgui.C
diff --git
a/cinelerra-5.1/cinelerra/mwindowgui.C
b/cinelerra-5.1/cinelerra/mwindowgui.C
index 7b92aa3258ae2a6635b163b0aaaff3a80329e418..34638e18480bafa4ff6d49ed50b77ded71301e16 100644
(file)
--- a/
cinelerra-5.1/cinelerra/mwindowgui.C
+++ b/
cinelerra-5.1/cinelerra/mwindowgui.C
@@
-316,7
+316,7
@@
int MWindowGUI::resize_event(int w, int h)
//printf("MWindowGUI::resize_event %d\n", __LINE__);
mwindow->session->mwindow_w = w;
mwindow->session->mwindow_h = h;
//printf("MWindowGUI::resize_event %d\n", __LINE__);
mwindow->session->mwindow_w = w;
mwindow->session->mwindow_h = h;
- int x1 =
get_w()
- MainShBtns::calculate_w(-1, 0, -1) - xS(5);
+ int x1 =
w
- MainShBtns::calculate_w(-1, 0, -1) - xS(5);
mainshbtns->reposition_window(x1, -1);
int x2 = x1 - mwindow->theme->stack_button_w - xS(5);
stack_button->reposition_window(x2, stack_button->get_y());
mainshbtns->reposition_window(x1, -1);
int x2 = x1 - mwindow->theme->stack_button_w - xS(5);
stack_button->reposition_window(x2, stack_button->get_y());
@@
-1256,18
+1256,18
@@
int MWindowGUI::keypress_event()
if( (this_track = pane[i]->over_patchbay()) != 0 ) break;
}
if( (this_track = pane[i]->over_patchbay()) != 0 ) break;
}
- if( get_keypress() == TAB ) { // Switch the
recor
d button
+ if( get_keypress() == TAB ) { // Switch the
arme
d button
if( this_track )
if( this_track )
- this_track->
record = !this_track->recor
d ? 1 : 0;
+ this_track->
armed = !this_track->arme
d ? 1 : 0;
}
else {
int total_selected = mwindow->edl->tracks->total_of(Tracks::RECORD);
// all selected if nothing previously selected or
// if this patch was previously the only one selected and armed
int selected = !total_selected || (total_selected == 1 &&
}
else {
int total_selected = mwindow->edl->tracks->total_of(Tracks::RECORD);
// all selected if nothing previously selected or
// if this patch was previously the only one selected and armed
int selected = !total_selected || (total_selected == 1 &&
- this_track && this_track->
recor
d ) ? 1 : 0;
+ this_track && this_track->
arme
d ) ? 1 : 0;
mwindow->edl->tracks->select_all(Tracks::RECORD, selected);
mwindow->edl->tracks->select_all(Tracks::RECORD, selected);
- if( !selected && this_track ) this_track->
recor
d = 1;
+ if( !selected && this_track ) this_track->
arme
d = 1;
}
update(0, NORMAL_DRAW, 0, 0, 1, 0, 1);
}
update(0, NORMAL_DRAW, 0, 0, 1, 0, 1);
@@
-2284,6
+2284,19
@@
void MWindowGUI::stop_transport(const char *lock_msg)
}
}
}
}
+void MWindowGUI::close_keyvalue_popup()
+{
+ if( !keyvalue_popup ) return;
+ delete keyvalue_popup;
+ keyvalue_popup = 0;
+}
+
+void MWindowGUI::open_keyvalue_popup(BC_SubWindow *popup)
+{
+ close_keyvalue_popup();
+ keyvalue_popup = popup;
+}
+
PaneButton::PaneButton(MWindow *mwindow, int x, int y)
: BC_Button(x, y, mwindow->theme->get_image_set("pane"))
{
PaneButton::PaneButton(MWindow *mwindow, int x, int y)
: BC_Button(x, y, mwindow->theme->get_image_set("pane"))
{