preset edit button, intl fix, drag window tweak, empty keyframe edit fix

[goodguy/history.git] / cinelerra-5.1 / cinelerra / appearanceprefs.C

diff --git a/cinelerra-5.1/cinelerra/appearanceprefs.C b/cinelerra-5.1/cinelerra/appearanceprefs.C
index 46badb85276be26b9a0c7e14bdfdcf0bc6b45558..0bf2e4f5ea008ac4605eef52263ade677e7d9515 100644 (file)
--- a/cinelerra-5.1/cinelerra/appearanceprefs.C
+++ b/cinelerra-5.1/cinelerra/appearanceprefs.C
@@ -33,12 +33,6 @@
 #include "theme.h"
 
 
-#define MOVE_ALL_EDITS_TITLE N_("Drag all following edits")
-#define MOVE_ONE_EDIT_TITLE N_("Drag only one edit")
-#define MOVE_NO_EDITS_TITLE N_("Drag source only")
-#define MOVE_EDITS_DISABLED_TITLE N_("No effect")
-
-
 AppearancePrefs::AppearancePrefs(MWindow *mwindow, PreferencesWindow *pwindow)
  : PreferencesDialog(mwindow, pwindow)
 {
@@ -332,14 +326,15 @@ void ViewPluginIcons::create_objects()
        add_item(new ViewPluginIconItem(this, DEFAULT_PICON));
        FileSystem fs;
        const char *plugin_path = File::get_plugin_path();
-       if( fs.update(plugin_path) ) return;
+       char picon_path[BCTEXTLEN];
+       snprintf(picon_path,sizeof(picon_path)-1,"%s/picon", plugin_path);
+       if( fs.update(picon_path) ) return;
        for( int i=0; i<fs.dir_list.total; ++i ) {
                char *fs_path = fs.dir_list[i]->path;
                if( !fs.is_dir(fs_path) ) continue;
                char *cp = strrchr(fs_path,'/');
                cp = !cp ? fs_path : cp+1;
-               if( strncmp("picon_", cp, 6) ) continue;
-               if( !strcmp(cp += 6,DEFAULT_PICON) ) continue;
+               if( !strcmp(cp,DEFAULT_PICON) ) continue;
                add_item(new ViewPluginIconItem(this, cp));
        }
 }
@@ -516,7 +511,12 @@ HighlightInverseColor::HighlightInverseColor(PreferencesWindow *pwindow, int x,
 int HighlightInverseColor::handle_event()
 {
        int inverse_color = strtoul(get_text(),0,16);
-       inverse_color &= 0xffffff;
+       if( (inverse_color &= 0xffffff) == 0 ) {
+               inverse_color = 0xffffff;
+               char string[BCSTRLEN];
+               sprintf(string,"%06x", inverse_color);
+               update(string);
+       }
        pwindow->thread->preferences->highlight_inverse = inverse_color;
        return 1;
 }