chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-06 11:10:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix tab and button visibility and replace PREF as required

Browse Source
This commit is contained in:
Phil Olynyk 2019-03-25 19:38:16 -04:00
parent 26f5854c6b
commit 1be2b84111
1 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
oscar/mainwindow.cpp
View File

@ -87,7 +87,7 @@ MainWindow::MainWindow(QWidget *parent) :
qDebug() << "Using System Tray for Menu"; qDebug() << "Using System Tray for Menu";
systray = new QSystemTrayIcon(QIcon(":/icons/logo.png"), this); systray = new QSystemTrayIcon(QIcon(":/icons/logo.png"), this);
systray->show(); systray->show();
systraymenu = new QMenu(this); /****** systraymenu = new QMenu(this);
systray->setContextMenu(systraymenu); systray->setContextMenu(systraymenu);
QAction *a = systraymenu->addAction(STR_TR_OSCAR + " v" + VersionString); QAction *a = systraymenu->addAction(STR_TR_OSCAR + " v" + VersionString);
a->setEnabled(false); a->setEnabled(false);
@ -96,6 +96,8 @@ MainWindow::MainWindow(QWidget *parent) :
// systraymenu->addAction(tr("Check for &Updates"), this, SLOT(on_actionCheck_for_Updates_triggered())); // systraymenu->addAction(tr("Check for &Updates"), this, SLOT(on_actionCheck_for_Updates_triggered()));
systraymenu->addSeparator(); systraymenu->addSeparator();
systraymenu->addAction(tr("E&xit"), this, SLOT(close())); systraymenu->addAction(tr("E&xit"), this, SLOT(close()));
*******/
systraymenu = nullptr;
} else { // if not available, the messages will popup in the taskbar } else { // if not available, the messages will popup in the taskbar
qDebug() << "No System Tray menues"; qDebug() << "No System Tray menues";
systray = nullptr; systray = nullptr;
@ -193,7 +195,8 @@ void MainWindow::SetupGUI()
profileSelector->updateProfileList(); profileSelector->updateProfileList();
// Start with the new Profile Tab // Start with the new Profile Tab
ui->tabWidget->setCurrentWidget(profileSelector); // setting this to daily shows the cube during loading.. ui->tabWidget->setCurrentWidget(profileSelector); // setting this to daily shows the cube during loading..
ui->tabWidget->setTabEnabled(1, false); // this should be the Statistics tab
ui->toolBox->setCurrentIndex(0); ui->toolBox->setCurrentIndex(0);
bool b = AppSetting->rightSidebarVisible(); bool b = AppSetting->rightSidebarVisible();
@ -219,6 +222,8 @@ void MainWindow::SetupGUI()
QTimer::singleShot(50, this, SLOT(Startup())); QTimer::singleShot(50, this, SLOT(Startup()));
ui->actionChange_Data_Folder->setVisible(false);
#ifndef helpless #ifndef helpless
help = new Help(this); help = new Help(this);
ui->tabWidget->addTab(help, tr("Help Browser")); ui->tabWidget->addTab(help, tr("Help Browser"));
@ -255,8 +260,14 @@ void MainWindow::closeEvent(QCloseEvent * event)
// Trash anything allocated by the Graph objects // Trash anything allocated by the Graph objects
DestroyGraphGlobals(); DestroyGraphGlobals();
if (systraymenu) delete systraymenu; if (systraymenu) {
if (systray) delete systray; delete systraymenu;
systraymenu = nullptr;
}
if (systray) {
delete systray;
systray = nullptr;
}
disconnect(logger, SIGNAL(outputLog(QString)), this, SLOT(logMessage(QString))); disconnect(logger, SIGNAL(outputLog(QString)), this, SLOT(logMessage(QString)));
shutdownLogger(); shutdownLogger();
@ -271,6 +282,7 @@ void MainWindow::closeEvent(QCloseEvent * event)
MainWindow::~MainWindow() MainWindow::~MainWindow()
{ {
delete ui; delete ui;
QCoreApplication::quit();
} }
void MainWindow::log(QString text) void MainWindow::log(QString text)
@ -818,6 +830,10 @@ QList<ImportPath> MainWindow::detectCPAPCards()
void MainWindow::on_action_Import_Data_triggered() void MainWindow::on_action_Import_Data_triggered()
{ {
static bool in_import = false; static bool in_import = false;
if ( p_profile == nullptr ) {
Notify(tr("No profile has been selected for Import."), STR_MessageBox_Busy);
return;
}
if (m_inRecalculation) { if (m_inRecalculation) {
Notify(tr("Access to Import has been blocked while recalculations are in progress."),STR_MessageBox_Busy); Notify(tr("Access to Import has been blocked while recalculations are in progress."),STR_MessageBox_Busy);
return; return;
@ -1323,7 +1339,7 @@ void MainWindow::DelayedScreenshot()
QPixmap pixmap = QPixmap::grabWindow(this->winId(), x(), y(), width() / pr, (height() / pr) + 10); QPixmap pixmap = QPixmap::grabWindow(this->winId(), x(), y(), width() / pr, (height() / pr) + 10);
#endif */ #endif */
QString a = PREF.Get("{home}/Screenshots"); QString a = p_pref->Get("{home}/Screenshots");
QDir dir(a); QDir dir(a);
if (!dir.exists()) { if (!dir.exists()) {
@ -1373,7 +1389,7 @@ void MainWindow::on_actionPrint_Report_triggered()
datestr = QDateTime::currentDateTime().toString(Qt::ISODate); datestr = QDateTime::currentDateTime().toString(Qt::ISODate);
} else { name = "Unknown"; } } else { name = "Unknown"; }
QString filename = PREF.Get("{home}/" + name + "_" + p_profile->user->userName() + "_" + datestr + ".pdf"); QString filename = p_pref->Get("{home}/" + name + "_" + p_profile->user->userName() + "_" + datestr + ".pdf");
printer.setOutputFileName(filename); printer.setOutputFileName(filename);
#endif #endif
@ -1680,7 +1696,7 @@ void MainWindow::reloadProfile()
void MainWindow::RestartApplication(bool force_login, QString cmdline) void MainWindow::RestartApplication(bool force_login, QString cmdline)
{ {
CloseProfile(); CloseProfile();
PREF.Save(); p_pref->Save();
QString apppath; QString apppath;
#ifdef Q_OS_MAC #ifdef Q_OS_MAC
@ -2271,7 +2287,7 @@ void MainWindow::on_actionChange_Data_Folder_triggered()
p_profile->Save(); p_profile->Save();
p_profile->removeLock(); p_profile->removeLock();
} }
PREF.Save(); p_pref->Save();
RestartApplication(false, "-d"); RestartApplication(false, "-d");
} }