Fix for bad branch handling in OP.

[virtualjaguar] / src / gui / filepicker.h

diff --git a/src/gui/filepicker.h b/src/gui/filepicker.h
index 543de0ebeba39c3a39039fd8c798275b3f4fd341..f304ab141914784c5ac10140d2d2a7fb68e119cd 100644 (file)
--- a/src/gui/filepicker.h
+++ b/src/gui/filepicker.h
@@ -2,13 +2,12 @@
 // filepicker.h - A ROM chooser
 //
 
-#include <QtGui>
-#include "types.h"
+#include <QtWidgets>
 
 // Forward declarations
 class QListWidget;
 class FileThread;
-//class FileListModel;
+class FileListModel;
 class QListView;
 
 class FilePickerWindow: public QWidget
@@ -18,16 +17,34 @@ class FilePickerWindow: public QWidget
 
        public:
                FilePickerWindow(QWidget * parent = 0);
+               QString GetSelectedPrettyName(void);
+               void ScanSoftwareFolder(bool allow = false);
 
        public slots:
                void AddFileToList(unsigned long index);
+               void AddFileToList2(unsigned long index, QString, QImage *, unsigned long size);
+               void AddFileToList3(unsigned long index, QString, QImage *, unsigned long size, bool, unsigned long, unsigned long);
+               void UpdateSelection(const QModelIndex &, const QModelIndex &);
+               void LoadButtonPressed(void);
+               void CatchDoubleClick(const QModelIndex &);
+
+       signals:
+               void RequestLoad(QString);
+               void FilePickerHiding(void);
 
        protected:
+               void keyPressEvent(QKeyEvent *);
 //             void PopulateList(void);
 
        private:
+               QString currentFile;
+               QString prettyFilename;
                QListWidget * fileList2;
                FileThread * fileThread;
-               QAbstractItemModel * model;
+               FileListModel * model;
                QListView * fileList;
+               QLabel * cartImage;
+               QLabel * title;
+               QLabel * data;
+               QPushButton * insertCart;
 };