mirror of
https://github.com/obsqrbtz/clrsync.git
synced 2026-04-08 20:19:04 +03:00
chore: structured src/gui, run clang-format
This commit is contained in:
Binary file not shown.
|
Before Width: | Height: | Size: 370 KiB After Width: | Height: | Size: 64 KiB |
@@ -1,6 +1,6 @@
|
|||||||
#include "config.hpp"
|
#include "config.hpp"
|
||||||
#include "core/utils.hpp"
|
|
||||||
#include "core/error.hpp"
|
#include "core/error.hpp"
|
||||||
|
#include "core/utils.hpp"
|
||||||
|
|
||||||
#include <core/palette/color.hpp>
|
#include <core/palette/color.hpp>
|
||||||
#include <filesystem>
|
#include <filesystem>
|
||||||
@@ -25,11 +25,12 @@ Result<void> config::initialize(std::unique_ptr<clrsync::core::io::file> file)
|
|||||||
m_file = std::move(file);
|
m_file = std::move(file);
|
||||||
if (!m_file)
|
if (!m_file)
|
||||||
return Err<void>(error_code::config_missing, "Config file is missing");
|
return Err<void>(error_code::config_missing, "Config file is missing");
|
||||||
|
|
||||||
auto parse_result = m_file->parse();
|
auto parse_result = m_file->parse();
|
||||||
if (!parse_result)
|
if (!parse_result)
|
||||||
return Err<void>(error_code::config_invalid, parse_result.error().message, parse_result.error().context);
|
return Err<void>(error_code::config_invalid, parse_result.error().message,
|
||||||
|
parse_result.error().context);
|
||||||
|
|
||||||
return Ok();
|
return Ok();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -68,10 +69,10 @@ void config::copy_file(const std::filesystem::path &src, const std::filesystem::
|
|||||||
|
|
||||||
std::ifstream in(src, std::ios::binary);
|
std::ifstream in(src, std::ios::binary);
|
||||||
std::ofstream out(dst, std::ios::binary);
|
std::ofstream out(dst, std::ios::binary);
|
||||||
|
|
||||||
if (!in || !out)
|
if (!in || !out)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
out << in.rdbuf();
|
out << in.rdbuf();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -79,7 +80,7 @@ void config::copy_dir(const std::filesystem::path &src, const std::filesystem::p
|
|||||||
{
|
{
|
||||||
if (!std::filesystem::exists(src))
|
if (!std::filesystem::exists(src))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
for (auto const &entry : std::filesystem::recursive_directory_iterator(src))
|
for (auto const &entry : std::filesystem::recursive_directory_iterator(src))
|
||||||
{
|
{
|
||||||
auto rel = std::filesystem::relative(entry.path(), src);
|
auto rel = std::filesystem::relative(entry.path(), src);
|
||||||
@@ -166,7 +167,7 @@ Result<void> config::set_default_theme(const std::string &theme)
|
|||||||
{
|
{
|
||||||
if (!m_file)
|
if (!m_file)
|
||||||
return Err<void>(error_code::config_missing, "Configuration not initialized");
|
return Err<void>(error_code::config_missing, "Configuration not initialized");
|
||||||
|
|
||||||
m_file->set_value("general", "default_theme", theme);
|
m_file->set_value("general", "default_theme", theme);
|
||||||
return m_file->save_file();
|
return m_file->save_file();
|
||||||
}
|
}
|
||||||
@@ -175,7 +176,7 @@ Result<void> config::set_palettes_path(const std::string &path)
|
|||||||
{
|
{
|
||||||
if (!m_file)
|
if (!m_file)
|
||||||
return Err<void>(error_code::config_missing, "Configuration not initialized");
|
return Err<void>(error_code::config_missing, "Configuration not initialized");
|
||||||
|
|
||||||
m_file->set_value("general", "palettes_path", path);
|
m_file->set_value("general", "palettes_path", path);
|
||||||
return m_file->save_file();
|
return m_file->save_file();
|
||||||
}
|
}
|
||||||
@@ -184,7 +185,7 @@ Result<void> config::set_font(const std::string &font)
|
|||||||
{
|
{
|
||||||
if (!m_file)
|
if (!m_file)
|
||||||
return Err<void>(error_code::config_missing, "Configuration not initialized");
|
return Err<void>(error_code::config_missing, "Configuration not initialized");
|
||||||
|
|
||||||
m_file->set_value("general", "font", font);
|
m_file->set_value("general", "font", font);
|
||||||
return m_file->save_file();
|
return m_file->save_file();
|
||||||
}
|
}
|
||||||
@@ -192,17 +193,17 @@ Result<void> config::set_font_size(int font_size)
|
|||||||
{
|
{
|
||||||
if (!m_file)
|
if (!m_file)
|
||||||
return Err<void>(error_code::config_missing, "Configuration not initialized");
|
return Err<void>(error_code::config_missing, "Configuration not initialized");
|
||||||
|
|
||||||
m_file->set_value("general", "font_size", font_size);
|
m_file->set_value("general", "font_size", font_size);
|
||||||
return m_file->save_file();
|
return m_file->save_file();
|
||||||
}
|
}
|
||||||
|
|
||||||
Result<void> config::update_template(const std::string &key,
|
Result<void> config::update_template(const std::string &key,
|
||||||
const clrsync::core::theme_template &theme_template)
|
const clrsync::core::theme_template &theme_template)
|
||||||
{
|
{
|
||||||
if (!m_file)
|
if (!m_file)
|
||||||
return Err<void>(error_code::config_missing, "Configuration not initialized");
|
return Err<void>(error_code::config_missing, "Configuration not initialized");
|
||||||
|
|
||||||
m_themes[key] = theme_template;
|
m_themes[key] = theme_template;
|
||||||
m_file->set_value("templates." + key, "input_path", theme_template.template_path());
|
m_file->set_value("templates." + key, "input_path", theme_template.template_path());
|
||||||
m_file->set_value("templates." + key, "output_path", theme_template.output_path());
|
m_file->set_value("templates." + key, "output_path", theme_template.output_path());
|
||||||
@@ -215,25 +216,29 @@ Result<void> config::remove_template(const std::string &key)
|
|||||||
{
|
{
|
||||||
if (!m_file)
|
if (!m_file)
|
||||||
return Err<void>(error_code::config_missing, "Configuration not initialized");
|
return Err<void>(error_code::config_missing, "Configuration not initialized");
|
||||||
|
|
||||||
auto it = m_themes.find(key);
|
auto it = m_themes.find(key);
|
||||||
if (it == m_themes.end())
|
if (it == m_themes.end())
|
||||||
return Err<void>(error_code::template_not_found, "Template not found", key);
|
return Err<void>(error_code::template_not_found, "Template not found", key);
|
||||||
|
|
||||||
std::filesystem::path template_file = it->second.template_path();
|
std::filesystem::path template_file = it->second.template_path();
|
||||||
if (std::filesystem::exists(template_file))
|
if (std::filesystem::exists(template_file))
|
||||||
{
|
{
|
||||||
try {
|
try
|
||||||
|
{
|
||||||
std::filesystem::remove(template_file);
|
std::filesystem::remove(template_file);
|
||||||
} catch (const std::exception& e) {
|
}
|
||||||
return Err<void>(error_code::file_write_failed, "Failed to delete template file", e.what());
|
catch (const std::exception &e)
|
||||||
|
{
|
||||||
|
return Err<void>(error_code::file_write_failed, "Failed to delete template file",
|
||||||
|
e.what());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
m_themes.erase(it);
|
m_themes.erase(it);
|
||||||
|
|
||||||
m_file->remove_section("templates." + key);
|
m_file->remove_section("templates." + key);
|
||||||
|
|
||||||
return m_file->save_file();
|
return m_file->save_file();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -264,14 +269,16 @@ const std::unordered_map<std::string, clrsync::core::theme_template> config::tem
|
|||||||
return m_themes;
|
return m_themes;
|
||||||
}
|
}
|
||||||
|
|
||||||
Result<const clrsync::core::theme_template*> config::template_by_name(const std::string &name) const
|
Result<const clrsync::core::theme_template *> config::template_by_name(
|
||||||
|
const std::string &name) const
|
||||||
{
|
{
|
||||||
auto it = m_themes.find(name);
|
auto it = m_themes.find(name);
|
||||||
if (it != m_themes.end())
|
if (it != m_themes.end())
|
||||||
{
|
{
|
||||||
return Ok(&it->second);
|
return Ok(&it->second);
|
||||||
}
|
}
|
||||||
return Err<const clrsync::core::theme_template*>(error_code::template_not_found, "Template not found", name);
|
return Err<const clrsync::core::theme_template *>(error_code::template_not_found,
|
||||||
|
"Template not found", name);
|
||||||
}
|
}
|
||||||
|
|
||||||
} // namespace clrsync::core
|
} // namespace clrsync::core
|
||||||
|
|||||||
@@ -1,9 +1,9 @@
|
|||||||
#ifndef CLRSYNC_CORE_CONFIG_HPP
|
#ifndef CLRSYNC_CORE_CONFIG_HPP
|
||||||
#define CLRSYNC_CORE_CONFIG_HPP
|
#define CLRSYNC_CORE_CONFIG_HPP
|
||||||
|
|
||||||
|
#include <core/error.hpp>
|
||||||
#include <core/io/file.hpp>
|
#include <core/io/file.hpp>
|
||||||
#include <core/theme/theme_template.hpp>
|
#include <core/theme/theme_template.hpp>
|
||||||
#include <core/error.hpp>
|
|
||||||
#include <filesystem>
|
#include <filesystem>
|
||||||
#include <memory>
|
#include <memory>
|
||||||
#include <string>
|
#include <string>
|
||||||
@@ -22,17 +22,16 @@ class config
|
|||||||
const std::string &palettes_path();
|
const std::string &palettes_path();
|
||||||
const std::string default_theme() const;
|
const std::string default_theme() const;
|
||||||
const std::unordered_map<std::string, clrsync::core::theme_template> templates();
|
const std::unordered_map<std::string, clrsync::core::theme_template> templates();
|
||||||
Result<const clrsync::core::theme_template*> template_by_name(const std::string &name) const;
|
Result<const clrsync::core::theme_template *> template_by_name(const std::string &name) const;
|
||||||
std::filesystem::path get_user_config_dir();
|
std::filesystem::path get_user_config_dir();
|
||||||
|
|
||||||
|
|
||||||
Result<void> set_default_theme(const std::string &theme);
|
Result<void> set_default_theme(const std::string &theme);
|
||||||
Result<void> set_palettes_path(const std::string &path);
|
Result<void> set_palettes_path(const std::string &path);
|
||||||
Result<void> set_font(const std::string &font);
|
Result<void> set_font(const std::string &font);
|
||||||
Result<void> set_font_size(int font_size);
|
Result<void> set_font_size(int font_size);
|
||||||
|
|
||||||
Result<void> update_template(const std::string &key,
|
Result<void> update_template(const std::string &key,
|
||||||
const clrsync::core::theme_template &theme_template);
|
const clrsync::core::theme_template &theme_template);
|
||||||
Result<void> remove_template(const std::string &key);
|
Result<void> remove_template(const std::string &key);
|
||||||
static std::filesystem::path get_data_dir();
|
static std::filesystem::path get_data_dir();
|
||||||
|
|
||||||
@@ -44,8 +43,8 @@ class config
|
|||||||
std::string m_palettes_dir{};
|
std::string m_palettes_dir{};
|
||||||
std::unique_ptr<io::file> m_file;
|
std::unique_ptr<io::file> m_file;
|
||||||
std::unordered_map<std::string, theme_template> m_themes{};
|
std::unordered_map<std::string, theme_template> m_themes{};
|
||||||
static void copy_file(const std::filesystem::path& src, const std::filesystem::path& dst);
|
static void copy_file(const std::filesystem::path &src, const std::filesystem::path &dst);
|
||||||
static void copy_dir(const std::filesystem::path& src, const std::filesystem::path& dst);
|
static void copy_dir(const std::filesystem::path &src, const std::filesystem::path &dst);
|
||||||
void copy_default_configs();
|
void copy_default_configs();
|
||||||
};
|
};
|
||||||
} // namespace clrsync::core
|
} // namespace clrsync::core
|
||||||
|
|||||||
@@ -1,9 +1,9 @@
|
|||||||
#ifndef CLRSYNC_CORE_ERROR_HPP
|
#ifndef CLRSYNC_CORE_ERROR_HPP
|
||||||
#define CLRSYNC_CORE_ERROR_HPP
|
#define CLRSYNC_CORE_ERROR_HPP
|
||||||
|
|
||||||
|
#include <optional>
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <variant>
|
#include <variant>
|
||||||
#include <optional>
|
|
||||||
|
|
||||||
namespace clrsync::core
|
namespace clrsync::core
|
||||||
{
|
{
|
||||||
@@ -11,54 +11,73 @@ namespace clrsync::core
|
|||||||
enum class error_code
|
enum class error_code
|
||||||
{
|
{
|
||||||
unknown,
|
unknown,
|
||||||
|
|
||||||
file_not_found,
|
file_not_found,
|
||||||
file_open_failed,
|
file_open_failed,
|
||||||
file_write_failed,
|
file_write_failed,
|
||||||
file_read_failed,
|
file_read_failed,
|
||||||
dir_create_failed,
|
dir_create_failed,
|
||||||
|
|
||||||
parse_failed,
|
parse_failed,
|
||||||
invalid_format,
|
invalid_format,
|
||||||
|
|
||||||
config_missing,
|
config_missing,
|
||||||
config_invalid,
|
config_invalid,
|
||||||
|
|
||||||
template_not_found,
|
template_not_found,
|
||||||
template_load_failed,
|
template_load_failed,
|
||||||
template_apply_failed,
|
template_apply_failed,
|
||||||
|
|
||||||
palette_not_found,
|
palette_not_found,
|
||||||
palette_load_failed,
|
palette_load_failed,
|
||||||
|
|
||||||
init_failed,
|
init_failed,
|
||||||
invalid_arg,
|
invalid_arg,
|
||||||
resource_missing,
|
resource_missing,
|
||||||
};
|
};
|
||||||
|
|
||||||
inline const char* error_code_string(error_code code)
|
inline const char *error_code_string(error_code code)
|
||||||
{
|
{
|
||||||
switch (code)
|
switch (code)
|
||||||
{
|
{
|
||||||
case error_code::unknown: return "Unknown error";
|
case error_code::unknown:
|
||||||
case error_code::file_not_found: return "File not found";
|
return "Unknown error";
|
||||||
case error_code::file_open_failed: return "Failed to open file";
|
case error_code::file_not_found:
|
||||||
case error_code::file_write_failed: return "Failed to write file";
|
return "File not found";
|
||||||
case error_code::file_read_failed: return "Failed to read file";
|
case error_code::file_open_failed:
|
||||||
case error_code::dir_create_failed: return "Failed to create directory";
|
return "Failed to open file";
|
||||||
case error_code::parse_failed: return "Parse failed";
|
case error_code::file_write_failed:
|
||||||
case error_code::invalid_format: return "Invalid format";
|
return "Failed to write file";
|
||||||
case error_code::config_missing: return "Configuration missing";
|
case error_code::file_read_failed:
|
||||||
case error_code::config_invalid: return "Configuration invalid";
|
return "Failed to read file";
|
||||||
case error_code::template_not_found: return "Template not found";
|
case error_code::dir_create_failed:
|
||||||
case error_code::template_load_failed: return "Failed to load template";
|
return "Failed to create directory";
|
||||||
case error_code::template_apply_failed: return "Failed to apply template";
|
case error_code::parse_failed:
|
||||||
case error_code::palette_not_found: return "Palette not found";
|
return "Parse failed";
|
||||||
case error_code::palette_load_failed: return "Failed to load palette";
|
case error_code::invalid_format:
|
||||||
case error_code::init_failed: return "Initialization failed";
|
return "Invalid format";
|
||||||
case error_code::invalid_arg: return "Invalid argument";
|
case error_code::config_missing:
|
||||||
case error_code::resource_missing: return "Resource missing";
|
return "Configuration missing";
|
||||||
default: return "Unknown error code";
|
case error_code::config_invalid:
|
||||||
|
return "Configuration invalid";
|
||||||
|
case error_code::template_not_found:
|
||||||
|
return "Template not found";
|
||||||
|
case error_code::template_load_failed:
|
||||||
|
return "Failed to load template";
|
||||||
|
case error_code::template_apply_failed:
|
||||||
|
return "Failed to apply template";
|
||||||
|
case error_code::palette_not_found:
|
||||||
|
return "Palette not found";
|
||||||
|
case error_code::palette_load_failed:
|
||||||
|
return "Failed to load palette";
|
||||||
|
case error_code::init_failed:
|
||||||
|
return "Initialization failed";
|
||||||
|
case error_code::invalid_arg:
|
||||||
|
return "Invalid argument";
|
||||||
|
case error_code::resource_missing:
|
||||||
|
return "Resource missing";
|
||||||
|
default:
|
||||||
|
return "Unknown error code";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -67,15 +86,20 @@ struct Error
|
|||||||
error_code code;
|
error_code code;
|
||||||
std::string message;
|
std::string message;
|
||||||
std::string context;
|
std::string context;
|
||||||
|
|
||||||
Error(error_code c) : code(c), message(error_code_string(c)) {}
|
Error(error_code c) : code(c), message(error_code_string(c))
|
||||||
|
{
|
||||||
Error(error_code c, std::string msg)
|
}
|
||||||
: code(c), message(std::move(msg)) {}
|
|
||||||
|
Error(error_code c, std::string msg) : code(c), message(std::move(msg))
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
Error(error_code c, std::string msg, std::string ctx)
|
Error(error_code c, std::string msg, std::string ctx)
|
||||||
: code(c), message(std::move(msg)), context(std::move(ctx)) {}
|
: code(c), message(std::move(msg)), context(std::move(ctx))
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
std::string description() const
|
std::string description() const
|
||||||
{
|
{
|
||||||
if (context.empty())
|
if (context.empty())
|
||||||
@@ -84,59 +108,81 @@ struct Error
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
template<typename T>
|
template <typename T> class [[nodiscard]] Result
|
||||||
class [[nodiscard]] Result
|
|
||||||
{
|
{
|
||||||
private:
|
private:
|
||||||
std::variant<T, Error> m_data;
|
std::variant<T, Error> m_data;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
Result(T value) : m_data(std::move(value)) {}
|
Result(T value) : m_data(std::move(value))
|
||||||
|
{
|
||||||
Result(Error error) : m_data(std::move(error)) {}
|
}
|
||||||
|
|
||||||
bool is_ok() const { return std::holds_alternative<T>(m_data); }
|
Result(Error error) : m_data(std::move(error))
|
||||||
|
{
|
||||||
bool is_error() const { return std::holds_alternative<Error>(m_data); }
|
}
|
||||||
|
|
||||||
explicit operator bool() const { return is_ok(); }
|
bool is_ok() const
|
||||||
|
{
|
||||||
T& value() & { return std::get<T>(m_data); }
|
return std::holds_alternative<T>(m_data);
|
||||||
const T& value() const & { return std::get<T>(m_data); }
|
}
|
||||||
T&& value() && { return std::get<T>(std::move(m_data)); }
|
|
||||||
|
bool is_error() const
|
||||||
const Error& error() const { return std::get<Error>(m_data); }
|
{
|
||||||
|
return std::holds_alternative<Error>(m_data);
|
||||||
|
}
|
||||||
|
|
||||||
|
explicit operator bool() const
|
||||||
|
{
|
||||||
|
return is_ok();
|
||||||
|
}
|
||||||
|
|
||||||
|
T &value() &
|
||||||
|
{
|
||||||
|
return std::get<T>(m_data);
|
||||||
|
}
|
||||||
|
const T &value() const &
|
||||||
|
{
|
||||||
|
return std::get<T>(m_data);
|
||||||
|
}
|
||||||
|
T &&value() &&
|
||||||
|
{
|
||||||
|
return std::get<T>(std::move(m_data));
|
||||||
|
}
|
||||||
|
|
||||||
|
const Error &error() const
|
||||||
|
{
|
||||||
|
return std::get<Error>(m_data);
|
||||||
|
}
|
||||||
|
|
||||||
T value_or(T default_value) const
|
T value_or(T default_value) const
|
||||||
{
|
{
|
||||||
return is_ok() ? std::get<T>(m_data) : std::move(default_value);
|
return is_ok() ? std::get<T>(m_data) : std::move(default_value);
|
||||||
}
|
}
|
||||||
|
|
||||||
std::optional<T> ok() const
|
std::optional<T> ok() const
|
||||||
{
|
{
|
||||||
if (is_ok())
|
if (is_ok())
|
||||||
return std::get<T>(m_data);
|
return std::get<T>(m_data);
|
||||||
return std::nullopt;
|
return std::nullopt;
|
||||||
}
|
}
|
||||||
|
|
||||||
std::optional<Error> err() const
|
std::optional<Error> err() const
|
||||||
{
|
{
|
||||||
if (is_error())
|
if (is_error())
|
||||||
return std::get<Error>(m_data);
|
return std::get<Error>(m_data);
|
||||||
return std::nullopt;
|
return std::nullopt;
|
||||||
}
|
}
|
||||||
|
|
||||||
template<typename F>
|
template <typename F> auto map(F &&func) -> Result<decltype(func(std::declval<T>()))>
|
||||||
auto map(F&& func) -> Result<decltype(func(std::declval<T>()))>
|
|
||||||
{
|
{
|
||||||
using U = decltype(func(std::declval<T>()));
|
using U = decltype(func(std::declval<T>()));
|
||||||
if (is_ok())
|
if (is_ok())
|
||||||
return Result<U>(func(std::get<T>(m_data)));
|
return Result<U>(func(std::get<T>(m_data)));
|
||||||
return Result<U>(std::get<Error>(m_data));
|
return Result<U>(std::get<Error>(m_data));
|
||||||
}
|
}
|
||||||
|
|
||||||
template<typename F>
|
template <typename F> auto and_then(F &&func) -> decltype(func(std::declval<T>()))
|
||||||
auto and_then(F&& func) -> decltype(func(std::declval<T>()))
|
|
||||||
{
|
{
|
||||||
if (is_ok())
|
if (is_ok())
|
||||||
return func(std::get<T>(m_data));
|
return func(std::get<T>(m_data));
|
||||||
@@ -145,30 +191,47 @@ public:
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
template<>
|
template <> class [[nodiscard]] Result<void>
|
||||||
class [[nodiscard]] Result<void>
|
|
||||||
{
|
{
|
||||||
private:
|
private:
|
||||||
std::optional<Error> m_error;
|
std::optional<Error> m_error;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
Result() : m_error(std::nullopt) {}
|
Result() : m_error(std::nullopt)
|
||||||
|
{
|
||||||
Result(Error error) : m_error(std::move(error)) {}
|
}
|
||||||
|
|
||||||
bool is_ok() const { return !m_error.has_value(); }
|
Result(Error error) : m_error(std::move(error))
|
||||||
|
{
|
||||||
bool is_error() const { return m_error.has_value(); }
|
}
|
||||||
|
|
||||||
explicit operator bool() const { return is_ok(); }
|
bool is_ok() const
|
||||||
|
{
|
||||||
const Error& error() const { return *m_error; }
|
return !m_error.has_value();
|
||||||
|
}
|
||||||
std::optional<Error> err() const { return m_error; }
|
|
||||||
|
bool is_error() const
|
||||||
|
{
|
||||||
|
return m_error.has_value();
|
||||||
|
}
|
||||||
|
|
||||||
|
explicit operator bool() const
|
||||||
|
{
|
||||||
|
return is_ok();
|
||||||
|
}
|
||||||
|
|
||||||
|
const Error &error() const
|
||||||
|
{
|
||||||
|
return *m_error;
|
||||||
|
}
|
||||||
|
|
||||||
|
std::optional<Error> err() const
|
||||||
|
{
|
||||||
|
return m_error;
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
template<typename T>
|
template <typename T> Result<T> Ok(T value)
|
||||||
Result<T> Ok(T value)
|
|
||||||
{
|
{
|
||||||
return Result<T>(std::move(value));
|
return Result<T>(std::move(value));
|
||||||
}
|
}
|
||||||
@@ -178,26 +241,22 @@ inline Result<void> Ok()
|
|||||||
return Result<void>();
|
return Result<void>();
|
||||||
}
|
}
|
||||||
|
|
||||||
template<typename T>
|
template <typename T> Result<T> Err(Error error)
|
||||||
Result<T> Err(Error error)
|
|
||||||
{
|
{
|
||||||
return Result<T>(std::move(error));
|
return Result<T>(std::move(error));
|
||||||
}
|
}
|
||||||
|
|
||||||
template<typename T>
|
template <typename T> Result<T> Err(error_code code)
|
||||||
Result<T> Err(error_code code)
|
|
||||||
{
|
{
|
||||||
return Result<T>(Error(code));
|
return Result<T>(Error(code));
|
||||||
}
|
}
|
||||||
|
|
||||||
template<typename T>
|
template <typename T> Result<T> Err(error_code code, std::string message)
|
||||||
Result<T> Err(error_code code, std::string message)
|
|
||||||
{
|
{
|
||||||
return Result<T>(Error(code, std::move(message)));
|
return Result<T>(Error(code, std::move(message)));
|
||||||
}
|
}
|
||||||
|
|
||||||
template<typename T>
|
template <typename T> Result<T> Err(error_code code, std::string message, std::string context)
|
||||||
Result<T> Err(error_code code, std::string message, std::string context)
|
|
||||||
{
|
{
|
||||||
return Result<T>(Error(code, std::move(message), std::move(context)));
|
return Result<T>(Error(code, std::move(message), std::move(context)));
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,10 +1,10 @@
|
|||||||
#ifndef CLRSYNC_CORE_IO_FILE_HPP
|
#ifndef CLRSYNC_CORE_IO_FILE_HPP
|
||||||
#define CLRSYNC_CORE_IO_FILE_HPP
|
#define CLRSYNC_CORE_IO_FILE_HPP
|
||||||
|
#include <core/error.hpp>
|
||||||
#include <cstdint>
|
#include <cstdint>
|
||||||
#include <map>
|
#include <map>
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <variant>
|
#include <variant>
|
||||||
#include <core/error.hpp>
|
|
||||||
|
|
||||||
using value_type = std::variant<std::string, uint32_t, int, bool>;
|
using value_type = std::variant<std::string, uint32_t, int, bool>;
|
||||||
|
|
||||||
@@ -16,7 +16,10 @@ class file
|
|||||||
file() = default;
|
file() = default;
|
||||||
file(std::string path) {};
|
file(std::string path) {};
|
||||||
virtual ~file() = default;
|
virtual ~file() = default;
|
||||||
virtual Result<void> parse() { return Ok(); };
|
virtual Result<void> parse()
|
||||||
|
{
|
||||||
|
return Ok();
|
||||||
|
};
|
||||||
virtual const std::string get_string_value(const std::string §ion,
|
virtual const std::string get_string_value(const std::string §ion,
|
||||||
const std::string &key) const
|
const std::string &key) const
|
||||||
{
|
{
|
||||||
@@ -35,14 +38,17 @@ class file
|
|||||||
return {};
|
return {};
|
||||||
}
|
}
|
||||||
virtual void set_value(const std::string §ion, const std::string &key,
|
virtual void set_value(const std::string §ion, const std::string &key,
|
||||||
const value_type &value)
|
const value_type &value)
|
||||||
{
|
{
|
||||||
insert_or_update_value(section, key, value);
|
insert_or_update_value(section, key, value);
|
||||||
}
|
}
|
||||||
virtual void insert_or_update_value(const std::string §ion, const std::string &key,
|
virtual void insert_or_update_value(const std::string §ion, const std::string &key,
|
||||||
const value_type &value) {};
|
const value_type &value) {};
|
||||||
virtual void remove_section(const std::string §ion) {};
|
virtual void remove_section(const std::string §ion) {};
|
||||||
virtual Result<void> save_file() { return Ok(); };
|
virtual Result<void> save_file()
|
||||||
|
{
|
||||||
|
return Ok();
|
||||||
|
};
|
||||||
};
|
};
|
||||||
} // namespace clrsync::core::io
|
} // namespace clrsync::core::io
|
||||||
#endif
|
#endif
|
||||||
@@ -15,7 +15,7 @@ Result<void> toml_file::parse()
|
|||||||
{
|
{
|
||||||
if (!std::filesystem::exists(m_path))
|
if (!std::filesystem::exists(m_path))
|
||||||
return Err<void>(error_code::file_not_found, "File does not exist", m_path);
|
return Err<void>(error_code::file_not_found, "File does not exist", m_path);
|
||||||
|
|
||||||
m_file = toml::parse_file(m_path);
|
m_file = toml::parse_file(m_path);
|
||||||
return Ok();
|
return Ok();
|
||||||
}
|
}
|
||||||
@@ -96,10 +96,10 @@ void toml_file::remove_section(const std::string §ion)
|
|||||||
{
|
{
|
||||||
toml::table *tbl = m_file.as_table();
|
toml::table *tbl = m_file.as_table();
|
||||||
auto parts = split(section, '.');
|
auto parts = split(section, '.');
|
||||||
|
|
||||||
if (parts.empty())
|
if (parts.empty())
|
||||||
return;
|
return;
|
||||||
|
|
||||||
for (size_t i = 0; i < parts.size() - 1; ++i)
|
for (size_t i = 0; i < parts.size() - 1; ++i)
|
||||||
{
|
{
|
||||||
auto *sub = (*tbl)[parts[i]].as_table();
|
auto *sub = (*tbl)[parts[i]].as_table();
|
||||||
@@ -107,26 +107,29 @@ void toml_file::remove_section(const std::string §ion)
|
|||||||
return;
|
return;
|
||||||
tbl = sub;
|
tbl = sub;
|
||||||
}
|
}
|
||||||
|
|
||||||
tbl->erase(parts.back());
|
tbl->erase(parts.back());
|
||||||
}
|
}
|
||||||
|
|
||||||
Result<void> toml_file::save_file()
|
Result<void> toml_file::save_file()
|
||||||
{
|
{
|
||||||
try {
|
try
|
||||||
|
{
|
||||||
std::filesystem::create_directories(std::filesystem::path(m_path).parent_path());
|
std::filesystem::create_directories(std::filesystem::path(m_path).parent_path());
|
||||||
} catch (const std::exception& e) {
|
}
|
||||||
|
catch (const std::exception &e)
|
||||||
|
{
|
||||||
return Err<void>(error_code::dir_create_failed, e.what(), m_path);
|
return Err<void>(error_code::dir_create_failed, e.what(), m_path);
|
||||||
}
|
}
|
||||||
|
|
||||||
std::ofstream stream(m_path, std::ios::binary);
|
std::ofstream stream(m_path, std::ios::binary);
|
||||||
if (!stream)
|
if (!stream)
|
||||||
return Err<void>(error_code::file_write_failed, "Failed to open file for writing", m_path);
|
return Err<void>(error_code::file_write_failed, "Failed to open file for writing", m_path);
|
||||||
|
|
||||||
stream << m_file;
|
stream << m_file;
|
||||||
if (!stream)
|
if (!stream)
|
||||||
return Err<void>(error_code::file_write_failed, "Failed to write to file", m_path);
|
return Err<void>(error_code::file_write_failed, "Failed to write to file", m_path);
|
||||||
|
|
||||||
return Ok();
|
return Ok();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
#ifndef CLRSYNC_CORE_IO_TOML_FILE_HPP
|
#ifndef CLRSYNC_CORE_IO_TOML_FILE_HPP
|
||||||
#define CLRSYNC_CORE_IO_TOML_FILE_HPP
|
#define CLRSYNC_CORE_IO_TOML_FILE_HPP
|
||||||
#include <core/io/file.hpp>
|
|
||||||
#include <core/error.hpp>
|
#include <core/error.hpp>
|
||||||
|
#include <core/io/file.hpp>
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <toml/toml.hpp>
|
#include <toml/toml.hpp>
|
||||||
|
|
||||||
|
|||||||
@@ -111,14 +111,17 @@ void color::from_hex_string(const std::string &str)
|
|||||||
if (str.empty() || str[0] != '#')
|
if (str.empty() || str[0] != '#')
|
||||||
throw std::invalid_argument("Invalid hex color format");
|
throw std::invalid_argument("Invalid hex color format");
|
||||||
|
|
||||||
if (str.size() == 7) {
|
if (str.size() == 7)
|
||||||
|
{
|
||||||
uint32_t rgb = static_cast<uint32_t>(std::stoul(str.substr(1), nullptr, 16));
|
uint32_t rgb = static_cast<uint32_t>(std::stoul(str.substr(1), nullptr, 16));
|
||||||
m_hex = (rgb << 8) | 0xFF;
|
m_hex = (rgb << 8) | 0xFF;
|
||||||
}
|
}
|
||||||
else if (str.size() == 9) {
|
else if (str.size() == 9)
|
||||||
|
{
|
||||||
m_hex = static_cast<uint32_t>(std::stoul(str.substr(1), nullptr, 16));
|
m_hex = static_cast<uint32_t>(std::stoul(str.substr(1), nullptr, 16));
|
||||||
}
|
}
|
||||||
else {
|
else
|
||||||
|
{
|
||||||
throw std::invalid_argument("Invalid hex color format");
|
throw std::invalid_argument("Invalid hex color format");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -137,30 +140,38 @@ const std::string color::to_hex_string_with_alpha() const
|
|||||||
return std::string(buffer);
|
return std::string(buffer);
|
||||||
}
|
}
|
||||||
|
|
||||||
std::string color::format(const std::string& field) const
|
std::string color::format(const std::string &field) const
|
||||||
{
|
{
|
||||||
auto rgb = to_rgb();
|
auto rgb = to_rgb();
|
||||||
auto rgba = to_rgba();
|
auto rgba = to_rgba();
|
||||||
auto hslv = to_hsl();
|
auto hslv = to_hsl();
|
||||||
auto hslav = to_hsla();
|
auto hslav = to_hsla();
|
||||||
|
|
||||||
if (field == "hex") return to_hex_string();
|
if (field == "hex")
|
||||||
if (field == "hex_stripped") {
|
return to_hex_string();
|
||||||
|
if (field == "hex_stripped")
|
||||||
|
{
|
||||||
auto s = to_hex_string();
|
auto s = to_hex_string();
|
||||||
return s.substr(1);
|
return s.substr(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (field == "hexa") return to_hex_string_with_alpha();
|
if (field == "hexa")
|
||||||
if (field == "hexa_stripped") {
|
return to_hex_string_with_alpha();
|
||||||
|
if (field == "hexa_stripped")
|
||||||
|
{
|
||||||
auto s = to_hex_string_with_alpha();
|
auto s = to_hex_string_with_alpha();
|
||||||
return s.substr(1);
|
return s.substr(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (field == "r") return std::to_string(rgb.r);
|
if (field == "r")
|
||||||
if (field == "g") return std::to_string(rgb.g);
|
return std::to_string(rgb.r);
|
||||||
if (field == "b") return std::to_string(rgb.b);
|
if (field == "g")
|
||||||
|
return std::to_string(rgb.g);
|
||||||
|
if (field == "b")
|
||||||
|
return std::to_string(rgb.b);
|
||||||
|
|
||||||
if (field == "a") {
|
if (field == "a")
|
||||||
|
{
|
||||||
float af = rgba.a / 255.0f;
|
float af = rgba.a / 255.0f;
|
||||||
return std::format("{:.2f}", af);
|
return std::format("{:.2f}", af);
|
||||||
}
|
}
|
||||||
@@ -169,9 +180,7 @@ std::string color::format(const std::string& field) const
|
|||||||
return std::format("rgb({},{},{})", rgb.r, rgb.g, rgb.b);
|
return std::format("rgb({},{},{})", rgb.r, rgb.g, rgb.b);
|
||||||
|
|
||||||
if (field == "rgba")
|
if (field == "rgba")
|
||||||
return std::format("rgba({},{},{},{:.2f})",
|
return std::format("rgba({},{},{},{:.2f})", rgba.r, rgba.g, rgba.b, rgba.a / 255.0f);
|
||||||
rgba.r, rgba.g, rgba.b,
|
|
||||||
rgba.a / 255.0f);
|
|
||||||
|
|
||||||
if (field == "h")
|
if (field == "h")
|
||||||
return std::format("{:.0f}", hslv.h);
|
return std::format("{:.0f}", hslv.h);
|
||||||
@@ -185,12 +194,10 @@ std::string color::format(const std::string& field) const
|
|||||||
return std::format("{:.2f}", hslav.a);
|
return std::format("{:.2f}", hslav.a);
|
||||||
|
|
||||||
if (field == "hsl")
|
if (field == "hsl")
|
||||||
return std::format("hsl({:.0f},{:.2f},{:.2f})",
|
return std::format("hsl({:.0f},{:.2f},{:.2f})", hslv.h, hslv.s, hslv.l);
|
||||||
hslv.h, hslv.s, hslv.l);
|
|
||||||
|
|
||||||
if (field == "hsla")
|
if (field == "hsla")
|
||||||
return std::format("hsla({:.0f},{:.2f},{:.2f},{:.2f})",
|
return std::format("hsla({:.0f},{:.2f},{:.2f},{:.2f})", hslav.h, hslav.s, hslav.l, hslav.a);
|
||||||
hslav.h, hslav.s, hslav.l, hslav.a);
|
|
||||||
|
|
||||||
throw std::runtime_error("Unknown color format: " + field);
|
throw std::runtime_error("Unknown color format: " + field);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -60,7 +60,7 @@ class color
|
|||||||
|
|
||||||
const std::string to_hex_string_with_alpha() const;
|
const std::string to_hex_string_with_alpha() const;
|
||||||
|
|
||||||
std::string format(const std::string& field) const;
|
std::string format(const std::string &field) const;
|
||||||
|
|
||||||
void set(uint32_t hex);
|
void set(uint32_t hex);
|
||||||
|
|
||||||
|
|||||||
@@ -3,12 +3,12 @@
|
|||||||
#include <cstddef>
|
#include <cstddef>
|
||||||
#include <cstdint>
|
#include <cstdint>
|
||||||
#include <iterator>
|
#include <iterator>
|
||||||
#include <unordered_map>
|
|
||||||
#include <string>
|
#include <string>
|
||||||
|
#include <unordered_map>
|
||||||
|
|
||||||
namespace clrsync::core
|
namespace clrsync::core
|
||||||
{
|
{
|
||||||
constexpr const char* COLOR_KEYS[] = {
|
constexpr const char *COLOR_KEYS[] = {
|
||||||
// General UI
|
// General UI
|
||||||
"background",
|
"background",
|
||||||
"on_background",
|
"on_background",
|
||||||
@@ -79,31 +79,31 @@ constexpr size_t NUM_COLOR_KEYS = std::size(COLOR_KEYS);
|
|||||||
inline const std::unordered_map<std::string, uint32_t> DEFAULT_COLORS = {
|
inline const std::unordered_map<std::string, uint32_t> DEFAULT_COLORS = {
|
||||||
{"background", 0x111111ff},
|
{"background", 0x111111ff},
|
||||||
{"on_background", 0xd4d4d4ff},
|
{"on_background", 0xd4d4d4ff},
|
||||||
|
|
||||||
{"surface", 0x111111ff},
|
{"surface", 0x111111ff},
|
||||||
{"on_surface", 0xd4d4d4ff},
|
{"on_surface", 0xd4d4d4ff},
|
||||||
|
|
||||||
{"surface_variant", 0x191919ff},
|
{"surface_variant", 0x191919ff},
|
||||||
{"on_surface_variant", 0xd4d4d4ff},
|
{"on_surface_variant", 0xd4d4d4ff},
|
||||||
|
|
||||||
{"border_focused", 0x2e2e2eff},
|
{"border_focused", 0x2e2e2eff},
|
||||||
{"border", 0x242424ff},
|
{"border", 0x242424ff},
|
||||||
|
|
||||||
{"foreground", 0xd2d2d2ff},
|
{"foreground", 0xd2d2d2ff},
|
||||||
|
|
||||||
{"cursor", 0xd2d2d2ff},
|
{"cursor", 0xd2d2d2ff},
|
||||||
{"accent", 0x9a8652ff},
|
{"accent", 0x9a8652ff},
|
||||||
|
|
||||||
{"success", 0x668a51ff},
|
{"success", 0x668a51ff},
|
||||||
{"info", 0x3a898cff},
|
{"info", 0x3a898cff},
|
||||||
{"warning", 0xb47837ff},
|
{"warning", 0xb47837ff},
|
||||||
{"error", 0xaa4e4aff},
|
{"error", 0xaa4e4aff},
|
||||||
|
|
||||||
{"on_success", 0xd2d2d2ff},
|
{"on_success", 0xd2d2d2ff},
|
||||||
{"on_info", 0xd2d2d2ff},
|
{"on_info", 0xd2d2d2ff},
|
||||||
{"on_warning", 0xd2d2d2ff},
|
{"on_warning", 0xd2d2d2ff},
|
||||||
{"on_error", 0xd2d2d2ff},
|
{"on_error", 0xd2d2d2ff},
|
||||||
|
|
||||||
{"editor_background", 0x111111ff},
|
{"editor_background", 0x111111ff},
|
||||||
{"editor_command", 0x3a898cff},
|
{"editor_command", 0x3a898cff},
|
||||||
{"editor_comment", 0x849899ff},
|
{"editor_comment", 0x849899ff},
|
||||||
@@ -119,7 +119,7 @@ inline const std::unordered_map<std::string, uint32_t> DEFAULT_COLORS = {
|
|||||||
{"editor_string", 0x9a8652ff},
|
{"editor_string", 0x9a8652ff},
|
||||||
{"editor_success", 0x668a51ff},
|
{"editor_success", 0x668a51ff},
|
||||||
{"editor_warning", 0xb47837ff},
|
{"editor_warning", 0xb47837ff},
|
||||||
|
|
||||||
{"base00", 0x111111ff},
|
{"base00", 0x111111ff},
|
||||||
{"base01", 0x668a51ff},
|
{"base01", 0x668a51ff},
|
||||||
{"base02", 0x9a8652ff},
|
{"base02", 0x9a8652ff},
|
||||||
|
|||||||
@@ -26,7 +26,7 @@ template <typename FileType> class palette_file
|
|||||||
if (!m_file->parse())
|
if (!m_file->parse())
|
||||||
return false;
|
return false;
|
||||||
m_palette.set_name(m_file->get_string_value("general", "name"));
|
m_palette.set_name(m_file->get_string_value("general", "name"));
|
||||||
|
|
||||||
for (const auto &color_key : COLOR_KEYS)
|
for (const auto &color_key : COLOR_KEYS)
|
||||||
{
|
{
|
||||||
auto it = DEFAULT_COLORS.find(color_key);
|
auto it = DEFAULT_COLORS.find(color_key);
|
||||||
@@ -35,7 +35,7 @@ template <typename FileType> class palette_file
|
|||||||
m_palette.set_color(color_key, core::color(it->second));
|
m_palette.set_color(color_key, core::color(it->second));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
for (const auto &color_key : COLOR_KEYS)
|
for (const auto &color_key : COLOR_KEYS)
|
||||||
{
|
{
|
||||||
auto color_str = m_file->get_string_value("colors", color_key);
|
auto color_str = m_file->get_string_value("colors", color_key);
|
||||||
|
|||||||
@@ -6,12 +6,10 @@
|
|||||||
#include <string>
|
#include <string>
|
||||||
#include <unordered_map>
|
#include <unordered_map>
|
||||||
|
|
||||||
|
|
||||||
namespace clrsync::core
|
namespace clrsync::core
|
||||||
{
|
{
|
||||||
|
|
||||||
template <typename FileType>
|
template <typename FileType> class template_manager
|
||||||
class template_manager
|
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
template_manager() = default;
|
template_manager() = default;
|
||||||
|
|||||||
@@ -1,9 +1,9 @@
|
|||||||
#ifndef CLRSYNC_CORE_THEME_THEME_RENDERER_HPP
|
#ifndef CLRSYNC_CORE_THEME_THEME_RENDERER_HPP
|
||||||
#define CLRSYNC_CORE_THEME_THEME_RENDERER_HPP
|
#define CLRSYNC_CORE_THEME_THEME_RENDERER_HPP
|
||||||
#include <core/config/config.hpp>
|
#include <core/config/config.hpp>
|
||||||
|
#include <core/error.hpp>
|
||||||
#include <core/palette/palette_manager.hpp>
|
#include <core/palette/palette_manager.hpp>
|
||||||
#include <core/theme/template_manager.hpp>
|
#include <core/theme/template_manager.hpp>
|
||||||
#include <core/error.hpp>
|
|
||||||
#include <string>
|
#include <string>
|
||||||
|
|
||||||
namespace clrsync::core
|
namespace clrsync::core
|
||||||
@@ -26,7 +26,7 @@ template <typename FileType> class theme_renderer
|
|||||||
return Err<void>(error_code::palette_not_found, "Palette not found", theme_name);
|
return Err<void>(error_code::palette_not_found, "Palette not found", theme_name);
|
||||||
return apply_palette_to_all_templates(*palette);
|
return apply_palette_to_all_templates(*palette);
|
||||||
}
|
}
|
||||||
|
|
||||||
Result<void> apply_theme_from_path(const std::string &path)
|
Result<void> apply_theme_from_path(const std::string &path)
|
||||||
{
|
{
|
||||||
auto palette = m_pal_manager.load_palette_from_file(path);
|
auto palette = m_pal_manager.load_palette_from_file(path);
|
||||||
@@ -44,23 +44,24 @@ template <typename FileType> class theme_renderer
|
|||||||
auto &tmpl = t_pair.second;
|
auto &tmpl = t_pair.second;
|
||||||
if (!tmpl.enabled())
|
if (!tmpl.enabled())
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
auto load_result = tmpl.load_template();
|
auto load_result = tmpl.load_template();
|
||||||
if (!load_result)
|
if (!load_result)
|
||||||
return load_result;
|
return load_result;
|
||||||
|
|
||||||
tmpl.apply_palette(pal);
|
tmpl.apply_palette(pal);
|
||||||
|
|
||||||
auto save_result = tmpl.save_output();
|
auto save_result = tmpl.save_output();
|
||||||
if (!save_result)
|
if (!save_result)
|
||||||
return save_result;
|
return save_result;
|
||||||
|
|
||||||
if (!tmpl.reload_command().empty())
|
if (!tmpl.reload_command().empty())
|
||||||
{
|
{
|
||||||
int result = std::system(tmpl.reload_command().c_str());
|
int result = std::system(tmpl.reload_command().c_str());
|
||||||
if (result != 0)
|
if (result != 0)
|
||||||
{
|
{
|
||||||
std::cerr << "Warning: Command " << tmpl.reload_command() << " failed with code " << result << "\n";
|
std::cerr << "Warning: Command " << tmpl.reload_command()
|
||||||
|
<< " failed with code " << result << "\n";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -47,13 +47,15 @@ Result<void> theme_template::load_template()
|
|||||||
{
|
{
|
||||||
if (!std::filesystem::exists(m_template_path))
|
if (!std::filesystem::exists(m_template_path))
|
||||||
{
|
{
|
||||||
return Err<void>(error_code::template_not_found, "Template file is missing", m_template_path);
|
return Err<void>(error_code::template_not_found, "Template file is missing",
|
||||||
|
m_template_path);
|
||||||
}
|
}
|
||||||
|
|
||||||
std::ifstream input(m_template_path, std::ios::binary);
|
std::ifstream input(m_template_path, std::ios::binary);
|
||||||
if (!input)
|
if (!input)
|
||||||
{
|
{
|
||||||
return Err<void>(error_code::template_load_failed, "Failed to open template file", m_template_path);
|
return Err<void>(error_code::template_load_failed, "Failed to open template file",
|
||||||
|
m_template_path);
|
||||||
}
|
}
|
||||||
|
|
||||||
m_template_data.assign(std::istreambuf_iterator<char>(input), std::istreambuf_iterator<char>());
|
m_template_data.assign(std::istreambuf_iterator<char>(input), std::istreambuf_iterator<char>());
|
||||||
@@ -64,7 +66,7 @@ void theme_template::apply_palette(const core::palette &palette)
|
|||||||
{
|
{
|
||||||
m_processed_data = m_template_data;
|
m_processed_data = m_template_data;
|
||||||
|
|
||||||
for (const auto& [key, color] : palette.colors())
|
for (const auto &[key, color] : palette.colors())
|
||||||
{
|
{
|
||||||
// simple replacement: {foreground}
|
// simple replacement: {foreground}
|
||||||
replace_all(m_processed_data, "{" + key + "}", color.format("hex"));
|
replace_all(m_processed_data, "{" + key + "}", color.format("hex"));
|
||||||
@@ -96,23 +98,25 @@ Result<void> theme_template::save_output() const
|
|||||||
{
|
{
|
||||||
std::filesystem::create_directories(std::filesystem::path(m_output_path).parent_path());
|
std::filesystem::create_directories(std::filesystem::path(m_output_path).parent_path());
|
||||||
}
|
}
|
||||||
catch (const std::exception& e)
|
catch (const std::exception &e)
|
||||||
{
|
{
|
||||||
return Err<void>(error_code::dir_create_failed, e.what(), m_output_path);
|
return Err<void>(error_code::dir_create_failed, e.what(), m_output_path);
|
||||||
}
|
}
|
||||||
|
|
||||||
std::ofstream output(m_output_path, std::ios::binary);
|
std::ofstream output(m_output_path, std::ios::binary);
|
||||||
if (!output)
|
if (!output)
|
||||||
{
|
{
|
||||||
return Err<void>(error_code::file_write_failed, "Failed to open output file for writing", m_output_path);
|
return Err<void>(error_code::file_write_failed, "Failed to open output file for writing",
|
||||||
|
m_output_path);
|
||||||
}
|
}
|
||||||
|
|
||||||
output << m_processed_data;
|
output << m_processed_data;
|
||||||
if (!output)
|
if (!output)
|
||||||
{
|
{
|
||||||
return Err<void>(error_code::file_write_failed, "Failed to write to output file", m_output_path);
|
return Err<void>(error_code::file_write_failed, "Failed to write to output file",
|
||||||
|
m_output_path);
|
||||||
}
|
}
|
||||||
|
|
||||||
return Ok();
|
return Ok();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
#ifndef clrsync_CORE_IO_THEME_TEMPLATE_HPP
|
#ifndef clrsync_CORE_IO_THEME_TEMPLATE_HPP
|
||||||
#define clrsync_CORE_IO_THEME_TEMPLATE_HPP
|
#define clrsync_CORE_IO_THEME_TEMPLATE_HPP
|
||||||
|
|
||||||
#include <core/palette/palette.hpp>
|
|
||||||
#include <core/error.hpp>
|
#include <core/error.hpp>
|
||||||
|
#include <core/palette/palette.hpp>
|
||||||
#include <string>
|
#include <string>
|
||||||
|
|
||||||
namespace clrsync::core
|
namespace clrsync::core
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
#include "utils.hpp"
|
#include "utils.hpp"
|
||||||
#include <iostream>
|
|
||||||
#include <filesystem>
|
#include <filesystem>
|
||||||
|
#include <iostream>
|
||||||
|
|
||||||
namespace clrsync::core
|
namespace clrsync::core
|
||||||
{
|
{
|
||||||
@@ -14,10 +14,10 @@ void print_color_keys()
|
|||||||
|
|
||||||
std::string get_default_config_path()
|
std::string get_default_config_path()
|
||||||
{
|
{
|
||||||
const char* env_path = std::getenv("CLRSYNC_CONFIG_PATH");
|
const char *env_path = std::getenv("CLRSYNC_CONFIG_PATH");
|
||||||
if (env_path && env_path[0] != '\0')
|
if (env_path && env_path[0] != '\0')
|
||||||
return normalize_path(env_path).string();
|
return normalize_path(env_path).string();
|
||||||
|
|
||||||
std::filesystem::path home = normalize_path("~");
|
std::filesystem::path home = normalize_path("~");
|
||||||
std::filesystem::path config_path = home / ".config" / "clrsync" / "config.toml";
|
std::filesystem::path config_path = home / ".config" / "clrsync" / "config.toml";
|
||||||
return config_path.string();
|
return config_path.string();
|
||||||
@@ -27,7 +27,7 @@ std::string expand_user(const std::string &path)
|
|||||||
{
|
{
|
||||||
if (path.empty() || path[0] != '~')
|
if (path.empty() || path[0] != '~')
|
||||||
return path;
|
return path;
|
||||||
|
|
||||||
if (path.length() == 1 || path[1] == '/' || path[1] == '\\')
|
if (path.length() == 1 || path[1] == '/' || path[1] == '\\')
|
||||||
{
|
{
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
@@ -37,10 +37,10 @@ std::string expand_user(const std::string &path)
|
|||||||
#endif
|
#endif
|
||||||
if (!home)
|
if (!home)
|
||||||
return path;
|
return path;
|
||||||
|
|
||||||
if (path.length() == 1)
|
if (path.length() == 1)
|
||||||
return std::string(home);
|
return std::string(home);
|
||||||
|
|
||||||
return std::string(home) + path.substr(1);
|
return std::string(home) + path.substr(1);
|
||||||
}
|
}
|
||||||
return path;
|
return path;
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
#ifndef CLRSYNC_CORE_UTILS_HPP
|
#ifndef CLRSYNC_CORE_UTILS_HPP
|
||||||
#define CLRSYNC_CORE_UTILS_HPP
|
#define CLRSYNC_CORE_UTILS_HPP
|
||||||
|
|
||||||
#include <string>
|
|
||||||
#include <filesystem>
|
#include <filesystem>
|
||||||
|
#include <string>
|
||||||
|
|
||||||
#include <core/palette/color_keys.hpp>
|
#include <core/palette/color_keys.hpp>
|
||||||
|
|
||||||
|
|||||||
@@ -6,7 +6,7 @@
|
|||||||
namespace clrsync::core
|
namespace clrsync::core
|
||||||
{
|
{
|
||||||
|
|
||||||
const std::string GIT_SEMVER = "0.1.6+git.g1a1747a";
|
const std::string GIT_SEMVER = "0.1.6+git.g613c2c8";
|
||||||
|
|
||||||
const std::string version_string();
|
const std::string version_string();
|
||||||
} // namespace clrsync::core
|
} // namespace clrsync::core
|
||||||
|
|||||||
@@ -1,23 +1,27 @@
|
|||||||
set(GUI_SOURCES
|
set(GUI_SOURCES
|
||||||
main.cpp
|
main.cpp
|
||||||
color_scheme_editor.cpp
|
views/color_scheme_editor.cpp
|
||||||
color_table_renderer.cpp
|
views/color_table_renderer.cpp
|
||||||
preview_renderer.cpp
|
views/preview_renderer.cpp
|
||||||
theme_applier.cpp
|
controllers/theme_applier.cpp
|
||||||
template_editor.cpp
|
views/template_editor.cpp
|
||||||
palette_controller.cpp
|
controllers/palette_controller.cpp
|
||||||
template_controller.cpp
|
controllers/template_controller.cpp
|
||||||
imgui_helpers.cpp
|
helpers/imgui_helpers.cpp
|
||||||
imgui_helpers.hpp
|
helpers/imgui_helpers.hpp
|
||||||
about_window.cpp
|
views/about_window.cpp
|
||||||
settings_window.cpp
|
views/settings_window.cpp
|
||||||
font_loader.cpp
|
platform/windows/font_loader_windows.cpp
|
||||||
file_browser.cpp
|
platform/linux/font_loader_linux.cpp
|
||||||
${CMAKE_SOURCE_DIR}/lib/color_text_edit/TextEditor.cpp
|
platform/macos/font_loader_macos.cpp
|
||||||
|
platform/linux/file_browser_linux.cpp
|
||||||
|
platform/windows/file_browser_windows.cpp
|
||||||
|
platform/macos/file_browser_macos.mm
|
||||||
|
${CMAKE_SOURCE_DIR}/lib/color_text_edit/TextEditor.cpp
|
||||||
|
platform/linux/font_loader_linux.cpp
|
||||||
|
platform/macos/font_loader_macos.cpp
|
||||||
|
platform/windows/font_loader_windows.cpp
|
||||||
)
|
)
|
||||||
if(APPLE)
|
|
||||||
list(APPEND GUI_SOURCES file_browser_macos.mm)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if(WIN32)
|
if(WIN32)
|
||||||
add_executable(clrsync_gui WIN32 ${GUI_SOURCES})
|
add_executable(clrsync_gui WIN32 ${GUI_SOURCES})
|
||||||
|
|||||||
@@ -1,21 +0,0 @@
|
|||||||
#ifndef CLRSYNC_GUI_ABOUT_WINDOW_HPP
|
|
||||||
#define CLRSYNC_GUI_ABOUT_WINDOW_HPP
|
|
||||||
|
|
||||||
#include "core/palette/palette.hpp"
|
|
||||||
|
|
||||||
class about_window
|
|
||||||
{
|
|
||||||
public:
|
|
||||||
about_window();
|
|
||||||
void render(const clrsync::core::palette& pal);
|
|
||||||
void render() { render(m_default_palette); }
|
|
||||||
void show() { m_visible = true; }
|
|
||||||
void hide() { m_visible = false; }
|
|
||||||
bool is_visible() const { return m_visible; }
|
|
||||||
|
|
||||||
private:
|
|
||||||
bool m_visible{false};
|
|
||||||
clrsync::core::palette m_default_palette;
|
|
||||||
};
|
|
||||||
|
|
||||||
#endif // CLRSYNC_GUI_ABOUT_WINDOW_HPP
|
|
||||||
@@ -1,35 +0,0 @@
|
|||||||
#ifndef CLRSYNC_GUI_COLOR_SCHEME_EDITOR_HPP
|
|
||||||
#define CLRSYNC_GUI_COLOR_SCHEME_EDITOR_HPP
|
|
||||||
|
|
||||||
#include "palette_controller.hpp"
|
|
||||||
#include "color_table_renderer.hpp"
|
|
||||||
#include "preview_renderer.hpp"
|
|
||||||
|
|
||||||
class template_editor;
|
|
||||||
class settings_window;
|
|
||||||
|
|
||||||
class color_scheme_editor
|
|
||||||
{
|
|
||||||
public:
|
|
||||||
color_scheme_editor();
|
|
||||||
|
|
||||||
void render_controls_and_colors();
|
|
||||||
void render_preview();
|
|
||||||
void set_template_editor(template_editor* editor) { m_template_editor = editor; }
|
|
||||||
void set_settings_window(settings_window* window) { m_settings_window = window; }
|
|
||||||
const palette_controller& controller() const { return m_controller; }
|
|
||||||
|
|
||||||
private:
|
|
||||||
void render_controls();
|
|
||||||
void apply_themes();
|
|
||||||
void notify_palette_changed();
|
|
||||||
|
|
||||||
palette_controller m_controller;
|
|
||||||
color_table_renderer m_color_table;
|
|
||||||
preview_renderer m_preview;
|
|
||||||
template_editor* m_template_editor{nullptr};
|
|
||||||
settings_window* m_settings_window{nullptr};
|
|
||||||
bool m_show_delete_confirmation{false};
|
|
||||||
};
|
|
||||||
|
|
||||||
#endif // CLRSYNC_GUI_COLOR_SCHEME_EDITOR_HPP
|
|
||||||
@@ -1,30 +0,0 @@
|
|||||||
#ifndef CLRSYNC_GUI_COLOR_TABLE_RENDERER_HPP
|
|
||||||
#define CLRSYNC_GUI_COLOR_TABLE_RENDERER_HPP
|
|
||||||
|
|
||||||
#include "core/palette/palette.hpp"
|
|
||||||
#include "palette_controller.hpp"
|
|
||||||
#include <functional>
|
|
||||||
#include <string>
|
|
||||||
|
|
||||||
class color_table_renderer
|
|
||||||
{
|
|
||||||
public:
|
|
||||||
using OnColorChangedCallback = std::function<void()>;
|
|
||||||
|
|
||||||
void render(const clrsync::core::palette& palette,
|
|
||||||
palette_controller& controller,
|
|
||||||
const OnColorChangedCallback& on_changed);
|
|
||||||
|
|
||||||
private:
|
|
||||||
void render_color_row(const std::string& name,
|
|
||||||
const clrsync::core::palette& palette,
|
|
||||||
palette_controller& controller,
|
|
||||||
const OnColorChangedCallback& on_changed);
|
|
||||||
|
|
||||||
bool matches_filter(const std::string& name) const;
|
|
||||||
|
|
||||||
char m_filter_text[128] = {0};
|
|
||||||
bool m_show_only_modified{false};
|
|
||||||
};
|
|
||||||
|
|
||||||
#endif // CLRSYNC_GUI_COLOR_TABLE_RENDERER_HPP
|
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
#include "palette_controller.hpp"
|
#include "gui/controllers/palette_controller.hpp"
|
||||||
#include "core/config/config.hpp"
|
#include "core/config/config.hpp"
|
||||||
#include "core/theme/theme_renderer.hpp"
|
#include "core/theme/theme_renderer.hpp"
|
||||||
|
|
||||||
@@ -7,39 +7,43 @@ palette_controller::palette_controller()
|
|||||||
m_palette_manager.load_palettes_from_directory(
|
m_palette_manager.load_palettes_from_directory(
|
||||||
clrsync::core::config::instance().palettes_path());
|
clrsync::core::config::instance().palettes_path());
|
||||||
m_palettes = m_palette_manager.palettes();
|
m_palettes = m_palette_manager.palettes();
|
||||||
|
|
||||||
if (m_palettes.empty())
|
if (m_palettes.empty())
|
||||||
return;
|
return;
|
||||||
|
|
||||||
auto default_theme = clrsync::core::config::instance().default_theme();
|
auto default_theme = clrsync::core::config::instance().default_theme();
|
||||||
auto it = m_palettes.find(default_theme);
|
auto it = m_palettes.find(default_theme);
|
||||||
if (it != m_palettes.end()) {
|
if (it != m_palettes.end())
|
||||||
|
{
|
||||||
m_current_palette = it->second;
|
m_current_palette = it->second;
|
||||||
} else {
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
m_current_palette = m_palettes.begin()->second;
|
m_current_palette = m_palettes.begin()->second;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void palette_controller::select_palette(const std::string& name)
|
void palette_controller::select_palette(const std::string &name)
|
||||||
{
|
{
|
||||||
auto it = m_palettes.find(name);
|
auto it = m_palettes.find(name);
|
||||||
if (it != m_palettes.end()) {
|
if (it != m_palettes.end())
|
||||||
|
{
|
||||||
m_current_palette = it->second;
|
m_current_palette = it->second;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void palette_controller::create_palette(const std::string& name)
|
void palette_controller::create_palette(const std::string &name)
|
||||||
{
|
{
|
||||||
clrsync::core::palette new_palette(name);
|
clrsync::core::palette new_palette(name);
|
||||||
|
|
||||||
for (const auto& [key, hex_value] : clrsync::core::DEFAULT_COLORS)
|
for (const auto &[key, hex_value] : clrsync::core::DEFAULT_COLORS)
|
||||||
{
|
{
|
||||||
new_palette.set_color(key, clrsync::core::color(hex_value));
|
new_palette.set_color(key, clrsync::core::color(hex_value));
|
||||||
}
|
}
|
||||||
|
|
||||||
auto dir = clrsync::core::config::instance().palettes_path();
|
auto dir = clrsync::core::config::instance().palettes_path();
|
||||||
m_palette_manager.save_palette_to_file(new_palette, dir);
|
m_palette_manager.save_palette_to_file(new_palette, dir);
|
||||||
|
|
||||||
reload_palettes();
|
reload_palettes();
|
||||||
m_current_palette = new_palette;
|
m_current_palette = new_palette;
|
||||||
}
|
}
|
||||||
@@ -63,7 +67,7 @@ void palette_controller::apply_current_theme() const
|
|||||||
(void)theme_renderer.apply_theme(m_current_palette.name());
|
(void)theme_renderer.apply_theme(m_current_palette.name());
|
||||||
}
|
}
|
||||||
|
|
||||||
void palette_controller::set_color(const std::string& key, const clrsync::core::color& color)
|
void palette_controller::set_color(const std::string &key, const clrsync::core::color &color)
|
||||||
{
|
{
|
||||||
m_current_palette.set_color(key, color);
|
m_current_palette.set_color(key, color);
|
||||||
}
|
}
|
||||||
@@ -6,23 +6,30 @@
|
|||||||
#include <string>
|
#include <string>
|
||||||
#include <unordered_map>
|
#include <unordered_map>
|
||||||
|
|
||||||
class palette_controller {
|
class palette_controller
|
||||||
public:
|
{
|
||||||
|
public:
|
||||||
palette_controller();
|
palette_controller();
|
||||||
|
|
||||||
const clrsync::core::palette& current_palette() const { return m_current_palette; }
|
const clrsync::core::palette ¤t_palette() const
|
||||||
const std::unordered_map<std::string, clrsync::core::palette>& palettes() const { return m_palettes; }
|
{
|
||||||
|
return m_current_palette;
|
||||||
|
}
|
||||||
|
const std::unordered_map<std::string, clrsync::core::palette> &palettes() const
|
||||||
|
{
|
||||||
|
return m_palettes;
|
||||||
|
}
|
||||||
|
|
||||||
void select_palette(const std::string& name);
|
void select_palette(const std::string &name);
|
||||||
void create_palette(const std::string& name);
|
void create_palette(const std::string &name);
|
||||||
void save_current_palette();
|
void save_current_palette();
|
||||||
void delete_current_palette();
|
void delete_current_palette();
|
||||||
void apply_current_theme() const;
|
void apply_current_theme() const;
|
||||||
void set_color(const std::string& key, const clrsync::core::color& color);
|
void set_color(const std::string &key, const clrsync::core::color &color);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
void reload_palettes();
|
void reload_palettes();
|
||||||
|
|
||||||
clrsync::core::palette_manager<clrsync::core::io::toml_file> m_palette_manager;
|
clrsync::core::palette_manager<clrsync::core::io::toml_file> m_palette_manager;
|
||||||
std::unordered_map<std::string, clrsync::core::palette> m_palettes;
|
std::unordered_map<std::string, clrsync::core::palette> m_palettes;
|
||||||
clrsync::core::palette m_current_palette;
|
clrsync::core::palette m_current_palette;
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
#include "template_controller.hpp"
|
#include "gui/controllers/template_controller.hpp"
|
||||||
#include "core/config/config.hpp"
|
#include "core/config/config.hpp"
|
||||||
|
|
||||||
template_controller::template_controller()
|
template_controller::template_controller()
|
||||||
@@ -6,46 +6,52 @@ template_controller::template_controller()
|
|||||||
m_templates = m_template_manager.templates();
|
m_templates = m_template_manager.templates();
|
||||||
}
|
}
|
||||||
|
|
||||||
void template_controller::set_template_enabled(const std::string& key, bool enabled)
|
void template_controller::set_template_enabled(const std::string &key, bool enabled)
|
||||||
{
|
{
|
||||||
auto it = m_templates.find(key);
|
auto it = m_templates.find(key);
|
||||||
if (it != m_templates.end()) {
|
if (it != m_templates.end())
|
||||||
|
{
|
||||||
it->second.set_enabled(enabled);
|
it->second.set_enabled(enabled);
|
||||||
(void)clrsync::core::config::instance().update_template(key, it->second);
|
(void)clrsync::core::config::instance().update_template(key, it->second);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void template_controller::set_template_input_path(const std::string& key, const std::string& path)
|
void template_controller::set_template_input_path(const std::string &key, const std::string &path)
|
||||||
{
|
{
|
||||||
auto it = m_templates.find(key);
|
auto it = m_templates.find(key);
|
||||||
if (it != m_templates.end()) {
|
if (it != m_templates.end())
|
||||||
|
{
|
||||||
it->second.set_template_path(path);
|
it->second.set_template_path(path);
|
||||||
(void)clrsync::core::config::instance().update_template(key, it->second);
|
(void)clrsync::core::config::instance().update_template(key, it->second);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void template_controller::set_template_output_path(const std::string& key, const std::string& path)
|
void template_controller::set_template_output_path(const std::string &key, const std::string &path)
|
||||||
{
|
{
|
||||||
auto it = m_templates.find(key);
|
auto it = m_templates.find(key);
|
||||||
if (it != m_templates.end()) {
|
if (it != m_templates.end())
|
||||||
|
{
|
||||||
it->second.set_output_path(path);
|
it->second.set_output_path(path);
|
||||||
(void)clrsync::core::config::instance().update_template(key, it->second);
|
(void)clrsync::core::config::instance().update_template(key, it->second);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void template_controller::set_template_reload_command(const std::string& key, const std::string& cmd)
|
void template_controller::set_template_reload_command(const std::string &key,
|
||||||
|
const std::string &cmd)
|
||||||
{
|
{
|
||||||
auto it = m_templates.find(key);
|
auto it = m_templates.find(key);
|
||||||
if (it != m_templates.end()) {
|
if (it != m_templates.end())
|
||||||
|
{
|
||||||
it->second.set_reload_command(cmd);
|
it->second.set_reload_command(cmd);
|
||||||
(void)clrsync::core::config::instance().update_template(key, it->second);
|
(void)clrsync::core::config::instance().update_template(key, it->second);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
bool template_controller::remove_template(const std::string& key)
|
bool template_controller::remove_template(const std::string &key)
|
||||||
{
|
{
|
||||||
auto result = clrsync::core::config::instance().remove_template(key);
|
auto result = clrsync::core::config::instance().remove_template(key);
|
||||||
if (result) {
|
if (result)
|
||||||
|
{
|
||||||
m_templates.erase(key);
|
m_templates.erase(key);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
@@ -1,24 +1,29 @@
|
|||||||
#ifndef CLRSYNC_GUI_TEMPLATE_CONTROLLER_HPP
|
#ifndef CLRSYNC_GUI_TEMPLATE_CONTROLLER_HPP
|
||||||
#define CLRSYNC_GUI_TEMPLATE_CONTROLLER_HPP
|
#define CLRSYNC_GUI_TEMPLATE_CONTROLLER_HPP
|
||||||
|
|
||||||
#include "core/theme/theme_template.hpp"
|
|
||||||
#include "core/theme/template_manager.hpp"
|
|
||||||
#include "core/io/toml_file.hpp"
|
#include "core/io/toml_file.hpp"
|
||||||
|
#include "core/theme/template_manager.hpp"
|
||||||
|
#include "core/theme/theme_template.hpp"
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <unordered_map>
|
#include <unordered_map>
|
||||||
|
|
||||||
class template_controller {
|
class template_controller
|
||||||
public:
|
{
|
||||||
|
public:
|
||||||
template_controller();
|
template_controller();
|
||||||
[[nodiscard]] const std::unordered_map<std::string, clrsync::core::theme_template>& templates() const { return m_templates; }
|
[[nodiscard]] const std::unordered_map<std::string, clrsync::core::theme_template> &templates()
|
||||||
void set_template_enabled(const std::string& key, bool enabled);
|
const
|
||||||
void set_template_input_path(const std::string& key, const std::string& path);
|
{
|
||||||
void set_template_output_path(const std::string& key, const std::string& path);
|
return m_templates;
|
||||||
void set_template_reload_command(const std::string& key, const std::string& cmd);
|
}
|
||||||
bool remove_template(const std::string& key);
|
void set_template_enabled(const std::string &key, bool enabled);
|
||||||
|
void set_template_input_path(const std::string &key, const std::string &path);
|
||||||
|
void set_template_output_path(const std::string &key, const std::string &path);
|
||||||
|
void set_template_reload_command(const std::string &key, const std::string &cmd);
|
||||||
|
bool remove_template(const std::string &key);
|
||||||
void refresh();
|
void refresh();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
clrsync::core::template_manager<clrsync::core::io::toml_file> m_template_manager;
|
clrsync::core::template_manager<clrsync::core::io::toml_file> m_template_manager;
|
||||||
std::unordered_map<std::string, clrsync::core::theme_template> m_templates;
|
std::unordered_map<std::string, clrsync::core::theme_template> m_templates;
|
||||||
};
|
};
|
||||||
@@ -1,10 +1,10 @@
|
|||||||
#include "theme_applier.hpp"
|
#include "gui/controllers/theme_applier.hpp"
|
||||||
#include "imgui.h"
|
#include "imgui.h"
|
||||||
|
|
||||||
namespace theme_applier
|
namespace theme_applier
|
||||||
{
|
{
|
||||||
|
|
||||||
static uint32_t get_color_u32(const clrsync::core::palette& current, const std::string &key)
|
static uint32_t get_color_u32(const clrsync::core::palette ¤t, const std::string &key)
|
||||||
{
|
{
|
||||||
const auto &col = current.get_color(key);
|
const auto &col = current.get_color(key);
|
||||||
const uint32_t hex = col.hex();
|
const uint32_t hex = col.hex();
|
||||||
@@ -16,7 +16,7 @@ static uint32_t get_color_u32(const clrsync::core::palette& current, const std::
|
|||||||
return (a << 24) | (b << 16) | (g << 8) | r;
|
return (a << 24) | (b << 16) | (g << 8) | r;
|
||||||
}
|
}
|
||||||
|
|
||||||
void apply_to_editor(TextEditor& editor, const clrsync::core::palette& current)
|
void apply_to_editor(TextEditor &editor, const clrsync::core::palette ¤t)
|
||||||
{
|
{
|
||||||
auto palette = editor.GetPalette();
|
auto palette = editor.GetPalette();
|
||||||
|
|
||||||
@@ -26,32 +26,40 @@ void apply_to_editor(TextEditor& editor, const clrsync::core::palette& current)
|
|||||||
palette[int(TextEditor::PaletteIndex::String)] = get_color_u32(current, "editor_string");
|
palette[int(TextEditor::PaletteIndex::String)] = get_color_u32(current, "editor_string");
|
||||||
palette[int(TextEditor::PaletteIndex::CharLiteral)] = get_color_u32(current, "editor_string");
|
palette[int(TextEditor::PaletteIndex::CharLiteral)] = get_color_u32(current, "editor_string");
|
||||||
palette[int(TextEditor::PaletteIndex::Punctuation)] = get_color_u32(current, "editor_main");
|
palette[int(TextEditor::PaletteIndex::Punctuation)] = get_color_u32(current, "editor_main");
|
||||||
palette[int(TextEditor::PaletteIndex::Preprocessor)] = get_color_u32(current, "editor_emphasis");
|
palette[int(TextEditor::PaletteIndex::Preprocessor)] =
|
||||||
|
get_color_u32(current, "editor_emphasis");
|
||||||
palette[int(TextEditor::PaletteIndex::Identifier)] = get_color_u32(current, "editor_main");
|
palette[int(TextEditor::PaletteIndex::Identifier)] = get_color_u32(current, "editor_main");
|
||||||
palette[int(TextEditor::PaletteIndex::KnownIdentifier)] = get_color_u32(current, "editor_link");
|
palette[int(TextEditor::PaletteIndex::KnownIdentifier)] = get_color_u32(current, "editor_link");
|
||||||
palette[int(TextEditor::PaletteIndex::PreprocIdentifier)] = get_color_u32(current, "editor_link");
|
palette[int(TextEditor::PaletteIndex::PreprocIdentifier)] =
|
||||||
|
get_color_u32(current, "editor_link");
|
||||||
|
|
||||||
palette[int(TextEditor::PaletteIndex::Comment)] = get_color_u32(current, "editor_comment");
|
palette[int(TextEditor::PaletteIndex::Comment)] = get_color_u32(current, "editor_comment");
|
||||||
palette[int(TextEditor::PaletteIndex::MultiLineComment)] = get_color_u32(current, "editor_comment");
|
palette[int(TextEditor::PaletteIndex::MultiLineComment)] =
|
||||||
|
get_color_u32(current, "editor_comment");
|
||||||
|
|
||||||
palette[int(TextEditor::PaletteIndex::Background)] = get_color_u32(current, "editor_background");
|
palette[int(TextEditor::PaletteIndex::Background)] =
|
||||||
|
get_color_u32(current, "editor_background");
|
||||||
palette[int(TextEditor::PaletteIndex::Cursor)] = get_color_u32(current, "cursor");
|
palette[int(TextEditor::PaletteIndex::Cursor)] = get_color_u32(current, "cursor");
|
||||||
|
|
||||||
palette[int(TextEditor::PaletteIndex::Selection)] = get_color_u32(current, "editor_selected");
|
palette[int(TextEditor::PaletteIndex::Selection)] = get_color_u32(current, "editor_selected");
|
||||||
palette[int(TextEditor::PaletteIndex::ErrorMarker)] = get_color_u32(current, "editor_error");
|
palette[int(TextEditor::PaletteIndex::ErrorMarker)] = get_color_u32(current, "editor_error");
|
||||||
palette[int(TextEditor::PaletteIndex::Breakpoint)] = get_color_u32(current, "editor_error");
|
palette[int(TextEditor::PaletteIndex::Breakpoint)] = get_color_u32(current, "editor_error");
|
||||||
|
|
||||||
palette[int(TextEditor::PaletteIndex::LineNumber)] = get_color_u32(current, "editor_line_number");
|
palette[int(TextEditor::PaletteIndex::LineNumber)] =
|
||||||
|
get_color_u32(current, "editor_line_number");
|
||||||
palette[int(TextEditor::PaletteIndex::CurrentLineFill)] = get_color_u32(current, "surface_variant");
|
|
||||||
palette[int(TextEditor::PaletteIndex::CurrentLineFillInactive)] = get_color_u32(current, "surface");
|
|
||||||
|
|
||||||
palette[int(TextEditor::PaletteIndex::CurrentLineEdge)] = get_color_u32(current, "border_focused");
|
palette[int(TextEditor::PaletteIndex::CurrentLineFill)] =
|
||||||
|
get_color_u32(current, "surface_variant");
|
||||||
|
palette[int(TextEditor::PaletteIndex::CurrentLineFillInactive)] =
|
||||||
|
get_color_u32(current, "surface");
|
||||||
|
|
||||||
|
palette[int(TextEditor::PaletteIndex::CurrentLineEdge)] =
|
||||||
|
get_color_u32(current, "border_focused");
|
||||||
|
|
||||||
editor.SetPalette(palette);
|
editor.SetPalette(palette);
|
||||||
}
|
}
|
||||||
|
|
||||||
void apply_to_imgui(const clrsync::core::palette& current)
|
void apply_to_imgui(const clrsync::core::palette ¤t)
|
||||||
{
|
{
|
||||||
auto getColor = [&](const std::string &key) -> ImVec4 {
|
auto getColor = [&](const std::string &key) -> ImVec4 {
|
||||||
const auto &col = current.get_color(key);
|
const auto &col = current.get_color(key);
|
||||||
@@ -72,7 +80,7 @@ void apply_to_imgui(const clrsync::core::palette& current)
|
|||||||
const ImVec4 fgInactive = getColor("editor_inactive");
|
const ImVec4 fgInactive = getColor("editor_inactive");
|
||||||
const ImVec4 accent = getColor("accent");
|
const ImVec4 accent = getColor("accent");
|
||||||
const ImVec4 border = getColor("border");
|
const ImVec4 border = getColor("border");
|
||||||
|
|
||||||
const ImVec4 error = getColor("error");
|
const ImVec4 error = getColor("error");
|
||||||
const ImVec4 onError = getColor("on_error");
|
const ImVec4 onError = getColor("on_error");
|
||||||
const ImVec4 success = getColor("success");
|
const ImVec4 success = getColor("success");
|
||||||
@@ -138,7 +146,8 @@ void apply_to_imgui(const clrsync::core::palette& current)
|
|||||||
ImVec4(border.x * 0.7f, border.y * 0.7f, border.z * 0.7f, border.w);
|
ImVec4(border.x * 0.7f, border.y * 0.7f, border.z * 0.7f, border.w);
|
||||||
|
|
||||||
style.Colors[ImGuiCol_TableRowBg] = ImVec4(0, 0, 0, 0);
|
style.Colors[ImGuiCol_TableRowBg] = ImVec4(0, 0, 0, 0);
|
||||||
style.Colors[ImGuiCol_TableRowBgAlt] = ImVec4(onSurfaceVariant.x, onSurfaceVariant.y, onSurfaceVariant.z, 0.06f);
|
style.Colors[ImGuiCol_TableRowBgAlt] =
|
||||||
|
ImVec4(onSurfaceVariant.x, onSurfaceVariant.y, onSurfaceVariant.z, 0.06f);
|
||||||
|
|
||||||
style.Colors[ImGuiCol_Separator] = border;
|
style.Colors[ImGuiCol_Separator] = border;
|
||||||
style.Colors[ImGuiCol_SeparatorHovered] = accent;
|
style.Colors[ImGuiCol_SeparatorHovered] = accent;
|
||||||
@@ -1,13 +1,13 @@
|
|||||||
#ifndef CLRSYNC_GUI_THEME_APPLIER_HPP
|
#ifndef CLRSYNC_GUI_THEME_APPLIER_HPP
|
||||||
#define CLRSYNC_GUI_THEME_APPLIER_HPP
|
#define CLRSYNC_GUI_THEME_APPLIER_HPP
|
||||||
|
|
||||||
#include "core/palette/palette.hpp"
|
|
||||||
#include "color_text_edit/TextEditor.h"
|
#include "color_text_edit/TextEditor.h"
|
||||||
|
#include "core/palette/palette.hpp"
|
||||||
|
|
||||||
namespace theme_applier
|
namespace theme_applier
|
||||||
{
|
{
|
||||||
void apply_to_imgui(const clrsync::core::palette& pal);
|
void apply_to_imgui(const clrsync::core::palette &pal);
|
||||||
void apply_to_editor(TextEditor& editor, const clrsync::core::palette& pal);
|
void apply_to_editor(TextEditor &editor, const clrsync::core::palette &pal);
|
||||||
}
|
} // namespace theme_applier
|
||||||
|
|
||||||
#endif // CLRSYNC_GUI_THEME_APPLIER_HPP
|
#endif // CLRSYNC_GUI_THEME_APPLIER_HPP
|
||||||
@@ -1,263 +0,0 @@
|
|||||||
#include "file_browser.hpp"
|
|
||||||
#include <filesystem>
|
|
||||||
|
|
||||||
#ifdef _WIN32
|
|
||||||
#include <windows.h>
|
|
||||||
#include <commdlg.h>
|
|
||||||
#include <shlobj.h>
|
|
||||||
#include <shlwapi.h>
|
|
||||||
#include <cstring>
|
|
||||||
|
|
||||||
namespace file_dialogs {
|
|
||||||
|
|
||||||
std::string open_file_dialog(const std::string& title,
|
|
||||||
const std::string& initial_path,
|
|
||||||
const std::vector<std::string>& filters) {
|
|
||||||
OPENFILENAMEA ofn;
|
|
||||||
char file[MAX_PATH] = "";
|
|
||||||
|
|
||||||
std::string filter_str = "All Files (*.*)\0*.*\0";
|
|
||||||
|
|
||||||
ZeroMemory(&ofn, sizeof(ofn));
|
|
||||||
ofn.lStructSize = sizeof(ofn);
|
|
||||||
ofn.hwndOwner = GetActiveWindow();
|
|
||||||
ofn.lpstrFile = file;
|
|
||||||
ofn.nMaxFile = sizeof(file);
|
|
||||||
ofn.lpstrFilter = filter_str.c_str();
|
|
||||||
ofn.nFilterIndex = 1;
|
|
||||||
ofn.lpstrTitle = title.c_str();
|
|
||||||
ofn.Flags = OFN_PATHMUSTEXIST | OFN_FILEMUSTEXIST | OFN_NOCHANGEDIR;
|
|
||||||
|
|
||||||
if (!initial_path.empty() && std::filesystem::exists(initial_path)) {
|
|
||||||
std::filesystem::path p(initial_path);
|
|
||||||
if (std::filesystem::is_directory(p)) {
|
|
||||||
ofn.lpstrInitialDir = initial_path.c_str();
|
|
||||||
} else {
|
|
||||||
std::string dir = p.parent_path().string();
|
|
||||||
std::string name = p.filename().string();
|
|
||||||
ofn.lpstrInitialDir = dir.c_str();
|
|
||||||
strncpy(file, name.c_str(), sizeof(file) - 1);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (GetOpenFileNameA(&ofn)) {
|
|
||||||
return std::string(file);
|
|
||||||
}
|
|
||||||
return "";
|
|
||||||
}
|
|
||||||
|
|
||||||
std::string save_file_dialog(const std::string& title,
|
|
||||||
const std::string& initial_path,
|
|
||||||
const std::vector<std::string>& filters) {
|
|
||||||
OPENFILENAMEA ofn;
|
|
||||||
char file[MAX_PATH] = "";
|
|
||||||
|
|
||||||
std::string filter_str = "All Files\0*.*\0\0";
|
|
||||||
|
|
||||||
ZeroMemory(&ofn, sizeof(ofn));
|
|
||||||
ofn.lStructSize = sizeof(ofn);
|
|
||||||
ofn.hwndOwner = GetActiveWindow();
|
|
||||||
ofn.lpstrFile = file;
|
|
||||||
ofn.nMaxFile = sizeof(file);
|
|
||||||
ofn.lpstrFilter = filter_str.c_str();
|
|
||||||
ofn.nFilterIndex = 1;
|
|
||||||
ofn.lpstrTitle = title.c_str();
|
|
||||||
ofn.Flags = OFN_PATHMUSTEXIST | OFN_OVERWRITEPROMPT | OFN_NOCHANGEDIR;
|
|
||||||
|
|
||||||
if (!initial_path.empty()) {
|
|
||||||
std::filesystem::path p(initial_path);
|
|
||||||
if (std::filesystem::exists(p) && std::filesystem::is_directory(p)) {
|
|
||||||
ofn.lpstrInitialDir = initial_path.c_str();
|
|
||||||
} else {
|
|
||||||
std::string dir = p.parent_path().string();
|
|
||||||
std::string name = p.filename().string();
|
|
||||||
if (std::filesystem::exists(dir)) {
|
|
||||||
ofn.lpstrInitialDir = dir.c_str();
|
|
||||||
strncpy(file, name.c_str(), sizeof(file) - 1);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (GetSaveFileNameA(&ofn)) {
|
|
||||||
return std::string(file);
|
|
||||||
}
|
|
||||||
return "";
|
|
||||||
}
|
|
||||||
|
|
||||||
std::string select_folder_dialog(const std::string& title,
|
|
||||||
const std::string& initial_path) {
|
|
||||||
IFileOpenDialog *pFileOpen;
|
|
||||||
|
|
||||||
HRESULT hr = CoCreateInstance(CLSID_FileOpenDialog, NULL, CLSCTX_ALL,
|
|
||||||
IID_IFileOpenDialog, reinterpret_cast<void**>(&pFileOpen));
|
|
||||||
|
|
||||||
if (SUCCEEDED(hr)) {
|
|
||||||
DWORD dwFlags;
|
|
||||||
if (SUCCEEDED(pFileOpen->GetOptions(&dwFlags))) {
|
|
||||||
pFileOpen->SetOptions(dwFlags | FOS_PICKFOLDERS);
|
|
||||||
}
|
|
||||||
|
|
||||||
std::wstring wtitle(title.begin(), title.end());
|
|
||||||
pFileOpen->SetTitle(wtitle.c_str());
|
|
||||||
|
|
||||||
if (!initial_path.empty() && std::filesystem::exists(initial_path)) {
|
|
||||||
IShellItem *psi = NULL;
|
|
||||||
std::wstring winitial(initial_path.begin(), initial_path.end());
|
|
||||||
hr = SHCreateItemFromParsingName(winitial.c_str(), NULL, IID_IShellItem, (void**)&psi);
|
|
||||||
if (SUCCEEDED(hr)) {
|
|
||||||
pFileOpen->SetFolder(psi);
|
|
||||||
psi->Release();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
hr = pFileOpen->Show(GetActiveWindow());
|
|
||||||
|
|
||||||
if (SUCCEEDED(hr)) {
|
|
||||||
IShellItem *pItem;
|
|
||||||
hr = pFileOpen->GetResult(&pItem);
|
|
||||||
if (SUCCEEDED(hr)) {
|
|
||||||
PWSTR pszFilePath;
|
|
||||||
hr = pItem->GetDisplayName(SIGDN_FILESYSPATH, &pszFilePath);
|
|
||||||
|
|
||||||
if (SUCCEEDED(hr)) {
|
|
||||||
std::wstring wpath(pszFilePath);
|
|
||||||
std::string result(wpath.begin(), wpath.end());
|
|
||||||
CoTaskMemFree(pszFilePath);
|
|
||||||
pItem->Release();
|
|
||||||
pFileOpen->Release();
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
pItem->Release();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
pFileOpen->Release();
|
|
||||||
}
|
|
||||||
|
|
||||||
return "";
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
#elif !defined(__APPLE__)
|
|
||||||
|
|
||||||
#include <gtk/gtk.h>
|
|
||||||
|
|
||||||
namespace file_dialogs {
|
|
||||||
|
|
||||||
std::string open_file_dialog(const std::string& title,
|
|
||||||
const std::string& initial_path,
|
|
||||||
const std::vector<std::string>& filters) {
|
|
||||||
if (!gtk_init_check(nullptr, nullptr)) {
|
|
||||||
return "";
|
|
||||||
}
|
|
||||||
|
|
||||||
GtkFileChooserNative *native = gtk_file_chooser_native_new(
|
|
||||||
title.c_str(),
|
|
||||||
nullptr,
|
|
||||||
GTK_FILE_CHOOSER_ACTION_OPEN,
|
|
||||||
"_Open",
|
|
||||||
"_Cancel");
|
|
||||||
|
|
||||||
GtkFileChooser *chooser = GTK_FILE_CHOOSER(native);
|
|
||||||
|
|
||||||
if (!initial_path.empty()) {
|
|
||||||
std::filesystem::path p(initial_path);
|
|
||||||
if (std::filesystem::exists(p)) {
|
|
||||||
if (std::filesystem::is_directory(p)) {
|
|
||||||
gtk_file_chooser_set_current_folder(chooser, initial_path.c_str());
|
|
||||||
} else {
|
|
||||||
gtk_file_chooser_set_current_folder(chooser, p.parent_path().c_str());
|
|
||||||
gtk_file_chooser_set_current_name(chooser, p.filename().c_str());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
std::string result;
|
|
||||||
if (gtk_native_dialog_run(GTK_NATIVE_DIALOG(native)) == GTK_RESPONSE_ACCEPT) {
|
|
||||||
char* filename = gtk_file_chooser_get_filename(chooser);
|
|
||||||
if (filename) {
|
|
||||||
result = filename;
|
|
||||||
g_free(filename);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
g_object_unref(native);
|
|
||||||
while (gtk_events_pending()) gtk_main_iteration();
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
|
|
||||||
std::string save_file_dialog(const std::string& title,
|
|
||||||
const std::string& initial_path,
|
|
||||||
const std::vector<std::string>& filters) {
|
|
||||||
if (!gtk_init_check(nullptr, nullptr)) {
|
|
||||||
return "";
|
|
||||||
}
|
|
||||||
|
|
||||||
GtkFileChooserNative *native = gtk_file_chooser_native_new(
|
|
||||||
title.c_str(),
|
|
||||||
nullptr,
|
|
||||||
GTK_FILE_CHOOSER_ACTION_SAVE,
|
|
||||||
"_Save",
|
|
||||||
"_Cancel");
|
|
||||||
|
|
||||||
GtkFileChooser *chooser = GTK_FILE_CHOOSER(native);
|
|
||||||
gtk_file_chooser_set_do_overwrite_confirmation(chooser, TRUE);
|
|
||||||
|
|
||||||
if (!initial_path.empty()) {
|
|
||||||
std::filesystem::path p(initial_path);
|
|
||||||
if (std::filesystem::exists(p.parent_path())) {
|
|
||||||
gtk_file_chooser_set_current_folder(chooser, p.parent_path().c_str());
|
|
||||||
gtk_file_chooser_set_current_name(chooser, p.filename().c_str());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
std::string result;
|
|
||||||
if (gtk_native_dialog_run(GTK_NATIVE_DIALOG(native)) == GTK_RESPONSE_ACCEPT) {
|
|
||||||
char* filename = gtk_file_chooser_get_filename(chooser);
|
|
||||||
if (filename) {
|
|
||||||
result = filename;
|
|
||||||
g_free(filename);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
g_object_unref(native);
|
|
||||||
while (gtk_events_pending()) gtk_main_iteration();
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
|
|
||||||
std::string select_folder_dialog(const std::string& title,
|
|
||||||
const std::string& initial_path) {
|
|
||||||
if (!gtk_init_check(nullptr, nullptr)) {
|
|
||||||
return "";
|
|
||||||
}
|
|
||||||
|
|
||||||
GtkFileChooserNative *native = gtk_file_chooser_native_new(
|
|
||||||
title.c_str(),
|
|
||||||
nullptr,
|
|
||||||
GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER,
|
|
||||||
"_Select",
|
|
||||||
"_Cancel");
|
|
||||||
|
|
||||||
GtkFileChooser *chooser = GTK_FILE_CHOOSER(native);
|
|
||||||
|
|
||||||
if (!initial_path.empty() && std::filesystem::exists(initial_path)) {
|
|
||||||
gtk_file_chooser_set_current_folder(chooser, initial_path.c_str());
|
|
||||||
}
|
|
||||||
|
|
||||||
std::string result;
|
|
||||||
if (gtk_native_dialog_run(GTK_NATIVE_DIALOG(native)) == GTK_RESPONSE_ACCEPT) {
|
|
||||||
char* filename = gtk_file_chooser_get_filename(chooser);
|
|
||||||
if (filename) {
|
|
||||||
result = filename;
|
|
||||||
g_free(filename);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
g_object_unref(native);
|
|
||||||
while (gtk_events_pending()) gtk_main_iteration();
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif
|
|
||||||
@@ -1,20 +0,0 @@
|
|||||||
#ifndef CLRSYNC_GUI_FILE_BROWSER_HPP
|
|
||||||
#define CLRSYNC_GUI_FILE_BROWSER_HPP
|
|
||||||
|
|
||||||
#include <string>
|
|
||||||
#include <vector>
|
|
||||||
|
|
||||||
namespace file_dialogs {
|
|
||||||
std::string open_file_dialog(const std::string& title = "Open File",
|
|
||||||
const std::string& initial_path = "",
|
|
||||||
const std::vector<std::string>& filters = {});
|
|
||||||
|
|
||||||
std::string save_file_dialog(const std::string& title = "Save File",
|
|
||||||
const std::string& initial_path = "",
|
|
||||||
const std::vector<std::string>& filters = {});
|
|
||||||
|
|
||||||
std::string select_folder_dialog(const std::string& title = "Select Folder",
|
|
||||||
const std::string& initial_path = "");
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif // CLRSYNC_GUI_FILE_BROWSER_HPP
|
|
||||||
@@ -1,333 +0,0 @@
|
|||||||
#include "font_loader.hpp"
|
|
||||||
#include "core/config/config.hpp"
|
|
||||||
#include "imgui_internal.h"
|
|
||||||
#include <imgui.h>
|
|
||||||
#include <algorithm>
|
|
||||||
|
|
||||||
#if defined(_WIN32)
|
|
||||||
|
|
||||||
#include <algorithm>
|
|
||||||
#include <windows.h>
|
|
||||||
#include <winreg.h>
|
|
||||||
|
|
||||||
static std::string search_registry_for_font(HKEY root_key, const char* subkey, const std::string& font_name_lower, const char* default_font_dir)
|
|
||||||
{
|
|
||||||
HKEY hKey;
|
|
||||||
LONG result = RegOpenKeyExA(root_key, subkey, 0, KEY_READ, &hKey);
|
|
||||||
|
|
||||||
if (result != ERROR_SUCCESS)
|
|
||||||
return {};
|
|
||||||
|
|
||||||
char value_name[512];
|
|
||||||
BYTE value_data[512];
|
|
||||||
DWORD value_name_size, value_data_size, type;
|
|
||||||
DWORD index = 0;
|
|
||||||
|
|
||||||
std::string found_path;
|
|
||||||
|
|
||||||
while (true)
|
|
||||||
{
|
|
||||||
value_name_size = sizeof(value_name);
|
|
||||||
value_data_size = sizeof(value_data);
|
|
||||||
|
|
||||||
result = RegEnumValueA(hKey, index++, value_name, &value_name_size, nullptr, &type, value_data, &value_data_size);
|
|
||||||
|
|
||||||
if (result != ERROR_SUCCESS)
|
|
||||||
break;
|
|
||||||
|
|
||||||
if (type != REG_SZ)
|
|
||||||
continue;
|
|
||||||
|
|
||||||
std::string reg_font_name = value_name;
|
|
||||||
std::transform(reg_font_name.begin(), reg_font_name.end(), reg_font_name.begin(), ::tolower);
|
|
||||||
|
|
||||||
std::string reg_font_name_clean = reg_font_name;
|
|
||||||
size_t type_pos = reg_font_name_clean.find(" (");
|
|
||||||
if (type_pos != std::string::npos)
|
|
||||||
reg_font_name_clean = reg_font_name_clean.substr(0, type_pos);
|
|
||||||
|
|
||||||
if (reg_font_name_clean == font_name_lower)
|
|
||||||
{
|
|
||||||
std::string font_file = reinterpret_cast<char*>(value_data);
|
|
||||||
|
|
||||||
// If path is not absolute, prepend default font directory
|
|
||||||
if (font_file.find(":\\") == std::string::npos)
|
|
||||||
{
|
|
||||||
found_path = std::string(default_font_dir) + "\\" + font_file;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
found_path = font_file;
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
RegCloseKey(hKey);
|
|
||||||
return found_path;
|
|
||||||
}
|
|
||||||
|
|
||||||
std::string font_loader::find_font_windows(const char* font_name)
|
|
||||||
{
|
|
||||||
std::string font_name_lower = font_name;
|
|
||||||
std::transform(font_name_lower.begin(), font_name_lower.end(), font_name_lower.begin(), ::tolower);
|
|
||||||
|
|
||||||
char windows_dir[MAX_PATH];
|
|
||||||
GetWindowsDirectoryA(windows_dir, MAX_PATH);
|
|
||||||
std::string system_fonts_dir = std::string(windows_dir) + "\\Fonts";
|
|
||||||
|
|
||||||
// First, try system-wide fonts (HKEY_LOCAL_MACHINE)
|
|
||||||
std::string path = search_registry_for_font(
|
|
||||||
HKEY_LOCAL_MACHINE,
|
|
||||||
"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Fonts",
|
|
||||||
font_name_lower,
|
|
||||||
system_fonts_dir.c_str()
|
|
||||||
);
|
|
||||||
|
|
||||||
if (!path.empty())
|
|
||||||
return path;
|
|
||||||
|
|
||||||
// If not found, try per-user fonts (HKEY_CURRENT_USER)
|
|
||||||
char local_appdata[MAX_PATH];
|
|
||||||
if (GetEnvironmentVariableA("LOCALAPPDATA", local_appdata, MAX_PATH) > 0)
|
|
||||||
{
|
|
||||||
std::string user_fonts_dir = std::string(local_appdata) + "\\Microsoft\\Windows\\Fonts";
|
|
||||||
|
|
||||||
path = search_registry_for_font(
|
|
||||||
HKEY_CURRENT_USER,
|
|
||||||
"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Fonts",
|
|
||||||
font_name_lower,
|
|
||||||
user_fonts_dir.c_str()
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
return path;
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if defined(__APPLE__)
|
|
||||||
|
|
||||||
#include <CoreText/CoreText.h>
|
|
||||||
|
|
||||||
std::vector<unsigned char> font_loader::load_font_macos(const char* font_name)
|
|
||||||
{
|
|
||||||
std::vector<unsigned char> out;
|
|
||||||
|
|
||||||
CFStringRef cf_name = CFStringCreateWithCString(nullptr, font_name, kCFStringEncodingUTF8);
|
|
||||||
if (!cf_name)
|
|
||||||
return out;
|
|
||||||
|
|
||||||
CTFontDescriptorRef desc = CTFontDescriptorCreateWithNameAndSize(cf_name, 12);
|
|
||||||
CFRelease(cf_name);
|
|
||||||
|
|
||||||
if (!desc)
|
|
||||||
return out;
|
|
||||||
|
|
||||||
CFURLRef url = (CFURLRef)CTFontDescriptorCopyAttribute(desc, kCTFontURLAttribute);
|
|
||||||
CFRelease(desc);
|
|
||||||
|
|
||||||
if (!url)
|
|
||||||
return out;
|
|
||||||
|
|
||||||
CFDataRef data = nullptr;
|
|
||||||
Boolean success = CFURLCreateDataAndPropertiesFromResource(kCFAllocatorDefault, url, &data, nullptr, nullptr, nullptr);
|
|
||||||
CFRelease(url);
|
|
||||||
|
|
||||||
if (success && data)
|
|
||||||
{
|
|
||||||
CFIndex size = CFDataGetLength(data);
|
|
||||||
if (size > 100)
|
|
||||||
{
|
|
||||||
out.resize(size);
|
|
||||||
CFDataGetBytes(data, CFRangeMake(0, size), out.data());
|
|
||||||
}
|
|
||||||
CFRelease(data);
|
|
||||||
}
|
|
||||||
|
|
||||||
return out;
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if !defined(_WIN32) && !defined(__APPLE__)
|
|
||||||
|
|
||||||
#include <fontconfig/fontconfig.h>
|
|
||||||
|
|
||||||
std::string font_loader::find_font_linux(const char* font_name)
|
|
||||||
{
|
|
||||||
FcInit();
|
|
||||||
|
|
||||||
FcPattern* pattern = FcNameParse(reinterpret_cast<const FcChar8*>(font_name));
|
|
||||||
if (!pattern)
|
|
||||||
return {};
|
|
||||||
|
|
||||||
FcConfigSubstitute(nullptr, pattern, FcMatchPattern);
|
|
||||||
FcDefaultSubstitute(pattern);
|
|
||||||
|
|
||||||
FcResult result;
|
|
||||||
FcPattern* match = FcFontMatch(nullptr, pattern, &result);
|
|
||||||
|
|
||||||
std::string out;
|
|
||||||
|
|
||||||
if (match)
|
|
||||||
{
|
|
||||||
FcChar8* file = nullptr;
|
|
||||||
if (FcPatternGetString(match, FC_FILE, 0, &file) == FcResultMatch)
|
|
||||||
out = reinterpret_cast<const char*>(file);
|
|
||||||
|
|
||||||
FcPatternDestroy(match);
|
|
||||||
}
|
|
||||||
|
|
||||||
FcPatternDestroy(pattern);
|
|
||||||
return out;
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
std::string font_loader::find_font_path(const char* font_name)
|
|
||||||
{
|
|
||||||
#if defined(_WIN32)
|
|
||||||
return find_font_windows(font_name);
|
|
||||||
|
|
||||||
#elif defined(__APPLE__)
|
|
||||||
(void)font_name;
|
|
||||||
return {};
|
|
||||||
|
|
||||||
#else
|
|
||||||
return find_font_linux(font_name);
|
|
||||||
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
ImFont* font_loader::load_font(const char* font_name, float size_px)
|
|
||||||
{
|
|
||||||
#if defined(__APPLE__)
|
|
||||||
std::vector<unsigned char> buf = load_font_macos(font_name);
|
|
||||||
if (buf.empty())
|
|
||||||
return nullptr;
|
|
||||||
|
|
||||||
return ImGui::GetIO().Fonts->AddFontFromMemoryTTF(
|
|
||||||
buf.data(),
|
|
||||||
static_cast<int>(buf.size()),
|
|
||||||
size_px
|
|
||||||
);
|
|
||||||
|
|
||||||
#else
|
|
||||||
std::string path = find_font_path(font_name);
|
|
||||||
if (path.empty())
|
|
||||||
return nullptr;
|
|
||||||
|
|
||||||
float scale = ImGui::GetIO().DisplayFramebufferScale.y;
|
|
||||||
return ImGui::GetIO().Fonts->AddFontFromFileTTF(
|
|
||||||
path.c_str(),
|
|
||||||
size_px * scale
|
|
||||||
);
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
void font_loader::push_default_font()
|
|
||||||
{
|
|
||||||
ImGui::PushFont(ImGui::GetDefaultFont(), clrsync::core::config::instance().font_size());
|
|
||||||
}
|
|
||||||
void font_loader::pop_font()
|
|
||||||
{
|
|
||||||
ImGui::PopFont();
|
|
||||||
}
|
|
||||||
|
|
||||||
std::vector<std::string> font_loader::get_system_fonts()
|
|
||||||
{
|
|
||||||
std::vector<std::string> fonts;
|
|
||||||
|
|
||||||
#if defined(_WIN32)
|
|
||||||
auto enumerate_registry_fonts = [&fonts](HKEY root_key, const char* subkey)
|
|
||||||
{
|
|
||||||
HKEY hKey;
|
|
||||||
if (RegOpenKeyExA(root_key, subkey, 0, KEY_READ, &hKey) != ERROR_SUCCESS)
|
|
||||||
return;
|
|
||||||
|
|
||||||
char value_name[512];
|
|
||||||
DWORD value_name_size;
|
|
||||||
DWORD index = 0;
|
|
||||||
|
|
||||||
while (true)
|
|
||||||
{
|
|
||||||
value_name_size = sizeof(value_name);
|
|
||||||
LONG result = RegEnumValueA(hKey, index++, value_name, &value_name_size, nullptr, nullptr, nullptr, nullptr);
|
|
||||||
|
|
||||||
if (result != ERROR_SUCCESS)
|
|
||||||
break;
|
|
||||||
|
|
||||||
std::string font_name = value_name;
|
|
||||||
size_t pos = font_name.find(" (");
|
|
||||||
if (pos != std::string::npos)
|
|
||||||
font_name = font_name.substr(0, pos);
|
|
||||||
|
|
||||||
if (std::find(fonts.begin(), fonts.end(), font_name) == fonts.end())
|
|
||||||
fonts.push_back(font_name);
|
|
||||||
}
|
|
||||||
|
|
||||||
RegCloseKey(hKey);
|
|
||||||
};
|
|
||||||
|
|
||||||
enumerate_registry_fonts(HKEY_LOCAL_MACHINE, "SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Fonts");
|
|
||||||
enumerate_registry_fonts(HKEY_CURRENT_USER, "SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Fonts");
|
|
||||||
|
|
||||||
#elif defined(__APPLE__)
|
|
||||||
CTFontCollectionRef collection = CTFontCollectionCreateFromAvailableFonts(nullptr);
|
|
||||||
if (collection)
|
|
||||||
{
|
|
||||||
CFArrayRef fontDescriptors = CTFontCollectionCreateMatchingFontDescriptors(collection);
|
|
||||||
CFRelease(collection);
|
|
||||||
|
|
||||||
if (fontDescriptors)
|
|
||||||
{
|
|
||||||
CFIndex count = CFArrayGetCount(fontDescriptors);
|
|
||||||
for (CFIndex i = 0; i < count; i++)
|
|
||||||
{
|
|
||||||
CTFontDescriptorRef descriptor = (CTFontDescriptorRef)CFArrayGetValueAtIndex(fontDescriptors, i);
|
|
||||||
CFStringRef fontName = (CFStringRef)CTFontDescriptorCopyAttribute(descriptor, kCTFontDisplayNameAttribute);
|
|
||||||
|
|
||||||
if (fontName)
|
|
||||||
{
|
|
||||||
char buffer[256];
|
|
||||||
if (CFStringGetCString(fontName, buffer, sizeof(buffer), kCFStringEncodingUTF8))
|
|
||||||
{
|
|
||||||
std::string font_name = buffer;
|
|
||||||
if (std::find(fonts.begin(), fonts.end(), font_name) == fonts.end())
|
|
||||||
fonts.push_back(font_name);
|
|
||||||
}
|
|
||||||
CFRelease(fontName);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
CFRelease(fontDescriptors);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#else
|
|
||||||
FcInit();
|
|
||||||
FcPattern* pattern = FcPatternCreate();
|
|
||||||
FcObjectSet* os = FcObjectSetBuild(FC_FAMILY, nullptr);
|
|
||||||
FcFontSet* fs = FcFontList(nullptr, pattern, os);
|
|
||||||
|
|
||||||
if (fs)
|
|
||||||
{
|
|
||||||
for (int i = 0; i < fs->nfont; i++)
|
|
||||||
{
|
|
||||||
FcChar8* family = nullptr;
|
|
||||||
if (FcPatternGetString(fs->fonts[i], FC_FAMILY, 0, &family) == FcResultMatch)
|
|
||||||
{
|
|
||||||
std::string font_name = reinterpret_cast<const char*>(family);
|
|
||||||
if (std::find(fonts.begin(), fonts.end(), font_name) == fonts.end())
|
|
||||||
fonts.push_back(font_name);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
FcFontSetDestroy(fs);
|
|
||||||
}
|
|
||||||
|
|
||||||
FcObjectSetDestroy(os);
|
|
||||||
FcPatternDestroy(pattern);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
std::sort(fonts.begin(), fonts.end());
|
|
||||||
return fonts;
|
|
||||||
}
|
|
||||||
@@ -2,7 +2,7 @@
|
|||||||
#include <string>
|
#include <string>
|
||||||
|
|
||||||
#include "GLFW/glfw3.h"
|
#include "GLFW/glfw3.h"
|
||||||
#include "gui/settings_window.hpp"
|
#include "gui/views/settings_window.hpp"
|
||||||
#include "imgui_impl_glfw.h"
|
#include "imgui_impl_glfw.h"
|
||||||
#include "imgui_impl_opengl3.h"
|
#include "imgui_impl_opengl3.h"
|
||||||
|
|
||||||
@@ -10,12 +10,12 @@
|
|||||||
|
|
||||||
#include "imgui_internal.h"
|
#include "imgui_internal.h"
|
||||||
|
|
||||||
GLFWwindow * init_glfw()
|
GLFWwindow *init_glfw()
|
||||||
{
|
{
|
||||||
glfwSetErrorCallback([](int error, const char* description) {
|
glfwSetErrorCallback([](int error, const char *description) {
|
||||||
std::cerr << "GLFW Error " << error << ": " << description << std::endl;
|
std::cerr << "GLFW Error " << error << ": " << description << std::endl;
|
||||||
});
|
});
|
||||||
|
|
||||||
if (!glfwInit())
|
if (!glfwInit())
|
||||||
{
|
{
|
||||||
std::cerr << "Failed to initialize GLFW\n";
|
std::cerr << "Failed to initialize GLFW\n";
|
||||||
@@ -23,14 +23,14 @@ GLFWwindow * init_glfw()
|
|||||||
}
|
}
|
||||||
|
|
||||||
glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 3);
|
glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 3);
|
||||||
#ifdef __APPLE__
|
#ifdef __APPLE__
|
||||||
glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 2);
|
glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 2);
|
||||||
#else
|
#else
|
||||||
glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 0);
|
glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 0);
|
||||||
#endif
|
#endif
|
||||||
glfwWindowHint(GLFW_TRANSPARENT_FRAMEBUFFER, GLFW_TRUE);
|
glfwWindowHint(GLFW_TRANSPARENT_FRAMEBUFFER, GLFW_TRUE);
|
||||||
|
|
||||||
GLFWwindow* w = glfwCreateWindow(1280, 720, "clrsync", nullptr, nullptr);
|
GLFWwindow *w = glfwCreateWindow(1280, 720, "clrsync", nullptr, nullptr);
|
||||||
if (!w)
|
if (!w)
|
||||||
{
|
{
|
||||||
std::cerr << "Failed to create GLFW window\n";
|
std::cerr << "Failed to create GLFW window\n";
|
||||||
@@ -42,22 +42,22 @@ GLFWwindow * init_glfw()
|
|||||||
return w;
|
return w;
|
||||||
}
|
}
|
||||||
|
|
||||||
void init_imgui(GLFWwindow* window, const std::string& ini_path)
|
void init_imgui(GLFWwindow *window, const std::string &ini_path)
|
||||||
{
|
{
|
||||||
IMGUI_CHECKVERSION();
|
IMGUI_CHECKVERSION();
|
||||||
ImGui::CreateContext();
|
ImGui::CreateContext();
|
||||||
|
|
||||||
ImGuiIO& io = ImGui::GetIO();
|
ImGuiIO &io = ImGui::GetIO();
|
||||||
io.ConfigFlags |= ImGuiConfigFlags_DockingEnable;
|
io.ConfigFlags |= ImGuiConfigFlags_DockingEnable;
|
||||||
io.IniFilename = ini_path.c_str();
|
io.IniFilename = ini_path.c_str();
|
||||||
|
|
||||||
ImGui::StyleColorsDark();
|
ImGui::StyleColorsDark();
|
||||||
ImGui_ImplGlfw_InitForOpenGL(window, true);
|
ImGui_ImplGlfw_InitForOpenGL(window, true);
|
||||||
#ifdef __APPLE__
|
#ifdef __APPLE__
|
||||||
ImGui_ImplOpenGL3_Init("#version 150");
|
ImGui_ImplOpenGL3_Init("#version 150");
|
||||||
#else
|
#else
|
||||||
ImGui_ImplOpenGL3_Init("#version 120");
|
ImGui_ImplOpenGL3_Init("#version 120");
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
void begin_frame()
|
void begin_frame()
|
||||||
@@ -67,7 +67,7 @@ void begin_frame()
|
|||||||
ImGui::NewFrame();
|
ImGui::NewFrame();
|
||||||
}
|
}
|
||||||
|
|
||||||
void render_menu_bar(about_window* about, settings_window* settings)
|
void render_menu_bar(about_window *about, settings_window *settings)
|
||||||
{
|
{
|
||||||
if (ImGui::BeginMainMenuBar())
|
if (ImGui::BeginMainMenuBar())
|
||||||
{
|
{
|
||||||
@@ -99,25 +99,21 @@ void render_menu_bar(about_window* about, settings_window* settings)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void setup_main_dockspace(bool& first_time)
|
void setup_main_dockspace(bool &first_time)
|
||||||
{
|
{
|
||||||
const ImGuiViewport* viewport = ImGui::GetMainViewport();
|
const ImGuiViewport *viewport = ImGui::GetMainViewport();
|
||||||
ImGui::SetNextWindowPos(viewport->Pos);
|
ImGui::SetNextWindowPos(viewport->Pos);
|
||||||
ImGui::SetNextWindowSize(viewport->Size);
|
ImGui::SetNextWindowSize(viewport->Size);
|
||||||
ImGui::SetNextWindowViewport(viewport->ID);
|
ImGui::SetNextWindowViewport(viewport->ID);
|
||||||
|
|
||||||
constexpr ImGuiWindowFlags flags =
|
constexpr ImGuiWindowFlags flags = ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoCollapse |
|
||||||
ImGuiWindowFlags_NoTitleBar |
|
ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoMove |
|
||||||
ImGuiWindowFlags_NoCollapse |
|
ImGuiWindowFlags_NoBringToFrontOnFocus |
|
||||||
ImGuiWindowFlags_NoResize |
|
ImGuiWindowFlags_NoNavFocus | ImGuiWindowFlags_MenuBar;
|
||||||
ImGuiWindowFlags_NoMove |
|
|
||||||
ImGuiWindowFlags_NoBringToFrontOnFocus |
|
|
||||||
ImGuiWindowFlags_NoNavFocus |
|
|
||||||
ImGuiWindowFlags_MenuBar;
|
|
||||||
|
|
||||||
ImGui::PushStyleVar(ImGuiStyleVar_WindowRounding, 0.0f);
|
ImGui::PushStyleVar(ImGuiStyleVar_WindowRounding, 0.0f);
|
||||||
ImGui::PushStyleVar(ImGuiStyleVar_WindowBorderSize, 0.0f);
|
ImGui::PushStyleVar(ImGuiStyleVar_WindowBorderSize, 0.0f);
|
||||||
ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(0,0));
|
ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(0, 0));
|
||||||
ImGui::Begin("MainDockSpace", nullptr, flags);
|
ImGui::Begin("MainDockSpace", nullptr, flags);
|
||||||
ImGui::PopStyleVar(3);
|
ImGui::PopStyleVar(3);
|
||||||
|
|
||||||
@@ -134,7 +130,7 @@ void setup_main_dockspace(bool& first_time)
|
|||||||
ImGuiID center, right;
|
ImGuiID center, right;
|
||||||
ImGui::DockBuilderSplitNode(dockspace_id, ImGuiDir_Right, 0.5f, &right, ¢er);
|
ImGui::DockBuilderSplitNode(dockspace_id, ImGuiDir_Right, 0.5f, &right, ¢er);
|
||||||
|
|
||||||
ImGuiDockNode* center_node = ImGui::DockBuilderGetNode(center);
|
ImGuiDockNode *center_node = ImGui::DockBuilderGetNode(center);
|
||||||
if (center_node)
|
if (center_node)
|
||||||
{
|
{
|
||||||
center_node->LocalFlags |= ImGuiDockNodeFlags_CentralNode;
|
center_node->LocalFlags |= ImGuiDockNodeFlags_CentralNode;
|
||||||
@@ -143,15 +139,15 @@ void setup_main_dockspace(bool& first_time)
|
|||||||
ImGui::DockBuilderDockWindow("Color Schemes", right);
|
ImGui::DockBuilderDockWindow("Color Schemes", right);
|
||||||
ImGui::DockBuilderDockWindow("Color Preview", center);
|
ImGui::DockBuilderDockWindow("Color Preview", center);
|
||||||
ImGui::DockBuilderDockWindow("Templates", center);
|
ImGui::DockBuilderDockWindow("Templates", center);
|
||||||
|
|
||||||
ImGui::DockBuilderFinish(dockspace_id);
|
ImGui::DockBuilderFinish(dockspace_id);
|
||||||
}
|
}
|
||||||
|
|
||||||
ImGui::DockSpace(dockspace_id, ImVec2{0,0}, ImGuiDockNodeFlags_None);
|
ImGui::DockSpace(dockspace_id, ImVec2{0, 0}, ImGuiDockNodeFlags_None);
|
||||||
ImGui::End();
|
ImGui::End();
|
||||||
}
|
}
|
||||||
|
|
||||||
void end_frame(GLFWwindow* window)
|
void end_frame(GLFWwindow *window)
|
||||||
{
|
{
|
||||||
ImGui::Render();
|
ImGui::Render();
|
||||||
int w, h;
|
int w, h;
|
||||||
@@ -164,7 +160,7 @@ void end_frame(GLFWwindow* window)
|
|||||||
glfwSwapBuffers(window);
|
glfwSwapBuffers(window);
|
||||||
}
|
}
|
||||||
|
|
||||||
void shutdown(GLFWwindow* window)
|
void shutdown(GLFWwindow *window)
|
||||||
{
|
{
|
||||||
ImGui_ImplOpenGL3_Shutdown();
|
ImGui_ImplOpenGL3_Shutdown();
|
||||||
ImGui_ImplGlfw_Shutdown();
|
ImGui_ImplGlfw_Shutdown();
|
||||||
@@ -173,24 +169,25 @@ void shutdown(GLFWwindow* window)
|
|||||||
glfwTerminate();
|
glfwTerminate();
|
||||||
}
|
}
|
||||||
|
|
||||||
namespace palette_utils
|
namespace palette_utils
|
||||||
{
|
{
|
||||||
|
|
||||||
ImVec4 get_color(const clrsync::core::palette& pal, const std::string& key, const std::string& fallback)
|
ImVec4 get_color(const clrsync::core::palette &pal, const std::string &key,
|
||||||
|
const std::string &fallback)
|
||||||
{
|
{
|
||||||
auto colors = pal.colors();
|
auto colors = pal.colors();
|
||||||
if (colors.empty())
|
if (colors.empty())
|
||||||
return ImVec4(1.0f, 1.0f, 1.0f, 1.0f);
|
return ImVec4(1.0f, 1.0f, 1.0f, 1.0f);
|
||||||
|
|
||||||
auto it = colors.find(key);
|
auto it = colors.find(key);
|
||||||
if (it == colors.end() && !fallback.empty())
|
if (it == colors.end() && !fallback.empty())
|
||||||
{
|
{
|
||||||
it = colors.find(fallback);
|
it = colors.find(fallback);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (it != colors.end())
|
if (it != colors.end())
|
||||||
{
|
{
|
||||||
const auto& col = it->second;
|
const auto &col = it->second;
|
||||||
const uint32_t hex = col.hex();
|
const uint32_t hex = col.hex();
|
||||||
const float r = ((hex >> 24) & 0xFF) / 255.0f;
|
const float r = ((hex >> 24) & 0xFF) / 255.0f;
|
||||||
const float g = ((hex >> 16) & 0xFF) / 255.0f;
|
const float g = ((hex >> 16) & 0xFF) / 255.0f;
|
||||||
@@ -201,21 +198,22 @@ ImVec4 get_color(const clrsync::core::palette& pal, const std::string& key, cons
|
|||||||
return ImVec4(1.0f, 1.0f, 1.0f, 1.0f);
|
return ImVec4(1.0f, 1.0f, 1.0f, 1.0f);
|
||||||
}
|
}
|
||||||
|
|
||||||
uint32_t get_color_u32(const clrsync::core::palette& pal, const std::string& key, const std::string& fallback)
|
uint32_t get_color_u32(const clrsync::core::palette &pal, const std::string &key,
|
||||||
|
const std::string &fallback)
|
||||||
{
|
{
|
||||||
auto colors = pal.colors();
|
auto colors = pal.colors();
|
||||||
if (colors.empty())
|
if (colors.empty())
|
||||||
return 0xFFFFFFFF;
|
return 0xFFFFFFFF;
|
||||||
|
|
||||||
auto it = colors.find(key);
|
auto it = colors.find(key);
|
||||||
if (it == colors.end() && !fallback.empty())
|
if (it == colors.end() && !fallback.empty())
|
||||||
{
|
{
|
||||||
it = colors.find(fallback);
|
it = colors.find(fallback);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (it != colors.end())
|
if (it != colors.end())
|
||||||
{
|
{
|
||||||
const auto& col = it->second;
|
const auto &col = it->second;
|
||||||
const uint32_t hex = col.hex();
|
const uint32_t hex = col.hex();
|
||||||
const uint32_t r = (hex >> 24) & 0xFF;
|
const uint32_t r = (hex >> 24) & 0xFF;
|
||||||
const uint32_t g = (hex >> 16) & 0xFF;
|
const uint32_t g = (hex >> 16) & 0xFF;
|
||||||
@@ -226,21 +224,23 @@ uint32_t get_color_u32(const clrsync::core::palette& pal, const std::string& key
|
|||||||
return 0xFFFFFFFF;
|
return 0xFFFFFFFF;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool render_delete_confirmation_popup(const std::string& popup_title, const std::string& item_name,
|
bool render_delete_confirmation_popup(const std::string &popup_title, const std::string &item_name,
|
||||||
const std::string& item_type, const clrsync::core::palette& pal,
|
const std::string &item_type,
|
||||||
const std::function<void()>& on_delete)
|
const clrsync::core::palette &pal,
|
||||||
|
const std::function<void()> &on_delete)
|
||||||
{
|
{
|
||||||
bool result = false;
|
bool result = false;
|
||||||
if (ImGui::BeginPopupModal(popup_title.c_str(), nullptr, ImGuiWindowFlags_AlwaysAutoResize))
|
if (ImGui::BeginPopupModal(popup_title.c_str(), nullptr, ImGuiWindowFlags_AlwaysAutoResize))
|
||||||
{
|
{
|
||||||
ImVec4 warning_color = get_color(pal, "warning", "accent");
|
ImVec4 warning_color = get_color(pal, "warning", "accent");
|
||||||
ImGui::TextColored(warning_color, "Are you sure you want to delete '%s'?", item_name.c_str());
|
ImGui::TextColored(warning_color, "Are you sure you want to delete '%s'?",
|
||||||
|
item_name.c_str());
|
||||||
ImGui::Text("This action cannot be undone.");
|
ImGui::Text("This action cannot be undone.");
|
||||||
|
|
||||||
ImGui::Spacing();
|
ImGui::Spacing();
|
||||||
ImGui::Separator();
|
ImGui::Separator();
|
||||||
ImGui::Spacing();
|
ImGui::Spacing();
|
||||||
|
|
||||||
float button_width = 120.0f;
|
float button_width = 120.0f;
|
||||||
float total_width = 2.0f * button_width + ImGui::GetStyle().ItemSpacing.x;
|
float total_width = 2.0f * button_width + ImGui::GetStyle().ItemSpacing.x;
|
||||||
float window_width = ImGui::GetContentRegionAvail().x;
|
float window_width = ImGui::GetContentRegionAvail().x;
|
||||||
@@ -252,7 +252,7 @@ bool render_delete_confirmation_popup(const std::string& popup_title, const std:
|
|||||||
result = true;
|
result = true;
|
||||||
ImGui::CloseCurrentPopup();
|
ImGui::CloseCurrentPopup();
|
||||||
}
|
}
|
||||||
|
|
||||||
ImGui::SameLine();
|
ImGui::SameLine();
|
||||||
if (ImGui::Button("Cancel", ImVec2(button_width, 0)))
|
if (ImGui::Button("Cancel", ImVec2(button_width, 0)))
|
||||||
{
|
{
|
||||||
@@ -263,4 +263,4 @@ bool render_delete_confirmation_popup(const std::string& popup_title, const std:
|
|||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
} // namespace palette_utils
|
||||||
42
src/gui/helpers/imgui_helpers.hpp
Normal file
42
src/gui/helpers/imgui_helpers.hpp
Normal file
@@ -0,0 +1,42 @@
|
|||||||
|
#ifndef CLRSYNC_IMGUI_HELPERS_HPP
|
||||||
|
#define CLRSYNC_IMGUI_HELPERS_HPP
|
||||||
|
|
||||||
|
#include "core/palette/palette.hpp"
|
||||||
|
#include "gui/views/about_window.hpp"
|
||||||
|
#include "imgui.h"
|
||||||
|
#include <functional>
|
||||||
|
#include <string>
|
||||||
|
|
||||||
|
struct GLFWwindow;
|
||||||
|
class settings_window;
|
||||||
|
|
||||||
|
GLFWwindow *init_glfw();
|
||||||
|
void init_imgui(GLFWwindow *window, const std::string &ini_path);
|
||||||
|
void begin_frame();
|
||||||
|
void setup_main_dockspace(bool &first_time);
|
||||||
|
void end_frame(GLFWwindow *window);
|
||||||
|
void shutdown(GLFWwindow *window);
|
||||||
|
void render_menu_bar(about_window *about, settings_window *settings);
|
||||||
|
|
||||||
|
namespace palette_utils
|
||||||
|
{
|
||||||
|
ImVec4 get_color(const clrsync::core::palette &pal, const std::string &key,
|
||||||
|
const std::string &fallback = "");
|
||||||
|
uint32_t get_color_u32(const clrsync::core::palette &pal, const std::string &key,
|
||||||
|
const std::string &fallback = "");
|
||||||
|
bool render_delete_confirmation_popup(const std::string &popup_title, const std::string &item_name,
|
||||||
|
const std::string &item_type,
|
||||||
|
const clrsync::core::palette &pal,
|
||||||
|
const std::function<void()> &on_delete);
|
||||||
|
} // namespace palette_utils
|
||||||
|
|
||||||
|
namespace imgui_helpers
|
||||||
|
{
|
||||||
|
inline ImVec4 get_palette_color(const clrsync::core::palette &pal, const std::string &key,
|
||||||
|
const std::string &fallback = "")
|
||||||
|
{
|
||||||
|
return palette_utils::get_color(pal, key, fallback);
|
||||||
|
}
|
||||||
|
} // namespace imgui_helpers
|
||||||
|
|
||||||
|
#endif // CLRSYNC_IMGUI_HELPERS_HPP
|
||||||
@@ -1,37 +0,0 @@
|
|||||||
#ifndef CLRSYNC_IMGUI_HELPERS_HPP
|
|
||||||
#define CLRSYNC_IMGUI_HELPERS_HPP
|
|
||||||
|
|
||||||
#include "gui/about_window.hpp"
|
|
||||||
#include "core/palette/palette.hpp"
|
|
||||||
#include "imgui.h"
|
|
||||||
#include <functional>
|
|
||||||
#include <string>
|
|
||||||
|
|
||||||
struct GLFWwindow;
|
|
||||||
class settings_window;
|
|
||||||
|
|
||||||
GLFWwindow * init_glfw();
|
|
||||||
void init_imgui(GLFWwindow* window, const std::string& ini_path);
|
|
||||||
void begin_frame();
|
|
||||||
void setup_main_dockspace(bool& first_time);
|
|
||||||
void end_frame(GLFWwindow* window);
|
|
||||||
void shutdown(GLFWwindow* window);
|
|
||||||
void render_menu_bar(about_window* about, settings_window* settings);
|
|
||||||
|
|
||||||
namespace palette_utils
|
|
||||||
{
|
|
||||||
ImVec4 get_color(const clrsync::core::palette& pal, const std::string& key, const std::string& fallback = "");
|
|
||||||
uint32_t get_color_u32(const clrsync::core::palette& pal, const std::string& key, const std::string& fallback = "");
|
|
||||||
bool render_delete_confirmation_popup(const std::string& popup_title, const std::string& item_name,
|
|
||||||
const std::string& item_type, const clrsync::core::palette& pal,
|
|
||||||
const std::function<void()>& on_delete);
|
|
||||||
}
|
|
||||||
|
|
||||||
namespace imgui_helpers
|
|
||||||
{
|
|
||||||
inline ImVec4 get_palette_color(const clrsync::core::palette& pal, const std::string& key, const std::string& fallback = "") {
|
|
||||||
return palette_utils::get_color(pal, key, fallback);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif // CLRSYNC_IMGUI_HELPERS_HPP
|
|
||||||
@@ -3,30 +3,30 @@
|
|||||||
#include <GLFW/glfw3.h>
|
#include <GLFW/glfw3.h>
|
||||||
#include <GLFW/glfw3native.h>
|
#include <GLFW/glfw3native.h>
|
||||||
|
|
||||||
|
|
||||||
#include "core/config/config.hpp"
|
#include "core/config/config.hpp"
|
||||||
|
#include "core/error.hpp"
|
||||||
#include "core/io/toml_file.hpp"
|
#include "core/io/toml_file.hpp"
|
||||||
#include "core/utils.hpp"
|
#include "core/utils.hpp"
|
||||||
#include "core/error.hpp"
|
|
||||||
|
|
||||||
#include "color_scheme_editor.hpp"
|
#include "gui/helpers/imgui_helpers.hpp"
|
||||||
#include "gui/font_loader.hpp"
|
#include "gui/platform/font_loader.hpp"
|
||||||
#include "gui/settings_window.hpp"
|
#include "gui/views/about_window.hpp"
|
||||||
#include "imgui_helpers.hpp"
|
#include "gui/views/color_scheme_editor.hpp"
|
||||||
#include "template_editor.hpp"
|
#include "gui/views/settings_window.hpp"
|
||||||
#include "about_window.hpp"
|
#include "gui/views/template_editor.hpp"
|
||||||
|
|
||||||
|
int main(int, char **)
|
||||||
int main(int, char**)
|
|
||||||
{
|
{
|
||||||
auto config_path = clrsync::core::get_default_config_path();
|
auto config_path = clrsync::core::get_default_config_path();
|
||||||
auto conf = std::make_unique<clrsync::core::io::toml_file>(config_path);
|
auto conf = std::make_unique<clrsync::core::io::toml_file>(config_path);
|
||||||
|
|
||||||
auto init_result = clrsync::core::config::instance().initialize(std::move(conf));
|
auto init_result = clrsync::core::config::instance().initialize(std::move(conf));
|
||||||
if (!init_result)
|
if (!init_result)
|
||||||
{
|
{
|
||||||
std::cerr << "Fatal error: " << init_result.error().description() << std::endl;
|
std::cerr << "Fatal error: " << init_result.error().description() << std::endl;
|
||||||
std::cerr << "Hint: Set CLRSYNC_CONFIG_PATH environment variable or ensure config exists at: " << config_path << std::endl;
|
std::cerr
|
||||||
|
<< "Hint: Set CLRSYNC_CONFIG_PATH environment variable or ensure config exists at: "
|
||||||
|
<< config_path << std::endl;
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -34,27 +34,37 @@ int main(int, char**)
|
|||||||
static std::string ini_path = (base.parent_path() / "layout.ini").string();
|
static std::string ini_path = (base.parent_path() / "layout.ini").string();
|
||||||
bool first_time = !std::filesystem::exists(ini_path);
|
bool first_time = !std::filesystem::exists(ini_path);
|
||||||
|
|
||||||
GLFWwindow* window = init_glfw();
|
GLFWwindow *window = init_glfw();
|
||||||
if (!window) return 1;
|
if (!window)
|
||||||
|
return 1;
|
||||||
|
|
||||||
printf("GLFV Version: %s\n", glfwGetVersionString());
|
printf("GLFV Version: %s\n", glfwGetVersionString());
|
||||||
|
|
||||||
std::cout << "GLFW runtime platform: ";
|
std::cout << "GLFW runtime platform: ";
|
||||||
switch (glfwGetPlatform()) {
|
switch (glfwGetPlatform())
|
||||||
case GLFW_PLATFORM_WAYLAND: std::cout << "Wayland\n"; break;
|
{
|
||||||
case GLFW_PLATFORM_X11: std::cout << "X11\n"; break;
|
case GLFW_PLATFORM_WAYLAND:
|
||||||
case GLFW_PLATFORM_COCOA: std::cout << "Cocoa\n"; break;
|
std::cout << "Wayland\n";
|
||||||
case GLFW_PLATFORM_WIN32: std::cout << "Win32\n"; break;
|
break;
|
||||||
default: std::cout << "Unknown\n";
|
case GLFW_PLATFORM_X11:
|
||||||
|
std::cout << "X11\n";
|
||||||
|
break;
|
||||||
|
case GLFW_PLATFORM_COCOA:
|
||||||
|
std::cout << "Cocoa\n";
|
||||||
|
break;
|
||||||
|
case GLFW_PLATFORM_WIN32:
|
||||||
|
std::cout << "Win32\n";
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
std::cout << "Unknown\n";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
init_imgui(window, ini_path);
|
init_imgui(window, ini_path);
|
||||||
|
|
||||||
font_loader loader;
|
font_loader loader;
|
||||||
|
|
||||||
ImFont* font =
|
ImFont *font = loader.load_font(clrsync::core::config::instance().font().c_str(),
|
||||||
loader.load_font(clrsync::core::config::instance().font().c_str(), clrsync::core::config::instance().font_size());
|
clrsync::core::config::instance().font_size());
|
||||||
|
|
||||||
if (font)
|
if (font)
|
||||||
ImGui::GetIO().FontDefault = font;
|
ImGui::GetIO().FontDefault = font;
|
||||||
@@ -63,7 +73,7 @@ int main(int, char**)
|
|||||||
template_editor templateEditor;
|
template_editor templateEditor;
|
||||||
about_window aboutWindow;
|
about_window aboutWindow;
|
||||||
settings_window settingsWindow;
|
settings_window settingsWindow;
|
||||||
|
|
||||||
colorEditor.set_template_editor(&templateEditor);
|
colorEditor.set_template_editor(&templateEditor);
|
||||||
colorEditor.set_settings_window(&settingsWindow);
|
colorEditor.set_settings_window(&settingsWindow);
|
||||||
templateEditor.apply_current_palette(colorEditor.controller().current_palette());
|
templateEditor.apply_current_palette(colorEditor.controller().current_palette());
|
||||||
@@ -76,7 +86,7 @@ int main(int, char**)
|
|||||||
begin_frame();
|
begin_frame();
|
||||||
|
|
||||||
render_menu_bar(&aboutWindow, &settingsWindow);
|
render_menu_bar(&aboutWindow, &settingsWindow);
|
||||||
setup_main_dockspace(first_time);
|
setup_main_dockspace(first_time);
|
||||||
templateEditor.render();
|
templateEditor.render();
|
||||||
colorEditor.render_controls_and_colors();
|
colorEditor.render_controls_and_colors();
|
||||||
colorEditor.render_preview();
|
colorEditor.render_preview();
|
||||||
|
|||||||
21
src/gui/platform/file_browser.hpp
Normal file
21
src/gui/platform/file_browser.hpp
Normal file
@@ -0,0 +1,21 @@
|
|||||||
|
#ifndef CLRSYNC_GUI_FILE_BROWSER_HPP
|
||||||
|
#define CLRSYNC_GUI_FILE_BROWSER_HPP
|
||||||
|
|
||||||
|
#include <string>
|
||||||
|
#include <vector>
|
||||||
|
|
||||||
|
namespace file_dialogs
|
||||||
|
{
|
||||||
|
std::string open_file_dialog(const std::string &title = "Open File",
|
||||||
|
const std::string &initial_path = "",
|
||||||
|
const std::vector<std::string> &filters = {});
|
||||||
|
|
||||||
|
std::string save_file_dialog(const std::string &title = "Save File",
|
||||||
|
const std::string &initial_path = "",
|
||||||
|
const std::vector<std::string> &filters = {});
|
||||||
|
|
||||||
|
std::string select_folder_dialog(const std::string &title = "Select Folder",
|
||||||
|
const std::string &initial_path = "");
|
||||||
|
} // namespace file_dialogs
|
||||||
|
|
||||||
|
#endif // CLRSYNC_GUI_FILE_BROWSER_HPP
|
||||||
@@ -1,30 +1,30 @@
|
|||||||
#ifndef CLRSYNC_GUI_SYSTEM_FONT_LOADER_HPP
|
#ifndef CLRSYNC_GUI_SYSTEM_FONT_LOADER_HPP
|
||||||
#define CLRSYNC_GUI_SYSTEM_FONT_LOADER_HPP
|
#define CLRSYNC_GUI_SYSTEM_FONT_LOADER_HPP
|
||||||
|
|
||||||
|
#include <imgui.h>
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
#include <imgui.h>
|
|
||||||
|
|
||||||
class font_loader
|
class font_loader
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
font_loader() = default;
|
font_loader() = default;
|
||||||
|
|
||||||
ImFont* load_font(const char* font_name, float size_px);
|
ImFont *load_font(const char *font_name, float size_px);
|
||||||
void push_default_font();
|
void push_default_font();
|
||||||
void pop_font();
|
void pop_font();
|
||||||
|
|
||||||
std::vector<std::string> get_system_fonts();
|
std::vector<std::string> get_system_fonts();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
std::string find_font_path(const char* font_name);
|
std::string find_font_path(const char *font_name);
|
||||||
|
|
||||||
#if defined(_WIN32)
|
#if defined(_WIN32)
|
||||||
static std::string find_font_windows(const char* font_name);
|
static std::string find_font_windows(const char *font_name);
|
||||||
#elif defined(__APPLE__)
|
#elif defined(__APPLE__)
|
||||||
std::vector<unsigned char> load_font_macos(const char* font_name);
|
std::vector<unsigned char> load_font_macos(const char *font_name);
|
||||||
#else
|
#else
|
||||||
std::string find_font_linux(const char* font_name);
|
std::string find_font_linux(const char *font_name);
|
||||||
#endif
|
#endif
|
||||||
};
|
};
|
||||||
|
|
||||||
132
src/gui/platform/linux/file_browser_linux.cpp
Normal file
132
src/gui/platform/linux/file_browser_linux.cpp
Normal file
@@ -0,0 +1,132 @@
|
|||||||
|
#ifdef __linux__
|
||||||
|
|
||||||
|
#include "gui/platform/file_browser.hpp"
|
||||||
|
#include <gtk/gtk.h>
|
||||||
|
|
||||||
|
namespace file_dialogs
|
||||||
|
{
|
||||||
|
|
||||||
|
std::string open_file_dialog(const std::string &title, const std::string &initial_path,
|
||||||
|
const std::vector<std::string> &filters)
|
||||||
|
{
|
||||||
|
if (!gtk_init_check(nullptr, nullptr))
|
||||||
|
{
|
||||||
|
return "";
|
||||||
|
}
|
||||||
|
|
||||||
|
GtkFileChooserNative *native = gtk_file_chooser_native_new(
|
||||||
|
title.c_str(), nullptr, GTK_FILE_CHOOSER_ACTION_OPEN, "_Open", "_Cancel");
|
||||||
|
|
||||||
|
GtkFileChooser *chooser = GTK_FILE_CHOOSER(native);
|
||||||
|
|
||||||
|
if (!initial_path.empty())
|
||||||
|
{
|
||||||
|
std::filesystem::path p(initial_path);
|
||||||
|
if (std::filesystem::exists(p))
|
||||||
|
{
|
||||||
|
if (std::filesystem::is_directory(p))
|
||||||
|
{
|
||||||
|
gtk_file_chooser_set_current_folder(chooser, initial_path.c_str());
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
gtk_file_chooser_set_current_folder(chooser, p.parent_path().c_str());
|
||||||
|
gtk_file_chooser_set_current_name(chooser, p.filename().c_str());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
std::string result;
|
||||||
|
if (gtk_native_dialog_run(GTK_NATIVE_DIALOG(native)) == GTK_RESPONSE_ACCEPT)
|
||||||
|
{
|
||||||
|
char *filename = gtk_file_chooser_get_filename(chooser);
|
||||||
|
if (filename)
|
||||||
|
{
|
||||||
|
result = filename;
|
||||||
|
g_free(filename);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
g_object_unref(native);
|
||||||
|
while (gtk_events_pending())
|
||||||
|
gtk_main_iteration();
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
std::string save_file_dialog(const std::string &title, const std::string &initial_path,
|
||||||
|
const std::vector<std::string> &filters)
|
||||||
|
{
|
||||||
|
if (!gtk_init_check(nullptr, nullptr))
|
||||||
|
{
|
||||||
|
return "";
|
||||||
|
}
|
||||||
|
|
||||||
|
GtkFileChooserNative *native = gtk_file_chooser_native_new(
|
||||||
|
title.c_str(), nullptr, GTK_FILE_CHOOSER_ACTION_SAVE, "_Save", "_Cancel");
|
||||||
|
|
||||||
|
GtkFileChooser *chooser = GTK_FILE_CHOOSER(native);
|
||||||
|
gtk_file_chooser_set_do_overwrite_confirmation(chooser, TRUE);
|
||||||
|
|
||||||
|
if (!initial_path.empty())
|
||||||
|
{
|
||||||
|
std::filesystem::path p(initial_path);
|
||||||
|
if (std::filesystem::exists(p.parent_path()))
|
||||||
|
{
|
||||||
|
gtk_file_chooser_set_current_folder(chooser, p.parent_path().c_str());
|
||||||
|
gtk_file_chooser_set_current_name(chooser, p.filename().c_str());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
std::string result;
|
||||||
|
if (gtk_native_dialog_run(GTK_NATIVE_DIALOG(native)) == GTK_RESPONSE_ACCEPT)
|
||||||
|
{
|
||||||
|
char *filename = gtk_file_chooser_get_filename(chooser);
|
||||||
|
if (filename)
|
||||||
|
{
|
||||||
|
result = filename;
|
||||||
|
g_free(filename);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
g_object_unref(native);
|
||||||
|
while (gtk_events_pending())
|
||||||
|
gtk_main_iteration();
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
std::string select_folder_dialog(const std::string &title, const std::string &initial_path)
|
||||||
|
{
|
||||||
|
if (!gtk_init_check(nullptr, nullptr))
|
||||||
|
{
|
||||||
|
return "";
|
||||||
|
}
|
||||||
|
|
||||||
|
GtkFileChooserNative *native = gtk_file_chooser_native_new(
|
||||||
|
title.c_str(), nullptr, GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER, "_Select", "_Cancel");
|
||||||
|
|
||||||
|
GtkFileChooser *chooser = GTK_FILE_CHOOSER(native);
|
||||||
|
|
||||||
|
if (!initial_path.empty() && std::filesystem::exists(initial_path))
|
||||||
|
{
|
||||||
|
gtk_file_chooser_set_current_folder(chooser, initial_path.c_str());
|
||||||
|
}
|
||||||
|
|
||||||
|
std::string result;
|
||||||
|
if (gtk_native_dialog_run(GTK_NATIVE_DIALOG(native)) == GTK_RESPONSE_ACCEPT)
|
||||||
|
{
|
||||||
|
char *filename = gtk_file_chooser_get_filename(chooser);
|
||||||
|
if (filename)
|
||||||
|
{
|
||||||
|
result = filename;
|
||||||
|
g_free(filename);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
g_object_unref(native);
|
||||||
|
while (gtk_events_pending())
|
||||||
|
gtk_main_iteration();
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
} // namespace file_dialogs
|
||||||
|
#endif
|
||||||
95
src/gui/platform/linux/font_loader_linux.cpp
Normal file
95
src/gui/platform/linux/font_loader_linux.cpp
Normal file
@@ -0,0 +1,95 @@
|
|||||||
|
#ifdef __linux__
|
||||||
|
|
||||||
|
#include "core/config/config.hpp"
|
||||||
|
#include "gui/platform/font_loader.hpp"
|
||||||
|
#include "imgui_internal.h"
|
||||||
|
#include <algorithm>
|
||||||
|
#include <fontconfig/fontconfig.h>
|
||||||
|
#include <imgui.h>
|
||||||
|
|
||||||
|
std::string font_loader::find_font_linux(const char *font_name)
|
||||||
|
{
|
||||||
|
FcInit();
|
||||||
|
|
||||||
|
FcPattern *pattern = FcNameParse(reinterpret_cast<const FcChar8 *>(font_name));
|
||||||
|
if (!pattern)
|
||||||
|
return {};
|
||||||
|
|
||||||
|
FcConfigSubstitute(nullptr, pattern, FcMatchPattern);
|
||||||
|
FcDefaultSubstitute(pattern);
|
||||||
|
|
||||||
|
FcResult result;
|
||||||
|
FcPattern *match = FcFontMatch(nullptr, pattern, &result);
|
||||||
|
|
||||||
|
std::string out;
|
||||||
|
|
||||||
|
if (match)
|
||||||
|
{
|
||||||
|
FcChar8 *file = nullptr;
|
||||||
|
if (FcPatternGetString(match, FC_FILE, 0, &file) == FcResultMatch)
|
||||||
|
out = reinterpret_cast<const char *>(file);
|
||||||
|
|
||||||
|
FcPatternDestroy(match);
|
||||||
|
}
|
||||||
|
|
||||||
|
FcPatternDestroy(pattern);
|
||||||
|
return out;
|
||||||
|
}
|
||||||
|
|
||||||
|
std::string font_loader::find_font_path(const char *font_name)
|
||||||
|
{
|
||||||
|
return find_font_linux(font_name);
|
||||||
|
}
|
||||||
|
|
||||||
|
ImFont *font_loader::load_font(const char *font_name, float size_px)
|
||||||
|
{
|
||||||
|
std::string path = find_font_path(font_name);
|
||||||
|
if (path.empty())
|
||||||
|
return nullptr;
|
||||||
|
|
||||||
|
float scale = ImGui::GetIO().DisplayFramebufferScale.y;
|
||||||
|
return ImGui::GetIO().Fonts->AddFontFromFileTTF(path.c_str(), size_px * scale);
|
||||||
|
}
|
||||||
|
|
||||||
|
void font_loader::push_default_font()
|
||||||
|
{
|
||||||
|
ImGui::PushFont(ImGui::GetDefaultFont(), clrsync::core::config::instance().font_size());
|
||||||
|
}
|
||||||
|
|
||||||
|
void font_loader::pop_font()
|
||||||
|
{
|
||||||
|
ImGui::PopFont();
|
||||||
|
}
|
||||||
|
|
||||||
|
std::vector<std::string> font_loader::get_system_fonts()
|
||||||
|
{
|
||||||
|
std::vector<std::string> fonts;
|
||||||
|
|
||||||
|
FcInit();
|
||||||
|
FcPattern *pattern = FcPatternCreate();
|
||||||
|
FcObjectSet *os = FcObjectSetBuild(FC_FAMILY, nullptr);
|
||||||
|
FcFontSet *fs = FcFontList(nullptr, pattern, os);
|
||||||
|
|
||||||
|
if (fs)
|
||||||
|
{
|
||||||
|
for (int i = 0; i < fs->nfont; i++)
|
||||||
|
{
|
||||||
|
FcChar8 *family = nullptr;
|
||||||
|
if (FcPatternGetString(fs->fonts[i], FC_FAMILY, 0, &family) == FcResultMatch)
|
||||||
|
{
|
||||||
|
std::string font_name = reinterpret_cast<const char *>(family);
|
||||||
|
if (std::find(fonts.begin(), fonts.end(), font_name) == fonts.end())
|
||||||
|
fonts.push_back(font_name);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
FcFontSetDestroy(fs);
|
||||||
|
}
|
||||||
|
|
||||||
|
FcObjectSetDestroy(os);
|
||||||
|
FcPatternDestroy(pattern);
|
||||||
|
|
||||||
|
std::sort(fonts.begin(), fonts.end());
|
||||||
|
return fonts;
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif
|
||||||
@@ -1,7 +1,6 @@
|
|||||||
#include "file_browser.hpp"
|
|
||||||
#include <filesystem>
|
|
||||||
|
|
||||||
#ifdef __APPLE__
|
#ifdef __APPLE__
|
||||||
|
#include "gui/platform/file_browser.hpp"
|
||||||
|
#include <filesystem>
|
||||||
#include <Cocoa/Cocoa.h>
|
#include <Cocoa/Cocoa.h>
|
||||||
|
|
||||||
namespace file_dialogs {
|
namespace file_dialogs {
|
||||||
@@ -76,5 +75,4 @@ std::string select_folder_dialog(const std::string& title,
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
115
src/gui/platform/macos/font_loader_macos.cpp
Normal file
115
src/gui/platform/macos/font_loader_macos.cpp
Normal file
@@ -0,0 +1,115 @@
|
|||||||
|
#ifdef __APPLE__
|
||||||
|
|
||||||
|
#include "core/config/config.hpp"
|
||||||
|
#include "gui/platform/font_loader.hpp"
|
||||||
|
#include "imgui_internal.h"
|
||||||
|
#include <CoreText/CoreText.h>
|
||||||
|
#include <algorithm>
|
||||||
|
#include <imgui.h>
|
||||||
|
|
||||||
|
std::vector<unsigned char> font_loader::load_font_macos(const char *font_name)
|
||||||
|
{
|
||||||
|
std::vector<unsigned char> out;
|
||||||
|
|
||||||
|
CFStringRef cf_name = CFStringCreateWithCString(nullptr, font_name, kCFStringEncodingUTF8);
|
||||||
|
if (!cf_name)
|
||||||
|
return out;
|
||||||
|
|
||||||
|
CTFontDescriptorRef desc = CTFontDescriptorCreateWithNameAndSize(cf_name, 12);
|
||||||
|
CFRelease(cf_name);
|
||||||
|
|
||||||
|
if (!desc)
|
||||||
|
return out;
|
||||||
|
|
||||||
|
CFURLRef url = (CFURLRef)CTFontDescriptorCopyAttribute(desc, kCTFontURLAttribute);
|
||||||
|
CFRelease(desc);
|
||||||
|
|
||||||
|
if (!url)
|
||||||
|
return out;
|
||||||
|
|
||||||
|
CFDataRef data = nullptr;
|
||||||
|
Boolean success = CFURLCreateDataAndPropertiesFromResource(kCFAllocatorDefault, url, &data,
|
||||||
|
nullptr, nullptr, nullptr);
|
||||||
|
CFRelease(url);
|
||||||
|
|
||||||
|
if (success && data)
|
||||||
|
{
|
||||||
|
CFIndex size = CFDataGetLength(data);
|
||||||
|
if (size > 100)
|
||||||
|
{
|
||||||
|
out.resize(size);
|
||||||
|
CFDataGetBytes(data, CFRangeMake(0, size), out.data());
|
||||||
|
}
|
||||||
|
CFRelease(data);
|
||||||
|
}
|
||||||
|
|
||||||
|
return out;
|
||||||
|
}
|
||||||
|
|
||||||
|
std::string font_loader::find_font_path(const char *font_name)
|
||||||
|
{
|
||||||
|
(void)font_name;
|
||||||
|
return {};
|
||||||
|
}
|
||||||
|
|
||||||
|
ImFont *font_loader::load_font(const char *font_name, float size_px)
|
||||||
|
{
|
||||||
|
std::vector<unsigned char> buf = load_font_macos(font_name);
|
||||||
|
if (buf.empty())
|
||||||
|
return nullptr;
|
||||||
|
|
||||||
|
return ImGui::GetIO().Fonts->AddFontFromMemoryTTF(buf.data(), static_cast<int>(buf.size()),
|
||||||
|
size_px);
|
||||||
|
}
|
||||||
|
|
||||||
|
void font_loader::push_default_font()
|
||||||
|
{
|
||||||
|
ImGui::PushFont(ImGui::GetDefaultFont(), clrsync::core::config::instance().font_size());
|
||||||
|
}
|
||||||
|
|
||||||
|
void font_loader::pop_font()
|
||||||
|
{
|
||||||
|
ImGui::PopFont();
|
||||||
|
}
|
||||||
|
|
||||||
|
std::vector<std::string> font_loader::get_system_fonts()
|
||||||
|
{
|
||||||
|
std::vector<std::string> fonts;
|
||||||
|
|
||||||
|
CTFontCollectionRef collection = CTFontCollectionCreateFromAvailableFonts(nullptr);
|
||||||
|
if (collection)
|
||||||
|
{
|
||||||
|
CFArrayRef fontDescriptors = CTFontCollectionCreateMatchingFontDescriptors(collection);
|
||||||
|
CFRelease(collection);
|
||||||
|
|
||||||
|
if (fontDescriptors)
|
||||||
|
{
|
||||||
|
CFIndex count = CFArrayGetCount(fontDescriptors);
|
||||||
|
for (CFIndex i = 0; i < count; i++)
|
||||||
|
{
|
||||||
|
CTFontDescriptorRef descriptor =
|
||||||
|
(CTFontDescriptorRef)CFArrayGetValueAtIndex(fontDescriptors, i);
|
||||||
|
CFStringRef fontName = (CFStringRef)CTFontDescriptorCopyAttribute(
|
||||||
|
descriptor, kCTFontDisplayNameAttribute);
|
||||||
|
|
||||||
|
if (fontName)
|
||||||
|
{
|
||||||
|
char buffer[256];
|
||||||
|
if (CFStringGetCString(fontName, buffer, sizeof(buffer), kCFStringEncodingUTF8))
|
||||||
|
{
|
||||||
|
std::string font_name = buffer;
|
||||||
|
if (std::find(fonts.begin(), fonts.end(), font_name) == fonts.end())
|
||||||
|
fonts.push_back(font_name);
|
||||||
|
}
|
||||||
|
CFRelease(fontName);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
CFRelease(fontDescriptors);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
std::sort(fonts.begin(), fonts.end());
|
||||||
|
return fonts;
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif
|
||||||
160
src/gui/platform/windows/file_browser_windows.cpp
Normal file
160
src/gui/platform/windows/file_browser_windows.cpp
Normal file
@@ -0,0 +1,160 @@
|
|||||||
|
#ifdef _WIN32
|
||||||
|
|
||||||
|
#include "gui/platform/file_browser.hpp"
|
||||||
|
#include <filesystem>
|
||||||
|
|
||||||
|
#include <commdlg.h>
|
||||||
|
#include <shlobj.h>
|
||||||
|
#include <shlwapi.h>
|
||||||
|
#include <windows.h>
|
||||||
|
|
||||||
|
namespace file_dialogs
|
||||||
|
{
|
||||||
|
|
||||||
|
std::string open_file_dialog(const std::string &title, const std::string &initial_path,
|
||||||
|
const std::vector<std::string> &filters)
|
||||||
|
{
|
||||||
|
OPENFILENAMEA ofn;
|
||||||
|
char file[MAX_PATH] = "";
|
||||||
|
|
||||||
|
std::string filter_str = "All Files (*.*)\0*.*\0";
|
||||||
|
|
||||||
|
ZeroMemory(&ofn, sizeof(ofn));
|
||||||
|
ofn.lStructSize = sizeof(ofn);
|
||||||
|
ofn.hwndOwner = GetActiveWindow();
|
||||||
|
ofn.lpstrFile = file;
|
||||||
|
ofn.nMaxFile = sizeof(file);
|
||||||
|
ofn.lpstrFilter = filter_str.c_str();
|
||||||
|
ofn.nFilterIndex = 1;
|
||||||
|
ofn.lpstrTitle = title.c_str();
|
||||||
|
ofn.Flags = OFN_PATHMUSTEXIST | OFN_FILEMUSTEXIST | OFN_NOCHANGEDIR;
|
||||||
|
|
||||||
|
if (!initial_path.empty() && std::filesystem::exists(initial_path))
|
||||||
|
{
|
||||||
|
std::filesystem::path p(initial_path);
|
||||||
|
if (std::filesystem::is_directory(p))
|
||||||
|
{
|
||||||
|
ofn.lpstrInitialDir = initial_path.c_str();
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
std::string dir = p.parent_path().string();
|
||||||
|
std::string name = p.filename().string();
|
||||||
|
ofn.lpstrInitialDir = dir.c_str();
|
||||||
|
strncpy(file, name.c_str(), sizeof(file) - 1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (GetOpenFileNameA(&ofn))
|
||||||
|
{
|
||||||
|
return std::string(file);
|
||||||
|
}
|
||||||
|
return "";
|
||||||
|
}
|
||||||
|
|
||||||
|
std::string save_file_dialog(const std::string &title, const std::string &initial_path,
|
||||||
|
const std::vector<std::string> &filters)
|
||||||
|
{
|
||||||
|
OPENFILENAMEA ofn;
|
||||||
|
char file[MAX_PATH] = "";
|
||||||
|
|
||||||
|
std::string filter_str = "All Files\0*.*\0\0";
|
||||||
|
|
||||||
|
ZeroMemory(&ofn, sizeof(ofn));
|
||||||
|
ofn.lStructSize = sizeof(ofn);
|
||||||
|
ofn.hwndOwner = GetActiveWindow();
|
||||||
|
ofn.lpstrFile = file;
|
||||||
|
ofn.nMaxFile = sizeof(file);
|
||||||
|
ofn.lpstrFilter = filter_str.c_str();
|
||||||
|
ofn.nFilterIndex = 1;
|
||||||
|
ofn.lpstrTitle = title.c_str();
|
||||||
|
ofn.Flags = OFN_PATHMUSTEXIST | OFN_OVERWRITEPROMPT | OFN_NOCHANGEDIR;
|
||||||
|
|
||||||
|
if (!initial_path.empty())
|
||||||
|
{
|
||||||
|
std::filesystem::path p(initial_path);
|
||||||
|
if (std::filesystem::exists(p) && std::filesystem::is_directory(p))
|
||||||
|
{
|
||||||
|
ofn.lpstrInitialDir = initial_path.c_str();
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
std::string dir = p.parent_path().string();
|
||||||
|
std::string name = p.filename().string();
|
||||||
|
if (std::filesystem::exists(dir))
|
||||||
|
{
|
||||||
|
ofn.lpstrInitialDir = dir.c_str();
|
||||||
|
strncpy(file, name.c_str(), sizeof(file) - 1);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (GetSaveFileNameA(&ofn))
|
||||||
|
{
|
||||||
|
return std::string(file);
|
||||||
|
}
|
||||||
|
return "";
|
||||||
|
}
|
||||||
|
|
||||||
|
std::string select_folder_dialog(const std::string &title, const std::string &initial_path)
|
||||||
|
{
|
||||||
|
IFileOpenDialog *pFileOpen;
|
||||||
|
|
||||||
|
HRESULT hr = CoCreateInstance(CLSID_FileOpenDialog, NULL, CLSCTX_ALL, IID_IFileOpenDialog,
|
||||||
|
reinterpret_cast<void **>(&pFileOpen));
|
||||||
|
|
||||||
|
if (SUCCEEDED(hr))
|
||||||
|
{
|
||||||
|
DWORD dwFlags;
|
||||||
|
if (SUCCEEDED(pFileOpen->GetOptions(&dwFlags)))
|
||||||
|
{
|
||||||
|
pFileOpen->SetOptions(dwFlags | FOS_PICKFOLDERS);
|
||||||
|
}
|
||||||
|
|
||||||
|
std::wstring wtitle(title.begin(), title.end());
|
||||||
|
pFileOpen->SetTitle(wtitle.c_str());
|
||||||
|
|
||||||
|
if (!initial_path.empty() && std::filesystem::exists(initial_path))
|
||||||
|
{
|
||||||
|
IShellItem *psi = NULL;
|
||||||
|
std::wstring winitial(initial_path.begin(), initial_path.end());
|
||||||
|
hr = SHCreateItemFromParsingName(winitial.c_str(), NULL, IID_IShellItem, (void **)&psi);
|
||||||
|
if (SUCCEEDED(hr))
|
||||||
|
{
|
||||||
|
pFileOpen->SetFolder(psi);
|
||||||
|
psi->Release();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
hr = pFileOpen->Show(GetActiveWindow());
|
||||||
|
|
||||||
|
if (SUCCEEDED(hr))
|
||||||
|
{
|
||||||
|
IShellItem *pItem;
|
||||||
|
hr = pFileOpen->GetResult(&pItem);
|
||||||
|
if (SUCCEEDED(hr))
|
||||||
|
{
|
||||||
|
PWSTR pszFilePath;
|
||||||
|
hr = pItem->GetDisplayName(SIGDN_FILESYSPATH, &pszFilePath);
|
||||||
|
|
||||||
|
if (SUCCEEDED(hr))
|
||||||
|
{
|
||||||
|
std::wstring wpath(pszFilePath);
|
||||||
|
std::string result(wpath.begin(), wpath.end());
|
||||||
|
CoTaskMemFree(pszFilePath);
|
||||||
|
pItem->Release();
|
||||||
|
pFileOpen->Release();
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
pItem->Release();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
pFileOpen->Release();
|
||||||
|
}
|
||||||
|
|
||||||
|
return "";
|
||||||
|
}
|
||||||
|
|
||||||
|
} // namespace file_dialogs
|
||||||
|
|
||||||
|
#endif
|
||||||
168
src/gui/platform/windows/font_loader_windows.cpp
Normal file
168
src/gui/platform/windows/font_loader_windows.cpp
Normal file
@@ -0,0 +1,168 @@
|
|||||||
|
#include "core/config/config.hpp"
|
||||||
|
#include "gui/platform/font_loader.hpp"
|
||||||
|
#include "imgui_internal.h"
|
||||||
|
#include <algorithm>
|
||||||
|
#include <imgui.h>
|
||||||
|
#include <windows.h>
|
||||||
|
#include <winreg.h>
|
||||||
|
|
||||||
|
static std::string search_registry_for_font(HKEY root_key, const char *subkey,
|
||||||
|
const std::string &font_name_lower,
|
||||||
|
const char *default_font_dir)
|
||||||
|
{
|
||||||
|
HKEY hKey;
|
||||||
|
LONG result = RegOpenKeyExA(root_key, subkey, 0, KEY_READ, &hKey);
|
||||||
|
|
||||||
|
if (result != ERROR_SUCCESS)
|
||||||
|
return {};
|
||||||
|
|
||||||
|
char value_name[512];
|
||||||
|
BYTE value_data[512];
|
||||||
|
DWORD value_name_size, value_data_size, type;
|
||||||
|
DWORD index = 0;
|
||||||
|
|
||||||
|
std::string found_path;
|
||||||
|
|
||||||
|
while (true)
|
||||||
|
{
|
||||||
|
value_name_size = sizeof(value_name);
|
||||||
|
value_data_size = sizeof(value_data);
|
||||||
|
|
||||||
|
result = RegEnumValueA(hKey, index++, value_name, &value_name_size, nullptr, &type,
|
||||||
|
value_data, &value_data_size);
|
||||||
|
|
||||||
|
if (result != ERROR_SUCCESS)
|
||||||
|
break;
|
||||||
|
|
||||||
|
if (type != REG_SZ)
|
||||||
|
continue;
|
||||||
|
|
||||||
|
std::string reg_font_name = value_name;
|
||||||
|
std::transform(reg_font_name.begin(), reg_font_name.end(), reg_font_name.begin(),
|
||||||
|
::tolower);
|
||||||
|
|
||||||
|
std::string reg_font_name_clean = reg_font_name;
|
||||||
|
size_t type_pos = reg_font_name_clean.find(" (");
|
||||||
|
if (type_pos != std::string::npos)
|
||||||
|
reg_font_name_clean = reg_font_name_clean.substr(0, type_pos);
|
||||||
|
|
||||||
|
if (reg_font_name_clean == font_name_lower)
|
||||||
|
{
|
||||||
|
std::string font_file = reinterpret_cast<char *>(value_data);
|
||||||
|
|
||||||
|
// If path is not absolute, prepend default font directory
|
||||||
|
if (font_file.find(":\\") == std::string::npos)
|
||||||
|
{
|
||||||
|
found_path = std::string(default_font_dir) + "\\" + font_file;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
found_path = font_file;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
RegCloseKey(hKey);
|
||||||
|
return found_path;
|
||||||
|
}
|
||||||
|
|
||||||
|
std::string font_loader::find_font_windows(const char *font_name)
|
||||||
|
{
|
||||||
|
std::string font_name_lower = font_name;
|
||||||
|
std::transform(font_name_lower.begin(), font_name_lower.end(), font_name_lower.begin(),
|
||||||
|
::tolower);
|
||||||
|
|
||||||
|
char windows_dir[MAX_PATH];
|
||||||
|
GetWindowsDirectoryA(windows_dir, MAX_PATH);
|
||||||
|
std::string system_fonts_dir = std::string(windows_dir) + "\\Fonts";
|
||||||
|
|
||||||
|
// First, try system-wide fonts (HKEY_LOCAL_MACHINE)
|
||||||
|
std::string path = search_registry_for_font(
|
||||||
|
HKEY_LOCAL_MACHINE, "SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Fonts",
|
||||||
|
font_name_lower, system_fonts_dir.c_str());
|
||||||
|
|
||||||
|
if (!path.empty())
|
||||||
|
return path;
|
||||||
|
|
||||||
|
// If not found, try per-user fonts (HKEY_CURRENT_USER)
|
||||||
|
char local_appdata[MAX_PATH];
|
||||||
|
if (GetEnvironmentVariableA("LOCALAPPDATA", local_appdata, MAX_PATH) > 0)
|
||||||
|
{
|
||||||
|
std::string user_fonts_dir = std::string(local_appdata) + "\\Microsoft\\Windows\\Fonts";
|
||||||
|
|
||||||
|
path = search_registry_for_font(HKEY_CURRENT_USER,
|
||||||
|
"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Fonts",
|
||||||
|
font_name_lower, user_fonts_dir.c_str());
|
||||||
|
}
|
||||||
|
|
||||||
|
return path;
|
||||||
|
}
|
||||||
|
|
||||||
|
std::string font_loader::find_font_path(const char *font_name)
|
||||||
|
{
|
||||||
|
return find_font_windows(font_name);
|
||||||
|
}
|
||||||
|
|
||||||
|
ImFont *font_loader::load_font(const char *font_name, float size_px)
|
||||||
|
{
|
||||||
|
std::string path = find_font_path(font_name);
|
||||||
|
if (path.empty())
|
||||||
|
return nullptr;
|
||||||
|
|
||||||
|
float scale = ImGui::GetIO().DisplayFramebufferScale.y;
|
||||||
|
return ImGui::GetIO().Fonts->AddFontFromFileTTF(path.c_str(), size_px * scale);
|
||||||
|
}
|
||||||
|
|
||||||
|
void font_loader::push_default_font()
|
||||||
|
{
|
||||||
|
ImGui::PushFont(ImGui::GetDefaultFont(), clrsync::core::config::instance().font_size());
|
||||||
|
}
|
||||||
|
|
||||||
|
void font_loader::pop_font()
|
||||||
|
{
|
||||||
|
ImGui::PopFont();
|
||||||
|
}
|
||||||
|
|
||||||
|
std::vector<std::string> font_loader::get_system_fonts()
|
||||||
|
{
|
||||||
|
std::vector<std::string> fonts;
|
||||||
|
|
||||||
|
auto enumerate_registry_fonts = [&fonts](HKEY root_key, const char *subkey) {
|
||||||
|
HKEY hKey;
|
||||||
|
if (RegOpenKeyExA(root_key, subkey, 0, KEY_READ, &hKey) != ERROR_SUCCESS)
|
||||||
|
return;
|
||||||
|
|
||||||
|
char value_name[512];
|
||||||
|
DWORD value_name_size;
|
||||||
|
DWORD index = 0;
|
||||||
|
|
||||||
|
while (true)
|
||||||
|
{
|
||||||
|
value_name_size = sizeof(value_name);
|
||||||
|
LONG result = RegEnumValueA(hKey, index++, value_name, &value_name_size, nullptr,
|
||||||
|
nullptr, nullptr, nullptr);
|
||||||
|
|
||||||
|
if (result != ERROR_SUCCESS)
|
||||||
|
break;
|
||||||
|
|
||||||
|
std::string font_name = value_name;
|
||||||
|
size_t pos = font_name.find(" (");
|
||||||
|
if (pos != std::string::npos)
|
||||||
|
font_name = font_name.substr(0, pos);
|
||||||
|
|
||||||
|
if (std::find(fonts.begin(), fonts.end(), font_name) == fonts.end())
|
||||||
|
fonts.push_back(font_name);
|
||||||
|
}
|
||||||
|
|
||||||
|
RegCloseKey(hKey);
|
||||||
|
};
|
||||||
|
|
||||||
|
enumerate_registry_fonts(HKEY_LOCAL_MACHINE,
|
||||||
|
"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Fonts");
|
||||||
|
enumerate_registry_fonts(HKEY_CURRENT_USER,
|
||||||
|
"SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\Fonts");
|
||||||
|
|
||||||
|
std::sort(fonts.begin(), fonts.end());
|
||||||
|
return fonts;
|
||||||
|
}
|
||||||
@@ -1,13 +1,13 @@
|
|||||||
#include "about_window.hpp"
|
#include "about_window.hpp"
|
||||||
#include "core/version.hpp"
|
#include "core/version.hpp"
|
||||||
#include "imgui_helpers.hpp"
|
#include "gui/helpers/imgui_helpers.hpp"
|
||||||
#include "imgui.h"
|
#include "imgui.h"
|
||||||
|
|
||||||
about_window::about_window()
|
about_window::about_window()
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
void about_window::render(const clrsync::core::palette& pal)
|
void about_window::render(const clrsync::core::palette &pal)
|
||||||
{
|
{
|
||||||
if (!m_visible)
|
if (!m_visible)
|
||||||
return;
|
return;
|
||||||
33
src/gui/views/about_window.hpp
Normal file
33
src/gui/views/about_window.hpp
Normal file
@@ -0,0 +1,33 @@
|
|||||||
|
#ifndef CLRSYNC_GUI_ABOUT_WINDOW_HPP
|
||||||
|
#define CLRSYNC_GUI_ABOUT_WINDOW_HPP
|
||||||
|
|
||||||
|
#include "core/palette/palette.hpp"
|
||||||
|
|
||||||
|
class about_window
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
about_window();
|
||||||
|
void render(const clrsync::core::palette &pal);
|
||||||
|
void render()
|
||||||
|
{
|
||||||
|
render(m_default_palette);
|
||||||
|
}
|
||||||
|
void show()
|
||||||
|
{
|
||||||
|
m_visible = true;
|
||||||
|
}
|
||||||
|
void hide()
|
||||||
|
{
|
||||||
|
m_visible = false;
|
||||||
|
}
|
||||||
|
bool is_visible() const
|
||||||
|
{
|
||||||
|
return m_visible;
|
||||||
|
}
|
||||||
|
|
||||||
|
private:
|
||||||
|
bool m_visible{false};
|
||||||
|
clrsync::core::palette m_default_palette;
|
||||||
|
};
|
||||||
|
|
||||||
|
#endif // CLRSYNC_GUI_ABOUT_WINDOW_HPP
|
||||||
@@ -1,13 +1,12 @@
|
|||||||
#include "color_scheme_editor.hpp"
|
#include "color_scheme_editor.hpp"
|
||||||
|
#include "gui/controllers/theme_applier.hpp"
|
||||||
|
#include "gui/helpers/imgui_helpers.hpp"
|
||||||
#include "imgui.h"
|
#include "imgui.h"
|
||||||
#include "imgui_helpers.hpp"
|
|
||||||
#include "template_editor.hpp"
|
|
||||||
#include "settings_window.hpp"
|
#include "settings_window.hpp"
|
||||||
#include "theme_applier.hpp"
|
#include "template_editor.hpp"
|
||||||
#include <iostream>
|
#include <iostream>
|
||||||
#include <ranges>
|
#include <ranges>
|
||||||
|
|
||||||
|
|
||||||
color_scheme_editor::color_scheme_editor()
|
color_scheme_editor::color_scheme_editor()
|
||||||
{
|
{
|
||||||
const auto ¤t = m_controller.current_palette();
|
const auto ¤t = m_controller.current_palette();
|
||||||
@@ -161,10 +160,8 @@ void color_scheme_editor::render_controls()
|
|||||||
|
|
||||||
ImGui::SameLine();
|
ImGui::SameLine();
|
||||||
auto error = palette_utils::get_color(current, "error");
|
auto error = palette_utils::get_color(current, "error");
|
||||||
auto error_hover = ImVec4(error.x * 1.1f, error.y * 1.1f, error.z * 1.1f,
|
auto error_hover = ImVec4(error.x * 1.1f, error.y * 1.1f, error.z * 1.1f, error.w);
|
||||||
error.w);
|
auto error_active = ImVec4(error.x * 0.8f, error.y * 0.8f, error.z * 0.8f, error.w);
|
||||||
auto error_active = ImVec4(error.x * 0.8f, error.y * 0.8f, error.z * 0.8f,
|
|
||||||
error.w);
|
|
||||||
auto on_error = palette_utils::get_color(current, "on_error");
|
auto on_error = palette_utils::get_color(current, "on_error");
|
||||||
ImGui::PushStyleColor(ImGuiCol_Button, error);
|
ImGui::PushStyleColor(ImGuiCol_Button, error);
|
||||||
ImGui::PushStyleColor(ImGuiCol_ButtonHovered, error_hover);
|
ImGui::PushStyleColor(ImGuiCol_ButtonHovered, error_hover);
|
||||||
44
src/gui/views/color_scheme_editor.hpp
Normal file
44
src/gui/views/color_scheme_editor.hpp
Normal file
@@ -0,0 +1,44 @@
|
|||||||
|
#ifndef CLRSYNC_GUI_COLOR_SCHEME_EDITOR_HPP
|
||||||
|
#define CLRSYNC_GUI_COLOR_SCHEME_EDITOR_HPP
|
||||||
|
|
||||||
|
#include "gui/controllers/palette_controller.hpp"
|
||||||
|
#include "gui/views/color_table_renderer.hpp"
|
||||||
|
#include "gui/views/preview_renderer.hpp"
|
||||||
|
|
||||||
|
class template_editor;
|
||||||
|
class settings_window;
|
||||||
|
|
||||||
|
class color_scheme_editor
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
color_scheme_editor();
|
||||||
|
|
||||||
|
void render_controls_and_colors();
|
||||||
|
void render_preview();
|
||||||
|
void set_template_editor(template_editor *editor)
|
||||||
|
{
|
||||||
|
m_template_editor = editor;
|
||||||
|
}
|
||||||
|
void set_settings_window(settings_window *window)
|
||||||
|
{
|
||||||
|
m_settings_window = window;
|
||||||
|
}
|
||||||
|
const palette_controller &controller() const
|
||||||
|
{
|
||||||
|
return m_controller;
|
||||||
|
}
|
||||||
|
|
||||||
|
private:
|
||||||
|
void render_controls();
|
||||||
|
void apply_themes();
|
||||||
|
void notify_palette_changed();
|
||||||
|
|
||||||
|
palette_controller m_controller;
|
||||||
|
color_table_renderer m_color_table;
|
||||||
|
preview_renderer m_preview;
|
||||||
|
template_editor *m_template_editor{nullptr};
|
||||||
|
settings_window *m_settings_window{nullptr};
|
||||||
|
bool m_show_delete_confirmation{false};
|
||||||
|
};
|
||||||
|
|
||||||
|
#endif // CLRSYNC_GUI_COLOR_SCHEME_EDITOR_HPP
|
||||||
@@ -1,46 +1,46 @@
|
|||||||
#include "color_table_renderer.hpp"
|
#include "gui/views/color_table_renderer.hpp"
|
||||||
#include "imgui_helpers.hpp"
|
#include "gui/helpers/imgui_helpers.hpp"
|
||||||
#include "imgui.h"
|
#include "imgui.h"
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
#include <cctype>
|
#include <cctype>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
||||||
bool color_table_renderer::matches_filter(const std::string& name) const
|
bool color_table_renderer::matches_filter(const std::string &name) const
|
||||||
{
|
{
|
||||||
if (m_filter_text[0] == '\0')
|
if (m_filter_text[0] == '\0')
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
std::string filter_lower = m_filter_text;
|
std::string filter_lower = m_filter_text;
|
||||||
std::string name_lower = name;
|
std::string name_lower = name;
|
||||||
|
|
||||||
std::transform(filter_lower.begin(), filter_lower.end(), filter_lower.begin(),
|
std::transform(filter_lower.begin(), filter_lower.end(), filter_lower.begin(),
|
||||||
[](unsigned char c) { return std::tolower(c); });
|
[](unsigned char c) { return std::tolower(c); });
|
||||||
std::transform(name_lower.begin(), name_lower.end(), name_lower.begin(),
|
std::transform(name_lower.begin(), name_lower.end(), name_lower.begin(),
|
||||||
[](unsigned char c) { return std::tolower(c); });
|
[](unsigned char c) { return std::tolower(c); });
|
||||||
|
|
||||||
return name_lower.find(filter_lower) != std::string::npos;
|
return name_lower.find(filter_lower) != std::string::npos;
|
||||||
}
|
}
|
||||||
|
|
||||||
void color_table_renderer::render_color_row(const std::string &name,
|
void color_table_renderer::render_color_row(const std::string &name,
|
||||||
const clrsync::core::palette& current,
|
const clrsync::core::palette ¤t,
|
||||||
palette_controller& controller,
|
palette_controller &controller,
|
||||||
const OnColorChangedCallback& on_changed)
|
const OnColorChangedCallback &on_changed)
|
||||||
{
|
{
|
||||||
if (!matches_filter(name))
|
if (!matches_filter(name))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
const clrsync::core::color &col = current.get_color(name);
|
const clrsync::core::color &col = current.get_color(name);
|
||||||
|
|
||||||
ImGui::TableNextRow();
|
ImGui::TableNextRow();
|
||||||
|
|
||||||
ImGui::TableSetColumnIndex(0);
|
ImGui::TableSetColumnIndex(0);
|
||||||
const float key_col_width = ImGui::GetContentRegionAvail().x;
|
const float key_col_width = ImGui::GetContentRegionAvail().x;
|
||||||
|
|
||||||
ImVec4 text_color = palette_utils::get_color(current, "info", "accent");
|
ImVec4 text_color = palette_utils::get_color(current, "info", "accent");
|
||||||
ImGui::PushStyleColor(ImGuiCol_Text, text_color);
|
ImGui::PushStyleColor(ImGuiCol_Text, text_color);
|
||||||
const bool copied = ImGui::Selectable(name.c_str(), false, 0, ImVec2(key_col_width, 0.0f));
|
const bool copied = ImGui::Selectable(name.c_str(), false, 0, ImVec2(key_col_width, 0.0f));
|
||||||
ImGui::PopStyleColor();
|
ImGui::PopStyleColor();
|
||||||
|
|
||||||
if (ImGui::IsItemHovered())
|
if (ImGui::IsItemHovered())
|
||||||
{
|
{
|
||||||
ImGui::SetMouseCursor(ImGuiMouseCursor_Hand);
|
ImGui::SetMouseCursor(ImGuiMouseCursor_Hand);
|
||||||
@@ -101,9 +101,9 @@ void color_table_renderer::render_color_row(const std::string &name,
|
|||||||
ImGui::PopID();
|
ImGui::PopID();
|
||||||
}
|
}
|
||||||
|
|
||||||
void color_table_renderer::render(const clrsync::core::palette& current,
|
void color_table_renderer::render(const clrsync::core::palette ¤t,
|
||||||
palette_controller& controller,
|
palette_controller &controller,
|
||||||
const OnColorChangedCallback& on_changed)
|
const OnColorChangedCallback &on_changed)
|
||||||
{
|
{
|
||||||
if (current.colors().empty())
|
if (current.colors().empty())
|
||||||
{
|
{
|
||||||
@@ -113,13 +113,13 @@ void color_table_renderer::render(const clrsync::core::palette& current,
|
|||||||
}
|
}
|
||||||
|
|
||||||
ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(8, 6));
|
ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(8, 6));
|
||||||
|
|
||||||
ImGui::Text("Filter:");
|
ImGui::Text("Filter:");
|
||||||
ImGui::SameLine();
|
ImGui::SameLine();
|
||||||
ImGui::SetNextItemWidth(200);
|
ImGui::SetNextItemWidth(200);
|
||||||
bool filter_changed = ImGui::InputTextWithHint("##color_filter", "Search colors...",
|
bool filter_changed = ImGui::InputTextWithHint("##color_filter", "Search colors...",
|
||||||
m_filter_text, sizeof(m_filter_text));
|
m_filter_text, sizeof(m_filter_text));
|
||||||
|
|
||||||
if (m_filter_text[0] != '\0')
|
if (m_filter_text[0] != '\0')
|
||||||
{
|
{
|
||||||
ImGui::SameLine();
|
ImGui::SameLine();
|
||||||
@@ -131,14 +131,15 @@ void color_table_renderer::render(const clrsync::core::palette& current,
|
|||||||
if (ImGui::IsItemHovered())
|
if (ImGui::IsItemHovered())
|
||||||
ImGui::SetTooltip("Clear filter");
|
ImGui::SetTooltip("Clear filter");
|
||||||
}
|
}
|
||||||
|
|
||||||
ImGui::PopStyleVar();
|
ImGui::PopStyleVar();
|
||||||
|
|
||||||
ImGui::Spacing();
|
ImGui::Spacing();
|
||||||
ImGui::Separator();
|
ImGui::Separator();
|
||||||
ImGui::Spacing();
|
ImGui::Spacing();
|
||||||
|
|
||||||
auto draw_table = [&](const char *title, const char* id, const std::vector<const char *> &keys) {
|
auto draw_table = [&](const char *title, const char *id,
|
||||||
|
const std::vector<const char *> &keys) {
|
||||||
bool has_matches = false;
|
bool has_matches = false;
|
||||||
for (auto *k : keys)
|
for (auto *k : keys)
|
||||||
{
|
{
|
||||||
@@ -148,18 +149,20 @@ void color_table_renderer::render(const clrsync::core::palette& current,
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!has_matches)
|
if (!has_matches)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
ImGui::PushStyleColor(ImGuiCol_Text, palette_utils::get_color(current, "accent"));
|
ImGui::PushStyleColor(ImGuiCol_Text, palette_utils::get_color(current, "accent"));
|
||||||
bool header_open = ImGui::TreeNodeEx(title, ImGuiTreeNodeFlags_DefaultOpen | ImGuiTreeNodeFlags_SpanAvailWidth);
|
bool header_open = ImGui::TreeNodeEx(title, ImGuiTreeNodeFlags_DefaultOpen |
|
||||||
|
ImGuiTreeNodeFlags_SpanAvailWidth);
|
||||||
ImGui::PopStyleColor();
|
ImGui::PopStyleColor();
|
||||||
|
|
||||||
if (header_open)
|
if (header_open)
|
||||||
{
|
{
|
||||||
if (ImGui::BeginTable(id, 3,
|
if (ImGui::BeginTable(id, 3,
|
||||||
ImGuiTableFlags_Borders | ImGuiTableFlags_RowBg | ImGuiTableFlags_SizingStretchProp))
|
ImGuiTableFlags_Borders | ImGuiTableFlags_RowBg |
|
||||||
|
ImGuiTableFlags_SizingStretchProp))
|
||||||
{
|
{
|
||||||
ImGui::TableSetupColumn("Name", ImGuiTableColumnFlags_WidthFixed, 160.0f);
|
ImGui::TableSetupColumn("Name", ImGuiTableColumnFlags_WidthFixed, 160.0f);
|
||||||
ImGui::TableSetupColumn("HEX", ImGuiTableColumnFlags_WidthFixed, 95.0f);
|
ImGui::TableSetupColumn("HEX", ImGuiTableColumnFlags_WidthFixed, 95.0f);
|
||||||
@@ -177,23 +180,23 @@ void color_table_renderer::render(const clrsync::core::palette& current,
|
|||||||
ImGui::Spacing();
|
ImGui::Spacing();
|
||||||
};
|
};
|
||||||
|
|
||||||
draw_table("General UI", "##general_ui", {"background", "on_background", "surface", "on_surface",
|
draw_table("General UI", "##general_ui",
|
||||||
"surface_variant", "on_surface_variant", "foreground",
|
{"background", "on_background", "surface", "on_surface", "surface_variant",
|
||||||
"cursor", "accent"});
|
"on_surface_variant", "foreground", "cursor", "accent"});
|
||||||
|
|
||||||
draw_table("Borders", "##borders", {"border_focused", "border"});
|
draw_table("Borders", "##borders", {"border_focused", "border"});
|
||||||
|
|
||||||
draw_table("Semantic Colors", "##semantic", {"success", "info", "warning", "error",
|
draw_table(
|
||||||
"on_success", "on_info", "on_warning", "on_error"});
|
"Semantic Colors", "##semantic",
|
||||||
|
{"success", "info", "warning", "error", "on_success", "on_info", "on_warning", "on_error"});
|
||||||
|
|
||||||
draw_table("Editor", "##editor", {"editor_background", "editor_command", "editor_comment",
|
draw_table("Editor", "##editor",
|
||||||
"editor_disabled", "editor_emphasis", "editor_error",
|
{"editor_background", "editor_command", "editor_comment", "editor_disabled",
|
||||||
"editor_inactive", "editor_line_number", "editor_link",
|
"editor_emphasis", "editor_error", "editor_inactive", "editor_line_number",
|
||||||
"editor_main", "editor_selected", "editor_selection_inactive",
|
"editor_link", "editor_main", "editor_selected", "editor_selection_inactive",
|
||||||
"editor_string", "editor_success", "editor_warning"});
|
"editor_string", "editor_success", "editor_warning"});
|
||||||
|
|
||||||
draw_table("Terminal (Base16)", "##terminal", {"base00", "base01", "base02", "base03",
|
draw_table("Terminal (Base16)", "##terminal",
|
||||||
"base04", "base05", "base06", "base07",
|
{"base00", "base01", "base02", "base03", "base04", "base05", "base06", "base07",
|
||||||
"base08", "base09", "base0A", "base0B",
|
"base08", "base09", "base0A", "base0B", "base0C", "base0D", "base0E", "base0F"});
|
||||||
"base0C", "base0D", "base0E", "base0F"});
|
|
||||||
}
|
}
|
||||||
27
src/gui/views/color_table_renderer.hpp
Normal file
27
src/gui/views/color_table_renderer.hpp
Normal file
@@ -0,0 +1,27 @@
|
|||||||
|
#ifndef CLRSYNC_GUI_COLOR_TABLE_RENDERER_HPP
|
||||||
|
#define CLRSYNC_GUI_COLOR_TABLE_RENDERER_HPP
|
||||||
|
|
||||||
|
#include "core/palette/palette.hpp"
|
||||||
|
#include "gui/controllers/palette_controller.hpp"
|
||||||
|
#include <functional>
|
||||||
|
#include <string>
|
||||||
|
|
||||||
|
class color_table_renderer
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
using OnColorChangedCallback = std::function<void()>;
|
||||||
|
|
||||||
|
void render(const clrsync::core::palette &palette, palette_controller &controller,
|
||||||
|
const OnColorChangedCallback &on_changed);
|
||||||
|
|
||||||
|
private:
|
||||||
|
void render_color_row(const std::string &name, const clrsync::core::palette &palette,
|
||||||
|
palette_controller &controller, const OnColorChangedCallback &on_changed);
|
||||||
|
|
||||||
|
bool matches_filter(const std::string &name) const;
|
||||||
|
|
||||||
|
char m_filter_text[128] = {0};
|
||||||
|
bool m_show_only_modified{false};
|
||||||
|
};
|
||||||
|
|
||||||
|
#endif // CLRSYNC_GUI_COLOR_TABLE_RENDERER_HPP
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
#include "preview_renderer.hpp"
|
#include "gui/views/preview_renderer.hpp"
|
||||||
#include "theme_applier.hpp"
|
#include "gui/controllers/theme_applier.hpp"
|
||||||
#include "imgui_helpers.hpp"
|
#include "gui/helpers/imgui_helpers.hpp"
|
||||||
#include "imgui.h"
|
#include "imgui.h"
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
#include <array>
|
#include <array>
|
||||||
@@ -74,15 +74,11 @@ int main()
|
|||||||
|
|
||||||
static ImVec4 hex_to_imvec4(uint32_t hex)
|
static ImVec4 hex_to_imvec4(uint32_t hex)
|
||||||
{
|
{
|
||||||
return {
|
return {((hex >> 24) & 0xFF) / 255.0f, ((hex >> 16) & 0xFF) / 255.0f,
|
||||||
((hex >> 24) & 0xFF) / 255.0f,
|
((hex >> 8) & 0xFF) / 255.0f, (hex & 0xFF) / 255.0f};
|
||||||
((hex >> 16) & 0xFF) / 255.0f,
|
|
||||||
((hex >> 8) & 0xFF) / 255.0f,
|
|
||||||
(hex & 0xFF) / 255.0f
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void preview_renderer::apply_palette(const clrsync::core::palette& palette)
|
void preview_renderer::apply_palette(const clrsync::core::palette &palette)
|
||||||
{
|
{
|
||||||
theme_applier::apply_to_editor(m_editor, palette);
|
theme_applier::apply_to_editor(m_editor, palette);
|
||||||
}
|
}
|
||||||
@@ -98,7 +94,7 @@ void preview_renderer::render_code_preview()
|
|||||||
m_editor.Render("##CodeEditor", ImVec2(0, code_preview_height), true);
|
m_editor.Render("##CodeEditor", ImVec2(0, code_preview_height), true);
|
||||||
}
|
}
|
||||||
|
|
||||||
void preview_renderer::render_terminal_preview(const clrsync::core::palette& current)
|
void preview_renderer::render_terminal_preview(const clrsync::core::palette ¤t)
|
||||||
{
|
{
|
||||||
auto get_color = [&](const std::string &key) -> ImVec4 {
|
auto get_color = [&](const std::string &key) -> ImVec4 {
|
||||||
const auto &col = current.get_color(key);
|
const auto &col = current.get_color(key);
|
||||||
@@ -108,7 +104,7 @@ void preview_renderer::render_terminal_preview(const clrsync::core::palette& cur
|
|||||||
const ImVec4 fg = get_color("base07");
|
const ImVec4 fg = get_color("base07");
|
||||||
const ImVec4 cursor_col = get_color("cursor");
|
const ImVec4 cursor_col = get_color("cursor");
|
||||||
const ImVec4 border_col = get_color("border");
|
const ImVec4 border_col = get_color("border");
|
||||||
|
|
||||||
const ImVec4 black = get_color("base00");
|
const ImVec4 black = get_color("base00");
|
||||||
const ImVec4 red = get_color("base01");
|
const ImVec4 red = get_color("base01");
|
||||||
const ImVec4 green = get_color("base02");
|
const ImVec4 green = get_color("base02");
|
||||||
@@ -117,7 +113,7 @@ void preview_renderer::render_terminal_preview(const clrsync::core::palette& cur
|
|||||||
const ImVec4 magenta = get_color("base05");
|
const ImVec4 magenta = get_color("base05");
|
||||||
const ImVec4 cyan = get_color("base06");
|
const ImVec4 cyan = get_color("base06");
|
||||||
const ImVec4 white = get_color("base07");
|
const ImVec4 white = get_color("base07");
|
||||||
|
|
||||||
const ImVec4 bright_black = get_color("base08");
|
const ImVec4 bright_black = get_color("base08");
|
||||||
const ImVec4 bright_red = get_color("base09");
|
const ImVec4 bright_red = get_color("base09");
|
||||||
const ImVec4 bright_green = get_color("base0A");
|
const ImVec4 bright_green = get_color("base0A");
|
||||||
@@ -134,7 +130,7 @@ void preview_renderer::render_terminal_preview(const clrsync::core::palette& cur
|
|||||||
|
|
||||||
ImGui::PushStyleColor(ImGuiCol_ChildBg, bg);
|
ImGui::PushStyleColor(ImGuiCol_ChildBg, bg);
|
||||||
ImGui::PushStyleColor(ImGuiCol_Border, border_col);
|
ImGui::PushStyleColor(ImGuiCol_Border, border_col);
|
||||||
|
|
||||||
const float terminal_height = std::max(200.0f, ImGui::GetContentRegionAvail().y - 10.0f);
|
const float terminal_height = std::max(200.0f, ImGui::GetContentRegionAvail().y - 10.0f);
|
||||||
ImGui::BeginChild("TerminalPreview", ImVec2(0, terminal_height), true);
|
ImGui::BeginChild("TerminalPreview", ImVec2(0, terminal_height), true);
|
||||||
|
|
||||||
@@ -154,25 +150,25 @@ void preview_renderer::render_terminal_preview(const clrsync::core::palette& cur
|
|||||||
ImGui::TextColored(fg, " 5 user group 4096 Dec 2 10:30 ");
|
ImGui::TextColored(fg, " 5 user group 4096 Dec 2 10:30 ");
|
||||||
ImGui::SameLine(0, 0);
|
ImGui::SameLine(0, 0);
|
||||||
ImGui::TextColored(blue, ".");
|
ImGui::TextColored(blue, ".");
|
||||||
|
|
||||||
ImGui::TextColored(blue, "drwxr-xr-x");
|
ImGui::TextColored(blue, "drwxr-xr-x");
|
||||||
ImGui::SameLine();
|
ImGui::SameLine();
|
||||||
ImGui::TextColored(fg, " 3 user group 4096 Dec 1 09:15 ");
|
ImGui::TextColored(fg, " 3 user group 4096 Dec 1 09:15 ");
|
||||||
ImGui::SameLine(0, 0);
|
ImGui::SameLine(0, 0);
|
||||||
ImGui::TextColored(blue, "..");
|
ImGui::TextColored(blue, "..");
|
||||||
|
|
||||||
ImGui::TextColored(fg, "-rw-r--r--");
|
ImGui::TextColored(fg, "-rw-r--r--");
|
||||||
ImGui::SameLine();
|
ImGui::SameLine();
|
||||||
ImGui::TextColored(fg, " 1 user group 1234 Dec 2 10:30 ");
|
ImGui::TextColored(fg, " 1 user group 1234 Dec 2 10:30 ");
|
||||||
ImGui::SameLine(0, 0);
|
ImGui::SameLine(0, 0);
|
||||||
ImGui::TextColored(fg, "README.md");
|
ImGui::TextColored(fg, "README.md");
|
||||||
|
|
||||||
ImGui::TextColored(fg, "-rwxr-xr-x");
|
ImGui::TextColored(fg, "-rwxr-xr-x");
|
||||||
ImGui::SameLine();
|
ImGui::SameLine();
|
||||||
ImGui::TextColored(fg, " 1 user group 8192 Dec 2 10:28 ");
|
ImGui::TextColored(fg, " 1 user group 8192 Dec 2 10:28 ");
|
||||||
ImGui::SameLine(0, 0);
|
ImGui::SameLine(0, 0);
|
||||||
ImGui::TextColored(green, "build.sh");
|
ImGui::TextColored(green, "build.sh");
|
||||||
|
|
||||||
ImGui::TextColored(cyan, "lrwxrwxrwx");
|
ImGui::TextColored(cyan, "lrwxrwxrwx");
|
||||||
ImGui::SameLine();
|
ImGui::SameLine();
|
||||||
ImGui::TextColored(fg, " 1 user group 24 Dec 1 15:00 ");
|
ImGui::TextColored(fg, " 1 user group 24 Dec 1 15:00 ");
|
||||||
@@ -180,7 +176,7 @@ void preview_renderer::render_terminal_preview(const clrsync::core::palette& cur
|
|||||||
ImGui::TextColored(cyan, "config -> ~/.config/app");
|
ImGui::TextColored(cyan, "config -> ~/.config/app");
|
||||||
|
|
||||||
ImGui::Spacing();
|
ImGui::Spacing();
|
||||||
|
|
||||||
ImGui::TextColored(green, "user@host");
|
ImGui::TextColored(green, "user@host");
|
||||||
ImGui::SameLine(0, 0);
|
ImGui::SameLine(0, 0);
|
||||||
ImGui::TextColored(fg, ":");
|
ImGui::TextColored(fg, ":");
|
||||||
@@ -190,7 +186,7 @@ void preview_renderer::render_terminal_preview(const clrsync::core::palette& cur
|
|||||||
ImGui::TextColored(fg, "$ ");
|
ImGui::TextColored(fg, "$ ");
|
||||||
ImGui::SameLine(0, 0);
|
ImGui::SameLine(0, 0);
|
||||||
ImGui::TextColored(fg, "git status");
|
ImGui::TextColored(fg, "git status");
|
||||||
|
|
||||||
ImGui::TextColored(fg, "On branch ");
|
ImGui::TextColored(fg, "On branch ");
|
||||||
ImGui::SameLine(0, 0);
|
ImGui::SameLine(0, 0);
|
||||||
ImGui::TextColored(green, "main");
|
ImGui::TextColored(green, "main");
|
||||||
@@ -203,12 +199,12 @@ void preview_renderer::render_terminal_preview(const clrsync::core::palette& cur
|
|||||||
ImGui::Spacing();
|
ImGui::Spacing();
|
||||||
|
|
||||||
ImGui::TextColored(fg, "ANSI Colors (0-7 / 8-15):");
|
ImGui::TextColored(fg, "ANSI Colors (0-7 / 8-15):");
|
||||||
|
|
||||||
const float box_size = 20.0f;
|
const float box_size = 20.0f;
|
||||||
const float spacing = 4.0f;
|
const float spacing = 4.0f;
|
||||||
ImVec2 start_pos = ImGui::GetCursorScreenPos();
|
ImVec2 start_pos = ImGui::GetCursorScreenPos();
|
||||||
ImDrawList* draw_list = ImGui::GetWindowDrawList();
|
ImDrawList *draw_list = ImGui::GetWindowDrawList();
|
||||||
|
|
||||||
std::array<ImVec4, 8> normal_colors = {black, red, green, yellow, blue, magenta, cyan, white};
|
std::array<ImVec4, 8> normal_colors = {black, red, green, yellow, blue, magenta, cyan, white};
|
||||||
for (size_t i = 0; i < 8; i++)
|
for (size_t i = 0; i < 8; i++)
|
||||||
{
|
{
|
||||||
@@ -217,24 +213,26 @@ void preview_renderer::render_terminal_preview(const clrsync::core::palette& cur
|
|||||||
draw_list->AddRectFilled(p0, p1, ImGui::ColorConvertFloat4ToU32(normal_colors[i]));
|
draw_list->AddRectFilled(p0, p1, ImGui::ColorConvertFloat4ToU32(normal_colors[i]));
|
||||||
draw_list->AddRect(p0, p1, ImGui::ColorConvertFloat4ToU32(border_col));
|
draw_list->AddRect(p0, p1, ImGui::ColorConvertFloat4ToU32(border_col));
|
||||||
}
|
}
|
||||||
|
|
||||||
std::array<ImVec4, 8> bright_colors = {bright_black, bright_red, bright_green, bright_yellow,
|
std::array<ImVec4, 8> bright_colors = {bright_black, bright_red, bright_green,
|
||||||
bright_blue, bright_magenta, bright_cyan, bright_white};
|
bright_yellow, bright_blue, bright_magenta,
|
||||||
|
bright_cyan, bright_white};
|
||||||
for (size_t i = 0; i < 8; i++)
|
for (size_t i = 0; i < 8; i++)
|
||||||
{
|
{
|
||||||
ImVec2 p0 = ImVec2(start_pos.x + i * (box_size + spacing), start_pos.y + box_size + spacing);
|
ImVec2 p0 =
|
||||||
|
ImVec2(start_pos.x + i * (box_size + spacing), start_pos.y + box_size + spacing);
|
||||||
ImVec2 p1 = ImVec2(p0.x + box_size, p0.y + box_size);
|
ImVec2 p1 = ImVec2(p0.x + box_size, p0.y + box_size);
|
||||||
draw_list->AddRectFilled(p0, p1, ImGui::ColorConvertFloat4ToU32(bright_colors[i]));
|
draw_list->AddRectFilled(p0, p1, ImGui::ColorConvertFloat4ToU32(bright_colors[i]));
|
||||||
draw_list->AddRect(p0, p1, ImGui::ColorConvertFloat4ToU32(border_col));
|
draw_list->AddRect(p0, p1, ImGui::ColorConvertFloat4ToU32(border_col));
|
||||||
}
|
}
|
||||||
|
|
||||||
ImGui::Dummy(ImVec2(8 * (box_size + spacing), 2 * box_size + spacing + 4));
|
ImGui::Dummy(ImVec2(8 * (box_size + spacing), 2 * box_size + spacing + 4));
|
||||||
|
|
||||||
ImGui::PopStyleColor(2);
|
ImGui::PopStyleColor(2);
|
||||||
ImGui::EndChild();
|
ImGui::EndChild();
|
||||||
}
|
}
|
||||||
|
|
||||||
void preview_renderer::render(const clrsync::core::palette& current)
|
void preview_renderer::render(const clrsync::core::palette ¤t)
|
||||||
{
|
{
|
||||||
if (current.colors().empty())
|
if (current.colors().empty())
|
||||||
{
|
{
|
||||||
@@ -1,21 +1,21 @@
|
|||||||
#ifndef CLRSYNC_GUI_PREVIEW_RENDERER_HPP
|
#ifndef CLRSYNC_GUI_PREVIEW_RENDERER_HPP
|
||||||
#define CLRSYNC_GUI_PREVIEW_RENDERER_HPP
|
#define CLRSYNC_GUI_PREVIEW_RENDERER_HPP
|
||||||
|
|
||||||
#include "core/palette/palette.hpp"
|
|
||||||
#include "color_text_edit/TextEditor.h"
|
#include "color_text_edit/TextEditor.h"
|
||||||
|
#include "core/palette/palette.hpp"
|
||||||
|
|
||||||
class preview_renderer
|
class preview_renderer
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
preview_renderer();
|
preview_renderer();
|
||||||
|
|
||||||
void render(const clrsync::core::palette& palette);
|
|
||||||
void apply_palette(const clrsync::core::palette& palette);
|
|
||||||
|
|
||||||
private:
|
void render(const clrsync::core::palette &palette);
|
||||||
|
void apply_palette(const clrsync::core::palette &palette);
|
||||||
|
|
||||||
|
private:
|
||||||
void render_code_preview();
|
void render_code_preview();
|
||||||
void render_terminal_preview(const clrsync::core::palette& palette);
|
void render_terminal_preview(const clrsync::core::palette &palette);
|
||||||
|
|
||||||
TextEditor m_editor;
|
TextEditor m_editor;
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -1,9 +1,9 @@
|
|||||||
#include "settings_window.hpp"
|
#include "gui/views/settings_window.hpp"
|
||||||
#include "core/config/config.hpp"
|
#include "core/config/config.hpp"
|
||||||
#include "core/error.hpp"
|
#include "core/error.hpp"
|
||||||
#include "gui/font_loader.hpp"
|
#include "gui/helpers/imgui_helpers.hpp"
|
||||||
#include "gui/imgui_helpers.hpp"
|
#include "gui/platform/file_browser.hpp"
|
||||||
#include "gui/file_browser.hpp"
|
#include "gui/platform/font_loader.hpp"
|
||||||
#include "imgui.h"
|
#include "imgui.h"
|
||||||
#include <cstring>
|
#include <cstring>
|
||||||
|
|
||||||
@@ -13,10 +13,10 @@ settings_window::settings_window()
|
|||||||
m_default_theme[0] = '\0';
|
m_default_theme[0] = '\0';
|
||||||
m_palettes_path[0] = '\0';
|
m_palettes_path[0] = '\0';
|
||||||
m_font[0] = '\0';
|
m_font[0] = '\0';
|
||||||
|
|
||||||
font_loader loader;
|
font_loader loader;
|
||||||
m_available_fonts = loader.get_system_fonts();
|
m_available_fonts = loader.get_system_fonts();
|
||||||
|
|
||||||
load_settings();
|
load_settings();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -26,8 +26,9 @@ void settings_window::render()
|
|||||||
return;
|
return;
|
||||||
|
|
||||||
ImGui::SetNextWindowSize(ImVec2(700, 500), ImGuiCond_FirstUseEver);
|
ImGui::SetNextWindowSize(ImVec2(700, 500), ImGuiCond_FirstUseEver);
|
||||||
ImGui::SetNextWindowPos(ImGui::GetMainViewport()->GetCenter(), ImGuiCond_FirstUseEver, ImVec2(0.5f, 0.5f));
|
ImGui::SetNextWindowPos(ImGui::GetMainViewport()->GetCenter(), ImGuiCond_FirstUseEver,
|
||||||
|
ImVec2(0.5f, 0.5f));
|
||||||
|
|
||||||
ImGuiWindowFlags window_flags = ImGuiWindowFlags_NoCollapse;
|
ImGuiWindowFlags window_flags = ImGuiWindowFlags_NoCollapse;
|
||||||
if (ImGui::Begin("Settings", &m_visible, window_flags))
|
if (ImGui::Begin("Settings", &m_visible, window_flags))
|
||||||
{
|
{
|
||||||
@@ -38,18 +39,18 @@ void settings_window::render()
|
|||||||
render_general_tab();
|
render_general_tab();
|
||||||
ImGui::EndTabItem();
|
ImGui::EndTabItem();
|
||||||
}
|
}
|
||||||
|
|
||||||
if (ImGui::BeginTabItem("Appearance"))
|
if (ImGui::BeginTabItem("Appearance"))
|
||||||
{
|
{
|
||||||
render_appearance_tab();
|
render_appearance_tab();
|
||||||
ImGui::EndTabItem();
|
ImGui::EndTabItem();
|
||||||
}
|
}
|
||||||
|
|
||||||
ImGui::EndTabBar();
|
ImGui::EndTabBar();
|
||||||
}
|
}
|
||||||
|
|
||||||
render_status_messages();
|
render_status_messages();
|
||||||
|
|
||||||
ImGui::Separator();
|
ImGui::Separator();
|
||||||
render_action_buttons();
|
render_action_buttons();
|
||||||
}
|
}
|
||||||
@@ -58,20 +59,20 @@ void settings_window::render()
|
|||||||
|
|
||||||
void settings_window::load_settings()
|
void settings_window::load_settings()
|
||||||
{
|
{
|
||||||
auto& cfg = clrsync::core::config::instance();
|
auto &cfg = clrsync::core::config::instance();
|
||||||
|
|
||||||
std::string default_theme = cfg.default_theme();
|
std::string default_theme = cfg.default_theme();
|
||||||
strncpy(m_default_theme, default_theme.c_str(), sizeof(m_default_theme) - 1);
|
strncpy(m_default_theme, default_theme.c_str(), sizeof(m_default_theme) - 1);
|
||||||
m_default_theme[sizeof(m_default_theme) - 1] = '\0';
|
m_default_theme[sizeof(m_default_theme) - 1] = '\0';
|
||||||
|
|
||||||
std::string palettes_path = cfg.palettes_path();
|
std::string palettes_path = cfg.palettes_path();
|
||||||
strncpy(m_palettes_path, palettes_path.c_str(), sizeof(m_palettes_path) - 1);
|
strncpy(m_palettes_path, palettes_path.c_str(), sizeof(m_palettes_path) - 1);
|
||||||
m_palettes_path[sizeof(m_palettes_path) - 1] = '\0';
|
m_palettes_path[sizeof(m_palettes_path) - 1] = '\0';
|
||||||
|
|
||||||
std::string font = cfg.font();
|
std::string font = cfg.font();
|
||||||
strncpy(m_font, font.c_str(), sizeof(m_font) - 1);
|
strncpy(m_font, font.c_str(), sizeof(m_font) - 1);
|
||||||
m_font[sizeof(m_font) - 1] = '\0';
|
m_font[sizeof(m_font) - 1] = '\0';
|
||||||
|
|
||||||
m_selected_font_idx = 0;
|
m_selected_font_idx = 0;
|
||||||
for (int i = 0; i < static_cast<int>(m_available_fonts.size()); i++)
|
for (int i = 0; i < static_cast<int>(m_available_fonts.size()); i++)
|
||||||
{
|
{
|
||||||
@@ -81,62 +82,62 @@ void settings_window::load_settings()
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
m_font_size = cfg.font_size();
|
m_font_size = cfg.font_size();
|
||||||
|
|
||||||
m_error_message.clear();
|
m_error_message.clear();
|
||||||
m_settings_changed = false;
|
m_settings_changed = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
void settings_window::apply_settings()
|
void settings_window::apply_settings()
|
||||||
{
|
{
|
||||||
auto& cfg = clrsync::core::config::instance();
|
auto &cfg = clrsync::core::config::instance();
|
||||||
|
|
||||||
if (strlen(m_default_theme) == 0)
|
if (strlen(m_default_theme) == 0)
|
||||||
{
|
{
|
||||||
m_error_message = "Default theme cannot be empty";
|
m_error_message = "Default theme cannot be empty";
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (strlen(m_palettes_path) == 0)
|
if (strlen(m_palettes_path) == 0)
|
||||||
{
|
{
|
||||||
m_error_message = "Palettes path cannot be empty";
|
m_error_message = "Palettes path cannot be empty";
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (strlen(m_font) == 0)
|
if (strlen(m_font) == 0)
|
||||||
{
|
{
|
||||||
m_error_message = "Font cannot be empty";
|
m_error_message = "Font cannot be empty";
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (m_font_size < 8 || m_font_size > 48)
|
if (m_font_size < 8 || m_font_size > 48)
|
||||||
{
|
{
|
||||||
m_error_message = "Font size must be between 8 and 48";
|
m_error_message = "Font size must be between 8 and 48";
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
auto result1 = cfg.set_default_theme(m_default_theme);
|
auto result1 = cfg.set_default_theme(m_default_theme);
|
||||||
if (!result1)
|
if (!result1)
|
||||||
{
|
{
|
||||||
m_error_message = "Failed to set default theme: " + result1.error().description();
|
m_error_message = "Failed to set default theme: " + result1.error().description();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
auto result2 = cfg.set_palettes_path(m_palettes_path);
|
auto result2 = cfg.set_palettes_path(m_palettes_path);
|
||||||
if (!result2)
|
if (!result2)
|
||||||
{
|
{
|
||||||
m_error_message = "Failed to set palettes path: " + result2.error().description();
|
m_error_message = "Failed to set palettes path: " + result2.error().description();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
auto result3 = cfg.set_font(m_font);
|
auto result3 = cfg.set_font(m_font);
|
||||||
if (!result3)
|
if (!result3)
|
||||||
{
|
{
|
||||||
m_error_message = "Failed to set font: " + result3.error().description();
|
m_error_message = "Failed to set font: " + result3.error().description();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
auto result4 = cfg.set_font_size(m_font_size);
|
auto result4 = cfg.set_font_size(m_font_size);
|
||||||
if (!result4)
|
if (!result4)
|
||||||
{
|
{
|
||||||
@@ -148,7 +149,7 @@ void settings_window::apply_settings()
|
|||||||
auto font = fn_loader.load_font(m_font, m_font_size);
|
auto font = fn_loader.load_font(m_font, m_font_size);
|
||||||
if (font)
|
if (font)
|
||||||
ImGui::GetIO().FontDefault = font;
|
ImGui::GetIO().FontDefault = font;
|
||||||
|
|
||||||
m_error_message.clear();
|
m_error_message.clear();
|
||||||
m_settings_changed = false;
|
m_settings_changed = false;
|
||||||
}
|
}
|
||||||
@@ -156,25 +157,25 @@ void settings_window::apply_settings()
|
|||||||
void settings_window::render_general_tab()
|
void settings_window::render_general_tab()
|
||||||
{
|
{
|
||||||
ImGui::Spacing();
|
ImGui::Spacing();
|
||||||
|
|
||||||
auto accent_color = palette_utils::get_color(m_current_palette, "accent");
|
auto accent_color = palette_utils::get_color(m_current_palette, "accent");
|
||||||
ImGui::TextColored(accent_color, "Theme Settings");
|
ImGui::TextColored(accent_color, "Theme Settings");
|
||||||
ImGui::Separator();
|
ImGui::Separator();
|
||||||
ImGui::Spacing();
|
ImGui::Spacing();
|
||||||
|
|
||||||
ImGui::Text("Default Theme:");
|
ImGui::Text("Default Theme:");
|
||||||
ImGui::SameLine();
|
ImGui::SameLine();
|
||||||
show_help_marker("The default color scheme to load on startup");
|
show_help_marker("The default color scheme to load on startup");
|
||||||
ImGui::SetNextItemWidth(-100.0f);
|
ImGui::SetNextItemWidth(-100.0f);
|
||||||
if (ImGui::InputText("##default_theme", m_default_theme, sizeof(m_default_theme)))
|
if (ImGui::InputText("##default_theme", m_default_theme, sizeof(m_default_theme)))
|
||||||
m_settings_changed = true;
|
m_settings_changed = true;
|
||||||
|
|
||||||
ImGui::Spacing();
|
ImGui::Spacing();
|
||||||
|
|
||||||
ImGui::TextColored(accent_color, "Path Settings");
|
ImGui::TextColored(accent_color, "Path Settings");
|
||||||
ImGui::Separator();
|
ImGui::Separator();
|
||||||
ImGui::Spacing();
|
ImGui::Spacing();
|
||||||
|
|
||||||
ImGui::Text("Palettes Directory:");
|
ImGui::Text("Palettes Directory:");
|
||||||
ImGui::SameLine();
|
ImGui::SameLine();
|
||||||
show_help_marker("Directory where color palettes are stored\nSupports ~ for home directory");
|
show_help_marker("Directory where color palettes are stored\nSupports ~ for home directory");
|
||||||
@@ -184,8 +185,10 @@ void settings_window::render_general_tab()
|
|||||||
ImGui::SameLine();
|
ImGui::SameLine();
|
||||||
if (ImGui::Button("Browse"))
|
if (ImGui::Button("Browse"))
|
||||||
{
|
{
|
||||||
std::string selected_path = file_dialogs::select_folder_dialog("Select Palettes Directory", m_palettes_path);
|
std::string selected_path =
|
||||||
if (!selected_path.empty()) {
|
file_dialogs::select_folder_dialog("Select Palettes Directory", m_palettes_path);
|
||||||
|
if (!selected_path.empty())
|
||||||
|
{
|
||||||
strncpy(m_palettes_path, selected_path.c_str(), sizeof(m_palettes_path) - 1);
|
strncpy(m_palettes_path, selected_path.c_str(), sizeof(m_palettes_path) - 1);
|
||||||
m_palettes_path[sizeof(m_palettes_path) - 1] = '\0';
|
m_palettes_path[sizeof(m_palettes_path) - 1] = '\0';
|
||||||
m_settings_changed = true;
|
m_settings_changed = true;
|
||||||
@@ -196,12 +199,12 @@ void settings_window::render_general_tab()
|
|||||||
void settings_window::render_appearance_tab()
|
void settings_window::render_appearance_tab()
|
||||||
{
|
{
|
||||||
ImGui::Spacing();
|
ImGui::Spacing();
|
||||||
|
|
||||||
auto accent_color = palette_utils::get_color(m_current_palette, "accent");
|
auto accent_color = palette_utils::get_color(m_current_palette, "accent");
|
||||||
ImGui::TextColored(accent_color, "Font Settings");
|
ImGui::TextColored(accent_color, "Font Settings");
|
||||||
ImGui::Separator();
|
ImGui::Separator();
|
||||||
ImGui::Spacing();
|
ImGui::Spacing();
|
||||||
|
|
||||||
ImGui::Text("Font Family:");
|
ImGui::Text("Font Family:");
|
||||||
ImGui::SameLine();
|
ImGui::SameLine();
|
||||||
show_help_marker("Select font family for the application interface");
|
show_help_marker("Select font family for the application interface");
|
||||||
@@ -223,9 +226,9 @@ void settings_window::render_appearance_tab()
|
|||||||
}
|
}
|
||||||
ImGui::EndCombo();
|
ImGui::EndCombo();
|
||||||
}
|
}
|
||||||
|
|
||||||
ImGui::Spacing();
|
ImGui::Spacing();
|
||||||
|
|
||||||
ImGui::Text("Font Size:");
|
ImGui::Text("Font Size:");
|
||||||
ImGui::SameLine();
|
ImGui::SameLine();
|
||||||
show_help_marker("Font size for the application interface (8-48)");
|
show_help_marker("Font size for the application interface (8-48)");
|
||||||
@@ -236,7 +239,7 @@ void settings_window::render_appearance_tab()
|
|||||||
if (old_size != m_font_size)
|
if (old_size != m_font_size)
|
||||||
m_settings_changed = true;
|
m_settings_changed = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
ImGui::SameLine();
|
ImGui::SameLine();
|
||||||
if (ImGui::Button("Reset"))
|
if (ImGui::Button("Reset"))
|
||||||
{
|
{
|
||||||
@@ -250,34 +253,39 @@ void settings_window::render_status_messages()
|
|||||||
if (!m_error_message.empty())
|
if (!m_error_message.empty())
|
||||||
{
|
{
|
||||||
ImGui::Spacing();
|
ImGui::Spacing();
|
||||||
|
|
||||||
auto error_bg_color = palette_utils::get_color(m_current_palette, "error");
|
auto error_bg_color = palette_utils::get_color(m_current_palette, "error");
|
||||||
auto error_text_color = palette_utils::get_color(m_current_palette, "on_error");
|
auto error_text_color = palette_utils::get_color(m_current_palette, "on_error");
|
||||||
|
|
||||||
ImGui::PushStyleColor(ImGuiCol_ChildBg, error_bg_color);
|
ImGui::PushStyleColor(ImGuiCol_ChildBg, error_bg_color);
|
||||||
ImGui::PushStyleColor(ImGuiCol_Border, error_bg_color);
|
ImGui::PushStyleColor(ImGuiCol_Border, error_bg_color);
|
||||||
ImGui::PushStyleVar(ImGuiStyleVar_ChildRounding, 4.0f);
|
ImGui::PushStyleVar(ImGuiStyleVar_ChildRounding, 4.0f);
|
||||||
ImGui::PushStyleVar(ImGuiStyleVar_ChildBorderSize, 1.0f);
|
ImGui::PushStyleVar(ImGuiStyleVar_ChildBorderSize, 1.0f);
|
||||||
|
|
||||||
if (ImGui::BeginChild("##error_box", ImVec2(0, 0), ImGuiChildFlags_AutoResizeY | ImGuiChildFlags_Borders))
|
if (ImGui::BeginChild("##error_box", ImVec2(0, 0),
|
||||||
|
ImGuiChildFlags_AutoResizeY | ImGuiChildFlags_Borders))
|
||||||
{
|
{
|
||||||
ImGui::PushStyleColor(ImGuiCol_Text, error_text_color);
|
ImGui::PushStyleColor(ImGuiCol_Text, error_text_color);
|
||||||
ImGui::TextWrapped("Error: %s", m_error_message.c_str());
|
ImGui::TextWrapped("Error: %s", m_error_message.c_str());
|
||||||
ImGui::PopStyleColor();
|
ImGui::PopStyleColor();
|
||||||
|
|
||||||
ImGui::Spacing();
|
ImGui::Spacing();
|
||||||
|
|
||||||
ImGui::PushStyleColor(ImGuiCol_Button, ImVec4(error_bg_color.x * 0.8f, error_bg_color.y * 0.8f, error_bg_color.z * 0.8f, error_bg_color.w));
|
ImGui::PushStyleColor(ImGuiCol_Button,
|
||||||
ImGui::PushStyleColor(ImGuiCol_ButtonHovered, ImVec4(error_bg_color.x * 0.6f, error_bg_color.y * 0.6f, error_bg_color.z * 0.6f, error_bg_color.w));
|
ImVec4(error_bg_color.x * 0.8f, error_bg_color.y * 0.8f,
|
||||||
|
error_bg_color.z * 0.8f, error_bg_color.w));
|
||||||
|
ImGui::PushStyleColor(ImGuiCol_ButtonHovered,
|
||||||
|
ImVec4(error_bg_color.x * 0.6f, error_bg_color.y * 0.6f,
|
||||||
|
error_bg_color.z * 0.6f, error_bg_color.w));
|
||||||
ImGui::PushStyleColor(ImGuiCol_Text, error_text_color);
|
ImGui::PushStyleColor(ImGuiCol_Text, error_text_color);
|
||||||
|
|
||||||
if (ImGui::Button("Dismiss##error"))
|
if (ImGui::Button("Dismiss##error"))
|
||||||
m_error_message.clear();
|
m_error_message.clear();
|
||||||
|
|
||||||
ImGui::PopStyleColor(3);
|
ImGui::PopStyleColor(3);
|
||||||
}
|
}
|
||||||
ImGui::EndChild();
|
ImGui::EndChild();
|
||||||
|
|
||||||
ImGui::PopStyleVar(2);
|
ImGui::PopStyleVar(2);
|
||||||
ImGui::PopStyleColor(2);
|
ImGui::PopStyleColor(2);
|
||||||
}
|
}
|
||||||
@@ -286,17 +294,17 @@ void settings_window::render_status_messages()
|
|||||||
void settings_window::render_action_buttons()
|
void settings_window::render_action_buttons()
|
||||||
{
|
{
|
||||||
ImGui::Spacing();
|
ImGui::Spacing();
|
||||||
|
|
||||||
float button_width = 100.0f;
|
float button_width = 100.0f;
|
||||||
float spacing = ImGui::GetStyle().ItemSpacing.x;
|
float spacing = ImGui::GetStyle().ItemSpacing.x;
|
||||||
float window_width = ImGui::GetContentRegionAvail().x;
|
float window_width = ImGui::GetContentRegionAvail().x;
|
||||||
|
|
||||||
float total_buttons_width = 4 * button_width + 3 * spacing;
|
float total_buttons_width = 4 * button_width + 3 * spacing;
|
||||||
float start_pos = (window_width - total_buttons_width) * 0.5f;
|
float start_pos = (window_width - total_buttons_width) * 0.5f;
|
||||||
|
|
||||||
if (start_pos > 0)
|
if (start_pos > 0)
|
||||||
ImGui::SetCursorPosX(ImGui::GetCursorPosX() + start_pos);
|
ImGui::SetCursorPosX(ImGui::GetCursorPosX() + start_pos);
|
||||||
|
|
||||||
if (ImGui::Button("OK", ImVec2(button_width, 0)))
|
if (ImGui::Button("OK", ImVec2(button_width, 0)))
|
||||||
{
|
{
|
||||||
apply_settings();
|
apply_settings();
|
||||||
@@ -306,15 +314,15 @@ void settings_window::render_action_buttons()
|
|||||||
m_settings_changed = false;
|
m_settings_changed = false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
ImGui::SameLine();
|
ImGui::SameLine();
|
||||||
|
|
||||||
bool apply_disabled = !m_settings_changed;
|
bool apply_disabled = !m_settings_changed;
|
||||||
if (apply_disabled)
|
if (apply_disabled)
|
||||||
{
|
{
|
||||||
ImGui::PushStyleVar(ImGuiStyleVar_Alpha, 0.5f);
|
ImGui::PushStyleVar(ImGuiStyleVar_Alpha, 0.5f);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (ImGui::Button("Apply", ImVec2(button_width, 0)) && !apply_disabled)
|
if (ImGui::Button("Apply", ImVec2(button_width, 0)) && !apply_disabled)
|
||||||
{
|
{
|
||||||
apply_settings();
|
apply_settings();
|
||||||
@@ -323,21 +331,21 @@ void settings_window::render_action_buttons()
|
|||||||
m_settings_changed = false;
|
m_settings_changed = false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (apply_disabled)
|
if (apply_disabled)
|
||||||
{
|
{
|
||||||
ImGui::PopStyleVar();
|
ImGui::PopStyleVar();
|
||||||
}
|
}
|
||||||
|
|
||||||
ImGui::SameLine();
|
ImGui::SameLine();
|
||||||
|
|
||||||
if (ImGui::Button("Reset", ImVec2(button_width, 0)))
|
if (ImGui::Button("Reset", ImVec2(button_width, 0)))
|
||||||
{
|
{
|
||||||
reset_to_defaults();
|
reset_to_defaults();
|
||||||
}
|
}
|
||||||
|
|
||||||
ImGui::SameLine();
|
ImGui::SameLine();
|
||||||
|
|
||||||
if (ImGui::Button("Cancel", ImVec2(button_width, 0)))
|
if (ImGui::Button("Cancel", ImVec2(button_width, 0)))
|
||||||
{
|
{
|
||||||
load_settings();
|
load_settings();
|
||||||
@@ -347,7 +355,7 @@ void settings_window::render_action_buttons()
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void settings_window::show_help_marker(const char* desc)
|
void settings_window::show_help_marker(const char *desc)
|
||||||
{
|
{
|
||||||
ImGui::TextDisabled("(?)");
|
ImGui::TextDisabled("(?)");
|
||||||
if (ImGui::BeginItemTooltip())
|
if (ImGui::BeginItemTooltip())
|
||||||
@@ -7,14 +7,23 @@
|
|||||||
|
|
||||||
class settings_window
|
class settings_window
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
settings_window();
|
settings_window();
|
||||||
void render();
|
void render();
|
||||||
void show() { m_visible = true; }
|
void show()
|
||||||
void hide() { m_visible = false; }
|
{
|
||||||
bool is_visible() const { return m_visible; }
|
m_visible = true;
|
||||||
|
}
|
||||||
|
void hide()
|
||||||
|
{
|
||||||
|
m_visible = false;
|
||||||
|
}
|
||||||
|
bool is_visible() const
|
||||||
|
{
|
||||||
|
return m_visible;
|
||||||
|
}
|
||||||
|
|
||||||
private:
|
private:
|
||||||
void load_settings();
|
void load_settings();
|
||||||
void save_settings();
|
void save_settings();
|
||||||
void apply_settings();
|
void apply_settings();
|
||||||
@@ -22,28 +31,29 @@ private:
|
|||||||
void render_appearance_tab();
|
void render_appearance_tab();
|
||||||
void render_status_messages();
|
void render_status_messages();
|
||||||
void render_action_buttons();
|
void render_action_buttons();
|
||||||
void show_help_marker(const char* desc);
|
void show_help_marker(const char *desc);
|
||||||
void reset_to_defaults();
|
void reset_to_defaults();
|
||||||
|
|
||||||
public:
|
public:
|
||||||
void set_palette(const clrsync::core::palette& palette) {
|
void set_palette(const clrsync::core::palette &palette)
|
||||||
m_current_palette = palette;
|
{
|
||||||
|
m_current_palette = palette;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool m_visible{false};
|
bool m_visible{false};
|
||||||
|
|
||||||
char m_default_theme[128];
|
char m_default_theme[128];
|
||||||
char m_palettes_path[512];
|
char m_palettes_path[512];
|
||||||
char m_font[128];
|
char m_font[128];
|
||||||
int m_font_size;
|
int m_font_size;
|
||||||
|
|
||||||
std::vector<std::string> m_available_fonts;
|
std::vector<std::string> m_available_fonts;
|
||||||
int m_selected_font_idx;
|
int m_selected_font_idx;
|
||||||
|
|
||||||
std::string m_error_message;
|
std::string m_error_message;
|
||||||
bool m_settings_changed;
|
bool m_settings_changed;
|
||||||
int m_current_tab;
|
int m_current_tab;
|
||||||
|
|
||||||
clrsync::core::palette m_current_palette;
|
clrsync::core::palette m_current_palette;
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -1,24 +1,21 @@
|
|||||||
#include "template_editor.hpp"
|
#include "template_editor.hpp"
|
||||||
#include "core/config/config.hpp"
|
#include "core/config/config.hpp"
|
||||||
#include "core/theme/theme_template.hpp"
|
|
||||||
#include "core/palette/color_keys.hpp"
|
#include "core/palette/color_keys.hpp"
|
||||||
|
#include "core/theme/theme_template.hpp"
|
||||||
#include "core/utils.hpp"
|
#include "core/utils.hpp"
|
||||||
#include "imgui_helpers.hpp"
|
#include "gui/helpers/imgui_helpers.hpp"
|
||||||
#include "file_browser.hpp"
|
#include "gui/platform/file_browser.hpp"
|
||||||
#include "imgui.h"
|
#include "imgui.h"
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
#include <filesystem>
|
#include <filesystem>
|
||||||
#include <fstream>
|
#include <fstream>
|
||||||
#include <ranges>
|
#include <ranges>
|
||||||
|
|
||||||
namespace {
|
namespace
|
||||||
const std::vector<std::string> COLOR_FORMATS = {
|
{
|
||||||
"hex", "hex_stripped", "hexa", "hexa_stripped",
|
const std::vector<std::string> COLOR_FORMATS = {
|
||||||
"r", "g", "b", "a",
|
"hex", "hex_stripped", "hexa", "hexa_stripped", "r", "g", "b", "a", "rgb", "rgba", "h", "s",
|
||||||
"rgb", "rgba",
|
"l", "hsl", "hsla"};
|
||||||
"h", "s", "l",
|
|
||||||
"hsl", "hsla"
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|
||||||
template_editor::template_editor() : m_template_name("new_template")
|
template_editor::template_editor() : m_template_name("new_template")
|
||||||
@@ -29,7 +26,7 @@ template_editor::template_editor() : m_template_name("new_template")
|
|||||||
m_autocomplete_text_color = ImVec4(0.85f, 0.85f, 0.9f, 1.0f);
|
m_autocomplete_text_color = ImVec4(0.85f, 0.85f, 0.9f, 1.0f);
|
||||||
m_autocomplete_selected_text_color = ImVec4(1.0f, 1.0f, 1.0f, 1.0f);
|
m_autocomplete_selected_text_color = ImVec4(1.0f, 1.0f, 1.0f, 1.0f);
|
||||||
m_autocomplete_dim_text_color = ImVec4(0.6f, 0.6f, 0.7f, 1.0f);
|
m_autocomplete_dim_text_color = ImVec4(0.6f, 0.6f, 0.7f, 1.0f);
|
||||||
|
|
||||||
TextEditor::LanguageDefinition lang;
|
TextEditor::LanguageDefinition lang;
|
||||||
lang.mName = "Template";
|
lang.mName = "Template";
|
||||||
|
|
||||||
@@ -101,24 +98,25 @@ void template_editor::apply_current_palette(const clrsync::core::palette &pal)
|
|||||||
get_color_u32("border_focused", "border");
|
get_color_u32("border_focused", "border");
|
||||||
|
|
||||||
m_editor.SetPalette(palette);
|
m_editor.SetPalette(palette);
|
||||||
|
|
||||||
m_autocomplete_bg_color = palette_utils::get_color(pal, "surface", "background");
|
m_autocomplete_bg_color = palette_utils::get_color(pal, "surface", "background");
|
||||||
m_autocomplete_bg_color.w = 0.98f;
|
m_autocomplete_bg_color.w = 0.98f;
|
||||||
m_autocomplete_border_color = palette_utils::get_color(pal, "border", "surface_variant");
|
m_autocomplete_border_color = palette_utils::get_color(pal, "border", "surface_variant");
|
||||||
m_autocomplete_selected_color = palette_utils::get_color(pal, "accent", "surface_variant");
|
m_autocomplete_selected_color = palette_utils::get_color(pal, "accent", "surface_variant");
|
||||||
m_autocomplete_text_color = palette_utils::get_color(pal, "on_surface", "foreground");
|
m_autocomplete_text_color = palette_utils::get_color(pal, "on_surface", "foreground");
|
||||||
m_autocomplete_selected_text_color = palette_utils::get_color(pal, "on_surface", "foreground");
|
m_autocomplete_selected_text_color = palette_utils::get_color(pal, "on_surface", "foreground");
|
||||||
m_autocomplete_dim_text_color = palette_utils::get_color(pal, "on_surface_variant", "editor_inactive");
|
m_autocomplete_dim_text_color =
|
||||||
|
palette_utils::get_color(pal, "on_surface_variant", "editor_inactive");
|
||||||
}
|
}
|
||||||
|
|
||||||
void template_editor::update_autocomplete_suggestions()
|
void template_editor::update_autocomplete_suggestions()
|
||||||
{
|
{
|
||||||
m_autocomplete_suggestions.clear();
|
m_autocomplete_suggestions.clear();
|
||||||
|
|
||||||
auto cursor = m_editor.GetCursorPosition();
|
auto cursor = m_editor.GetCursorPosition();
|
||||||
std::string line = m_editor.GetCurrentLineText();
|
std::string line = m_editor.GetCurrentLineText();
|
||||||
int col = cursor.mColumn;
|
int col = cursor.mColumn;
|
||||||
|
|
||||||
// Check if inside '{'
|
// Check if inside '{'
|
||||||
int brace_pos = -1;
|
int brace_pos = -1;
|
||||||
for (int i = col - 1; i >= 0; --i)
|
for (int i = col - 1; i >= 0; --i)
|
||||||
@@ -136,25 +134,24 @@ void template_editor::update_autocomplete_suggestions()
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (brace_pos < 0)
|
if (brace_pos < 0)
|
||||||
{
|
{
|
||||||
m_show_autocomplete = false;
|
m_show_autocomplete = false;
|
||||||
m_autocomplete_dismissed = false;
|
m_autocomplete_dismissed = false;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (m_autocomplete_dismissed)
|
if (m_autocomplete_dismissed)
|
||||||
{
|
{
|
||||||
bool should_reset_dismissal = false;
|
bool should_reset_dismissal = false;
|
||||||
|
|
||||||
if (cursor.mLine != m_dismiss_position.mLine ||
|
if (cursor.mLine != m_dismiss_position.mLine || brace_pos != m_dismiss_brace_pos ||
|
||||||
brace_pos != m_dismiss_brace_pos ||
|
|
||||||
abs(cursor.mColumn - m_dismiss_position.mColumn) > 3)
|
abs(cursor.mColumn - m_dismiss_position.mColumn) > 3)
|
||||||
{
|
{
|
||||||
should_reset_dismissal = true;
|
should_reset_dismissal = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (should_reset_dismissal)
|
if (should_reset_dismissal)
|
||||||
{
|
{
|
||||||
m_autocomplete_dismissed = false;
|
m_autocomplete_dismissed = false;
|
||||||
@@ -165,17 +162,17 @@ void template_editor::update_autocomplete_suggestions()
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
m_autocomplete_prefix = line.substr(brace_pos + 1, col - brace_pos - 1);
|
m_autocomplete_prefix = line.substr(brace_pos + 1, col - brace_pos - 1);
|
||||||
m_autocomplete_start_pos = TextEditor::Coordinates(cursor.mLine, brace_pos + 1);
|
m_autocomplete_start_pos = TextEditor::Coordinates(cursor.mLine, brace_pos + 1);
|
||||||
|
|
||||||
size_t dot_pos = m_autocomplete_prefix.find('.');
|
size_t dot_pos = m_autocomplete_prefix.find('.');
|
||||||
|
|
||||||
if (dot_pos != std::string::npos)
|
if (dot_pos != std::string::npos)
|
||||||
{
|
{
|
||||||
std::string color_key = m_autocomplete_prefix.substr(0, dot_pos);
|
std::string color_key = m_autocomplete_prefix.substr(0, dot_pos);
|
||||||
std::string format_prefix = m_autocomplete_prefix.substr(dot_pos + 1);
|
std::string format_prefix = m_autocomplete_prefix.substr(dot_pos + 1);
|
||||||
|
|
||||||
bool valid_key = false;
|
bool valid_key = false;
|
||||||
for (size_t i = 0; i < clrsync::core::NUM_COLOR_KEYS; ++i)
|
for (size_t i = 0; i < clrsync::core::NUM_COLOR_KEYS; ++i)
|
||||||
{
|
{
|
||||||
@@ -185,13 +182,12 @@ void template_editor::update_autocomplete_suggestions()
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (valid_key)
|
if (valid_key)
|
||||||
{
|
{
|
||||||
for (const auto &fmt : COLOR_FORMATS)
|
for (const auto &fmt : COLOR_FORMATS)
|
||||||
{
|
{
|
||||||
if (format_prefix.empty() ||
|
if (format_prefix.empty() || fmt.find(format_prefix) == 0 ||
|
||||||
fmt.find(format_prefix) == 0 ||
|
|
||||||
fmt.find(format_prefix) != std::string::npos)
|
fmt.find(format_prefix) != std::string::npos)
|
||||||
{
|
{
|
||||||
m_autocomplete_suggestions.push_back(color_key + "." + fmt);
|
m_autocomplete_suggestions.push_back(color_key + "." + fmt);
|
||||||
@@ -204,24 +200,23 @@ void template_editor::update_autocomplete_suggestions()
|
|||||||
for (size_t i = 0; i < clrsync::core::NUM_COLOR_KEYS; ++i)
|
for (size_t i = 0; i < clrsync::core::NUM_COLOR_KEYS; ++i)
|
||||||
{
|
{
|
||||||
std::string key = clrsync::core::COLOR_KEYS[i];
|
std::string key = clrsync::core::COLOR_KEYS[i];
|
||||||
if (m_autocomplete_prefix.empty() ||
|
if (m_autocomplete_prefix.empty() || key.find(m_autocomplete_prefix) == 0 ||
|
||||||
key.find(m_autocomplete_prefix) == 0 ||
|
|
||||||
key.find(m_autocomplete_prefix) != std::string::npos)
|
key.find(m_autocomplete_prefix) != std::string::npos)
|
||||||
{
|
{
|
||||||
m_autocomplete_suggestions.push_back(key);
|
m_autocomplete_suggestions.push_back(key);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
std::sort(m_autocomplete_suggestions.begin(), m_autocomplete_suggestions.end(),
|
std::sort(m_autocomplete_suggestions.begin(), m_autocomplete_suggestions.end(),
|
||||||
[this](const std::string &a, const std::string &b) {
|
[this](const std::string &a, const std::string &b) {
|
||||||
bool a_prefix = a.find(m_autocomplete_prefix) == 0;
|
bool a_prefix = a.find(m_autocomplete_prefix) == 0;
|
||||||
bool b_prefix = b.find(m_autocomplete_prefix) == 0;
|
bool b_prefix = b.find(m_autocomplete_prefix) == 0;
|
||||||
if (a_prefix != b_prefix)
|
if (a_prefix != b_prefix)
|
||||||
return a_prefix;
|
return a_prefix;
|
||||||
return a < b;
|
return a < b;
|
||||||
});
|
});
|
||||||
|
|
||||||
m_show_autocomplete = !m_autocomplete_suggestions.empty();
|
m_show_autocomplete = !m_autocomplete_suggestions.empty();
|
||||||
if (m_show_autocomplete && m_autocomplete_selected >= (int)m_autocomplete_suggestions.size())
|
if (m_show_autocomplete && m_autocomplete_selected >= (int)m_autocomplete_suggestions.size())
|
||||||
{
|
{
|
||||||
@@ -229,34 +224,36 @@ void template_editor::update_autocomplete_suggestions()
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void template_editor::render_autocomplete(const ImVec2& editor_pos)
|
void template_editor::render_autocomplete(const ImVec2 &editor_pos)
|
||||||
{
|
{
|
||||||
if (!m_show_autocomplete || m_autocomplete_suggestions.empty())
|
if (!m_show_autocomplete || m_autocomplete_suggestions.empty())
|
||||||
return;
|
return;
|
||||||
|
|
||||||
float line_height = ImGui::GetTextLineHeightWithSpacing();
|
float line_height = ImGui::GetTextLineHeightWithSpacing();
|
||||||
float char_width = ImGui::GetFontSize() * 0.5f;
|
float char_width = ImGui::GetFontSize() * 0.5f;
|
||||||
auto cursor = m_editor.GetCursorPosition();
|
auto cursor = m_editor.GetCursorPosition();
|
||||||
|
|
||||||
const float line_number_width = 50.0f;
|
const float line_number_width = 50.0f;
|
||||||
|
|
||||||
ImVec2 popup_pos;
|
ImVec2 popup_pos;
|
||||||
popup_pos.x = editor_pos.x + line_number_width + (m_autocomplete_start_pos.mColumn * char_width);
|
popup_pos.x =
|
||||||
|
editor_pos.x + line_number_width + (m_autocomplete_start_pos.mColumn * char_width);
|
||||||
popup_pos.y = editor_pos.y + ((cursor.mLine + 1) * line_height);
|
popup_pos.y = editor_pos.y + ((cursor.mLine + 1) * line_height);
|
||||||
|
|
||||||
ImGui::SetNextWindowPos(popup_pos, ImGuiCond_Always);
|
ImGui::SetNextWindowPos(popup_pos, ImGuiCond_Always);
|
||||||
ImGui::SetNextWindowSize(ImVec2(300, 0));
|
ImGui::SetNextWindowSize(ImVec2(300, 0));
|
||||||
|
|
||||||
ImGuiWindowFlags flags = ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoResize |
|
ImGuiWindowFlags flags = ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoResize |
|
||||||
ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoSavedSettings |
|
ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoSavedSettings |
|
||||||
ImGuiWindowFlags_NoFocusOnAppearing | ImGuiWindowFlags_AlwaysAutoResize;
|
ImGuiWindowFlags_NoFocusOnAppearing |
|
||||||
|
ImGuiWindowFlags_AlwaysAutoResize;
|
||||||
|
|
||||||
ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(6, 6));
|
ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(6, 6));
|
||||||
ImGui::PushStyleVar(ImGuiStyleVar_WindowRounding, 6.0f);
|
ImGui::PushStyleVar(ImGuiStyleVar_WindowRounding, 6.0f);
|
||||||
ImGui::PushStyleVar(ImGuiStyleVar_ItemSpacing, ImVec2(4, 2));
|
ImGui::PushStyleVar(ImGuiStyleVar_ItemSpacing, ImVec2(4, 2));
|
||||||
ImGui::PushStyleColor(ImGuiCol_WindowBg, m_autocomplete_bg_color);
|
ImGui::PushStyleColor(ImGuiCol_WindowBg, m_autocomplete_bg_color);
|
||||||
ImGui::PushStyleColor(ImGuiCol_Border, m_autocomplete_border_color);
|
ImGui::PushStyleColor(ImGuiCol_Border, m_autocomplete_border_color);
|
||||||
|
|
||||||
if (ImGui::Begin("##autocomplete", nullptr, flags))
|
if (ImGui::Begin("##autocomplete", nullptr, flags))
|
||||||
{
|
{
|
||||||
ImGui::PushStyleColor(ImGuiCol_Text, m_autocomplete_dim_text_color);
|
ImGui::PushStyleColor(ImGuiCol_Text, m_autocomplete_dim_text_color);
|
||||||
@@ -266,14 +263,14 @@ void template_editor::render_autocomplete(const ImVec2& editor_pos)
|
|||||||
ImGui::Text("Color Keys");
|
ImGui::Text("Color Keys");
|
||||||
ImGui::PopStyleColor();
|
ImGui::PopStyleColor();
|
||||||
ImGui::Separator();
|
ImGui::Separator();
|
||||||
|
|
||||||
int max_items = std::min((int)m_autocomplete_suggestions.size(), 8);
|
int max_items = std::min((int)m_autocomplete_suggestions.size(), 8);
|
||||||
|
|
||||||
for (int i = 0; i < max_items; ++i)
|
for (int i = 0; i < max_items; ++i)
|
||||||
{
|
{
|
||||||
const auto &suggestion = m_autocomplete_suggestions[i];
|
const auto &suggestion = m_autocomplete_suggestions[i];
|
||||||
bool is_selected = (i == m_autocomplete_selected);
|
bool is_selected = (i == m_autocomplete_selected);
|
||||||
|
|
||||||
if (is_selected)
|
if (is_selected)
|
||||||
{
|
{
|
||||||
ImVec4 selected_hover = m_autocomplete_selected_color;
|
ImVec4 selected_hover = m_autocomplete_selected_color;
|
||||||
@@ -292,11 +289,11 @@ void template_editor::render_autocomplete(const ImVec2& editor_pos)
|
|||||||
ImGui::PushStyleColor(ImGuiCol_HeaderHovered, hover_bg);
|
ImGui::PushStyleColor(ImGuiCol_HeaderHovered, hover_bg);
|
||||||
ImGui::PushStyleColor(ImGuiCol_Text, m_autocomplete_text_color);
|
ImGui::PushStyleColor(ImGuiCol_Text, m_autocomplete_text_color);
|
||||||
}
|
}
|
||||||
|
|
||||||
std::string display_text = " " + suggestion;
|
std::string display_text = " " + suggestion;
|
||||||
|
|
||||||
if (ImGui::Selectable(display_text.c_str(), is_selected,
|
if (ImGui::Selectable(display_text.c_str(), is_selected, ImGuiSelectableFlags_None,
|
||||||
ImGuiSelectableFlags_None, ImVec2(0, 0)))
|
ImVec2(0, 0)))
|
||||||
{
|
{
|
||||||
auto start = m_autocomplete_start_pos;
|
auto start = m_autocomplete_start_pos;
|
||||||
auto end = m_editor.GetCursorPosition();
|
auto end = m_editor.GetCursorPosition();
|
||||||
@@ -306,15 +303,15 @@ void template_editor::render_autocomplete(const ImVec2& editor_pos)
|
|||||||
m_show_autocomplete = false;
|
m_show_autocomplete = false;
|
||||||
m_autocomplete_dismissed = false;
|
m_autocomplete_dismissed = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
ImGui::PopStyleColor(3);
|
ImGui::PopStyleColor(3);
|
||||||
|
|
||||||
if (is_selected && ImGui::IsWindowAppearing())
|
if (is_selected && ImGui::IsWindowAppearing())
|
||||||
{
|
{
|
||||||
ImGui::SetScrollHereY();
|
ImGui::SetScrollHereY();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (m_autocomplete_suggestions.size() > 8)
|
if (m_autocomplete_suggestions.size() > 8)
|
||||||
{
|
{
|
||||||
ImGui::Separator();
|
ImGui::Separator();
|
||||||
@@ -322,14 +319,14 @@ void template_editor::render_autocomplete(const ImVec2& editor_pos)
|
|||||||
ImGui::Text(" +%d more", (int)m_autocomplete_suggestions.size() - 8);
|
ImGui::Text(" +%d more", (int)m_autocomplete_suggestions.size() - 8);
|
||||||
ImGui::PopStyleColor();
|
ImGui::PopStyleColor();
|
||||||
}
|
}
|
||||||
|
|
||||||
ImGui::Separator();
|
ImGui::Separator();
|
||||||
ImGui::PushStyleColor(ImGuiCol_Text, m_autocomplete_dim_text_color);
|
ImGui::PushStyleColor(ImGuiCol_Text, m_autocomplete_dim_text_color);
|
||||||
ImGui::Text(" Tab/Enter: accept | Esc: dismiss");
|
ImGui::Text(" Tab/Enter: accept | Esc: dismiss");
|
||||||
ImGui::PopStyleColor();
|
ImGui::PopStyleColor();
|
||||||
}
|
}
|
||||||
ImGui::End();
|
ImGui::End();
|
||||||
|
|
||||||
ImGui::PopStyleColor(2);
|
ImGui::PopStyleColor(2);
|
||||||
ImGui::PopStyleVar(3);
|
ImGui::PopStyleVar(3);
|
||||||
}
|
}
|
||||||
@@ -362,8 +359,7 @@ void template_editor::render()
|
|||||||
}
|
}
|
||||||
|
|
||||||
palette_utils::render_delete_confirmation_popup(
|
palette_utils::render_delete_confirmation_popup(
|
||||||
"Delete Template?", m_template_name, "template", m_current_palette,
|
"Delete Template?", m_template_name, "template", m_current_palette, [this]() {
|
||||||
[this]() {
|
|
||||||
bool success = m_template_controller.remove_template(m_template_name);
|
bool success = m_template_controller.remove_template(m_template_name);
|
||||||
if (success)
|
if (success)
|
||||||
{
|
{
|
||||||
@@ -382,7 +378,7 @@ void template_editor::render()
|
|||||||
void template_editor::render_controls()
|
void template_editor::render_controls()
|
||||||
{
|
{
|
||||||
ImGui::PushStyleVar(ImGuiStyleVar_ItemSpacing, ImVec2(4, 8));
|
ImGui::PushStyleVar(ImGuiStyleVar_ItemSpacing, ImVec2(4, 8));
|
||||||
|
|
||||||
if (ImGui::Button(" + New "))
|
if (ImGui::Button(" + New "))
|
||||||
{
|
{
|
||||||
new_template();
|
new_template();
|
||||||
@@ -408,10 +404,8 @@ void template_editor::render_controls()
|
|||||||
{
|
{
|
||||||
ImGui::SameLine();
|
ImGui::SameLine();
|
||||||
auto error = palette_utils::get_color(m_current_palette, "error");
|
auto error = palette_utils::get_color(m_current_palette, "error");
|
||||||
auto error_hover = ImVec4(error.x * 1.1f, error.y * 1.1f, error.z * 1.1f,
|
auto error_hover = ImVec4(error.x * 1.1f, error.y * 1.1f, error.z * 1.1f, error.w);
|
||||||
error.w);
|
auto error_active = ImVec4(error.x * 0.8f, error.y * 0.8f, error.z * 0.8f, error.w);
|
||||||
auto error_active = ImVec4(error.x * 0.8f, error.y * 0.8f, error.z * 0.8f,
|
|
||||||
error.w);
|
|
||||||
auto on_error = palette_utils::get_color(m_current_palette, "on_error");
|
auto on_error = palette_utils::get_color(m_current_palette, "on_error");
|
||||||
ImGui::PushStyleColor(ImGuiCol_Button, error);
|
ImGui::PushStyleColor(ImGuiCol_Button, error);
|
||||||
ImGui::PushStyleColor(ImGuiCol_ButtonHovered, error_hover);
|
ImGui::PushStyleColor(ImGuiCol_ButtonHovered, error_hover);
|
||||||
@@ -428,41 +422,47 @@ void template_editor::render_controls()
|
|||||||
|
|
||||||
ImGui::SameLine();
|
ImGui::SameLine();
|
||||||
ImGui::SetCursorPosX(ImGui::GetCursorPosX() + 10);
|
ImGui::SetCursorPosX(ImGui::GetCursorPosX() + 10);
|
||||||
|
|
||||||
bool enabled_changed = false;
|
bool enabled_changed = false;
|
||||||
if (m_enabled)
|
if (m_enabled)
|
||||||
{
|
{
|
||||||
ImVec4 success_color = palette_utils::get_color(m_current_palette, "success", "accent");
|
ImVec4 success_color = palette_utils::get_color(m_current_palette, "success", "accent");
|
||||||
ImVec4 success_on_color = palette_utils::get_color(m_current_palette, "on_success", "on_surface");
|
ImVec4 success_on_color =
|
||||||
ImVec4 success_hover = ImVec4(success_color.x * 1.2f, success_color.y * 1.2f, success_color.z * 1.2f, 0.6f);
|
palette_utils::get_color(m_current_palette, "on_success", "on_surface");
|
||||||
ImGui::PushStyleColor(ImGuiCol_FrameBg, ImVec4(success_color.x, success_color.y, success_color.z, 0.5f));
|
ImVec4 success_hover =
|
||||||
|
ImVec4(success_color.x * 1.2f, success_color.y * 1.2f, success_color.z * 1.2f, 0.6f);
|
||||||
|
ImGui::PushStyleColor(ImGuiCol_FrameBg,
|
||||||
|
ImVec4(success_color.x, success_color.y, success_color.z, 0.5f));
|
||||||
ImGui::PushStyleColor(ImGuiCol_FrameBgHovered, success_hover);
|
ImGui::PushStyleColor(ImGuiCol_FrameBgHovered, success_hover);
|
||||||
ImGui::PushStyleColor(ImGuiCol_CheckMark, success_on_color);
|
ImGui::PushStyleColor(ImGuiCol_CheckMark, success_on_color);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
ImVec4 error_color = palette_utils::get_color(m_current_palette, "error", "accent");
|
ImVec4 error_color = palette_utils::get_color(m_current_palette, "error", "accent");
|
||||||
ImVec4 error_on_color = palette_utils::get_color(m_current_palette, "on_error", "on_surface");
|
ImVec4 error_on_color =
|
||||||
ImVec4 error_hover = ImVec4(error_color.x * 1.2f, error_color.y * 1.2f, error_color.z * 1.2f, 0.6f);
|
palette_utils::get_color(m_current_palette, "on_error", "on_surface");
|
||||||
ImGui::PushStyleColor(ImGuiCol_FrameBg, ImVec4(error_color.x, error_color.y, error_color.z, 0.5f));
|
ImVec4 error_hover =
|
||||||
|
ImVec4(error_color.x * 1.2f, error_color.y * 1.2f, error_color.z * 1.2f, 0.6f);
|
||||||
|
ImGui::PushStyleColor(ImGuiCol_FrameBg,
|
||||||
|
ImVec4(error_color.x, error_color.y, error_color.z, 0.5f));
|
||||||
ImGui::PushStyleColor(ImGuiCol_FrameBgHovered, error_hover);
|
ImGui::PushStyleColor(ImGuiCol_FrameBgHovered, error_hover);
|
||||||
ImGui::PushStyleColor(ImGuiCol_CheckMark, error_on_color);
|
ImGui::PushStyleColor(ImGuiCol_CheckMark, error_on_color);
|
||||||
}
|
}
|
||||||
|
|
||||||
enabled_changed = ImGui::Checkbox("Enabled", &m_enabled);
|
enabled_changed = ImGui::Checkbox("Enabled", &m_enabled);
|
||||||
ImGui::PopStyleColor(3);
|
ImGui::PopStyleColor(3);
|
||||||
|
|
||||||
if (enabled_changed && m_is_editing_existing)
|
if (enabled_changed && m_is_editing_existing)
|
||||||
{
|
{
|
||||||
m_template_controller.set_template_enabled(m_template_name, m_enabled);
|
m_template_controller.set_template_enabled(m_template_name, m_enabled);
|
||||||
}
|
}
|
||||||
if (ImGui::IsItemHovered())
|
if (ImGui::IsItemHovered())
|
||||||
ImGui::SetTooltip("Enable/disable this template for theme application");
|
ImGui::SetTooltip("Enable/disable this template for theme application");
|
||||||
|
|
||||||
ImGui::PopStyleVar();
|
ImGui::PopStyleVar();
|
||||||
|
|
||||||
ImGui::Spacing();
|
ImGui::Spacing();
|
||||||
|
|
||||||
ImGui::AlignTextToFramePadding();
|
ImGui::AlignTextToFramePadding();
|
||||||
ImGui::Text("Name:");
|
ImGui::Text("Name:");
|
||||||
ImGui::SameLine(80);
|
ImGui::SameLine(80);
|
||||||
@@ -486,8 +486,8 @@ void template_editor::render_controls()
|
|||||||
ImGui::SetNextItemWidth(-120.0f);
|
ImGui::SetNextItemWidth(-120.0f);
|
||||||
char input_path_buf[512] = {0};
|
char input_path_buf[512] = {0};
|
||||||
snprintf(input_path_buf, sizeof(input_path_buf), "%s", m_input_path.c_str());
|
snprintf(input_path_buf, sizeof(input_path_buf), "%s", m_input_path.c_str());
|
||||||
if (ImGui::InputTextWithHint("##input_path", "Path to template file...",
|
if (ImGui::InputTextWithHint("##input_path", "Path to template file...", input_path_buf,
|
||||||
input_path_buf, sizeof(input_path_buf)))
|
sizeof(input_path_buf)))
|
||||||
{
|
{
|
||||||
m_input_path = input_path_buf;
|
m_input_path = input_path_buf;
|
||||||
if (!m_input_path.empty())
|
if (!m_input_path.empty())
|
||||||
@@ -502,10 +502,13 @@ void template_editor::render_controls()
|
|||||||
ImGui::SameLine();
|
ImGui::SameLine();
|
||||||
if (ImGui::Button("Browse##input"))
|
if (ImGui::Button("Browse##input"))
|
||||||
{
|
{
|
||||||
std::string selected_path = file_dialogs::open_file_dialog("Select Template File", m_input_path);
|
std::string selected_path =
|
||||||
if (!selected_path.empty()) {
|
file_dialogs::open_file_dialog("Select Template File", m_input_path);
|
||||||
|
if (!selected_path.empty())
|
||||||
|
{
|
||||||
m_input_path = selected_path;
|
m_input_path = selected_path;
|
||||||
if (m_is_editing_existing) {
|
if (m_is_editing_existing)
|
||||||
|
{
|
||||||
m_template_controller.set_template_input_path(m_template_name, m_input_path);
|
m_template_controller.set_template_input_path(m_template_name, m_input_path);
|
||||||
}
|
}
|
||||||
m_validation_error = "";
|
m_validation_error = "";
|
||||||
@@ -520,8 +523,8 @@ void template_editor::render_controls()
|
|||||||
ImGui::SetNextItemWidth(-120.0f);
|
ImGui::SetNextItemWidth(-120.0f);
|
||||||
char path_buf[512] = {0};
|
char path_buf[512] = {0};
|
||||||
snprintf(path_buf, sizeof(path_buf), "%s", m_output_path.c_str());
|
snprintf(path_buf, sizeof(path_buf), "%s", m_output_path.c_str());
|
||||||
if (ImGui::InputTextWithHint("##output_path", "Path for generated config...",
|
if (ImGui::InputTextWithHint("##output_path", "Path for generated config...", path_buf,
|
||||||
path_buf, sizeof(path_buf)))
|
sizeof(path_buf)))
|
||||||
{
|
{
|
||||||
m_output_path = path_buf;
|
m_output_path = path_buf;
|
||||||
if (!m_output_path.empty())
|
if (!m_output_path.empty())
|
||||||
@@ -536,10 +539,13 @@ void template_editor::render_controls()
|
|||||||
ImGui::SameLine();
|
ImGui::SameLine();
|
||||||
if (ImGui::Button("Browse##output"))
|
if (ImGui::Button("Browse##output"))
|
||||||
{
|
{
|
||||||
std::string selected_path = file_dialogs::save_file_dialog("Select Output File", m_output_path);
|
std::string selected_path =
|
||||||
if (!selected_path.empty()) {
|
file_dialogs::save_file_dialog("Select Output File", m_output_path);
|
||||||
|
if (!selected_path.empty())
|
||||||
|
{
|
||||||
m_output_path = selected_path;
|
m_output_path = selected_path;
|
||||||
if (m_is_editing_existing) {
|
if (m_is_editing_existing)
|
||||||
|
{
|
||||||
m_template_controller.set_template_output_path(m_template_name, m_output_path);
|
m_template_controller.set_template_output_path(m_template_name, m_output_path);
|
||||||
}
|
}
|
||||||
m_validation_error = "";
|
m_validation_error = "";
|
||||||
@@ -554,8 +560,8 @@ void template_editor::render_controls()
|
|||||||
ImGui::SetNextItemWidth(-FLT_MIN);
|
ImGui::SetNextItemWidth(-FLT_MIN);
|
||||||
char reload_buf[512] = {0};
|
char reload_buf[512] = {0};
|
||||||
snprintf(reload_buf, sizeof(reload_buf), "%s", m_reload_command.c_str());
|
snprintf(reload_buf, sizeof(reload_buf), "%s", m_reload_command.c_str());
|
||||||
if (ImGui::InputTextWithHint("##reload_cmd", "Command to reload app (optional)...",
|
if (ImGui::InputTextWithHint("##reload_cmd", "Command to reload app (optional)...", reload_buf,
|
||||||
reload_buf, sizeof(reload_buf)))
|
sizeof(reload_buf)))
|
||||||
{
|
{
|
||||||
m_reload_command = reload_buf;
|
m_reload_command = reload_buf;
|
||||||
if (m_is_editing_existing)
|
if (m_is_editing_existing)
|
||||||
@@ -579,7 +585,7 @@ void template_editor::render_controls()
|
|||||||
void template_editor::render_editor()
|
void template_editor::render_editor()
|
||||||
{
|
{
|
||||||
ImGui::PushStyleVar(ImGuiStyleVar_ItemSpacing, ImVec2(8, 4));
|
ImGui::PushStyleVar(ImGuiStyleVar_ItemSpacing, ImVec2(8, 4));
|
||||||
|
|
||||||
if (!m_is_editing_existing)
|
if (!m_is_editing_existing)
|
||||||
{
|
{
|
||||||
ImVec4 success_color = palette_utils::get_color(m_current_palette, "success", "accent");
|
ImVec4 success_color = palette_utils::get_color(m_current_palette, "success", "accent");
|
||||||
@@ -608,19 +614,19 @@ void template_editor::render_editor()
|
|||||||
ImGui::PopStyleColor();
|
ImGui::PopStyleColor();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
ImGui::PopStyleVar();
|
ImGui::PopStyleVar();
|
||||||
ImGui::Separator();
|
ImGui::Separator();
|
||||||
|
|
||||||
bool consume_keys = false;
|
bool consume_keys = false;
|
||||||
|
|
||||||
if (m_show_autocomplete && ImGui::IsKeyPressed(ImGuiKey_Escape, false))
|
if (m_show_autocomplete && ImGui::IsKeyPressed(ImGuiKey_Escape, false))
|
||||||
{
|
{
|
||||||
m_show_autocomplete = false;
|
m_show_autocomplete = false;
|
||||||
m_autocomplete_dismissed = true;
|
m_autocomplete_dismissed = true;
|
||||||
|
|
||||||
m_dismiss_position = m_editor.GetCursorPosition();
|
m_dismiss_position = m_editor.GetCursorPosition();
|
||||||
|
|
||||||
std::string line = m_editor.GetCurrentLineText();
|
std::string line = m_editor.GetCurrentLineText();
|
||||||
m_dismiss_brace_pos = -1;
|
m_dismiss_brace_pos = -1;
|
||||||
for (int i = m_dismiss_position.mColumn - 1; i >= 0; --i)
|
for (int i = m_dismiss_position.mColumn - 1; i >= 0; --i)
|
||||||
@@ -631,13 +637,13 @@ void template_editor::render_editor()
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
consume_keys = true;
|
consume_keys = true;
|
||||||
}
|
}
|
||||||
else if (m_show_autocomplete && !m_autocomplete_suggestions.empty())
|
else if (m_show_autocomplete && !m_autocomplete_suggestions.empty())
|
||||||
{
|
{
|
||||||
int max_visible = std::min((int)m_autocomplete_suggestions.size(), 8);
|
int max_visible = std::min((int)m_autocomplete_suggestions.size(), 8);
|
||||||
|
|
||||||
if (ImGui::IsKeyPressed(ImGuiKey_DownArrow, false))
|
if (ImGui::IsKeyPressed(ImGuiKey_DownArrow, false))
|
||||||
{
|
{
|
||||||
m_autocomplete_selected = (m_autocomplete_selected + 1) % max_visible;
|
m_autocomplete_selected = (m_autocomplete_selected + 1) % max_visible;
|
||||||
@@ -648,7 +654,7 @@ void template_editor::render_editor()
|
|||||||
m_autocomplete_selected = (m_autocomplete_selected - 1 + max_visible) % max_visible;
|
m_autocomplete_selected = (m_autocomplete_selected - 1 + max_visible) % max_visible;
|
||||||
consume_keys = true;
|
consume_keys = true;
|
||||||
}
|
}
|
||||||
else if (ImGui::IsKeyPressed(ImGuiKey_Tab, false) ||
|
else if (ImGui::IsKeyPressed(ImGuiKey_Tab, false) ||
|
||||||
ImGui::IsKeyPressed(ImGuiKey_Enter, false))
|
ImGui::IsKeyPressed(ImGuiKey_Enter, false))
|
||||||
{
|
{
|
||||||
auto start = m_autocomplete_start_pos;
|
auto start = m_autocomplete_start_pos;
|
||||||
@@ -657,25 +663,25 @@ void template_editor::render_editor()
|
|||||||
m_editor.Delete();
|
m_editor.Delete();
|
||||||
m_editor.InsertText(m_autocomplete_suggestions[m_autocomplete_selected] + "}");
|
m_editor.InsertText(m_autocomplete_suggestions[m_autocomplete_selected] + "}");
|
||||||
m_show_autocomplete = false;
|
m_show_autocomplete = false;
|
||||||
m_autocomplete_dismissed = false;
|
m_autocomplete_dismissed = false;
|
||||||
consume_keys = true;
|
consume_keys = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (consume_keys)
|
if (consume_keys)
|
||||||
{
|
{
|
||||||
m_editor.SetHandleKeyboardInputs(false);
|
m_editor.SetHandleKeyboardInputs(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
ImVec2 editor_pos = ImGui::GetCursorScreenPos();
|
ImVec2 editor_pos = ImGui::GetCursorScreenPos();
|
||||||
|
|
||||||
m_editor.Render("##TemplateEditor", ImVec2(0, 0), true);
|
m_editor.Render("##TemplateEditor", ImVec2(0, 0), true);
|
||||||
|
|
||||||
if (consume_keys)
|
if (consume_keys)
|
||||||
{
|
{
|
||||||
m_editor.SetHandleKeyboardInputs(true);
|
m_editor.SetHandleKeyboardInputs(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
update_autocomplete_suggestions();
|
update_autocomplete_suggestions();
|
||||||
render_autocomplete(editor_pos);
|
render_autocomplete(editor_pos);
|
||||||
}
|
}
|
||||||
@@ -683,7 +689,7 @@ void template_editor::render_editor()
|
|||||||
void template_editor::render_template_list()
|
void template_editor::render_template_list()
|
||||||
{
|
{
|
||||||
ImGui::PushStyleVar(ImGuiStyleVar_ItemSpacing, ImVec2(8, 6));
|
ImGui::PushStyleVar(ImGuiStyleVar_ItemSpacing, ImVec2(8, 6));
|
||||||
|
|
||||||
ImGui::Text("Templates");
|
ImGui::Text("Templates");
|
||||||
ImGui::SameLine(ImGui::GetContentRegionAvail().x - 20);
|
ImGui::SameLine(ImGui::GetContentRegionAvail().x - 20);
|
||||||
ImGui::TextDisabled("(%d)", (int)m_template_controller.templates().size());
|
ImGui::TextDisabled("(%d)", (int)m_template_controller.templates().size());
|
||||||
@@ -705,23 +711,24 @@ void template_editor::render_template_list()
|
|||||||
for (const auto &[key, tmpl] : templates)
|
for (const auto &[key, tmpl] : templates)
|
||||||
{
|
{
|
||||||
const bool selected = (m_template_name == key && m_is_editing_existing);
|
const bool selected = (m_template_name == key && m_is_editing_existing);
|
||||||
|
|
||||||
if (!tmpl.enabled())
|
if (!tmpl.enabled())
|
||||||
{
|
{
|
||||||
ImVec4 disabled_color = palette_utils::get_color(m_current_palette, "on_surface_variant", "editor_inactive");
|
ImVec4 disabled_color = palette_utils::get_color(
|
||||||
|
m_current_palette, "on_surface_variant", "editor_inactive");
|
||||||
ImGui::PushStyleColor(ImGuiCol_Text, disabled_color);
|
ImGui::PushStyleColor(ImGuiCol_Text, disabled_color);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (ImGui::Selectable(key.c_str(), selected))
|
if (ImGui::Selectable(key.c_str(), selected))
|
||||||
{
|
{
|
||||||
load_template(key);
|
load_template(key);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!tmpl.enabled())
|
if (!tmpl.enabled())
|
||||||
{
|
{
|
||||||
ImGui::PopStyleColor();
|
ImGui::PopStyleColor();
|
||||||
}
|
}
|
||||||
|
|
||||||
if (ImGui::IsItemHovered())
|
if (ImGui::IsItemHovered())
|
||||||
{
|
{
|
||||||
ImGui::BeginTooltip();
|
ImGui::BeginTooltip();
|
||||||
@@ -733,7 +740,7 @@ void template_editor::render_template_list()
|
|||||||
ImGui::EndTooltip();
|
ImGui::EndTooltip();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
ImGui::PopStyleVar();
|
ImGui::PopStyleVar();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -830,7 +837,7 @@ void template_editor::save_template()
|
|||||||
auto &cfg = clrsync::core::config::instance();
|
auto &cfg = clrsync::core::config::instance();
|
||||||
|
|
||||||
std::filesystem::path template_file = clrsync::core::normalize_path(trimmed_input_path);
|
std::filesystem::path template_file = clrsync::core::normalize_path(trimmed_input_path);
|
||||||
|
|
||||||
auto parent_dir = template_file.parent_path();
|
auto parent_dir = template_file.parent_path();
|
||||||
if (!parent_dir.empty() && !std::filesystem::exists(parent_dir))
|
if (!parent_dir.empty() && !std::filesystem::exists(parent_dir))
|
||||||
{
|
{
|
||||||
@@ -838,7 +845,7 @@ void template_editor::save_template()
|
|||||||
{
|
{
|
||||||
std::filesystem::create_directories(parent_dir);
|
std::filesystem::create_directories(parent_dir);
|
||||||
}
|
}
|
||||||
catch (const std::exception& e)
|
catch (const std::exception &e)
|
||||||
{
|
{
|
||||||
m_validation_error = "Error: Could not create directory for input path";
|
m_validation_error = "Error: Could not create directory for input path";
|
||||||
return;
|
return;
|
||||||
@@ -853,7 +860,7 @@ void template_editor::save_template()
|
|||||||
m_validation_error = "Failed to write template file";
|
m_validation_error = "Failed to write template file";
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
out << template_content;
|
out << template_content;
|
||||||
out.close();
|
out.close();
|
||||||
|
|
||||||
@@ -937,7 +944,7 @@ void template_editor::delete_template()
|
|||||||
{
|
{
|
||||||
if (!m_is_editing_existing || m_template_name.empty())
|
if (!m_is_editing_existing || m_template_name.empty())
|
||||||
return;
|
return;
|
||||||
|
|
||||||
m_show_delete_confirmation = true;
|
m_show_delete_confirmation = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1,25 +1,25 @@
|
|||||||
#ifndef CLRSYNC_GUI_TEMPLATE_EDITOR_HPP
|
#ifndef CLRSYNC_GUI_TEMPLATE_EDITOR_HPP
|
||||||
#define CLRSYNC_GUI_TEMPLATE_EDITOR_HPP
|
#define CLRSYNC_GUI_TEMPLATE_EDITOR_HPP
|
||||||
|
|
||||||
#include "template_controller.hpp"
|
|
||||||
#include <core/palette/palette.hpp>
|
|
||||||
#include "color_text_edit/TextEditor.h"
|
#include "color_text_edit/TextEditor.h"
|
||||||
|
#include "gui/controllers/template_controller.hpp"
|
||||||
#include "imgui.h"
|
#include "imgui.h"
|
||||||
|
#include <core/palette/palette.hpp>
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
||||||
class template_editor
|
class template_editor
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
template_editor();
|
template_editor();
|
||||||
void render();
|
void render();
|
||||||
void apply_current_palette(const clrsync::core::palette& pal);
|
void apply_current_palette(const clrsync::core::palette &pal);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
void render_controls();
|
void render_controls();
|
||||||
void render_editor();
|
void render_editor();
|
||||||
void render_template_list();
|
void render_template_list();
|
||||||
void render_autocomplete(const ImVec2& editor_pos);
|
void render_autocomplete(const ImVec2 &editor_pos);
|
||||||
void update_autocomplete_suggestions();
|
void update_autocomplete_suggestions();
|
||||||
|
|
||||||
void save_template();
|
void save_template();
|
||||||
@@ -32,7 +32,7 @@ private:
|
|||||||
|
|
||||||
template_controller m_template_controller;
|
template_controller m_template_controller;
|
||||||
TextEditor m_editor;
|
TextEditor m_editor;
|
||||||
|
|
||||||
std::string m_template_name;
|
std::string m_template_name;
|
||||||
std::string m_input_path;
|
std::string m_input_path;
|
||||||
std::string m_output_path;
|
std::string m_output_path;
|
||||||
@@ -40,7 +40,7 @@ private:
|
|||||||
std::string m_validation_error;
|
std::string m_validation_error;
|
||||||
std::string m_saved_content;
|
std::string m_saved_content;
|
||||||
bool m_has_unsaved_changes = false;
|
bool m_has_unsaved_changes = false;
|
||||||
|
|
||||||
bool m_enabled{true};
|
bool m_enabled{true};
|
||||||
bool m_is_editing_existing{false};
|
bool m_is_editing_existing{false};
|
||||||
bool m_show_delete_confirmation{false};
|
bool m_show_delete_confirmation{false};
|
||||||
@@ -53,14 +53,14 @@ private:
|
|||||||
int m_autocomplete_selected{0};
|
int m_autocomplete_selected{0};
|
||||||
std::string m_autocomplete_prefix;
|
std::string m_autocomplete_prefix;
|
||||||
TextEditor::Coordinates m_autocomplete_start_pos;
|
TextEditor::Coordinates m_autocomplete_start_pos;
|
||||||
|
|
||||||
ImVec4 m_autocomplete_bg_color;
|
ImVec4 m_autocomplete_bg_color;
|
||||||
ImVec4 m_autocomplete_border_color;
|
ImVec4 m_autocomplete_border_color;
|
||||||
ImVec4 m_autocomplete_selected_color;
|
ImVec4 m_autocomplete_selected_color;
|
||||||
ImVec4 m_autocomplete_text_color;
|
ImVec4 m_autocomplete_text_color;
|
||||||
ImVec4 m_autocomplete_selected_text_color;
|
ImVec4 m_autocomplete_selected_text_color;
|
||||||
ImVec4 m_autocomplete_dim_text_color;
|
ImVec4 m_autocomplete_dim_text_color;
|
||||||
|
|
||||||
clrsync::core::palette m_current_palette;
|
clrsync::core::palette m_current_palette;
|
||||||
};
|
};
|
||||||
|
|
||||||
Reference in New Issue
Block a user