From e92a5f5afae344d7bc70ebc588f303b4870a582e Mon Sep 17 00:00:00 2001 From: thepherm <63941518+thepherm@users.noreply.github.com> Date: Sun, 8 Dec 2024 11:49:41 -0600 Subject: [PATCH 1/8] Add Visual Studio Code configuration files and update .gitignore; override window controller methods --- .gitignore | 5 ++- .vscode/launch.json | 24 ++++++++++++ .vscode/tasks.json | 40 ++++++++++++++++++++ install_apple_silicon_dependencys.sh | 12 ++++++ src/sdl2_module/gpe_window_controller_sdl2.h | 36 +++++++++--------- 5 files changed, 97 insertions(+), 20 deletions(-) create mode 100644 .vscode/launch.json create mode 100644 .vscode/tasks.json create mode 100644 install_apple_silicon_dependencys.sh diff --git a/.gitignore b/.gitignore index 5750a8f7..33d224bb 100644 --- a/.gitignore +++ b/.gitignore @@ -8,7 +8,7 @@ obj/ screenshots/ src/raylib_module src/sfml_module -.vscode/ + **/*.dll **/*.o @@ -19,4 +19,5 @@ Game-Pencil-Engine-Editor.depend Game-Pencil-Engine-Editor.layout Game_Pencil_Engine_IDE.cbp Game_Pencil_Engine_IDE.depend -Game_Pencil_Engine_IDE.layout \ No newline at end of file +Game_Pencil_Engine_IDE.layout +GamePencil \ No newline at end of file diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 00000000..ddc46768 --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,24 @@ +{ + "version": "0.2.0", + "configurations": [ + { + "name": "Run Game Pencil", + "type": "cppdbg", + "request": "launch", + "program": "${workspaceFolder}/GamePencil", + "args": [], + "stopAtEntry": false, + "cwd": "${workspaceFolder}", + "environment": [], + "externalConsole": true, + "MIMode": "lldb", + "setupCommands": [ + { + "description": "Enable pretty-printing for gdb", + "text": "-enable-pretty-printing", + "ignoreFailures": true + } + ] + } + ] +} \ No newline at end of file diff --git a/.vscode/tasks.json b/.vscode/tasks.json new file mode 100644 index 00000000..7e2260d1 --- /dev/null +++ b/.vscode/tasks.json @@ -0,0 +1,40 @@ +{ + "version": "2.0.0", + "tasks": [ + { + "label": "build", + "type": "shell", + "command": "bash", + "args": [ + "-c", + "g++ -std=c++11 -I/opt/homebrew/include -L/opt/homebrew/lib -lSDL2 -lSDL2_image -lSDL2_mixer -lSDL2_ttf src/*.cpp src/gpe/*.cpp src/gpe_editor/*.cpp src/pawgui/*.cpp src/sdl2_module/*.cpp src/sdl2_module/thirdparty/*.cpp src/other_libs/*.cpp -o GamePencil && echo 'Build Complete!'" + ], + "group": { + "kind": "build", + "isDefault": true + }, + "problemMatcher": ["$gcc"], + "presentation": { + "reveal": "always" + }, + "windows": { + "args": [ + "-c", + "g++ -std=c++11 -IC:/MinGW/include -LC:/MinGW/lib -lmingw32 -lSDL2main -lSDL2 -lSDL2_image -lSDL2_mixer -lSDL2_ttf src/*.cpp src/gpe/*.cpp src/gpe_editor/*.cpp src/pawgui/*.cpp src/sdl2_module/*.cpp src/sdl2_module/thirdparty/*.cpp src/other_libs/*.cpp -o GamePencil.exe && echo 'Build Complete!'" + ] + }, + "osx": { + "args": [ + "-c", + "g++ -std=c++11 -I/opt/homebrew/include -L/opt/homebrew/lib -lSDL2 -lSDL2_image -lSDL2_mixer -lSDL2_ttf src/*.cpp src/gpe/*.cpp src/gpe_editor/*.cpp src/pawgui/*.cpp src/sdl2_module/*.cpp src/sdl2_module/thirdparty/*.cpp src/other_libs/*.cpp -o GamePencil && echo 'Build Complete!' && osascript -e 'display notification \"GamePencil Engine\" with title \"Editor Build Complete\"'" + ] + }, + "linux": { + "args": [ + "-c", + "g++ -std=c++11 -I/usr/include -L/usr/lib -lSDL2 -lSDL2_image -lSDL2_mixer -lSDL2_ttf src/*.cpp src/gpe/*.cpp src/gpe_editor/*.cpp src/pawgui/*.cpp src/sdl2_module/*.cpp src/sdl2_module/thirdparty/*.cpp src/other_libs/*.cpp -o GamePencil && echo 'Build Complete!'" + ] + } + } + ] +} \ No newline at end of file diff --git a/install_apple_silicon_dependencys.sh b/install_apple_silicon_dependencys.sh new file mode 100644 index 00000000..af43ab69 --- /dev/null +++ b/install_apple_silicon_dependencys.sh @@ -0,0 +1,12 @@ +#!/bin/bash + +echo "Updating Homebrew..." +brew update + +echo "Installing SDL2 and extensions..." +brew install sdl2 sdl2_image sdl2_mixer sdl2_ttf + +echo "Cleaning up unused files..." +brew cleanup + +echo "Dependencies installed successfully!" \ No newline at end of file diff --git a/src/sdl2_module/gpe_window_controller_sdl2.h b/src/sdl2_module/gpe_window_controller_sdl2.h index 924fc333..28f0db5a 100644 --- a/src/sdl2_module/gpe_window_controller_sdl2.h +++ b/src/sdl2_module/gpe_window_controller_sdl2.h @@ -55,38 +55,38 @@ namespace gpe window_controller_sdl2(std::string windowTitle,int wWidth, int wHeight,bool showBorder, bool fullScreen, bool maximized, bool isResizable ); ~window_controller_sdl2(); - bool disable_scaling(); - bool enable_scaling(); + bool disable_scaling() override; + bool enable_scaling() override; virtual bool disable_window_resize() override; virtual bool enable_window_resize() override; SDL_Window * get_sdl2_window(); //Handle window events - bool hide_window(); - bool minimize_window(); - bool maximize_window(); + bool hide_window() override; + bool minimize_window() override; + bool maximize_window() override; - void process_event( input_event_container * event_holder ); + void process_event( input_event_container * event_holder ) override; - //SDL_SysWMinfo * get_info(); - void reset_input(); - void resize_window(); + //SDL_SysWMinfo * get_info(); + void reset_input() override; + void resize_window() override; - bool scale_window( int s_width, int s_height , bool scale_int ); - bool scale_window_factor( float s_width, float s_height, bool scale_int ); + bool scale_window( int s_width, int s_height , bool scale_int ) override; + bool scale_window_factor( float s_width, float s_height, bool scale_int ) override; void set_renderer( renderer_base * new_renderer, bool remove_current ); - void set_vysnc( bool vs_on ); - void set_window_position( int new_x, int new_y ); - bool set_window_size( int n_width, int n_height ); + void set_vysnc( bool vs_on ) override; + void set_window_position( int new_x, int new_y ) override; + bool set_window_size( int n_width, int n_height ) override; //std::string save_screenshot(std::string file_location = ""); - void set_window_title(std::string new_title); - bool show_window(); - void start_loop(); + void set_window_title(std::string new_title) override; + bool show_window() override; + void start_loop() override; //Turn fullscreen on/off - void toggle_fullscreen(); + void toggle_fullscreen() override; bool window_changed(); }; From 8a295cb16700729e703f681872fc1a9765834c21 Mon Sep 17 00:00:00 2001 From: thepherm <63941518+thepherm@users.noreply.github.com> Date: Sun, 8 Dec 2024 12:23:30 -0600 Subject: [PATCH 2/8] Refactor font handling to eliminate hardcoded paths and improve cross-platform compatibility --- src/gpe_editor/gpe_editor.cpp | 306 ++++++++++++++++++++-------------- 1 file changed, 181 insertions(+), 125 deletions(-) diff --git a/src/gpe_editor/gpe_editor.cpp b/src/gpe_editor/gpe_editor.cpp index 6797b13b..2c8bbb3a 100644 --- a/src/gpe_editor/gpe_editor.cpp +++ b/src/gpe_editor/gpe_editor.cpp @@ -37,6 +37,32 @@ SOFTWARE. #include "gpe_project_resources.h" #include "gpe_cpp_builder_settings.h" #include "gpe_gamepad_tester.h" +// Ensure you have these includes at the top of your file +#include // For std::max +#include + +// Define the PATH_SEPARATOR based on the OS +#ifdef _WIN32 + const char PATH_SEPARATOR = '\\'; +#else + const char PATH_SEPARATOR = '/'; +#endif + +// Utility function to join two paths +std::string join_paths(const std::string& path1, const std::string& path2) +{ + if (path1.empty()) return path2; + if (path2.empty()) return path1; + + std::string joined = path1; + if (joined.back() != PATH_SEPARATOR) + { + joined += PATH_SEPARATOR; + } + joined += path2; + return joined; +} + GPE_Gui_Engine * editor_gui_main = nullptr; @@ -851,131 +877,131 @@ void GPE_Gui_Engine::launch_new_project() std::string newProjectName = ""; std::string foundFileName = ""; pawgui::resource_dragged = nullptr; - if( editor_gui_main!=nullptr && gpe::renderer_main!=nullptr) + + if (editor_gui_main != nullptr && gpe::renderer_main != nullptr) { gpe::error_log->report("Launching New Project"); std::string popUpCaption = "Launch New Project"; - gpe::cursor_main_controller->cursor_change( gpe::cursor_main_controller->cursor_system_name( gpe::cursor_default_type::arrow) ); + gpe::cursor_main_controller->cursor_change(gpe::cursor_main_controller->cursor_system_name(gpe::cursor_default_type::arrow)); editor_gui_main->reset_gui_info(); - pawgui::main_overlay_system->take_frozen_screenshot( ); + pawgui::main_overlay_system->take_frozen_screenshot(); int promptBoxWidth = gpe::settings->minWindowWidth; int promptBoxHeight = gpe::settings->minWindowHeight; gpe::shape_rect widget_box; - gpe::input->reset_all_input(); int currentTipId = editor_gui_main->get_random_tip(); - if( currentTipId < 0 || currentTipId > editor_gui_main->get_tip_count() ) + if (currentTipId < 0 || currentTipId > editor_gui_main->get_tip_count()) { currentTipId = 0; } std::string currentTipstring = editor_gui_main->get_tip(currentTipId); - pawgui::widget_label_title * mainMenuLabel = new pawgui::widget_label_title("Create A Project?","Create A Project"); - pawgui::widget_label_text * projectLocationLabel = new pawgui::widget_label_text ("Project Location:","Project Location:"); - pawgui::widget_label_text * projectNameLabel = new pawgui::widget_label_text ("Project Name:","Project Name:"); + pawgui::widget_label_title* mainMenuLabel = new pawgui::widget_label_title("Create A Project?", "Create A Project"); + pawgui::widget_label_text* projectLocationLabel = new pawgui::widget_label_text("Project Location:", "Project Location:"); + pawgui::widget_label_text* projectNameLabel = new pawgui::widget_label_text("Project Name:", "Project Name:"); - pawgui::widget_label_text * projectMainExportLabel = new pawgui::widget_label_text ("Primary Export Target:","Primary Export Target:"); - pawgui::widget_label_text * projectMainLanguageLabel = new pawgui::widget_label_text ("Programming Language:","Programming Language:"); - int biggerLabelSize = std::max( projectMainExportLabel->get_width(), projectMainLanguageLabel->get_width() ); - biggerLabelSize = std::max( biggerLabelSize, projectNameLabel->get_width() ); + pawgui::widget_label_text* projectMainExportLabel = new pawgui::widget_label_text("Primary Export Target:", "Primary Export Target:"); + pawgui::widget_label_text* projectMainLanguageLabel = new pawgui::widget_label_text("Programming Language:", "Programming Language:"); + int biggerLabelSize = std::max(projectMainExportLabel->get_width(), projectMainLanguageLabel->get_width()); + biggerLabelSize = std::max(biggerLabelSize, projectNameLabel->get_width()); projectMainExportLabel->set_width(biggerLabelSize); projectNameLabel->set_width(biggerLabelSize); projectMainLanguageLabel->set_width(biggerLabelSize); - //Adds all available languages to drop down menu - pawgui::widget_dropdown_menu * newprojectLanguage = new pawgui::widget_dropdown_menu( "Project Language",true); + // Adds all available languages to drop down menu + pawgui::widget_dropdown_menu* newprojectLanguage = new pawgui::widget_dropdown_menu("Project Language", true); int addedLanguages = 0; - if( pawgui::main_syntax_highlighter!=nullptr ) + if (pawgui::main_syntax_highlighter != nullptr) { - //short operation so not "optimized" - pawgui::syntax_language * tLanguage = nullptr; - int languageCount = (int)pawgui::main_syntax_highlighter->get_language_count(); + // Short operation so not "optimized" + pawgui::syntax_language* tLanguage = nullptr; + int languageCount = static_cast(pawgui::main_syntax_highlighter->get_language_count()); - for( int cLanguage = 0; cLanguage < languageCount; cLanguage++ ) + for (int cLanguage = 0; cLanguage < languageCount; cLanguage++) { - tLanguage = pawgui::main_syntax_highlighter->get_language_object( cLanguage); - if( tLanguage!=nullptr && tLanguage->isCodingLanguage) + tLanguage = pawgui::main_syntax_highlighter->get_language_object(cLanguage); + if (tLanguage != nullptr && tLanguage->isCodingLanguage) { - newprojectLanguage->add_menu_option(tLanguage->languageName+" ("+tLanguage->languageShortName+")",tLanguage->languageShortName,cLanguage,true); + newprojectLanguage->add_menu_option(tLanguage->languageName + " (" + tLanguage->languageShortName + ")", tLanguage->languageShortName, cLanguage, true); addedLanguages++; } } } - //In the event something went wrong and we somehow didn't add JS and any other new coding language... - if( addedLanguages == 0 ) + // In the event something went wrong and we somehow didn't add JS and any other new coding language... + if (addedLanguages == 0) { - newprojectLanguage->add_menu_option("JavaScript","JS", pawgui::program_language_js,true); - newprojectLanguage->add_menu_option("C++","CPP", pawgui::program_language_cpp,true); + newprojectLanguage->add_menu_option("JavaScript", "JS", pawgui::program_language_js, true); + newprojectLanguage->add_menu_option("C++", "CPP", pawgui::program_language_cpp, true); } - pawgui::widget_dropdown_menu * newprojectMainExport= new pawgui::widget_dropdown_menu( "Main Export Target",true); - newprojectMainExport->add_menu_option("HTML5","HTML5" , gpe::system_os_html5,true); - newprojectMainExport->add_menu_option("WINDOWS","WINDOWS", gpe::system_os_windows); - newprojectMainExport->add_menu_option("MAC","MAC", gpe::system_os_mac); - newprojectMainExport->add_menu_option("LINUX","LINUX", gpe::system_os_linux); + pawgui::widget_dropdown_menu* newprojectMainExport = new pawgui::widget_dropdown_menu("Main Export Target", true); + newprojectMainExport->add_menu_option("HTML5", "HTML5", gpe::system_os_html5, true); + newprojectMainExport->add_menu_option("WINDOWS", "WINDOWS", gpe::system_os_windows); + newprojectMainExport->add_menu_option("MAC", "MAC", gpe::system_os_mac); + newprojectMainExport->add_menu_option("LINUX", "LINUX", gpe::system_os_linux); + pawgui::widget_panel_list* popupMenuList = new pawgui::widget_panel_list(); + pawgui::widget_input_text* projectNameField = new pawgui::widget_input_text("", "New Project"); + pawgui::widget_label_text* fileToCreateField = new pawgui::widget_label_text("No file selected", "No file selected"); + fileToCreateField->set_width(gpe::settings->minWindowWidth - 32); + pawgui::widget_button_label* close_button = new pawgui::widget_button_label("Cancel", "Cancel"); + pawgui::widget_button_label* create_button = new pawgui::widget_button_label("Create", "Create"); + pawgui::widget_checkbox* matchProjectFileName = new pawgui::widget_checkbox("Same as file name", "Makes project name same as file name", true); + pawgui::widget_label_error* projectCreateErrorLabel = new pawgui::widget_label_error("Please input all fields above", ""); + pawgui::widget_button_push* fileFind_button = new pawgui::widget_button_push(gpe::app_directory_name + "resources/gfx/iconpacks/fontawesome/folder.png", "Browse Projects..."); + fileToCreateField->set_width(gpe::settings->minWindowWidth - 32); + gpe::renderer_main->reset_viewpoint(); + // pawgui::main_overlay_system->render_frozen_screenshot(); - pawgui::widget_panel_list * popupMenuList = new pawgui::widget_panel_list(); - pawgui::widget_input_text * projectNameField = new pawgui::widget_input_text("","New Project"); - pawgui::widget_label_text * fileToCreateField = new pawgui::widget_label_text ("No file selected","No file selected" ); - fileToCreateField->set_width( gpe::settings->minWindowWidth -32 ); - pawgui::widget_button_label * close_button = new pawgui::widget_button_label( "Cancel","Cancel"); - pawgui::widget_button_label * create_button = new pawgui::widget_button_label( "Create","Create"); - pawgui::widget_checkbox * matchProjectFileName = new pawgui::widget_checkbox("Same as file name","Makes project name same as file name", true ); - pawgui::widget_label_error * projectCreateErrorLabel = new pawgui::widget_label_error("Please gpe::input all fields above",""); - pawgui::widget_button_push * fileFind_button = new pawgui::widget_button_push( gpe::app_directory_name+"resources/gfx/iconpacks/fontawesome/folder.png","Browse Projects..."); - fileToCreateField->set_width( gpe::settings->minWindowWidth -32 ); - gpe::renderer_main->reset_viewpoint( ); - //pawgui::main_overlay_system->render_frozen_screenshot( ); - while(exitOperation==false) + while (!exitOperation) { - gpe::cursor_main_controller->cursor_change( gpe::cursor_main_controller->cursor_system_name( gpe::cursor_default_type::arrow) ); - //gpe::error_log->report("Processing tip of the day"); + gpe::cursor_main_controller->cursor_change(gpe::cursor_main_controller->cursor_system_name(gpe::cursor_default_type::arrow)); + // gpe::error_log->report("Processing tip of the day"); gpe::game_runtime->start_loop(); - if( gpe::screen_width > gpe::settings->defaultWindowWidth*2 ) + if (gpe::screen_width > gpe::settings->defaultWindowWidth * 2) { - promptBoxWidth = gpe::settings->defaultWindowWidth*2; + promptBoxWidth = gpe::settings->defaultWindowWidth * 2; } else { promptBoxWidth = gpe::screen_width; } - if( gpe::screen_height > gpe::settings->defaultWindowWidth*2 ) + if (gpe::screen_height > gpe::settings->defaultWindowWidth * 2) { - promptBoxHeight = gpe::settings->defaultWindowWidth*2; + promptBoxHeight = gpe::settings->defaultWindowWidth * 2; } else { promptBoxHeight = gpe::screen_height; } - widget_box.x = (gpe::screen_width-promptBoxWidth)/2; - widget_box.y = (gpe::screen_height-promptBoxHeight)/2; + widget_box.x = (gpe::screen_width - promptBoxWidth) / 2; + widget_box.y = (gpe::screen_height - promptBoxHeight) / 2; widget_box.w = promptBoxWidth; widget_box.h = promptBoxHeight; - popupMenuList->set_coords(widget_box.x, widget_box.y+32); + popupMenuList->set_coords(widget_box.x, widget_box.y + 32); popupMenuList->set_width(widget_box.w); - popupMenuList->set_height(widget_box.h-32); + popupMenuList->set_height(widget_box.h - 32); popupMenuList->barXMargin = pawgui::padding_default; popupMenuList->barYMargin = pawgui::padding_default; popupMenuList->barXPadding = pawgui::padding_default; popupMenuList->barYPadding = pawgui::padding_default; editor_gui_main->reset_gui_info(); popupMenuList->clear_list(); - popupMenuList->add_gui_element(mainMenuLabel,true); + popupMenuList->add_gui_element(mainMenuLabel, true); - popupMenuList->add_gui_element(projectLocationLabel,false); + popupMenuList->add_gui_element(projectLocationLabel, false); popupMenuList->add_gui_element(fileFind_button, true); - popupMenuList->add_gui_element(fileToCreateField,true); + popupMenuList->add_gui_element(fileToCreateField, true); popupMenuList->add_gui_element(matchProjectFileName, true); - popupMenuList->add_gui_element(projectNameLabel,false); - popupMenuList->add_gui_element(projectNameField,true); + popupMenuList->add_gui_element(projectNameLabel, false); + popupMenuList->add_gui_element(projectNameField, true); popupMenuList->add_gui_element(projectMainExportLabel, false); popupMenuList->add_gui_element(newprojectMainExport, true); @@ -984,42 +1010,45 @@ void GPE_Gui_Engine::launch_new_project() popupMenuList->add_gui_element(newprojectLanguage, true); popupMenuList->add_gui_element(projectCreateErrorLabel, true); - popupMenuList->add_gui_element(create_button,false); - popupMenuList->add_gui_element(close_button,false); + popupMenuList->add_gui_element(create_button, false); + popupMenuList->add_gui_element(close_button, false); popupMenuList->process_self(); - if( gpe::input->check_kb_released(kb_esc) || close_button->is_clicked() ) + + if (gpe::input->check_kb_released(kb_esc) || close_button->is_clicked()) { exitOperation = true; manualCancel = true; newProjectFileName = ""; } - else if( create_button->is_clicked() ) + else if (create_button->is_clicked()) { newProjectName = projectNameField->get_string(); - //Checks if a file is actually here or is it still just a folder... - newProjectLocalFileName = stg_ex::get_local_from_global_file( newProjectName ); - if( (int)newProjectLocalFileName.size() > 0 ) + // Checks if a file is actually here or is it still just a folder... + newProjectLocalFileName = stg_ex::get_local_from_global_file(newProjectName); + if (static_cast(newProjectLocalFileName.size()) > 0) { - if( stg_ex::is_alnum(newProjectName,true, true) ) + if (stg_ex::is_alnum(newProjectName, true, true)) { /* - If the path exists, file name checks, is alpha numeric and such + If the path exists, file name checks, is alphanumeric and such We exit this while loop and skip to end of function ready to create a new project. */ - if( sff_ex::path_exists( stg_ex::get_path_from_file(newProjectFileName) ) ) + std::string projectPathStr = stg_ex::get_path_from_file(newProjectFileName); + // Check if the path exists (assuming sff_ex::path_exists can work with string paths) + if (sff_ex::path_exists(projectPathStr)) { manualCancel = false; create_buttonPushed = true; exitOperation = true; } - else if( (int)newProjectFileName.size() > 0 ) + else if (newProjectFileName.size() > 0) { - projectCreateErrorLabel->set_name("Empty path given..."); + projectCreateErrorLabel->set_name("Path does not exist..."); } else { - projectCreateErrorLabel->set_name("Path does not exist..."); + projectCreateErrorLabel->set_name("Empty path given..."); } } else @@ -1032,41 +1061,59 @@ void GPE_Gui_Engine::launch_new_project() projectCreateErrorLabel->set_name("Empty project name given..."); } } - else if( fileFind_button->is_clicked() ) + else if (fileFind_button->is_clicked()) { - foundFileName = pawgui::get_filename_save_from_popup("Create a New Project File","Game Pencil Projects",editor_gui_main->fileOpenProjectDir); - if( (int)foundFileName.size() > 0 ) + foundFileName = pawgui::get_filename_save_from_popup("Create a New Project File", "Game Pencil Projects", editor_gui_main->fileOpenProjectDir); + if (foundFileName.size() > 0) { - newProjectFileName = foundFileName; - fileToCreateField->set_name(foundFileName); - if( matchProjectFileName!=nullptr && matchProjectFileName->is_clicked() ) + // Normalize the path by replacing backslashes with forward slashes on non-Windows systems + std::string normalizedPath = foundFileName; + #ifndef _WIN32 + std::replace(normalizedPath.begin(), normalizedPath.end(), '\\', '/'); + #else + std::replace(normalizedPath.begin(), normalizedPath.end(), '/', '\\'); + #endif + newProjectFileName = normalizedPath; + fileToCreateField->set_name(newProjectFileName); + if (matchProjectFileName != nullptr && matchProjectFileName->is_clicked()) { - projectNameField->set_string( stg_ex::get_file_noext( stg_ex::get_local_from_global_file(foundFileName) ) ); + // Extract the filename without extension + size_t lastSeparator = newProjectFileName.find_last_of("/\\"); + size_t lastDot = newProjectFileName.find_last_of('.'); + std::string filename; + if (lastDot != std::string::npos && lastDot > lastSeparator) + { + filename = newProjectFileName.substr(lastSeparator + 1, lastDot - lastSeparator - 1); + } + else + { + filename = newProjectFileName.substr(lastSeparator + 1); + } + projectNameField->set_string(filename); } } - } - //gpe::error_log->report("Rendering tip of the day"); - gpe::renderer_main->reset_viewpoint( ); - if( !gpe::window_controller_main->is_resized() ) + // gpe::error_log->report("Rendering tip of the day"); + gpe::renderer_main->reset_viewpoint(); + if (!gpe::window_controller_main->is_resized()) { - //if( gpe::input->window_input_received ) + // if (gpe::input->window_input_received) { - pawgui::main_overlay_system->render_frozen_screenshot( ); + pawgui::main_overlay_system->render_frozen_screenshot(); } - //Update screen - gpe::gcanvas->render_rectangle( widget_box.x-4,widget_box.y-4,widget_box.x+widget_box.w+8,widget_box.y+widget_box.h+8, gpe::c_blgray,false,64); - gpe::gcanvas->render_rect( &widget_box,pawgui::theme_main->popup_box_color,false); - - gpe::gcanvas->render_rectangle( widget_box.x,widget_box.y,widget_box.x+widget_box.w,widget_box.y+32,pawgui::theme_main->popup_box_highlight_color,false); - gpe::gcanvas->render_rect( &widget_box,pawgui::theme_main->button_box_highlight_color,true); - gpe::gfs->render_text( widget_box.x+widget_box.w/2,widget_box.y+pawgui::padding_default,popUpCaption,pawgui::theme_main->popup_box_highlight_font_color,gpe::font_default,gpe::fa_center,gpe::fa_top); - popupMenuList->render_self( ); - //editor_gui_main-render_gui_info(renderer_main, true); - - gpe::gcanvas->render_rect( &widget_box,pawgui::theme_main->popup_box_border_color,true); - if( editor_gui_main!= nullptr ) + // Update screen + gpe::gcanvas->render_rectangle(widget_box.x - 4, widget_box.y - 4, widget_box.x + widget_box.w + 8, widget_box.y + widget_box.h + 8, gpe::c_blgray, false, 64); + gpe::gcanvas->render_rect(&widget_box, pawgui::theme_main->popup_box_color, false); + + gpe::gcanvas->render_rectangle(widget_box.x, widget_box.y, widget_box.x + widget_box.w, widget_box.y + 32, pawgui::theme_main->popup_box_highlight_color, false); + gpe::gcanvas->render_rect(&widget_box, pawgui::theme_main->button_box_highlight_color, true); + gpe::gfs->render_text(widget_box.x + widget_box.w / 2, widget_box.y + pawgui::padding_default, popUpCaption, pawgui::theme_main->popup_box_highlight_font_color, gpe::font_default, gpe::fa_center, gpe::fa_top); + popupMenuList->render_self(); + // editor_gui_main->render_gui_info(renderer_main, true); + + gpe::gcanvas->render_rect(&widget_box, pawgui::theme_main->popup_box_border_color, true); + if (editor_gui_main != nullptr) { editor_gui_main->render_gui_info(); } @@ -1076,26 +1123,35 @@ void GPE_Gui_Engine::launch_new_project() gpe::input->reset_all_input(); - //Creates project if authorized to do so.... - if( manualCancel==false && (int)newProjectFileName.size()> 0 ) + // Creates project if authorized to do so.... + if (!manualCancel && newProjectFileName.size() > 0) { - GPE_ProjectFolder * tPFolder = find_project_from_filename(newProjectFileName); - if(tPFolder==nullptr) + GPE_ProjectFolder* tPFolder = find_project_from_filename(newProjectFileName); + if (tPFolder == nullptr) { - std::string newProjectDir= stg_ex::get_path_from_file(newProjectFileName); + // Extract directory from newProjectFileName + size_t lastSeparator = newProjectFileName.find_last_of("/\\"); + std::string newProjectDir = (lastSeparator != std::string::npos) ? newProjectFileName.substr(0, lastSeparator) : ""; + + // Extract local filename std::string newProjectLocalFileName = stg_ex::get_local_from_global_file(newProjectFileName); - if( (int)newProjectLocalFileName.size()>0 && (int)newProjectName.size() > 0 ) + if (newProjectLocalFileName.size() > 0 && newProjectName.size() > 0) { - std::string newProjectTitle = stg_ex::get_file_noext(newProjectLocalFileName); - if( (int)newProjectTitle.size() > 0) + // Extract title without extension + size_t lastDot = newProjectLocalFileName.find_last_of('.'); + std::string newProjectTitle = (lastDot != std::string::npos) ? newProjectLocalFileName.substr(0, lastDot) : newProjectLocalFileName; + if (newProjectTitle.size() > 0) { - newProjectFileName = newProjectDir+"/"+newProjectTitle+".gppf"; - newProjectDir = newProjectDir+"/"+newProjectTitle; - setup_project_directory(newProjectDir); - main_editor_log->log_general_line("Creating new Project["+newProjectName+"] at ["+newProjectFileName+"] location."); - main_editor_log->log_general_line("Detected Language for new project: ["+newprojectLanguage->get_selected_tag() + "]." ); - GPE_ProjectFolder * newProject = new GPE_ProjectFolder(newProjectName,newProjectDir,newProjectFileName, newprojectLanguage->get_selected_tag(), true ); - pawgui::display_user_alert("Project Opened",newProjectFileName.c_str() ); + // Construct final paths + std::string finalProjectFileName = join_paths(newProjectDir, newProjectTitle + ".gppf"); + std::string finalProjectDir = join_paths(newProjectDir, newProjectTitle); + + setup_project_directory(finalProjectDir); + main_editor_log->log_general_line("Creating new Project[" + newProjectName + "] at [" + finalProjectFileName + "] location."); + main_editor_log->log_general_line("Detected Language for new project: [" + newprojectLanguage->get_selected_tag() + "]."); + + GPE_ProjectFolder* newProject = new GPE_ProjectFolder(newProjectName, finalProjectDir, finalProjectFileName, newprojectLanguage->get_selected_tag(), true); + pawgui::display_user_alert("Project Opened", finalProjectFileName.c_str()); gpeProjects.push_back(newProject); newProject->save_project(); } @@ -1103,59 +1159,59 @@ void GPE_Gui_Engine::launch_new_project() } } - //Cleans up all of the UI elements. - if( popupMenuList!=nullptr) + // Cleans up all of the UI elements. + if (popupMenuList != nullptr) { delete popupMenuList; popupMenuList = nullptr; } - if( mainMenuLabel!=nullptr) + if (mainMenuLabel != nullptr) { delete mainMenuLabel; mainMenuLabel = nullptr; } - if( newprojectMainExport!=nullptr) + if (newprojectMainExport != nullptr) { delete newprojectMainExport; newprojectMainExport = nullptr; } - if( projectMainExportLabel!=nullptr) + if (projectMainExportLabel != nullptr) { delete projectMainExportLabel; projectMainExportLabel = nullptr; } - if( newprojectLanguage!=nullptr) + if (newprojectLanguage != nullptr) { delete newprojectLanguage; newprojectLanguage = nullptr; } - if( projectMainLanguageLabel!=nullptr) + if (projectMainLanguageLabel != nullptr) { delete projectMainLanguageLabel; projectMainLanguageLabel = nullptr; } - if( projectLocationLabel!=nullptr) + if (projectLocationLabel != nullptr) { delete projectLocationLabel; projectLocationLabel = nullptr; } - if( fileToCreateField!=nullptr) + if (fileToCreateField != nullptr) { delete fileToCreateField; fileToCreateField = nullptr; } - if( matchProjectFileName!=nullptr) + if (matchProjectFileName != nullptr) { delete matchProjectFileName; matchProjectFileName = nullptr; } - if( close_button!=nullptr) + if (close_button != nullptr) { delete close_button; close_button = nullptr; } - if( fileFind_button!=nullptr) + if (fileFind_button != nullptr) { delete fileFind_button; fileFind_button = nullptr; @@ -2025,7 +2081,7 @@ void GPE_Gui_Engine::render_foreground_engine() gpe::gfs->render_text_boxed( gpe::input->mouse_position_x+32,gpe::input->mouse_position_y,pawgui::resource_dragged->get_name(),pawgui::theme_main->popup_box_font_color,pawgui::theme_main->popup_box_color,pawgui::font_textinput,gpe::fa_left,gpe::fa_top ); } main_toolbar->render_self( nullptr); - pawgui::main_context_menu->render_self( ); + pawgui::main_context_menu->render_self( ); ////if( forceRedraw ) { //gpe::gfs->render_fps( pawgui::font_textinput, pawgui::theme_main->main_box_font_color, gpe::screen_width, 32 ); From f288081fec7630b044f4e46d85ec7da6cd234f45 Mon Sep 17 00:00:00 2001 From: thepherm <63941518+thepherm@users.noreply.github.com> Date: Sun, 8 Dec 2024 12:24:36 -0600 Subject: [PATCH 3/8] Update .gitignore to exclude .vscode directory --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 33d224bb..bdb47224 100644 --- a/.gitignore +++ b/.gitignore @@ -20,4 +20,5 @@ Game-Pencil-Engine-Editor.layout Game_Pencil_Engine_IDE.cbp Game_Pencil_Engine_IDE.depend Game_Pencil_Engine_IDE.layout -GamePencil \ No newline at end of file +GamePencil +.vscode \ No newline at end of file From 56b4325c7d6293fa4bbcbcef33c1c76db33daa37 Mon Sep 17 00:00:00 2001 From: thepherm <63941518+thepherm@users.noreply.github.com> Date: Sun, 8 Dec 2024 12:35:55 -0600 Subject: [PATCH 4/8] Remove unnecessary comments and clean up includes in gpe_editor.cpp --- src/gpe_editor/gpe_editor.cpp | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/gpe_editor/gpe_editor.cpp b/src/gpe_editor/gpe_editor.cpp index 2c8bbb3a..278bf042 100644 --- a/src/gpe_editor/gpe_editor.cpp +++ b/src/gpe_editor/gpe_editor.cpp @@ -37,7 +37,6 @@ SOFTWARE. #include "gpe_project_resources.h" #include "gpe_cpp_builder_settings.h" #include "gpe_gamepad_tester.h" -// Ensure you have these includes at the top of your file #include // For std::max #include @@ -63,8 +62,6 @@ std::string join_paths(const std::string& path1, const std::string& path2) return joined; } - - GPE_Gui_Engine * editor_gui_main = nullptr; pawgui::popup_menu_option * main_TOOLBAR_RECENT_PROJECTS = nullptr; From 919f2cb4e401b43993a806f83814fe961a5659ac Mon Sep 17 00:00:00 2001 From: thepherm <63941518+thepherm@users.noreply.github.com> Date: Sat, 14 Dec 2024 09:39:57 -0600 Subject: [PATCH 5/8] Refactor SDL includes to use relative paths and reorganize resource headers --- .vscode/tasks.json | 42 +++++++-------- install_apple_silicon_dependencys.sh | 2 +- .../{ => cpp}/gpe_cpp_builder_settings.cpp | 0 .../{ => cpp}/gpe_cpp_builder_settings.h | 2 +- src/gpe_editor/{ => editor}/gpe_editor.cpp | 7 +-- src/gpe_editor/{ => editor}/gpe_editor.h | 10 ++-- .../{ => editor}/gpe_editor_aboutpage.cpp | 0 .../{ => editor}/gpe_editor_aboutpage.h | 2 +- .../{ => editor}/gpe_editor_constants.h | 0 .../{ => editor}/gpe_editor_globals.cpp | 2 +- .../{ => editor}/gpe_editor_globals.h | 0 .../{ => editor}/gpe_editor_helppage.cpp | 0 .../{ => editor}/gpe_editor_helppage.h | 0 .../{ => editor}/gpe_editor_project.cpp | 4 +- .../{ => editor}/gpe_editor_project.h | 8 +-- .../gpe_editor_project_helper.cpp | 0 .../{ => editor}/gpe_editor_project_helper.h | 2 +- .../{ => editor}/gpe_editor_settings.cpp | 0 .../{ => editor}/gpe_editor_settings.h | 2 +- .../{ => editor}/gpe_editor_splash_page.cpp | 0 .../{ => editor}/gpe_editor_splash_page.h | 0 .../{ => editor}/gpe_editor_start_page.cpp | 0 .../{ => editor}/gpe_editor_start_page.h | 3 +- .../{ => editor}/gpe_editor_state.cpp | 51 ++++++++++--------- .../{ => editor}/gpe_editor_state.h | 12 ++--- .../{ => extra}/gpe_extra_tools.cpp | 0 src/gpe_editor/{ => extra}/gpe_extra_tools.h | 3 +- .../{ => gamepad}/gpe_gamepad_tester.cpp | 0 .../{ => gamepad}/gpe_gamepad_tester.h | 3 +- .../{ => js}/gpe_js_compiler_settings.cpp | 0 .../{ => js}/gpe_js_compiler_settings.h | 3 +- src/gpe_editor/{ => log}/gpe_log_manager.cpp | 4 +- src/gpe_editor/{ => log}/gpe_log_manager.h | 0 .../{ => project}/gpe_project_resources.cpp | 0 .../{ => project}/gpe_project_resources.h | 32 ++++++------ .../{ => project}/project_properties.cpp | 2 +- .../{ => project}/project_properties.h | 4 +- .../animation}/animation_resource.cpp | 2 +- .../animation}/animation_resource.h | 3 +- .../{ => resources/audio}/audio_resource.cpp | 2 +- .../{ => resources/audio}/audio_resource.h | 3 +- .../basic}/gpe_basic_resource_page.cpp | 3 +- .../basic}/gpe_basic_resource_page.h | 4 +- .../{ => resources/class}/class_resource.cpp | 0 .../{ => resources/class}/class_resource.h | 3 +- .../{ => resources/font}/font_resource.cpp | 2 +- .../{ => resources/font}/font_resource.h | 3 +- .../function}/function_resource.cpp | 0 .../function}/function_resource.h | 3 +- .../game_entity}/game_entity_resource.cpp | 0 .../game_entity}/game_entity_resource.h | 6 +-- .../game_scene}/game_scene_resource.cpp | 10 ++-- .../game_scene}/game_scene_resource.h | 38 +++++++------- .../{ => resources/gpe}/gpe_resource_tree.cpp | 0 .../{ => resources/gpe}/gpe_resource_tree.h | 0 .../{ => resources/light}/light_resource.cpp | 0 .../{ => resources/light}/light_resource.h | 4 +- .../particle}/particle_resource.cpp | 2 +- .../particle}/particle_resource.h | 3 +- .../{ => resources/path}/path_resource.cpp | 0 .../{ => resources/path}/path_resource.h | 4 +- .../texture}/texture_resource.cpp | 2 +- .../texture}/texture_resource.h | 3 +- .../tilesheet_resource.cpp | 2 +- .../tilesheet_resource}/tilesheet_resource.h | 3 +- .../{ => resources/video}/video_resource.cpp | 2 +- .../{ => resources/video}/video_resource.h | 2 +- .../{ => scene}/gpe_scene_animation_class.cpp | 0 .../{ => scene}/gpe_scene_animation_class.h | 2 +- .../gpe_scene_background_class.cpp | 0 .../{ => scene}/gpe_scene_background_class.h | 2 +- .../{ => scene}/gpe_scene_basic_class.cpp | 0 .../{ => scene}/gpe_scene_basic_class.h | 4 +- .../{ => scene}/gpe_scene_group_class.cpp | 0 .../{ => scene}/gpe_scene_group_class.h | 0 .../{ => scene}/gpe_scene_helper_class.cpp | 2 +- .../{ => scene}/gpe_scene_helper_class.h | 0 .../{ => scene}/gpe_scene_layer_class.cpp | 0 .../{ => scene}/gpe_scene_layer_class.h | 0 .../{ => scene}/gpe_scene_light_class.cpp | 0 .../{ => scene}/gpe_scene_light_class.h | 0 .../{ => scene}/gpe_scene_object_class.cpp | 0 .../{ => scene}/gpe_scene_object_class.h | 4 +- .../{ => scene}/gpe_scene_particle_class.cpp | 0 .../{ => scene}/gpe_scene_particle_class.h | 0 .../{ => scene}/gpe_scene_text_class.cpp | 0 .../{ => scene}/gpe_scene_text_class.h | 2 +- .../{ => scene}/gpe_scene_tilemap_class.cpp | 0 .../{ => scene}/gpe_scene_tilemap_class.h | 8 +-- src/main.cpp | 2 +- src/meson.build | 42 +++++++++++++-- src/meson_buiild_backup | 39 ++++++++++++++ src/other_libs/dlgmodule/macos/macos.cpp | 6 +-- src/sdl2_module/gpe_audio_sdl2_mixer.h | 2 +- src/sdl2_module/gpe_cursor_sdl2.h | 2 +- src/sdl2_module/gpe_font_sdl2.h | 2 +- src/sdl2_module/gpe_input_sdl2.h | 6 +-- src/sdl2_module/gpe_sdl2_basic.h | 4 +- src/sdl2_module/gpe_sdl2_converter.h | 2 +- src/sdl2_module/gpe_timer_sdl2.h | 2 +- src/sdl2_module/thirdparty/sdl2_renderparty.h | 2 +- src/sdl2_module/thirdparty/sdl2_surface_ex.h | 4 +- 102 files changed, 270 insertions(+), 178 deletions(-) rename src/gpe_editor/{ => cpp}/gpe_cpp_builder_settings.cpp (100%) rename src/gpe_editor/{ => cpp}/gpe_cpp_builder_settings.h (96%) rename src/gpe_editor/{ => editor}/gpe_editor.cpp (97%) rename src/gpe_editor/{ => editor}/gpe_editor.h (93%) rename src/gpe_editor/{ => editor}/gpe_editor_aboutpage.cpp (100%) rename src/gpe_editor/{ => editor}/gpe_editor_aboutpage.h (96%) rename src/gpe_editor/{ => editor}/gpe_editor_constants.h (100%) rename src/gpe_editor/{ => editor}/gpe_editor_globals.cpp (95%) rename src/gpe_editor/{ => editor}/gpe_editor_globals.h (100%) rename src/gpe_editor/{ => editor}/gpe_editor_helppage.cpp (100%) rename src/gpe_editor/{ => editor}/gpe_editor_helppage.h (100%) rename src/gpe_editor/{ => editor}/gpe_editor_project.cpp (97%) rename src/gpe_editor/{ => editor}/gpe_editor_project.h (96%) rename src/gpe_editor/{ => editor}/gpe_editor_project_helper.cpp (100%) rename src/gpe_editor/{ => editor}/gpe_editor_project_helper.h (95%) rename src/gpe_editor/{ => editor}/gpe_editor_settings.cpp (100%) rename src/gpe_editor/{ => editor}/gpe_editor_settings.h (96%) rename src/gpe_editor/{ => editor}/gpe_editor_splash_page.cpp (100%) rename src/gpe_editor/{ => editor}/gpe_editor_splash_page.h (100%) rename src/gpe_editor/{ => editor}/gpe_editor_start_page.cpp (100%) rename src/gpe_editor/{ => editor}/gpe_editor_start_page.h (96%) rename src/gpe_editor/{ => editor}/gpe_editor_state.cpp (97%) rename src/gpe_editor/{ => editor}/gpe_editor_state.h (90%) rename src/gpe_editor/{ => extra}/gpe_extra_tools.cpp (100%) rename src/gpe_editor/{ => extra}/gpe_extra_tools.h (95%) rename src/gpe_editor/{ => gamepad}/gpe_gamepad_tester.cpp (100%) rename src/gpe_editor/{ => gamepad}/gpe_gamepad_tester.h (96%) rename src/gpe_editor/{ => js}/gpe_js_compiler_settings.cpp (100%) rename src/gpe_editor/{ => js}/gpe_js_compiler_settings.h (95%) rename src/gpe_editor/{ => log}/gpe_log_manager.cpp (97%) rename src/gpe_editor/{ => log}/gpe_log_manager.h (100%) rename src/gpe_editor/{ => project}/gpe_project_resources.cpp (100%) rename src/gpe_editor/{ => project}/gpe_project_resources.h (64%) rename src/gpe_editor/{ => project}/project_properties.cpp (97%) rename src/gpe_editor/{ => project}/project_properties.h (96%) rename src/gpe_editor/{ => resources/animation}/animation_resource.cpp (97%) rename src/gpe_editor/{ => resources/animation}/animation_resource.h (96%) rename src/gpe_editor/{ => resources/audio}/audio_resource.cpp (97%) rename src/gpe_editor/{ => resources/audio}/audio_resource.h (95%) rename src/gpe_editor/{ => resources/basic}/gpe_basic_resource_page.cpp (96%) rename src/gpe_editor/{ => resources/basic}/gpe_basic_resource_page.h (95%) rename src/gpe_editor/{ => resources/class}/class_resource.cpp (100%) rename src/gpe_editor/{ => resources/class}/class_resource.h (95%) rename src/gpe_editor/{ => resources/font}/font_resource.cpp (97%) rename src/gpe_editor/{ => resources/font}/font_resource.h (95%) rename src/gpe_editor/{ => resources/function}/function_resource.cpp (100%) rename src/gpe_editor/{ => resources/function}/function_resource.h (95%) rename src/gpe_editor/{ => resources/game_entity}/game_entity_resource.cpp (100%) rename src/gpe_editor/{ => resources/game_entity}/game_entity_resource.h (94%) rename src/gpe_editor/{ => resources/game_scene}/game_scene_resource.cpp (97%) rename src/gpe_editor/{ => resources/game_scene}/game_scene_resource.h (89%) rename src/gpe_editor/{ => resources/gpe}/gpe_resource_tree.cpp (100%) rename src/gpe_editor/{ => resources/gpe}/gpe_resource_tree.h (100%) rename src/gpe_editor/{ => resources/light}/light_resource.cpp (100%) rename src/gpe_editor/{ => resources/light}/light_resource.h (96%) rename src/gpe_editor/{ => resources/particle}/particle_resource.cpp (97%) rename src/gpe_editor/{ => resources/particle}/particle_resource.h (96%) rename src/gpe_editor/{ => resources/path}/path_resource.cpp (100%) rename src/gpe_editor/{ => resources/path}/path_resource.h (95%) rename src/gpe_editor/{ => resources/texture}/texture_resource.cpp (97%) rename src/gpe_editor/{ => resources/texture}/texture_resource.h (95%) rename src/gpe_editor/{ => resources/tilesheet_resource}/tilesheet_resource.cpp (97%) rename src/gpe_editor/{ => resources/tilesheet_resource}/tilesheet_resource.h (96%) rename src/gpe_editor/{ => resources/video}/video_resource.cpp (97%) rename src/gpe_editor/{ => resources/video}/video_resource.h (96%) rename src/gpe_editor/{ => scene}/gpe_scene_animation_class.cpp (100%) rename src/gpe_editor/{ => scene}/gpe_scene_animation_class.h (95%) rename src/gpe_editor/{ => scene}/gpe_scene_background_class.cpp (100%) rename src/gpe_editor/{ => scene}/gpe_scene_background_class.h (95%) rename src/gpe_editor/{ => scene}/gpe_scene_basic_class.cpp (100%) rename src/gpe_editor/{ => scene}/gpe_scene_basic_class.h (94%) rename src/gpe_editor/{ => scene}/gpe_scene_group_class.cpp (100%) rename src/gpe_editor/{ => scene}/gpe_scene_group_class.h (100%) rename src/gpe_editor/{ => scene}/gpe_scene_helper_class.cpp (97%) rename src/gpe_editor/{ => scene}/gpe_scene_helper_class.h (100%) rename src/gpe_editor/{ => scene}/gpe_scene_layer_class.cpp (100%) rename src/gpe_editor/{ => scene}/gpe_scene_layer_class.h (100%) rename src/gpe_editor/{ => scene}/gpe_scene_light_class.cpp (100%) rename src/gpe_editor/{ => scene}/gpe_scene_light_class.h (100%) rename src/gpe_editor/{ => scene}/gpe_scene_object_class.cpp (100%) rename src/gpe_editor/{ => scene}/gpe_scene_object_class.h (91%) rename src/gpe_editor/{ => scene}/gpe_scene_particle_class.cpp (100%) rename src/gpe_editor/{ => scene}/gpe_scene_particle_class.h (100%) rename src/gpe_editor/{ => scene}/gpe_scene_text_class.cpp (100%) rename src/gpe_editor/{ => scene}/gpe_scene_text_class.h (96%) rename src/gpe_editor/{ => scene}/gpe_scene_tilemap_class.cpp (100%) rename src/gpe_editor/{ => scene}/gpe_scene_tilemap_class.h (92%) create mode 100644 src/meson_buiild_backup diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 7e2260d1..15118ebe 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -4,11 +4,8 @@ { "label": "build", "type": "shell", - "command": "bash", - "args": [ - "-c", - "g++ -std=c++11 -I/opt/homebrew/include -L/opt/homebrew/lib -lSDL2 -lSDL2_image -lSDL2_mixer -lSDL2_ttf src/*.cpp src/gpe/*.cpp src/gpe_editor/*.cpp src/pawgui/*.cpp src/sdl2_module/*.cpp src/sdl2_module/thirdparty/*.cpp src/other_libs/*.cpp -o GamePencil && echo 'Build Complete!'" - ], + "command": "ninja", + "args": [], "group": { "kind": "build", "isDefault": true @@ -17,23 +14,28 @@ "presentation": { "reveal": "always" }, - "windows": { - "args": [ - "-c", - "g++ -std=c++11 -IC:/MinGW/include -LC:/MinGW/lib -lmingw32 -lSDL2main -lSDL2 -lSDL2_image -lSDL2_mixer -lSDL2_ttf src/*.cpp src/gpe/*.cpp src/gpe_editor/*.cpp src/pawgui/*.cpp src/sdl2_module/*.cpp src/sdl2_module/thirdparty/*.cpp src/other_libs/*.cpp -o GamePencil.exe && echo 'Build Complete!'" - ] + "options": { + "cwd": "${workspaceFolder}/src/build" + } + }, + { + "label": "configure", + "type": "shell", + "command": "meson", + "args": [ + "setup", + "--reconfigure", + "build" + ], + "options": { + "cwd": "${workspaceFolder}/src" }, - "osx": { - "args": [ - "-c", - "g++ -std=c++11 -I/opt/homebrew/include -L/opt/homebrew/lib -lSDL2 -lSDL2_image -lSDL2_mixer -lSDL2_ttf src/*.cpp src/gpe/*.cpp src/gpe_editor/*.cpp src/pawgui/*.cpp src/sdl2_module/*.cpp src/sdl2_module/thirdparty/*.cpp src/other_libs/*.cpp -o GamePencil && echo 'Build Complete!' && osascript -e 'display notification \"GamePencil Engine\" with title \"Editor Build Complete\"'" - ] + "group": { + "kind": "build", + "isDefault": false }, - "linux": { - "args": [ - "-c", - "g++ -std=c++11 -I/usr/include -L/usr/lib -lSDL2 -lSDL2_image -lSDL2_mixer -lSDL2_ttf src/*.cpp src/gpe/*.cpp src/gpe_editor/*.cpp src/pawgui/*.cpp src/sdl2_module/*.cpp src/sdl2_module/thirdparty/*.cpp src/other_libs/*.cpp -o GamePencil && echo 'Build Complete!'" - ] + "presentation": { + "reveal": "always" } } ] diff --git a/install_apple_silicon_dependencys.sh b/install_apple_silicon_dependencys.sh index af43ab69..bc321a48 100644 --- a/install_apple_silicon_dependencys.sh +++ b/install_apple_silicon_dependencys.sh @@ -4,7 +4,7 @@ echo "Updating Homebrew..." brew update echo "Installing SDL2 and extensions..." -brew install sdl2 sdl2_image sdl2_mixer sdl2_ttf +brew install sdl2 sdl2_image sdl2_mixer sdl2_ttf meson ninja cmake echo "Cleaning up unused files..." brew cleanup diff --git a/src/gpe_editor/gpe_cpp_builder_settings.cpp b/src/gpe_editor/cpp/gpe_cpp_builder_settings.cpp similarity index 100% rename from src/gpe_editor/gpe_cpp_builder_settings.cpp rename to src/gpe_editor/cpp/gpe_cpp_builder_settings.cpp diff --git a/src/gpe_editor/gpe_cpp_builder_settings.h b/src/gpe_editor/cpp/gpe_cpp_builder_settings.h similarity index 96% rename from src/gpe_editor/gpe_cpp_builder_settings.h rename to src/gpe_editor/cpp/gpe_cpp_builder_settings.h index 419f74fc..524a08af 100644 --- a/src/gpe_editor/gpe_cpp_builder_settings.h +++ b/src/gpe_editor/cpp/gpe_cpp_builder_settings.h @@ -33,7 +33,7 @@ SOFTWARE. #ifndef GPE_CPP_COMPILER_RESOURCES_H #define GPE_CPP_COMPILER_RESOURCES_H -#include "gpe_basic_resource_page.h" +#include "../resources/basic/gpe_basic_resource_page.h" class cppCompilerManager { diff --git a/src/gpe_editor/gpe_editor.cpp b/src/gpe_editor/editor/gpe_editor.cpp similarity index 97% rename from src/gpe_editor/gpe_editor.cpp rename to src/gpe_editor/editor/gpe_editor.cpp index 278bf042..4cea8c70 100644 --- a/src/gpe_editor/gpe_editor.cpp +++ b/src/gpe_editor/editor/gpe_editor.cpp @@ -34,9 +34,10 @@ SOFTWARE. #include "../gpe/gpe.h" #include "gpe_editor.h" #include "gpe_editor_start_page.h" -#include "gpe_project_resources.h" -#include "gpe_cpp_builder_settings.h" -#include "gpe_gamepad_tester.h" +#include "../project/gpe_project_resources.h" +#include "../cpp/gpe_cpp_builder_settings.h" +#include "../gamepad/gpe_gamepad_tester.h" +#include "../extra/gpe_extra_tools.h" #include // For std::max #include diff --git a/src/gpe_editor/gpe_editor.h b/src/gpe_editor/editor/gpe_editor.h similarity index 93% rename from src/gpe_editor/gpe_editor.h rename to src/gpe_editor/editor/gpe_editor.h index 16504cee..44049bed 100644 --- a/src/gpe_editor/gpe_editor.h +++ b/src/gpe_editor/editor/gpe_editor.h @@ -35,15 +35,15 @@ SOFTWARE. #define GPE_EDITOR_H #include "../pawgui/pawgui.h" -#include "../pawgui/pawgui_resource_dropdown.h" -#include "../pawgui/pawgui_dock_system.h" +#include "pawgui/pawgui_resource_dropdown.h" +#include "pawgui/pawgui_dock_system.h" #include "gpe_editor_constants.h" -#include "gpe_editor_globals.h" +#include "../editor/gpe_editor_globals.h" #include "gpe_editor_project.h" #include "gpe_editor_project_helper.h" -#include "gpe_log_manager.h" -#include "gpe_resource_tree.h" +#include "../log/gpe_log_manager.h" +#include "../resources/gpe/gpe_resource_tree.h" extern std::string GPE_BUILD_NAMES[ gpe::system_os_max ]; diff --git a/src/gpe_editor/gpe_editor_aboutpage.cpp b/src/gpe_editor/editor/gpe_editor_aboutpage.cpp similarity index 100% rename from src/gpe_editor/gpe_editor_aboutpage.cpp rename to src/gpe_editor/editor/gpe_editor_aboutpage.cpp diff --git a/src/gpe_editor/gpe_editor_aboutpage.h b/src/gpe_editor/editor/gpe_editor_aboutpage.h similarity index 96% rename from src/gpe_editor/gpe_editor_aboutpage.h rename to src/gpe_editor/editor/gpe_editor_aboutpage.h index 10d79473..27b98904 100644 --- a/src/gpe_editor/gpe_editor_aboutpage.h +++ b/src/gpe_editor/editor/gpe_editor_aboutpage.h @@ -34,7 +34,7 @@ SOFTWARE. #ifndef GPE_ABOUT_PAGE_RESOURCES_H #define GPE_ABOUT_PAGE_RESOURCES_H -#include "gpe_basic_resource_page.h" +#include "../resources/basic/gpe_basic_resource_page.h" class gamePencilAboutPageResource: public pawgui::general_resource { diff --git a/src/gpe_editor/gpe_editor_constants.h b/src/gpe_editor/editor/gpe_editor_constants.h similarity index 100% rename from src/gpe_editor/gpe_editor_constants.h rename to src/gpe_editor/editor/gpe_editor_constants.h diff --git a/src/gpe_editor/gpe_editor_globals.cpp b/src/gpe_editor/editor/gpe_editor_globals.cpp similarity index 95% rename from src/gpe_editor/gpe_editor_globals.cpp rename to src/gpe_editor/editor/gpe_editor_globals.cpp index d3c658ce..aaee8912 100644 --- a/src/gpe_editor/gpe_editor_globals.cpp +++ b/src/gpe_editor/editor/gpe_editor_globals.cpp @@ -32,7 +32,7 @@ SOFTWARE. */ #include "gpe_editor_constants.h" -#include "gpe_editor_globals.h" +#include "../editor/gpe_editor_globals.h" int release_current_mode = release_type_alpha; bool release_is_lts_version = false; diff --git a/src/gpe_editor/gpe_editor_globals.h b/src/gpe_editor/editor/gpe_editor_globals.h similarity index 100% rename from src/gpe_editor/gpe_editor_globals.h rename to src/gpe_editor/editor/gpe_editor_globals.h diff --git a/src/gpe_editor/gpe_editor_helppage.cpp b/src/gpe_editor/editor/gpe_editor_helppage.cpp similarity index 100% rename from src/gpe_editor/gpe_editor_helppage.cpp rename to src/gpe_editor/editor/gpe_editor_helppage.cpp diff --git a/src/gpe_editor/gpe_editor_helppage.h b/src/gpe_editor/editor/gpe_editor_helppage.h similarity index 100% rename from src/gpe_editor/gpe_editor_helppage.h rename to src/gpe_editor/editor/gpe_editor_helppage.h diff --git a/src/gpe_editor/gpe_editor_project.cpp b/src/gpe_editor/editor/gpe_editor_project.cpp similarity index 97% rename from src/gpe_editor/gpe_editor_project.cpp rename to src/gpe_editor/editor/gpe_editor_project.cpp index b6af360f..a46b3700 100644 --- a/src/gpe_editor/gpe_editor_project.cpp +++ b/src/gpe_editor/editor/gpe_editor_project.cpp @@ -32,8 +32,8 @@ SOFTWARE. */ #include "gpe_editor_project.h" -#include "gpe_project_resources.h" -#include "project_properties.h" +#include "../project/gpe_project_resources.h" +#include "../project/project_properties.h" GPE_ProjectFolder * current_project = nullptr; diff --git a/src/gpe_editor/gpe_editor_project.h b/src/gpe_editor/editor/gpe_editor_project.h similarity index 96% rename from src/gpe_editor/gpe_editor_project.h rename to src/gpe_editor/editor/gpe_editor_project.h index e34a3ae4..b5fe9312 100644 --- a/src/gpe_editor/gpe_editor_project.h +++ b/src/gpe_editor/editor/gpe_editor_project.h @@ -39,10 +39,10 @@ SOFTWARE. #include "../pawgui/pawgui_general_resource.h" #include "gpe_editor_constants.h" -#include "gpe_editor_globals.h" -#include "gpe_log_manager.h" +#include "../editor/gpe_editor_globals.h" +#include "../log/gpe_log_manager.h" #include "gpe_editor_project_helper.h" -#include "gpe_resource_tree.h" +#include "../resources/gpe/gpe_resource_tree.h" class GPE_ProjectFolder { @@ -163,7 +163,7 @@ class GPE_ProjectFolder bool save_project_settings(); bool save_project_as(std::string projectFilenew_name); void set_project_language( std::string newProjectLanguage); - void set_project_language_id( int projectLanguageId ); + void set_project_language_id( int projectLanguageId ); void start_state(); }; diff --git a/src/gpe_editor/gpe_editor_project_helper.cpp b/src/gpe_editor/editor/gpe_editor_project_helper.cpp similarity index 100% rename from src/gpe_editor/gpe_editor_project_helper.cpp rename to src/gpe_editor/editor/gpe_editor_project_helper.cpp diff --git a/src/gpe_editor/gpe_editor_project_helper.h b/src/gpe_editor/editor/gpe_editor_project_helper.h similarity index 95% rename from src/gpe_editor/gpe_editor_project_helper.h rename to src/gpe_editor/editor/gpe_editor_project_helper.h index a3a7f92b..660d1395 100644 --- a/src/gpe_editor/gpe_editor_project_helper.h +++ b/src/gpe_editor/editor/gpe_editor_project_helper.h @@ -41,7 +41,7 @@ SOFTWARE. #include "../gpe/gpe.h" #include "../pawgui/pawgui_popups.h" #include "gpe_editor_constants.h" -#include "gpe_editor_globals.h" +#include "../editor/gpe_editor_globals.h" void setup_project_directory(std::string newProjectDir); std::string setup_cpp_folder(std::string buildDirectory, int buildType, int buildBits = 32, bool inDebugMode = false ); diff --git a/src/gpe_editor/gpe_editor_settings.cpp b/src/gpe_editor/editor/gpe_editor_settings.cpp similarity index 100% rename from src/gpe_editor/gpe_editor_settings.cpp rename to src/gpe_editor/editor/gpe_editor_settings.cpp diff --git a/src/gpe_editor/gpe_editor_settings.h b/src/gpe_editor/editor/gpe_editor_settings.h similarity index 96% rename from src/gpe_editor/gpe_editor_settings.h rename to src/gpe_editor/editor/gpe_editor_settings.h index 713ed8d8..e53c8dbb 100644 --- a/src/gpe_editor/gpe_editor_settings.h +++ b/src/gpe_editor/editor/gpe_editor_settings.h @@ -34,7 +34,7 @@ SOFTWARE. #ifndef GPE_EDITOR_SETTINGS_RESOURCES_H #define GPE_EDITOR_SETTINGS_RESOURCES_H -#include "gpe_basic_resource_page.h" +#include "../resources/basic/gpe_basic_resource_page.h" #include "gpe_editor.h" const int GPE_EXTERNAL_EDITOR_MAX = 4; diff --git a/src/gpe_editor/gpe_editor_splash_page.cpp b/src/gpe_editor/editor/gpe_editor_splash_page.cpp similarity index 100% rename from src/gpe_editor/gpe_editor_splash_page.cpp rename to src/gpe_editor/editor/gpe_editor_splash_page.cpp diff --git a/src/gpe_editor/gpe_editor_splash_page.h b/src/gpe_editor/editor/gpe_editor_splash_page.h similarity index 100% rename from src/gpe_editor/gpe_editor_splash_page.h rename to src/gpe_editor/editor/gpe_editor_splash_page.h diff --git a/src/gpe_editor/gpe_editor_start_page.cpp b/src/gpe_editor/editor/gpe_editor_start_page.cpp similarity index 100% rename from src/gpe_editor/gpe_editor_start_page.cpp rename to src/gpe_editor/editor/gpe_editor_start_page.cpp diff --git a/src/gpe_editor/gpe_editor_start_page.h b/src/gpe_editor/editor/gpe_editor_start_page.h similarity index 96% rename from src/gpe_editor/gpe_editor_start_page.h rename to src/gpe_editor/editor/gpe_editor_start_page.h index 85285f7c..dd0fff98 100644 --- a/src/gpe_editor/gpe_editor_start_page.h +++ b/src/gpe_editor/editor/gpe_editor_start_page.h @@ -33,7 +33,8 @@ SOFTWARE. #ifndef GPE_START_PAGE_H #define GPE_START_PAGE_H -#include "gpe_basic_resource_page.h" +#include "../resources/basic/gpe_basic_resource_page.h" + #include "gpe_editor.h" #include "gpe_editor_aboutpage.h" diff --git a/src/gpe_editor/gpe_editor_state.cpp b/src/gpe_editor/editor/gpe_editor_state.cpp similarity index 97% rename from src/gpe_editor/gpe_editor_state.cpp rename to src/gpe_editor/editor/gpe_editor_state.cpp index 26b4258d..44e7f51d 100644 --- a/src/gpe_editor/gpe_editor_state.cpp +++ b/src/gpe_editor/editor/gpe_editor_state.cpp @@ -32,17 +32,18 @@ SOFTWARE. */ #include "gpe_editor_state.h" +#include "../extra/gpe_extra_tools.h" gpe_editor_state::gpe_editor_state(std::string s_name) -{ - if( (int)s_name.size() > 0) - { - state_name = s_name; +{ + if( (int)s_name.size() > 0) + { + state_name = s_name; } - else - { + else + { state_name = "gpe_editor"; - } + } } gpe_editor_state::~gpe_editor_state() @@ -202,11 +203,11 @@ void gpe_editor_state::clean_up() { } - -void gpe_editor_state::end_state() -{ - -} + +void gpe_editor_state::end_state() +{ + +} void gpe_editor_state::process_view_mode() { @@ -273,9 +274,9 @@ void gpe_editor_state::render() gpe::error_log->log_ms_action("editor_gui_main->render_foreground_engine()",eTicks - sTicks,10 ); } - -void gpe_editor_state::start_state() -{ + +void gpe_editor_state::start_state() +{ main_editor_log->log_general_line("Starting Game Pencil Engine Version "+ stg_ex::float_to_string( gpe::version_number_total )+"..."); if( main_gpe_splash_page != nullptr ) @@ -682,8 +683,8 @@ bool init_gpe_editor( int argc, char* args[] ) gpe::game_runtime->loading_data = false; gpe_editor_state * newEditor = new gpe_editor_state( "gpe_editor"); - gpe::game_runtime->state_add( newEditor ); - gpe::game_runtime->state_set( newEditor->get_state_name() ); + gpe::game_runtime->state_add( newEditor ); + gpe::game_runtime->state_set( newEditor->get_state_name() ); //Opens projects based on args[0] being the application name. if( argc > 1) @@ -721,43 +722,43 @@ bool init_gpe_editor( int argc, char* args[] ) bool quit_gpe_editor() { if( pawgui::main_tab_resource_bar!=nullptr) - { + { gpe::error_log->report("Closing all tabs...."); pawgui::main_tab_resource_bar->close_all_tabs(); } if( main_editor_settings!=nullptr) - { + { gpe::error_log->report("Deleting _settings...."); main_editor_settings->save_resource(); delete main_editor_settings; main_editor_settings = nullptr; } if( main_about_page!=nullptr) - { + { gpe::error_log->report("Deleting about page...."); delete main_about_page; main_about_page = nullptr; } if( main_START_PAGE!=nullptr) - { + { gpe::error_log->report("Deleting start page...."); delete main_START_PAGE; main_START_PAGE = nullptr; } if( main_EXTRA_TOOLS!=nullptr) - { + { gpe::error_log->report("Deleting extra tools...."); delete main_EXTRA_TOOLS; main_EXTRA_TOOLS = nullptr; } if( pawgui::main_context_menu!=nullptr) - { + { gpe::error_log->report("Deleting context menu...."); delete pawgui::main_context_menu; pawgui::main_context_menu = nullptr; } if( main_TOOLBAR_RECENT_PROJECTS!=nullptr) - { + { gpe::error_log->report("Deleting toolbar recent projects...."); delete main_TOOLBAR_RECENT_PROJECTS; main_TOOLBAR_RECENT_PROJECTS = nullptr; @@ -771,7 +772,7 @@ bool quit_gpe_editor() } if( editor_gui_main!=nullptr) - { + { gpe::error_log->report("Deleting gui...."); editor_gui_main->save_settings(); delete editor_gui_main; diff --git a/src/gpe_editor/gpe_editor_state.h b/src/gpe_editor/editor/gpe_editor_state.h similarity index 90% rename from src/gpe_editor/gpe_editor_state.h rename to src/gpe_editor/editor/gpe_editor_state.h index 6de22bb1..632630f0 100644 --- a/src/gpe_editor/gpe_editor_state.h +++ b/src/gpe_editor/editor/gpe_editor_state.h @@ -37,11 +37,11 @@ SOFTWARE. #include "gpe_editor.h" #include "gpe_editor_settings.h" -#include "project_properties.h" +#include "../project/project_properties.h" -#include "gpe_log_manager.h" -#include "gpe_resource_tree.h" -#include "gpe_project_resources.h" +#include "../log/gpe_log_manager.h" +#include "../resources/gpe/gpe_resource_tree.h" +#include "../project/gpe_project_resources.h" #include "../gpe/gpe_program_state.h" #include "../pawgui/pawgui.h" @@ -66,9 +66,9 @@ class gpe_editor_state : public gpe::program_state void process_input(); void process_view_mode(); void apply_logic(); - void clean_up(); + void clean_up(); void end_state(); - void render(); + void render(); void start_state(); }; diff --git a/src/gpe_editor/gpe_extra_tools.cpp b/src/gpe_editor/extra/gpe_extra_tools.cpp similarity index 100% rename from src/gpe_editor/gpe_extra_tools.cpp rename to src/gpe_editor/extra/gpe_extra_tools.cpp diff --git a/src/gpe_editor/gpe_extra_tools.h b/src/gpe_editor/extra/gpe_extra_tools.h similarity index 95% rename from src/gpe_editor/gpe_extra_tools.h rename to src/gpe_editor/extra/gpe_extra_tools.h index 614f83b7..ac2cd8ba 100644 --- a/src/gpe_editor/gpe_extra_tools.h +++ b/src/gpe_editor/extra/gpe_extra_tools.h @@ -35,7 +35,8 @@ SOFTWARE. #ifndef GPE_EXTRA_TOOLS_H #define GPE_EXTRA_TOOLS_H -#include "gpe_basic_resource_page.h" +#include "../resources/basic/gpe_basic_resource_page.h" + class atlas_data_viewer { diff --git a/src/gpe_editor/gpe_gamepad_tester.cpp b/src/gpe_editor/gamepad/gpe_gamepad_tester.cpp similarity index 100% rename from src/gpe_editor/gpe_gamepad_tester.cpp rename to src/gpe_editor/gamepad/gpe_gamepad_tester.cpp diff --git a/src/gpe_editor/gpe_gamepad_tester.h b/src/gpe_editor/gamepad/gpe_gamepad_tester.h similarity index 96% rename from src/gpe_editor/gpe_gamepad_tester.h rename to src/gpe_editor/gamepad/gpe_gamepad_tester.h index 855253f6..27fe220a 100644 --- a/src/gpe_editor/gpe_gamepad_tester.h +++ b/src/gpe_editor/gamepad/gpe_gamepad_tester.h @@ -34,7 +34,8 @@ SOFTWARE. #ifndef gpe_gamepad_tester_h #define gpe_gamepad_tester_h -#include "gpe_basic_resource_page.h" +#include "../resources/basic/gpe_basic_resource_page.h" + class gamePencilgamepadTesterResource: public pawgui::general_resource { diff --git a/src/gpe_editor/gpe_js_compiler_settings.cpp b/src/gpe_editor/js/gpe_js_compiler_settings.cpp similarity index 100% rename from src/gpe_editor/gpe_js_compiler_settings.cpp rename to src/gpe_editor/js/gpe_js_compiler_settings.cpp diff --git a/src/gpe_editor/gpe_js_compiler_settings.h b/src/gpe_editor/js/gpe_js_compiler_settings.h similarity index 95% rename from src/gpe_editor/gpe_js_compiler_settings.h rename to src/gpe_editor/js/gpe_js_compiler_settings.h index 61198eff..a7504908 100644 --- a/src/gpe_editor/gpe_js_compiler_settings.h +++ b/src/gpe_editor/js/gpe_js_compiler_settings.h @@ -35,7 +35,8 @@ SOFTWARE. #define GPE_JS_COMPILER_RESOURCES_H -#include "gpe_basic_resource_page.h" +#include "../resources/basic/gpe_basic_resource_page.h" + class gameJSCompiler_settingsResource: public standardEditableGameResource { diff --git a/src/gpe_editor/gpe_log_manager.cpp b/src/gpe_editor/log/gpe_log_manager.cpp similarity index 97% rename from src/gpe_editor/gpe_log_manager.cpp rename to src/gpe_editor/log/gpe_log_manager.cpp index 6d6f70f5..921a24eb 100644 --- a/src/gpe_editor/gpe_log_manager.cpp +++ b/src/gpe_editor/log/gpe_log_manager.cpp @@ -31,8 +31,8 @@ SOFTWARE. */ -#include "gpe_log_manager.h" -#include "gpe_editor.h" +#include "../log/gpe_log_manager.h" +#include "../editor/gpe_editor.h" log_manager * main_editor_log = nullptr; diff --git a/src/gpe_editor/gpe_log_manager.h b/src/gpe_editor/log/gpe_log_manager.h similarity index 100% rename from src/gpe_editor/gpe_log_manager.h rename to src/gpe_editor/log/gpe_log_manager.h diff --git a/src/gpe_editor/gpe_project_resources.cpp b/src/gpe_editor/project/gpe_project_resources.cpp similarity index 100% rename from src/gpe_editor/gpe_project_resources.cpp rename to src/gpe_editor/project/gpe_project_resources.cpp diff --git a/src/gpe_editor/gpe_project_resources.h b/src/gpe_editor/project/gpe_project_resources.h similarity index 64% rename from src/gpe_editor/gpe_project_resources.h rename to src/gpe_editor/project/gpe_project_resources.h index 3e7683ea..5f917014 100644 --- a/src/gpe_editor/gpe_project_resources.h +++ b/src/gpe_editor/project/gpe_project_resources.h @@ -34,22 +34,22 @@ SOFTWARE. #ifndef gpe_project_resources_h #define gpe_project_resources_h -#include "animation_resource.h" -#include "audio_resource.h" -#include "class_resource.h" -#include "font_resource.h" -#include "function_resource.h" -#include "light_resource.h" -#include "path_resource.h" -#include "particle_resource.h" -#include "video_resource.h" -#include "gpe_editor_aboutpage.h" -#include "gpe_editor_settings.h" -#include "gpe_editor_start_page.h" -#include "gpe_extra_tools.h" -#include "game_entity_resource.h" -#include "game_scene_resource.h" -#include "gpe_gamepad_tester.h" +#include "../resources/animation/animation_resource.h" +#include "../resources/audio/audio_resource.h" +#include "../resources/class/class_resource.h" +#include "../resources/font/font_resource.h" +#include "../resources/function/function_resource.h" +#include "../resources/light/light_resource.h" +#include "../resources/path/path_resource.h" +#include "../resources/particle/particle_resource.h" +#include "../resources/video/video_resource.h" +#include "../editor/gpe_editor_aboutpage.h" +#include "../editor/gpe_editor_settings.h" +#include "../editor/gpe_editor_start_page.h" +#include "../editor/gpe_editor.h" +#include "../resources/game_entity/game_entity_resource.h" +#include "../resources/game_scene/game_scene_resource.h" +#include "../gamepad/gpe_gamepad_tester.h" #endif //gpe_project_resources_h diff --git a/src/gpe_editor/project_properties.cpp b/src/gpe_editor/project/project_properties.cpp similarity index 97% rename from src/gpe_editor/project_properties.cpp rename to src/gpe_editor/project/project_properties.cpp index 7ec0993c..06501a4e 100644 --- a/src/gpe_editor/project_properties.cpp +++ b/src/gpe_editor/project/project_properties.cpp @@ -32,7 +32,7 @@ SOFTWARE. */ #include "project_properties.h" -#include "game_scene_resource.h" +#include "../resources/game_scene/game_scene_resource.h" projectPropertiesResource::projectPropertiesResource(pawgui::widget_resource_container * pFolder) { diff --git a/src/gpe_editor/project_properties.h b/src/gpe_editor/project/project_properties.h similarity index 96% rename from src/gpe_editor/project_properties.h rename to src/gpe_editor/project/project_properties.h index 64bec618..ede81319 100644 --- a/src/gpe_editor/project_properties.h +++ b/src/gpe_editor/project/project_properties.h @@ -34,8 +34,8 @@ SOFTWARE. #ifndef GPE_project_PROOPERTIES_H #define GPE_project_PROOPERTIES_H -#include "gpe_basic_resource_page.h" -#include "gpe_cpp_builder_settings.h" +#include "../resources/basic/gpe_basic_resource_page.h" +#include "../cpp/gpe_cpp_builder_settings.h" class projectPropertiesResource: public standardEditableGameResource { diff --git a/src/gpe_editor/animation_resource.cpp b/src/gpe_editor/resources/animation/animation_resource.cpp similarity index 97% rename from src/gpe_editor/animation_resource.cpp rename to src/gpe_editor/resources/animation/animation_resource.cpp index 0937c182..5beffa16 100644 --- a/src/gpe_editor/animation_resource.cpp +++ b/src/gpe_editor/resources/animation/animation_resource.cpp @@ -32,7 +32,7 @@ SOFTWARE. */ #include "animation_resource.h" -#include "gpe_editor_settings.h" +#include "../../editor/gpe_editor_settings.h" std::string animation2d_LABELS[ANIMATION_DATA_FIELD_COUNT]; diff --git a/src/gpe_editor/animation_resource.h b/src/gpe_editor/resources/animation/animation_resource.h similarity index 96% rename from src/gpe_editor/animation_resource.h rename to src/gpe_editor/resources/animation/animation_resource.h index 8f8c2a9f..c3776c97 100644 --- a/src/gpe_editor/animation_resource.h +++ b/src/gpe_editor/resources/animation/animation_resource.h @@ -34,7 +34,8 @@ SOFTWARE. #ifndef animation2d_RESOURCES_H #define animation2d_RESOURCES_H -#include "gpe_basic_resource_page.h" +#include "../../resources/basic/gpe_basic_resource_page.h" + const float ZOOM_LEVEL_MIN = 0.0625; const float ZOOM_LEVEL_MAX = 16; diff --git a/src/gpe_editor/audio_resource.cpp b/src/gpe_editor/resources/audio/audio_resource.cpp similarity index 97% rename from src/gpe_editor/audio_resource.cpp rename to src/gpe_editor/resources/audio/audio_resource.cpp index fd7e795e..d8470ab4 100644 --- a/src/gpe_editor/audio_resource.cpp +++ b/src/gpe_editor/resources/audio/audio_resource.cpp @@ -32,7 +32,7 @@ SOFTWARE. */ #include "audio_resource.h" -#include "gpe_editor_settings.h" +#include "../../editor/gpe_editor_settings.h" audioResource::audioResource(pawgui::widget_resource_container * pFolder) { diff --git a/src/gpe_editor/audio_resource.h b/src/gpe_editor/resources/audio/audio_resource.h similarity index 95% rename from src/gpe_editor/audio_resource.h rename to src/gpe_editor/resources/audio/audio_resource.h index 3079854f..6f39e20f 100644 --- a/src/gpe_editor/audio_resource.h +++ b/src/gpe_editor/resources/audio/audio_resource.h @@ -34,7 +34,8 @@ SOFTWARE. #ifndef GPE_AUDIO_RESOURCES_H #define GPE_AUDIO_RESOURCES_H -#include "gpe_basic_resource_page.h" +#include "../../resources/basic/gpe_basic_resource_page.h" + class audioResource: public standardEditableGameResource { diff --git a/src/gpe_editor/gpe_basic_resource_page.cpp b/src/gpe_editor/resources/basic/gpe_basic_resource_page.cpp similarity index 96% rename from src/gpe_editor/gpe_basic_resource_page.cpp rename to src/gpe_editor/resources/basic/gpe_basic_resource_page.cpp index 07b07b33..e4b739b0 100644 --- a/src/gpe_editor/gpe_basic_resource_page.cpp +++ b/src/gpe_editor/resources/basic/gpe_basic_resource_page.cpp @@ -31,7 +31,8 @@ SOFTWARE. */ -#include "gpe_basic_resource_page.h" +#include "../../resources/basic/gpe_basic_resource_page.h" + gpe::texture_base * texture_transparent_bg = nullptr; gpe::texture_base * texture_gpe_logo = nullptr; diff --git a/src/gpe_editor/gpe_basic_resource_page.h b/src/gpe_editor/resources/basic/gpe_basic_resource_page.h similarity index 95% rename from src/gpe_editor/gpe_basic_resource_page.h rename to src/gpe_editor/resources/basic/gpe_basic_resource_page.h index cab783fb..972a4b08 100644 --- a/src/gpe_editor/gpe_basic_resource_page.h +++ b/src/gpe_editor/resources/basic/gpe_basic_resource_page.h @@ -41,8 +41,8 @@ SOFTWARE. #include "../pawgui/pawgui.h" -#include "gpe_editor_globals.h" -#include "gpe_editor_project.h" +#include "../../editor/gpe_editor_globals.h" +#include "../../editor/gpe_editor_project.h" extern gpe::texture_base * texture_transparent_bg; extern gpe::texture_base * texture_gpe_logo; diff --git a/src/gpe_editor/class_resource.cpp b/src/gpe_editor/resources/class/class_resource.cpp similarity index 100% rename from src/gpe_editor/class_resource.cpp rename to src/gpe_editor/resources/class/class_resource.cpp diff --git a/src/gpe_editor/class_resource.h b/src/gpe_editor/resources/class/class_resource.h similarity index 95% rename from src/gpe_editor/class_resource.h rename to src/gpe_editor/resources/class/class_resource.h index e12e0f23..e302690c 100644 --- a/src/gpe_editor/class_resource.h +++ b/src/gpe_editor/resources/class/class_resource.h @@ -34,7 +34,8 @@ SOFTWARE. #ifndef GPE_CLASS_RESOURCES_H #define GPE_CLASS_RESOURCES_H -#include "gpe_basic_resource_page.h" +#include "../../resources/basic/gpe_basic_resource_page.h" + class classResource: public standardEditableGameResource { diff --git a/src/gpe_editor/font_resource.cpp b/src/gpe_editor/resources/font/font_resource.cpp similarity index 97% rename from src/gpe_editor/font_resource.cpp rename to src/gpe_editor/resources/font/font_resource.cpp index 03a25033..b17f02c6 100644 --- a/src/gpe_editor/font_resource.cpp +++ b/src/gpe_editor/resources/font/font_resource.cpp @@ -32,7 +32,7 @@ SOFTWARE. */ #include "font_resource.h" -#include "gpe_editor_settings.h" +#include "../../editor/gpe_editor_settings.h" // diff --git a/src/gpe_editor/font_resource.h b/src/gpe_editor/resources/font/font_resource.h similarity index 95% rename from src/gpe_editor/font_resource.h rename to src/gpe_editor/resources/font/font_resource.h index db2dd13c..5cf8ad25 100644 --- a/src/gpe_editor/font_resource.h +++ b/src/gpe_editor/resources/font/font_resource.h @@ -33,7 +33,8 @@ SOFTWARE. #ifndef GPE_FONT_RESOURCES_H #define GPE_FONT_RESOURCES_H -#include "gpe_basic_resource_page.h" +#include "../../resources/basic/gpe_basic_resource_page.h" + const int FONT_FILE_TYPES = 6; const int FONT_EOT = 0; diff --git a/src/gpe_editor/function_resource.cpp b/src/gpe_editor/resources/function/function_resource.cpp similarity index 100% rename from src/gpe_editor/function_resource.cpp rename to src/gpe_editor/resources/function/function_resource.cpp diff --git a/src/gpe_editor/function_resource.h b/src/gpe_editor/resources/function/function_resource.h similarity index 95% rename from src/gpe_editor/function_resource.h rename to src/gpe_editor/resources/function/function_resource.h index 437f7baf..e92f4221 100644 --- a/src/gpe_editor/function_resource.h +++ b/src/gpe_editor/resources/function/function_resource.h @@ -34,7 +34,8 @@ SOFTWARE. #ifndef GPE_function_RESOURCES_H #define GPE_function_RESOURCES_H -#include "gpe_basic_resource_page.h" +#include "../../resources/basic/gpe_basic_resource_page.h" + class functionResource: public standardEditableGameResource { diff --git a/src/gpe_editor/game_entity_resource.cpp b/src/gpe_editor/resources/game_entity/game_entity_resource.cpp similarity index 100% rename from src/gpe_editor/game_entity_resource.cpp rename to src/gpe_editor/resources/game_entity/game_entity_resource.cpp diff --git a/src/gpe_editor/game_entity_resource.h b/src/gpe_editor/resources/game_entity/game_entity_resource.h similarity index 94% rename from src/gpe_editor/game_entity_resource.h rename to src/gpe_editor/resources/game_entity/game_entity_resource.h index 7a948061..7e63c65c 100644 --- a/src/gpe_editor/game_entity_resource.h +++ b/src/gpe_editor/resources/game_entity/game_entity_resource.h @@ -34,9 +34,9 @@ SOFTWARE. #ifndef GAME_ENTITY_RESOURCE_H #define GAME_ENTITY_RESOURCE_H -#include "gpe_basic_resource_page.h" -#include "gpe_editor_settings.h" -#include "gpe_js_compiler_settings.h" +#include "../../resources/basic/gpe_basic_resource_page.h" +#include "../../editor/gpe_editor_settings.h" +#include "../../js/gpe_js_compiler_settings.h" const int objectFunctionTypes = 5; //normal, timed, collisions, user added, special functions diff --git a/src/gpe_editor/game_scene_resource.cpp b/src/gpe_editor/resources/game_scene/game_scene_resource.cpp similarity index 97% rename from src/gpe_editor/game_scene_resource.cpp rename to src/gpe_editor/resources/game_scene/game_scene_resource.cpp index 11463194..85b9b9e1 100644 --- a/src/gpe_editor/game_scene_resource.cpp +++ b/src/gpe_editor/resources/game_scene/game_scene_resource.cpp @@ -32,11 +32,11 @@ SOFTWARE. */ #include "game_scene_resource.h" -#include "gpe_editor_settings.h" -#include "animation_resource.h" -#include "project_properties.h" -#include "texture_resource.h" -#include "tilesheet_resource.h" +#include "../../editor/gpe_editor_settings.h" +#include "../animation/animation_resource.h" +#include "../../project/project_properties.h" +#include "../texture/texture_resource.h" +#include "../tilesheet_resource/tilesheet_resource.h" std::string DEFAULT_SCENE_SUBEDITOR_NAMES[5]; diff --git a/src/gpe_editor/game_scene_resource.h b/src/gpe_editor/resources/game_scene/game_scene_resource.h similarity index 89% rename from src/gpe_editor/game_scene_resource.h rename to src/gpe_editor/resources/game_scene/game_scene_resource.h index d2ebf1a0..5ba9b4f6 100644 --- a/src/gpe_editor/game_scene_resource.h +++ b/src/gpe_editor/resources/game_scene/game_scene_resource.h @@ -35,25 +35,25 @@ SOFTWARE. #define GAME_SCENE_RESOURCE_H #include "../gpe/gpe_layer.h" -#include "animation_resource.h" -#include "font_resource.h" -#include "game_entity_resource.h" -#include "project_properties.h" -#include "texture_resource.h" -#include "tilesheet_resource.h" - -#include "gpe_scene_animation_class.h" -#include "gpe_scene_background_class.h" -#include "gpe_scene_basic_class.h" -#include "gpe_scene_background_class.h" -#include "gpe_scene_group_class.h" -#include "gpe_scene_helper_class.h" -#include "gpe_scene_layer_class.h" -#include "gpe_scene_light_class.h" -#include "gpe_scene_object_class.h" -#include "gpe_scene_particle_class.h" -#include "gpe_scene_text_class.h" -#include "gpe_scene_tilemap_class.h" +#include "../../resources/animation/animation_resource.h" +#include "../../resources/font/font_resource.h" +#include "../../resources/game_entity/game_entity_resource.h" +#include "../../project/project_properties.h" +#include "../../resources/texture/texture_resource.h" +#include "../../resources/tilesheet_resource/tilesheet_resource.h" + +#include "../../scene/gpe_scene_animation_class.h" +#include "../../scene/gpe_scene_background_class.h" +#include "../../scene/gpe_scene_basic_class.h" +#include "../../scene/gpe_scene_background_class.h" +#include "../../scene/gpe_scene_group_class.h" +#include "../../scene/gpe_scene_helper_class.h" +#include "../../scene/gpe_scene_layer_class.h" +#include "../../scene/gpe_scene_light_class.h" +#include "../../scene/gpe_scene_object_class.h" +#include "../../scene/gpe_scene_particle_class.h" +#include "../../scene/gpe_scene_text_class.h" +#include "../../scene/gpe_scene_tilemap_class.h" const int LEDITOR_MODE_SETTINGS = 0; const int LEDITOR_MODE_LAYERS = 1; diff --git a/src/gpe_editor/gpe_resource_tree.cpp b/src/gpe_editor/resources/gpe/gpe_resource_tree.cpp similarity index 100% rename from src/gpe_editor/gpe_resource_tree.cpp rename to src/gpe_editor/resources/gpe/gpe_resource_tree.cpp diff --git a/src/gpe_editor/gpe_resource_tree.h b/src/gpe_editor/resources/gpe/gpe_resource_tree.h similarity index 100% rename from src/gpe_editor/gpe_resource_tree.h rename to src/gpe_editor/resources/gpe/gpe_resource_tree.h diff --git a/src/gpe_editor/light_resource.cpp b/src/gpe_editor/resources/light/light_resource.cpp similarity index 100% rename from src/gpe_editor/light_resource.cpp rename to src/gpe_editor/resources/light/light_resource.cpp diff --git a/src/gpe_editor/light_resource.h b/src/gpe_editor/resources/light/light_resource.h similarity index 96% rename from src/gpe_editor/light_resource.h rename to src/gpe_editor/resources/light/light_resource.h index cd859d48..6f44d8b5 100644 --- a/src/gpe_editor/light_resource.h +++ b/src/gpe_editor/resources/light/light_resource.h @@ -34,9 +34,9 @@ SOFTWARE. #ifndef GPE_LIGHT_RESOURCE_H #define GPE_LIGHT_RESOURCE_H - #include "../gpe/gpe_lights2d.h" -#include "gpe_basic_resource_page.h" +#include "../basic/gpe_basic_resource_page.h" + class lightResource: public standardEditableGameResource diff --git a/src/gpe_editor/particle_resource.cpp b/src/gpe_editor/resources/particle/particle_resource.cpp similarity index 97% rename from src/gpe_editor/particle_resource.cpp rename to src/gpe_editor/resources/particle/particle_resource.cpp index c31f93ff..529bf6f4 100644 --- a/src/gpe_editor/particle_resource.cpp +++ b/src/gpe_editor/resources/particle/particle_resource.cpp @@ -32,7 +32,7 @@ SOFTWARE. */ #include "particle_resource.h" -#include "gpe_editor_settings.h" +#include "../../editor/gpe_editor_settings.h" particleResource::particleResource(pawgui::widget_resource_container * pFolder) diff --git a/src/gpe_editor/particle_resource.h b/src/gpe_editor/resources/particle/particle_resource.h similarity index 96% rename from src/gpe_editor/particle_resource.h rename to src/gpe_editor/resources/particle/particle_resource.h index 277c25e8..f76e6989 100644 --- a/src/gpe_editor/particle_resource.h +++ b/src/gpe_editor/resources/particle/particle_resource.h @@ -37,7 +37,8 @@ SOFTWARE. #define GPE_PARTICLE_RESOURCES_H #include "../gpe/gpe_particles2d.h" -#include "gpe_basic_resource_page.h" +#include "../basic/gpe_basic_resource_page.h" + class particleResource: public standardEditableGameResource diff --git a/src/gpe_editor/path_resource.cpp b/src/gpe_editor/resources/path/path_resource.cpp similarity index 100% rename from src/gpe_editor/path_resource.cpp rename to src/gpe_editor/resources/path/path_resource.cpp diff --git a/src/gpe_editor/path_resource.h b/src/gpe_editor/resources/path/path_resource.h similarity index 95% rename from src/gpe_editor/path_resource.h rename to src/gpe_editor/resources/path/path_resource.h index 796d2b8d..5b77e4f4 100644 --- a/src/gpe_editor/path_resource.h +++ b/src/gpe_editor/resources/path/path_resource.h @@ -34,8 +34,8 @@ SOFTWARE. #ifndef GPE_PATH_RESOURCE_H #define GPE_PATH_RESOURCE_H -#include "gpe_basic_resource_page.h" -#include "game_scene_resource.h" +#include "../../resources/basic/gpe_basic_resource_page.h" +#include "../game_scene/game_scene_resource.h" #include "../gpe/gpe_path2d.h" class gamePathResource: public standardEditableGameResource diff --git a/src/gpe_editor/texture_resource.cpp b/src/gpe_editor/resources/texture/texture_resource.cpp similarity index 97% rename from src/gpe_editor/texture_resource.cpp rename to src/gpe_editor/resources/texture/texture_resource.cpp index caeb1815..7e3f79c8 100644 --- a/src/gpe_editor/texture_resource.cpp +++ b/src/gpe_editor/resources/texture/texture_resource.cpp @@ -32,7 +32,7 @@ SOFTWARE. */ #include "texture_resource.h" -#include "gpe_editor_settings.h" +#include "../../editor/gpe_editor_settings.h" textureResource::textureResource(pawgui::widget_resource_container * pFolder) { diff --git a/src/gpe_editor/texture_resource.h b/src/gpe_editor/resources/texture/texture_resource.h similarity index 95% rename from src/gpe_editor/texture_resource.h rename to src/gpe_editor/resources/texture/texture_resource.h index a6c94000..d43833bf 100644 --- a/src/gpe_editor/texture_resource.h +++ b/src/gpe_editor/resources/texture/texture_resource.h @@ -33,7 +33,8 @@ SOFTWARE. #ifndef GPE_TEXTURE_RESOURCES_H #define GPE_TEXTURE_RESOURCES_H -#include "gpe_basic_resource_page.h" +#include "../../resources/basic/gpe_basic_resource_page.h" + enum { diff --git a/src/gpe_editor/tilesheet_resource.cpp b/src/gpe_editor/resources/tilesheet_resource/tilesheet_resource.cpp similarity index 97% rename from src/gpe_editor/tilesheet_resource.cpp rename to src/gpe_editor/resources/tilesheet_resource/tilesheet_resource.cpp index 04f36e58..a541cfc8 100644 --- a/src/gpe_editor/tilesheet_resource.cpp +++ b/src/gpe_editor/resources/tilesheet_resource/tilesheet_resource.cpp @@ -32,7 +32,7 @@ SOFTWARE. */ #include "tilesheet_resource.h" -#include "gpe_editor_settings.h" +#include "../../editor/gpe_editor_settings.h" std::string tsDataLabels[TILESHEET_DATA_FIELD_COUNT]; int tsDataLabelWidth; diff --git a/src/gpe_editor/tilesheet_resource.h b/src/gpe_editor/resources/tilesheet_resource/tilesheet_resource.h similarity index 96% rename from src/gpe_editor/tilesheet_resource.h rename to src/gpe_editor/resources/tilesheet_resource/tilesheet_resource.h index 9561b2a7..31a09d0d 100644 --- a/src/gpe_editor/tilesheet_resource.h +++ b/src/gpe_editor/resources/tilesheet_resource/tilesheet_resource.h @@ -33,7 +33,8 @@ SOFTWARE. #ifndef GPE_TILESHEET_RESOURCES_H #define GPE_TILESHEET_RESOURCES_H -#include "gpe_basic_resource_page.h" +#include "../../resources/basic/gpe_basic_resource_page.h" + const int TILESHEET_DATA_FIELD_COUNT = 6; extern std::string tsDataLabels[TILESHEET_DATA_FIELD_COUNT]; diff --git a/src/gpe_editor/video_resource.cpp b/src/gpe_editor/resources/video/video_resource.cpp similarity index 97% rename from src/gpe_editor/video_resource.cpp rename to src/gpe_editor/resources/video/video_resource.cpp index 2414cf12..1f00fd13 100644 --- a/src/gpe_editor/video_resource.cpp +++ b/src/gpe_editor/resources/video/video_resource.cpp @@ -32,7 +32,7 @@ SOFTWARE. */ #include "video_resource.h" -#include "gpe_editor_settings.h" +#include "../../editor/gpe_editor_settings.h" std::string SUPPORTED_VIDEO_EXT[SUPPORTED_VIDEO_FORMAT_COUNT]; diff --git a/src/gpe_editor/video_resource.h b/src/gpe_editor/resources/video/video_resource.h similarity index 96% rename from src/gpe_editor/video_resource.h rename to src/gpe_editor/resources/video/video_resource.h index dde6aa22..052c965c 100644 --- a/src/gpe_editor/video_resource.h +++ b/src/gpe_editor/resources/video/video_resource.h @@ -33,7 +33,7 @@ SOFTWARE. #ifndef GPE_VIDEO_RESOURCES_H #define GPE_VIDEO_RESOURCES_H -#include "gpe_basic_resource_page.h" +#include "../basic/gpe_basic_resource_page.h" const int SUPPORTED_VIDEO_FORMAT_COUNT = 3; diff --git a/src/gpe_editor/gpe_scene_animation_class.cpp b/src/gpe_editor/scene/gpe_scene_animation_class.cpp similarity index 100% rename from src/gpe_editor/gpe_scene_animation_class.cpp rename to src/gpe_editor/scene/gpe_scene_animation_class.cpp diff --git a/src/gpe_editor/gpe_scene_animation_class.h b/src/gpe_editor/scene/gpe_scene_animation_class.h similarity index 95% rename from src/gpe_editor/gpe_scene_animation_class.h rename to src/gpe_editor/scene/gpe_scene_animation_class.h index 0de31a8c..284f7bba 100644 --- a/src/gpe_editor/gpe_scene_animation_class.h +++ b/src/gpe_editor/scene/gpe_scene_animation_class.h @@ -35,7 +35,7 @@ SOFTWARE. #define GPE_SCENE_ANIMATION_CLASS_H #include "gpe_scene_basic_class.h" -#include "animation_resource.h" +#include "../resources/animation/animation_resource.h" //Hooray animations/Animations in the scene on their own and such!!!! class GPE_SceneAnimation: public GPE_SceneBasicClass diff --git a/src/gpe_editor/gpe_scene_background_class.cpp b/src/gpe_editor/scene/gpe_scene_background_class.cpp similarity index 100% rename from src/gpe_editor/gpe_scene_background_class.cpp rename to src/gpe_editor/scene/gpe_scene_background_class.cpp diff --git a/src/gpe_editor/gpe_scene_background_class.h b/src/gpe_editor/scene/gpe_scene_background_class.h similarity index 95% rename from src/gpe_editor/gpe_scene_background_class.h rename to src/gpe_editor/scene/gpe_scene_background_class.h index ebecb81f..3c497ba3 100644 --- a/src/gpe_editor/gpe_scene_background_class.h +++ b/src/gpe_editor/scene/gpe_scene_background_class.h @@ -36,7 +36,7 @@ SOFTWARE. #include "gpe_scene_basic_class.h" #include "gpe_scene_helper_class.h" -#include "texture_resource.h" +#include "../resources/texture/texture_resource.h" class GPE_SceneBackground: public GPE_SceneBasicClass { diff --git a/src/gpe_editor/gpe_scene_basic_class.cpp b/src/gpe_editor/scene/gpe_scene_basic_class.cpp similarity index 100% rename from src/gpe_editor/gpe_scene_basic_class.cpp rename to src/gpe_editor/scene/gpe_scene_basic_class.cpp diff --git a/src/gpe_editor/gpe_scene_basic_class.h b/src/gpe_editor/scene/gpe_scene_basic_class.h similarity index 94% rename from src/gpe_editor/gpe_scene_basic_class.h rename to src/gpe_editor/scene/gpe_scene_basic_class.h index 0c6e1029..8d10779f 100644 --- a/src/gpe_editor/gpe_scene_basic_class.h +++ b/src/gpe_editor/scene/gpe_scene_basic_class.h @@ -35,8 +35,8 @@ SOFTWARE. #ifndef GPE_SCENE_BASIC_CLASS_H #define GPE_SCENE_BASIC_CLASS_H -#include "gpe_basic_resource_page.h" -#include "gpe_editor_globals.h" +#include "../resources/basic/gpe_basic_resource_page.h" +#include "../editor/gpe_editor_globals.h" #include "../pawgui/pawgui_stree.h" //Basic Scene Editing Modes diff --git a/src/gpe_editor/gpe_scene_group_class.cpp b/src/gpe_editor/scene/gpe_scene_group_class.cpp similarity index 100% rename from src/gpe_editor/gpe_scene_group_class.cpp rename to src/gpe_editor/scene/gpe_scene_group_class.cpp diff --git a/src/gpe_editor/gpe_scene_group_class.h b/src/gpe_editor/scene/gpe_scene_group_class.h similarity index 100% rename from src/gpe_editor/gpe_scene_group_class.h rename to src/gpe_editor/scene/gpe_scene_group_class.h diff --git a/src/gpe_editor/gpe_scene_helper_class.cpp b/src/gpe_editor/scene/gpe_scene_helper_class.cpp similarity index 97% rename from src/gpe_editor/gpe_scene_helper_class.cpp rename to src/gpe_editor/scene/gpe_scene_helper_class.cpp index 6d51b360..5952d07d 100644 --- a/src/gpe_editor/gpe_scene_helper_class.cpp +++ b/src/gpe_editor/scene/gpe_scene_helper_class.cpp @@ -30,7 +30,7 @@ SOFTWARE. */ -#include "gpe_editor.h" +#include "../editor/gpe_editor.h" #include "gpe_scene_helper_class.h" GPE_SceneEditorHelper * spm = nullptr; diff --git a/src/gpe_editor/gpe_scene_helper_class.h b/src/gpe_editor/scene/gpe_scene_helper_class.h similarity index 100% rename from src/gpe_editor/gpe_scene_helper_class.h rename to src/gpe_editor/scene/gpe_scene_helper_class.h diff --git a/src/gpe_editor/gpe_scene_layer_class.cpp b/src/gpe_editor/scene/gpe_scene_layer_class.cpp similarity index 100% rename from src/gpe_editor/gpe_scene_layer_class.cpp rename to src/gpe_editor/scene/gpe_scene_layer_class.cpp diff --git a/src/gpe_editor/gpe_scene_layer_class.h b/src/gpe_editor/scene/gpe_scene_layer_class.h similarity index 100% rename from src/gpe_editor/gpe_scene_layer_class.h rename to src/gpe_editor/scene/gpe_scene_layer_class.h diff --git a/src/gpe_editor/gpe_scene_light_class.cpp b/src/gpe_editor/scene/gpe_scene_light_class.cpp similarity index 100% rename from src/gpe_editor/gpe_scene_light_class.cpp rename to src/gpe_editor/scene/gpe_scene_light_class.cpp diff --git a/src/gpe_editor/gpe_scene_light_class.h b/src/gpe_editor/scene/gpe_scene_light_class.h similarity index 100% rename from src/gpe_editor/gpe_scene_light_class.h rename to src/gpe_editor/scene/gpe_scene_light_class.h diff --git a/src/gpe_editor/gpe_scene_object_class.cpp b/src/gpe_editor/scene/gpe_scene_object_class.cpp similarity index 100% rename from src/gpe_editor/gpe_scene_object_class.cpp rename to src/gpe_editor/scene/gpe_scene_object_class.cpp diff --git a/src/gpe_editor/gpe_scene_object_class.h b/src/gpe_editor/scene/gpe_scene_object_class.h similarity index 91% rename from src/gpe_editor/gpe_scene_object_class.h rename to src/gpe_editor/scene/gpe_scene_object_class.h index 823ca17c..88424be0 100644 --- a/src/gpe_editor/gpe_scene_object_class.h +++ b/src/gpe_editor/scene/gpe_scene_object_class.h @@ -36,8 +36,8 @@ SOFTWARE. #include "gpe_scene_basic_class.h" #include "gpe_scene_helper_class.h" -#include "animation_resource.h" -#include "game_entity_resource.h" +#include "../resources/animation/animation_resource.h" +#include "../resources/game_entity/game_entity_resource.h" class GPE_SceneGameObject: public GPE_SceneBasicClass { diff --git a/src/gpe_editor/gpe_scene_particle_class.cpp b/src/gpe_editor/scene/gpe_scene_particle_class.cpp similarity index 100% rename from src/gpe_editor/gpe_scene_particle_class.cpp rename to src/gpe_editor/scene/gpe_scene_particle_class.cpp diff --git a/src/gpe_editor/gpe_scene_particle_class.h b/src/gpe_editor/scene/gpe_scene_particle_class.h similarity index 100% rename from src/gpe_editor/gpe_scene_particle_class.h rename to src/gpe_editor/scene/gpe_scene_particle_class.h diff --git a/src/gpe_editor/gpe_scene_text_class.cpp b/src/gpe_editor/scene/gpe_scene_text_class.cpp similarity index 100% rename from src/gpe_editor/gpe_scene_text_class.cpp rename to src/gpe_editor/scene/gpe_scene_text_class.cpp diff --git a/src/gpe_editor/gpe_scene_text_class.h b/src/gpe_editor/scene/gpe_scene_text_class.h similarity index 96% rename from src/gpe_editor/gpe_scene_text_class.h rename to src/gpe_editor/scene/gpe_scene_text_class.h index de7f4fd7..488c6f50 100644 --- a/src/gpe_editor/gpe_scene_text_class.h +++ b/src/gpe_editor/scene/gpe_scene_text_class.h @@ -36,7 +36,7 @@ SOFTWARE. #include "gpe_scene_basic_class.h" #include "gpe_scene_helper_class.h" -#include "font_resource.h" +#include "../resources/font/font_resource.h" class GPE_SceneText: public GPE_SceneBasicClass { diff --git a/src/gpe_editor/gpe_scene_tilemap_class.cpp b/src/gpe_editor/scene/gpe_scene_tilemap_class.cpp similarity index 100% rename from src/gpe_editor/gpe_scene_tilemap_class.cpp rename to src/gpe_editor/scene/gpe_scene_tilemap_class.cpp diff --git a/src/gpe_editor/gpe_scene_tilemap_class.h b/src/gpe_editor/scene/gpe_scene_tilemap_class.h similarity index 92% rename from src/gpe_editor/gpe_scene_tilemap_class.h rename to src/gpe_editor/scene/gpe_scene_tilemap_class.h index f7a10a2c..79bb7842 100644 --- a/src/gpe_editor/gpe_scene_tilemap_class.h +++ b/src/gpe_editor/scene/gpe_scene_tilemap_class.h @@ -34,12 +34,12 @@ SOFTWARE. #ifndef GPE_SCENE_TILEMAP_CLASS_H #define GPE_SCENE_TILEMAP_CLASS_H -#include "../gpe/gpe_tiles.h" +#include "../../gpe/gpe_tiles.h" -#include "gpe_scene_basic_class.h" +#include "./gpe_scene_basic_class.h" #include "gpe_scene_helper_class.h" -#include "tilesheet_resource.h" -#include "gpe_editor_globals.h" +#include "../resources/tilesheet_resource/tilesheet_resource.h" +#include "../editor/gpe_editor_globals.h" extern pawgui::widget_dock_panel * PANEL_TS_RESOURCE; diff --git a/src/main.cpp b/src/main.cpp index b8aba6b7..ffa59492 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -46,7 +46,7 @@ SDL 2.0.9 used for this version... #include "game_state_main_menu_base.h" #include "game_state_master.h" #include "game_state_splash.h" -#include "gpe_editor/gpe_editor_state.h" +#include "gpe_editor/editor/gpe_editor_state.h" #include "game_state_shape_test.h" int main( int argc, char* args[] ) diff --git a/src/meson.build b/src/meson.build index 242ed3a5..fd036720 100644 --- a/src/meson.build +++ b/src/meson.build @@ -1,3 +1,39 @@ -sources += files('animation_resource.cpp','audio_resource.cpp','class_resource.cpp','dictionaryresource.cpp','font_resource.cpp','function_resource.cpp','game_object_resource.cpp','game_scene_resource.cpp','gpe_basic_resource_page.cpp','gpe_cpp_compiler_settings.cpp','gpe_dock_system.cpp','gpe_editor_aboutpage.cpp','gpe_editor.cpp','gpe_editor_helppage.cpp','gpe_editor_settings.cpp','gpe_editor_start_page.cpp','gpe_extra_tools.cpp','gpe_gamecontroller_tester.cpp','gpe_js_compiler_settings.cpp','gpe_log_manager.cpp','gpe_project_resources.cpp','gpe_resource_tree.cpp','gpe_scene_animation_class.cpp','gpe_scene_background_class.cpp','gpe_scene_basic_class.cpp','gpe_scene_group_class.cpp','gpe_scene_helper_class.cpp','gpe_scene_layer_class.cpp','gpe_scene_light_class.cpp','gpe_scene_object_class.cpp','gpe_scene_particle_class.cpp','gpe_scene_text_class.cpp','gpe_scene_tilemap_class.cpp','light_resource.cpp','main.cpp','particle_resource.cpp','path_resource.cpp','project_properties.cpp','texture_resource.cpp','tilesheet_resource.cpp','video_resource.cpp') -subdir('GPE_Engine') -subdir('AOSGUI') +project('GamePencil', 'cpp', + version: '1.0', + default_options: ['cpp_std=c++11', 'warning_level=3']) + +# Dependencies +sdl2_dep = dependency('sdl2', version: '>=2.0.0', required: true) +sdl2_image_dep = dependency('sdl2_image', version: '>=2.0.0', required: true) +sdl2_mixer_dep = dependency('sdl2_mixer', version: '>=2.0.0', required: true) +sdl2_ttf_dep = dependency('sdl2_ttf', version: '>=2.0.0', required: true) +x11_dep = dependency('x11', required: host_machine.system() != 'windows') + +# Include directories +inc = include_directories('.') + +# Get all source files +find_program = find_program('find') +cpp_files = run_command(find_program, meson.source_root(), '-name', '*.cpp').stdout().strip().split() + +# Exclude platform-specific files +filtered_cpp_files = [] +foreach f : cpp_files + if host_machine.system() == 'darwin' and not f.contains('win32') + filtered_cpp_files += f + elif host_machine.system() == 'windows' and not f.contains('macos') and not f.contains('unix') + filtered_cpp_files += f + elif host_machine.system() == 'linux' and not f.contains('win32') and not f.contains('macos') + filtered_cpp_files += f + endif +endforeach + +cpp_files = filtered_cpp_files + +# Executable +executable( + 'GamePencil', + cpp_files, + include_directories: inc, + dependencies: [sdl2_dep, sdl2_image_dep, sdl2_mixer_dep, sdl2_ttf_dep, x11_dep] +) \ No newline at end of file diff --git a/src/meson_buiild_backup b/src/meson_buiild_backup new file mode 100644 index 00000000..fd036720 --- /dev/null +++ b/src/meson_buiild_backup @@ -0,0 +1,39 @@ +project('GamePencil', 'cpp', + version: '1.0', + default_options: ['cpp_std=c++11', 'warning_level=3']) + +# Dependencies +sdl2_dep = dependency('sdl2', version: '>=2.0.0', required: true) +sdl2_image_dep = dependency('sdl2_image', version: '>=2.0.0', required: true) +sdl2_mixer_dep = dependency('sdl2_mixer', version: '>=2.0.0', required: true) +sdl2_ttf_dep = dependency('sdl2_ttf', version: '>=2.0.0', required: true) +x11_dep = dependency('x11', required: host_machine.system() != 'windows') + +# Include directories +inc = include_directories('.') + +# Get all source files +find_program = find_program('find') +cpp_files = run_command(find_program, meson.source_root(), '-name', '*.cpp').stdout().strip().split() + +# Exclude platform-specific files +filtered_cpp_files = [] +foreach f : cpp_files + if host_machine.system() == 'darwin' and not f.contains('win32') + filtered_cpp_files += f + elif host_machine.system() == 'windows' and not f.contains('macos') and not f.contains('unix') + filtered_cpp_files += f + elif host_machine.system() == 'linux' and not f.contains('win32') and not f.contains('macos') + filtered_cpp_files += f + endif +endforeach + +cpp_files = filtered_cpp_files + +# Executable +executable( + 'GamePencil', + cpp_files, + include_directories: inc, + dependencies: [sdl2_dep, sdl2_image_dep, sdl2_mixer_dep, sdl2_ttf_dep, x11_dep] +) \ No newline at end of file diff --git a/src/other_libs/dlgmodule/macos/macos.cpp b/src/other_libs/dlgmodule/macos/macos.cpp index 0f113dd1..d98c86a8 100644 --- a/src/other_libs/dlgmodule/macos/macos.cpp +++ b/src/other_libs/dlgmodule/macos/macos.cpp @@ -37,9 +37,9 @@ using std::string; -const char *cocoa_widget_get_button_name(int type) { - return dialog_module::widget_get_button_name(type); -} +// const char *cocoa_widget_get_button_name(int type) { +// return dialog_module::widget_get_button_name(type); +// } namespace { diff --git a/src/sdl2_module/gpe_audio_sdl2_mixer.h b/src/sdl2_module/gpe_audio_sdl2_mixer.h index f239fb8a..40164305 100644 --- a/src/sdl2_module/gpe_audio_sdl2_mixer.h +++ b/src/sdl2_module/gpe_audio_sdl2_mixer.h @@ -34,7 +34,7 @@ SOFTWARE. #ifndef gpe_audio_sdl2_mixer_h #define gpe_audio_sdl2_mixer_h -#include +#include "SDL_mixer.h" #include "../gpe/gpe_audio_base.h" namespace gpe { diff --git a/src/sdl2_module/gpe_cursor_sdl2.h b/src/sdl2_module/gpe_cursor_sdl2.h index d8d947af..83efb7b5 100644 --- a/src/sdl2_module/gpe_cursor_sdl2.h +++ b/src/sdl2_module/gpe_cursor_sdl2.h @@ -37,7 +37,7 @@ SOFTWARE. #include #include -#include +#include "SDL.h" #include "thirdparty/sdl2_surface_ex.h" #include "../gpe/gpe_cursor_base.h" #include "../gpe/gpe_error_logger.h" diff --git a/src/sdl2_module/gpe_font_sdl2.h b/src/sdl2_module/gpe_font_sdl2.h index 0331662c..6a582391 100644 --- a/src/sdl2_module/gpe_font_sdl2.h +++ b/src/sdl2_module/gpe_font_sdl2.h @@ -44,7 +44,7 @@ SOFTWARE. #include "../gpe/gpe_shared_resources.h" #include "../gpe/internal_libs/stg_ex.h" #include "gpe_renderer_sdl2.h" -#include +#include "SDL_ttf.h" namespace gpe { diff --git a/src/sdl2_module/gpe_input_sdl2.h b/src/sdl2_module/gpe_input_sdl2.h index 9aaf01da..33e25e63 100644 --- a/src/sdl2_module/gpe_input_sdl2.h +++ b/src/sdl2_module/gpe_input_sdl2.h @@ -34,9 +34,9 @@ SOFTWARE. #ifndef gpe_input_sdl2_h #define gpe_input_sdl2_h -#include -#include -#include +#include "SDL.h" +#include "SDL_version.h" +#include "SDL_video.h" #include "../gpe/gpe_input_base.h" #include "../gpe/gpe_render_package_handler.h" #include "../gpe/gpe_shared_resources.h" diff --git a/src/sdl2_module/gpe_sdl2_basic.h b/src/sdl2_module/gpe_sdl2_basic.h index 20c36650..c7eebbd3 100644 --- a/src/sdl2_module/gpe_sdl2_basic.h +++ b/src/sdl2_module/gpe_sdl2_basic.h @@ -35,8 +35,8 @@ SOFTWARE. #define gpe_sdl2_basic_h #include "../gpe/gpe_error_logger.h" -#include -#include +#include "SDL.h" +#include "SDL_image.h" #ifdef _WIN32 diff --git a/src/sdl2_module/gpe_sdl2_converter.h b/src/sdl2_module/gpe_sdl2_converter.h index de10914c..5f891bf2 100644 --- a/src/sdl2_module/gpe_sdl2_converter.h +++ b/src/sdl2_module/gpe_sdl2_converter.h @@ -35,7 +35,7 @@ SOFTWARE. #define gpe_sdl2_converter_h #include "../gpe/gpe_color.h" -#include +#include "SDL.h" namespace gpe { diff --git a/src/sdl2_module/gpe_timer_sdl2.h b/src/sdl2_module/gpe_timer_sdl2.h index 8d4265ed..4f357f84 100644 --- a/src/sdl2_module/gpe_timer_sdl2.h +++ b/src/sdl2_module/gpe_timer_sdl2.h @@ -37,7 +37,7 @@ SOFTWARE. #include "../gpe/gpe_runtime.h" #include "../gpe/gpe_timer_base.h" #include -#include +#include "SDL.h" namespace gpe { diff --git a/src/sdl2_module/thirdparty/sdl2_renderparty.h b/src/sdl2_module/thirdparty/sdl2_renderparty.h index ee00f430..557ef6af 100644 --- a/src/sdl2_module/thirdparty/sdl2_renderparty.h +++ b/src/sdl2_module/thirdparty/sdl2_renderparty.h @@ -46,7 +46,7 @@ extern "C" { #define SDL2_RENDERPARTY_CIRCLE_POINT_MIN 4 #include - #include "SDL2/SDL.h" + #include "SDL.h" /* Requires SDL_RenderGeometry, which was introduced in SDL 2.0.18 diff --git a/src/sdl2_module/thirdparty/sdl2_surface_ex.h b/src/sdl2_module/thirdparty/sdl2_surface_ex.h index f02e2533..26260657 100644 --- a/src/sdl2_module/thirdparty/sdl2_surface_ex.h +++ b/src/sdl2_module/thirdparty/sdl2_surface_ex.h @@ -32,8 +32,8 @@ SOFTWARE. #ifndef sdl_surface_ex_h #define sdl_surface_ex_h -#include "SDL2/SDL.h" -#include "SDL2/SDL_image.h" +#include "SDL.h" +#include "SDL_image.h" #include namespace sdl2_surface_ex From a956190c8cf85948940680f57ded1ed630d1e808 Mon Sep 17 00:00:00 2001 From: thepherm <63941518+thepherm@users.noreply.github.com> Date: Sat, 14 Dec 2024 18:11:39 -0600 Subject: [PATCH 6/8] Update copyright information to include P.Industries as a contributor --- src/pawgui/{ => base}/pawgui_base.cpp | 7 ++- src/pawgui/{ => base}/pawgui_base.h | 0 src/pawgui/{ => buttons}/pawgui_buttons.cpp | 7 ++- src/pawgui/{ => buttons}/pawgui_buttons.h | 0 src/pawgui/{ => checkbox}/pawgui_checkbox.cpp | 7 ++- src/pawgui/{ => checkbox}/pawgui_checkbox.h | 7 ++- .../pawgui_color_picker.cpp | 7 ++- .../{ => color_picker}/pawgui_color_picker.h | 7 ++- src/pawgui/{ => constants}/pawgui_constants.h | 0 src/pawgui/{ => context}/pawgui_context.cpp | 7 ++- src/pawgui/{ => context}/pawgui_context.h | 7 ++- .../pawgui_content_selector.cpp | 7 ++- .../pawgui_content_selector.h | 0 .../{ => dock_system}/pawgui_dock_system.cpp | 7 ++- .../{ => dock_system}/pawgui_dock_system.h | 0 src/pawgui/{ => dropdown}/pawgui_dropdown.cpp | 63 ++++++++++--------- src/pawgui/{ => dropdown}/pawgui_dropdown.h | 0 .../{ => file_popups}/pawgui_file_popups.cpp | 7 ++- .../pawgui_file_popups.cpp.save | 0 .../{ => file_popups}/pawgui_file_popups.h | 7 ++- .../pawgui_general_resource.cpp | 7 ++- .../pawgui_general_resource.h | 7 ++- .../pawgui_general_resource_container.cpp | 7 ++- ...pawgui_general_resource_container.cpp.save | 0 .../pawgui_general_resource_container.h | 7 ++- src/pawgui/{ => globals}/pawgui_globals.cpp | 7 ++- src/pawgui/{ => globals}/pawgui_globals.h | 7 ++- .../{ => icon_pack}/pawgui_iconpack.cpp | 0 src/pawgui/{ => icon_pack}/pawgui_iconpack.h | 0 src/pawgui/{ => labels}/pawgui_labels.cpp | 7 ++- src/pawgui/{ => labels}/pawgui_labels.h | 7 ++- .../pawgui_notifications.cpp | 7 ++- .../pawgui_notifications.h | 7 ++- src/pawgui/pawgui.cpp | 7 ++- src/pawgui/pawgui_overlay.cpp | 7 ++- src/pawgui/pawgui_overlay.h | 7 ++- src/pawgui/pawgui_panel_list.cpp | 7 ++- src/pawgui/pawgui_panel_list.h | 11 ++-- src/pawgui/pawgui_parsers.cpp | 7 ++- src/pawgui/pawgui_parsers.h | 7 ++- src/pawgui/pawgui_popups.cpp | 7 ++- src/pawgui/pawgui_popups.h | 7 ++- src/pawgui/pawgui_radiobuttons.cpp | 7 ++- src/pawgui/pawgui_radiobuttons.h | 7 ++- src/pawgui/pawgui_resource_dropdown.cpp | 7 ++- src/pawgui/pawgui_resource_dropdown.h | 7 ++- src/pawgui/pawgui_scrollbars.cpp | 7 ++- src/pawgui/pawgui_scrollbars.h | 7 ++- src/pawgui/pawgui_search_controller.cpp | 7 ++- src/pawgui/pawgui_search_controller.h | 7 ++- src/pawgui/pawgui_selectbox.cpp | 7 ++- src/pawgui/pawgui_selectbox.h | 7 ++- src/pawgui/pawgui_sliders.cpp | 7 ++- src/pawgui/pawgui_sliders.h | 7 ++- src/pawgui/pawgui_statusbar.cpp | 7 ++- src/pawgui/pawgui_statusbar.h | 7 ++- src/pawgui/pawgui_stree.cpp | 7 ++- src/pawgui/pawgui_stree.h | 7 ++- src/pawgui/pawgui_syntax_handler.cpp | 7 ++- src/pawgui/pawgui_syntax_handler.h | 7 ++- src/pawgui/pawgui_tab_basic.cpp | 7 ++- src/pawgui/pawgui_tab_basic.h | 7 ++- src/pawgui/pawgui_tab_manager.cpp | 7 ++- src/pawgui/pawgui_tab_manager.h | 7 ++- src/pawgui/pawgui_text_editor.cpp | 7 ++- src/pawgui/pawgui_text_editor.h | 7 ++- src/pawgui/pawgui_text_input.cpp | 7 ++- src/pawgui/pawgui_text_input.h | 7 ++- src/pawgui/pawgui_text_url.cpp | 7 ++- src/pawgui/pawgui_text_url.h | 7 ++- .../pawgui_theme_controller.cpp | 7 ++- .../pawgui_theme_controller.h | 7 ++- src/pawgui/{ => themes}/pawgui_themes.cpp | 7 ++- src/pawgui/{ => themes}/pawgui_themes.h | 7 ++- 74 files changed, 286 insertions(+), 222 deletions(-) rename src/pawgui/{ => base}/pawgui_base.cpp (94%) rename src/pawgui/{ => base}/pawgui_base.h (100%) rename src/pawgui/{ => buttons}/pawgui_buttons.cpp (96%) rename src/pawgui/{ => buttons}/pawgui_buttons.h (100%) rename src/pawgui/{ => checkbox}/pawgui_checkbox.cpp (94%) rename src/pawgui/{ => checkbox}/pawgui_checkbox.h (92%) rename src/pawgui/{ => color_picker}/pawgui_color_picker.cpp (96%) rename src/pawgui/{ => color_picker}/pawgui_color_picker.h (92%) rename src/pawgui/{ => constants}/pawgui_constants.h (100%) rename src/pawgui/{ => context}/pawgui_context.cpp (97%) rename src/pawgui/{ => context}/pawgui_context.h (94%) rename src/pawgui/{ => context_selector}/pawgui_content_selector.cpp (95%) rename src/pawgui/{ => context_selector}/pawgui_content_selector.h (100%) rename src/pawgui/{ => dock_system}/pawgui_dock_system.cpp (97%) rename src/pawgui/{ => dock_system}/pawgui_dock_system.h (100%) rename src/pawgui/{ => dropdown}/pawgui_dropdown.cpp (96%) rename src/pawgui/{ => dropdown}/pawgui_dropdown.h (100%) rename src/pawgui/{ => file_popups}/pawgui_file_popups.cpp (97%) rename src/pawgui/{ => file_popups}/pawgui_file_popups.cpp.save (100%) rename src/pawgui/{ => file_popups}/pawgui_file_popups.h (91%) rename src/pawgui/{ => general_resource}/pawgui_general_resource.cpp (94%) rename src/pawgui/{ => general_resource}/pawgui_general_resource.h (94%) rename src/pawgui/{ => general_resource}/pawgui_general_resource_container.cpp (97%) rename src/pawgui/{ => general_resource}/pawgui_general_resource_container.cpp.save (100%) rename src/pawgui/{ => general_resource}/pawgui_general_resource_container.h (96%) rename src/pawgui/{ => globals}/pawgui_globals.cpp (88%) rename src/pawgui/{ => globals}/pawgui_globals.h (89%) rename src/pawgui/{ => icon_pack}/pawgui_iconpack.cpp (100%) rename src/pawgui/{ => icon_pack}/pawgui_iconpack.h (100%) rename src/pawgui/{ => labels}/pawgui_labels.cpp (96%) rename src/pawgui/{ => labels}/pawgui_labels.h (94%) rename src/pawgui/{ => notifications}/pawgui_notifications.cpp (96%) rename src/pawgui/{ => notifications}/pawgui_notifications.h (93%) rename src/pawgui/{ => theme_controller}/pawgui_theme_controller.cpp (90%) rename src/pawgui/{ => theme_controller}/pawgui_theme_controller.h (89%) rename src/pawgui/{ => themes}/pawgui_themes.cpp (97%) rename src/pawgui/{ => themes}/pawgui_themes.h (96%) diff --git a/src/pawgui/pawgui_base.cpp b/src/pawgui/base/pawgui_base.cpp similarity index 94% rename from src/pawgui/pawgui_base.cpp rename to src/pawgui/base/pawgui_base.cpp index 0ba6ed0f..9a88bb10 100644 --- a/src/pawgui/pawgui_base.cpp +++ b/src/pawgui/base/pawgui_base.cpp @@ -7,6 +7,7 @@ Copyright (c) 2014-2024 Nathan Hurde, Chase Lee. Copyright (c) 2014-2024 PawByte LLC. Copyright (c) 2014-2024 PawByte Ambitious Working GUI(PAWGUI) contributors ( Contributors Page ) +Copyright (c) 2024 P.Industries Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal @@ -26,9 +27,9 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. --PawByte Ambitious Working GUI(PAWGUI) - - +Contributors: +- PawByte Ambitious Working GUI(PAWGUI) +- P Industries */ #include "pawgui_base.h" diff --git a/src/pawgui/pawgui_base.h b/src/pawgui/base/pawgui_base.h similarity index 100% rename from src/pawgui/pawgui_base.h rename to src/pawgui/base/pawgui_base.h diff --git a/src/pawgui/pawgui_buttons.cpp b/src/pawgui/buttons/pawgui_buttons.cpp similarity index 96% rename from src/pawgui/pawgui_buttons.cpp rename to src/pawgui/buttons/pawgui_buttons.cpp index 84675043..26260249 100644 --- a/src/pawgui/pawgui_buttons.cpp +++ b/src/pawgui/buttons/pawgui_buttons.cpp @@ -7,6 +7,7 @@ Copyright (c) 2014-2024 Nathan Hurde, Chase Lee. Copyright (c) 2014-2024 PawByte LLC. Copyright (c) 2014-2024 PawByte Ambitious Working GUI(PAWGUI) contributors ( Contributors Page ) +Copyright (c) 2024 P.Industries Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal @@ -26,9 +27,9 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. --PawByte Ambitious Working GUI(PAWGUI) - - +Contributors: +- PawByte Ambitious Working GUI(PAWGUI) +- P Industries */ #include "pawgui_buttons.h" diff --git a/src/pawgui/pawgui_buttons.h b/src/pawgui/buttons/pawgui_buttons.h similarity index 100% rename from src/pawgui/pawgui_buttons.h rename to src/pawgui/buttons/pawgui_buttons.h diff --git a/src/pawgui/pawgui_checkbox.cpp b/src/pawgui/checkbox/pawgui_checkbox.cpp similarity index 94% rename from src/pawgui/pawgui_checkbox.cpp rename to src/pawgui/checkbox/pawgui_checkbox.cpp index 4dea54ab..3c8873dc 100644 --- a/src/pawgui/pawgui_checkbox.cpp +++ b/src/pawgui/checkbox/pawgui_checkbox.cpp @@ -7,6 +7,7 @@ Copyright (c) 2014-2024 Nathan Hurde, Chase Lee. Copyright (c) 2014-2024 PawByte LLC. Copyright (c) 2014-2024 PawByte Ambitious Working GUI(PAWGUI) contributors ( Contributors Page ) +Copyright (c) 2024 P.Industries Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal @@ -26,9 +27,9 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. --PawByte Ambitious Working GUI(PAWGUI) - - +Contributors: +- PawByte Ambitious Working GUI(PAWGUI) +- P Industries */ #include "pawgui_checkbox.h" diff --git a/src/pawgui/pawgui_checkbox.h b/src/pawgui/checkbox/pawgui_checkbox.h similarity index 92% rename from src/pawgui/pawgui_checkbox.h rename to src/pawgui/checkbox/pawgui_checkbox.h index 39170663..4dbecb3a 100644 --- a/src/pawgui/pawgui_checkbox.h +++ b/src/pawgui/checkbox/pawgui_checkbox.h @@ -7,6 +7,7 @@ Copyright (c) 2014-2024 Nathan Hurde, Chase Lee. Copyright (c) 2014-2024 PawByte LLC. Copyright (c) 2014-2024 PawByte Ambitious Working GUI(PAWGUI) contributors ( Contributors Page ) +Copyright (c) 2024 P.Industries Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal @@ -26,9 +27,9 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. --PawByte Ambitious Working GUI(PAWGUI) - - +Contributors: +- PawByte Ambitious Working GUI(PAWGUI) +- P Industries */ #ifndef PAWGUI_CHCKBOX_H diff --git a/src/pawgui/pawgui_color_picker.cpp b/src/pawgui/color_picker/pawgui_color_picker.cpp similarity index 96% rename from src/pawgui/pawgui_color_picker.cpp rename to src/pawgui/color_picker/pawgui_color_picker.cpp index b1d8e235..5eb0388e 100644 --- a/src/pawgui/pawgui_color_picker.cpp +++ b/src/pawgui/color_picker/pawgui_color_picker.cpp @@ -7,6 +7,7 @@ Copyright (c) 2014-2024 Nathan Hurde, Chase Lee. Copyright (c) 2014-2024 PawByte LLC. Copyright (c) 2014-2024 PawByte Ambitious Working GUI(PAWGUI) contributors ( Contributors Page ) +Copyright (c) 2024 P.Industries Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal @@ -26,9 +27,9 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. --PawByte Ambitious Working GUI(PAWGUI) - - +Contributors: +- PawByte Ambitious Working GUI(PAWGUI) +- P Industries */ #include "pawgui_text_input.h" diff --git a/src/pawgui/pawgui_color_picker.h b/src/pawgui/color_picker/pawgui_color_picker.h similarity index 92% rename from src/pawgui/pawgui_color_picker.h rename to src/pawgui/color_picker/pawgui_color_picker.h index 000f371c..4d1e27fd 100644 --- a/src/pawgui/pawgui_color_picker.h +++ b/src/pawgui/color_picker/pawgui_color_picker.h @@ -7,6 +7,7 @@ Copyright (c) 2014-2024 Nathan Hurde, Chase Lee. Copyright (c) 2014-2024 PawByte LLC. Copyright (c) 2014-2024 PawByte Ambitious Working GUI(PAWGUI) contributors ( Contributors Page ) +Copyright (c) 2024 P.Industries Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal @@ -26,9 +27,9 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. --PawByte Ambitious Working GUI(PAWGUI) - - +Contributors: +- PawByte Ambitious Working GUI(PAWGUI) +- P Industries */ diff --git a/src/pawgui/pawgui_constants.h b/src/pawgui/constants/pawgui_constants.h similarity index 100% rename from src/pawgui/pawgui_constants.h rename to src/pawgui/constants/pawgui_constants.h diff --git a/src/pawgui/pawgui_context.cpp b/src/pawgui/context/pawgui_context.cpp similarity index 97% rename from src/pawgui/pawgui_context.cpp rename to src/pawgui/context/pawgui_context.cpp index a3b61672..7009fcbc 100644 --- a/src/pawgui/pawgui_context.cpp +++ b/src/pawgui/context/pawgui_context.cpp @@ -7,6 +7,7 @@ Copyright (c) 2014-2024 Nathan Hurde, Chase Lee. Copyright (c) 2014-2024 PawByte LLC. Copyright (c) 2014-2024 PawByte Ambitious Working GUI(PAWGUI) contributors ( Contributors Page ) +Copyright (c) 2024 P.Industries Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal @@ -26,9 +27,9 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. --PawByte Ambitious Working GUI(PAWGUI) - - +Contributors: +- PawByte Ambitious Working GUI(PAWGUI) +- P Industries */ #include "pawgui_context.h" diff --git a/src/pawgui/pawgui_context.h b/src/pawgui/context/pawgui_context.h similarity index 94% rename from src/pawgui/pawgui_context.h rename to src/pawgui/context/pawgui_context.h index 27f35cc3..310308a2 100644 --- a/src/pawgui/pawgui_context.h +++ b/src/pawgui/context/pawgui_context.h @@ -7,6 +7,7 @@ Copyright (c) 2014-2024 Nathan Hurde, Chase Lee. Copyright (c) 2014-2024 PawByte LLC. Copyright (c) 2014-2024 PawByte Ambitious Working GUI(PAWGUI) contributors ( Contributors Page ) +Copyright (c) 2024 P.Industries Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal @@ -26,9 +27,9 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. --PawByte Ambitious Working GUI(PAWGUI) - - +Contributors: +- PawByte Ambitious Working GUI(PAWGUI) +- P Industries */ #ifndef PAWGUI_CONTEXT_H diff --git a/src/pawgui/pawgui_content_selector.cpp b/src/pawgui/context_selector/pawgui_content_selector.cpp similarity index 95% rename from src/pawgui/pawgui_content_selector.cpp rename to src/pawgui/context_selector/pawgui_content_selector.cpp index 9c3a13c4..33118f89 100644 --- a/src/pawgui/pawgui_content_selector.cpp +++ b/src/pawgui/context_selector/pawgui_content_selector.cpp @@ -7,6 +7,7 @@ Copyright (c) 2014-2024 Nathan Hurde, Chase Lee. Copyright (c) 2014-2024 PawByte LLC. Copyright (c) 2014-2024 PawByte Ambitious Working GUI(PAWGUI) contributors ( Contributors Page ) +Copyright (c) 2024 P.Industries Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal @@ -26,9 +27,9 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. --PawByte Ambitious Working GUI(PAWGUI) - - +Contributors: +- PawByte Ambitious Working GUI(PAWGUI) +- P Industries */ #include "pawgui_content_selector.h" diff --git a/src/pawgui/pawgui_content_selector.h b/src/pawgui/context_selector/pawgui_content_selector.h similarity index 100% rename from src/pawgui/pawgui_content_selector.h rename to src/pawgui/context_selector/pawgui_content_selector.h diff --git a/src/pawgui/pawgui_dock_system.cpp b/src/pawgui/dock_system/pawgui_dock_system.cpp similarity index 97% rename from src/pawgui/pawgui_dock_system.cpp rename to src/pawgui/dock_system/pawgui_dock_system.cpp index e4755370..5bd1906f 100644 --- a/src/pawgui/pawgui_dock_system.cpp +++ b/src/pawgui/dock_system/pawgui_dock_system.cpp @@ -7,6 +7,7 @@ Copyright (c) 2014-2024 Nathan Hurde, Chase Lee. Copyright (c) 2014-2024 PawByte LLC. Copyright (c) 2014-2024 PawByte Ambitious Working GUI(PAWGUI) contributors ( Contributors Page ) +Copyright (c) 2024 P.Industries Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal @@ -26,9 +27,9 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. --PawByte Ambitious Working GUI(PAWGUI) - -*/ +Contributors: +- PawByte Ambitious Working GUI(PAWGUI) +- P Industries */ #include "pawgui_dock_system.h" diff --git a/src/pawgui/pawgui_dock_system.h b/src/pawgui/dock_system/pawgui_dock_system.h similarity index 100% rename from src/pawgui/pawgui_dock_system.h rename to src/pawgui/dock_system/pawgui_dock_system.h diff --git a/src/pawgui/pawgui_dropdown.cpp b/src/pawgui/dropdown/pawgui_dropdown.cpp similarity index 96% rename from src/pawgui/pawgui_dropdown.cpp rename to src/pawgui/dropdown/pawgui_dropdown.cpp index 99d9c886..5a26190c 100644 --- a/src/pawgui/pawgui_dropdown.cpp +++ b/src/pawgui/dropdown/pawgui_dropdown.cpp @@ -7,6 +7,7 @@ Copyright (c) 2014-2024 Nathan Hurde, Chase Lee. Copyright (c) 2014-2024 PawByte LLC. Copyright (c) 2014-2024 PawByte Ambitious Working GUI(PAWGUI) contributors ( Contributors Page ) +Copyright (c) 2024 P.Industries Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal @@ -26,9 +27,9 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. --PawByte Ambitious Working GUI(PAWGUI) - - +Contributors: +- PawByte Ambitious Working GUI(PAWGUI) +- P Industries */ #include "pawgui_dropdown.h" @@ -46,7 +47,7 @@ namespace pawgui dropdownName = widget_name = name; opId = -1; selectedId = -1; - selectedPair = nullptr; + selectedPair = nullptr; selectedValue = -1; isSelectable = true; showJustOptions = justOptions; @@ -128,16 +129,16 @@ namespace pawgui selectedTag = ""; dropDownParentPair->remove_all(); } - - gpe::key_pair * widget_dropdown_menu::find_option_id( int pairId ) - { - return dropDownParentPair->find_option_id( pairId ); - } - - gpe::key_pair * widget_dropdown_menu::find_option_valie( float pairValue ) - { - return dropDownParentPair->find_option_value( pairValue ); - } + + gpe::key_pair * widget_dropdown_menu::find_option_id( int pairId ) + { + return dropDownParentPair->find_option_id( pairId ); + } + + gpe::key_pair * widget_dropdown_menu::find_option_valie( float pairValue ) + { + return dropDownParentPair->find_option_value( pairValue ); + } gpe::key_pair * widget_dropdown_menu::find_selected_pair( gpe::key_pair * pairIn, std::string pairName, int pairId ) { @@ -394,9 +395,9 @@ namespace pawgui context_menu_close(); if( foundResult>=0 ) { - set_id( foundResult ); + set_id( foundResult ); context_menu_close(); - return; + return; } else { @@ -512,21 +513,21 @@ namespace pawgui { if( new_id >= 0 ) { - selectedPair = dropDownParentPair->find_option_id( new_id ); - if( selectedPair!=nullptr) - { + selectedPair = dropDownParentPair->find_option_id( new_id ); + if( selectedPair!=nullptr) + { selectedId = new_id; selectedName = selectedPair->key_string; - selectedTag = selectedPair->key_substring; - selectedValue = selectedPair->key_value; - return; + selectedTag = selectedPair->key_substring; + selectedValue = selectedPair->key_value; + return; } } //If no pair was found we return to default mode selectedPair = nullptr; selectedId = -1; selectedName = ""; - selectedTag = ""; + selectedTag = ""; selectedValue = -1; widget_name = dropdownName; } @@ -602,19 +603,19 @@ namespace pawgui void widget_dropdown_menu::set_option_value(float option_value ) { - selectedPair = dropDownParentPair->find_option_value( option_value ); - if( selectedPair!=nullptr) - { + selectedPair = dropDownParentPair->find_option_value( option_value ); + if( selectedPair!=nullptr) + { selectedId = selectedPair->key_id; selectedName = selectedPair->key_string; - selectedTag = selectedPair->key_substring; - } - else - { + selectedTag = selectedPair->key_substring; + } + else + { selectedPair = nullptr; selectedId = -1; selectedName = ""; - selectedTag = ""; + selectedTag = ""; } } diff --git a/src/pawgui/pawgui_dropdown.h b/src/pawgui/dropdown/pawgui_dropdown.h similarity index 100% rename from src/pawgui/pawgui_dropdown.h rename to src/pawgui/dropdown/pawgui_dropdown.h diff --git a/src/pawgui/pawgui_file_popups.cpp b/src/pawgui/file_popups/pawgui_file_popups.cpp similarity index 97% rename from src/pawgui/pawgui_file_popups.cpp rename to src/pawgui/file_popups/pawgui_file_popups.cpp index 7f1d499a..9a004308 100644 --- a/src/pawgui/pawgui_file_popups.cpp +++ b/src/pawgui/file_popups/pawgui_file_popups.cpp @@ -7,6 +7,7 @@ Copyright (c) 2014-2024 Nathan Hurde, Chase Lee. Copyright (c) 2014-2024 PawByte LLC. Copyright (c) 2014-2024 PawByte Ambitious Working GUI(PAWGUI) contributors ( Contributors Page ) +Copyright (c) 2024 P.Industries Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal @@ -26,9 +27,9 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. --PawByte Ambitious Working GUI(PAWGUI) - - +Contributors: +- PawByte Ambitious Working GUI(PAWGUI) +- P Industries */ #include "pawgui_file_popups.h" diff --git a/src/pawgui/pawgui_file_popups.cpp.save b/src/pawgui/file_popups/pawgui_file_popups.cpp.save similarity index 100% rename from src/pawgui/pawgui_file_popups.cpp.save rename to src/pawgui/file_popups/pawgui_file_popups.cpp.save diff --git a/src/pawgui/pawgui_file_popups.h b/src/pawgui/file_popups/pawgui_file_popups.h similarity index 91% rename from src/pawgui/pawgui_file_popups.h rename to src/pawgui/file_popups/pawgui_file_popups.h index 416cd4f0..783ee70c 100644 --- a/src/pawgui/pawgui_file_popups.h +++ b/src/pawgui/file_popups/pawgui_file_popups.h @@ -7,6 +7,7 @@ Copyright (c) 2014-2024 Nathan Hurde, Chase Lee. Copyright (c) 2014-2024 PawByte LLC. Copyright (c) 2014-2024 PawByte Ambitious Working GUI(PAWGUI) contributors ( Contributors Page ) +Copyright (c) 2024 P.Industries Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal @@ -26,9 +27,9 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. --PawByte Ambitious Working GUI(PAWGUI) - - +Contributors: +- PawByte Ambitious Working GUI(PAWGUI) +- P Industries */ #ifndef PAWGUI_FILE_POPUPS_H diff --git a/src/pawgui/pawgui_general_resource.cpp b/src/pawgui/general_resource/pawgui_general_resource.cpp similarity index 94% rename from src/pawgui/pawgui_general_resource.cpp rename to src/pawgui/general_resource/pawgui_general_resource.cpp index 8b0cd573..e1b9b006 100644 --- a/src/pawgui/pawgui_general_resource.cpp +++ b/src/pawgui/general_resource/pawgui_general_resource.cpp @@ -7,6 +7,7 @@ Copyright (c) 2014-2024 Nathan Hurde, Chase Lee. Copyright (c) 2014-2024 PawByte LLC. Copyright (c) 2014-2024 PawByte Ambitious Working GUI(PAWGUI) contributors ( Contributors Page ) +Copyright (c) 2024 P.Industries Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal @@ -26,9 +27,9 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. --PawByte Ambitious Working GUI(PAWGUI) - - +Contributors: +- PawByte Ambitious Working GUI(PAWGUI) +- P Industries */ #include "pawgui_general_resource.h" diff --git a/src/pawgui/pawgui_general_resource.h b/src/pawgui/general_resource/pawgui_general_resource.h similarity index 94% rename from src/pawgui/pawgui_general_resource.h rename to src/pawgui/general_resource/pawgui_general_resource.h index 33ef23f7..499010b8 100644 --- a/src/pawgui/pawgui_general_resource.h +++ b/src/pawgui/general_resource/pawgui_general_resource.h @@ -7,6 +7,7 @@ Copyright (c) 2014-2024 Nathan Hurde, Chase Lee. Copyright (c) 2014-2024 PawByte LLC. Copyright (c) 2014-2024 PawByte Ambitious Working GUI(PAWGUI) contributors ( Contributors Page ) +Copyright (c) 2024 P.Industries Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal @@ -26,9 +27,9 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. --PawByte Ambitious Working GUI(PAWGUI) - - +Contributors: +- PawByte Ambitious Working GUI(PAWGUI) +- P Industries */ #ifndef PAWGUI_GENERAL_RESOURCE_H diff --git a/src/pawgui/pawgui_general_resource_container.cpp b/src/pawgui/general_resource/pawgui_general_resource_container.cpp similarity index 97% rename from src/pawgui/pawgui_general_resource_container.cpp rename to src/pawgui/general_resource/pawgui_general_resource_container.cpp index c82a75db..7fbbe514 100644 --- a/src/pawgui/pawgui_general_resource_container.cpp +++ b/src/pawgui/general_resource/pawgui_general_resource_container.cpp @@ -7,6 +7,7 @@ Copyright (c) 2014-2024 Nathan Hurde, Chase Lee. Copyright (c) 2014-2024 PawByte LLC. Copyright (c) 2014-2024 PawByte Ambitious Working GUI(PAWGUI) contributors ( Contributors Page ) +Copyright (c) 2024 P.Industries Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal @@ -26,9 +27,9 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. --PawByte Ambitious Working GUI(PAWGUI) - - +Contributors: +- PawByte Ambitious Working GUI(PAWGUI) +- P Industries */ #include "pawgui_general_resource_container.h" diff --git a/src/pawgui/pawgui_general_resource_container.cpp.save b/src/pawgui/general_resource/pawgui_general_resource_container.cpp.save similarity index 100% rename from src/pawgui/pawgui_general_resource_container.cpp.save rename to src/pawgui/general_resource/pawgui_general_resource_container.cpp.save diff --git a/src/pawgui/pawgui_general_resource_container.h b/src/pawgui/general_resource/pawgui_general_resource_container.h similarity index 96% rename from src/pawgui/pawgui_general_resource_container.h rename to src/pawgui/general_resource/pawgui_general_resource_container.h index d07484d8..2d1f91c7 100644 --- a/src/pawgui/pawgui_general_resource_container.h +++ b/src/pawgui/general_resource/pawgui_general_resource_container.h @@ -7,6 +7,7 @@ Copyright (c) 2014-2024 Nathan Hurde, Chase Lee. Copyright (c) 2014-2024 PawByte LLC. Copyright (c) 2014-2024 PawByte Ambitious Working GUI(PAWGUI) contributors ( Contributors Page ) +Copyright (c) 2024 P.Industries Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal @@ -26,9 +27,9 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. --PawByte Ambitious Working GUI(PAWGUI) - - +Contributors: +- PawByte Ambitious Working GUI(PAWGUI) +- P Industries */ #ifndef PAWGUI_GRC_H diff --git a/src/pawgui/pawgui_globals.cpp b/src/pawgui/globals/pawgui_globals.cpp similarity index 88% rename from src/pawgui/pawgui_globals.cpp rename to src/pawgui/globals/pawgui_globals.cpp index 7ff4fe2c..a1383a8e 100644 --- a/src/pawgui/pawgui_globals.cpp +++ b/src/pawgui/globals/pawgui_globals.cpp @@ -7,6 +7,7 @@ Copyright (c) 2014-2024 Nathan Hurde, Chase Lee. Copyright (c) 2014-2024 PawByte LLC. Copyright (c) 2014-2024 PawByte Ambitious Working GUI(PAWGUI) contributors ( Contributors Page ) +Copyright (c) 2024 P.Industries Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal @@ -26,9 +27,9 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. --PawByte Ambitious Working GUI(PAWGUI) - - +Contributors: +- PawByte Ambitious Working GUI(PAWGUI) +- P Industries */ #include "pawgui_globals.h" diff --git a/src/pawgui/pawgui_globals.h b/src/pawgui/globals/pawgui_globals.h similarity index 89% rename from src/pawgui/pawgui_globals.h rename to src/pawgui/globals/pawgui_globals.h index b665a088..e0514b35 100644 --- a/src/pawgui/pawgui_globals.h +++ b/src/pawgui/globals/pawgui_globals.h @@ -7,6 +7,7 @@ Copyright (c) 2014-2024 Nathan Hurde, Chase Lee. Copyright (c) 2014-2024 PawByte LLC. Copyright (c) 2014-2024 PawByte Ambitious Working GUI(PAWGUI) contributors ( Contributors Page ) +Copyright (c) 2024 P.Industries Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal @@ -26,9 +27,9 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. --PawByte Ambitious Working GUI(PAWGUI) - - +Contributors: +- PawByte Ambitious Working GUI(PAWGUI) +- P Industries */ #ifndef PAWGUI_GLOBALS_H diff --git a/src/pawgui/pawgui_iconpack.cpp b/src/pawgui/icon_pack/pawgui_iconpack.cpp similarity index 100% rename from src/pawgui/pawgui_iconpack.cpp rename to src/pawgui/icon_pack/pawgui_iconpack.cpp diff --git a/src/pawgui/pawgui_iconpack.h b/src/pawgui/icon_pack/pawgui_iconpack.h similarity index 100% rename from src/pawgui/pawgui_iconpack.h rename to src/pawgui/icon_pack/pawgui_iconpack.h diff --git a/src/pawgui/pawgui_labels.cpp b/src/pawgui/labels/pawgui_labels.cpp similarity index 96% rename from src/pawgui/pawgui_labels.cpp rename to src/pawgui/labels/pawgui_labels.cpp index 6a7e662b..56146588 100644 --- a/src/pawgui/pawgui_labels.cpp +++ b/src/pawgui/labels/pawgui_labels.cpp @@ -7,6 +7,7 @@ Copyright (c) 2014-2024 Nathan Hurde, Chase Lee. Copyright (c) 2014-2024 PawByte LLC. Copyright (c) 2014-2024 PawByte Ambitious Working GUI(PAWGUI) contributors ( Contributors Page ) +Copyright (c) 2024 P.Industries Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal @@ -26,9 +27,9 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. --PawByte Ambitious Working GUI(PAWGUI) - - +Contributors: +- PawByte Ambitious Working GUI(PAWGUI) +- P Industries */ #include "pawgui_labels.h" diff --git a/src/pawgui/pawgui_labels.h b/src/pawgui/labels/pawgui_labels.h similarity index 94% rename from src/pawgui/pawgui_labels.h rename to src/pawgui/labels/pawgui_labels.h index 1881dd6b..409d56e0 100644 --- a/src/pawgui/pawgui_labels.h +++ b/src/pawgui/labels/pawgui_labels.h @@ -7,6 +7,7 @@ Copyright (c) 2014-2024 Nathan Hurde, Chase Lee. Copyright (c) 2014-2024 PawByte LLC. Copyright (c) 2014-2024 PawByte Ambitious Working GUI(PAWGUI) contributors ( Contributors Page ) +Copyright (c) 2024 P.Industries Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal @@ -26,9 +27,9 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. --PawByte Ambitious Working GUI(PAWGUI) - - +Contributors: +- PawByte Ambitious Working GUI(PAWGUI) +- P Industries */ #ifndef PAWGUI_LABELS_H diff --git a/src/pawgui/pawgui_notifications.cpp b/src/pawgui/notifications/pawgui_notifications.cpp similarity index 96% rename from src/pawgui/pawgui_notifications.cpp rename to src/pawgui/notifications/pawgui_notifications.cpp index 605b49e1..5644d9fe 100644 --- a/src/pawgui/pawgui_notifications.cpp +++ b/src/pawgui/notifications/pawgui_notifications.cpp @@ -7,6 +7,7 @@ Copyright (c) 2014-2024 Nathan Hurde, Chase Lee. Copyright (c) 2014-2024 PawByte LLC. Copyright (c) 2014-2024 PawByte Ambitious Working GUI(PAWGUI) contributors ( Contributors Page ) +Copyright (c) 2024 P.Industries Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal @@ -26,9 +27,9 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. --PawByte Ambitious Working GUI(PAWGUI) - - +Contributors: +- PawByte Ambitious Working GUI(PAWGUI) +- P Industries */ #include "pawgui_notifications.h" diff --git a/src/pawgui/pawgui_notifications.h b/src/pawgui/notifications/pawgui_notifications.h similarity index 93% rename from src/pawgui/pawgui_notifications.h rename to src/pawgui/notifications/pawgui_notifications.h index 3a30d084..6315c08f 100644 --- a/src/pawgui/pawgui_notifications.h +++ b/src/pawgui/notifications/pawgui_notifications.h @@ -7,6 +7,7 @@ Copyright (c) 2014-2024 Nathan Hurde, Chase Lee. Copyright (c) 2014-2024 PawByte LLC. Copyright (c) 2014-2024 PawByte Ambitious Working GUI(PAWGUI) contributors ( Contributors Page ) +Copyright (c) 2024 P.Industries Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal @@ -26,9 +27,9 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. --PawByte Ambitious Working GUI(PAWGUI) - - +Contributors: +- PawByte Ambitious Working GUI(PAWGUI) +- P Industries */ #ifndef pawgui_notificatons_h diff --git a/src/pawgui/pawgui.cpp b/src/pawgui/pawgui.cpp index 42fc58ca..dc64d0e6 100644 --- a/src/pawgui/pawgui.cpp +++ b/src/pawgui/pawgui.cpp @@ -7,6 +7,7 @@ Copyright (c) 2014-2024 Nathan Hurde, Chase Lee. Copyright (c) 2014-2024 PawByte LLC. Copyright (c) 2014-2024 PawByte Ambitious Working GUI(PAWGUI) contributors ( Contributors Page ) +Copyright (c) 2024 P.Industries Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal @@ -26,9 +27,9 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. --PawByte Ambitious Working GUI(PAWGUI) - - +Contributors: +- PawByte Ambitious Working GUI(PAWGUI) +- P Industries */ #include "pawgui.h" diff --git a/src/pawgui/pawgui_overlay.cpp b/src/pawgui/pawgui_overlay.cpp index 681b72b8..771251f5 100644 --- a/src/pawgui/pawgui_overlay.cpp +++ b/src/pawgui/pawgui_overlay.cpp @@ -7,6 +7,7 @@ Copyright (c) 2014-2024 Nathan Hurde, Chase Lee. Copyright (c) 2014-2024 PawByte LLC. Copyright (c) 2014-2024 PawByte Ambitious Working GUI(PAWGUI) contributors ( Contributors Page ) +Copyright (c) 2024 P.Industries Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal @@ -26,9 +27,9 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. --PawByte Ambitious Working GUI(PAWGUI) - - +Contributors: +- PawByte Ambitious Working GUI(PAWGUI) +- P Industries */ #include "pawgui_overlay.h" diff --git a/src/pawgui/pawgui_overlay.h b/src/pawgui/pawgui_overlay.h index 03b7733a..760348f0 100644 --- a/src/pawgui/pawgui_overlay.h +++ b/src/pawgui/pawgui_overlay.h @@ -7,6 +7,7 @@ Copyright (c) 2014-2024 Nathan Hurde, Chase Lee. Copyright (c) 2014-2024 PawByte LLC. Copyright (c) 2014-2024 PawByte Ambitious Working GUI(PAWGUI) contributors ( Contributors Page ) +Copyright (c) 2024 P.Industries Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal @@ -26,9 +27,9 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. --PawByte Ambitious Working GUI(PAWGUI) - - +Contributors: +- PawByte Ambitious Working GUI(PAWGUI) +- P Industries */ #ifndef PAWGUI_OVERLAY_SYSTEM_H diff --git a/src/pawgui/pawgui_panel_list.cpp b/src/pawgui/pawgui_panel_list.cpp index b4820139..aaf9b437 100644 --- a/src/pawgui/pawgui_panel_list.cpp +++ b/src/pawgui/pawgui_panel_list.cpp @@ -7,6 +7,7 @@ Copyright (c) 2014-2024 Nathan Hurde, Chase Lee. Copyright (c) 2014-2024 PawByte LLC. Copyright (c) 2014-2024 PawByte Ambitious Working GUI(PAWGUI) contributors ( Contributors Page ) +Copyright (c) 2024 P.Industries Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal @@ -26,9 +27,9 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. --PawByte Ambitious Working GUI(PAWGUI) - - +Contributors: +- PawByte Ambitious Working GUI(PAWGUI) +- P Industries */ #include "pawgui_panel_list.h" diff --git a/src/pawgui/pawgui_panel_list.h b/src/pawgui/pawgui_panel_list.h index fea1bc66..66d00589 100644 --- a/src/pawgui/pawgui_panel_list.h +++ b/src/pawgui/pawgui_panel_list.h @@ -7,6 +7,7 @@ Copyright (c) 2014-2024 Nathan Hurde, Chase Lee. Copyright (c) 2014-2024 PawByte LLC. Copyright (c) 2014-2024 PawByte Ambitious Working GUI(PAWGUI) contributors ( Contributors Page ) +Copyright (c) 2024 P.Industries Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal @@ -26,9 +27,9 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. --PawByte Ambitious Working GUI(PAWGUI) - - +Contributors: +- PawByte Ambitious Working GUI(PAWGUI) +- P Industries */ #ifndef PAWGUI_PANEL_LIST_H @@ -38,10 +39,10 @@ SOFTWARE. namespace pawgui { - enum + enum { panel_align_default = 0, /**< Panel elements not modified */ - panel_align_full = 1, /**< Panel elements modified to fit within panel */ + panel_align_full = 1, /**< Panel elements modified to fit within panel */ panel_align_left =2, /**< Panel elements modified to fit within panel with left element getting most of space */ panel_align_right =3, /**< Panel elements modified to fit within panel with right element getting most of space */ panel_align_equal = 4, /**< Panel elements modified to resize equally after non-resizable elements */ diff --git a/src/pawgui/pawgui_parsers.cpp b/src/pawgui/pawgui_parsers.cpp index 6b6fde8f..54e226fd 100644 --- a/src/pawgui/pawgui_parsers.cpp +++ b/src/pawgui/pawgui_parsers.cpp @@ -7,6 +7,7 @@ Copyright (c) 2014-2024 Nathan Hurde, Chase Lee. Copyright (c) 2014-2024 PawByte LLC. Copyright (c) 2014-2024 PawByte Ambitious Working GUI(PAWGUI) contributors ( Contributors Page ) +Copyright (c) 2024 P.Industries Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal @@ -26,9 +27,9 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. --PawByte Ambitious Working GUI(PAWGUI) - - +Contributors: +- PawByte Ambitious Working GUI(PAWGUI) +- P Industries */ #include "pawgui_parsers.h" diff --git a/src/pawgui/pawgui_parsers.h b/src/pawgui/pawgui_parsers.h index 376b3c22..d9bb45a9 100644 --- a/src/pawgui/pawgui_parsers.h +++ b/src/pawgui/pawgui_parsers.h @@ -7,6 +7,7 @@ Copyright (c) 2014-2024 Nathan Hurde, Chase Lee. Copyright (c) 2014-2024 PawByte LLC. Copyright (c) 2014-2024 PawByte Ambitious Working GUI(PAWGUI) contributors ( Contributors Page ) +Copyright (c) 2024 P.Industries Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal @@ -26,9 +27,9 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. --PawByte Ambitious Working GUI(PAWGUI) - - +Contributors: +- PawByte Ambitious Working GUI(PAWGUI) +- P Industries */ #ifndef PAWGUI_PARSERS_H diff --git a/src/pawgui/pawgui_popups.cpp b/src/pawgui/pawgui_popups.cpp index 4028640d..9210bfce 100644 --- a/src/pawgui/pawgui_popups.cpp +++ b/src/pawgui/pawgui_popups.cpp @@ -7,6 +7,7 @@ Copyright (c) 2014-2024 Nathan Hurde, Chase Lee. Copyright (c) 2014-2024 PawByte LLC. Copyright (c) 2014-2024 PawByte Ambitious Working GUI(PAWGUI) contributors ( Contributors Page ) +Copyright (c) 2024 P.Industries Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal @@ -26,9 +27,9 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. --PawByte Ambitious Working GUI(PAWGUI) - - +Contributors: +- PawByte Ambitious Working GUI(PAWGUI) +- P Industries */ #include "pawgui_base.h" diff --git a/src/pawgui/pawgui_popups.h b/src/pawgui/pawgui_popups.h index 111ebe84..de23af95 100644 --- a/src/pawgui/pawgui_popups.h +++ b/src/pawgui/pawgui_popups.h @@ -7,6 +7,7 @@ Copyright (c) 2014-2024 Nathan Hurde, Chase Lee. Copyright (c) 2014-2024 PawByte LLC. Copyright (c) 2014-2024 PawByte Ambitious Working GUI(PAWGUI) contributors ( Contributors Page ) +Copyright (c) 2024 P.Industries Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal @@ -26,9 +27,9 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. --PawByte Ambitious Working GUI(PAWGUI) - - +Contributors: +- PawByte Ambitious Working GUI(PAWGUI) +- P Industries */ #ifndef PAWGUI_POPUPS_H diff --git a/src/pawgui/pawgui_radiobuttons.cpp b/src/pawgui/pawgui_radiobuttons.cpp index 178d2b9f..be85abf9 100644 --- a/src/pawgui/pawgui_radiobuttons.cpp +++ b/src/pawgui/pawgui_radiobuttons.cpp @@ -7,6 +7,7 @@ Copyright (c) 2014-2024 Nathan Hurde, Chase Lee. Copyright (c) 2014-2024 PawByte LLC. Copyright (c) 2014-2024 PawByte Ambitious Working GUI(PAWGUI) contributors ( Contributors Page ) +Copyright (c) 2024 P.Industries Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal @@ -26,9 +27,9 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. --PawByte Ambitious Working GUI(PAWGUI) - - +Contributors: +- PawByte Ambitious Working GUI(PAWGUI) +- P Industries */ diff --git a/src/pawgui/pawgui_radiobuttons.h b/src/pawgui/pawgui_radiobuttons.h index 8594a3be..cfcf0aa9 100644 --- a/src/pawgui/pawgui_radiobuttons.h +++ b/src/pawgui/pawgui_radiobuttons.h @@ -7,6 +7,7 @@ Copyright (c) 2014-2024 Nathan Hurde, Chase Lee. Copyright (c) 2014-2024 PawByte LLC. Copyright (c) 2014-2024 PawByte Ambitious Working GUI(PAWGUI) contributors ( Contributors Page ) +Copyright (c) 2024 P.Industries Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal @@ -26,9 +27,9 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. --PawByte Ambitious Working GUI(PAWGUI) - - +Contributors: +- PawByte Ambitious Working GUI(PAWGUI) +- P Industries */ #ifndef PAWGUI_RADIOBUTTONS_H diff --git a/src/pawgui/pawgui_resource_dropdown.cpp b/src/pawgui/pawgui_resource_dropdown.cpp index ce3aaa06..cbeda30b 100644 --- a/src/pawgui/pawgui_resource_dropdown.cpp +++ b/src/pawgui/pawgui_resource_dropdown.cpp @@ -7,6 +7,7 @@ Copyright (c) 2014-2024 Nathan Hurde, Chase Lee. Copyright (c) 2014-2024 PawByte LLC. Copyright (c) 2014-2024 PawByte Ambitious Working GUI(PAWGUI) contributors ( Contributors Page ) +Copyright (c) 2024 P.Industries Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal @@ -26,9 +27,9 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. --PawByte Ambitious Working GUI(PAWGUI) - - +Contributors: +- PawByte Ambitious Working GUI(PAWGUI) +- P Industries */ #include "pawgui_resource_dropdown.h" diff --git a/src/pawgui/pawgui_resource_dropdown.h b/src/pawgui/pawgui_resource_dropdown.h index 133038e1..c7d0cd4d 100644 --- a/src/pawgui/pawgui_resource_dropdown.h +++ b/src/pawgui/pawgui_resource_dropdown.h @@ -7,6 +7,7 @@ Copyright (c) 2014-2024 Nathan Hurde, Chase Lee. Copyright (c) 2014-2024 PawByte LLC. Copyright (c) 2014-2024 PawByte Ambitious Working GUI(PAWGUI) contributors ( Contributors Page ) +Copyright (c) 2024 P.Industries Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal @@ -26,9 +27,9 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. --PawByte Ambitious Working GUI(PAWGUI) - - +Contributors: +- PawByte Ambitious Working GUI(PAWGUI) +- P Industries */ #ifndef PAWGUI_RESOURCE_DROPDOWN_H diff --git a/src/pawgui/pawgui_scrollbars.cpp b/src/pawgui/pawgui_scrollbars.cpp index 581de8ff..4b741050 100644 --- a/src/pawgui/pawgui_scrollbars.cpp +++ b/src/pawgui/pawgui_scrollbars.cpp @@ -7,6 +7,7 @@ Copyright (c) 2014-2024 Nathan Hurde, Chase Lee. Copyright (c) 2014-2024 PawByte LLC. Copyright (c) 2014-2024 PawByte Ambitious Working GUI(PAWGUI) contributors ( Contributors Page ) +Copyright (c) 2024 P.Industries Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal @@ -26,9 +27,9 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. --PawByte Ambitious Working GUI(PAWGUI) - - +Contributors: +- PawByte Ambitious Working GUI(PAWGUI) +- P Industries */ #include "pawgui_scrollbars.h" diff --git a/src/pawgui/pawgui_scrollbars.h b/src/pawgui/pawgui_scrollbars.h index d403589d..b7348476 100644 --- a/src/pawgui/pawgui_scrollbars.h +++ b/src/pawgui/pawgui_scrollbars.h @@ -7,6 +7,7 @@ Copyright (c) 2014-2024 Nathan Hurde, Chase Lee. Copyright (c) 2014-2024 PawByte LLC. Copyright (c) 2014-2024 PawByte Ambitious Working GUI(PAWGUI) contributors ( Contributors Page ) +Copyright (c) 2024 P.Industries Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal @@ -26,9 +27,9 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. --PawByte Ambitious Working GUI(PAWGUI) - - +Contributors: +- PawByte Ambitious Working GUI(PAWGUI) +- P Industries */ #ifndef PAWGUI_SCROLLBARS_H diff --git a/src/pawgui/pawgui_search_controller.cpp b/src/pawgui/pawgui_search_controller.cpp index e70f1a7e..a4a0f3dc 100644 --- a/src/pawgui/pawgui_search_controller.cpp +++ b/src/pawgui/pawgui_search_controller.cpp @@ -7,6 +7,7 @@ Copyright (c) 2014-2024 Nathan Hurde, Chase Lee. Copyright (c) 2014-2024 PawByte LLC. Copyright (c) 2014-2024 PawByte Ambitious Working GUI(PAWGUI) contributors ( Contributors Page ) +Copyright (c) 2024 P.Industries Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal @@ -26,9 +27,9 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. --PawByte Ambitious Working GUI(PAWGUI) - - +Contributors: +- PawByte Ambitious Working GUI(PAWGUI) +- P Industries */ #include "pawgui_search_controller.h" diff --git a/src/pawgui/pawgui_search_controller.h b/src/pawgui/pawgui_search_controller.h index 9c1eb1bf..7fb49ba9 100644 --- a/src/pawgui/pawgui_search_controller.h +++ b/src/pawgui/pawgui_search_controller.h @@ -7,6 +7,7 @@ Copyright (c) 2014-2024 Nathan Hurde, Chase Lee. Copyright (c) 2014-2024 PawByte LLC. Copyright (c) 2014-2024 PawByte Ambitious Working GUI(PAWGUI) contributors ( Contributors Page ) +Copyright (c) 2024 P.Industries Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal @@ -26,9 +27,9 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. --PawByte Ambitious Working GUI(PAWGUI) - - +Contributors: +- PawByte Ambitious Working GUI(PAWGUI) +- P Industries */ diff --git a/src/pawgui/pawgui_selectbox.cpp b/src/pawgui/pawgui_selectbox.cpp index 1510d814..1cc8bd42 100644 --- a/src/pawgui/pawgui_selectbox.cpp +++ b/src/pawgui/pawgui_selectbox.cpp @@ -7,6 +7,7 @@ Copyright (c) 2014-2024 Nathan Hurde, Chase Lee. Copyright (c) 2014-2024 PawByte LLC. Copyright (c) 2014-2024 PawByte Ambitious Working GUI(PAWGUI) contributors ( Contributors Page ) +Copyright (c) 2024 P.Industries Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal @@ -26,9 +27,9 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. --PawByte Ambitious Working GUI(PAWGUI) - - +Contributors: +- PawByte Ambitious Working GUI(PAWGUI) +- P Industries */ #include "pawgui_selectbox.h" diff --git a/src/pawgui/pawgui_selectbox.h b/src/pawgui/pawgui_selectbox.h index 48bddfc6..74ffc6ff 100644 --- a/src/pawgui/pawgui_selectbox.h +++ b/src/pawgui/pawgui_selectbox.h @@ -7,6 +7,7 @@ Copyright (c) 2014-2024 Nathan Hurde, Chase Lee. Copyright (c) 2014-2024 PawByte LLC. Copyright (c) 2014-2024 PawByte Ambitious Working GUI(PAWGUI) contributors ( Contributors Page ) +Copyright (c) 2024 P.Industries Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal @@ -26,9 +27,9 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. --PawByte Ambitious Working GUI(PAWGUI) - - +Contributors: +- PawByte Ambitious Working GUI(PAWGUI) +- P Industries */ #ifndef PAWGUI_SELECTBOX_H #define PAWGUI_SELECTBOX_H diff --git a/src/pawgui/pawgui_sliders.cpp b/src/pawgui/pawgui_sliders.cpp index 286a729a..64043639 100644 --- a/src/pawgui/pawgui_sliders.cpp +++ b/src/pawgui/pawgui_sliders.cpp @@ -7,6 +7,7 @@ Copyright (c) 2014-2024 Nathan Hurde, Chase Lee. Copyright (c) 2014-2024 PawByte LLC. Copyright (c) 2014-2024 PawByte Ambitious Working GUI(PAWGUI) contributors ( Contributors Page ) +Copyright (c) 2024 P.Industries Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal @@ -26,9 +27,9 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. --PawByte Ambitious Working GUI(PAWGUI) - - +Contributors: +- PawByte Ambitious Working GUI(PAWGUI) +- P Industries */ #include "pawgui_sliders.h" diff --git a/src/pawgui/pawgui_sliders.h b/src/pawgui/pawgui_sliders.h index 8473c62f..0869eef3 100644 --- a/src/pawgui/pawgui_sliders.h +++ b/src/pawgui/pawgui_sliders.h @@ -7,6 +7,7 @@ Copyright (c) 2014-2024 Nathan Hurde, Chase Lee. Copyright (c) 2014-2024 PawByte LLC. Copyright (c) 2014-2024 PawByte Ambitious Working GUI(PAWGUI) contributors ( Contributors Page ) +Copyright (c) 2024 P.Industries Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal @@ -26,9 +27,9 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. --PawByte Ambitious Working GUI(PAWGUI) - - +Contributors: +- PawByte Ambitious Working GUI(PAWGUI) +- P Industries */ #ifndef PAWGUI_SLIDERS_H diff --git a/src/pawgui/pawgui_statusbar.cpp b/src/pawgui/pawgui_statusbar.cpp index 55c042be..b7cc42cf 100644 --- a/src/pawgui/pawgui_statusbar.cpp +++ b/src/pawgui/pawgui_statusbar.cpp @@ -7,6 +7,7 @@ Copyright (c) 2014-2024 Nathan Hurde, Chase Lee. Copyright (c) 2014-2024 PawByte LLC. Copyright (c) 2014-2024 PawByte Ambitious Working GUI(PAWGUI) contributors ( Contributors Page ) +Copyright (c) 2024 P.Industries Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal @@ -26,9 +27,9 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. --PawByte Ambitious Working GUI(PAWGUI) - - +Contributors: +- PawByte Ambitious Working GUI(PAWGUI) +- P Industries */ #include "pawgui_statusbar.h" diff --git a/src/pawgui/pawgui_statusbar.h b/src/pawgui/pawgui_statusbar.h index cbfec240..316d26e7 100644 --- a/src/pawgui/pawgui_statusbar.h +++ b/src/pawgui/pawgui_statusbar.h @@ -7,6 +7,7 @@ Copyright (c) 2014-2024 Nathan Hurde, Chase Lee. Copyright (c) 2014-2024 PawByte LLC. Copyright (c) 2014-2024 PawByte Ambitious Working GUI(PAWGUI) contributors ( Contributors Page ) +Copyright (c) 2024 P.Industries Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal @@ -26,9 +27,9 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. --PawByte Ambitious Working GUI(PAWGUI) - - +Contributors: +- PawByte Ambitious Working GUI(PAWGUI) +- P Industries */ #ifndef PAWGUI_STATUS_BAR_H diff --git a/src/pawgui/pawgui_stree.cpp b/src/pawgui/pawgui_stree.cpp index f82bae97..2409d965 100644 --- a/src/pawgui/pawgui_stree.cpp +++ b/src/pawgui/pawgui_stree.cpp @@ -7,6 +7,7 @@ Copyright (c) 2014-2024 Nathan Hurde, Chase Lee. Copyright (c) 2014-2024 PawByte LLC. Copyright (c) 2014-2024 PawByte Ambitious Working GUI(PAWGUI) contributors ( Contributors Page ) +Copyright (c) 2024 P.Industries Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal @@ -26,9 +27,9 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. --PawByte Ambitious Working GUI(PAWGUI) - - +Contributors: +- PawByte Ambitious Working GUI(PAWGUI) +- P Industries */ #include "pawgui_stree.h" diff --git a/src/pawgui/pawgui_stree.h b/src/pawgui/pawgui_stree.h index e3daa663..d21710a4 100644 --- a/src/pawgui/pawgui_stree.h +++ b/src/pawgui/pawgui_stree.h @@ -7,6 +7,7 @@ Copyright (c) 2014-2024 Nathan Hurde, Chase Lee. Copyright (c) 2014-2024 PawByte LLC. Copyright (c) 2014-2024 PawByte Ambitious Working GUI(PAWGUI) contributors ( Contributors Page ) +Copyright (c) 2024 P.Industries Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal @@ -26,9 +27,9 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. --PawByte Ambitious Working GUI(PAWGUI) - - +Contributors: +- PawByte Ambitious Working GUI(PAWGUI) +- P Industries */ #ifndef PAWGUI_STREE_H diff --git a/src/pawgui/pawgui_syntax_handler.cpp b/src/pawgui/pawgui_syntax_handler.cpp index 04d0192c..c7346967 100644 --- a/src/pawgui/pawgui_syntax_handler.cpp +++ b/src/pawgui/pawgui_syntax_handler.cpp @@ -7,6 +7,7 @@ Copyright (c) 2014-2024 Nathan Hurde, Chase Lee. Copyright (c) 2014-2024 PawByte LLC. Copyright (c) 2014-2024 PawByte Ambitious Working GUI(PAWGUI) contributors ( Contributors Page ) +Copyright (c) 2024 P.Industries Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal @@ -26,9 +27,9 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. --PawByte Ambitious Working GUI(PAWGUI) - - +Contributors: +- PawByte Ambitious Working GUI(PAWGUI) +- P Industries */ #include "pawgui_syntax_handler.h" #include "pawgui_themes.h" diff --git a/src/pawgui/pawgui_syntax_handler.h b/src/pawgui/pawgui_syntax_handler.h index 826725fa..1270ed87 100644 --- a/src/pawgui/pawgui_syntax_handler.h +++ b/src/pawgui/pawgui_syntax_handler.h @@ -7,6 +7,7 @@ Copyright (c) 2014-2024 Nathan Hurde, Chase Lee. Copyright (c) 2014-2024 PawByte LLC. Copyright (c) 2014-2024 PawByte Ambitious Working GUI(PAWGUI) contributors ( Contributors Page ) +Copyright (c) 2024 P.Industries Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal @@ -26,9 +27,9 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. --PawByte Ambitious Working GUI(PAWGUI) - - +Contributors: +- PawByte Ambitious Working GUI(PAWGUI) +- P Industries */ #ifndef PAWGUI_SYNTHAX_HANDLER_H diff --git a/src/pawgui/pawgui_tab_basic.cpp b/src/pawgui/pawgui_tab_basic.cpp index a0d3679f..ec978696 100644 --- a/src/pawgui/pawgui_tab_basic.cpp +++ b/src/pawgui/pawgui_tab_basic.cpp @@ -7,6 +7,7 @@ Copyright (c) 2014-2024 Nathan Hurde, Chase Lee. Copyright (c) 2014-2024 PawByte LLC. Copyright (c) 2014-2024 PawByte Ambitious Working GUI(PAWGUI) contributors ( Contributors Page ) +Copyright (c) 2024 P.Industries Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal @@ -26,9 +27,9 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. --PawByte Ambitious Working GUI(PAWGUI) - - +Contributors: +- PawByte Ambitious Working GUI(PAWGUI) +- P Industries */ #include "pawgui_tab_basic.h" diff --git a/src/pawgui/pawgui_tab_basic.h b/src/pawgui/pawgui_tab_basic.h index 6dc971fc..f4a793d9 100644 --- a/src/pawgui/pawgui_tab_basic.h +++ b/src/pawgui/pawgui_tab_basic.h @@ -7,6 +7,7 @@ Copyright (c) 2014-2024 Nathan Hurde, Chase Lee. Copyright (c) 2014-2024 PawByte LLC. Copyright (c) 2014-2024 PawByte Ambitious Working GUI(PAWGUI) contributors ( Contributors Page ) +Copyright (c) 2024 P.Industries Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal @@ -26,9 +27,9 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. --PawByte Ambitious Working GUI(PAWGUI) - - +Contributors: +- PawByte Ambitious Working GUI(PAWGUI) +- P Industries */ #ifndef PAWGUI_TAB_BASIC_H diff --git a/src/pawgui/pawgui_tab_manager.cpp b/src/pawgui/pawgui_tab_manager.cpp index 14135712..c4aa80f8 100644 --- a/src/pawgui/pawgui_tab_manager.cpp +++ b/src/pawgui/pawgui_tab_manager.cpp @@ -7,6 +7,7 @@ Copyright (c) 2014-2024 Nathan Hurde, Chase Lee. Copyright (c) 2014-2024 PawByte LLC. Copyright (c) 2014-2024 PawByte Ambitious Working GUI(PAWGUI) contributors ( Contributors Page ) +Copyright (c) 2024 P.Industries Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal @@ -26,9 +27,9 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. --PawByte Ambitious Working GUI(PAWGUI) - - +Contributors: +- PawByte Ambitious Working GUI(PAWGUI) +- P Industries */ #include "pawgui_tab_manager.h" diff --git a/src/pawgui/pawgui_tab_manager.h b/src/pawgui/pawgui_tab_manager.h index 6cc1e117..2b36a99e 100644 --- a/src/pawgui/pawgui_tab_manager.h +++ b/src/pawgui/pawgui_tab_manager.h @@ -7,6 +7,7 @@ Copyright (c) 2014-2024 Nathan Hurde, Chase Lee. Copyright (c) 2014-2024 PawByte LLC. Copyright (c) 2014-2024 PawByte Ambitious Working GUI(PAWGUI) contributors ( Contributors Page ) +Copyright (c) 2024 P.Industries Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal @@ -26,9 +27,9 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. --PawByte Ambitious Working GUI(PAWGUI) - - +Contributors: +- PawByte Ambitious Working GUI(PAWGUI) +- P Industries */ #ifndef PAWGUI_TAB_RESOURCEBAR_H diff --git a/src/pawgui/pawgui_text_editor.cpp b/src/pawgui/pawgui_text_editor.cpp index f42d98cd..1923ce2f 100644 --- a/src/pawgui/pawgui_text_editor.cpp +++ b/src/pawgui/pawgui_text_editor.cpp @@ -7,6 +7,7 @@ Copyright (c) 2014-2024 Nathan Hurde, Chase Lee. Copyright (c) 2014-2024 PawByte LLC. Copyright (c) 2014-2024 PawByte Ambitious Working GUI(PAWGUI) contributors ( Contributors Page ) +Copyright (c) 2024 P.Industries Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal @@ -26,9 +27,9 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. --PawByte Ambitious Working GUI(PAWGUI) - - +Contributors: +- PawByte Ambitious Working GUI(PAWGUI) +- P Industries */ #include "pawgui_context.h" diff --git a/src/pawgui/pawgui_text_editor.h b/src/pawgui/pawgui_text_editor.h index dd5c970f..b21fbd9b 100644 --- a/src/pawgui/pawgui_text_editor.h +++ b/src/pawgui/pawgui_text_editor.h @@ -7,6 +7,7 @@ Copyright (c) 2014-2024 Nathan Hurde, Chase Lee. Copyright (c) 2014-2024 PawByte LLC. Copyright (c) 2014-2024 PawByte Ambitious Working GUI(PAWGUI) contributors ( Contributors Page ) +Copyright (c) 2024 P.Industries Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal @@ -26,9 +27,9 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. --PawByte Ambitious Working GUI(PAWGUI) - - +Contributors: +- PawByte Ambitious Working GUI(PAWGUI) +- P Industries */ #ifndef PAWGUI_TEXT_EDITOR_H diff --git a/src/pawgui/pawgui_text_input.cpp b/src/pawgui/pawgui_text_input.cpp index bc1fa733..eae2f6d1 100644 --- a/src/pawgui/pawgui_text_input.cpp +++ b/src/pawgui/pawgui_text_input.cpp @@ -7,6 +7,7 @@ Copyright (c) 2014-2024 Nathan Hurde, Chase Lee. Copyright (c) 2014-2024 PawByte LLC. Copyright (c) 2014-2024 PawByte Ambitious Working GUI(PAWGUI) contributors ( Contributors Page ) +Copyright (c) 2024 P.Industries Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal @@ -26,9 +27,9 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. --PawByte Ambitious Working GUI(PAWGUI) - - +Contributors: +- PawByte Ambitious Working GUI(PAWGUI) +- P Industries */ #include "pawgui_text_input.h" diff --git a/src/pawgui/pawgui_text_input.h b/src/pawgui/pawgui_text_input.h index 9b5048cb..493424a9 100644 --- a/src/pawgui/pawgui_text_input.h +++ b/src/pawgui/pawgui_text_input.h @@ -7,6 +7,7 @@ Copyright (c) 2014-2024 Nathan Hurde, Chase Lee. Copyright (c) 2014-2024 PawByte LLC. Copyright (c) 2014-2024 PawByte Ambitious Working GUI(PAWGUI) contributors ( Contributors Page ) +Copyright (c) 2024 P.Industries Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal @@ -26,9 +27,9 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. --PawByte Ambitious Working GUI(PAWGUI) - - +Contributors: +- PawByte Ambitious Working GUI(PAWGUI) +- P Industries */ diff --git a/src/pawgui/pawgui_text_url.cpp b/src/pawgui/pawgui_text_url.cpp index 3620800d..f8c1c789 100644 --- a/src/pawgui/pawgui_text_url.cpp +++ b/src/pawgui/pawgui_text_url.cpp @@ -7,6 +7,7 @@ Copyright (c) 2014-2024 Nathan Hurde, Chase Lee. Copyright (c) 2014-2024 PawByte LLC. Copyright (c) 2014-2024 PawByte Ambitious Working GUI(PAWGUI) contributors ( Contributors Page ) +Copyright (c) 2024 P.Industries Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal @@ -26,9 +27,9 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. --PawByte Ambitious Working GUI(PAWGUI) - - +Contributors: +- PawByte Ambitious Working GUI(PAWGUI) +- P Industries */ #include "pawgui_text_url.h" diff --git a/src/pawgui/pawgui_text_url.h b/src/pawgui/pawgui_text_url.h index 0e696c6d..2c7b48ba 100644 --- a/src/pawgui/pawgui_text_url.h +++ b/src/pawgui/pawgui_text_url.h @@ -7,6 +7,7 @@ Copyright (c) 2014-2024 Nathan Hurde, Chase Lee. Copyright (c) 2014-2024 PawByte LLC. Copyright (c) 2014-2024 PawByte Ambitious Working GUI(PAWGUI) contributors ( Contributors Page ) +Copyright (c) 2024 P.Industries Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal @@ -26,9 +27,9 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. --PawByte Ambitious Working GUI(PAWGUI) - - +Contributors: +- PawByte Ambitious Working GUI(PAWGUI) +- P Industries */ #ifndef PAWGUI_TEXT_URL_H diff --git a/src/pawgui/pawgui_theme_controller.cpp b/src/pawgui/theme_controller/pawgui_theme_controller.cpp similarity index 90% rename from src/pawgui/pawgui_theme_controller.cpp rename to src/pawgui/theme_controller/pawgui_theme_controller.cpp index 6db080a7..690e1bfe 100644 --- a/src/pawgui/pawgui_theme_controller.cpp +++ b/src/pawgui/theme_controller/pawgui_theme_controller.cpp @@ -7,6 +7,7 @@ Copyright (c) 2014-2024 Nathan Hurde, Chase Lee. Copyright (c) 2014-2024 PawByte LLC. Copyright (c) 2014-2024 PawByte Ambitious Working GUI(PAWGUI) contributors ( Contributors Page ) +Copyright (c) 2024 P.Industries Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal @@ -26,9 +27,9 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. --PawByte Ambitious Working GUI(PAWGUI) - - +Contributors: +- PawByte Ambitious Working GUI(PAWGUI) +- P Industries */ #include "pawgui_theme_controller.h" diff --git a/src/pawgui/pawgui_theme_controller.h b/src/pawgui/theme_controller/pawgui_theme_controller.h similarity index 89% rename from src/pawgui/pawgui_theme_controller.h rename to src/pawgui/theme_controller/pawgui_theme_controller.h index b5daba03..d05e1621 100644 --- a/src/pawgui/pawgui_theme_controller.h +++ b/src/pawgui/theme_controller/pawgui_theme_controller.h @@ -7,6 +7,7 @@ Copyright (c) 2014-2024 Nathan Hurde, Chase Lee. Copyright (c) 2014-2024 PawByte LLC. Copyright (c) 2014-2024 PawByte Ambitious Working GUI(PAWGUI) contributors ( Contributors Page ) +Copyright (c) 2024 P.Industries Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal @@ -26,9 +27,9 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. --PawByte Ambitious Working GUI(PAWGUI) - - +Contributors: +- PawByte Ambitious Working GUI(PAWGUI) +- P Industries */ #ifndef PAWGUI_THEME_CONTROLLER_H diff --git a/src/pawgui/pawgui_themes.cpp b/src/pawgui/themes/pawgui_themes.cpp similarity index 97% rename from src/pawgui/pawgui_themes.cpp rename to src/pawgui/themes/pawgui_themes.cpp index 3c4ea3e1..433d2936 100644 --- a/src/pawgui/pawgui_themes.cpp +++ b/src/pawgui/themes/pawgui_themes.cpp @@ -7,6 +7,7 @@ Copyright (c) 2014-2024 Nathan Hurde, Chase Lee. Copyright (c) 2014-2024 PawByte LLC. Copyright (c) 2014-2024 PawByte Ambitious Working GUI(PAWGUI) contributors ( Contributors Page ) +Copyright (c) 2024 P.Industries Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal @@ -26,9 +27,9 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. --PawByte Ambitious Working GUI(PAWGUI) - - +Contributors: +- PawByte Ambitious Working GUI(PAWGUI) +- P Industries */ #include "pawgui_themes.h" diff --git a/src/pawgui/pawgui_themes.h b/src/pawgui/themes/pawgui_themes.h similarity index 96% rename from src/pawgui/pawgui_themes.h rename to src/pawgui/themes/pawgui_themes.h index 9f664e38..f91d75ec 100644 --- a/src/pawgui/pawgui_themes.h +++ b/src/pawgui/themes/pawgui_themes.h @@ -7,6 +7,7 @@ Copyright (c) 2014-2024 Nathan Hurde, Chase Lee. Copyright (c) 2014-2024 PawByte LLC. Copyright (c) 2014-2024 PawByte Ambitious Working GUI(PAWGUI) contributors ( Contributors Page ) +Copyright (c) 2024 P.Industries Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the “Software”), to deal @@ -26,9 +27,9 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. --PawByte Ambitious Working GUI(PAWGUI) - - +Contributors: +- PawByte Ambitious Working GUI(PAWGUI) +- P Industries */ #ifndef PAWGUI_THEMES_H From 692410971a428b7b0a206114029052bdd34c59db Mon Sep 17 00:00:00 2001 From: thepherm <63941518+thepherm@users.noreply.github.com> Date: Sat, 14 Dec 2024 18:15:15 -0600 Subject: [PATCH 7/8] Add new header files for pawgui popups, text URL, and status bar; remove old versions --- src/pawgui/{ => overlay}/pawgui_overlay.cpp | 0 src/pawgui/{ => overlay}/pawgui_overlay.h | 0 src/pawgui/{ => panel_list}/pawgui_panel_list.cpp | 0 src/pawgui/{ => panel_list}/pawgui_panel_list.h | 0 src/pawgui/{ => parsers}/pawgui_parsers.cpp | 0 src/pawgui/{ => parsers}/pawgui_parsers.h | 0 src/pawgui/{ => pawgui}/pawgui.cpp | 0 src/pawgui/{ => pawgui}/pawgui.h | 0 src/pawgui/{ => popups}/pawgui_popups.cpp | 0 src/pawgui/{ => popups}/pawgui_popups.h | 0 src/pawgui/{ => radio_buttons}/pawgui_radiobuttons.cpp | 0 src/pawgui/{ => radio_buttons}/pawgui_radiobuttons.h | 0 src/pawgui/{ => resource_dropdown}/pawgui_resource_dropdown.cpp | 0 src/pawgui/{ => resource_dropdown}/pawgui_resource_dropdown.h | 0 src/pawgui/{ => scrollbars}/pawgui_scrollbars.cpp | 0 src/pawgui/{ => scrollbars}/pawgui_scrollbars.h | 0 src/pawgui/{ => search_controller}/pawgui_search_controller.cpp | 0 src/pawgui/{ => search_controller}/pawgui_search_controller.h | 0 src/pawgui/{ => select_box}/pawgui_selectbox.cpp | 0 src/pawgui/{ => select_box}/pawgui_selectbox.h | 0 src/pawgui/{ => settings}/pawgui_settings.cpp | 0 src/pawgui/{ => settings}/pawgui_settings.h | 0 src/pawgui/{ => sliders}/pawgui_sliders.cpp | 0 src/pawgui/{ => sliders}/pawgui_sliders.h | 0 src/pawgui/{ => statusbar}/pawgui_statusbar.cpp | 0 src/pawgui/{ => statusbar}/pawgui_statusbar.h | 0 src/pawgui/{ => stree}/pawgui_stree.cpp | 0 src/pawgui/{ => stree}/pawgui_stree.h | 0 src/pawgui/{ => syntax_handler}/pawgui_syntax_handler.cpp | 0 src/pawgui/{ => syntax_handler}/pawgui_syntax_handler.h | 0 src/pawgui/{ => tab_basic}/pawgui_tab_basic.cpp | 0 src/pawgui/{ => tab_basic}/pawgui_tab_basic.h | 0 src/pawgui/{ => tab_manager}/pawgui_tab_manager.cpp | 0 src/pawgui/{ => tab_manager}/pawgui_tab_manager.h | 0 src/pawgui/{ => text_editor}/pawgui_text_editor.cpp | 0 src/pawgui/{ => text_editor}/pawgui_text_editor.h | 0 src/pawgui/{ => text_input}/pawgui_text_input.cpp | 0 src/pawgui/{ => text_input}/pawgui_text_input.cpp.save | 0 src/pawgui/{ => text_input}/pawgui_text_input.h | 0 src/pawgui/{ => text_url}/pawgui_text_url.cpp | 0 src/pawgui/{ => text_url}/pawgui_text_url.h | 0 41 files changed, 0 insertions(+), 0 deletions(-) rename src/pawgui/{ => overlay}/pawgui_overlay.cpp (100%) rename src/pawgui/{ => overlay}/pawgui_overlay.h (100%) rename src/pawgui/{ => panel_list}/pawgui_panel_list.cpp (100%) rename src/pawgui/{ => panel_list}/pawgui_panel_list.h (100%) rename src/pawgui/{ => parsers}/pawgui_parsers.cpp (100%) rename src/pawgui/{ => parsers}/pawgui_parsers.h (100%) rename src/pawgui/{ => pawgui}/pawgui.cpp (100%) rename src/pawgui/{ => pawgui}/pawgui.h (100%) rename src/pawgui/{ => popups}/pawgui_popups.cpp (100%) rename src/pawgui/{ => popups}/pawgui_popups.h (100%) rename src/pawgui/{ => radio_buttons}/pawgui_radiobuttons.cpp (100%) rename src/pawgui/{ => radio_buttons}/pawgui_radiobuttons.h (100%) rename src/pawgui/{ => resource_dropdown}/pawgui_resource_dropdown.cpp (100%) rename src/pawgui/{ => resource_dropdown}/pawgui_resource_dropdown.h (100%) rename src/pawgui/{ => scrollbars}/pawgui_scrollbars.cpp (100%) rename src/pawgui/{ => scrollbars}/pawgui_scrollbars.h (100%) rename src/pawgui/{ => search_controller}/pawgui_search_controller.cpp (100%) rename src/pawgui/{ => search_controller}/pawgui_search_controller.h (100%) rename src/pawgui/{ => select_box}/pawgui_selectbox.cpp (100%) rename src/pawgui/{ => select_box}/pawgui_selectbox.h (100%) rename src/pawgui/{ => settings}/pawgui_settings.cpp (100%) rename src/pawgui/{ => settings}/pawgui_settings.h (100%) rename src/pawgui/{ => sliders}/pawgui_sliders.cpp (100%) rename src/pawgui/{ => sliders}/pawgui_sliders.h (100%) rename src/pawgui/{ => statusbar}/pawgui_statusbar.cpp (100%) rename src/pawgui/{ => statusbar}/pawgui_statusbar.h (100%) rename src/pawgui/{ => stree}/pawgui_stree.cpp (100%) rename src/pawgui/{ => stree}/pawgui_stree.h (100%) rename src/pawgui/{ => syntax_handler}/pawgui_syntax_handler.cpp (100%) rename src/pawgui/{ => syntax_handler}/pawgui_syntax_handler.h (100%) rename src/pawgui/{ => tab_basic}/pawgui_tab_basic.cpp (100%) rename src/pawgui/{ => tab_basic}/pawgui_tab_basic.h (100%) rename src/pawgui/{ => tab_manager}/pawgui_tab_manager.cpp (100%) rename src/pawgui/{ => tab_manager}/pawgui_tab_manager.h (100%) rename src/pawgui/{ => text_editor}/pawgui_text_editor.cpp (100%) rename src/pawgui/{ => text_editor}/pawgui_text_editor.h (100%) rename src/pawgui/{ => text_input}/pawgui_text_input.cpp (100%) rename src/pawgui/{ => text_input}/pawgui_text_input.cpp.save (100%) rename src/pawgui/{ => text_input}/pawgui_text_input.h (100%) rename src/pawgui/{ => text_url}/pawgui_text_url.cpp (100%) rename src/pawgui/{ => text_url}/pawgui_text_url.h (100%) diff --git a/src/pawgui/pawgui_overlay.cpp b/src/pawgui/overlay/pawgui_overlay.cpp similarity index 100% rename from src/pawgui/pawgui_overlay.cpp rename to src/pawgui/overlay/pawgui_overlay.cpp diff --git a/src/pawgui/pawgui_overlay.h b/src/pawgui/overlay/pawgui_overlay.h similarity index 100% rename from src/pawgui/pawgui_overlay.h rename to src/pawgui/overlay/pawgui_overlay.h diff --git a/src/pawgui/pawgui_panel_list.cpp b/src/pawgui/panel_list/pawgui_panel_list.cpp similarity index 100% rename from src/pawgui/pawgui_panel_list.cpp rename to src/pawgui/panel_list/pawgui_panel_list.cpp diff --git a/src/pawgui/pawgui_panel_list.h b/src/pawgui/panel_list/pawgui_panel_list.h similarity index 100% rename from src/pawgui/pawgui_panel_list.h rename to src/pawgui/panel_list/pawgui_panel_list.h diff --git a/src/pawgui/pawgui_parsers.cpp b/src/pawgui/parsers/pawgui_parsers.cpp similarity index 100% rename from src/pawgui/pawgui_parsers.cpp rename to src/pawgui/parsers/pawgui_parsers.cpp diff --git a/src/pawgui/pawgui_parsers.h b/src/pawgui/parsers/pawgui_parsers.h similarity index 100% rename from src/pawgui/pawgui_parsers.h rename to src/pawgui/parsers/pawgui_parsers.h diff --git a/src/pawgui/pawgui.cpp b/src/pawgui/pawgui/pawgui.cpp similarity index 100% rename from src/pawgui/pawgui.cpp rename to src/pawgui/pawgui/pawgui.cpp diff --git a/src/pawgui/pawgui.h b/src/pawgui/pawgui/pawgui.h similarity index 100% rename from src/pawgui/pawgui.h rename to src/pawgui/pawgui/pawgui.h diff --git a/src/pawgui/pawgui_popups.cpp b/src/pawgui/popups/pawgui_popups.cpp similarity index 100% rename from src/pawgui/pawgui_popups.cpp rename to src/pawgui/popups/pawgui_popups.cpp diff --git a/src/pawgui/pawgui_popups.h b/src/pawgui/popups/pawgui_popups.h similarity index 100% rename from src/pawgui/pawgui_popups.h rename to src/pawgui/popups/pawgui_popups.h diff --git a/src/pawgui/pawgui_radiobuttons.cpp b/src/pawgui/radio_buttons/pawgui_radiobuttons.cpp similarity index 100% rename from src/pawgui/pawgui_radiobuttons.cpp rename to src/pawgui/radio_buttons/pawgui_radiobuttons.cpp diff --git a/src/pawgui/pawgui_radiobuttons.h b/src/pawgui/radio_buttons/pawgui_radiobuttons.h similarity index 100% rename from src/pawgui/pawgui_radiobuttons.h rename to src/pawgui/radio_buttons/pawgui_radiobuttons.h diff --git a/src/pawgui/pawgui_resource_dropdown.cpp b/src/pawgui/resource_dropdown/pawgui_resource_dropdown.cpp similarity index 100% rename from src/pawgui/pawgui_resource_dropdown.cpp rename to src/pawgui/resource_dropdown/pawgui_resource_dropdown.cpp diff --git a/src/pawgui/pawgui_resource_dropdown.h b/src/pawgui/resource_dropdown/pawgui_resource_dropdown.h similarity index 100% rename from src/pawgui/pawgui_resource_dropdown.h rename to src/pawgui/resource_dropdown/pawgui_resource_dropdown.h diff --git a/src/pawgui/pawgui_scrollbars.cpp b/src/pawgui/scrollbars/pawgui_scrollbars.cpp similarity index 100% rename from src/pawgui/pawgui_scrollbars.cpp rename to src/pawgui/scrollbars/pawgui_scrollbars.cpp diff --git a/src/pawgui/pawgui_scrollbars.h b/src/pawgui/scrollbars/pawgui_scrollbars.h similarity index 100% rename from src/pawgui/pawgui_scrollbars.h rename to src/pawgui/scrollbars/pawgui_scrollbars.h diff --git a/src/pawgui/pawgui_search_controller.cpp b/src/pawgui/search_controller/pawgui_search_controller.cpp similarity index 100% rename from src/pawgui/pawgui_search_controller.cpp rename to src/pawgui/search_controller/pawgui_search_controller.cpp diff --git a/src/pawgui/pawgui_search_controller.h b/src/pawgui/search_controller/pawgui_search_controller.h similarity index 100% rename from src/pawgui/pawgui_search_controller.h rename to src/pawgui/search_controller/pawgui_search_controller.h diff --git a/src/pawgui/pawgui_selectbox.cpp b/src/pawgui/select_box/pawgui_selectbox.cpp similarity index 100% rename from src/pawgui/pawgui_selectbox.cpp rename to src/pawgui/select_box/pawgui_selectbox.cpp diff --git a/src/pawgui/pawgui_selectbox.h b/src/pawgui/select_box/pawgui_selectbox.h similarity index 100% rename from src/pawgui/pawgui_selectbox.h rename to src/pawgui/select_box/pawgui_selectbox.h diff --git a/src/pawgui/pawgui_settings.cpp b/src/pawgui/settings/pawgui_settings.cpp similarity index 100% rename from src/pawgui/pawgui_settings.cpp rename to src/pawgui/settings/pawgui_settings.cpp diff --git a/src/pawgui/pawgui_settings.h b/src/pawgui/settings/pawgui_settings.h similarity index 100% rename from src/pawgui/pawgui_settings.h rename to src/pawgui/settings/pawgui_settings.h diff --git a/src/pawgui/pawgui_sliders.cpp b/src/pawgui/sliders/pawgui_sliders.cpp similarity index 100% rename from src/pawgui/pawgui_sliders.cpp rename to src/pawgui/sliders/pawgui_sliders.cpp diff --git a/src/pawgui/pawgui_sliders.h b/src/pawgui/sliders/pawgui_sliders.h similarity index 100% rename from src/pawgui/pawgui_sliders.h rename to src/pawgui/sliders/pawgui_sliders.h diff --git a/src/pawgui/pawgui_statusbar.cpp b/src/pawgui/statusbar/pawgui_statusbar.cpp similarity index 100% rename from src/pawgui/pawgui_statusbar.cpp rename to src/pawgui/statusbar/pawgui_statusbar.cpp diff --git a/src/pawgui/pawgui_statusbar.h b/src/pawgui/statusbar/pawgui_statusbar.h similarity index 100% rename from src/pawgui/pawgui_statusbar.h rename to src/pawgui/statusbar/pawgui_statusbar.h diff --git a/src/pawgui/pawgui_stree.cpp b/src/pawgui/stree/pawgui_stree.cpp similarity index 100% rename from src/pawgui/pawgui_stree.cpp rename to src/pawgui/stree/pawgui_stree.cpp diff --git a/src/pawgui/pawgui_stree.h b/src/pawgui/stree/pawgui_stree.h similarity index 100% rename from src/pawgui/pawgui_stree.h rename to src/pawgui/stree/pawgui_stree.h diff --git a/src/pawgui/pawgui_syntax_handler.cpp b/src/pawgui/syntax_handler/pawgui_syntax_handler.cpp similarity index 100% rename from src/pawgui/pawgui_syntax_handler.cpp rename to src/pawgui/syntax_handler/pawgui_syntax_handler.cpp diff --git a/src/pawgui/pawgui_syntax_handler.h b/src/pawgui/syntax_handler/pawgui_syntax_handler.h similarity index 100% rename from src/pawgui/pawgui_syntax_handler.h rename to src/pawgui/syntax_handler/pawgui_syntax_handler.h diff --git a/src/pawgui/pawgui_tab_basic.cpp b/src/pawgui/tab_basic/pawgui_tab_basic.cpp similarity index 100% rename from src/pawgui/pawgui_tab_basic.cpp rename to src/pawgui/tab_basic/pawgui_tab_basic.cpp diff --git a/src/pawgui/pawgui_tab_basic.h b/src/pawgui/tab_basic/pawgui_tab_basic.h similarity index 100% rename from src/pawgui/pawgui_tab_basic.h rename to src/pawgui/tab_basic/pawgui_tab_basic.h diff --git a/src/pawgui/pawgui_tab_manager.cpp b/src/pawgui/tab_manager/pawgui_tab_manager.cpp similarity index 100% rename from src/pawgui/pawgui_tab_manager.cpp rename to src/pawgui/tab_manager/pawgui_tab_manager.cpp diff --git a/src/pawgui/pawgui_tab_manager.h b/src/pawgui/tab_manager/pawgui_tab_manager.h similarity index 100% rename from src/pawgui/pawgui_tab_manager.h rename to src/pawgui/tab_manager/pawgui_tab_manager.h diff --git a/src/pawgui/pawgui_text_editor.cpp b/src/pawgui/text_editor/pawgui_text_editor.cpp similarity index 100% rename from src/pawgui/pawgui_text_editor.cpp rename to src/pawgui/text_editor/pawgui_text_editor.cpp diff --git a/src/pawgui/pawgui_text_editor.h b/src/pawgui/text_editor/pawgui_text_editor.h similarity index 100% rename from src/pawgui/pawgui_text_editor.h rename to src/pawgui/text_editor/pawgui_text_editor.h diff --git a/src/pawgui/pawgui_text_input.cpp b/src/pawgui/text_input/pawgui_text_input.cpp similarity index 100% rename from src/pawgui/pawgui_text_input.cpp rename to src/pawgui/text_input/pawgui_text_input.cpp diff --git a/src/pawgui/pawgui_text_input.cpp.save b/src/pawgui/text_input/pawgui_text_input.cpp.save similarity index 100% rename from src/pawgui/pawgui_text_input.cpp.save rename to src/pawgui/text_input/pawgui_text_input.cpp.save diff --git a/src/pawgui/pawgui_text_input.h b/src/pawgui/text_input/pawgui_text_input.h similarity index 100% rename from src/pawgui/pawgui_text_input.h rename to src/pawgui/text_input/pawgui_text_input.h diff --git a/src/pawgui/pawgui_text_url.cpp b/src/pawgui/text_url/pawgui_text_url.cpp similarity index 100% rename from src/pawgui/pawgui_text_url.cpp rename to src/pawgui/text_url/pawgui_text_url.cpp diff --git a/src/pawgui/pawgui_text_url.h b/src/pawgui/text_url/pawgui_text_url.h similarity index 100% rename from src/pawgui/pawgui_text_url.h rename to src/pawgui/text_url/pawgui_text_url.h From 81a339fe8524f653319bd29dbb9a074ab5fcc87a Mon Sep 17 00:00:00 2001 From: thepherm <63941518+thepherm@users.noreply.github.com> Date: Sat, 14 Dec 2024 20:40:06 -0600 Subject: [PATCH 8/8] Refactor include paths in pawgui headers to use relative paths --- src/gpe_editor/editor/gpe_editor.h | 6 +- src/gpe_editor/editor/gpe_editor_globals.h | 4 +- src/gpe_editor/editor/gpe_editor_project.h | 6 +- .../editor/gpe_editor_project_helper.h | 2 +- .../editor/gpe_editor_splash_page.h | 2 +- src/gpe_editor/editor/gpe_editor_state.h | 2 +- src/gpe_editor/log/gpe_log_manager.h | 2 +- .../resources/basic/gpe_basic_resource_page.h | 8 +-- .../resources/gpe/gpe_resource_tree.h | 2 +- src/gpe_editor/scene/gpe_scene_basic_class.h | 2 +- src/pawgui/base/pawgui_base.h | 10 ++-- src/pawgui/buttons/pawgui_buttons.h | 2 +- src/pawgui/checkbox/pawgui_checkbox.h | 2 +- .../color_picker/pawgui_color_picker.cpp | 8 +-- src/pawgui/color_picker/pawgui_color_picker.h | 2 +- src/pawgui/context/pawgui_context.h | 2 +- .../pawgui_content_selector.h | 8 +-- src/pawgui/dock_system/pawgui_dock_system.h | 10 ++-- src/pawgui/dropdown/pawgui_dropdown.h | 14 ++--- src/pawgui/file_popups/pawgui_file_popups.h | 12 ++-- .../pawgui_general_resource_container.cpp | 8 +-- .../pawgui_general_resource_container.h | 4 +- src/pawgui/icon_pack/pawgui_iconpack.h | 6 +- src/pawgui/labels/pawgui_labels.h | 2 +- .../notifications/pawgui_notifications.h | 2 +- src/pawgui/overlay/pawgui_overlay.h | 2 +- src/pawgui/panel_list/pawgui_panel_list.h | 2 +- src/pawgui/parsers/pawgui_parsers.cpp | 4 +- src/pawgui/parsers/pawgui_parsers.h | 2 +- src/pawgui/pawgui/pawgui.h | 60 +++++++++---------- src/pawgui/popups/pawgui_popups.cpp | 10 ++-- .../radio_buttons/pawgui_radiobuttons.h | 4 +- .../pawgui_resource_dropdown.h | 6 +- src/pawgui/scrollbars/pawgui_scrollbars.h | 2 +- .../pawgui_search_controller.h | 12 ++-- src/pawgui/select_box/pawgui_selectbox.h | 6 +- src/pawgui/sliders/pawgui_sliders.h | 3 +- src/pawgui/statusbar/pawgui_statusbar.h | 3 +- src/pawgui/stree/pawgui_stree.cpp | 4 +- src/pawgui/stree/pawgui_stree.h | 6 +- .../syntax_handler/pawgui_syntax_handler.cpp | 4 +- src/pawgui/tab_basic/pawgui_tab_basic.h | 2 +- src/pawgui/tab_manager/pawgui_tab_manager.cpp | 6 +- src/pawgui/tab_manager/pawgui_tab_manager.h | 6 +- src/pawgui/text_editor/pawgui_text_editor.cpp | 12 ++-- src/pawgui/text_editor/pawgui_text_editor.h | 12 ++-- src/pawgui/text_input/pawgui_text_input.h | 4 +- src/pawgui/text_url/pawgui_text_url.h | 2 +- .../pawgui_theme_controller.h | 2 +- src/pawgui/themes/pawgui_themes.h | 4 +- 50 files changed, 155 insertions(+), 153 deletions(-) diff --git a/src/gpe_editor/editor/gpe_editor.h b/src/gpe_editor/editor/gpe_editor.h index 44049bed..b5a6cfca 100644 --- a/src/gpe_editor/editor/gpe_editor.h +++ b/src/gpe_editor/editor/gpe_editor.h @@ -34,9 +34,9 @@ SOFTWARE. #ifndef GPE_EDITOR_H #define GPE_EDITOR_H -#include "../pawgui/pawgui.h" -#include "pawgui/pawgui_resource_dropdown.h" -#include "pawgui/pawgui_dock_system.h" +#include "../pawgui/pawgui/pawgui.h" +#include "../pawgui/resource_dropdown/pawgui_resource_dropdown.h" +#include "../pawgui/dock_system/pawgui_dock_system.h" #include "gpe_editor_constants.h" #include "../editor/gpe_editor_globals.h" diff --git a/src/gpe_editor/editor/gpe_editor_globals.h b/src/gpe_editor/editor/gpe_editor_globals.h index 5ff802ec..4ff5a710 100644 --- a/src/gpe_editor/editor/gpe_editor_globals.h +++ b/src/gpe_editor/editor/gpe_editor_globals.h @@ -34,8 +34,8 @@ SOFTWARE. #ifndef gpe_editor_globals_h #define gpe_editor_globals_h -#include "../pawgui/pawgui_theme_controller.h" -#include "../pawgui/pawgui_dock_system.h" +#include "../../pawgui/theme_controller/pawgui_theme_controller.h" +#include "../../pawgui/dock_system/pawgui_dock_system.h" #include "gpe_editor_splash_page.h" extern int release_current_mode; diff --git a/src/gpe_editor/editor/gpe_editor_project.h b/src/gpe_editor/editor/gpe_editor_project.h index b5fe9312..3420622a 100644 --- a/src/gpe_editor/editor/gpe_editor_project.h +++ b/src/gpe_editor/editor/gpe_editor_project.h @@ -34,9 +34,9 @@ SOFTWARE. #ifndef gpe_editor_project_h #define gpe_editor_project_h -#include "../pawgui/pawgui.h" -#include "../pawgui/pawgui_resource_dropdown.h" -#include "../pawgui/pawgui_general_resource.h" +#include "../pawgui/pawgui/pawgui.h" +#include "../pawgui/resource_dropdown/pawgui_resource_dropdown.h" +#include "../pawgui/general_resource/pawgui_general_resource.h" #include "gpe_editor_constants.h" #include "../editor/gpe_editor_globals.h" diff --git a/src/gpe_editor/editor/gpe_editor_project_helper.h b/src/gpe_editor/editor/gpe_editor_project_helper.h index 660d1395..e8583534 100644 --- a/src/gpe_editor/editor/gpe_editor_project_helper.h +++ b/src/gpe_editor/editor/gpe_editor_project_helper.h @@ -39,7 +39,7 @@ SOFTWARE. #include "../gpe/gpe_file_system.h" #include "../gpe/gpe_globals.h" #include "../gpe/gpe.h" -#include "../pawgui/pawgui_popups.h" +#include "../pawgui/popups/pawgui_popups.h" #include "gpe_editor_constants.h" #include "../editor/gpe_editor_globals.h" diff --git a/src/gpe_editor/editor/gpe_editor_splash_page.h b/src/gpe_editor/editor/gpe_editor_splash_page.h index 45b363a0..8b412614 100644 --- a/src/gpe_editor/editor/gpe_editor_splash_page.h +++ b/src/gpe_editor/editor/gpe_editor_splash_page.h @@ -35,7 +35,7 @@ SOFTWARE. #include #include "../gpe/gpe.h" -#include "../pawgui/pawgui.h" +#include "../pawgui/pawgui/pawgui.h" class gpe_splash_page { diff --git a/src/gpe_editor/editor/gpe_editor_state.h b/src/gpe_editor/editor/gpe_editor_state.h index 632630f0..e3fc6115 100644 --- a/src/gpe_editor/editor/gpe_editor_state.h +++ b/src/gpe_editor/editor/gpe_editor_state.h @@ -43,7 +43,7 @@ SOFTWARE. #include "../resources/gpe/gpe_resource_tree.h" #include "../project/gpe_project_resources.h" #include "../gpe/gpe_program_state.h" -#include "../pawgui/pawgui.h" +#include "../pawgui/pawgui/pawgui.h" class gpe_editor_state : public gpe::program_state { diff --git a/src/gpe_editor/log/gpe_log_manager.h b/src/gpe_editor/log/gpe_log_manager.h index 90316aef..998217db 100644 --- a/src/gpe_editor/log/gpe_log_manager.h +++ b/src/gpe_editor/log/gpe_log_manager.h @@ -34,7 +34,7 @@ SOFTWARE. #ifndef GPE_EDITOR_LOGS_H #define GPE_EDITOR_LOGS_H -#include "../pawgui/pawgui.h" +#include "../pawgui/pawgui/pawgui.h" class log_manager: public pawgui::widget_basic { diff --git a/src/gpe_editor/resources/basic/gpe_basic_resource_page.h b/src/gpe_editor/resources/basic/gpe_basic_resource_page.h index 972a4b08..eefa1dbb 100644 --- a/src/gpe_editor/resources/basic/gpe_basic_resource_page.h +++ b/src/gpe_editor/resources/basic/gpe_basic_resource_page.h @@ -35,10 +35,10 @@ SOFTWARE. #ifndef GPE_BASIC_project_RESOURCE_H #define GPE_BASIC_project_RESOURCE_H -#include "../gpe/gpe_render_package_handler.h" -#include "../pawgui/pawgui_dock_system.h" -#include "../pawgui/pawgui_general_resource.h" -#include "../pawgui/pawgui.h" +#include "../../gpe/gpe_render_package_handler.h" +#include "../../pawgui/dock_system/pawgui_dock_system.h" +#include "../../pawgui/general_resource/pawgui_general_resource.h" +#include "../../pawgui/pawgui/pawgui.h" #include "../../editor/gpe_editor_globals.h" diff --git a/src/gpe_editor/resources/gpe/gpe_resource_tree.h b/src/gpe_editor/resources/gpe/gpe_resource_tree.h index d3ac2c35..2af80e7a 100644 --- a/src/gpe_editor/resources/gpe/gpe_resource_tree.h +++ b/src/gpe_editor/resources/gpe/gpe_resource_tree.h @@ -34,7 +34,7 @@ SOFTWARE. #ifndef GPE_RESOURCE_TREE_H #define GPE_RESOURCE_TREE_H -#include "../pawgui/pawgui.h" +#include "../../pawgui/pawgui/pawgui.h" extern int resourcetype_last_rendered_type; diff --git a/src/gpe_editor/scene/gpe_scene_basic_class.h b/src/gpe_editor/scene/gpe_scene_basic_class.h index 8d10779f..89b00d33 100644 --- a/src/gpe_editor/scene/gpe_scene_basic_class.h +++ b/src/gpe_editor/scene/gpe_scene_basic_class.h @@ -37,7 +37,7 @@ SOFTWARE. #include "../resources/basic/gpe_basic_resource_page.h" #include "../editor/gpe_editor_globals.h" -#include "../pawgui/pawgui_stree.h" +#include "../pawgui/stree/pawgui_stree.h" //Basic Scene Editing Modes const int SCENE_MODE_NONE = -1; diff --git a/src/pawgui/base/pawgui_base.h b/src/pawgui/base/pawgui_base.h index 60a7cb3c..a3850816 100644 --- a/src/pawgui/base/pawgui_base.h +++ b/src/pawgui/base/pawgui_base.h @@ -32,11 +32,11 @@ SOFTWARE. #ifndef PAWGUI_BASE_H #define PAWGUI_BASE_H -#include "pawgui_constants.h" -#include "pawgui_globals.h" -#include "pawgui_settings.h" -#include "pawgui_themes.h" -#include "pawgui_overlay.h" +#include "../constants/pawgui_constants.h" +#include "../globals/pawgui_globals.h" +#include "../settings/pawgui_settings.h" +#include "../themes/pawgui_themes.h" +#include "../overlay/pawgui_overlay.h" namespace pawgui { diff --git a/src/pawgui/buttons/pawgui_buttons.h b/src/pawgui/buttons/pawgui_buttons.h index 826c9899..e46f5541 100644 --- a/src/pawgui/buttons/pawgui_buttons.h +++ b/src/pawgui/buttons/pawgui_buttons.h @@ -35,7 +35,7 @@ SOFTWARE. #ifndef PAWGUI_BUTTONS_H #define PAWGUI_BUTTONS_H -#include "pawgui_base.h" +#include "../base/pawgui_base.h" namespace pawgui { diff --git a/src/pawgui/checkbox/pawgui_checkbox.h b/src/pawgui/checkbox/pawgui_checkbox.h index 4dbecb3a..c1e9830f 100644 --- a/src/pawgui/checkbox/pawgui_checkbox.h +++ b/src/pawgui/checkbox/pawgui_checkbox.h @@ -35,7 +35,7 @@ SOFTWARE. #ifndef PAWGUI_CHCKBOX_H #define PAWGUI_CHCKBOX_H -#include "pawgui_base.h" +#include "../base/pawgui_base.h" namespace pawgui { diff --git a/src/pawgui/color_picker/pawgui_color_picker.cpp b/src/pawgui/color_picker/pawgui_color_picker.cpp index 5eb0388e..7a201138 100644 --- a/src/pawgui/color_picker/pawgui_color_picker.cpp +++ b/src/pawgui/color_picker/pawgui_color_picker.cpp @@ -32,10 +32,10 @@ SOFTWARE. - P Industries */ -#include "pawgui_text_input.h" -#include "pawgui_buttons.h" -#include "pawgui_color_picker.h" -#include "pawgui_labels.h" +#include "../text_input/pawgui_text_input.h" +#include "../buttons/pawgui_buttons.h" +#include "../color_picker/pawgui_color_picker.h" +#include "../labels/pawgui_labels.h" namespace pawgui { diff --git a/src/pawgui/color_picker/pawgui_color_picker.h b/src/pawgui/color_picker/pawgui_color_picker.h index 4d1e27fd..072eba3c 100644 --- a/src/pawgui/color_picker/pawgui_color_picker.h +++ b/src/pawgui/color_picker/pawgui_color_picker.h @@ -36,7 +36,7 @@ SOFTWARE. #ifndef PAWGUI_COLOR_PICKER_H #define PAWGUI_COLOR_PICKER_H -#include "pawgui_base.h" +#include "../base/pawgui_base.h" namespace pawgui { diff --git a/src/pawgui/context/pawgui_context.h b/src/pawgui/context/pawgui_context.h index 310308a2..f3e67a76 100644 --- a/src/pawgui/context/pawgui_context.h +++ b/src/pawgui/context/pawgui_context.h @@ -35,7 +35,7 @@ SOFTWARE. #ifndef PAWGUI_CONTEXT_H #define PAWGUI_CONTEXT_H -#include "pawgui_base.h" +#include "../base/pawgui_base.h" namespace pawgui { diff --git a/src/pawgui/context_selector/pawgui_content_selector.h b/src/pawgui/context_selector/pawgui_content_selector.h index 5fef1309..9133af21 100644 --- a/src/pawgui/context_selector/pawgui_content_selector.h +++ b/src/pawgui/context_selector/pawgui_content_selector.h @@ -33,17 +33,17 @@ SOFTWARE. #ifndef PAWGUI_CONTENT_SELECTOR_H #define PAWGUI_CONTENT_SELECTOR_H -#include "pawgui_base.h" +#include "../base/pawgui_base.h" namespace pawgui { enum class content_selector_type { cs_type_int = 0, /**< Int */ - cs_type_float = 1, /**< float */ + cs_type_float = 1, /**< float */ cs_type_color = 2, /**< Color */ - cs_type_string = 3, /**< string */ - }; + cs_type_string = 3, /**< string */ + }; class widget_content_selector: public widget_basic { diff --git a/src/pawgui/dock_system/pawgui_dock_system.h b/src/pawgui/dock_system/pawgui_dock_system.h index e1eef9e1..fa4ca920 100644 --- a/src/pawgui/dock_system/pawgui_dock_system.h +++ b/src/pawgui/dock_system/pawgui_dock_system.h @@ -35,11 +35,11 @@ SOFTWARE. #ifndef PAWGUI_DOCK_SYSTEM_H #define PAWGUI_DOCK_SYSTEM_H -#include "pawgui_resource_dropdown.h" -#include "pawgui_general_resource.h" -#include "pawgui_buttons.h" -#include "pawgui_tab_basic.h" -#include "pawgui_panel_list.h" +#include "../resource_dropdown/pawgui_resource_dropdown.h" +#include "../general_resource/pawgui_general_resource.h" +#include "../buttons/pawgui_buttons.h" +#include "../tab_basic/pawgui_tab_basic.h" +#include "../panel_list/pawgui_panel_list.h" namespace pawgui { diff --git a/src/pawgui/dropdown/pawgui_dropdown.h b/src/pawgui/dropdown/pawgui_dropdown.h index 7ee55fa2..c6ff91bb 100644 --- a/src/pawgui/dropdown/pawgui_dropdown.h +++ b/src/pawgui/dropdown/pawgui_dropdown.h @@ -32,9 +32,9 @@ SOFTWARE. #ifndef PAWGUI_DROPDOWN_H #define PAWGUI_DROPDOWN_H -#include "pawgui_base.h" -#include "pawgui_parsers.h" -#include "pawgui_context.h" +#include "../base/pawgui_base.h" +#include "../parsers/pawgui_parsers.h" +#include "../context/pawgui_context.h" #include "../gpe/gpe_parser.h" namespace pawgui @@ -49,9 +49,9 @@ namespace pawgui bool isSelectable; int selectedId; std::string selectedName; - std::string selectedTag; + std::string selectedTag; float selectedValue; - gpe::key_pair * selectedPair; + gpe::key_pair * selectedPair; gpe::key_pair * dropDownParentPair; bool isOpen; bool justActivated; @@ -68,8 +68,8 @@ namespace pawgui bool add_to_context_menu( popup_menu_option * cLevel, gpe::key_pair * cKey ); gpe::key_pair * add_menu_option(std::string optionName, std::string optionSubStr= "",float optionValue = 0, bool selectOption = false); void clear_dropdown(); - gpe::key_pair * find_option_id( int pairId ); - gpe::key_pair * find_option_valie( float pairValue ); + gpe::key_pair * find_option_id( int pairId ); + gpe::key_pair * find_option_valie( float pairValue ); gpe::key_pair * find_selected_pair( gpe::key_pair * pairIn, std::string pairName, int pairId = -1); gpe::key_pair * find_selected_pair_sub( gpe::key_pair * pairIn, std::string pairSubstring ); std::string get_menu_option(int atNumb); diff --git a/src/pawgui/file_popups/pawgui_file_popups.h b/src/pawgui/file_popups/pawgui_file_popups.h index 783ee70c..a10304f6 100644 --- a/src/pawgui/file_popups/pawgui_file_popups.h +++ b/src/pawgui/file_popups/pawgui_file_popups.h @@ -35,12 +35,12 @@ SOFTWARE. #ifndef PAWGUI_FILE_POPUPS_H #define PAWGUI_FILE_POPUPS_H -#include "pawgui_base.h" -#include "pawgui_panel_list.h" -#include "pawgui_buttons.h" -#include "pawgui_dropdown.h" -#include "pawgui_popups.h" -#include "pawgui_text_input.h" +#include "../base/pawgui_base.h" +#include "../panel_list/pawgui_panel_list.h" +#include "../buttons/pawgui_buttons.h" +#include "../dropdown/pawgui_dropdown.h" +#include "../popups/pawgui_popups.h" +#include "../text_input/pawgui_text_input.h" namespace pawgui { diff --git a/src/pawgui/general_resource/pawgui_general_resource_container.cpp b/src/pawgui/general_resource/pawgui_general_resource_container.cpp index 7fbbe514..133f48dd 100644 --- a/src/pawgui/general_resource/pawgui_general_resource_container.cpp +++ b/src/pawgui/general_resource/pawgui_general_resource_container.cpp @@ -32,10 +32,10 @@ SOFTWARE. - P Industries */ -#include "pawgui_general_resource_container.h" -#include "pawgui_parsers.h" -#include "pawgui_popups.h" -#include "pawgui_tab_manager.h" +#include "../general_resource/pawgui_general_resource_container.h" +#include "../parsers/pawgui_parsers.h" +#include "../popups/pawgui_popups.h" +#include "../tab_manager/pawgui_tab_manager.h" namespace pawgui { diff --git a/src/pawgui/general_resource/pawgui_general_resource_container.h b/src/pawgui/general_resource/pawgui_general_resource_container.h index 2d1f91c7..6ea5290e 100644 --- a/src/pawgui/general_resource/pawgui_general_resource_container.h +++ b/src/pawgui/general_resource/pawgui_general_resource_container.h @@ -35,8 +35,8 @@ SOFTWARE. #ifndef PAWGUI_GRC_H #define PAWGUI_GRC_H -#include "pawgui_base.h" -#include "pawgui_general_resource.h" +#include "../base/pawgui_base.h" +#include "../general_resource/pawgui_general_resource.h" namespace pawgui { diff --git a/src/pawgui/icon_pack/pawgui_iconpack.h b/src/pawgui/icon_pack/pawgui_iconpack.h index 3b739584..20d89a71 100644 --- a/src/pawgui/icon_pack/pawgui_iconpack.h +++ b/src/pawgui/icon_pack/pawgui_iconpack.h @@ -9,7 +9,7 @@ Copyright (c) 2014-2024 PawByte LLC. Copyright (c) 2014-2024 PawByte Ambitious Working GUI(PAWGUI) contributors ( Contributors Page ) Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the Software), to deal +of this software and associated documentation files (the �Software�), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is @@ -18,7 +18,7 @@ furnished to do so, subject to the following conditions: The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. -THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +THE SOFTWARE IS PROVIDED �AS IS�, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER @@ -34,7 +34,7 @@ SOFTWARE. #ifndef PAWGUI_ICONPACK_H #define PAWGUI_ICONPACK_H -#include "pawgui_base.h" +#include "../base/pawgui_base.h" namespace pawgui { diff --git a/src/pawgui/labels/pawgui_labels.h b/src/pawgui/labels/pawgui_labels.h index 409d56e0..9bda53d6 100644 --- a/src/pawgui/labels/pawgui_labels.h +++ b/src/pawgui/labels/pawgui_labels.h @@ -35,7 +35,7 @@ SOFTWARE. #ifndef PAWGUI_LABELS_H #define PAWGUI_LABELS_H -#include "pawgui_base.h" +#include "../base/pawgui_base.h" namespace pawgui { diff --git a/src/pawgui/notifications/pawgui_notifications.h b/src/pawgui/notifications/pawgui_notifications.h index 6315c08f..2d242789 100644 --- a/src/pawgui/notifications/pawgui_notifications.h +++ b/src/pawgui/notifications/pawgui_notifications.h @@ -35,7 +35,7 @@ SOFTWARE. #ifndef pawgui_notificatons_h #define pawgui_notificatons_h -#include "pawgui_base.h" +#include "../base/pawgui_base.h" namespace pawgui { diff --git a/src/pawgui/overlay/pawgui_overlay.h b/src/pawgui/overlay/pawgui_overlay.h index 760348f0..d9c450bf 100644 --- a/src/pawgui/overlay/pawgui_overlay.h +++ b/src/pawgui/overlay/pawgui_overlay.h @@ -35,7 +35,7 @@ SOFTWARE. #ifndef PAWGUI_OVERLAY_SYSTEM_H #define PAWGUI_OVERLAY_SYSTEM_H -#include "pawgui_themes.h" +#include "../themes/pawgui_themes.h" namespace pawgui { diff --git a/src/pawgui/panel_list/pawgui_panel_list.h b/src/pawgui/panel_list/pawgui_panel_list.h index 66d00589..e46ba9b1 100644 --- a/src/pawgui/panel_list/pawgui_panel_list.h +++ b/src/pawgui/panel_list/pawgui_panel_list.h @@ -35,7 +35,7 @@ SOFTWARE. #ifndef PAWGUI_PANEL_LIST_H #define PAWGUI_PANEL_LIST_H -#include "pawgui_scrollbars.h" +#include "../scrollbars/pawgui_scrollbars.h" namespace pawgui { diff --git a/src/pawgui/parsers/pawgui_parsers.cpp b/src/pawgui/parsers/pawgui_parsers.cpp index 54e226fd..dbced981 100644 --- a/src/pawgui/parsers/pawgui_parsers.cpp +++ b/src/pawgui/parsers/pawgui_parsers.cpp @@ -32,8 +32,8 @@ SOFTWARE. - P Industries */ -#include "pawgui_parsers.h" -#include "pawgui_themes.h" +#include "../parsers/pawgui_parsers.h" +#include "../themes/pawgui_themes.h" namespace pawgui { diff --git a/src/pawgui/parsers/pawgui_parsers.h b/src/pawgui/parsers/pawgui_parsers.h index d9bb45a9..9bea1a2a 100644 --- a/src/pawgui/parsers/pawgui_parsers.h +++ b/src/pawgui/parsers/pawgui_parsers.h @@ -35,7 +35,7 @@ SOFTWARE. #ifndef PAWGUI_PARSERS_H #define PAWGUI_PARSERS_H -#include "pawgui_base.h" +#include "../base/pawgui_base.h" namespace pawgui { diff --git a/src/pawgui/pawgui/pawgui.h b/src/pawgui/pawgui/pawgui.h index 31a37c64..8b2bb851 100644 --- a/src/pawgui/pawgui/pawgui.h +++ b/src/pawgui/pawgui/pawgui.h @@ -34,36 +34,36 @@ SOFTWARE. #ifndef PAWGUI_LIBRARY_H #define PAWGUI_LIBRARY_H -#include "pawgui_base.h" -#include "pawgui_buttons.h" -#include "pawgui_checkbox.h" -#include "pawgui_color_picker.h" -#include "pawgui_content_selector.h" -#include "pawgui_context.h" -#include "pawgui_dropdown.h" -#include "pawgui_file_popups.h" -#include "pawgui_globals.h" -#include "pawgui_labels.h" -#include "pawgui_notifications.h" -#include "pawgui_overlay.h" -#include "pawgui_panel_list.h" -#include "pawgui_parsers.h" -#include "pawgui_popups.h" -#include "pawgui_radiobuttons.h" -#include "pawgui_resource_dropdown.h" -#include "pawgui_scrollbars.h" -#include "pawgui_search_controller.h" -#include "pawgui_selectbox.h" -#include "pawgui_sliders.h" -#include "pawgui_statusbar.h" -#include "pawgui_stree.h" -#include "pawgui_tab_basic.h" -#include "pawgui_tab_manager.h" -#include "pawgui_text_editor.h" -#include "pawgui_text_input.h" -#include "pawgui_text_url.h" -#include "pawgui_theme_controller.h" -#include "pawgui_themes.h" +#include "../base/pawgui_base.h" +#include "../buttons/pawgui_buttons.h" +#include "../checkbox/pawgui_checkbox.h" +#include "../color_picker/pawgui_color_picker.h" +#include "../context_selector/pawgui_content_selector.h" +#include "../context/pawgui_context.h" +#include "../dropdown/pawgui_dropdown.h" +#include "../file_popups/pawgui_file_popups.h" +#include "../globals/pawgui_globals.h" +#include "../labels/pawgui_labels.h" +#include "../notifications/pawgui_notifications.h" +#include "../overlay/pawgui_overlay.h" +#include "../panel_list/pawgui_panel_list.h" +#include "../parsers/pawgui_parsers.h" +#include "../popups/pawgui_popups.h" +#include "../radio_buttons/pawgui_radiobuttons.h" +#include "../resource_dropdown/pawgui_resource_dropdown.h" +#include "../scrollbars/pawgui_scrollbars.h" +#include "../search_controller/pawgui_search_controller.h" +#include "../select_box/pawgui_selectbox.h" +#include "../sliders/pawgui_sliders.h" +#include "../statusbar/pawgui_statusbar.h" +#include "../stree/pawgui_stree.h" +#include "../tab_basic/pawgui_tab_basic.h" +#include "../tab_manager/pawgui_tab_manager.h" +#include "../text_editor/pawgui_text_editor.h" +#include "../text_input/pawgui_text_input.h" +#include "../text_url/pawgui_text_url.h" +#include "../theme_controller/pawgui_theme_controller.h" +#include "../themes/pawgui_themes.h" namespace pawgui diff --git a/src/pawgui/popups/pawgui_popups.cpp b/src/pawgui/popups/pawgui_popups.cpp index 9210bfce..ccc58266 100644 --- a/src/pawgui/popups/pawgui_popups.cpp +++ b/src/pawgui/popups/pawgui_popups.cpp @@ -32,11 +32,11 @@ SOFTWARE. - P Industries */ -#include "pawgui_base.h" -#include "pawgui_buttons.h" -#include "pawgui_labels.h" -#include "pawgui_popups.h" -#include "pawgui_text_input.h" +#include "../base/pawgui_base.h" +#include "../buttons/pawgui_buttons.h" +#include "../labels/pawgui_labels.h" +#include "../popups/pawgui_popups.h" +#include "../text_input/pawgui_text_input.h" namespace pawgui { diff --git a/src/pawgui/radio_buttons/pawgui_radiobuttons.h b/src/pawgui/radio_buttons/pawgui_radiobuttons.h index cfcf0aa9..e5ae6924 100644 --- a/src/pawgui/radio_buttons/pawgui_radiobuttons.h +++ b/src/pawgui/radio_buttons/pawgui_radiobuttons.h @@ -35,8 +35,8 @@ SOFTWARE. #ifndef PAWGUI_RADIOBUTTONS_H #define PAWGUI_RADIOBUTTONS_H -#include "pawgui_base.h" -#include "pawgui_parsers.h" +#include "../base/pawgui_base.h" +#include "../parsers/pawgui_parsers.h" namespace pawgui { diff --git a/src/pawgui/resource_dropdown/pawgui_resource_dropdown.h b/src/pawgui/resource_dropdown/pawgui_resource_dropdown.h index c7d0cd4d..94dc43be 100644 --- a/src/pawgui/resource_dropdown/pawgui_resource_dropdown.h +++ b/src/pawgui/resource_dropdown/pawgui_resource_dropdown.h @@ -35,9 +35,9 @@ SOFTWARE. #ifndef PAWGUI_RESOURCE_DROPDOWN_H #define PAWGUI_RESOURCE_DROPDOWN_H -#include "pawgui_base.h" -#include "pawgui_context.h" -#include "pawgui_general_resource_container.h" +#include "../base/pawgui_base.h" +#include "../context/pawgui_context.h" +#include "../general_resource/pawgui_general_resource_container.h" namespace pawgui { diff --git a/src/pawgui/scrollbars/pawgui_scrollbars.h b/src/pawgui/scrollbars/pawgui_scrollbars.h index b7348476..82654562 100644 --- a/src/pawgui/scrollbars/pawgui_scrollbars.h +++ b/src/pawgui/scrollbars/pawgui_scrollbars.h @@ -35,7 +35,7 @@ SOFTWARE. #ifndef PAWGUI_SCROLLBARS_H #define PAWGUI_SCROLLBARS_H -#include "pawgui_base.h" +#include "../base/pawgui_base.h" namespace pawgui { diff --git a/src/pawgui/search_controller/pawgui_search_controller.h b/src/pawgui/search_controller/pawgui_search_controller.h index 7fb49ba9..86e494f1 100644 --- a/src/pawgui/search_controller/pawgui_search_controller.h +++ b/src/pawgui/search_controller/pawgui_search_controller.h @@ -36,12 +36,12 @@ SOFTWARE. #ifndef PAWGUI_SEARCH_CONTROLLER_H #define PAWGUI_SEARCH_CONTROLLER_H -#include "pawgui_base.h" -#include "pawgui_buttons.h" -#include "pawgui_checkbox.h" -#include "pawgui_dropdown.h" -#include "pawgui_labels.h" -#include "pawgui_text_input.h" +#include "../base/pawgui_base.h" +#include "../buttons/pawgui_buttons.h" +#include "../checkbox/pawgui_checkbox.h" +#include "../dropdown/pawgui_dropdown.h" +#include "../labels/pawgui_labels.h" +#include "../text_input/pawgui_text_input.h" namespace pawgui { diff --git a/src/pawgui/select_box/pawgui_selectbox.h b/src/pawgui/select_box/pawgui_selectbox.h index 74ffc6ff..c67b9a58 100644 --- a/src/pawgui/select_box/pawgui_selectbox.h +++ b/src/pawgui/select_box/pawgui_selectbox.h @@ -34,9 +34,9 @@ SOFTWARE. #ifndef PAWGUI_SELECTBOX_H #define PAWGUI_SELECTBOX_H -#include "pawgui_base.h" -#include "pawgui_parsers.h" -#include "pawgui_scrollbars.h" +#include "../base/pawgui_base.h" +#include "../parsers/pawgui_parsers.h" +#include "../scrollbars/pawgui_scrollbars.h" namespace pawgui { diff --git a/src/pawgui/sliders/pawgui_sliders.h b/src/pawgui/sliders/pawgui_sliders.h index 0869eef3..b77e5052 100644 --- a/src/pawgui/sliders/pawgui_sliders.h +++ b/src/pawgui/sliders/pawgui_sliders.h @@ -35,7 +35,8 @@ SOFTWARE. #ifndef PAWGUI_SLIDERS_H #define PAWGUI_SLIDERS_H -#include "pawgui_base.h" +#include "../base/pawgui_base.h" + namespace pawgui { diff --git a/src/pawgui/statusbar/pawgui_statusbar.h b/src/pawgui/statusbar/pawgui_statusbar.h index 316d26e7..c3c3be03 100644 --- a/src/pawgui/statusbar/pawgui_statusbar.h +++ b/src/pawgui/statusbar/pawgui_statusbar.h @@ -35,7 +35,8 @@ SOFTWARE. #ifndef PAWGUI_STATUS_BAR_H #define PAWGUI_STATUS_BAR_H -#include "pawgui_base.h" +#include "../base/pawgui_base.h" + namespace pawgui { diff --git a/src/pawgui/stree/pawgui_stree.cpp b/src/pawgui/stree/pawgui_stree.cpp index 2409d965..8c22cc0d 100644 --- a/src/pawgui/stree/pawgui_stree.cpp +++ b/src/pawgui/stree/pawgui_stree.cpp @@ -32,8 +32,8 @@ SOFTWARE. - P Industries */ -#include "pawgui_stree.h" -#include "pawgui_popups.h" +#include "../stree/pawgui_stree.h" +#include "../popups/pawgui_popups.h" namespace pawgui { diff --git a/src/pawgui/stree/pawgui_stree.h b/src/pawgui/stree/pawgui_stree.h index d21710a4..18edad91 100644 --- a/src/pawgui/stree/pawgui_stree.h +++ b/src/pawgui/stree/pawgui_stree.h @@ -35,9 +35,9 @@ SOFTWARE. #ifndef PAWGUI_STREE_H #define PAWGUI_STREE_H -#include "pawgui_panel_list.h" -#include "pawgui_buttons.h" -#include "pawgui_text_input.h" +#include "../panel_list/pawgui_panel_list.h" +#include "../buttons/pawgui_buttons.h" +#include "../text_input/pawgui_text_input.h" namespace pawgui { diff --git a/src/pawgui/syntax_handler/pawgui_syntax_handler.cpp b/src/pawgui/syntax_handler/pawgui_syntax_handler.cpp index c7346967..992a624c 100644 --- a/src/pawgui/syntax_handler/pawgui_syntax_handler.cpp +++ b/src/pawgui/syntax_handler/pawgui_syntax_handler.cpp @@ -31,8 +31,8 @@ SOFTWARE. - PawByte Ambitious Working GUI(PAWGUI) - P Industries */ -#include "pawgui_syntax_handler.h" -#include "pawgui_themes.h" +#include "../syntax_handler/pawgui_syntax_handler.h" +#include "../themes/pawgui_themes.h" namespace pawgui { diff --git a/src/pawgui/tab_basic/pawgui_tab_basic.h b/src/pawgui/tab_basic/pawgui_tab_basic.h index f4a793d9..36ff45b5 100644 --- a/src/pawgui/tab_basic/pawgui_tab_basic.h +++ b/src/pawgui/tab_basic/pawgui_tab_basic.h @@ -35,7 +35,7 @@ SOFTWARE. #ifndef PAWGUI_TAB_BASIC_H #define PAWGUI_TAB_BASIC_H -#include "pawgui_base.h" +#include "../base/pawgui_base.h" namespace pawgui { diff --git a/src/pawgui/tab_manager/pawgui_tab_manager.cpp b/src/pawgui/tab_manager/pawgui_tab_manager.cpp index c4aa80f8..c5010d4c 100644 --- a/src/pawgui/tab_manager/pawgui_tab_manager.cpp +++ b/src/pawgui/tab_manager/pawgui_tab_manager.cpp @@ -32,9 +32,9 @@ SOFTWARE. - P Industries */ -#include "pawgui_tab_manager.h" -#include "pawgui_search_controller.h" -#include "pawgui_text_editor.h" +#include "../tab_manager/pawgui_tab_manager.h" +#include "../search_controller/pawgui_search_controller.h" +#include "../text_editor/pawgui_text_editor.h" namespace pawgui { diff --git a/src/pawgui/tab_manager/pawgui_tab_manager.h b/src/pawgui/tab_manager/pawgui_tab_manager.h index 2b36a99e..2c40a260 100644 --- a/src/pawgui/tab_manager/pawgui_tab_manager.h +++ b/src/pawgui/tab_manager/pawgui_tab_manager.h @@ -35,9 +35,9 @@ SOFTWARE. #ifndef PAWGUI_TAB_RESOURCEBAR_H #define PAWGUI_TAB_RESOURCEBAR_H -#include "pawgui_base.h" -#include "pawgui_buttons.h" -#include "pawgui_general_resource.h" +#include "../base/pawgui_base.h" +#include "../buttons/pawgui_buttons.h" +#include "../general_resource/pawgui_general_resource.h" namespace pawgui { diff --git a/src/pawgui/text_editor/pawgui_text_editor.cpp b/src/pawgui/text_editor/pawgui_text_editor.cpp index 1923ce2f..7b423ea0 100644 --- a/src/pawgui/text_editor/pawgui_text_editor.cpp +++ b/src/pawgui/text_editor/pawgui_text_editor.cpp @@ -32,12 +32,12 @@ SOFTWARE. - P Industries */ -#include "pawgui_context.h" -#include "pawgui_file_popups.h" -#include "pawgui_general_resource_container.h" -#include "pawgui_search_controller.h" -#include "pawgui_statusbar.h" -#include "pawgui_text_editor.h" +#include "../context/pawgui_context.h" +#include "../file_popups/pawgui_file_popups.h" +#include "../general_resource/pawgui_general_resource_container.h" +#include "../search_controller/pawgui_search_controller.h" +#include "../statusbar/pawgui_statusbar.h" +#include "../text_editor/pawgui_text_editor.h" namespace pawgui { diff --git a/src/pawgui/text_editor/pawgui_text_editor.h b/src/pawgui/text_editor/pawgui_text_editor.h index b21fbd9b..a7cc7cf5 100644 --- a/src/pawgui/text_editor/pawgui_text_editor.h +++ b/src/pawgui/text_editor/pawgui_text_editor.h @@ -35,12 +35,12 @@ SOFTWARE. #ifndef PAWGUI_TEXT_EDITOR_H #define PAWGUI_TEXT_EDITOR_H -#include "pawgui_syntax_handler.h" -#include "pawgui_base.h" -#include "pawgui_buttons.h" -#include "pawgui_labels.h" -#include "pawgui_parsers.h" -#include "pawgui_scrollbars.h" +#include "../syntax_handler/pawgui_syntax_handler.h" +#include "../base/pawgui_base.h" +#include "../buttons/pawgui_buttons.h" +#include "../labels/pawgui_labels.h" +#include "../parsers/pawgui_parsers.h" +#include "../scrollbars/pawgui_scrollbars.h" namespace pawgui { diff --git a/src/pawgui/text_input/pawgui_text_input.h b/src/pawgui/text_input/pawgui_text_input.h index 493424a9..ca405380 100644 --- a/src/pawgui/text_input/pawgui_text_input.h +++ b/src/pawgui/text_input/pawgui_text_input.h @@ -36,8 +36,8 @@ SOFTWARE. #ifndef PAWGUI_INPUT_TEXT_H #define PAWGUI_INPUT_TEXT_H -#include "pawgui_base.h" -#include "pawgui_context.h" +#include "../base/pawgui_base.h" +#include "../context/pawgui_context.h" namespace pawgui { diff --git a/src/pawgui/text_url/pawgui_text_url.h b/src/pawgui/text_url/pawgui_text_url.h index 2c7b48ba..403c9578 100644 --- a/src/pawgui/text_url/pawgui_text_url.h +++ b/src/pawgui/text_url/pawgui_text_url.h @@ -35,7 +35,7 @@ SOFTWARE. #ifndef PAWGUI_TEXT_URL_H #define PAWGUI_TEXT_URL_H -#include "pawgui_base.h" +#include "../base/pawgui_base.h" namespace pawgui { diff --git a/src/pawgui/theme_controller/pawgui_theme_controller.h b/src/pawgui/theme_controller/pawgui_theme_controller.h index d05e1621..77c0962c 100644 --- a/src/pawgui/theme_controller/pawgui_theme_controller.h +++ b/src/pawgui/theme_controller/pawgui_theme_controller.h @@ -35,7 +35,7 @@ SOFTWARE. #ifndef PAWGUI_THEME_CONTROLLER_H #define PAWGUI_THEME_CONTROLLER_H -#include "pawgui_themes.h" +#include "../themes/pawgui_themes.h" namespace pawgui { diff --git a/src/pawgui/themes/pawgui_themes.h b/src/pawgui/themes/pawgui_themes.h index f91d75ec..542a695d 100644 --- a/src/pawgui/themes/pawgui_themes.h +++ b/src/pawgui/themes/pawgui_themes.h @@ -36,8 +36,8 @@ SOFTWARE. #define PAWGUI_THEMES_H #include "../gpe/gpe.h" -#include "pawgui_constants.h" -#include "pawgui_globals.h" +#include "../constants/pawgui_constants.h" +#include "../globals/pawgui_globals.h" namespace pawgui {