projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rework cpozer zoom slider
[goodguy/history.git]
/
cinelerra-5.1
/
cinelerra
/
cwindowgui.h
diff --git
a/cinelerra-5.1/cinelerra/cwindowgui.h
b/cinelerra-5.1/cinelerra/cwindowgui.h
index 33913e5c17b8bf5fe89eac1cfb2f02d7951eff00..44a0b607be5f5547c2a18d595fb6215975064b70 100644
(file)
--- a/
cinelerra-5.1/cinelerra/cwindowgui.h
+++ b/
cinelerra-5.1/cinelerra/cwindowgui.h
@@
-32,6
+32,7
@@
#include "floatauto.inc"
#include "floatautos.inc"
#include "guicast.h"
#include "floatauto.inc"
#include "floatautos.inc"
#include "guicast.h"
+#include "language.h"
#include "mainclock.inc"
#include "maskauto.inc"
#include "meterpanel.h"
#include "mainclock.inc"
#include "maskauto.inc"
#include "meterpanel.h"
@@
-51,7
+52,7
@@
class CWindowCanvas;
class CWindowEditing;
class CWindowEditing;
-#define AUTO_ZOOM
"Auto"
+#define AUTO_ZOOM
N_("Auto")
class CWindowGUI : public BC_Window
{
class CWindowGUI : public BC_Window
{
@@
-59,8
+60,10
@@
public:
CWindowGUI(MWindow *mwindow, CWindow *cwindow);
~CWindowGUI();
CWindowGUI(MWindow *mwindow, CWindow *cwindow);
~CWindowGUI();
- void create_objects();
+
void create_objects();
int resize_event(int w, int h);
int resize_event(int w, int h);
+ void zoom_canvas(double value, int update_menu);
+ float get_auto_zoom();
// Events for the fullscreen canvas fall through to here.
int button_press_event();
// Events for the fullscreen canvas fall through to here.
int button_press_event();
@@
-69,9
+72,6
@@
public:
int button_release_event();
int cursor_motion_event();
int button_release_event();
int cursor_motion_event();
-
- void zoom_canvas(int do_auto, double value, int update_menu);
-
int close_event();
int keypress_event();
int translation_event();
int close_event();
int keypress_event();
int translation_event();
@@
-87,7
+87,8
@@
public:
void update_meters();
MWindow *mwindow;
void update_meters();
MWindow *mwindow;
- CWindow *cwindow;
+ CWindow *cwindow;
+ const char *auto_zoom;
CWindowEditing *edit_panel;
// APanel *automation_panel;
CPanel *composite_panel;
CWindowEditing *edit_panel;
// APanel *automation_panel;
CPanel *composite_panel;
@@
-151,6
+152,7
@@
public:
// Must recalculate the origin when pressing shift.
// Switch toggle on and off to recalculate origin.
int translating_zoom;
// Must recalculate the origin when pressing shift.
// Switch toggle on and off to recalculate origin.
int translating_zoom;
+ int highlighted;
};
};
@@
-197,6
+199,7
@@
public:
CWindowZoom(MWindow *mwindow, CWindowGUI *gui, int x, int y, int w);
virtual ~CWindowZoom();
int handle_event();
CWindowZoom(MWindow *mwindow, CWindowGUI *gui, int x, int y, int w);
virtual ~CWindowZoom();
int handle_event();
+ void update(double value);
MWindow *mwindow;
CWindowGUI *gui;
};
MWindow *mwindow;
CWindowGUI *gui;
};