From 7ac25bf2dae0c4435732265d26924140893914ff Mon Sep 17 00:00:00 2001 From: Andrew Date: Tue, 29 Jan 2013 00:26:24 -0600 Subject: [PATCH] Implemented the view folder buttons on the main window. --- CMakeLists.txt | 2 ++ gui/mainwindow.cpp | 6 ++++-- util/osutils.cpp | 25 +++++++++++++++++++++++++ util/osutils.h | 5 +++++ 4 files changed, 36 insertions(+), 2 deletions(-) create mode 100644 util/osutils.cpp diff --git a/CMakeLists.txt b/CMakeLists.txt index 1859c71b8..218d7f13a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -112,6 +112,7 @@ gui/modeditwindow.cpp gui/settingsdialog.cpp util/pathutils.cpp +util/osutils.cpp java/javautils.cpp java/annotations.cpp @@ -131,6 +132,7 @@ data/version.h util/apputils.h util/pathutils.h +util/osutils.h multimc_pragma.h diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp index eedaddb8d..e2a3abfb6 100644 --- a/gui/mainwindow.cpp +++ b/gui/mainwindow.cpp @@ -19,7 +19,9 @@ #include #include +#include "util/osutils.h" #include "gui/settingsdialog.h" +#include "data/appsettings.h" #include "data/version.h" MainWindow::MainWindow(QWidget *parent) : @@ -46,7 +48,7 @@ void MainWindow::on_actionAddInstance_triggered() void MainWindow::on_actionViewInstanceFolder_triggered() { - + openInDefaultProgram(settings->getInstanceDir()); } void MainWindow::on_actionRefresh_triggered() @@ -56,7 +58,7 @@ void MainWindow::on_actionRefresh_triggered() void MainWindow::on_actionViewCentralModsFolder_triggered() { - + openInDefaultProgram(settings->getCentralModsDir()); } void MainWindow::on_actionCheckUpdate_triggered() diff --git a/util/osutils.cpp b/util/osutils.cpp new file mode 100644 index 000000000..6b0955185 --- /dev/null +++ b/util/osutils.cpp @@ -0,0 +1,25 @@ +/* Copyright 2013 MultiMC Contributors + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "osutils.h" + +#include +#include +#include + +void openInDefaultProgram(QString filename) +{ + QDesktopServices::openUrl("file:///" + QFileInfo(filename).absolutePath()); +} diff --git a/util/osutils.h b/util/osutils.h index 263f1f6df..f779ea2df 100644 --- a/util/osutils.h +++ b/util/osutils.h @@ -16,6 +16,8 @@ #ifndef OSUTILS_H #define OSUTILS_H +#include + #if defined _WIN32 | defined _WIN64 #define WINDOWS 1 #elif __APPLE__ & __MACH__ @@ -24,4 +26,7 @@ #define LINUX 1 #endif +// Opens the given file in the default application. +void openInDefaultProgram(QString filename); + #endif // OSUTILS_H