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

Fix text color in the Script console and the Rename popup (#458)

Browse source 
* set object names

* add style sheet

* close #442 and #449
This commit is contained in:
shun-iwasawa 2016-06-17 17:35:41 +09:00 committed by Shinya Kitaoka
parent 8f3ba348eb
commit eec8419456
11 changed files with 101 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -732,7 +732,7 @@ DvDirTreeView {
}
/*---------------------------------------------------------------------------*/
/* Cleanup Settings, LoadLevel, PsdSettingsPopup, FxSettingsPopup */
/* Cleanup Settings, LoadLevel, PsdSettingsPopup, FxSettingsPopup, RenameAsToonzPopup */
/*---------------------------------------------------------------------------*/
#CleanupSettingsFrame,
#LoadLevelFrame,
@ -744,7 +744,8 @@ DvDirTreeView {
#LoadLevelHeadLabel,
#PsdSettingsHeadLabel,
#PsdSettingsGroupBox::title,
#FxSettingsPreviewShowLabel {
#FxSettingsPreviewShowLabel,
#RenameAsToonzPopupLabel{
color: @m_titleTxtColor;
}
@ -1172,6 +1173,15 @@ SpreadsheetViewer {
}
}
/*------ Script Console ------*/
#ScriptConsole {
border: 1px inset;
background-color: rgb(220,220,220);
color: black;
font-family: "Courier";
}
/*------ Topbar and Menubar of the MainWindow ------*/
#TopBar {

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

@ -746,7 +746,7 @@ DvDirTreeView {
alternate-background-color: #3d3d3d;
}
/*---------------------------------------------------------------------------*/
/* Cleanup Settings, LoadLevel, PsdSettingsPopup, FxSettingsPopup */
/* Cleanup Settings, LoadLevel, PsdSettingsPopup, FxSettingsPopup, RenameAsToonzPopup */
/*---------------------------------------------------------------------------*/
#CleanupSettingsFrame,
#LoadLevelFrame,
@ -757,7 +757,8 @@ DvDirTreeView {
#LoadLevelHeadLabel,
#PsdSettingsHeadLabel,
#PsdSettingsGroupBox::title,
#FxSettingsPreviewShowLabel {
#FxSettingsPreviewShowLabel,
#RenameAsToonzPopupLabel {
color: #a8bee7;
}
#PsdSettingsGroupBox {
@ -1174,6 +1175,13 @@ SpreadsheetViewer {
#EditToolLockButton::indicator:checked:hover {
image: url("../gray_072/imgs/cam_lock_hover.png");
}
/*------ Script Console ------*/
#ScriptConsole {
border: 1px inset;
background-color: #dcdcdc;
color: black;
font-family: "Courier";
}
/*------ Topbar and Menubar of the MainWindow ------*/
#TopBar {
height: 22px;

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

@ -746,7 +746,7 @@ DvDirTreeView {
alternate-background-color: #3d3d3d;
}
/*---------------------------------------------------------------------------*/
/* Cleanup Settings, LoadLevel, PsdSettingsPopup, FxSettingsPopup */
/* Cleanup Settings, LoadLevel, PsdSettingsPopup, FxSettingsPopup, RenameAsToonzPopup */
/*---------------------------------------------------------------------------*/
#CleanupSettingsFrame,
#LoadLevelFrame,
@ -757,7 +757,8 @@ DvDirTreeView {
#LoadLevelHeadLabel,
#PsdSettingsHeadLabel,
#PsdSettingsGroupBox::title,
#FxSettingsPreviewShowLabel {
#FxSettingsPreviewShowLabel,
#RenameAsToonzPopupLabel {
color: #a8bee7;
}
#PsdSettingsGroupBox {
@ -1174,6 +1175,13 @@ SpreadsheetViewer {
#EditToolLockButton::indicator:checked:hover {
image: url("../gray_072/imgs/cam_lock_hover.png");
}
/*------ Script Console ------*/
#ScriptConsole {
border: 1px inset;
background-color: #dcdcdc;
color: black;
font-family: "Courier";
}
/*------ Topbar and Menubar of the MainWindow ------*/
#TopBar {
height: 22px;

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

@ -731,7 +731,7 @@ DvDirTreeView {
}
/*---------------------------------------------------------------------------*/
/* Cleanup Settings, LoadLevel, PsdSettingsPopup, FxSettingsPopup */
/* Cleanup Settings, LoadLevel, PsdSettingsPopup, FxSettingsPopup, RenameAsToonzPopup */
/*---------------------------------------------------------------------------*/
#CleanupSettingsFrame,
#LoadLevelFrame,
@ -743,7 +743,8 @@ DvDirTreeView {
#LoadLevelHeadLabel,
#PsdSettingsHeadLabel,
#PsdSettingsGroupBox::title,
#FxSettingsPreviewShowLabel {
#FxSettingsPreviewShowLabel,
#RenameAsToonzPopupLabel {
color: @m_titleTxtColor;
}
@ -1171,6 +1172,15 @@ SpreadsheetViewer {
}
}
/*------ Script Console ------*/
#ScriptConsole {
border: 1px inset;
background-color: rgb(220,220,220);
color: black;
font-family: "Courier";
}
/*------ Topbar and Menubar of the MainWindow ------*/
#TopBar {

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

@ -746,7 +746,7 @@ DvDirTreeView {
alternate-background-color: #555555;
}
/*---------------------------------------------------------------------------*/
/* Cleanup Settings, LoadLevel, PsdSettingsPopup, FxSettingsPopup */
/* Cleanup Settings, LoadLevel, PsdSettingsPopup, FxSettingsPopup, RenameAsToonzPopup */
/*---------------------------------------------------------------------------*/
#CleanupSettingsFrame,
#LoadLevelFrame,
@ -757,7 +757,8 @@ DvDirTreeView {
#LoadLevelHeadLabel,
#PsdSettingsHeadLabel,
#PsdSettingsGroupBox::title,
#FxSettingsPreviewShowLabel {
#FxSettingsPreviewShowLabel,
#RenameAsToonzPopupLabel {
color: #a8bee7;
}
#PsdSettingsGroupBox {
@ -1174,6 +1175,13 @@ SpreadsheetViewer {
#EditToolLockButton::indicator:checked:hover {
image: url("imgs/cam_lock_hover.png");
}
/*------ Script Console ------*/
#ScriptConsole {
border: 1px inset;
background-color: #dcdcdc;
color: black;
font-family: "Courier";
}
/*------ Topbar and Menubar of the MainWindow ------*/
#TopBar {
height: 22px;

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

@ -746,7 +746,7 @@ DvDirTreeView {
alternate-background-color: #555555;
}
/*---------------------------------------------------------------------------*/
/* Cleanup Settings, LoadLevel, PsdSettingsPopup, FxSettingsPopup */
/* Cleanup Settings, LoadLevel, PsdSettingsPopup, FxSettingsPopup, RenameAsToonzPopup */
/*---------------------------------------------------------------------------*/
#CleanupSettingsFrame,
#LoadLevelFrame,
@ -757,7 +757,8 @@ DvDirTreeView {
#LoadLevelHeadLabel,
#PsdSettingsHeadLabel,
#PsdSettingsGroupBox::title,
#FxSettingsPreviewShowLabel {
#FxSettingsPreviewShowLabel,
#RenameAsToonzPopupLabel {
color: #a8bee7;
}
#PsdSettingsGroupBox {
@ -1174,6 +1175,13 @@ SpreadsheetViewer {
#EditToolLockButton::indicator:checked:hover {
image: url("imgs/cam_lock_hover.png");
}
/*------ Script Console ------*/
#ScriptConsole {
border: 1px inset;
background-color: #dcdcdc;
color: black;
font-family: "Courier";
}
/*------ Topbar and Menubar of the MainWindow ------*/
#TopBar {
height: 22px;

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

@ -568,7 +568,7 @@ DvDirTreeView {
}
/*---------------------------------------------------------------------------*/
/* Cleanup Settings, LoadLevel, PsdSettingsPopup, FxSettingsPopup */
/* Cleanup Settings, LoadLevel, PsdSettingsPopup, FxSettingsPopup, RenameAsToonzPopup */
/*---------------------------------------------------------------------------*/
#CleanupSettingsFrame,
#LoadLevelFrame,
@ -580,7 +580,8 @@ DvDirTreeView {
#LoadLevelHeadLabel,
#PsdSettingsHeadLabel,
#PsdSettingsGroupBox::title,
#FxSettingsPreviewShowLabel {
#FxSettingsPreviewShowLabel,
#RenameAsToonzPopupLabel {
color: rgb(0,0,64);
}
@ -995,6 +996,16 @@ SpreadsheetViewer {
}
}
/*------ Script Console ------*/
#ScriptConsole {
border: 1px inset;
background-color: rgb(220,220,220);
color: black;
font-family: "Courier";
}
/*------ Topbar and Menubar of the MainWindow ------*/
#TopBar {

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

@ -497,7 +497,7 @@ DvDirTreeView {
alternate-background-color: #8d8d8d;
}
/*---------------------------------------------------------------------------*/
/* Cleanup Settings, LoadLevel, PsdSettingsPopup, FxSettingsPopup */
/* Cleanup Settings, LoadLevel, PsdSettingsPopup, FxSettingsPopup, RenameAsToonzPopup */
/*---------------------------------------------------------------------------*/
#CleanupSettingsFrame,
#LoadLevelFrame,
@ -508,7 +508,8 @@ DvDirTreeView {
#LoadLevelHeadLabel,
#PsdSettingsHeadLabel,
#PsdSettingsGroupBox::title,
#FxSettingsPreviewShowLabel {
#FxSettingsPreviewShowLabel,
#RenameAsToonzPopupLabel {
color: #000040;
}
#PsdSettingsGroupBox {
@ -908,6 +909,13 @@ SpreadsheetViewer {
#EditToolLockButton::indicator:checked:hover {
image: url("imgs/cam_lock_hover.png");
}
/*------ Script Console ------*/
#ScriptConsole {
border: 1px inset;
background-color: #dcdcdc;
color: black;
font-family: "Courier";
}
/*------ Topbar and Menubar of the MainWindow ------*/
#TopBar {
height: 22px;

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

@ -497,7 +497,7 @@ DvDirTreeView {
alternate-background-color: #8d8d8d;
}
/*---------------------------------------------------------------------------*/
/* Cleanup Settings, LoadLevel, PsdSettingsPopup, FxSettingsPopup */
/* Cleanup Settings, LoadLevel, PsdSettingsPopup, FxSettingsPopup, RenameAsToonzPopup */
/*---------------------------------------------------------------------------*/
#CleanupSettingsFrame,
#LoadLevelFrame,
@ -508,7 +508,8 @@ DvDirTreeView {
#LoadLevelHeadLabel,
#PsdSettingsHeadLabel,
#PsdSettingsGroupBox::title,
#FxSettingsPreviewShowLabel {
#FxSettingsPreviewShowLabel,
#RenameAsToonzPopupLabel {
color: #000040;
}
#PsdSettingsGroupBox {
@ -908,6 +909,13 @@ SpreadsheetViewer {
#EditToolLockButton::indicator:checked:hover {
image: url("imgs/cam_lock_hover.png");
}
/*------ Script Console ------*/
#ScriptConsole {
border: 1px inset;
background-color: #dcdcdc;
color: black;
font-family: "Courier";
}
/*------ Topbar and Menubar of the MainWindow ------*/
#TopBar {
height: 22px;

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->setStyleSheet("color:rgb(0, 0, 190)");
lbl->setObjectName("RenameAsToonzPopupLabel");
m_name = new LineEdit(frames == -1 ? "" : name);
m_name->setFixedHeight(20);

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

@ -9,6 +9,9 @@
ScriptConsole::ScriptConsole(QWidget *parent)
: QTextEdit(parent), m_commandIndex(0) {
setObjectName("ScriptConsole");
m_prompt = ">> ";
append(m_prompt);