From 1fc72a0812127dc6450746b6ed4a87ba854f2a52 Mon Sep 17 00:00:00 2001 From: Samuel Banya Date: Sat, 12 Jan 2019 15:27:23 -0600 Subject: [PATCH] Samuel Banya: adding latest Lubuntu Welcome Center changes Summary: Adding latest Lubuntu Welcome Center additions, and clarified buttons with tool tips. Test Plan: Welcome Center will be built by other team members to test it works. Reviewers: tsimonq2 Differential Revision: https://phab.lubuntu.me/D52 --- images/Lubuntu Logo.png | Bin 0 -> 7589 bytes images/Lubuntu Logo.xcf.bz2 | Bin 0 -> 2864 bytes lubuntuWelcomeCenter.pro.user | 6 +++--- mainwindow.cpp | 16 +++++++--------- mainwindow.h | 5 ++--- mainwindow.ui | 25 +++++++++++++++---------- 6 files changed, 27 insertions(+), 25 deletions(-) create mode 100644 images/Lubuntu Logo.png create mode 100644 images/Lubuntu Logo.xcf.bz2 diff --git a/images/Lubuntu Logo.png b/images/Lubuntu Logo.png new file mode 100644 index 0000000000000000000000000000000000000000..8599ce7020e85d95f06f7fbe1b4e708c41f14ad1 GIT binary patch literal 7589 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 ZK>E4wi#l+Z;+-M^%JLd=H8Pf={{yV)cT@lX literal 0 HcmV?d00001 diff --git a/images/Lubuntu Logo.xcf.bz2 b/images/Lubuntu Logo.xcf.bz2 new file mode 100644 index 0000000000000000000000000000000000000000..aac7d03758620394fc2374f15d01d9897f6fd438 GIT binary patch literal 2864 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 O@pmLsg$WNB_lO`R<01S2 literal 0 HcmV?d00001 diff --git a/lubuntuWelcomeCenter.pro.user b/lubuntuWelcomeCenter.pro.user index 9d05a8f..447fa87 100644 --- a/lubuntuWelcomeCenter.pro.user +++ b/lubuntuWelcomeCenter.pro.user @@ -1,6 +1,6 @@ - + EnvironmentId @@ -303,8 +303,8 @@ 2 lubuntuWelcomeCenter - - Qt4ProjectManager.Qt4RunConfiguration:/home/sam/scripts/phabricator/lubuntuBugs/lubuntu-welcome-center/lubuntuWelcomeCenter.pro + lubuntuWelcomeCenter2 + Qt4ProjectManager.Qt4RunConfiguration:/home/sam/scripts/lubuntuBugs/lubuntu-welcome-center/lubuntuWelcomeCenter.pro true lubuntuWelcomeCenter.pro diff --git a/mainwindow.cpp b/mainwindow.cpp index a75ffd6..d8c9e02 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -35,7 +35,7 @@ MainWindow::~MainWindow() void MainWindow::on_buttonManual_clicked() { - QString manualLink = "https://wiki.ubuntu.com/Lubuntu/DocumentationTeam/Manual"; + QString manualLink = "https://manual.lubuntu.me"; QDesktopServices::openUrl(QUrl(manualLink)); } @@ -46,24 +46,22 @@ void MainWindow::on_buttonMonitorSetup_clicked() process->start(file); } -void MainWindow::on_buttonControlCenter_clicked() +void MainWindow::on_buttonLXQTConfigurationCenter_clicked() { -} - -void MainWindow::on_buttonCommunity_clicked() -{ - // This will open up another UI window that contains more community specific information + QProcess *process = new QProcess(this); + QString file = "/usr/bin/lxqt-config"; + process->start(file); } void MainWindow::on_buttonContribute_clicked() { - QString contributeLink = "https://launchpad.net/~lubuntu-wiki-docs"; + QString contributeLink = "https://phab.lubuntu.me/w/contributor-guide/"; QDesktopServices::openUrl(QUrl(contributeLink)); } void MainWindow::on_actionAbout_triggered() { - QMessageBox::information(this, "About", "Created by Samuel Banya and Wendy Hill © Lubuntu 2018"); + QMessageBox::information(this, "About", "Created by Samuel Banya\n\n© Lubuntu 2018"); } void MainWindow::on_actionExit_triggered() diff --git a/mainwindow.h b/mainwindow.h index fbeb746..1f03cf8 100644 --- a/mainwindow.h +++ b/mainwindow.h @@ -35,9 +35,7 @@ private slots: void on_buttonMonitorSetup_clicked(); - void on_buttonControlCenter_clicked(); - - void on_buttonCommunity_clicked(); + void on_buttonLXQTConfigurationCenter_clicked(); void on_buttonContribute_clicked(); @@ -45,6 +43,7 @@ private slots: void on_actionExit_triggered(); + private: Ui::MainWindow *ui; }; diff --git a/mainwindow.ui b/mainwindow.ui index b9bacac..bee4777 100644 --- a/mainwindow.ui +++ b/mainwindow.ui @@ -11,7 +11,7 @@ - MainWindow + Lubuntu Welcome Center @@ -19,6 +19,9 @@ + + <html><head/><body><p>View online manual to see latest changes, fixes, and tips &amp; tricks</p></body></html> + Lubuntu Manual @@ -26,29 +29,31 @@ + + <html><head/><body><p>Adjust monitor settings</p></body></html> + Monitor Setup - - - Control Center + + + <html><head/><body><p>Open up LXQT Configuration Center to change LXQt settings</p></body></html> - - - - - Community + LXQT Configuration Center + + <html><head/><body><p>View the online Lubuntu Contribution Guide, and learn how to become a part of the team!</p></body></html> + - Contribute + Contribute To Lubuntu