mirror of
https://github.com/subsurface/subsurface.git
synced 2025-02-19 22:16:15 +00:00
Preferences: move units to the new dialog
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Tomaz Canabrava
Dirk Hohndel
parent
c53615315e
commit
57d7b59bdc
7 changed files with 336 additions and 527 deletions
|
|
@ -15,6 +15,7 @@ set(SUBSURFACE_PREFERENCES_LIB_SRCS
|
|||
preferences_language.cpp
|
||||
preferences_georeference.cpp
|
||||
preferences_defaults.cpp
|
||||
preferences_units.cpp
|
||||
)
|
||||
|
||||
source_group("Subsurface Preferences" FILES ${SUBSURFACE_PREFERENCES_LIB_SRCS})
|
||||
|
|
|
|||
60
desktop-widgets/preferences/preferences_units.cpp
Normal file
60
desktop-widgets/preferences/preferences_units.cpp
Normal file
|
|
@ -0,0 +1,60 @@
|
|||
#include "preferences_units.h"
|
||||
#include "ui_preferences_units.h"
|
||||
#include "prefs-macros.h"
|
||||
#include "qthelper.h"
|
||||
|
||||
#include <QSettings>
|
||||
|
||||
PreferencesUnits::PreferencesUnits(): AbstractPreferencesWidget(tr("Units"),QIcon(":units"),1), ui(new Ui::PreferencesUnits())
|
||||
{
|
||||
ui->setupUi(this);
|
||||
}
|
||||
|
||||
PreferencesUnits::~PreferencesUnits()
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
void PreferencesUnits::refreshSettings()
|
||||
{
|
||||
QSettings s;
|
||||
s.beginGroup("Units");
|
||||
QString unitSystem[] = {"metric", "imperial", "personal"};
|
||||
short unitValue = ui->metric->isChecked() ? METRIC : (ui->imperial->isChecked() ? IMPERIAL : PERSONALIZE);
|
||||
SAVE_OR_REMOVE_SPECIAL("unit_system", default_prefs.unit_system, unitValue, unitSystem[unitValue]);
|
||||
s.setValue("temperature", ui->fahrenheit->isChecked() ? units::FAHRENHEIT : units::CELSIUS);
|
||||
s.setValue("length", ui->feet->isChecked() ? units::FEET : units::METERS);
|
||||
s.setValue("pressure", ui->psi->isChecked() ? units::PSI : units::BAR);
|
||||
s.setValue("volume", ui->cuft->isChecked() ? units::CUFT : units::LITER);
|
||||
s.setValue("weight", ui->lbs->isChecked() ? units::LBS : units::KG);
|
||||
s.setValue("vertical_speed_time", ui->vertical_speed_minutes->isChecked() ? units::MINUTES : units::SECONDS);
|
||||
s.setValue("coordinates", ui->gpsTraditional->isChecked());
|
||||
s.endGroup();
|
||||
}
|
||||
|
||||
void PreferencesUnits::syncSettings()
|
||||
{
|
||||
switch(prefs.unit_system) {
|
||||
case METRIC: ui->metric->setChecked(true); break;
|
||||
case IMPERIAL: ui->imperial->setChecked(true); break;
|
||||
default: ui->personalize->setChecked(true); break;
|
||||
}
|
||||
|
||||
ui->gpsTraditional->setChecked(prefs.coordinates_traditional);
|
||||
ui->gpsDecimal->setChecked(!prefs.coordinates_traditional);
|
||||
|
||||
ui->celsius->setChecked(prefs.units.temperature == units::CELSIUS);
|
||||
ui->fahrenheit->setChecked(prefs.units.temperature == units::FAHRENHEIT);
|
||||
ui->meter->setChecked(prefs.units.length == units::METERS);
|
||||
ui->feet->setChecked(prefs.units.length == units::FEET);
|
||||
ui->bar->setChecked(prefs.units.pressure == units::BAR);
|
||||
ui->psi->setChecked(prefs.units.pressure == units::PSI);
|
||||
ui->liter->setChecked(prefs.units.volume == units::LITER);
|
||||
ui->cuft->setChecked(prefs.units.volume == units::CUFT);
|
||||
ui->kg->setChecked(prefs.units.weight == units::KG);
|
||||
ui->lbs->setChecked(prefs.units.weight == units::LBS);
|
||||
ui->units_group->setEnabled(ui->personalize->isChecked());
|
||||
|
||||
ui->vertical_speed_minutes->setChecked(prefs.units.vertical_speed_time == units::MINUTES);
|
||||
ui->vertical_speed_seconds->setChecked(prefs.units.vertical_speed_time == units::SECONDS);
|
||||
}
|
||||
21
desktop-widgets/preferences/preferences_units.h
Normal file
21
desktop-widgets/preferences/preferences_units.h
Normal file
|
|
@ -0,0 +1,21 @@
|
|||
#ifndef PREFERENCES_UNITS_H
|
||||
#define PREFERENCES_UNITS_H
|
||||
|
||||
#include "abstractpreferenceswidget.h"
|
||||
|
||||
namespace Ui {
|
||||
class PreferencesUnits;
|
||||
}
|
||||
|
||||
class PreferencesUnits : public AbstractPreferencesWidget {
|
||||
Q_OBJECT
|
||||
public:
|
||||
PreferencesUnits();
|
||||
virtual ~PreferencesUnits();
|
||||
virtual void refreshSettings();
|
||||
virtual void syncSettings();
|
||||
private:
|
||||
Ui::PreferencesUnits *ui;
|
||||
};
|
||||
|
||||
#endif
|
||||
251
desktop-widgets/preferences/preferences_units.ui
Normal file
251
desktop-widgets/preferences/preferences_units.ui
Normal file
|
|
@ -0,0 +1,251 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<ui version="4.0">
|
||||
<class>PreferencesUnits</class>
|
||||
<widget class="QWidget" name="PreferencesUnits">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>400</width>
|
||||
<height>374</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="windowTitle">
|
||||
<string>Form</string>
|
||||
</property>
|
||||
<layout class="QVBoxLayout" name="verticalLayout">
|
||||
<item>
|
||||
<widget class="QGroupBox" name="groupBox_units">
|
||||
<property name="title">
|
||||
<string>Unit system</string>
|
||||
</property>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout">
|
||||
<item>
|
||||
<widget class="QLabel" name="label_6">
|
||||
<property name="text">
|
||||
<string>System</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QRadioButton" name="metric">
|
||||
<property name="text">
|
||||
<string>&Metric</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QRadioButton" name="imperial">
|
||||
<property name="text">
|
||||
<string>Imperial</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QRadioButton" name="personalize">
|
||||
<property name="text">
|
||||
<string>Personali&ze</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QGroupBox" name="units_group">
|
||||
<property name="title">
|
||||
<string>Individual settings</string>
|
||||
</property>
|
||||
<property name="checkable">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
<property name="checked">
|
||||
<bool>false</bool>
|
||||
</property>
|
||||
<layout class="QGridLayout" name="gridLayout">
|
||||
<item row="0" column="0">
|
||||
<widget class="QLabel" name="label">
|
||||
<property name="text">
|
||||
<string>Depth</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="0" column="1">
|
||||
<widget class="QRadioButton" name="meter">
|
||||
<property name="text">
|
||||
<string>meter</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="0" column="2">
|
||||
<widget class="QRadioButton" name="feet">
|
||||
<property name="text">
|
||||
<string>feet</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="0">
|
||||
<widget class="QLabel" name="label_2">
|
||||
<property name="text">
|
||||
<string>Pressure</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="1">
|
||||
<widget class="QRadioButton" name="bar">
|
||||
<property name="text">
|
||||
<string>bar</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="2">
|
||||
<widget class="QRadioButton" name="psi">
|
||||
<property name="text">
|
||||
<string>psi</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="2" column="0">
|
||||
<widget class="QLabel" name="label_3">
|
||||
<property name="text">
|
||||
<string>Volume</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="2" column="1">
|
||||
<widget class="QRadioButton" name="liter">
|
||||
<property name="text">
|
||||
<string>&liter</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="2" column="2">
|
||||
<widget class="QRadioButton" name="cuft">
|
||||
<property name="text">
|
||||
<string>cu ft</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="3" column="0">
|
||||
<widget class="QLabel" name="label_4">
|
||||
<property name="text">
|
||||
<string>Temperature</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="3" column="1">
|
||||
<widget class="QRadioButton" name="celsius">
|
||||
<property name="text">
|
||||
<string>celsius</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="3" column="2">
|
||||
<widget class="QRadioButton" name="fahrenheit">
|
||||
<property name="text">
|
||||
<string>fahrenheit</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="4" column="0">
|
||||
<widget class="QLabel" name="label_5">
|
||||
<property name="text">
|
||||
<string>Weight</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="4" column="1">
|
||||
<widget class="QRadioButton" name="kg">
|
||||
<property name="text">
|
||||
<string>kg</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="4" column="2">
|
||||
<widget class="QRadioButton" name="lbs">
|
||||
<property name="text">
|
||||
<string>lbs</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QGroupBox" name="groupBox">
|
||||
<property name="title">
|
||||
<string>Time units</string>
|
||||
</property>
|
||||
<layout class="QGridLayout">
|
||||
<item row="0" column="0">
|
||||
<widget class="QLabel" name="label13">
|
||||
<property name="text">
|
||||
<string>Ascent/descent speed denominator</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="0" column="1">
|
||||
<widget class="QRadioButton" name="vertical_speed_minutes">
|
||||
<property name="text">
|
||||
<string>Minutes</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="0" column="2">
|
||||
<widget class="QRadioButton" name="vertical_speed_seconds">
|
||||
<property name="text">
|
||||
<string>Seconds</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QGroupBox" name="groupBox_11">
|
||||
<property name="title">
|
||||
<string>GPS coordinates</string>
|
||||
</property>
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_12">
|
||||
<item>
|
||||
<widget class="QLabel" name="label_27">
|
||||
<property name="text">
|
||||
<string>Location Display</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QRadioButton" name="gpsTraditional">
|
||||
<property name="text">
|
||||
<string>traditional (dms)</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QRadioButton" name="gpsDecimal">
|
||||
<property name="text">
|
||||
<string>decimal</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<spacer name="verticalSpacer">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Vertical</enum>
|
||||
</property>
|
||||
<property name="sizeHint" stdset="0">
|
||||
<size>
|
||||
<width>0</width>
|
||||
<height>0</height>
|
||||
</size>
|
||||
</property>
|
||||
</spacer>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
<resources/>
|
||||
<connections/>
|
||||
</ui>
|
||||
|
|
@ -4,6 +4,7 @@
|
|||
#include "preferences_language.h"
|
||||
#include "preferences_georeference.h"
|
||||
#include "preferences_defaults.h"
|
||||
#include "preferences_units.h"
|
||||
|
||||
#include <QVBoxLayout>
|
||||
#include <QHBoxLayout>
|
||||
|
|
@ -37,6 +38,7 @@ PreferencesDialogV2::PreferencesDialogV2()
|
|||
addPreferencePage(new PreferencesLanguage());
|
||||
addPreferencePage(new PreferencesGeoreference());
|
||||
addPreferencePage(new PreferencesDefaults());
|
||||
addPreferencePage(new PreferencesUnits());
|
||||
refreshPages();
|
||||
|
||||
connect(pagesList, &QListWidget::currentRowChanged,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue