Index: cumulus/variomodedialog.cpp
===================================================================
--- a/cumulus/variomodedialog.cpp (revision 3782)
+++ b/cumulus/variomodedialog.cpp (working copy)
@@ -40,6 +40,7 @@
setObjectName("VarioModeDialog");
setModal(true);
setWindowTitle( tr("Set Variometer") );
+ setMinimumWidth(400);
hildonStyle = false;
Index: cumulus/calculator.cpp
===================================================================
--- a/cumulus/calculator.cpp (revision 3782)
+++ b/cumulus/calculator.cpp (working copy)
@@ -63,8 +63,8 @@
lastDistance=-1;
lastRequiredLD = -1.0;
lastCurrentLD = -1.0;
- _calculateLD = false;
- _calculateETA = false;
+ _calculateLD = true;
+ _calculateETA = true;
_calculateVario = true;
_calculateWind = true;
selectedWp=(wayPoint *) 0;
@@ -443,7 +443,7 @@
if ( selectedWp->taskPointType == TaskPointTypes::Landing && taskEndReached == false )
{
taskEndReached = true;
- emit taskInfo( tr("Task target reached"), true );
+ emit taskInfo( tr("At target"), true );
QString text = "
" +
tr("Task Target reached") +
@@ -467,7 +467,7 @@
{
// Announce task point touch only, if nearest switch scheme is
// chosen by the user to avoid to much info for him.
- emit taskInfo( tr("Taskpoint sector reached"), true );
+ emit taskInfo( tr("At sector"), true );
}
else
{
@@ -517,7 +517,7 @@
lastWp->origP == nextWp->origP ) )
{
- emit taskInfo( tr("Automatic taskpoint switch"), true );
+ emit taskInfo( tr("Auto TP"), true );
TPInfoWidget *tpInfo = new TPInfoWidget( _globalMainWindow );
tpInfo->prepareSwitchText( lastWp->taskPointIndex, dist2Next.getKilometers() );
Index: cumulus/generalconfig.cpp
===================================================================
--- a/cumulus/generalconfig.cpp (revision 3782)
+++ b/cumulus/generalconfig.cpp (working copy)
@@ -76,7 +76,7 @@
// Main window properties
beginGroup("MainWindow");
- _windowSize = value("Geometry", QSize(800, 480)).toSize();
+ _windowSize = value("Geometry", QSize(480, 630)).toSize();
_mapSideFrameColor = QColor( value("MapSideFrameColor", "#687ec6").toString() );
#ifndef MAEMO_QT
Index: cumulus/mapview.cpp
===================================================================
--- a/cumulus/mapview.cpp (revision 3782)
+++ b/cumulus/mapview.cpp (working copy)
@@ -72,12 +72,22 @@
topLayout->setSpacing(0);
//@JD: the new "sidebar" layout
- QBoxLayout *centerLayout = new QHBoxLayout;
+ QBoxLayout *centerLayout = new QVBoxLayout;
topLayout->addLayout(centerLayout);
topLayout->setStretchFactor( centerLayout, 1 );
centerLayout->setSpacing(0);
- QBoxLayout *sideLayout = new QVBoxLayout;
+ //--------------------------------------------------------------------
+ //layout for the map
+ QBoxLayout *MapLayout = new QHBoxLayout;
+ centerLayout->addLayout(MapLayout);
+ _theMap = new Map(this);
+ centerLayout->setStretchFactor( MapLayout, 1 );
+ MapLayout->addWidget(_theMap, 10);
+ _theMap->setMode(Map::headUp);
+
+
+ QBoxLayout *sideLayout = new QHBoxLayout;
centerLayout->addLayout(sideLayout);
sideLayout->setSpacing(0);
@@ -86,8 +96,8 @@
//widget to group waypoint functions
QWidget *wayBar = new QWidget( this );
- wayBar->setFixedWidth(216);
- wayBar->setContentsMargins(-9,-9,-9,-3);
+ wayBar->setFixedWidth(240);
+ wayBar->setContentsMargins(-9, -9, -9, -9);
wayBar->setAutoFillBackground(true);
wayBar->setBackgroundRole(QPalette::Window);
@@ -95,12 +105,13 @@
// vertical layout for waypoint widgets
QBoxLayout *wayLayout = new QVBoxLayout( wayBar );
- wayLayout->setSpacing(4);
+ wayLayout->setSpacing(0);
//add Waypoint widget (whole line)
_waypoint = new MapInfoBox( this, conf->getMapFrameColor().name() );
_waypoint->setPreText("To");
_waypoint->setValue("-");
+ _waypoint->setFixedHeight(40);
wayLayout->addWidget( _waypoint );
connect(_waypoint, SIGNAL(mousePress()),
(MainWindow*)parent, SLOT(slotSwitchToWPListViewExt()));
@@ -108,13 +119,13 @@
//layout for Glide Path and Relative Bearing
QBoxLayout *GRLayout = new QHBoxLayout;
wayLayout->addLayout(GRLayout);
- GRLayout->setSpacing(2);
+ GRLayout->setSpacing(0);
//add Glide Path widget
_glidepath = new MapInfoBox( this, conf->getMapFrameColor().name(), 42 );
_glidepath->setValue("-");
_glidepath->setPreText("Arr");
- _glidepath->setFixedHeight(60);
+ _glidepath->setFixedHeight(40);
GRLayout->addWidget( _glidepath );
connect(_glidepath, SIGNAL(mousePress()),
@@ -123,34 +134,36 @@
// add Relative Bearing widget
QPixmap arrow = _arrows.copy( 24*60+3, 3, 54, 54 );
_rel_bearing = new MapInfoBox( this, conf->getMapFrameColor().name(), arrow);
- _rel_bearing->setFixedSize(60,60);
+ _rel_bearing->setFixedSize(80,40);
_rel_bearing->setToolTip( tr("Click here to save current position as waypoint") );
- GRLayout->addWidget(_rel_bearing);
-// _rel_bearing->setPixmap( arrow );
connect(_rel_bearing, SIGNAL(mousePress()),
(MainWindow*)parent, SLOT(slotRememberWaypoint()) );
//layout for Distance/ETA and Bearing
- QBoxLayout *DEBLayout = new QHBoxLayout;
- wayLayout->addLayout(DEBLayout);
- DEBLayout->setSpacing(2);
+ QBoxLayout *DELayout = new QHBoxLayout;
+ wayLayout->addLayout(DELayout);
+ DELayout->setSpacing(0);
//add Distance widget
- _distance = new MapInfoBox( this, conf->getMapFrameColor().name() );
+ _distance = new MapInfoBox( this, "#cfcfcf" );
_distance->setPreText("Dis");
_distance->setValue("-");
- DEBLayout->addWidget( _distance);
- connect(_distance, SIGNAL(mousePress()), this, SLOT(slot_toggleDistanceEta()));
+ _distance->setFixedHeight(40);
+ DELayout->addWidget( _distance);
//add ETA widget
- _eta = new MapInfoBox( this, conf->getMapFrameColor().name() );
- _eta->hide();
+ _eta = new MapInfoBox( this, "#cfcfcf" );
+ //_eta->hide();
_eta->setPreText( "Eta" );
_eta->setValue("-");
- DEBLayout->addWidget( _eta );
- connect(_eta, SIGNAL(mousePress()), this, SLOT(slot_toggleDistanceEta()));
+ _eta->setFixedHeight(40);
+ DELayout->addWidget( _eta );
+ QBoxLayout *BRBLayout = new QHBoxLayout;
+ wayLayout->addLayout(BRBLayout);
+ BRBLayout->setSpacing(0);
+
//add Bearing widget
_bearingMode = 1; // normal bearing display is default
_lastBearing = -1;
@@ -161,35 +174,40 @@
_bearingBGColor = wayBar->palette().color(QPalette::Window);
_bearing->setValue("-");
_bearing->setPreText("Brg");
- DEBLayout->addWidget( _bearing);
+ _bearing->setFixedHeight(40);
+ BRBLayout->addWidget( _bearing);
connect(_bearing, SIGNAL(mousePress()), this, SLOT(slot_toggleBearing()));
+ BRBLayout->addWidget(_rel_bearing);
+
sideLayout->addWidget( wayBar, 3 );
//widget to group common displays
QWidget *commonBar = new QWidget( this );
- commonBar->setFixedWidth(216);
- commonBar->setContentsMargins( -9, -3, -9, -3);
+ commonBar->setContentsMargins(-9, -9, -9, -9);
+ commonBar->setFixedWidth(240);
// vertical layout for common display widgets
QBoxLayout *commonLayout = new QVBoxLayout( commonBar );
- commonLayout->setSpacing(4);
+ commonLayout->setSpacing(0);
//layout for Speed and Heading
QBoxLayout *SHLayout = new QHBoxLayout;
commonLayout->addLayout(SHLayout);
- SHLayout->setSpacing(2);
+ SHLayout->setSpacing(0);
//add Speed widget
_speed = new MapInfoBox( this, "#cfcfcf" );
_speed->setPreText("Gs");
_speed->setValue("-");
+ _speed->setFixedHeight(40);
SHLayout->addWidget( _speed);
//add Heading widget
_heading = new MapInfoBox( this, "#cfcfcf" );
_heading->setPreText("Trk");
_heading->setValue("-");
+ _heading->setFixedHeight(40);
SHLayout->addWidget( _heading);
@@ -198,29 +216,30 @@
commonLayout->addLayout(WLLayout);
//add Wind widget; this is head/tailwind, no direction given !
- _wind = new MapInfoBox( this, conf->getMapFrameColor().name() );
+ _wind = new MapInfoBox( this, "#cfcfcf" );
_wind->setPreText("Wd");
_wind->setValue("-");
+ _wind->setFixedHeight(40);
WLLayout->addWidget(_wind );
- connect(_wind, SIGNAL(mousePress()), this, SLOT(slot_toggleWindAndLD()));
//add LD widget
- _ld = new MapInfoBox( this, conf->getMapFrameColor().name() );
- _ld->hide();
+ _ld = new MapInfoBox( this, "#cfcfcf" );
+ //_ld->hide();
_ld->setPreText( "LD" );
_ld->setValue("-/-");
+ _ld->setFixedHeight(40);
WLLayout->addWidget( _ld );
- connect(_ld, SIGNAL(mousePress()), this, SLOT(slot_toggleWindAndLD()));
-
+
//layout for Vario and Altitude
QBoxLayout *VALayout = new QHBoxLayout;
commonLayout->addLayout(VALayout);
- VALayout->setSpacing(2);
+ VALayout->setSpacing(0);
//add Vario widget
_vario = new MapInfoBox( this, conf->getMapFrameColor().name(), 38, true );
_vario->setPreText("Var");
_vario->setValue("-");
+ _vario->setFixedHeight(40);
VALayout->addWidget(_vario, 2 );
connect(_vario, SIGNAL(mousePress()),
this, SLOT(slot_VarioDialog()));
@@ -228,6 +247,7 @@
_altitude = new MapInfoBox( this, conf->getMapFrameColor().name() );
_altitude->setPreText(AltimeterModeDialog::mode2String()); // get current mode
_altitude->setValue("-");
+ _altitude->setFixedHeight(40);
VALayout->addWidget( _altitude, 3 );
connect(_altitude, SIGNAL(mousePress()),
this, SLOT(slot_AltimeterDialog()));
@@ -237,7 +257,7 @@
//widget to group McCready functions
QWidget *mcBar = new QWidget( this );
mcBar->setFixedWidth(216);
- mcBar->setContentsMargins(-9,-3,-9,-9);
+ mcBar->setContentsMargins(-9,-9,-9,-9);
mcBar->setAutoFillBackground(true);
mcBar->setBackgroundRole(QPalette::Window);
@@ -245,12 +265,13 @@
//layout for McCready and Best Speed
QBoxLayout *MSLayout = new QHBoxLayout(mcBar);
- MSLayout->setSpacing(2);
+ MSLayout->setSpacing(0);
//add McCready widget
_mc = new MapInfoBox( this, conf->getMapFrameColor().name() );
_mc->setPreText("Mc");
_mc->setValue("0.0");
+ _mc->setFixedHeight(40);
MSLayout->addWidget( _mc );
connect(_mc, SIGNAL(mousePress()), this, SLOT(slot_gliderFlightDialog()));
@@ -258,25 +279,17 @@
_speed2fly = new MapInfoBox( this, "#a6a6a6" );
_speed2fly->setPreText("S2f");
_speed2fly->setValue("-");
+ _speed2fly->setFixedHeight(40);
MSLayout->addWidget( _speed2fly );
- sideLayout->addWidget( mcBar, 1 );
+ commonLayout->addWidget( mcBar, 1 );
//--------------------------------------------------------------------
- //layout for the map
- QBoxLayout *MapLayout = new QHBoxLayout;
- centerLayout->addLayout(MapLayout);
- _theMap = new Map(this);
- centerLayout->setStretchFactor( MapLayout, 1 );
- MapLayout->addWidget(_theMap, 10);
- _theMap->setMode(Map::headUp);
-
- //--------------------------------------------------------------------
// Status bar
_statusbar = new QStatusBar(this);
_statusbar->setObjectName("status");
_statusbar->setSizeGripEnabled(false);
- _statusbar->setFixedHeight(20);
+ _statusbar->setFixedSize(480, 40);
QFont font = _statusbar->font();
font.setBold(true);
font.setPixelSize(13);
@@ -293,7 +306,7 @@
connect(_menuToggle, SIGNAL(mousePress()), (MainWindow*)parent, SLOT(slotToggleMenu()));
#endif
- _statusGps = new CuLabel(tr("Man"),_statusbar);
+ _statusGps = new CuLabel(tr("M"),_statusbar);
_statusGps->setLineWidth(0);
_statusGps->setAlignment(Qt::AlignCenter);
_statusGps->setMargin(0);
@@ -315,12 +328,6 @@
_statusPosition->setMargin(0);
_statusbar->addWidget(_statusPosition);
- _statusGlider = new QLabel(_statusbar);
- _statusGlider->setLineWidth(0);
- _statusGlider->setAlignment(Qt::AlignCenter);
- _statusGlider->setMargin(0);
- _statusbar->addWidget(_statusGlider);
-
_statusWarning = new QLabel(_statusbar);
_statusWarning->setAlignment(Qt::AlignCenter);
_statusWarning->setMargin(0);
@@ -540,8 +547,10 @@
if(!calculator->isManualInFlight() ||
(calculator->isManualInFlight() && (source == Calculator::MAN)))
{
- _statusPosition->setText(" " + WGSPoint::printPos(position.x(),true) +
- " / " + WGSPoint::printPos(position.y(),false) + " ");
+ QString str = WGSPoint::printPos(position.x(),true) +
+ "/" + WGSPoint::printPos(position.y(),false);
+ str.remove(" ");
+ _statusPosition->setText(str);
}
// remember for slot_settingsChange
@@ -554,11 +563,11 @@
{
if(status>GpsNmea::notConnected)
{
- _statusGps->setText(tr("GPS"));
+ _statusGps->setText(tr("G"));
}
else
{
- _statusGps->setText(tr("Man"));
+ _statusGps->setText(tr("M"));
_heading->setValue("-");
_speed->setValue("-");
_altitude->setValue("-");
@@ -697,7 +706,7 @@
*/
void MapView::slot_glider( const QString& glider )
{
- _statusGlider->setText( glider );
+ //_statusGlider->setText( glider ); //take up too much room
if( glider.isNull() )
{
Index: cumulus/splash.cpp
===================================================================
--- a/cumulus/splash.cpp (revision 3782)
+++ b/cumulus/splash.cpp (working copy)
@@ -34,7 +34,7 @@
}
else
{
- resize( 800, 480 );
+ resize( 480, 630 );
}
// load background picture
Index: cumulus/gliderflightdialog.cpp
===================================================================
--- a/cumulus/gliderflightdialog.cpp (revision 3782)
+++ b/cumulus/gliderflightdialog.cpp (working copy)
@@ -41,6 +41,7 @@
setObjectName("GliderFlightDialog");
setModal(true);
setWindowTitle (tr("Set Flight Parameters"));
+ setMinimumWidth(400);
hildonStyle = false;