Merge pull request #293 from mfs12/fix-message-title-display

Fix message title display
Duet3D · Apr 21, 2023 · 4c0cb55 · 4c0cb55
2 parents c423b01 + 93cc780
commit 4c0cb55
Show file tree

Hide file tree

Showing 13 changed files with 28 additions and 15 deletions.
diff --git a/lib/librrf b/lib/librrf
diff --git a/src/PanelDue.cpp b/src/PanelDue.cpp
@@ -1050,6 +1050,17 @@ static void EndReceivedMessage()
 	}
 	FileManager::EndReceivedMessage();
 
+	// alert event handling
+	if (currentAlert.flags.IsBitSet(Alert::GotMode) && currentAlert.mode == Alert::Mode::None)
+	{
+		UI::ClearAlert();
+	}
+	else if (currentAlert.mode != Alert::Mode::None && currentAlert.seq != lastAlertSeq)
+	{
+		UI::ProcessAlert(currentAlert);
+		lastAlertSeq = currentAlert.seq;
+	}
+
 	if (thumbnailContext.parseErr != 0 || thumbnailContext.err != 0)
 	{
 		dbg("thumbnail parseErr %d err %d.\n",
@@ -2562,17 +2573,6 @@ int main(void)
 			}
 		}
 
-		// alert event handling
-		if (currentAlert.flags.IsBitSet(Alert::GotMode) && currentAlert.mode == Alert::Mode::None)
-		{
-			UI::ClearAlert();
-		}
-		else if (currentAlert.mode > Alert::Mode::None && currentAlert.seq != lastAlertSeq)
-		{
-			UI::ProcessAlert(currentAlert);
-			lastAlertSeq = currentAlert.seq;
-		}
-
 		// refresh the display
 		UpdateDebugInfo();
 		mgr.Refresh(false);

diff --git a/src/UI/Popup.cpp b/src/UI/Popup.cpp
@@ -42,9 +42,10 @@ void AlertPopup::Set(const char *title, const char *text, int32_t mode, uint32_t
 	text += splitPoint;
 	alertText3.copy(text);
 
-	closeButton->Show(mode == Alert::Mode::InfoConfirm);
+	closeButton->Show(mode == Alert::Mode::InfoClose);
 
-	okButton->Show(mode == Alert::Mode::ConfirmCancel ||
+	okButton->Show(mode == Alert::Mode::InfoConfirm ||
+		       mode == Alert::Mode::ConfirmCancel ||
 		       mode == Alert::Mode::NumberInt ||
 		       mode == Alert::Mode::NumberFloat ||
 		       mode == Alert::Mode::Text);

diff --git a/src/Version.hpp b/src/Version.hpp
@@ -8,7 +8,7 @@
 #ifndef SRC_VERSION_HPP_
 #define SRC_VERSION_HPP_
 
-#define VERSION_MAIN		"3.4.1"
+#define VERSION_MAIN		"3.5.0-rc1"
 
 #ifdef SUPPORT_ENCODER
 #define VERSION_ENCODER	"+enc"

diff --git a/tests/test-m291-s0.g b/tests/test-m291-s0.g
@@ -0,0 +1 @@
+M291 P"test message mode 0" R"test mode S0" S0
diff --git a/tests/test-m291-s1.g b/tests/test-m291-s1.g
@@ -0,0 +1 @@
+M291 P"test message mode 1" R"test mode S1" S1
diff --git a/tests/test-m291-s2.g b/tests/test-m291-s2.g
@@ -0,0 +1 @@
+M291 P"test message mode 2" R"test mode S2" S2
diff --git a/tests/test-m291-s3.g b/tests/test-m291-s3.g
@@ -0,0 +1 @@
+M291 P"test message mode 3" R"test mode S3" S3
diff --git a/tests/test-m291-s4.g b/tests/test-m291-s4.g
@@ -0,0 +1 @@
+M291 P"select a choice" R"test mode 4" S4 K{"choice1", "choice2", "choice3", "choice4", "choice5", "choice6", "choice7", "choice8", "choice9", "choice10" }
diff --git a/tests/test-m291-s5.g b/tests/test-m291-s5.g
@@ -0,0 +1 @@
+M291 P"enter an integer number" R"test mode 5" S5 L10 H100 F50
diff --git a/tests/test-m291-s6.g b/tests/test-m291-s6.g
@@ -0,0 +1 @@
+M291 P"enter a float number" R"test mode 6" S6 L0.1 H1.0 F0.5
diff --git a/tests/test-m291-s7.g b/tests/test-m291-s7.g
@@ -0,0 +1 @@
+M291 P"enter a text" R"test mode 7" S7 L2 H20 F"abc"
diff --git a/tests/test-m291.g b/tests/test-m291.g
@@ -0,0 +1,4 @@
+M291 P"test message mode 0" R"test title" S0
+M291 P"test message mode 1" R"test title" S1
+M291 P"test message mode 2" R"test title" S2
+M291 P"test message mode 3" R"test title" S3
+67 −0		.cproject
+1 −0		.gitignore
+2 −0		.settings/org.eclipse.core.resources.prefs
+2 −0		.settings/org.eclipse.core.runtime.prefs
+ −		RRFLibraries.pdp
+68 −28		src/General/Bitmap.h
+3 −0		src/General/NamedEnum.h
+1 −1		src/General/NumericConverter.cpp
+1 −1		src/General/NumericConverter.h
+0 −18		src/General/SafeStrtod.cpp
+1 −3		src/General/SafeStrtod.h
+2 −4		src/General/SafeVsnprintf.cpp
+1 −1		src/General/SafeVsnprintf.h
+1 −1		src/General/StringRef.cpp
+6 −6		src/General/Vector.hpp
+43 −8		src/General/function_ref.h
+23 −14		src/Math/Isqrt.cpp
+3 −1		src/Math/Isqrt.h
+291 −66		src/RTOSIface/RTOSIface.cpp
+43 −24		src/RTOSIface/RTOSIface.h
+1 −0		src/ecv_duet3d.h
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		M291 P"select a choice" R"test mode 4" S4 K{"choice1", "choice2", "choice3", "choice4", "choice5", "choice6", "choice7", "choice8", "choice9", "choice10" }
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		M291 P"enter an integer number" R"test mode 5" S5 L10 H100 F50
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		M291 P"enter a float number" R"test mode 6" S6 L0.1 H1.0 F0.5
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		M291 P"enter a text" R"test mode 7" S7 L2 H20 F"abc"