added placeholder icons and theming settings

main.cpp

@@ -23,9 +23,10 @@
 #include <QDir>
 #include <QPalette>
 #include <QColor>
+#include "dbman.cpp"
 #include <QDebug>
 
-
+int selectedtheme = 1; //Variable to store theming information
 
 int main(int argc, char *argv[])
 {
@@ -33,13 +34,24 @@ int main(int argc, char *argv[])
     QCoreApplication::setOrganizationDomain("f-cloud.ch");
     QCoreApplication::setApplicationName("openLog");
     QApplication openLog(argc, argv);
+    db::connect();  //connect to the database
+
     //Theming with CSS inlcues QFile,QTextStream, QDir, themes folder and TARGET = flog, RESOURCES = themes/breeze.qrc in pro
     // credit: https://github.com/Alexhuszagh/BreezeStyleSheets
+    selectedtheme = db::retreiveSetting("10")[1].toInt();
     QDir::setCurrent("/themes");
-    QFile file(":dark.qss");
-    file.open(QFile::ReadOnly | QFile::Text);
-    QTextStream stream(&file);
-    openLog.setStyleSheet(stream.readAll());
+    if (selectedtheme == 1){
+        QFile file(":light.qss");
+        file.open(QFile::ReadOnly | QFile::Text);
+        QTextStream stream(&file);
+        openLog.setStyleSheet(stream.readAll());
+    }else if (selectedtheme == 2){
+        QFile file(":dark.qss");
+        file.open(QFile::ReadOnly | QFile::Text);
+        QTextStream stream(&file);
+        openLog.setStyleSheet(stream.readAll());
+    }
+
 
 
     MainWindow w;

mainwindow.cpp

@@ -35,26 +35,38 @@
 #include <chrono>
 #include <QMessageBox>
 
+#include <QDir>
+#include <QFile>
+
 qlonglong SelectedFlightold = -1;
 
 MainWindow::MainWindow(QWidget *parent)
     : QMainWindow(parent)
     , ui(new Ui::MainWindow)
 {
-
     ui->setupUi(this);
-    // Adds space between toolbar items and actionQuit item
+
+    // Set up Toolbar
+    ui->toolBar->setToolButtonStyle(Qt::ToolButtonTextUnderIcon);
+    ui->toolBar->setIconSize(QSize(64,64));
+    ui->actionLogbook->setIcon(QIcon(":/logbook_icon.png"));
+    ui->actionHome->setIcon(QIcon(":/home_icon.svg"));
+    ui->actionSettings->setIcon(QIcon(":/settings_icon.svg"));
+    ui->actionQuit->setIcon(QIcon(":/quit_icon.svg"));
+
+    // Adds space between toolbar items and actionSetting item
     auto *spacer = new QWidget();
     spacer->setMinimumWidth(10);
     spacer->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Minimum);
-    ui->toolBar->insertWidget(ui->actionQuit,spacer);
+    ui->toolBar->insertWidget(ui->actionSettings,spacer);
+
 
     // create and show homeWidget
     auto hw = new homeWidget(this);
     ui->stackedWidget->addWidget(hw);
     ui->stackedWidget->setCurrentWidget(hw);
 
-    db::connect();  //connect to the database
+
 }
 
 MainWindow::~MainWindow()
@@ -106,3 +118,8 @@ void MainWindow::on_actionLogbook_triggered()
     ui->stackedWidget->addWidget(lw);
     ui->stackedWidget->setCurrentWidget(lw);
 }
+
+void MainWindow::on_actionSettings_triggered()
+{
+    nope();
+}

mainwindow.h

@@ -46,6 +46,8 @@ private slots:
 
     void on_actionLogbook_triggered();
 
+    void on_actionSettings_triggered();
+
 private:
     Ui::MainWindow *ui;
 };

mainwindow.ui

@@ -30,7 +30,7 @@
      <x>0</x>
      <y>0</y>
      <width>1280</width>
-     <height>25</height>
+     <height>24</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuFile">
@@ -55,7 +55,7 @@
    </attribute>
    <addaction name="actionHome"/>
    <addaction name="actionLogbook"/>
-   <addaction name="actionNew_Flight"/>
+   <addaction name="actionSettings"/>
    <addaction name="actionQuit"/>
   </widget>
   <action name="actionNew_Flight">
@@ -78,11 +78,25 @@
    <property name="text">
     <string>Home</string>
    </property>
+   <property name="shortcut">
+    <string>Ctrl+H</string>
+   </property>
+  </action>
+  <action name="actionSettings">
+   <property name="text">
+    <string>Settings</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+S</string>
+   </property>
   </action>
   <action name="actionLogbook">
    <property name="text">
     <string>Logbook</string>
    </property>
+   <property name="shortcut">
+    <string>Ctrl+L</string>
+   </property>
   </action>
  </widget>
  <resources/>

openLog.pro

@@ -6,7 +6,8 @@ CONFIG += c++11
 
 TARGET = openLog
 
-RESOURCES = themes/breeze.qrc
+RESOURCES = themes/breeze.qrc \
+    themes/icons/icons.qrc
 
 # The following define makes your compiler emit warnings if you use
 # any Qt feature that has been marked deprecated (the exact warnings

themes/icons/home_icon.svg

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg width="64" version="1.1" xmlns="http://www.w3.org/2000/svg" height="64" viewBox="0 0 64 64" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape">
+ <defs id="defs5455">
+  <linearGradient inkscape:collect="always" id="linearGradient4172">
+   <stop style="stop-color:#3daee9" id="stop4174"/>
+   <stop offset="1" style="stop-color:#6cc1ef" id="stop4176"/>
+  </linearGradient>
+  <linearGradient inkscape:collect="always" id="linearGradient4178" xlink:href="#linearGradient4172" y1="541.79797" y2="499.78421" gradientUnits="userSpaceOnUse" x2="0" gradientTransform="matrix(1 0 0 0.99967455 0 0.17645)"/>
+ </defs>
+ <metadata id="metadata5458"/>
+ <g inkscape:label="Capa 1" inkscape:groupmode="layer" id="layer1" transform="matrix(1 0 0 1 -384.57143 -483.798)">
+  <g inkscape:label="Capa 1" id="layer1-5" transform="matrix(1 0 0 1 0 0.000005)">
+   <path inkscape:connector-curvature="0" style="fill:#147eb8" id="rect4180" d="m 388.57143,489.79812 0,5 0,22 c 0,0.55373 0.446,1 1,1 l 54,0 c 0.55399,0 1,-0.44627 1,-1 l 0,-21.99023 c 0,-0.003 -0.002,-0.006 -0.002,-0.01 l 0.002,0 0,-1 -28,0 -4,-4 -24,0 z"/>
+   <path inkscape:connector-curvature="0" style="fill:url(#linearGradient4178)" id="rect4113" d="m 410.57143,499.79812 -4,4 -19,0 0,1 0.002,0 c -5e-5,0.004 -0.002,0.008 -0.002,0.0117 l 0,35.98828 0,1 1,0 56,0 1,0 0,-1 0,-35.98828 0,-0.0117 0,-5 z"/>
+   <path inkscape:connector-curvature="0" style="fill:#ffffff;fill-opacity:0.235294;fill-rule:evenodd" id="path4224-4" d="m 387.57144,503.79812 0,1 19.99999,0 3,-5 -4,4 z"/>
+   <path inkscape:connector-curvature="0" style="fill-opacity:0.235294;fill-rule:evenodd" id="path4228-2" d="m 388.57143,502.79812 0,1 18,0 4,-4 -6,3 z"/>
+   <path inkscape:connector-curvature="0" style="fill-opacity:0.235294" id="path4151-2" d="m 387.57143,540.7981 0,1 1,0 56,0 1,0 0,-1 -1,0 -56,0 -1,0 z"/>
+   <path inkscape:connector-curvature="0" style="fill:#ffffff;fill-opacity:0.235294;fill-rule:evenodd" id="path4196" d="m 28,6 3,5 2,0 27,0 0,-1 -27,0 -1,0 z" transform="matrix(1 0 0 1 384.57143 483.798)"/>
+  </g>
+  <path style="fill:#1272a5" id="rect4208" d="M 31.992188 27 L 22 36.992188 L 22.007812 37 L 22 37 L 22 38 L 24 38 L 24 46 L 24 47 L 40 47 L 40 46 L 40 38 L 42 38 L 42 37 L 41.992188 37 L 42 36.992188 L 38 33 L 38 32.998047 L 38 29 L 37 29 L 37 32 L 31.992188 27 z M 32 28.40625 L 40.59375 37 L 39 37 L 39 38 L 39 46 L 34 46 L 34 40 L 30 40 L 30 46 L 25 46 L 25 38 L 25 37 L 23.40625 37 L 32 28.40625 z " transform="matrix(1 0 0 1 384.57143 483.798)"/>
+ </g>
+</svg>

themes/icons/icons.qrc

@@ -0,0 +1,9 @@
+<RCC>
+    <qresource prefix="/">
+        <file>logbook_icon.png</file>
+        <file>home_icon.svg</file>
+        <file>settings_icon.svg</file>
+        <file>search_icon.svg</file>
+        <file>quit_icon.svg</file>
+    </qresource>
+</RCC>

themes/icons/quit_icon.svg

@@ -0,0 +1,17 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32">
+  <defs
+     id="defs3051">
+    <style
+       type="text/css"
+       id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#eff0f1;
+      }
+      </style>
+  </defs>
+  <path
+     style="fill:currentColor;fill-opacity:1;stroke:none" 
+     d="M 15,4 15,4.05078 15,5.054686 15,13 17,13 17,5.050781 17,4.046875 17,4 16,4 15,4 Z m 3,0.169922 0,1.021484 A 11,11 0 0 1 27,16 11,11 0 0 1 16,27 11,11 0 0 1 5,16 11,11 0 0 1 14,5.189453 L 14,4.181641 A 12,12 0 0 0 4,16 12,12 0 0 0 16,28 12,12 0 0 0 28,16 12,12 0 0 0 18,4.169922 Z"
+     class="ColorScheme-Text"
+     />
+</svg>

themes/icons/search_icon.svg

@@ -0,0 +1,18 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32">
+  <defs
+     id="defs3051">
+    <style
+       type="text/css"
+       id="current-color-scheme">
+      .ColorScheme-Text {
+        color:#eff0f1;
+      }
+      </style>
+  </defs>
+  <path
+     style="fill:currentColor;fill-opacity:1;stroke:none" 
+     d="M 6 4 L 6 28 L 14 28 L 14 27 L 7 27 L 7 5 L 18 5 L 18 12 L 25 12 L 25 16 L 26 16 L 26 11 L 19 4 L 18 4 L 6 4 z M 18.5 16 C 16.007 16 14 18.01 14 20.5 C 14 22.993 16.01 25 18.5 25 C 19.563643 25 20.526341 24.618801 21.294922 24.005859 L 25.292969 28.003906 L 26 27.296875 L 22.001953 23.298828 C 22.617604 22.529048 23 21.565338 23 20.5 C 23 18.007 20.99 16 18.5 16 z M 18.5 17 C 20.439 17 22 18.561 22 20.5 C 22 22.439 20.439 24 18.5 24 C 16.561 24 15 22.439 15 20.5 C 15 18.561 16.561 17 18.5 17 z "
+     id="path32" 
+     class="ColorScheme-Text"
+     />
+</svg>

themes/icons/settings_icon.svg

@@ -0,0 +1,149 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="64"
+   version="1.1"
+   viewBox="0 0 64 64"
+   height="64"
+   id="svg2"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="application-x-sharedlib.svg">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1366"
+     inkscape:window-height="699"
+     id="namedview24"
+     showgrid="true"
+     inkscape:zoom="8.48"
+     inkscape:cx="29.654971"
+     inkscape:cy="33.030316"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2">
+    <inkscape:grid
+       type="xygrid"
+       id="grid4244" />
+  </sodipodi:namedview>
+  <defs
+     id="defs4">
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4303-1"
+       id="linearGradient4186"
+       x1="479.84732"
+       y1="794.41791"
+       x2="479.84732"
+       y2="-564.64087"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4303-1">
+      <stop
+         style="stop-color:#bfc1c1;stop-opacity:1"
+         offset="0"
+         id="stop4305-2" />
+      <stop
+         style="stop-color:#f1f2f3;stop-opacity:1"
+         offset="1"
+         id="stop4307-2" />
+    </linearGradient>
+    <linearGradient
+       gradientTransform="matrix(0.50259673,0,0,0.50259673,0.00311656,-0.51851143)"
+       inkscape:collect="always"
+       xlink:href="#linearGradient4303-1"
+       id="linearGradient4194"
+       x1="65"
+       y1="103"
+       x2="65"
+       y2="-32"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4303-1"
+       id="linearGradient4287"
+       gradientUnits="userSpaceOnUse"
+       x1="479.84732"
+       y1="794.41791"
+       x2="479.84732"
+       y2="-564.64087" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4303-1"
+       id="linearGradient4289"
+       gradientUnits="userSpaceOnUse"
+       x1="479.84732"
+       y1="794.41791"
+       x2="479.84732"
+       y2="-564.64087" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4303-1"
+       id="linearGradient4291"
+       gradientUnits="userSpaceOnUse"
+       x1="479.84732"
+       y1="794.41791"
+       x2="479.84732"
+       y2="-564.64087" />
+  </defs>
+  <metadata
+     id="metadata84">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <rect
+     style="fill:url(#linearGradient4194);fill-opacity:1;fill-rule:evenodd;stroke:none"
+     id="rect2982"
+     width="52.035847"
+     height="52.035847"
+     x="6.0671382"
+     y="5.9744072" />
+  <rect
+     style="fill:#4d4d4d;fill-opacity:1;fill-rule:evenodd;stroke:none"
+     id="rect3752"
+     width="45.446903"
+     height="43.892849"
+     x="9.3951912"
+     y="9.8676434" />
+  <g
+     transform="matrix(0.04437749,0,0,0.04437749,11.377488,10.968721)"
+     id="g3"
+     style="fill:url(#linearGradient4186);fill-opacity:1">
+    <path
+       inkscape:connector-curvature="0"
+       d="m 61.2,341.538 c 4.9,16.8 11.7,33 20.3,48.2 l -24.5,30.9 c -8,10.1 -7.1,24.5 1.9,33.6 l 42.2,42.2 c 9.1,9.1 23.5,9.899 33.6,1.899 l 30.7,-24.3 c 15.8,9.101 32.6,16.2 50.1,21.2 l 4.6,39.5 c 1.5,12.8 12.3,22.4 25.1,22.4 l 59.7,0 c 12.8,0 23.6,-9.601 25.1,-22.4 l 4.4,-38.1 c 18.8,-4.9 36.8,-12.2 53.7,-21.7 l 29.7,23.5 c 10.1,8 24.5,7.1 33.6,-1.9 l 42.2,-42.2 c 9.1,-9.1 9.9,-23.5 1.9,-33.6 l -23.1,-29.3 c 9.6,-16.601 17.1,-34.3 22.1,-52.8 l 35.6,-4.1 c 12.801,-1.5 22.4,-12.3 22.4,-25.1 l 0,-59.7 c 0,-12.8 -9.6,-23.6 -22.4,-25.1 l -35.1,-4.1 c -4.801,-18.3 -12,-35.8 -21.199,-52.2 l 21.6,-27.3 c 8,-10.1 7.1,-24.5 -1.9,-33.6 l -42.1,-42.1 c -9.1,-9.1 -23.5,-9.9 -33.6,-1.9 l -26.5,21 c -17.2,-10.1 -35.601,-17.8 -54.9,-23 l -4,-34.3 c -1.5,-12.8 -12.3,-22.4 -25.1,-22.4 l -59.7,0 c -12.8,0 -23.6,9.6 -25.1,22.4 l -4,34.3 c -19.8,5.3 -38.7,13.3 -56.3,23.8 l -27.5,-21.8 c -10.1,-8 -24.5,-7.1 -33.6,1.9 l -42.2,42.2 c -9.1,9.1 -9.9,23.5 -1.9,33.6 l 23,29.1 c -9.2,16.6 -16.2,34.3 -20.8,52.7 l -36.8,4.2 c -12.8,1.5 -22.4,12.3 -22.4,25.1 l 0,59.7 c 0,12.8 9.6,23.6 22.4,25.1 l 38.799,4.501 z m 216.3,-161.5 c 54.4,0 98.7,44.3 98.7,98.7 0,54.4 -44.3,98.7 -98.7,98.7 -54.399,0 -98.7,-44.3 -98.7,-98.7 0,-54.4 44.3,-98.7 98.7,-98.7 z"
+       id="path5"
+       style="fill:url(#linearGradient4287);fill-opacity:1" />
+    <path
+       inkscape:connector-curvature="0"
+       d="m 867.699,356.238 -31.5,-26.6 c -9.699,-8.2 -24,-7.8 -33.199,0.9 l -17.4,16.3 c -14.699,-7.1 -30.299,-12.1 -46.4,-15 l -4.898,-24 c -2.5,-12.4 -14,-21 -26.602,-20 l -41.1,3.5 c -12.6,1.1 -22.5,11.4 -22.9,24.1 l -0.799,24.4 c -15.801,5.7 -30.701,13.5 -44.301,23.3 l -20.799,-13.8 c -10.602,-7 -24.701,-5 -32.9,4.7 l -26.6,31.7 c -8.201,9.7 -7.801,24 0.898,33.2 l 18.201,19.399 c -6.301,14.2 -10.801,29.101 -13.4,44.4 l -26,5.3 c -12.4,2.5 -21,14 -20,26.601 l 3.5,41.1 c 1.1,12.6 11.4,22.5 24.1,22.9 l 28.1,0.899 c 5.102,13.4 11.801,26.101 19.9,38 l -15.699,23.7 c -7,10.6 -5,24.7 4.699,32.9 l 31.5,26.6 c 9.701,8.2 24,7.8 33.201,-0.9 l 20.6,-19.3 c 13.5,6.3 27.699,11 42.299,13.8 l 5.701,28.2 c 2.5,12.4 14,21 26.6,20 l 41.1,-3.5 c 12.6,-1.1 22.5,-11.399 22.9,-24.1 l 0.9,-27.601 c 15,-5.3 29.199,-12.5 42.299,-21.399 l 22.701,15 c 10.6,7 24.699,5 32.9,-4.7 l 26.6,-31.5 c 8.199,-9.7 7.799,-24 -0.9,-33.2 L 872.7,592.138 c 6.701,-14.2 11.602,-29.2 14.4,-44.601 l 25,-5.1 c 12.4,-2.5 21,-14 20,-26.601 l -3.5,-41.1 c -1.1,-12.6 -11.4,-22.5 -24.1,-22.9 l -25.1,-0.8 c -5.201,-14.6 -12.201,-28.399 -20.9,-41.2 l 13.699,-20.6 c 7.201,-10.598 5.201,-24.798 -4.5,-32.998 z M 712.801,593.837 c -44.4,3.801 -83.602,-29.3 -87.301,-73.699 -3.801,-44.4 29.301,-83.601 73.699,-87.301 44.4,-3.8 83.602,29.301 87.301,73.7 3.801,44.401 -29.301,83.601 -73.699,87.3 z"
+       id="path7"
+       style="fill:url(#linearGradient4289);fill-opacity:1" />
+    <path
+       inkscape:connector-curvature="0"
+       d="m 205,704.438 c -12.6,1.3 -22.3,11.899 -22.4,24.6 l -0.3,25.3 c -0.2,12.7 9.2,23.5 21.8,25.101 l 18.6,2.399 c 3.1,11.301 7.5,22.101 13.2,32.301 l -12,14.8 c -8,9.899 -7.4,24.1 1.5,33.2 l 17.7,18.1 c 8.9,9.1 23.1,10.1 33.2,2.3 l 14.899,-11.5 c 10.5,6.2 21.601,11.101 33.2,14.5 l 2,19.2 c 1.3,12.6 11.9,22.3 24.6,22.4 l 25.301,0.3 c 12.699,0.2 23.5,-9.2 25.1,-21.8 l 2.3,-18.2 c 12.601,-3.101 24.601,-7.8 36,-14 l 14,11.3 c 9.9,8 24.101,7.4 33.201,-1.5 l 18.1,-17.7 c 9.1,-8.899 10.1,-23.1 2.301,-33.2 L 496.6,818.438 c 6.6,-11 11.701,-22.7 15.201,-35 l 16.6,-1.7 c 12.6,-1.3 22.299,-11.9 22.4,-24.6 l 0.299,-25.301 c 0.201,-12.699 -9.199,-23.5 -21.799,-25.1 l -16.201,-2.1 c -3.1,-12.2 -7.699,-24 -13.699,-35 l 10.1,-12.4 c 8,-9.9 7.4,-24.1 -1.5,-33.2 l -17.699,-18.1 c -8.9,-9.101 -23.102,-10.101 -33.201,-2.3 l -12.101,9.3 c -11.399,-6.9 -23.6,-12.2 -36.399,-15.8 L 407,581.437 c -1.3,-12.601 -11.899,-22.3 -24.6,-22.4 l -25.3,-0.3 c -12.7,-0.2 -23.5,9.2 -25.101,21.8 l -2,15.601 c -13.199,3.399 -25.899,8.6 -37.699,15.399 l -12.5,-10.2 c -9.9,-8 -24.101,-7.399 -33.201,1.5 l -18.2,17.801 c -9.1,8.899 -10.1,23.1 -2.3,33.199 l 10.7,13.801 c -6.2,11 -11.1,22.699 -14.3,35 l -17.499,1.8 z m 163.3,-28.601 c 36.3,0.4 65.399,30.301 65,66.601 -0.4,36.3 -30.301,65.399 -66.601,65 -36.3,-0.4 -65.399,-30.3 -65,-66.601 0.401,-36.299 30.301,-65.399 66.601,-65 z"
+       id="path9"
+       style="fill:url(#linearGradient4291);fill-opacity:1" />
+  </g>
+</svg>