diff options
| -rw-r--r-- | planner.c | 2 | ||||
| -rw-r--r-- | qt-ui/preferences.cpp | 9 | ||||
| -rw-r--r-- | qt-ui/preferences.ui | 2 |
3 files changed, 9 insertions, 4 deletions
@@ -208,7 +208,7 @@ int add_gas(struct dive *dive, int o2, int he) if (i == MAX_CYLINDERS) { return -1; } - /* let's make it our default cylinder (right now hardcoded as AL80) */ + /* let's make it our default cylinder */ fill_default_cylinder(cyl); mix->o2.permille = o2; mix->he.permille = he; diff --git a/qt-ui/preferences.cpp b/qt-ui/preferences.cpp index e0ac4039f..4a3189337 100644 --- a/qt-ui/preferences.cpp +++ b/qt-ui/preferences.cpp @@ -78,7 +78,12 @@ void PreferencesDialog::setUiFromPrefs() ui.font->setFont(QString(prefs.divelist_font)); ui.fontsize->setValue(prefs.font_size); ui.defaultfilename->setText(prefs.default_filename); - ui.defaultcylinder->setText(prefs.default_cylinder); + ui.default_cylinder->clear(); + for(int i=0; tank_info[i].name != NULL; i++) { + ui.default_cylinder->addItem(tank_info[i].name); + if (prefs.default_cylinder && strcmp(tank_info[i].name, prefs.default_cylinder) == 0) + ui.default_cylinder->setCurrentIndex(i); + } ui.displayinvalid->setChecked(prefs.display_invalid_dives); ui.show_sac->setChecked(prefs.show_sac); ui.vertical_speed_minutes->setChecked(prefs.units.vertical_speed_time == units::MINUTES); @@ -140,7 +145,7 @@ void PreferencesDialog::syncSettings() // Defaults s.beginGroup("GeneralSettings"); s.setValue("default_filename", ui.defaultfilename->text()); - s.setValue("default_cylinder", ui.defaultcylinder->text()); + s.setValue("default_cylinder", ui.default_cylinder->currentText()); s.endGroup(); s.beginGroup("Display"); diff --git a/qt-ui/preferences.ui b/qt-ui/preferences.ui index d30752829..cb546a93b 100644 --- a/qt-ui/preferences.ui +++ b/qt-ui/preferences.ui @@ -209,7 +209,7 @@ <item row="0" column="1"> <layout class="QHBoxLayout" name="horizontalLayout_3"> <item> - <widget class="QLineEdit" name="defaultcylinder"/> + <widget class="QComboBox" name="default_cylinder"/> </item> </layout> </item> |