dasha_uwu/PrismLauncher
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' of git://github.com/peterix/MultiMC5

Browse source 
Conflicts:
	CMakeLists.txt
	main.cpp
This commit is contained in:
Andrew 2013-02-25 13:31:37 -06:00
commit 23474da175
25 changed files with 2196 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

41
gui/mainwindow.cpp
View file

@ -1,4 +1,8 @@
/* Copyright 2013 MultiMC Contributors
*
* Authors: Andrew Okin
* Peterix
* Orochimarufan <orochimarufan.x3@gmail.com>
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -18,17 +22,23 @@
#include <QMenu>
#include <QMessageBox>
#include <QInputDialog>
#include <QApplication>
#include <QDesktopServices>
#include <QUrl>
#include <QDir>
#include <QFileInfo>
#include "osutils.h"
#include "userutils.h"
#include "pathutils.h"
#include "gui/settingsdialog.h"
#include "gui/newinstancedialog.h"
#include "gui/logindialog.h"
#include "gui/taskdialog.h"
#include "gui/browserdialog.h"
#include "gui/aboutdialog.h"
#include "instancelist.h"
#include "data/appsettings.h"
@ -94,17 +104,20 @@ void MainWindow::on_actionSettings_triggered()
void MainWindow::on_actionReportBug_triggered()
{
QDesktopServices::openUrl(QUrl("http://bugs.forkk.net/"));
//QDesktopServices::openUrl(QUrl("http://bugs.forkk.net/"));
openWebPage(QUrl("http://bugs.forkk.net/"));
}
void MainWindow::on_actionNews_triggered()
{
QDesktopServices::openUrl(QUrl("http://news.forkk.net/"));
//QDesktopServices::openUrl(QUrl("http://news.forkk.net/"));
openWebPage(QUrl("http://news.forkk.net/"));
}
void MainWindow::on_actionAbout_triggered()
{
AboutDialog dialog(this);
dialog.exec();
}
void MainWindow::on_mainToolBar_visibilityChanged(bool)
@ -163,6 +176,26 @@ void MainWindow::onLoginComplete(LoginResponse response)
arg(response.username(), response.sessionID()));
}
// Create A Desktop Shortcut
void MainWindow::on_actionMakeDesktopShortcut_triggered()
{
QString name("Test");
name = QInputDialog::getText(this, tr("MultiMC Shortcut"), tr("Enter a Shortcut Name."), QLineEdit::Normal, name);
Util::createShortCut(Util::getDesktopDir(), QApplication::instance()->applicationFilePath(), QStringList() << "-dl" << QDir::currentPath() << "test", name, "application-x-octet-stream");
QMessageBox::warning(this, "Not useful", "A Dummy Shortcut was created. it will not do anything productive");
}
// BrowserDialog
void MainWindow::openWebPage(QUrl url)
{
BrowserDialog *browser = new BrowserDialog(this);
browser->load(url);
browser->exec();
}
void openInDefaultProgram(QString filename)
{
QDesktopServices::openUrl("file:///" + QFileInfo(filename).absolutePath());