Merge branch 'master' of github.com:sandialabs/InterSpec

Author: wcjohns

src/EnergyCalTool.cpp

@@ -685,12 +685,11 @@ class CalDisplay : public WContainerWidget
     m_downloadCALp = new WAnchor( WLink(m_tool->calpResources()), btndiv );
     m_downloadCALp->setTarget( AnchorTarget::TargetNewWindow );
     m_downloadCALp->setStyleClass( "LinkBtn DownloadLink" );
-    m_downloadCALp->setText( "CALp" );
 #else
-    m_downloadCALp = new WPushButton( "CALp", btndiv );
+    m_downloadCALp = new WPushButton( btndiv );
     m_downloadCALp->setIcon( "InterSpec_resources/images/download_small.svg" );
-    m_downloadCALp->setLinkTarget( Wt::TargetNewWindow );
     m_downloadCALp->setLink( WLink( m_tool->calpResources() ) );
+    m_downloadCALp->setLinkTarget( Wt::TargetNewWindow );
     m_downloadCALp->setStyleClass( "LinkBtn DownloadBtn CALp" );
 
 #if( ANDROID )
@@ -701,6 +700,8 @@ class CalDisplay : public WContainerWidget
 #endif //ANDROID
 
 #endif //#if( BUILD_AS_OSX_APP || IOS ) / #else
+
+    m_downloadCALp->setText( "CALp" );
 
     m_uploadCALp = new WPushButton( btndiv );
     m_uploadCALp->setIcon( "InterSpec_resources/images/upload_small.svg" );
@@ -1307,13 +1308,12 @@ void EnergyCalTool::initWidgets( EnergyCalTool::LayoutType layoutType )
   m_downloadCALp = new WAnchor( WLink(m_calpResource), btndiv );
   m_downloadCALp->setTarget( AnchorTarget::TargetNewWindow );
   m_downloadCALp->setStyleClass( "LinkBtn DownloadLink CALp" );
-  m_downloadCALp->setText( "CALp" );
 #else
-  m_downloadCALp = new WPushButton( "CALp", btndiv );
+  m_downloadCALp = new WPushButton( btndiv );
   m_downloadCALp->setIcon( "InterSpec_resources/images/download_small.svg" );
+  m_downloadCALp->setLink( WLink( m_calpResource ) );
   m_downloadCALp->setLinkTarget( Wt::TargetNewWindow );
   m_downloadCALp->setStyleClass( "LinkBtn DownloadBtn CALp" );
-  m_downloadCALp->setLink( WLink(m_calpResource) );
 
 #if( ANDROID )
   // Using hacked saving to temporary file in Android, instead of via network download of file.
@@ -1323,6 +1323,7 @@ void EnergyCalTool::initWidgets( EnergyCalTool::LayoutType layoutType )
 #endif //ANDROID
 
 #endif
+  m_downloadCALp->setText( "CALp" );
 
   m_downloadCALp->clicked().connect( std::bind([this](){
     m_interspec->logMessage( "You can apply this CALp file later to a different spectrum by"

src/RelActAutoGui.cpp

@@ -3770,22 +3770,22 @@ void RelActAutoGui::addDownloadAndUploadLinks( Wt::WContainerWidget *parent )
   WAnchor *btn = new WAnchor( WLink(m_html_download_rsc), parent );
   btn->setTarget( AnchorTarget::TargetNewWindow );
   btn->setStyleClass( "LinkBtn DownloadLink RelActDownload" );
-  btn->setText( "HTML Report" );
 #else
-  WPushButton *btn = new WPushButton( "HTML Report", parent );
+  WPushButton *btn = new WPushButton( parent );
   btn->setIcon( "InterSpec_resources/images/download_small.svg" );
+  btn->setLink( WLink( m_html_download_rsc ) );
   btn->setLinkTarget( Wt::TargetNewWindow );
   btn->setStyleClass( "LinkBtn DownloadBtn RelActDownload" );
-  btn->setLink( WLink(m_html_download_rsc) );
-  
+
 #if( ANDROID )
   // Using hacked saving to temporary file in Android, instead of via network download of file.
   m_downloadHtmlReport->clicked().connect( std::bind([this](){
     android_download_workaround( m_calpResource, "isotopics_by_nuclide.html");
   }) );
 #endif //ANDROID
-  
 #endif
+
+  btn->setText( "HTML Report" );
 
   m_calc_started.connect( btn, &WWidget::disable );
   m_calc_failed.connect( btn, &WWidget::disable );

src/RelActManualGui.cpp

@@ -246,8 +246,8 @@ class ManRelEffNucDisp : public Wt::WPanel
     setTitle( m_nuc ? m_nuc->symbol : m_reaction->name() );
     setCollapsible( true );
     setCollapsed( true );
-    setAnimation( { WAnimation::AnimationEffect::SlideInFromTop,
-      WAnimation::TimingFunction::Linear, 250 } );
+    //setAnimation( { WAnimation::AnimationEffect::SlideInFromTop,
+    //  WAnimation::TimingFunction::Linear, 250 } );
 
     if( m_nuc )
     {