p/s proxy icon, rework window locks, segv in close_mixers + exportedl, ffmpeg default...

[goodguy/history.git] / cinelerra-5.1 / plugins / theme_unflat / unflattheme.C

diff --git a/cinelerra-5.1/plugins/theme_unflat/unflattheme.C b/cinelerra-5.1/plugins/theme_unflat/unflattheme.C
index 26859167cae28a689b2b3f5c714a2dedc3faa059..5a72f3e754230ee6fb85ad713a05cd0dabeed465 100644 (file)
--- a/cinelerra-5.1/plugins/theme_unflat/unflattheme.C
+++ b/cinelerra-5.1/plugins/theme_unflat/unflattheme.C
@@ -63,10 +63,7 @@ UNFLATTHEMEMain::~UNFLATTHEMEMain()
 {
 }
 
-const char* UNFLATTHEMEMain::plugin_title()
-{
-       return _("UnFlat");
-}
+const char* UNFLATTHEMEMain::plugin_title() { return N_("UnFlat"); }
 
 Theme* UNFLATTHEMEMain::new_theme()
 {
@@ -106,6 +103,7 @@ void UNFLATTHEME::initialize()
 
        resources->text_default = 0xbfbfbf;
        resources->text_background = 0x333333;
+       resources->text_background_disarmed = 0xaf0000;
        resources->text_border1 = 0x202020;
        resources->text_border2 = 0x333333;
        resources->text_border3 = 0x333333;
@@ -619,6 +617,20 @@ void UNFLATTHEME::initialize()
                "ff_down.png",
                "ff_checkedhi.png");
 
+       proxy_p_toggle = new_image_set(5,
+               "proxy_p_up.png",
+               "proxy_p_hi.png",
+               "proxy_p_chkd.png",
+               "proxy_p_down.png",
+               "proxy_p_chkdhi.png");
+
+       proxy_s_toggle = new_image_set(5,
+               "proxy_s_up.png",
+               "proxy_s_hi.png",
+               "proxy_s_chkd.png",
+               "proxy_s_down.png",
+               "proxy_s_chkdhi.png");
+
        shbtn_data = new_image_set(3,
                "shbtn_up.png",
                "shbtn_hi.png",
@@ -656,7 +668,7 @@ void UNFLATTHEME::initialize()
        new_button("center_justify.png", editpanel_up, editpanel_hi, editpanel_dn, "center_justify");
        new_button("channel.png", editpanel_up, editpanel_hi, editpanel_dn, "channel");
 
-       new_toggle("histogram.png",
+       new_toggle("histogram_toggle.png",
                editpanel_up,
                editpanel_hi,
                editpanel_checked,