summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: dd76e94)
raw | patch | inline | side by side (parent: dd76e94)
author | dgerlach <d-gerlach@ti.com> | |
Fri, 7 Sep 2012 15:16:11 +0000 (10:16 -0500) | ||
committer | dgerlach <d-gerlach@ti.com> | |
Fri, 7 Sep 2012 15:16:11 +0000 (10:16 -0500) |
* different settings split across 3 pages now
diff --git a/ThermostatDemo b/ThermostatDemo
index 18139ca51bc508beb9c0dc962691556d3d38b3c6..12662727ede832f6f80e2edbe1c98f4ab9e45f23 100755 (executable)
Binary files a/ThermostatDemo and b/ThermostatDemo differ
Binary files a/ThermostatDemo and b/ThermostatDemo differ
diff --git a/ThermostatDemoSource/qss/thermostatdemo.qss b/ThermostatDemoSource/qss/thermostatdemo.qss
index 32390f1377aa65e7658157440ac47a11223d3362..cc2bcfe7374436fb5cbd6f83eef7418ccba11d66 100644 (file)
WeatherWidget,ThermostatWidget,OptionsWidget {\r
- background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, \r
- stop: 0 black, stop: 0.01 rgb(100, 100, 100), \r
- stop: 0.02 black); \r
- border: 2px groove gray;\r
- border-radius: 10px;\r
- padding: 2px 4px;\r
- qproperty-alignment: AlignCenter;\r
+ background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,\r
+ stop: 0 black, stop: 0.01 rgb(100, 100, 100),\r
+ stop: 0.02 black);\r
+ border: 2px groove gray;\r
+ border-radius: 10px;\r
+ padding: 2px 4px;\r
+ qproperty-alignment: AlignCenter;\r
}\r
/*\r
OptionsWidget {\r
- border: none;\r
- background-color: rgba(0,0,0,0);\r
+ border: none;\r
+ background-color: rgba(0,0,0,0);\r
}\r
*/\r
WeatherWidget > QLabel {\r
- color: white; \r
- font-size: 18px;\r
- qproperty-alignment: AlignCenter;\r
+ color: white;\r
+ font-size: 18px;\r
+ qproperty-alignment: AlignCenter;\r
}\r
\r
WeatherWidget > QLabel#currentCity {\r
- font-size: 14px;\r
+ font-size: 14px;\r
}\r
\r
WeatherWidget > QLabel#currentTemp {\r
- font-size: 36px;\r
+ font-size: 36px;\r
}\r
\r
WeatherWidget > QLabel#statusLabel {\r
}\r
\r
WeatherWidget:pressed {\r
- background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1, \r
- stop: 0 black, stop: 0.03 white, \r
- stop: 0.05 rgb(100,100,100), stop: 0.1 black);\r
- border-style: inset;\r
+ background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,\r
+ stop: 0 black, stop: 0.03 white,\r
+ stop: 0.05 rgb(100,100,100), stop: 0.1 black);\r
+ border-style: inset;\r
}\r
\r
ThermostatWidget > QLabel {\r
- color: white;\r
+ color: white;\r
font-size: 32px;\r
- qproperty-alignment: AlignCenter;\r
- padding-right: 10px;\r
- padding-left: 10px;\r
+ qproperty-alignment: AlignCenter;\r
+ padding-right: 10px;\r
+ padding-left: 10px;\r
}\r
\r
ThermostatWidget > QLabel#currentTemp {\r
font-size: 84px;\r
- padding: -5px;\r
- margin-right: -30px;\r
+ padding: -5px;\r
+ margin-right: -30px;\r
}\r
\r
ThermostatWidget > QPushButton {\r
- color: white;\r
- font-size: 36px;\r
- border: 2px solid #555;\r
- border-radius: 11px;\r
- padding: 5px;\r
- background: qradialgradient(cx: 0.3, cy: -0.4,\r
- fx: 0.3, fy: -0.4,\r
- radius: 1.35, stop: 0 black, stop: 1 rgb(100,100,100));\r
- width: 40px;\r
- height: 40px;\r
-} \r
+ color: white;\r
+ font-size: 36px;\r
+ border: 2px solid #555;\r
+ border-radius: 11px;\r
+ padding: 5px;\r
+ background: qradialgradient(cx: 0.3, cy: -0.4,\r
+ fx: 0.3, fy: -0.4,\r
+ radius: 1.35, stop: 0 black, stop: 1 rgb(100,100,100));\r
+ width: 40px;\r
+ height: 40px;\r
+}\r
\r
ThermostatWidget > QPushButton:pressed {\r
- background: qradialgradient(cx: 0.3, cy: -0.4,\r
- fx: 0.3, fy: -0.4,\r
- radius: 1.35, stop: 0 black, stop: 1 #888);\r
+ background: qradialgradient(cx: 0.3, cy: -0.4,\r
+ fx: 0.3, fy: -0.4,\r
+ radius: 1.35, stop: 0 black, stop: 1 #888);\r
}\r
\r
OptionsWidget > QPushButton {\r
- background: rgba(0,0,0,0);\r
- margin: 0;\r
- padding: 4px 4px;\r
+ background: rgba(0,0,0,0);\r
+ margin: 0;\r
+ padding: 4px 4px;\r
}\r
\r
#closeButton {\r
- background: rgba(0,0,0,0);\r
- margin: 0;\r
- padding: 1px;\r
- height: 10px;\r
- width: 10px;\r
+ background: rgba(0,0,0,0);\r
+ margin: 0;\r
+ padding: 1px;\r
+ height: 10px;\r
+ width: 10px;\r
}\r
\r
#energyButton {\r
- background: green;\r
- color: white;\r
+ background: green;\r
+ color: white;\r
}\r
\r
#timeButton {\r
- background: black;\r
- color: white;\r
+ background: black;\r
+ color: white;\r
}\r
\r
#dateButton {\r
- background: black;\r
- color: white;\r
- qproperty-alignment: AlignCenter;\r
+ background: black;\r
+ color: white;\r
+ qproperty-alignment: AlignCenter;\r
}\r
\r
AwayScreen {\r
- background: black;\r
+ background: black;\r
}\r
\r
AwayScreen > QLabel {\r
- color: white;\r
- font-size: 16px;\r
+ color: white;\r
+ font-size: 16px;\r
}\r
\r
AwayScreen > QLabel#ecoLabel {\r
- width: 30px;\r
+ width: 30px;\r
}\r
\r
AwayScreen > QLabel#currentTemp {\r
- font-size: 100px;\r
+ font-size: 100px;\r
}\r
\r
AwayScreen > QSpinBox {\r
subcontrol-position: top right;\r
width: 50px;\r
border-image: url(:/Images/simple-black-square-icon-arrowup.png) 1;\r
- border-bottom-width: -5px; \r
- border-top-width: 0px; \r
+ border-bottom-width: -5px;\r
+ border-top-width: 0px;\r
border-right-width: 0px;\r
border-left-width: 0px;\r
}\r
subcontrol-position: bottom right;\r
width: 50px;\r
border-image: url(:/Images/simple-black-square-icon-arrowdown.png) 1;\r
- border-top-width: -5px; \r
+ border-top-width: -5px;\r
border-bottom-width: 0px;\r
border-right-width: 0px;\r
border-left-width: 0px;\r
}\r
\r
AwayScreen > QPushButton {\r
- color: white;\r
- font-size: 16px;\r
- border: 2px solid #555;\r
- border-radius: 11px;\r
- padding: 5px;\r
- background: qradialgradient(cx: 0.3, cy: -0.4,\r
- fx: 0.3, fy: -0.4,\r
- radius: 1.35, stop: 0 black, stop: 1 rgb(100,100,100));\r
+ color: white;\r
+ font-size: 16px;\r
+ border: 2px solid #555;\r
+ border-radius: 11px;\r
+ padding: 5px;\r
+ background: qradialgradient(cx: 0.3, cy: -0.4,\r
+ fx: 0.3, fy: -0.4,\r
+ radius: 1.35, stop: 0 black, stop: 1 rgb(100,100,100));\r
}\r
\r
AwayScreen > QPushButton#backButton {\r
}\r
\r
ScheduleScreen {\r
- background: black;\r
+ background: black;\r
}\r
\r
ScheduleScreen > QLabel {\r
- color: white;\r
- font-size: 12px;\r
- margin: 0;\r
- padding: 0;\r
+ color: white;\r
+ font-size: 12px;\r
+ margin: 0;\r
+ padding: 0;\r
}\r
\r
ScheduleScreen > QLabel#title {\r
- font-size: 16px;\r
+ font-size: 16px;\r
}\r
\r
ScheduleScreen > QLabel#currentTime {\r
- font-size: 16px;\r
+ font-size: 16px;\r
}\r
\r
ScheduleScreen > QCheckBox::indicator:checked {\r
- image: url(:/Images/simple-black-square-icon-check-box-full.png) 1;\r
- height: 32px;\r
- width: 32px;\r
- margin: 0px;\r
- padding: 0px;\r
- border: 0px;\r
+ image: url(:/Images/simple-black-square-icon-check-box-full.png) 1;\r
+ height: 32px;\r
+ width: 32px;\r
+ margin: 0px;\r
+ padding: 0px;\r
+ border: 0px;\r
}\r
\r
ScheduleScreen > QCheckBox::indicator:unchecked {\r
- image: url(:/Images/simple-black-square-icon-check-box-empty.png) 1;\r
- height: 32px;\r
- width: 32px;\r
- margin: 0px;\r
- padding: 0px;\r
- border: 0px;\r
+ image: url(:/Images/simple-black-square-icon-check-box-empty.png) 1;\r
+ height: 32px;\r
+ width: 32px;\r
+ margin: 0px;\r
+ padding: 0px;\r
+ border: 0px;\r
}\r
\r
ScheduleScreen > QCheckBox {\r
- color: white;\r
- spacing: 0px;\r
+ color: white;\r
+ spacing: 0px;\r
}\r
\r
ScheduleScreen > QPushButton {\r
- background: rgba(0,0,0,0);\r
- margin: 0;\r
- padding: 4px 4px;\r
+ background: rgba(0,0,0,0);\r
+ margin: 0;\r
+ padding: 4px 4px;\r
}\r
\r
ScheduleScreen > QGraphicsView {\r
- background: black;\r
- border: 0;\r
+ background: black;\r
+ border: 0;\r
}\r
\r
QMessageBox {\r
- background: black;\r
- spacing: 40px;\r
+ background: black;\r
+ spacing: 40px;\r
}\r
\r
QMessageBox > QWidget {\r
- color: white;\r
- font-size: 16px;\r
- padding-top: 45px;\r
- padding-bottom: 45px;\r
- margin: 15px;\r
- border: 15px;\r
+ color: white;\r
+ font-size: 16px;\r
+ padding-top: 45px;\r
+ padding-bottom: 45px;\r
+ margin: 15px;\r
+ border: 15px;\r
}\r
\r
Keyboard {\r
- background: black;\r
- color: white;\r
+ background: black;\r
+ color: white;\r
}\r
\r
SettingScreen {\r
- background: black;\r
+ background: black;\r
+}\r
+\r
+SettingScreen QKeyboardLineEdit{\r
+ color: white;\r
+ border: 2px solid #999;\r
+ border-radius: 7px;\r
}\r
\r
-SettingScreen > QLabel {\r
- color: white;\r
- font-size: 16px;\r
+SettingScreen QWidget {\r
+ background: black;\r
}\r
\r
-SettingScreen > QPushButton#backButton {\r
- background: rgba(0,0,0,0);\r
- margin: 0;\r
- border: 0;\r
- padding: 4px 4px;\r
\r
+SettingScreen QLabel {\r
+ color: white;\r
+ font-size: 16px;\r
}\r
\r
-SettingScreen > QPushButton {\r
- color: white;\r
- font-size: 16px;\r
- border: 2px solid #555;\r
- border-radius: 11px;\r
- padding: 5px;\r
- background: qradialgradient(cx: 0.3, cy: -0.4,\r
- fx: 0.3, fy: -0.4,\r
- radius: 1.35, stop: 0 black, stop: 1 rgb(50,50,50));\r
+SettingScreen QPushButton#backButton {\r
+ background: rgba(0,0,0,0);\r
+ margin: 0;\r
+ border: 0;\r
+ padding: 4px 4px;\r
+\r
+}\r
+\r
+SettingScreen QPushButton {\r
+ color: white;\r
+ font-size: 16px;\r
+ border: 2px solid #555;\r
+ border-radius: 11px;\r
+ padding: 5px;\r
+ background: qradialgradient(cx: 0.3, cy: -0.4,\r
+ fx: 0.3, fy: -0.4,\r
+ radius: 1.35, stop: 0 black, stop: 1 rgb(50,50,50));\r
}\r
\r
-SettingScreen > QPushButton:checked {\r
- color: black;\r
- background: qradialgradient(cx: 0.3, cy: -0.4,\r
- fx: 0.3, fy: -0.4,\r
- radius: 1.35, stop: 0 black, stop: 1 white);\r
+SettingScreen QPushButton:checked {\r
+ color: black;\r
+ background: qradialgradient(cx: 0.3, cy: -0.4,\r
+ fx: 0.3, fy: -0.4,\r
+ radius: 1.35, stop: 0 black, stop: 1 white);\r
}\r
\r
-SettingScreen > QComboBox {\r
+SettingScreen QComboBox {\r
color: white;\r
font: 16pt;\r
background: qradialgradient(cx: 0.3, cy: -0.4,\r
- fx: 0.3, fy: -0.4,\r
- radius: 1.35, stop: 0 black, stop: 1 rgb(100,100,100));\r
- border: 2px solid #555;\r
- border-radius: 11px;\r
- padding: 5px;\r
+ fx: 0.3, fy: -0.4,\r
+ radius: 1.35, stop: 0 black, stop: 1 rgb(100,100,100));\r
+ border: 2px solid #555;\r
+ border-radius: 11px;\r
+ padding: 5px;\r
}\r
\r
\r
-SettingScreen > QComboBox:on {\r
+SettingScreen QComboBox:on {\r
color: white;\r
font: 16pt;\r
- background: qradialgradient(cx: 0.3, cy: -0.4,\r
- fx: 0.3, fy: -0.4,\r
- radius: 1.35, stop: 0 black, stop: 1 #888);\r
- border: 2px solid #555;\r
- border-radius: 11px;\r
- padding: 5px;\r
+ background: qradialgradient(cx: 0.3, cy: -0.4,\r
+ fx: 0.3, fy: -0.4,\r
+ radius: 1.35, stop: 0 black, stop: 1 #888);\r
+ border: 2px solid #555;\r
+ border-radius: 11px;\r
+ padding: 5px;\r
}\r
\r
-SettingScreen > QComboBox::drop-down {\r
- background: rgba(0,0,0,0);\r
- padding-right: 10px;\r
+SettingScreen QComboBox::drop-down {\r
+ background: rgba(0,0,0,0);\r
+ padding-right: 10px;\r
}\r
\r
-SettingScreen > QComboBox::down-arrow {\r
- border-image: url(:/Images/down-arrow.png);\r
+SettingScreen QComboBox::down-arrow {\r
+ border-image: url(:/Images/down-arrow.png);\r
}\r
\r
-SettingScreen > QComboBox QAbstractItemView {\r
+SettingScreen QComboBox QAbstractItemView {\r
color: white;\r
- border: 2px solid #555;\r
+ border: 2px solid #555;\r
selection-background-color: black;\r
- background: qradialgradient(cx: 0.3, cy: -0.4,\r
- fx: 0.3, fy: -0.4,\r
- radius: 1.35, stop: 0 black, stop: 1 #888);\r
+ background: qradialgradient(cx: 0.3, cy: -0.4,\r
+ fx: 0.3, fy: -0.4,\r
+ radius: 1.35, stop: 0 black, stop: 1 #888);\r
}\r
+\r
+SettingScreen QGroupBox {\r
+ color: white;\r
+ font: 16pt;\r
+}\r
+\r
+SettingScreen QTabBar::tab {\r
+ background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,\r
+ stop: 0 black, stop: 0.01 rgb(100, 100, 100),\r
+ stop: 0.02 black);\r
+ border: 2px groove #333;\r
+ border-radius: 10px;\r
+ padding: 2px 14px 2px 14px;\r
+ qproperty-alignment: AlignCenter;\r
+ color:#999;\r
+}\r
+SettingScreen QTabBar::tab:selected {\r
+ background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,\r
+ stop: 0 black, stop: 0.01 rgb(100, 100, 100),\r
+ stop: 0.02 black);\r
+ border: 2px groove gray;\r
+ border-radius: 10px;\r
+ padding: 2px 14px 2px 14px;\r
+ qproperty-alignment: AlignCenter;\r
+ color:white;\r
+}\r
+SettingScreen QTabWidget::pane {\r
+ background-color: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,\r
+ stop: 0 black, stop: 0.01 rgb(100, 100, 100),\r
+ stop: 0.02 black);\r
+ border: 2px groove gray;\r
+ border-radius: 10px;\r
+ padding: 6px;\r
+ qproperty-alignment: AlignCenter;\r
+}\r
index 1bca2d8e911b175b913effc2a3703397dbbbb861..0c6f9d957867043d178a297eb13e47d96708c032 100644 (file)
#include <QtGui>
+#define MAXIMUM_CONTENT_HEIGHT 450
+#define MAXIMUM_CONTENT_WIDTH 800
+
SettingScreen::SettingScreen(QWidget *parent) :
QWidget(parent)
{
connect(backButton,SIGNAL(clicked()),this,SLOT(commitChanges()));
connect(backButton, SIGNAL(clicked()), this, SIGNAL(valueChanged()));
+ QHBoxLayout *topLayout = new QHBoxLayout;
+ topLayout->addSpacing(40);
+ topLayout->addStretch();
+ topLayout->addWidget(title);
+ topLayout->addStretch();
+ topLayout->addWidget(backButton);
+
+ QTabWidget* mainTabWidget = new QTabWidget(this);
+ mainTabWidget->setFocusPolicy(Qt::NoFocus);
+
+ mainTabWidget->addTab(buildGeneralSettingsWidget(), "General");
+ mainTabWidget->addTab(buildFormatSettingsWidget(), "Format");
+ mainTabWidget->addTab(buildNetworkSettingsWidget(), "Network");
+// mainTabWidget->addTab(buildGeneralSettingsWidget(), QIcon(":/Images/glossy-blue-orb-icon-arrowback.png"),"General");
+// mainTabWidget->addTab(buildFormatSettingsWidget(), QIcon(":/Images/glossy-blue-orb-icon-arrowback.png"),"Format");
+// mainTabWidget->addTab(buildNetworkSettingsWidget(), QIcon(":/Images/glossy-blue-orb-icon-arrowback.png"),"Network");
+//
+ mainTabWidget->setIconSize(QSize(40,40));
+ mainTabWidget->setTabPosition(QTabWidget::West);
+ mainTabWidget->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
+ mainTabWidget->setMaximumSize(MAXIMUM_CONTENT_HEIGHT, MAXIMUM_CONTENT_WIDTH);
+
+ QHBoxLayout* contentsBox = new QHBoxLayout;
+ contentsBox->addWidget(mainTabWidget);
+
+ QVBoxLayout *mainLayout = new QVBoxLayout;
+ mainLayout->addLayout(topLayout);
+ mainLayout->addStretch();
+ mainLayout->addLayout(contentsBox);
+ mainLayout->setStretchFactor(contentsBox, 0);
+ mainLayout->addStretch(0);
+ mainLayout->setContentsMargins(0,0,0,0);
+ mainLayout->setAlignment(contentsBox,Qt::AlignCenter);
+
+
+ // show layout
+ setLayout(mainLayout);
+
+ //populate the current settings
+
+ int index = cityBox->findText(m_globalSettings->currentCity());
+ if(index>-1)
+ cityBox->setCurrentIndex(index);
+
+ if(m_globalSettings->temperatureFormat() == GlobalSettings::TempFormatC)
+ setTempFormatC();
+ else
+ setTempFormatF();
+
+ if(m_globalSettings->timeFormat() == GlobalSettings::TimeFormat24h)
+ setTimeFormat24h();
+ else
+ setTimeFormat12h();
+
+ m_proxyHostLineEdit->setText(m_globalSettings->proxyHost());
+
+ //to prevent a zero from showing up
+ if(QString::number(m_globalSettings->proxyPort()) != 0)
+ m_proxyPortLineEdit->setText(QString::number(m_globalSettings->proxyPort()));
+}
+
+QWidget* SettingScreen::buildNetworkSettingsWidget()
+{
+ QWidget* networkSettingsWidget = new QWidget(this);
+ networkSettingsWidget->setStyle(this->style());
+
+
+ QLabel *m_proxyHostLabel = new QLabel("Proxy Host: ", this);
+ QLabel *m_proxyPortLabel = new QLabel("Proxy Port: ", this);
+ m_proxyHostLineEdit = new QKeyboardLineEdit;
+ m_proxyPortLineEdit = new QKeyboardLineEdit;
+
+ QFormLayout* proxyLayout = new QFormLayout;
+ proxyLayout->addRow(m_proxyHostLabel, m_proxyHostLineEdit);
+ proxyLayout->addRow(m_proxyPortLabel, m_proxyPortLineEdit);
+ m_proxyHostLineEdit->setMaximumWidth(300);
+ m_proxyPortLineEdit->setMaximumWidth(80);
+ proxyLayout->setFormAlignment(Qt::AlignCenter);
+
+ QVBoxLayout* proxyVBoxLayout = new QVBoxLayout(this);
+ proxyVBoxLayout->addStretch();
+ proxyVBoxLayout->addLayout(proxyLayout);
+
+ QGroupBox* proxySettingsGroupBox = new QGroupBox("Proxy Settings");
+
+ proxySettingsGroupBox->setLayout(proxyVBoxLayout);
+
+ QVBoxLayout *networkSettingsLayout = new QVBoxLayout(this);
+ networkSettingsLayout->addWidget(proxySettingsGroupBox);
+ networkSettingsLayout->addStretch();
+
+ networkSettingsWidget->setLayout(networkSettingsLayout);
+
+ return networkSettingsWidget;
+}
+
+QWidget* SettingScreen::buildGeneralSettingsWidget()
+{
+ // create box to contain all possible cities
+ cityBox = new QComboBox;
+ cityBox->setFocusPolicy(Qt::NoFocus);
+ cityBox->addItem("Dallas,TX");
+ cityBox->addItem("Tokyo,Japan");
+ cityBox->addItem("Chicago,IL");
+ cityBox->addItem("Hong Kong,China");
+ cityBox->addItem("Munich,Germany");
+ cityBox->addItem("Taipei,Taiwan");
+ cityBox->addItem("San Jose,CA");
+ cityBox->addItem("Shanghai,China");
+ cityBox->addItem("New York,NY");
+ cityBox->addItem("Bangalore,India");
+ cityBox->addItem("Sao Paulo,Brazil");
+ cityBox->addItem("Seoul,South Korea");
+ cityBox->addItem("Moscow,Russia");
+ cityBox->addItem("Mexico City,Mexico");
+ cityBox->addItem("Johannesburg,South Africa");
+
+
+ QVBoxLayout *cityLayout = new QVBoxLayout;
+ cityLayout->addStretch();
+ cityLayout->addWidget(cityBox);
+ cityLayout->addStretch();
+
+ QWidget* generalSettingsWidget = new QWidget(this);
+
+ QGroupBox* generalSettingsGroupBox = new QGroupBox("City");
+
+ generalSettingsGroupBox->setLayout(cityLayout);
+
+ QVBoxLayout *generalSettingsLayout = new QVBoxLayout(this);
+ generalSettingsLayout->addWidget(generalSettingsGroupBox);
+ generalSettingsLayout->addStretch();
+
+ generalSettingsWidget->setLayout(generalSettingsLayout);
+
+ return generalSettingsWidget;
+}
+
+QWidget* SettingScreen::buildFormatSettingsWidget()
+{
// create button to select Fahrenheit
FButton = new QPushButton("°F", (this));
//FButton->setMaximumWidth(150);
connect(FButton, SIGNAL(clicked()), this, SIGNAL(valueChanged()));
connect(CButton, SIGNAL(clicked()), this, SIGNAL(valueChanged()));
- // create box to contain all possible cities
- cityBox = new QComboBox;
- cityBox->setFocusPolicy(Qt::NoFocus);
- cityBox->addItem("Dallas,TX");
- cityBox->addItem("Tokyo,Japan");
- cityBox->addItem("Chicago,IL");
- cityBox->addItem("Hong Kong,China");
- cityBox->addItem("Munich,Germany");
- cityBox->addItem("Taipei,Taiwan");
- cityBox->addItem("San Jose,CA");
- cityBox->addItem("Shanghai,China");
- cityBox->addItem("New York,NY");
- cityBox->addItem("Bangalore,India");
- cityBox->addItem("Sao Paulo,Brazil");
- cityBox->addItem("Seoul,South Korea");
- cityBox->addItem("Moscow,Russia");
- cityBox->addItem("Mexico City,Mexico");
- cityBox->addItem("Johannesburg,South Africa");
- // create city label
- QLabel *cityLabel = new QLabel("City: ", (this));
// create layout
QHBoxLayout *unitLayout = new QHBoxLayout;
timeFormatLayout->setSpacing(0);
timeFormatLayout->setContentsMargins(0,0,0,0);
- QHBoxLayout *cityLayout = new QHBoxLayout;
- cityLayout->addStretch();
- cityLayout->addWidget(cityLabel);
- cityLayout->addWidget(cityBox);
- cityLayout->addStretch();
-
- QHBoxLayout *topLayout = new QHBoxLayout;
- topLayout->addSpacing(40);
- topLayout->addStretch();
- topLayout->addWidget(title);
- topLayout->addStretch();
- topLayout->addWidget(backButton);
-
- QLabel *m_proxyHostLabel = new QLabel("Proxy Host: ", this);
- QLabel *m_proxyPortLabel = new QLabel("Proxy Port: ", this);
- m_proxyHostLineEdit = new QKeyboardLineEdit;
- m_proxyPortLineEdit = new QKeyboardLineEdit;
- QFormLayout* proxyLayout = new QFormLayout;
-
- proxyLayout->addRow(m_proxyHostLabel, m_proxyHostLineEdit);
- proxyLayout->addRow(m_proxyPortLabel, m_proxyPortLineEdit);
- m_proxyHostLineEdit->setMaximumWidth(300);
- m_proxyPortLineEdit->setMaximumWidth(80);
- proxyLayout->setFormAlignment(Qt::AlignCenter);
-
-
-
- QVBoxLayout *mainLayout = new QVBoxLayout;
- mainLayout->addLayout(topLayout);
- mainLayout->addStretch();
- mainLayout->addLayout(cityLayout);
- mainLayout->addStretch();
- mainLayout->addLayout(unitLayout);
- mainLayout->addStretch();
- mainLayout->addLayout(timeFormatLayout);
- mainLayout->addStretch();
- mainLayout->addLayout(proxyLayout);
- mainLayout->setAlignment(proxyLayout, Qt::AlignCenter);
- mainLayout->addStretch();
+ QGroupBox *tempFormatGroupBox = new QGroupBox("Temperature", this);
+ QGroupBox *timeFormatGroupBox = new QGroupBox("Time Format", this);
- // show layout
- setLayout(mainLayout);
+ tempFormatGroupBox->setLayout(unitLayout);
+ timeFormatGroupBox->setLayout(timeFormatLayout);
- //populate the current settings
+ QVBoxLayout *formatSettingsLayout = new QVBoxLayout(this);
+ formatSettingsLayout->addWidget(tempFormatGroupBox);
+ formatSettingsLayout->addWidget(timeFormatGroupBox);
- int index = cityBox->findText(m_globalSettings->currentCity());
- if(index>-1)
- cityBox->setCurrentIndex(index);
-
- if(m_globalSettings->temperatureFormat() == GlobalSettings::TempFormatC)
- setTempFormatC();
- else
- setTempFormatF();
+ QWidget *formatSettingsWidget = new QWidget(this);
+ formatSettingsWidget->setLayout(formatSettingsLayout);
- if(m_globalSettings->timeFormat() == GlobalSettings::TimeFormat24h)
- setTimeFormat24h();
- else
- setTimeFormat12h();
+ return formatSettingsWidget;
+}
- m_proxyHostLineEdit->setText(m_globalSettings->proxyHost());
- //to prevent a zero from showing up
- if(QString::number(m_globalSettings->proxyPort()) != 0)
- m_proxyPortLineEdit->setText(QString::number(m_globalSettings->proxyPort()));
-}
void SettingScreen::setTempFormatF()
{
index 765b0f601c3211ed0bad93b9c9b544c16afe10ff..5b34a807ddbd83cc7aa9eb5846d23f92d4b9aaeb 100644 (file)
QKeyboardLineEdit* m_proxyPortLineEdit;
GlobalSettings* m_globalSettings;
+
+ QWidget* buildNetworkSettingsWidget();
+ QWidget* buildGeneralSettingsWidget();
+ QWidget* buildFormatSettingsWidget();
};