mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-12-03 15:43:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

preferences: support a pre-defined list of date formats

Browse source 
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 2017-11-10 16:52:12 +02:00 committed by Dirk Hohndel
parent f1437cfec7
commit 2c06cb027f
3 changed files with 47 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
desktop-widgets/preferences/preferences_language.cpp
View file

@ -22,6 +22,14 @@ PreferencesLanguage::PreferencesLanguage() : AbstractPreferencesWidget(tr("Langu
filterModel->sort(0); filterModel->sort(0);
connect(ui->languageFilter, &QLineEdit::textChanged, connect(ui->languageFilter, &QLineEdit::textChanged,
filterModel, &QSortFilterProxyModel::setFilterFixedString); 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() PreferencesLanguage::~PreferencesLanguage()
@ -29,13 +37,18 @@ PreferencesLanguage::~PreferencesLanguage()
delete ui; delete ui;
} }
void PreferencesLanguage::dateFormatChanged(const QString &text)
{
ui->shortDateFormatEntry->setText(dateFormatShortMap.value(text));
}
void PreferencesLanguage::refreshSettings() void PreferencesLanguage::refreshSettings()
{ {
ui->languageSystemDefault->setChecked(prefs.locale.use_system_language); ui->languageSystemDefault->setChecked(prefs.locale.use_system_language);
ui->timeFormatSystemDefault->setChecked(!prefs.time_format_override); ui->timeFormatSystemDefault->setChecked(!prefs.time_format_override);
ui->dateFormatSystemDefault->setChecked(!prefs.date_format_override); ui->dateFormatSystemDefault->setChecked(!prefs.date_format_override);
ui->timeFormatEntry->setText(prefs.time_format); 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); ui->shortDateFormatEntry->setText(prefs.date_format_short);
QAbstractItemModel *m = ui->languageDropdown->model(); QAbstractItemModel *m = ui->languageDropdown->model();
QModelIndexList languages = m->match(m->index(0, 0), Qt::UserRole, QString(prefs.locale.lang_locale).replace("-", "_")); 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->setTimeFormatOverride(!ui->timeFormatSystemDefault->isChecked());
lang->setDateFormatOverride(!ui->dateFormatSystemDefault->isChecked()); lang->setDateFormatOverride(!ui->dateFormatSystemDefault->isChecked());
lang->setTimeFormat(ui->timeFormatEntry->text()); lang->setTimeFormat(ui->timeFormatEntry->text());
lang->setDateFormat(ui->dateFormatEntry->text()); lang->setDateFormat(ui->dateFormatEntry->currentText());
lang->setDateFormatShort(ui->shortDateFormatEntry->text()); lang->setDateFormatShort(ui->shortDateFormatEntry->text());
uiLanguage(NULL); uiLanguage(NULL);
@ -81,8 +94,8 @@ void PreferencesLanguage::syncSettings()
QMessageBox::warning(this, tr("Literal characters"), 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")); 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:;\\.,]"); QRegExp dfillegalchars("[^dMy/\\s:;\\.,\\-]");
if (dfillegalchars.indexIn(ui->dateFormatEntry->text()) >= 0 || if (dfillegalchars.indexIn(ui->dateFormatEntry->currentText()) >= 0 ||
dfillegalchars.indexIn(ui->shortDateFormatEntry->text()) >= 0) dfillegalchars.indexIn(ui->shortDateFormatEntry->text()) >= 0)
QMessageBox::warning(this, tr("Literal characters"), 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")); 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"));

4
desktop-widgets/preferences/preferences_language.h
View file

@ -2,6 +2,7 @@
#ifndef PREFERENCES_LANGUAGE_H #ifndef PREFERENCES_LANGUAGE_H
#define PREFERENCES_LANGUAGE_H #define PREFERENCES_LANGUAGE_H
#include <QMap>
#include "abstractpreferenceswidget.h" #include "abstractpreferenceswidget.h"
namespace Ui { namespace Ui {
@ -17,6 +18,9 @@ public:
virtual void syncSettings(); virtual void syncSettings();
private: private:
Ui::PreferencesLanguage *ui; Ui::PreferencesLanguage *ui;
QMap<QString, QString> dateFormatShortMap;
public slots:
void dateFormatChanged(const QString&);
}; };
#endif #endif

49
desktop-widgets/preferences/prefs_language.ui
View file

@ -74,13 +74,6 @@
<string>Date format</string> <string>Date format</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<item row="0" column="1">
<widget class="QLineEdit" name="dateFormatEntry">
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Preferred date format. Commonly used fields are&lt;/p&gt;&lt;p&gt;d (day of month)&lt;/p&gt;&lt;p&gt;ddd (abbr. day name)&lt;/p&gt;&lt;p&gt;M (month number)&lt;/p&gt;&lt;p&gt;MMM (abbr. month name)&lt;/p&gt;&lt;p&gt;yy/yyyy (2/4 digit year)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
</widget>
</item>
<item row="0" column="0"> <item row="0" column="0">
<widget class="QCheckBox" name="dateFormatSystemDefault"> <widget class="QCheckBox" name="dateFormatSystemDefault">
<property name="text"> <property name="text">
@ -114,6 +107,16 @@
</property> </property>
</spacer> </spacer>
</item> </item>
<item row="0" column="1">
<widget class="QComboBox" name="dateFormatEntry">
<property name="toolTip">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Preferred date format. Commonly used fields are&lt;/p&gt;&lt;p&gt;d (day of month)&lt;/p&gt;&lt;p&gt;ddd (abbr. day name)&lt;/p&gt;&lt;p&gt;M (month number)&lt;/p&gt;&lt;p&gt;MMM (abbr. month name)&lt;/p&gt;&lt;p&gt;yy/yyyy (2/4 digit year)&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="editable">
<bool>true</bool>
</property>
</widget>
</item>
</layout> </layout>
</widget> </widget>
</item> </item>
@ -208,22 +211,6 @@
</hint> </hint>
</hints> </hints>
</connection> </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> <connection>
<sender>timeFormatSystemDefault</sender> <sender>timeFormatSystemDefault</sender>
<signal>toggled(bool)</signal> <signal>toggled(bool)</signal>
@ -256,5 +243,21 @@
</hint> </hint>
</hints> </hints>
</connection> </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> </connections>
</ui> </ui>