Skip to content

Commit

Permalink
Added manual monochrome tray icon option
Browse files Browse the repository at this point in the history
  • Loading branch information
CountMurphy committed Nov 22, 2020
1 parent 5648b8f commit 1991cc9
Show file tree
Hide file tree
Showing 8 changed files with 49 additions and 9 deletions.
2 changes: 2 additions & 0 deletions Icons.qrc
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
<RCC>
<qresource prefix="/new/icons">
<file alias="Clock.png">Icons/1349069370_Alarm_Clock.png</file>
<file alias="mono.png">Icons/1349069370_Alarm_Clock_mono.png</file>
</qresource>
<qresource prefix="/new/sounds">
<file alias="alarm.ogg">Sounds/condition_one.ogg</file>
</qresource>
<qresource prefix="/"/>
</RCC>
Binary file added Icons/1349069370_Alarm_Clock_mono.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 13 additions & 1 deletion fileio.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,19 @@ bool FileIO::isMilTime()
return settings.value("isMilTime").toBool();
}

void FileIO::SaveTimeMode(bool isMilTime)
bool FileIO::LoadisMono()
{
QSettings settings;
return settings.value("isMono").toBool();
}

void FileIO::SaveisMono(bool isMono)
{
QSettings settings;
settings.setValue("isMono",isMono);
}

void FileIO::SaveisMilTime(bool isMilTime)
{
QSettings settings;
settings.setValue("isMilTime",isMilTime);
Expand Down
4 changes: 3 additions & 1 deletion fileio.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@ class FileIO : public QObject
static bool LoadWindowShow();
static void SaveWindowShow(bool);
static bool isMilTime();
static void SaveTimeMode(bool isMilTime);
static bool LoadisMono();
static void SaveisMono(bool);
static void SaveisMilTime(bool isMilTime);
static bool LoadWarnOnPm();
static void SaveWarnOnPm(bool);
private:
Expand Down
9 changes: 7 additions & 2 deletions mainwindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,12 @@ MainWindow::MainWindow(QWidget *parent) :
trayIconMenu->addSeparator();
trayIconMenu->addAction(QAquit);
trayIcon->setContextMenu(trayIconMenu);
trayIcon->setIcon(QIcon(":/new/icons/Clock.png"));
if(FileIO::LoadisMono())
{
trayIcon->setIcon(QIcon(":/new/icons/mono.png"));
}else{
trayIcon->setIcon(QIcon(":/new/icons/Clock.png"));
}
trayIcon->setToolTip("QTalarm");
trayIcon->show();

Expand Down Expand Up @@ -372,7 +377,7 @@ void MainWindow::PMWarning()

void MainWindow::ShowSettings()
{
SettingDialog *settingsPage=new SettingDialog(this,&_isMilTime, &_WarnOnPm);
SettingDialog *settingsPage=new SettingDialog(this,&_isMilTime, &_WarnOnPm, trayIcon);
settingsPage->show();
}

Expand Down
14 changes: 12 additions & 2 deletions settingdialog.cpp
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
#include <QSystemTrayIcon>
#include "settingdialog.h"
#include "ui_settingdialog.h"
#include "fileio.h"

SettingDialog::SettingDialog(QWidget *parent,bool *isMilTime, bool *WarnOnPm) :
SettingDialog::SettingDialog(QWidget *parent,bool *isMilTime, bool *WarnOnPm, QSystemTrayIcon *trayIcon) :
QDialog(parent),
ui(new Ui::SettingDialog)
{
ui->setupUi(this);
_isMilTime=isMilTime;
_WarnOnPm=WarnOnPm;
_trayIcon=trayIcon;

if(*_isMilTime)
{
Expand All @@ -20,6 +22,7 @@ SettingDialog::SettingDialog(QWidget *parent,bool *isMilTime, bool *WarnOnPm) :
ui->milTime->setChecked(*_isMilTime);

ui->defaultShow->setChecked(FileIO::LoadWindowShow());
ui->chk_mono->setChecked(FileIO::LoadisMono());

connect(ui->buttonBox,SIGNAL(accepted()),this,SLOT(Save()));
connect(ui->plebTime,SIGNAL(clicked(bool)),this,SLOT(toggleWarnBox()));
Expand All @@ -37,8 +40,15 @@ void SettingDialog::Save()
FileIO::SaveWindowShow(ui->defaultShow->isChecked());
*_isMilTime=ui->milTime->isChecked();
*_WarnOnPm=ui->WarnBox->isChecked();
FileIO::SaveTimeMode(*_isMilTime);
FileIO::SaveisMilTime(*_isMilTime);
FileIO::SaveWarnOnPm(*_WarnOnPm);
FileIO::SaveisMono(ui->chk_mono->isChecked());
if(ui->chk_mono->isChecked())
{
_trayIcon->setIcon(QIcon(":/new/icons/mono.png"));
}else{
_trayIcon->setIcon(QIcon(":/new/icons/Clock.png"));
}
this->deleteLater();
}

Expand Down
4 changes: 3 additions & 1 deletion settingdialog.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
#define SETTINGDIALOG_H

#include <QDialog>
#include <QSystemTrayIcon>

namespace Ui {
class SettingDialog;
Expand All @@ -12,13 +13,14 @@ class SettingDialog : public QDialog
Q_OBJECT

public:
explicit SettingDialog(QWidget *parent = 0,bool *isMilTime=0, bool *WarnOnPm=0);
explicit SettingDialog(QWidget *parent = 0,bool *isMilTime=0, bool *WarnOnPm=0, QSystemTrayIcon *trayIcon=0);
~SettingDialog();

private:
Ui::SettingDialog *ui;
bool *_isMilTime;
bool *_WarnOnPm;
QSystemTrayIcon *_trayIcon;
private slots:
void Save();
void toggleWarnBox();
Expand Down
11 changes: 9 additions & 2 deletions settingdialog.ui
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>327</width>
<height>182</height>
<height>212</height>
</rect>
</property>
<property name="windowTitle">
Expand Down Expand Up @@ -53,7 +53,14 @@
<item>
<widget class="QCheckBox" name="WarnBox">
<property name="text">
<string>Warn on Pm alarms</string>
<string>Warn on Pm Alarms</string>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="chk_mono">
<property name="text">
<string>Use Monochrome Icons</string>
</property>
</widget>
</item>
Expand Down

0 comments on commit 1991cc9

Please sign in to comment.