diff options
| -rw-r--r-- | qt-ui/globe.cpp | 6 | ||||
| -rw-r--r-- | qt-ui/kmessagewidget.cpp | 10 | ||||
| -rw-r--r-- | qt-ui/mainwindow.cpp | 1 |
3 files changed, 10 insertions, 7 deletions
diff --git a/qt-ui/globe.cpp b/qt-ui/globe.cpp index 43763e338..56c99849c 100644 --- a/qt-ui/globe.cpp +++ b/qt-ui/globe.cpp @@ -15,17 +15,19 @@ GlobeGPS::GlobeGPS(QWidget* parent) : MarbleWidget(parent), loadedDives(0) { + setMapThemeId("earth/bluemarble/bluemarble.dgml"); + //setMapThemeId("earth/openstreetmap/openstreetmap.dgml"); setProjection( Marble::Spherical ); setAnimationsEnabled(true); setShowClouds( false ); setShowBorders( false ); - setShowPlaces( false ); + setShowPlaces( true ); setShowCrosshairs( false ); setShowGrid( false ); setShowOverviewMap(false); - setShowScaleBar(false); + setShowScaleBar(true); Q_FOREACH( AbstractFloatItem * floatItem, floatItems() ){ if ( floatItem && floatItem->nameId() == "compass" ) { diff --git a/qt-ui/kmessagewidget.cpp b/qt-ui/kmessagewidget.cpp index 653d52f4f..dc200654e 100644 --- a/qt-ui/kmessagewidget.cpp +++ b/qt-ui/kmessagewidget.cpp @@ -217,22 +217,22 @@ void KMessageWidget::setMessageType(KMessageWidget::MessageType type) switch (type) { case Positive: - bg1 = QColor(Qt::green); + bg1 = QColor("#72D594"); // nice green fg = QColor(Qt::white); break; case Information: - bg1 = QColor(Qt::blue); + bg1 = QColor("#41A8E3"); // nice blue fg = QColor(Qt::black); break; case Warning: - bg1 = QColor(Qt::yellow); + bg1 = QColor("#72D594"); // nice yellow fg = QColor(Qt::black); break; case Error: - bg1 = QColor(Qt::red); + bg1 = QColor("#E4B7B7"); // nice red. fg = QColor(Qt::black); break; } @@ -240,7 +240,7 @@ void KMessageWidget::setMessageType(KMessageWidget::MessageType type) // Colors bg0 = bg1.lighter(110); bg2 = bg1.darker(110); - border = QColor(Qt::black); + border = bg2.darker(110); d->content->setStyleSheet( QString(".QFrame {" "background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1," diff --git a/qt-ui/mainwindow.cpp b/qt-ui/mainwindow.cpp index e5cf5ed37..1eb741244 100644 --- a/qt-ui/mainwindow.cpp +++ b/qt-ui/mainwindow.cpp @@ -34,6 +34,7 @@ MainWindow::MainWindow() : ui(new Ui::MainWindow()) connect(ui->ListWidget, SIGNAL(currentDiveChanged(int)), this, SLOT(current_dive_changed(int))); ui->globeMessage->hide(); ui->globe->setMessageWidget(ui->globeMessage); + ui->globeMessage->setCloseButtonVisible(false); ui->ProfileWidget->setFocusProxy(ui->ListWidget); ui->ListWidget->reload(); ui->ListWidget->setFocus(); |