Fix some smaller display issues.

Scroll bars where they shouldn't be, wording, etc.

Author: wcjohns

InterSpec_resources/DbFileBrowser.css

@@ -7,6 +7,7 @@
 .SnapshotTable
 {
   padding: 2px;
+  overflow-x: hidden;
 }
 
 

InterSpec_resources/ShieldingSourceDisplay.css

@@ -52,14 +52,26 @@
 }
 
 
+.DetAndMenu
+{
+  display: flex;
+  flex-wrap: nowrap;
+  align-items: center;
+  justify-content: space-between;
+}
 
+.DetAndMenu .DetectorDisplay
+{
+  flex: 1 1 content;
+}
 
 .RoundMenuIcon,.RoundMenuIcon:hover
 {
   background-image: url('../InterSpec_resources/images/menu_icon_round.svg');
-  background-position: 3px center;
+  /* background-position: 3px center; */
   background-repeat: no-repeat;
-  padding-left: 23px;  /* width of the image plus a little extra padding */
+  /* padding-left: 23px; */ /* width of the image plus a little extra padding */
+  width: 26px;
   background-color: rgba(0,0,0,0) !important;
   border: none;
 }

InterSpec_resources/static_text/make_drf_help.xml

@@ -105,7 +105,7 @@ Some comments on taking test-source data:
       and other effects.  Very roughly, scintillating detectors (NaI, LaBr, etc)
       should probably have less than about 20% dead-time, while HPGe should
       have less than about 50% dead-time, although acceptable levels will be
-      system dependant.
+      system dependent.
   </li>
   <li>Test-sources should be at least 25 cm away from the detector so that
       gammas striking the detector are about parallel.
@@ -280,6 +280,13 @@ def getFWHM( energy ):
 You can also choose to show this fit and peak FWHM  data on the chart by selecting the
 &quot;Show FWHM points&quot; checkbox.
 </div>
+<div style="margin-top: 10px;">
+When the &quot;<span style="font-weight: bold;">Atten. for air</span>&quot; option is checked, the source distance will be used to
+compensate for the gamma attenuation in the air.  It is recommended to have this option checked
+unless your measurements will always be at the same distance as the calibration-measurements (in
+which case you should also disable air attenuation from the &quot;Activity/Shielding Fit&quot; tool;
+however, leaving it enabled in both places would cancel out anyway).
+</div>
 </p>
 </div>
 

src/DecayWindow.cpp

@@ -51,11 +51,9 @@ DecayWindow::DecayWindow( InterSpec *viewer )
             (Wt::WFlags<AuxWindowProperties>(AuxWindowProperties::DisableCollapse) | AuxWindowProperties::EnableResize) ),
   m_activityDiv( 0 )
 {
-  WContainerWidget *contentDiv = WDialog::contents();
   m_activityDiv = new DecayActivityDiv( viewer );
 
-  WGridLayout *layout = new WGridLayout();
-  contentDiv->setLayout( layout );
+  WGridLayout *layout = stretcher();
   layout->addWidget( m_activityDiv, 0, 0 );
   layout->setContentsMargins( 0, 0, 0, 0 );
   layout->setVerticalSpacing( 0 );

src/MakeDrf.cpp

@@ -1577,10 +1577,10 @@ AuxWindow *MakeDrf::makeDrfWindow( InterSpec *viewer, MaterialDB *materialDB, Wt
 
   AuxWindow::addHelpInFooter( window->footer(), "make-drf" );
 
-  WPushButton *closeButton = window->addCloseButtonToFooter( "Cancel" );
+  WPushButton *closeButton = window->addCloseButtonToFooter( "Close" );
   closeButton->clicked().connect( window, &AuxWindow::hide );
 
-  WPushButton *saveAs = new WPushButton( "Save As...", window->footer() );
+  WPushButton *saveAs = new WPushButton( "Store/Export...", window->footer() );
   saveAs->clicked().connect( makeDrfWidget, &MakeDrf::startSaveAs );
   makeDrfWidget->intrinsicEfficiencyIsValid().connect( boost::bind( &WPushButton::setEnabled, saveAs, _1 ) );
   saveAs->disable();

src/PeakSearchGuiUtils.cpp

@@ -337,9 +337,9 @@ class PeakSelectorWindow : public AuxWindow
     }//if( m_showAllPeaks )
 
 
-    // The rel eff chart is close, but not fully debugged, so leaving diabled for now
+    // The rel eff chart is close, but not fully debugged, so leaving disabled for now
     //setupRelEffChart();
-    
+    contents()->setOverflow( WContainerWidget::Overflow::OverflowAuto, Orientation::Vertical );
     m_table = new WTable( contents() );
     m_table->addStyleClass( "PeakSelectorTable" );
     m_table->setHeaderCount( 1, Wt::Horizontal );

src/ShieldingSelect.cpp

@@ -1984,7 +1984,7 @@ void ShieldingSelect::init()
 
   lbltxt = fistShield ? "Radius" : "Radial Thickness";
   setupDimEdit( lbltxt, m_cylRadiusEdit, m_fitCylRadiusCB, cylindricalLayout );
-  lbltxt = fistShield ? "Length" : "Length Thickness";
+  lbltxt = fistShield ? "Half-Length" : "Length Thickness";
   setupDimEdit( lbltxt, m_cylLengthEdit, m_fitCylLengthCB, cylindricalLayout );
 
 

src/ShieldingSourceDisplay.cpp

@@ -2574,7 +2574,7 @@ ShieldingSourceDisplay::ShieldingSourceDisplay( PeakModel *peakModel,
   m_shieldingSelects = new WContainerWidget();
   m_shieldingSelects->setStyleClass( "ShieldingSelectContainer" );
 
-  tooltip = "Shieldings are treated as spherical shells with the innermost"
+  tooltip = "Shieldings are treated as shells with the innermost"
             " shell being the first one you add (the top one in this box), and"
             " the subsequent shieldings layered around that one.  Any sources"
             " not attributed as components of shieldings are treated as point"
@@ -2872,30 +2872,37 @@ if (m_specViewer->isSupportFile())
     chartDiv->setLayout(chartLayout);
     chartLayout->setContentsMargins(0, 0, 0, 0);
 
-    chartLayout->addWidget( m_detectorDisplay, 0, 0, AlignLeft );
-    chartLayout->addWidget( m_showChiOnChart, 0, 1 );
-    chartLayout->addWidget( addItemMenubutton, 0, 2, AlignRight);
-    chartLayout->addWidget( m_chi2Graphic, 1, 0, 1, 3 );
-    chartLayout->addWidget( m_fitModelButton, 2, 0, 1, 3, AlignCenter );
-    chartLayout->addWidget( m_fitProgressTxt, 3, 0, 1 ,3, AlignCenter );
+    chartLayout->addWidget( m_detectorDisplay,      0, 0, AlignLeft );
+    chartLayout->addWidget( m_showChiOnChart,       0, 1 );
+    chartLayout->addWidget( addItemMenubutton,      0, 2, AlignRight);
+    chartLayout->addWidget( m_chi2Graphic,          1, 0, 1, 3 );
+    chartLayout->addWidget( m_fitModelButton,       2, 0, 1, 3, AlignCenter );
+    chartLayout->addWidget( m_fitProgressTxt,       3, 0, 1 ,3, AlignCenter );
     chartLayout->addWidget( m_cancelfitModelButton, 4, 0, 1, 3, AlignCenter );
 
     chartLayout->setRowStretch(1, 1);
     tab->addTab(chartDiv,"Fit", Wt::WTabWidget::PreLoading);
   }else
   {
     //regular layout
-    detectorLayout->addWidget( m_detectorDisplay,          0, 0 );
-    detectorLayout->addWidget( addItemMenubutton,          0, 1 );
-    detectorLayout->addWidget( smallerContainer,           1, 0, 1, 2);
-    detectorLayout->addWidget( m_shieldingSelects,         2, 0, 1, 2 );
-    detectorLayout->addWidget( m_fitModelButton,           3, 0, 1, 2, AlignCenter );
-    detectorLayout->addWidget( m_fitProgressTxt,           4, 0, 1, 2 );
-    detectorLayout->addWidget( m_cancelfitModelButton,     5, 0, 1, 2, AlignCenter );
-    detectorLayout->addWidget( m_showChi2Text,             6, 0, 1, 2 );
+    
+    // We'll put the detector and menu icon in a flexbox layout, which is less hassle than
+    //  the Wt layout
+    WContainerWidget *toprow = new WContainerWidget();
+    toprow->addStyleClass( "DetAndMenu" );
+    toprow->addWidget( m_detectorDisplay );
+    toprow->addWidget( addItemMenubutton );
+    
+    
+    detectorLayout->addWidget( toprow,                     0, 0 );
+    detectorLayout->addWidget( smallerContainer,           1, 0 );
+    detectorLayout->addWidget( m_shieldingSelects,         2, 0 );
+    detectorLayout->addWidget( m_fitModelButton,           3, 0, AlignCenter );
+    detectorLayout->addWidget( m_fitProgressTxt,           4, 0 );
+    detectorLayout->addWidget( m_cancelfitModelButton,     5, 0, AlignCenter );
+    detectorLayout->addWidget( m_showChi2Text,             6, 0 );
 
     detectorLayout->setRowStretch( 2, 1 );
-    detectorLayout->setColumnStretch( 0, 1 );
     detectorLayout->setHorizontalSpacing( 0 );
     detectorLayout->setVerticalSpacing( 0 );
     detectorLayout->setContentsMargins( 1, 1, 1, 1 );