Browse Source

set room names in settings

master
Richard Genoud 5 years ago
parent
commit
f13d8549ae
3 changed files with 14 additions and 10 deletions
  1. +3
    -2
      soft/thermostat/inc/settings.h
  2. +6
    -4
      soft/thermostat/src/mainwindow.cpp
  3. +5
    -4
      soft/thermostat/src/settings.cpp

+ 3
- 2
soft/thermostat/inc/settings.h View File

@ -10,10 +10,11 @@
#define SETTINGS_H
#include <QStringList>
#include <QSettings>
class Settings
class Settings : public QSettings
{
Q_OBJECT
public:
static Settings *getInstance(void);


+ 6
- 4
soft/thermostat/src/mainwindow.cpp View File

@ -12,22 +12,24 @@
#include <QLocale>
#include "zoneitem.h"
#include "settings.h"
#include "mainwindow.h"
MainWindow::MainWindow(QWidget *parent) :
QMainWindow(parent)
{
Settings *s = Settings::getInstance();
/*
* Sensors-related layout
*/
QGridLayout *mainLayout = new QGridLayout;
mainLayout->addWidget(new ZoneItem(tr("Living room"), this), 0, 0);
mainLayout->addWidget(new ZoneItem(tr("Workspace"), this), 0, 1);
mainLayout->addWidget(new ZoneItem(s->m_rooms_names[0], this), 0, 0);
mainLayout->addWidget(new ZoneItem(s->m_rooms_names[1], this), 0, 1);
mainLayout->addWidget(new QPushButton(tr("Menu")), 0, 2);
mainLayout->addWidget(new ZoneItem(tr("Bathroom"), this), 1, 0);
mainLayout->addWidget(new ZoneItem(tr("Bedroom"), this), 1, 1);
mainLayout->addWidget(new ZoneItem(s->m_rooms_names[2], this), 1, 0);
mainLayout->addWidget(new ZoneItem(s->m_rooms_names[3], this), 1, 1);
mainLayout->addWidget(new QPushButton(tr("Auto")), 1, 2);
QWidget *mainWidget = new QWidget;


+ 5
- 4
soft/thermostat/src/settings.cpp View File

@ -6,6 +6,7 @@
*
*/
#include <QTranslator>
#include <QStringList>
#include <QString>
@ -15,10 +16,10 @@ Settings *Settings::_singleton = NULL;
Settings::Settings()
{
m_rooms_names << QString("Chambe So");
m_rooms_names << QString("Chambe Rico");
m_rooms_names << QString("Salon");
m_rooms_names << QString("Salle de bain");
m_rooms_names << QString(tr("Bedroom"));
m_rooms_names << QString(tr("Workspace"));
m_rooms_names << QString(tr("Living room"));
m_rooms_names << QString(tr("Bathroom"));
m_sensor_topics << QString::fromUtf8("sensors/chambre_so/xiaomi");
m_sensor_topics << QString::fromUtf8("sensors/chambre_rico/xiaomi");
m_sensor_topics << QString::fromUtf8("sensors/salon/xiaomi");


Loading…
Cancel
Save