From 9f8145d0f95d42625a543719d50544837e6ca95e Mon Sep 17 00:00:00 2001 From: Bryant Date: Sun, 19 May 2013 01:00:29 -0700 Subject: [PATCH] Removed commented-out references to setStyleSheet(). Moving towards all styles being set in .css files --- src/ui/designer/QGCComboBox.cc | 2 -- src/ui/designer/QGCCommandButton.cc | 4 ---- src/ui/designer/QGCParamSlider.cc | 3 --- src/ui/designer/QGCTextLabel.cc | 5 ----- src/ui/uas/QGCUnconnectedInfoWidget.cc | 4 ---- 5 files changed, 18 deletions(-) diff --git a/src/ui/designer/QGCComboBox.cc b/src/ui/designer/QGCComboBox.cc index bcd0d65..21d86f6 100644 --- a/src/ui/designer/QGCComboBox.cc +++ b/src/ui/designer/QGCComboBox.cc @@ -42,8 +42,6 @@ QGCComboBox::QGCComboBox(QWidget *parent) : ui->infoLabel->hide(); ui->editOptionComboBox->setEnabled(false); isDisabled = true; - //ui->editLine1->setStyleSheet("QWidget { border: 1px solid #66666B; border-radius: 3px; padding: 10px 0px 0px 0px; background: #111122; }"); - // ui->editLine2->setStyleSheet("QWidget { border: 1px solid #66666B; border-radius: 3px; padding: 10px 0px 0px 0px; background: #111122; }"); connect(ui->editDoneButton, SIGNAL(clicked()), this, SLOT(endEditMode())); connect(ui->editOptionComboBox,SIGNAL(currentIndexChanged(QString)),this,SLOT(comboBoxIndexChanged(QString))); connect(ui->editAddItemButton,SIGNAL(clicked()),this,SLOT(addButtonClicked())); diff --git a/src/ui/designer/QGCCommandButton.cc b/src/ui/designer/QGCCommandButton.cc index c42e46e..76352aa 100644 --- a/src/ui/designer/QGCCommandButton.cc +++ b/src/ui/designer/QGCCommandButton.cc @@ -36,9 +36,6 @@ QGCCommandButton::QGCCommandButton(QWidget *parent) : ui->editLine1->hide(); ui->editLine2->hide(); - ui->editLine1->setStyleSheet("QWidget { border: 1px solid #66666B; border-radius: 3px; padding: 10px 0px 0px 0px; background: #111122; }"); - ui->editLine2->setStyleSheet("QWidget { border: 1px solid #66666B; border-radius: 3px; padding: 10px 0px 0px 0px; background: #111122; }"); - // Add commands to combo box ui->editCommandComboBox->addItem("CUSTOM 0", 0); ui->editCommandComboBox->addItem("CUSTOM 1", 1); @@ -185,7 +182,6 @@ void QGCCommandButton::startEditMode() ui->editParam7SpinBox->show(); ui->editLine1->show(); ui->editLine2->show(); - //setStyleSheet("QGroupBox { border: 1px solid #66666B; border-radius: 3px; padding: 10px 0px 0px 0px; background: #111122; }"); // Attempt to undock the dock widget QWidget* p = this; diff --git a/src/ui/designer/QGCParamSlider.cc b/src/ui/designer/QGCParamSlider.cc index 5d37f4f..f3a2ee3 100644 --- a/src/ui/designer/QGCParamSlider.cc +++ b/src/ui/designer/QGCParamSlider.cc @@ -44,9 +44,6 @@ QGCParamSlider::QGCParamSlider(QWidget *parent) : ui->editLine2->hide(); ui->infoLabel->hide(); - //ui->editLine1->setStyleSheet("QWidget { border: 1px solid #66666B; border-radius: 3px; padding: 10px 0px 0px 0px; background: #111122; }"); - //ui->editLine2->setStyleSheet("QWidget { border: 1px solid #66666B; border-radius: 3px; padding: 10px 0px 0px 0px; background: #111122; }"); - connect(ui->editDoneButton, SIGNAL(clicked()), this, SLOT(endEditMode())); // Sending actions diff --git a/src/ui/designer/QGCTextLabel.cc b/src/ui/designer/QGCTextLabel.cc index e824e01..6a56bcf 100644 --- a/src/ui/designer/QGCTextLabel.cc +++ b/src/ui/designer/QGCTextLabel.cc @@ -24,9 +24,6 @@ QGCTextLabel::QGCTextLabel(QWidget *parent) : ui->editLine1->hide(); ui->editLine2->hide(); - ui->editLine1->setStyleSheet("QWidget { border: 1px solid #66666B; border-radius: 3px; padding: 10px 0px 0px 0px; background: #111122; }"); - ui->editLine2->setStyleSheet("QWidget { border: 1px solid #66666B; border-radius: 3px; padding: 10px 0px 0px 0px; background: #111122; }"); - // Add commands to combo box } @@ -49,7 +46,6 @@ void QGCTextLabel::startEditMode() ui->editComponentSpinBox->show(); ui->editLine1->show(); ui->editLine2->show(); - //setStyleSheet("QGroupBox { border: 1px solid #66666B; border-radius: 3px; padding: 10px 0px 0px 0px; background: #111122; }"); // Attempt to undock the dock widget QWidget* p = this; @@ -82,7 +78,6 @@ void QGCTextLabel::endEditMode() // Write to settings emit editingFinished(); - //setStyleSheet(""); // Attempt to dock the dock widget QWidget* p = this; diff --git a/src/ui/uas/QGCUnconnectedInfoWidget.cc b/src/ui/uas/QGCUnconnectedInfoWidget.cc index ab81a04..3a77c1a 100644 --- a/src/ui/uas/QGCUnconnectedInfoWidget.cc +++ b/src/ui/uas/QGCUnconnectedInfoWidget.cc @@ -13,10 +13,6 @@ QGCUnconnectedInfoWidget::QGCUnconnectedInfoWidget(QWidget *parent) : //connect(ui->simulationButton, SIGNAL(clicked()), this, SLOT(simulate())); connect(ui->connectButton, SIGNAL(clicked()), this, SLOT(addLink())); - - // Overwrite global style sheet - //ui->connectButton->setStyleSheet("* { max-height: 1000; background-color: transparent; border-color: transparent; }"); - //ui->connectButton->setStyleSheet("QToolButton {background-color: green; border-radius: 20px; } QButton {} QPushButton {}"); } QGCUnconnectedInfoWidget::~QGCUnconnectedInfoWidget()