Skip to content

Q
qgroundcontrol
Commit e536522e authored by Bryant's avatar Bryant
Browse files
Options

The View Only waypoint view is now styled similarly to the editable view. Same... 

The View Only waypoint view is now styled similarly to the editable view. Same caveats apply where the widgets don't update their style if QGC has its styles changed.
parent f2fd73b3
Show whitespace changes
Inline Side-by-side
Showing with 572 additions and 640 deletions
files/styles/style-dark.css
View file @ e536522e
......@@ -392,12 +392,12 @@ QToolTip {
color: #DDD;
}
WaypointEditableView {
WaypointEditableView, WaypointViewOnlyView {
border: 1px solid #777;
border-radius: 5px;
margin-bottom: 3px;
}
WaypointEditableView QCheckBox, WaypointEditableView .QWidget {
WaypointEditableView QCheckBox, WaypointEditableView .QWidget, WaypointViewOnlyView QCheckBox, WaypointViewOnlyView .QWidget {
background: none;
}
files/styles/style-light.css
View file @ e536522e
......@@ -396,12 +396,12 @@ QToolTip {
color: #000;
}
WaypointEditableView {
WaypointEditableView, WaypointViewOnlyView {
border: 1px solid #333;
border-radius: 5px;
margin-bottom: 3px;
}
WaypointEditableView QCheckBox, WaypointEditableView .QWidget {
WaypointEditableView QCheckBox, WaypointEditableView .QWidget, WaypointViewOnlyView QCheckBox, WaypointViewOnlyView .QWidget {
background: none;
}
src/ui/WaypointEditableView.cc
View file @ e536522e
......@@ -652,6 +652,9 @@ void WaypointEditableView::changeEvent(QEvent *e)
}
}
/**
* Implement paintEvent() so that stylesheets work for our custom widget.
*/
void WaypointEditableView::paintEvent(QPaintEvent *)
{
QStyleOption opt;
......
src/ui/WaypointViewOnlyView.cc
View file @ e536522e
#include <QDebug>
#include "MainWindow.h"
#include "WaypointViewOnlyView.h"
#include "ui_WaypointViewOnlyView.h"
......@@ -47,7 +49,6 @@ void WaypointViewOnlyView::changedCurrent(int state)
}
else
{
hightlightDesiredCurrent(true);
m_ui->current->setCheckState(Qt::Unchecked);
//qDebug() << "Trof: WaypointViewOnlyView::changedCurrent. Checked new. Sending set_current request to Manager " << m_ui->current->isChecked();
emit changeCurrentWaypoint(wp->getId()); //the slot changeCurrentWaypoint() in WaypointList sets all other current flags to false
......@@ -63,13 +64,11 @@ void WaypointViewOnlyView::setCurrent(bool state)
if (state == true)
{
wp->setCurrent(true);
hightlightDesiredCurrent(true);
m_ui->current->setCheckState(Qt::Checked);
}
else
{
wp->setCurrent(false);
hightlightDesiredCurrent(false);
m_ui->current->setCheckState(Qt::Unchecked);
}
m_ui->current->blockSignals(false);
......@@ -86,37 +85,38 @@ void WaypointViewOnlyView::updateValues()
return;
}
// Update style
QColor backGroundColor = QGC::colorBackground;
// Style alternating rows of Missions as lighter/darker.
static int lastId = -1;
int currId = wp->getId() % 2;
if (currId != lastId)
{
// qDebug() << "COLOR ID: " << currId;
QString backGroundColor;
if (currId == 1)
{
backGroundColor = QColor("#252528").lighter(150);
if (MainWindow::instance()->getStyle() == MainWindow::QGC_MAINWINDOW_STYLE_LIGHT)
{
backGroundColor = "#999";
}
else
{
backGroundColor = QColor("#252528").lighter(250);
backGroundColor = "#333";
}
}
else
{
if (MainWindow::instance()->getStyle() == MainWindow::QGC_MAINWINDOW_STYLE_LIGHT)
{
backGroundColor = "#CCC";
}
else
{
backGroundColor = "#555";
}
}
// Update color based on id
QString groupBoxStyle = QString("QGroupBox {padding: 0px; margin: 0px; border: 0px; background-color: %1; min-height: 12px; }").arg(backGroundColor.name());
QString labelStyle = QString("QWidget {background-color: %1; color: #DDDDDF; border-color: #EEEEEE; }").arg(backGroundColor.name());
QString displayBarStyle = QString("QWidget {background-color: %1; color: #DDDDDF; border: none; }").arg(backGroundColor.name());
QString checkBoxStyle = QString("QCheckBox {background-color: %1; color: #454545; border-color: #EEEEEE; }").arg(backGroundColor.name());
QString newStyle = QString("WaypointViewOnlyView {background-color: %1}").arg(backGroundColor);
this->setStyleSheet(newStyle);
m_ui->autoContinue->setStyleSheet(checkBoxStyle);
m_ui->current->setStyleSheet(checkBoxStyle);
m_ui->idLabel->setStyleSheet(labelStyle);
m_ui->displayBar->setStyleSheet(displayBarStyle);
m_ui->groupBox->setStyleSheet(groupBoxStyle);
lastId = currId;
}
......@@ -157,7 +157,6 @@ void WaypointViewOnlyView::updateValues()
}
}
hightlightDesiredCurrent(wp->getCurrent());
if (m_ui->current->isChecked() != wp->getCurrent())
{
m_ui->current->blockSignals(true);
......@@ -405,31 +404,29 @@ void WaypointViewOnlyView::updateValues()
}
}
void WaypointViewOnlyView::hightlightDesiredCurrent(bool hightlight_on)
WaypointViewOnlyView::~WaypointViewOnlyView()
{
QColor backGroundColor = QGC::colorBackground;
QString checkBoxStyle;
if (wp->getId() % 2 == 1)
{
backGroundColor = QColor("#252528").lighter(150);
}
else
{
backGroundColor = QColor("#252528").lighter(250);
}
if (hightlight_on)
{
checkBoxStyle = QString("QCheckBox {background-color: %1; color: #454545; border-color: #EEEEEE; } QCheckBox::indicator { border-color: #FFFFFF}").arg(backGroundColor.name());
}
else
{
checkBoxStyle = QString("QCheckBox {background-color: %1; color: #454545; border-color: #EEEEEE; } QCheckBox::indicator { border-color: QGC::colorBackground}").arg(backGroundColor.name());
}
m_ui->current->setStyleSheet(checkBoxStyle);
delete m_ui;
}
WaypointViewOnlyView::~WaypointViewOnlyView()
void WaypointViewOnlyView::changeEvent(QEvent *e)
{
delete m_ui;
switch (e->type()) {
case QEvent::LanguageChange:
m_ui->retranslateUi(this);
break;
default:
break;
}
}
/**
* Implement paintEvent() so that stylesheets work for our custom widget.
*/
void WaypointViewOnlyView::paintEvent(QPaintEvent *)
{
QStyleOption opt;
opt.init(this);
QPainter p(this);
style()->drawPrimitive(QStyle::PE_Widget, &opt, &p, this);
}
src/ui/WaypointViewOnlyView.h
View file @ e536522e
......@@ -18,20 +18,21 @@ public:
~WaypointViewOnlyView();
public slots:
void changedCurrent(int state);
void changedAutoContinue(int state);
void updateValues(void);
void setCurrent(bool state);
void changedCurrent(int state);
void changedAutoContinue(int state);
void updateValues(void);
void setCurrent(bool state);
signals:
void changeCurrentWaypoint(quint16);
void changeAutoContinue(quint16, bool);
protected:
Waypoint* wp;
Waypoint* wp;
virtual void changeEvent(QEvent *e);
virtual void paintEvent(QPaintEvent *);
private:
void hightlightDesiredCurrent(bool hightlight_on);
Ui::WaypointViewOnlyView *m_ui;
};
......
src/ui/WaypointViewOnlyView.ui
View file @ e536522e
......@@ -26,62 +26,37 @@
<string>Form</string>
</property>
<property name="styleSheet">
<string notr="true">QGroupBox {
border: 1px solid #EEEEEE;
border-radius: 5px;
padding: 0px 0px 0px 0px;
margin-top: 1ex; /* leave space at the top for the title */
margin: 0px;
}
QGroupBox::title {
subcontrol-origin: margin;
subcontrol-position: top center; /* position at the top center */
margin: 0 3px 0px 3px;
padding: 0 3px 0px 0px;
font: bold 8px;
}</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<property name="margin">
<number>0</number>
</property>
<property name="spacing">
<number>0</number>
<string notr="true"/>
</property>
<item row="0" column="0">
<widget class="QGroupBox" name="groupBox">
<property name="enabled">
<bool>true</bool>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<property name="margin">
<number>6</number>
</property>
<item>
<widget class="QLabel" name="idLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<sizepolicy hsizetype="Fixed" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="styleSheet">
<string notr="true"/>
</property>
<property name="title">
<string/>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property>
<property name="flat">
<bool>false</bool>
<property name="minimumSize">
<size>
<width>25</width>
<height>0</height>
</size>
</property>
<property name="checkable">
<bool>false</bool>
<property name="lineWidth">
<number>1</number>
</property>
<layout class="QHBoxLayout" name="horizontalLayout" stretch="0,2,100,10,5,1">
<property name="spacing">
<number>2</number>
<property name="text">
<string>ID</string>
</property>
<property name="margin">
<number>4</number>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="current">
<property name="sizePolicy">
......@@ -522,31 +497,6 @@ margin-top: 1ex; /* leave space at the top for the title */
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="idLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>25</width>
<height>0</height>
</size>
</property>
<property name="lineWidth">
<number>1</number>
</property>
<property name="text">
<string>ID</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="displayBar">
<property name="sizePolicy">
......@@ -569,22 +519,6 @@ margin-top: 1ex; /* leave space at the top for the title */
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>79</width>
<height>17</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QLabel" name="frameLabel">
<property name="toolTip">
......@@ -631,9 +565,6 @@ margin-top: 1ex; /* leave space at the top for the title */
</item>
</layout>
</widget>
</item>
</layout>
</widget>
<resources/>
<connections/>
</ui>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment