# HG changeset patch # User koda # Date 1288650633 -3600 # Node ID 4b165832d2328a0fab09f17244cf5ba415a33045 # Parent b0535bf6163898408a1a10b52eccaa7db5e34cde disable file association on mac for now diff -r b0535bf61638 -r 4b165832d232 QTfrontend/hwform.cpp --- a/QTfrontend/hwform.cpp Mon Nov 01 18:20:50 2010 -0400 +++ b/QTfrontend/hwform.cpp Mon Nov 01 23:30:33 2010 +0100 @@ -1131,6 +1131,9 @@ registry_hkcr.setValue("Hedgewars.Save/DefaultIcon/Default", "\"" + bindir->absolutePath().replace("/", "\\") + "\\hwsfile.ico\",0"); registry_hkcr.setValue("Hedgewars.Demo/Shell/Open/Command/Default", "\"" + bindir->absolutePath().replace("/", "\\") + "\\hwengine.exe\" \"" + datadir->absolutePath().replace("/", "\\") + "\" \"%1\""); registry_hkcr.setValue("Hedgewars.Save/Shell/Open/Command/Default", "\"" + bindir->absolutePath().replace("/", "\\") + "\\hwengine.exe\" \"" + datadir->absolutePath().replace("/", "\\") + "\" \"%1\""); +#elif defined __APPLE__ + success = false; + // TODO; also reenable button in pages.cpp #else if (success) success = checkForDir(QDir::home().absolutePath() + "/.local"); if (success) success = checkForDir(QDir::home().absolutePath() + "/.local/share"); diff -r b0535bf61638 -r 4b165832d232 QTfrontend/pages.cpp --- a/QTfrontend/pages.cpp Mon Nov 01 18:20:50 2010 -0400 +++ b/QTfrontend/pages.cpp Mon Nov 01 23:30:33 2010 +0100 @@ -611,11 +611,12 @@ CBAutoUpdate->setText(QCheckBox::tr("Check for updates at startup")); MiscLayout->addWidget(CBAutoUpdate, 4, 0, 1, 2); #endif +#ifndef __APPLE__ BtnAssociateFiles = new QPushButton(groupMisc); BtnAssociateFiles->setText(QPushButton::tr("Associate file extensions")); BtnAssociateFiles->setEnabled(!custom_data && !custom_config); MiscLayout->addWidget(BtnAssociateFiles, 4, 0, 1, 2); - +#endif gbTBLayout->addWidget(groupMisc, 2, 0); }