diff --git a/stuff/config/qss/gray_048/gray_048.less b/stuff/config/qss/gray_048/gray_048.less index 0455cc37..b3895831 100644 --- a/stuff/config/qss/gray_048/gray_048.less +++ b/stuff/config/qss/gray_048/gray_048.less @@ -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 { diff --git a/stuff/config/qss/gray_048/gray_048.qss b/stuff/config/qss/gray_048/gray_048.qss index c3e9c0fb..107de891 100644 --- a/stuff/config/qss/gray_048/gray_048.qss +++ b/stuff/config/qss/gray_048/gray_048.qss @@ -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; diff --git a/stuff/config/qss/gray_048/gray_048_mac.qss b/stuff/config/qss/gray_048/gray_048_mac.qss index c3e9c0fb..107de891 100644 --- a/stuff/config/qss/gray_048/gray_048_mac.qss +++ b/stuff/config/qss/gray_048/gray_048_mac.qss @@ -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; diff --git a/stuff/config/qss/gray_072/gray_072.less b/stuff/config/qss/gray_072/gray_072.less index a052a748..35c93af6 100644 --- a/stuff/config/qss/gray_072/gray_072.less +++ b/stuff/config/qss/gray_072/gray_072.less @@ -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 { diff --git a/stuff/config/qss/gray_072/gray_072.qss b/stuff/config/qss/gray_072/gray_072.qss index 92e1d396..857908c9 100644 --- a/stuff/config/qss/gray_072/gray_072.qss +++ b/stuff/config/qss/gray_072/gray_072.qss @@ -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; diff --git a/stuff/config/qss/gray_072/gray_072_mac.qss b/stuff/config/qss/gray_072/gray_072_mac.qss index 92e1d396..857908c9 100644 --- a/stuff/config/qss/gray_072/gray_072_mac.qss +++ b/stuff/config/qss/gray_072/gray_072_mac.qss @@ -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; diff --git a/stuff/config/qss/gray_128/gray_128.less b/stuff/config/qss/gray_128/gray_128.less index 923918b5..518c277b 100644 --- a/stuff/config/qss/gray_128/gray_128.less +++ b/stuff/config/qss/gray_128/gray_128.less @@ -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 { diff --git a/stuff/config/qss/gray_128/gray_128.qss b/stuff/config/qss/gray_128/gray_128.qss index bb458e38..0ea7d8e9 100644 --- a/stuff/config/qss/gray_128/gray_128.qss +++ b/stuff/config/qss/gray_128/gray_128.qss @@ -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; diff --git a/stuff/config/qss/gray_128/gray_128_mac.qss b/stuff/config/qss/gray_128/gray_128_mac.qss index bb458e38..0ea7d8e9 100644 --- a/stuff/config/qss/gray_128/gray_128_mac.qss +++ b/stuff/config/qss/gray_128/gray_128_mac.qss @@ -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; diff --git a/toonz/sources/toonz/filebrowser.cpp b/toonz/sources/toonz/filebrowser.cpp index b40c000b..8ea7ac7f 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->setStyleSheet("color:rgb(0, 0, 190)"); + lbl->setObjectName("RenameAsToonzPopupLabel"); m_name = new LineEdit(frames == -1 ? "" : name); m_name->setFixedHeight(20); diff --git a/toonz/sources/toonzqt/scriptconsole.cpp b/toonz/sources/toonzqt/scriptconsole.cpp index 3c5770d0..a778e7ee 100644 --- a/toonz/sources/toonzqt/scriptconsole.cpp +++ b/toonz/sources/toonzqt/scriptconsole.cpp @@ -9,6 +9,9 @@ ScriptConsole::ScriptConsole(QWidget *parent) : QTextEdit(parent), m_commandIndex(0) { + + setObjectName("ScriptConsole"); + m_prompt = ">> "; append(m_prompt);