diff --git a/MenuApplets/ClipboardHistory/CMakeLists.txt b/MenuApplets/ClipboardHistory/CMakeLists.txt index 7e6bb6d763..9f34084d5d 100644 --- a/MenuApplets/ClipboardHistory/CMakeLists.txt +++ b/MenuApplets/ClipboardHistory/CMakeLists.txt @@ -1,6 +1,5 @@ set(SOURCES ClipboardHistoryModel.cpp - IconWidget.cpp main.cpp ) diff --git a/MenuApplets/ClipboardHistory/IconWidget.cpp b/MenuApplets/ClipboardHistory/IconWidget.cpp deleted file mode 100644 index bf95cf1f7d..0000000000 --- a/MenuApplets/ClipboardHistory/IconWidget.cpp +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright (c) 2019-2020, Sergey Bugaev - * 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 "IconWidget.h" -#include - -IconWidget::IconWidget() -{ - set_icon(Gfx::Bitmap::load_from_file("/res/icons/clipboard.png")); - set_fill_with_background_color(true); -} - -IconWidget::~IconWidget() -{ -} - -void IconWidget::mousedown_event(GUI::MouseEvent&) -{ - if (on_click) - on_click(); -} diff --git a/MenuApplets/ClipboardHistory/IconWidget.h b/MenuApplets/ClipboardHistory/IconWidget.h deleted file mode 100644 index 3b96c88f3d..0000000000 --- a/MenuApplets/ClipboardHistory/IconWidget.h +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright (c) 2019-2020, Sergey Bugaev - * 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. - */ - -#pragma once - -#include -#include - -class IconWidget : public GUI::Label { - C_OBJECT(IconWidget) -public: - IconWidget(); - virtual ~IconWidget() override; - - Function on_click; - -private: - virtual void mousedown_event(GUI::MouseEvent&) override; -}; diff --git a/MenuApplets/ClipboardHistory/main.cpp b/MenuApplets/ClipboardHistory/main.cpp index e44120899a..82cc8b54f7 100644 --- a/MenuApplets/ClipboardHistory/main.cpp +++ b/MenuApplets/ClipboardHistory/main.cpp @@ -25,8 +25,8 @@ */ #include "ClipboardHistoryModel.h" -#include "IconWidget.h" #include +#include #include #include @@ -55,8 +55,10 @@ int main(int argc, char* argv[]) auto applet_window = GUI::Window::construct(); applet_window->set_title("ClipboardHistory"); applet_window->set_window_type(GUI::WindowType::MenuApplet); - auto& icon = applet_window->set_main_widget(); - icon.on_click = [&main_window = *main_window] { + auto& icon = applet_window->set_main_widget(); + icon.load_from_file("/res/icons/clipboard.png"); + icon.set_fill_with_background_color(true); + icon.on_click = [& main_window = *main_window] { main_window.show(); }; applet_window->resize(16, 16);