History

remove Model Type dropdown and related code paths

humbletim committed 8 years ago

Commit 2cf633c1 parent b1d8a9a6 files · +76 −164Browse files

Showing the changes to interface/src/ModelSelector.cpp (1 of 6 files). Show all

Unified · Split

interface/src/ModelSelector.cpp+0−20
@@ -32,13 +32,6 @@ ModelSelector::ModelSelector() { · 31 unmodified lines
3232 connect(_browseButton, &QPushButton::clicked, this, &ModelSelector::browse);
3333 form->addRow("Model File:", _browseButton);
3434
35− _modelType = new QComboBox(this);
36−
37− _modelType->addItem(AVATAR_HEAD_AND_BODY_STRING);
38− _modelType->addItem(AVATAR_ATTACHEMENT_STRING);
39− _modelType->addItem(ENTITY_MODEL_STRING);
40− form->addRow("Model Type:", _modelType);
41−
4235 QDialogButtonBox* buttons = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, this);
4336 connect(buttons, &QDialogButtonBox::accepted, this, &ModelSelector::accept);
4437 connect(buttons, &QDialogButtonBox::rejected, this, &QDialog::reject);
@@ -49,19 +42,6 @@ QFileInfo ModelSelector::getFileInfo() const { · 4 unmodified lines
4942 return _modelFile;
5043 }
5144
52−FSTReader::ModelType ModelSelector::getModelType() const {
53− QString text = _modelType->currentText();
54−
55−if (text == AVATAR_HEAD_AND_BODY_STRING) {
56− return FSTReader::HEAD_AND_BODY_MODEL;
57− } else if (text == AVATAR_ATTACHEMENT_STRING) {
58− return FSTReader::ATTACHMENT_MODEL;
59− } else if (text == ENTITY_MODEL_STRING) {
60− return FSTReader::ENTITY_MODEL;
61− }
62− Q_UNREACHABLE();
63−}
64−
6545 void ModelSelector::accept() {
6646 if (!_modelFile.isFile()) {
6747 return;

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t