From 41828591940ba55084e467bf3ad083e7eddf3517 Mon Sep 17 00:00:00 2001 From: Samuel Banya Date: Mon, 3 Dec 2018 21:11:43 -0500 Subject: [PATCH] Adding latest Lubuntu Welcome Center progress --- lubuntuWelcomeCenter.pro.user | 2 +- main.cpp | 37 -------- mainwindow.cpp | 12 ++- mainwindow.h | 4 + mainwindow.ui | 168 +++++++++++++++------------------- 5 files changed, 90 insertions(+), 133 deletions(-) diff --git a/lubuntuWelcomeCenter.pro.user b/lubuntuWelcomeCenter.pro.user index 23e6092..9d05a8f 100644 --- a/lubuntuWelcomeCenter.pro.user +++ b/lubuntuWelcomeCenter.pro.user @@ -1,6 +1,6 @@ - + EnvironmentId diff --git a/main.cpp b/main.cpp index 3ccc984..2d24a7e 100644 --- a/main.cpp +++ b/main.cpp @@ -22,43 +22,6 @@ int main(int argc, char *argv[]) MainWindow w; w.show(); - // Manual Button - - // Monitor Setup Button - - // Control Center Button - - // Community Button - - // Contribute Button - - /* - // News Button - QPushButton *buttonNews = new QPushButton("Latest news for Lubuntu", &window); - - // Change Monitor Settings Button - QPushButton *buttonMonitorSettings = new QPushButton("Change monitor settings", &window); - - // Change Desktop Resolution Button - QPushButton *buttonDesktopResolution = new QPushButton("Change desktop resolution", &window); - - // Icon Theme Button - QPushButton *buttonIconTheme = new QPushButton("Latest icon themes for Lubuntu", &window); - - // Bug Button - QPushButton *buttonBug = new QPushButton("Report bugs to Lubuntu team", &window); - - // Manual Button - QPushButton *buttonManual = new QPushButton("Read manual for Lubuntu help", &window); - - // Quit Functionality (Using SIGNAL event, and QApplication::instance()) - // connect(m_button, SIGNAL (clicked()), QApplication::instance(), SLOT (quit())); - - // Window window; - window.show(); - - */ - return app.exec(); } diff --git a/mainwindow.cpp b/mainwindow.cpp index 92621d4..a75ffd6 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -19,6 +19,7 @@ #include #include #include +#include MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), @@ -36,7 +37,6 @@ void MainWindow::on_buttonManual_clicked() { QString manualLink = "https://wiki.ubuntu.com/Lubuntu/DocumentationTeam/Manual"; QDesktopServices::openUrl(QUrl(manualLink)); - } void MainWindow::on_buttonMonitorSetup_clicked() @@ -60,3 +60,13 @@ void MainWindow::on_buttonContribute_clicked() QString contributeLink = "https://launchpad.net/~lubuntu-wiki-docs"; QDesktopServices::openUrl(QUrl(contributeLink)); } + +void MainWindow::on_actionAbout_triggered() +{ + QMessageBox::information(this, "About", "Created by Samuel Banya and Wendy Hill © Lubuntu 2018"); +} + +void MainWindow::on_actionExit_triggered() +{ + QApplication::quit(); +} diff --git a/mainwindow.h b/mainwindow.h index 12e2310..fbeb746 100644 --- a/mainwindow.h +++ b/mainwindow.h @@ -41,6 +41,10 @@ private slots: void on_buttonContribute_clicked(); + void on_actionAbout_triggered(); + + void on_actionExit_triggered(); + private: Ui::MainWindow *ui; }; diff --git a/mainwindow.ui b/mainwindow.ui index f33f9b1..b9bacac 100644 --- a/mainwindow.ui +++ b/mainwindow.ui @@ -6,7 +6,7 @@ 0 0 - 500 + 600 300 @@ -14,111 +14,79 @@ 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"> + + + + + + + Lubuntu Manual + + + + + + + Monitor Setup + + + + + + + Control Center + + + + + + + Community + + + + + + + Contribute + + + + + + + + + + + <!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 - - + + + + + + + Show this window at startup + + + + + + 0 0 - 500 - 22 + 600 + 29 @@ -127,13 +95,25 @@ p, li { white-space: pre-wrap; } + + + Help + + + + Exit + + + About + +