From f551e5f4a7cbf6c2e8634b80a0f2c289fafbbfa8 Mon Sep 17 00:00:00 2001 From: Moritz Bunkus Date: Sun, 26 Jan 2014 21:28:09 +0100 Subject: [PATCH] GUI: swap track name and source file columns --- src/mkvtoolnix-gui/merge_widget/track_model.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/mkvtoolnix-gui/merge_widget/track_model.cpp b/src/mkvtoolnix-gui/merge_widget/track_model.cpp index 809d1fa39..931bcdbb2 100644 --- a/src/mkvtoolnix-gui/merge_widget/track_model.cpp +++ b/src/mkvtoolnix-gui/merge_widget/track_model.cpp @@ -20,7 +20,7 @@ TrackModel::TrackModel(QObject *parent) , m_debug{"track_model"} { auto labels = QStringList{}; - labels << QY("Codec") << QY("Type") << QY("Mux this") << QY("Language") << QY("Source file") << QY("Name") << QY("ID"); + labels << QY("Codec") << QY("Type") << QY("Mux this") << QY("Language") << QY("Name") << QY("Source file") << QY("ID"); setHorizontalHeaderLabels(labels); horizontalHeaderItem(6)->setTextAlignment(Qt::AlignRight); } @@ -73,8 +73,8 @@ TrackModel::setItemsFromTrack(QList items, : Q("INTERNAL ERROR")); items[2]->setText(track->m_muxThis ? QY("yes") : QY("no")); items[3]->setText(track->m_language); - items[4]->setText(QFileInfo{ track->m_file->m_fileName }.fileName()); - items[5]->setText(track->m_name); + items[4]->setText(track->m_name); + items[5]->setText(QFileInfo{ track->m_file->m_fileName }.fileName()); items[6]->setText(-1 == track->m_id ? Q("") : QString::number(track->m_id)); items[0]->setData(QVariant::fromValue(track), Util::TrackRole);