From 9ea327d93d0bbe1c09afabeda52e364b99d96d1f Mon Sep 17 00:00:00 2001 From: Aldrik Ramaekers Date: Wed, 8 Jul 2020 15:37:16 +0200 Subject: automated commit --- changes.txt | 2 + data/translations/en-English.mo | Bin 2947 -> 3001 bytes data/translations/nl-Dutch.mo | Bin 3140 -> 3203 bytes src/config.h | 2 +- src/mo_edit.c | 4 +- src/project_base.h | 122 ---------------------------------------- src/settings.c | 4 +- 7 files changed, 6 insertions(+), 128 deletions(-) delete mode 100644 src/project_base.h diff --git a/changes.txt b/changes.txt index 017a91d..2d50a89 100644 --- a/changes.txt +++ b/changes.txt @@ -1,3 +1,5 @@ +1.4 +- - show project-base version in settings page 1.3 - windows shows *after* loading pixelformat & opengl setup - replace png with bmps diff --git a/data/translations/en-English.mo b/data/translations/en-English.mo index e6c82e4..1cab912 100644 Binary files a/data/translations/en-English.mo and b/data/translations/en-English.mo differ diff --git a/data/translations/nl-Dutch.mo b/data/translations/nl-Dutch.mo index 8ec0f77..42936e9 100644 Binary files a/data/translations/nl-Dutch.mo and b/data/translations/nl-Dutch.mo differ diff --git a/src/config.h b/src/config.h index d7ee47f..8c541ad 100644 --- a/src/config.h +++ b/src/config.h @@ -8,7 +8,7 @@ #define INCLUDE_CONFIG #define TARGET_FRAMERATE (1000/24.0) -#define VERSION "1.0.3" +#define VERSION "1.0.4" #define CONFIG_DIRECTORY_LINUX "/.config/moedit" #define CONFIG_DIRECTORY_WINDOWS "\\moedit" diff --git a/src/mo_edit.c b/src/mo_edit.c index a3d62bd..d9013a5 100644 --- a/src/mo_edit.c +++ b/src/mo_edit.c @@ -8,8 +8,6 @@ #include "asset_definitions.h" #include "../../project-base/src/project_base.h" -// TODO(Aldrik): get rid if unnecessary draw calls (especially lists) - s32 global_language_id = 1; char project_path[MAX_INPUT_LENGTH]; @@ -608,7 +606,7 @@ int main(int argc, char **argv) } } - ui_end_menu_submenu(); + ui_end_menu_submenu(localize("empty_placeholder")); if (ui_push_menu_item(localize("close_project"), "")) { if (!string_equals(project_path, "")) diff --git a/src/project_base.h b/src/project_base.h deleted file mode 100644 index 90698c4..0000000 --- a/src/project_base.h +++ /dev/null @@ -1,122 +0,0 @@ -/* -* BSD 2-Clause “Simplified” License -* Copyright (c) 2019, Aldrik Ramaekers, aldrik.ramaekers@protonmail.com -* All rights reserved. -*/ - -#ifndef INCLUDE_PROJECT_BASE -#define INCLUDE_PROJECT_BASE - -#ifdef _WIN32 -#define OS_WIN -#include -#include -#endif -#ifdef __linux__ -#define OS_LINUX -#include -#include -#endif -#ifdef __APPLE__ -#define OS_OSX -#error platform not supported -#endif - -#include "stdint.h" -#include "string.h" -#include "assert.h" - -#include -#ifdef OS_LINUX -#include -#endif -#include -#include - -#define s8 int8_t -#define s16 int16_t -#define s32 int32_t -#define s64 int64_t - -#define u8 uint8_t -#define u16 uint16_t -#define u32 uint32_t -#define u64 uint64_t - -#define float32 float -#define float64 double - -#ifdef OS_LINUX -#define bool uint8_t -#endif -#ifdef OS_WIN -#define bool _Bool -#endif - -#define true 1 -#define false 0 - -#include "asset_definitions.h" - -#include "../../project-base/src/thread.h" -#include "../../project-base/src/array.h" -#include "../../project-base/src/memory.h" -//#include "../../project-base/src/licensing.h" -#include "../../project-base/src/external/cJSON.h" - -#define STB_IMAGE_IMPLEMENTATION -#define STBI_ONLY_PNG -#include "../../project-base/src/external/stb_image.h" - -#define STB_TRUETYPE_IMPLEMENTATION -#include "../../project-base/src/external/stb_truetype.h" - -#include "../../project-base/src/external/utf8.h" -#include "../../project-base/src/input.h" -#include "../../project-base/src/timer.h" -#include "../../project-base/src/assets.h" -#include "../../project-base/src/memory_bucket.h" -#include "../../project-base/src/platform.h" -#include "../../project-base/src/render.h" -#include "../../project-base/src/camera.h" -#include "../../project-base/src/ui.h" -#include "../../project-base/src/notification.h" -#include "../../project-base/src/string_utils.h" -#include "../../project-base/src/settings_config.h" -#include "../../project-base/src/localization.h" - -#include "../../project-base/src/platform_shared.c" - -#ifdef OS_LINUX -#define DEFAULT_DIRECTORY "/home/" -#define CONFIG_DIRECTORY "/.config/moedit" - -#include "../../project-base/src/linux/thread.c" -#include "../../project-base/src/linux/platform.c" -#endif - -#ifdef OS_WIN -#define DEFAULT_DIRECTORY "C:/" -#define CONFIG_DIRECTORY "\\moedit" - -#include "../../project-base/src/windows/thread.c" -#include "../../project-base/src/windows/platform.c" -#endif - -#include "../../project-base/src/input.c" -#include "../../project-base/src/timer.c" -#include "../../project-base/src/array.c" -#include "../../project-base/src/assets.c" -#include "../../project-base/src/render.c" -#include "../../project-base/src/camera.c" -#include "../../project-base/src/ui.c" -#include "../../project-base/src/notification.c" -#include "../../project-base/src/string_utils.c" -#include "../../project-base/src/settings_config.c" -#include "../../project-base/src/localization.c" -#include "../../project-base/src/memory_bucket.c" -//#include "../../project-base/src/licensing.c" - -#include "../../project-base/src/external/cJSON.c" - -#endif \ No newline at end of file diff --git a/src/settings.c b/src/settings.c index 79b1a95..0a4b941 100644 --- a/src/settings.c +++ b/src/settings.c @@ -162,9 +162,9 @@ void settings_page_update_render() // version nr { - s32 w = calculate_text_width(global_settings_page.font_small, VERSION); + s32 w = calculate_text_width(global_settings_page.font_small, VERSION" @ "PROJECT_BASE_VERSION); render_text(global_settings_page.font_small, global_settings_page.window.width-w - 10, - global_settings_page.window.height-global_settings_page.font_small->px_h - 10, VERSION, rgb(120,120,120)); + global_settings_page.window.height-global_settings_page.font_small->px_h - 10, VERSION" @ "PROJECT_BASE_VERSION, rgb(120,120,120)); } platform_window_swap_buffers(&global_settings_page.window); -- cgit v1.2.3-70-g09d2