diff --git a/stuff/config/qss/gray_048/gray_048.less b/stuff/config/qss/gray_048/gray_048.less index b389583..f692d1a 100644 --- a/stuff/config/qss/gray_048/gray_048.less +++ b/stuff/config/qss/gray_048/gray_048.less @@ -740,12 +740,7 @@ DvDirTreeView { border: 1px solid @m_baseTxtColor; } -#CleanupSettingsHeadLabel, -#LoadLevelHeadLabel, -#PsdSettingsHeadLabel, -#PsdSettingsGroupBox::title, -#FxSettingsPreviewShowLabel, -#RenameAsToonzPopupLabel{ +#TitleTxtLabel{ color: @m_titleTxtColor; } diff --git a/stuff/config/qss/gray_048/gray_048.qss b/stuff/config/qss/gray_048/gray_048.qss index 107de89..d915037 100644 --- a/stuff/config/qss/gray_048/gray_048.qss +++ b/stuff/config/qss/gray_048/gray_048.qss @@ -753,12 +753,7 @@ DvDirTreeView { #SolidLineFrame { border: 1px solid #e6e6e6; } -#CleanupSettingsHeadLabel, -#LoadLevelHeadLabel, -#PsdSettingsHeadLabel, -#PsdSettingsGroupBox::title, -#FxSettingsPreviewShowLabel, -#RenameAsToonzPopupLabel { +#TitleTxtLabel { color: #a8bee7; } #PsdSettingsGroupBox { diff --git a/stuff/config/qss/gray_048/gray_048_mac.qss b/stuff/config/qss/gray_048/gray_048_mac.qss index 107de89..2411204 100644 --- a/stuff/config/qss/gray_048/gray_048_mac.qss +++ b/stuff/config/qss/gray_048/gray_048_mac.qss @@ -753,12 +753,7 @@ DvDirTreeView { #SolidLineFrame { border: 1px solid #e6e6e6; } -#CleanupSettingsHeadLabel, -#LoadLevelHeadLabel, -#PsdSettingsHeadLabel, -#PsdSettingsGroupBox::title, -#FxSettingsPreviewShowLabel, -#RenameAsToonzPopupLabel { +#TitleTxtLabel { color: #a8bee7; } #PsdSettingsGroupBox { @@ -1317,4 +1312,4 @@ QDialog #dialogButtonFrame { background-color: #7d7d7d; } -//# sourceMappingURL=gray_048.qss.map \ No newline at end of file +//# sourceMappingURL=gray_048_mac.qss.map \ No newline at end of file diff --git a/stuff/config/qss/gray_072/gray_072.less b/stuff/config/qss/gray_072/gray_072.less index 35c93af..464ead3 100644 --- a/stuff/config/qss/gray_072/gray_072.less +++ b/stuff/config/qss/gray_072/gray_072.less @@ -739,12 +739,8 @@ DvDirTreeView { border: 1px solid @m_baseTxtColor; } -#CleanupSettingsHeadLabel, -#LoadLevelHeadLabel, -#PsdSettingsHeadLabel, -#PsdSettingsGroupBox::title, -#FxSettingsPreviewShowLabel, -#RenameAsToonzPopupLabel { + +#TitleTxtLabel{ color: @m_titleTxtColor; } diff --git a/stuff/config/qss/gray_072/gray_072.qss b/stuff/config/qss/gray_072/gray_072.qss index 857908c..e580f2d 100644 --- a/stuff/config/qss/gray_072/gray_072.qss +++ b/stuff/config/qss/gray_072/gray_072.qss @@ -753,12 +753,7 @@ DvDirTreeView { #SolidLineFrame { border: 1px solid #e6e6e6; } -#CleanupSettingsHeadLabel, -#LoadLevelHeadLabel, -#PsdSettingsHeadLabel, -#PsdSettingsGroupBox::title, -#FxSettingsPreviewShowLabel, -#RenameAsToonzPopupLabel { +#TitleTxtLabel { color: #a8bee7; } #PsdSettingsGroupBox { diff --git a/stuff/config/qss/gray_072/gray_072_mac.qss b/stuff/config/qss/gray_072/gray_072_mac.qss index 857908c..0ee3793 100644 --- a/stuff/config/qss/gray_072/gray_072_mac.qss +++ b/stuff/config/qss/gray_072/gray_072_mac.qss @@ -753,12 +753,7 @@ DvDirTreeView { #SolidLineFrame { border: 1px solid #e6e6e6; } -#CleanupSettingsHeadLabel, -#LoadLevelHeadLabel, -#PsdSettingsHeadLabel, -#PsdSettingsGroupBox::title, -#FxSettingsPreviewShowLabel, -#RenameAsToonzPopupLabel { +#TitleTxtLabel { color: #a8bee7; } #PsdSettingsGroupBox { @@ -1317,4 +1312,4 @@ QDialog #dialogButtonFrame { background-color: #949494; } -//# sourceMappingURL=gray_072.qss.map \ No newline at end of file +//# sourceMappingURL=gray_072_mac.qss.map \ No newline at end of file diff --git a/stuff/config/qss/gray_128/gray_128.less b/stuff/config/qss/gray_128/gray_128.less index 518c277..d86103d 100644 --- a/stuff/config/qss/gray_128/gray_128.less +++ b/stuff/config/qss/gray_128/gray_128.less @@ -576,12 +576,7 @@ DvDirTreeView { border: 1px solid rgb(20,20,20); } -#CleanupSettingsHeadLabel, -#LoadLevelHeadLabel, -#PsdSettingsHeadLabel, -#PsdSettingsGroupBox::title, -#FxSettingsPreviewShowLabel, -#RenameAsToonzPopupLabel { +#TitleTxtLabel{ color: rgb(0,0,64); } diff --git a/stuff/config/qss/gray_128/gray_128.qss b/stuff/config/qss/gray_128/gray_128.qss index 0ea7d8e..430174a 100644 --- a/stuff/config/qss/gray_128/gray_128.qss +++ b/stuff/config/qss/gray_128/gray_128.qss @@ -504,12 +504,7 @@ DvDirTreeView { #SolidLineFrame { border: 1px solid #141414; } -#CleanupSettingsHeadLabel, -#LoadLevelHeadLabel, -#PsdSettingsHeadLabel, -#PsdSettingsGroupBox::title, -#FxSettingsPreviewShowLabel, -#RenameAsToonzPopupLabel { +#TitleTxtLabel { color: #000040; } #PsdSettingsGroupBox { diff --git a/stuff/config/qss/gray_128/gray_128_mac.qss b/stuff/config/qss/gray_128/gray_128_mac.qss index 0ea7d8e..f281f15 100644 --- a/stuff/config/qss/gray_128/gray_128_mac.qss +++ b/stuff/config/qss/gray_128/gray_128_mac.qss @@ -504,12 +504,7 @@ DvDirTreeView { #SolidLineFrame { border: 1px solid #141414; } -#CleanupSettingsHeadLabel, -#LoadLevelHeadLabel, -#PsdSettingsHeadLabel, -#PsdSettingsGroupBox::title, -#FxSettingsPreviewShowLabel, -#RenameAsToonzPopupLabel { +#TitleTxtLabel { color: #000040; } #PsdSettingsGroupBox { @@ -1046,4 +1041,4 @@ QDialog #dialogButtonFrame { background-color: #dcdcdc; } -//# sourceMappingURL=gray_128.qss.map \ No newline at end of file +//# sourceMappingURL=gray_128_mac.qss.map \ No newline at end of file diff --git a/toonz/sources/toonz/filebrowser.cpp b/toonz/sources/toonz/filebrowser.cpp index 80417e0..ddc610f 100644 --- a/toonz/sources/toonz/filebrowser.cpp +++ b/toonz/sources/toonz/filebrowser.cpp @@ -1607,7 +1607,7 @@ RenameAsToonzPopup::RenameAsToonzPopup(const QString name, int frames) lbl = new QLabel( QString(tr("Creating an animation level of %1 frames").arg(frames))); lbl->setFixedHeight(20); - lbl->setObjectName("RenameAsToonzPopupLabel"); + lbl->setObjectName("TitleTxtLabel"); m_name = new LineEdit(frames == -1 ? "" : name); m_name->setFixedHeight(20); diff --git a/toonz/sources/toonz/filebrowserpopup.cpp b/toonz/sources/toonz/filebrowserpopup.cpp index 4578968..833227e 100644 --- a/toonz/sources/toonz/filebrowserpopup.cpp +++ b/toonz/sources/toonz/filebrowserpopup.cpp @@ -637,13 +637,13 @@ LoadLevelPopup::LoadLevelPopup() // use the default value set in the preference m_loadTlvBehaviorComboBox->setCurrentIndex( Preferences::instance()->getInitialLoadTlvCachingBehavior()); - cacheBehaviorLabel->setObjectName("LoadLevelHeadLabel"); + cacheBehaviorLabel->setObjectName("TitleTxtLabel"); QIntValidator *validator = new QIntValidator(this); validator->setBottom(1); //----Load Subsequence Level - subsequenceLabel->setObjectName("LoadLevelHeadLabel"); + subsequenceLabel->setObjectName("TitleTxtLabel"); showSubsequenceButton->setObjectName("LoadLevelShowButton"); showSubsequenceButton->setFixedSize(15, 15); showSubsequenceButton->setCheckable(true); @@ -659,7 +659,7 @@ LoadLevelPopup::LoadLevelPopup() m_toFrame->setValidator(validator); //----Arrangement in Xsheet - arrangementLabel->setObjectName("LoadLevelHeadLabel"); + arrangementLabel->setObjectName("TitleTxtLabel"); showArrangementButton->setObjectName("LoadLevelShowButton"); showArrangementButton->setFixedSize(15, 15); showArrangementButton->setCheckable(true); diff --git a/toonz/sources/toonz/psdsettingspopup.cpp b/toonz/sources/toonz/psdsettingspopup.cpp index 94639c3..c30000a 100644 --- a/toonz/sources/toonz/psdsettingspopup.cpp +++ b/toonz/sources/toonz/psdsettingspopup.cpp @@ -128,7 +128,9 @@ PsdSettingsPopup::PsdSettingsPopup() m_parentDir->setAlignment(Qt::AlignLeft | Qt::AlignVCenter); m_parentDir->setFixedHeight(WidgetHeight); QLabel *nmLbl = new QLabel(tr("Name:")); + nmLbl->setObjectName("TitleTxtLabel"); QLabel *ptLbl = new QLabel(tr("Path:")); + ptLbl->setObjectName("TitleTxtLabel"); QGridLayout *grid = new QGridLayout(); grid->setColumnMinimumWidth(0, 65); grid->addWidget(nmLbl, 0, 0, Qt::AlignRight); @@ -168,6 +170,7 @@ PsdSettingsPopup::PsdSettingsPopup() m_createSubXSheet->setEnabled(false); QLabel *modeLbl = new QLabel(tr("Load As:")); + modeLbl->setObjectName("TitleTxtLabel"); QGridLayout *gridMode = new QGridLayout(); gridMode->setColumnMinimumWidth(0, 65); diff --git a/toonz/sources/toonzqt/dvdialog.cpp b/toonz/sources/toonzqt/dvdialog.cpp index c4a18b7..fc85827 100644 --- a/toonz/sources/toonzqt/dvdialog.cpp +++ b/toonz/sources/toonzqt/dvdialog.cpp @@ -115,7 +115,7 @@ void Separator::paintEvent(QPaintEvent *) { QPainter p(this); ParamsPage *page = dynamic_cast(parentWidget()); if (!page) - p.setPen(Qt::black); + p.setPen(palette().alternateBase().color()); else p.setPen(page->getTextColor()); diff --git a/toonz/sources/toonzqt/fxsettings.cpp b/toonz/sources/toonzqt/fxsettings.cpp index e286c40..5d31582 100644 --- a/toonz/sources/toonzqt/fxsettings.cpp +++ b/toonz/sources/toonzqt/fxsettings.cpp @@ -960,7 +960,7 @@ ParamViewer::ParamViewer(QWidget *parent, Qt::WFlags flags) QPushButton *showSwatchButton = new QPushButton("", this); QLabel *swatchLabel = new QLabel(tr("Swatch Viewer"), this); - swatchLabel->setObjectName("FxSettingsPreviewShowLabel"); + swatchLabel->setObjectName("TitleTxtLabel"); showSwatchButton->setObjectName("FxSettingsPreviewShowButton"); showSwatchButton->setFixedSize(15, 15); showSwatchButton->setCheckable(true); diff --git a/toonz/sources/toonzqt/infoviewer.cpp b/toonz/sources/toonzqt/infoviewer.cpp index 8b792e4..ec5a347 100644 --- a/toonz/sources/toonzqt/infoviewer.cpp +++ b/toonz/sources/toonzqt/infoviewer.cpp @@ -172,8 +172,7 @@ void InfoViewerImp::onSliderChanged() { namespace { void setLabelStyle(QLabel *l) { - l->setFrameStyle(QFrame::StyledPanel); - l->setStyleSheet("color: rgb(0, 0, 200);"); + l->setObjectName("TitleTxtLabel"); } }