Improved translation mechanism

[someplayer] / src / playerform.cpp

diff --git a/src/playerform.cpp b/src/playerform.cpp
index 0cbabd2..11328da 100644 (file)
--- a/src/playerform.cpp
+++ b/src/playerform.cpp
@@ -87,12 +87,12 @@ PlayerForm::PlayerForm(Library* lib, QWidget *parent) :
        _model = new QStandardItemModel(0, 2, this);
        ui->playlistView->setModel(_model);
        _context_menu = new QMenu(ui->playlistView);
-       QAction *clear_playlist = _context_menu->addAction("Clear playlist");
-       QAction *delete_action = _context_menu->addAction("Delete");
-       QAction *add_to_favorites = _context_menu->addAction("Add to favorites");
-       QAction *enqueue_action = _context_menu->addAction("Enqueue");
-       QAction *add_to_playlists = _context_menu->addAction("Add to playlists");
-       QAction *edit_tags = _context_menu->addAction("Edit tags");
+       __clear_playlist = _context_menu->addAction(tr("Clear playlist"));
+       __delete_action = _context_menu->addAction(tr("Delete"));
+       __add_to_favorites = _context_menu->addAction(tr("Add to favorites"));
+       __enqueue_action = _context_menu->addAction(tr("Enqueue"));
+       __add_to_playlists = _context_menu->addAction(tr("Add to playlists"));
+       __edit_tags = _context_menu->addAction(tr("Edit tags"));
 
        _track_renderer = new TrackRenderer(this);
        _track_renderer->setActiveRow(-1);
@@ -123,12 +123,12 @@ PlayerForm::PlayerForm(Library* lib, QWidget *parent) :
        connect(ui->repeatButton, SIGNAL(clicked()), this, SLOT(_toggle_repeat()));
        connect(ui->seekSlider, SIGNAL(sliderMoved(int)), _player, SLOT(seek(int)));
        connect(ui->playlistView, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(_custom_context_menu_requested(QPoint)));
-       connect(clear_playlist, SIGNAL(triggered()), this, SIGNAL(clearPlaylist()));
-       connect(delete_action, SIGNAL(triggered()), this, SLOT(_delete_track()));
-       connect(enqueue_action, SIGNAL(triggered()), this, SLOT(_enqueue_track()));
-       connect(add_to_favorites, SIGNAL(triggered()), this, SLOT(_add_to_favorites()));
-       connect(add_to_playlists, SIGNAL(triggered()), this, SLOT(_add_to_playlists()));
-       connect(edit_tags, SIGNAL(triggered()), this, SLOT(_edit_tags()));
+       connect(__clear_playlist, SIGNAL(triggered()), this, SIGNAL(clearPlaylist()));
+       connect(__delete_action, SIGNAL(triggered()), this, SLOT(_delete_track()));
+       connect(__enqueue_action, SIGNAL(triggered()), this, SLOT(_enqueue_track()));
+       connect(__add_to_favorites, SIGNAL(triggered()), this, SLOT(_add_to_favorites()));
+       connect(__add_to_playlists, SIGNAL(triggered()), this, SLOT(_add_to_playlists()));
+       connect(__edit_tags, SIGNAL(triggered()), this, SLOT(_edit_tags()));
        connect(_player, SIGNAL(stateChanged(PlayerState)), this, SLOT(_state_changed(PlayerState)));
        connect(_player, SIGNAL(trackDone(Track)), _lib, SLOT(updateTrackCount(Track)));
        connect(_tag_resolver, SIGNAL(decoded(Track)), this, SLOT(_track_decoded(Track)));
@@ -239,7 +239,7 @@ void PlayerForm::_display_track(Track track) {
        ui->seekSlider->setMinimum(0);
        ui->seekSlider->setMaximum(track.metadata().length());
        _tick(0, track.metadata().length());
-       _coverfinder->find(QFileInfo(track.source()).absolutePath());
+       _coverfinder->find(QFileInfo(track.source()));
 }
 
 void PlayerForm::_tick(int done, int all) {
@@ -432,22 +432,22 @@ void PlayerForm::landscapeMode() {
        ui->widget->layout()->removeItem(ui->controlLayout);
        ui->controlLayout->removeItem(ui->countHLayout);
        ui->controlLayout->removeItem(ui->cverticalSpacer_0);
-       ui->controlLayout->removeWidget(ui->titleLabel);
+       ui->controlLayout->removeItem(ui->titleLayout);
        ui->controlLayout->removeItem(ui->coverLayout);
        ui->controlLayout->removeItem(ui->cverticalSpacer_1);
        ui->controlLayout->removeItem(ui->seekLayout);
        ui->controlLayout->removeItem(ui->progressLayout);
        ui->controlLayout->removeItem(ui->cverticalSpacer_2);
-       ui->controlLayout->removeWidget(ui->artistAlbumLabel);
+       ui->controlLayout->removeItem(ui->artistAlbumLayout);
        ui->controlLayout->removeItem(ui->cverticalSpacer_3);
        ui->controlLayout->addItem(ui->countHLayout);
        ui->controlLayout->addItem(ui->cverticalSpacer_0);
-       ui->controlLayout->addWidget(ui->titleLabel);
+       ui->controlLayout->addItem(ui->titleLayout);
        ui->controlLayout->addItem(ui->cverticalSpacer_1);
        ui->controlLayout->addItem(ui->progressLayout);
        ui->controlLayout->addItem(ui->seekLayout);
        ui->controlLayout->addItem(ui->cverticalSpacer_2);
-       ui->controlLayout->addWidget(ui->artistAlbumLabel);
+       ui->controlLayout->addItem(ui->artistAlbumLayout);
        ui->controlLayout->addItem(ui->cverticalSpacer_3);
 
        ((QGridLayout *)ui->widget->layout())->addItem(ui->coverLayout, 0, 0);
@@ -496,22 +496,22 @@ void PlayerForm::portraitMode() {
 
        ui->controlLayout->removeItem(ui->countHLayout);
        ui->controlLayout->removeItem(ui->cverticalSpacer_0);
-       ui->controlLayout->removeWidget(ui->titleLabel);
+       ui->controlLayout->removeItem(ui->titleLayout);
        ui->controlLayout->removeItem(ui->coverLayout);
        ui->controlLayout->removeItem(ui->cverticalSpacer_1);
        ui->controlLayout->removeItem(ui->seekLayout);
        ui->controlLayout->removeItem(ui->progressLayout);
        ui->controlLayout->removeItem(ui->cverticalSpacer_2);
-       ui->controlLayout->removeWidget(ui->artistAlbumLabel);
+       ui->controlLayout->removeItem(ui->artistAlbumLayout);
        ui->controlLayout->removeItem(ui->cverticalSpacer_3);
 
        ui->controlLayout->addItem(ui->countHLayout);
        ui->controlLayout->addItem(ui->progressLayout);
        ui->controlLayout->addItem(ui->seekLayout);
        ui->controlLayout->addItem(ui->cverticalSpacer_0);
-       ui->controlLayout->addWidget(ui->titleLabel);
+       ui->controlLayout->addItem(ui->titleLayout);
        ui->controlLayout->addItem(ui->coverLayout);
-       ui->controlLayout->addWidget(ui->artistAlbumLabel);
+       ui->controlLayout->addItem(ui->artistAlbumLayout);
        ui->controlLayout->addItem(ui->cverticalSpacer_1);
        ui->controlLayout->invalidate();
 
@@ -662,7 +662,8 @@ void PlayerForm::hideCountdown() {
 }
 
 void PlayerForm::_display_cover(QImage image) {
-       _cover->setPixmap(QPixmap::fromImage(image));
+       QPixmap p = QPixmap::fromImage(image);
+       _cover->setPixmap(p);
 }
 
 void PlayerForm::_c_add_to_favorites() {
@@ -719,3 +720,7 @@ void PlayerForm::_toggle_extra_buttons() {
                ui->ctagButton->setIcon(QIcon());
        }
 }
+
+void PlayerForm::updateTranslations() {
+       ui->retranslateUi(this);
+}