Project compiles on Qt5!;

chepe263 · chepe263 · commit c3582d0798c2 · 2019-03-08T19:18:15.000-06:00
diff --git a/src/RGApplicationName.h b/src/RGApplicationName.h
@@ -0,0 +1,5 @@
+#ifndef RGAPPLICATIONNAME_H
+#define RGAPPLICATIONNAME_H
+#include <QString>
+extern const QString applicationName;
+#endif // RGAPPLICATIONNAME_H
diff --git a/src/RGEditPath.cpp b/src/RGEditPath.cpp
@@ -29,7 +29,7 @@ RGEditPath::RGEditPath(QGraphicsItem *parent) :
 {
   setPos(0,0);
   setCursor(Qt::CrossCursor);
-  setAcceptsHoverEvents(true);
+  setAcceptHoverEvents(true);
   setFlag(QGraphicsItem::ItemHasNoContents);
 }
 
diff --git a/src/RGEditPath.h b/src/RGEditPath.h
@@ -23,6 +23,8 @@
 
 #include <QGraphicsObject>
 #include <QtGui>
+#include <QGraphicsView>
+#include <QGraphicsSceneMouseEvent>
 #include "RGEditPathPoint.h"
 
 class RGEditPath : public QGraphicsObject
diff --git a/src/RGEditPathPoint.h b/src/RGEditPathPoint.h
@@ -24,6 +24,8 @@
 #include <QGraphicsObject>
 #include <QPoint>
 #include <QtGui>
+#include <QGraphicsScene>
+#include <QGraphicsSceneMouseEvent>
 
 class RGEditPathPoint : public QGraphicsObject
 {
diff --git a/src/RGEncVideo.h b/src/RGEncVideo.h
@@ -23,8 +23,9 @@
 
 #include <QObject>
 #include <QProcess>
-#include <QMessageBox>
+#include <QtWidgets/QMessageBox>
 #include "ui_videosettings.h"
+#include <QFileDialog>
 
 class RGEncVideo : public QWidget
 {
diff --git a/src/RGGoogleMap.cpp b/src/RGGoogleMap.cpp
@@ -26,7 +26,7 @@
  * Workaround with google api, dragging the map doesn't work,
  * emulating Chrome, fixes this.
  */
-class myWebPage : public QWebPage
+class myWebPage : public QWebEnginePage
 {
 protected:
 
@@ -49,8 +49,12 @@ RGGoogleMap::RGGoogleMap(QWidget *parent)
 	ui.setupUi(this);
 
 	QFile file("google-maps-template.html");
-	if (!file.open(QIODevice::ReadOnly | QIODevice::Text))
+	if (!file.open(QIODevice::ReadOnly | QIODevice::Text)){
+        QFileInfo fileInfo(file.fileName());
+		qDebug() << "I can't open google-maps-template.html !!!";
+        qDebug() << "Path:" << fileInfo.absoluteFilePath();
 		return;
+	}
 
 	QTextStream in(&file);
 	while (!in.atEnd()) {
@@ -59,26 +63,59 @@ RGGoogleMap::RGGoogleMap(QWidget *parent)
 
 	ui.progressBar->hide();
 	ui.progressBar->setRange(0, 100);
-  ui.spinBoxX->setValue(RGSettings::getGMXResolution());
-  ui.spinBoxY->setValue(RGSettings::getGMYResolution());
+    ui.spinBoxX->setValue(RGSettings::getGMXResolution());
+    ui.spinBoxY->setValue(RGSettings::getGMYResolution());
 
-  ui.webView->setPage(new myWebPage());
+    //ui.webView->setPage(new myWebPage());
 
 	//Init map resolution
 	on_fixButton_clicked(true);
 }
-
+RGGoogleMap::~RGGoogleMap()
+{
+    qDebug() << "~RGGoogleMap() destroyed";
+    if(ui.webView->page() != nullptr){
+        qDebug() << "RGGoogleMap destorying webview->page";
+        ui.webView->page()->~QWebEnginePage();
+    }
+    if(ui.webView != nullptr){
+        qDebug() << "RGGoogleMap destorying webview";
+        ui.webView->close();
+    }
+}
 void RGGoogleMap::accept()
 {
 	m_map = QPixmap(ui.webView->size());
 	ui.webView->render(&m_map);
 
-  RGSettings::setGMXResolution(ui.spinBoxX->value());
-  RGSettings::setGMYResolution(ui.spinBoxY->value());
+    RGSettings::setGMXResolution(ui.spinBoxX->value());
+    RGSettings::setGMYResolution(ui.spinBoxY->value());
+    qDebug() << "Closing dialog by accepted";
+    if(ui.webView->page() != nullptr){
+        qDebug() << "RGGoogleMap destorying webview->page";
+        ui.webView->page()->~QWebEnginePage();
+    }
+    if(ui.webView != nullptr){
+        qDebug() << "RGGoogleMap destorying webview";
+        ui.webView->close();
+    }
+
 
 	QDialog::accept();
 }
-
+void RGGoogleMap::rejected()
+{
+    qDebug() << "RGGoogleMap::rejected()";
+    if(ui.webView->page() != nullptr){
+        qDebug() << "RGGoogleMap destorying webview->page";
+        ui.webView->page()->~QWebEnginePage();
+    }
+    if(ui.webView != nullptr){
+        qDebug() << "RGGoogleMap destorying webview";
+        ui.webView->close();
+    }
+    QDialog::reject();
+}
 
 void RGGoogleMap::on_goButton_clicked(bool)
 {
@@ -88,13 +125,14 @@ void RGGoogleMap::on_goButton_clicked(bool)
 	//https://www.google.nl/maps/@52.374716,4.898623,12z
 
 	QString manUrl = ui.lineEdit->text();
-	QUrl url = manUrl;
+    QUrl url = manUrl;
 	QString latlon;
 	QString zoom;
 	if (url.hasFragment() || url.host().contains("google"))
 	{
-		latlon = url.queryItemValue ("ll");
-		zoom = url.queryItemValue ("z");
+        QUrlQuery query(url);
+        latlon = query.queryItemValue ("ll");
+        zoom = query.queryItemValue ("z");
 		if (latlon.isEmpty() || zoom.isEmpty())
 		{
 			//Now try the new google maps URL format (the construction is not supported by QUrl, so parse the URL manually
@@ -122,7 +160,11 @@ void RGGoogleMap::on_goButton_clicked(bool)
 		return;
 	}
 
-
+    if(ui.webView->page() != nullptr){
+        qDebug() << "RGGoogleMap destorying webview->page";
+        ui.webView->page()->~QWebEnginePage();
+        ui.webView->setPage(new myWebPage());
+    }
 	ui.webView->setHtml(genHtml(latlon, zoom));
 	ui.webView->reload();
 }
@@ -165,3 +207,4 @@ QString RGGoogleMap::genHtml(const QString &latlon, const QString &zoom) const
 
 	return html;
 }
+
diff --git a/src/RGGoogleMap.h b/src/RGGoogleMap.h
@@ -22,17 +22,23 @@
 #include <QString>
 #include <QPixmap>
 
+#include <QWebEngineView>
+#include <QWebEnginePage>
+#include <QMessageBox>
+
 class RGGoogleMap : public QDialog
 {
 	Q_OBJECT
 
 public:
 	RGGoogleMap(QWidget *parent);
 
-	QPixmap getMap() const {return m_map;}
+    QPixmap getMap() const {return m_map;}
+    ~RGGoogleMap();
 
 public slots:
 	void accept();
+    void rejected();
 
 private slots:
   void on_goButton_clicked(bool);
@@ -48,4 +54,17 @@ private slots:
 	Ui_googleMap ui;
 	QString    m_html_template;
 	QPixmap    m_map;
+
+    //ToDo: Create function that destroys the webview page and the webview
+    //void unload_qwebengine();
+    //tries to delete the page on the ui.webengine and the ui.webengine itself
+    //void unload_qwebengine()
+    //{
+        //if(ui.webView->page() != nullptr){
+        //    ui.webView->page()->~QWebEnginePage();
+        //}
+        //if(ui.webView != nullptr){
+        //    ui.webView->close();
+        //}
+    //}
 };
diff --git a/src/RGMainWindow.cpp b/src/RGMainWindow.cpp
@@ -444,4 +444,4 @@ void RGMainWindow::initVideoEncoderFromSettings()
 	{
     qDebug()<<"encoder found !";
 	}
-}
+}
diff --git a/src/RGMainWindow.h b/src/RGMainWindow.h
@@ -24,6 +24,8 @@
 #include <QMainWindow>
 #include <QProcess>
 #include <QStringList>
+#include <QTextBrowser>
+#include <QFileDialog>
 
 class QWidget;
 class QTimer;
diff --git a/src/RGVehicle.cpp b/src/RGVehicle.cpp
@@ -136,7 +136,8 @@ bool RGVehicle::getMirror()
 void RGVehicle::setMirror(bool mirror)
 {
   if(mMirror!=mirror)
-    this->scale(-1,1);
+    //this->scale(-1,1);
+    this->setTransform(QTransform::fromScale(-1, 1), true);
   mMirror=mirror;
 }
 
@@ -168,13 +169,15 @@ void RGVehicle::setRotation(qreal angle)
   if(angle<270 && angle>90){
     if(mRotMirror==false){
       mRotMirror=true;
-      this->scale(-1,1);
+      //this->scale(-1,1);
+      this->setTransform(QTransform::fromScale(-1, 1), true);
     }
     angle=180-angle;
   }
   else if(mRotMirror==true){
     mRotMirror=false;
-    this->scale(-1,1);
+    //this->scale(-1,1);
+    this->setTransform(QTransform::fromScale(-1, 1), true);
   }
   if(mMirror) angle=-angle;
   QGraphicsItem::setRotation(angle+mStartAngle);
diff --git a/src/RGVehicleDialog.cpp b/src/RGVehicleDialog.cpp
@@ -24,6 +24,7 @@
 #include <QDesktopServices>
 #include <QFileDialog>
 
+
 #include "RGVehicleDialog.h"
 
 RGVehicleDialog::RGVehicleDialog(QWidget *parent,RGVehicleList *vehicleList,const QPen &pen)
@@ -79,7 +80,7 @@ void RGVehicleDialog::reject()
 void RGVehicleDialog::on_addVehiclePB_clicked(bool)
 {
   QString fileName = QFileDialog::getOpenFileName(this, tr("Select image/icon file to add as custom vehicle"),
-                                                  QDesktopServices::storageLocation(QDesktopServices::PicturesLocation),
+                                                  QStandardPaths::writableLocation(QStandardPaths::PicturesLocation),
                                                   tr("Images (*.jpg *.gif *.png)"));
   if (!fileName.isNull()){
     QString errStr;
diff --git a/src/RGVehicleDialog.h b/src/RGVehicleDialog.h
@@ -29,6 +29,7 @@
 #include "RGVehicleList.h"
 #include "RGVehicleOriginPt.h"
 #include <QGraphicsScene>
+#include <QMessageBox>
 
 class RGVehicleDialog : public QDialog
 {
diff --git a/src/RGVehicleList.cpp b/src/RGVehicleList.cpp
@@ -45,7 +45,7 @@ RGVehicleList::RGVehicleList()
 
   //Also look in user's local data directory for custom vehicles
   //TODO: Should also be working on linux: check! then above linux dependent block can be removed!
-  vehicleDir.setPath(QDesktopServices::storageLocation(QDesktopServices::DataLocation) + "/vehicles");
+  vehicleDir.setPath(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation)  + "/vehicles");
   if (vehicleDir.exists())
   {
     vehicles.append(vehicleDir.entryInfoList());
@@ -135,7 +135,7 @@ void RGVehicleList::loadVehiclesSettings()
 
 RGVehicle* RGVehicleList::addCustomVehicle(const QString &fileName, QString &errStr)
 {
-  QDir customVehicleDir = QDesktopServices::storageLocation(QDesktopServices::DataLocation) + "/vehicles";
+  QDir customVehicleDir = QStandardPaths::writableLocation(QStandardPaths::AppDataLocation)  + "/vehicles";
   if (!customVehicleDir.exists())
   {
     //It should have been created in constructor, so it's an error if this didn't succeed
diff --git a/src/RGViewWidget.h b/src/RGViewWidget.h
@@ -25,6 +25,8 @@
 #include <QGraphicsScene>
 #include <QGraphicsTextItem>
 #include <QTimer>
+#include <QMessageBox>
+#include <QProgressDialog>
 #include "RGRoute.h"
 
 class RGViewWidget : public QGraphicsView
diff --git a/src/google-maps-template.html b/src/google-maps-template.html
@@ -23,6 +23,11 @@
         };
         map = new google.maps.Map(document.getElementById('map_canvas'),
             myOptions);
+		map.addListener('center_changed', function(event) {
+			var center = map.getCenter();
+			window.map_latitude = center.lat();
+			window.map_longitude = center.lng();
+		});
       }
 
       google.maps.event.addDomListener(window, 'load', initialize);
diff --git a/src/googlemap.ui b/src/googlemap.ui
@@ -104,7 +104,7 @@ p, li { white-space: pre-wrap; }
       </property>
       <layout class="QGridLayout">
        <item row="0" column="0">
-        <widget class="QWebView" name="webView">
+        <widget class="QWebEngineView" name="webView">
          <property name="url">
           <url>
            <string>about:blank</string>
@@ -137,9 +137,9 @@ p, li { white-space: pre-wrap; }
  </widget>
  <customwidgets>
   <customwidget>
-   <class>QWebView</class>
+   <class>QWebEngineView</class>
    <extends>QWidget</extends>
-   <header>QtWebKit/QWebView</header>
+   <header>QWebEngineView</header>
   </customwidget>
  </customwidgets>
  <resources>
diff --git a/src/main.cpp b/src/main.cpp
@@ -24,6 +24,7 @@
 #include <QFile>
 #include <QFileDialog>
 
+#include "RGApplicationName.h"
 #include "RGMainWindow.h"
 
 /*
diff --git a/src/routegen.pro b/src/routegen.pro
@@ -10,7 +10,8 @@ INCLUDEPATH += .
 MOC_DIR = ./build/moc
 OBJECTS_DIR = ./build/obj
 UI_DIR = ./build/ui
-QT += webkit
+#QT += webkit
+QT += gui core webengine widgets webenginewidgets
 
 # Input
 HEADERS += RGMainWindow.h RGVehicleDialog.h RGSettings.h RGSettingsDialog.h RGGoogleMap.h \
@@ -27,7 +28,8 @@ HEADERS += RGMainWindow.h RGVehicleDialog.h RGSettings.h RGSettingsDialog.h RGGo
     RGEditPath.h \
     RGVehicleOriginPt.h \
     RGUndoRedo.h \
-    RGGraphicsObjectUndo.h
+    RGGraphicsObjectUndo.h \
+    RGApplicationName.h
 FORMS += routegen.ui settings.ui googlemap.ui \
     vehicledialog.ui \
     videosettings.ui \

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ RGEditPath::RGEditPath(QGraphicsItem *parent) :`
`29`	`29`	`{`
`30`	`30`	`setPos(0,0);`
`31`	`31`	`setCursor(Qt::CrossCursor);`
`32`		`- setAcceptsHoverEvents(true);`
	`32`	`+ setAcceptHoverEvents(true);`
`33`	`33`	`setFlag(QGraphicsItem::ItemHasNoContents);`
`34`	`34`	`}`
`35`	`35`
Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,8 @@`
`24`	`24`	`#include <QGraphicsObject>`
`25`	`25`	`#include <QPoint>`
`26`	`26`	`#include <QtGui>`
	`27`	`+#include <QGraphicsScene>`
	`28`	`+#include <QGraphicsSceneMouseEvent>`
`27`	`29`
`28`	`30`	`class RGEditPathPoint : public QGraphicsObject`
`29`	`31`	`{`
Original file line number	Diff line number	Diff line change
`@@ -23,8 +23,9 @@`
`23`	`23`
`24`	`24`	`#include <QObject>`
`25`	`25`	`#include <QProcess>`
`26`		`-#include <QMessageBox>`
	`26`	`+#include <QtWidgets/QMessageBox>`
`27`	`27`	`#include "ui_videosettings.h"`
	`28`	`+#include <QFileDialog>`
`28`	`29`
`29`	`30`	`class RGEncVideo : public QWidget`
`30`	`31`	`{`
Original file line number	Diff line number	Diff line change
`@@ -444,4 +444,4 @@ void RGMainWindow::initVideoEncoderFromSettings()`
`444`	`444`	`{`
`445`	`445`	`qDebug()<<"encoder found !";`
`446`	`446`	`}`
`447`		`-}`
	`447`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -136,7 +136,8 @@ bool RGVehicle::getMirror()`
`136`	`136`	`void RGVehicle::setMirror(bool mirror)`
`137`	`137`	`{`
`138`	`138`	`if(mMirror!=mirror)`
`139`		`- this->scale(-1,1);`
	`139`	`+ //this->scale(-1,1);`
	`140`	`+ this->setTransform(QTransform::fromScale(-1, 1), true);`
`140`	`141`	`mMirror=mirror;`
`141`	`142`	`}`
`142`	`143`
`@@ -168,13 +169,15 @@ void RGVehicle::setRotation(qreal angle)`
`168`	`169`	`if(angle<270 && angle>90){`
`169`	`170`	`if(mRotMirror==false){`
`170`	`171`	`mRotMirror=true;`
`171`		`- this->scale(-1,1);`
	`172`	`+ //this->scale(-1,1);`
	`173`	`+ this->setTransform(QTransform::fromScale(-1, 1), true);`
`172`	`174`	`}`
`173`	`175`	`angle=180-angle;`
`174`	`176`	`}`
`175`	`177`	`else if(mRotMirror==true){`
`176`	`178`	`mRotMirror=false;`
`177`		`- this->scale(-1,1);`
	`179`	`+ //this->scale(-1,1);`
	`180`	`+ this->setTransform(QTransform::fromScale(-1, 1), true);`
`178`	`181`	`}`
`179`	`182`	`if(mMirror) angle=-angle;`
`180`	`183`	`QGraphicsItem::setRotation(angle+mStartAngle);`