zhaohuwei
/
QG4
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Revised the UI for styling QGC again. I think it's a little clearer now.

QGC4.4
Bryant 12 years ago
parent
2a0f669b07
commit
a4201a09d0
3 changed files with 127 additions and 73 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/ui/MainWindow.cc
  2. 19
      src/ui/QGCSettingsWidget.cc
  3. 179
      src/ui/QGCSettingsWidget.ui

2
src/ui/MainWindow.cc
Unescape View File

@ -1228,7 +1228,7 @@ bool MainWindow::loadStyle(QGC_MAINWINDOW_STYLE style, QString cssFile)
default: default:
style = QGC_MAINWINDOW_STYLE_DARK; style = QGC_MAINWINDOW_STYLE_DARK;
case QGC_MAINWINDOW_STYLE_DARK: case QGC_MAINWINDOW_STYLE_DARK:
styleFileName = ":files/styles/style-dark.css"; darkStyleFileName = ":files/styles/style-dark.css";
break; break;
case QGC_MAINWINDOW_STYLE_LIGHT: case QGC_MAINWINDOW_STYLE_LIGHT:
styleFileName = ":files/styles/style-light.css"; styleFileName = ":files/styles/style-light.css";

19
src/ui/QGCSettingsWidget.cc
Unescape View File

@ -17,9 +17,6 @@ QGCSettingsWidget::QGCSettingsWidget(QWidget *parent, Qt::WindowFlags flags) :
{ {
ui->setupUi(this); ui->setupUi(this);
// Set the frame holding the options for the custom style frame to hidden by default
ui->customStyleFrame->setVisible(false);
// Add all protocols // Add all protocols
QList<ProtocolInterface*> protocols = LinkManager::instance()->getProtocols(); QList<ProtocolInterface*> protocols = LinkManager::instance()->getProtocols();
foreach (ProtocolInterface* protocol, protocols) { foreach (ProtocolInterface* protocol, protocols) {
@ -53,7 +50,8 @@ QGCSettingsWidget::QGCSettingsWidget(QWidget *parent, Qt::WindowFlags flags) :
MainWindow::QGC_MAINWINDOW_STYLE style = (MainWindow::QGC_MAINWINDOW_STYLE)MainWindow::instance()->getStyle(); MainWindow::QGC_MAINWINDOW_STYLE style = (MainWindow::QGC_MAINWINDOW_STYLE)MainWindow::instance()->getStyle();
ui->styleChooser->setCurrentIndex(style); ui->styleChooser->setCurrentIndex(style);
connect(ui->styleChooser, SIGNAL(currentIndexChanged(int)), this, SLOT(styleChanged(int))); connect(ui->styleChooser, SIGNAL(currentIndexChanged(int)), this, SLOT(styleChanged(int)));
connect(ui->customStyleFileButton, SIGNAL(clicked()), this, SLOT(selectStylesheet())); connect(ui->darkStyleCustomButton, SIGNAL(clicked()), this, SLOT(selectStylesheet()));
connect(ui->lightStyleCustomButton, SIGNAL(clicked()), this, SLOT(selectStylesheet()));
// Close / destroy // Close / destroy
connect(ui->buttonBox, SIGNAL(accepted()), this, SLOT(deleteLater())); connect(ui->buttonBox, SIGNAL(accepted()), this, SLOT(deleteLater()));
@ -128,18 +126,7 @@ bool QGCSettingsWidget::updateStyle()
} }
void QGCSettingsWidget::styleChanged(int index) void QGCSettingsWidget::styleChanged(int index)
{ {
// If a custom style is selected, enable the advanced view for the custom stylesheet. Otherwise,
// make sure it's hidden.
if (index == 2 || index == 3)
{
ui->customStyleFrame->setVisible(true);
}
else
{
ui->customStyleFrame->setVisible(false);
}
// And trigger a style update. // And trigger a style update.
updateStyle(); updateStyle();
} }

179
src/ui/QGCSettingsWidget.ui
Unescape View File

@ -6,12 +6,12 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>535</width> <width>392</width>
<height>427</height> <height>313</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Minimum"> <sizepolicy hsizetype="MinimumExpanding" vsizetype="MinimumExpanding">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
@ -73,75 +73,142 @@
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QFrame" name="styleFrame"> <widget class="QGroupBox" name="groupBox">
<property name="sizePolicy"> <property name="title">
<sizepolicy hsizetype="Preferred" vsizetype="Minimum"> <string>Style</string>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property> </property>
<property name="frameShape"> <layout class="QVBoxLayout" name="verticalLayout_3">
<enum>QFrame::Box</enum> <item>
</property> <layout class="QHBoxLayout" name="horizontalLayout">
<property name="frameShadow"> <property name="sizeConstraint">
<enum>QFrame::Sunken</enum> <enum>QLayout::SetMinimumSize</enum>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_5"> <item>
<widget class="QLabel" name="label">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Minimum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Use:</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer">
<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="QComboBox" name="styleChooser">
<item>
<property name="text">
<string>Dark (for indoor use)</string>
</property>
</item>
<item>
<property name="text">
<string>Light (for outdoor use)</string>
</property>
</item>
</widget>
</item>
</layout>
</item>
<item> <item>
<widget class="QComboBox" name="styleChooser"> <layout class="QHBoxLayout" name="DarkStyleLayout">
<item> <item>
<property name="text"> <widget class="QLabel" name="label_2">
<string>Dark (for indoor use)</string> <property name="sizePolicy">
</property> <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Dark:</string>
</property>
</widget>
</item> </item>
<item> <item>
<property name="text"> <widget class="QLineEdit" name="darkStyleFile"/>
<string>Light (for outdoor use)</string>
</property>
</item> </item>
<item> <item>
<property name="text"> <widget class="QPushButton" name="darkStyleCustomButton">
<string>Custom dark (for indoor use)</string> <property name="text">
</property> <string>Custom</string>
</property>
</widget>
</item> </item>
<item> <item>
<property name="text"> <widget class="QPushButton" name="darkStyleDefaultButton">
<string>Custom light (for outdoor use)</string> <property name="text">
</property> <string>Default</string>
</property>
</widget>
</item> </item>
</widget> </layout>
</item> </item>
<item> <item>
<widget class="QFrame" name="customStyleFrame"> <layout class="QHBoxLayout" name="LightStyleLayout">
<property name="sizePolicy"> <item>
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Minimum"> <widget class="QLabel" name="label_3">
<horstretch>0</horstretch> <property name="sizePolicy">
<verstretch>0</verstretch> <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
</sizepolicy> <horstretch>0</horstretch>
</property> <verstretch>0</verstretch>
<property name="frameShape"> </sizepolicy>
<enum>QFrame::NoFrame</enum> </property>
</property> <property name="text">
<property name="frameShadow"> <string>Light:</string>
<enum>QFrame::Plain</enum> </property>
</property> </widget>
<layout class="QHBoxLayout" name="horizontalLayout_2"> </item>
<item> <item>
<widget class="QLineEdit" name="lineEdit"/> <widget class="QLineEdit" name="lightStyleFile"/>
</item> </item>
<item> <item>
<widget class="QPushButton" name="customStyleFileButton"> <widget class="QPushButton" name="lightStyleCustomButton">
<property name="text"> <property name="text">
<string>Select</string> <string>Custom</string>
</property> </property>
</widget> </widget>
</item> </item>
</layout> <item>
</widget> <widget class="QPushButton" name="lightStyleDefaultButton">
<property name="text">
<string>Default</string>
</property>
</widget>
</item>
</layout>
</item> </item>
</layout> </layout>
</widget> </widget>
</item> </item>
<item>
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>0</height>
</size>
</property>
</spacer>
</item>
</layout> </layout>
</widget> </widget>
</widget> </widget>

Write Preview
Loading…
Cancel
Save