mirror of
https://github.com/subsurface/subsurface.git
synced 2024-11-28 13:10:19 +00:00
7d0cc6b337
In commit 85fab31c71fc ("Shift times of selected dives") we added a dialog
that didn't align its content very well. This change improves the layout
(I hope) and makes the labels in the layout clearer (earlier and later seem
easier to correlate with the direction of the shift).
The original commit also forgets to deal with the consequences of shifting
the dives. The dive list needs to be re-sorted (as the relative order of
dives could have changed) and be marked as changed. And we should try to
maintain the selection across these operations.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
168 lines
4 KiB
C++
168 lines
4 KiB
C++
#include "simplewidgets.h"
|
|
|
|
#include <QLabel>
|
|
#include <QLabel>
|
|
#include <QFormLayout>
|
|
#include <QIcon>
|
|
#include <QAbstractButton>
|
|
#include <QSpinBox>
|
|
#include <QButtonGroup>
|
|
#include <QDebug>
|
|
#include <QProcess>
|
|
#include <QStringList>
|
|
#include <QDebug>
|
|
|
|
#include "../dive.h"
|
|
#include "mainwindow.h"
|
|
|
|
class MinMaxAvgWidgetPrivate{
|
|
public:
|
|
QLabel *avgIco, *avgValue;
|
|
QLabel *minIco, *minValue;
|
|
QLabel *maxIco, *maxValue;
|
|
|
|
MinMaxAvgWidgetPrivate(MinMaxAvgWidget *owner){
|
|
avgIco = new QLabel(owner);
|
|
avgIco->setPixmap(QIcon(":/average").pixmap(16,16));
|
|
avgIco->setToolTip(QObject::tr("Average"));
|
|
minIco = new QLabel(owner);
|
|
minIco->setPixmap(QIcon(":/minimum").pixmap(16,16));
|
|
minIco->setToolTip(QObject::tr("Minimum"));
|
|
maxIco = new QLabel(owner);
|
|
maxIco->setPixmap(QIcon(":/maximum").pixmap(16,16));
|
|
maxIco->setToolTip(QObject::tr("Maximum"));
|
|
avgValue = new QLabel(owner);
|
|
minValue = new QLabel(owner);
|
|
maxValue = new QLabel(owner);
|
|
|
|
QGridLayout *formLayout = new QGridLayout();
|
|
formLayout->addWidget(maxIco, 0, 0);
|
|
formLayout->addWidget(maxValue, 0, 1);
|
|
formLayout->addWidget(avgIco, 1, 0);
|
|
formLayout->addWidget(avgValue, 1, 1);
|
|
formLayout->addWidget(minIco, 2, 0);
|
|
formLayout->addWidget(minValue, 2, 1);
|
|
owner->setLayout(formLayout);
|
|
}
|
|
};
|
|
|
|
double MinMaxAvgWidget::average() const
|
|
{
|
|
return d->avgValue->text().toDouble();
|
|
}
|
|
|
|
double MinMaxAvgWidget::maximum() const
|
|
{
|
|
return d->maxValue->text().toDouble();
|
|
}
|
|
double MinMaxAvgWidget::minimum() const
|
|
{
|
|
return d->minValue->text().toDouble();
|
|
}
|
|
|
|
MinMaxAvgWidget::MinMaxAvgWidget(QWidget* parent)
|
|
: d(new MinMaxAvgWidgetPrivate(this)){
|
|
}
|
|
|
|
void MinMaxAvgWidget::clear()
|
|
{
|
|
d->avgValue->setText(QString());
|
|
d->maxValue->setText(QString());
|
|
d->minValue->setText(QString());
|
|
}
|
|
|
|
void MinMaxAvgWidget::setAverage(double average)
|
|
{
|
|
d->avgValue->setText(QString::number(average));
|
|
}
|
|
|
|
void MinMaxAvgWidget::setMaximum(double maximum)
|
|
{
|
|
d->maxValue->setText(QString::number(maximum));
|
|
}
|
|
void MinMaxAvgWidget::setMinimum(double minimum)
|
|
{
|
|
d->minValue->setText(QString::number(minimum));
|
|
}
|
|
|
|
void MinMaxAvgWidget::setAverage(const QString& average)
|
|
{
|
|
d->avgValue->setText(average);
|
|
}
|
|
|
|
void MinMaxAvgWidget::setMaximum(const QString& maximum)
|
|
{
|
|
d->maxValue->setText(maximum);
|
|
}
|
|
|
|
void MinMaxAvgWidget::setMinimum(const QString& minimum)
|
|
{
|
|
d->minValue->setText(minimum);
|
|
}
|
|
|
|
RenumberDialog* RenumberDialog::instance()
|
|
{
|
|
static RenumberDialog* self = new RenumberDialog();
|
|
return self;
|
|
}
|
|
|
|
void RenumberDialog::buttonClicked(QAbstractButton* button)
|
|
{
|
|
if (ui.buttonBox->buttonRole(button) == QDialogButtonBox::AcceptRole){
|
|
qDebug() << "Renumbering.";
|
|
renumber_dives(ui.spinBox->value());
|
|
}
|
|
}
|
|
|
|
RenumberDialog::RenumberDialog(): QDialog()
|
|
{
|
|
ui.setupUi(this);
|
|
connect(ui.buttonBox, SIGNAL(clicked(QAbstractButton*)), this, SLOT(buttonClicked(QAbstractButton*)));
|
|
}
|
|
|
|
ShiftTimesDialog* ShiftTimesDialog::instance()
|
|
{
|
|
static ShiftTimesDialog* self = new ShiftTimesDialog();
|
|
return self;
|
|
}
|
|
|
|
void ShiftTimesDialog::buttonClicked(QAbstractButton* button)
|
|
{
|
|
int amount;
|
|
|
|
if (ui.buttonBox->buttonRole(button) == QDialogButtonBox::AcceptRole){
|
|
amount = ui.timeEdit->time().hour() * 3600 + ui.timeEdit->time().minute() * 60;
|
|
if (ui.backwards->isChecked())
|
|
amount *= -1;
|
|
if (amount != 0) {
|
|
// DANGER, DANGER - this could get our dive_table unsorted...
|
|
shift_times(amount);
|
|
sort_table(&dive_table);
|
|
mark_divelist_changed(TRUE);
|
|
mainWindow()->dive_list()->rememberSelection();
|
|
mainWindow()->refreshDisplay();
|
|
mainWindow()->dive_list()->restoreSelection();
|
|
}
|
|
}
|
|
}
|
|
|
|
ShiftTimesDialog::ShiftTimesDialog(): QDialog()
|
|
{
|
|
ui.setupUi(this);
|
|
connect(ui.buttonBox, SIGNAL(clicked(QAbstractButton*)), this, SLOT(buttonClicked(QAbstractButton*)));
|
|
}
|
|
|
|
bool isGnome3Session()
|
|
{
|
|
#if defined(QT_OS_WIW) || defined(QT_OS_MAC)
|
|
return false;
|
|
#else
|
|
if (qApp->style()->objectName() != "gtk+")
|
|
return false;
|
|
QProcess p;
|
|
p.start("pidof", QStringList() << "gnome-shell" );
|
|
p.waitForFinished(-1);
|
|
QString p_stdout = p.readAllStandardOutput();
|
|
return !p_stdout.isEmpty();
|
|
#endif
|
|
}
|