projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
terminate keyframe string in edl output
[goodguy/history.git]
/
cinelerra-5.1
/
cinelerra
/
labeledit.h
diff --git
a/cinelerra-5.1/cinelerra/labeledit.h
b/cinelerra-5.1/cinelerra/labeledit.h
index 9a9d04bb09b2d22440ef0e7dd36f0b94700dfd7a..80bf1f127e350f7254b196af5bedb6aa87a13d95 100644
(file)
--- a/
cinelerra-5.1/cinelerra/labeledit.h
+++ b/
cinelerra-5.1/cinelerra/labeledit.h
@@
-1,7
+1,7
@@
-
/*
* CINELERRA
* Copyright (C) 2006 Pierre Dumuid
/*
* CINELERRA
* Copyright (C) 2006 Pierre Dumuid
+ * Copyright (C) 2008 Adam Williams <broadcast at earthling dot net>
*
* 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
@@
-22,22
+22,26
@@
#ifndef LABELEDIT_H
#define LABELEDIT_H
#ifndef LABELEDIT_H
#define LABELEDIT_H
+#include "assetedit.inc"
+#include "assets.inc"
#include "awindow.inc"
#include "awindow.inc"
-#include "
edl
.inc"
+#include "
awindowgui
.inc"
#include "guicast.h"
#include "guicast.h"
+#include "labeledit.inc"
#include "mwindow.inc"
#include "mwindow.inc"
-#include "thread.h"
#include "vwindow.inc"
#include "vwindow.inc"
-class LabelEdit : public Thread
+class LabelEdit : public
BC_Dialog
Thread
{
public:
LabelEdit(MWindow *mwindow, AWindow *awindow, VWindow *vwindow);
~LabelEdit();
{
public:
LabelEdit(MWindow *mwindow, AWindow *awindow, VWindow *vwindow);
~LabelEdit();
- void run();
- void edit_label(Label *label);
+ BC_Window *new_gui();
+ void start(Label *label, int x, int y);
+ void handle_close_event(int result);
+ void handle_done_event(int result);
// If it is being created or edited
MWindow *mwindow;
// If it is being created or edited
MWindow *mwindow;
@@
-45,11
+49,10
@@
public:
VWindow *vwindow;
Label *label;
VWindow *vwindow;
Label *label;
+ int x, y;
+ LabelEditWindow *label_edit_window;
};
};
-
-
-
class LabelEditWindow : public BC_Window
{
public:
class LabelEditWindow : public BC_Window
{
public:
@@
-58,15
+61,12
@@
public:
void create_objects();
void create_objects();
-
-// Use this copy of the pointer in LabelEdit since multiple windows are possible
Label *label;
MWindow *mwindow;
LabelEdit *thread;
Label *label;
MWindow *mwindow;
LabelEdit *thread;
+ BC_TextBox *textbox;
};
};
-
-
class LabelEditTitle : public BC_TextBox
{
public:
class LabelEditTitle : public BC_TextBox
{
public:
@@
-75,7
+75,6
@@
public:
LabelEditWindow *window;
};
LabelEditWindow *window;
};
-
class LabelEditComments : public BC_TextBox
{
public:
class LabelEditComments : public BC_TextBox
{
public:
@@
-84,9
+83,4
@@
public:
LabelEditWindow *window;
};
LabelEditWindow *window;
};
-
-
-
-
-
#endif
#endif