Moved & renamed infowidgets/ to viewpages/

src/libtomahawk/CMakeLists.txt

@@ -145,14 +145,14 @@ set( libGuiSources
     widgets/RecentlyPlayedPlaylistsModel.cpp
     widgets/ScriptCollectionHeader.cpp
     widgets/ScrollingLabel.cpp
-    widgets/SearchWidget.cpp
     widgets/SeekSlider.cpp
     widgets/SourceTreePopupDialog.cpp
     widgets/ToggleButton.cpp
-    widgets/infowidgets/SourceInfoWidget.cpp
+    viewpages/SearchViewPage.cpp
-    widgets/infowidgets/ArtistInfoWidget.cpp
+    viewpages/SourceViewPage.cpp
-    widgets/infowidgets/AlbumInfoWidget.cpp
+    viewpages/ArtistViewPage.cpp
-    widgets/infowidgets/TrackInfoWidget.cpp
+    viewpages/AlbumViewPage.cpp
+    viewpages/TrackViewPage.cpp
     widgets/searchlineedit/ClearButton.cpp
     widgets/searchlineedit/LineEdit.cpp
     widgets/searchlineedit/SearchButton.cpp
@@ -373,13 +373,13 @@ ENDIF(LIBLASTFM_FOUND)
 set( libUI ${libUI}
     widgets/PlaylistTypeSelectorDialog.ui
     widgets/NewPlaylistWidget.ui
-    widgets/SearchWidget.ui
     widgets/HeaderWidget.ui
     widgets/NewReleasesWidget.ui
-    widgets/infowidgets/SourceInfoWidget.ui
+    viewpages/SearchViewPage.ui
-    widgets/infowidgets/ArtistInfoWidget.ui
+    viewpages/SourceViewPage.ui
-    widgets/infowidgets/AlbumInfoWidget.ui
+    viewpages/ArtistViewPage.ui
-    widgets/infowidgets/TrackInfoWidget.ui
+    viewpages/AlbumViewPage.ui
+    viewpages/TrackViewPage.ui
     playlist/QueueView.ui
     filemetadata/MetadataEditor.ui
     accounts/AccountFactoryWrapper.ui
@@ -566,7 +566,7 @@ file( GLOB thirdpartyKdsingleapplicationguardHeaders "thirdparty/kdsingleapplica
 file( GLOB thirdpartyQocoaHeaders "thirdparty/Qocoa/*.h" )
 file( GLOB utilsHeaders "utils/*.h" )
 file( GLOB widgetsHeaders "widgets/*.h" )
-file( GLOB widgetsInfowidgetsHeaders "widgets/infowidgets/*.h" )
+file( GLOB widgetsViewpagesHeaders "viewpages/*.h" )
 file( GLOB widgetsSearchlineeditHeaders "widgets/searchlineedit/*.h" )
 
 install( FILES ${CMAKE_CURRENT_BINARY_DIR}/config.h DESTINATION include/libtomahawk )
@@ -595,5 +595,5 @@ install( FILES ${thirdpartyKdsingleapplicationguardHeaders} DESTINATION include/
 install( FILES ${thirdpartyQocoaHeaders} DESTINATION include/libtomahawk/thirdparty/Qocoa )
 install( FILES ${utilsHeaders} DESTINATION include/libtomahawk/utils )
 install( FILES ${widgetsHeaders} DESTINATION include/libtomahawk/widgets )
-install( FILES ${widgetsInfowidgetsHeaders} DESTINATION include/libtomahawk/widgets/infowidgets )
+install( FILES ${widgetsViewpagesHeaders} DESTINATION include/libtomahawk/viewpages )
 install( FILES ${widgetsSearchlineeditHeaders} DESTINATION include/libtomahawk/widgets/searchlineedit )

src/libtomahawk/GlobalActionManager.cpp

@@ -47,7 +47,7 @@
 #include "utils/TomahawkUtils.h"
 #include "utils/XspfLoader.h"
 #include "utils/XspfGenerator.h"
-#include "widgets/SearchWidget.h"
+#include "viewpages/SearchViewPage.h"
 
 #include "Album.h"
 #include "Artist.h"

src/libtomahawk/ViewManager.cpp

@@ -44,10 +44,10 @@
 #include "playlist/dynamic/widgets/DynamicWidget.h"
 #include "resolvers/ScriptCollection.h"
 #include "widgets/NewReleasesWidget.h"
-#include "widgets/infowidgets/SourceInfoWidget.h"
+#include "viewpages/SourceViewPage.h"
-#include "widgets/infowidgets/ArtistInfoWidget.h"
+#include "viewpages/ArtistViewPage.h"
-#include "widgets/infowidgets/AlbumInfoWidget.h"
+#include "viewpages/AlbumViewPage.h"
-#include "widgets/infowidgets/TrackInfoWidget.h"
+#include "viewpages/TrackViewPage.h"
 #include "widgets/NewPlaylistWidget.h"
 #include "widgets/AnimatedSplitter.h"
 

src/libtomahawk/viewpages/AlbumViewPage.cpp

@@ -18,8 +18,8 @@
  *   along with Tomahawk. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "AlbumInfoWidget.h"
+#include "AlbumViewPage.h"
-#include "ui_AlbumInfoWidget.h"
+#include "ui_AlbumViewPage.h"
 
 #include "audio/AudioEngine.h"
 #include "ViewManager.h"

src/libtomahawk/viewpages/ArtistViewPage.cpp

@@ -17,8 +17,8 @@
  *   along with Tomahawk. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "ArtistInfoWidget.h"
+#include "ArtistViewPage.h"
-#include "ui_ArtistInfoWidget.h"
+#include "ui_ArtistViewPage.h"
 
 #include <QDesktopServices>
 #include <QScrollArea>

src/libtomahawk/viewpages/SearchViewPage.cpp

@@ -17,8 +17,8 @@
  *   along with Tomahawk. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "SearchWidget.h"
+#include "SearchViewPage.h"
-#include "ui_SearchWidget.h"
+#include "ui_SearchViewPage.h"
 
 #include "SourceList.h"
 #include "MetaPlaylistInterface.h"

src/libtomahawk/viewpages/SourceViewPage.cpp

@@ -16,8 +16,8 @@
  *   along with Tomahawk. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "SourceInfoWidget.h"
+#include "SourceViewPage.h"
-#include "ui_SourceInfoWidget.h"
+#include "ui_SourceViewPage.h"
 
 #include "Source.h"
 #include "ViewManager.h"

src/libtomahawk/viewpages/TrackViewPage.cpp

@@ -18,8 +18,8 @@
  *   along with Tomahawk. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "TrackInfoWidget.h"
+#include "TrackViewPage.h"
-#include "ui_TrackInfoWidget.h"
+#include "ui_TrackViewPage.h"
 
 #include <QScrollArea>
 #include <QScrollBar>

src/tomahawk/TomahawkWindow.cpp

@@ -49,8 +49,6 @@
 #include "utils/NetworkAccessManager.h"
 #include "widgets/AccountsToolButton.h"
 #include "widgets/AnimatedSplitter.h"
-#include "widgets/NewPlaylistWidget.h"
-#include "widgets/SearchWidget.h"
 #include "widgets/ContainedMenuButton.h"
 #include "thirdparty/Qocoa/qsearchfield.h"
 #include "playlist/dynamic/GeneratorInterface.h"
@@ -65,6 +63,7 @@
 #include "jobview/JobStatusModel.h"
 #include "sip/SipPlugin.h"
 #include "filemetadata/ScanManager.h"
+#include "viewpages/SearchViewPage.h"
 #include "viewpages/whatsnew_0_8/WhatsNew_0_8.h"
 
 #include "Playlist.h"

src/tomahawk/sourcetree/items/TemporaryPageItem.cpp

@@ -21,10 +21,10 @@
 
 #include "GlobalActionManager.h"
 #include "ViewManager.h"
-#include "widgets/infowidgets/AlbumInfoWidget.h"
+#include "viewpages/AlbumViewPage.h"
-#include "widgets/infowidgets/ArtistInfoWidget.h"
+#include "viewpages/ArtistViewPage.h"
-#include "widgets/infowidgets/TrackInfoWidget.h"
+#include "viewpages/TrackViewPage.h"
-#include "widgets/SearchWidget.h"
+#include "viewpages/SearchViewPage.h"
 #include "utils/ImageRegistry.h"
 #include "utils/Closure.h"
 #include "utils/Logger.h"