category name correction : "others" to "more"
This commit is contained in:
parent
d68f1f7d13
commit
b926bc7c42
2 changed files with 16 additions and 16 deletions
|
@ -215,7 +215,7 @@ OutputSettingsPopup::OutputSettingsPopup(bool isPreview)
|
||||||
|
|
||||||
QListWidget *categoryList = new QListWidget(this);
|
QListWidget *categoryList = new QListWidget(this);
|
||||||
QStringList categories;
|
QStringList categories;
|
||||||
categories << tr("General") << tr("Camera") << tr("Advanced") << tr("Others");
|
categories << tr("General") << tr("Camera") << tr("Advanced") << tr("More");
|
||||||
categoryList->addItems(categories);
|
categoryList->addItems(categories);
|
||||||
categoryList->setFixedWidth(100);
|
categoryList->setFixedWidth(100);
|
||||||
categoryList->setCurrentRow(0);
|
categoryList->setCurrentRow(0);
|
||||||
|
@ -292,9 +292,9 @@ void OutputSettingsPopup::onCategoryActivated(QListWidgetItem *item) {
|
||||||
} else if (item->text() == tr("Advanced")) {
|
} else if (item->text() == tr("Advanced")) {
|
||||||
label = m_advancedLabel;
|
label = m_advancedLabel;
|
||||||
frame = m_advancedBox;
|
frame = m_advancedBox;
|
||||||
} else if (item->text() == tr("Others")) {
|
} else if (item->text() == tr("More")) {
|
||||||
label = m_othersLabel;
|
label = m_moreLabel;
|
||||||
frame = m_othersBox;
|
frame = m_moreBox;
|
||||||
} else
|
} else
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
@ -321,8 +321,8 @@ QFrame *OutputSettingsPopup::createPanel(bool isPreview) {
|
||||||
m_advancedLabel = new AnimatedLabel(tr("Advanced Settings"), this);
|
m_advancedLabel = new AnimatedLabel(tr("Advanced Settings"), this);
|
||||||
m_advancedBox = createAdvancedSettingsBox(isPreview);
|
m_advancedBox = createAdvancedSettingsBox(isPreview);
|
||||||
if (!isPreview) {
|
if (!isPreview) {
|
||||||
m_othersLabel = new AnimatedLabel(tr("Other Settings"), this);
|
m_moreLabel = new AnimatedLabel(tr("More Settings"), this);
|
||||||
m_othersBox = createOtherSettingsBox();
|
m_moreBox = createMoreSettingsBox();
|
||||||
}
|
}
|
||||||
QVBoxLayout *lay = new QVBoxLayout();
|
QVBoxLayout *lay = new QVBoxLayout();
|
||||||
lay->setMargin(5);
|
lay->setMargin(5);
|
||||||
|
@ -343,8 +343,8 @@ QFrame *OutputSettingsPopup::createPanel(bool isPreview) {
|
||||||
|
|
||||||
if (!isPreview) {
|
if (!isPreview) {
|
||||||
lay->addSpacing(10);
|
lay->addSpacing(10);
|
||||||
lay->addWidget(m_othersLabel, 0);
|
lay->addWidget(m_moreLabel, 0);
|
||||||
lay->addWidget(m_othersBox, 0);
|
lay->addWidget(m_moreBox, 0);
|
||||||
}
|
}
|
||||||
lay->addStretch(1);
|
lay->addStretch(1);
|
||||||
}
|
}
|
||||||
|
@ -688,9 +688,9 @@ QFrame *OutputSettingsPopup::createAdvancedSettingsBox(bool isPreview) {
|
||||||
|
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
|
|
||||||
QFrame *OutputSettingsPopup::createOtherSettingsBox() {
|
QFrame *OutputSettingsPopup::createMoreSettingsBox() {
|
||||||
QFrame *otherSettingsBox = new QFrame(this);
|
QFrame *moreSettingsBox = new QFrame(this);
|
||||||
otherSettingsBox->setObjectName("OutputSettingsBox");
|
moreSettingsBox->setObjectName("OutputSettingsBox");
|
||||||
|
|
||||||
// Board
|
// Board
|
||||||
m_addBoard = new DVGui::CheckBox(tr("Add Clapperboard"), this);
|
m_addBoard = new DVGui::CheckBox(tr("Add Clapperboard"), this);
|
||||||
|
@ -775,7 +775,7 @@ QFrame *OutputSettingsPopup::createOtherSettingsBox() {
|
||||||
}
|
}
|
||||||
lay->setColumnStretch(4, 1);
|
lay->setColumnStretch(4, 1);
|
||||||
|
|
||||||
otherSettingsBox->setLayout(lay);
|
moreSettingsBox->setLayout(lay);
|
||||||
|
|
||||||
//-----
|
//-----
|
||||||
|
|
||||||
|
@ -803,7 +803,7 @@ QFrame *OutputSettingsPopup::createOtherSettingsBox() {
|
||||||
ret = ret && connect(m_stereoShift, SIGNAL(editingFinished()),
|
ret = ret && connect(m_stereoShift, SIGNAL(editingFinished()),
|
||||||
SLOT(onStereoChanged()));
|
SLOT(onStereoChanged()));
|
||||||
assert(ret);
|
assert(ret);
|
||||||
return otherSettingsBox;
|
return moreSettingsBox;
|
||||||
}
|
}
|
||||||
|
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
|
|
|
@ -78,8 +78,8 @@ class OutputSettingsPopup : public DVGui::Dialog {
|
||||||
QPushButton *m_boardSettingsBtn;
|
QPushButton *m_boardSettingsBtn;
|
||||||
|
|
||||||
QScrollArea *m_scrollArea;
|
QScrollArea *m_scrollArea;
|
||||||
AnimatedLabel *m_generalLabel, *m_cameraLabel, *m_advancedLabel, *m_othersLabel;
|
AnimatedLabel *m_generalLabel, *m_cameraLabel, *m_advancedLabel, *m_moreLabel;
|
||||||
QFrame *m_generalBox, *m_cameraBox, *m_advancedBox, *m_othersBox;
|
QFrame *m_generalBox, *m_cameraBox, *m_advancedBox, *m_moreBox;
|
||||||
|
|
||||||
bool m_isPreviewSettings;
|
bool m_isPreviewSettings;
|
||||||
bool m_hideAlreadyCalled = false;
|
bool m_hideAlreadyCalled = false;
|
||||||
|
@ -91,7 +91,7 @@ class OutputSettingsPopup : public DVGui::Dialog {
|
||||||
QFrame *createGeneralSettingsBox(bool isPreview);
|
QFrame *createGeneralSettingsBox(bool isPreview);
|
||||||
QFrame *createCameraSettingsBox(bool isPreview);
|
QFrame *createCameraSettingsBox(bool isPreview);
|
||||||
QFrame *createAdvancedSettingsBox(bool isPreview);
|
QFrame *createAdvancedSettingsBox(bool isPreview);
|
||||||
QFrame *createOtherSettingsBox();
|
QFrame *createMoreSettingsBox();
|
||||||
|
|
||||||
public:
|
public:
|
||||||
OutputSettingsPopup(bool isPreview = false);
|
OutputSettingsPopup(bool isPreview = false);
|
||||||
|
|
Loading…
Reference in a new issue