projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sams last ladspa icons, libopus/vp9, mixer fixer, plugin resets, fmt frmsz, shm fixes
[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..9cca7fa56ec73eb89895ab442c671152fb4b4fd5 100644
(file)
--- a/
cinelerra-5.1/cinelerra/preferencesthread.C
+++ b/
cinelerra-5.1/cinelerra/preferencesthread.C
@@
-20,6
+20,7
@@
*/
#include "aboutprefs.h"
*/
#include "aboutprefs.h"
+#include "appearanceprefs.h"
#include "asset.h"
#include "audiodevice.inc"
#include "bcsignals.h"
#include "asset.h"
#include "audiodevice.inc"
#include "bcsignals.h"
@@
-62,8
+63,8
@@
-#define WIDTH
77
0
-#define HEIGHT 7
2
0
+#define WIDTH
80
0
+#define HEIGHT 7
0
0
PreferencesMenuitem::PreferencesMenuitem(MWindow *mwindow)
PreferencesMenuitem::PreferencesMenuitem(MWindow *mwindow)
@@
-210,8
+211,17
@@
int PreferencesThread::apply_settings()
(*this_aconfig != *aconfig) || (*this_vconfig != *vconfig) ||
!preferences->brender_asset->equivalent(*mwindow->preferences->brender_asset, 0, 1, edl);
(*this_aconfig != *aconfig) || (*this_vconfig != *vconfig) ||
!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->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);
mwindow->edl->copy_session(edl, 1);
mwindow->preferences->copy_from(preferences);
@@
-220,6
+230,7
@@
int PreferencesThread::apply_settings()
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_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();
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();
@@
-232,11
+243,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 ?
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);
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();
//edl->session->recording_format->dump();
//mwindow->edl->session->recording_format->dump();
@@
-291,6
+299,7
@@
int PreferencesThread::apply_settings()
if(redraw_overlays)
{
mwindow->gui->lock_window("PreferencesThread::apply_settings 2");
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();
}
mwindow->gui->draw_overlays(1);
mwindow->gui->unlock_window();
}
@@
-308,10
+317,7
@@
int PreferencesThread::apply_settings()
//printf("PreferencesThread::apply_settings 1\n");
// This doesn't stop and restart, only reloads the assets before
// the next play command.
//printf("PreferencesThread::apply_settings 1\n");
// This doesn't stop and restart, only reloads the assets before
// the next play command.
- mwindow->cwindow->playback_engine->que->send_command(CURRENT_FRAME,
- CHANGE_ALL,
- mwindow->edl,
- 1);
+ mwindow->cwindow->refresh_frame(CHANGE_ALL, mwindow->edl);
//printf("PreferencesThread::apply_settings 10\n");
}
//printf("PreferencesThread::apply_settings 10\n");
}
@@
-342,6
+348,8
@@
const char* PreferencesThread::category_to_text(int category)
return _("Performance");
case INTERFACE:
return _("Interface");
return _("Performance");
case INTERFACE:
return _("Interface");
+ case APPEARANCE:
+ return _("Appearance");
case ABOUT:
return _("About");
}
case ABOUT:
return _("About");
}
@@
-410,11
+418,7
@@
void PreferencesWindow::create_objects()
for(int i = 0; i < CATEGORIES; i++)
{
add_subwindow(category_button[i] = new PreferencesButton(mwindow,
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")));
(i == thread->current_dialog) ?
mwindow->theme->get_image_set("category_button_checked") :
mwindow->theme->get_image_set("category_button")));
@@
-520,6
+524,10
@@
int PreferencesWindow::set_current_dialog(int number)
add_subwindow(dialog = new InterfacePrefs(mwindow, this));
break;
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;
case PreferencesThread::ABOUT:
add_subwindow(dialog = new AboutPrefs(mwindow, this));
break;