diff --git a/lubuntuWelcomeCenter.pro b/lubuntuWelcomeCenter.pro index da5c024..0af4067 100644 --- a/lubuntuWelcomeCenter.pro +++ b/lubuntuWelcomeCenter.pro @@ -15,15 +15,15 @@ #------------------------------------------------- # -# Project created by QtCreator 2018-10-16T20:19:15 +# Project created by QtCreator 2018-11-05T22:07:39 # #------------------------------------------------- -QT += core gui network +QT += core gui greaterThan(QT_MAJOR_VERSION, 4): QT += widgets -TARGET = SubclassingQWidget test +TARGET = lubuntuWelcomeCenter TEMPLATE = app # The following define makes your compiler emit warnings if you use @@ -41,12 +41,10 @@ CONFIG += c++11 SOURCES += \ main.cpp \ - mainwindow.cpp \ - window.cpp + mainwindow.cpp HEADERS += \ - mainwindow.h \ - window.h + mainwindow.h FORMS += \ mainwindow.ui diff --git a/lubuntuWelcomeCenter.pro.user b/lubuntuWelcomeCenter.pro.user index ae669e8..b61738d 100644 --- a/lubuntuWelcomeCenter.pro.user +++ b/lubuntuWelcomeCenter.pro.user @@ -1,4 +1,601 @@ - - + + + + EnvironmentId + {3ad3f86a-0ba2-40ce-ad95-b88db7dc70bf} + + + 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 + + + true + + + + ProjectExplorer.Project.Target.0 + + Desktop Qt 5.11.2 GCC 64bit + Desktop Qt 5.11.2 GCC 64bit + qt.qt5.5112.gcc_64_kit + 0 + 0 + 0 + + /home/sam/scripts/build-lubuntuWelcomeCenter-Desktop_Qt_5_11_2_GCC_64bit_qt_qt5-Debug + + + true + qmake + + QtProjectManager.QMakeBuildStep + true + + false + false + false + + + true + Make + + Qt4ProjectManager.MakeStep + + -w + -r + + false + + + + 2 + Build + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + -w + -r + + true + clean + + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Debug + Debug + Qt4ProjectManager.Qt4BuildConfiguration + 2 + true + + + /home/sam/scripts/build-lubuntuWelcomeCenter-Desktop_Qt_5_11_2_GCC_64bit_qt_qt5-Release + + + true + qmake + + QtProjectManager.QMakeBuildStep + false + + false + false + true + + + true + Make + + Qt4ProjectManager.MakeStep + + -w + -r + + false + + + + 2 + Build + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + -w + -r + + true + clean + + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Release + Release + Qt4ProjectManager.Qt4BuildConfiguration + 0 + true + + + /home/sam/scripts/build-lubuntuWelcomeCenter-Desktop_Qt_5_11_2_GCC_64bit_qt_qt5-Profile + + + true + qmake + + QtProjectManager.QMakeBuildStep + true + + false + true + true + + + true + Make + + Qt4ProjectManager.MakeStep + + -w + -r + + false + + + + 2 + Build + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + -w + -r + + true + clean + + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Profile + Profile + Qt4ProjectManager.Qt4BuildConfiguration + 0 + true + + 3 + + + 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 + + 2 + + lubuntuWelcomeCenter + + Qt4ProjectManager.Qt4RunConfiguration:/home/sam/scripts/lubuntuWelcomeCenter/lubuntuWelcomeCenter.pro + true + + lubuntuWelcomeCenter.pro + + /home/sam/scripts/build-lubuntuWelcomeCenter-Desktop_Qt_5_11_2_GCC_64bit_qt_qt5-Debug + 3768 + false + true + false + false + true + + 1 + + + + ProjectExplorer.Project.Target.1 + + Desktop Qt 5.11.2 GCC 64bit + Desktop Qt 5.11.2 GCC 64bit + {927c6f31-6bb3-4b42-82c9-dfe01d201dc9} + 0 + 0 + 0 + + /home/sam/scripts/build-lubuntuWelcomeCenter-Desktop_Qt_5_11_2_GCC_64bit_927c6f-Debug + + + true + qmake + + QtProjectManager.QMakeBuildStep + true + + false + false + false + + + true + Make + + Qt4ProjectManager.MakeStep + + -w + -r + + false + + + + 2 + Build + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + -w + -r + + true + clean + + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Debug + Debug + Qt4ProjectManager.Qt4BuildConfiguration + 2 + true + + + /home/sam/scripts/build-lubuntuWelcomeCenter-Desktop_Qt_5_11_2_GCC_64bit_927c6f-Release + + + true + qmake + + QtProjectManager.QMakeBuildStep + false + + false + false + true + + + true + Make + + Qt4ProjectManager.MakeStep + + -w + -r + + false + + + + 2 + Build + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + -w + -r + + true + clean + + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Release + Release + Qt4ProjectManager.Qt4BuildConfiguration + 0 + true + + + /home/sam/scripts/build-lubuntuWelcomeCenter-Desktop_Qt_5_11_2_GCC_64bit_927c6f-Profile + + + true + qmake + + QtProjectManager.QMakeBuildStep + true + + false + true + true + + + true + Make + + Qt4ProjectManager.MakeStep + + -w + -r + + false + + + + 2 + Build + + ProjectExplorer.BuildSteps.Build + + + + true + Make + + Qt4ProjectManager.MakeStep + + -w + -r + + true + clean + + + 1 + Clean + + ProjectExplorer.BuildSteps.Clean + + 2 + false + + Profile + Profile + Qt4ProjectManager.Qt4BuildConfiguration + 0 + true + + 3 + + + 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 + + 2 + + + + + + Custom Executable + + ProjectExplorer.CustomExecutableRunConfiguration + 3768 + false + true + false + false + true + + 1 + + + + ProjectExplorer.Project.TargetCount + 2 + + + ProjectExplorer.Project.Updater.FileVersion + 18 + + + Version + 18 + + diff --git a/lubuntuWelcomeCenter.user b/lubuntuWelcomeCenter.user deleted file mode 100644 index 8295393..0000000 --- a/lubuntuWelcomeCenter.user +++ /dev/null @@ -1,355 +0,0 @@ - - - - - - - - EnvironmentId - {3ad3f86a-0ba2-40ce-ad95-b88db7dc70bf} - - - 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 - - - true - - - - ProjectExplorer.Project.Target.0 - - Desktop Qt 5.11.2 GCC 64bit - Desktop Qt 5.11.2 GCC 64bit - qt.qt5.5112.gcc_64_kit - 0 - 0 - 0 - - /home/sam/scripts/qt/build-RespondingToAnEvent-Desktop_Qt_5_11_2_GCC_64bit-Debug - - - true - qmake - - QtProjectManager.QMakeBuildStep - true - - false - false - false - - - true - Make - - Qt4ProjectManager.MakeStep - - -w - -r - - false - - - - 2 - Build - - ProjectExplorer.BuildSteps.Build - - - - true - Make - - Qt4ProjectManager.MakeStep - - -w - -r - - true - clean - - - 1 - Clean - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Debug - Debug - Qt4ProjectManager.Qt4BuildConfiguration - 2 - true - - - /home/sam/scripts/qt/build-RespondingToAnEvent-Desktop_Qt_5_11_2_GCC_64bit-Release - - - true - qmake - - QtProjectManager.QMakeBuildStep - false - - false - false - true - - - true - Make - - Qt4ProjectManager.MakeStep - - -w - -r - - false - - - - 2 - Build - - ProjectExplorer.BuildSteps.Build - - - - true - Make - - Qt4ProjectManager.MakeStep - - -w - -r - - true - clean - - - 1 - Clean - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Release - Release - Qt4ProjectManager.Qt4BuildConfiguration - 0 - true - - - /home/sam/scripts/qt/build-RespondingToAnEvent-Desktop_Qt_5_11_2_GCC_64bit-Profile - - - true - qmake - - QtProjectManager.QMakeBuildStep - true - - false - true - true - - - true - Make - - Qt4ProjectManager.MakeStep - - -w - -r - - false - - - - 2 - Build - - ProjectExplorer.BuildSteps.Build - - - - true - Make - - Qt4ProjectManager.MakeStep - - -w - -r - - true - clean - - - 1 - Clean - - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Profile - Profile - Qt4ProjectManager.Qt4BuildConfiguration - 0 - true - - 3 - - - 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 - - 2 - - RespondingToAnEvent - - Qt4ProjectManager.Qt4RunConfiguration:/home/sam/scripts/qt/RespondingToAnEvent/RespondingToAnEvent.pro - true - - RespondingToAnEvent.pro - - /home/sam/scripts/qt/build-RespondingToAnEvent-Desktop_Qt_5_11_2_GCC_64bit-Debug - 3768 - false - true - false - false - true - - 1 - - - - ProjectExplorer.Project.TargetCount - 1 - - - ProjectExplorer.Project.Updater.FileVersion - 18 - - - Version - 18 - - diff --git a/main.cpp b/main.cpp index 236df32..3ccc984 100644 --- a/main.cpp +++ b/main.cpp @@ -1,77 +1,55 @@ -# Copyright (C) 2018 Lubuntu +// Copyright (C) 2018 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 -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. +// 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 +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +#include "mainwindow.h" #include -#include -#include "window.h" -int main(int argc, char **argv) +int main(int argc, char *argv[]) { - QApplication app (argc, argv); + QApplication app(argc, argv); + MainWindow w; + w.show(); - // Set size of the window - QWidget window; - window.setFixedSize(800, 600); + // Manual Button + + // Monitor Setup Button + + // Control Center Button - // Font - QFont font ("Courier"); + // Community Button - // Button Format - // (x pos, y pos, width, length) + // Contribute Button + /* // News Button QPushButton *buttonNews = new QPushButton("Latest news for Lubuntu", &window); - buttonNews->setGeometry(300, 50, 250, 30); - buttonNews->setToolTip("Click here for the lastest news for Lubuntu 18.40 Cosmic Cuttlefish!"); - buttonNews->setFont(font); // Change Monitor Settings Button QPushButton *buttonMonitorSettings = new QPushButton("Change monitor settings", &window); - buttonMonitorSettings->setGeometry(300, 125, 250, 30); - buttonMonitorSettings->setToolTip("Click here to change your monitor settings!"); - buttonMonitorSettings->setFont(font); // Change Desktop Resolution Button QPushButton *buttonDesktopResolution = new QPushButton("Change desktop resolution", &window); - buttonDesktopResolution->setGeometry(300, 200, 250, 30); - buttonDesktopResolution->setToolTip("Click here to change your desktop resolution!"); - buttonDesktopResolution->setFont(font); // Icon Theme Button QPushButton *buttonIconTheme = new QPushButton("Latest icon themes for Lubuntu", &window); - buttonIconTheme->setGeometry(225, 275, 400, 30); - buttonIconTheme->setToolTip("Click here to download the latest icon themes for Lubuntu 18.40 Cosmic Cuttlefish"); - buttonIconTheme->setFont(font); // Bug Button QPushButton *buttonBug = new QPushButton("Report bugs to Lubuntu team", &window); - buttonBug->setGeometry(225, 350, 400, 30); - buttonBug->setToolTip("Click here to report bugs to the Lubuntu development team!"); - buttonBug->setFont(font); // Manual Button QPushButton *buttonManual = new QPushButton("Read manual for Lubuntu help", &window); - buttonManual->setGeometry(225, 425, 400, 30); - buttonManual->setToolTip("Click here to access the manual for Lubuntu 18.40 Cosmic Cuttlefish!"); - buttonManual->setFont(font); - - // Quit Button - QPushButton *buttonQuit = new QPushButton("Quit", &window); - buttonQuit->setGeometry(300, 500, 250, 30); - buttonQuit->setToolTip("Click here to quit the Welcome Center!"); - buttonQuit->setFont(font); // Quit Functionality (Using SIGNAL event, and QApplication::instance()) // connect(m_button, SIGNAL (clicked()), QApplication::instance(), SLOT (quit())); @@ -79,5 +57,8 @@ int main(int argc, char **argv) // Window window; window.show(); + */ + return app.exec(); + } diff --git a/mainwindow.cpp b/mainwindow.cpp index b0e91d5..0bbdefe 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -1,29 +1,73 @@ -# Copyright (C) 2018 Lubuntu +// Copyright (C) 2018 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 -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. +// 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 +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . #include "mainwindow.h" #include "ui_mainwindow.h" +#include +#include MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWindow) { ui->setupUi(this); + + // connect(ui->buttonManual, SIGNAL(clicked()), + // IDK, SLOT(OPENURL)); + + /* + // Connect the signal of the horizontal slider to the slot of the first progress bar + connect(ui->buttonManual, SIGNAL(valueChanged(int)), + ui->progressBar, SLOT(setValue(int))); + + + // Disconnect the first progress bar with disconnect() + disconnect(ui->horizontalSlider, SIGNAL(valueChanged(int)), + ui->progressBar, SLOT(setValue(int))); + */ } MainWindow::~MainWindow() { delete ui; } + +void MainWindow::on_buttonManual_clicked() +{ + QString manualLink = "https://wiki.ubuntu.com/Lubuntu/DocumentationTeam/Manual"; + QDesktopServices::openUrl(QUrl(manualLink)); + +} + +void MainWindow::on_buttonMonitorSetup_clicked() +{ + +} + +void MainWindow::on_buttonControlCenter_clicked() +{ + +} + +void MainWindow::on_buttonCommunity_clicked() +{ + +} + +void MainWindow::on_buttonContribute_clicked() +{ + QString contributeLink = "https://launchpad.net/~lubuntu-wiki-docs"; + QDesktopServices::openUrl(QUrl(contributeLink)); +} diff --git a/mainwindow.h b/mainwindow.h index ae98e1c..12e2310 100644 --- a/mainwindow.h +++ b/mainwindow.h @@ -1,27 +1,23 @@ -# Copyright (C) 2018 Lubuntu +// Copyright (C) 2018 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 -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. +// 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 +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . #ifndef MAINWINDOW_H #define MAINWINDOW_H #include -SOURCES += main.cpp \ - mainWindow.cpp \ - window.cpp - namespace Ui { class MainWindow; } @@ -34,6 +30,17 @@ public: explicit MainWindow(QWidget *parent = nullptr); ~MainWindow(); +private slots: + void on_buttonManual_clicked(); + + void on_buttonMonitorSetup_clicked(); + + void on_buttonControlCenter_clicked(); + + void on_buttonCommunity_clicked(); + + void on_buttonContribute_clicked(); + private: Ui::MainWindow *ui; }; diff --git a/mainwindow.ui b/mainwindow.ui index 30452bc..f33f9b1 100644 --- a/mainwindow.ui +++ b/mainwindow.ui @@ -1,41 +1,141 @@ - - + MainWindow - - + + 0 0 - 400 + 500 300 - + MainWindow - - - - + + + + + 30 + 40 + 121 + 25 + + + + Lubuntu Manual + + + + + + 30 + 80 + 121 + 25 + + + + Monitor Setup + + + + + + 30 + 120 + 121 + 25 + + + + Control Center + + + + + + 30 + 160 + 121 + 25 + + + + Community + + + + + + 30 + 200 + 121 + 25 + + + + Contribute + + + + + + 260 + 50 + 211 + 161 + + + + <!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> + + + + + + 260 + 220 + 211 + 31 + + + + Show this window at startup + + + + + + + 0 + 0 + 500 + 22 + + + + + File + + + + + + + + Exit + + - - + diff --git a/window.cpp b/window.cpp deleted file mode 100644 index 4019bd4..0000000 --- a/window.cpp +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright (C) 2018 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 -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - -#include "window.h" -#include -#include - -Window::Window(QWidget *parent) : - QWidget(parent) - { - - } diff --git a/window.h b/window.h deleted file mode 100644 index 1d01d0c..0000000 --- a/window.h +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright (C) 2018 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 -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . - -#ifndef WINDOW_H -#define WINDOW_H - -#include - -SOURCES += main.cpp \ - mainwindow.cpp \ - window.cpp - -class QPushButton; -class Window : public QWidget -{ -public: - explicit Window(QWidget *parent = 0); -private: -}; - -#endif // WINDOW_H