diff options
| author | Rachel Powers <508861+Ryex@users.noreply.github.com> | 2023-05-12 01:13:17 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-12 01:13:17 -0700 |
| commit | 6b6d6a01dc9cf05715f01e3a549740b169ef9ae3 (patch) | |
| tree | 8ba9746a188c39003213839825552543e3f1a48f /launcher/minecraft/WorldList.h | |
| parent | f27716656c6f6006238203669a7a02f035733fc0 (diff) | |
| parent | c5aff7cc1ef43a1326bd3ce0c83e29669e2ff43f (diff) | |
| download | PrismLauncher-6b6d6a01dc9cf05715f01e3a549740b169ef9ae3.tar.gz PrismLauncher-6b6d6a01dc9cf05715f01e3a549740b169ef9ae3.tar.bz2 PrismLauncher-6b6d6a01dc9cf05715f01e3a549740b169ef9ae3.zip | |
Merge branch 'develop' into fix/network_and_signals
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
Diffstat (limited to 'launcher/minecraft/WorldList.h')
| -rw-r--r-- | launcher/minecraft/WorldList.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/launcher/minecraft/WorldList.h b/launcher/minecraft/WorldList.h index 08294755..10fb4e3c 100644 --- a/launcher/minecraft/WorldList.h +++ b/launcher/minecraft/WorldList.h @@ -21,6 +21,7 @@ #include <QAbstractListModel> #include <QMimeData> #include "minecraft/World.h" +#include "BaseInstance.h" class QFileSystemWatcher; @@ -33,7 +34,8 @@ public: NameColumn, GameModeColumn, LastPlayedColumn, - SizeColumn + SizeColumn, + InfoColumn }; enum Roles @@ -48,7 +50,7 @@ public: IconFileRole }; - WorldList(const QString &dir); + WorldList(const QString &dir, std::shared_ptr<const BaseInstance> instance); virtual QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const; @@ -112,6 +114,8 @@ public: return m_dir; } + QString instDirPath() const; + const QList<World> &allWorlds() const { return worlds; @@ -124,6 +128,7 @@ signals: void changed(); protected: + std::shared_ptr<const BaseInstance> m_instance; QFileSystemWatcher *m_watcher; bool is_watching; QDir m_dir; |