X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fmwindowgui.h;h=2d5fd10cbe97d419e89532b59668b7943e79338a;hb=3966bf849d26244bc8b9a39fa485a808272225d0;hp=4d742667f042fac6ec01ed677d3513c15353f83a;hpb=30bdb85eb33a8ee7ba675038a86c6be59c43d7bd;p=goodguy%2Fhistory.git diff --git a/cinelerra-5.1/cinelerra/mwindowgui.h b/cinelerra-5.1/cinelerra/mwindowgui.h index 4d742667..2d5fd10c 100644 --- a/cinelerra-5.1/cinelerra/mwindowgui.h +++ b/cinelerra-5.1/cinelerra/mwindowgui.h @@ -2,21 +2,21 @@ /* * CINELERRA * Copyright (C) 1997-2014 Adam Williams - * + * * 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 * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * + * */ #ifndef MAINWINDOWGUI_H @@ -99,10 +99,10 @@ public: // FORCE_REDRAW for delete and redraw of resources // IGNORE_THREAD to ignore picon thread void update(int scrollbars, - int do_canvas, + int do_canvas, int timebar, int zoombar, - int patchbay, + int patchbay, int clock, int buttonbar); void draw_overlays(int flash_it); @@ -130,9 +130,10 @@ public: int translation_event(); int resize_event(int w, int h); // handle a resize event + int button_release_event(); int keypress_event(); int keyboard_listener(BC_WindowBase *wp); - int keyboard_listener(int key); + int key_listener(int key); void use_android_remote(int on); int close_event(); int quit(); @@ -141,8 +142,10 @@ public: int menu_w(); int menu_h(); // Draw on the status bar only. - int show_message(char *message, int color = -1); -// Pop up a box if the statusbar is taken and show an error. + void show_message(const char *message, int color=-1); + void update_default_message(); + void reset_default_message(); + void default_message(); void show_error(char *message, int color = BLACK); int repeat_event(int64_t duration); // Entry point for drag events in all windows @@ -155,7 +158,7 @@ public: // 1 if there are 2 panes horizontally int horizontal_panes(); -// get pane number where cursor updates should be drawn in, +// get pane number where cursor updates should be drawn in, // whether active or not TimelinePane* get_focused_pane(); void start_x_pane_drag(); @@ -191,6 +194,8 @@ public: EditPopup *edit_menu; PluginPopup *plugin_menu; KeyframePopup *keyframe_menu; + KeyframeHidePopup *keyframe_hide; + BC_SubWindow *keyvalue_popup; TransitionPopup *transition_menu; MainClock *mainclock; @@ -221,7 +226,6 @@ public: BC_DragWindow *drag_popup; - // PatchBay *patchbay; // MTimeBar *timebar; // SampleScroll *samplescroll;