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

category name correction : "others" to "more"

Browse source
This commit is contained in:
shun-iwasawa 2020-12-18 12:56:25 +09:00 committed by manongjohn
parent d68f1f7d13
commit b926bc7c42
2 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
toonz/sources/toonz/outputsettingspopup.cpp
View file

@ -215,7 +215,7 @@ OutputSettingsPopup::OutputSettingsPopup(bool isPreview)
QListWidget *categoryList = new QListWidget(this);
QStringList categories;
categories << tr("General") << tr("Camera") << tr("Advanced") << tr("Others");
categories << tr("General") << tr("Camera") << tr("Advanced") << tr("More");
categoryList->addItems(categories);
categoryList->setFixedWidth(100);
categoryList->setCurrentRow(0);
@ -292,9 +292,9 @@ void OutputSettingsPopup::onCategoryActivated(QListWidgetItem *item) {
} else if (item->text() == tr("Advanced")) {
label = m_advancedLabel;
frame = m_advancedBox;
} else if (item->text() == tr("Others")) {
label = m_othersLabel;
frame = m_othersBox;
} else if (item->text() == tr("More")) {
label = m_moreLabel;
frame = m_moreBox;
} else
return;
@ -321,8 +321,8 @@ QFrame *OutputSettingsPopup::createPanel(bool isPreview) {
m_advancedLabel = new AnimatedLabel(tr("Advanced Settings"), this);
m_advancedBox = createAdvancedSettingsBox(isPreview);
if (!isPreview) {
m_othersLabel = new AnimatedLabel(tr("Other Settings"), this);
m_othersBox = createOtherSettingsBox();
m_moreLabel = new AnimatedLabel(tr("More Settings"), this);
m_moreBox = createMoreSettingsBox();
}
QVBoxLayout *lay = new QVBoxLayout();
lay->setMargin(5);
@ -343,8 +343,8 @@ QFrame *OutputSettingsPopup::createPanel(bool isPreview) {
if (!isPreview) {
lay->addSpacing(10);
lay->addWidget(m_othersLabel, 0);
lay->addWidget(m_othersBox, 0);
lay->addWidget(m_moreLabel, 0);
lay->addWidget(m_moreBox, 0);
}
lay->addStretch(1);
}
@ -688,9 +688,9 @@ QFrame *OutputSettingsPopup::createAdvancedSettingsBox(bool isPreview) {
//-----------------------------------------------------------------------------
QFrame *OutputSettingsPopup::createOtherSettingsBox() {
QFrame *otherSettingsBox = new QFrame(this);
otherSettingsBox->setObjectName("OutputSettingsBox");
QFrame *OutputSettingsPopup::createMoreSettingsBox() {
QFrame *moreSettingsBox = new QFrame(this);
moreSettingsBox->setObjectName("OutputSettingsBox");
// Board
m_addBoard = new DVGui::CheckBox(tr("Add Clapperboard"), this);
@ -775,7 +775,7 @@ QFrame *OutputSettingsPopup::createOtherSettingsBox() {
}
lay->setColumnStretch(4, 1);
otherSettingsBox->setLayout(lay);
moreSettingsBox->setLayout(lay);
//-----
@ -803,7 +803,7 @@ QFrame *OutputSettingsPopup::createOtherSettingsBox() {
ret = ret && connect(m_stereoShift, SIGNAL(editingFinished()),
SLOT(onStereoChanged()));
assert(ret);
return otherSettingsBox;
return moreSettingsBox;
}
//-----------------------------------------------------------------------------

6
toonz/sources/toonz/outputsettingspopup.h
View file

@ -78,8 +78,8 @@ class OutputSettingsPopup : public DVGui::Dialog {
QPushButton *m_boardSettingsBtn;
QScrollArea *m_scrollArea;
AnimatedLabel *m_generalLabel, *m_cameraLabel, *m_advancedLabel, *m_othersLabel;
QFrame *m_generalBox, *m_cameraBox, *m_advancedBox, *m_othersBox;
AnimatedLabel *m_generalLabel, *m_cameraLabel, *m_advancedLabel, *m_moreLabel;
QFrame *m_generalBox, *m_cameraBox, *m_advancedBox, *m_moreBox;
bool m_isPreviewSettings;
bool m_hideAlreadyCalled = false;
@ -91,7 +91,7 @@ class OutputSettingsPopup : public DVGui::Dialog {
QFrame *createGeneralSettingsBox(bool isPreview);
QFrame *createCameraSettingsBox(bool isPreview);
QFrame *createAdvancedSettingsBox(bool isPreview);
QFrame *createOtherSettingsBox();
QFrame *createMoreSettingsBox();
public:
OutputSettingsPopup(bool isPreview = false);