Mercurial > hg > easyhg
comparison mainwindow.cpp @ 212:4c5993d860f3
* OS/X: platform-specific binaries
author | Chris Cannam |
---|---|
date | Wed, 05 Jan 2011 15:55:36 +0000 |
parents | 290a95b5ceae |
children | 90e70a9024f3 |
comparison
equal
deleted
inserted
replaced
211:290a95b5ceae | 212:4c5993d860f3 |
---|---|
503 QSettings settings; | 503 QSettings settings; |
504 settings.beginGroup("Locations"); | 504 settings.beginGroup("Locations"); |
505 QString diff = settings.value("extdiffbinary", "").toString(); | 505 QString diff = settings.value("extdiffbinary", "").toString(); |
506 if (diff == "") { | 506 if (diff == "") { |
507 QStringList bases; | 507 QStringList bases; |
508 bases << "easyhg-extdiff-osx.sh" << "kompare" << "kdiff3" << "meld"; | 508 #ifdef Q_OS_MAC |
509 bases << "easyhg-extdiff-osx.sh"; | |
510 #endif | |
511 bases << "kompare" << "kdiff3" << "meld"; | |
509 bool found = false; | 512 bool found = false; |
510 foreach (QString base, bases) { | 513 foreach (QString base, bases) { |
511 diff = findInPath(base, m_myDirPath, true); | 514 diff = findInPath(base, m_myDirPath, true); |
512 if (diff != base && diff != base + ".exe") { | 515 if (diff != base && diff != base + ".exe") { |
513 found = true; | 516 found = true; |
531 if (v != QVariant()) { | 534 if (v != QVariant()) { |
532 return v.toString(); // even if empty: user may have specified no external tool | 535 return v.toString(); // even if empty: user may have specified no external tool |
533 } | 536 } |
534 QString merge; | 537 QString merge; |
535 QStringList bases; | 538 QStringList bases; |
536 bases << "fmdiff3" << "meld" << "diffuse" << "kdiff3"; | 539 #ifdef Q_OS_MAC |
540 bases << "easyhg-merge-osx.sh"; | |
541 #endif | |
542 bases << "meld" << "diffuse" << "kdiff3"; | |
537 bool found = false; | 543 bool found = false; |
538 foreach (QString base, bases) { | 544 foreach (QString base, bases) { |
539 merge = findInPath(base, m_myDirPath, true); | 545 merge = findInPath(base, m_myDirPath, true); |
540 if (merge != base && merge != base + ".exe") { | 546 if (merge != base && merge != base + ".exe") { |
541 found = true; | 547 found = true; |
561 #if defined Q_OS_WIN32 | 567 #if defined Q_OS_WIN32 |
562 << "wordpad.exe" | 568 << "wordpad.exe" |
563 << "C:\\Program Files\\Windows NT\\Accessories\\wordpad.exe" | 569 << "C:\\Program Files\\Windows NT\\Accessories\\wordpad.exe" |
564 << "notepad.exe" | 570 << "notepad.exe" |
565 #elif defined Q_OS_MAC | 571 #elif defined Q_OS_MAC |
566 << "textedit" | 572 << "/Applications/TextEdit.app/Contents/MacOS/TextEdit" |
567 #else | 573 #else |
568 << "gedit" << "kate" | 574 << "gedit" << "kate" |
569 #endif | 575 #endif |
570 ; | 576 ; |
571 bool found = false; | 577 bool found = false; |