aw/valentina_old
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactoring.

Browse Source 
--HG--
branch : develop
This commit is contained in:
Roman Telezhynskyi 2019-05-28 16:20:53 +03:00
parent cdccce054b
commit e9d77c747b
1 changed files with 30 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
src/libs/vmisc/vcommonsettings.cpp
View File

@ -1041,27 +1041,29 @@ void VCommonSettings::SetLabelDateFormat(const QString &format)
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
QStringList VCommonSettings::PredefinedDateFormats() QStringList VCommonSettings::PredefinedDateFormats()
{ {
QStringList formats = QStringList() << "MM-dd-yyyy" return QStringList
<< "d/M/yy" {
<< "ddddMMMM dd, yyyy" "MM-dd-yyyy",
<< "dd/MM/yy" "d/M/yy",
<< "dd/MM/yyyy" "ddddMMMM dd, yyyy",
<< "MMM d, yy" "dd/MM/yy",
<< "MMM d, yyyy" "dd/MM/yyyy",
<< "d. MMM. yyyy" "MMM d, yy",
<< "MMMM d, yyyy" "MMM d, yyyy",
<< "d. MMMM yyyy" "d. MMM. yyyy",
<< "ddd, MMM d, yy" "MMMM d, yyyy",
<< "ddd dd/MMM yy" "d. MMMM yyyy",
<< "ddd, MMMM d, yyyy" "ddd, MMM d, yy",
<< "ddddMMMM d, yyyy" "ddd dd/MMM yy",
<< "MM-dd" "ddd, MMMM d, yyyy",
<< "yy-MM-dd" "ddddMMMM d, yyyy",
<< "yyyy-MM-dd" "MM-dd",
<< "MM/yy" "yy-MM-dd",
<< "MMM dd" "yyyy-MM-dd",
<< "MMMM"; "MM/yy",
return formats; "MMM dd",
"MMMM"
};
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
@ -1110,11 +1112,13 @@ void VCommonSettings::SetLabelTimeFormat(const QString &format)
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------
QStringList VCommonSettings::PredefinedTimeFormats() QStringList VCommonSettings::PredefinedTimeFormats()
{ {
QStringList formats = QStringList() << "hh:mm:ss" return QStringList
<< "hh:mm:ss AP" {
<< "hh:mm" "hh:mm:ss",
<< "hh:mm AP"; "hh:mm:ss AP",
return formats; "hh:mm",
"hh:mm AP"
};
} }
//--------------------------------------------------------------------------------------------------------------------- //---------------------------------------------------------------------------------------------------------------------