Merge remote-tracking branch 'origin/GeoDMS_Qt' into v13

ObjectVision · Aug 31, 2023 · f8d8378 · f8d8378
2 parents 3dd9e18 + 295a03f
commit f8d8378
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 35 deletions.
diff --git a/qtgui/exe/src/DmsDetailPages.cpp b/qtgui/exe/src/DmsDetailPages.cpp
@@ -138,18 +138,6 @@ void DmsDetailPages::toggleExplorer()
 void DmsDetailPages::toggleProperties()
 {
     toggle(ActiveDetailPage::PROPERTIES);
-    return;
-    if (m_active_detail_page != ActiveDetailPage::PROPERTIES || m_ShowNonDefaultProperties == false)
-    {
-        if (m_active_detail_page == ActiveDetailPage::PROPERTIES)
-            m_ShowNonDefaultProperties = true; // we hide now, but go for Show when made visible again
-        toggle(ActiveDetailPage::PROPERTIES);
-    }
-    else
-    {
-        m_ShowNonDefaultProperties = false;
-        scheduleDrawPage();
-    }
 }
 
 void DmsDetailPages::toggleConfiguration()
@@ -160,18 +148,6 @@ void DmsDetailPages::toggleConfiguration()
 void DmsDetailPages::toggleSourceDescr()
 {
     toggle(ActiveDetailPage::SOURCEDESCR);
-    return;
-    if (m_active_detail_page != ActiveDetailPage::SOURCEDESCR || m_SDM == SourceDescrMode::All)
-    {
-        if (m_active_detail_page == ActiveDetailPage::PROPERTIES)
-            m_SDM = SourceDescrMode::Configured; // we hide now, but go for Show when made visible again
-        toggle(ActiveDetailPage::SOURCEDESCR);
-    }
-    else
-    {
-        reinterpret_cast<int&>(m_SDM)++;
-        scheduleDrawPageImpl(500);
-    }
 }
 
 void DmsDetailPages::toggleMetaInfo()
@@ -186,12 +162,12 @@ void DmsDetailPages::propertiesButtonToggled(QAbstractButton* button, bool check
 
     auto main_window = MainWindow::TheOne();
     if (main_window->m_detail_page_properties_buttons->pr_nondefault == button) // non default
-        m_ShowNonDefaultProperties = true;
+        m_AllProperties = false;
 
     if (main_window->m_detail_page_properties_buttons->pr_all == button) // all
-        m_ShowNonDefaultProperties = false;
+        m_AllProperties = true;
 
-    scheduleDrawPageImpl(500);
+    scheduleDrawPageImpl(0);
 }
 
 void DmsDetailPages::sourceDescriptionButtonToggled(QAbstractButton* button, bool checked)
@@ -212,7 +188,7 @@ void DmsDetailPages::sourceDescriptionButtonToggled(QAbstractButton* button, boo
     if (main_window->m_detail_page_source_description_buttons->sd_all == button) // all
         m_SDM = SourceDescrMode::All;
 
-    scheduleDrawPageImpl(500);
+    scheduleDrawPageImpl(0);
 }
 
 auto htmlEncodeTextDoc(CharPtr str) -> SharedStr
@@ -315,7 +291,7 @@ void DmsDetailPages::drawPage()
         break;
     case ActiveDetailPage::PROPERTIES:
         main_window->hideDetailPagesRadioButtonWidgets(false, true);
-        result = DMS_TreeItem_XML_DumpAllProps(current_item, xmlOut.get(), m_ShowNonDefaultProperties);
+        result = DMS_TreeItem_XML_DumpAllProps(current_item, xmlOut.get(), m_AllProperties);
         break;
     case ActiveDetailPage::EXPLORE:
         DMS_TreeItem_XML_DumpExplore(current_item, xmlOut.get(), showAll);

diff --git a/qtgui/exe/src/DmsDetailPages.h b/qtgui/exe/src/DmsDetailPages.h
@@ -59,7 +59,7 @@ public slots:
 
 	ActiveDetailPage m_active_detail_page = ActiveDetailPage::GENERAL;
 	SourceDescrMode m_SDM = SourceDescrMode::Configured;
-	bool            m_ShowNonDefaultProperties = true;
+	bool            m_AllProperties = true;
 };
 
 SharedStr FindURL(const TreeItem* ti);
diff --git a/tic/dll/src/Xml/XmlTreeOut.cpp b/tic/dll/src/Xml/XmlTreeOut.cpp
@@ -283,7 +283,8 @@ XML_ItemBody::XML_ItemBody(OutStreamBase& out, CharPtr caption, CharPtr subText,
 	auto cell = XML_Table::Row::Cell(row);
 	row.ValueCell("Active Item");
 	auto cell2 = XML_Table::Row::Cell(row);
-	row.ItemCell(item);
+	//XML_OutElement bold(out, "B");
+	row.ItemCell(item, true);
 	XML_OutElement table_row2(out, "TR");
 
 	/*XML_OutElement table_col(out, "TD");

diff --git a/tic/dll/src/Xml/XmlTreeOut.h b/tic/dll/src/Xml/XmlTreeOut.h
@@ -97,12 +97,22 @@ struct XML_Table : XML_OutElement
 				WriteCellData(value);
 		}
 
-		void ClickableCell(CharPtr value, CharPtr hRef)
+		void ClickableCell(CharPtr value, CharPtr hRef, bool bold = false) // TODO: move implementation to implementation file
 		{
 			Cell xmlElemTD(*this);
+			if (bold)
+			{
+				auto bold = XML_OutElement(OutStream(), "B");
+				XML_hRef xmlElemA(OutStream(), hRef);
+				WriteCellData(value); // TODO: remove duplicate logic
+			}
+			else
+			{
 				XML_hRef xmlElemA(OutStream(), hRef);
-					WriteCellData(value);
+				WriteCellData(value);
+			}
 		}
+
 		void EditablePropCell(CharPtr propName, CharPtr propLabel = "", const TreeItem* item = 0)
 		{
 			if (!*propLabel) 
@@ -120,9 +130,9 @@ struct XML_Table : XML_OutElement
 				//ClickableCell(propLabel, editUrl.c_str());
 			}
 		}
-		void ItemCell(const TreeItem* item)
+		void ItemCell(const TreeItem* item, bool bold = false)
 		{
-			ClickableCell(item->GetFullName().c_str(), ItemUrl(item).c_str());
+			ClickableCell(item->GetFullName().c_str(), ItemUrl(item).c_str(), bold);
 		}
 	};