nmelone/GoldenCheetah
1
0
Fork 0
mirror of https://github.com/GoldenCheetah/GoldenCheetah.git synced 2026-02-15 17:09:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

QT5 -- 1 of 3

Browse Source 
Porting the codebase to QT 5 (5.2) to get the
latest bug fixes, performance and improved platform
support.

This first part is to fixup the codebase to compile
on Qt 5, but some aspects have been broken (video).

The second part is to migrate from Qwt 6.0.1 to the
latest Qwt for multiaxis support.

The third part will be to fixup any platform specific
issues or issues identified at runtime.
This commit is contained in:
Mark Liversedge
2013-12-09 09:57:13 +00:00
parent 2d9e71b500
commit aa8605e8d5
186 changed files with 552 additions and 313 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/AllPlotWindow.cpp
View File

@@ -45,7 +45,8 @@
// span slider specials
#include <qxtspanslider.h>
#include <QCleanlooksStyle>
#include <QStyleFactory>
#include <QStyle>
// tooltip
#include "LTMWindow.h"
@@ -56,8 +57,6 @@
AllPlotWindow::AllPlotWindow(Context *context) :
GcChartWindow(context), current(NULL), context(context), active(false), stale(true), setupStack(false)
{
setInstanceName("Ride Plot Window");
QWidget *c = new QWidget;
QVBoxLayout *clv = new QVBoxLayout(c);
QHBoxLayout *cl = new QHBoxLayout;
@@ -230,7 +229,6 @@ AllPlotWindow::AllPlotWindow(Context *context) :
palette.setBrush(QPalette::Background, QBrush(GColor(CRIDEPLOTBACKGROUND)));
allPlot = new AllPlot(this, context);
allPlot->setInstanceName("allPlot");
allPlot->setContentsMargins(0,0,0,0);
//allPlot->axisWidget(QwtPlot::yLeft)->installEventFilter(this);
@@ -355,14 +353,13 @@ AllPlotWindow::AllPlotWindow(Context *context) :
// BUG in QMacStyle and painting of spanSlider
// so we use a plain style to avoid it, but only
// on a MAC, since win and linux are fine
QCleanlooksStyle *style = new QCleanlooksStyle();
QStyle *style = QStyleFactory::create("fusion");
spanSlider->setStyle(style);
scrollLeft->setStyle(style);
scrollRight->setStyle(style);
#endif
fullPlot = new AllPlot(this, context);
fullPlot->setInstanceName("fullPlot");
fullPlot->grid->enableY(false);
fullPlot->setFixedHeight(100);
fullPlot->setCanvasBackground(GColor(CRIDEPLOTBACKGROUND));
@@ -1702,7 +1699,6 @@ AllPlotWindow::setupStackPlots()
// create that plot
AllPlot *_allPlot = new AllPlot(this, context);
_allPlot->setInstanceName("stackPlot");
_allPlot->setAutoFillBackground(false);
_allPlot->setPalette(palette);