From 1fe57a5e70a9d187dc14ae52935dd681f8861b62 Mon Sep 17 00:00:00 2001
From: William Johnson <wcjohns@sandia.gov>
Date: Sat, 21 Sep 2024 19:27:36 -0700
Subject: [PATCH] Fix GADRAS drf directory in macOS app, and some small compile
 error. Also update version 1.0.13 in CMakeLists.txt.

---
 CMakeLists.txt            | 2 +-
 src/DrfSelect.cpp         | 2 ++
 src/PeakInfoDisplay.cpp   | 2 +-
 target/osx/CMakeLists.txt | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 113e6898..ca37cfc3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.1...3.20 FATAL_ERROR)
 
-project(InterSpec VERSION 1.0.12)
+project(InterSpec VERSION 1.0.13)
 
 set(CMAKE_CXX_STANDARD 14)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
diff --git a/src/DrfSelect.cpp b/src/DrfSelect.cpp
index 3ac4be23..1a357d38 100644
--- a/src/DrfSelect.cpp
+++ b/src/DrfSelect.cpp
@@ -477,6 +477,8 @@ namespace
    
    string trialpath = InterSpec::staticDataDirectory();
    trial_paths.push_back( trialpath );
+   trialpath = SpecUtils::lexically_normalize_path( SpecUtils::append_path( trialpath, "..") );
+   trial_paths.push_back( trialpath );
    
    trialpath = SpecUtils::append_path( SpecUtils::append_path( trialpath, ".."), "data_ouo" );
    trialpath = SpecUtils::lexically_normalize_path( trialpath );
diff --git a/src/PeakInfoDisplay.cpp b/src/PeakInfoDisplay.cpp
index 205ae30e..551d5cfd 100644
--- a/src/PeakInfoDisplay.cpp
+++ b/src/PeakInfoDisplay.cpp
@@ -1157,7 +1157,7 @@ void PeakInfoDisplay::init()
 
   auto enableDisableCsv = [this,csvButton,copyButton](){
     const bool enable = (m_model->rowCount() > 0);
-    csvButton->setEnabled( enable );
+    csvButton->setDisabled( !enable );
     copyButton->setEnabled( enable );
   };
   
diff --git a/target/osx/CMakeLists.txt b/target/osx/CMakeLists.txt
index cba8e9b5..d26d8413 100644
--- a/target/osx/CMakeLists.txt
+++ b/target/osx/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.25 FATAL_ERROR)
 
-project( InterSpecApp VERSION 1.0.12 )
+project( InterSpecApp VERSION 1.0.13 )
 
 if(POLICY CMP0114)
   # Add @rpath to the install_name of shared libraries and frameworks that are part of a macOS application bundle.