fix about dialogs

jafl · Feb 27, 2024 · 817836f · 817836f
1 parent 13113d9
commit 817836f
Show file tree

Hide file tree

Showing 9 changed files with 49 additions and 23 deletions.
diff --git a/tools/jx_layout_editor/code/AboutDialog.cpp b/tools/jx_layout_editor/code/AboutDialog.cpp
@@ -71,9 +71,9 @@ AboutDialog::BuildWindow
 	imageWidget->SetImage(GetDisplay()->GetImageCache()->GetImage(about_icon), false);
 
 	auto* textWidget =
-		jnew JXStaticText(JString::empty, window,
+		jnew JXStaticText(JString::empty, true, false, false, nullptr, window,
 					JXWidget::kHElastic, JXWidget::kVElastic, 70,20, 290,50);
-	assert( textWidget != nullptr );
+	textWidget->SetBorderWidth(0);
 
 	itsCreditsButton =
 		jnew JXTextButton(JGetString("itsCreditsButton::AboutDialog::JXLayout"), window,

diff --git a/tools/jx_layout_editor/code/AboutDialog.jxl b/tools/jx_layout_editor/code/AboutDialog.jxl
@@ -1,4 +1,4 @@
-jx_layout_editor 5
+jx_layout_editor 8
 370
 120
 "JXLayout"
@@ -9,6 +9,7 @@ jx_layout_editor 5
 
 1
 0
+0
 "ImageWidget"
 0
 0
@@ -22,6 +23,7 @@ jx_layout_editor 5
 
 1
 0
+0
 "StaticText"
 2
 2
@@ -33,12 +35,13 @@ jx_layout_editor 5
 ""
 0
 0
-0
+1
 0
 0
 
 1
 0
+0
 "TextButton"
 0
 1
@@ -52,6 +55,7 @@ jx_layout_editor 5
 
 1
 0
+0
 "TextButton"
 0
 1
@@ -65,6 +69,7 @@ jx_layout_editor 5
 
 1
 0
+0
 "TextButton"
 0
 1

diff --git a/tools/jx_memory_debugger/code/AboutDialog.cpp b/tools/jx_memory_debugger/code/AboutDialog.cpp
@@ -9,11 +9,12 @@
 
 #include "AboutDialog.h"
 #include "globals.h"
+#include <jx-af/jx/JXDisplay.h>
 #include <jx-af/jx/JXWindow.h>
 #include <jx-af/jx/JXTextButton.h>
 #include <jx-af/jx/JXStaticText.h>
 #include <jx-af/jx/JXImageWidget.h>
-#include <jx-af/jx/JXImage.h>
+#include <jx-af/jx/JXImageCache.h>
 #include <jx-af/jx/JXHelpManager.h>
 #include <jx-af/jcore/jAssert.h>
 
@@ -67,12 +68,12 @@ AboutDialog::BuildWindow
 #define _H_md_about_icon
 #include "md_about_icon.xpm"
 #endif
-	imageWidget->SetXPM(md_about_icon);
+	imageWidget->SetImage(GetDisplay()->GetImageCache()->GetImage(md_about_icon), false);
 
 	auto* textWidget =
-		jnew JXStaticText(JString::empty, window,
+		jnew JXStaticText(JString::empty, true, false, false, nullptr, window,
 					JXWidget::kHElastic, JXWidget::kVElastic, 70,20, 300,50);
-	textWidget->SetToLabel(false);
+	textWidget->SetBorderWidth(0);
 
 	itsCreditsButton =
 		jnew JXTextButton(JGetString("itsCreditsButton::AboutDialog::JXLayout"), window,

diff --git a/tools/jx_memory_debugger/code/AboutDialog.jxl b/tools/jx_memory_debugger/code/AboutDialog.jxl
@@ -1,4 +1,4 @@
-jx_layout_editor 5
+jx_layout_editor 8
 390
 120
 "JXLayout"
@@ -9,6 +9,7 @@ jx_layout_editor 5
 
 1
 0
+0
 "ImageWidget"
 0
 0
@@ -22,6 +23,7 @@ jx_layout_editor 5
 
 1
 0
+0
 "StaticText"
 2
 2
@@ -31,14 +33,15 @@ jx_layout_editor 5
 0
 0
 ""
-1
 0
 0
+1
 0
 0
 
 1
 0
+0
 "TextButton"
 0
 1
@@ -52,6 +55,7 @@ jx_layout_editor 5
 
 1
 0
+0
 "TextButton"
 0
 1
@@ -65,6 +69,7 @@ jx_layout_editor 5
 
 1
 0
+0
 "TextButton"
 0
 1

diff --git a/tools/jx_menu_editor/code/AboutDialog.cpp b/tools/jx_menu_editor/code/AboutDialog.cpp
@@ -9,11 +9,12 @@
 
 #include "AboutDialog.h"
 #include "globals.h"
+#include <jx-af/jx/JXDisplay.h>
 #include <jx-af/jx/JXWindow.h>
 #include <jx-af/jx/JXTextButton.h>
 #include <jx-af/jx/JXStaticText.h>
 #include <jx-af/jx/JXImageWidget.h>
-#include <jx-af/jx/JXImage.h>
+#include <jx-af/jx/JXImageCache.h>
 #include <jx-af/jx/JXHelpManager.h>
 #include <jx-af/jcore/jAssert.h>
 
@@ -67,12 +68,12 @@ AboutDialog::BuildWindow
 #define _H_about_icon
 #include "about_icon.xpm"
 #endif
-	imageWidget->SetXPM(about_icon);
+	imageWidget->SetImage(GetDisplay()->GetImageCache()->GetImage(about_icon), false);
 
 	auto* textWidget =
-		jnew JXStaticText(JGetString("textWidget::AboutDialog::JXLayout"),window,
+		jnew JXStaticText(JString::empty, true, false, false, nullptr, window,
 					JXWidget::kHElastic, JXWidget::kVElastic, 70,20, 290,50);
-	textWidget->SetToLabel(false);
+	textWidget->SetBorderWidth(0);
 
 	itsCreditsButton =
 		jnew JXTextButton(JGetString("itsCreditsButton::AboutDialog::JXLayout"), window,

diff --git a/tools/jx_menu_editor/code/AboutDialog.jxl b/tools/jx_menu_editor/code/AboutDialog.jxl
@@ -1,4 +1,4 @@
-jx_layout_editor 3
+jx_layout_editor 8
 370
 120
 "JXLayout"
@@ -9,6 +9,7 @@ jx_layout_editor 3
 
 1
 0
+0
 "ImageWidget"
 0
 0
@@ -17,57 +18,66 @@ jx_layout_editor 3
 0
 0
 0
-"about_icon.png"
+0
+0 "about_icon.png"
 
 1
 0
+0
 "StaticText"
 2
 2
 20 70 70 360
 "textWidget"
 0
 0
+0
 ""
-1
 0
 0
+1
 0
 0
 
 1
 0
+0
 "TextButton"
 0
 1
 90 50 110 110
 "itsCreditsButton"
 1
 0
+0
 "Credits"
 ""
 
 1
 0
+0
 "TextButton"
 0
 1
 90 155 110 215
 "itsHelpButton"
 1
 0
+0
 "Help"
 "F1"
 
 1
 0
+0
 "TextButton"
 0
 1
 90 260 110 320
 "okButton"
 0
 0
+0
 "OK"
 "^M"
 

diff --git a/tools/jx_menu_editor/strings/AboutDialog_layout b/tools/jx_menu_editor/strings/AboutDialog_layout
@@ -2,7 +2,6 @@
 itsHelpButton::shortcuts::AboutDialog::JXLayout "F1"
 WindowTitle::AboutDialog::JXLayout "About"
 itsHelpButton::AboutDialog::JXLayout "Help"
-textWidget::AboutDialog::JXLayout ""
 okButton::AboutDialog::JXLayout "OK"
 itsCreditsButton::AboutDialog::JXLayout "Credits"
 okButton::shortcuts::AboutDialog::JXLayout "^M"

diff --git a/tools/jx_project_wizard/app_template/code/AboutDialog.cpp b/tools/jx_project_wizard/app_template/code/AboutDialog.cpp
@@ -69,12 +69,12 @@ AboutDialog::BuildWindow
 #define _H_about_icon
 #include "about_icon.xpm"
 #endif
-	imageWidget->SetXPM(about_icon);
+	imageWidget->SetImage(GetDisplay()->GetImageCache()->GetImage(about_icon), false);
 
 	auto* textWidget =
-		jnew JXStaticText(JString::empty, window,
+		jnew JXStaticText(JString::empty, true, false, false, nullptr, window,
 					JXWidget::kHElastic, JXWidget::kVElastic, 70,20, 280,50);
-	assert( textWidget != nullptr );
+	textWidget->SetBorderWidth(0);
 
 	itsCreditsButton =
 		jnew JXTextButton(JGetString("itsCreditsButton::AboutDialog::JXLayout"), window,

diff --git a/tools/jx_project_wizard/app_template/code/AboutDialog.jxl b/tools/jx_project_wizard/app_template/code/AboutDialog.jxl
@@ -1,4 +1,4 @@
-jx_layout_editor 5
+jx_layout_editor 8
 370
 120
 "JXLayout"
@@ -9,6 +9,7 @@ jx_layout_editor 5
 
 1
 0
+0
 "ImageWidget"
 0
 0
@@ -22,6 +23,7 @@ jx_layout_editor 5
 
 1
 0
+0
 "StaticText"
 2
 2
@@ -33,12 +35,13 @@ jx_layout_editor 5
 ""
 0
 0
-0
+1
 0
 0
 
 1
 0
+0
 "TextButton"
 0
 1
@@ -52,6 +55,7 @@ jx_layout_editor 5
 
 1
 0
+0
 "TextButton"
 0
 1
@@ -65,6 +69,7 @@ jx_layout_editor 5
 
 1
 0
+0
 "TextButton"
 0
 1