jx_layout_editor: improve code generation

todo-jxlayout

@@ -4,6 +4,10 @@ when show/hide toolbar, change window size to preserve LayoutContainer size
 
 snap-to-grid for bottom & right is offset
 
+LayoutConfigDialog:
+	SetWMClass
+	SetMinSize/SetMaxSize/etc
+
 -----
 
 JXImageWidget

tools/jx_layout_editor/code/BaseWidget.cpp

@@ -226,7 +226,7 @@ BaseWidget::EditConfiguration
 
  ******************************************************************************/
 
-void
+bool
 BaseWidget::GenerateCode
 	(
 	std::ostream&		output,
@@ -237,6 +237,11 @@ BaseWidget::GenerateCode
 	)
 	const
 {
+	if (WaitForCodeDependency(*objNames))
+	{
+		return false;
+	}
+
 	indent.Print(output);
 	if (itsIsMemberVarFlag)
 	{
@@ -276,6 +281,46 @@ BaseWidget::GenerateCode
 
 	PrintConfiguration(output, indent, itsVarName, stringdb);
 	output << std::endl;
+	return true;
+}
+
+/******************************************************************************
+ PrepareToGenerateCode (virtual)
+
+ ******************************************************************************/
+
+void
+BaseWidget::PrepareToGenerateCode()
+	const
+{
+}
+
+/******************************************************************************
+ GenerateCodeFinished (virtual)
+
+ ******************************************************************************/
+
+void
+BaseWidget::GenerateCodeFinished()
+	const
+{
+}
+
+/******************************************************************************
+ WaitForCodeDependency (virtual protected)
+
+	Return true if need to wait for another object to be created first.
+
+ ******************************************************************************/
+
+bool
+BaseWidget::WaitForCodeDependency
+	(
+	const JPtrArray<JString>& objNames
+	)
+	const
+{
+	return false;
 }
 
 /******************************************************************************

tools/jx_layout_editor/code/BaseWidget.h

@@ -47,11 +47,14 @@ class BaseWidget : public JXWidget
 	JPoint	GetDragStartPointGlobal() const;
 
 	void	EditConfiguration(const bool createUndo = true);
-	void	GenerateCode(std::ostream& output, const JString& indent,
+	bool	GenerateCode(std::ostream& output, const JString& indent,
 						 JPtrArray<JString>* objTypes,
 						 JPtrArray<JString>* objNames,
 						 JStringManager* stringdb) const;
 
+	virtual void	PrepareToGenerateCode() const;
+	virtual void	GenerateCodeFinished() const;
+
 	void	PrepareToAcceptDrag();
 
 	virtual JString	GetEnclosureName() const;
@@ -71,6 +74,7 @@ class BaseWidget : public JXWidget
 									   const JString& indent,
 									   const JString& varName,
 									   JStringManager* stringdb) const;
+	virtual bool	WaitForCodeDependency(const JPtrArray<JString>& objNames) const;
 
 	virtual void	AddPanels(WidgetParametersDialog* dlog);
 	virtual void	SavePanelData();

tools/jx_layout_editor/code/CustomWidget.cpp

@@ -74,6 +74,11 @@ CustomWidget::CustomWidget
 {
 	input >> itsClassName >> itsCtorArgs >> itsCreateFlag;
 
+	if (vers >= 2)
+	{
+		input >> itsDependencyNames;
+	}
+
 	CustomWidgetX();
 }
 
@@ -113,6 +118,7 @@ CustomWidget::StreamOut
 	output << itsClassName << std::endl;
 	output << itsCtorArgs << std::endl;
 	output << itsCreateFlag << std::endl;
+	output << itsDependencyNames << std::endl;
 }
 
 /******************************************************************************
@@ -225,6 +231,49 @@ CustomWidget::PrintCtorArgsWithComma
 	}
 }
 
+/******************************************************************************
+ WaitForCodeDependency (virtual protected)
+
+	Return true if need to wait for another object to be created first.
+
+ ******************************************************************************/
+
+bool
+CustomWidget::WaitForCodeDependency
+	(
+	const JPtrArray<JString>& objNames
+	)
+	const
+{
+	if (itsDependencyNames.IsEmpty())
+	{
+		return false;
+	}
+
+	JPtrArray<JString> list(JPtrArrayT::kDeleteAll);
+	itsDependencyNames.Split(",", &list);
+
+	for (auto* d : list)
+	{
+		bool found = false;
+		for (auto* n : objNames)
+		{
+			if (*n == *d)
+			{
+				found = true;
+				break;
+			}
+		}
+
+		if (!found)
+		{
+			return true;
+		}
+	}
+
+	return false;
+}
+
 /******************************************************************************
  AddPanels (virtual protected)
 
@@ -238,7 +287,7 @@ CustomWidget::AddPanels
 {
 	itsPanel =
 		jnew CustomWidgetPanel(dlog, itsClassName, itsCtorArgs, itsCreateFlag,
-			WantsInput());
+			itsDependencyNames, WantsInput());
 }
 
 /******************************************************************************
@@ -250,7 +299,8 @@ void
 CustomWidget::SavePanelData()
 {
 	bool wantsInput;
-	itsPanel->GetValues(&itsClassName, &itsCtorArgs, &itsCreateFlag, &wantsInput);
+	itsPanel->GetValues(&itsClassName, &itsCtorArgs, &itsCreateFlag,
+						&itsDependencyNames, &wantsInput);
 	SetWantsInput(wantsInput);
 	itsPanel = nullptr;
 }

tools/jx_layout_editor/code/CustomWidget.h

@@ -45,6 +45,7 @@ class CustomWidget : public BaseWidget
 	void	PrintCtorArgsWithComma(std::ostream& output,
 								   const JString& varName,
 								   JStringManager* stringdb) const override;
+	bool	WaitForCodeDependency(const JPtrArray<JString>& objNames) const override;
 
 	void	AddPanels(WidgetParametersDialog* dlog) override;
 	void	SavePanelData() override;
@@ -54,6 +55,7 @@ class CustomWidget : public BaseWidget
 	JString	itsClassName;
 	JString	itsCtorArgs;
 	bool	itsCreateFlag;
+	JString	itsDependencyNames;
 
 	CustomWidgetPanel*	itsPanel;	// nullptr unless editing
 

tools/jx_layout_editor/code/CustomWidgetPanel.cpp

@@ -30,10 +30,11 @@ CustomWidgetPanel::CustomWidgetPanel
 	const JString&	className,
 	const JString&	ctorArgs,
 	const bool		needsCreate,
+	const JString&	deps,
 	const bool		wantsInput
 	)
 {
-	BuildPanel(dlog, className, ctorArgs, needsCreate, wantsInput);
+	BuildPanel(dlog, className, ctorArgs, needsCreate, deps, wantsInput);
 }
 
 /******************************************************************************
@@ -58,6 +59,7 @@ CustomWidgetPanel::BuildPanel
 	const JString&	className,
 	const JString&	ctorArgs,
 	const bool		needsCreate,
+	const JString&	deps,
 	const bool		wantsInput
 	)
 {
@@ -67,7 +69,7 @@ CustomWidgetPanel::BuildPanel
 
 	auto* container =
 		jnew JXWidgetSet(window,
-					JXWidget::kFixedLeft, JXWidget::kFixedTop, 0,0, 460,100);
+					JXWidget::kFixedLeft, JXWidget::kFixedTop, 0,0, 460,130);
 	assert( container != nullptr );
 
 	auto* classNameLabel =
@@ -80,14 +82,19 @@ CustomWidgetPanel::BuildPanel
 					JXWidget::kFixedLeft, JXWidget::kFixedTop, 20,39, 80,20);
 	constructorArgsLabel->SetToLabel(false);
 
+	auto* dependencyLabel =
+		jnew JXStaticText(JGetString("dependencyLabel::CustomWidgetPanel::Panel"),container,
+					JXWidget::kFixedLeft, JXWidget::kFixedTop, 20,70, 80,20);
+	dependencyLabel->SetToLabel(false);
+
 	itsWantsInputCB =
 		jnew JXTextCheckbox(JGetString("itsWantsInputCB::CustomWidgetPanel::Panel"), container,
-					JXWidget::kFixedLeft, JXWidget::kFixedTop, 20,70, 160,20);
+					JXWidget::kFixedLeft, JXWidget::kFixedTop, 20,100, 160,20);
 	itsWantsInputCB->SetShortcuts(JGetString("itsWantsInputCB::shortcuts::CustomWidgetPanel::Panel"));
 
 	itsNeedsCreateCB =
 		jnew JXTextCheckbox(JGetString("itsNeedsCreateCB::CustomWidgetPanel::Panel"), container,
-					JXWidget::kFixedLeft, JXWidget::kFixedTop, 280,70, 160,20);
+					JXWidget::kFixedLeft, JXWidget::kFixedTop, 280,100, 160,20);
 	itsNeedsCreateCB->SetShortcuts(JGetString("itsNeedsCreateCB::shortcuts::CustomWidgetPanel::Panel"));
 
 	itsClassNameInput =
@@ -98,6 +105,11 @@ CustomWidgetPanel::BuildPanel
 		jnew JXInputField(container,
 					JXWidget::kFixedLeft, JXWidget::kFixedTop, 100,40, 340,20);
 
+	itsDependencyInput =
+		jnew JXInputField(container,
+					JXWidget::kFixedLeft, JXWidget::kFixedTop, 100,70, 340,20);
+	itsDependencyInput->SetValidationPattern(jnew JRegex("^[_a-z][_a-z0-9,]+$", "i"), "itsDependencyInput::validation::CustomWidgetPanel::Panel");
+
 // end Panel
 
 	dlog->AddPanel(this, container);
@@ -111,6 +123,8 @@ CustomWidgetPanel::BuildPanel
 	itsCtorArgs->GetText()->SetText(ctorArgs);
 	itsNeedsCreateCB->SetState(needsCreate);
 
+	itsDependencyInput->GetText()->SetText(deps);
+
 	itsWantsInputCB->SetState(wantsInput);
 }
 
@@ -125,11 +139,13 @@ CustomWidgetPanel::GetValues
 	JString*	className,
 	JString*	ctorArgs,
 	bool*		needsCreate,
+	JString*	deps,
 	bool*		wantsInput
 	)
 {
 	*className   = itsClassNameInput->GetText()->GetText();
 	*ctorArgs    = itsCtorArgs->GetText()->GetText();
+	*deps        = itsDependencyInput->GetText()->GetText();
 	*needsCreate = itsNeedsCreateCB->IsChecked();
 	*wantsInput  = itsWantsInputCB->IsChecked();
 }

tools/jx_layout_editor/code/CustomWidgetPanel.h

@@ -20,12 +20,12 @@ class CustomWidgetPanel : public WidgetPanelBase
 
 	CustomWidgetPanel(WidgetParametersDialog* dlog, const JString& className,
 					  const JString& ctorArgs, const bool needsCreate,
-					  const bool wantsInput);
+					  const JString& deps, const bool wantsInput);
 
 	~CustomWidgetPanel();
 
 	void	GetValues(JString* className, JString* ctorArgs, bool* needsCreate,
-					  bool* wantsInput);
+					  JString* deps, bool* wantsInput);
 
 private:
 
@@ -35,14 +35,15 @@ class CustomWidgetPanel : public WidgetPanelBase
 	JXTextCheckbox* itsNeedsCreateCB;
 	JXInputField*   itsClassNameInput;
 	JXInputField*   itsCtorArgs;
+	JXInputField*   itsDependencyInput;
 
 // end Panel
 
 private:
 
 	void	BuildPanel(WidgetParametersDialog* dlog, const JString& className,
 						const JString& ctorArgs, const bool needsCreate,
-						const bool wantsInput);
+						const JString& deps, const bool wantsInput);
 };
 
 #endif