diff --git a/CMakeLists.txt b/CMakeLists.txt index 585f77b..483166f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -8,7 +8,9 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_AUTOMOC ON) # Create code from a list of Qt designer ui files set(CMAKE_AUTOUIC ON) -# C++11 +# Auto add resource files +set(CMAKE_AUTORCC ON) +# C++12 set(CMAKE_CXX_STANDARD 11) # Find the QtWidgets library @@ -21,8 +23,10 @@ set(lubuntuWelcomeCenter_SRCS mainwindow.ui mainwindow.cpp main.cpp + welcomecenterresource.qrc ) # Tell CMake to create the helloworld executable add_executable(lubuntuWelcomeCenter WIN32 ${lubuntuWelcomeCenter_SRCS}) + # Use the Widgets module from Qt 5 -target_link_libraries(lubuntuWelcomeCenter Qt5::Widgets) \ No newline at end of file +target_link_libraries(lubuntuWelcomeCenter Qt5::Widgets) diff --git a/CMakeLists.txt.user b/CMakeLists.txt.user new file mode 100644 index 0000000..1a1b5e1 --- /dev/null +++ b/CMakeLists.txt.user @@ -0,0 +1,372 @@ + + + + + + EnvironmentId + {35da86b0-5805-413d-ad6d-c6eb4afb7663} + + + ProjectExplorer.Project.ActiveTarget + 0 + + + ProjectExplorer.Project.EditorSettings + + true + false + true + + Cpp + + CppGlobal + + + + QmlJS + + QmlJSGlobal + + + 2 + UTF-8 + false + 4 + false + 80 + true + true + 1 + true + false + 0 + true + true + 0 + 8 + true + 1 + true + true + true + false + + + + ProjectExplorer.Project.PluginSettings + + + + ProjectExplorer.Project.Target.0 + + Desktop + Desktop + {cca6c687-0e9a-40f1-930f-b0ab516ee288} + 0 + 0 + 0 + + + /home/sam/scripts/lubuntuBugs/build-lubuntu-welcome-center-Desktop-Default + + + + + all + + true + CMake Build + + CMakeProjectManager.MakeStep + + 1 + Build + + ProjectExplorer.BuildSteps.Build + + + + + + clean + + true + CMake Build + + CMakeProjectManager.MakeStep + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Default + Default + CMakeProjectManager.CMakeBuildConfiguration + + + + CMAKE_BUILD_TYPE:STRING=Debug + + /home/sam/scripts/lubuntuBugs/build-lubuntu-welcome-center-Desktop-Debug + + + + + all + + true + CMake Build + + CMakeProjectManager.MakeStep + + 1 + Build + + ProjectExplorer.BuildSteps.Build + + + + + + clean + + true + CMake Build + + CMakeProjectManager.MakeStep + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Debug + Debug + CMakeProjectManager.CMakeBuildConfiguration + + + + CMAKE_BUILD_TYPE:STRING=Release + + /home/sam/scripts/lubuntuBugs/build-lubuntu-welcome-center-Desktop-Release + + + + + all + + true + CMake Build + + CMakeProjectManager.MakeStep + + 1 + Build + + ProjectExplorer.BuildSteps.Build + + + + + + clean + + true + CMake Build + + CMakeProjectManager.MakeStep + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Release + Release + CMakeProjectManager.CMakeBuildConfiguration + + + + CMAKE_BUILD_TYPE:STRING=RelWithDebInfo + + /home/sam/scripts/lubuntuBugs/build-lubuntu-welcome-center-Desktop-Release with Debug Information + + + + + all + + true + CMake Build + + CMakeProjectManager.MakeStep + + 1 + Build + + ProjectExplorer.BuildSteps.Build + + + + + + clean + + true + CMake Build + + CMakeProjectManager.MakeStep + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Release with Debug Information + Release with Debug Information + CMakeProjectManager.CMakeBuildConfiguration + + + + CMAKE_BUILD_TYPE:STRING=MinSizeRel + + /home/sam/scripts/lubuntuBugs/build-lubuntu-welcome-center-Desktop-Minimum Size Release + + + + + all + + true + CMake Build + + CMakeProjectManager.MakeStep + + 1 + Build + + ProjectExplorer.BuildSteps.Build + + + + + + clean + + true + CMake Build + + CMakeProjectManager.MakeStep + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Minimum Size Release + Minimum Size Release + CMakeProjectManager.CMakeBuildConfiguration + + 5 + + + 0 + Deploy + + ProjectExplorer.BuildSteps.Deploy + + 1 + Deploy Configuration + + ProjectExplorer.DefaultDeployConfiguration + + 1 + + + false + false + 1000 + + true + + false + false + false + false + true + 0.01 + 10 + true + 1 + 25 + + 1 + true + false + true + valgrind + + 0 + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + 11 + 12 + 13 + 14 + + lubuntuWelcomeCenter + + + /home/sam/scripts/lubuntuBugs/build-lubuntu-welcome-center-Desktop-Default + 2 + + lubuntuWelcomeCenter + + CMakeProjectManager.CMakeRunConfiguration.lubuntuWelcomeCenter + 3768 + false + true + false + false + true + + 1 + + + + ProjectExplorer.Project.TargetCount + 1 + + + ProjectExplorer.Project.Updater.FileVersion + 18 + + + Version + 18 + + diff --git a/images/lubuntu--button--active.svg b/images/lubuntu--button--active.svg new file mode 100644 index 0000000..1eb6d8a --- /dev/null +++ b/images/lubuntu--button--active.svg @@ -0,0 +1,8 @@ + + + + + ACTIO N + + + diff --git a/images/lubuntu--button--active.webp b/images/lubuntu--button--active.webp new file mode 100644 index 0000000..a27705e Binary files /dev/null and b/images/lubuntu--button--active.webp differ diff --git a/images/lubuntu--button--active@1x.png b/images/lubuntu--button--active@1x.png new file mode 100644 index 0000000..ac17719 Binary files /dev/null and b/images/lubuntu--button--active@1x.png differ diff --git a/images/lubuntu--button--default.svg b/images/lubuntu--button--default.svg new file mode 100644 index 0000000..b6e4b86 --- /dev/null +++ b/images/lubuntu--button--default.svg @@ -0,0 +1,8 @@ + + + + + ACTIO N + + + diff --git a/images/lubuntu--button--default.webp b/images/lubuntu--button--default.webp new file mode 100644 index 0000000..8523da4 Binary files /dev/null and b/images/lubuntu--button--default.webp differ diff --git a/images/lubuntu--button--default@1x.png b/images/lubuntu--button--default@1x.png new file mode 100644 index 0000000..5f7fa09 Binary files /dev/null and b/images/lubuntu--button--default@1x.png differ diff --git a/images/lubuntu--button--hover.svg b/images/lubuntu--button--hover.svg new file mode 100644 index 0000000..d93dcf2 --- /dev/null +++ b/images/lubuntu--button--hover.svg @@ -0,0 +1,8 @@ + + + + + ACTIO N + + + diff --git a/images/lubuntu--button--hover.webp b/images/lubuntu--button--hover.webp new file mode 100644 index 0000000..6f7d652 Binary files /dev/null and b/images/lubuntu--button--hover.webp differ diff --git a/images/lubuntu--button--hover@1x.png b/images/lubuntu--button--hover@1x.png new file mode 100644 index 0000000..7b64bf7 Binary files /dev/null and b/images/lubuntu--button--hover@1x.png differ diff --git a/images/lubuntu--menu-item--active.pdf b/images/lubuntu--menu-item--active.pdf new file mode 100644 index 0000000..6661ee5 Binary files /dev/null and b/images/lubuntu--menu-item--active.pdf differ diff --git a/images/lubuntu--menu-item--active.svg b/images/lubuntu--menu-item--active.svg new file mode 100644 index 0000000..529a6e9 --- /dev/null +++ b/images/lubuntu--menu-item--active.svg @@ -0,0 +1,5 @@ + + + MENU ITEM + + diff --git a/images/lubuntu--menu-item--active.webp b/images/lubuntu--menu-item--active.webp new file mode 100644 index 0000000..1b495fd Binary files /dev/null and b/images/lubuntu--menu-item--active.webp differ diff --git a/images/lubuntu--menu-item--active@1x.png b/images/lubuntu--menu-item--active@1x.png new file mode 100644 index 0000000..fa17a20 Binary files /dev/null and b/images/lubuntu--menu-item--active@1x.png differ diff --git a/images/lubuntu--menu-item--default.pdf b/images/lubuntu--menu-item--default.pdf new file mode 100644 index 0000000..158deac Binary files /dev/null and b/images/lubuntu--menu-item--default.pdf differ diff --git a/images/lubuntu--menu-item--default.svg b/images/lubuntu--menu-item--default.svg new file mode 100644 index 0000000..c975463 --- /dev/null +++ b/images/lubuntu--menu-item--default.svg @@ -0,0 +1,5 @@ + + + MENU ITEM + + diff --git a/images/lubuntu--menu-item--default.webp b/images/lubuntu--menu-item--default.webp new file mode 100644 index 0000000..a6af3f0 Binary files /dev/null and b/images/lubuntu--menu-item--default.webp differ diff --git a/images/lubuntu--menu-item--default@1x.png b/images/lubuntu--menu-item--default@1x.png new file mode 100644 index 0000000..3485d1c Binary files /dev/null and b/images/lubuntu--menu-item--default@1x.png differ diff --git a/images/lubuntu--menu-item--hover.pdf b/images/lubuntu--menu-item--hover.pdf new file mode 100644 index 0000000..62968b5 Binary files /dev/null and b/images/lubuntu--menu-item--hover.pdf differ diff --git a/images/lubuntu--menu-item--hover.svg b/images/lubuntu--menu-item--hover.svg new file mode 100644 index 0000000..34c1a0a --- /dev/null +++ b/images/lubuntu--menu-item--hover.svg @@ -0,0 +1,5 @@ + + + MENU ITEM + + diff --git a/images/lubuntu--menu-item--hover.webp b/images/lubuntu--menu-item--hover.webp new file mode 100644 index 0000000..a92846e Binary files /dev/null and b/images/lubuntu--menu-item--hover.webp differ diff --git a/images/lubuntu--menu-item--hover@1x.png b/images/lubuntu--menu-item--hover@1x.png new file mode 100644 index 0000000..8b4c1bf Binary files /dev/null and b/images/lubuntu--menu-item--hover@1x.png differ diff --git a/main.cpp b/main.cpp index b2d93d3..f265006 100644 --- a/main.cpp +++ b/main.cpp @@ -1,4 +1,4 @@ -// Copyright (C) 2018 Lubuntu +// Copyright (C) 2019 Lubuntu // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by diff --git a/mainwindow.cpp b/mainwindow.cpp index c92dafd..7cba4ab 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -1,4 +1,4 @@ -// Copyright (C) 2018 Lubuntu +// Copyright (C) 2019 Lubuntu // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -67,10 +67,28 @@ void MainWindow::on_buttonContribute_clicked() void MainWindow::on_actionAbout_triggered() { - QMessageBox::information(this, "About", "Created by Samuel Banya\n\n© Lubuntu 2018"); + // QAction: this class helps provide icons and images for individual methods + // http://doc.qt.io/qt-5/qaction.html + // I need to find out how to insert the Lubuntu logo with this method + QMessageBox::information(this, "About", "Created By:\n\nSamuel Banya (Developer)\nSimon Quigley (Lubuntu Release Manager)\nArtem Abutalipov (UX/UI Designer)\n\n© Lubuntu 2019"); } void MainWindow::on_actionExit_triggered() { + // Tell the user that since the checkbox is unchecked, the Welcome Center will NOT run on + // startup (COMMENTED OUT FOR LATER RESEARCH) + + // Related Documentation: + // http://doc.qt.io/qt-5/qt.html#CheckState-enum + + // if ui->checkBox->QCheckBox::checkState(Unchecked) { + // QMessageBox::information(this, "The Lubuntu Welcome Center will now NOT begin on startup.\nThank you for installing Lubuntu!"); + // } QApplication::quit(); } + +void MainWindow::on_checkBox_stateChanged(int arg1) +{ + // Add checkbox stateChanged functionality that depends on a boolean variable of it being checked: + // http://doc.qt.io/qt-5/qml-qtquick-controls-checkbox.html#checkedState-prop +} diff --git a/mainwindow.h b/mainwindow.h index f9840f4..1e01073 100644 --- a/mainwindow.h +++ b/mainwindow.h @@ -1,4 +1,4 @@ -// Copyright (C) 2018 Lubuntu +// Copyright (C) 2019 Lubuntu // This program is free software: you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -46,6 +46,8 @@ private slots: void on_actionExit_triggered(); + void on_checkBox_stateChanged(int arg1); + private: Ui::MainWindow *ui; }; diff --git a/mainwindow.ui b/mainwindow.ui index 4acb115..5ee5c4d 100644 --- a/mainwindow.ui +++ b/mainwindow.ui @@ -13,6 +13,11 @@ Lubuntu Welcome Center + + color: white; + +background-color: black; + @@ -77,10 +82,13 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">What's new in 19.04</p> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Here is a simple and quick read of some of the new things in the latest version of Lubuntu</p></body></html> +</style></head><body style=" font-family:'Ubuntu'; font-size:14pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:11pt;">What's new in 19.04</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:11pt;"><br /></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:11pt;">Here is a simple and quick read of some of the new things in the latest version of Lubuntu</span></p> +<ul style="margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;"><li style=" font-size:11pt;" style=" margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Lorem Ipsum</li> +<li style=" font-size:11pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Lorem Ipsum</li> +<li style=" font-size:11pt;" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Lorem Ipsum</li></ul></body></html> @@ -101,7 +109,7 @@ p, li { white-space: pre-wrap; } 0 0 600 - 29 + 34 @@ -131,6 +139,8 @@ p, li { white-space: pre-wrap; } - + + + diff --git a/welcomecenterresource.qrc b/welcomecenterresource.qrc new file mode 100644 index 0000000..0f75390 --- /dev/null +++ b/welcomecenterresource.qrc @@ -0,0 +1,4 @@ + + + images/logo.png +