diff -ur mc-4.8.11.orig/lib/skin/common.c mc-4.8.11/lib/skin/common.c
old
|
new
|
|
63 | 63 | static char * |
64 | 64 | mc_skin_get_default_name (void) |
65 | 65 | { |
| 66 | static int n = 0; |
| 67 | char *skins[] = {"darkfar", "default", "double-lines", "gotar", "nicedark", "modarin256", "sand256", "xoria256"}; |
66 | 68 | char *tmp_str; |
67 | 69 | |
68 | 70 | /* from command line */ |
… |
… |
|
74 | 76 | if (tmp_str != NULL) |
75 | 77 | return g_strdup (tmp_str); |
76 | 78 | |
| 79 | return g_strdup(skins[n++ % 8]); |
| 80 | |
77 | 81 | /* from config. Or 'default' if no present in config */ |
78 | 82 | return mc_config_get_string (mc_main_config, CONFIG_APP_SECTION, "skin", "default"); |
79 | 83 | } |
80 | 84 | |
81 | 85 | /* --------------------------------------------------------------------------------------------- */ |
82 | 86 | |
83 | | static void |
| 87 | void |
84 | 88 | mc_skin_reinit (void) |
85 | 89 | { |
| 90 | GError *error = NULL; |
86 | 91 | mc_skin_deinit (); |
87 | | mc_skin__default.name = mc_skin_get_default_name (); |
88 | | mc_skin__default.colors = g_hash_table_new_full (g_str_hash, g_str_equal, |
89 | | g_free, mc_skin_hash_destroy_value); |
| 92 | tty_color_free_all_tmp (); |
| 93 | tty_color_free_all_non_tmp (); |
| 94 | mc_skin_init (&error); |
90 | 95 | } |
91 | 96 | |
92 | 97 | /* --------------------------------------------------------------------------------------------- */ |
diff -ur mc-4.8.11.orig/src/filemanager/layout.c mc-4.8.11/src/filemanager/layout.c
old
|
new
|
|
1090 | 1090 | void |
1091 | 1091 | swap_panels (void) |
1092 | 1092 | { |
| 1093 | mc_skin_reinit (); |
| 1094 | mc_fhl_free (&mc_filehighlight); |
| 1095 | mc_filehighlight = mc_fhl_new (TRUE); |
| 1096 | dlg_set_default_colors (); |
| 1097 | panel_deinit (); |
| 1098 | panel_init (); |
| 1099 | return; |
| 1100 | |
1093 | 1101 | WPanel *panel1, *panel2; |
1094 | 1102 | Widget *tmp_widget; |
1095 | 1103 | |