rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-01-29 14:52:12 +01:00
Code Issues Releases Activity

OP-857 OP-869 fixed style sheet issues:

Browse Source 
- removed wide style sheets
- added style sheet common to all platforms
- fixed broken styles for QTabWidget and QGroupBox on Windows
- fixed broken style for QTabWidget on Linux
This commit is contained in:
Philippe Renon 2013-03-12 22:04:03 +01:00
parent 96a1e1d8c9
commit 9b495b4d5e
10 changed files with 189 additions and 653 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ground/openpilotgcs/share/openpilotgcs/default_configurations/OpenPilotGCS_wide.xml
View File

@ -11,7 +11,7 @@
<UDPMirror>false</UDPMirror> <UDPMirror>false</UDPMirror>
<Description>Wide configuration</Description> <Description>Wide configuration</Description>
<Details>Default configuration built for wide screens (17"up)</Details> <Details>Default configuration built for wide screens (17"up)</Details>
<StyleSheet>wide</StyleSheet> <StyleSheet>default</StyleSheet>
</General> </General>
<KeyBindings> <KeyBindings>
<size>0</size> <size>0</size>

84
ground/openpilotgcs/share/openpilotgcs/stylesheets/default.qss Normal file
View File

@ -0,0 +1,84 @@
/* Default styles */
MyListWidget {
font-size: 11px;
}
Utils--StyledBar {
background-color: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 rgba(0, 0, 0, 255), stop:1 rgba(200, 200, 200, 255));
}
QSlider::groove:horizontal {
border: 1px solid rgb(196, 196, 196);
background: white;
height: 6px;
border-radius: 2px;
margin 10px 10px;
}
QSlider::add-page:horizontal {
background: #fff;
border: 1px solid #777;
height: 1px;
border-radius: 4px;
}
QSlider::sub-page:horizontal {
background: rgb(249, 117, 76);
border: 1px solid #777;
height: 1px;
border-radius: 4px;
}
QSlider::handle:horizontal {
background: rgb(196, 196, 196);
width: 18px;
height: 28px;
margin: -2px 0;
border-radius: 3px;
border: 1px solid #777;
}
QSlider::groove:vertical {
border: 1px solid rgb(196, 196, 196);
background: white;
width: 6px;
border-radius: 2px;
margin 0px -10px;
margin-top: 5px;
margin-bottom: 5px;
}
QSlider::sub-page:vertical {
background: #fff;
border: 1px solid #777;
width: 1px;
border-radius: 4px;
}
QSlider::add-page:vertical {
background: rgb(249, 117, 76);
border: 1px solid #777;
width: 1px;
border-radius: 4px;
}
QSlider::handle:vertical {
background: rgb(196, 196, 196);
width: 18px;
margin: -6 -6;
border-radius: 3px;
border: 1px solid #777;
}
QSlider::handle:vertical:hover {
background: qlineargradient(x1:0, y1:0, x2:1, y2:1, stop:0 #fff, stop:1 #ddd);
border: 1px solid #444;
border-radius: 4px;
}
QSlider::handle:horizontal:hover {
background: qlineargradient(x1:0, y1:0, x2:1, y2:1, stop:0 #fff, stop:1 #ddd);
border: 1px solid #444;
border-radius: 4px;
}

118
ground/openpilotgcs/share/openpilotgcs/stylesheets/default_linux.qss
View File

@ -1,105 +1,19 @@
MyListWidget {font-size: 11px;} /* Linux styles */
MixerCurveWidget {font-size: 12px;}
Utils--StyledBar { background-color: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 rgba(0, 0, 0, 255), stop:1 rgba(200, 200, 200, 255));}
QGroupBox {
border: 1px solid gray;
border-radius: 5px;
margin-top: 1ex;
font-size: 11px;
font-weight: bold;
}
QGroupBox::title {
subcontrol-origin: margin;
subcontrol-position: top left;
padding: 0 3px;
}
MixerCurveWidget {
font-size: 12px;
QGroupBox { }
border: 1px solid gray;
border-radius: 5px;
margin-top: 1ex; /* leave space at the top for the title */
font-size: 11px;
font-weight: bold;
}
QGroupBox::title {
subcontrol-origin: margin;
subcontrol-position: top left; /* position at the top center */
padding: 0 3px;
}
QTabWidget::pane { /* The tab widget frame */
margin: 1px,1px,1px,1px;
border: 2px solid rgb(196,196,196);
border-radius: 5px;
padding: 0px;
}
QSlider::groove:horizontal {
border: 1px solid rgb(196,196,196);
background: white;
height: 6px;
border-radius: 2px;
margin 10px 10px;
}
QSlider::add-page:horizontal {
background: #fff;
border: 1px solid #777;
height: 1px;
border-radius: 4px;
}
QSlider::sub-page:horizontal {
background: rgb(249,117,76);
border: 1px solid #777;
height: 1px;
border-radius: 4px;
}
QSlider::handle:horizontal {
background: rgb(196,196,196);
width: 18px;
height: 28px;
margin: -2px 0;
border-radius: 3px;
border: 1px solid #777;
}
QSlider::groove:vertical {
border: 1px solid rgb(196,196,196);
background: white;
width: 6px;
border-radius: 2px;
margin 0px -10px;
margin-top: 5px;
margin-bottom: 5px;
}
QSlider::sub-page:vertical {
background: #fff;
border: 1px solid #777;
width: 1px;
border-radius: 4px;
}
QSlider::add-page:vertical {
background: rgb(249,117,76);
border: 1px solid #777;
width: 1px;
border-radius: 4px;
}
QSlider::handle:vertical {
background: rgb(196,196,196);
width: 18px;
margin: -6 -6;
border-radius: 3px;
border: 1px solid #777;
}
QSlider::handle:vertical:hover {
background: qlineargradient(x1:0, y1:0, x2:1, y2:1, stop:0 #fff, stop:1 #ddd);
border: 1px solid #444;
border-radius: 4px;
}
QSlider::handle:horizontal:hover {
background: qlineargradient(x1:0, y1:0, x2:1, y2:1, stop:0 #fff, stop:1 #ddd);
border: 1px solid #444;
border-radius: 4px;
}

120
ground/openpilotgcs/share/openpilotgcs/stylesheets/default_macos.qss
View File

@ -1,104 +1,22 @@
MyListWidget {font-size: 11px;} /* MacOS styles */
Utils--StyledBar { background-color: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 rgba(0, 0, 0, 255), stop:1 rgba(200, 200, 200, 255));}
QGroupBox {
border: 1px solid gray;
border-radius: 5px;
margin-top: 1ex;
font-size: 11px;
font-weight: bold;
}
QGroupBox::title {
subcontrol-origin: margin;
subcontrol-position: top left;
padding: 0 3px;
}
QTabWidget::pane {
margin: 1px, 1px, 1px, 1px;
QGroupBox { border: 2px solid rgb(196, 196, 196);
border: 1px solid gray; border-radius: 5px;
border-radius: 5px; padding: 0px;
margin-top: 1ex; /* leave space at the top for the title */ }
font-size: 11px;
font-weight: bold;
}
QGroupBox::title {
subcontrol-origin: margin;
subcontrol-position: top left; /* position at the top center */
padding: 0 3px;
}
QTabWidget::pane { /* The tab widget frame */
margin: 1px,1px,1px,1px;
border: 2px solid rgb(196,196,196);
border-radius: 5px;
padding: 0px;
}
QSlider::groove:horizontal {
border: 1px solid rgb(196,196,196);
background: white;
height: 6px;
border-radius: 2px;
margin 10px 10px;
}
QSlider::add-page:horizontal {
background: #fff;
border: 1px solid #777;
height: 1px;
border-radius: 4px;
}
QSlider::sub-page:horizontal {
background: rgb(249,117,76);
border: 1px solid #777;
height: 1px;
border-radius: 4px;
}
QSlider::handle:horizontal {
background: rgb(196,196,196);
width: 18px;
height: 28px;
margin: -2px 0;
border-radius: 3px;
border: 1px solid #777;
}
QSlider::groove:vertical {
border: 1px solid rgb(196,196,196);
background: white;
width: 6px;
border-radius: 2px;
margin 0px -10px;
margin-top: 5px;
margin-bottom: 5px;
}
QSlider::sub-page:vertical {
background: #fff;
border: 1px solid #777;
width: 1px;
border-radius: 4px;
}
QSlider::add-page:vertical {
background: rgb(249,117,76);
border: 1px solid #777;
width: 1px;
border-radius: 4px;
}
QSlider::handle:vertical {
background: rgb(196,196,196);
width: 18px;
margin: -6 -6;
border-radius: 3px;
border: 1px solid #777;
}
QSlider::handle:vertical:hover {
background: qlineargradient(x1:0, y1:0, x2:1, y2:1, stop:0 #fff, stop:1 #ddd);
border: 1px solid #444;
border-radius: 4px;
}
QSlider::handle:horizontal:hover {
background: qlineargradient(x1:0, y1:0, x2:1, y2:1, stop:0 #fff, stop:1 #ddd);
border: 1px solid #444;
border-radius: 4px;
}

118
ground/openpilotgcs/share/openpilotgcs/stylesheets/default_windows.qss
View File

@ -1,104 +1,18 @@
MyListWidget {font-size: 11px;} /* Windows styles */
Utils--StyledBar { background-color: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 rgba(0, 0, 0, 255), stop:1 rgba(200, 200, 200, 255));}
QGroupBox {
border: 1px solid gray;
border-radius: 3px;
margin-top: 1ex;
padding: 1ex 0px 0px 0px;
font-size: 11px;
font-weight: bold;
}
QGroupBox::title {
subcontrol-origin: margin;
subcontrol-position: top left;
QGroupBox { left: 7px;
border: 1px solid gray; top: -1ex;
border-radius: 5px; padding: 0px 3px;
margin-top: 1ex; /* leave space at the top for the title */ }
font-size: 11px;
font-weight: bold;
}
QGroupBox::title {
subcontrol-origin: margin;
subcontrol-position: top left; /* position at the top center */
padding: 0 3px;
}
QTabWidget::pane { /* The tab widget frame */
margin: 1px,1px,1px,1px;
border: 2px solid rgb(196,196,196);
border-radius: 5px;
padding: 0px;
}
QSlider::groove:horizontal {
border: 1px solid rgb(196,196,196);
background: white;
height: 6px;
border-radius: 2px;
margin 10px 10px;
}
QSlider::add-page:horizontal {
background: #fff;
border: 1px solid #777;
height: 1px;
border-radius: 4px;
}
QSlider::sub-page:horizontal {
background: rgb(249,117,76);
border: 1px solid #777;
height: 1px;
border-radius: 4px;
}
QSlider::handle:horizontal {
background: rgb(196,196,196);
width: 18px;
height: 28px;
margin: -2px 0;
border-radius: 3px;
border: 1px solid #777;
}
QSlider::groove:vertical {
border: 1px solid rgb(196,196,196);
background: white;
width: 6px;
border-radius: 2px;
margin 0px -10px;
margin-top: 5px;
margin-bottom: 5px;
}
QSlider::sub-page:vertical {
background: #fff;
border: 1px solid #777;
width: 1px;
border-radius: 4px;
}
QSlider::add-page:vertical {
background: rgb(249,117,76);
border: 1px solid #777;
width: 1px;
border-radius: 4px;
}
QSlider::handle:vertical {
background: rgb(196,196,196);
width: 18px;
margin: -6 -6;
border-radius: 3px;
border: 1px solid #777;
}
QSlider::handle:vertical:hover {
background: qlineargradient(x1:0, y1:0, x2:1, y2:1, stop:0 #fff, stop:1 #ddd);
border: 1px solid #444;
border-radius: 4px;
}
QSlider::handle:horizontal:hover {
background: qlineargradient(x1:0, y1:0, x2:1, y2:1, stop:0 #fff, stop:1 #ddd);
border: 1px solid #444;
border-radius: 4px;
}

105
ground/openpilotgcs/share/openpilotgcs/stylesheets/wide_linux.qss
View File

@ -1,105 +0,0 @@
MyListWidget {font-size: 11px;}
MixerCurveWidget {font-size: 12px;}
Utils--StyledBar { background-color: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 rgba(0, 0, 0, 255), stop:1 rgba(200, 200, 200, 255));}
QGroupBox {
border: 1px solid gray;
border-radius: 5px;
margin-top: 1ex; /* leave space at the top for the title */
font-size: 11px;
font-weight: bold;
}
QGroupBox::title {
subcontrol-origin: margin;
subcontrol-position: top left; /* position at the top center */
padding: 0 3px;
}
QTabWidget::pane { /* The tab widget frame */
margin: 1px,1px,1px,1px;
border: 2px solid rgb(196,196,196);
border-radius: 5px;
padding: 0px;
}
QSlider::groove:horizontal {
border: 1px solid rgb(196,196,196);
background: white;
height: 6px;
border-radius: 2px;
margin 10px 10px;
}
QSlider::add-page:horizontal {
background: #fff;
border: 1px solid #777;
height: 1px;
border-radius: 4px;
}
QSlider::sub-page:horizontal {
background: rgb(249,117,76);
border: 1px solid #777;
height: 1px;
border-radius: 4px;
}
QSlider::handle:horizontal {
background: rgb(196,196,196);
width: 18px;
height: 28px;
margin: -2px 0;
border-radius: 3px;
border: 1px solid #777;
}
QSlider::groove:vertical {
border: 1px solid rgb(196,196,196);
background: white;
width: 6px;
border-radius: 2px;
margin 0px -10px;
margin-top: 5px;
margin-bottom: 5px;
}
QSlider::sub-page:vertical {
background: #fff;
border: 1px solid #777;
width: 1px;
border-radius: 4px;
}
QSlider::add-page:vertical {
background: rgb(249,117,76);
border: 1px solid #777;
width: 1px;
border-radius: 4px;
}
QSlider::handle:vertical {
background: rgb(196,196,196);
width: 18px;
margin: -6 -6;
border-radius: 3px;
border: 1px solid #777;
}
QSlider::handle:vertical:hover {
background: qlineargradient(x1:0, y1:0, x2:1, y2:1, stop:0 #fff, stop:1 #ddd);
border: 1px solid #444;
border-radius: 4px;
}
QSlider::handle:horizontal:hover {
background: qlineargradient(x1:0, y1:0, x2:1, y2:1, stop:0 #fff, stop:1 #ddd);
border: 1px solid #444;
border-radius: 4px;
}

104
ground/openpilotgcs/share/openpilotgcs/stylesheets/wide_macos.qss
View File

@ -1,104 +0,0 @@
MyListWidget {font-size: 11px;}
Utils--StyledBar { background-color: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 rgba(0, 0, 0, 255), stop:1 rgba(200, 200, 200, 255));}
QGroupBox {
border: 1px solid gray;
border-radius: 5px;
margin-top: 1ex; /* leave space at the top for the title */
font-size: 11px;
font-weight: bold;
}
QGroupBox::title {
subcontrol-origin: margin;
subcontrol-position: top left; /* position at the top center */
padding: 0 3px;
}
QTabWidget::pane { /* The tab widget frame */
margin: 1px,1px,1px,1px;
border: 2px solid rgb(196,196,196);
border-radius: 5px;
padding: 0px;
}
QSlider::groove:horizontal {
border: 1px solid rgb(196,196,196);
background: white;
height: 6px;
border-radius: 2px;
margin 10px 10px;
}
QSlider::add-page:horizontal {
background: #fff;
border: 1px solid #777;
height: 1px;
border-radius: 4px;
}
QSlider::sub-page:horizontal {
background: rgb(249,117,76);
border: 1px solid #777;
height: 1px;
border-radius: 4px;
}
QSlider::handle:horizontal {
background: rgb(196,196,196);
width: 18px;
height: 28px;
margin: -2px 0;
border-radius: 3px;
border: 1px solid #777;
}
QSlider::groove:vertical {
border: 1px solid rgb(196,196,196);
background: white;
width: 6px;
border-radius: 2px;
margin 0px -10px;
margin-top: 5px;
margin-bottom: 5px;
}
QSlider::sub-page:vertical {
background: #fff;
border: 1px solid #777;
width: 1px;
border-radius: 4px;
}
QSlider::add-page:vertical {
background: rgb(249,117,76);
border: 1px solid #777;
width: 1px;
border-radius: 4px;
}
QSlider::handle:vertical {
background: rgb(196,196,196);
width: 18px;
margin: -6 -6;
border-radius: 3px;
border: 1px solid #777;
}
QSlider::handle:vertical:hover {
background: qlineargradient(x1:0, y1:0, x2:1, y2:1, stop:0 #fff, stop:1 #ddd);
border: 1px solid #444;
border-radius: 4px;
}
QSlider::handle:horizontal:hover {
background: qlineargradient(x1:0, y1:0, x2:1, y2:1, stop:0 #fff, stop:1 #ddd);
border: 1px solid #444;
border-radius: 4px;
}

104
ground/openpilotgcs/share/openpilotgcs/stylesheets/wide_windows.qss
View File

@ -1,104 +0,0 @@
MyListWidget {font-size: 11px;}
Utils--StyledBar { background-color: qlineargradient(spread:pad, x1:0, y1:0, x2:0, y2:1, stop:0 rgba(0, 0, 0, 255), stop:1 rgba(200, 200, 200, 255));}
QGroupBox {
border: 1px solid gray;
border-radius: 5px;
margin-top: 1ex; /* leave space at the top for the title */
font-size: 11px;
font-weight: bold;
}
QGroupBox::title {
subcontrol-origin: margin;
subcontrol-position: top left; /* position at the top center */
padding: 0 3px;
}
QTabWidget::pane { /* The tab widget frame */
margin: 1px,1px,1px,1px;
border: 2px solid rgb(196,196,196);
border-radius: 5px;
padding: 0px;
}
QSlider::groove:horizontal {
border: 1px solid rgb(196,196,196);
background: white;
height: 6px;
border-radius: 2px;
margin 10px 10px;
}
QSlider::add-page:horizontal {
background: #fff;
border: 1px solid #777;
height: 1px;
border-radius: 4px;
}
QSlider::sub-page:horizontal {
background: rgb(249,117,76);
border: 1px solid #777;
height: 1px;
border-radius: 4px;
}
QSlider::handle:horizontal {
background: rgb(196,196,196);
width: 18px;
height: 28px;
margin: -2px 0;
border-radius: 3px;
border: 1px solid #777;
}
QSlider::groove:vertical {
border: 1px solid rgb(196,196,196);
background: white;
width: 6px;
border-radius: 2px;
margin 0px -10px;
margin-top: 5px;
margin-bottom: 5px;
}
QSlider::sub-page:vertical {
background: #fff;
border: 1px solid #777;
width: 1px;
border-radius: 4px;
}
QSlider::add-page:vertical {
background: rgb(249,117,76);
border: 1px solid #777;
width: 1px;
border-radius: 4px;
}
QSlider::handle:vertical {
background: rgb(196,196,196);
width: 18px;
margin: -6 -6;
border-radius: 3px;
border: 1px solid #777;
}
QSlider::handle:vertical:hover {
background: qlineargradient(x1:0, y1:0, x2:1, y2:1, stop:0 #fff, stop:1 #ddd);
border: 1px solid #444;
border-radius: 4px;
}
QSlider::handle:horizontal:hover {
background: qlineargradient(x1:0, y1:0, x2:1, y2:1, stop:0 #fff, stop:1 #ddd);
border: 1px solid #444;
border-radius: 4px;
}

85
ground/openpilotgcs/src/plugins/coreplugin/mainwindow.cpp
View File

@ -310,11 +310,37 @@ void MainWindow::extensionsInitialized()
qs = settings; qs = settings;
qDebug() << "Load default config from resource " << filename; qDebug() << "Load default config from resource " << filename;
} }
qs->beginGroup("General"); qs->beginGroup("General");
m_config_description=qs->value("Description", "none").toString(); m_config_description = qs->value("Description", "none").toString();
m_config_details=qs->value("Details", "none").toString(); m_config_details = qs->value("Details", "none").toString();
m_config_stylesheet=qs->value("StyleSheet", "none").toString(); m_config_stylesheet = qs->value("StyleSheet", "none").toString();
loadStyleSheet(m_config_stylesheet);
qDebug() << "Configured style sheet:" << m_config_stylesheet;
if (m_config_stylesheet == "wide") {
// OP-869 just in case some user configuration still references the now obsolete "wide" style sheet
m_config_stylesheet = "default";
}
// Load common style sheet
QString style = loadStyleSheet(m_config_stylesheet + ".qss");
// Load and concatenate platform specific style sheet
QString fileName = m_config_stylesheet;
#ifdef Q_OS_MAC
fileName += "_macos.qss";
#elif defined(Q_OS_LINUX)
fileName += "_linux.qss";
#else
fileName += "_windows.qss";
#endif
style += loadStyleSheet(fileName);
// We'll use qApp macro to get the QApplication pointer
// and set the style sheet application wide.
qDebug() << "Setting application style sheet to:" << style;
qApp->setStyleSheet(style);
qs->endGroup(); qs->endGroup();
m_uavGadgetInstanceManager = new UAVGadgetInstanceManager(this); m_uavGadgetInstanceManager = new UAVGadgetInstanceManager(this);
m_uavGadgetInstanceManager->readSettings(qs); m_uavGadgetInstanceManager->readSettings(qs);
@ -329,40 +355,33 @@ void MainWindow::extensionsInitialized()
emit m_coreImpl->coreOpened(); emit m_coreImpl->coreOpened();
} }
void MainWindow::loadStyleSheet(QString name) { QString MainWindow::loadStyleSheet(QString fileName) {
/* Let's use QFile and point to a resource... */ // Let's use QFile and point to a resource...
QDir directory(QCoreApplication::applicationDirPath()); QDir dir(QCoreApplication::applicationDirPath());
#ifdef Q_OS_MAC #ifdef Q_OS_MAC
directory.cdUp(); dir.cdUp();
directory.cd("Resources"); dir.cd("Resources");
#else #else
directory.cdUp(); dir.cdUp();
directory.cd("share"); dir.cd("share");
directory.cd("openpilotgcs"); dir.cd("openpilotgcs");
#endif
directory.cd("stylesheets");
#ifdef Q_OS_MAC
QFile data(directory.absolutePath()+QDir::separator()+name+"_macos.qss");
#elif defined(Q_OS_LINUX)
QFile data(directory.absolutePath()+QDir::separator()+name+"_linux.qss");
#else
QFile data(directory.absolutePath()+QDir::separator()+name+"_windows.qss");
#endif #endif
dir.cd("stylesheets");
QString style; QString style;
/* ...to open the file */ // ...to open the file
if(data.open(QFile::ReadOnly)) { QFile file(dir.absolutePath() + QDir::separator() + fileName);
/* QTextStream... */ qDebug() << "Loading style sheet file" << file.fileName();
QTextStream styleIn(&data); if (file.open(QFile::ReadOnly)) {
/* ...read file to a string. */ // QTextStream...
style = styleIn.readAll(); QTextStream textStream(&file);
data.close(); // ...read file to a string.
/* We'll use qApp macro to get the QApplication pointer style = textStream.readAll();
* and set the style sheet application wide. */ file.close();
qApp->setStyleSheet(style);
qDebug()<<"Loaded stylesheet:"<<style;
} }
else else {
qDebug()<<"Failed to openstylesheet file"<<directory.absolutePath()<<name; qDebug() << "Failed to open style sheet file" << file.fileName();
}
return style;
} }
void MainWindow::closeEvent(QCloseEvent *event) void MainWindow::closeEvent(QCloseEvent *event)

2
ground/openpilotgcs/src/plugins/coreplugin/mainwindow.h
View File

@ -170,7 +170,7 @@ private:
void registerDefaultContainers(); void registerDefaultContainers();
void registerDefaultActions(); void registerDefaultActions();
void createWorkspaces(QSettings* qs, bool diffOnly = false); void createWorkspaces(QSettings* qs, bool diffOnly = false);
void loadStyleSheet(QString name); QString loadStyleSheet(QString name);
CoreImpl *m_coreImpl; CoreImpl *m_coreImpl;
UniqueIDManager *m_uniqueIDManager; UniqueIDManager *m_uniqueIDManager;