tweak loadmode icons/tooltips, change snap/grabshot default path, fix broken vicon...

diff --git a/cinelerra-5.1/cinelerra/appearanceprefs.C b/cinelerra-5.1/cinelerra/appearanceprefs.C
index 6de484032743ebb25625eefcfca6487ef72f1232..287fc4d456344f6bb016d29ecfe698dfbf1465d1 100644 (file)
--- a/cinelerra-5.1/cinelerra/appearanceprefs.C
+++ b/cinelerra-5.1/cinelerra/appearanceprefs.C
@@ -220,7 +220,7 @@ void AppearancePrefs::create_objects()
 
        x = get_w() / 3 + xs30;
        y = y1;
-       add_subwindow(title = new BC_Title(x1, y, _("Flags:"), LARGEFONT,
+       add_subwindow(title = new BC_Title(x, y, _("Flags:"), LARGEFONT,
                resources->text_default));
        y += title->get_h() + ys10;
        y1 = y;

diff --git a/cinelerra-5.1/cinelerra/assetpopup.C b/cinelerra-5.1/cinelerra/assetpopup.C
index 51e3f886a609b0e7c3f97db366045c37a26c1b90..ba828166fa48e285de9f62f922c55a863a94007b 100644 (file)
--- a/cinelerra-5.1/cinelerra/assetpopup.C
+++ b/cinelerra-5.1/cinelerra/assetpopup.C
@@ -892,12 +892,13 @@ int SnapshotMenuItem::handle_event()
        if( !edl->have_video() ) return 1;
 
        Preferences *preferences = mwindow->preferences;
-       char filename[BCTEXTLEN];
+       char filename[BCTEXTLEN], snapshot_path[BCTEXTLEN];
        static const char *exts[] = { "png", "jpg", "tif", "ppm" };
        time_t tt;     time(&tt);
        struct tm tm;  localtime_r(&tt,&tm);
+       File::getenv_path(snapshot_path, preferences->snapshot_path);
        snprintf(filename,sizeof(filename),"%s/%s_%04d%02d%02d-%02d%02d%02d.%s",
-               preferences->snapshot_path, _("snap"),
+               snapshot_path, _("snap"),
                1900+tm.tm_year,1+tm.tm_mon,tm.tm_mday,
                tm.tm_hour,tm.tm_min,tm.tm_sec, exts[mode]);
        char *asset_path = FileSystem::basepath(filename);
@@ -1117,12 +1118,13 @@ int GrabshotPopup::grab_event(XEvent *event)
 
        MWindow *mwindow = grab_thread->mwindow;
        Preferences *preferences = mwindow->preferences;
-       char filename[BCTEXTLEN];
+       char filename[BCTEXTLEN], snapshot_path[BCTEXTLEN];
        static const char *exts[] = { "png", "jpg", "tif", "ppm" };
        time_t tt;     time(&tt);
        struct tm tm;  localtime_r(&tt,&tm);
+       File::getenv_path(snapshot_path, preferences->snapshot_path);
        snprintf(filename,sizeof(filename),"%s/%s_%04d%02d%02d-%02d%02d%02d.%s",
-               preferences->snapshot_path, _("grab"),
+               snapshot_path, _("grab"),
                1900+tm.tm_year,1+tm.tm_mon,tm.tm_mday,
                tm.tm_hour,tm.tm_min,tm.tm_sec, exts[mode]);
        char *asset_path = FileSystem::basepath(filename);

diff --git a/cinelerra-5.1/cinelerra/awindowgui.C b/cinelerra-5.1/cinelerra/awindowgui.C
index dc884e55896a2d0729c7d07a58f15d7ab97dae87..a8e6c002832fa14cbcf06d1f3820f0f4d5d27877 100644 (file)
--- a/cinelerra-5.1/cinelerra/awindowgui.C
+++ b/cinelerra-5.1/cinelerra/awindowgui.C
@@ -109,6 +109,7 @@ AssetVIcon::AssetVIcon(AssetPicon *picon, int w, int h, double framerate, int64_
        this->picon = picon;
        this->length = length;
        temp = 0;
+       broken = 0;
 }
 
 AssetVIcon::~AssetVIcon()
@@ -119,6 +120,7 @@ AssetVIcon::~AssetVIcon()
 
 VFrame *AssetVIcon::frame()
 {
+       if( broken ) return 0;
        AssetVIconThread *avt = picon->gui->vicon_thread;
        Indexable *idxbl = picon->indexable;
        Asset *asset = idxbl && idxbl->is_asset ? (Asset *)idxbl : 0;
@@ -161,7 +163,10 @@ VFrame *AssetVIcon::frame()
        if( seq_no >= images.size() ) {
                MWindow *mwindow = picon->mwindow;
                File *file = mwindow->video_cache->check_out(asset, mwindow->edl, 1);
-               if( !file ) return 0;
+               if( !file ) {
+                       broken = 1;
+                       return 0;
+               }
                if( temp && (temp->get_w() != asset->width || temp->get_h() != asset->height) ) {
                        delete temp;  temp = 0;
                }
@@ -929,7 +934,7 @@ void AssetPicon::create_objects()
                else {
                        edl = (EDL *)indexable;
                        cp += sprintf(cp, "edl:");
-                       set_color(get_color() ^ 0xCC9955);
+//                     set_color(get_color() ^ 0xCC9955);
                }
                fs.extract_name(cp, indexable->path);
                set_text(name);

diff --git a/cinelerra-5.1/cinelerra/awindowgui.h b/cinelerra-5.1/cinelerra/awindowgui.h
index 6ba8d504cab7fa8e473e227dbfd0947be5791a54..6004247d4f158ec25264b05ff304e8cb6fe22f7a 100644 (file)
--- a/cinelerra-5.1/cinelerra/awindowgui.h
+++ b/cinelerra-5.1/cinelerra/awindowgui.h
@@ -165,6 +165,7 @@ public:
        AssetPicon *picon;
        VFrame *temp;
        int64_t length;
+       int broken;
 
        VFrame *frame();
        int64_t set_seq_no(int64_t no);

diff --git a/cinelerra-5.1/cinelerra/loadmode.C b/cinelerra-5.1/cinelerra/loadmode.C
index 4caed986e4b5a60c8b51961e3e639c499920714c..6e12593da63f633af82858eec9418611b76e2299 100644 (file)
--- a/cinelerra-5.1/cinelerra/loadmode.C
+++ b/cinelerra-5.1/cinelerra/loadmode.C
@@ -52,9 +52,9 @@ static const char *mode_text[] =
        N_("Concatenate to existing tracks"),
        N_("Paste over selection/at insertion point"),
        N_("Create new resources only"),
-       N_("EDL as Clip"),
-       N_("EDL as Nested"),
-       N_("EDL as Reference"),
+       N_("EDL"),
+       N_("Nested"),
+       N_("Reference"),
 };
 
 

diff --git a/cinelerra-5.1/cinelerra/mwindowgui.C b/cinelerra-5.1/cinelerra/mwindowgui.C
index 0033b268950d11eec7288d1a679db956bcde672a..0fde87abb75419f77ce5abb61908a78b6f3e6b03 100644 (file)
--- a/cinelerra-5.1/cinelerra/mwindowgui.C
+++ b/cinelerra-5.1/cinelerra/mwindowgui.C
@@ -186,6 +186,12 @@ void MWindowGUI::create_objects()
        }
 #endif
        mwindow->reset_android_remote();
+       if( !cwindow_remote_handler )
+               cwindow_remote_handler = (RemoteHandler*)
+                       new CWindowKeyEvHandler(mwindow->gui->remote_control);
+       if( !record_remote_handler )
+               record_remote_handler = (RemoteHandler*)
+                       new RecordKeyEvHandler(mwindow->gui->remote_control);
        if(debug) printf("MWindowGUI::create_objects %d\n", __LINE__);
 
        int x1 = get_w() - MainShBtns::calculate_w(-1, 0, -1) - xS(5);

diff --git a/cinelerra-5.1/cinelerra/preferences.C b/cinelerra-5.1/cinelerra/preferences.C
index d9db06ad2b35eae3f5f30e11f58827d05e7c4ba4..dbf14c49597688b74f7028d96815eca5948d527d 100644 (file)
--- a/cinelerra-5.1/cinelerra/preferences.C
+++ b/cinelerra-5.1/cinelerra/preferences.C
@@ -75,7 +75,7 @@ Preferences::Preferences()
        vicon_color_mode = VICON_COLOR_MODE_LOW;
        theme[0] = 0;
        plugin_icons[0] = 0;
-       strcpy(snapshot_path, "/tmp");
+       strcpy(snapshot_path, DEFAULT_SNAPSHOT_PATH);
        use_renderfarm = 0;
        force_uniprocessor = 0;
        renderfarm_port = DEAMON_PORT;
@@ -347,7 +347,7 @@ int Preferences::load_defaults(BC_Hash *defaults)
        strcpy(plugin_icons, DEFAULT_PICON);
        defaults->get("THEME", theme);
        defaults->get("PLUGIN_ICONS", plugin_icons);
-       strcpy(snapshot_path, "/tmp");
+       strcpy(snapshot_path, DEFAULT_SNAPSHOT_PATH);
        defaults->get("SNAPSHOT_PATH", snapshot_path);
 
        for( int i=0; i<MAXCHANNELS; ++i ) {

diff --git a/cinelerra-5.1/cinelerra/preferences.inc b/cinelerra-5.1/cinelerra/preferences.inc
index 5cf159031261c1fe9c1903da72d1a7a331dcdcb1..6eb2939977b4fb8916a78cd8e5cd883e8f2e19ae 100644 (file)
--- a/cinelerra-5.1/cinelerra/preferences.inc
+++ b/cinelerra-5.1/cinelerra/preferences.inc
@@ -32,6 +32,7 @@
 #define LAYOUTS_MAX 4
 #define DEFAULT_LV2_PATH CINDAT_DIR "/lv2"
 #define DEFAULT_NESTED_PROXY_PATH NESTED_DIR
+#define DEFAULT_SNAPSHOT_PATH SNAP_DIR
 #define FFMPEG_EARLY_TIP _("Currently: Try FFMpeg first\n   Click to: Try FFMpeg last")
 #define FFMPEG_LATE_TIP  _("Currently: Try FFMpeg last\n   Click to: Try FFMpeg first")
 

diff --git a/cinelerra-5.1/configure.ac b/cinelerra-5.1/configure.ac
index 92688079b26211e85a0b103da1b53f9ad6e97bf7..599a835d6af706493efc0fbc034724616ab30b35 100644 (file)
--- a/cinelerra-5.1/configure.ac
+++ b/cinelerra-5.1/configure.ac
@@ -49,6 +49,7 @@ CHECK_WITH([plugin-dir],[plugin install dir],[PLUGIN_DIR],[auto])
 CHECK_WITH([ladspa-dir],[ladspa install dir],[LADSPA_DIR],[auto])
 CHECK_WITH([config-dir],[.bcast config dir],[CONFIG_DIR],[$$HOME/.bcast5])
 CHECK_WITH([nested-dir],[nested proxy dir],[NESTED_DIR],[$$HOME/Videos])
+CHECK_WITH([snap-dir],[snapshot/grabshot dir],[SNAP_DIR],[$$HOME/Pictures])
 CHECK_WITH([browser],[cin_browser path],[CIN_BROWSER],[firefox])
 CHECK_WITH([git-ffmpeg],[git ffmpeg using url],[GIT_FFMPEG],[no])
 CHECK_WITH([noelision],[use noelision/libpthread],[NOELISION],[auto])
@@ -969,6 +970,7 @@ echo "  using: with-cinlib = $WANT_CINLIB_DIR"
 echo "  using: with-cindat = $WANT_CINDAT_DIR"
 echo "  using: with-config-dir = $WANT_CONFIG_DIR"
 echo "  using: with-nested-dir = $WANT_NESTED_DIR"
+echo "  using: with-snap-dir = $WANT_SNAP_DIR"
 echo "  using: with-browser = $WANT_CIN_BROWSER"
 echo "  using: with-plugin-dir = $WANT_PLUGIN_DIR"
 echo "  using: with-ladspa-dir = $WANT_LADSPA_DIR"
@@ -1053,6 +1055,7 @@ echo "CFLAGS += '-DCINLIB_DIR=\"$WANT_CINLIB_DIR\"'"
 echo "CFLAGS += '-DCINDAT_DIR=\"$WANT_CINDAT_DIR\"'"
 echo "CFLAGS += '-DCONFIG_DIR=\"$WANT_CONFIG_DIR\"'"
 echo "CFLAGS += '-DNESTED_DIR=\"$WANT_NESTED_DIR\"'"
+echo "CFLAGS += '-DSNAP_DIR=\"$WANT_SNAP_DIR\"'"
 echo "CFLAGS += '-DPLUGIN_DIR=\"$WANT_PLUGIN_DIR\"'"
 echo "CFLAGS += '-DLOCALE_DIR=\"$WANT_LOCALE_DIR\"'"
 echo "CFLAGS += '-DLADSPA_DIR=\"$WANT_LADSPA_DIR\"'"

diff --git a/cinelerra-5.1/plugins/theme_blond/data/loadmode_edl_clip.png b/cinelerra-5.1/plugins/theme_blond/data/loadmode_edl_clip.png
deleted file mode 120000 (symlink)
index f85385811f3d9494b154cd4efc9a7c0dfa08a520..0000000000000000000000000000000000000000
--- a/cinelerra-5.1/plugins/theme_blond/data/loadmode_edl_clip.png
+++ /dev/null
@@ -1 +0,0 @@
-loadmode_nested.png
\ No newline at end of file

diff --git a/cinelerra-5.1/plugins/theme_blond/data/loadmode_edl_clip.png b/cinelerra-5.1/plugins/theme_blond/data/loadmode_edl_clip.png
new file mode 100644 (file)
index 0000000000000000000000000000000000000000..0567a0074c9e4b1338739da0af3ef8b346e163c4
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blond/data/loadmode_edl_clip.png differ

diff --git a/cinelerra-5.1/plugins/theme_blond/data/loadmode_edl_fileref.png b/cinelerra-5.1/plugins/theme_blond/data/loadmode_edl_fileref.png
deleted file mode 120000 (symlink)
index f85385811f3d9494b154cd4efc9a7c0dfa08a520..0000000000000000000000000000000000000000
--- a/cinelerra-5.1/plugins/theme_blond/data/loadmode_edl_fileref.png
+++ /dev/null
@@ -1 +0,0 @@
-loadmode_nested.png
\ No newline at end of file

diff --git a/cinelerra-5.1/plugins/theme_blond/data/loadmode_edl_fileref.png b/cinelerra-5.1/plugins/theme_blond/data/loadmode_edl_fileref.png
new file mode 100644 (file)
index 0000000000000000000000000000000000000000..135de294046b80c8efcce86b58c41dfffa5b8f6e
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blond/data/loadmode_edl_fileref.png differ

diff --git a/cinelerra-5.1/plugins/theme_blond/data/loadmode_edl_nested.png b/cinelerra-5.1/plugins/theme_blond/data/loadmode_edl_nested.png
deleted file mode 120000 (symlink)
index f85385811f3d9494b154cd4efc9a7c0dfa08a520..0000000000000000000000000000000000000000
--- a/cinelerra-5.1/plugins/theme_blond/data/loadmode_edl_nested.png
+++ /dev/null
@@ -1 +0,0 @@
-loadmode_nested.png
\ No newline at end of file

diff --git a/cinelerra-5.1/plugins/theme_blond/data/loadmode_edl_nested.png b/cinelerra-5.1/plugins/theme_blond/data/loadmode_edl_nested.png
new file mode 100644 (file)
index 0000000000000000000000000000000000000000..51d6d7684ba463018e8465606a33cc328416575f
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blond/data/loadmode_edl_nested.png differ

diff --git a/cinelerra-5.1/plugins/theme_blond_cv/data/loadmode_edl_clip.png b/cinelerra-5.1/plugins/theme_blond_cv/data/loadmode_edl_clip.png
deleted file mode 120000 (symlink)
index f85385811f3d9494b154cd4efc9a7c0dfa08a520..0000000000000000000000000000000000000000
--- a/cinelerra-5.1/plugins/theme_blond_cv/data/loadmode_edl_clip.png
+++ /dev/null
@@ -1 +0,0 @@
-loadmode_nested.png
\ No newline at end of file

diff --git a/cinelerra-5.1/plugins/theme_blond_cv/data/loadmode_edl_clip.png b/cinelerra-5.1/plugins/theme_blond_cv/data/loadmode_edl_clip.png
new file mode 100644 (file)
index 0000000000000000000000000000000000000000..0567a0074c9e4b1338739da0af3ef8b346e163c4
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blond_cv/data/loadmode_edl_clip.png differ

diff --git a/cinelerra-5.1/plugins/theme_blond_cv/data/loadmode_edl_fileref.png b/cinelerra-5.1/plugins/theme_blond_cv/data/loadmode_edl_fileref.png
deleted file mode 120000 (symlink)
index f85385811f3d9494b154cd4efc9a7c0dfa08a520..0000000000000000000000000000000000000000
--- a/cinelerra-5.1/plugins/theme_blond_cv/data/loadmode_edl_fileref.png
+++ /dev/null
@@ -1 +0,0 @@
-loadmode_nested.png
\ No newline at end of file

diff --git a/cinelerra-5.1/plugins/theme_blond_cv/data/loadmode_edl_fileref.png b/cinelerra-5.1/plugins/theme_blond_cv/data/loadmode_edl_fileref.png
new file mode 100644 (file)
index 0000000000000000000000000000000000000000..135de294046b80c8efcce86b58c41dfffa5b8f6e
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blond_cv/data/loadmode_edl_fileref.png differ

diff --git a/cinelerra-5.1/plugins/theme_blond_cv/data/loadmode_edl_nested.png b/cinelerra-5.1/plugins/theme_blond_cv/data/loadmode_edl_nested.png
deleted file mode 120000 (symlink)
index f85385811f3d9494b154cd4efc9a7c0dfa08a520..0000000000000000000000000000000000000000
--- a/cinelerra-5.1/plugins/theme_blond_cv/data/loadmode_edl_nested.png
+++ /dev/null
@@ -1 +0,0 @@
-loadmode_nested.png
\ No newline at end of file

diff --git a/cinelerra-5.1/plugins/theme_blond_cv/data/loadmode_edl_nested.png b/cinelerra-5.1/plugins/theme_blond_cv/data/loadmode_edl_nested.png
new file mode 100644 (file)
index 0000000000000000000000000000000000000000..51d6d7684ba463018e8465606a33cc328416575f
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blond_cv/data/loadmode_edl_nested.png differ

diff --git a/cinelerra-5.1/plugins/theme_blue/data/loadmode_edl_clip.png b/cinelerra-5.1/plugins/theme_blue/data/loadmode_edl_clip.png
deleted file mode 120000 (symlink)
index f85385811f3d9494b154cd4efc9a7c0dfa08a520..0000000000000000000000000000000000000000
--- a/cinelerra-5.1/plugins/theme_blue/data/loadmode_edl_clip.png
+++ /dev/null
@@ -1 +0,0 @@
-loadmode_nested.png
\ No newline at end of file

diff --git a/cinelerra-5.1/plugins/theme_blue/data/loadmode_edl_clip.png b/cinelerra-5.1/plugins/theme_blue/data/loadmode_edl_clip.png
new file mode 100644 (file)
index 0000000000000000000000000000000000000000..0567a0074c9e4b1338739da0af3ef8b346e163c4
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blue/data/loadmode_edl_clip.png differ

diff --git a/cinelerra-5.1/plugins/theme_blue/data/loadmode_edl_fileref.png b/cinelerra-5.1/plugins/theme_blue/data/loadmode_edl_fileref.png
deleted file mode 120000 (symlink)
index f85385811f3d9494b154cd4efc9a7c0dfa08a520..0000000000000000000000000000000000000000
--- a/cinelerra-5.1/plugins/theme_blue/data/loadmode_edl_fileref.png
+++ /dev/null
@@ -1 +0,0 @@
-loadmode_nested.png
\ No newline at end of file

diff --git a/cinelerra-5.1/plugins/theme_blue/data/loadmode_edl_fileref.png b/cinelerra-5.1/plugins/theme_blue/data/loadmode_edl_fileref.png
new file mode 100644 (file)
index 0000000000000000000000000000000000000000..135de294046b80c8efcce86b58c41dfffa5b8f6e
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blue/data/loadmode_edl_fileref.png differ

diff --git a/cinelerra-5.1/plugins/theme_blue/data/loadmode_edl_nested.png b/cinelerra-5.1/plugins/theme_blue/data/loadmode_edl_nested.png
deleted file mode 120000 (symlink)
index f85385811f3d9494b154cd4efc9a7c0dfa08a520..0000000000000000000000000000000000000000
--- a/cinelerra-5.1/plugins/theme_blue/data/loadmode_edl_nested.png
+++ /dev/null
@@ -1 +0,0 @@
-loadmode_nested.png
\ No newline at end of file

diff --git a/cinelerra-5.1/plugins/theme_blue/data/loadmode_edl_nested.png b/cinelerra-5.1/plugins/theme_blue/data/loadmode_edl_nested.png
new file mode 100644 (file)
index 0000000000000000000000000000000000000000..51d6d7684ba463018e8465606a33cc328416575f
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blue/data/loadmode_edl_nested.png differ

diff --git a/cinelerra-5.1/plugins/theme_blue_dot/data/loadmode_edl_clip.png b/cinelerra-5.1/plugins/theme_blue_dot/data/loadmode_edl_clip.png
deleted file mode 120000 (symlink)
index f85385811f3d9494b154cd4efc9a7c0dfa08a520..0000000000000000000000000000000000000000
--- a/cinelerra-5.1/plugins/theme_blue_dot/data/loadmode_edl_clip.png
+++ /dev/null
@@ -1 +0,0 @@
-loadmode_nested.png
\ No newline at end of file

diff --git a/cinelerra-5.1/plugins/theme_blue_dot/data/loadmode_edl_clip.png b/cinelerra-5.1/plugins/theme_blue_dot/data/loadmode_edl_clip.png
new file mode 100644 (file)
index 0000000000000000000000000000000000000000..0567a0074c9e4b1338739da0af3ef8b346e163c4
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blue_dot/data/loadmode_edl_clip.png differ

diff --git a/cinelerra-5.1/plugins/theme_blue_dot/data/loadmode_edl_fileref.png b/cinelerra-5.1/plugins/theme_blue_dot/data/loadmode_edl_fileref.png
deleted file mode 120000 (symlink)
index f85385811f3d9494b154cd4efc9a7c0dfa08a520..0000000000000000000000000000000000000000
--- a/cinelerra-5.1/plugins/theme_blue_dot/data/loadmode_edl_fileref.png
+++ /dev/null
@@ -1 +0,0 @@
-loadmode_nested.png
\ No newline at end of file

diff --git a/cinelerra-5.1/plugins/theme_blue_dot/data/loadmode_edl_fileref.png b/cinelerra-5.1/plugins/theme_blue_dot/data/loadmode_edl_fileref.png
new file mode 100644 (file)
index 0000000000000000000000000000000000000000..135de294046b80c8efcce86b58c41dfffa5b8f6e
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blue_dot/data/loadmode_edl_fileref.png differ

diff --git a/cinelerra-5.1/plugins/theme_blue_dot/data/loadmode_edl_nested.png b/cinelerra-5.1/plugins/theme_blue_dot/data/loadmode_edl_nested.png
deleted file mode 120000 (symlink)
index f85385811f3d9494b154cd4efc9a7c0dfa08a520..0000000000000000000000000000000000000000
--- a/cinelerra-5.1/plugins/theme_blue_dot/data/loadmode_edl_nested.png
+++ /dev/null
@@ -1 +0,0 @@
-loadmode_nested.png
\ No newline at end of file

diff --git a/cinelerra-5.1/plugins/theme_blue_dot/data/loadmode_edl_nested.png b/cinelerra-5.1/plugins/theme_blue_dot/data/loadmode_edl_nested.png
new file mode 100644 (file)
index 0000000000000000000000000000000000000000..51d6d7684ba463018e8465606a33cc328416575f
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_blue_dot/data/loadmode_edl_nested.png differ

diff --git a/cinelerra-5.1/plugins/theme_bright/data/loadmode_edl_clip.png b/cinelerra-5.1/plugins/theme_bright/data/loadmode_edl_clip.png
deleted file mode 120000 (symlink)
index f85385811f3d9494b154cd4efc9a7c0dfa08a520..0000000000000000000000000000000000000000
--- a/cinelerra-5.1/plugins/theme_bright/data/loadmode_edl_clip.png
+++ /dev/null
@@ -1 +0,0 @@
-loadmode_nested.png
\ No newline at end of file

diff --git a/cinelerra-5.1/plugins/theme_bright/data/loadmode_edl_clip.png b/cinelerra-5.1/plugins/theme_bright/data/loadmode_edl_clip.png
new file mode 100644 (file)
index 0000000000000000000000000000000000000000..0567a0074c9e4b1338739da0af3ef8b346e163c4
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_bright/data/loadmode_edl_clip.png differ

diff --git a/cinelerra-5.1/plugins/theme_bright/data/loadmode_edl_fileref.png b/cinelerra-5.1/plugins/theme_bright/data/loadmode_edl_fileref.png
deleted file mode 120000 (symlink)
index f85385811f3d9494b154cd4efc9a7c0dfa08a520..0000000000000000000000000000000000000000
--- a/cinelerra-5.1/plugins/theme_bright/data/loadmode_edl_fileref.png
+++ /dev/null
@@ -1 +0,0 @@
-loadmode_nested.png
\ No newline at end of file

diff --git a/cinelerra-5.1/plugins/theme_bright/data/loadmode_edl_fileref.png b/cinelerra-5.1/plugins/theme_bright/data/loadmode_edl_fileref.png
new file mode 100644 (file)
index 0000000000000000000000000000000000000000..135de294046b80c8efcce86b58c41dfffa5b8f6e
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_bright/data/loadmode_edl_fileref.png differ

diff --git a/cinelerra-5.1/plugins/theme_bright/data/loadmode_edl_nested.png b/cinelerra-5.1/plugins/theme_bright/data/loadmode_edl_nested.png
deleted file mode 120000 (symlink)
index f85385811f3d9494b154cd4efc9a7c0dfa08a520..0000000000000000000000000000000000000000
--- a/cinelerra-5.1/plugins/theme_bright/data/loadmode_edl_nested.png
+++ /dev/null
@@ -1 +0,0 @@
-loadmode_nested.png
\ No newline at end of file

diff --git a/cinelerra-5.1/plugins/theme_bright/data/loadmode_edl_nested.png b/cinelerra-5.1/plugins/theme_bright/data/loadmode_edl_nested.png
new file mode 100644 (file)
index 0000000000000000000000000000000000000000..51d6d7684ba463018e8465606a33cc328416575f
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_bright/data/loadmode_edl_nested.png differ

diff --git a/cinelerra-5.1/plugins/theme_cakewalk/data/loadmode_edl_clip.png b/cinelerra-5.1/plugins/theme_cakewalk/data/loadmode_edl_clip.png
deleted file mode 120000 (symlink)
index f85385811f3d9494b154cd4efc9a7c0dfa08a520..0000000000000000000000000000000000000000
--- a/cinelerra-5.1/plugins/theme_cakewalk/data/loadmode_edl_clip.png
+++ /dev/null
@@ -1 +0,0 @@
-loadmode_nested.png
\ No newline at end of file

diff --git a/cinelerra-5.1/plugins/theme_cakewalk/data/loadmode_edl_clip.png b/cinelerra-5.1/plugins/theme_cakewalk/data/loadmode_edl_clip.png
new file mode 100644 (file)
index 0000000000000000000000000000000000000000..0567a0074c9e4b1338739da0af3ef8b346e163c4
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_cakewalk/data/loadmode_edl_clip.png differ

diff --git a/cinelerra-5.1/plugins/theme_cakewalk/data/loadmode_edl_fileref.png b/cinelerra-5.1/plugins/theme_cakewalk/data/loadmode_edl_fileref.png
deleted file mode 120000 (symlink)
index f85385811f3d9494b154cd4efc9a7c0dfa08a520..0000000000000000000000000000000000000000
--- a/cinelerra-5.1/plugins/theme_cakewalk/data/loadmode_edl_fileref.png
+++ /dev/null
@@ -1 +0,0 @@
-loadmode_nested.png
\ No newline at end of file

diff --git a/cinelerra-5.1/plugins/theme_cakewalk/data/loadmode_edl_fileref.png b/cinelerra-5.1/plugins/theme_cakewalk/data/loadmode_edl_fileref.png
new file mode 100644 (file)
index 0000000000000000000000000000000000000000..135de294046b80c8efcce86b58c41dfffa5b8f6e
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_cakewalk/data/loadmode_edl_fileref.png differ

diff --git a/cinelerra-5.1/plugins/theme_cakewalk/data/loadmode_edl_nested.png b/cinelerra-5.1/plugins/theme_cakewalk/data/loadmode_edl_nested.png
deleted file mode 120000 (symlink)
index f85385811f3d9494b154cd4efc9a7c0dfa08a520..0000000000000000000000000000000000000000
--- a/cinelerra-5.1/plugins/theme_cakewalk/data/loadmode_edl_nested.png
+++ /dev/null
@@ -1 +0,0 @@
-loadmode_nested.png
\ No newline at end of file

diff --git a/cinelerra-5.1/plugins/theme_cakewalk/data/loadmode_edl_nested.png b/cinelerra-5.1/plugins/theme_cakewalk/data/loadmode_edl_nested.png
new file mode 100644 (file)
index 0000000000000000000000000000000000000000..51d6d7684ba463018e8465606a33cc328416575f
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_cakewalk/data/loadmode_edl_nested.png differ

diff --git a/cinelerra-5.1/plugins/theme_hulk/data/loadmode_edl_clip.png b/cinelerra-5.1/plugins/theme_hulk/data/loadmode_edl_clip.png
deleted file mode 120000 (symlink)
index f85385811f3d9494b154cd4efc9a7c0dfa08a520..0000000000000000000000000000000000000000
--- a/cinelerra-5.1/plugins/theme_hulk/data/loadmode_edl_clip.png
+++ /dev/null
@@ -1 +0,0 @@
-loadmode_nested.png
\ No newline at end of file

diff --git a/cinelerra-5.1/plugins/theme_hulk/data/loadmode_edl_clip.png b/cinelerra-5.1/plugins/theme_hulk/data/loadmode_edl_clip.png
new file mode 100644 (file)
index 0000000000000000000000000000000000000000..0567a0074c9e4b1338739da0af3ef8b346e163c4
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_hulk/data/loadmode_edl_clip.png differ

diff --git a/cinelerra-5.1/plugins/theme_hulk/data/loadmode_edl_fileref.png b/cinelerra-5.1/plugins/theme_hulk/data/loadmode_edl_fileref.png
deleted file mode 120000 (symlink)
index f85385811f3d9494b154cd4efc9a7c0dfa08a520..0000000000000000000000000000000000000000
--- a/cinelerra-5.1/plugins/theme_hulk/data/loadmode_edl_fileref.png
+++ /dev/null
@@ -1 +0,0 @@
-loadmode_nested.png
\ No newline at end of file

diff --git a/cinelerra-5.1/plugins/theme_hulk/data/loadmode_edl_fileref.png b/cinelerra-5.1/plugins/theme_hulk/data/loadmode_edl_fileref.png
new file mode 100644 (file)
index 0000000000000000000000000000000000000000..135de294046b80c8efcce86b58c41dfffa5b8f6e
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_hulk/data/loadmode_edl_fileref.png differ

diff --git a/cinelerra-5.1/plugins/theme_hulk/data/loadmode_edl_nested.png b/cinelerra-5.1/plugins/theme_hulk/data/loadmode_edl_nested.png
deleted file mode 120000 (symlink)
index f85385811f3d9494b154cd4efc9a7c0dfa08a520..0000000000000000000000000000000000000000
--- a/cinelerra-5.1/plugins/theme_hulk/data/loadmode_edl_nested.png
+++ /dev/null
@@ -1 +0,0 @@
-loadmode_nested.png
\ No newline at end of file

diff --git a/cinelerra-5.1/plugins/theme_hulk/data/loadmode_edl_nested.png b/cinelerra-5.1/plugins/theme_hulk/data/loadmode_edl_nested.png
new file mode 100644 (file)
index 0000000000000000000000000000000000000000..51d6d7684ba463018e8465606a33cc328416575f
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_hulk/data/loadmode_edl_nested.png differ

diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/loadmode_edl_clip.png b/cinelerra-5.1/plugins/theme_neophyte/data/loadmode_edl_clip.png
deleted file mode 120000 (symlink)
index f85385811f3d9494b154cd4efc9a7c0dfa08a520..0000000000000000000000000000000000000000
--- a/cinelerra-5.1/plugins/theme_neophyte/data/loadmode_edl_clip.png
+++ /dev/null
@@ -1 +0,0 @@
-loadmode_nested.png
\ No newline at end of file

diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/loadmode_edl_clip.png b/cinelerra-5.1/plugins/theme_neophyte/data/loadmode_edl_clip.png
new file mode 100644 (file)
index 0000000000000000000000000000000000000000..0567a0074c9e4b1338739da0af3ef8b346e163c4
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_neophyte/data/loadmode_edl_clip.png differ

diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/loadmode_edl_fileref.png b/cinelerra-5.1/plugins/theme_neophyte/data/loadmode_edl_fileref.png
deleted file mode 120000 (symlink)
index f85385811f3d9494b154cd4efc9a7c0dfa08a520..0000000000000000000000000000000000000000
--- a/cinelerra-5.1/plugins/theme_neophyte/data/loadmode_edl_fileref.png
+++ /dev/null
@@ -1 +0,0 @@
-loadmode_nested.png
\ No newline at end of file

diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/loadmode_edl_fileref.png b/cinelerra-5.1/plugins/theme_neophyte/data/loadmode_edl_fileref.png
new file mode 100644 (file)
index 0000000000000000000000000000000000000000..135de294046b80c8efcce86b58c41dfffa5b8f6e
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_neophyte/data/loadmode_edl_fileref.png differ

diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/loadmode_edl_nested.png b/cinelerra-5.1/plugins/theme_neophyte/data/loadmode_edl_nested.png
deleted file mode 120000 (symlink)
index f85385811f3d9494b154cd4efc9a7c0dfa08a520..0000000000000000000000000000000000000000
--- a/cinelerra-5.1/plugins/theme_neophyte/data/loadmode_edl_nested.png
+++ /dev/null
@@ -1 +0,0 @@
-loadmode_nested.png
\ No newline at end of file

diff --git a/cinelerra-5.1/plugins/theme_neophyte/data/loadmode_edl_nested.png b/cinelerra-5.1/plugins/theme_neophyte/data/loadmode_edl_nested.png
new file mode 100644 (file)
index 0000000000000000000000000000000000000000..51d6d7684ba463018e8465606a33cc328416575f
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_neophyte/data/loadmode_edl_nested.png differ

diff --git a/cinelerra-5.1/plugins/theme_pinklady/data/loadmode_edl_clip.png b/cinelerra-5.1/plugins/theme_pinklady/data/loadmode_edl_clip.png
deleted file mode 120000 (symlink)
index f85385811f3d9494b154cd4efc9a7c0dfa08a520..0000000000000000000000000000000000000000
--- a/cinelerra-5.1/plugins/theme_pinklady/data/loadmode_edl_clip.png
+++ /dev/null
@@ -1 +0,0 @@
-loadmode_nested.png
\ No newline at end of file

diff --git a/cinelerra-5.1/plugins/theme_pinklady/data/loadmode_edl_clip.png b/cinelerra-5.1/plugins/theme_pinklady/data/loadmode_edl_clip.png
new file mode 100644 (file)
index 0000000000000000000000000000000000000000..0567a0074c9e4b1338739da0af3ef8b346e163c4
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_pinklady/data/loadmode_edl_clip.png differ

diff --git a/cinelerra-5.1/plugins/theme_pinklady/data/loadmode_edl_fileref.png b/cinelerra-5.1/plugins/theme_pinklady/data/loadmode_edl_fileref.png
deleted file mode 120000 (symlink)
index f85385811f3d9494b154cd4efc9a7c0dfa08a520..0000000000000000000000000000000000000000
--- a/cinelerra-5.1/plugins/theme_pinklady/data/loadmode_edl_fileref.png
+++ /dev/null
@@ -1 +0,0 @@
-loadmode_nested.png
\ No newline at end of file

diff --git a/cinelerra-5.1/plugins/theme_pinklady/data/loadmode_edl_fileref.png b/cinelerra-5.1/plugins/theme_pinklady/data/loadmode_edl_fileref.png
new file mode 100644 (file)
index 0000000000000000000000000000000000000000..135de294046b80c8efcce86b58c41dfffa5b8f6e
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_pinklady/data/loadmode_edl_fileref.png differ

diff --git a/cinelerra-5.1/plugins/theme_pinklady/data/loadmode_edl_nested.png b/cinelerra-5.1/plugins/theme_pinklady/data/loadmode_edl_nested.png
deleted file mode 120000 (symlink)
index f85385811f3d9494b154cd4efc9a7c0dfa08a520..0000000000000000000000000000000000000000
--- a/cinelerra-5.1/plugins/theme_pinklady/data/loadmode_edl_nested.png
+++ /dev/null
@@ -1 +0,0 @@
-loadmode_nested.png
\ No newline at end of file

diff --git a/cinelerra-5.1/plugins/theme_pinklady/data/loadmode_edl_nested.png b/cinelerra-5.1/plugins/theme_pinklady/data/loadmode_edl_nested.png
new file mode 100644 (file)
index 0000000000000000000000000000000000000000..51d6d7684ba463018e8465606a33cc328416575f
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_pinklady/data/loadmode_edl_nested.png differ

diff --git a/cinelerra-5.1/plugins/theme_suv/data/loadmode_edl_clip.png b/cinelerra-5.1/plugins/theme_suv/data/loadmode_edl_clip.png
deleted file mode 120000 (symlink)
index f85385811f3d9494b154cd4efc9a7c0dfa08a520..0000000000000000000000000000000000000000
--- a/cinelerra-5.1/plugins/theme_suv/data/loadmode_edl_clip.png
+++ /dev/null
@@ -1 +0,0 @@
-loadmode_nested.png
\ No newline at end of file

diff --git a/cinelerra-5.1/plugins/theme_suv/data/loadmode_edl_clip.png b/cinelerra-5.1/plugins/theme_suv/data/loadmode_edl_clip.png
new file mode 100644 (file)
index 0000000000000000000000000000000000000000..0567a0074c9e4b1338739da0af3ef8b346e163c4
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_suv/data/loadmode_edl_clip.png differ

diff --git a/cinelerra-5.1/plugins/theme_suv/data/loadmode_edl_fileref.png b/cinelerra-5.1/plugins/theme_suv/data/loadmode_edl_fileref.png
deleted file mode 120000 (symlink)
index f85385811f3d9494b154cd4efc9a7c0dfa08a520..0000000000000000000000000000000000000000
--- a/cinelerra-5.1/plugins/theme_suv/data/loadmode_edl_fileref.png
+++ /dev/null
@@ -1 +0,0 @@
-loadmode_nested.png
\ No newline at end of file

diff --git a/cinelerra-5.1/plugins/theme_suv/data/loadmode_edl_fileref.png b/cinelerra-5.1/plugins/theme_suv/data/loadmode_edl_fileref.png
new file mode 100644 (file)
index 0000000000000000000000000000000000000000..135de294046b80c8efcce86b58c41dfffa5b8f6e
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_suv/data/loadmode_edl_fileref.png differ

diff --git a/cinelerra-5.1/plugins/theme_suv/data/loadmode_edl_nested.png b/cinelerra-5.1/plugins/theme_suv/data/loadmode_edl_nested.png
deleted file mode 120000 (symlink)
index f85385811f3d9494b154cd4efc9a7c0dfa08a520..0000000000000000000000000000000000000000
--- a/cinelerra-5.1/plugins/theme_suv/data/loadmode_edl_nested.png
+++ /dev/null
@@ -1 +0,0 @@
-loadmode_nested.png
\ No newline at end of file

diff --git a/cinelerra-5.1/plugins/theme_suv/data/loadmode_edl_nested.png b/cinelerra-5.1/plugins/theme_suv/data/loadmode_edl_nested.png
new file mode 100644 (file)
index 0000000000000000000000000000000000000000..51d6d7684ba463018e8465606a33cc328416575f
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_suv/data/loadmode_edl_nested.png differ

diff --git a/cinelerra-5.1/plugins/theme_unflat/data/loadmode_edl_clip.png b/cinelerra-5.1/plugins/theme_unflat/data/loadmode_edl_clip.png
deleted file mode 120000 (symlink)
index f85385811f3d9494b154cd4efc9a7c0dfa08a520..0000000000000000000000000000000000000000
--- a/cinelerra-5.1/plugins/theme_unflat/data/loadmode_edl_clip.png
+++ /dev/null
@@ -1 +0,0 @@
-loadmode_nested.png
\ No newline at end of file

diff --git a/cinelerra-5.1/plugins/theme_unflat/data/loadmode_edl_clip.png b/cinelerra-5.1/plugins/theme_unflat/data/loadmode_edl_clip.png
new file mode 100644 (file)
index 0000000000000000000000000000000000000000..0567a0074c9e4b1338739da0af3ef8b346e163c4
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_unflat/data/loadmode_edl_clip.png differ

diff --git a/cinelerra-5.1/plugins/theme_unflat/data/loadmode_edl_fileref.png b/cinelerra-5.1/plugins/theme_unflat/data/loadmode_edl_fileref.png
deleted file mode 120000 (symlink)
index f85385811f3d9494b154cd4efc9a7c0dfa08a520..0000000000000000000000000000000000000000
--- a/cinelerra-5.1/plugins/theme_unflat/data/loadmode_edl_fileref.png
+++ /dev/null
@@ -1 +0,0 @@
-loadmode_nested.png
\ No newline at end of file

diff --git a/cinelerra-5.1/plugins/theme_unflat/data/loadmode_edl_fileref.png b/cinelerra-5.1/plugins/theme_unflat/data/loadmode_edl_fileref.png
new file mode 100644 (file)
index 0000000000000000000000000000000000000000..135de294046b80c8efcce86b58c41dfffa5b8f6e
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_unflat/data/loadmode_edl_fileref.png differ

diff --git a/cinelerra-5.1/plugins/theme_unflat/data/loadmode_edl_nested.png b/cinelerra-5.1/plugins/theme_unflat/data/loadmode_edl_nested.png
deleted file mode 120000 (symlink)
index f85385811f3d9494b154cd4efc9a7c0dfa08a520..0000000000000000000000000000000000000000
--- a/cinelerra-5.1/plugins/theme_unflat/data/loadmode_edl_nested.png
+++ /dev/null
@@ -1 +0,0 @@
-loadmode_nested.png
\ No newline at end of file

diff --git a/cinelerra-5.1/plugins/theme_unflat/data/loadmode_edl_nested.png b/cinelerra-5.1/plugins/theme_unflat/data/loadmode_edl_nested.png
new file mode 100644 (file)
index 0000000000000000000000000000000000000000..51d6d7684ba463018e8465606a33cc328416575f
Binary files /dev/null and b/cinelerra-5.1/plugins/theme_unflat/data/loadmode_edl_nested.png differ