RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-24 21:57:35 +00:00
Code Issues Activity Actions

HackStudio: Implement adding an existing file to project

Browse source
This commit is contained in:
Andreas Kling 2019-10-26 21:43:08 +02:00
parent 4089690cf1
commit cea6506998
2 changed files with 19 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
DevTools/HackStudio/Makefile
View file

@ -16,7 +16,7 @@ DEFINES += -DUSERLAND
all: $(APP) all: $(APP)
$(APP): $(OBJS) $(APP): $(OBJS)
$(LD) -o $(APP) $(LDFLAGS) $(OBJS) -lvt -lgui -ldraw -lcore -lc $(LD) -o $(APP) $(LDFLAGS) $(OBJS) -lvt -lgui -ldraw -lthread -lcore -lc
.cpp.o: .cpp.o:
@echo "CXX $<"; $(CXX) $(CXXFLAGS) -o $@ -c $< @echo "CXX $<"; $(CXX) $(CXXFLAGS) -o $@ -c $<

22
DevTools/HackStudio/main.cpp
View file

@ -8,6 +8,7 @@
#include <LibGUI/GApplication.h> #include <LibGUI/GApplication.h>
#include <LibGUI/GBoxLayout.h> #include <LibGUI/GBoxLayout.h>
#include <LibGUI/GButton.h> #include <LibGUI/GButton.h>
#include <LibGUI/GFilePicker.h>
#include <LibGUI/GInputBox.h> #include <LibGUI/GInputBox.h>
#include <LibGUI/GListView.h> #include <LibGUI/GListView.h>
#include <LibGUI/GMenu.h> #include <LibGUI/GMenu.h>
@ -76,7 +77,7 @@ int main(int argc, char** argv)
g_text_editor->set_line_wrapping_enabled(true); g_text_editor->set_line_wrapping_enabled(true);
g_text_editor->set_automatic_indentation_enabled(true); g_text_editor->set_automatic_indentation_enabled(true);
auto new_action = GAction::create("Add new file to project", { Mod_Ctrl, Key_N }, GraphicsBitmap::load_from_file("/res/icons/16x16/new.png"), [&](const GAction&) { auto new_action = GAction::create("Add new file to project...", { Mod_Ctrl, Key_N }, GraphicsBitmap::load_from_file("/res/icons/16x16/new.png"), [&](const GAction&) {
auto input_box = GInputBox::construct("Enter name of new file:", "Add new file to project", g_window); auto input_box = GInputBox::construct("Enter name of new file:", "Add new file to project", g_window);
if (input_box->exec() == GInputBox::ExecCancel) if (input_box->exec() == GInputBox::ExecCancel)
return; return;
@ -94,8 +95,16 @@ int main(int argc, char** argv)
open_file(filename); open_file(filename);
}); });
auto open_action = GCommonActions::make_open_action([&](auto&) { auto add_existing_file_action = GAction::create("Add existing file to project...", GraphicsBitmap::load_from_file("/res/icons/16x16/open.png"), [&](auto&) {
// FIXME: Implement. auto result = GFilePicker::get_open_filepath("Add existing file to project");
if (!result.has_value())
return;
auto& filename = result.value();
if (!g_project->add_file(filename)) {
GMessageBox::show(String::format("Failed to add '%s' to project", filename.characters()), "Error", GMessageBox::Type::Error, GMessageBox::InputType::OK, g_window);
return;
}
open_file(filename);
}); });
auto save_action = GAction::create("Save", { Mod_Ctrl, Key_S }, GraphicsBitmap::load_from_file("/res/icons/16x16/save.png"), [&](auto&) { auto save_action = GAction::create("Save", { Mod_Ctrl, Key_S }, GraphicsBitmap::load_from_file("/res/icons/16x16/save.png"), [&](auto&) {
@ -105,7 +114,7 @@ int main(int argc, char** argv)
}); });
toolbar->add_action(new_action); toolbar->add_action(new_action);
toolbar->add_action(open_action); toolbar->add_action(add_existing_file_action);
toolbar->add_action(save_action); toolbar->add_action(save_action);
toolbar->add_separator(); toolbar->add_separator();
toolbar->add_action(g_text_editor->cut_action()); toolbar->add_action(g_text_editor->cut_action());
@ -175,6 +184,11 @@ int main(int argc, char** argv)
})); }));
menubar->add_menu(move(app_menu)); menubar->add_menu(move(app_menu));
auto project_menu = make<GMenu>("Project");
project_menu->add_action(new_action);
project_menu->add_action(add_existing_file_action);
menubar->add_menu(move(project_menu));
auto edit_menu = make<GMenu>("Edit"); auto edit_menu = make<GMenu>("Edit");
edit_menu->add_action(GAction::create("Find in files...", { Mod_Ctrl | Mod_Shift, Key_F }, [&](auto&) { edit_menu->add_action(GAction::create("Find in files...", { Mod_Ctrl | Mod_Shift, Key_F }, [&](auto&) {
reveal_action_tab(find_in_files_widget); reveal_action_tab(find_in_files_widget);