Ticket #1760: mythgallery.diff

gallerysettings.cpp

@@ -30 +30 @@
     return gc;
 };
 
+static HostComboBox *MythGallerySortOrder()
+{
+    HostComboBox *gc = new HostComboBox("GallerySortOrder");
+    gc->setLabel(QObject::tr("Sort order when browsing"));
+    gc->addSelection("Name (A-Z alpha)", QString::number(QDir::Name | QDir::DirsFirst | QDir::IgnoreCase));
+    gc->addSelection("Reverse Name (Z-A alpha)", QString::number(QDir::Name | QDir::DirsFirst | QDir::IgnoreCase | QDir::Reversed));
+    gc->addSelection("Mod Time (earliest first)", QString::number(QDir::Time | QDir::DirsFirst | QDir::IgnoreCase | QDir::Reversed));
+    gc->addSelection("Reverse Mod Time (most recent first)", QString::number(QDir::Time | QDir::DirsFirst | QDir::IgnoreCase));
+    gc->setHelpText(QObject::tr("This is the sort order for the displayed "
+                    "picture thumbnails."));
+    return gc;
+};
+
 static HostLineEdit *MythGalleryMoviePlayerCmd()
 {
     HostLineEdit *gc = new HostLineEdit("GalleryMoviePlayerCmd");
@@ -161 +174 @@
 
         addChild(MythGalleryDir());
         addChild(MythGalleryThumbnailLocation());
+        addChild(MythGallerySortOrder());
         addChild(MythGalleryImportDirs());
         addChild(MythGalleryMoviePlayerCmd());
 

iconview.cpp

@@ -92 +92 @@
 }
 
 IconView::IconView(const QString& galleryDir, MythMediaDevice *initialDevice,
-                   MythMainWindow* parent, const char* name )
+                   const int& sortorder, MythMainWindow* parent,
+                   const char* name )
     : MythDialog(parent, name)
 {
-    m_galleryDir = galleryDir;    
+    m_galleryDir = galleryDir;
+    m_sortorder  = sortorder;
 
     m_inMenu     = false;
     m_inSubMenu  = false;
@@ -1450 +1452 @@
         return;
 
     d.setNameFilter(MEDIA_FILENAMES);
-    d.setSorting(QDir::Name | QDir::DirsFirst | QDir::IgnoreCase);
+    d.setSorting(m_sortorder);
     d.setFilter(QDir::Files | QDir::Dirs | QDir::NoSymLinks  | QDir::Readable);
     d.setMatchAllDirs(true);
     const QFileInfoList *list = d.entryInfoList();

iconview.h

@@ -66 +66 @@
     Q_OBJECT
   public:
     IconView(const QString& galleryDir, MythMediaDevice *initialDevice,
-             MythMainWindow* parent, const char* name = 0);
+             const int& sortorder, MythMainWindow* parent,
+             const char* name = 0);
     ~IconView();
 
   protected:
@@ -122 +123 @@
     QDict<ThumbItem>    m_itemDict;
     QStringList         m_itemMarked;
     QString             m_galleryDir;
+    int                 m_sortorder;
 
     XMLParse           *m_theme;
     QRect               m_menuRect;

main.cpp

@@ -25 +25 @@
 void runGallery(void)
 {
     gContext->addCurrentLocation("mythgallery");
+    int sortorder = gContext->GetNumSetting("GallerySortOrder");
     QString startdir = gContext->GetSetting("GalleryDir");
     QDir dir(startdir);
     if (!dir.exists() || !dir.isReadable()) {
@@ -36 +37 @@
     }
     else
     {
-        IconView icv(startdir, NULL, gContext->GetMainWindow(), "IconView");
+        IconView icv(startdir, NULL, sortorder, gContext->GetMainWindow(), "IconView");
         icv.exec();
     }
     gContext->removeCurrentLocation();