X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fplugins%2Ftheme_unflat%2Funflattheme.C;h=26859167cae28a689b2b3f5c714a2dedc3faa059;hb=0fbaff5c59fa1a3b93f5f9d344451f6aa57778d4;hp=27140de16ef1324d691ab633e1aa1e98885edb7b;hpb=30bdb85eb33a8ee7ba675038a86c6be59c43d7bd;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/plugins/theme_unflat/unflattheme.C b/cinelerra-5.1/plugins/theme_unflat/unflattheme.C
index 27140de1..26859167 100644
--- a/cinelerra-5.1/plugins/theme_unflat/unflattheme.C
+++ b/cinelerra-5.1/plugins/theme_unflat/unflattheme.C
@@ -213,49 +213,58 @@ void UNFLATTHEME::initialize()
 	resources->filebox_icons_images = new_button("icons.png",
 		"fileboxbutton_up.png",
 		"fileboxbutton_hi.png",
-		"fileboxbutton_dn.png");
+		"fileboxbutton_dn.png",
+		"filebox_icons");
 
 	resources->filebox_text_images = new_button("text.png",
 		"fileboxbutton_up.png",
 		"fileboxbutton_hi.png",
-		"fileboxbutton_dn.png");
+		"fileboxbutton_dn.png",
+		"filebox_text");
 
 	resources->filebox_newfolder_images = new_button("folder.png",
 		"fileboxbutton_up.png",
 		"fileboxbutton_hi.png",
-		"fileboxbutton_dn.png");
+		"fileboxbutton_dn.png",
+		"filebox_newfolder");
 
 	resources->filebox_rename_images = new_button("rename.png",
 		"fileboxbutton_up.png",
 		"fileboxbutton_hi.png",
-		"fileboxbutton_dn.png");
+		"fileboxbutton_dn.png",
+		"filebox_rename");
 
 	resources->filebox_updir_images = new_button("updir.png",
 		"fileboxbutton_up.png",
 		"fileboxbutton_hi.png",
-		"fileboxbutton_dn.png");
+		"fileboxbutton_dn.png",
+		"filebox_updir");
 
 	resources->filebox_delete_images = new_button("delete.png",
 		"fileboxbutton_up.png",
 		"fileboxbutton_hi.png",
-		"fileboxbutton_dn.png");
+		"fileboxbutton_dn.png",
+		"filebox_delete");
 
 	resources->filebox_reload_images = new_button("reload.png",
 		"fileboxbutton_up.png",
 		"fileboxbutton_hi.png",
-		"fileboxbutton_dn.png");
+		"fileboxbutton_dn.png",
+		"filebox_reload");
 
 
 	resources->filebox_descend_images = new_button("openfolder.png",
 		"filebox_bigbutton_up.png",
 		"filebox_bigbutton_hi.png",
-		"filebox_bigbutton_dn.png");
+		"filebox_bigbutton_dn.png",
+		"filebox_descend");
 
 	resources->usethis_button_images =
 		resources->ok_images = new_button("ok.png",
 		"filebox_bigbutton_up.png",
 		"filebox_bigbutton_hi.png",
-		"filebox_bigbutton_dn.png");
+		"filebox_bigbutton_dn.png",
+		"ok_button");
 
 	new_button("ok.png",
 		"new_bigbutton_up.png",
@@ -266,7 +275,8 @@ void UNFLATTHEME::initialize()
 	resources->cancel_images = new_button("cancel.png",
 		"filebox_bigbutton_up.png",
 		"filebox_bigbutton_hi.png",
-		"filebox_bigbutton_dn.png");
+		"filebox_bigbutton_dn.png",
+		"cancel_button");
 
 	new_button("cancel.png",
 		"new_bigbutton_up.png",
@@ -332,6 +342,16 @@ void UNFLATTHEME::initialize()
 			"hslider_bg_up.png",
 			"hslider_bg_hi.png",
 			"hslider_bg_dn.png");
+	resources->vertical_slider_data = new_image_set(6,
+			"hslider_fg_up.png",
+			"hslider_fg_hi.png",
+			"hslider_fg_dn.png",
+			"hslider_bg_up.png",
+			"hslider_bg_hi.png",
+			"hslider_bg_dn.png");
+	for( int i=0; i<6; ++i )
+		resources->vertical_slider_data[i]->rotate90();
+
 	resources->progress_images = new_image_set(2,
 			"progress_bg.png",
 			"progress_hi.png");
@@ -344,7 +364,8 @@ void UNFLATTHEME::initialize()
 		"editpanel_up.png",
 		"editpanel_hi.png",
 		"editpanel_dn.png",
-		"editpanel_hi.png");
+		"editpanel_hi.png",
+		"listbox_button");
 	resources->listbox_column = new_image_set(3,
 		"column_up.png",
 		"column_hi.png",
@@ -499,10 +520,10 @@ void UNFLATTHEME::initialize()
 	setformat_w = get_image("setformat_bg")->get_w();
 	setformat_h = get_image("setformat_bg")->get_h();
 	setformat_x1 = 15;
-	setformat_x2 = 100;
+	setformat_x2 = 110;
 
 	setformat_x3 = 315;
-	setformat_x4 = 415;
+	setformat_x4 = 425;
 	setformat_y1 = 20;
 	setformat_y2 = 85;
 	setformat_y3 = 125;
@@ -603,6 +624,12 @@ void UNFLATTHEME::initialize()
 		"shbtn_hi.png",
 		"shbtn_dn.png");
 
+	new_image_set("preset_edit",
+		3,
+		"preset_edit0.png",
+		"preset_edit1.png",
+		"preset_edit2.png");
+
 	new_image_set("histogram_carrot",
 		5,
 		"histogram_carrot_up.png",
@@ -666,7 +693,7 @@ void UNFLATTHEME::initialize()
 		"scope_toggle");
 
 	new_button("picture.png", editpanel_up, editpanel_hi, editpanel_dn, "picture");
-	new_button("histogram.png", editpanel_up, editpanel_hi, editpanel_dn, "histogram");
+	new_button("histogram_img.png", editpanel_up, editpanel_hi, editpanel_dn, "histogram_img");
 
 
 	new_button("copy.png", editpanel_up, editpanel_hi, editpanel_dn, "copy");
@@ -684,12 +711,12 @@ void UNFLATTHEME::initialize()
 	new_button("nextedit.png", editpanel_up, editpanel_hi, editpanel_dn, "nextedit");
 	new_button("prevedit.png", editpanel_up, editpanel_hi, editpanel_dn, "prevedit");
 	new_button("outpoint.png", editpanel_up, editpanel_hi, editpanel_dn, "outbutton");
-	over_button = new_button("over.png", editpanel_up, editpanel_hi, editpanel_dn);
-	overwrite_data = new_button("overwrite.png", editpanel_up, editpanel_hi, editpanel_dn);
+	over_button = new_button("over.png", editpanel_up, editpanel_hi, editpanel_dn,"overbutton");
+	overwrite_data = new_button("overwrite.png", editpanel_up, editpanel_hi, editpanel_dn,"overwritebutton");
 	new_button("paste.png", editpanel_up, editpanel_hi, editpanel_dn, "paste");
 	new_button("redo.png", editpanel_up, editpanel_hi, editpanel_dn, "redo");
 	new_button("right_justify.png", editpanel_up, editpanel_hi, editpanel_dn, "right_justify");
-	splice_data = new_button("splice.png", editpanel_up, editpanel_hi, editpanel_dn);
+	splice_data = new_button("splice.png", editpanel_up, editpanel_hi, editpanel_dn,"splicebutton");
 	new_button("toclip.png", editpanel_up, editpanel_hi, editpanel_dn, "toclip");
 	new_button("goto.png", editpanel_up, editpanel_hi, editpanel_dn, "goto");
 	new_button("top_justify.png", editpanel_up, editpanel_hi, editpanel_dn, "top_justify");