From 4af5bef66fdde0dfdad469dcc803dd39fdfde1c6 Mon Sep 17 00:00:00 2001 From: Noah Mayr Date: Thu, 2 Jan 2014 14:15:44 +0100 Subject: Added .DS_Store to .gitignore. --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index a58d38f3..54bd5039 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,5 @@ tags # YouCompleteMe config stuff. .ycm_extra_conf.* +#OSX Stuff +.DS_Store -- cgit v1.2.3 From 1bdac97af51b77ddcf4934752c2a7d0704c8f7be Mon Sep 17 00:00:00 2001 From: Noah Mayr Date: Thu, 2 Jan 2014 15:22:57 +0100 Subject: Fixed buttons on osx by adding the accessible plugin. --- CMakeLists.txt | 12 ++++++++++++ 1 file changed, 12 insertions(+) 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 -- cgit v1.2.3 From cdebeff179b78b9acb013cea7a9b71f45bef751d Mon Sep 17 00:00:00 2001 From: Noah Mayr Date: Thu, 2 Jan 2014 17:01:26 +0100 Subject: Improved java detection on OSX. --- logic/JavaUtils.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/logic/JavaUtils.cpp b/logic/JavaUtils.cpp index e1b3bc64..8005c375 100644 --- a/logic/JavaUtils.cpp +++ b/logic/JavaUtils.cpp @@ -181,6 +181,8 @@ QList JavaUtils::FindJavaPaths() QList 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; } -- cgit v1.2.3 From 092b15fc8716af61472ffdd953429792183b350d Mon Sep 17 00:00:00 2001 From: max96at Date: Thu, 2 Jan 2014 17:07:47 +0100 Subject: Removed incomplete osx java detection log message --- logic/JavaUtils.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/logic/JavaUtils.cpp b/logic/JavaUtils.cpp index 8005c375..cf47df6f 100644 --- a/logic/JavaUtils.cpp +++ b/logic/JavaUtils.cpp @@ -177,8 +177,6 @@ QList JavaUtils::FindJavaPaths() #elif OSX QList JavaUtils::FindJavaPaths() { - QLOG_INFO() << "OS X Java detection incomplete - defaulting to \"java\""; - QList javas; javas.append(this->GetDefaultJava()->path); javas.append("/Library/Internet Plug-Ins/JavaAppletPlugin.plugin/Contents/Home/bin/java"); -- cgit v1.2.3 From c0b6fd0647fe90084f3d2750cb26e3b9cb611266 Mon Sep 17 00:00:00 2001 From: Jan Dalheimer Date: Thu, 2 Jan 2014 18:51:40 +0100 Subject: Make .ico files usable (the plugin is already included) --- gui/dialogs/IconPickerDialog.cpp | 2 +- logic/icons/IconList.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) 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/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" -- cgit v1.2.3