From 78fee704501e2d95b4e2c3c19b17305ab952a9af Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Mon, 4 Aug 2014 22:45:17 -0700 Subject: Correctly remove the Close button from most message widgets The only time we want the close button is when showing an error at the bottom of the main window. In the other cases (maintab, globe) we need to explicitly hide it. Signed-off-by: Dirk Hohndel --- qt-ui/globe.cpp | 1 + qt-ui/kmessagewidget.cpp | 2 +- qt-ui/maintab.cpp | 4 ++++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/qt-ui/globe.cpp b/qt-ui/globe.cpp index 8af76ac2a..b9bbf2dde 100644 --- a/qt-ui/globe.cpp +++ b/qt-ui/globe.cpp @@ -287,6 +287,7 @@ void GlobeGPS::prepareForGetDiveCoordinates() messageWidget->setMessageType(KMessageWidget::Warning); messageWidget->setText(QObject::tr("Move the map and double-click to set the dive location")); messageWidget->setWordWrap(true); + messageWidget->setCloseButtonVisible(false); messageWidget->animatedShow(); editingDiveLocation = true; if (!dive_has_gps_location(current_dive)) diff --git a/qt-ui/kmessagewidget.cpp b/qt-ui/kmessagewidget.cpp index e03d10c75..fc733c02d 100644 --- a/qt-ui/kmessagewidget.cpp +++ b/qt-ui/kmessagewidget.cpp @@ -61,7 +61,7 @@ void KMessageWidgetPrivate::init(KMessageWidget *q_ptr) closeButton = new QToolButton(content); closeButton->setAutoRaise(true); closeButton->setDefaultAction(closeAction); - + closeButton->setVisible(false); q->setMessageType(KMessageWidget::Information); } diff --git a/qt-ui/maintab.cpp b/qt-ui/maintab.cpp index 652e8242e..c704f5516 100644 --- a/qt-ui/maintab.cpp +++ b/qt-ui/maintab.cpp @@ -227,6 +227,10 @@ void MainTab::closeMessage() void MainTab::displayMessage(QString str) { + ui.diveNotesMessage->setCloseButtonVisible(false); + ui.diveEquipmentMessage->setCloseButtonVisible(false); + ui.diveInfoMessage->setCloseButtonVisible(false); + ui.diveStatisticsMessage->setCloseButtonVisible(false); ui.diveNotesMessage->setText(str); ui.diveNotesMessage->animatedShow(); ui.diveEquipmentMessage->setText(str); -- cgit v1.2.3-70-g09d2