projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
version update
[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 71adc84715ba2c83fb34234d08327678e65030d1..5716c37e87ffb23297da62c6430eff2169c33854 100644
(file)
--- a/
cinelerra-5.1/cinelerra/mwindowgui.C
+++ b/
cinelerra-5.1/cinelerra/mwindowgui.C
@@
-36,6
+36,7
@@
#include "edl.h"
#include "edlsession.h"
#include "filesystem.h"
#include "edl.h"
#include "edlsession.h"
#include "filesystem.h"
+#include "filexml.h"
#include "keyframepopup.h"
#include "keys.h"
#include "language.h"
#include "keyframepopup.h"
#include "keys.h"
#include "language.h"
@@
-269,7
+270,7
@@
void MWindowGUI::create_objects()
if(debug) printf("MWindowGUI::create_objects %d\n", __LINE__);
if(debug) printf("MWindowGUI::create_objects %d\n", __LINE__);
- int x = get_w() - MainShBtns::calculate_w(
0
);
+ int x = get_w() - MainShBtns::calculate_w(
-1, 0, -1
);
add_subwindow(mainmenu = new MainMenu(mwindow, this, x));
mainmenu->create_objects();
add_subwindow(mainshbtns = new MainShBtns(mwindow, x, -1));
add_subwindow(mainmenu = new MainMenu(mwindow, this, x));
mainmenu->create_objects();
add_subwindow(mainshbtns = new MainShBtns(mwindow, x, -1));
@@
-410,7
+411,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 x = w - MainShBtns::calculate_w(
0
);
+ int x = w - MainShBtns::calculate_w(
-1, 0, -1
);
mainmenu->resize_event(x, mainmenu->get_h());
mainshbtns->reposition_window(x, -1);
mwindow->theme->get_mwindow_sizes(this, w, h);
mainmenu->resize_event(x, mainmenu->get_h());
mainshbtns->reposition_window(x, -1);
mwindow->theme->get_mwindow_sizes(this, w, h);
@@
-931,9
+932,9
@@
int MWindowGUI::visible(int64_t x1, int64_t x2, int64_t view_x1, int64_t view_x2
}
}
-void MWindowGUI::show_message(const char *message, int color)
+void MWindowGUI::show_message(const char *message, int
msg_color, int bar_
color)
{
{
- statusbar->show_message(message, color);
+ statusbar->show_message(message,
msg_color, bar_
color);
}
void MWindowGUI::update_default_message()
}
void MWindowGUI::update_default_message()
@@
-1007,6
+1008,7
@@
int MWindowGUI::drag_motion()
if( mwindow->session->current_operation == DRAG_ASSET ||
mwindow->session->current_operation == DRAG_EDIT ||
if( mwindow->session->current_operation == DRAG_ASSET ||
mwindow->session->current_operation == DRAG_EDIT ||
+ mwindow->session->current_operation == DRAG_GROUP ||
mwindow->session->current_operation == DRAG_AEFFECT_COPY ||
mwindow->session->current_operation == DRAG_VEFFECT_COPY )
{
mwindow->session->current_operation == DRAG_AEFFECT_COPY ||
mwindow->session->current_operation == DRAG_VEFFECT_COPY )
{
@@
-1171,7
+1173,7
@@
int MWindowGUI::keypress_event()
if( result ) return result;
Track *this_track = 0, *first_track = 0;
if( result ) return result;
Track *this_track = 0, *first_track = 0;
- int collapse = 0, packed = 0, overwrite = 0;
+ int collapse = 0, packed = 0, overwrite = 0
, plugins = 0
;
double position = 0;
switch( get_keypress() ) {
double position = 0;
switch( get_keypress() ) {
@@
-1198,9
+1200,11
@@
int MWindowGUI::keypress_event()
packed = 1;
case 'c':
if( !ctrl_down() || alt_down() ) break;
packed = 1;
case 'c':
if( !ctrl_down() || alt_down() ) break;
- mwindow->selected_to_clipboard(packed);
+ mwindow->selected_
edits_
to_clipboard(packed);
result = 1;
break;
result = 1;
break;
+ case 'P':
+ plugins = 1;
case 'b':
overwrite = -1; // fall thru
case 'v':
case 'b':
overwrite = -1; // fall thru
case 'v':
@@
-1221,13
+1225,17
@@
int MWindowGUI::keypress_event()
}
else
position = mwindow->edl->local_session->get_selectionstart();
}
else
position = mwindow->edl->local_session->get_selectionstart();
- mwindow->paste(position, first_track, 0, overwrite);
+ if( !plugins )
+ mwindow->paste(position, first_track, 0, overwrite);
+ else
+ mwindow->paste_clipboard(first_track, position, 1, 0, 1, 1, 1);
mwindow->edl->tracks->clear_selected_edits();
draw_overlays(1);
result = 1;
break;
case 'M':
collapse = 1;
mwindow->edl->tracks->clear_selected_edits();
draw_overlays(1);
result = 1;
break;
case 'M':
collapse = 1;
+ case BACKSPACE:
case 'm':
mwindow->cut_selected_edits(0, collapse);
result = 1;
case 'm':
mwindow->cut_selected_edits(0, collapse);
result = 1;
@@
-1240,8
+1248,7
@@
int MWindowGUI::keypress_event()
result = 1;
break;
result = 1;
break;
- case '1': case '2': case '3': case '4':
- case '5': case '6': case '7': case '8':
+ case '1' ... '8':
if( !alt_down() || shift_down() ) break;
if( !mwindow->select_asset(get_keypress()-'1',1) )
result = 1;
if( !alt_down() || shift_down() ) break;
if( !mwindow->select_asset(get_keypress()-'1',1) )
result = 1;
@@
-1355,18
+1362,7
@@
int MWindowGUI::keypress_event()
result = 1;
break;
result = 1;
break;
- case KEY_F1:
- case KEY_F2:
- case KEY_F3:
- case KEY_F4:
- case KEY_F5:
- case KEY_F6:
- case KEY_F7:
- case KEY_F8:
- case KEY_F9:
- case KEY_F10:
- case KEY_F11:
- case KEY_F12:
+ case KEY_F1 ... KEY_F12:
resend_event(mwindow->cwindow->gui);
return 1;
}
resend_event(mwindow->cwindow->gui);
return 1;
}
@@
-2353,7
+2349,7
@@
void MWindowGUI::stop_transport(const char *lock_msg)
{
if( !mbuttons->transport->is_stopped() ) {
if( lock_msg ) unlock_window();
{
if( !mbuttons->transport->is_stopped() ) {
if( lock_msg ) unlock_window();
- mbuttons->transport->handle_transport(STOP, 1
, 0, 0
);
+ mbuttons->transport->handle_transport(STOP, 1);
if( lock_msg ) lock_window(lock_msg);
}
}
if( lock_msg ) lock_window(lock_msg);
}
}