Rename the sixtyfps C++ namespaces

This commit is contained in:
Simon Hausmann 2022-02-02 11:39:24 +01:00
parent 5226feab01
commit 7d297da2fc
96 changed files with 747 additions and 753 deletions

View file

@ -5,43 +5,43 @@
#include <ctime>
using sixtyfps::interpreter::Value;
using slint::interpreter::Value;
struct InkLevelModel : sixtyfps::Model<Value>
struct InkLevelModel : slint::Model<Value>
{
int row_count() const override { return m_data.size(); }
std::optional<Value> row_data(int i) const override {
std::optional<Value> row_data(int i) const override
{
if (i < m_data.size())
return { m_data[i] };
return {};
}
private:
static Value make_inklevel_value(sixtyfps::Color color, float level)
static Value make_inklevel_value(slint::Color color, float level)
{
sixtyfps::interpreter::Struct s;
slint::interpreter::Struct s;
s.set_field("color", Value(color));
s.set_field("level", level);
return s;
}
std::vector<Value> m_data = {
make_inklevel_value(sixtyfps::Color::from_rgb_uint8(255, 255, 0), 0.9),
make_inklevel_value(sixtyfps::Color::from_rgb_uint8(255, 0, 255), 0.8),
make_inklevel_value(sixtyfps::Color::from_rgb_uint8(0, 255, 255), 0.5),
make_inklevel_value(sixtyfps::Color::from_rgb_uint8(0, 0, 0), 0.1),
make_inklevel_value(slint::Color::from_rgb_uint8(255, 255, 0), 0.9),
make_inklevel_value(slint::Color::from_rgb_uint8(255, 0, 255), 0.8),
make_inklevel_value(slint::Color::from_rgb_uint8(0, 255, 255), 0.5),
make_inklevel_value(slint::Color::from_rgb_uint8(0, 0, 0), 0.1),
};
};
int main()
{
sixtyfps::interpreter::ComponentCompiler compiler;
slint::interpreter::ComponentCompiler compiler;
auto definition = compiler.build_from_path(SOURCE_DIR "/../ui/printerdemo.slint");
for (auto diagnostic : compiler.diagnostics()) {
std::cerr << (diagnostic.level == sixtyfps::interpreter::DiagnosticLevel::Warning
? "warning: "
: "error: ")
std::cerr << (diagnostic.level == slint::interpreter::DiagnosticLevel::Warning ? "warning: "
: "error: ")
<< diagnostic.message << std::endl;
std::cerr << "location: " << diagnostic.source_file;
if (diagnostic.line > 0)
@ -56,15 +56,15 @@ int main()
return EXIT_FAILURE;
}
auto instance = definition->create();
std::shared_ptr<sixtyfps::Model<Value>> ink_levels = std::make_shared<InkLevelModel>();
std::shared_ptr<slint::Model<Value>> ink_levels = std::make_shared<InkLevelModel>();
if (!instance->set_property("ink_levels", ink_levels)) {
std::cerr << "Could not set property ink_levels" << std::endl;
return EXIT_FAILURE;
}
auto printer_queue = std::make_shared<sixtyfps::VectorModel<Value>>();
auto printer_queue = std::make_shared<slint::VectorModel<Value>>();
sixtyfps::SharedVector<Value> default_queue =
slint::SharedVector<Value> default_queue =
*instance->get_global_property("PrinterQueue", "printer_queue")->to_array();
for (const auto &default_item : default_queue)
printer_queue->push_back(default_item);
@ -76,15 +76,13 @@ int main()
char time_buf[100] = { 0 };
std::strftime(time_buf, sizeof(time_buf), "%H:%M:%S %d/%m/%Y", std::localtime(&now));
sixtyfps::interpreter::Struct item {
{ "status", Value(sixtyfps::SharedString("WAITING...")) },
{ "progress", Value(0.) },
{ "title", args[0] },
{ "owner", sixtyfps::SharedString("joe@example.com") },
{ "pages", Value(1.) },
{ "size", sixtyfps::SharedString("100kB") },
{ "submission_date", sixtyfps::SharedString(time_buf) }
};
slint::interpreter::Struct item { { "status", Value(slint::SharedString("WAITING...")) },
{ "progress", Value(0.) },
{ "title", args[0] },
{ "owner", slint::SharedString("joe@example.com") },
{ "pages", Value(1.) },
{ "size", slint::SharedString("100kB") },
{ "submission_date", slint::SharedString(time_buf) } };
printer_queue->push_back(item);
return Value();
});
@ -95,12 +93,12 @@ int main()
return Value();
});
sixtyfps::Timer printer_queue_progress_timer(std::chrono::seconds(1), [=]() {
slint::Timer printer_queue_progress_timer(std::chrono::seconds(1), [=]() {
if (printer_queue->row_count() > 0) {
auto top_item = *(*printer_queue->row_data(0)).to_struct();
auto progress = *top_item.get_field("progress")->to_number() + 1.;
top_item.set_field("progress", progress);
top_item.set_field("status", sixtyfps::SharedString("PRINTING"));
top_item.set_field("status", slint::SharedString("PRINTING"));
if (progress > 100) {
printer_queue->erase(0);
} else {