diff --git a/custom/4coder_config.cpp b/custom/4coder_config.cpp index 070ee09b..254cec93 100644 --- a/custom/4coder_config.cpp +++ b/custom/4coder_config.cpp @@ -1594,11 +1594,13 @@ load_folder_of_themes_into_live_set(Application_Links *app, String_Const_u8 path File_Info *info = *ptr; if (!HasFlag(info->attributes.flags, FileAttribute_IsDirectory)){ String_Const_u8 name = info->file_name; - Temp_Memory_Block temp(scratch); - String_Const_u8 full_name = push_u8_stringf(scratch, "%.*s/%.*s", - string_expand(path), - string_expand(name)); - load_theme_file_into_live_set(app, (char*)full_name.str); + if (string_match(string_postfix(name, 7), str8_lit(".4coder"))){ + Temp_Memory_Block temp(scratch); + String_Const_u8 full_name = push_u8_stringf(scratch, "%.*s/%.*s", + string_expand(path), + string_expand(name)); + load_theme_file_into_live_set(app, (char*)full_name.str); + } } } } diff --git a/custom/generated/command_metadata.h b/custom/generated/command_metadata.h index 353a86e2..aee421e5 100644 --- a/custom/generated/command_metadata.h +++ b/custom/generated/command_metadata.h @@ -342,7 +342,7 @@ static Command_Metadata fcoder_metacmd_table[268] = { { PROC_LINKS(execute_any_cli, 0), false, "execute_any_cli", 15, "Queries for an output buffer name and system command, runs the system command as a CLI and prints the output to the specified buffer.", 133, "W:\\4ed\\code\\custom\\4coder_cli_command.cpp", 41, 22 }, { PROC_LINKS(execute_previous_cli, 0), false, "execute_previous_cli", 20, "If the command execute_any_cli has already been used, this will execute a CLI reusing the most recent buffer name and command.", 126, "W:\\4ed\\code\\custom\\4coder_cli_command.cpp", 41, 7 }, { PROC_LINKS(exit_4coder, 0), false, "exit_4coder", 11, "Attempts to close 4coder.", 25, "W:\\4ed\\code\\custom\\4coder_base_commands.cpp", 43, 848 }, -{ PROC_LINKS(go_to_user_directory, 0), false, "go_to_user_directory", 20, "Go to the 4coder user directory", 31, "W:\\4ed\\code\\custom\\4coder_config.cpp", 36, 1653 }, +{ PROC_LINKS(go_to_user_directory, 0), false, "go_to_user_directory", 20, "Go to the 4coder user directory", 31, "W:\\4ed\\code\\custom\\4coder_config.cpp", 36, 1655 }, { PROC_LINKS(goto_beginning_of_file, 0), false, "goto_beginning_of_file", 22, "Sets the cursor to the beginning of the file.", 45, "W:\\4ed\\code\\custom\\4coder_helper.cpp", 36, 2258 }, { PROC_LINKS(goto_end_of_file, 0), false, "goto_end_of_file", 16, "Sets the cursor to the end of the file.", 39, "W:\\4ed\\code\\custom\\4coder_helper.cpp", 36, 2266 }, { PROC_LINKS(goto_first_jump, 0), false, "goto_first_jump", 15, "If a buffer containing jump locations has been locked in, goes to the first jump in the buffer.", 95, "W:\\4ed\\code\\custom\\4coder_jump_sticky.cpp", 41, 525 }, @@ -391,7 +391,7 @@ static Command_Metadata fcoder_metacmd_table[268] = { { PROC_LINKS(list_all_substring_locations, 0), false, "list_all_substring_locations", 28, "Queries the user for a string and lists all case-sensitive substring matches found in all open buffers.", 103, "W:\\4ed\\code\\custom\\4coder_search.cpp", 36, 174 }, { PROC_LINKS(list_all_substring_locations_case_insensitive, 0), false, "list_all_substring_locations_case_insensitive", 45, "Queries the user for a string and lists all case-insensitive substring matches found in all open buffers.", 105, "W:\\4ed\\code\\custom\\4coder_search.cpp", 36, 186 }, { PROC_LINKS(load_project, 0), false, "load_project", 12, "Looks for a project.4coder file in the current directory and tries to load it. Looks in parent directories until a project file is found or there are no more parents.", 167, "W:\\4ed\\code\\custom\\4coder_project_commands.cpp", 46, 856 }, -{ PROC_LINKS(load_theme_current_buffer, 0), false, "load_theme_current_buffer", 25, "Parse the current buffer as a theme file and add the theme to the theme list. If the buffer has a .4coder postfix in it's name, it is removed when the name is saved.", 165, "W:\\4ed\\code\\custom\\4coder_config.cpp", 36, 1609 }, +{ PROC_LINKS(load_theme_current_buffer, 0), false, "load_theme_current_buffer", 25, "Parse the current buffer as a theme file and add the theme to the theme list. If the buffer has a .4coder postfix in it's name, it is removed when the name is saved.", 165, "W:\\4ed\\code\\custom\\4coder_config.cpp", 36, 1611 }, { PROC_LINKS(load_themes_default_folder, 0), false, "load_themes_default_folder", 26, "Loads all the theme files in the default theme folder.", 54, "W:\\4ed\\code\\custom\\4coder_default_framework.cpp", 47, 535 }, { PROC_LINKS(load_themes_hot_directory, 0), false, "load_themes_hot_directory", 25, "Loads all the theme files in the current hot directory.", 55, "W:\\4ed\\code\\custom\\4coder_default_framework.cpp", 47, 554 }, { PROC_LINKS(make_directory_query, 0), false, "make_directory_query", 20, "Queries the user for a name and creates a new directory with the given name.", 76, "W:\\4ed\\code\\custom\\4coder_base_commands.cpp", 43, 1497 }, diff --git a/ship_files/themes/theme-fleury.4coder b/ship_files/themes/theme-fleury.4coder new file mode 100644 index 00000000..5ce64099 --- /dev/null +++ b/ship_files/themes/theme-fleury.4coder @@ -0,0 +1,64 @@ +defcolor_bar = 0xFF000000; +defcolor_base = 0xFFfcaa05; +defcolor_pop1 = 0xffde8150; +defcolor_pop2 = 0xFFFF0000; +defcolor_back = 0xFF020202; +defcolor_margin = 0xFF222425; +defcolor_margin_hover = 0xff63523d; +defcolor_margin_active = 0xff63523d; +defcolor_list_item = { 0xFF222425, defcolor_back}; +defcolor_list_item_hover = { 0xff362e25, defcolor_margin}; +defcolor_list_item_active = { 0xff63523d, defcolor_margin}; +defcolor_cursor = { 0xFF00EE00, 0xffe0741b, 0xff1be094, 0xffba60c4 }; +defcolor_at_cursor = 0xFF0C0C0C; +defcolor_highlight_cursor_line = 0xFF1E1E1E; +defcolor_highlight = 0xFF303040; +defcolor_at_highlight = 0xFFFF44DD; +defcolor_mark = 0xFF494949; +defcolor_text_default = 0xffb99468; +defcolor_comment = 0xff666666; +defcolor_comment_pop = { 0xff2ab34f, 0xFFdb2828 }; +defcolor_keyword = 0xfff0c674; +defcolor_str_constant = 0xffffa900; +defcolor_char_constant = 0xffffa900; +defcolor_int_constant = 0xffffa900; +defcolor_float_constant = 0xffffa900; +defcolor_bool_constant = 0xffffa900; +defcolor_preproc = 0xFFdc7575; +defcolor_include = 0xffffa900; +defcolor_special_character = 0xFFFF0000; +defcolor_ghost_character = 0xFF4E5E46; +defcolor_highlight_junk = 0xFF3A0000; +defcolor_highlight_white = 0xFF003A3A; +defcolor_paste = 0xFFDDEE00; +defcolor_undo = 0xFF00DDEE; +defcolor_back_cycle = { 0xFF020202, 0xFF020202, 0xFF020202, 0xFF020202, 0xFF020202, 0xFF020202, 0xFF020202, 0xFF100202, 0xFF300202, 0xFF500202, 0xFF700202}; +defcolor_text_cycle = { 0xFFA00000, 0xFF00A000, 0xFF0030B0, 0xFFA0A000 }; +defcolor_line_numbers_back = 0xFF101010; +defcolor_line_numbers_text = 0xFF404040; + +fleury_color_syntax_crap = 0xff5c4d3c; +fleury_color_operators = 0xFFbd2d2d; +fleury_color_inactive_pane_overlay = 0x44000000; +fleury_color_inactive_pane_background = 0xff000000; +fleury_color_file_progress_bar = 0x60634323; +fleury_color_brace_highlight = { 0xff8ffff2 }; +fleury_color_brace_line = { 0x809ba290 }; +fleury_color_brace_annotation = { 0x809ba290 }; +fleury_color_index_product_type = 0xFFedb211; +fleury_color_index_sum_type = 0xFFa7eb13; +fleury_color_index_function = 0xFFde451f; +fleury_color_index_macro = 0xFF2895c7; +fleury_color_index_constant = 0xff6eb535; +fleury_color_index_comment_tag = 0xffffae00; +fleury_color_index_decl = 0xffc9598a; +fleury_color_cursor_macro = 0xffde2368; +fleury_color_cursor_power_mode = 0xffefaf2f; +fleury_color_cursor_inactive = 0xFF880000; +fleury_color_plot_cycle = { 0xff03d3fc, 0xff22b80b, 0xfff0bb0c, 0xfff0500c }; +fleury_color_token_highlight = 0x88f2d357; +fleury_color_token_minor_highlight = 0x44d19045; +fleury_color_error_annotation = 0xffff0000; +fleury_color_lego_grab = 0xffefaf6f; +fleury_color_lego_splat = 0xffefaaef; +fleury_color_comment_user_name = 0xffffdd23;