0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop

Browse Source
This commit is contained in:
Sky 2014-01-02 19:49:12 +00:00
commit f08c0e3141
5 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -18,3 +18,5 @@ tags
# YouCompleteMe config stuff. # YouCompleteMe config stuff.
.ycm_extra_conf.* .ycm_extra_conf.*
#OSX Stuff
.DS_Store

12
CMakeLists.txt
View File

@ -612,6 +612,18 @@ INSTALL(
REGEX "d\\." EXCLUDE REGEX "d\\." EXCLUDE
REGEX "_debug\\." EXCLUDE REGEX "_debug\\." EXCLUDE
) )
IF(APPLE)
# Accessible plugin to make buttons look decent on osx
INSTALL(
DIRECTORY "${QT_PLUGINS_DIR}/accessible"
DESTINATION ${PLUGIN_DEST_DIR}
COMPONENT Runtime
REGEX "quick" EXCLUDE
REGEX "d\\." EXCLUDE
REGEX "_debug\\." EXCLUDE
)
ENDIF()
endif() endif()
# qtconf # qtconf

2
gui/dialogs/IconPickerDialog.cpp
View File

@ -103,7 +103,7 @@ void IconPickerDialog::addNewIcon()
QString selectIcons = tr("Select Icons"); QString selectIcons = tr("Select Icons");
//: The type of icon files //: The type of icon files
QStringList fileNames = QFileDialog::getOpenFileNames(this, selectIcons, QString(), QStringList fileNames = QFileDialog::getOpenFileNames(this, selectIcons, QString(),
tr("Icons") + "(*.png *.jpg *.jpeg)"); tr("Icons") + "(*.png *.jpg *.jpeg *.ico)");
MMC->icons()->installIcons(fileNames); MMC->icons()->installIcons(fileNames);
} }

4
logic/JavaUtils.cpp
View File

@ -177,10 +177,10 @@ QList<QString> JavaUtils::FindJavaPaths()
#elif OSX #elif OSX
QList<QString> JavaUtils::FindJavaPaths() QList<QString> JavaUtils::FindJavaPaths()
{ {
QLOG_INFO() << "OS X Java detection incomplete - defaulting to \"java\"";
QList<QString> javas; QList<QString> javas;
javas.append(this->GetDefaultJava()->path); javas.append(this->GetDefaultJava()->path);
javas.append("/Library/Internet Plug-Ins/JavaAppletPlugin.plugin/Contents/Home/bin/java");
javas.append("/System/Library/Frameworks/JavaVM.framework/Versions/Current/Commands/java");
return javas; return javas;
} }

4
logic/icons/IconList.cpp
View File

@ -258,7 +258,7 @@ void IconList::installIcons(QStringList iconFiles)
QString target = PathCombine("icons", fileinfo.fileName()); QString target = PathCombine("icons", fileinfo.fileName());
QString suffix = fileinfo.suffix(); QString suffix = fileinfo.suffix();
if (suffix != "jpeg" && suffix != "png" && suffix != "jpg") if (suffix != "jpeg" && suffix != "png" && suffix != "jpg" && suffix != "ico")
continue; continue;
if (!QFile::copy(file, target)) if (!QFile::copy(file, target))
@ -348,4 +348,4 @@ int IconList::getIconIndex(QString key)
return -1; return -1;
} }
//#include "IconList.moc" //#include "IconList.moc"