diff --git a/lib/README.md b/lib/README.md index 15cdda48..fdc7f573 100644 --- a/lib/README.md +++ b/lib/README.md @@ -5,8 +5,8 @@ I know these files shouldn't belong here. But it keeps things way more simple to These files are used for compiling subproject `MiamCore`. You can also rebuild these files for Windows/OSX if you wish. -###Folders *debug* and *release* (x64 only) -- Files for Windows. Built with MSVC2013 +###Folders *release* (x64 only) +- Files for Windows. Built with MSVC2015-MSVC2017 ###Folder *osx* - Contains only `libtag.dylib` diff --git a/lib/debug/win-x64/OpenAL32.dll b/lib/debug/win-x64/OpenAL32.dll deleted file mode 100644 index beaab9ef..00000000 Binary files a/lib/debug/win-x64/OpenAL32.dll and /dev/null differ diff --git a/lib/debug/win-x64/QtAV1.dll b/lib/debug/win-x64/QtAV1.dll deleted file mode 100644 index 2ec4e30a..00000000 Binary files a/lib/debug/win-x64/QtAV1.dll and /dev/null differ diff --git a/lib/debug/win-x64/QtAV1.lib b/lib/debug/win-x64/QtAV1.lib deleted file mode 100644 index 8caaacdc..00000000 Binary files a/lib/debug/win-x64/QtAV1.lib and /dev/null differ diff --git a/lib/debug/win-x64/avcodec-57.dll b/lib/debug/win-x64/avcodec-57.dll deleted file mode 100644 index f0d0f1aa..00000000 Binary files a/lib/debug/win-x64/avcodec-57.dll and /dev/null differ diff --git a/lib/debug/win-x64/avdevice-57.dll b/lib/debug/win-x64/avdevice-57.dll deleted file mode 100644 index 3c0ab2b3..00000000 Binary files a/lib/debug/win-x64/avdevice-57.dll and /dev/null differ diff --git a/lib/debug/win-x64/avfilter-6.dll b/lib/debug/win-x64/avfilter-6.dll deleted file mode 100644 index 3c3bac26..00000000 Binary files a/lib/debug/win-x64/avfilter-6.dll and /dev/null differ diff --git a/lib/debug/win-x64/avformat-57.dll b/lib/debug/win-x64/avformat-57.dll deleted file mode 100644 index 954d2faf..00000000 Binary files a/lib/debug/win-x64/avformat-57.dll and /dev/null differ diff --git a/lib/debug/win-x64/avresample-3.dll b/lib/debug/win-x64/avresample-3.dll deleted file mode 100644 index f271335b..00000000 Binary files a/lib/debug/win-x64/avresample-3.dll and /dev/null differ diff --git a/lib/debug/win-x64/avutil-55.dll b/lib/debug/win-x64/avutil-55.dll deleted file mode 100644 index ce62cc2e..00000000 Binary files a/lib/debug/win-x64/avutil-55.dll and /dev/null differ diff --git a/lib/debug/win-x64/chromaprint.dll b/lib/debug/win-x64/chromaprint.dll deleted file mode 100644 index bd99e85b..00000000 Binary files a/lib/debug/win-x64/chromaprint.dll and /dev/null differ diff --git a/lib/debug/win-x64/swresample-2.dll b/lib/debug/win-x64/swresample-2.dll deleted file mode 100644 index d2eef8c3..00000000 Binary files a/lib/debug/win-x64/swresample-2.dll and /dev/null differ diff --git a/lib/debug/win-x64/swscale-4.dll b/lib/debug/win-x64/swscale-4.dll deleted file mode 100644 index cb92b49b..00000000 Binary files a/lib/debug/win-x64/swscale-4.dll and /dev/null differ diff --git a/lib/debug/win-x64/tag.dll b/lib/debug/win-x64/tag.dll deleted file mode 100644 index 59957531..00000000 Binary files a/lib/debug/win-x64/tag.dll and /dev/null differ diff --git a/lib/debug/win-x64/tag.lib b/lib/debug/win-x64/tag.lib deleted file mode 100644 index 08fc5c94..00000000 Binary files a/lib/debug/win-x64/tag.lib and /dev/null differ diff --git a/lib/release/win-x64/OpenAL32.dll b/lib/release/win-x64/OpenAL32.dll index beaab9ef..36dc6073 100644 Binary files a/lib/release/win-x64/OpenAL32.dll and b/lib/release/win-x64/OpenAL32.dll differ diff --git a/lib/release/win-x64/QtAV1.dll b/lib/release/win-x64/QtAV1.dll index ac14d854..3d9d29f3 100644 Binary files a/lib/release/win-x64/QtAV1.dll and b/lib/release/win-x64/QtAV1.dll differ diff --git a/lib/release/win-x64/QtAV1.lib b/lib/release/win-x64/QtAV1.lib index 8caaacdc..3be5d35e 100644 Binary files a/lib/release/win-x64/QtAV1.lib and b/lib/release/win-x64/QtAV1.lib differ diff --git a/lib/release/win-x64/avcodec-57.dll b/lib/release/win-x64/avcodec-57.dll index f0d0f1aa..d824dc52 100644 Binary files a/lib/release/win-x64/avcodec-57.dll and b/lib/release/win-x64/avcodec-57.dll differ diff --git a/lib/release/win-x64/avdevice-57.dll b/lib/release/win-x64/avdevice-57.dll index 3c0ab2b3..a7a0e2b9 100644 Binary files a/lib/release/win-x64/avdevice-57.dll and b/lib/release/win-x64/avdevice-57.dll differ diff --git a/lib/release/win-x64/avfilter-6.dll b/lib/release/win-x64/avfilter-6.dll index 3c3bac26..aa6927b8 100644 Binary files a/lib/release/win-x64/avfilter-6.dll and b/lib/release/win-x64/avfilter-6.dll differ diff --git a/lib/release/win-x64/avformat-57.dll b/lib/release/win-x64/avformat-57.dll index 954d2faf..6a21d917 100644 Binary files a/lib/release/win-x64/avformat-57.dll and b/lib/release/win-x64/avformat-57.dll differ diff --git a/lib/release/win-x64/avresample-3.dll b/lib/release/win-x64/avresample-3.dll index f271335b..69634f52 100644 Binary files a/lib/release/win-x64/avresample-3.dll and b/lib/release/win-x64/avresample-3.dll differ diff --git a/lib/release/win-x64/avutil-55.dll b/lib/release/win-x64/avutil-55.dll index ce62cc2e..db20d737 100644 Binary files a/lib/release/win-x64/avutil-55.dll and b/lib/release/win-x64/avutil-55.dll differ diff --git a/lib/release/win-x64/swresample-2.dll b/lib/release/win-x64/swresample-2.dll index d2eef8c3..a4c51470 100644 Binary files a/lib/release/win-x64/swresample-2.dll and b/lib/release/win-x64/swresample-2.dll differ diff --git a/lib/release/win-x64/swscale-4.dll b/lib/release/win-x64/swscale-4.dll index cb92b49b..c66904c5 100644 Binary files a/lib/release/win-x64/swscale-4.dll and b/lib/release/win-x64/swscale-4.dll differ diff --git a/miam-player.pro b/miam-player.pro index d93117ef..e93bc8ac 100644 --- a/miam-player.pro +++ b/miam-player.pro @@ -12,6 +12,6 @@ SUBDIRS += src/core \ src/tageditor \ src/player -RESOURCES += src/player/mp.qrc \ - src/tabplaylists/mp.qrc \ - src/tageditor/player.qrc +RESOURCES += src/player/player.qrc \ + src/tabplaylists/tabPlaylists.qrc \ + src/tageditor/tageditor.qrc diff --git a/src/core/filehelper.cpp b/src/core/filehelper.cpp index 4bd25bd8..55018047 100644 --- a/src/core/filehelper.cpp +++ b/src/core/filehelper.cpp @@ -217,7 +217,6 @@ QString FileHelper::artistAlbum() const } break; case EXT_ASF: - qDebug() << Q_FUNC_INFO << "Not yet implemented for ASF file"; break; case EXT_FLAC: artAlb = this->extractFlacFeature("ALBUMARTIST"); @@ -248,8 +247,6 @@ void FileHelper::setArtistAlbum(const QString &artistAlbum) break; } case EXT_MPC: - //mpcFile = static_cast(f); - qDebug() << Q_FUNC_INFO << "Not implemented for MPC"; break; case EXT_MP3:{ TagLib::MPEG::File *mpegFile = static_cast(_file); @@ -264,7 +261,7 @@ void FileHelper::setArtistAlbum(const QString &artistAlbum) tif->setText(artistAlbum.toStdString().data()); tag->addFrame(tif); } else if (mpegFile->hasID3v1Tag()) { - qDebug() << Q_FUNC_INFO << "Not implemented for ID3v1Tag"; + } break; } @@ -272,13 +269,10 @@ void FileHelper::setArtistAlbum(const QString &artistAlbum) TagLib::Ogg::XiphComment *xiphComment = static_cast(_file->tag()); if (xiphComment) { xiphComment->addField("ALBUMARTIST", artistAlbum.toStdString().data()); - } else { - qDebug() << Q_FUNC_INFO << "Not implemented for this OGG file"; - } + } break; } default: - qDebug() << Q_FUNC_INFO << "Not implemented for this type of file"; break; } } diff --git a/src/core/library/jumptowidget.cpp b/src/core/library/jumptowidget.cpp index 28fbd215..fa4a1a44 100644 --- a/src/core/library/jumptowidget.cpp +++ b/src/core/library/jumptowidget.cpp @@ -53,7 +53,6 @@ bool JumpToWidget::eventFilter(QObject *obj, QEvent *event) QSize JumpToWidget::sizeHint() const { - //qDebug() << Q_FUNC_INFO << QSize(20, _view->height()); return QSize(20, _view->height()); } diff --git a/src/core/mediaplayer.cpp b/src/core/mediaplayer.cpp index 808b13af..dd4d62d2 100644 --- a/src/core/mediaplayer.cpp +++ b/src/core/mediaplayer.cpp @@ -29,19 +29,16 @@ MediaPlayer::MediaPlayer(QObject *parent) , _stopAfterCurrent(false) { connect(_localPlayer, &QtAV::AVPlayer::stopped, this, [=]() { - //qDebug() << "QtAV::AVPlayer::stopped"; this->setState(QMediaPlayer::StoppedState); }); connect(_localPlayer, &QtAV::AVPlayer::loaded, this, [=]() { - //qDebug() << "QtAV::AVPlayer::loaded"; _localPlayer->audio()->setVolume(Settings::instance()->volume()); emit currentMediaChanged(_localPlayer->file()); this->setState(QMediaPlayer::PlayingState); }); connect(_localPlayer, &QtAV::AVPlayer::paused, this, [=](bool) { - //qDebug() << "QtAV::AVPlayer::paused" << b; this->setState(QMediaPlayer::PausedState); }); @@ -133,13 +130,9 @@ void MediaPlayer::playMediaContent(const QMediaContent &mc) } else { // Find remote player attached to mediaContent _remotePlayer = _remotePlayers.value(mc.canonicalUrl().host()); - qDebug() << Q_FUNC_INFO << "about to play remote track" << mc.canonicalUrl().host() << _remotePlayer; if (_remotePlayer) { - qDebug() << Q_FUNC_INFO << "about to play remote track" << mc.canonicalUrl(); _remotePlayer->play(mc.canonicalUrl()); - } else { - qDebug() << Q_FUNC_INFO << "couldn't get remote player for" << mc.canonicalUrl(); - } + } } this->setVolume(Settings::instance()->volume()); } @@ -248,7 +241,6 @@ void MediaPlayer::seekForward() void MediaPlayer::skipBackward() { - qDebug() << Q_FUNC_INFO << playlist(); if (!_playlist) { return; } @@ -289,12 +281,10 @@ void MediaPlayer::play() { // Check if it's possible to play tracks first if (!_playlist) { - qDebug() << Q_FUNC_INFO << "no playlist!"; return; } QMediaContent mc = _playlist->media(_playlist->currentIndex()); if (mc.isNull()) { - qDebug() << Q_FUNC_INFO << "media content is null!"; return; } this->playMediaContent(mc); @@ -316,9 +306,7 @@ void MediaPlayer::stop() /** Activate or desactive audio output. */ void MediaPlayer::toggleMute() const { - if (_remotePlayer) { - qDebug() << Q_FUNC_INFO << "not yet implemented for remote players"; - } else { + if (!_remotePlayer) { _localPlayer->audio()->setMute(!_localPlayer->audio()->isMute()); } } diff --git a/src/core/model/sqldatabase.cpp b/src/core/model/sqldatabase.cpp index a187b98d..2209bfdb 100644 --- a/src/core/model/sqldatabase.cpp +++ b/src/core/model/sqldatabase.cpp @@ -103,8 +103,6 @@ uint SqlDatabase::insertIntoTablePlaylists(const PlaylistDAO &playlist, const QS this->setPragmas(); } - qDebug() << Q_FUNC_INFO << tracks; - static std::uniform_int_distribution tt; this->transaction(); uint id = 0; @@ -513,7 +511,6 @@ void SqlDatabase::updateTrack(const QString &absFilePath) { FileHelper fh(absFilePath); if (!fh.isValid()) { - qDebug() << Q_FUNC_INFO << "file is not valid, won't be updated"; return; } @@ -569,8 +566,6 @@ void SqlDatabase::updateTracks(const QStringList &oldPaths, const QStringList &n transaction(); Q_ASSERT(oldPaths.size() == newPaths.size()); - //qDebug() << Q_FUNC_INFO << "oldPaths" << oldPaths; - //qDebug() << Q_FUNC_INFO << "newPaths" << newPaths; for (int i = 0; i < newPaths.size(); i++) { QString newPath = newPaths.at(i); QString oldPath = oldPaths.at(i); @@ -632,7 +627,6 @@ void SqlDatabase::saveFileRef(const QString &absFilePath) { FileHelper fh(absFilePath); if (!fh.isValid()) { - qDebug() << Q_FUNC_INFO << "file is not valid, won't be saved:" << absFilePath; return; } diff --git a/src/core/musicsearchengine.cpp b/src/core/musicsearchengine.cpp index a14e6c3d..de58e905 100644 --- a/src/core/musicsearchengine.cpp +++ b/src/core/musicsearchengine.cpp @@ -135,7 +135,6 @@ void MusicSearchEngine::doSearch() void MusicSearchEngine::watchForChanges() { if (isScanning) { - qDebug() << Q_FUNC_INFO << "the filesystem is already being analyzed by another process"; return; } @@ -177,7 +176,6 @@ void MusicSearchEngine::watchForChanges() // Process in reverse mode to clean cache: from database file and check if entry exists in database QSqlQuery cache("SELECT * FROM filesystem", db); - qDebug() << Q_FUNC_INFO << "SELECT * FROM filesystem"; cache.setForwardOnly(true); if (cache.exec()) { QStringList oldLocations; diff --git a/src/core/settingsprivate.cpp b/src/core/settingsprivate.cpp index 5be4782d..a768bed6 100644 --- a/src/core/settingsprivate.cpp +++ b/src/core/settingsprivate.cpp @@ -525,9 +525,7 @@ void SettingsPrivate::addMusicLocations(const QList &dirs) for (QDir d : dirs) { if (!old.contains(QDir::toNativeSeparators(d.absolutePath()))) { locations << QDir::toNativeSeparators(d.absolutePath()); - } else { - qDebug() << Q_FUNC_INFO << old << "already contains" << QDir::toNativeSeparators(d.absolutePath()); - } + } } QStringList newLocations(old); newLocations.append(locations); diff --git a/src/core/styling/miamstyleditemdelegate.cpp b/src/core/styling/miamstyleditemdelegate.cpp index 8ad3d219..9a7e4a45 100644 --- a/src/core/styling/miamstyleditemdelegate.cpp +++ b/src/core/styling/miamstyleditemdelegate.cpp @@ -55,7 +55,6 @@ void MiamStyledItemDelegate::paint(QPainter *p, const QStyleOptionViewItem &opt, p->drawLine(o.rect.x(), o.rect.y() + o.rect.height(), o.rect.x() + o.rect.width(), o.rect.y() + o.rect.height()); } } else { - //qDebug() << Q_FUNC_INFO << o.text; style->drawPrimitive(QStyle::PE_PanelItemViewItem, &o, p, o.widget); } p->restore(); diff --git a/src/cover-fetcher/coverfetcher.cpp b/src/cover-fetcher/coverfetcher.cpp index 69b181a7..0953c12a 100644 --- a/src/cover-fetcher/coverfetcher.cpp +++ b/src/cover-fetcher/coverfetcher.cpp @@ -103,7 +103,7 @@ void CoverFetcher::fetch(SelectedTracksModel *selectedTracksModel) QUrl url = cp->query(artistAlbum, album); QNetworkRequest request(url); request.setAttribute(QNetworkRequest::User, CoverArtProvider::FO_Search); - request.setHeader(QNetworkRequest::UserAgentHeader, "MiamPlayer/0.8.1 ( https://www.miam-player.org/ )" ); + request.setHeader(QNetworkRequest::UserAgentHeader, "MiamPlayer/0.9.0 ( https://github.com/MBach/Miam-Player )" ); QNetworkReply *n = _manager->get(request); n->setProperty("type", cp->type()); n->setProperty("requestType", CoverArtProvider::FO_Search); diff --git a/src/cover-fetcher/providers/musicbrainzprovider.cpp b/src/cover-fetcher/providers/musicbrainzprovider.cpp index 169d9594..aa2f8c25 100644 --- a/src/cover-fetcher/providers/musicbrainzprovider.cpp +++ b/src/cover-fetcher/providers/musicbrainzprovider.cpp @@ -76,7 +76,7 @@ void MusicBrainzProvider::fetchReleases(const QString &album, const QByteArray & /// FIXME: find a way to get the 500px thumbnail and to automatically download the large one after QUrl url = this->album(it.value()); QNetworkRequest request(url); - request.setHeader(QNetworkRequest::UserAgentHeader, "MiamPlayer/0.8.1 ( http://www.miam-player.org/ )" ); + request.setHeader(QNetworkRequest::UserAgentHeader, "MiamPlayer/0.9.0 ( https://github.com/MBach/Miam-Player )" ); QNetworkReply *reply = _manager->get(request); reply->setProperty("type", this->type()); reply->setProperty("requestType", FO_DownloadCover); diff --git a/src/library/library.pro b/src/library/library.pro index 98ddf2c4..36f2dab8 100644 --- a/src/library/library.pro +++ b/src/library/library.pro @@ -42,7 +42,7 @@ HEADERS += albumitem.h \ FORMS += libraryorderdialog.ui CONFIG += c++11 CONFIG(debug, debug|release) { - win32: LIBS += -L$$OUT_PWD/../core/debug/ -lmiam-core -L$$OUT_PWD/../cover-fetcher/release/ -lmiam-coverfetcher + win32: LIBS += -L$$OUT_PWD/../core/debug/ -lmiam-core -L$$OUT_PWD/../cover-fetcher/debug/ -lmiam-coverfetcher OBJECTS_DIR = debug/.obj MOC_DIR = debug/.moc RCC_DIR = debug/.rcc diff --git a/src/library/libraryitemmodel.cpp b/src/library/libraryitemmodel.cpp index 5d43be4f..3813c25f 100644 --- a/src/library/libraryitemmodel.cpp +++ b/src/library/libraryitemmodel.cpp @@ -96,7 +96,6 @@ void LibraryItemModel::load(const QString &) // Add artist if (_artists.contains(artistItem->hash())) { - //qDebug() << "hash found:" << artistItem->hash() << "for" << artistItem->text() ; auto it = _artists.find(artistItem->hash()); delete artistItem; artistItem = (*it); diff --git a/src/library/librarytreeview.cpp b/src/library/librarytreeview.cpp index 2601ac6e..2f461997 100644 --- a/src/library/librarytreeview.cpp +++ b/src/library/librarytreeview.cpp @@ -151,19 +151,15 @@ void LibraryTreeView::setExpandedCover(const QModelIndex &index) { QStandardItem *item = _libraryModel->itemFromIndex(_proxyModel->mapToSource(index)); if (item->type() == Miam::IT_Album && Settings::instance()->isCoverBelowTracksEnabled()) { - qDebug() << Q_FUNC_INFO; QImage *image = nullptr; AlbumItem *albumItem = static_cast(item); if (albumItem->data(Miam::DF_InternalCover).toString().isEmpty()) { QString coverPath = albumItem->data(Miam::DF_CoverPath).toString(); - qDebug() << Q_FUNC_INFO << "loading external cover" << coverPath; if (!coverPath.isEmpty()) { image = new QImage(coverPath); } } else { - qDebug() << Q_FUNC_INFO << "loading internal cover"; - FileHelper fh(albumItem->data(Miam::DF_InternalCover).toString()); std::unique_ptr cover(fh.extractCover()); if (cover) { @@ -212,7 +208,6 @@ void LibraryTreeView::scrollToLetter(const QString &letter) void LibraryTreeView::updateSelectedTracks() { /// Like the tagEditor, it's easier to proceed with complete clean/rebuild from dabatase - qDebug() << Q_FUNC_INFO; model()->load(); } diff --git a/src/player/config/mp.rc b/src/player/config/mp.rc index fa366ee5..3224d314 100644 --- a/src/player/config/mp.rc +++ b/src/player/config/mp.rc @@ -2,7 +2,7 @@ IDI_ICON1 ICON DISCARDABLE "../../core/mp.ico" // Executable version information. 1 VERSIONINFO FILEVERSION 1,0,0,0 - PRODUCTVERSION 0,8,1,20161229 + PRODUCTVERSION 0,9,0,20181028 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L diff --git a/src/player/dialogs/customizeoptionsdialog.cpp b/src/player/dialogs/customizeoptionsdialog.cpp index bd60e95b..edca04cc 100644 --- a/src/player/dialogs/customizeoptionsdialog.cpp +++ b/src/player/dialogs/customizeoptionsdialog.cpp @@ -319,7 +319,6 @@ void CustomizeOptionsDialog::initShortcuts() emit shortcut->editingFinished(); }); connect(reset, &QPushButton::clicked, this, [=]() { - qDebug() << Q_FUNC_INFO << shortcut->objectName() << QKeySequence(defaultShortcutMap.value(shortcut->objectName()).toString()); shortcut->setKeySequence(QKeySequence(defaultShortcutMap.value(shortcut->objectName()).toString())); emit shortcut->editingFinished(); }); @@ -494,7 +493,6 @@ void CustomizeOptionsDialog::togglePlugin(QTableWidgetItem *item) void CustomizeOptionsDialog::toggleRemoteControl(bool enabled) { - qDebug() << Q_FUNC_INFO; remoteControlLabelPort->setEnabled(enabled); remoteControlPortSpinBox->setEnabled(enabled); SettingsPrivate::instance()->setRemoteControlEnabled(enabled); diff --git a/src/player/dialogs/customizethemedialog.cpp b/src/player/dialogs/customizethemedialog.cpp index 0d1b8cf5..51dccb59 100644 --- a/src/player/dialogs/customizethemedialog.cpp +++ b/src/player/dialogs/customizethemedialog.cpp @@ -277,7 +277,6 @@ void CustomizeThemeDialog::setupActions() // Change big cover opacity connect(radioButtonEnableBigCover, &QRadioButton::toggled, [=](bool b) { - qDebug() << Q_FUNC_INFO; settings->setCoverBelowTracksEnabled(b); labelBigCoverOpacity->setEnabled(b); spinBoxBigCoverOpacity->setEnabled(b); @@ -486,7 +485,6 @@ void CustomizeThemeDialog::showColorDialog() void CustomizeThemeDialog::toggleCustomColors(bool enabled) { - qDebug() << Q_FUNC_INFO << enabled; this->toggleCustomColorsGridLayout(customColorsGridLayout, enabled); labelOverrideTextColor->setEnabled(enabled); @@ -503,8 +501,6 @@ void CustomizeThemeDialog::toggleCustomColors(bool enabled) void CustomizeThemeDialog::toggleCustomTextColors(bool enabled) { - qDebug() << Q_FUNC_INFO << enabled; - this->toggleCustomColorsGridLayout(customTextColorsGridLayout, enabled); this->toggleCustomColorsReflector(fontColorWidget, selectedFontColorWidget, enabled); } diff --git a/src/player/dialogs/customizethemetaglineedit.cpp b/src/player/dialogs/customizethemetaglineedit.cpp index b8639263..9e3e174d 100644 --- a/src/player/dialogs/customizethemetaglineedit.cpp +++ b/src/player/dialogs/customizethemetaglineedit.cpp @@ -42,6 +42,5 @@ bool CustomizeThemeTagLineEdit::eventFilter(QObject *obj, QEvent *event) void CustomizeThemeTagLineEdit::closeTagButton(TagButton *t) { TagLineEdit::closeTagButton(t); - qDebug() << Q_FUNC_INFO << this->toStringList(); emit taglistHasChanged(this->toStringList()); } diff --git a/src/player/main.cpp b/src/player/main.cpp index 9c012674..12ae2476 100644 --- a/src/player/main.cpp +++ b/src/player/main.cpp @@ -5,7 +5,7 @@ #define COMPANY "MmeMiamMiam" #define SOFT "MiamPlayer" -#define VERSION "0.8.1" +#define VERSION "0.9.0" #include #include "styling/miamstyle.h" diff --git a/src/player/mainwindow.cpp b/src/player/mainwindow.cpp index 91ec5c71..30408fdb 100644 --- a/src/player/mainwindow.cpp +++ b/src/player/mainwindow.cpp @@ -198,7 +198,7 @@ void MainWindow::setupActions() this->syncLibrary(QStringList(), settingsPrivate->musicLocations()); }); connect(actionShowHelp, &QAction::triggered, this, [=]() { - QDesktopServices::openUrl(QUrl("http://miam-player.org/wiki/index.php")); + QDesktopServices::openUrl(QUrl("https://github.com/MBach/Miam-Player/wiki")); }); // Load music @@ -224,10 +224,7 @@ void MainWindow::setupActions() if (_currentView && _currentView->viewProperty(Settings::VP_HasAreaForRescan)) { _currentView->setMusicSearchEngine(worker); } - qDebug() << Q_FUNC_INFO << "create new instance of file system watcher"; - } else { - qDebug() << Q_FUNC_INFO << "delete any instance of file system watcher"; - } + } }); connect(settingsPrivate, &SettingsPrivate::fontHasChanged, this, [=](SettingsPrivate::FontFamily ff) { @@ -237,7 +234,6 @@ void MainWindow::setupActions() }); connect(settingsPrivate, &SettingsPrivate::remoteControlChanged, this, [=](bool enabled, uint port) { - qDebug() << Q_FUNC_INFO; if (enabled) { if (_remoteControl) { _remoteControl->changeServerPort(port); @@ -321,7 +317,6 @@ bool MainWindow::event(QEvent *e) if (!this->menuBar()->isVisible()) { QKeyEvent *keyEvent = static_cast(e); if (keyEvent->key() == Qt::Key_Alt) { - qDebug() << Q_FUNC_INFO << "Alt was pressed"; this->setProperty("altKey", true); this->toggleMenuBar(false); // Reactivate shortcuts on the menuBar @@ -339,7 +334,6 @@ bool MainWindow::event(QEvent *e) } else if (e->type() == QEvent::KeyRelease) { QKeyEvent *keyEvent = static_cast(e); if (this->property("altKey").toBool() && keyEvent->key() == Qt::Key_Alt) { - qDebug() << Q_FUNC_INFO << "Alt was released"; this->menuBar()->show(); this->menuBar()->setFocus(); this->setProperty("altKey", false); diff --git a/src/player/mainwindow.ui b/src/player/mainwindow.ui index c88eaec6..348dd13f 100644 --- a/src/player/mainwindow.ui +++ b/src/player/mainwindow.ui @@ -22,7 +22,7 @@ 0 0 439 - 25 + 20 @@ -66,8 +66,6 @@ &Help - - @@ -408,6 +406,7 @@ + diff --git a/src/player/pluginmanager.cpp b/src/player/pluginmanager.cpp index 6bc5116f..c72cafaf 100644 --- a/src/player/pluginmanager.cpp +++ b/src/player/pluginmanager.cpp @@ -128,10 +128,7 @@ bool PluginManager::loadPlugin(const QString &pluginAbsPath) this->loadMediaPlayerPlugin(mediaPlayerPlugin); } else if (RemoteMediaPlayerPlugin *remoteMediaPlayerPlugin = qobject_cast(plugin)) { this->loadRemoteMediaPlayerPlugin(remoteMediaPlayerPlugin); - } /*else if (TagEditorPlugin *tagEditorPlugin = qobject_cast(plugin)) { - qDebug() << Q_FUNC_INFO; - this->loadTagEditorPlugin(tagEditorPlugin); - }*/ + } } return plugin != nullptr; } diff --git a/src/player/remotecontrol.cpp b/src/player/remotecontrol.cpp index f94dadfd..0951df51 100644 --- a/src/player/remotecontrol.cpp +++ b/src/player/remotecontrol.cpp @@ -42,11 +42,9 @@ void RemoteControl::changeServerPort(int port) void RemoteControl::startServer() { auto b = _webSocketServer->listen(QHostAddress::Any, _port); - qDebug() << Q_FUNC_INFO << b; _udpSocket->bind(_port, QUdpSocket::ShareAddress); connect(_udpSocket, &QUdpSocket::readyRead, this, [=]() { - qDebug() << Q_FUNC_INFO; if (_udpSocket->hasPendingDatagrams()) { QByteArray clientHost; @@ -69,7 +67,6 @@ void RemoteControl::startServer() QByteArray hostByteArray; hostByteArray.append(host); - qDebug() << Q_FUNC_INFO << "sending server infos:" << host << "to client:" << client; _udpSocket->writeDatagram(hostByteArray, QHostAddress(client), _port); } }); @@ -268,7 +265,6 @@ void RemoteControl::sendTrackInfos(const QString &track) void RemoteControl::sendVolume(qreal volume) { if (!_webSocket) { - qDebug() << Q_FUNC_INFO << "Cannot send volume !"; return; } diff --git a/src/player/styling/miamstyle.cpp b/src/player/styling/miamstyle.cpp index bec39ba3..752f2f2d 100644 --- a/src/player/styling/miamstyle.cpp +++ b/src/player/styling/miamstyle.cpp @@ -32,9 +32,6 @@ void MiamStyle::drawScrollBar(QPainter *p, const QWidget *widget) const QRect addLineRect = QApplication::style()->subControlRect(QStyle::CC_ScrollBar, &scrollbar, QStyle::SC_ScrollBarAddLine, sc); QRect sliderRect = QApplication::style()->subControlRect(QStyle::CC_ScrollBar, &scrollbar, QStyle::SC_ScrollBarSlider, sc); - //qDebug() << subLineRect << sliderRect << addLineRect; - - if (sc->orientation() == Qt::Vertical) { subLineRect.adjust(0, 0, -1, 0); addLineRect.adjust(0, 0, -1, 0); @@ -173,14 +170,9 @@ QRect MiamStyle::subElementRect(SubElement element, const QStyleOption *option, if (widget && widget->objectName() == "tabBar") { const QStyleOptionTab *sot = qstyleoption_cast(option); QStyleOptionTab tab = *sot; - //qDebug() << Q_FUNC_INFO << element << r; if (element == SE_TabBarTabText) { - //tab.rect.setX(tab.rect.x() + 20); - //qDebug() << "SE_TabBarTabText" << sot->rect; - return sot->rect; } else if (element == SE_CheckBoxContents) { - //qDebug() << "SE_CheckBoxContents" << sot->rect; return sot->rect; } } @@ -419,7 +411,6 @@ void MiamStyle::drawPrimitive(PrimitiveElement element, const QStyleOption *opt, QRect tabCloseRect(0, 0, tabHeight, tabHeight); #endif - //qDebug() << Q_FUNC_INFO << tabWdidth; QFileSelector fs; if (opt->state.testFlag(State_MouseOver)) { tabClosePixmap.load(fs.select(":/icons/config/close_tabs_hover.png")); @@ -438,7 +429,6 @@ void MiamStyle::drawPrimitive(PrimitiveElement element, const QStyleOption *opt, QTransform t; float ratio = opt->rect.width() / 4.0; - //qDebug() << "ratio" << ratio << opt->rect << opt->fontMetrics.height(); t.scale(ratio, ratio); QPolygonF arrow; diff --git a/src/player/views/viewloader.cpp b/src/player/views/viewloader.cpp index dd598be3..df3101d8 100644 --- a/src/player/views/viewloader.cpp +++ b/src/player/views/viewloader.cpp @@ -84,7 +84,6 @@ AbstractView* ViewLoader::loadFromPlugin(AbstractView *currentView, const QStrin if (dep.isEmpty()) { return view; } - qDebug() << Q_FUNC_INFO << "No built-in view was found for this action. Was it from an external plugin?"; for (BasicPlugin *plugin : _pluginManager->loadedPlugins().values()) { if (plugin->name() != menuAction) { continue; diff --git a/src/tabplaylists/filesystem/addressbar.cpp b/src/tabplaylists/filesystem/addressbar.cpp index f3391af7..83562f81 100644 --- a/src/tabplaylists/filesystem/addressbar.cpp +++ b/src/tabplaylists/filesystem/addressbar.cpp @@ -101,7 +101,6 @@ void AddressBar::paintEvent(QPaintEvent *) void AddressBar::resizeEvent(QResizeEvent *event) { - //qDebug() << Q_FUNC_INFO << event->oldSize().width() << event->size().width(); static const int arrowRectWidth = 15; static const int margin = 5; @@ -136,9 +135,7 @@ void AddressBar::resizeEvent(QResizeEvent *event) if (_hBoxLayout->count() == 3) { // Keep at least one button, and resize it to the minimum size if (button->width() > 70) { - qDebug() << Q_FUNC_INFO << "we should reduce size" << button->minimumSizeHint(); int actualTextWidth = fontMetrics().width(button->text()); - qDebug() << Q_FUNC_INFO << "text width" << actualTextWidth << button->text() << button->path(); button->setText(fontMetrics().elidedText(button->text(), Qt::ElideRight, actualTextWidth - 5)); } } else { diff --git a/src/tabplaylists/filesystem/addressbarbutton.cpp b/src/tabplaylists/filesystem/addressbarbutton.cpp index 5c52a38d..9c340725 100644 --- a/src/tabplaylists/filesystem/addressbarbutton.cpp +++ b/src/tabplaylists/filesystem/addressbarbutton.cpp @@ -235,9 +235,6 @@ void AddressBarButton::paintEvent(QPaintEvent *) QRect indicatorArrow(_arrowRect.x() + w + 1, _arrowRect.y() + h, w, h); o.rect = indicatorArrow; - //qDebug() << Q_FUNC_INFO << o.rect << _arrowRect; - //p.drawRect(o.rect); - p.setRenderHint(QPainter::Antialiasing); p.save(); diff --git a/src/tabplaylists/filesystem/addressbardirectorylist.cpp b/src/tabplaylists/filesystem/addressbardirectorylist.cpp index 58335692..c1daf740 100644 --- a/src/tabplaylists/filesystem/addressbardirectorylist.cpp +++ b/src/tabplaylists/filesystem/addressbardirectorylist.cpp @@ -39,7 +39,6 @@ void AddressBarDirectoryList::cdUp(const QString &path) void AddressBarDirectoryList::filterItems(const QString &path) { - //qDebug() << Q_FUNC_INFO << path; QDir d(path); if (_dir == d) { this->clear(); diff --git a/src/tabplaylists/filesystem/addressbarlineedit.cpp b/src/tabplaylists/filesystem/addressbarlineedit.cpp index 01195b51..8b13a4ae 100644 --- a/src/tabplaylists/filesystem/addressbarlineedit.cpp +++ b/src/tabplaylists/filesystem/addressbarlineedit.cpp @@ -45,7 +45,6 @@ void AddressBarLineEdit::focusOutEvent(QFocusEvent *e) void AddressBarLineEdit::keyPressEvent(QKeyEvent *e) { - qDebug() << Q_FUNC_INFO; switch (e->key()) { case Qt::Key_Escape:{ if (_directoryList) { @@ -57,7 +56,6 @@ void AddressBarLineEdit::keyPressEvent(QKeyEvent *e) break; case Qt::Key_Enter: case Qt::Key_Return:{ - qDebug() << Q_FUNC_INFO << "enter pressed" << this->text(); QFileInfo fileInfo(this->text()); if (fileInfo.isDir()) { if (_directoryList) { @@ -66,7 +64,6 @@ void AddressBarLineEdit::keyPressEvent(QKeyEvent *e) emit aboutToReloadAddressBar(fileInfo.absoluteFilePath()); return; } else { - qDebug() << Q_FUNC_INFO << "dir not recognized"; QMessageBox::critical(this, tr("Error"), QString(tr("Miam-Player cannot find « %1 ». Please check the name and retry.")).arg(this->text())); return; } @@ -74,7 +71,6 @@ void AddressBarLineEdit::keyPressEvent(QKeyEvent *e) break; case Qt::Key_Backspace:{ // Detect when separator was eaten - qDebug() << Q_FUNC_INFO << "About to process backspace on:" << this->text(); if (this->text().endsWith(QDir::separator())) { QLineEdit::keyPressEvent(e); if (_directoryList) { @@ -114,7 +110,6 @@ void AddressBarLineEdit::keyPressEvent(QKeyEvent *e) if (QFileInfo::exists(this->text())) { QFileInfo fileInfo(this->text()); if (fileInfo.isDir()) { - qDebug() << "separator was detected" << fileInfo.absoluteFilePath(); if (_directoryList == nullptr) { _directoryList = new AddressBarDirectoryList(fileInfo.absoluteFilePath(), parentWidget()->parentWidget()); _directoryList->show(); @@ -124,7 +119,6 @@ void AddressBarLineEdit::keyPressEvent(QKeyEvent *e) emit aboutToReloadAddressBar(item->text()); }); } else { - qDebug() << "dir list already opened, updating" << fileInfo.absoluteFilePath(); _directoryList->cd(fileInfo.absoluteFilePath()); } } diff --git a/src/tabplaylists/filesystem/filesystemtreeview.cpp b/src/tabplaylists/filesystem/filesystemtreeview.cpp index 6c48c683..dab343c4 100644 --- a/src/tabplaylists/filesystem/filesystemtreeview.cpp +++ b/src/tabplaylists/filesystem/filesystemtreeview.cpp @@ -46,7 +46,6 @@ void FileSystemTreeView::findAll(const QModelIndex &index, QList *tracks) if (fileInfo.isFile()) { files << fileInfo.absoluteFilePath(); } else { - qDebug() << Q_FUNC_INFO; QDirIterator dirIterator(fileInfo.absoluteFilePath(), QDir::AllEntries | QDir::Hidden | QDir::NoDotAndDotDot, QDirIterator::Subdirectories); while (dirIterator.hasNext()) { QString entry = dirIterator.next(); @@ -212,9 +211,7 @@ void FileSystemTreeView::reloadWithNewPath(const QDir &path) } void FileSystemTreeView::updateSelectedTracks() -{ - qDebug() << Q_FUNC_INFO << "not yet implemented"; -} +{} /** Get the folder which is the target of one's double-click. */ void FileSystemTreeView::convertIndex(const QModelIndex &index) diff --git a/src/tabplaylists/playlist.cpp b/src/tabplaylists/playlist.cpp index 932e76d6..f4d6ca84 100644 --- a/src/tabplaylists/playlist.cpp +++ b/src/tabplaylists/playlist.cpp @@ -297,7 +297,6 @@ void Playlist::dropEvent(QDropEvent *event) int c = -1; if (_mediaPlayer->state() == QMediaPlayer::PlayingState) { c = _mediaPlayer->playlist()->currentIndex(); - qDebug() << Q_FUNC_INFO << "we should also change highlighted track" << c << row; } QList rowsToHighlight = _playlistModel->internalMove(indexAt(event->pos()), selectionModel()->selectedRows()); // Highlight rows that were just moved @@ -307,13 +306,6 @@ void Playlist::dropEvent(QDropEvent *event) selectionModel()->select(index, QItemSelectionModel::Select); } } - /*if (c >= 0) { - //_playlistModel->mediaPlaylist()->removeMedia(0, 4); - - for (int i = 0; i < _playlistModel->mediaPlaylist()->mediaCount(); i++) { - - } - }*/ } else if (target && target != this) { // If the drop occurs at the end of the playlist, indexAt is invalid if (row == -1) { @@ -338,11 +330,9 @@ void Playlist::dropEvent(QDropEvent *event) } } } else if (source == cornerWidget()) { - qDebug() << Q_FUNC_INFO << "Drop on corner widget not yet implemented"; event->ignore(); return; } else if (source == nullptr) { - qDebug() << Q_FUNC_INFO << "No source, passing the drop event to parent"; event->ignore(); return; } else { diff --git a/src/tabplaylists/playlistitemdelegate.cpp b/src/tabplaylists/playlistitemdelegate.cpp index 2db46dcc..40ed4f6f 100644 --- a/src/tabplaylists/playlistitemdelegate.cpp +++ b/src/tabplaylists/playlistitemdelegate.cpp @@ -23,7 +23,6 @@ PlaylistItemDelegate::PlaylistItemDelegate(Playlist *playlist) /** Redefined. */ QWidget* PlaylistItemDelegate::createEditor(QWidget *p, const QStyleOptionViewItem &, const QModelIndex &index) const { - qDebug() << Q_FUNC_INFO; StarEditor *editor = new StarEditor(index, p); connect(editor, &StarEditor::editFinished, this, &PlaylistItemDelegate::commitAndClose); return editor; diff --git a/src/tabplaylists/playlistmodel.cpp b/src/tabplaylists/playlistmodel.cpp index b4983ebf..4785fffd 100644 --- a/src/tabplaylists/playlistmodel.cpp +++ b/src/tabplaylists/playlistmodel.cpp @@ -44,7 +44,6 @@ bool PlaylistModel::insertMedias(int rowIndex, const QList &track this->insertMedia(rowIndex++, f); } } else { - qDebug() << Q_FUNC_INFO << track.canonicalUrl(); TrackDAO t = db.selectTrackByURI(track.canonicalUrl().toString()); this->createLine(rowIndex++, t); } @@ -172,16 +171,12 @@ QList PlaylistModel::internalMove(QModelIndex dest, QModelIndexL QList> removedRows; _mediaPlaylist->blockSignals(true); int currentPlayingTrack = _mediaPlaylist->currentIndex(); - qDebug() << "currentPlayingTrack" << currentPlayingTrack; - - for (QModelIndex selectedIndex : selectedIndexes) { int rowNumber = selectedIndex.row(); QList row = this->takeRow(rowNumber); rowsToHiglight << row.at(0); removedRows.append(row); mediasToMove.prepend(_mediaPlaylist->media(rowNumber)); - qDebug() << "removing from playlist" << rowNumber << row.at(1)->text(); _mediaPlaylist->removeMedia(rowNumber); currentPlayingTrack--; } @@ -198,11 +193,8 @@ QList PlaylistModel::internalMove(QModelIndex dest, QModelIndexL // Finally, reorder the inner QMediaPlaylist _mediaPlaylist->insertMedia(insertPoint, mediasToMove); currentPlayingTrack += mediasToMove.size(); - _mediaPlaylist->blockSignals(false); - - qDebug() << "currentPlayingTrack" << _mediaPlaylist->currentIndex() << currentPlayingTrack; - - return rowsToHiglight; + _mediaPlaylist->blockSignals(false); + return rowsToHiglight; } void PlaylistModel::insertRow(int row, const QList &items) diff --git a/src/tabplaylists/tabbar.cpp b/src/tabplaylists/tabbar.cpp index 8343aa26..394e6035 100644 --- a/src/tabplaylists/tabbar.cpp +++ b/src/tabplaylists/tabbar.cpp @@ -385,7 +385,6 @@ void TabBar::paintRoundedTabs(QStylePainter &p) int pm = style()->pixelMetric(QStyle::PM_TabCloseIndicatorWidth, &o, this); QRect rText(o.rect.x() + pm * 2, o.rect.y(), o.rect.width() - 2 * pm, o.rect.height()); - //qDebug() << Q_FUNC_INFO << i << rText; p.drawText(rText, Qt::AlignLeft | Qt::AlignVCenter, o.text); // Icon @@ -397,7 +396,6 @@ void TabBar::paintRoundedTabs(QStylePainter &p) int vpm = style()->pixelMetric(QStyle::PM_TabCloseIndicatorHeight); QRect iconRect = style()->subElementRect(QStyle::SE_CheckBoxContents, &o, this); - //qDebug() << Q_FUNC_INFO << iconRect; iconRect.translate(rText.right(), 0); int w = style()->pixelMetric(QStyle::PM_TabBarIconSize); iconRect.setWidth(w); @@ -408,9 +406,6 @@ void TabBar::paintRoundedTabs(QStylePainter &p) QRect r2(o.rect.x() + o.rect.width() - w - dist / 2, o.rect.y() + (o.rect.height() - w) / 2, w, w); - //qDebug() << Q_FUNC_INFO << i << o.state; - //qDebug() << Q_FUNC_INFO << i << o.state.testFlag(QStyle::State_Active) << o.state.testFlag(QStyle::State_On); - o.icon.paint(&p, r2, Qt::AlignLeft | Qt::AlignVCenter); //p.drawPixmap(r2, QPixmap(":/icons/playlistIcon")); //o.rect.setRight(iconRect.right()); diff --git a/src/tabplaylists/tabplaylist.cpp b/src/tabplaylists/tabplaylist.cpp index 29b075b7..f5a38545 100644 --- a/src/tabplaylists/tabplaylist.cpp +++ b/src/tabplaylists/tabplaylist.cpp @@ -9,6 +9,7 @@ #include "cornerwidget.h" #include +#include /** Default constructor. */ TabPlaylist::TabPlaylist(QWidget *parent) @@ -26,7 +27,6 @@ TabPlaylist::TabPlaylist(QWidget *parent) connect(this, &QTabWidget::currentChanged, this, [=](int index) { Playlist *p = playlist(index); QMediaPlaylist::PlaybackMode m = p->mediaPlaylist()->playbackMode(); - qDebug() << Q_FUNC_INFO << index << p << m; emit updatePlaybackModeButton(m); }); @@ -106,11 +106,8 @@ TabPlaylist::TabPlaylist(QWidget *parent) }); // Add the possibility to draw a custom background for every playlist - connect(loadBackground, &QAction::triggered, this, [=]() { - qDebug() << Q_FUNC_INFO << "Load background not implemented yet"; - }); - //this->setAcceptDrops(false); - + //connect(loadBackground, &QAction::triggered, this, [=]() { + //}); CornerWidget *corner = new CornerWidget(this); this->setCornerWidget(corner, Qt::TopRightCorner); connect(corner, &CornerWidget::innerButtonClicked, this, &TabPlaylist::addPlaylist); @@ -412,7 +409,6 @@ void TabPlaylist::deletePlaylist(uint playlistId) void TabPlaylist::changeCurrentPlaylistPlaybackMode(QMediaPlaylist::PlaybackMode mode) { - qDebug() << Q_FUNC_INFO << mode << this->currentPlayList(); this->currentPlayList()->mediaPlaylist()->setPlaybackMode(mode); } diff --git a/src/tabplaylists/viewplaylistsmediaplayercontrol.cpp b/src/tabplaylists/viewplaylistsmediaplayercontrol.cpp index f05d1707..acf33f85 100644 --- a/src/tabplaylists/viewplaylistsmediaplayercontrol.cpp +++ b/src/tabplaylists/viewplaylistsmediaplayercontrol.cpp @@ -18,7 +18,6 @@ bool ViewPlaylistsMediaPlayerControl::isInShuffleState() const /** Forward action to MediaPlayer. */ void ViewPlaylistsMediaPlayerControl::skipBackward() { - qDebug() << Q_FUNC_INFO << mediaPlayer(); if (mediaPlayer()) { mediaPlayer()->skipBackward(); } diff --git a/src/tageditor/tagconverter.cpp b/src/tageditor/tagconverter.cpp index 1ecb8479..f836172f 100644 --- a/src/tageditor/tagconverter.cpp +++ b/src/tageditor/tagconverter.cpp @@ -159,7 +159,6 @@ QString TagConverter::generatePattern(TagLineEdit *lineEdit) const QString substitution = ':' + QString::number(tag->column()); pattern.replace(tag->position(), tag->spaceCount(), substitution); } - qDebug() << Q_FUNC_INFO << lineEdit->text() << "pattern" << pattern; return pattern; } diff --git a/src/tageditor/taglineedit.cpp b/src/tageditor/taglineedit.cpp index 4eaf5dfa..4d3c54c3 100644 --- a/src/tageditor/taglineedit.cpp +++ b/src/tageditor/taglineedit.cpp @@ -4,7 +4,7 @@ #include #include #include -#include +#include #include @@ -131,7 +131,6 @@ void TagLineEdit::keyPressEvent(QKeyEvent *event) QString k = event->text(); int w = fontMetrics().width(k); if (event->key() == Qt::Key_Delete) { - qDebug() << Q_FUNC_INFO << "Key_Delete"; w = -w; } for (TagButton *t : _tags) { @@ -153,12 +152,10 @@ void TagLineEdit::mousePressEvent(QMouseEvent *event) if (r.x() + r.width() / 2 >= event->pos().x()) { while (r.contains(cursorRect().center()) && cursorPosition() > 0) { cursorBackward(false); - //qDebug() << "cursorBackward" << "pos" << t->position() << "spaces" << t->spaceCount(); } } else { while (r.contains(cursorRect().center()) && cursorPosition() < text().length()) { cursorForward(false); - //qDebug() << "cursorForward" << "pos" << t->position() << "spaces" << t->spaceCount(); } } break; @@ -172,7 +169,7 @@ void TagLineEdit::paintEvent(QPaintEvent *) QStylePainter p(this); // Draw frame - QStyleOptionFrameV3 frame; + QStyleOptionFrame frame; this->initStyleOption(&frame); QPalette palette = QApplication::palette(); p.setPen(palette.mid().color()); diff --git a/src/uniquelibrary/tableview.cpp b/src/uniquelibrary/tableview.cpp index 069d390e..5ab3970b 100644 --- a/src/uniquelibrary/tableview.cpp +++ b/src/uniquelibrary/tableview.cpp @@ -95,7 +95,6 @@ TableView::TableView(QWidget *parent) bool TableView::eventFilter(QObject *obj, QEvent *event) { if (event->type() == QEvent::ShowToParent) { - qDebug() << Q_FUNC_INFO << "so what?"; //QShowEvent *showEvent = static_cast(event); _artistHeader->setMinimumWidth(this->width()); } else if (event->type() == QEvent::ShortcutOverride) { diff --git a/src/uniquelibrary/uniquelibrarymediaplayercontrol.cpp b/src/uniquelibrary/uniquelibrarymediaplayercontrol.cpp index b6ec9d64..02185c50 100644 --- a/src/uniquelibrary/uniquelibrarymediaplayercontrol.cpp +++ b/src/uniquelibrary/uniquelibrarymediaplayercontrol.cpp @@ -108,7 +108,6 @@ void UniqueLibraryMediaPlayerControl::togglePlayback() void UniqueLibraryMediaPlayerControl::toggleShuffle(bool checked) { _uniqueLibrary->playbackModeButton->setChecked(checked); - qDebug() << Q_FUNC_INFO << checked; SettingsPrivate::instance()->setValue("uniqueLibraryIsInShuffleState", checked); if (!checked) { _uniqueLibrary->randomHistoryList()->clear(); diff --git a/windows/create_package_x64.bat b/windows/create_package_x64.bat index 278f4246..ed7b3fa8 100644 --- a/windows/create_package_x64.bat +++ b/windows/create_package_x64.bat @@ -1,7 +1,7 @@ @echo off rem core -set MiamPlayerBuild="C:\dev\Miam-Player-build\src" +set MiamPlayerBuild="C:\dev\build-miam-player-Desktop_Qt_5_11_1_MSVC2017_64bit-Release\src" mkdir packages\org.miamplayer.core\data\ copy %MiamPlayerBuild%\acoustid\release\miam-acoustid.dll packages\org.miamplayer.core\data\ copy %MiamPlayerBuild%\core\release\miam-core.dll packages\org.miamplayer.core\data\ @@ -18,7 +18,7 @@ mkdir packages\org.qtav\data\ copy %MiamPlayerLibs%\*.dll packages\org.qtav\data\ rem qt libraries -set QTDIR="C:\Qt\Qt5.8.0\5.8\msvc2015_64" +set QTDIR="C:\Qt\5.11.1\msvc2017_64" echo f | xcopy %QTDIR%\plugins\bearer\qgenericbearer.dll packages\org.miamplayer.core\data\bearer\qgenericbearer.dll /y/s echo f | xcopy %QTDIR%\plugins\imageformats\qjpeg.dll packages\org.miamplayer.core\data\imageformats\qjpeg.dll /y/s echo f | xcopy %QTDIR%\plugins\mediaservice\qtmedia_audioengine.dll packages\org.miamplayer.core\data\mediaservice\qtmedia_audioengine.dll /y/s @@ -66,7 +66,7 @@ rem copy %QTDIR%\bin\Qt5WebEngine.dll packages\org.miamplayer.plugins.deezer\dat rem copy %QTDIR%\bin\Qt5WebEngineCore.dll packages\org.miamplayer.plugins.deezer\data\Qt5WebEngineCore.dll rem create the final package -binarycreator --offline-only -c config/config.xml -r resources/additional.qrc -p packages MiamPlayer-0.8.1.exe +binarycreator --offline-only -c config/config.xml -r resources/additional.qrc -p packages MiamPlayer-0.9.0.exe rem delete data folders rmdir packages\org.qtav\data\ /s /q diff --git a/windows/generate_human_readable_translation.bat b/windows/generate_human_readable_translation.bat index ea1cb435..697f13bf 100644 --- a/windows/generate_human_readable_translation.bat +++ b/windows/generate_human_readable_translation.bat @@ -1,2 +1,2 @@ @echo off -lupdate -tr-function-alias qsTr=qsTr config\controller.js packages\org.miamplayer.core\meta\installscript_core.js packages\org.miamplayer.core\meta\targetwidget.ui packages\org.miamplayer.core\meta\copybitcoinaddressform.ui packages\org.miamplayer.plugins\meta\package.xml packages\org.miamplayer.plugins.coverfetcher\meta\package.xml packages\org.miamplayer.plugins.miamplayershell\meta\package.xml packages\org.miamplayer.plugins.minimode\meta\package.xml packages\org.miamplayer.plugins.windowstoolbar\meta\package.xml -ts packages\org.miamplayer.core\meta\fr_fr.ts \ No newline at end of file +lupdate -tr-function-alias qsTr=qsTr config\controller.js packages\org.miamplayer.core\meta\installscript_core.js packages\org.miamplayer.core\meta\targetwidget.ui packages\org.miamplayer.core\meta\copybitcoinaddressform.ui packages\org.miamplayer.plugins\meta\package.xml packages\org.miamplayer.plugins.windowstoolbar\meta\package.xml -ts packages\org.miamplayer.core\meta\fr_fr.ts \ No newline at end of file