asset menu size fixups, new picons+prefs, more timecode del, stretch scrollbars,...

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

diff --git a/cinelerra-5.1/cinelerra/preferencesthread.C b/cinelerra-5.1/cinelerra/preferencesthread.C
index 9393d4359f7158802ffe3c9eab8f84096863e4a0..8d4544f8d76b42014a8486b73bfaa820d315ac4c 100644 (file)
--- a/cinelerra-5.1/cinelerra/preferencesthread.C
+++ b/cinelerra-5.1/cinelerra/preferencesthread.C
@@ -63,7 +63,7 @@
 
 
 #define WIDTH 770
-#define HEIGHT 720
+#define HEIGHT 740
 
 
 PreferencesMenuitem::PreferencesMenuitem(MWindow *mwindow)
@@ -212,6 +212,8 @@ int PreferencesThread::apply_settings()
 
        if( strcmp(preferences->theme, mwindow->preferences->theme) != 0 )
                mwindow->restart_status = -1; // reload, need new bcresources
+       if( strcmp(preferences->plugin_icons, mwindow->preferences->plugin_icons) != 0 )
+               mwindow->restart_status = -1;
 
        mwindow->edl->copy_session(edl, 1);
        mwindow->preferences->copy_from(preferences);
@@ -232,11 +234,8 @@ int PreferencesThread::apply_settings()
        int ffmpeg_early_probe = mwindow->preferences->get_file_probe_armed("FFPMEG_Early");
        mwindow->gui->ffmpeg_toggle->update(ffmpeg_early_probe);
        mwindow->gui->ffmpeg_toggle->set_tooltip(ffmpeg_early_probe ?
-               _("Try FFMpeg first") : _("Try FFMpeg last") );
+               FFMPEG_EARLY_TIP : FFMPEG_LATE_TIP);
        mwindow->gui->mainshbtns->load(mwindow->preferences);
-       double tc_position =
-               mwindow->edl->session->get_frame_offset() / mwindow->edl->session->frame_rate;
-       mwindow->gui->mainclock->set_position_offset(tc_position);
 
 //edl->session->recording_format->dump();
 //mwindow->edl->session->recording_format->dump();