Merge branch 'master' into java-integration

* master:
  Updated Windows build instructions
  Added comments
  added icon and Qt attribution. Fixed #42
  Added logout button in menu

Author: davidcorbin

ATTRIBUTION.md

@@ -0,0 +1,11 @@
+Icons made by [Freepik](https://www.flaticon.com/authors/freepik) from www.flaticon.com is licensed by [CC 3.0 BY](http://creativecommons.org/licenses/by/3.0/)
+Icons made by [Smashicons](https://www.flaticon.com/authors/smashicons) from www.flaticon.com is licensed by [CC 3.0 BY](http://creativecommons.org/licenses/by/3.0/)
+Icons made by [Gregor Cresnar](https://www.flaticon.com/authors/gregor-cresnar) from www.flaticon.com is licensed by [CC 3.0 BY](http://creativecommons.org/licenses/by/3.0/)
+Icons made by [Dave Gandy](https://www.flaticon.com/authors/dave-gandy) from www.flaticon.com is licensed by [CC 3.0 BY](http://creativecommons.org/licenses/by/3.0/)
+Icons made by [Bogdan Rosu](https://www.flaticon.com/authors/bogdan-rosu) from www.flaticon.com is licensed by [CC 3.0 BY](http://creativecommons.org/licenses/by/3.0/)
+Icons made by [Egor Rumyantsev](https://www.flaticon.com/authors/egor-rumyantsev) from www.flaticon.com is licensed by [CC 3.0 BY](http://creativecommons.org/licenses/by/3.0/)
+Icons made by [Hanan](https://www.flaticon.com/authors/hanan) from www.flaticon.com is licensed by [CC 3.0 BY](http://creativecommons.org/licenses/by/3.0/)
+Icons made by [Those Icons](https://www.flaticon.com/authors/those-icons) from www.flaticon.com is licensed by [CC 3.0 BY](http://creativecommons.org/licenses/by/3.0/)
+Icons made by [Google](https://www.flaticon.com/authors/google) from www.flaticon.com is licensed by [CC 3.0 BY](http://creativecommons.org/licenses/by/3.0/)
+
+[Qt](www.qt.io) is licensed by [LGPLv3](opensource.org/licenses/lgpl-3.0.html)

README.md

@@ -29,20 +29,18 @@ cmake --build .
 ```
 
 ## Build on Windows
-1. Install [CMake](https://cmake.org/download/), [Qt](https://www.qt.io/download), [Visual Studio](https://www.visualstudio.com/downloads/), and [Vcpkg](https://github.com/Microsoft/vcpkg).
+1. Install [CMake](https://cmake.org/download/), [Qt5](https://www.qt.io/download), [Visual Studio](https://www.visualstudio.com/downloads/).
     - Must install "MSVC 2015 32-bit" Qt library.
     - For Visual Studio, **Community** edition is fine, pick the "Desktop development with C++" option, or at least VC++.
-    - Follow quick start instructions to install Vcpkg, making sure your install directory is that same as in CMakeLists.txt.
     - You must add Qt to the path (`setx CMAKE_PREFIX_PATH "C:\Qt\5.10.1\msvc2015"`)
-2. Update submodules: `git submodule update --init --recursive`
-3. Using the **Qt Command Prompt** (Qt 32-bit for Desktop (MSVC)), navigate to the project directory, then run:
+2. Using the **Qt Command Prompt** (Qt 32-bit for Desktop (MSVC)), navigate to the project directory, then run:
     - `mkdir build`
     - `cd build`
     - `cmake ..`
     - `cmake --build .` (or `msbuild /m facade-application.sln` in VS developer command prompt for multicore building)
-4. Copy all resources from the folder and subfolders of `C:\mygcc-application\res\` to `C:\mygcc-application\build\Debug`
-5. Include `mygcc-api-with-dependencies.jar` from [mygcc-api](https://github.com/davidcorbin/mygcc-api).
-6. Copy needed DLLs from `C:\Qt\5.10.1\msvc2015\bin` to `C:\mygcc-application\build\Debug`
+3. Copy all resources from the folder and subfolders of `C:\mygcc-application\res\` to `C:\mygcc-application\build\Debug`
+4. Include `mygcc-api-with-dependencies.jar` from [mygcc-api](https://github.com/davidcorbin/mygcc-api).
+5. Copy needed DLLs from `C:\Qt\5.10.1\msvc2015\bin` to `C:\mygcc-application\build\Debug`
 
 ## Build Documentation
 Generating documentation requires Doxygen

include/data/Login.hpp

@@ -19,6 +19,7 @@ class Login : public QObject {
   bool isApiConnectionEstablished() const;
   void queueLogin();
   void saveToken(std::string *token);
+  void deleteUserData();
   std::string *getApiToken() const;
 
  private:

include/ui/MainWindow.hpp

@@ -62,9 +62,13 @@ class MainWindow : public QMainWindow {
 
   void showHomeWidget();
 
+  QMenu *fileMenu;
+  QAction *logoutAction;
+
  private slots:  // NOLINT
   void startupCallbackHandler();
   void logout();
+  void logoutRestart();
   void addChapelGridItems();
 };
 

src/data/Login.cpp

@@ -182,6 +182,16 @@ bool Login::loadUserData() {
   return false;
 }
 
+//
+// Deletes the userdata file, logging user out.
+//
+void Login::deleteUserData() {
+  if (!datapath.empty()) {
+    QFile file(datapath.c_str());
+    file.remove();
+  }
+}
+
 //
 // Create user data json file.
 //

src/ui/MainWindow.cpp

@@ -11,6 +11,7 @@
 #include <QPainter>
 #include <QCloseEvent>
 #include <QCoreApplication>
+#include <QtWidgets>
 #include <vector>
 #include <string>
 
@@ -52,6 +53,12 @@ MainWindow::MainWindow(JavaIntegration *ji,
   infogrid->setup();
 
   connect(chapel, SIGNAL(chapelsReceived()), this, SLOT(addChapelGridItems()));
+
+  auto *logoutAction = new QAction(tr("&Log Out"), this);
+  connect(logoutAction, SIGNAL(triggered()), this, SLOT(logoutRestart()));
+
+  fileMenu = menuBar()->addMenu(tr("&File"));
+  fileMenu->addAction(logoutAction);
 }
 
 void MainWindow::viewFeedbackPanel() {
@@ -172,6 +179,15 @@ void MainWindow::logout() {
   loginPanel->authFailure();
 }
 
+void MainWindow::logoutRestart() {
+  // Delete user data file
+  login->deleteUserData();
+
+  // Quit application and restart
+  qApp->quit();
+  QProcess::startDetached(qApp->arguments()[0], qApp->arguments());
+}
+
 void MainWindow::addChapelGridItems() {
   int remaining = chapel->getRemaining();
   int required = chapel->getRequired();
@@ -186,7 +202,7 @@ void MainWindow::addChapelGridItems() {
                                      Color::grid_blue()));
 
   // Percent of chapels completed
-  int pc = static_cast<int>(((attended/
+  auto pc = static_cast<int>(((attended/
       static_cast<float>(required + makeups))) * 100 + 0.5);
   QString percentHeader = QString("%1%").arg(QString::number(pc));
   infogrid->addGridItem(new GridItem(&percentHeader,