Merge pull request #72 from OpenMW/master

Add OpenMW commits up to 30 Sep

apps/opencs/view/world/dialoguesubview.cpp

@@ -578,27 +578,22 @@ void CSVWorld::EditWidget::remake(int row)
                         fixedRows = true;
                 }
 
+                // Create and display nested table only if it's editable.
+                if (editable)
+                {
                     NestedTable* table =
                         new NestedTable(mDocument, id, mNestedModels.back(), this, editable, fixedRows);
                     table->resizeColumnsToContents();
-                if (!editable)
-                {
-                    table->setEditTriggers(QAbstractItemView::NoEditTriggers);
-                    table->setEnabled(false);
-                }
 
                     int rows = mTable->rowCount(mTable->index(row, i));
                     int rowHeight = (rows == 0) ? table->horizontalHeader()->height() : table->rowHeight(0);
-                int tableMaxHeight = (5 * rowHeight)
-                    + table->horizontalHeader()->height() + 2 * table->frameWidth();
+                    int headerHeight = table->horizontalHeader()->height();
+                    int tableMaxHeight = (5 * rowHeight) + headerHeight + (2 * table->frameWidth());
                     table->setMinimumHeight(tableMaxHeight);
 
-                QLabel* label =
-                    new QLabel (mTable->headerData (i, Qt::Horizontal, Qt::DisplayRole).toString(), mMainWidget);
-
+                    QString headerText = mTable->headerData (i, Qt::Horizontal, Qt::DisplayRole).toString();
+                    QLabel* label = new QLabel (headerText, mMainWidget);
                     label->setSizePolicy (QSizePolicy::Fixed, QSizePolicy::Fixed);
-                if(!editable)
-                    label->setEnabled(false);
 
                     tablesLayout->addWidget(label);
                     tablesLayout->addWidget(table);
@@ -608,6 +603,7 @@ void CSVWorld::EditWidget::remake(int row)
                             this,
                             SIGNAL(editIdRequest(const CSMWorld::UniversalId &, const std::string &)));
                 }
+            }
             else if (!(flags & CSMWorld::ColumnBase::Flag_Dialogue_List))
             {
                 mDispatcher->makeDelegate (display);