Skip to content

Commit

Permalink
Fixes #93 Show IMDB and musicbrainz ID in the GUI
Browse files Browse the repository at this point in the history
  • Loading branch information
Komet committed Feb 2, 2015
1 parent 1441334 commit 1ff4635
Show file tree
Hide file tree
Showing 7 changed files with 120 additions and 50 deletions.
14 changes: 14 additions & 0 deletions movies/MovieWidget.cpp
Expand Up @@ -137,6 +137,7 @@ MovieWidget::MovieWidget(QWidget *parent) :
m_savingWidget->hide();

// Connect GUI change events to movie object
connect(ui->imdbId, SIGNAL(textEdited(QString)), this, SLOT(onImdbIdChange(QString)));
connect(ui->name, SIGNAL(textEdited(QString)), this, SLOT(onNameChange(QString)));
connect(ui->originalName, SIGNAL(textEdited(QString)), this, SLOT(onOriginalNameChange(QString)));
connect(ui->sortTitle, SIGNAL(textEdited(QString)), this, SLOT(onSortTitleChange(QString)));
Expand Down Expand Up @@ -239,6 +240,10 @@ void MovieWidget::clear()
ui->files->clear();
ui->files->blockSignals(blocked);

blocked = ui->imdbId->blockSignals(true);
ui->imdbId->clear();
ui->imdbId->blockSignals(blocked);

blocked = ui->name->blockSignals(true);
ui->name->clear();
ui->name->blockSignals(blocked);
Expand Down Expand Up @@ -536,6 +541,7 @@ void MovieWidget::updateMovieInfo()

ui->files->setText(m_movie->files().join(", "));
ui->files->setToolTip(m_movie->files().join("\n"));
ui->imdbId->setText(m_movie->id());
ui->name->setText(m_movie->name());
ui->movieName->setText(m_movie->name());
ui->originalName->setText(m_movie->originalName());
Expand Down Expand Up @@ -1080,6 +1086,14 @@ void MovieWidget::onNameChange(QString text)
ui->buttonRevert->setVisible(true);
}

void MovieWidget::onImdbIdChange(QString text)
{
if (!m_movie)
return;
m_movie->setId(text);
ui->buttonRevert->setVisible(true);
}

/**
* @brief Marks the movie as changed when the original name has changed
*/
Expand Down
1 change: 1 addition & 0 deletions movies/MovieWidget.h
Expand Up @@ -96,6 +96,7 @@ private slots:
void onLastWatchedChange(QDateTime dateTime);
void onOverviewChange();
void onOutlineChange();
void onImdbIdChange(QString text);

void onActorEdited(QTableWidgetItem *item);
void onStreamDetailsEdited();
Expand Down
51 changes: 34 additions & 17 deletions movies/MovieWidget.ui
Expand Up @@ -586,6 +586,23 @@
<item row="17" column="1">
<widget class="QTextEdit" name="outline"/>
</item>
<item row="1" column="1">
<widget class="QLineEdit" name="imdbId">
<property name="maximumSize">
<size>
<width>150</width>
<height>16777215</height>
</size>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_13">
<property name="text">
<string>IMDB ID</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
Expand Down Expand Up @@ -1659,6 +1676,23 @@ QPushButton::hover {
</layout>
</widget>
<customwidgets>
<customwidget>
<class>TagCloud</class>
<extends>QWidget</extends>
<header>smallWidgets/TagCloud.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>ImageGallery</class>
<extends>QWidget</extends>
<header>smallWidgets/ImageGallery.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>ClosableImage</class>
<extends>QLabel</extends>
<header>smallWidgets/ClosableImage.h</header>
</customwidget>
<customwidget>
<class>SlidingStackedWidget</class>
<extends>QStackedWidget</extends>
Expand All @@ -1681,28 +1715,11 @@ QPushButton::hover {
<header>smallWidgets/MediaFlags.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>TagCloud</class>
<extends>QWidget</extends>
<header>smallWidgets/TagCloud.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>ImageGallery</class>
<extends>QWidget</extends>
<header>smallWidgets/ImageGallery.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>MySpinBox</class>
<extends>QSpinBox</extends>
<header>smallWidgets/MySpinBox.h</header>
</customwidget>
<customwidget>
<class>ClosableImage</class>
<extends>QLabel</extends>
<header>smallWidgets/ClosableImage.h</header>
</customwidget>
<customwidget>
<class>MessageLabel</class>
<extends>QLabel</extends>
Expand Down
5 changes: 5 additions & 0 deletions music/MusicWidgetAlbum.cpp
Expand Up @@ -71,6 +71,7 @@ MusicWidgetAlbum::MusicWidgetAlbum(QWidget *parent) :
connect(ui->year, SIGNAL(valueChanged(int)), this, SLOT(onYearChanged(int)));
connect(ui->rating, SIGNAL(valueChanged(double)), this, SLOT(onRatingChanged(double)));
connect(ui->review, SIGNAL(textChanged()), this, SLOT(onReviewChanged()));
connect(ui->musicBrainzId, SIGNAL(textEdited(QString)), this, SLOT(onItemChanged(QString)));

QPainter p;
QPixmap revert(":/img/arrow_circle_left.png");
Expand Down Expand Up @@ -128,6 +129,7 @@ void MusicWidgetAlbum::onClear()
clearContents(ui->artist);
clearContents(ui->label);
clearContents(ui->releaseDate);
clearContents(ui->musicBrainzId);
bool blocked = ui->review->blockSignals(true);
ui->review->clear();
ui->review->blockSignals(blocked);
Expand Down Expand Up @@ -208,6 +210,7 @@ void MusicWidgetAlbum::updateAlbumInfo()
setContent(ui->artist, m_album->artist());
setContent(ui->label, m_album->label());
setContent(ui->releaseDate, m_album->releaseDate());
setContent(ui->musicBrainzId, m_album->mbId());
ui->review->blockSignals(true);
ui->review->setPlainText(m_album->review());
ui->review->blockSignals(false);
Expand Down Expand Up @@ -273,6 +276,8 @@ void MusicWidgetAlbum::onItemChanged(QString text)
m_album->setLabel(text);
else if (property == "releaseDate")
m_album->setReleaseDate(text);
else if (property == "mbid")
m_album->setMbId(text);

ui->buttonRevert->setVisible(true);
}
Expand Down
52 changes: 33 additions & 19 deletions music/MusicWidgetAlbum.ui
Expand Up @@ -166,80 +166,80 @@
</property>
</widget>
</item>
<item row="1" column="1">
<item row="2" column="1">
<widget class="QLineEdit" name="artist">
<property name="item" stdset="0">
<string notr="true">artist</string>
</property>
</widget>
</item>
<item row="1" column="0">
<item row="2" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
<string>Artist</string>
</property>
</widget>
</item>
<item row="2" column="1">
<item row="3" column="1">
<widget class="QLineEdit" name="title">
<property name="item" stdset="0">
<string notr="true">title</string>
</property>
</widget>
</item>
<item row="3" column="1">
<item row="4" column="1">
<widget class="QLineEdit" name="label">
<property name="item" stdset="0">
<string notr="true">label</string>
</property>
</widget>
</item>
<item row="2" column="0">
<item row="3" column="0">
<widget class="QLabel" name="label_3">
<property name="text">
<string>Title</string>
</property>
</widget>
</item>
<item row="3" column="0">
<item row="4" column="0">
<widget class="QLabel" name="label_21">
<property name="text">
<string>Label</string>
</property>
</widget>
</item>
<item row="4" column="0">
<item row="5" column="0">
<widget class="QLabel" name="label_6">
<property name="text">
<string>Rating</string>
</property>
</widget>
</item>
<item row="5" column="0">
<item row="6" column="0">
<widget class="QLabel" name="label_22">
<property name="text">
<string>Year</string>
</property>
</widget>
</item>
<item row="6" column="0">
<item row="7" column="0">
<widget class="QLabel" name="label_23">
<property name="text">
<string>Release Date</string>
</property>
</widget>
</item>
<item row="7" column="0">
<item row="8" column="0">
<widget class="QLabel" name="label_15">
<property name="text">
<string>Review</string>
</property>
</widget>
</item>
<item row="7" column="1">
<item row="8" column="1">
<widget class="QTextEdit" name="review"/>
</item>
<item row="5" column="1">
<item row="6" column="1">
<widget class="QSpinBox" name="year">
<property name="buttonSymbols">
<enum>QAbstractSpinBox::NoButtons</enum>
Expand All @@ -249,14 +249,14 @@
</property>
</widget>
</item>
<item row="6" column="1">
<item row="7" column="1">
<widget class="QLineEdit" name="releaseDate">
<property name="item" stdset="0">
<string notr="true">releaseDate</string>
</property>
</widget>
</item>
<item row="4" column="1">
<item row="5" column="1">
<widget class="QDoubleSpinBox" name="rating">
<property name="buttonSymbols">
<enum>QAbstractSpinBox::NoButtons</enum>
Expand All @@ -269,6 +269,20 @@
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_4">
<property name="text">
<string>MusicBrainz ID</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLineEdit" name="musicBrainzId">
<property name="item" stdset="0">
<string notr="true">mbid</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
Expand Down Expand Up @@ -498,17 +512,17 @@
</layout>
</widget>
<customwidgets>
<customwidget>
<class>ClosableImage</class>
<extends>QLabel</extends>
<header>smallWidgets/ClosableImage.h</header>
</customwidget>
<customwidget>
<class>TagCloud</class>
<extends>QWidget</extends>
<header>smallWidgets/TagCloud.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>ClosableImage</class>
<extends>QLabel</extends>
<header>smallWidgets/ClosableImage.h</header>
</customwidget>
</customwidgets>
<resources>
<include location="../MediaElch.qrc"/>
Expand Down
5 changes: 5 additions & 0 deletions music/MusicWidgetArtist.cpp
Expand Up @@ -79,6 +79,7 @@ MusicWidgetArtist::MusicWidgetArtist(QWidget *parent) :
connect(ui->disbanded, SIGNAL(textEdited(QString)), this, SLOT(onItemChanged(QString)));
connect(ui->died, SIGNAL(textEdited(QString)), this, SLOT(onItemChanged(QString)));
connect(ui->biography, SIGNAL(textChanged()), this, SLOT(onBiographyChanged()));
connect(ui->musicBrainzId, SIGNAL(textEdited(QString)), this, SLOT(onItemChanged(QString)));

connect(ui->fanarts, SIGNAL(sigRemoveImage(QByteArray)), this, SLOT(onRemoveExtraFanart(QByteArray)));
connect(ui->fanarts, SIGNAL(sigRemoveImage(QString)), this, SLOT(onRemoveExtraFanart(QString)));
Expand Down Expand Up @@ -146,6 +147,7 @@ void MusicWidgetArtist::onClear()
clearContents(ui->yearsActive);
clearContents(ui->disbanded);
clearContents(ui->died);
clearContents(ui->musicBrainzId);

bool blocked = ui->biography->blockSignals(true);
ui->biography->clear();
Expand Down Expand Up @@ -229,6 +231,7 @@ void MusicWidgetArtist::updateArtistInfo()
setContent(ui->yearsActive, m_artist->yearsActive());
setContent(ui->disbanded, m_artist->disbanded());
setContent(ui->died, m_artist->died());
setContent(ui->musicBrainzId, m_artist->mbId());
ui->biography->blockSignals(true);
ui->biography->setPlainText(m_artist->biography());
ui->biography->blockSignals(false);
Expand Down Expand Up @@ -297,6 +300,8 @@ void MusicWidgetArtist::onItemChanged(QString text)
m_artist->setDisbanded(text);
else if (property == "died")
m_artist->setDied(text);
else if (property == "mbid")
m_artist->setMbId(text);

ui->buttonRevert->setVisible(true);
}
Expand Down

0 comments on commit 1ff4635

Please sign in to comment.