From 3ffbc14138e578acf6f11eb55b09c94d5b14f39c Mon Sep 17 00:00:00 2001 From: Mark Watkins Date: Wed, 16 Nov 2011 07:22:08 +1000 Subject: [PATCH] Qt < 4.8 build fixes (Locale firstDayOfWeek) --- SleepyHeadQT.pro | 8 +++++-- common_gui.cpp | 52 +++++++++++++++++++++++++++++++++++++++++ common_gui.h | 10 ++++++++ daily.cpp | 7 +++++- docs/release_notes.html | 6 ++--- exportcsv.cpp | 7 ++++-- overview.cpp | 8 +++++-- 7 files changed, 88 insertions(+), 10 deletions(-) create mode 100644 common_gui.cpp create mode 100644 common_gui.h diff --git a/SleepyHeadQT.pro b/SleepyHeadQT.pro index c7225cc8..0f5d75b4 100644 --- a/SleepyHeadQT.pro +++ b/SleepyHeadQT.pro @@ -66,7 +66,8 @@ SOURCES += main.cpp\ SleepLib/schema.cpp \ profileselect.cpp \ newprofile.cpp \ - exportcsv.cpp + exportcsv.cpp \ + common_gui.cpp unix:SOURCES += qextserialport/posix_qextserialport.cpp unix:!macx:SOURCES += qextserialport/qextserialenumerator_unix.cpp @@ -120,7 +121,8 @@ HEADERS += \ SleepLib/schema.h \ profileselect.h \ newprofile.h \ - exportcsv.h + exportcsv.h \ + common_gui.h FORMS += \ @@ -153,3 +155,5 @@ OTHER_FILES += \ + + diff --git a/common_gui.cpp b/common_gui.cpp new file mode 100644 index 00000000..1f6574e5 --- /dev/null +++ b/common_gui.cpp @@ -0,0 +1,52 @@ +#include "common_gui.h" +#include "qglobal.h" + +#if QT_VERSION<0x400800 +#if defined(Q_OS_MAC) +#include "cocoacommon.h" +#include +#endif + +#ifdef Q_OS_WIN +#include "windows.h" +#endif + +#ifdef __GLIBC__ +#include +#endif + +Qt::DayOfWeek firstDayOfWeekFromLocale() +{ + Qt::DayOfWeek firstDay = Qt::Monday; +#ifdef Q_OS_WIN + WCHAR wsDay[4]; +# if defined(_WIN32_WINNT_VISTA) && WINVER >= _WIN32_WINNT_VISTA && defined(LOCALE_NAME_USER_DEFAULT) + if (GetLocaleInfoEx(LOCALE_NAME_USER_DEFAULT, LOCALE_IFIRSTDAYOFWEEK, wsDay, 4)) { +# else + if (GetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_IFIRSTDAYOFWEEK, wsDay, 4)) { +# endif + bool ok; + int wfd = QString::fromWCharArray(wsDay).toInt(&ok) + 1; + if (ok) { + firstDay = (Qt::DayOfWeek)(unsigned char)wfd; + } + } +#elif defined(__GLIBC__) + firstDay = (Qt::DayOfWeek)(unsigned char)((*nl_langinfo(_NL_TIME_FIRST_WEEKDAY) + 5) % 7 + 1); +#elif defined(Q_OS_MAC) + NSCalendar *cal = [NSCalendar currentCalendar]; + int day = ([cal firstWeekday] + 5) % 7 + 1; + + firstDay = (Qt::DayOfWeek)(unsigned char)day; +#endif + return firstDay; +} + + +#else +Qt::DayOfWeek firstDayOfWeekFromLocale() +{ + return QLocale::system().firstDayOfWeek(); +} +#endif + diff --git a/common_gui.h b/common_gui.h new file mode 100644 index 00000000..31085ef8 --- /dev/null +++ b/common_gui.h @@ -0,0 +1,10 @@ +#ifndef COMMON_GUI_H +#define COMMON_GUI_H + +//#if QT_VERSION +#include + +Qt::DayOfWeek firstDayOfWeekFromLocale(); +//#endif + +#endif diff --git a/daily.cpp b/daily.cpp index 3b86528d..58b0bb17 100644 --- a/daily.cpp +++ b/daily.cpp @@ -18,6 +18,7 @@ #include #include +#include "common_gui.h" #include "SleepLib/profiles.h" #include "SleepLib/session.h" #include "Graphs/graphdata_custom.h" @@ -210,7 +211,11 @@ Daily::Daily(QWidget *parent,gGraphView * shared, MainWindow *mw) format.setForeground(QBrush(Qt::black, Qt::SolidPattern)); ui->calendar->setWeekdayTextFormat(Qt::Saturday, format); ui->calendar->setWeekdayTextFormat(Qt::Sunday, format); - ui->calendar->setFirstDayOfWeek(QLocale::system().firstDayOfWeek()); + + //Qt::DayOfWeek dow=QLocale::system().firstDayOfWeek(); + Qt::DayOfWeek dow=firstDayOfWeekFromLocale(); + + ui->calendar->setFirstDayOfWeek(dow); ui->tabWidget->setCurrentWidget(ui->details); diff --git a/docs/release_notes.html b/docs/release_notes.html index 6d523106..8863c0a5 100644 --- a/docs/release_notes.html +++ b/docs/release_notes.html @@ -12,9 +12,9 @@ however, I have still managed to cook up a few nice improvements...

What's New?

  • You can now Shift+Left Click on a day in an overview graph, and it will jump to that day in Daily tab.
  • New calendar navigation bar allows easy hiding the calendar to get more room.
    • -
  • (Relative) AHI is displayed above the flow rate waveform for selected area.
    • +
  • Event count, duration and (relative) AHI is displayed above the flow rate waveform for selected area.
  • Improved support for ResMed S9 ASV/VPAP Machines.
    • -
  • Added some basic CSV export capabilities.
    • +
  • Added some basic CSV export capabilities (File Menu->Export).
  • A new preference option to switch some daily graphs between square plots and normal line plots.
  • Some graphing optimizations to improve performance.
  • Quite a few other little bugfixes I've forgotten about.
    • @@ -32,7 +32,7 @@ If I've still missed your bug, my appologies, I'm not deliberately ignoring you, Thanks to all the wonderful people who have given their support to this project, be it via donations, sharing CPAP data, following GIT source tree, testing binary builds, submitting bug reports, giving ideas for improvement, and general feedback on the CPAP forums.

    I very much appreciate all the help and encouragement.

    -

    Cheers,

    +

    Sleep Well,

    Mark Watkins (JediMark)

    diff --git a/exportcsv.cpp b/exportcsv.cpp index 2e63a5af..6e1ef414 100644 --- a/exportcsv.cpp +++ b/exportcsv.cpp @@ -5,6 +5,7 @@ #include #include "SleepLib/profiles.h" #include "SleepLib/day.h" +#include "common_gui.h" #include "exportcsv.h" #include "ui_exportcsv.h" #include "mainwindow.h" @@ -35,8 +36,10 @@ ExportCSV::ExportCSV(QWidget *parent) : ui->endDate->calendarWidget()->setWeekdayTextFormat(Qt::Saturday, format); ui->endDate->calendarWidget()->setWeekdayTextFormat(Qt::Sunday, format); - ui->startDate->calendarWidget()->setFirstDayOfWeek(QLocale::system().firstDayOfWeek()); - ui->endDate->calendarWidget()->setFirstDayOfWeek(QLocale::system().firstDayOfWeek()); + Qt::DayOfWeek dow=firstDayOfWeekFromLocale(); + + ui->startDate->calendarWidget()->setFirstDayOfWeek(dow); + ui->endDate->calendarWidget()->setFirstDayOfWeek(dow); // Connect the signals to update which days have CPAP data when the month is changed connect(ui->startDate->calendarWidget(),SIGNAL(currentPageChanged(int,int)),SLOT(startDate_currentPageChanged(int,int))); diff --git a/overview.cpp b/overview.cpp index d76f3b14..fcf64255 100644 --- a/overview.cpp +++ b/overview.cpp @@ -14,6 +14,7 @@ #include "SleepLib/profiles.h" #include "overview.h" #include "ui_overview.h" +#include "common_gui.h" #include "Graphs/gXAxis.h" #include "Graphs/gLineChart.h" #include "Graphs/gYAxis.h" @@ -33,8 +34,11 @@ Overview::Overview(QWidget *parent,gGraphView * shared) : } ui->dateStart->setDisplayFormat(shortformat); ui->dateEnd->setDisplayFormat(shortformat); - ui->dateStart->calendarWidget()->setFirstDayOfWeek(QLocale::system().firstDayOfWeek()); - ui->dateEnd->calendarWidget()->setFirstDayOfWeek(QLocale::system().firstDayOfWeek()); + + Qt::DayOfWeek dow=firstDayOfWeekFromLocale(); + + ui->dateStart->calendarWidget()->setFirstDayOfWeek(dow); + ui->dateEnd->calendarWidget()->setFirstDayOfWeek(dow); // Stop both calendar drop downs highlighting weekends in red