diff -Nru fgx-2.8.0~1027+git9929238/README.rst fgx-2.8.0~1029+git46d4c7f/README.rst --- fgx-2.8.0~1027+git9929238/README.rst 2013-11-14 16:09:11.000000000 +0000 +++ fgx-2.8.0~1029+git46d4c7f/README.rst 2013-11-16 14:00:05.000000000 +0000 @@ -3,10 +3,7 @@ **Free & Open Source XPlatform Launcher For FlightGear** -* Version 2.8.x -* Version -.. include:: version - :literal: +* Version 2.8.x - see Build Status -------------------------- diff -Nru fgx-2.8.0~1027+git9929238/debian/changelog fgx-2.8.0~1029+git46d4c7f/debian/changelog --- fgx-2.8.0~1027+git9929238/debian/changelog 2013-11-14 17:10:51.000000000 +0000 +++ fgx-2.8.0~1029+git46d4c7f/debian/changelog 2013-11-16 14:00:09.000000000 +0000 @@ -1,3 +1,13 @@ +fgx (2.8.0~1029+git46d4c7f-0ubuntu1~ppa1~trusty1) trusty; urgency=low + + [ Pedro ] + * clean up readme + * Found bug in openlayerswidget thats crashed on startup, updated urls + + [ Saikrishna Arcot ] + + -- Saikrishna Arcot Sat, 16 Nov 2013 09:00:08 -0500 + fgx (2.8.0~1027+git9929238-0ubuntu1~ppa2~trusty1) trusty; urgency=low * Add pkg-config dependency diff -Nru fgx-2.8.0~1027+git9929238/debian/rules fgx-2.8.0~1029+git46d4c7f/debian/rules --- fgx-2.8.0~1027+git9929238/debian/rules 2013-11-13 03:55:45.000000000 +0000 +++ fgx-2.8.0~1029+git46d4c7f/debian/rules 2013-11-14 17:20:43.000000000 +0000 @@ -9,6 +9,11 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) + NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) + MAKEFLAGS += -j$(NUMJOBS) +endif + build: build-stamp build-stamp: @@ -16,7 +21,7 @@ mkdir -p builddir cd builddir && qmake-qt4 SYSTEM_ZLIB="ON" ../src/fgx.pro - cd builddir && $(MAKE) + cd builddir && $(MAKE) $(MAKEFLAGS) touch $@ diff -Nru fgx-2.8.0~1027+git9929238/src/airports/airportswidget.cpp fgx-2.8.0~1029+git46d4c7f/src/airports/airportswidget.cpp --- fgx-2.8.0~1027+git9929238/src/airports/airportswidget.cpp 2013-11-14 16:09:11.000000000 +0000 +++ fgx-2.8.0~1029+git46d4c7f/src/airports/airportswidget.cpp 2013-11-16 14:00:05.000000000 +0000 @@ -376,7 +376,7 @@ mapWidget = new OpenLayerWidget(mainObject); mapWidget->setMinimumWidth(400); mainLayout->addWidget(mapWidget); - mapWidget->load_map("airport"); + mapWidget->load_map("airport"); connect(mapWidget, SIGNAL(map_double_clicked(QString,QString, QString)), this, SLOT(on_map_double_clicked(QString, QString, QString))); diff -Nru fgx-2.8.0~1027+git9929238/src/launcher/menuwidget.cpp fgx-2.8.0~1029+git46d4c7f/src/launcher/menuwidget.cpp --- fgx-2.8.0~1027+git9929238/src/launcher/menuwidget.cpp 2013-11-10 03:04:02.000000000 +0000 +++ fgx-2.8.0~1029+git46d4c7f/src/launcher/menuwidget.cpp 2013-11-16 14:00:05.000000000 +0000 @@ -100,17 +100,18 @@ defaultProfileAction->setStatusTip(tr("Reload FGx default profile (built-in)")); connect(defaultProfileAction, SIGNAL(triggered()), this, SLOT(on_menu_default_profile())); + //======================================= // Menu FlightGear Help actions - urlActionWiki = new QAction(tr("FlightGear Wiki"), this); connect(urlActionWiki, SIGNAL(triggered()), this, SLOT(on_menu_url_wiki())); urlActionForums = new QAction(tr("FlightGear Forums"), this); connect(urlActionForums, SIGNAL(triggered()), this, SLOT(on_menu_url_forums())); + //======================================= // Menu FGx Help actions - urlActionFGxUserHelp = new QAction(tr("FGx User Forums"), this); + urlActionFGxUserHelp = new QAction(tr("FGx - User Forum"), this); connect(urlActionFGxUserHelp, SIGNAL(triggered()), this, SLOT(on_menu_fgx_user_forums())); // Add actions to menu "FGx"/"Windows" (OSX = "Windows") @@ -131,7 +132,9 @@ // Add actions to menu "Help" helpFlightGearGroup->addAction(urlActionWiki); helpFlightGearGroup->addAction(urlActionForums); - helpFGxGroup->addAction(urlActionFGxUserHelp); + helpFGxGroup->addAction("FGx - Source code and Bugs at github", this, SLOT(on_menu_fgx_github()) ); + helpFGxGroup->addAction(urlActionFGxUserHelp); + helpMenu->addMenu(helpFlightGearGroup); helpMenu->addMenu(helpFGxGroup); @@ -260,12 +263,16 @@ void MenuWidget::on_menu_url_forums() { - QUrl url("http://www.flightgear.org/forums"); + QUrl url("http://forum.flightgear.org/"); QDesktopServices::openUrl( url ); } void MenuWidget::on_menu_fgx_user_forums() { - QUrl url("http://www.flightgear.org/forums/viewforum.php?f=65"); - QDesktopServices::openUrl( url ); -} \ No newline at end of file + QUrl url("http://forum.flightgear.org/viewforum.php?f=65"); + QDesktopServices::openUrl( url ); +} + +void MenuWidget::on_menu_fgx_github(){ + QDesktopServices::openUrl( QUrl("https://github.com/fgx/fgx") ); +} diff -Nru fgx-2.8.0~1027+git9929238/src/launcher/menuwidget.h fgx-2.8.0~1029+git46d4c7f/src/launcher/menuwidget.h --- fgx-2.8.0~1027+git9929238/src/launcher/menuwidget.h 2013-11-14 16:09:11.000000000 +0000 +++ fgx-2.8.0~1029+git46d4c7f/src/launcher/menuwidget.h 2013-11-16 14:00:05.000000000 +0000 @@ -88,7 +88,7 @@ void on_menu_url_wiki(); void on_menu_url_forums(); void on_menu_fgx_user_forums(); - + void on_menu_fgx_github(); }; #endif // XMENUWIDGET_H diff -Nru fgx-2.8.0~1027+git9929238/src/map/openlayerwidget.cpp fgx-2.8.0~1029+git46d4c7f/src/map/openlayerwidget.cpp --- fgx-2.8.0~1027+git9929238/src/map/openlayerwidget.cpp 2013-11-14 16:09:11.000000000 +0000 +++ fgx-2.8.0~1029+git46d4c7f/src/map/openlayerwidget.cpp 2013-11-16 14:00:05.000000000 +0000 @@ -301,13 +301,15 @@ void OpenLayerWidget::load_map(QString m_typ) { this->map_type = m_typ; - QFile file(":/openlayers/map.html"); + QFile file(":/openlayers/map.html"); if (!file.open(QIODevice::ReadOnly | QIODevice::Text)){ - //qDebug() << "MAP: could not open file" << file.fileName(); + qDebug() << "MAP: could not open file" << file.fileName(); return; } + QByteArray contents = file.readAll(); - webView->setHtml(contents, QUrl("qrc:///")); // This prefix does not work with src:///openlayers/ .. help.. Geoff.. gral.? + // @TODO: This stuff id dodgy and "qrc:///" caused seg fault - pete + webView->setHtml(contents, QUrl("qrc://")); // This prefix does not work with src:///openlayers/ .. help.. Geoff.. gral.? webView->page()->mainFrame()->addToJavaScriptWindowObject("Qt", this); webView->settings()->setAttribute(QWebSettings::DeveloperExtrasEnabled, mainObject->debug_mode);