More Icons

Added icons for New Flight and Aircraft

assets/icons.qrc

@@ -12,9 +12,11 @@
         <file>ionicon-icons/settings-outline.png</file>
         <file>ionicon-icons/power.png</file>
         <file>ionicon-icons/power-outline.png</file>
-        <file>opl-icons/pilot.png</file>
+        <file>opl-icons/opl_logo.svg</file>
         <file>opl-icons/appicon_round_transparent.svg</file>
         <file>opl-icons/appicon_round_gradient.svg</file>
-        <file>opl-icons/opl_logo.svg</file>
+        <file>opl-icons/pilot.png</file>
+        <file>opl-icons/aircraft.png</file>
+        <file>opl-icons/new_flight.png</file>
     </qresource>
 </RCC>

mainwindow.cpp

@@ -29,10 +29,10 @@ MainWindow::MainWindow(QWidget *parent)
 
     // Set up Toolbar
     ui->actionHome->setIcon(QIcon(":/icons/ionicon-icons/home-outline.png"));
-    ui->actionNewFlight->setIcon(QIcon(":/icons/ionicon-icons/airplane-outline.png"));
+    ui->actionNewFlight->setIcon(QIcon(Opl::Assets::ICON_NEW_FLIGHT));
     ui->actionLogbook->setIcon(QIcon(":/icons/ionicon-icons/book-outline.png"));
-    ui->actionAircraft->setIcon(QIcon(":/icons/ionicon-icons/airplane-outline.png"));
-    ui->actionPilots->setIcon(QIcon(Opl::Assets::PILOT_ICON));
+    ui->actionAircraft->setIcon(QIcon(Opl::Assets::ICON_AIRCRAFT));
+    ui->actionPilots->setIcon(QIcon(Opl::Assets::ICON_PILOT));
     ui->actionSettings->setIcon(QIcon(":/icons/ionicon-icons/settings-outline.png"));
     ui->actionQuit->setIcon(QIcon(":/icons/ionicon-icons/power-outline.png"));
     ui->toolBar->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Minimum);

src/gui/widgets/logbookwidget.cpp

@@ -104,85 +104,6 @@ void LogbookWidget::connectSignalsAndSlots()
     QObject::connect(view->selectionModel(), &QItemSelectionModel::selectionChanged,
                      this, &LogbookWidget::flightsTableView_selectionChanged);
 }
-
-// not manually set at the moment
-/*void LogbookWidget::setupDefaultView()
-{
-    DEB << "Loading Default View...";
-    displayModel = new QSqlTableModel(this);
-    displayModel->setTable(QStringLiteral("viewDefault"));
-    displayModel->select();
-
-    view = ui->tableView;
-    view->setModel(displayModel);
-
-    view->setColumnWidth(1, 120);
-    view->setColumnWidth(2, 60);
-    view->setColumnWidth(3, 60);
-    view->setColumnWidth(4, 60);
-    view->setColumnWidth(5, 60);
-    view->setColumnWidth(6, 60);
-    view->setColumnWidth(7, 180);
-    view->setColumnWidth(8, 180);
-    view->setColumnWidth(9, 120);
-    view->setColumnWidth(10, 90);
-
-    view->setSelectionBehavior(QAbstractItemView::SelectRows);
-    view->setSelectionMode(QAbstractItemView::ExtendedSelection);
-    view->setEditTriggers(QAbstractItemView::NoEditTriggers);
-    view->setContextMenuPolicy(Qt::CustomContextMenu);
-    view->horizontalHeader()->setStretchLastSection(QHeaderView::Stretch);
-    view->verticalHeader()->hide();
-    view->setAlternatingRowColors(true);
-    view->hideColumn(0);
-
-    view->show();
-}
-
-void LogbookWidget::setupEasaView()
-{
-    DEB << "Loading EASA View...";
-    displayModel = new QSqlTableModel;
-    displayModel->setTable(QStringLiteral("viewEASA"));
-    displayModel->select();
-
-    view = ui->tableView;
-    view->setModel(displayModel);
-
-    view->setColumnWidth(1,120);
-    view->setColumnWidth(2,60);
-    view->setColumnWidth(3,60);
-    view->setColumnWidth(4,60);
-    view->setColumnWidth(5,60);
-    view->setColumnWidth(6,180);
-    view->setColumnWidth(7,120);
-    view->setColumnWidth(8,30);
-    view->setColumnWidth(9,30);
-    view->setColumnWidth(10,30);
-    view->setColumnWidth(11,30);
-    view->setColumnWidth(12,120);
-    view->setColumnWidth(13,15);
-    view->setColumnWidth(14,15);
-    view->setColumnWidth(15,60);
-    view->setColumnWidth(16,60);
-    view->setColumnWidth(17,60);
-    view->setColumnWidth(18,60);
-    view->setColumnWidth(19,60);
-    view->setColumnWidth(20,60);
-    view->setColumnWidth(21,120);
-
-    view->setSelectionBehavior(QAbstractItemView::SelectRows);
-    view->setSelectionMode(QAbstractItemView::ExtendedSelection);
-    view->setEditTriggers(QAbstractItemView::NoEditTriggers);
-    view->setContextMenuPolicy(Qt::CustomContextMenu);
-    view->horizontalHeader()->setStretchLastSection(QHeaderView::Stretch);
-    view->verticalHeader()->hide();
-    view->setAlternatingRowColors(true);
-    view->hideColumn(0);
-
-    view->show();
-}*/
-
 /*
  * Slots
  */

src/gui/widgets/logbookwidget.h

@@ -72,8 +72,6 @@ private:
 
     void prepareModelAndView(int view_id);
     void connectSignalsAndSlots();
-    //void setupDefaultView();
-    //void setupEasaView();
 };
 
 #endif // LOGBOOKWIDGET_H

src/oplconstants.h

@@ -175,7 +175,9 @@ namespace Assets {
 static const auto APP_ICON_FILLED = QLatin1String(":/icons/opl-icons/appicon_round_gradient.svg");
 static const auto APP_ICON_TRANSPARENT = QLatin1String(":/icons/opl-icons/appicon_round_transparent.svg");
 static const auto LOGO = QLatin1String(":/icons/opl-icons/opl_logo.svg");
-static const auto PILOT_ICON = QLatin1String(":/icons/opl-icons/pilot.png");
+static const auto ICON_PILOT = QLatin1String(":/icons/opl-icons/pilot.png");
+static const auto ICON_NEW_FLIGHT = QLatin1String(":/icons/opl-icons/new_flight.png");
+static const auto ICON_AIRCRAFT = QLatin1String(":/icons/opl-icons/aircraft.png");
 
 }