Merge pull request #6765 from Montellese/media_window_cosmetics

CGUIMediaWindow cosmetics

2 files changed, 66 insertions, 53 deletions

diff --git a/xbmc/windows/GUIMediaWindow.cpp b/xbmc/windows/GUIMediaWindow.cpp
index 0625a4549d..fd741a43b3 100644
--- a/xbmc/windows/GUIMediaWindow.cpp
+++ b/xbmc/windows/GUIMediaWindow.cpp
@@ -18,61 +18,60 @@
  *
  */
 
-#include "threads/SystemClock.h"
 #include "GUIMediaWindow.h"
+#include "Application.h"
+#include "ApplicationMessenger.h"
+#include "ContextMenuManager.h"
+#include "FileItemListModification.h"
+#include "GUIPassword.h"
 #include "GUIUserMessages.h"
-#include "Util.h"
+#include "PartyModeManager.h"
 #include "PlayListPlayer.h"
+#include "URL.h"
+#include "Util.h"
 #include "addons/AddonManager.h"
+#include "addons/GUIDialogAddonSettings.h"
 #include "addons/PluginSource.h"
-#include "filesystem/PluginDirectory.h"
-#include "filesystem/MultiPathDirectory.h"
-#include "GUIPassword.h"
-#include "Application.h"
-#include "ApplicationMessenger.h"
-#include "network/Network.h"
-#include "utils/RegExp.h"
-#include "PartyModeManager.h"
+#if defined(TARGET_ANDROID)
+#include "android/activity/XBMCApp.h"
+#endif
+#include "dialogs/GUIDialogKaiToast.h"
+#include "dialogs/GUIDialogMediaFilter.h"
 #include "dialogs/GUIDialogMediaSource.h"
-#include "GUIWindowFileManager.h"
-#include "filesystem/FavouritesDirectory.h"
-#include "utils/LabelFormatter.h"
+#include "dialogs/GUIDialogOK.h"
 #include "dialogs/GUIDialogProgress.h"
-#include "profiles/ProfilesManager.h"
-#include "settings/AdvancedSettings.h"
-#include "settings/Settings.h"
-#include "URL.h"
-
 #include "dialogs/GUIDialogSmartPlaylistEditor.h"
-#include "addons/GUIDialogAddonSettings.h"
 #include "dialogs/GUIDialogYesNo.h"
-#include "guilib/GUIWindowManager.h"
-#include "dialogs/GUIDialogOK.h"
-#include "playlists/PlayList.h"
-#include "storage/MediaManager.h"
-#include "video/VideoLibraryQueue.h"
-#include "utils/StringUtils.h"
-#include "utils/URIUtils.h"
-#include "input/Key.h"
-#include "guilib/LocalizeStrings.h"
-#include "utils/TimeUtils.h"
+#include "filesystem/FavouritesDirectory.h"
 #include "filesystem/File.h"
 #include "filesystem/FileDirectoryFactory.h"
-#include "utils/log.h"
-#include "utils/FileUtils.h"
+#include "filesystem/MultiPathDirectory.h"
+#include "filesystem/PluginDirectory.h"
+#include "filesystem/SmartPlaylistDirectory.h"
 #include "guilib/GUIEditControl.h"
 #include "guilib/GUIKeyboardFactory.h"
+#include "guilib/GUIWindowManager.h"
+#include "guilib/LocalizeStrings.h"
 #include "interfaces/Builtins.h"
 #include "interfaces/generic/ScriptInvocationManager.h"
-#include "dialogs/GUIDialogKaiToast.h"
-#include "dialogs/GUIDialogMediaFilter.h"
-#include "filesystem/SmartPlaylistDirectory.h"
-#if defined(TARGET_ANDROID)
-#include "xbmc/android/activity/XBMCApp.h"
-#endif
-#include "FileItemListModification.h"
+#include "input/Key.h"
+#include "network/Network.h"
+#include "playlists/PlayList.h"
+#include "profiles/ProfilesManager.h"
+#include "settings/AdvancedSettings.h"
+#include "settings/Settings.h"
+#include "storage/MediaManager.h"
+#include "threads/SystemClock.h"
+#include "utils/FileUtils.h"
+#include "utils/LabelFormatter.h"
+#include "utils/log.h"
+#include "utils/RegExp.h"
+#include "utils/StringUtils.h"
+#include "utils/TimeUtils.h"
+#include "utils/URIUtils.h"
 #include "video/VideoInfoTag.h"
-#include "ContextMenuManager.h"
+#include "video/VideoLibraryQueue.h"
+#include "windows/GUIWindowFileManager.h"
 
 #define CONTROL_BTNVIEWASICONS       2
 #define CONTROL_BTNSORTBY            3
@@ -81,6 +80,9 @@
 
 #define CONTROL_LABELFILES          12
 
+#define CONTROL_VIEW_START          50
+#define CONTROL_VIEW_END            59
+
 #define PROPERTY_PATH_DB            "path.db"
 #define PROPERTY_SORT_ORDER         "sort.order"
 #define PROPERTY_SORT_ASCENDING     "sort.ascending"
@@ -108,9 +110,6 @@ CGUIMediaWindow::~CGUIMediaWindow()
   delete m_unfilteredItems;
 }
 
-#define CONTROL_VIEW_START        50
-#define CONTROL_VIEW_END          59
-
 void CGUIMediaWindow::LoadAdditionalTags(TiXmlElement *root)
 {
   CGUIWindow::LoadAdditionalTags(root);
diff --git a/xbmc/windows/GUIMediaWindow.h b/xbmc/windows/GUIMediaWindow.h
index f961efb76f..b74341f1d9 100644
--- a/xbmc/windows/GUIMediaWindow.h
+++ b/xbmc/windows/GUIMediaWindow.h
@@ -20,13 +20,13 @@
  *
  */
 
-#include "guilib/GUIWindow.h"
-#include "filesystem/VirtualDirectory.h"
+#include "dialogs/GUIDialogContextMenu.h"
 #include "filesystem/DirectoryHistory.h"
+#include "filesystem/VirtualDirectory.h"
+#include "guilib/GUIWindow.h"
+#include "playlists/SmartPlayList.h"
 #include "view/GUIViewControl.h"
 #include "view/GUIViewState.h"
-#include "dialogs/GUIDialogContextMenu.h"
-#include "playlists/SmartPlayList.h"
 
 class CFileItemList;
 
@@ -36,26 +36,37 @@ class CGUIMediaWindow : public CGUIWindow
 public:
   CGUIMediaWindow(int id, const char *xmlFile);
   virtual ~CGUIMediaWindow(void);
-  virtual bool OnMessage(CGUIMessage& message);
+
+  // specializations of CGUIControl
   virtual bool OnAction(const CAction &action);
   virtual bool OnBack(int actionID);
+  virtual bool OnMessage(CGUIMessage& message);
+
+  // specializations of CGUIWindow
   virtual void OnWindowLoaded();
   virtual void OnWindowUnload();
   virtual void OnInitWindow();
-  virtual bool IsMediaWindow() const { return true; };
-  const CFileItemList &CurrentDirectory() const;
-  int GetViewContainerID() const { return m_viewControl.GetCurrentControl(); };
-  virtual bool HasListItems() const { return true; };
+  virtual bool IsMediaWindow() const { return true; }
+  int GetViewContainerID() const { return m_viewControl.GetCurrentControl(); }
+  virtual bool HasListItems() const { return true; }
   virtual CFileItemPtr GetCurrentListItem(int offset = 0);
-  const CGUIViewState *GetViewState() const;
 
+  // custom methods
   virtual bool CanFilterAdvanced() { return m_canFilterAdvanced; }
   virtual bool IsFiltered();
   virtual bool IsSameStartFolder(const std::string &dir);
 
+  const CFileItemList &CurrentDirectory() const;
+  const CGUIViewState *GetViewState() const;
+
 protected:
+  // specializations of CGUIControlGroup
+  virtual CGUIControl *GetFirstFocusableControl(int id);
+
+  // specializations of CGUIWindow
   virtual void LoadAdditionalTags(TiXmlElement *root);
-  CGUIControl *GetFirstFocusableControl(int id);
+
+  // custom methods
   virtual void SetupShares();
   virtual void GoParentFolder();
   virtual bool OnClick(int iItem);
@@ -66,10 +77,12 @@ protected:
    */
   virtual bool OnSelect(int item);
   virtual bool OnPopupMenu(int iItem);
+
   virtual void GetContextButtons(int itemNumber, CContextButtons &buttons);
   virtual bool OnContextButton(int itemNumber, CONTEXT_BUTTON button);
   virtual void FormatItemLabels(CFileItemList &items, const LABEL_MASKS &labelMasks);
   virtual void UpdateButtons();
+
   virtual bool GetDirectory(const std::string &strDirectory, CFileItemList &items);
   /*! \brief Retrieves the items from the given path and updates the list
    \param strDirectory The path to the directory to get the items from
@@ -86,6 +99,7 @@ protected:
    \sa GetDirectory
    */
   virtual bool Refresh(bool clearCache = false);
+
   virtual void FormatAndSort(CFileItemList &items);
   virtual void OnPrepareFileItems(CFileItemList &items);
   virtual void OnCacheFileItems(CFileItemList &items);