mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Work around QMessageBox not showing its title on Mac

Browse source 
This is a bit hacky and simply adds the title to the message text when
compiling on a Mac, but hopefully this will be enough.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2013-11-21 04:23:10 -08:00
parent 8aadd4d372
commit 995192c5fb
6 changed files with 18 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
helpers.h
View file

@ -35,4 +35,9 @@ QString get_trip_date_string(timestamp_t when, int nr);
extern DiveComputerList dcList; extern DiveComputerList dcList;
#if defined __APPLE__
#define TITLE_OR_TEXT(_t,_m) "", _t + "\n" + _m
#else
#define TITLE_OR_TEXT(_t,_m) _t, _m
#endif
#endif /* HELPER_H */ #endif /* HELPER_H */

4
qt-ui/divecomputermanagementdialog.cpp
View file

@ -42,9 +42,9 @@ void DiveComputerManagementDialog::tryRemove(const QModelIndex& index)
return; return;
QMessageBox::StandardButton response = QMessageBox::question( QMessageBox::StandardButton response = QMessageBox::question(
this, this, TITLE_OR_TEXT(
tr("Remove the selected Dive Computer?"), tr("Remove the selected Dive Computer?"),
tr("Are you sure that you want to \n remove the selected dive computer?"), tr("Are you sure that you want to \n remove the selected dive computer?")),
QMessageBox::Ok | QMessageBox::Cancel QMessageBox::Ok | QMessageBox::Cancel
); );

4
qt-ui/diveplanner.cpp
View file

@ -1272,8 +1272,8 @@ struct diveplan DivePlannerPointsModel::getDiveplan()
void DivePlannerPointsModel::cancelPlan() void DivePlannerPointsModel::cancelPlan()
{ {
if (mode == PLAN && rowCount()) { if (mode == PLAN && rowCount()) {
if (QMessageBox::warning(mainWindow(), tr("Discard the Plan?"), if (QMessageBox::warning(mainWindow(), TITLE_OR_TEXT(tr("Discard the Plan?"),
tr("You are about to discard your plan."), tr("You are about to discard your plan.")),
QMessageBox::Discard | QMessageBox::Cancel, QMessageBox::Discard) != QMessageBox::Discard) { QMessageBox::Discard | QMessageBox::Cancel, QMessageBox::Discard) != QMessageBox::Discard) {
return; return;
} }

2
qt-ui/downloadfromdivecomputer.cpp
View file

@ -137,7 +137,7 @@ void DownloadFromDCWidget::updateState(states state)
// got an error // got an error
else if (state == ERROR) { else if (state == ERROR) {
QMessageBox::critical(this, tr("Error"), this->thread->error, QMessageBox::Ok); QMessageBox::critical(this, TITLE_OR_TEXT(tr("Error"), this->thread->error), QMessageBox::Ok);
markChildrenAsEnabled(); markChildrenAsEnabled();
ui.progressBar->hide(); ui.progressBar->hide();

8
qt-ui/models.cpp
View file

@ -385,10 +385,10 @@ void CylindersModel::remove(const QModelIndex& index)
} }
cylinder_t *cyl = &current->cylinder[index.row()]; cylinder_t *cyl = &current->cylinder[index.row()];
if (DivePlannerPointsModel::instance()->tankInUse(cyl->gasmix.o2.permille, cyl->gasmix.he.permille)) { if (DivePlannerPointsModel::instance()->tankInUse(cyl->gasmix.o2.permille, cyl->gasmix.he.permille)) {
QMessageBox::warning(mainWindow(), QMessageBox::warning(mainWindow(), TITLE_OR_TEXT(
tr("Cylinder cannot be removed"), tr("Cylinder cannot be removed"),
tr("This gas in use. Only cylinders that are not used in the dive can be removed."), tr("This gas in use. Only cylinders that are not used in the dive can be removed.")),
QMessageBox::Ok); QMessageBox::Ok);
return; return;
} }
beginRemoveRows(QModelIndex(), index.row(), index.row()); // yah, know, ugly. beginRemoveRows(QModelIndex(), index.row(), index.row()); // yah, know, ugly.

8
qt-ui/profilegraphics.cpp
View file

@ -182,9 +182,9 @@ void ProfileGraphicsView::hideEvents()
EventItem *item = static_cast<EventItem*>(action->data().value<void*>()); EventItem *item = static_cast<EventItem*>(action->data().value<void*>());
struct event *event = item->ev; struct event *event = item->ev;
if (QMessageBox::question(mainWindow(), if (QMessageBox::question(mainWindow(), TITLE_OR_TEXT(
tr("Hide events"), tr("Hide events"),
tr("Hide all %1 events?").arg(event->name), tr("Hide all %1 events?").arg(event->name)),
QMessageBox::Ok | QMessageBox::Cancel) == QMessageBox::Ok){ QMessageBox::Ok | QMessageBox::Cancel) == QMessageBox::Ok){
if (event->name) { if (event->name) {
for (int i = 0; i < evn_used; i++) { for (int i = 0; i < evn_used; i++) {
@ -204,11 +204,11 @@ void ProfileGraphicsView::removeEvent()
EventItem *item = static_cast<EventItem*>(action->data().value<void*>()); EventItem *item = static_cast<EventItem*>(action->data().value<void*>());
struct event *event = item->ev; struct event *event = item->ev;
if (QMessageBox::question(mainWindow(), if (QMessageBox::question(mainWindow(), TITLE_OR_TEXT(
tr("Remove the selected event?"), tr("Remove the selected event?"),
tr("%1 @ %2:%3").arg(event->name) tr("%1 @ %2:%3").arg(event->name)
.arg(event->time.seconds / 60) .arg(event->time.seconds / 60)
.arg(event->time.seconds % 60, 2, 10, QChar('0')), .arg(event->time.seconds % 60, 2, 10, QChar('0'))),
QMessageBox::Ok | QMessageBox::Cancel) == QMessageBox::Ok){ QMessageBox::Ok | QMessageBox::Cancel) == QMessageBox::Ok){
struct event **ep = &current_dc->events; struct event **ep = &current_dc->events;
while (ep && *ep != event) while (ep && *ep != event)