From ff33d4a1a48abf1442cde77c2253f071d0870d50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Mon, 12 Aug 2013 00:39:19 +0200 Subject: OneSix instances now have a minecraft folder inside. Also, the main instance view was expanded with helpful key events: F2 for rename, F5 for refresh, Enter for start instance, Delete for... --- backend/BaseInstance.cpp | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'backend/BaseInstance.cpp') diff --git a/backend/BaseInstance.cpp b/backend/BaseInstance.cpp index d94f3de9..951b403a 100644 --- a/backend/BaseInstance.cpp +++ b/backend/BaseInstance.cpp @@ -75,7 +75,7 @@ BaseInstance::BaseInstance( BaseInstancePrivate* d_in, QString BaseInstance::id() const { - return QFileInfo(rootDir()).fileName(); + return QFileInfo(instanceRoot()).fileName(); } QString BaseInstance::instanceType() const @@ -85,12 +85,23 @@ QString BaseInstance::instanceType() const } -QString BaseInstance::rootDir() const +QString BaseInstance::instanceRoot() const { I_D(BaseInstance); return d->m_rootDir; } +QString BaseInstance::minecraftRoot() const +{ + QFileInfo mcDir(PathCombine(instanceRoot(), "minecraft")); + QFileInfo dotMCDir(PathCombine(instanceRoot(), ".minecraft")); + + if (dotMCDir.exists() && !mcDir.exists()) + return dotMCDir.filePath(); + else + return mcDir.filePath(); +} + InstanceList *BaseInstance::instList() const { if (parent()->inherits("InstanceList")) -- cgit v1.2.3