From ceae993d62e4282487c66a7909eb541b7d06e363 Mon Sep 17 00:00:00 2001 From: David Sansome Date: Mon, 18 Jul 2011 22:20:45 +0000 Subject: [PATCH] Add Python bindings for IconLoader and expose all protected methods in classes --- 3rdparty/pythonqt/generator/prigenerator.cpp | 2 +- .../pythonqt/generator/shellgenerator.cpp | 2 +- src/generated_cpp/CMakeLists.txt | 1 + src/generated_cpp/clementine/clementine0.cpp | 468 ++++++++++++------ src/generated_cpp/clementine/clementine0.h | 192 +++++-- src/generated_cpp/clementine/clementine1.cpp | 167 +++++++ src/generated_cpp/clementine/clementine1.h | 46 ++ .../clementine/clementine_init.cpp | 1 + src/scripting/python/bindings_includes.h | 1 + .../python/typesystem_clementine.xml | 1 + 10 files changed, 705 insertions(+), 176 deletions(-) diff --git a/3rdparty/pythonqt/generator/prigenerator.cpp b/3rdparty/pythonqt/generator/prigenerator.cpp index 7b81266ef..efc478dc4 100644 --- a/3rdparty/pythonqt/generator/prigenerator.cpp +++ b/3rdparty/pythonqt/generator/prigenerator.cpp @@ -83,7 +83,7 @@ static QString combineIncludes(const QString& text) { } QStringList includeList = includes.toList(); qSort(includeList); - result = includeList.join("\n") + result; + result = "#define protected public\n" + includeList.join("\n") + "\n#undef protected\n" + result; return result; } diff --git a/3rdparty/pythonqt/generator/shellgenerator.cpp b/3rdparty/pythonqt/generator/shellgenerator.cpp index a6948d8dd..25c3f4605 100644 --- a/3rdparty/pythonqt/generator/shellgenerator.cpp +++ b/3rdparty/pythonqt/generator/shellgenerator.cpp @@ -261,7 +261,7 @@ AbstractMetaFunctionList ShellGenerator::getFunctionsToWrap(const AbstractMetaCl | AbstractMetaClass::NotRemovedFromTargetLang | AbstractMetaClass::ClassImplements ); AbstractMetaFunctionList functions2 = meta_class->queryFunctions( - AbstractMetaClass::VirtualFunctions | AbstractMetaClass::WasVisible + AbstractMetaClass::WasVisible | AbstractMetaClass::NotRemovedFromTargetLang | AbstractMetaClass::ClassImplements ); QSet set1 = QSet::fromList(functions); diff --git a/src/generated_cpp/CMakeLists.txt b/src/generated_cpp/CMakeLists.txt index c003195e0..ecfc27b8b 100644 --- a/src/generated_cpp/CMakeLists.txt +++ b/src/generated_cpp/CMakeLists.txt @@ -7,6 +7,7 @@ include_directories( ${CMAKE_SOURCE_DIR}/src/playlist ${CMAKE_SOURCE_DIR}/src/playlistparsers ${CMAKE_SOURCE_DIR}/src/smartplaylists + ${CMAKE_SOURCE_DIR}/src/ui ${CMAKE_CURRENT_SOURCE_DIR}/clementine ${PYTHON_INCLUDE_DIRS} ) diff --git a/src/generated_cpp/clementine/clementine0.cpp b/src/generated_cpp/clementine/clementine0.cpp index 14d854506..e5d929174 100644 --- a/src/generated_cpp/clementine/clementine0.cpp +++ b/src/generated_cpp/clementine/clementine0.cpp @@ -1,4 +1,5 @@ #include "clementine0.h" +#define protected public #include #include #include @@ -56,12 +57,24 @@ #include #include #include +#undef protected + + +void PythonQtWrapper_AlbumCoverFetcherSearch::AlbumCoverFetched(AlbumCoverFetcherSearch* theWrappedObject, quint64 arg__1, const QImage& cover) +{ + ( ((PythonQtPublicPromoter_AlbumCoverFetcherSearch*)theWrappedObject)->promoted_AlbumCoverFetched(arg__1, cover)); +} void PythonQtWrapper_AlbumCoverFetcherSearch::Cancel(AlbumCoverFetcherSearch* theWrappedObject) { ( theWrappedObject->Cancel()); } +void PythonQtWrapper_AlbumCoverFetcherSearch::SearchFinished(AlbumCoverFetcherSearch* theWrappedObject, quint64 arg__1, const QList& results) +{ + ( ((PythonQtPublicPromoter_AlbumCoverFetcherSearch*)theWrappedObject)->promoted_SearchFinished(arg__1, results)); +} + void PythonQtWrapper_AlbumCoverFetcherSearch::Start(AlbumCoverFetcherSearch* theWrappedObject) { ( theWrappedObject->Start()); @@ -237,6 +250,11 @@ void PythonQtWrapper_CoverProvider::CancelSearch(CoverProvider* theWrappedObject ( ((PythonQtPublicPromoter_CoverProvider*)theWrappedObject)->promoted_CancelSearch(id)); } +void PythonQtWrapper_CoverProvider::SearchFinished(CoverProvider* theWrappedObject, int id, const QList& results) +{ + ( ((PythonQtPublicPromoter_CoverProvider*)theWrappedObject)->promoted_SearchFinished(id, results)); +} + QString PythonQtWrapper_CoverProvider::name(CoverProvider* theWrappedObject) const { return ( theWrappedObject->name()); @@ -288,11 +306,28 @@ return new PythonQtShell_Directory(); } +void PythonQtWrapper_IconLoader::static_IconLoader_Init() +{ + (IconLoader::Init()); +} + +QIcon PythonQtWrapper_IconLoader::static_IconLoader_Load(const QString& name) +{ + return (IconLoader::Load(name)); +} + + + void PythonQtWrapper_InternetModel::AddService(InternetModel* theWrappedObject, InternetService* service) { ( theWrappedObject->AddService(service)); } +void PythonQtWrapper_InternetModel::AddToPlaylist(InternetModel* theWrappedObject, QMimeData* data) +{ + ( ((PythonQtPublicPromoter_InternetModel*)theWrappedObject)->promoted_AddToPlaylist(data)); +} + bool PythonQtWrapper_InternetModel::IsPlayable(InternetModel* theWrappedObject, const QModelIndex& index) const { return ( theWrappedObject->IsPlayable(index)); @@ -328,6 +363,16 @@ void PythonQtWrapper_InternetModel::ShowContextMenu(InternetModel* theWrappedObj ( theWrappedObject->ShowContextMenu(merged_model_index, global_pos)); } +void PythonQtWrapper_InternetModel::StreamError(InternetModel* theWrappedObject, const QString& message) +{ + ( ((PythonQtPublicPromoter_InternetModel*)theWrappedObject)->promoted_StreamError(message)); +} + +void PythonQtWrapper_InternetModel::StreamMetadataFound(InternetModel* theWrappedObject, const QUrl& original_url, const Song& song) +{ + ( ((PythonQtPublicPromoter_InternetModel*)theWrappedObject)->promoted_StreamMetadataFound(original_url, song)); +} + Qt::ItemFlags PythonQtWrapper_InternetModel::flags(InternetModel* theWrappedObject, const QModelIndex& index) const { return ( ((PythonQtPublicPromoter_InternetModel*)theWrappedObject)->promoted_flags(index)); @@ -669,6 +714,41 @@ InternetService* PythonQtWrapper_InternetService::new_InternetService(const QStr { return new PythonQtShell_InternetService(name, model, parent); } +void PythonQtWrapper_InternetService::AddItemToPlaylist(InternetService* theWrappedObject, const QModelIndex& index, InternetService::AddMode add_mode) +{ + ( ((PythonQtPublicPromoter_InternetService*)theWrappedObject)->promoted_AddItemToPlaylist(index, add_mode)); +} + +void PythonQtWrapper_InternetService::AddItemsToPlaylist(InternetService* theWrappedObject, const QList& indexes, InternetService::AddMode add_mode) +{ + ( ((PythonQtPublicPromoter_InternetService*)theWrappedObject)->promoted_AddItemsToPlaylist(indexes, add_mode)); +} + +void PythonQtWrapper_InternetService::AddToPlaylistSignal(InternetService* theWrappedObject, QMimeData* data) +{ + ( ((PythonQtPublicPromoter_InternetService*)theWrappedObject)->promoted_AddToPlaylistSignal(data)); +} + +QAction* PythonQtWrapper_InternetService::GetAppendToPlaylistAction(InternetService* theWrappedObject) +{ + return ( ((PythonQtPublicPromoter_InternetService*)theWrappedObject)->promoted_GetAppendToPlaylistAction()); +} + +QAction* PythonQtWrapper_InternetService::GetOpenInNewPlaylistAction(InternetService* theWrappedObject) +{ + return ( ((PythonQtPublicPromoter_InternetService*)theWrappedObject)->promoted_GetOpenInNewPlaylistAction()); +} + +QList PythonQtWrapper_InternetService::GetPlaylistActions(InternetService* theWrappedObject) +{ + return ( ((PythonQtPublicPromoter_InternetService*)theWrappedObject)->promoted_GetPlaylistActions()); +} + +QAction* PythonQtWrapper_InternetService::GetReplacePlaylistAction(InternetService* theWrappedObject) +{ + return ( ((PythonQtPublicPromoter_InternetService*)theWrappedObject)->promoted_GetReplacePlaylistAction()); +} + QWidget* PythonQtWrapper_InternetService::HeaderWidget(InternetService* theWrappedObject) const { return ( ((PythonQtPublicPromoter_InternetService*)theWrappedObject)->promoted_HeaderWidget()); @@ -694,6 +774,16 @@ void PythonQtWrapper_InternetService::ShowContextMenu(InternetService* theWrappe ( ((PythonQtPublicPromoter_InternetService*)theWrappedObject)->promoted_ShowContextMenu(index, global_pos)); } +void PythonQtWrapper_InternetService::StreamError(InternetService* theWrappedObject, const QString& message) +{ + ( ((PythonQtPublicPromoter_InternetService*)theWrappedObject)->promoted_StreamError(message)); +} + +void PythonQtWrapper_InternetService::StreamMetadataFound(InternetService* theWrappedObject, const QUrl& original_url, const Song& song) +{ + ( ((PythonQtPublicPromoter_InternetService*)theWrappedObject)->promoted_StreamMetadataFound(original_url, song)); +} + InternetModel* PythonQtWrapper_InternetService::model(InternetService* theWrappedObject) const { return ( theWrappedObject->model()); @@ -1404,11 +1494,26 @@ void PythonQtWrapper_LibraryBackend::ChangeDirPath(LibraryBackend* theWrappedObj ( ((PythonQtPublicPromoter_LibraryBackend*)theWrappedObject)->promoted_ChangeDirPath(id, old_path, new_path)); } +void PythonQtWrapper_LibraryBackend::DatabaseReset(LibraryBackend* theWrappedObject) +{ + ( ((PythonQtPublicPromoter_LibraryBackend*)theWrappedObject)->promoted_DatabaseReset()); +} + void PythonQtWrapper_LibraryBackend::DeleteAll(LibraryBackend* theWrappedObject) { ( theWrappedObject->DeleteAll()); } +void PythonQtWrapper_LibraryBackend::DirectoryDeleted(LibraryBackend* theWrappedObject, const Directory& dir) +{ + ( ((PythonQtPublicPromoter_LibraryBackend*)theWrappedObject)->promoted_DirectoryDeleted(dir)); +} + +void PythonQtWrapper_LibraryBackend::DirectoryDiscovered(LibraryBackend* theWrappedObject, const Directory& dir, const QList& subdirs) +{ + ( ((PythonQtPublicPromoter_LibraryBackend*)theWrappedObject)->promoted_DirectoryDiscovered(dir, subdirs)); +} + bool PythonQtWrapper_LibraryBackend::ExecQuery(LibraryBackend* theWrappedObject, LibraryQuery* q) { return ( ((PythonQtPublicPromoter_LibraryBackend*)theWrappedObject)->promoted_ExecQuery(q)); @@ -1529,11 +1634,31 @@ void PythonQtWrapper_LibraryBackend::ResetStatisticsAsync(LibraryBackend* theWra ( theWrappedObject->ResetStatisticsAsync(id)); } +void PythonQtWrapper_LibraryBackend::SongsDeleted(LibraryBackend* theWrappedObject, const QList& songs) +{ + ( ((PythonQtPublicPromoter_LibraryBackend*)theWrappedObject)->promoted_SongsDeleted(songs)); +} + +void PythonQtWrapper_LibraryBackend::SongsDiscovered(LibraryBackend* theWrappedObject, const QList& songs) +{ + ( ((PythonQtPublicPromoter_LibraryBackend*)theWrappedObject)->promoted_SongsDiscovered(songs)); +} + +void PythonQtWrapper_LibraryBackend::SongsStatisticsChanged(LibraryBackend* theWrappedObject, const QList& songs) +{ + ( ((PythonQtPublicPromoter_LibraryBackend*)theWrappedObject)->promoted_SongsStatisticsChanged(songs)); +} + QList PythonQtWrapper_LibraryBackend::SubdirsInDirectory(LibraryBackend* theWrappedObject, int id) { return ( ((PythonQtPublicPromoter_LibraryBackend*)theWrappedObject)->promoted_SubdirsInDirectory(id)); } +void PythonQtWrapper_LibraryBackend::TotalSongCountUpdated(LibraryBackend* theWrappedObject, int total) +{ + ( ((PythonQtPublicPromoter_LibraryBackend*)theWrappedObject)->promoted_TotalSongCountUpdated(total)); +} + void PythonQtWrapper_LibraryBackend::UpdateManualAlbumArtAsync(LibraryBackend* theWrappedObject, const QString& artist, const QString& album, const QString& art) { ( ((PythonQtPublicPromoter_LibraryBackend*)theWrappedObject)->promoted_UpdateManualAlbumArtAsync(artist, album, art)); @@ -2326,11 +2451,31 @@ void PythonQtWrapper_LibraryView::SetTaskManager(LibraryView* theWrappedObject, ( theWrappedObject->SetTaskManager(task_manager)); } +void PythonQtWrapper_LibraryView::ShowConfigDialog(LibraryView* theWrappedObject) +{ + ( ((PythonQtPublicPromoter_LibraryView*)theWrappedObject)->promoted_ShowConfigDialog()); +} + +void PythonQtWrapper_LibraryView::contextMenuEvent(LibraryView* theWrappedObject, QContextMenuEvent* e) +{ + ( ((PythonQtPublicPromoter_LibraryView*)theWrappedObject)->promoted_contextMenuEvent(e)); +} + void PythonQtWrapper_LibraryView::keyboardSearch(LibraryView* theWrappedObject, const QString& search) { ( theWrappedObject->keyboardSearch(search)); } +void PythonQtWrapper_LibraryView::mouseReleaseEvent(LibraryView* theWrappedObject, QMouseEvent* e) +{ + ( ((PythonQtPublicPromoter_LibraryView*)theWrappedObject)->promoted_mouseReleaseEvent(e)); +} + +void PythonQtWrapper_LibraryView::paintEvent(LibraryView* theWrappedObject, QPaintEvent* event) +{ + ( ((PythonQtPublicPromoter_LibraryView*)theWrappedObject)->promoted_paintEvent(event)); +} + void PythonQtWrapper_LibraryView::scrollTo(LibraryView* theWrappedObject, const QModelIndex& index, QAbstractItemView::ScrollHint hint) { ( theWrappedObject->scrollTo(index, hint)); @@ -3929,6 +4074,56 @@ PlayerInterface* PythonQtWrapper_PlayerInterface::new_PlayerInterface(QObject* { return new PythonQtShell_PlayerInterface(parent); } +void PythonQtWrapper_PlayerInterface::Error(PlayerInterface* theWrappedObject, const QString& message) +{ + ( ((PythonQtPublicPromoter_PlayerInterface*)theWrappedObject)->promoted_Error(message)); +} + +void PythonQtWrapper_PlayerInterface::ForceShowOSD(PlayerInterface* theWrappedObject, Song arg__1, bool toogle) +{ + ( ((PythonQtPublicPromoter_PlayerInterface*)theWrappedObject)->promoted_ForceShowOSD(arg__1, toogle)); +} + +void PythonQtWrapper_PlayerInterface::Paused(PlayerInterface* theWrappedObject) +{ + ( ((PythonQtPublicPromoter_PlayerInterface*)theWrappedObject)->promoted_Paused()); +} + +void PythonQtWrapper_PlayerInterface::Playing(PlayerInterface* theWrappedObject) +{ + ( ((PythonQtPublicPromoter_PlayerInterface*)theWrappedObject)->promoted_Playing()); +} + +void PythonQtWrapper_PlayerInterface::PlaylistFinished(PlayerInterface* theWrappedObject) +{ + ( ((PythonQtPublicPromoter_PlayerInterface*)theWrappedObject)->promoted_PlaylistFinished()); +} + +void PythonQtWrapper_PlayerInterface::Seeked(PlayerInterface* theWrappedObject, qlonglong microseconds) +{ + ( ((PythonQtPublicPromoter_PlayerInterface*)theWrappedObject)->promoted_Seeked(microseconds)); +} + +void PythonQtWrapper_PlayerInterface::SongChangeRequestProcessed(PlayerInterface* theWrappedObject, const QUrl& url, bool valid) +{ + ( ((PythonQtPublicPromoter_PlayerInterface*)theWrappedObject)->promoted_SongChangeRequestProcessed(url, valid)); +} + +void PythonQtWrapper_PlayerInterface::Stopped(PlayerInterface* theWrappedObject) +{ + ( ((PythonQtPublicPromoter_PlayerInterface*)theWrappedObject)->promoted_Stopped()); +} + +void PythonQtWrapper_PlayerInterface::TrackSkipped(PlayerInterface* theWrappedObject, PlaylistItemPtr old_track) +{ + ( ((PythonQtPublicPromoter_PlayerInterface*)theWrappedObject)->promoted_TrackSkipped(old_track)); +} + +void PythonQtWrapper_PlayerInterface::VolumeChanged(PlayerInterface* theWrappedObject, int volume) +{ + ( ((PythonQtPublicPromoter_PlayerInterface*)theWrappedObject)->promoted_VolumeChanged(volume)); +} + QModelIndex PythonQtShell_Playlist::buddy(const QModelIndex& index) const @@ -4783,6 +4978,21 @@ bool PythonQtWrapper_Playlist::static_Playlist_CompareItems(int column, Qt::So return (Playlist::CompareItems(column, order, a, b)); } +void PythonQtWrapper_Playlist::CurrentSongChanged(Playlist* theWrappedObject, const Song& metadata) +{ + ( ((PythonQtPublicPromoter_Playlist*)theWrappedObject)->promoted_CurrentSongChanged(metadata)); +} + +void PythonQtWrapper_Playlist::DynamicModeChanged(Playlist* theWrappedObject, bool dynamic) +{ + ( ((PythonQtPublicPromoter_Playlist*)theWrappedObject)->promoted_DynamicModeChanged(dynamic)); +} + +void PythonQtWrapper_Playlist::EditingFinished(Playlist* theWrappedObject, const QModelIndex& index) +{ + ( ((PythonQtPublicPromoter_Playlist*)theWrappedObject)->promoted_EditingFinished(index)); +} + QList PythonQtWrapper_Playlist::GetAllItems(Playlist* theWrappedObject) const { return ( theWrappedObject->GetAllItems()); @@ -4833,6 +5043,21 @@ void PythonQtWrapper_Playlist::InvalidateDeletedSongs(Playlist* theWrappedObject ( theWrappedObject->InvalidateDeletedSongs()); } +void PythonQtWrapper_Playlist::LoadTracksError(Playlist* theWrappedObject, const QString& message) +{ + ( ((PythonQtPublicPromoter_Playlist*)theWrappedObject)->promoted_LoadTracksError(message)); +} + +void PythonQtWrapper_Playlist::PlayRequested(Playlist* theWrappedObject, const QModelIndex& index) +{ + ( ((PythonQtPublicPromoter_Playlist*)theWrappedObject)->promoted_PlayRequested(index)); +} + +void PythonQtWrapper_Playlist::PlaylistChanged(Playlist* theWrappedObject) +{ + ( ((PythonQtPublicPromoter_Playlist*)theWrappedObject)->promoted_PlaylistChanged()); +} + void PythonQtWrapper_Playlist::RateSong(Playlist* theWrappedObject, const QModelIndex& index, double rating) { ( theWrappedObject->RateSong(index, rating)); @@ -4863,6 +5088,11 @@ void PythonQtWrapper_Playlist::Restore(Playlist* theWrappedObject) ( theWrappedObject->Restore()); } +void PythonQtWrapper_Playlist::RestoreFinished(Playlist* theWrappedObject) +{ + ( ((PythonQtPublicPromoter_Playlist*)theWrappedObject)->promoted_RestoreFinished()); +} + void PythonQtWrapper_Playlist::Save(Playlist* theWrappedObject) const { ( theWrappedObject->Save()); @@ -6087,6 +6317,16 @@ PlaylistContainer* PythonQtWrapper_PlaylistContainer::new_PlaylistContainer(QWid { return new PythonQtShell_PlaylistContainer(parent); } +void PythonQtWrapper_PlaylistContainer::Remove(PlaylistContainer* theWrappedObject, int id) +{ + ( ((PythonQtPublicPromoter_PlaylistContainer*)theWrappedObject)->promoted_Remove(id)); +} + +void PythonQtWrapper_PlaylistContainer::Rename(PlaylistContainer* theWrappedObject, int id, const QString& new_name) +{ + ( ((PythonQtPublicPromoter_PlaylistContainer*)theWrappedObject)->promoted_Rename(id, new_name)); +} + void PythonQtWrapper_PlaylistContainer::SetActions(PlaylistContainer* theWrappedObject, QAction* new_playlist, QAction* save_playlist, QAction* load_playlist, QAction* next_playlist, QAction* previous_playlist) { ( theWrappedObject->SetActions(new_playlist, save_playlist, load_playlist, next_playlist, previous_playlist)); @@ -6097,6 +6337,21 @@ void PythonQtWrapper_PlaylistContainer::SetManager(PlaylistContainer* theWrapped ( theWrappedObject->SetManager(manager)); } +void PythonQtWrapper_PlaylistContainer::TabChanged(PlaylistContainer* theWrappedObject, int id) +{ + ( ((PythonQtPublicPromoter_PlaylistContainer*)theWrappedObject)->promoted_TabChanged(id)); +} + +void PythonQtWrapper_PlaylistContainer::UndoRedoActionsChanged(PlaylistContainer* theWrappedObject, QAction* undo, QAction* redo) +{ + ( ((PythonQtPublicPromoter_PlaylistContainer*)theWrappedObject)->promoted_UndoRedoActionsChanged(undo, redo)); +} + +void PythonQtWrapper_PlaylistContainer::ViewSelectionModelChanged(PlaylistContainer* theWrappedObject) +{ + ( ((PythonQtPublicPromoter_PlaylistContainer*)theWrappedObject)->promoted_ViewSelectionModelChanged()); +} + void PythonQtWrapper_PlaylistContainer::resizeEvent(PlaylistContainer* theWrappedObject, QResizeEvent* arg__1) { ( ((PythonQtPublicPromoter_PlaylistContainer*)theWrappedObject)->promoted_resizeEvent(arg__1)); @@ -8309,6 +8564,66 @@ PlaylistManagerInterface* PythonQtWrapper_PlaylistManagerInterface::new_Playlist { return new PythonQtShell_PlaylistManagerInterface(parent); } +void PythonQtWrapper_PlaylistManagerInterface::ActiveChanged(PlaylistManagerInterface* theWrappedObject, Playlist* new_playlist) +{ + ( ((PythonQtPublicPromoter_PlaylistManagerInterface*)theWrappedObject)->promoted_ActiveChanged(new_playlist)); +} + +void PythonQtWrapper_PlaylistManagerInterface::CurrentChanged(PlaylistManagerInterface* theWrappedObject, Playlist* new_playlist) +{ + ( ((PythonQtPublicPromoter_PlaylistManagerInterface*)theWrappedObject)->promoted_CurrentChanged(new_playlist)); +} + +void PythonQtWrapper_PlaylistManagerInterface::CurrentSongChanged(PlaylistManagerInterface* theWrappedObject, const Song& song) +{ + ( ((PythonQtPublicPromoter_PlaylistManagerInterface*)theWrappedObject)->promoted_CurrentSongChanged(song)); +} + +void PythonQtWrapper_PlaylistManagerInterface::EditingFinished(PlaylistManagerInterface* theWrappedObject, const QModelIndex& index) +{ + ( ((PythonQtPublicPromoter_PlaylistManagerInterface*)theWrappedObject)->promoted_EditingFinished(index)); +} + +void PythonQtWrapper_PlaylistManagerInterface::Error(PlaylistManagerInterface* theWrappedObject, const QString& message) +{ + ( ((PythonQtPublicPromoter_PlaylistManagerInterface*)theWrappedObject)->promoted_Error(message)); +} + +void PythonQtWrapper_PlaylistManagerInterface::PlayRequested(PlaylistManagerInterface* theWrappedObject, const QModelIndex& index) +{ + ( ((PythonQtPublicPromoter_PlaylistManagerInterface*)theWrappedObject)->promoted_PlayRequested(index)); +} + +void PythonQtWrapper_PlaylistManagerInterface::PlaylistAdded(PlaylistManagerInterface* theWrappedObject, int id, const QString& name) +{ + ( ((PythonQtPublicPromoter_PlaylistManagerInterface*)theWrappedObject)->promoted_PlaylistAdded(id, name)); +} + +void PythonQtWrapper_PlaylistManagerInterface::PlaylistChanged(PlaylistManagerInterface* theWrappedObject, Playlist* playlist) +{ + ( ((PythonQtPublicPromoter_PlaylistManagerInterface*)theWrappedObject)->promoted_PlaylistChanged(playlist)); +} + +void PythonQtWrapper_PlaylistManagerInterface::PlaylistManagerInitialized(PlaylistManagerInterface* theWrappedObject) +{ + ( ((PythonQtPublicPromoter_PlaylistManagerInterface*)theWrappedObject)->promoted_PlaylistManagerInitialized()); +} + +void PythonQtWrapper_PlaylistManagerInterface::PlaylistRemoved(PlaylistManagerInterface* theWrappedObject, int id) +{ + ( ((PythonQtPublicPromoter_PlaylistManagerInterface*)theWrappedObject)->promoted_PlaylistRemoved(id)); +} + +void PythonQtWrapper_PlaylistManagerInterface::PlaylistRenamed(PlaylistManagerInterface* theWrappedObject, int id, const QString& new_name) +{ + ( ((PythonQtPublicPromoter_PlaylistManagerInterface*)theWrappedObject)->promoted_PlaylistRenamed(id, new_name)); +} + +void PythonQtWrapper_PlaylistManagerInterface::SummaryTextChanged(PlaylistManagerInterface* theWrappedObject, const QString& summary) +{ + ( ((PythonQtPublicPromoter_PlaylistManagerInterface*)theWrappedObject)->promoted_SummaryTextChanged(summary)); +} + void PythonQtShell_PlaylistParser::childEvent(QChildEvent* arg__1) @@ -8464,6 +8779,16 @@ QString PythonQtWrapper_PlaylistParser::filters(PlaylistParser* theWrappedObjec +void PythonQtWrapper_PlaylistSequence::RepeatModeChanged(PlaylistSequence* theWrappedObject, PlaylistSequence::RepeatMode mode) +{ + ( ((PythonQtPublicPromoter_PlaylistSequence*)theWrappedObject)->promoted_RepeatModeChanged(mode)); +} + +void PythonQtWrapper_PlaylistSequence::ShuffleModeChanged(PlaylistSequence* theWrappedObject, PlaylistSequence::ShuffleMode mode) +{ + ( ((PythonQtPublicPromoter_PlaylistSequence*)theWrappedObject)->promoted_ShuffleModeChanged(mode)); +} + QMenu* PythonQtWrapper_PlaylistSequence::repeat_menu(PlaylistSequence* theWrappedObject) const { return ( theWrappedObject->repeat_menu()); @@ -9421,146 +9746,3 @@ Subdirectory* PythonQtWrapper_Subdirectory::new_Subdirectory() return new PythonQtShell_Subdirectory(); } - -void PythonQtShell_TaskManager::childEvent(QChildEvent* arg__1) -{ -if (_wrapper) { - PyObject* obj = PyObject_GetAttrString((PyObject*)_wrapper, "childEvent"); - PyErr_Clear(); - if (obj && !PythonQtSlotFunction_Check(obj)) { - static const char* argumentList[] ={"" , "QChildEvent*"}; - static const PythonQtMethodInfo* methodInfo = PythonQtMethodInfo::getCachedMethodInfoFromArgumentList(2, argumentList); - void* args[2] = {NULL, (void*)&arg__1}; - PyObject* result = PythonQtSignalTarget::call(obj, methodInfo, args, true); - if (result) { Py_DECREF(result); } - Py_DECREF(obj); - return; - } - Py_XDECREF(obj); -} - TaskManager::childEvent(arg__1); -} -void PythonQtShell_TaskManager::customEvent(QEvent* arg__1) -{ -if (_wrapper) { - PyObject* obj = PyObject_GetAttrString((PyObject*)_wrapper, "customEvent"); - PyErr_Clear(); - if (obj && !PythonQtSlotFunction_Check(obj)) { - static const char* argumentList[] ={"" , "QEvent*"}; - static const PythonQtMethodInfo* methodInfo = PythonQtMethodInfo::getCachedMethodInfoFromArgumentList(2, argumentList); - void* args[2] = {NULL, (void*)&arg__1}; - PyObject* result = PythonQtSignalTarget::call(obj, methodInfo, args, true); - if (result) { Py_DECREF(result); } - Py_DECREF(obj); - return; - } - Py_XDECREF(obj); -} - TaskManager::customEvent(arg__1); -} -bool PythonQtShell_TaskManager::event(QEvent* arg__1) -{ -if (_wrapper) { - PyObject* obj = PyObject_GetAttrString((PyObject*)_wrapper, "event"); - PyErr_Clear(); - if (obj && !PythonQtSlotFunction_Check(obj)) { - static const char* argumentList[] ={"bool" , "QEvent*"}; - static const PythonQtMethodInfo* methodInfo = PythonQtMethodInfo::getCachedMethodInfoFromArgumentList(2, argumentList); - bool returnValue = 0; - void* args[2] = {NULL, (void*)&arg__1}; - PyObject* result = PythonQtSignalTarget::call(obj, methodInfo, args, true); - if (result) { - args[0] = PythonQtConv::ConvertPythonToQt(methodInfo->parameters().at(0), result, false, NULL, &returnValue); - if (args[0]!=&returnValue) { - if (args[0]==NULL) { - PythonQt::priv()->handleVirtualOverloadReturnError("event", methodInfo, result); - } else { - returnValue = *((bool*)args[0]); - } - } - } - if (result) { Py_DECREF(result); } - Py_DECREF(obj); - return returnValue; - } - Py_XDECREF(obj); -} - return TaskManager::event(arg__1); -} -bool PythonQtShell_TaskManager::eventFilter(QObject* arg__1, QEvent* arg__2) -{ -if (_wrapper) { - PyObject* obj = PyObject_GetAttrString((PyObject*)_wrapper, "eventFilter"); - PyErr_Clear(); - if (obj && !PythonQtSlotFunction_Check(obj)) { - static const char* argumentList[] ={"bool" , "QObject*" , "QEvent*"}; - static const PythonQtMethodInfo* methodInfo = PythonQtMethodInfo::getCachedMethodInfoFromArgumentList(3, argumentList); - bool returnValue = 0; - void* args[3] = {NULL, (void*)&arg__1, (void*)&arg__2}; - PyObject* result = PythonQtSignalTarget::call(obj, methodInfo, args, true); - if (result) { - args[0] = PythonQtConv::ConvertPythonToQt(methodInfo->parameters().at(0), result, false, NULL, &returnValue); - if (args[0]!=&returnValue) { - if (args[0]==NULL) { - PythonQt::priv()->handleVirtualOverloadReturnError("eventFilter", methodInfo, result); - } else { - returnValue = *((bool*)args[0]); - } - } - } - if (result) { Py_DECREF(result); } - Py_DECREF(obj); - return returnValue; - } - Py_XDECREF(obj); -} - return TaskManager::eventFilter(arg__1, arg__2); -} -void PythonQtShell_TaskManager::timerEvent(QTimerEvent* arg__1) -{ -if (_wrapper) { - PyObject* obj = PyObject_GetAttrString((PyObject*)_wrapper, "timerEvent"); - PyErr_Clear(); - if (obj && !PythonQtSlotFunction_Check(obj)) { - static const char* argumentList[] ={"" , "QTimerEvent*"}; - static const PythonQtMethodInfo* methodInfo = PythonQtMethodInfo::getCachedMethodInfoFromArgumentList(2, argumentList); - void* args[2] = {NULL, (void*)&arg__1}; - PyObject* result = PythonQtSignalTarget::call(obj, methodInfo, args, true); - if (result) { Py_DECREF(result); } - Py_DECREF(obj); - return; - } - Py_XDECREF(obj); -} - TaskManager::timerEvent(arg__1); -} -TaskManager* PythonQtWrapper_TaskManager::new_TaskManager(QObject* parent) -{ -return new PythonQtShell_TaskManager(parent); } - -QList PythonQtWrapper_TaskManager::GetTasks(TaskManager* theWrappedObject) -{ - return ( theWrappedObject->GetTasks()); -} - -void PythonQtWrapper_TaskManager::SetTaskBlocksLibraryScans(TaskManager* theWrappedObject, int id) -{ - ( theWrappedObject->SetTaskBlocksLibraryScans(id)); -} - -void PythonQtWrapper_TaskManager::SetTaskFinished(TaskManager* theWrappedObject, int id) -{ - ( theWrappedObject->SetTaskFinished(id)); -} - -void PythonQtWrapper_TaskManager::SetTaskProgress(TaskManager* theWrappedObject, int id, int progress, int max) -{ - ( theWrappedObject->SetTaskProgress(id, progress, max)); -} - -int PythonQtWrapper_TaskManager::StartTask(TaskManager* theWrappedObject, const QString& name) -{ - return ( theWrappedObject->StartTask(name)); -} - - diff --git a/src/generated_cpp/clementine/clementine0.h b/src/generated_cpp/clementine/clementine0.h index 44b564ef6..4d5fa7b2d 100644 --- a/src/generated_cpp/clementine/clementine0.h +++ b/src/generated_cpp/clementine/clementine0.h @@ -1,3 +1,4 @@ +#define protected public #include #include #include @@ -6,6 +7,7 @@ #include #include #include +#include #include #include #include @@ -57,15 +59,25 @@ #include #include #include +#undef protected + +class PythonQtPublicPromoter_AlbumCoverFetcherSearch : public AlbumCoverFetcherSearch +{ public: +inline void promoted_AlbumCoverFetched(quint64 arg__1, const QImage& cover) { AlbumCoverFetcherSearch::AlbumCoverFetched(arg__1, cover); } +inline void promoted_SearchFinished(quint64 arg__1, const QList& results) { AlbumCoverFetcherSearch::SearchFinished(arg__1, results); } +}; + class PythonQtWrapper_AlbumCoverFetcherSearch : public QObject { Q_OBJECT public: public slots: void delete_AlbumCoverFetcherSearch(AlbumCoverFetcherSearch* obj) { delete obj; } + void AlbumCoverFetched(AlbumCoverFetcherSearch* theWrappedObject, quint64 arg__1, const QImage& cover); void Cancel(AlbumCoverFetcherSearch* theWrappedObject); + void SearchFinished(AlbumCoverFetcherSearch* theWrappedObject, quint64 arg__1, const QList& results); void Start(AlbumCoverFetcherSearch* theWrappedObject); }; @@ -92,6 +104,7 @@ virtual void timerEvent(QTimerEvent* arg__1); class PythonQtPublicPromoter_CoverProvider : public CoverProvider { public: inline void promoted_CancelSearch(int id) { CoverProvider::CancelSearch(id); } +inline void promoted_SearchFinished(int id, const QList& results) { CoverProvider::SearchFinished(id, results); } }; class PythonQtWrapper_CoverProvider : public QObject @@ -101,6 +114,7 @@ public slots: CoverProvider* new_CoverProvider(const QString& name, QObject* parent); void delete_CoverProvider(CoverProvider* obj) { delete obj; } void CancelSearch(CoverProvider* theWrappedObject, int id); + void SearchFinished(CoverProvider* theWrappedObject, int id, const QList& results); QString name(CoverProvider* theWrappedObject) const; }; @@ -184,8 +198,24 @@ int py_get_id(Directory* theWrappedObject){ return theWrappedObject->id; } +class PythonQtWrapper_IconLoader : public QObject +{ Q_OBJECT +public: +public slots: +void delete_IconLoader(IconLoader* obj) { delete obj; } + void static_IconLoader_Init(); + QIcon static_IconLoader_Load(const QString& name); +}; + + + + + class PythonQtPublicPromoter_InternetModel : public InternetModel { public: +inline void promoted_AddToPlaylist(QMimeData* data) { InternetModel::AddToPlaylist(data); } +inline void promoted_StreamError(const QString& message) { InternetModel::StreamError(message); } +inline void promoted_StreamMetadataFound(const QUrl& original_url, const Song& song) { InternetModel::StreamMetadataFound(original_url, song); } inline Qt::ItemFlags promoted_flags(const QModelIndex& index) const { return InternetModel::flags(index); } inline bool promoted_hasChildren(const QModelIndex& parent) const { return InternetModel::hasChildren(parent); } inline QMimeData* promoted_mimeData(const QList& indexes) const { return InternetModel::mimeData(indexes); } @@ -206,6 +236,7 @@ enum Type{ public slots: void delete_InternetModel(InternetModel* obj) { delete obj; } void AddService(InternetModel* theWrappedObject, InternetService* service); + void AddToPlaylist(InternetModel* theWrappedObject, QMimeData* data); bool IsPlayable(InternetModel* theWrappedObject, const QModelIndex& index) const; void ReloadSettings(InternetModel* theWrappedObject); void RemoveService(InternetModel* theWrappedObject, InternetService* service); @@ -213,6 +244,8 @@ void delete_InternetModel(InternetModel* obj) { delete obj; } InternetService* ServiceForIndex(InternetModel* theWrappedObject, const QModelIndex& index) const; InternetService* ServiceForItem(InternetModel* theWrappedObject, const QStandardItem* item) const; void ShowContextMenu(InternetModel* theWrappedObject, const QModelIndex& merged_model_index, const QPoint& global_pos); + void StreamError(InternetModel* theWrappedObject, const QString& message); + void StreamMetadataFound(InternetModel* theWrappedObject, const QUrl& original_url, const Song& song); Qt::ItemFlags flags(InternetModel* theWrappedObject, const QModelIndex& index) const; bool hasChildren(InternetModel* theWrappedObject, const QModelIndex& parent) const; QMimeData* mimeData(InternetModel* theWrappedObject, const QList& indexes) const; @@ -250,11 +283,20 @@ virtual void timerEvent(QTimerEvent* arg__1); class PythonQtPublicPromoter_InternetService : public InternetService { public: +inline void promoted_AddItemToPlaylist(const QModelIndex& index, InternetService::AddMode add_mode) { InternetService::AddItemToPlaylist(index, add_mode); } +inline void promoted_AddItemsToPlaylist(const QList& indexes, InternetService::AddMode add_mode) { InternetService::AddItemsToPlaylist(indexes, add_mode); } +inline void promoted_AddToPlaylistSignal(QMimeData* data) { InternetService::AddToPlaylistSignal(data); } +inline QAction* promoted_GetAppendToPlaylistAction() { return InternetService::GetAppendToPlaylistAction(); } +inline QAction* promoted_GetOpenInNewPlaylistAction() { return InternetService::GetOpenInNewPlaylistAction(); } +inline QList promoted_GetPlaylistActions() { return InternetService::GetPlaylistActions(); } +inline QAction* promoted_GetReplacePlaylistAction() { return InternetService::GetReplacePlaylistAction(); } inline QWidget* promoted_HeaderWidget() const { return InternetService::HeaderWidget(); } inline QString promoted_Icon() { return InternetService::Icon(); } inline void promoted_ItemDoubleClicked(QStandardItem* item) { InternetService::ItemDoubleClicked(item); } inline void promoted_ReloadSettings() { InternetService::ReloadSettings(); } inline void promoted_ShowContextMenu(const QModelIndex& index, const QPoint& global_pos) { InternetService::ShowContextMenu(index, global_pos); } +inline void promoted_StreamError(const QString& message) { InternetService::StreamError(message); } +inline void promoted_StreamMetadataFound(const QUrl& original_url, const Song& song) { InternetService::StreamMetadataFound(original_url, song); } }; class PythonQtWrapper_InternetService : public QObject @@ -263,11 +305,20 @@ public: public slots: InternetService* new_InternetService(const QString& name, InternetModel* model, QObject* parent = NULL); void delete_InternetService(InternetService* obj) { delete obj; } + void AddItemToPlaylist(InternetService* theWrappedObject, const QModelIndex& index, InternetService::AddMode add_mode); + void AddItemsToPlaylist(InternetService* theWrappedObject, const QList& indexes, InternetService::AddMode add_mode); + void AddToPlaylistSignal(InternetService* theWrappedObject, QMimeData* data); + QAction* GetAppendToPlaylistAction(InternetService* theWrappedObject); + QAction* GetOpenInNewPlaylistAction(InternetService* theWrappedObject); + QList GetPlaylistActions(InternetService* theWrappedObject); + QAction* GetReplacePlaylistAction(InternetService* theWrappedObject); QWidget* HeaderWidget(InternetService* theWrappedObject) const; QString Icon(InternetService* theWrappedObject); void ItemDoubleClicked(InternetService* theWrappedObject, QStandardItem* item); void ReloadSettings(InternetService* theWrappedObject); void ShowContextMenu(InternetService* theWrappedObject, const QModelIndex& index, const QPoint& global_pos); + void StreamError(InternetService* theWrappedObject, const QString& message); + void StreamMetadataFound(InternetService* theWrappedObject, const QUrl& original_url, const Song& song); InternetModel* model(InternetService* theWrappedObject) const; QString name(InternetService* theWrappedObject) const; }; @@ -316,6 +367,9 @@ class PythonQtPublicPromoter_LibraryBackend : public LibraryBackend { public: inline void promoted_AddDirectory(const QString& path) { LibraryBackend::AddDirectory(path); } inline void promoted_ChangeDirPath(int id, const QString& old_path, const QString& new_path) { LibraryBackend::ChangeDirPath(id, old_path, new_path); } +inline void promoted_DatabaseReset() { LibraryBackend::DatabaseReset(); } +inline void promoted_DirectoryDeleted(const Directory& dir) { LibraryBackend::DirectoryDeleted(dir); } +inline void promoted_DirectoryDiscovered(const Directory& dir, const QList& subdirs) { LibraryBackend::DirectoryDiscovered(dir, subdirs); } inline bool promoted_ExecQuery(LibraryQuery* q) { return LibraryBackend::ExecQuery(q); } inline QList promoted_FindSongsInDirectory(int id) { return LibraryBackend::FindSongsInDirectory(id); } inline LibraryBackendInterface::Album promoted_GetAlbumArt(const QString& artist, const QString& album) { return LibraryBackend::GetAlbumArt(artist, album); } @@ -333,7 +387,11 @@ inline QList promoted_GetSongsByUrl(const QUrl& url) { return LibraryBa inline bool promoted_HasCompilations(const QueryOptions& opt = QueryOptions()) { return LibraryBackend::HasCompilations(opt); } inline void promoted_LoadDirectoriesAsync() { LibraryBackend::LoadDirectoriesAsync(); } inline void promoted_RemoveDirectory(const Directory& dir) { LibraryBackend::RemoveDirectory(dir); } +inline void promoted_SongsDeleted(const QList& songs) { LibraryBackend::SongsDeleted(songs); } +inline void promoted_SongsDiscovered(const QList& songs) { LibraryBackend::SongsDiscovered(songs); } +inline void promoted_SongsStatisticsChanged(const QList& songs) { LibraryBackend::SongsStatisticsChanged(songs); } inline QList promoted_SubdirsInDirectory(int id) { return LibraryBackend::SubdirsInDirectory(id); } +inline void promoted_TotalSongCountUpdated(int total) { LibraryBackend::TotalSongCountUpdated(total); } inline void promoted_UpdateManualAlbumArtAsync(const QString& artist, const QString& album, const QString& art) { LibraryBackend::UpdateManualAlbumArtAsync(artist, album, art); } inline void promoted_UpdateTotalSongCountAsync() { LibraryBackend::UpdateTotalSongCountAsync(); } }; @@ -346,7 +404,10 @@ LibraryBackend* new_LibraryBackend(QObject* parent = 0); void delete_LibraryBackend(LibraryBackend* obj) { delete obj; } void AddDirectory(LibraryBackend* theWrappedObject, const QString& path); void ChangeDirPath(LibraryBackend* theWrappedObject, int id, const QString& old_path, const QString& new_path); + void DatabaseReset(LibraryBackend* theWrappedObject); void DeleteAll(LibraryBackend* theWrappedObject); + void DirectoryDeleted(LibraryBackend* theWrappedObject, const Directory& dir); + void DirectoryDiscovered(LibraryBackend* theWrappedObject, const Directory& dir, const QList& subdirs); bool ExecQuery(LibraryBackend* theWrappedObject, LibraryQuery* q); QList FindSongsInDirectory(LibraryBackend* theWrappedObject, int id); LibraryBackendInterface::Album GetAlbumArt(LibraryBackend* theWrappedObject, const QString& artist, const QString& album); @@ -371,7 +432,11 @@ void delete_LibraryBackend(LibraryBackend* obj) { delete obj; } void LoadDirectoriesAsync(LibraryBackend* theWrappedObject); void RemoveDirectory(LibraryBackend* theWrappedObject, const Directory& dir); void ResetStatisticsAsync(LibraryBackend* theWrappedObject, int id); + void SongsDeleted(LibraryBackend* theWrappedObject, const QList& songs); + void SongsDiscovered(LibraryBackend* theWrappedObject, const QList& songs); + void SongsStatisticsChanged(LibraryBackend* theWrappedObject, const QList& songs); QList SubdirsInDirectory(LibraryBackend* theWrappedObject, int id); + void TotalSongCountUpdated(LibraryBackend* theWrappedObject, int total); void UpdateManualAlbumArtAsync(LibraryBackend* theWrappedObject, const QString& artist, const QString& album, const QString& art); void UpdateSongRatingAsync(LibraryBackend* theWrappedObject, int id, float rating); void UpdateTotalSongCountAsync(LibraryBackend* theWrappedObject); @@ -498,6 +563,14 @@ public: PythonQtInstanceWrapper* _wrapper; }; +class PythonQtPublicPromoter_LibraryView : public LibraryView +{ public: +inline void promoted_ShowConfigDialog() { LibraryView::ShowConfigDialog(); } +inline void promoted_contextMenuEvent(QContextMenuEvent* e) { LibraryView::contextMenuEvent(e); } +inline void promoted_mouseReleaseEvent(QMouseEvent* e) { LibraryView::mouseReleaseEvent(e); } +inline void promoted_paintEvent(QPaintEvent* event) { LibraryView::paintEvent(event); } +}; + class PythonQtWrapper_LibraryView : public QObject { Q_OBJECT public: @@ -506,7 +579,11 @@ LibraryView* new_LibraryView(QWidget* parent = 0); void delete_LibraryView(LibraryView* obj) { delete obj; } QList GetSelectedSongs(LibraryView* theWrappedObject) const; void SetTaskManager(LibraryView* theWrappedObject, TaskManager* task_manager); + void ShowConfigDialog(LibraryView* theWrappedObject); + void contextMenuEvent(LibraryView* theWrappedObject, QContextMenuEvent* e); void keyboardSearch(LibraryView* theWrappedObject, const QString& search); + void mouseReleaseEvent(LibraryView* theWrappedObject, QMouseEvent* e); + void paintEvent(LibraryView* theWrappedObject, QPaintEvent* event); void scrollTo(LibraryView* theWrappedObject, const QModelIndex& index, QAbstractItemView::ScrollHint hint = QAbstractItemView::EnsureVisible); }; @@ -703,12 +780,36 @@ virtual void timerEvent(QTimerEvent* arg__1); PythonQtInstanceWrapper* _wrapper; }; +class PythonQtPublicPromoter_PlayerInterface : public PlayerInterface +{ public: +inline void promoted_Error(const QString& message) { PlayerInterface::Error(message); } +inline void promoted_ForceShowOSD(Song arg__1, bool toogle) { PlayerInterface::ForceShowOSD(arg__1, toogle); } +inline void promoted_Paused() { PlayerInterface::Paused(); } +inline void promoted_Playing() { PlayerInterface::Playing(); } +inline void promoted_PlaylistFinished() { PlayerInterface::PlaylistFinished(); } +inline void promoted_Seeked(qlonglong microseconds) { PlayerInterface::Seeked(microseconds); } +inline void promoted_SongChangeRequestProcessed(const QUrl& url, bool valid) { PlayerInterface::SongChangeRequestProcessed(url, valid); } +inline void promoted_Stopped() { PlayerInterface::Stopped(); } +inline void promoted_TrackSkipped(PlaylistItemPtr old_track) { PlayerInterface::TrackSkipped(old_track); } +inline void promoted_VolumeChanged(int volume) { PlayerInterface::VolumeChanged(volume); } +}; + class PythonQtWrapper_PlayerInterface : public QObject { Q_OBJECT public: public slots: PlayerInterface* new_PlayerInterface(QObject* parent = 0); void delete_PlayerInterface(PlayerInterface* obj) { delete obj; } + void Error(PlayerInterface* theWrappedObject, const QString& message); + void ForceShowOSD(PlayerInterface* theWrappedObject, Song arg__1, bool toogle); + void Paused(PlayerInterface* theWrappedObject); + void Playing(PlayerInterface* theWrappedObject); + void PlaylistFinished(PlayerInterface* theWrappedObject); + void Seeked(PlayerInterface* theWrappedObject, qlonglong microseconds); + void SongChangeRequestProcessed(PlayerInterface* theWrappedObject, const QUrl& url, bool valid); + void Stopped(PlayerInterface* theWrappedObject); + void TrackSkipped(PlayerInterface* theWrappedObject, PlaylistItemPtr old_track); + void VolumeChanged(PlayerInterface* theWrappedObject, int volume); }; @@ -757,6 +858,13 @@ virtual void timerEvent(QTimerEvent* arg__1); class PythonQtPublicPromoter_Playlist : public Playlist { public: +inline void promoted_CurrentSongChanged(const Song& metadata) { Playlist::CurrentSongChanged(metadata); } +inline void promoted_DynamicModeChanged(bool dynamic) { Playlist::DynamicModeChanged(dynamic); } +inline void promoted_EditingFinished(const QModelIndex& index) { Playlist::EditingFinished(index); } +inline void promoted_LoadTracksError(const QString& message) { Playlist::LoadTracksError(message); } +inline void promoted_PlayRequested(const QModelIndex& index) { Playlist::PlayRequested(index); } +inline void promoted_PlaylistChanged() { Playlist::PlaylistChanged(); } +inline void promoted_RestoreFinished() { Playlist::RestoreFinished(); } inline int promoted_columnCount(const QModelIndex& arg__1 = QModelIndex()) const { return Playlist::columnCount(arg__1); } inline QVariant promoted_data(const QModelIndex& index, int role = Qt::DisplayRole) const { return Playlist::data(index, role); } inline bool promoted_dropMimeData(const QMimeData* data, Qt::DropAction action, int row, int column, const QModelIndex& parent) { return Playlist::dropMimeData(data, action, row, column, parent); } @@ -787,6 +895,9 @@ void delete_Playlist(Playlist* obj) { delete obj; } void AddSongInsertVetoListener(Playlist* theWrappedObject, SongInsertVetoListener* listener); bool ApplyValidityOnCurrentSong(Playlist* theWrappedObject, const QUrl& url, bool valid); bool static_Playlist_CompareItems(int column, Qt::SortOrder order, PlaylistItemPtr a, PlaylistItemPtr b); + void CurrentSongChanged(Playlist* theWrappedObject, const Song& metadata); + void DynamicModeChanged(Playlist* theWrappedObject, bool dynamic); + void EditingFinished(Playlist* theWrappedObject, const QModelIndex& index); QList GetAllItems(Playlist* theWrappedObject) const; QList GetAllSongs(Playlist* theWrappedObject) const; quint64 GetTotalLength(Playlist* theWrappedObject) const; @@ -797,12 +908,16 @@ void delete_Playlist(Playlist* obj) { delete obj; } void InsertSongsOrLibraryItems(Playlist* theWrappedObject, const QList& items, int pos = -1, bool play_now = false, bool enqueue = false); void InsertUrls(Playlist* theWrappedObject, const QList& urls, int pos = -1, bool play_now = false, bool enqueue = false); void InvalidateDeletedSongs(Playlist* theWrappedObject); + void LoadTracksError(Playlist* theWrappedObject, const QString& message); + void PlayRequested(Playlist* theWrappedObject, const QModelIndex& index); + void PlaylistChanged(Playlist* theWrappedObject); void RateSong(Playlist* theWrappedObject, const QModelIndex& index, double rating); void ReloadItems(Playlist* theWrappedObject, const QList& rows); void RemoveDeletedSongs(Playlist* theWrappedObject); void RemoveItemsWithoutUndo(Playlist* theWrappedObject, const QList& indices); void RemoveSongInsertVetoListener(Playlist* theWrappedObject, SongInsertVetoListener* listener); void Restore(Playlist* theWrappedObject); + void RestoreFinished(Playlist* theWrappedObject); void Save(Playlist* theWrappedObject) const; void StopAfter(Playlist* theWrappedObject, int row); void UpdateItems(Playlist* theWrappedObject, const QList& songs); @@ -940,6 +1055,11 @@ virtual void wheelEvent(QWheelEvent* arg__1); class PythonQtPublicPromoter_PlaylistContainer : public PlaylistContainer { public: +inline void promoted_Remove(int id) { PlaylistContainer::Remove(id); } +inline void promoted_Rename(int id, const QString& new_name) { PlaylistContainer::Rename(id, new_name); } +inline void promoted_TabChanged(int id) { PlaylistContainer::TabChanged(id); } +inline void promoted_UndoRedoActionsChanged(QAction* undo, QAction* redo) { PlaylistContainer::UndoRedoActionsChanged(undo, redo); } +inline void promoted_ViewSelectionModelChanged() { PlaylistContainer::ViewSelectionModelChanged(); } inline void promoted_resizeEvent(QResizeEvent* arg__1) { PlaylistContainer::resizeEvent(arg__1); } }; @@ -949,8 +1069,13 @@ public: public slots: PlaylistContainer* new_PlaylistContainer(QWidget* parent = 0); void delete_PlaylistContainer(PlaylistContainer* obj) { delete obj; } + void Remove(PlaylistContainer* theWrappedObject, int id); + void Rename(PlaylistContainer* theWrappedObject, int id, const QString& new_name); void SetActions(PlaylistContainer* theWrappedObject, QAction* new_playlist, QAction* save_playlist, QAction* load_playlist, QAction* next_playlist, QAction* previous_playlist); void SetManager(PlaylistContainer* theWrappedObject, PlaylistManager* manager); + void TabChanged(PlaylistContainer* theWrappedObject, int id); + void UndoRedoActionsChanged(PlaylistContainer* theWrappedObject, QAction* undo, QAction* redo); + void ViewSelectionModelChanged(PlaylistContainer* theWrappedObject); void resizeEvent(PlaylistContainer* theWrappedObject, QResizeEvent* arg__1); }; @@ -1173,12 +1298,40 @@ virtual void timerEvent(QTimerEvent* arg__1); PythonQtInstanceWrapper* _wrapper; }; +class PythonQtPublicPromoter_PlaylistManagerInterface : public PlaylistManagerInterface +{ public: +inline void promoted_ActiveChanged(Playlist* new_playlist) { PlaylistManagerInterface::ActiveChanged(new_playlist); } +inline void promoted_CurrentChanged(Playlist* new_playlist) { PlaylistManagerInterface::CurrentChanged(new_playlist); } +inline void promoted_CurrentSongChanged(const Song& song) { PlaylistManagerInterface::CurrentSongChanged(song); } +inline void promoted_EditingFinished(const QModelIndex& index) { PlaylistManagerInterface::EditingFinished(index); } +inline void promoted_Error(const QString& message) { PlaylistManagerInterface::Error(message); } +inline void promoted_PlayRequested(const QModelIndex& index) { PlaylistManagerInterface::PlayRequested(index); } +inline void promoted_PlaylistAdded(int id, const QString& name) { PlaylistManagerInterface::PlaylistAdded(id, name); } +inline void promoted_PlaylistChanged(Playlist* playlist) { PlaylistManagerInterface::PlaylistChanged(playlist); } +inline void promoted_PlaylistManagerInitialized() { PlaylistManagerInterface::PlaylistManagerInitialized(); } +inline void promoted_PlaylistRemoved(int id) { PlaylistManagerInterface::PlaylistRemoved(id); } +inline void promoted_PlaylistRenamed(int id, const QString& new_name) { PlaylistManagerInterface::PlaylistRenamed(id, new_name); } +inline void promoted_SummaryTextChanged(const QString& summary) { PlaylistManagerInterface::SummaryTextChanged(summary); } +}; + class PythonQtWrapper_PlaylistManagerInterface : public QObject { Q_OBJECT public: public slots: PlaylistManagerInterface* new_PlaylistManagerInterface(QObject* parent); void delete_PlaylistManagerInterface(PlaylistManagerInterface* obj) { delete obj; } + void ActiveChanged(PlaylistManagerInterface* theWrappedObject, Playlist* new_playlist); + void CurrentChanged(PlaylistManagerInterface* theWrappedObject, Playlist* new_playlist); + void CurrentSongChanged(PlaylistManagerInterface* theWrappedObject, const Song& song); + void EditingFinished(PlaylistManagerInterface* theWrappedObject, const QModelIndex& index); + void Error(PlaylistManagerInterface* theWrappedObject, const QString& message); + void PlayRequested(PlaylistManagerInterface* theWrappedObject, const QModelIndex& index); + void PlaylistAdded(PlaylistManagerInterface* theWrappedObject, int id, const QString& name); + void PlaylistChanged(PlaylistManagerInterface* theWrappedObject, Playlist* playlist); + void PlaylistManagerInitialized(PlaylistManagerInterface* theWrappedObject); + void PlaylistRemoved(PlaylistManagerInterface* theWrappedObject, int id); + void PlaylistRenamed(PlaylistManagerInterface* theWrappedObject, int id, const QString& new_name); + void SummaryTextChanged(PlaylistManagerInterface* theWrappedObject, const QString& summary); }; @@ -1218,6 +1371,12 @@ void delete_PlaylistParser(PlaylistParser* obj) { delete obj; } +class PythonQtPublicPromoter_PlaylistSequence : public PlaylistSequence +{ public: +inline void promoted_RepeatModeChanged(PlaylistSequence::RepeatMode mode) { PlaylistSequence::RepeatModeChanged(mode); } +inline void promoted_ShuffleModeChanged(PlaylistSequence::ShuffleMode mode) { PlaylistSequence::ShuffleModeChanged(mode); } +}; + class PythonQtWrapper_PlaylistSequence : public QObject { Q_OBJECT public: @@ -1228,6 +1387,8 @@ enum RepeatMode{ Repeat_Off = PlaylistSequence::Repeat_Off, Repeat_Track = PlaylistSequence::Repeat_Track, Repeat_Album = PlaylistSequence::Repeat_Album, Repeat_Playlist = PlaylistSequence::Repeat_Playlist}; public slots: void delete_PlaylistSequence(PlaylistSequence* obj) { delete obj; } + void RepeatModeChanged(PlaylistSequence* theWrappedObject, PlaylistSequence::RepeatMode mode); + void ShuffleModeChanged(PlaylistSequence* theWrappedObject, PlaylistSequence::ShuffleMode mode); QMenu* repeat_menu(PlaylistSequence* theWrappedObject) const; PlaylistSequence::RepeatMode repeat_mode(PlaylistSequence* theWrappedObject) const; QMenu* shuffle_menu(PlaylistSequence* theWrappedObject) const; @@ -1492,34 +1653,3 @@ int py_get_directory_id(Subdirectory* theWrappedObject){ return theWrappedObjec }; - - - -class PythonQtShell_TaskManager : public TaskManager -{ -public: - PythonQtShell_TaskManager(QObject* parent = 0):TaskManager(parent),_wrapper(NULL) {}; - -virtual void childEvent(QChildEvent* arg__1); -virtual void customEvent(QEvent* arg__1); -virtual bool event(QEvent* arg__1); -virtual bool eventFilter(QObject* arg__1, QEvent* arg__2); -virtual void timerEvent(QTimerEvent* arg__1); - - PythonQtInstanceWrapper* _wrapper; -}; - -class PythonQtWrapper_TaskManager : public QObject -{ Q_OBJECT -public: -public slots: -TaskManager* new_TaskManager(QObject* parent = 0); -void delete_TaskManager(TaskManager* obj) { delete obj; } - QList GetTasks(TaskManager* theWrappedObject); - void SetTaskBlocksLibraryScans(TaskManager* theWrappedObject, int id); - void SetTaskFinished(TaskManager* theWrappedObject, int id); - void SetTaskProgress(TaskManager* theWrappedObject, int id, int progress, int max = 0); - int StartTask(TaskManager* theWrappedObject, const QString& name); -}; - - diff --git a/src/generated_cpp/clementine/clementine1.cpp b/src/generated_cpp/clementine/clementine1.cpp index 0302b86b8..4a1f9c7f3 100644 --- a/src/generated_cpp/clementine/clementine1.cpp +++ b/src/generated_cpp/clementine/clementine1.cpp @@ -1,4 +1,5 @@ #include "clementine1.h" +#define protected public #include #include #include @@ -10,7 +11,168 @@ #include #include #include +#include #include +#undef protected + + +void PythonQtShell_TaskManager::childEvent(QChildEvent* arg__1) +{ +if (_wrapper) { + PyObject* obj = PyObject_GetAttrString((PyObject*)_wrapper, "childEvent"); + PyErr_Clear(); + if (obj && !PythonQtSlotFunction_Check(obj)) { + static const char* argumentList[] ={"" , "QChildEvent*"}; + static const PythonQtMethodInfo* methodInfo = PythonQtMethodInfo::getCachedMethodInfoFromArgumentList(2, argumentList); + void* args[2] = {NULL, (void*)&arg__1}; + PyObject* result = PythonQtSignalTarget::call(obj, methodInfo, args, true); + if (result) { Py_DECREF(result); } + Py_DECREF(obj); + return; + } + Py_XDECREF(obj); +} + TaskManager::childEvent(arg__1); +} +void PythonQtShell_TaskManager::customEvent(QEvent* arg__1) +{ +if (_wrapper) { + PyObject* obj = PyObject_GetAttrString((PyObject*)_wrapper, "customEvent"); + PyErr_Clear(); + if (obj && !PythonQtSlotFunction_Check(obj)) { + static const char* argumentList[] ={"" , "QEvent*"}; + static const PythonQtMethodInfo* methodInfo = PythonQtMethodInfo::getCachedMethodInfoFromArgumentList(2, argumentList); + void* args[2] = {NULL, (void*)&arg__1}; + PyObject* result = PythonQtSignalTarget::call(obj, methodInfo, args, true); + if (result) { Py_DECREF(result); } + Py_DECREF(obj); + return; + } + Py_XDECREF(obj); +} + TaskManager::customEvent(arg__1); +} +bool PythonQtShell_TaskManager::event(QEvent* arg__1) +{ +if (_wrapper) { + PyObject* obj = PyObject_GetAttrString((PyObject*)_wrapper, "event"); + PyErr_Clear(); + if (obj && !PythonQtSlotFunction_Check(obj)) { + static const char* argumentList[] ={"bool" , "QEvent*"}; + static const PythonQtMethodInfo* methodInfo = PythonQtMethodInfo::getCachedMethodInfoFromArgumentList(2, argumentList); + bool returnValue = 0; + void* args[2] = {NULL, (void*)&arg__1}; + PyObject* result = PythonQtSignalTarget::call(obj, methodInfo, args, true); + if (result) { + args[0] = PythonQtConv::ConvertPythonToQt(methodInfo->parameters().at(0), result, false, NULL, &returnValue); + if (args[0]!=&returnValue) { + if (args[0]==NULL) { + PythonQt::priv()->handleVirtualOverloadReturnError("event", methodInfo, result); + } else { + returnValue = *((bool*)args[0]); + } + } + } + if (result) { Py_DECREF(result); } + Py_DECREF(obj); + return returnValue; + } + Py_XDECREF(obj); +} + return TaskManager::event(arg__1); +} +bool PythonQtShell_TaskManager::eventFilter(QObject* arg__1, QEvent* arg__2) +{ +if (_wrapper) { + PyObject* obj = PyObject_GetAttrString((PyObject*)_wrapper, "eventFilter"); + PyErr_Clear(); + if (obj && !PythonQtSlotFunction_Check(obj)) { + static const char* argumentList[] ={"bool" , "QObject*" , "QEvent*"}; + static const PythonQtMethodInfo* methodInfo = PythonQtMethodInfo::getCachedMethodInfoFromArgumentList(3, argumentList); + bool returnValue = 0; + void* args[3] = {NULL, (void*)&arg__1, (void*)&arg__2}; + PyObject* result = PythonQtSignalTarget::call(obj, methodInfo, args, true); + if (result) { + args[0] = PythonQtConv::ConvertPythonToQt(methodInfo->parameters().at(0), result, false, NULL, &returnValue); + if (args[0]!=&returnValue) { + if (args[0]==NULL) { + PythonQt::priv()->handleVirtualOverloadReturnError("eventFilter", methodInfo, result); + } else { + returnValue = *((bool*)args[0]); + } + } + } + if (result) { Py_DECREF(result); } + Py_DECREF(obj); + return returnValue; + } + Py_XDECREF(obj); +} + return TaskManager::eventFilter(arg__1, arg__2); +} +void PythonQtShell_TaskManager::timerEvent(QTimerEvent* arg__1) +{ +if (_wrapper) { + PyObject* obj = PyObject_GetAttrString((PyObject*)_wrapper, "timerEvent"); + PyErr_Clear(); + if (obj && !PythonQtSlotFunction_Check(obj)) { + static const char* argumentList[] ={"" , "QTimerEvent*"}; + static const PythonQtMethodInfo* methodInfo = PythonQtMethodInfo::getCachedMethodInfoFromArgumentList(2, argumentList); + void* args[2] = {NULL, (void*)&arg__1}; + PyObject* result = PythonQtSignalTarget::call(obj, methodInfo, args, true); + if (result) { Py_DECREF(result); } + Py_DECREF(obj); + return; + } + Py_XDECREF(obj); +} + TaskManager::timerEvent(arg__1); +} +TaskManager* PythonQtWrapper_TaskManager::new_TaskManager(QObject* parent) +{ +return new PythonQtShell_TaskManager(parent); } + +QList PythonQtWrapper_TaskManager::GetTasks(TaskManager* theWrappedObject) +{ + return ( theWrappedObject->GetTasks()); +} + +void PythonQtWrapper_TaskManager::PauseLibraryWatchers(TaskManager* theWrappedObject) +{ + ( ((PythonQtPublicPromoter_TaskManager*)theWrappedObject)->promoted_PauseLibraryWatchers()); +} + +void PythonQtWrapper_TaskManager::ResumeLibraryWatchers(TaskManager* theWrappedObject) +{ + ( ((PythonQtPublicPromoter_TaskManager*)theWrappedObject)->promoted_ResumeLibraryWatchers()); +} + +void PythonQtWrapper_TaskManager::SetTaskBlocksLibraryScans(TaskManager* theWrappedObject, int id) +{ + ( theWrappedObject->SetTaskBlocksLibraryScans(id)); +} + +void PythonQtWrapper_TaskManager::SetTaskFinished(TaskManager* theWrappedObject, int id) +{ + ( theWrappedObject->SetTaskFinished(id)); +} + +void PythonQtWrapper_TaskManager::SetTaskProgress(TaskManager* theWrappedObject, int id, int progress, int max) +{ + ( theWrappedObject->SetTaskProgress(id, progress, max)); +} + +int PythonQtWrapper_TaskManager::StartTask(TaskManager* theWrappedObject, const QString& name) +{ + return ( theWrappedObject->StartTask(name)); +} + +void PythonQtWrapper_TaskManager::TasksChanged(TaskManager* theWrappedObject) +{ + ( ((PythonQtPublicPromoter_TaskManager*)theWrappedObject)->promoted_TasksChanged()); +} + + TaskManager_Task* PythonQtWrapper_TaskManager_Task::new_TaskManager_Task() { @@ -578,6 +740,11 @@ UrlHandler* PythonQtWrapper_UrlHandler::new_UrlHandler(QObject* parent) { return new PythonQtShell_UrlHandler(parent); } +void PythonQtWrapper_UrlHandler::AsyncLoadComplete(UrlHandler* theWrappedObject, const UrlHandler_LoadResult& result) +{ + ( ((PythonQtPublicPromoter_UrlHandler*)theWrappedObject)->promoted_AsyncLoadComplete(result)); +} + UrlHandler_LoadResult PythonQtWrapper_UrlHandler::LoadNext(UrlHandler* theWrappedObject, const QUrl& url) { return ( ((PythonQtPublicPromoter_UrlHandler*)theWrappedObject)->promoted_LoadNext(url)); diff --git a/src/generated_cpp/clementine/clementine1.h b/src/generated_cpp/clementine/clementine1.h index ceb1be512..45e000832 100644 --- a/src/generated_cpp/clementine/clementine1.h +++ b/src/generated_cpp/clementine/clementine1.h @@ -1,3 +1,4 @@ +#define protected public #include #include #include @@ -11,6 +12,49 @@ #include #include #include +#undef protected + + + + +class PythonQtShell_TaskManager : public TaskManager +{ +public: + PythonQtShell_TaskManager(QObject* parent = 0):TaskManager(parent),_wrapper(NULL) {}; + +virtual void childEvent(QChildEvent* arg__1); +virtual void customEvent(QEvent* arg__1); +virtual bool event(QEvent* arg__1); +virtual bool eventFilter(QObject* arg__1, QEvent* arg__2); +virtual void timerEvent(QTimerEvent* arg__1); + + PythonQtInstanceWrapper* _wrapper; +}; + +class PythonQtPublicPromoter_TaskManager : public TaskManager +{ public: +inline void promoted_PauseLibraryWatchers() { TaskManager::PauseLibraryWatchers(); } +inline void promoted_ResumeLibraryWatchers() { TaskManager::ResumeLibraryWatchers(); } +inline void promoted_TasksChanged() { TaskManager::TasksChanged(); } +}; + +class PythonQtWrapper_TaskManager : public QObject +{ Q_OBJECT +public: +public slots: +TaskManager* new_TaskManager(QObject* parent = 0); +void delete_TaskManager(TaskManager* obj) { delete obj; } + QList GetTasks(TaskManager* theWrappedObject); + void PauseLibraryWatchers(TaskManager* theWrappedObject); + void ResumeLibraryWatchers(TaskManager* theWrappedObject); + void SetTaskBlocksLibraryScans(TaskManager* theWrappedObject, int id); + void SetTaskFinished(TaskManager* theWrappedObject, int id); + void SetTaskProgress(TaskManager* theWrappedObject, int id, int progress, int max = 0); + int StartTask(TaskManager* theWrappedObject, const QString& name); + void TasksChanged(TaskManager* theWrappedObject); +}; + + @@ -122,6 +166,7 @@ virtual void timerEvent(QTimerEvent* arg__1); class PythonQtPublicPromoter_UrlHandler : public UrlHandler { public: +inline void promoted_AsyncLoadComplete(const UrlHandler_LoadResult& result) { UrlHandler::AsyncLoadComplete(result); } inline UrlHandler_LoadResult promoted_LoadNext(const QUrl& url) { return UrlHandler::LoadNext(url); } inline UrlHandler_LoadResult promoted_StartLoading(const QUrl& url) { return UrlHandler::StartLoading(url); } }; @@ -132,6 +177,7 @@ public: public slots: UrlHandler* new_UrlHandler(QObject* parent = 0); void delete_UrlHandler(UrlHandler* obj) { delete obj; } + void AsyncLoadComplete(UrlHandler* theWrappedObject, const UrlHandler_LoadResult& result); UrlHandler_LoadResult LoadNext(UrlHandler* theWrappedObject, const QUrl& url); UrlHandler_LoadResult StartLoading(UrlHandler* theWrappedObject, const QUrl& url); }; diff --git a/src/generated_cpp/clementine/clementine_init.cpp b/src/generated_cpp/clementine/clementine_init.cpp index 834a3aad4..7c73b4014 100644 --- a/src/generated_cpp/clementine/clementine_init.cpp +++ b/src/generated_cpp/clementine/clementine_init.cpp @@ -9,6 +9,7 @@ PythonQt::priv()->registerClass(&CoverProvider::staticMetaObject, "Clementine", PythonQt::priv()->registerClass(&CoverProviders::staticMetaObject, "Clementine", PythonQtCreateObject, NULL, module, 0); PythonQt::priv()->registerCPPClass("CoverSearchResult", "", "Clementine", PythonQtCreateObject, PythonQtSetInstanceWrapperOnShell, module, 0); PythonQt::priv()->registerCPPClass("Directory", "", "Clementine", PythonQtCreateObject, PythonQtSetInstanceWrapperOnShell, module, 0); +PythonQt::priv()->registerCPPClass("IconLoader", "", "Clementine", PythonQtCreateObject, NULL, module, 0); PythonQt::priv()->registerClass(&InternetModel::staticMetaObject, "Clementine", PythonQtCreateObject, NULL, module, 0); PythonQt::priv()->registerClass(&InternetService::staticMetaObject, "Clementine", PythonQtCreateObject, PythonQtSetInstanceWrapperOnShell, module, 0); PythonQt::priv()->registerClass(&LibraryBackend::staticMetaObject, "Clementine", PythonQtCreateObject, PythonQtSetInstanceWrapperOnShell, module, 0); diff --git a/src/scripting/python/bindings_includes.h b/src/scripting/python/bindings_includes.h index c91a39bac..39aff9648 100644 --- a/src/scripting/python/bindings_includes.h +++ b/src/scripting/python/bindings_includes.h @@ -42,5 +42,6 @@ #include "internet/internetmodel.h" #include "internet/internetservice.h" #include "smartplaylists/generator.h" +#include "ui/iconloader.h" #endif // BINDINGS_INCLUDES_H diff --git a/src/scripting/python/typesystem_clementine.xml b/src/scripting/python/typesystem_clementine.xml index b66ef5cbc..28ca60171 100644 --- a/src/scripting/python/typesystem_clementine.xml +++ b/src/scripting/python/typesystem_clementine.xml @@ -39,6 +39,7 @@ +