razzaline/tahoma2d
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

Merge pull request #532 from shun-iwasawa/fix_infoviewer_text_color

Browse source 
Fix File Info text color
This commit is contained in:
Shinya Kitaoka 2016-06-29 12:56:16 +09:00 committed by GitHub
commit 91695244e8
15 changed files with 23 additions and 65 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
stuff/config/qss/gray_048/gray_048.less
View file

@ -740,12 +740,7 @@ DvDirTreeView {
border: 1px solid @m_baseTxtColor;
}
#CleanupSettingsHeadLabel,
#LoadLevelHeadLabel,
#PsdSettingsHeadLabel,
#PsdSettingsGroupBox::title,
#FxSettingsPreviewShowLabel,
#RenameAsToonzPopupLabel{
#TitleTxtLabel{
color: @m_titleTxtColor;
}

7
stuff/config/qss/gray_048/gray_048.qss
View file

@ -753,12 +753,7 @@ DvDirTreeView {
#SolidLineFrame {
border: 1px solid #e6e6e6;
}
#CleanupSettingsHeadLabel,
#LoadLevelHeadLabel,
#PsdSettingsHeadLabel,
#PsdSettingsGroupBox::title,
#FxSettingsPreviewShowLabel,
#RenameAsToonzPopupLabel {
#TitleTxtLabel {
color: #a8bee7;
}
#PsdSettingsGroupBox {

9
stuff/config/qss/gray_048/gray_048_mac.qss
View file

@ -753,12 +753,7 @@ DvDirTreeView {
#SolidLineFrame {
border: 1px solid #e6e6e6;
}
#CleanupSettingsHeadLabel,
#LoadLevelHeadLabel,
#PsdSettingsHeadLabel,
#PsdSettingsGroupBox::title,
#FxSettingsPreviewShowLabel,
#RenameAsToonzPopupLabel {
#TitleTxtLabel {
color: #a8bee7;
}
#PsdSettingsGroupBox {
@ -1351,4 +1346,4 @@ QDialog #dialogButtonFrame {
background-color: #7d7d7d;
}
//# sourceMappingURL=gray_048.qss.map
//# sourceMappingURL=gray_048_mac.qss.map

8
stuff/config/qss/gray_072/gray_072.less
View file

@ -739,12 +739,8 @@ DvDirTreeView {
border: 1px solid @m_baseTxtColor;
}
#CleanupSettingsHeadLabel,
#LoadLevelHeadLabel,
#PsdSettingsHeadLabel,
#PsdSettingsGroupBox::title,
#FxSettingsPreviewShowLabel,
#RenameAsToonzPopupLabel {
#TitleTxtLabel{
color: @m_titleTxtColor;
}

7
stuff/config/qss/gray_072/gray_072.qss
View file

@ -753,12 +753,7 @@ DvDirTreeView {
#SolidLineFrame {
border: 1px solid #e6e6e6;
}
#CleanupSettingsHeadLabel,
#LoadLevelHeadLabel,
#PsdSettingsHeadLabel,
#PsdSettingsGroupBox::title,
#FxSettingsPreviewShowLabel,
#RenameAsToonzPopupLabel {
#TitleTxtLabel {
color: #a8bee7;
}
#PsdSettingsGroupBox {

9
stuff/config/qss/gray_072/gray_072_mac.qss
View file

@ -753,12 +753,7 @@ DvDirTreeView {
#SolidLineFrame {
border: 1px solid #e6e6e6;
}
#CleanupSettingsHeadLabel,
#LoadLevelHeadLabel,
#PsdSettingsHeadLabel,
#PsdSettingsGroupBox::title,
#FxSettingsPreviewShowLabel,
#RenameAsToonzPopupLabel {
#TitleTxtLabel {
color: #a8bee7;
}
#PsdSettingsGroupBox {
@ -1351,4 +1346,4 @@ QDialog #dialogButtonFrame {
background-color: #949494;
}
//# sourceMappingURL=gray_072.qss.map
//# sourceMappingURL=gray_072_mac.qss.map

7
stuff/config/qss/gray_128/gray_128.less
View file

@ -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);
}

7
stuff/config/qss/gray_128/gray_128.qss
View file

@ -504,12 +504,7 @@ DvDirTreeView {
#SolidLineFrame {
border: 1px solid #141414;
}
#CleanupSettingsHeadLabel,
#LoadLevelHeadLabel,
#PsdSettingsHeadLabel,
#PsdSettingsGroupBox::title,
#FxSettingsPreviewShowLabel,
#RenameAsToonzPopupLabel {
#TitleTxtLabel {
color: #000040;
}
#PsdSettingsGroupBox {

9
stuff/config/qss/gray_128/gray_128_mac.qss
View file

@ -504,12 +504,7 @@ DvDirTreeView {
#SolidLineFrame {
border: 1px solid #141414;
}
#CleanupSettingsHeadLabel,
#LoadLevelHeadLabel,
#PsdSettingsHeadLabel,
#PsdSettingsGroupBox::title,
#FxSettingsPreviewShowLabel,
#RenameAsToonzPopupLabel {
#TitleTxtLabel {
color: #000040;
}
#PsdSettingsGroupBox {
@ -1079,4 +1074,4 @@ QDialog #dialogButtonFrame {
background-color: #dcdcdc;
}
//# sourceMappingURL=gray_128.qss.map
//# sourceMappingURL=gray_128_mac.qss.map

2
toonz/sources/toonz/filebrowser.cpp
View file

@ -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);

6
toonz/sources/toonz/filebrowserpopup.cpp
View file

@ -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);

3
toonz/sources/toonz/psdsettingspopup.cpp
View file

@ -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);

2
toonz/sources/toonzqt/dvdialog.cpp
View file

@ -115,7 +115,7 @@ void Separator::paintEvent(QPaintEvent *) {
QPainter p(this);
ParamsPage *page = dynamic_cast<ParamsPage *>(parentWidget());
if (!page)
p.setPen(Qt::black);
p.setPen(palette().alternateBase().color());
else
p.setPen(page->getTextColor());

2
toonz/sources/toonzqt/fxsettings.cpp
View file

@ -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);

3
toonz/sources/toonzqt/infoviewer.cpp
View file

@ -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");
}
}