diff options
| author | Sky <git@bunnies.cc> | 2014-01-02 19:49:12 +0000 |
|---|---|---|
| committer | Sky <git@bunnies.cc> | 2014-01-02 19:49:12 +0000 |
| commit | f08c0e3141cfeb50c2a0aff3524fbe74aa64bb9f (patch) | |
| tree | 6ccc6671f06312a54d14bfc5c78dea95f721857c | |
| parent | 47d577b7669e2ff7ea331f75e33911ddf7bffd05 (diff) | |
| parent | aa5f2c8120cc23de0d57c9f0280512adb9a531b3 (diff) | |
| download | MultiMC-f08c0e3141cfeb50c2a0aff3524fbe74aa64bb9f.tar MultiMC-f08c0e3141cfeb50c2a0aff3524fbe74aa64bb9f.tar.gz MultiMC-f08c0e3141cfeb50c2a0aff3524fbe74aa64bb9f.tar.lz MultiMC-f08c0e3141cfeb50c2a0aff3524fbe74aa64bb9f.tar.xz MultiMC-f08c0e3141cfeb50c2a0aff3524fbe74aa64bb9f.zip | |
Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | CMakeLists.txt | 12 | ||||
| -rw-r--r-- | gui/dialogs/IconPickerDialog.cpp | 2 | ||||
| -rw-r--r-- | logic/JavaUtils.cpp | 4 | ||||
| -rw-r--r-- | logic/icons/IconList.cpp | 4 |
5 files changed, 19 insertions, 5 deletions
@@ -18,3 +18,5 @@ tags # YouCompleteMe config stuff. .ycm_extra_conf.* +#OSX Stuff +.DS_Store diff --git a/CMakeLists.txt b/CMakeLists.txt index 39ff15c0..ab04c280 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -612,6 +612,18 @@ INSTALL( REGEX "d\\." 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() # qtconf diff --git a/gui/dialogs/IconPickerDialog.cpp b/gui/dialogs/IconPickerDialog.cpp index cb832d95..f7970b37 100644 --- a/gui/dialogs/IconPickerDialog.cpp +++ b/gui/dialogs/IconPickerDialog.cpp @@ -103,7 +103,7 @@ void IconPickerDialog::addNewIcon() QString selectIcons = tr("Select Icons"); //: The type of icon files QStringList fileNames = QFileDialog::getOpenFileNames(this, selectIcons, QString(), - tr("Icons") + "(*.png *.jpg *.jpeg)"); + tr("Icons") + "(*.png *.jpg *.jpeg *.ico)"); MMC->icons()->installIcons(fileNames); } diff --git a/logic/JavaUtils.cpp b/logic/JavaUtils.cpp index e1b3bc64..cf47df6f 100644 --- a/logic/JavaUtils.cpp +++ b/logic/JavaUtils.cpp @@ -177,10 +177,10 @@ QList<QString> JavaUtils::FindJavaPaths() #elif OSX QList<QString> JavaUtils::FindJavaPaths() { - QLOG_INFO() << "OS X Java detection incomplete - defaulting to \"java\""; - QList<QString> javas; 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; } diff --git a/logic/icons/IconList.cpp b/logic/icons/IconList.cpp index 3a745662..cda2db7b 100644 --- a/logic/icons/IconList.cpp +++ b/logic/icons/IconList.cpp @@ -258,7 +258,7 @@ void IconList::installIcons(QStringList iconFiles) QString target = PathCombine("icons", fileinfo.fileName()); QString suffix = fileinfo.suffix(); - if (suffix != "jpeg" && suffix != "png" && suffix != "jpg") + if (suffix != "jpeg" && suffix != "png" && suffix != "jpg" && suffix != "ico") continue; if (!QFile::copy(file, target)) @@ -348,4 +348,4 @@ int IconList::getIconIndex(QString key) return -1; } -//#include "IconList.moc"
\ No newline at end of file +//#include "IconList.moc" |