From b49e483fa4411249b0866ca5300c1887da129af9 Mon Sep 17 00:00:00 2001 From: Guy Scharf Date: Wed, 9 Sep 2020 20:55:23 -0700 Subject: [PATCH] Remove SleepyHead modules ProfileSelect.h, .cpp, .ui. OSCAR uses ProfileSelector.* modules --- oscar/oscar.pro | 3 - oscar/profileselect.cpp | 368 ----------------------------------- oscar/profileselect.h | 62 ------ oscar/profileselect.ui | 422 ---------------------------------------- 4 files changed, 855 deletions(-) delete mode 100644 oscar/profileselect.cpp delete mode 100644 oscar/profileselect.h delete mode 100644 oscar/profileselect.ui diff --git a/oscar/oscar.pro b/oscar/oscar.pro index 71c5d30b..eb704b56 100644 --- a/oscar/oscar.pro +++ b/oscar/oscar.pro @@ -258,7 +258,6 @@ SOURCES += \ newprofile.cpp \ overview.cpp \ preferencesdialog.cpp \ - profileselect.cpp \ reports.cpp \ sessionbar.cpp \ # updateparser.cpp \ @@ -337,7 +336,6 @@ HEADERS += \ newprofile.h \ overview.h \ preferencesdialog.h \ - profileselect.h \ reports.h \ sessionbar.h \ # updateparser.h \ @@ -415,7 +413,6 @@ FORMS += \ mainwindow.ui \ oximetry.ui \ preferencesdialog.ui \ - profileselect.ui \ newprofile.ui \ exportcsv.ui \ # UpdaterWindow.ui \ diff --git a/oscar/profileselect.cpp b/oscar/profileselect.cpp deleted file mode 100644 index fa62f99c..00000000 --- a/oscar/profileselect.cpp +++ /dev/null @@ -1,368 +0,0 @@ -/* Profile Select Implementation (Login Screen) - * - * 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 source code - * for more details. */ - -#include "profileselect.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include "ui_profileselect.h" -#include "SleepLib/profiles.h" -#include "newprofile.h" -#include "mainwindow.h" - -extern MainWindow * mainwin; - -ProfileSelect::ProfileSelect(QWidget *parent) : - QDialog(parent), - ui(new Ui::ProfileSelect) -{ - ui->setupUi(this); - QStringList str; - model = new QStandardItemModel(0, 0); - - int i = 0; - int sel = -1; - QString name; - - QIcon icon(":/icons/moon.png"); - - int w=0; - QFont font("Sans Serif", 18, QFont::Bold, false); - ui->listView->setFont(font); - - QFontMetrics fm(font); - QMap::iterator p; - for (p = Profiles::profiles.begin(); p != Profiles::profiles.end(); p++) { - name = p.key(); - - if (AppSetting->profileName() == name) { - sel = i; - } - - QStandardItem *item = new QStandardItem(name); - - item->setData(p.key(), Qt::UserRole+2); - item->setEditable(false); - - if (!(*p)->checkLock().isEmpty()) { - item->setForeground(QBrush(Qt::red)); - item->setText(name+" (open)"); - } - - QRect rect = fm.boundingRect(name); - if (rect.width() > w) w = rect.width(); - - // Profile fonts arern't loaded yet.. Using generic font. - item->setFont(font); - model->appendRow(item); - i++; - } - w+=20; - ui->listView->setMinimumWidth(w); - - proxy = new QSortFilterProxyModel(this); - proxy->setSourceModel(model); - proxy->setSortCaseSensitivity(Qt::CaseInsensitive); - - ui->listView->setModel(proxy); - ui->listView->setSelectionBehavior(QAbstractItemView::SelectRows); - ui->listView->setSelectionMode(QAbstractItemView::SingleSelection); - - if (sel >= 0) { ui->listView->setCurrentIndex(proxy->index(sel,0)); } //model->item(sel)->index()); } - - proxy->sort(0, Qt::AscendingOrder); - - m_tries = 0; - - popupMenu = new QMenu(this); - popupMenu->addAction(tr("Open Profile"), this, SLOT(openProfile())); - popupMenu->addAction(tr("Edit Profile"), this, SLOT(editProfile())); - popupMenu->addSeparator(); - popupMenu->addAction(tr("Delete Profile"), this, SLOT(deleteProfile())); - - ui->labelAppName->setText(STR_TR_OSCAR); - ui->labelVersion->setText(""); - // if (GIT_BRANCH!="master") - // ui->labelBuild->setText(GIT_BRANCH); - // else ui->labelBuild->setText(QString()); - ui->labelFolder->setText(GetAppData()); - ui->labelFolder->setToolTip("Current OSCAR data folder\n" + GetAppData()); - - ui->listView->verticalScrollBar()->setStyleSheet("QScrollBar:vertical {border: 0px solid grey; background: transparent; }" - "QScrollBar::handle:vertical {" - " background: qlineargradient(x1:0, y1:0, x2:1, y2:0," - " stop: 0 rgb(230, 230, 230), stop: 0.5 rgb(255, 255, 255), stop:1 rgb(230, 230, 230));" - " min-height: 0px;" - " border: 1px solid gray;" - " border-radius: 5px;" - "}"); -} - -ProfileSelect::~ProfileSelect() -{ - delete model; // why is this not being cleaned up by Qt? - delete popupMenu; - delete ui; -} -void ProfileSelect::earlyExit() -{ - accept(); -} -void ProfileSelect::editProfile() -{ - QString name = ui->listView->currentIndex().data(Qt::UserRole+2).toString(); - Profile *profile = Profiles::Get(name); - - if (!profile) { return; } - - bool reallyEdit = false; - - if (profile->user->hasPassword()) { - QDialog dialog(this, Qt::Dialog); - QLineEdit *e = new QLineEdit(&dialog); - e->setEchoMode(QLineEdit::Password); - dialog.connect(e, SIGNAL(returnPressed()), &dialog, SLOT(accept())); - dialog.setWindowTitle(tr("Enter Password for %1").arg(name)); - dialog.setMinimumWidth(300); - QVBoxLayout *lay = new QVBoxLayout(); - dialog.setLayout(lay); - lay->addWidget(e); - int tries = 0; - - do { - e->setText(""); - - if (dialog.exec() != QDialog::Accepted) { break; } - - tries++; - - if (profile->user->checkPassword(e->text())) { - reallyEdit = true; - break; - } else { - if (tries < 3) { - QMessageBox::warning(this, STR_MessageBox_Error, tr("Incorrect Password"), QMessageBox::Ok); - } else { - QMessageBox::warning(this, STR_MessageBox_Error, tr("You entered the password wrong too many times."), - QMessageBox::Ok); - reject(); - } - } - } while (tries < 3); - } else { reallyEdit = true; } - - if (reallyEdit) { - NewProfile newprof(this); - newprof.edit(name); - newprof.exec(); - } - - //qDebug() << "edit" << name; -} -void ProfileSelect::deleteProfile() -{ - QString name = ui->listView->currentIndex().data(Qt::UserRole+2).toString(); - - QDialog confirmdlg; - QVBoxLayout layout(&confirmdlg); - QLabel message(QString(""+STR_MessageBox_Warning+": "+tr("You are about to destroy profile '%1'.")+"

"+tr("Enter the word DELETE below to confirm.")).arg(name), &confirmdlg); - layout.insertWidget(0,&message,1); - QLineEdit lineedit(&confirmdlg); - layout.insertWidget(1, &lineedit, 1); - QHBoxLayout layout2; - layout.insertLayout(2,&layout2,1); - QPushButton cancel(QString("&Cancel"), &confirmdlg); - QPushButton accept(QString("&Delete Profile"), &confirmdlg); - layout2.addWidget(&cancel); - layout2.addStretch(1); - layout2.addWidget(&accept); - confirmdlg.connect(&cancel, SIGNAL(clicked()), &confirmdlg, SLOT(reject())); - confirmdlg.connect(&accept, SIGNAL(clicked()), &confirmdlg, SLOT(accept())); - confirmdlg.connect(&lineedit, SIGNAL(returnPressed()), &confirmdlg, SLOT(accept())); - - if (confirmdlg.exec() != QDialog::Accepted) - return; - - if (lineedit.text().compare("DELETE")!=0) { - QMessageBox::information(NULL, tr("Sorry"), tr("You need to enter DELETE in capital letters."), QMessageBox::Ok); - return; - } - - Profile * profile = Profiles::profiles[name]; - p_profile = profile; - // Hmmmmm..... -// if (!profile->Load()) { -// QMessageBox::warning(this, STR_MessageBox_Error, -// QString(tr("Could not open profile.. You will need to delete this profile directory manually")+ -// "\n\n"+tr("You will find it under the following location:")+"\n\n%1").arg(QDir::toNativeSeparators(GetAppData() + "/Profiles/" + profile->user->userName())), QMessageBox::Ok); -// return; -// } - bool reallydelete = false; - if (profile->user->hasPassword()) { - QDialog dialog(this, Qt::Dialog); - QLineEdit *e = new QLineEdit(&dialog); - e->setEchoMode(QLineEdit::Password); - dialog.connect(e, SIGNAL(returnPressed()), &dialog, SLOT(accept())); - dialog.setWindowTitle(tr("Enter Password for %1").arg(name)); - dialog.setMinimumWidth(300); - QVBoxLayout *lay = new QVBoxLayout(); - dialog.setLayout(lay); - lay->addWidget(e); - int tries = 0; - - do { - e->setText(""); - - if (dialog.exec() != QDialog::Accepted) { break; } - - tries++; - - if (profile->user->checkPassword(e->text())) { - reallydelete = true; - break; - } else { - if (tries < 3) { - QMessageBox::warning(this, STR_MessageBox_Error, tr("You entered an incorrect password"), QMessageBox::Ok); - } else { - QMessageBox::warning(this, STR_MessageBox_Error, - tr("If you're trying to delete because you forgot the password, you need to delete it manually."), - QMessageBox::Ok); - } - } - } while (tries < 3); - } else { reallydelete = true; } - - if (reallydelete) { - QString path = profile->Get(PrefMacro(STR_GEN_DataFolder)); - - if (!path.isEmpty()) { - if (!removeDir(path)) { - QMessageBox::information(this, STR_MessageBox_Error, - tr("There was an error deleting the profile directory, you need to manually remove it.")+QString("\n\n%1").arg(path), - QMessageBox::Ok); - } - qDebug() << "Delete" << path; - QMessageBox::information(this, STR_MessageBox_Information, tr("Profile '%1' was succesfully deleted").arg(name),QMessageBox::Ok); - } - - int row = ui->listView->currentIndex().row(); - proxy->removeRow(row); - delete p_profile; - p_profile = nullptr; - } -} - -//! \fn ProfileSelect::QuickLogin() -//! \brief For programmatically bypassing the login window -void ProfileSelect::QuickLogin() -{ - on_listView_activated(ui->listView->currentIndex()); -} - -void ProfileSelect::on_selectButton_clicked() -{ - on_listView_activated(ui->listView->currentIndex()); -} -void ProfileSelect::openProfile() -{ - on_listView_activated(ui->listView->currentIndex()); -} - -void ProfileSelect::on_newProfileButton_clicked() -{ - NewProfile newprof(this); - newprof.skipWelcomeScreen(); - newprof.setWindowTitle(tr("Create new profile")); - - if (newprof.exec() == NewProfile::Rejected) { - // reject(); - } else { accept(); } -} - - -//! \fn ProfileSelect::on_listView_activated(const QModelIndex &index) -//! \brief Process the selected login, requesting passwords if required. -void ProfileSelect::on_listView_activated(const QModelIndex &index) -{ - QString name = index.data(Qt::UserRole+2).toString(); - Profile *profile = Profiles::profiles[name]; - - if (!profile) { return; } - if (!profile->isOpen()) { - p_profile = profile; - // Do this in case user renames the directory (otherwise it won't load) - // Essentially makes the folder name the user name, but whatever.. - // TODO: Change the profile editor one day to make it rename the actual folder - profile->p_preferences[STR_UI_UserName] = name; - } - - if (!profile->user->hasPassword()) { - m_selectedProfile = name; - AppSetting->setProfileName(name); - accept(); - return; - } else { - int tries = 0; - - do { - QDialog dialog(this, Qt::Dialog); - QLineEdit *e = new QLineEdit(&dialog); - e->setEchoMode(QLineEdit::Password); - dialog.connect(e, SIGNAL(returnPressed()), &dialog, SLOT(accept())); - dialog.setWindowTitle(tr("Enter Password")); - QVBoxLayout *lay = new QVBoxLayout(); - dialog.setLayout(lay); - lay->addWidget(e); - dialog.exec(); - - if (profile->user->checkPassword(e->text())) { - m_selectedProfile = name; - AppSetting->setProfileName(name); - accept(); - return; - } - - tries++; - - if (tries < 3) { - QMessageBox::warning(this, STR_MessageBox_Error, tr("Incorrect Password"), QMessageBox::Ok); - } else { - QMessageBox::warning(this, STR_MessageBox_Error, - tr("You entered an Incorrect Password too many times. Exiting!"), QMessageBox::Ok); - } - } while (tries < 3); - } - - reject(); - return; -} - -void ProfileSelect::on_listView_customContextMenuRequested(const QPoint &pos) -{ - popupMenu->popup(QWidget::mapToGlobal(pos)); -} - -void ProfileSelect::on_pushButton_clicked() -{ - mainwin->RestartApplication(false, "-d"); -} - -void ProfileSelect::on_filter_textChanged(const QString &arg1) -{ - QRegExp regExp("*"+arg1+"*", Qt::CaseInsensitive, QRegExp::Wildcard); - proxy->setFilterRegExp(regExp); -} diff --git a/oscar/profileselect.h b/oscar/profileselect.h deleted file mode 100644 index ce37fd0b..00000000 --- a/oscar/profileselect.h +++ /dev/null @@ -1,62 +0,0 @@ -/* Profile Select Header (Login Screen) - * - * 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 source code - * for more details. */ - -#ifndef PROFILESELECT_H -#define PROFILESELECT_H - -#include -#include -#include -#include -#include - -namespace Ui { -class ProfileSelect; -} - -/*! \class ProfileSelect - \brief Simple Login Window providing a list of all profiles to select from - */ -class ProfileSelect : public QDialog -{ - Q_OBJECT - - public: - explicit ProfileSelect(QWidget *parent = 0); - ~ProfileSelect(); - - QString selectedProfile(); - void QuickLogin(); - private slots: - void on_selectButton_clicked(); - - void on_newProfileButton_clicked(); - - void on_listView_activated(const QModelIndex &index); - void earlyExit(); - - void openProfile(); - void editProfile(); - void deleteProfile(); - - void on_listView_customContextMenuRequested(const QPoint &pos); - - void on_pushButton_clicked(); - - void on_filter_textChanged(const QString &arg1); - -private: - Ui::ProfileSelect *ui; - QString m_selectedProfile; - int m_tries; - QMenu *popupMenu; - QStandardItemModel *model; - QSortFilterProxyModel *proxy; -}; - -#endif // PROFILESELECT_H diff --git a/oscar/profileselect.ui b/oscar/profileselect.ui deleted file mode 100644 index caa66b77..00000000 --- a/oscar/profileselect.ui +++ /dev/null @@ -1,422 +0,0 @@ - - - ProfileSelect - - - - 0 - 0 - 418 - 272 - - - - Select Profile - - - - :/icons/logo-sm.png:/icons/logo-sm.png - - - QDialog { - background: qlineargradient(spread:pad, x1:0, y1:0, x2:1, y2:0, stop:0 rgba(240, 240, 240, 255), stop:1 rgba(220, 220, 220, 255)); -} - -QGroupBox { - background-color: white; - border: 1px solid gray; - border-radius: 5px; - margin-top: 3ex; /* leave space at the top for the title */ - } - - QGroupBox::title { - subcontrol-origin: margin; - subcontrol-position: top center; /* position at the top center */ - padding: 2px; - background-color: white; -} - -QFrame { -background: white; -border: 1px solid gray; -border-radius: 10px; -} - -QLabel { -background: transparent; -border: 0px; -} - -QPushButton { -background: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 rgba(240, 240, 240, 255), stop:1 rgba(255, 255, 255, 255)); -border: 1px solid gray; -border-radius: 10px; -padding: 3px; -padding-left: 20px; -padding-right: 20px; -} - -QPushButton:hover { -background: white; -border: 2px solid gray; -} - -QPushButton:pressed { -background: gray; -} - -QLineEdit { -border-radius: 5px; -border: 1px solid gray; -background: white; -} - - - - 6 - - - 6 - - - 6 - - - 6 - - - 6 - - - - - 6 - - - - - - - - QFrame::StyledPanel - - - QFrame::Raised - - - - - - - - border: 0px; - - - Search: - - - - - - - - - - - - - - - - Qt::CustomContextMenu - - - border: 0px; - - - QFrame::NoFrame - - - QAbstractScrollArea::AdjustToContents - - - true - - - QAbstractItemView::ScrollPerPixel - - - - - - - - - - QFrame { -background: qlineargradient(spread:pad, x1:0, y1:0, x2:1, y2:0, stop:0 rgba(255, 255, 255, 255), stop:1 rgba(220, 220, 220, 255)); -}; - - - QFrame::StyledPanel - - - QFrame::Raised - - - - 6 - - - 16 - - - 16 - - - 16 - - - 16 - - - - - - 0 - 0 - - - - Start with the selected user profile. - - - &Select User - - - - :/icons/forward.png:/icons/forward.png - - - false - - - - - - - Qt::Horizontal - - - - - - - Create a new user profile. - - - New Profile - - - false - - - - - - - Qt::Horizontal - - - - - - - Choose a different OSCAR data folder. - - - - - - &Different Folder - - - false - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - 15 - 75 - true - - - - border: 0px; - - - OSCAR - - - Qt::AlignCenter - - - - - - - border: 0px; - - - [version] - - - Qt::AlignCenter - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - Click here if you didn't want to start OSCAR. - - - &Quit - - - false - - - - - - - - - - - - - 0 - 0 - - - - - - - QFrame::StyledPanel - - - QFrame::Plain - - - - 4 - - - 4 - - - 4 - - - 4 - - - 4 - - - - - - 75 - true - - - - border: 0px; - - - Folder: - - - - - - - - 0 - 0 - - - - The current location of OSCAR data store. - - - border: 0px; - - - [data directory] - - - true - - - - - - - - - - - - - - quitButton - clicked() - ProfileSelect - reject() - - - 52 - 276 - - - 199 - 149 - - - - -