Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-12-13 08:06:38 +01:00
Code Issues Projects Releases Wiki Activity

2021-08-13 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Fixed a regression in rdlibrary(1) that caused misaligned
	columns when generating a Cut Report.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason
2021-08-15 13:55:19 -04:00
parent d9925e0ee8
commit fcb3ad7b27
12 changed files with 62 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
lib/rdcoreapplication.cpp
View File

@@ -360,27 +360,46 @@ QString RDCoreApplication::shortDateTimeString(const QDateTime &dt) const
}
QString RDCoreApplication::timeString(const QTime &time,bool padded) const
QString RDCoreApplication::timeString(const QTime &time,
const QString &padding) const
{
if(app_show_twelve_hour_time) {
if(padded) {
return time.toString(RD_TWELVE_HOUR_PADDED_FORMAT);
QString time_str=time.toString(RD_TWELVE_HOUR_FORMAT);
if(!padding.isEmpty()) {
if((time.hour()==0)||((time.hour()>=10)&&(time.hour()<13))||
(time.hour()>=22)) {
return time_str.left(8)+" "+time_str.right(2);
}
return padding+time_str.left(7)+" "+time_str.right(2);
}
return time.toString(RD_TWELVE_HOUR_FORMAT);
if((time.hour()==0)||((time.hour()>=10)&&(time.hour()<13))||
(time.hour()>=22)) {
return time_str.left(8)+" "+time_str.right(2);
}
return time_str.left(7)+" "+time_str.right(2);
}
return time.toString(RD_TWENTYFOUR_HOUR_FORMAT);
return time.toString(RD_TWENTYFOUR_HOUR_FORMAT).left(10);
}
QString RDCoreApplication::tenthsTimeString(const QTime &time,bool padded) const
QString RDCoreApplication::tenthsTimeString(const QTime &time,
const QString &padding) const
{
if(app_show_twelve_hour_time) {
if(padded) {
return time.toString(RD_TWELVE_HOUR_TENTHS_PADDED_FORMAT);
QString time_str=time.toString(RD_TWELVE_HOUR_TENTHS_FORMAT);
if(!padding.isEmpty()) {
if((time.hour()==0)||((time.hour()>=10)&&(time.hour()<13))||
(time.hour()>=22)) {
return time_str.left(10)+" "+time_str.right(2);
}
return padding+time_str.left(9)+" "+time_str.right(2);
}
return time.toString(RD_TWELVE_HOUR_TENTHS_FORMAT);
if(((time.hour()>=10)&&(time.hour()<13))||(time.hour()>=22)) {
return time_str.left(10)+" "+time_str.right(2);
}
return time_str.left(9)+" "+time_str.right(2);
}
return time.toString(RD_TWENTYFOUR_HOUR_TENTHS_FORMAT);
return time.toString(RD_TWENTYFOUR_HOUR_TENTHS_FORMAT).left(10);
}