*/
#include "aboutprefs.h"
+#include "appearanceprefs.h"
#include "asset.h"
#include "audiodevice.inc"
#include "bcsignals.h"
+#include "bctrace.h"
#include "cache.h"
#include "cplayback.h"
#include "cwindow.h"
-#define WIDTH 770
-#define HEIGHT 690
+#define WIDTH 800
+#define HEIGHT 700
PreferencesMenuitem::PreferencesMenuitem(MWindow *mwindow)
(preferences->force_uniprocessor != mwindow->preferences->force_uniprocessor) ||
this_playback_config->active_config != playback_config->active_config ||
(*this_aconfig != *aconfig) || (*this_vconfig != *vconfig) ||
- !preferences->brender_asset->equivalent(*mwindow->preferences->brender_asset, 0, 1);
+ !preferences->brender_asset->equivalent(*mwindow->preferences->brender_asset, 0, 1, edl);
+
+ if( preferences->highlight_inverse != mwindow->preferences->highlight_inverse ) {
+ mwindow->gui->lock_window("PreferencesThread::apply_settings 0");
+ mwindow->gui->hide_cursor(0);
+ mwindow->gui->unlock_window();
+ redraw_overlays = 1;
+ }
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);
BC_Signals::set_catch_segv(mwindow->preferences->trap_sigsegv);
BC_Signals::set_catch_intr(mwindow->preferences->trap_sigintr);
BC_WindowBase::get_resources()->popupmenu_btnup = mwindow->preferences->popupmenu_btnup;
+ BC_WindowBase::get_resources()->grab_input_focus = mwindow->preferences->grab_input_focus;
+ BC_WindowBase::get_resources()->textbox_focus_policy = mwindow->preferences->textbox_focus_policy;
+ if( mwindow->preferences->trap_sigsegv || mwindow->preferences->trap_sigintr ) {
+ BC_Trace::enable_locks();
+ }
+ else {
+ BC_Trace::disable_locks();
+ }
mwindow->reset_android_remote();
- mwindow->gui->ffmpeg_toggle->update(mwindow->preferences->ffmpeg_early_probe);
- mwindow->gui->ffmpeg_toggle->set_tooltip( mwindow->preferences->ffmpeg_early_probe ?
- _("Try FFMpeg first") : _("Try FFMpeg last") );
+ 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 ?
+ 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();
if(redraw_overlays)
{
mwindow->gui->lock_window("PreferencesThread::apply_settings 2");
+ mwindow->gui->show_cursor(0);
mwindow->gui->draw_overlays(1);
mwindow->gui->unlock_window();
}
return _("Performance");
case INTERFACE:
return _("Interface");
+ case APPEARANCE:
+ return _("Appearance");
case ABOUT:
return _("About");
}
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")));
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;