From a17f4ef05bd643e353682472929ec1db99dfa7e1 Mon Sep 17 00:00:00 2001 From: Carlos Bohórquez Date: Thu, 10 Sep 2015 19:54:44 +0200 Subject: Solves issue 11400 The functions to set dates on lumina-FM now use user preferred settings. --- lumina-fm/widgets/DirWidget.cpp | 48 ++++++++++++++++++++++++++++++++++++----- lumina-fm/widgets/DirWidget.h | 11 +++++++--- 2 files changed, 51 insertions(+), 8 deletions(-) diff --git a/lumina-fm/widgets/DirWidget.cpp b/lumina-fm/widgets/DirWidget.cpp index 22879c1b..9d4eef0c 100644 --- a/lumina-fm/widgets/DirWidget.cpp +++ b/lumina-fm/widgets/DirWidget.cpp @@ -14,6 +14,7 @@ #include #include #include +#include #include #include @@ -25,6 +26,11 @@ #define DEBUG 0 #endif + +const QString sessionsettings_config_file = QDir::homePath() + "/.lumina/LuminaDE/sessionsettings.conf"; + +QString DirWidget::date_format = QString(); + DirWidget::DirWidget(QString objID, QWidget *parent) : QWidget(parent), ui(new Ui::DirWidget){ ui->setupUi(this); //load the designer file ID = objID; @@ -64,6 +70,7 @@ DirWidget::DirWidget(QString objID, QWidget *parent) : QWidget(parent), ui(new U //Now update the rest of the UI canmodify = false; //initial value contextMenu = new QMenu(this); + setDateFormat(); setShowDetails(true); setShowThumbnails(true); UpdateIcons(); @@ -233,6 +240,8 @@ void DirWidget::LoadDir(QString dir, QList list){ if(!watcher->directories().isEmpty()){ watcher->removePaths(watcher->directories()); } if(!watcher->files().isEmpty()){ watcher->removePaths(watcher->files()); } watcher->addPath(CDIR); + // add sessionsettings to watcher so date_format can be update based on user settings + watcher->addPath(QDir::homePath() + "/.lumina/LuminaDE/sessionsettings.conf"); ui->actionStopLoad->setVisible(true); stopload = false; //Clear the display widget (if a new directory) @@ -319,10 +328,10 @@ void DirWidget::LoadDir(QString dir, QList list){ it->setText(t, list[i].mimetype()); break; case DATEMOD: - it->setText(t, list[i].lastModified().toString(Qt::DefaultLocaleShortDate) ); + it->setText(t, list[i].lastModified().toString(getDateFormat()) ); break; case DATECREATE: - it->setText(t, list[i].created().toString(Qt::DefaultLocaleShortDate) ); + it->setText(t, list[i].created().toString(getDateFormat()) ); break; } } @@ -499,8 +508,8 @@ void DirWidget::setupConnections(){ connect(deleteFilesShort, SIGNAL(activated()), this, SLOT( on_tool_act_rm_clicked() ) ); connect(refreshShort, SIGNAL(activated()), this, SLOT( refresh()) ); //Filesystem Watcher - connect(watcher, SIGNAL(directoryChanged(const QString&)), this, SLOT(startSync()) ); - connect(watcher, SIGNAL(fileChanged(const QString&)), this, SLOT(startSync()) ); //just in case + connect(watcher, SIGNAL(directoryChanged(const QString&)), this, SLOT(startSync(const QString &)) ); + connect(watcher, SIGNAL(fileChanged(const QString&)), this, SLOT(startSync(const QString &)) ); //just in case connect(synctimer, SIGNAL(timeout()), this, SLOT(refresh()) ); } @@ -846,7 +855,10 @@ void DirWidget::SelectionChanged(){ ui->tool_act_runwith->setEnabled(hasselection); } -void DirWidget::startSync(){ +void DirWidget::startSync(const QString &file){ + //Update date_format based on user settings + if(file == sessionsettings_config_file) + setDateFormat(); if(synctimer->isActive()){ synctimer->stop(); } synctimer->start(); } @@ -866,3 +878,29 @@ void DirWidget::mouseReleaseEvent(QMouseEvent *ev){ ev->ignore(); //not handled here } } + +//==================== +// STATIC +//==================== + +QString DirWidget::getDateFormat() { + return DirWidget::date_format; +} + +// This function is only called if user changes sessionsettings. By doing so, operations like sorting by date +// are faster because the date format is already stored in DirWidget::date_format static variable +void DirWidget::setDateFormat() { + const QString default_date_format = "dddd, d MMMM yyyy"; + const QString default_hour_format = "h:mm"; + QSettings::setPath(QSettings::NativeFormat, QSettings::UserScope, QDir::homePath()+"/.lumina"); + QSettings settings("LuminaDE","sessionsettings"); + QString date, time; + // If DateFormat/TimeFormat don't exist or are empty, default values are setted + date = settings.value("DateFormat", default_date_format).toString(); + time = settings.value("TimeFormat", default_hour_format).toString(); + if(date.isEmpty()) + date = default_date_format; + if(time.isEmpty()) + time = default_hour_format; + DirWidget::date_format = date + " " + time; +} diff --git a/lumina-fm/widgets/DirWidget.h b/lumina-fm/widgets/DirWidget.h index 514b3e7f..474531f3 100644 --- a/lumina-fm/widgets/DirWidget.h +++ b/lumina-fm/widgets/DirWidget.h @@ -52,6 +52,10 @@ public: void setDetails(QList list); //Which details to show and in which order (L->R) void setThumbnailSize(int px); void setShowCloseButton(bool show); + + //Date format for show items + static QString getDateFormat(); + static void setDateFormat(); public slots: void LoadDir(QString dir, LFileInfoList list); @@ -94,6 +98,7 @@ private: //Functions for internal use void setupConnections(); QStringList currentSelection(); + static QString date_format; private slots: //UI BUTTONS/Actions @@ -132,7 +137,7 @@ private slots: //Browser Functions void OpenContextMenu(); void SelectionChanged(); - void startSync(); //used internally to collect/pause before updating the dir + void startSync(const QString &file); //used internally to collect/pause before updating the dir signals: //Directory loading/finding signals @@ -184,8 +189,8 @@ public: // Get the stored text and try to convert to QDateTime QString text = this->text(column); QString text_tmp = tmp.text(column); - QDateTime date_time = QDateTime::fromString(text, Qt::DefaultLocaleShortDate); - QDateTime date_time_tmp = QDateTime::fromString(text_tmp, Qt::DefaultLocaleShortDate); + QDateTime date_time = QDateTime::fromString(text, DirWidget::getDateFormat()); + QDateTime date_time_tmp = QDateTime::fromString(text_tmp, DirWidget::getDateFormat()); // If the conversion are ok in both objects, compare them if(date_time.isValid() && date_time_tmp.isValid()) return date_time < date_time_tmp; -- cgit From 9d6c79522dde67a1810d6a040bd40e12f8eaae44 Mon Sep 17 00:00:00 2001 From: Carlos Bohórquez Date: Fri, 11 Sep 2015 14:53:30 +0200 Subject: Several changes Use the global variable sessionsettings_config_file in all places that must be used. QSettings::setPath was already setted so it's not needed. Deleted. Instead using variable for date and time format in case user settings aren't setted, now we go to Qt::DefaultLocaleShortDate. To perform this operation, we must work with Date and Time separately. Now DirWidget::date_format is an QStringList, first item for date and second for time. The QDateTime with format "yyyyMMddhhmmsszzz" is stored on whatsThis variable for being used in sort operations. CQTreeWidgetItem operator< function has been simplified. Now, to check dates, we used the value stored in whatsThis. --- lumina-config/mainUI.cpp | 4 +- lumina-desktop/panel-plugins/clock/LClock.cpp | 6 +-- lumina-fm/widgets/DirWidget.cpp | 61 ++++++++++++++++++--------- lumina-fm/widgets/DirWidget.h | 22 ++-------- 4 files changed, 50 insertions(+), 43 deletions(-) diff --git a/lumina-config/mainUI.cpp b/lumina-config/mainUI.cpp index 5f312f17..4f3a7a53 100644 --- a/lumina-config/mainUI.cpp +++ b/lumina-config/mainUI.cpp @@ -1986,7 +1986,7 @@ void MainUI::sessionResetLumina(){ void MainUI::sessionLoadTimeSample(){ if(ui->line_session_time->text().simplified().isEmpty()){ - ui->label_session_timesample->setText( QTime::currentTime().toString(Qt::SystemLocaleShortDate) ); + ui->label_session_timesample->setText( QTime::currentTime().toString(Qt::DefaultLocaleShortDate) ); }else{ ui->label_session_timesample->setText( QTime::currentTime().toString( ui->line_session_time->text() ) ); } @@ -2009,7 +2009,7 @@ void MainUI::sessionShowTimeCodes(){ void MainUI::sessionLoadDateSample(){ if(ui->line_session_date->text().simplified().isEmpty()){ - ui->label_session_datesample->setText( QDate::currentDate().toString(Qt::SystemLocaleLongDate) ); + ui->label_session_datesample->setText( QDate::currentDate().toString(Qt::DefaultLocaleShortDate) ); }else{ ui->label_session_datesample->setText( QDate::currentDate().toString( ui->line_session_date->text() ) ); } diff --git a/lumina-desktop/panel-plugins/clock/LClock.cpp b/lumina-desktop/panel-plugins/clock/LClock.cpp index f704647e..2c7e3e07 100644 --- a/lumina-desktop/panel-plugins/clock/LClock.cpp +++ b/lumina-desktop/panel-plugins/clock/LClock.cpp @@ -55,9 +55,9 @@ void LClock::updateTime(bool adjustformat){ QString label; QString timelabel; QString datelabel; - if(deftime){ timelabel = CT.time().toString(Qt::SystemLocaleShortDate) ; } + if(deftime){ timelabel = CT.time().toString(Qt::DefaultLocaleShortDate) ; } else{ timelabel=CT.toString(timefmt); } - if(defdate){ datelabel = CT.date().toString(Qt::SystemLocaleLongDate); } + if(defdate){ datelabel = CT.date().toString(Qt::DefaultLocaleShortDate); } else{ datelabel = CT.toString(datefmt); } if(datetimeorder == "dateonly"){ label = datelabel; @@ -255,4 +255,4 @@ void LClock::OrientationChange(){ } updateTime(true); //re-adjust the font/spacings this->layout()->update(); -} \ No newline at end of file +} diff --git a/lumina-fm/widgets/DirWidget.cpp b/lumina-fm/widgets/DirWidget.cpp index 9d4eef0c..7954cc8e 100644 --- a/lumina-fm/widgets/DirWidget.cpp +++ b/lumina-fm/widgets/DirWidget.cpp @@ -29,7 +29,7 @@ const QString sessionsettings_config_file = QDir::homePath() + "/.lumina/LuminaDE/sessionsettings.conf"; -QString DirWidget::date_format = QString(); +QStringList DirWidget::date_format = QStringList(); DirWidget::DirWidget(QString objID, QWidget *parent) : QWidget(parent), ui(new Ui::DirWidget){ ui->setupUi(this); //load the designer file @@ -241,7 +241,7 @@ void DirWidget::LoadDir(QString dir, QList list){ if(!watcher->files().isEmpty()){ watcher->removePaths(watcher->files()); } watcher->addPath(CDIR); // add sessionsettings to watcher so date_format can be update based on user settings - watcher->addPath(QDir::homePath() + "/.lumina/LuminaDE/sessionsettings.conf"); + watcher->addPath(sessionsettings_config_file); ui->actionStopLoad->setVisible(true); stopload = false; //Clear the display widget (if a new directory) @@ -327,12 +327,39 @@ void DirWidget::LoadDir(QString dir, QList list){ case TYPE: it->setText(t, list[i].mimetype()); break; - case DATEMOD: - it->setText(t, list[i].lastModified().toString(getDateFormat()) ); - break; - case DATECREATE: - it->setText(t, list[i].created().toString(getDateFormat()) ); - break; + case DATEMOD: + { + QStringList datetime_format = getDateFormat(); + // Save datetime in WhatThis value. Lately will be used by CQTreeWidgetItem for sorting by date + it->setWhatsThis(DATEMOD, list[i].lastModified().toString("yyyyMMddhhmmsszzz")); + // Default configurition. Fallback to Qt::DefaultLocaleShortDate for formats + if(datetime_format.at(0).isEmpty() && datetime_format.at(1).isEmpty()) + it->setText(t, list[i].lastModified().toString(Qt::DefaultLocaleShortDate) ); + // Date is setted but time not. Time goes to default + else if(!datetime_format.at(0).isEmpty() && datetime_format.at(1).isEmpty()) + it->setText(t, list[i].lastModified().date().toString(datetime_format.at(0)) + " " + list[i].lastModified().time().toString(Qt::DefaultLocaleShortDate)); + // Time is setted but date not. Date goes to default + else if(datetime_format.at(0).isEmpty() && !datetime_format.at(1).isEmpty()) + it->setText(t, list[i].lastModified().date().toString(Qt::DefaultLocaleShortDate) + " " + list[i].lastModified().time().toString(datetime_format.at(1))); + // Both time and date setted. + else + it->setText(t, list[i].lastModified().date().toString(datetime_format.at(0)) + " " + list[i].lastModified().time().toString(datetime_format.at(1))); + break; + } + case DATECREATE: + { + QStringList datetime_format = getDateFormat(); + it->setWhatsThis(DATECREATE, list[i].lastModified().toString("yyyyMMddhhmmsszzz")); + if(datetime_format.at(0).isEmpty() && datetime_format.at(1).isEmpty()) + it->setText(t, list[i].lastModified().toString(Qt::DefaultLocaleShortDate) ); + else if(!datetime_format.at(0).isEmpty() && datetime_format.at(1).isEmpty()) + it->setText(t, list[i].lastModified().date().toString(datetime_format.at(0)) + " " + list[i].lastModified().time().toString(Qt::DefaultLocaleShortDate)); + else if(datetime_format.at(0).isEmpty() && !datetime_format.at(1).isEmpty()) + it->setText(t, list[i].lastModified().date().toString(Qt::DefaultLocaleShortDate) + " " + list[i].lastModified().time().toString(datetime_format.at(1))); + else + it->setText(t, list[i].lastModified().date().toString(datetime_format.at(0)) + " " + list[i].lastModified().time().toString(datetime_format.at(1))); + break; + } } } if(addnew){ treeWidget->addTopLevelItem(it); } @@ -883,24 +910,18 @@ void DirWidget::mouseReleaseEvent(QMouseEvent *ev){ // STATIC //==================== -QString DirWidget::getDateFormat() { +QStringList DirWidget::getDateFormat() { return DirWidget::date_format; } // This function is only called if user changes sessionsettings. By doing so, operations like sorting by date // are faster because the date format is already stored in DirWidget::date_format static variable void DirWidget::setDateFormat() { - const QString default_date_format = "dddd, d MMMM yyyy"; - const QString default_hour_format = "h:mm"; - QSettings::setPath(QSettings::NativeFormat, QSettings::UserScope, QDir::homePath()+"/.lumina"); + if(!DirWidget::date_format.isEmpty()) + DirWidget::date_format.clear(); QSettings settings("LuminaDE","sessionsettings"); QString date, time; - // If DateFormat/TimeFormat don't exist or are empty, default values are setted - date = settings.value("DateFormat", default_date_format).toString(); - time = settings.value("TimeFormat", default_hour_format).toString(); - if(date.isEmpty()) - date = default_date_format; - if(time.isEmpty()) - time = default_hour_format; - DirWidget::date_format = date + " " + time; + // If value doesn't exist or is not setted, empty string is returned + DirWidget::date_format << settings.value("DateFormat").toString(); + DirWidget::date_format << settings.value("TimeFormat").toString(); } diff --git a/lumina-fm/widgets/DirWidget.h b/lumina-fm/widgets/DirWidget.h index 474531f3..6f0e3d8b 100644 --- a/lumina-fm/widgets/DirWidget.h +++ b/lumina-fm/widgets/DirWidget.h @@ -54,7 +54,7 @@ public: void setShowCloseButton(bool show); //Date format for show items - static QString getDateFormat(); + static QStringList getDateFormat(); static void setDateFormat(); public slots: @@ -98,7 +98,7 @@ private: //Functions for internal use void setupConnections(); QStringList currentSelection(); - static QString date_format; + static QStringList date_format; private slots: //UI BUTTONS/Actions @@ -185,22 +185,8 @@ public: inline virtual bool operator<(const QTreeWidgetItem &tmp) const { int column = this->treeWidget()->sortColumn(); // We are in date text - if(column == DirWidget::DATEMOD || column == DirWidget::DATECREATE) { - // Get the stored text and try to convert to QDateTime - QString text = this->text(column); - QString text_tmp = tmp.text(column); - QDateTime date_time = QDateTime::fromString(text, DirWidget::getDateFormat()); - QDateTime date_time_tmp = QDateTime::fromString(text_tmp, DirWidget::getDateFormat()); - // If the conversion are ok in both objects, compare them - if(date_time.isValid() && date_time_tmp.isValid()) - return date_time < date_time_tmp; - // If some of the dates are invalid, use the base class implementation (order by string) - else { - if(DEBUG) - qDebug() << "Cannot convert the date. Texts arrived are " << text << " and " << text_tmp; - return QTreeWidgetItem::operator <(tmp); - } - } + if(column == DirWidget::DATEMOD || column == DirWidget::DATECREATE) + return this->whatsThis(column) < tmp.whatsThis(column); // We are in size text else if(column == DirWidget::SIZE) { QString text = this->text(column); -- cgit From ad713efa6f6232422d9e88095e8313383fed64db Mon Sep 17 00:00:00 2001 From: Carlos Bohórquez Date: Fri, 11 Sep 2015 15:06:27 +0200 Subject: Static variables not needed now --- lumina-fm/widgets/DirWidget.cpp | 39 +++++++++++++++++---------------------- lumina-fm/widgets/DirWidget.h | 6 +++--- 2 files changed, 20 insertions(+), 25 deletions(-) diff --git a/lumina-fm/widgets/DirWidget.cpp b/lumina-fm/widgets/DirWidget.cpp index 7954cc8e..6c1c4553 100644 --- a/lumina-fm/widgets/DirWidget.cpp +++ b/lumina-fm/widgets/DirWidget.cpp @@ -29,8 +29,6 @@ const QString sessionsettings_config_file = QDir::homePath() + "/.lumina/LuminaDE/sessionsettings.conf"; -QStringList DirWidget::date_format = QStringList(); - DirWidget::DirWidget(QString objID, QWidget *parent) : QWidget(parent), ui(new Ui::DirWidget){ ui->setupUi(this); //load the designer file ID = objID; @@ -162,6 +160,23 @@ void DirWidget::setShowCloseButton(bool show){ ui->actionClose_Browser->setVisible(show); } +QStringList DirWidget::getDateFormat() { + return date_format; +} + +// This function is only called if user changes sessionsettings. By doing so, operations like sorting by date +// are faster because the date format is already stored in DirWidget::date_format static variable +void DirWidget::setDateFormat() { + if(!date_format.isEmpty()) + date_format.clear(); + QSettings settings("LuminaDE","sessionsettings"); + QString date, time; + // If value doesn't exist or is not setted, empty string is returned + date_format << settings.value("DateFormat").toString(); + date_format << settings.value("TimeFormat").toString(); +} + + // ================ // PUBLIC SLOTS // ================ @@ -905,23 +920,3 @@ void DirWidget::mouseReleaseEvent(QMouseEvent *ev){ ev->ignore(); //not handled here } } - -//==================== -// STATIC -//==================== - -QStringList DirWidget::getDateFormat() { - return DirWidget::date_format; -} - -// This function is only called if user changes sessionsettings. By doing so, operations like sorting by date -// are faster because the date format is already stored in DirWidget::date_format static variable -void DirWidget::setDateFormat() { - if(!DirWidget::date_format.isEmpty()) - DirWidget::date_format.clear(); - QSettings settings("LuminaDE","sessionsettings"); - QString date, time; - // If value doesn't exist or is not setted, empty string is returned - DirWidget::date_format << settings.value("DateFormat").toString(); - DirWidget::date_format << settings.value("TimeFormat").toString(); -} diff --git a/lumina-fm/widgets/DirWidget.h b/lumina-fm/widgets/DirWidget.h index 6f0e3d8b..adf349a9 100644 --- a/lumina-fm/widgets/DirWidget.h +++ b/lumina-fm/widgets/DirWidget.h @@ -54,8 +54,8 @@ public: void setShowCloseButton(bool show); //Date format for show items - static QStringList getDateFormat(); - static void setDateFormat(); + QStringList getDateFormat(); + void setDateFormat(); public slots: void LoadDir(QString dir, LFileInfoList list); @@ -98,7 +98,7 @@ private: //Functions for internal use void setupConnections(); QStringList currentSelection(); - static QStringList date_format; + QStringList date_format; private slots: //UI BUTTONS/Actions -- cgit From f0001106f033b9c2c9602282001f17a148ed29b0 Mon Sep 17 00:00:00 2001 From: Carlos Bohórquez Date: Fri, 11 Sep 2015 15:10:11 +0200 Subject: Forget delete 2 unused variables --- lumina-fm/widgets/DirWidget.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/lumina-fm/widgets/DirWidget.cpp b/lumina-fm/widgets/DirWidget.cpp index 6c1c4553..6e5c3941 100644 --- a/lumina-fm/widgets/DirWidget.cpp +++ b/lumina-fm/widgets/DirWidget.cpp @@ -170,7 +170,6 @@ void DirWidget::setDateFormat() { if(!date_format.isEmpty()) date_format.clear(); QSettings settings("LuminaDE","sessionsettings"); - QString date, time; // If value doesn't exist or is not setted, empty string is returned date_format << settings.value("DateFormat").toString(); date_format << settings.value("TimeFormat").toString(); -- cgit