From d8497433f784649e5b388fd8e727a2e841886e46 Mon Sep 17 00:00:00 2001 From: Arno Date: Mon, 24 May 2010 14:49:12 +0200 Subject: Bugfix for commit 8827510ec55eda169340b5414bd60eb3ba3bfb79 et al. Remove duplicate QLabels in ArchiveEditDialog after given commit. Also readd ListModel to genre QComboBox in the dialog. Seems I deleted a little to much. --- archiveeditdialog.cpp | 4 ---- archivefilewidget.cpp | 7 ++++++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/archiveeditdialog.cpp b/archiveeditdialog.cpp index 35f1ef2..41f303f 100644 --- a/archiveeditdialog.cpp +++ b/archiveeditdialog.cpp @@ -42,15 +42,11 @@ ArchiveEditDialog::ArchiveEditDialog(QWidget *parent, Qt::WindowFlags f) : QDial QVBoxLayout *editorLayout = new QVBoxLayout; //genre editor - QLabel *l1 = new QLabel(tr("Edit genres")); mGenreEditor = new ListEditor(mGenreModel); - editorLayout->addWidget(l1); editorLayout->addWidget(mGenreEditor); //actor editor - QLabel *l2 = new QLabel(tr("Edit actors")); mActorsEditor = new ListEditor(mActorsModel); - editorLayout->addWidget(l2); editorLayout->addWidget(mActorsEditor); //cover editor diff --git a/archivefilewidget.cpp b/archivefilewidget.cpp index 818ac43..ce824aa 100644 --- a/archivefilewidget.cpp +++ b/archivefilewidget.cpp @@ -47,7 +47,12 @@ ArchiveFileWidget::ArchiveFileWidget(QWidget *parent, Qt::WindowFlags f) : QWidg //genre combobox QHBoxLayout *genreLayout = new QHBoxLayout; QLabel *l2 = new QLabel(tr("Select genre")); - mGenre = new QComboBox; + mGenre = new QComboBox; + mGenre->setModel(mGenreModel); + int idx = mGenre->findText("shemale"); + if(idx != -1){ + mGenre->setCurrentIndex(idx); + } genreLayout->addWidget(l2); genreLayout->addWidget(mGenre); mainLayout->addLayout(genreLayout); -- cgit v1.2.3-70-g09d2