X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fpreferencesthread.C;h=b7c46fd5047e7e39c7096afa1726ac5e578295bb;hb=8d1431081df60da0719db2c77e4c56830521c7e8;hp=4d1a41561c4e2896d5ad1bade1f68160a10187b0;hpb=24db15d85f2e4c986ff91f992e815747c55948f3;p=goodguy%2Fhistory.git

diff --git a/cinelerra-5.1/cinelerra/preferencesthread.C b/cinelerra-5.1/cinelerra/preferencesthread.C
index 4d1a4156..b7c46fd5 100644
--- a/cinelerra-5.1/cinelerra/preferencesthread.C
+++ b/cinelerra-5.1/cinelerra/preferencesthread.C
@@ -20,6 +20,7 @@
  */
 
 #include "aboutprefs.h"
+#include "appearanceprefs.h"
 #include "asset.h"
 #include "audiodevice.inc"
 #include "bcsignals.h"
@@ -62,8 +63,8 @@
 
 
 
-#define WIDTH 770
-#define HEIGHT 690
+#define WIDTH 800
+#define HEIGHT 700
 
 
 PreferencesMenuitem::PreferencesMenuitem(MWindow *mwindow)
@@ -212,6 +213,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 +235,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();
@@ -342,6 +342,8 @@ const char* PreferencesThread::category_to_text(int category)
 			return _("Performance");
 		case INTERFACE:
 			return _("Interface");
+		case APPEARANCE:
+			return _("Appearance");
 		case ABOUT:
 			return _("About");
 	}
@@ -410,11 +412,7 @@ void PreferencesWindow::create_objects()
 	for(int i = 0; i < CATEGORIES; i++)
 	{
 		add_subwindow(category_button[i] = new PreferencesButton(mwindow,
-			thread,
-			x,
-			y,
-			i,
-			thread->category_to_text(i),
+			thread, x, y, i, thread->category_to_text(i),
 			(i == thread->current_dialog) ?
 				mwindow->theme->get_image_set("category_button_checked") :
 				mwindow->theme->get_image_set("category_button")));
@@ -520,6 +518,10 @@ int PreferencesWindow::set_current_dialog(int number)
 			add_subwindow(dialog = new InterfacePrefs(mwindow, this));
 			break;
 
+		case PreferencesThread::APPEARANCE:
+			add_subwindow(dialog = new AppearancePrefs(mwindow, this));
+			break;
+
 		case PreferencesThread::ABOUT:
 			add_subwindow(dialog = new AboutPrefs(mwindow, this));
 			break;