From eb34a2bcd5d2b698071a75bf8fe03e4b6385c63a Mon Sep 17 00:00:00 2001 From: "craig.p.drummond" Date: Fri, 11 Apr 2014 17:45:59 +0000 Subject: [PATCH] Remove Actions and Icons from Ubuntu build --- CMakeLists.txt | 7 +++---- gui/currentcover.cpp | 8 ++++---- models/albumsmodel.cpp | 22 ++++++++++++++++++---- models/albumsmodel.h | 4 ++++ models/dirviewmodel.cpp | 4 ++++ models/dirviewmodel.h | 2 ++ models/musiclibraryitemalbum.cpp | 5 +++-- models/musiclibraryitemalbum.h | 2 ++ models/musiclibrarymodel.cpp | 12 +++++++++--- models/musiclibrarymodel.h | 2 ++ models/musicmodel.cpp | 6 ++++++ models/playlistsmodel.cpp | 25 ++++++++++++++++++++++++- models/playlistsmodel.h | 10 +++++++++- models/playqueuemodel.cpp | 22 ++++++++++++++++++++++ models/playqueuemodel.h | 10 ++++++++++ models/playqueueproxymodel.cpp | 2 ++ models/playqueueproxymodel.h | 3 +++ models/searchmodel.cpp | 9 +++++++++ models/searchmodel.h | 4 ++++ support/CMakeLists.txt | 8 ++++---- 20 files changed, 144 insertions(+), 23 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a4a3fe34b..7bdc22191 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -288,8 +288,7 @@ if (MSVC) endif (MSVC) set(CANTATA_CORE_SRCS - gui/covers.cpp gui/currentcover.cpp gui/settings.cpp gui/stdactions.cpp - widgets/icons.cpp + gui/covers.cpp gui/currentcover.cpp gui/settings.cpp models/musiclibraryitemroot.cpp models/musiclibraryitemartist.cpp models/musiclibraryitemalbum.cpp models/musiclibrarymodel.cpp models/musiclibraryproxymodel.cpp models/playlistsmodel.cpp models/playlistsproxymodel.cpp models/playqueuemodel.cpp models/playqueueproxymodel.cpp models/dirviewmodel.cpp models/dirviewproxymodel.cpp models/dirviewitem.cpp models/dirviewitemdir.cpp @@ -313,10 +312,10 @@ set(CANTATA_SRCS ${CANTATA_CORE_SRCS} gui/application.cpp gui/initialsettingswizard.cpp gui/mainwindow.cpp gui/preferencesdialog.cpp gui/filesettings.cpp gui/interfacesettings.cpp gui/playbacksettings.cpp gui/serversettings.cpp gui/librarypage.cpp gui/albumspage.cpp gui/folderpage.cpp gui/playlistspage.cpp gui/trayitem.cpp - gui/cachesettings.cpp gui/coverdialog.cpp gui/searchpage.cpp + gui/cachesettings.cpp gui/coverdialog.cpp gui/searchpage.cpp gui/stdactions.cpp widgets/treeview.cpp widgets/listview.cpp widgets/itemview.cpp widgets/autohidingsplitter.cpp widgets/timeslider.cpp widgets/actionlabel.cpp widgets/playqueueview.cpp widgets/groupedview.cpp widgets/actionitemdelegate.cpp widgets/textbrowser.cpp - widgets/volumeslider.cpp widgets/genrecombo.cpp widgets/menubutton.cpp + widgets/volumeslider.cpp widgets/genrecombo.cpp widgets/menubutton.cpp widgets/icons.cpp widgets/toolbutton.cpp widgets/wizardpage.cpp widgets/statuslabel.cpp widgets/searchwidget.cpp widgets/messageoverlay.cpp widgets/basicitemdelegate.cpp widgets/sizegrip.cpp widgets/sizewidget.cpp widgets/servicestatuslabel.cpp widgets/spacerwidget.cpp widgets/songdialog.cpp widgets/stretchheaderview.cpp widgets/tableview.cpp widgets/songlabel.cpp widgets/thinsplitterhandle.cpp diff --git a/gui/currentcover.cpp b/gui/currentcover.cpp index 4ce781b2f..0a8f2a612 100644 --- a/gui/currentcover.cpp +++ b/gui/currentcover.cpp @@ -132,12 +132,11 @@ const QImage & CurrentCover::stdImage(bool stream) { QImage &img=stream ? noStreamCover : noCover; + #ifdef ENABLE_UBUNTU + // TODO: Jsut return qrc file Touch... + #else if (img.isNull()) { - #ifdef ENABLE_UBUNTU - int iconSize=256; - #else int iconSize=Utils::isHighDpi() ? 256 : 128; - #endif img = (stream ? Icons::self()->streamIcon : Icons::self()->albumIcon).pixmap(iconSize, iconSize).toImage(); QString &file=stream ? noStreamCoverFileName : noCoverFileName; @@ -157,6 +156,7 @@ const QImage & CurrentCover::stdImage(bool stream) } #endif } + #endif return img; } diff --git a/models/albumsmodel.cpp b/models/albumsmodel.cpp index 871010fdf..9692bfc3a 100644 --- a/models/albumsmodel.cpp +++ b/models/albumsmodel.cpp @@ -54,6 +54,7 @@ static int sortAlbums=AlbumsModel::Sort_AlbumArtist; GLOBAL_STATIC(AlbumsModel, instance) +#ifndef ENABLE_UBUNTU static MusicLibraryItemAlbum::CoverSize coverSize=MusicLibraryItemAlbum::CoverMedium; static QPixmap *theDefaultIcon=0; static QSize itemSize; @@ -98,6 +99,7 @@ void AlbumsModel::setCoverSize(MusicLibraryItemAlbum::CoverSize size) coverSize=size; } } +#endif AlbumsModel::AlbumsModel(QObject *parent) : ActionModel(parent) @@ -242,16 +244,19 @@ QVariant AlbumsModel::data(const QModelIndex &index, int role) const return al->albumDisplay(); case ItemView::Role_BriefMainText: return al->album; + #ifndef ENABLE_UBUNTU case ItemView::Role_ImageSize: return iconSize(); - case ItemView::Role_SubText: - return al->artist; - case ItemView::Role_TitleText: - return i18nc("Album by Artist", "%1 by %2", al->album, al->artist); case Qt::SizeHintRole: if (!itemSize.isNull()) { return itemSize; } + break; + #endif + case ItemView::Role_SubText: + return al->artist; + case ItemView::Role_TitleText: + return i18nc("Album by Artist", "%1 by %2", al->album, al->artist); } } else { SongItem *si=static_cast(item); @@ -259,8 +264,10 @@ QVariant AlbumsModel::data(const QModelIndex &index, int role) const switch (role) { default: return ActionModel::data(index, role); + #ifndef ENABLE_UBUNTU case Qt::DecorationRole: return Song::Playlist==si->type ? Icons::self()->playlistIcon : Icons::self()->audioFileIcon; + #endif case Qt::ToolTipRole: { quint32 year=si->parent->songs.count() ? si->parent->songs.at(0)->year : 0; return si->parent->artist+QLatin1String("
")+ @@ -339,6 +346,7 @@ QList AlbumsModel::songs(const QModelIndexList &indexes, bool allowPlaylis return songs; } +#ifndef ENABLE_UBUNTU QMimeData * AlbumsModel::mimeData(const QModelIndexList &indexes) const { QMimeData *mimeData = new QMimeData(); @@ -353,6 +361,7 @@ QMimeData * AlbumsModel::mimeData(const QModelIndexList &indexes) const } return mimeData; } +#endif void AlbumsModel::update(const MusicLibraryItemRoot *root) { @@ -485,6 +494,10 @@ void AlbumsModel::setCover(const Song &song, const QImage &img, const QString &f void AlbumsModel::coverLoaded(const Song &song, int s) { + #ifdef ENABLE_UBUNTU + Q_UNUSED(song) + Q_UNUSED(s) + #else if (s==iconSize() && !song.isArtistImageRequest()) { QList::Iterator it=items.begin(); QList::Iterator end=items.end(); @@ -498,6 +511,7 @@ void AlbumsModel::coverLoaded(const Song &song, int s) } } } + #endif } void AlbumsModel::clearNewState() diff --git a/models/albumsmodel.h b/models/albumsmodel.h index 06c096ffc..a3e741a5d 100644 --- a/models/albumsmodel.h +++ b/models/albumsmodel.h @@ -40,11 +40,13 @@ class AlbumsModel : public ActionModel Q_OBJECT public: + #ifndef ENABLE_UBUNTU static MusicLibraryItemAlbum::CoverSize currentCoverSize(); static void setCoverSize(MusicLibraryItemAlbum::CoverSize size); static int iconSize(); static void setItemSize(const QSize &sz); static void setIconMode(bool u); + #endif enum Sort { @@ -124,7 +126,9 @@ public: Qt::ItemFlags flags(const QModelIndex &index) const; QStringList filenames(const QModelIndexList &indexes, bool allowPlaylists=false) const; QList songs(const QModelIndexList &indexes, bool allowPlaylists=false) const; + #ifndef ENABLE_UBUNTU QMimeData * mimeData(const QModelIndexList &indexes) const; + #endif void clear(); bool isEnabled() const { return enabled; } void setEnabled(bool e); diff --git a/models/dirviewmodel.cpp b/models/dirviewmodel.cpp index 0c390bd68..de42ee79c 100644 --- a/models/dirviewmodel.cpp +++ b/models/dirviewmodel.cpp @@ -173,6 +173,7 @@ QVariant DirViewModel::data(const QModelIndex &index, int role) const DirViewItem *item = static_cast(index.internalPointer()); switch (role) { + #ifndef ENABLE_UBUNTU case Qt::DecorationRole: { if (item->type() == DirViewItem::Type_Dir) { return Icons::self()->folderIcon; @@ -181,6 +182,7 @@ QVariant DirViewModel::data(const QModelIndex &index, int role) const } break; } + #endif case Qt::DisplayRole: return item->data(); case Qt::ToolTipRole: @@ -521,6 +523,7 @@ QStringList DirViewModel::filenames(const QModelIndexList &indexes, bool allowPl return fnames; } +#ifndef ENABLE_UBUNTU QMimeData *DirViewModel::mimeData(const QModelIndexList &indexes) const { QMimeData *mimeData = new QMimeData(); @@ -535,6 +538,7 @@ QMimeData *DirViewModel::mimeData(const QModelIndexList &indexes) const } return mimeData; } +#endif static inline void addFile(DirViewItem *item, QStringList &insertInto, QStringList &checkAgainst, bool allowPlaylists) { diff --git a/models/dirviewmodel.h b/models/dirviewmodel.h index 03ca1957a..e47f02ea9 100644 --- a/models/dirviewmodel.h +++ b/models/dirviewmodel.h @@ -51,7 +51,9 @@ public: QVariant data(const QModelIndex &, int) const; Qt::ItemFlags flags(const QModelIndex &index) const; QStringList filenames(const QModelIndexList &indexes, bool allowPlaylists) const; + #ifndef ENABLE_UBUNTU QMimeData *mimeData(const QModelIndexList &indexes) const; + #endif void clear(); void addFileToList(const QString &file, const QString &mopidyPath); void removeFileFromList(const QString &file); diff --git a/models/musiclibraryitemalbum.cpp b/models/musiclibraryitemalbum.cpp index 92802b2fa..e5c52a194 100644 --- a/models/musiclibraryitemalbum.cpp +++ b/models/musiclibraryitemalbum.cpp @@ -50,6 +50,8 @@ static const QString constDefaultCover="qrc:/album.png"; static QPixmap *theDefaultIcon=0; #endif static bool dateSort=false; + +#ifndef ENABLE_UBUNTU static QSize iconItemSize; static inline int adjust(int v) @@ -117,16 +119,15 @@ MusicLibraryItemAlbum::CoverSize MusicLibraryItemAlbum::currentCoverSize() void MusicLibraryItemAlbum::setCoverSize(MusicLibraryItemAlbum::CoverSize size) { if (size!=coverSize) { - #ifndef ENABLE_UBUNTU if (theDefaultIcon) { delete theDefaultIcon; theDefaultIcon=0; } - #endif MusicLibraryItemArtist::clearDefaultCover(); coverSize=size; } } +#endif void MusicLibraryItemAlbum::setSortByDate(bool sd) { diff --git a/models/musiclibraryitemalbum.h b/models/musiclibraryitemalbum.h index 6dc5d35e3..598aa2516 100644 --- a/models/musiclibraryitemalbum.h +++ b/models/musiclibraryitemalbum.h @@ -49,6 +49,7 @@ public: CoverExtraLarge = 4 }; + #ifndef ENABLE_UBUNTU static void setup(); static CoverSize currentCoverSize(); static void setCoverSize(CoverSize size); @@ -56,6 +57,7 @@ public: static int iconSize(bool iconMode=false); static void setItemSize(const QSize &sz); static QSize itemSize(); + #endif static void setSortByDate(bool sd); static bool sortByDate(); diff --git a/models/musiclibrarymodel.cpp b/models/musiclibrarymodel.cpp index 1b1812a30..300f698bd 100644 --- a/models/musiclibrarymodel.cpp +++ b/models/musiclibrarymodel.cpp @@ -521,7 +521,7 @@ void MusicLibraryModel::updatingMpd() void MusicLibraryModel::setArtistImage(const Song &song, const QImage &img, const QString &file) { #ifdef ENABLE_UBUNTU - if (!rootItem->useArtistImages() || img.isNull() || file.isEmpty() || MusicLibraryItemAlbum::CoverNone==MusicLibraryItemAlbum::currentCoverSize() || + if (!rootItem->useArtistImages() || img.isNull() || file.isEmpty() || song.file.startsWith("http://") || song.name.startsWith("http://")) { return; } @@ -699,7 +699,10 @@ QList MusicLibraryModel::getArtistAlbumsFirstTracks(const Song &song) cons // Currently ONLY artist images are always loaded from non UI thread. void MusicLibraryModel::coverLoaded(const Song &song, int size) { - if (MusicLibraryItemAlbum::CoverNone==MusicLibraryItemAlbum::currentCoverSize() || size!=MusicLibraryItemAlbum::iconSize(rootItem->useLargeImages()) || + if ( + #ifndef ENABLE_UBUNTU + MusicLibraryItemAlbum::CoverNone==MusicLibraryItemAlbum::currentCoverSize() || size!=MusicLibraryItemAlbum::iconSize(rootItem->useLargeImages()) || + #endif //song.isCdda() || (song.isArtistImageRequest() && !rootItem->useArtistImages()) || song.isCdda() || !song.isArtistImageRequest() || !rootItem->useArtistImages() || song.file.startsWith("http://") || song.name.startsWith("http://")) { @@ -726,7 +729,7 @@ void MusicLibraryModel::coverLoaded(const Song &song, int size) void MusicLibraryModel::setCover(const Song &song, const QImage &img, const QString &file) { #ifdef ENABLE_UBUNTU - if (!rootItem->useAlbumImages() || img.isNull() || file.isEmpty() || MusicLibraryItemAlbum::CoverNone==MusicLibraryItemAlbum::currentCoverSize() || + if (!rootItem->useAlbumImages() || img.isNull() || file.isEmpty() || song.isCdda() || song.file.startsWith("http:/") || song.name.startsWith("http:/")) { return; } @@ -904,6 +907,7 @@ QList MusicLibraryModel::songs(const QStringList &filenames, bool insertNo return songs; } +#ifndef ENABLE_UBUNTU /** * Convert the data at indexes into mimedata ready for transport * @@ -924,3 +928,5 @@ QMimeData *MusicLibraryModel::mimeData(const QModelIndexList &indexes) const } return mimeData; } +#endif + diff --git a/models/musiclibrarymodel.h b/models/musiclibrarymodel.h index c449367fb..197c8d9e3 100644 --- a/models/musiclibrarymodel.h +++ b/models/musiclibrarymodel.h @@ -64,7 +64,9 @@ public: QStringList filenames(const QModelIndexList &indexes, bool allowPlaylists=false) const; QList songs(const QModelIndexList &indexes, bool allowPlaylists=false) const; QList songs(const QStringList &filenames, bool insertNotFound=false) const; + #ifndef ENABLE_UBUNTU QMimeData *mimeData(const QModelIndexList &indexes) const; + #endif const MusicLibraryItemRoot * root() const { return rootItem; } const MusicLibraryItemRoot * root(const MusicLibraryItem *) const { return root(); } bool isFromSingleTracks(const Song &s) const { return rootItem->isFromSingleTracks(s); } diff --git a/models/musicmodel.cpp b/models/musicmodel.cpp index b170303e0..8a8d0354f 100644 --- a/models/musicmodel.cpp +++ b/models/musicmodel.cpp @@ -96,6 +96,7 @@ QVariant MusicModel::data(const QModelIndex &index, int role) const MusicLibraryItem *item = static_cast(index.internalPointer()); switch (role) { + #ifndef ENABLE_UBUNTU case Qt::DecorationRole: switch (item->itemType()) { case MusicLibraryItem::Type_Root: { @@ -126,6 +127,7 @@ QVariant MusicModel::data(const QModelIndex &index, int role) const case MusicLibraryItem::Type_Song: return Song::Playlist==static_cast(item)->song().type ? Icons::self()->playlistIcon : Icons::self()->audioFileIcon; default: return QVariant(); } + #endif case ItemView::Role_BriefMainText: if (MusicLibraryItem::Type_Album==item->itemType()) { return item->data(); @@ -173,6 +175,7 @@ QVariant MusicModel::data(const QModelIndex &index, int role) const (0==item->childCount() ? item->displayData(true) : (item->displayData(true)+"
"+data(index, ItemView::Role_SubText).toString())); + #ifndef ENABLE_UBUNTU case ItemView::Role_ImageSize: { const MusicLibraryItemRoot *r=root(item); if (MusicLibraryItem::Type_Song!=item->itemType() && !MusicLibraryItemAlbum::itemSize().isNull()) { // icon/list style view... @@ -182,6 +185,7 @@ QVariant MusicModel::data(const QModelIndex &index, int role) const } break; } + #endif case ItemView::Role_SubText: switch (item->itemType()) { case MusicLibraryItem::Type_Root: { @@ -238,6 +242,7 @@ QVariant MusicModel::data(const QModelIndex &index, int role) const return i18nc("Album by Artist", "%1 by %2", item->data(), item->parentItem()->data()); } return item->data(); + #ifndef ENABLE_UBUNTU case Qt::SizeHintRole: { const MusicLibraryItemRoot *r=root(item); if (!r->useArtistImages() && MusicLibraryItem::Type_Artist==item->itemType()) { @@ -247,6 +252,7 @@ QVariant MusicModel::data(const QModelIndex &index, int role) const return MusicLibraryItemAlbum::itemSize(); } } + #endif default: break; } diff --git a/models/playlistsmodel.cpp b/models/playlistsmodel.cpp index 7430e2f5c..308bb49ca 100644 --- a/models/playlistsmodel.cpp +++ b/models/playlistsmodel.cpp @@ -52,6 +52,7 @@ #include "modeltest.h" #endif +#ifndef ENABLE_UBUNTU QString PlaylistsModel::headerText(int col) { switch (col) { @@ -64,6 +65,7 @@ QString PlaylistsModel::headerText(int col) default: return QString(); } } +#endif GLOBAL_STATIC(PlaylistsModel, instance) @@ -71,8 +73,10 @@ PlaylistsModel::PlaylistsModel(QObject *parent) : ActionModel(parent) , enabled(true) , multiCol(false) + #ifndef ENABLE_UBUNTU , itemMenu(0) , dropAdjust(0) + #endif { connect(MPDConnection::self(), SIGNAL(stateChanged(bool)), SLOT(mpdConnectionStateChanged(bool))); connect(MPDConnection::self(), SIGNAL(playlistsRetrieved(const QList &)), this, SLOT(setPlaylists(const QList &))); @@ -86,10 +90,13 @@ PlaylistsModel::PlaylistsModel(QObject *parent) connect(this, SIGNAL(listPlaylists()), MPDConnection::self(), SLOT(listPlaylists())); connect(this, SIGNAL(playlistInfo(const QString &)), MPDConnection::self(), SLOT(playlistInfo(const QString &))); connect(this, SIGNAL(addToPlaylist(const QString &, const QStringList, quint32, quint32)), MPDConnection::self(), SLOT(addToPlaylist(const QString &, const QStringList, quint32, quint32))); - connect(this, SIGNAL(moveInPlaylist(const QString &, const QList &, quint32, quint32)), MPDConnection::self(), SLOT(moveInPlaylist(const QString &, const QList &, quint32, quint32))); + connect(this, SIGNAL(moveInPlaylist(const QString &, const QList &, quint32, quint32)), MPDConnection::self(), SLOT(moveInPlaylist(const QString &, const + QList &, quint32, quint32))); + #ifndef ENABLE_UBUNTU newAction=new QAction(Icon("document-new"), i18n("New Playlist..."), this); connect(newAction, SIGNAL(triggered(bool)), this, SIGNAL(addToNew())); Action::initIcon(newAction); + #endif #if defined ENABLE_MODEL_TEST new ModelTest(this, this); #endif @@ -97,10 +104,12 @@ PlaylistsModel::PlaylistsModel(QObject *parent) PlaylistsModel::~PlaylistsModel() { + #ifndef ENABLE_UBUNTU if (itemMenu) { itemMenu->deleteLater(); itemMenu=0; } + #endif } int PlaylistsModel::rowCount(const QModelIndex &index) const @@ -186,6 +195,7 @@ QModelIndex PlaylistsModel::index(int row, int col, const QModelIndex &parent) c return rowsongs.count() ? pl->visibleName() : pl->visibleName()+"\n"+Plurals::tracksWithDuration(pl->songs.count(), Utils::formatTime(pl->totalTime())); + #ifndef ENABLE_UBUNTU case Qt::DecorationRole: return multiCol ? QVariant() : (pl->isSmartPlaylist ? Icons::self()->dynamicRuleIcon : Icons::self()->playlistIcon); + #endif case ItemView::Role_SubText: if (!pl->loaded) { pl->loaded=true; @@ -415,8 +428,10 @@ QVariant PlaylistsModel::data(const QModelIndex &index, int role) const } return text; } + #ifndef ENABLE_UBUNTU case Qt::DecorationRole: return multiCol ? QVariant() : (s->title.isEmpty() ? Icons::self()->streamIcon : Icons::self()->audioFileIcon); + #endif case ItemView::Role_MainText: return s->title.isEmpty() ? s->file : s->title; case ItemView::Role_SubText: @@ -429,6 +444,7 @@ QVariant PlaylistsModel::data(const QModelIndex &index, int role) const return QVariant(); } +#ifndef ENABLE_UBUNTU bool PlaylistsModel::setData(const QModelIndex &index, const QVariant &value, int role) { if (GroupedView::Role_DropAdjust==role) { @@ -438,6 +454,7 @@ bool PlaylistsModel::setData(const QModelIndex &index, const QVariant &value, in return QAbstractItemModel::setData(index, value, role); } } +#endif Qt::ItemFlags PlaylistsModel::flags(const QModelIndex &index) const { @@ -503,6 +520,7 @@ QList PlaylistsModel::songs(const QModelIndexList &indexes) const return songs; } +#ifndef ENABLE_UBUNTU static const QLatin1String constPlaylistNameMimeType("cantata/playlistnames"); static const QLatin1String constPositionsMimeType("cantata/positions"); static const char *constPlaylistProp="hasPlaylist"; @@ -640,6 +658,7 @@ QStringList PlaylistsModel::mimeTypes() const types << PlayQueueModel::constFileNameMimeType; return types; } +#endif void PlaylistsModel::getPlaylists() { @@ -670,6 +689,7 @@ void PlaylistsModel::setEnabled(bool e) } } +#ifndef ENABLE_UBUNTU QMenu * PlaylistsModel::menu() { if (!itemMenu) { @@ -677,6 +697,7 @@ QMenu * PlaylistsModel::menu() } return itemMenu; } +#endif void PlaylistsModel::setPlaylists(const QList &playlists) { @@ -905,6 +926,7 @@ void PlaylistsModel::mpdConnectionStateChanged(bool connected) void PlaylistsModel::updateItemMenu(bool create) { + #ifndef ENABLE_UBUNTU if (!itemMenu) { if (!create) { return; @@ -924,6 +946,7 @@ void PlaylistsModel::updateItemMenu(bool create) foreach (const QString &n, names) { itemMenu->addAction(n, this, SLOT(emitAddToExisting())); } + #endif } PlaylistsModel::PlaylistItem * PlaylistsModel::getPlaylist(const QString &name) diff --git a/models/playlistsmodel.h b/models/playlistsmodel.h index 17349ef7c..dbb1d2335 100644 --- a/models/playlistsmodel.h +++ b/models/playlistsmodel.h @@ -103,22 +103,28 @@ public: bool hasChildren(const QModelIndex &parent = QModelIndex()) const; QModelIndex parent(const QModelIndex &index) const; QModelIndex index(int row, int col, const QModelIndex &parent) const; - QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const; QVariant data(const QModelIndex &, int) const; + #ifndef ENABLE_UBUNTU + QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const; bool setData(const QModelIndex &index, const QVariant &value, int role); + #endif Qt::ItemFlags flags(const QModelIndex &index) const; Qt::DropActions supportedDropActions() const; QStringList filenames(const QModelIndexList &indexes, bool filesOnly=false) const; QList songs(const QModelIndexList &indexes) const; + #ifndef ENABLE_UBUNTU QMimeData * mimeData(const QModelIndexList &indexes) const; bool dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int /*col*/, const QModelIndex &parent); QStringList mimeTypes() const; + #endif void getPlaylists(); void clear(); bool isEnabled() const { return enabled; } void setEnabled(bool e); bool exists(const QString &n) { return 0!=getPlaylist(n); } + #ifndef ENABLE_UBUNTU QMenu * menu(); + #endif const QSet & genres() { return plGenres; } static QString strippedText(QString s); void setMultiColumn(bool m) { multiCol=m; } @@ -159,9 +165,11 @@ private: QList items; QSet usedKeys; QSet plGenres; + #ifndef ENABLE_UBUNTU QMenu *itemMenu; quint32 dropAdjust; QAction *newAction; + #endif }; #endif diff --git a/models/playqueuemodel.cpp b/models/playqueuemodel.cpp index 1e9c00b99..cf1f6a9a7 100644 --- a/models/playqueuemodel.cpp +++ b/models/playqueuemodel.cpp @@ -66,6 +66,7 @@ #include "modeltest.h" #endif +#ifndef ENABLE_UBUNTU const QLatin1String PlayQueueModel::constMoveMimeType("cantata/move"); const QLatin1String PlayQueueModel::constFileNameMimeType("cantata/filename"); const QLatin1String PlayQueueModel::constUriMimeType("text/uri-list"); @@ -153,13 +154,16 @@ QString PlayQueueModel::headerText(int col) default: return QString(); } } +#endif PlayQueueModel::PlayQueueModel(QObject *parent) : QAbstractItemModel(parent) , currentSongId(-1) , currentSongRowNum(-1) , mpdState(MPDState_Inactive) + #ifndef ENABLE_UBUNTU , dropAdjust(0) + #endif , stopAfterCurrent(false) , stopAfterTrackId(-1) , undoLimit(Settings::self()->undoSteps()) @@ -240,6 +244,7 @@ QModelIndex PlayQueueModel::parent(const QModelIndex &idx) const return QModelIndex(); } +#ifndef ENABLE_UBUNTU QVariant PlayQueueModel::headerData(int section, Qt::Orientation orientation, int role) const { if (Qt::Horizontal==orientation) { @@ -282,6 +287,7 @@ QVariant PlayQueueModel::headerData(int section, Qt::Orientation orientation, in return QVariant(); } +#endif int PlayQueueModel::rowCount(const QModelIndex &idx) const { @@ -518,6 +524,7 @@ QVariant PlayQueueModel::data(const QModelIndex &index, int role) const case COL_PRIO: return int(Qt::AlignVCenter|Qt::AlignRight); } + #ifndef ENABLE_UBUNTU case PlayQueueView::Role_Decoration: { qint32 id=songs.at(index.row()).id; if (id==currentSongId) { @@ -532,6 +539,7 @@ QVariant PlayQueueModel::data(const QModelIndex &index, int role) const } break; } + #endif default: break; } @@ -539,6 +547,7 @@ QVariant PlayQueueModel::data(const QModelIndex &index, int role) const return QVariant(); } +#ifndef ENABLE_UBUNTU bool PlayQueueModel::setData(const QModelIndex &index, const QVariant &value, int role) { if (GroupedView::Role_DropAdjust==role) { @@ -548,6 +557,7 @@ bool PlayQueueModel::setData(const QModelIndex &index, const QVariant &value, in return QAbstractItemModel::setData(index, value, role); } } +#endif Qt::DropActions PlayQueueModel::supportedDropActions() const { @@ -562,6 +572,7 @@ Qt::ItemFlags PlayQueueModel::flags(const QModelIndex &index) const return Qt::ItemIsDropEnabled; } +#ifndef ENABLE_UBUNTU /** * @return A QStringList with the mimetypes we support */ @@ -651,13 +662,18 @@ bool PlayQueueModel::dropMimeData(const QMimeData *data, } return false; } +#endif void PlayQueueModel::load(const QStringList &urls) { + #ifdef ENABLE_UBUNTU + Q_UNUSED(urls) + #else QStringList useable=parseUrls(urls, false); if (useable.count()) { addItems(useable, songs.count(), songs.isEmpty(), 0); } + #endif } void PlayQueueModel::addItems(const QStringList &items, int row, bool replace, quint8 priority) @@ -995,7 +1011,9 @@ void PlayQueueModel::enableUndo(bool e) undoStack.clear(); redoStack.clear(); } + #ifndef ENABLE_UBUNTU controlActions(); + #endif } static PlayQueueModel::UndoItem getState(const QList &songs) @@ -1080,6 +1098,7 @@ void PlayQueueModel::saveHistory(const QList &prevList) lastCommand=Cmd_Other; } +#ifndef ENABLE_UBUNTU void PlayQueueModel::controlActions() { undoAction->setEnabled(!undoStack.isEmpty()); @@ -1124,9 +1143,11 @@ static bool yearSort(const Song &s1, const Song &s2) { return s1.year(sender()); if (act) { QString key=act->property(constSortByKey).toString(); @@ -1151,6 +1172,7 @@ void PlayQueueModel::sortBy() emit filesAdded(files, 0, 0, MPDState_Playing==MPDStatus::self()->state() ? MPDConnection::AddReplaceAndPlay : MPDConnection::AddAndReplace , 0); } } + #endif } void PlayQueueModel::removeDuplicates() diff --git a/models/playqueuemodel.h b/models/playqueuemodel.h index 1623eb295..ed495c4a1 100644 --- a/models/playqueuemodel.h +++ b/models/playqueuemodel.h @@ -69,6 +69,7 @@ public: QList priority; }; + #ifndef ENABLE_UBUNTU static const QLatin1String constMoveMimeType; static const QLatin1String constFileNameMimeType; static const QLatin1String constUriMimeType; @@ -76,19 +77,24 @@ public: static void encode(QMimeData &mimeData, const QString &mime, const QStringList &values); static QStringList decode(const QMimeData &mimeData, const QString &mime); static QString headerText(int col); + #endif PlayQueueModel(QObject *parent = 0); ~PlayQueueModel(); QModelIndex index(int row, int column, const QModelIndex &parent=QModelIndex()) const; QModelIndex parent(const QModelIndex &idx) const; + #ifndef ENABLE_UBUNTU QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const; + #endif int rowCount(const QModelIndex &parent = QModelIndex()) const; int columnCount(const QModelIndex &) const { return COL_COUNT; } #ifdef ENABLE_UBUNTU QHash roleNames() const; #endif QVariant data(const QModelIndex &, int) const; + #ifndef ENABLE_UBUNTU bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole); + #endif void updateCurrentSong(quint32 id); qint32 getIdByRow(qint32 row) const; qint32 getSongId(const QString &file) const; @@ -98,9 +104,11 @@ public: Song getSongById(qint32 id) const; Qt::DropActions supportedDropActions() const; Qt::ItemFlags flags(const QModelIndex &index) const; + #ifndef ENABLE_UBUNTU QStringList mimeTypes() const; QMimeData *mimeData(const QModelIndexList &indexes) const; bool dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent); + #endif QStringList filenames(); void clear(); qint32 currentSong() const { return currentSongId; } @@ -169,7 +177,9 @@ private: mutable qint32 currentSongRowNum; StreamFetcher *fetcher; MPDState mpdState; + #ifndef ENABLE_UBUNTU quint32 dropAdjust; + #endif bool stopAfterCurrent; qint32 stopAfterTrackId; Action *removeDuplicatesAction; diff --git a/models/playqueueproxymodel.cpp b/models/playqueueproxymodel.cpp index 8a4763a8d..fa38cbdd8 100644 --- a/models/playqueueproxymodel.cpp +++ b/models/playqueueproxymodel.cpp @@ -49,6 +49,7 @@ bool PlayQueueProxyModel::filterAcceptsRow(int sourceRow, const QModelIndex &sou return index.isValid() && matchesFilter(*static_cast(index.internalPointer())); } +#ifndef ENABLE_UBUNTU QMimeData *PlayQueueProxyModel::mimeData(const QModelIndexList &indexes) const { QModelIndexList sourceIndexes; @@ -65,3 +66,4 @@ bool PlayQueueProxyModel::dropMimeData(const QMimeData *data, Qt::DropAction act const QModelIndex sourceIndex = mapToSource(index(row, column, parent)); return sourceModel()->dropMimeData(data, action, sourceIndex.row(), sourceIndex.column(), sourceIndex.parent()); } +#endif diff --git a/models/playqueueproxymodel.h b/models/playqueueproxymodel.h index c99864001..d27974ecc 100644 --- a/models/playqueueproxymodel.h +++ b/models/playqueueproxymodel.h @@ -28,6 +28,7 @@ #define PLAYQUEUEPROXYMODEL_H #include "proxymodel.h" +#include "config.h" class PlayQueueProxyModel : public ProxyModel { @@ -37,8 +38,10 @@ public: PlayQueueProxyModel(QObject *parent = 0); bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const; + #ifndef ENABLE_UBUNTU QMimeData *mimeData(const QModelIndexList &indexes) const; bool dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent); + #endif }; #endif diff --git a/models/searchmodel.cpp b/models/searchmodel.cpp index 07372fb92..3f1298229 100644 --- a/models/searchmodel.cpp +++ b/models/searchmodel.cpp @@ -39,6 +39,7 @@ #include "modeltest.h" #endif +#ifndef ENABLE_UBUNTU QString SearchModel::headerText(int col) { switch (col) { @@ -52,6 +53,7 @@ QString SearchModel::headerText(int col) default: return QString(); } } +#endif SearchModel::SearchModel(QObject *parent) : ActionModel(parent) @@ -82,6 +84,7 @@ QModelIndex SearchModel::parent(const QModelIndex &index) const return QModelIndex(); } +#ifndef ENABLE_UBUNTU QVariant SearchModel::headerData(int section, Qt::Orientation orientation, int role) const { if (Qt::Horizontal==orientation) { @@ -119,6 +122,8 @@ QVariant SearchModel::headerData(int section, Qt::Orientation orientation, int r } return QVariant(); } +#endif + int SearchModel::rowCount(const QModelIndex &parent) const @@ -135,6 +140,7 @@ QVariant SearchModel::data(const QModelIndex &index, int role) const } switch (role) { + #ifndef ENABLE_UBUNTU case Qt::DecorationRole: if (multiCol) { return QVariant(); @@ -157,6 +163,7 @@ QVariant SearchModel::data(const QModelIndex &index, int role) const case COL_YEAR: return int(Qt::AlignVCenter|Qt::AlignRight); } + #endif case Qt::DisplayRole: if (multiCol) { switch (index.column()) { @@ -240,6 +247,7 @@ QList SearchModel::songs(const QModelIndexList &indexes, bool allowPlaylis return list; } +#ifndef ENABLE_UBUNTU QMimeData * SearchModel::mimeData(const QModelIndexList &indexes) const { QMimeData *mimeData = new QMimeData(); @@ -253,6 +261,7 @@ QStringList SearchModel::mimeTypes() const types << PlayQueueModel::constFileNameMimeType; return types; } +#endif void SearchModel::refresh() { diff --git a/models/searchmodel.h b/models/searchmodel.h index 117762c46..a097c825b 100644 --- a/models/searchmodel.h +++ b/models/searchmodel.h @@ -53,7 +53,9 @@ public: ~SearchModel(); QModelIndex index(int, int, const QModelIndex & = QModelIndex()) const; QModelIndex parent(const QModelIndex &) const; + #ifndef ENABLE_UBUNTU QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const; + #endif int rowCount(const QModelIndex &parent = QModelIndex()) const; int columnCount(const QModelIndex &) const { return COL_COUNT; } QVariant data(const QModelIndex &, int) const; @@ -61,8 +63,10 @@ public: QStringList filenames(const QModelIndexList &indexes, bool allowPlaylists=false) const; QList songs(const QModelIndexList &indexes, bool allowPlaylists=false) const; + #ifndef ENABLE_UBUNTU QMimeData * mimeData(const QModelIndexList &indexes) const; QStringList mimeTypes() const; + #endif void refresh(); void clear(); diff --git a/support/CMakeLists.txt b/support/CMakeLists.txt index a1b00ca6c..f32de9af5 100644 --- a/support/CMakeLists.txt +++ b/support/CMakeLists.txt @@ -1,5 +1,5 @@ -set(SUPPORT_CORE_SRCS icon.cpp utils.cpp thread.cpp configuration.cpp action.cpp actioncollection.cpp) -set(SUPPORT_CORE_MOC_HDRS thread.h action.h actioncollection.h) +set(SUPPORT_CORE_SRCS utils.cpp thread.cpp configuration.cpp) +set(SUPPORT_CORE_MOC_HDRS thread.h) include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${QTINCLUDES}) @@ -12,10 +12,10 @@ endif (ENABLE_QT5) add_library(support-core STATIC ${SUPPORT_CORE_MOC_SRCS} ${SUPPORT_CORE_SRCS}) if (NOT ENABLE_UBUNTU) - set(SUPPORT_SRCS fancytabwidget.cpp messagewidget.cpp buddylabel.cpp + set(SUPPORT_SRCS icon.cpp fancytabwidget.cpp messagewidget.cpp buddylabel.cpp action.cpp actioncollection.cpp lineedit.cpp gtkstyle.cpp spinner.cpp messagebox.cpp inputdialog.cpp thread.cpp squeezedtextlabel.cpp) - set(SUPPORT_MOC_HDRS fancytabwidget.h messagewidget.h inputdialog.h pagewidget.h) + set(SUPPORT_MOC_HDRS fancytabwidget.h messagewidget.h inputdialog.h pagewidget.h action.h actioncollection.h) if (NOT WIN32) set(SUPPORT_SRCS ${SUPPORT_SRCS} windowmanager.cpp gtkproxystyle.cpp combobox.cpp shortcuthandler.cpp)