X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;ds=sidebyside;f=cinelerra-5.1%2Fplugins%2Ftitler%2Ftitlerwindow.h;h=0a5122b485470e6a4f3ca16c9a4d5229b3b1eea9;hb=1f004d22ca7bd7a98a3bf02b12ec5b1adece92f2;hp=5af1c7aad67ff8626f8021671d00b49572e371f8;hpb=72a6abf751403bd91464e77ff2cece01c9756a6b;p=goodguy%2Fhistory.git diff --git a/cinelerra-5.1/plugins/titler/titlerwindow.h b/cinelerra-5.1/plugins/titler/titlerwindow.h index 5af1c7aa..0a5122b4 100644 --- a/cinelerra-5.1/plugins/titler/titlerwindow.h +++ b/cinelerra-5.1/plugins/titler/titlerwindow.h @@ -29,17 +29,17 @@ class TitleWindow; class TitleInterlace; #include "colorpicker.h" +#include "dragcheckbox.h" #include "filexml.h" #include "mutex.h" #include "titler.h" - - - +#include class TitleFontTumble; class TitleSizeTumble; class TitleItalic; +class TitleAlias; class TitleBold; class TitleDrag; class TitleSize; @@ -54,6 +54,8 @@ class TitleLinePitch; class TitleFade; class TitleFont; class TitleText; +class TitleTextChars; +class TitleTextBfrSz; class TitleX; class TitleY; class TitleW; @@ -88,15 +90,18 @@ public: void create_objects(); int resize_event(int w, int h); - int grab_event(XEvent *event); + void update_drag(); void update_color(); void update_justification(); + void update_stats(); void update(); void previous_font(); void next_font(); - void check_style(const char *font_name); - int insert_ibeam(const char *txt, int adv); + void check_style(const char *font_name, int update); + int insert_ibeam(const char *txt, int ofs=0); void done_event(int result); + void send_configure_change(); + int check_configure_change(int ret); TitleMain *client; @@ -119,6 +124,7 @@ public: TitleStroker *stroker; BC_Title *style_title; TitleItalic *italic; + TitleAlias *alias; TitleBold *bold; TitleDrag *drag; TitleCurPopup *cur_popup; @@ -129,7 +135,7 @@ public: int color_x, color_y; int outline_color_x, outline_color_y; int drag_dx, drag_dy, dragging; - int cur_ibeam; + int cur_ibeam, pending_config; BC_Title *size_title; TitleSize *size; @@ -152,6 +158,8 @@ public: TitleFade *fade_out; BC_Title *text_title; TitleText *text; + TitleTextChars *text_chars; + TitleTextBfrSz *text_bfrsz; BC_Title *justify_title; TitleLeft *left; TitleCenter *center; @@ -202,7 +210,14 @@ public: }; - +class TitleAlias : public BC_CheckBox +{ +public: + TitleAlias(TitleMain *client, TitleWindow *window, int x, int y); + int handle_event(); + TitleMain *client; + TitleWindow *window; +}; class TitleItalic : public BC_CheckBox { public: @@ -219,11 +234,15 @@ public: TitleMain *client; TitleWindow *window; }; -class TitleDrag : public BC_CheckBox +class TitleDrag : public DragCheckBox { public: TitleDrag(TitleMain *client, TitleWindow *window, int x, int y); int handle_event(); + void update_gui(); + Track *get_drag_track(); + int64_t get_drag_position(); + TitleMain *client; TitleWindow *window; }; @@ -290,7 +309,7 @@ public: class TitleLoop : public BC_CheckBox { public: - TitleLoop(TitleMain *client, int x, int y); + TitleLoop(TitleMain *client, TitleWindow *window, int x, int y); int handle_event(); TitleMain *client; TitleWindow *window; @@ -298,7 +317,7 @@ public: class TitleLinePitch : public BC_CheckBox { public: - TitleLinePitch(TitleMain *client, int x, int y); + TitleLinePitch(TitleMain *client, TitleWindow *window, int x, int y); int handle_event(); TitleMain *client; TitleWindow *window; @@ -307,19 +326,21 @@ public: class TitleTimecode : public BC_CheckBox { public: - TitleTimecode(TitleMain *client, int x, int y); + TitleTimecode(TitleMain *client, TitleWindow *window, int x, int y); int handle_event(); TitleMain *client; + TitleWindow *window; }; class TitleTimecodeFormat : public BC_PopupMenu { public: - TitleTimecodeFormat(TitleMain *client, int x, int y, const char *text); + TitleTimecodeFormat(TitleMain *client, TitleWindow *window, int x, int y, const char *text); void create_objects(); int update(int timecode_format); int handle_event(); TitleMain *client; + TitleWindow *window; }; class TitleFade : public BC_TextBox @@ -353,6 +374,21 @@ public: TitleMain *client; TitleWindow *window; }; +class TitleTextChars : public BC_Title +{ +public: + int update(int n); + TitleTextChars(int x, int y, int w); + ~TitleTextChars(); +}; +class TitleTextBfrSz : public BC_Title +{ +public: + int update(int n); + TitleTextBfrSz(int x, int y, int w); + ~TitleTextBfrSz(); +}; + class TitleX : public BC_TumbleTextBox { public: @@ -419,6 +455,7 @@ public: TitleSpeed(TitleMain *client, TitleWindow *window, int x, int y); int handle_event(); TitleMain *client; + TitleWindow *window; }; class TitleLeft : public BC_Radial @@ -470,7 +507,7 @@ public: TitleMain *client; TitleWindow *window; }; -class TitleColorThread : public ColorThread +class TitleColorThread : public ColorPicker { public: TitleColorThread(TitleMain *client, TitleWindow *window, int is_outline); @@ -498,7 +535,7 @@ public: class TitleLoopPlayback : public BC_CheckBox { public: - TitleLoopPlayback(TitleMain *client, int x, int y); + TitleLoopPlayback(TitleMain *client, TitleWindow *window, int x, int y); int handle_event(); TitleMain *client; TitleWindow *window; @@ -526,23 +563,32 @@ public: TitleCurPopup *popup; }; +enum { POPUP_OFFSET=-1, POPUP_NONE=0, POPUP_FONT, POPUP_COLOR, POPUP_PNG, }; + class TitleCurSubMenu : public BC_SubMenu { public: TitleCurSubMenu(TitleCurItem *cur_item); ~TitleCurSubMenu(); - + void add_subitemx(int popup_type, va_list ap, const char *fmt); + void add_subitem(int popup_type, const char *fmt,...) { va_list ap; + va_start(ap, fmt); add_subitemx(popup_type, ap, fmt); va_end(ap); + } + void add_subitem(const char *fmt,...) { va_list ap; + va_start(ap, fmt); add_subitemx(POPUP_NONE, ap, fmt); va_end(ap); + } TitleCurItem *cur_item; }; class TitleCurSubMenuItem : public BC_MenuItem { public: - TitleCurSubMenuItem(TitleCurSubMenu *submenu, const char *text); + TitleCurSubMenuItem(TitleCurSubMenu *submenu, const char *text, int popup_type); ~TitleCurSubMenuItem(); int handle_event(); TitleCurSubMenu *submenu; + int popup_type; }; class TitleFontsPopup : public BC_ListBox @@ -550,13 +596,17 @@ class TitleFontsPopup : public BC_ListBox public: TitleFontsPopup(TitleMain *client, TitleWindow *window); ~TitleFontsPopup(); + int keypress_event(); int handle_event(); + int show_tooltip(const char *text, int x,int y, int w,int h) { + return gui_tooltip(text); + } TitleMain *client; TitleWindow *window; }; -class TitleColorPopup : public ColorThread +class TitleColorPopup : public ColorPicker { public: TitleColorPopup(TitleMain *client, TitleWindow *window);