Start converting file export dialog to work on phones in portrait mode.

sandialabs · Oct 2, 2024 · 9c8cd7c · 9c8cd7c
1 parent d834788
commit 9c8cd7c
Show file tree

Hide file tree

Showing 3 changed files with 63 additions and 7 deletions.
diff --git a/InterSpec_resources/ExportSpecFile.css b/InterSpec_resources/ExportSpecFile.css
@@ -59,6 +59,12 @@
   padding-right: 10px;
 }
 
+.ExportSpecFileTool.ExportSpecFileToolPhone .ExportSpecFileTabs
+{
+  flex-grow: 2;
+  margin-top: 5px;
+}
+
 .ExportSpecFileTool .ExportSpecFileBody .ExportColTitle
 {
   display: block;
@@ -125,6 +131,13 @@
   font-size: 14px;
 }
 
+.ExportSpecFileTool.ExportSpecFileToolPhone .ExportSpecSelect
+{
+  margin-left: auto;
+  margin-right: auto;
+  margin-top: 10px;
+}
+
 .ExportSpecInfo .ExportSpecInfoTable
 {
 }
@@ -162,6 +175,12 @@
   height: 100%;
 }
 
+.ExportSpecFileTool.ExportSpecFileToolPhone .ExportSpecFormat
+{
+  height: 300px;
+  overflow-y: auto;
+}
+
 
 .ExportSpecFileTool .ExportSpecFormat .ExportSpecFormatMenu.SideMenu
 {
@@ -176,6 +195,12 @@
   width: 8.5em;
 }
 
+.ExportSpecFileTool.ExportSpecFileToolPhone .ExportSpecFormatMenu.SideMenu
+{
+  margin-left: auto;
+  margin-right: auto;
+}
+
 .ExportSpecFileTool .ExportSpecFormat .ExportSpecFormatMenu.SideMenu li
 {
   height: 1.25em;

diff --git a/src/ExportSpecFile.cpp b/src/ExportSpecFile.cpp
@@ -41,6 +41,7 @@
 #include <Wt/WLineEdit>
 #include <Wt/WMenuItem>
 #include <Wt/WResource>
+#include <Wt/WTabWidget>
 #include <Wt/WPushButton>
 #include <Wt/Http/Request>
 #include <Wt/WApplication>
@@ -739,16 +740,32 @@ void ExportSpecFileTool::init()
 
   const bool showToolTips = InterSpecUser::preferenceValue<bool>( "ShowTooltips", m_interspec );
   const bool isMobile = m_interspec && m_interspec->isMobile();
+
+  const int screenWidth = m_interspec->renderedWidth();
+  const bool isPhone = (screenWidth > 100) ? (screenWidth < 640) : m_interspec->isPhone();
 
   if( isMobile )
     addStyleClass( "ExportSpecFileToolMobile" );
 
-  WContainerWidget *body = new WContainerWidget( this );
-  body->addStyleClass( "ExportSpecFileBody" );
+  WTabWidget *mobileTabs = nullptr;
+  WContainerWidget *body = nullptr;
+
+  if( isPhone )
+  {
+    addStyleClass( "ExportSpecFileToolPhone" );
+    mobileTabs = new WTabWidget( this );
+    mobileTabs->addStyleClass( "ExportSpecFileTabs" );
+  }else
+  {
+    body = new WContainerWidget( this );
+    body->addStyleClass( "ExportSpecFileBody" );
+  }
 
 
   WContainerWidget *fileSelectDiv = new WContainerWidget( body );
   fileSelectDiv->addStyleClass( "ExportSpecSelect" );
+  if( isPhone )
+    mobileTabs->addTab( fileSelectDiv, "File", Wt::WTabWidget::LoadPolicy::PreLoading );
 
   if( !m_specific_spectrum )
   {
@@ -795,6 +812,8 @@ void ExportSpecFileTool::init()
   // Spectrum format
   WContainerWidget *menuHolder = new WContainerWidget( body );
   menuHolder->addStyleClass( "ExportSpecFormat" );
+  if( isPhone )
+    mobileTabs->addTab( menuHolder, "Format", Wt::WTabWidget::LoadPolicy::PreLoading );
 
   WText *title = new WText( "File Format", menuHolder );
   title->addStyleClass( "ExportColTitle" );
@@ -864,6 +883,10 @@ void ExportSpecFileTool::init()
   // Meas/samples to include
   m_samplesHolder = new WContainerWidget( body );
   m_samplesHolder->addStyleClass( "ExportSpecSamples" );
+
+  if( isPhone )
+    mobileTabs->addTab( m_samplesHolder, "Options", Wt::WTabWidget::LoadPolicy::PreLoading );
+
   title = new WText( "Samples to Include", m_samplesHolder );
   title->addStyleClass( "ExportColTitle" );
 
@@ -3596,9 +3619,16 @@ ExportSpecFileWindow::ExportSpecFileWindow( InterSpec *viewer )
   addStyleClass( "export-spec-file" );
 
   const int w = viewer->renderedWidth();
-  //setMinimumSize( WLength(w > 100 ? std::min(0.95*w, 800.0) : 800.0 ,WLength::Pixel), WLength::Auto );
-  setMinimumSize( WLength(w > 100 ? std::min(0.95*w, 600.0) : 600.0 ,WLength::Pixel), WLength::Auto );
-
+  const bool isPhone = (w > 100) ? (w < 640) : (viewer && viewer->isPhone());
+
+  if( isPhone )
+  {
+    resize( 320, Wt::WLength::Auto ); //320 px is about the smallest width Android phone to expect
+  }else 
+  {
+    //setMinimumSize( WLength(w > 100 ? std::min(0.95*w, 800.0) : 800.0 ,WLength::Pixel), WLength::Auto );
+    setMinimumSize( WLength(w > 100 ? std::min(0.95*w, 600.0) : 600.0 ,WLength::Pixel), WLength::Auto );
+  }
   m_tool = new ExportSpecFileTool( viewer, contents() );
   m_tool->done().connect( boost::bind(&ExportSpecFileWindow::accept, this) );
 

diff --git a/src/PeakInfoDisplay.cpp b/src/PeakInfoDisplay.cpp
@@ -1079,7 +1079,8 @@ void PeakInfoDisplay::init()
     }
   }//for( int col = 0; col < m_model->columnCount(); ++col )
 
-//#if( !ANDROID && !IOS )
+  // For desktop, we'll put a little hint text that users can right-click on peaks for peak editor,
+  //  But on mobile we'll just treat it as a spacer (which we need so peak CSV link goes to right).
   WString hintTxt = "&nbsp;";
   if( !m_viewer->isPhone() )
   {
@@ -1094,7 +1095,7 @@ void PeakInfoDisplay::init()
   mouseWentOver().connect( show_js );
   mouseWentOut().connect( hide_js );
   txt->doJavaScript( "(" + hide_js + ")();" );
-//#endif
+
 
   WContainerWidget *csvDiv = new WContainerWidget( bottomDiv );
   csvDiv->addStyleClass( "PeakInfoDisplayCsvBtns" );