mirror of
https://github.com/subsurface/subsurface.git
synced 2024-11-30 22:20:21 +00:00
preferences: support a pre-defined list of date formats
Add a combo-box in place of the single line text field and support some pre-defined date formats, such as: MM/dd/yyyy Each long format has a corresponding short variant stored in the QMap dateFormatShortMap and it's updated automatically once the user selects a combo box item for the long format. The regex for dates is slighly modified: [^dMy/\\s:;\\.,\\-] The user is still allowed to enter custom long / short date foramats. Fixes #276 Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
This commit is contained in:
Lubomir I. Ivanov
Dirk Hohndel
parent
f1437cfec7
commit
2c06cb027f
3 changed files with 47 additions and 27 deletions
|
|
@ -22,6 +22,14 @@ PreferencesLanguage::PreferencesLanguage() : AbstractPreferencesWidget(tr("Langu
|
|||
filterModel->sort(0);
|
||||
connect(ui->languageFilter, &QLineEdit::textChanged,
|
||||
filterModel, &QSortFilterProxyModel::setFilterFixedString);
|
||||
|
||||
dateFormatShortMap.insert("MM/dd/yyyy", "M/d/yy");
|
||||
dateFormatShortMap.insert("dd.MM.yyyy", "d.M.yy");
|
||||
dateFormatShortMap.insert("yyyy-MM-dd", "yy-M-d");
|
||||
foreach (QString format, dateFormatShortMap.keys())
|
||||
ui->dateFormatEntry->addItem(format);
|
||||
connect(ui->dateFormatEntry, SIGNAL(currentIndexChanged(const QString&)),
|
||||
this, SLOT(dateFormatChanged(const QString&)));
|
||||
}
|
||||
|
||||
PreferencesLanguage::~PreferencesLanguage()
|
||||
|
|
@ -29,13 +37,18 @@ PreferencesLanguage::~PreferencesLanguage()
|
|||
delete ui;
|
||||
}
|
||||
|
||||
void PreferencesLanguage::dateFormatChanged(const QString &text)
|
||||
{
|
||||
ui->shortDateFormatEntry->setText(dateFormatShortMap.value(text));
|
||||
}
|
||||
|
||||
void PreferencesLanguage::refreshSettings()
|
||||
{
|
||||
ui->languageSystemDefault->setChecked(prefs.locale.use_system_language);
|
||||
ui->timeFormatSystemDefault->setChecked(!prefs.time_format_override);
|
||||
ui->dateFormatSystemDefault->setChecked(!prefs.date_format_override);
|
||||
ui->timeFormatEntry->setText(prefs.time_format);
|
||||
ui->dateFormatEntry->setText(prefs.date_format);
|
||||
ui->dateFormatEntry->setCurrentText(prefs.date_format);
|
||||
ui->shortDateFormatEntry->setText(prefs.date_format_short);
|
||||
QAbstractItemModel *m = ui->languageDropdown->model();
|
||||
QModelIndexList languages = m->match(m->index(0, 0), Qt::UserRole, QString(prefs.locale.lang_locale).replace("-", "_"));
|
||||
|
|
@ -72,7 +85,7 @@ void PreferencesLanguage::syncSettings()
|
|||
lang->setTimeFormatOverride(!ui->timeFormatSystemDefault->isChecked());
|
||||
lang->setDateFormatOverride(!ui->dateFormatSystemDefault->isChecked());
|
||||
lang->setTimeFormat(ui->timeFormatEntry->text());
|
||||
lang->setDateFormat(ui->dateFormatEntry->text());
|
||||
lang->setDateFormat(ui->dateFormatEntry->currentText());
|
||||
lang->setDateFormatShort(ui->shortDateFormatEntry->text());
|
||||
uiLanguage(NULL);
|
||||
|
||||
|
|
@ -81,8 +94,8 @@ void PreferencesLanguage::syncSettings()
|
|||
QMessageBox::warning(this, tr("Literal characters"),
|
||||
tr("Non-special character(s) in time format.\nThese will be used as is. This might not be what you intended.\nSee http://doc.qt.io/qt-5/qdatetime.html#toString"));
|
||||
|
||||
QRegExp dfillegalchars("[^dMy/\\s:;\\.,]");
|
||||
if (dfillegalchars.indexIn(ui->dateFormatEntry->text()) >= 0 ||
|
||||
QRegExp dfillegalchars("[^dMy/\\s:;\\.,\\-]");
|
||||
if (dfillegalchars.indexIn(ui->dateFormatEntry->currentText()) >= 0 ||
|
||||
dfillegalchars.indexIn(ui->shortDateFormatEntry->text()) >= 0)
|
||||
QMessageBox::warning(this, tr("Literal characters"),
|
||||
tr("Non-special character(s) in time format.\nThese will be used as is. This might not be what you intended.\nSee http://doc.qt.io/qt-5/qdatetime.html#toString"));
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
#ifndef PREFERENCES_LANGUAGE_H
|
||||
#define PREFERENCES_LANGUAGE_H
|
||||
|
||||
#include <QMap>
|
||||
#include "abstractpreferenceswidget.h"
|
||||
|
||||
namespace Ui {
|
||||
|
|
@ -17,6 +18,9 @@ public:
|
|||
virtual void syncSettings();
|
||||
private:
|
||||
Ui::PreferencesLanguage *ui;
|
||||
QMap<QString, QString> dateFormatShortMap;
|
||||
public slots:
|
||||
void dateFormatChanged(const QString&);
|
||||
};
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -74,13 +74,6 @@
|
|||
<string>Date format</string>
|
||||
</property>
|
||||
<layout class="QGridLayout" name="gridLayout">
|
||||
<item row="0" column="1">
|
||||
<widget class="QLineEdit" name="dateFormatEntry">
|
||||
<property name="toolTip">
|
||||
<string><html><head/><body><p>Preferred date format. Commonly used fields are</p><p>d (day of month)</p><p>ddd (abbr. day name)</p><p>M (month number)</p><p>MMM (abbr. month name)</p><p>yy/yyyy (2/4 digit year)</p></body></html></string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="0" column="0">
|
||||
<widget class="QCheckBox" name="dateFormatSystemDefault">
|
||||
<property name="text">
|
||||
|
|
@ -114,6 +107,16 @@
|
|||
</property>
|
||||
</spacer>
|
||||
</item>
|
||||
<item row="0" column="1">
|
||||
<widget class="QComboBox" name="dateFormatEntry">
|
||||
<property name="toolTip">
|
||||
<string><html><head/><body><p>Preferred date format. Commonly used fields are</p><p>d (day of month)</p><p>ddd (abbr. day name)</p><p>M (month number)</p><p>MMM (abbr. month name)</p><p>yy/yyyy (2/4 digit year)</p></body></html></string>
|
||||
</property>
|
||||
<property name="editable">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
</item>
|
||||
|
|
@ -208,22 +211,6 @@
|
|||
</hint>
|
||||
</hints>
|
||||
</connection>
|
||||
<connection>
|
||||
<sender>dateFormatSystemDefault</sender>
|
||||
<signal>toggled(bool)</signal>
|
||||
<receiver>dateFormatEntry</receiver>
|
||||
<slot>setDisabled(bool)</slot>
|
||||
<hints>
|
||||
<hint type="sourcelabel">
|
||||
<x>79</x>
|
||||
<y>132</y>
|
||||
</hint>
|
||||
<hint type="destinationlabel">
|
||||
<x>264</x>
|
||||
<y>132</y>
|
||||
</hint>
|
||||
</hints>
|
||||
</connection>
|
||||
<connection>
|
||||
<sender>timeFormatSystemDefault</sender>
|
||||
<signal>toggled(bool)</signal>
|
||||
|
|
@ -256,5 +243,21 @@
|
|||
</hint>
|
||||
</hints>
|
||||
</connection>
|
||||
<connection>
|
||||
<sender>dateFormatSystemDefault</sender>
|
||||
<signal>toggled(bool)</signal>
|
||||
<receiver>dateFormatEntry</receiver>
|
||||
<slot>setDisabled(bool)</slot>
|
||||
<hints>
|
||||
<hint type="sourcelabel">
|
||||
<x>89</x>
|
||||
<y>103</y>
|
||||
</hint>
|
||||
<hint type="destinationlabel">
|
||||
<x>273</x>
|
||||
<y>103</y>
|
||||
</hint>
|
||||
</hints>
|
||||
</connection>
|
||||
</connections>
|
||||
</ui>
|
||||
|
|
|
|||
Loading…
Reference in a new issue