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
/
clipedit.C
diff --git
a/cinelerra-5.1/cinelerra/clipedit.C
b/cinelerra-5.1/cinelerra/clipedit.C
index 29ebd9f6549fc440264cb39049fef2dbf7b480d3..7351be71dcf95fbe41f4b405c848a05b3e0e69f9 100644
(file)
--- a/
cinelerra-5.1/cinelerra/clipedit.C
+++ b/
cinelerra-5.1/cinelerra/clipedit.C
@@
-2,6
+2,7
@@
/*
* CINELERRA
* Copyright (C) 2008 Adam Williams <broadcast at earthling dot net>
/*
* CINELERRA
* Copyright (C) 2008 Adam Williams <broadcast at earthling dot net>
+ * Copyright (C) 2003-2016 Cinelerra CV contributors
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@
-131,14
+132,18
@@
void ClipEdit::create_clip(EDL *clip, int x, int y)
start();
}
start();
}
+#define CEW_W xS(400)
+#define CEW_H yS(350)
ClipEditWindow::ClipEditWindow(MWindow *mwindow, ClipEdit *thread)
: BC_Window(_(PROGRAM_NAME ": Clip Info"),
ClipEditWindow::ClipEditWindow(MWindow *mwindow, ClipEdit *thread)
: BC_Window(_(PROGRAM_NAME ": Clip Info"),
- thread->x -
400/2, thread->y - 350
/2,
-
400, 350, 400, 430
, 0, 0, 1)
+ thread->x -
CEW_W/2, thread->y - CEW_H
/2,
+
CEW_W, CEW_H, CEW_W, CEW_H
, 0, 0, 1)
{
this->mwindow = mwindow;
this->thread = thread;
{
this->mwindow = mwindow;
this->thread = thread;
+// *** CONTEXT_HELP ***
+ context_help_set_keyword("Workflow with OpenEDL and Nested Clips");
}
ClipEditWindow::~ClipEditWindow()
}
ClipEditWindow::~ClipEditWindow()
@@
-148,31
+153,33
@@
ClipEditWindow::~ClipEditWindow()
void ClipEditWindow::create_objects()
{
void ClipEditWindow::create_objects()
{
+ int xs10 = xS(10);
+ int ys5 = yS(5), ys10 = yS(10);
lock_window("ClipEditWindow::create_objects");
this->create_it = thread->create_it;
lock_window("ClipEditWindow::create_objects");
this->create_it = thread->create_it;
- int x =
10, y =
10;
+ int x =
xs10, y = ys
10;
int x1 = x;
BC_TextBox *textbox;
BC_Title *title;
add_subwindow(title = new BC_Title(x1, y, _("Title:")));
int x1 = x;
BC_TextBox *textbox;
BC_Title *title;
add_subwindow(title = new BC_Title(x1, y, _("Title:")));
- y += title->get_h() + 5;
+ y += title->get_h() +
ys
5;
add_subwindow(titlebox = new ClipEditTitle(this, x1, y, get_w() - x1 * 2));
int end = strlen(titlebox->get_text());
titlebox->set_selection(0, end, end);
add_subwindow(titlebox = new ClipEditTitle(this, x1, y, get_w() - x1 * 2));
int end = strlen(titlebox->get_text());
titlebox->set_selection(0, end, end);
- y += titlebox->get_h() + 10;
+ y += titlebox->get_h() +
ys
10;
add_subwindow(title = new BC_Title(x1, y, _("Comments:")));
add_subwindow(title = new BC_Title(x1, y, _("Comments:")));
- y += title->get_h() + 5;
+ y += title->get_h() +
ys
5;
add_subwindow(textbox = new ClipEditComments(this,
x1,
y,
get_w() - x1 * 2,
BC_TextBox::pixels_to_rows(this,
MEDIUMFONT,
add_subwindow(textbox = new ClipEditComments(this,
x1,
y,
get_w() - x1 * 2,
BC_TextBox::pixels_to_rows(this,
MEDIUMFONT,
- get_h() - 10 - BC_OKButton::calculate_h() - y)));
+ get_h() -
ys
10 - BC_OKButton::calculate_h() - y)));