Skip to content

Settings module #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SergySanJj merged 5 commits into from
Nov 3, 2018
Merged

Settings module #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f4b9a24
Better tab blinking
SergySanJj Nov 3, 2018
1397e44
Add global settings logging
SergySanJj Nov 3, 2018
d1981c6
Add activation of the window on signal
SergySanJj Nov 3, 2018
f317db2
Fix floating button
SergySanJj Nov 3, 2018
fa4345e
Add settings dialog, Add opacity update, work on settings update handler
SergySanJj Nov 3, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions SmartTimer/SmartTimer.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,8 @@ SOURCES += \
toggleswitch.cpp \
alertwidget.cpp \
addalarmdialog.cpp \
changealarmdialog.cpp
changealarmdialog.cpp \
globalsettingsdialog.cpp

HEADERS += \
mainwindow.h \
Expand All @@ -48,7 +49,8 @@ HEADERS += \
alertwidget.h \
addalarmdialog.h \
changealarmdialog.h \
widgetsettings.h
widgetsettings.h \
globalsettingsdialog.h

FORMS += \
mainwindow.ui \
Expand All @@ -57,7 +59,8 @@ FORMS += \
changetimerdialog.ui \
alertwidget.ui \
addalarmdialog.ui \
changealarmdialog.ui
changealarmdialog.ui \
globalsettingsdialog.ui

# Default rules for deployment.
qnx: target.path = /tmp/$${TARGET}/bin
Expand Down
13 changes: 11 additions & 2 deletions SmartTimer/alertwidget.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,9 @@ void alertwidget::statusChanged(bool stat)
}
else
{
if (blinkTimer.isActive())
emit blinkInfo("Alarms",false);

alertTick.stop();
blinkTimer.stop();
blinking = false;
Expand Down Expand Up @@ -154,6 +157,9 @@ void alertwidget::blink()

void alertwidget::stopBlinking()
{
if (blinkTimer.isActive())
emit blinkInfo("Alarms",false);

alertTick.stop();
blinkTimer.stop();
blinking = false;
Expand All @@ -170,13 +176,16 @@ void alertwidget::stopBlinking()

void alertwidget::closeAlarm()
{
if (blinkTimer.isActive())
emit blinkInfo("Alarms",false);

alertTick.stop();
blinkTimer.stop();
player->stop();


emit del(this);
emit blinkInfo("Alarms",false);


this->close();
}
Expand Down Expand Up @@ -220,7 +229,7 @@ void alertwidget::setAlarm(int msecs, const QString & _name)

void alertwidget::mousePressEvent(QMouseEvent *e)
{
if (e->button() == Qt::RightButton)
if (e->button() == Qt::RightButton && !blinkTimer.isActive())
{
player->stop();
ShowContextMenu(e->pos());
Expand Down
56 changes: 56 additions & 0 deletions SmartTimer/globalsettingsdialog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
#include "globalsettingsdialog.h"
#include "ui_globalsettingsdialog.h"

#include <QFile>
#include <QSlider>

GlobalSettingsDialog::GlobalSettingsDialog(GlobalSettings old, QWidget *parent) :
QDialog(parent),
ui(new Ui::GlobalSettingsDialog)
{
ui->setupUi(this);

QFile file(":/stylesheet.qss");
if(file.open(QIODevice::ReadOnly | QIODevice::Text))
{
this->setStyleSheet(file.readAll());
file.close();
}

oldSettings = old;

ui->opacitySlider->setValue(static_cast<int>(old.windowOpacity*100));
ui->SliderValue->setText(QString::number(static_cast<int>(old.windowOpacity*100))+"%");

connect(ui->cancelButton,SIGNAL(clicked()),this,SLOT(close()));
connect(ui->confirmButton,SIGNAL(clicked()),this, SLOT(confirmed()));
connect( ui->opacitySlider,SIGNAL(valueChanged(int)),this,SLOT(opacityChanged()));

}

GlobalSettingsDialog::~GlobalSettingsDialog()
{
delete ui;
}

void GlobalSettingsDialog::confirmed()
{
GlobalSettings newSettings(ui->opacitySlider->value()/100.0,ui->alarmFormat->text(), ui->TimerFormat->text());
emit changeSettings(newSettings);
this->close();
}

void GlobalSettingsDialog::canceled()
{
emit changeSettings(oldSettings);
this->close();
}

void GlobalSettingsDialog::opacityChanged()
{
GlobalSettings newSettings(ui->opacitySlider->value()/100.0,ui->alarmFormat->text(), ui->TimerFormat->text());

ui->SliderValue->setText(QString::number(static_cast<int>(newSettings.windowOpacity*100))+"%");

emit changeSettings(newSettings);
}
32 changes: 32 additions & 0 deletions SmartTimer/globalsettingsdialog.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
#ifndef GLOBALSETTINGSDIALOG_H
#define GLOBALSETTINGSDIALOG_H

#include "widgetsettings.h"

#include <QDialog>

namespace Ui {
class GlobalSettingsDialog;
}

class GlobalSettingsDialog : public QDialog
{
Q_OBJECT

public:
explicit GlobalSettingsDialog(GlobalSettings old, QWidget *parent = nullptr);
~GlobalSettingsDialog();
public slots:
void confirmed();
void canceled();
void opacityChanged();
signals:
void changeSettings(GlobalSettings settings);

private:
Ui::GlobalSettingsDialog *ui;

GlobalSettings oldSettings;
};

#endif // GLOBALSETTINGSDIALOG_H
168 changes: 168 additions & 0 deletions SmartTimer/globalsettingsdialog.ui
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,168 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>GlobalSettingsDialog</class>
<widget class="QDialog" name="GlobalSettingsDialog">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>420</width>
<height>465</height>
</rect>
</property>
<property name="minimumSize">
<size>
<width>420</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>420</width>
<height>16777215</height>
</size>
</property>
<property name="windowTitle">
<string>Global settings</string>
</property>
<property name="windowIcon">
<iconset resource="resources.qrc">
<normaloff>:/icons/change-icon.png</normaloff>:/icons/change-icon.png</iconset>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0">
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QLabel" name="label">
<property name="text">
<string>Window opacity:</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QLabel" name="SliderValue">
<property name="text">
<string/>
</property>
</widget>
</item>
<item>
<widget class="QSlider" name="opacitySlider">
<property name="minimumSize">
<size>
<width>200</width>
<height>0</height>
</size>
</property>
<property name="minimum">
<number>20</number>
</property>
<property name="maximum">
<number>100</number>
</property>
<property name="pageStep">
<number>0</number>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_3">
<item>
<widget class="QLabel" name="label_2">
<property name="text">
<string>Alarm Time format:</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QLineEdit" name="alarmFormat"/>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_4">
<item>
<widget class="QLabel" name="label_3">
<property name="text">
<string>Timer Time format:</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_3">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QLineEdit" name="TimerFormat"/>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QPushButton" name="confirmButton">
<property name="text">
<string>Confirtm</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="cancelButton">
<property name="text">
<string>Cancel</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</item>
</layout>
</widget>
<resources>
<include location="resources.qrc"/>
</resources>
<connections/>
</ui>
1 change: 1 addition & 0 deletions SmartTimer/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ int main(int argc, char *argv[])

MainWindow w;


w.show();

return QApplication::exec();
Expand Down
Loading