diff --git a/sleepyhead/SleepLib/loader_plugins/cms50_loader.h b/sleepyhead/SleepLib/loader_plugins/cms50_loader.h index 8f139b1c..2c62d6fe 100644 --- a/sleepyhead/SleepLib/loader_plugins/cms50_loader.h +++ b/sleepyhead/SleepLib/loader_plugins/cms50_loader.h @@ -3,8 +3,8 @@ * Copyright (C) 2011-2018 Mark Watkins * * This file is subject to the terms and conditions of the GNU General Public - * License. See the file COPYING in the main directory of the Linux - * distribution for more details. */ + * License. See the file COPYING in the main directory of the source code + * for more details. */ #ifndef CMS50LOADER_H #define CMS50LOADER_H diff --git a/sleepyhead/SleepLib/loader_plugins/icon_loader.cpp b/sleepyhead/SleepLib/loader_plugins/icon_loader.cpp index 15a339fe..1a53d7e8 100644 --- a/sleepyhead/SleepLib/loader_plugins/icon_loader.cpp +++ b/sleepyhead/SleepLib/loader_plugins/icon_loader.cpp @@ -16,8 +16,8 @@ const QString FPHCARE = "FPHCARE"; -FPIcon::FPIcon(MachineID id) - : CPAP(id) +FPIcon::FPIcon(Profile *profile, MachineID id) + : CPAP(profile, id) { } diff --git a/sleepyhead/SleepLib/loader_plugins/icon_loader.h b/sleepyhead/SleepLib/loader_plugins/icon_loader.h index 574e2802..34d03c8d 100644 --- a/sleepyhead/SleepLib/loader_plugins/icon_loader.h +++ b/sleepyhead/SleepLib/loader_plugins/icon_loader.h @@ -30,7 +30,7 @@ const int fpicon_data_version = 3; class FPIcon: public CPAP { public: - FPIcon(MachineID id = 0); + FPIcon(Profile *, MachineID id = 0); virtual ~FPIcon(); }; diff --git a/sleepyhead/SleepLib/loader_plugins/intellipap_loader.cpp b/sleepyhead/SleepLib/loader_plugins/intellipap_loader.cpp index a7558b72..3817acf1 100644 --- a/sleepyhead/SleepLib/loader_plugins/intellipap_loader.cpp +++ b/sleepyhead/SleepLib/loader_plugins/intellipap_loader.cpp @@ -14,8 +14,8 @@ ChannelID INTP_SmartFlexMode, INTP_SmartFlexLevel; -Intellipap::Intellipap(MachineID id) - : CPAP(id) +Intellipap::Intellipap(Profile *profile, MachineID id) + : CPAP(profile, id) { } diff --git a/sleepyhead/SleepLib/loader_plugins/intellipap_loader.h b/sleepyhead/SleepLib/loader_plugins/intellipap_loader.h index 7b3df400..0823b1ec 100644 --- a/sleepyhead/SleepLib/loader_plugins/intellipap_loader.h +++ b/sleepyhead/SleepLib/loader_plugins/intellipap_loader.h @@ -29,7 +29,7 @@ const int intellipap_data_version = 3; class Intellipap: public CPAP { public: - Intellipap(MachineID id = 0); + Intellipap(Profile *, MachineID id = 0); virtual ~Intellipap(); }; diff --git a/sleepyhead/SleepLib/loader_plugins/mseries_loader.cpp b/sleepyhead/SleepLib/loader_plugins/mseries_loader.cpp index 8c60eb9b..94ae5f75 100644 --- a/sleepyhead/SleepLib/loader_plugins/mseries_loader.cpp +++ b/sleepyhead/SleepLib/loader_plugins/mseries_loader.cpp @@ -14,8 +14,8 @@ extern QProgressBar *qprogress; -MSeries::MSeries(MachineID id) - : CPAP(id) +MSeries::MSeries(Profile *profile, MachineID id) + : CPAP(profile, id) { } diff --git a/sleepyhead/SleepLib/loader_plugins/mseries_loader.h b/sleepyhead/SleepLib/loader_plugins/mseries_loader.h index 365cc2f3..acd21dbe 100644 --- a/sleepyhead/SleepLib/loader_plugins/mseries_loader.h +++ b/sleepyhead/SleepLib/loader_plugins/mseries_loader.h @@ -31,7 +31,7 @@ const int mseries_data_version = 2; class MSeries: public CPAP { public: - MSeries(MachineID id = 0); + MSeries(Profile *, MachineID id = 0); virtual ~MSeries(); }; diff --git a/sleepyhead/SleepLib/loader_plugins/prs1_loader.cpp b/sleepyhead/SleepLib/loader_plugins/prs1_loader.cpp index 9783a680..be87b650 100644 --- a/sleepyhead/SleepLib/loader_plugins/prs1_loader.cpp +++ b/sleepyhead/SleepLib/loader_plugins/prs1_loader.cpp @@ -3,8 +3,8 @@ * Copyright (c) 2011-2018 Mark Watkins * * This file is subject to the terms and conditions of the GNU General Public - * License. See the file COPYING in the main directory of the Linux - * distribution for more details. */ + * License. See the file COPYING in the main directory of the source code + * for more details. */ #include #include @@ -102,7 +102,7 @@ enum FlexMode { FLEX_None, FLEX_CFlex, FLEX_CFlexPlus, FLEX_AFlex, FLEX_RiseTime ChannelID PRS1_TimedBreath = 0, PRS1_HeatedTubing = 0; -PRS1::PRS1(MachineID id): CPAP(id) +PRS1::PRS1(Profile *profile, MachineID id): CPAP(profile, id) { } PRS1::~PRS1() diff --git a/sleepyhead/SleepLib/loader_plugins/prs1_loader.h b/sleepyhead/SleepLib/loader_plugins/prs1_loader.h index 524949ea..a8ab1b09 100644 --- a/sleepyhead/SleepLib/loader_plugins/prs1_loader.h +++ b/sleepyhead/SleepLib/loader_plugins/prs1_loader.h @@ -30,7 +30,7 @@ const int prs1_data_version = 15; class PRS1: public CPAP { public: - PRS1(MachineID id = 0); + PRS1(Profile *, MachineID id = 0); virtual ~PRS1(); }; diff --git a/sleepyhead/SleepLib/loader_plugins/weinmann_loader.cpp b/sleepyhead/SleepLib/loader_plugins/weinmann_loader.cpp index 4d9e220c..677156bc 100644 --- a/sleepyhead/SleepLib/loader_plugins/weinmann_loader.cpp +++ b/sleepyhead/SleepLib/loader_plugins/weinmann_loader.cpp @@ -18,8 +18,8 @@ extern QProgressBar *qprogress; -Weinmann::Weinmann(MachineID id) - : CPAP(id) +Weinmann::Weinmann(Profile *profile, MachineID id) + : CPAP(profile, id) { } diff --git a/sleepyhead/SleepLib/loader_plugins/weinmann_loader.h b/sleepyhead/SleepLib/loader_plugins/weinmann_loader.h index aeb74527..0ed5c22e 100644 --- a/sleepyhead/SleepLib/loader_plugins/weinmann_loader.h +++ b/sleepyhead/SleepLib/loader_plugins/weinmann_loader.h @@ -29,7 +29,7 @@ const int weinmann_data_version = 3; class Weinmann: public CPAP { public: - Weinmann(MachineID id = 0); + Weinmann(Profile *, MachineID id = 0); virtual ~Weinmann(); }; diff --git a/sleepyhead/SleepLib/machine.cpp b/sleepyhead/SleepLib/machine.cpp index a8c6b15e..10df2215 100644 --- a/sleepyhead/SleepLib/machine.cpp +++ b/sleepyhead/SleepLib/machine.cpp @@ -41,7 +41,7 @@ extern QProgressBar *qprogress; ////////////////////////////////////////////////////////////////////////////////////////// // Machine Base-Class implmementation ////////////////////////////////////////////////////////////////////////////////////////// -Machine::Machine(MachineID id) +Machine::Machine(Profile *_profile, MachineID id) : profile(_profile) { day.clear(); highest_sessionid = 0; @@ -57,8 +57,8 @@ Machine::Machine(MachineID id) temp = rand(); found = false; - for (int i=0;im_machlist.size(); ++i) { - if (p_profile->m_machlist.at(i)->id() == temp) found = true; + for (int i=0;im_machlist.size(); ++i) { + if (profile->m_machlist.at(i)->id() == temp) found = true; } } while (found); @@ -198,8 +198,8 @@ bool Machine::loadSessionInfo() // Find date this session belongs in QDate Machine::pickDate(qint64 first) { - QTime split_time = p_profile->session->daySplitTime(); - int combine_sessions = p_profile->session->combineCloseSessions(); + QTime split_time = profile->session->daySplitTime(); + int combine_sessions = profile->session->combineCloseSessions(); QDateTime d2 = QDateTime::fromTime_t(first / 1000); @@ -232,13 +232,13 @@ bool Machine::AddSession(Session *s) qCritical() << "AddSession() called with a null object"; return false; } - if (p_profile == nullptr) { - qCritical() << "AddSession() called without a valid p_profile"; + if (profile == nullptr) { + qCritical() << "AddSession() called without a valid profile"; return false; } - if (p_profile->session->ignoreOlderSessions()) { - qint64 ignorebefore = p_profile->session->ignoreOlderSessionsDate().toMSecsSinceEpoch(); + if (profile->session->ignoreOlderSessions()) { + qint64 ignorebefore = profile->session->ignoreOlderSessionsDate().toMSecsSinceEpoch(); if (s->last() < ignorebefore) { skipped_sessions++; return false; @@ -254,24 +254,24 @@ bool Machine::AddSession(Session *s) QTime split_time; int combine_sessions; - bool locksessions = p_profile->session->lockSummarySessions(); + bool locksessions = profile->session->lockSummarySessions(); if (locksessions) { - split_time = s->summaryOnly() ? QTime(12,0,0) : p_profile->session->daySplitTime(); + split_time = s->summaryOnly() ? QTime(12,0,0) : profile->session->daySplitTime(); combine_sessions = s->summaryOnly() ? 0 : p_profile->session->combineCloseSessions(); } else { - split_time = p_profile->session->daySplitTime(); - combine_sessions = p_profile->session->combineCloseSessions(); + split_time = profile->session->daySplitTime(); + combine_sessions = profile->session->combineCloseSessions(); } - int ignore_sessions = p_profile->session->ignoreShortSessions(); + int ignore_sessions = profile->session->ignoreShortSessions(); int session_length = s->last() - s->first(); session_length /= 60000; sessionlist[s->session()] = s; // To make sure it get's saved later even if it's not wanted. - //int drift=p_profile->cpap->clockDrift(); + //int drift=profile->cpap->clockDrift(); QDateTime d2 = QDateTime::fromTime_t(s->first() / 1000); @@ -338,7 +338,7 @@ bool Machine::AddSession(Session *s) dit = day.find(date); if (dit == day.end()) { - dit = day.insert(date, p_profile->addDay(date)); + dit = day.insert(date, profile->addDay(date)); } dd = dit.value(); @@ -356,9 +356,9 @@ bool Machine::AddSession(Session *s) dd->addSession(*i); } -// QMap >::iterator nd = p_profile->daylist.find(date.addDays(1)); -// if (nd != p_profile->daylist.end()) { -// p_profile->unlinkDay(nd.key(), nd.value()); +// QMap >::iterator nd = profile->daylist.find(date.addDays(1)); +// if (nd != profile->daylist.end()) { +// profile->unlinkDay(nd.key(), nd.value()); // } // QList::iterator iend = nd.value().end(); @@ -425,7 +425,7 @@ bool Machine::unlinkSession(Session * sess) } if (d->size() == 0) { - p_profile->unlinkDay(d); + profile->unlinkDay(d); } } } @@ -457,7 +457,7 @@ bool Machine::Purge(int secret) QFile impfile(getDataPath()+"/imported_files.csv"); impfile.remove(); - QFile rxcache(p_profile->Get("{" + STR_GEN_DataFolder + "}/RXChanges.cache" )); + QFile rxcache(profile->Get("{" + STR_GEN_DataFolder + "}/RXChanges.cache" )); rxcache.remove(); QFile sumfile(getDataPath()+"/Summaries.xml.gz"); @@ -546,7 +546,7 @@ void Machine::setInfo(MachineInfo inf) const QString Machine::getDataPath() { if (m_dataPath.isEmpty()) { - m_dataPath = p_profile->Get("{" + STR_GEN_DataFolder + "}/" + info.loadername + "_" + (info.serial.isEmpty() ? hexid() : info.serial)) + "/"; + m_dataPath = profile->Get("{" + STR_GEN_DataFolder + "}/" + info.loadername + "_" + (info.serial.isEmpty() ? hexid() : info.serial)) + "/"; } return m_dataPath; } @@ -558,10 +558,9 @@ const QString Machine::getEventsPath() { return getDataPath() + "Events/"; } - const QString Machine::getBackupPath() { - return p_profile->Get("{" + STR_GEN_DataFolder + "}/" + info.loadername + "_" + (info.serial.isEmpty() ? hexid() : info.serial) + "/Backup/"); + return getDataPath() + "Backup/"; } // dirSize lazily pinched from https://stackoverflow.com/questions/47854288/can-not-get-directory-size-in-qt-c, thank's "Mike" @@ -610,7 +609,7 @@ bool Machine::Load() QPixmap image = getPixmap().scaled(64,64); popup->setPixmap(image); - popup->setMessage(QObject::tr("Loading %1 data for %2...").arg(info.brand).arg(p_profile->user->userName())); + popup->setMessage(QObject::tr("Loading %1 data for %2...").arg(info.brand).arg(profile->user->userName())); popup->open(); QProgressBar * saveQProgress = qprogress; @@ -1050,7 +1049,7 @@ bool Machine::LoadSummary(QProgressBar * progress) QMap::iterator it_end = sess_order.end(); QMap::iterator it; int cnt = 0; - bool loadSummaries = p_profile->session->preloadSummaries(); + bool loadSummaries = profile->session->preloadSummaries(); progress->setMaximum(sess_order.size()); for (it = sess_order.begin(); it != it_end; ++it, ++cnt) { @@ -1086,7 +1085,7 @@ bool Machine::SaveSummaryCache() QDomElement root = doc.createElement("sessions"); root.setAttribute("version", summaryxml_version); - root.setAttribute("profile", p_profile->user->userName()); + root.setAttribute("profile", profile->user->userName()); root.setAttribute("count", sessionlist.size()); root.setAttribute("loader", info.loadername); root.setAttribute("serial", info.serial); @@ -1220,7 +1219,7 @@ QList Machine::availableChannels(quint32 chantype) ////////////////////////////////////////////////////////////////////////////////////////// // CPAP implmementation ////////////////////////////////////////////////////////////////////////////////////////// -CPAP::CPAP(MachineID id): Machine(id) +CPAP::CPAP(Profile * profile, MachineID id): Machine(profile, id) { m_type = MT_CPAP; } @@ -1232,7 +1231,7 @@ CPAP::~CPAP() ////////////////////////////////////////////////////////////////////////////////////////// // Oximeter Class implmementation ////////////////////////////////////////////////////////////////////////////////////////// -Oximeter::Oximeter(MachineID id): Machine(id) +Oximeter::Oximeter(Profile * profile, MachineID id): Machine(profile, id) { m_type = MT_OXIMETER; } @@ -1244,7 +1243,7 @@ Oximeter::~Oximeter() ////////////////////////////////////////////////////////////////////////////////////////// // SleepStage Class implmementation ////////////////////////////////////////////////////////////////////////////////////////// -SleepStage::SleepStage(MachineID id): Machine(id) +SleepStage::SleepStage(Profile * profile, MachineID id): Machine(profile, id) { m_type = MT_SLEEPSTAGE; } @@ -1255,7 +1254,7 @@ SleepStage::~SleepStage() ////////////////////////////////////////////////////////////////////////////////////////// // PositionSensor Class implmementation ////////////////////////////////////////////////////////////////////////////////////////// -PositionSensor::PositionSensor(MachineID id): Machine(id) +PositionSensor::PositionSensor(Profile * profile, MachineID id): Machine(profile, id) { m_type = MT_POSITION; } diff --git a/sleepyhead/SleepLib/machine.h b/sleepyhead/SleepLib/machine.h index d7babcf7..0bc8cec5 100644 --- a/sleepyhead/SleepLib/machine.h +++ b/sleepyhead/SleepLib/machine.h @@ -83,7 +83,7 @@ class Machine If supplied MachineID is zero, it will generate a new unused random one. */ - Machine(MachineID id = 0); + Machine(Profile * _profile, MachineID id = 0); virtual ~Machine(); //! \brief Load all Machine summary data @@ -268,6 +268,8 @@ class Machine QString m_summaryPath; QString m_eventsPath; QString m_dataPath; + + Profile * profile; }; @@ -277,7 +279,7 @@ class Machine class CPAP: public Machine { public: - CPAP(MachineID id = 0); + CPAP(Profile *, MachineID id = 0); virtual ~CPAP(); }; @@ -289,7 +291,7 @@ class CPAP: public Machine class Oximeter: public Machine { public: - Oximeter(MachineID id = 0); + Oximeter(Profile *, MachineID id = 0); virtual ~Oximeter(); protected: }; @@ -300,7 +302,7 @@ class Oximeter: public Machine class SleepStage: public Machine { public: - SleepStage(MachineID id = 0); + SleepStage(Profile *, MachineID id = 0); virtual ~SleepStage(); protected: }; @@ -311,7 +313,7 @@ class SleepStage: public Machine class PositionSensor: public Machine { public: - PositionSensor(MachineID id = 0); + PositionSensor(Profile *, MachineID id = 0); virtual ~PositionSensor(); protected: }; diff --git a/sleepyhead/SleepLib/profiles.cpp b/sleepyhead/SleepLib/profiles.cpp index 184467a3..c1177102 100644 --- a/sleepyhead/SleepLib/profiles.cpp +++ b/sleepyhead/SleepLib/profiles.cpp @@ -674,23 +674,23 @@ Machine * Profile::CreateMachine(MachineInfo info, MachineID id) switch (info.type) { case MT_CPAP: - m = new CPAP(id); + m = new CPAP(this, id); break; case MT_SLEEPSTAGE: - m = new SleepStage(id); + m = new SleepStage(this, id); break; case MT_OXIMETER: - m = new Oximeter(id); + m = new Oximeter(this, id); break; case MT_POSITION: - m = new PositionSensor(id); + m = new PositionSensor(this, id); break; case MT_JOURNAL: - m = new Machine(id); + m = new Machine(this, id); m->setType(MT_JOURNAL); break; default: - m = new Machine(id); + m = new Machine(this, id); break; } diff --git a/sleepyhead/profileselector.cpp b/sleepyhead/profileselector.cpp index 1385f7d0..79b6921d 100644 --- a/sleepyhead/profileselector.cpp +++ b/sleepyhead/profileselector.cpp @@ -51,15 +51,21 @@ ProfileSelector::ProfileSelector(QWidget *parent) : model = nullptr; proxy = nullptr; - showDiskUsage = false; + showDiskUsage = false; // in case I want to preference it later on_diskSpaceInfo_linkActivated(showDiskUsage ? "show" : "hide"); ui->versionLabel->setText(VersionString); ui->diskSpaceInfo->setVisible(false); + + QItemSelectionModel * sm = ui->profileView->selectionModel(); + connect(sm, SIGNAL(currentRowChanged(QModelIndex,QModelIndex)), this, SLOT(on_selectionChanged(QModelIndex,QModelIndex))); + ui->buttonEditProfile->setEnabled(false); } ProfileSelector::~ProfileSelector() { + QItemSelectionModel * sm = ui->profileView->selectionModel(); + disconnect(sm, SIGNAL(currentRowChanged(QModelIndex,QModelIndex)), this, SLOT(on_selectionChanged(QModelIndex,QModelIndex))); delete ui; } @@ -87,6 +93,19 @@ void ProfileSelector::updateProfileList() // int sel = -1; QFontMetrics fm(ui->profileView->font()); + //#if QT_VERSION < QT_VERSION_CHECK(5,11,0) // not sure when this was fixed + QPalette palette = ui->profileView->palette(); + palette.setColor(QPalette::Highlight, "#3a7fc2"); + palette.setColor(QPalette::HighlightedText, "white"); + ui->profileView->setPalette(palette); + //#endif + + ui->profileView->setEditTriggers(QAbstractItemView::NoEditTriggers); + ui->profileView->setFocusPolicy(Qt::NoFocus); +// ui->profileView->setSelectionMode(QAbstractItemView::NoSelection); + ui->profileView->setSelectionBehavior(QAbstractItemView::SelectRows); + ui->profileView->setSelectionMode(QAbstractItemView::SingleSelection); + QMap::iterator pi; for (pi = Profiles::profiles.begin(); pi != Profiles::profiles.end(); pi++) { @@ -145,19 +164,14 @@ void ProfileSelector::updateProfileList() proxy->setSortCaseSensitivity(Qt::CaseInsensitive); ui->profileView->setModel(proxy); - ui->profileView->setSelectionBehavior(QAbstractItemView::SelectRows); - ui->profileView->setSelectionMode(QAbstractItemView::SingleSelection); QHeaderView *headerView = ui->profileView->horizontalHeader(); headerView->setStretchLastSection(true); headerView->setSectionResizeMode(QHeaderView::Stretch); - QPalette* palette = new QPalette(); - palette->setColor(QPalette::Highlight,QColor("#3a7fc2")); - palette->setColor(QPalette::HighlightedText, QColor("white")); - - ui->profileView->setPalette(*palette); - + QItemSelectionModel * sm = ui->profileView->selectionModel(); + disconnect(sm, SIGNAL(currentRowChanged(QModelIndex,QModelIndex)), this, SLOT(on_selectionChanged(QModelIndex,QModelIndex))); + connect(sm, SIGNAL(currentRowChanged(QModelIndex,QModelIndex)), this, SLOT(on_selectionChanged(QModelIndex,QModelIndex))); } @@ -184,7 +198,7 @@ void ProfileSelector::updateProfileHighlight(QString name) break; } } - if (p_profile) { + /*if (p_profile) { QString html = QString(); if (!p_profile->user->lastName().isEmpty() && !p_profile->user->firstName().isEmpty()) { @@ -206,11 +220,9 @@ void ProfileSelector::updateProfileHighlight(QString name) ui->diskSpaceInfo->setVisible(true); ui->profileInfoGroupBox->setTitle(tr("Current Profile: %1").arg(name)); ui->profileInfoLabel->setText(html); - - on_diskSpaceInfo_linkActivated(showDiskUsage ? "show" : "hide"); // don't show disk info by default } else { ui->diskSpaceInfo->setVisible(false); - } + } */ } @@ -314,6 +326,8 @@ void ProfileSelector::on_buttonEditProfile_clicked() } delete newprof; + } else { + QMessageBox::information(this, STR_MessageBox_Information, tr("Select a profile first"), QMessageBox::Ok); } } @@ -386,7 +400,7 @@ void ProfileSelector::on_buttonDestroyProfile_clicked() QDialog confirmdlg; QVBoxLayout layout(&confirmdlg); - QLabel message(QString(""+STR_MessageBox_Warning+": "+tr("You are about to destroy profile '%1'.")+"

"+tr("Think carefully, as this will irretrievably delete the profile along with all backup data stored under
%2.")+"

"+tr("Enter the word DELETE below to confirm.")).arg(name).arg(path), &confirmdlg); + QLabel message(QString(""+STR_MessageBox_Warning+": "+tr("You are about to destroy profile '%1'.")+"

"+tr("Think carefully, as this will irretrievably delete the profile along with all backup data stored under
%2.")+"

"+tr("Enter the word DELETE below (exactly as shown) to confirm.")).arg(name).arg(path), &confirmdlg); layout.insertWidget(0,&message,1); QLineEdit lineedit(&confirmdlg); layout.insertWidget(1, &lineedit, 1); @@ -404,7 +418,7 @@ void ProfileSelector::on_buttonDestroyProfile_clicked() if (confirmdlg.exec() != QDialog::Accepted) return; - if (lineedit.text().compare("DELETE")!=0) { + if (lineedit.text().compare(tr("DELETE"))!=0) { QMessageBox::information(NULL, tr("Sorry"), tr("You need to enter DELETE in capital letters."), QMessageBox::Ok); return; } @@ -444,22 +458,30 @@ QString formatSize(qint64 size) { } +QString getProfileDiskInfo(Profile *profile) +{ + QString html; + if (profile) { + qint64 sizeSummaries = profile->diskSpaceSummaries(); + qint64 sizeEvents = profile->diskSpaceEvents(); + qint64 sizeBackups = profile->diskSpaceBackups(); + + html += "" + "" + "" + "" + "
"+QObject::tr("Summaries:")+""+formatSize(sizeSummaries)+"
"+QObject::tr("Events:")+""+formatSize(sizeEvents)+"
"+QObject::tr("Backups:")+""+formatSize(sizeBackups)+"
"; + } + return html; + +} + void ProfileSelector::on_diskSpaceInfo_linkActivated(const QString &link) { QString html; if (link == "show") { - html += ""+tr("Hide disk usage information")+""; - if (p_profile) { - qint64 sizeSummaries = p_profile->diskSpaceSummaries(); - qint64 sizeEvents = p_profile->diskSpaceEvents(); - qint64 sizeBackups = p_profile->diskSpaceBackups(); - - html += "" - "" - "" - "
"+tr("Summaries:")+""+formatSize(sizeSummaries)+"
"+tr("Events:")+""+formatSize(sizeEvents)+"
"+tr("Backups:")+""+formatSize(sizeBackups)+"
"; - } + html += ""+tr("Hide disk usage information")+""+getProfileDiskInfo(p_profile); showDiskUsage = true; } else { html += ""+tr("Show disk usage information")+""; @@ -467,3 +489,43 @@ void ProfileSelector::on_diskSpaceInfo_linkActivated(const QString &link) } ui->diskSpaceInfo->setText(html); } + +void ProfileSelector::on_selectionChanged(const QModelIndex &index, const QModelIndex &) +{ + bool enabled = false; + if (index.isValid()) { + QString name = proxy->data(proxy->index(index.row(), 0, QModelIndex()), Qt::UserRole+2).toString(); + auto prof = Profiles::profiles.find(name); + if (prof != Profiles::profiles.end()) { + enabled = true; + QString html = QString(); + Profile * profile = prof.value(); + + if (!profile->user->lastName().isEmpty() && !profile->user->firstName().isEmpty()) { + html += tr("Name: %1, %2").arg(profile->user->lastName()).arg(profile->user->firstName())+"
"; + } + if (!profile->user->phone().isEmpty()) { + html += tr("Phone: %1").arg(profile->user->phone())+"
"; + } + if (!profile->user->email().isEmpty()) { + html += tr("Email: %1").arg(profile->user->email())+"
"; + } + if (!profile->user->address().isEmpty()) { + html += "
"+tr("Address:")+"
"+profile->user->address().trimmed().replace("\n","
")+"
"; + } + if (html.isEmpty()) { + html += tr("No profile information given")+"
"; + } + ui->diskSpaceInfo->setVisible(true); + ui->profileInfoGroupBox->setTitle(tr("Profile: %1").arg(name)); + ui->profileInfoLabel->setText(html); + + if (showDiskUsage) { // ugly, but uh.... + ui->diskSpaceInfo->setText(""+tr("Hide disk usage information")+""+getProfileDiskInfo(prof.value())); + } + } else { + ui->diskSpaceInfo->setText("Something went wrong"); + } + } + ui->buttonEditProfile->setEnabled(enabled); +} diff --git a/sleepyhead/profileselector.h b/sleepyhead/profileselector.h index 0ed30ee0..a51040d8 100644 --- a/sleepyhead/profileselector.h +++ b/sleepyhead/profileselector.h @@ -53,6 +53,8 @@ private slots: void on_diskSpaceInfo_linkActivated(const QString &link); + void on_selectionChanged(const QModelIndex ¤t, const QModelIndex &previous); + private: Ui::ProfileSelector *ui; QStandardItemModel *model; diff --git a/sleepyhead/profileselector.ui b/sleepyhead/profileselector.ui index e1e00ab4..370983ff 100644 --- a/sleepyhead/profileselector.ui +++ b/sleepyhead/profileselector.ui @@ -58,7 +58,7 @@ true - QAbstractItemView::SingleSelection + QAbstractItemView::NoSelection QAbstractItemView::SelectRows @@ -244,7 +244,7 @@ - Current Profile: None + Profile: None Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter