X-Git-Url: http://git.cinelerra-gg.org/git/?p=goodguy%2Fhistory.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fzoompanel.C;h=e826e30bd837e7f8f39d9ea869292a56ae9deb8b;hp=c272b123e239b1d31ac5f0c59dcd4543363946f0;hb=HEAD;hpb=30bdb85eb33a8ee7ba675038a86c6be59c43d7bd

diff --git a/cinelerra-5.1/cinelerra/zoompanel.C b/cinelerra-5.1/cinelerra/zoompanel.C
index c272b123..e826e30b 100644
--- a/cinelerra-5.1/cinelerra/zoompanel.C
+++ b/cinelerra-5.1/cinelerra/zoompanel.C
@@ -45,30 +45,8 @@ ZoomHash::~ZoomHash()
 }
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-ZoomPanel::ZoomPanel(MWindow *mwindow,
-	BC_WindowBase *subwindow,
-	double value,
-	int x,
-	int y,
-	int w,
-	double min,
-	double max,
-	int zoom_type)
+ZoomPanel::ZoomPanel(MWindow *mwindow, BC_WindowBase *subwindow, double value,
+		int x, int y, int w, double min, double max, int zoom_type)
 {
 	this->mwindow = mwindow;
 	this->subwindow = subwindow;
@@ -79,21 +57,12 @@ ZoomPanel::ZoomPanel(MWindow *mwindow,
 	this->min = min;
 	this->max = max;
 	this->zoom_type = zoom_type;
-	this->menu_images = 0;
-	this->tumbler_images = 0;
 	this->user_table = 0;
 	this->user_size = 0;
 }
 
-ZoomPanel::ZoomPanel(MWindow *mwindow,
-	BC_WindowBase *subwindow,
-	double value,
-	int x,
-	int y,
-	int w,
-	double *user_table,
-	int user_size,
-	int zoom_type)
+ZoomPanel::ZoomPanel(MWindow *mwindow, BC_WindowBase *subwindow, double value,
+		int x, int y, int w, double *user_table, int user_size, int zoom_type)
 {
 	this->mwindow = mwindow;
 	this->subwindow = subwindow;
@@ -104,8 +73,6 @@ ZoomPanel::ZoomPanel(MWindow *mwindow,
 	this->min = min;
 	this->max = max;
 	this->zoom_type = zoom_type;
-	this->menu_images = 0;
-	this->tumbler_images = 0;
 	this->user_table = user_table;
 	this->user_size = user_size;
 }
@@ -144,36 +111,17 @@ int ZoomPanel::calculate_w(int menu_w)
 
 void ZoomPanel::update_menu()
 {
-	while(zoom_text->total_items())
-	{
-		zoom_text->remove_item(0);
-	}
+	while(zoom_text->total_items()) zoom_text->del_item(0);
 
 	zoom_table.remove_all_objects();
 	calculate_menu();
 }
 
-void ZoomPanel::set_menu_images(VFrame **data)
-{
-	this->menu_images = data;
-}
-
-void ZoomPanel::set_tumbler_images(VFrame **data)
-{
-	this->tumbler_images = data;
-}
-
 void ZoomPanel::create_objects()
 {
-	subwindow->add_subwindow(zoom_text = new ZoomPopup(mwindow,
-		this,
-		x,
-		y));
+	subwindow->add_subwindow(zoom_text = new ZoomPopup(mwindow, this, x, y));
 	x += zoom_text->get_w();
-	subwindow->add_subwindow(zoom_tumbler = new ZoomTumbler(mwindow,
-		this,
-		x,
-		y));
+	subwindow->add_subwindow(zoom_tumbler = new ZoomTumbler(mwindow, this, x, y));
 	calculate_menu();
 }
 
@@ -205,6 +153,12 @@ void ZoomPanel::set_text(const char *text)
 	zoom_text->set_text(text);
 }
 
+void ZoomPanel::set_tooltip(const char *text)
+{
+	zoom_text->set_tooltip(text);
+	zoom_tumbler->set_tooltip(text);
+}
+
 void ZoomPanel::update(double value)
 {
 	this->value = value;
@@ -312,12 +266,8 @@ double ZoomPanel::text_to_zoom(char *text, int use_table)
 
 
 ZoomPopup::ZoomPopup(MWindow *mwindow, ZoomPanel *panel, int x, int y)
- : BC_PopupMenu(x,
-		y,
-		panel->w,
-		panel->value_to_text(panel->value, 0),
-		1,
-		panel->menu_images)
+ : BC_PopupMenu(x, y, panel->w, panel->value_to_text(panel->value, 0),
+	1, mwindow->theme->get_image_set("zoombar_menu", 0))
 {
 	this->mwindow = mwindow;
 	this->panel = panel;
@@ -337,9 +287,7 @@ int ZoomPopup::handle_event()
 
 
 ZoomTumbler::ZoomTumbler(MWindow *mwindow, ZoomPanel *panel, int x, int y)
- : BC_Tumbler(x,
- 	y,
- 	panel->tumbler_images)
+ : BC_Tumbler(x, y, mwindow->theme->get_image_set("zoombar_tumbler", 0))
 {
 	this->mwindow = mwindow;
 	this->panel = panel;