diff --git a/Applications/VisualBuilder/VBForm.cpp b/Applications/VisualBuilder/VBForm.cpp index 2e9af9bfea..63c4886f30 100644 --- a/Applications/VisualBuilder/VBForm.cpp +++ b/Applications/VisualBuilder/VBForm.cpp @@ -1,8 +1,11 @@ #include "VBForm.h" #include "VBWidget.h" +#include "VBProperty.h" #include #include #include +#include +#include static VBForm* s_current; VBForm* VBForm::current() @@ -300,6 +303,27 @@ void VBForm::mousemove_event(GMouseEvent& event) } } +void VBForm::write_to_file(const String& path) +{ + CFile file(path); + if (!file.open(CIODevice::WriteOnly)) { + GMessageBox box(String::format("Could not open '%s' for writing", path.characters()), "Error", window()); + box.exec(); + return; + } + file.printf("[Form]\n"); + file.printf("Name=%s\n", m_name.characters()); + file.printf("\n"); + int i = 0; + for (auto& widget : m_widgets) { + file.printf("[Widget %d]\n", i++); + widget->for_each_property([&] (auto& property) { + file.printf("%s=%s\n", property.name().characters(), property.value().to_string().characters()); + }); + file.printf("\n"); + } +} + void VBForm::dump() { dbgprintf("[Form]\n"); @@ -308,7 +332,9 @@ void VBForm::dump() int i = 0; for (auto& widget : m_widgets) { dbgprintf("[Widget %d]\n", i++); - widget->dump(); + widget->for_each_property([] (auto& property) { + dbgprintf("%s=%s\n", property.name().characters(), property.value().to_string().characters()); + }); dbgprintf("\n"); } } diff --git a/Applications/VisualBuilder/VBForm.h b/Applications/VisualBuilder/VBForm.h index 8968719533..bae9553233 100644 --- a/Applications/VisualBuilder/VBForm.h +++ b/Applications/VisualBuilder/VBForm.h @@ -25,6 +25,7 @@ public: Function on_widget_selected; + void write_to_file(const String& path); void dump(); protected: diff --git a/Applications/VisualBuilder/VBWidget.cpp b/Applications/VisualBuilder/VBWidget.cpp index 5df3eb6696..83e92167de 100644 --- a/Applications/VisualBuilder/VBWidget.cpp +++ b/Applications/VisualBuilder/VBWidget.cpp @@ -195,10 +195,3 @@ void VBWidget::capture_transform_origin_rect() { m_transform_origin_rect = rect(); } - -void VBWidget::dump() -{ - for (auto& property : m_properties) { - dbgprintf("%s=%s\n", property->name().characters(), property->value().to_string().characters()); - } -} diff --git a/Applications/VisualBuilder/VBWidget.h b/Applications/VisualBuilder/VBWidget.h index 744b7e29c0..afd240b081 100644 --- a/Applications/VisualBuilder/VBWidget.h +++ b/Applications/VisualBuilder/VBWidget.h @@ -59,8 +59,6 @@ public: Rect transform_origin_rect() const { return m_transform_origin_rect; } void capture_transform_origin_rect(); - void dump(); - private: VBWidget(VBWidgetType, VBForm&); diff --git a/Applications/VisualBuilder/main.cpp b/Applications/VisualBuilder/main.cpp index 27642d2a3e..03b32576c3 100644 --- a/Applications/VisualBuilder/main.cpp +++ b/Applications/VisualBuilder/main.cpp @@ -40,6 +40,9 @@ int main(int argc, char** argv) file_menu->add_action(GAction::create("Dump Form", [&] (auto&) { form1->dump(); })); + file_menu->add_action(GAction::create("Save Form...", { Mod_Ctrl, Key_S }, [form1] (auto&) { + form1->write_to_file("/tmp/form.frm"); + })); menubar->add_menu(move(file_menu)); auto edit_menu = make("Edit");