From 9dc94ff0a716a04cdec4ef2466ed20227b79c114 Mon Sep 17 00:00:00 2001 From: Good Guy Date: Fri, 4 Aug 2017 08:41:02 -0600 Subject: [PATCH] xlat default theme name, fix stop blunder --- cinelerra-5.1/cinelerra/mwindow.C | 7 ++++--- cinelerra-5.1/cinelerra/playtransport.C | 3 +++ cinelerra-5.1/cinelerra/preferences.C | 2 +- cinelerra-5.1/cinelerra/theme.C | 2 +- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/cinelerra-5.1/cinelerra/mwindow.C b/cinelerra-5.1/cinelerra/mwindow.C index ce48f124..8824b868 100644 --- a/cinelerra-5.1/cinelerra/mwindow.C +++ b/cinelerra-5.1/cinelerra/mwindow.C @@ -1022,12 +1022,13 @@ void MWindow::init_theme() fprintf(stderr, _("MWindow::init_theme: prefered theme %s not found.\n"), preferences->theme); - if( !theme_plugin && strcasecmp(preferences->theme, DEFAULT_THEME) ) { + const char *default_theme = _(DEFAULT_THEME); + if( !theme_plugin && strcasecmp(preferences->theme, default_theme) ) { fprintf(stderr, _("MWindow::init_theme: trying default theme %s\n"), - DEFAULT_THEME); + default_theme); for(int i = 0; i < plugindb->total && !theme_plugin; i++) { if( plugindb->get(i)->theme && - !strcasecmp(DEFAULT_THEME, plugindb->get(i)->title) ) + !strcasecmp(default_theme, plugindb->get(i)->title) ) theme_plugin = plugindb->get(i); } } diff --git a/cinelerra-5.1/cinelerra/playtransport.C b/cinelerra-5.1/cinelerra/playtransport.C index 85fe95a4..991adb9a 100644 --- a/cinelerra-5.1/cinelerra/playtransport.C +++ b/cinelerra-5.1/cinelerra/playtransport.C @@ -216,6 +216,9 @@ int PlayTransport::keypress_event() case STOP: command = NORMAL_FWD; break; + default: + command = STOP; + break; } break; default: diff --git a/cinelerra-5.1/cinelerra/preferences.C b/cinelerra-5.1/cinelerra/preferences.C index c4252072..4e1f204f 100644 --- a/cinelerra-5.1/cinelerra/preferences.C +++ b/cinelerra-5.1/cinelerra/preferences.C @@ -314,7 +314,7 @@ int Preferences::load_defaults(BC_Hash *defaults) trap_sigsegv = defaults->get("TRAP_SIGSEGV", trap_sigsegv); trap_sigintr = defaults->get("TRAP_SIGINTR", trap_sigintr); - strcpy(theme, DEFAULT_THEME); + strcpy(theme, _(DEFAULT_THEME)); strcpy(plugin_icons, DEFAULT_PICON); defaults->get("THEME", theme); defaults->get("PLUGIN_ICONS", plugin_icons); diff --git a/cinelerra-5.1/cinelerra/theme.C b/cinelerra-5.1/cinelerra/theme.C index 827d5b9e..1e2b161d 100644 --- a/cinelerra-5.1/cinelerra/theme.C +++ b/cinelerra-5.1/cinelerra/theme.C @@ -65,7 +65,7 @@ Theme::Theme() window_border = 10; widget_border = 5; this->mwindow = 0; - theme_title = DEFAULT_THEME; + theme_title = _(DEFAULT_THEME); data_buffer = 0; contents_buffer = 0; last_image = 0; -- 2.26.2