summaryrefslogtreecommitdiffstats
path: root/MultiMC.h
diff options
context:
space:
mode:
authorSky <git@bunnies.cc>2013-12-30 06:04:32 -0800
committerSky <git@bunnies.cc>2013-12-30 06:04:32 -0800
commitd62e175cca3d1a9e16741623442f8bdd5c107c02 (patch)
tree9b82e5fd20529ac1ead260b2e7e7f60d54b476e6 /MultiMC.h
parent654f444f55de58f5cf0477e3b08b8f18e8d60831 (diff)
parent76438f6afe4b29b3436bc32ba18e7f4dbdfa636d (diff)
downloadMultiMC-d62e175cca3d1a9e16741623442f8bdd5c107c02.tar
MultiMC-d62e175cca3d1a9e16741623442f8bdd5c107c02.tar.gz
MultiMC-d62e175cca3d1a9e16741623442f8bdd5c107c02.tar.lz
MultiMC-d62e175cca3d1a9e16741623442f8bdd5c107c02.tar.xz
MultiMC-d62e175cca3d1a9e16741623442f8bdd5c107c02.zip
Merge pull request #28 from 02JanDal/feature_editor
Button for opening an editor for the custom.json file
Diffstat (limited to 'MultiMC.h')
-rw-r--r--MultiMC.h11
1 files changed, 8 insertions, 3 deletions
diff --git a/MultiMC.h b/MultiMC.h
index 4a33fb69..602a4673 100644
--- a/MultiMC.h
+++ b/MultiMC.h
@@ -6,7 +6,6 @@
#include "logger/QsLog.h"
#include "logger/QsLogDest.h"
-
class MinecraftVersionList;
class LWJGLVersionList;
class HttpMetaCache;
@@ -101,12 +100,12 @@ public:
/*!
* Installs update from the given update files directory.
*/
- void installUpdates(const QString& updateFilesDir, bool restartOnFinish=false);
+ void installUpdates(const QString &updateFilesDir, bool restartOnFinish = false);
/*!
* Sets MultiMC to install updates from the given directory when it exits.
*/
- void setUpdateOnExit(const QString& updateFilesDir);
+ void setUpdateOnExit(const QString &updateFilesDir);
/*!
* Gets the path to install updates from on exit.
@@ -114,6 +113,12 @@ public:
*/
QString getExitUpdatePath() const;
+ /*!
+ * Opens a json file using either a system default editor, or, if note empty, the editor
+ * specified in the settings
+ */
+ bool openJsonEditor(const QString &filename);
+
private:
void initLogger();