diff --git a/Demos/HelloWorld2/.gitignore b/Demos/HelloWorld2/.gitignore deleted file mode 100644 index 0e7af5b54ff..00000000000 --- a/Demos/HelloWorld2/.gitignore +++ /dev/null @@ -1 +0,0 @@ -UI_*.h diff --git a/Demos/HelloWorld2/HelloWorld2.frm b/Demos/HelloWorld2/HelloWorld2.frm deleted file mode 100644 index f4ae8251e56..00000000000 --- a/Demos/HelloWorld2/HelloWorld2.frm +++ /dev/null @@ -1 +0,0 @@ -{"name":"HelloWorld2","widgets":[{"name":"w1","tooltip":null,"backcolor":"#d4d0c8ff","forecolor":"#000000ff","text":"Hello world!","class":"GUI::Label","autofill":true,"enabled":true,"visible":true,"x":5,"height":26,"y":5,"width":121},{"name":"w2","tooltip":null,"backcolor":"#d4d0c8ff","forecolor":"#000000ff","text":"Lefty","class":"GUI::Button","autofill":false,"enabled":true,"visible":true,"x":5,"height":26,"y":40,"width":51},{"name":"w3","tooltip":null,"backcolor":"#d4d0c8ff","forecolor":"#000000ff","text":"Righty","class":"GUI::Button","autofill":false,"enabled":true,"visible":true,"x":80,"height":26,"y":40,"width":51},{"name":"w4","enabled":true,"forecolor":"#000000ff","checked":false,"autofill":false,"x":150,"tooltip":null,"height":26,"width":91,"y":5,"class":"GUI::CheckBox","text":"Awesome","backcolor":"#d4d0c8ff","visible":true},{"name":"w5","enabled":true,"forecolor":"#000000ff","checked":false,"autofill":false,"x":150,"tooltip":null,"height":26,"width":51,"y":30,"class":"GUI::CheckBox","text":"Cool","backcolor":"#d4d0c8ff","visible":true}]} diff --git a/Demos/HelloWorld2/Makefile b/Demos/HelloWorld2/Makefile deleted file mode 100644 index 1bc418efcaa..00000000000 --- a/Demos/HelloWorld2/Makefile +++ /dev/null @@ -1,13 +0,0 @@ -OBJS = \ - main.o - -PROGRAM = HelloWorld2 - -LIB_DEPS = GUI IPC Gfx Core - -main.cpp: UI_HelloWorld2.h - -UI_HelloWorld2.h: HelloWorld2.frm | FORMCOMPILER - $(QUIET) $(FORMCOMPILER) $< > $@ - -include ../../Makefile.common diff --git a/Demos/HelloWorld2/main.cpp b/Demos/HelloWorld2/main.cpp deleted file mode 100644 index 8d2921bf268..00000000000 --- a/Demos/HelloWorld2/main.cpp +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Copyright (c) 2018-2020, Andreas Kling - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER - * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -#include -#include -#include -#include -#include -#include -#include "UI_HelloWorld2.h" - -int main(int argc, char** argv) -{ - GUI::Application app(argc, argv); - - auto window = GUI::Window::construct(); - window->set_rect(100, 100, 240, 160); - window->set_title("Hello World!"); - - auto* ui = new UI_HelloWorld2; - window->set_main_widget(ui->main_widget); - - ui->w3->on_click = [&](auto&) { - app.quit(); - }; - - window->show(); - return app.exec(); -} diff --git a/Kernel/build-root-filesystem.sh b/Kernel/build-root-filesystem.sh index 922083703e0..14b4ccbb102 100755 --- a/Kernel/build-root-filesystem.sh +++ b/Kernel/build-root-filesystem.sh @@ -138,7 +138,6 @@ cp ../Applications/Welcome/Welcome mnt/bin/Welcome cp ../Applications/Help/Help mnt/bin/Help cp ../Applications/Browser/Browser mnt/bin/Browser cp ../Demos/HelloWorld/HelloWorld mnt/bin/HelloWorld -cp ../Demos/HelloWorld2/HelloWorld2 mnt/bin/HelloWorld2 cp ../Demos/WidgetGallery/WidgetGallery mnt/bin/WidgetGallery cp ../Demos/Fire/Fire mnt/bin/Fire cp ../Demos/DynamicLink/LinkDemo/LinkDemo mnt/bin/LinkDemo @@ -171,7 +170,6 @@ echo "done" printf "installing shortcuts... " ln -s FileManager mnt/bin/fm ln -s HelloWorld mnt/bin/hw -ln -s HelloWorld2 mnt/bin/hw2 ln -s IRCClient mnt/bin/irc ln -s Minesweeper mnt/bin/ms ln -s Shell mnt/bin/sh