diff --git a/Fltk/Makefile b/Fltk/Makefile
index 7522cd450801d511597f5bbbee68ac368f0626a7..c45b946da5e1672b0256445e3c362a02cbd8c673 100644
--- a/Fltk/Makefile
+++ b/Fltk/Makefile
@@ -108,7 +108,7 @@ GUI${OBJEXT}: GUI.cpp GUI.h graphicWindow.h openglWindow.h \
../Mesh/PartitionOptions.h
graphicWindow${OBJEXT}: graphicWindow.cpp GUI.h graphicWindow.h openglWindow.h \
../Graphics/drawContext.h ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h \
- dialogWindow.h mainWindow.h menuWindow.h popupButton.h messageWindow.h \
+ paletteWindow.h mainWindow.h menuWindow.h popupButton.h messageWindow.h \
manipWindow.h extraDialogs.h Draw.h ../Post/PView.h ../Post/PViewData.h \
../Numeric/GmshMatrix.h ../Common/GmshMessage.h ../Common/OS.h \
../Common/Options.h ../Post/ColorTable.h ../Common/Context.h \
@@ -137,19 +137,18 @@ menuWindow${OBJEXT}: menuWindow.cpp GUI.h Draw.h menuWindow.h popupButton.h \
statisticsWindow.h messageWindow.h contextWindow.h visibilityWindow.h \
clippingWindow.h manipWindow.h fieldWindow.h pluginWindow.h \
solverWindow.h aboutWindow.h fileDialogs.h partitionDialog.h \
- projectionEditor.h dialogWindow.h ../Geo/fourierProjectionFace.h \
- ../Geo/GModel.h ../Geo/GVertex.h ../Geo/GEntity.h ../Geo/Range.h \
- ../Geo/SPoint3.h ../Geo/SBoundingBox3d.h ../Geo/GPoint.h \
- ../Geo/SPoint2.h ../Geo/GEdge.h ../Geo/GEntity.h ../Geo/GVertex.h \
- ../Geo/SVector3.h ../Geo/SPoint3.h ../Geo/SPoint3.h ../Geo/SPoint2.h \
- ../Geo/GFace.h ../Geo/GEntity.h ../Geo/GPoint.h ../Geo/GEdgeLoop.h \
- ../Geo/GEdge.h ../Geo/SPoint2.h ../Geo/SVector3.h ../Geo/Pair.h \
- ../Geo/GRegion.h ../Geo/GEntity.h ../Geo/SPoint3.h \
- ../Geo/SBoundingBox3d.h ../Geo/Range.h classificationEditor.h \
- ../Geo/MElement.h ../Common/GmshDefines.h ../Geo/MVertex.h \
- ../Geo/SPoint2.h ../Geo/SPoint3.h ../Geo/MEdge.h ../Geo/MVertex.h \
- ../Geo/SVector3.h ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h \
- ../Common/GmshMessage.h ../Numeric/FunctionSpace.h \
+ projectionEditor.h ../Geo/fourierProjectionFace.h ../Geo/GModel.h \
+ ../Geo/GVertex.h ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \
+ ../Geo/SBoundingBox3d.h ../Geo/GPoint.h ../Geo/SPoint2.h ../Geo/GEdge.h \
+ ../Geo/GEntity.h ../Geo/GVertex.h ../Geo/SVector3.h ../Geo/SPoint3.h \
+ ../Geo/SPoint3.h ../Geo/SPoint2.h ../Geo/GFace.h ../Geo/GEntity.h \
+ ../Geo/GPoint.h ../Geo/GEdgeLoop.h ../Geo/GEdge.h ../Geo/SPoint2.h \
+ ../Geo/SVector3.h ../Geo/Pair.h ../Geo/GRegion.h ../Geo/GEntity.h \
+ ../Geo/SPoint3.h ../Geo/SBoundingBox3d.h ../Geo/Range.h \
+ classificationEditor.h ../Geo/MElement.h ../Common/GmshDefines.h \
+ ../Geo/MVertex.h ../Geo/SPoint2.h ../Geo/SPoint3.h ../Geo/MEdge.h \
+ ../Geo/MVertex.h ../Geo/SVector3.h ../Geo/MFace.h ../Geo/MVertex.h \
+ ../Geo/SVector3.h ../Common/GmshMessage.h ../Numeric/FunctionSpace.h \
../Numeric/GmshMatrix.h ../Numeric/Gauss.h ../Common/Options.h \
Solvers.h ../Common/CommandLine.h ../Mesh/Generator.h \
../Mesh/HighOrder.h ../Post/PView.h ../Post/PViewData.h \
@@ -160,7 +159,7 @@ menuWindow${OBJEXT}: menuWindow.cpp GUI.h Draw.h menuWindow.h popupButton.h \
../Mesh/PartitionOptions.h
optionWindow${OBJEXT}: optionWindow.cpp GUI.h optionWindow.h \
spherePositionWidget.h colorbarWindow.h ../Post/ColorTable.h \
- dialogWindow.h menuWindow.h popupButton.h extraDialogs.h Draw.h \
+ paletteWindow.h menuWindow.h popupButton.h extraDialogs.h Draw.h \
../Common/GmshDefines.h ../Common/GmshMessage.h ../Common/Options.h \
Solvers.h ../Geo/GModel.h ../Geo/GVertex.h ../Geo/GEntity.h \
../Geo/Range.h ../Geo/SPoint3.h ../Geo/SBoundingBox3d.h \
@@ -179,7 +178,7 @@ optionWindow${OBJEXT}: optionWindow.cpp GUI.h optionWindow.h \
colorbarWindow${OBJEXT}: colorbarWindow.cpp colorbarWindow.h \
../Post/ColorTable.h Draw.h ../Common/Context.h ../Geo/CGNSOptions.h \
../Mesh/PartitionOptions.h
-fieldWindow${OBJEXT}: fieldWindow.cpp GUI.h Draw.h fieldWindow.h dialogWindow.h \
+fieldWindow${OBJEXT}: fieldWindow.cpp GUI.h Draw.h fieldWindow.h paletteWindow.h \
fileDialogs.h ../Common/GmshDefines.h ../Geo/GModel.h ../Geo/GVertex.h \
../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \
../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Geo/GPoint.h \
@@ -193,14 +192,14 @@ fieldWindow${OBJEXT}: fieldWindow.cpp GUI.h Draw.h fieldWindow.h dialogWindow.h
../Common/Options.h ../Post/ColorTable.h ../Common/Context.h \
../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h
pluginWindow${OBJEXT}: pluginWindow.cpp GUI.h Draw.h pluginWindow.h \
- dialogWindow.h ../Post/PView.h ../Geo/SPoint3.h \
+ paletteWindow.h ../Post/PView.h ../Geo/SPoint3.h \
../Plugin/PluginManager.h ../Plugin/Plugin.h ../Common/Options.h \
../Post/ColorTable.h ../Common/GmshMessage.h ../Post/PViewDataList.h \
../Post/PViewData.h ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h \
../Numeric/GmshMatrix.h ../Common/ListUtils.h ../Common/Context.h \
../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h
statisticsWindow${OBJEXT}: statisticsWindow.cpp GUI.h Draw.h statisticsWindow.h \
- dialogWindow.h ../Geo/GModel.h ../Geo/GVertex.h ../Geo/GEntity.h \
+ paletteWindow.h ../Geo/GModel.h ../Geo/GVertex.h ../Geo/GEntity.h \
../Geo/Range.h ../Geo/SPoint3.h ../Geo/SBoundingBox3d.h \
../Geo/SPoint3.h ../Geo/GPoint.h ../Geo/SPoint2.h ../Geo/GEdge.h \
../Geo/GEntity.h ../Geo/GVertex.h ../Geo/SVector3.h ../Geo/SPoint3.h \
@@ -216,7 +215,7 @@ statisticsWindow${OBJEXT}: statisticsWindow.cpp GUI.h Draw.h statisticsWindow.h
../Mesh/Generator.h ../Common/Context.h ../Geo/CGNSOptions.h \
../Mesh/PartitionOptions.h
visibilityWindow${OBJEXT}: visibilityWindow.cpp GUI.h Draw.h visibilityWindow.h \
- dialogWindow.h contextWindow.h ../Common/GmshDefines.h \
+ paletteWindow.h contextWindow.h ../Common/GmshDefines.h \
../Common/GmshMessage.h ../Geo/GModel.h ../Geo/GVertex.h \
../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \
../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Geo/GPoint.h \
@@ -233,20 +232,20 @@ visibilityWindow${OBJEXT}: visibilityWindow.cpp GUI.h Draw.h visibilityWindow.h
../Post/ColorTable.h ../Common/Context.h ../Geo/CGNSOptions.h \
../Mesh/PartitionOptions.h ../Parser/Parser.h
clippingWindow${OBJEXT}: clippingWindow.cpp GUI.h Draw.h clippingWindow.h \
- dialogWindow.h ../Common/GmshDefines.h ../Post/PView.h ../Geo/SPoint3.h \
- ../Post/PViewOptions.h ../Post/ColorTable.h ../Geo/SBoundingBox3d.h \
- ../Geo/SPoint3.h ../Common/Context.h ../Geo/CGNSOptions.h \
- ../Mesh/PartitionOptions.h
-messageWindow${OBJEXT}: messageWindow.cpp GUI.h messageWindow.h dialogWindow.h \
+ paletteWindow.h ../Common/GmshDefines.h ../Post/PView.h \
+ ../Geo/SPoint3.h ../Post/PViewOptions.h ../Post/ColorTable.h \
+ ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Common/Context.h \
+ ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h
+messageWindow${OBJEXT}: messageWindow.cpp GUI.h messageWindow.h paletteWindow.h \
fileDialogs.h ../Common/GmshMessage.h ../Common/OS.h \
../Common/Context.h ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h
-manipWindow${OBJEXT}: manipWindow.cpp GUI.h Draw.h manipWindow.h dialogWindow.h \
+manipWindow${OBJEXT}: manipWindow.cpp GUI.h Draw.h manipWindow.h paletteWindow.h \
graphicWindow.h openglWindow.h ../Graphics/drawContext.h \
../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Common/Options.h \
../Post/ColorTable.h ../Common/Context.h ../Geo/CGNSOptions.h \
../Mesh/PartitionOptions.h
contextWindow${OBJEXT}: contextWindow.cpp GUI.h Draw.h contextWindow.h \
- dialogWindow.h ../Geo/GModel.h ../Geo/GVertex.h ../Geo/GEntity.h \
+ paletteWindow.h ../Geo/GModel.h ../Geo/GVertex.h ../Geo/GEntity.h \
../Geo/Range.h ../Geo/SPoint3.h ../Geo/SBoundingBox3d.h \
../Geo/SPoint3.h ../Geo/GPoint.h ../Geo/SPoint2.h ../Geo/GEdge.h \
../Geo/GEntity.h ../Geo/GVertex.h ../Geo/SVector3.h ../Geo/SPoint3.h \
@@ -264,31 +263,30 @@ solverWindow${OBJEXT}: solverWindow.cpp ../Geo/GModel.h ../Geo/GVertex.h \
../Geo/GFace.h ../Geo/GEntity.h ../Geo/GPoint.h ../Geo/GEdgeLoop.h \
../Geo/GEdge.h ../Geo/SPoint2.h ../Geo/SVector3.h ../Geo/Pair.h \
../Geo/GRegion.h ../Geo/GEntity.h ../Geo/SPoint3.h \
- ../Geo/SBoundingBox3d.h GUI.h solverWindow.h dialogWindow.h \
+ ../Geo/SBoundingBox3d.h GUI.h solverWindow.h paletteWindow.h \
optionWindow.h spherePositionWidget.h colorbarWindow.h \
../Post/ColorTable.h messageWindow.h fileDialogs.h \
../Common/GmshMessage.h Solvers.h ../Common/StringUtils.h \
../Common/Options.h ../Common/OS.h ../Common/Context.h \
../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h
-aboutWindow${OBJEXT}: aboutWindow.cpp GUI.h aboutWindow.h dialogWindow.h \
+aboutWindow${OBJEXT}: aboutWindow.cpp GUI.h aboutWindow.h paletteWindow.h \
../Common/CommandLine.h ../Common/StringUtils.h ../Common/OS.h \
../Common/Context.h ../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h
-fileDialogs${OBJEXT}: fileDialogs.cpp GUI.h dialogWindow.h \
- ../Common/GmshDefines.h ../Common/CreateFile.h ../Common/Options.h \
- ../Post/ColorTable.h Draw.h ../Geo/GModel.h ../Geo/GVertex.h \
- ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \
- ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Geo/GPoint.h \
- ../Geo/SPoint2.h ../Geo/GEdge.h ../Geo/GEntity.h ../Geo/GVertex.h \
- ../Geo/SVector3.h ../Geo/SPoint3.h ../Geo/SPoint3.h ../Geo/SPoint2.h \
- ../Geo/GFace.h ../Geo/GEntity.h ../Geo/GPoint.h ../Geo/GEdgeLoop.h \
- ../Geo/GEdge.h ../Geo/SPoint2.h ../Geo/SVector3.h ../Geo/Pair.h \
- ../Geo/GRegion.h ../Geo/GEntity.h ../Geo/SPoint3.h \
+fileDialogs${OBJEXT}: fileDialogs.cpp GUI.h ../Common/GmshDefines.h \
+ ../Common/CreateFile.h ../Common/Options.h ../Post/ColorTable.h Draw.h \
+ ../Geo/GModel.h ../Geo/GVertex.h ../Geo/GEntity.h ../Geo/Range.h \
+ ../Geo/SPoint3.h ../Geo/SBoundingBox3d.h ../Geo/SPoint3.h \
+ ../Geo/GPoint.h ../Geo/SPoint2.h ../Geo/GEdge.h ../Geo/GEntity.h \
+ ../Geo/GVertex.h ../Geo/SVector3.h ../Geo/SPoint3.h ../Geo/SPoint3.h \
+ ../Geo/SPoint2.h ../Geo/GFace.h ../Geo/GEntity.h ../Geo/GPoint.h \
+ ../Geo/GEdgeLoop.h ../Geo/GEdge.h ../Geo/SPoint2.h ../Geo/SVector3.h \
+ ../Geo/Pair.h ../Geo/GRegion.h ../Geo/GEntity.h ../Geo/SPoint3.h \
../Geo/SBoundingBox3d.h ../Common/Context.h ../Geo/CGNSOptions.h \
../Mesh/PartitionOptions.h fileChooser.h
-extraDialogs${OBJEXT}: extraDialogs.cpp GUI.h dialogWindow.h \
- ../Common/GmshDefines.h ../Common/CreateFile.h ../Common/Options.h \
- ../Post/ColorTable.h Draw.h ../Geo/GModel.h ../Geo/GVertex.h \
- ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \
+extraDialogs${OBJEXT}: extraDialogs.cpp GUI.h paletteWindow.h \
+ ../Common/GmshDefines.h ../Common/OpenFile.h ../Common/CreateFile.h \
+ ../Common/Options.h ../Post/ColorTable.h Draw.h ../Geo/GModel.h \
+ ../Geo/GVertex.h ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \
../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Geo/GPoint.h \
../Geo/SPoint2.h ../Geo/GEdge.h ../Geo/GEntity.h ../Geo/GVertex.h \
../Geo/SVector3.h ../Geo/SPoint3.h ../Geo/SPoint3.h ../Geo/SPoint2.h \
@@ -298,8 +296,8 @@ extraDialogs${OBJEXT}: extraDialogs.cpp GUI.h dialogWindow.h \
../Geo/SBoundingBox3d.h ../Common/Context.h ../Geo/CGNSOptions.h \
../Mesh/PartitionOptions.h
projectionEditor${OBJEXT}: projectionEditor.cpp GUI.h projectionEditor.h \
- dialogWindow.h ../Geo/fourierProjectionFace.h ../Geo/GModel.h \
- ../Geo/GVertex.h ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \
+ ../Geo/fourierProjectionFace.h ../Geo/GModel.h ../Geo/GVertex.h \
+ ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \
../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Geo/GPoint.h \
../Geo/SPoint2.h ../Geo/GEdge.h ../Geo/GEntity.h ../Geo/GVertex.h \
../Geo/SVector3.h ../Geo/SPoint3.h ../Geo/SPoint3.h ../Geo/SPoint2.h \
@@ -307,7 +305,7 @@ projectionEditor${OBJEXT}: projectionEditor.cpp GUI.h projectionEditor.h \
../Geo/GEdge.h ../Geo/SPoint2.h ../Geo/SVector3.h ../Geo/Pair.h \
../Geo/GRegion.h ../Geo/GEntity.h ../Geo/SPoint3.h \
../Geo/SBoundingBox3d.h ../Geo/Range.h ../Post/ColorTable.h \
- fileDialogs.h ../Geo/GModelIO_Fourier.h ../Geo/GModel.h \
+ paletteWindow.h fileDialogs.h ../Geo/GModelIO_Fourier.h ../Geo/GModel.h \
../Geo/MElement.h ../Common/GmshDefines.h ../Geo/MVertex.h \
../Geo/SPoint2.h ../Geo/SPoint3.h ../Geo/MEdge.h ../Geo/MVertex.h \
../Geo/SVector3.h ../Geo/MFace.h ../Geo/MVertex.h ../Geo/SVector3.h \
@@ -319,7 +317,7 @@ projectionEditor${OBJEXT}: projectionEditor.cpp GUI.h projectionEditor.h \
../Geo/MVertex.h ../Common/Context.h ../Geo/CGNSOptions.h \
../Mesh/PartitionOptions.h
classificationEditor${OBJEXT}: classificationEditor.cpp GUI.h \
- classificationEditor.h dialogWindow.h ../Geo/GModel.h ../Geo/GVertex.h \
+ classificationEditor.h ../Geo/GModel.h ../Geo/GVertex.h \
../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \
../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Geo/GPoint.h \
../Geo/SPoint2.h ../Geo/GEdge.h ../Geo/GEntity.h ../Geo/GVertex.h \
@@ -332,14 +330,14 @@ classificationEditor${OBJEXT}: classificationEditor.cpp GUI.h \
../Geo/MVertex.h ../Geo/SVector3.h ../Geo/MFace.h ../Geo/MVertex.h \
../Geo/SVector3.h ../Common/GmshMessage.h ../Numeric/FunctionSpace.h \
../Numeric/GmshMatrix.h ../Numeric/Gauss.h ../Post/ColorTable.h \
- ../Numeric/Numeric.h ../Numeric/NumericEmbedded.h \
+ paletteWindow.h ../Numeric/Numeric.h ../Numeric/NumericEmbedded.h \
../Numeric/GmshMatrix.h Draw.h ../Common/Options.h ../Common/Context.h \
../Geo/CGNSOptions.h ../Mesh/PartitionOptions.h \
../Mesh/meshGFaceDelaunayInsertion.h ../Mesh/meshGFaceOptimize.h \
../Mesh/meshGFaceDelaunayInsertion.h ../Geo/discreteEdge.h \
../Geo/GModel.h ../Geo/GEdge.h ../Geo/discreteFace.h ../Geo/GModel.h \
../Geo/GFace.h
-partitionDialog${OBJEXT}: partitionDialog.cpp GUI.h dialogWindow.h \
+partitionDialog${OBJEXT}: partitionDialog.cpp GUI.h paletteWindow.h \
../Common/GmshDefines.h ../Common/GmshMessage.h ../Geo/GModel.h \
../Geo/GVertex.h ../Geo/GEntity.h ../Geo/Range.h ../Geo/SPoint3.h \
../Geo/SBoundingBox3d.h ../Geo/SPoint3.h ../Geo/GPoint.h \
diff --git a/Fltk/aboutWindow.cpp b/Fltk/aboutWindow.cpp
index d4941ffbfb864df7df2f5878814f6ff53e942fd4..9853c8426e53d3ea2703a85280447f6ec10fa5a8 100644
--- a/Fltk/aboutWindow.cpp
+++ b/Fltk/aboutWindow.cpp
@@ -8,7 +8,7 @@
#include <FL/Fl_Button.H>
#include "GUI.h"
#include "aboutWindow.h"
-#include "dialogWindow.h"
+#include "paletteWindow.h"
#include "CommandLine.h"
#include "StringUtils.h"
#include "OS.h"
@@ -38,7 +38,7 @@ aboutWindow::aboutWindow()
int width = 28 * FL_NORMAL_SIZE;
int height = 15 * BH + BH/2;
- win = new dialogWindow(width, height, CTX.non_modal_windows, "About Gmsh");
+ win = new paletteWindow(width, height, CTX.non_modal_windows, "About Gmsh");
win->box(GMSH_WINDOW_BOX);
{
diff --git a/Fltk/classificationEditor.cpp b/Fltk/classificationEditor.cpp
index 6f821c82a361cd0ef67005b98285c21d0eef7124..f26f74ab87865af7bbe093989ca86106b2fc1bba 100644
--- a/Fltk/classificationEditor.cpp
+++ b/Fltk/classificationEditor.cpp
@@ -7,6 +7,7 @@
#include <Fl/Fl_Value_Input.H>
#include "GUI.h"
#include "classificationEditor.h"
+#include "paletteWindow.h"
#include "Numeric.h"
#include "Draw.h"
#include "Options.h"
@@ -540,7 +541,7 @@ classificationEditor::classificationEditor()
int BBB = (int)(1.4 * BB); // labels too long
const int width = (int)(3.5 * BBB), height = 10 * BH;
- _window = new dialogWindow(width, height, CTX.non_modal_windows, "Classify");
+ _window = new paletteWindow(width, height, CTX.non_modal_windows, "Classify");
new Fl_Tabs(WB, WB, width - 2 * WB, height - 2 * WB);
{
diff --git a/Fltk/classificationEditor.h b/Fltk/classificationEditor.h
index a73905fa1e96223f893250ea03030e425e88e524..9c9b32633546ec1b9c4db05ded65a80cc3036fa1 100644
--- a/Fltk/classificationEditor.h
+++ b/Fltk/classificationEditor.h
@@ -9,7 +9,7 @@
#include <vector>
#include <FL/Fl_Toggle_Button.H>
#include <FL/Fl_Round_Button.H>
-#include "dialogWindow.h"
+#include <FL/Fl_Window.H>
#include "GModel.h"
#include "MElement.h"
#include "ColorTable.h"
diff --git a/Fltk/clippingWindow.cpp b/Fltk/clippingWindow.cpp
index 618684e0fe590d5245abde9abc0d74eb24d081a2..5962bd5b0d2fe2a4df69359cead8bdab722c15f4 100644
--- a/Fltk/clippingWindow.cpp
+++ b/Fltk/clippingWindow.cpp
@@ -8,7 +8,7 @@
#include "GUI.h"
#include "Draw.h"
#include "clippingWindow.h"
-#include "dialogWindow.h"
+#include "paletteWindow.h"
#include "GmshDefines.h"
#include "PView.h"
#include "PViewOptions.h"
@@ -163,7 +163,7 @@ clippingWindow::clippingWindow(int deltaFontSize)
int height = 10 * BH + 5 * WB;
int L = 7 * FL_NORMAL_SIZE;
- win = new dialogWindow(width, height, CTX.non_modal_windows, "Clipping");
+ win = new paletteWindow(width, height, CTX.non_modal_windows, "Clipping");
win->box(GMSH_WINDOW_BOX);
browser = new Fl_Multi_Browser(WB, WB, L - WB, height - BH - 3 * WB);
diff --git a/Fltk/contextWindow.cpp b/Fltk/contextWindow.cpp
index 8967d154976b067fd8424780082f72d50625683c..44751d8f8842f1d99e911f867f7559ba8c27a150 100644
--- a/Fltk/contextWindow.cpp
+++ b/Fltk/contextWindow.cpp
@@ -8,7 +8,7 @@
#include "GUI.h"
#include "Draw.h"
#include "contextWindow.h"
-#include "dialogWindow.h"
+#include "paletteWindow.h"
#include "GModel.h"
#include "GeoStringInterface.h"
#include "OpenFile.h"
@@ -51,7 +51,7 @@ geometryContextWindow::geometryContextWindow(int deltaFontSize)
int width = 31 * FL_NORMAL_SIZE;
int height = 4 * WB + 8 * BH;
- win = new dialogWindow
+ win = new paletteWindow
(width, height, CTX.non_modal_windows, "Contextual Geometry Definitions");
win->box(GMSH_WINDOW_BOX);
{
@@ -218,7 +218,7 @@ meshContextWindow::meshContextWindow(int deltaFontSize)
int width = 29 * FL_NORMAL_SIZE;
int height = 4 * WB + 4 * BH;
- win = new dialogWindow
+ win = new paletteWindow
(width, height, CTX.non_modal_windows, "Contextual Mesh Definitions");
win->box(GMSH_WINDOW_BOX);
{
diff --git a/Fltk/extraDialogs.cpp b/Fltk/extraDialogs.cpp
index e41e855f67c75f0dd1068a1ba9f733bd26b13633..d8e112f7a5689b8a5b8d6fa7b1b989a798c6d9e2 100644
--- a/Fltk/extraDialogs.cpp
+++ b/Fltk/extraDialogs.cpp
@@ -17,7 +17,7 @@
#include <FL/Fl_Hold_Browser.H>
#include <FL/Fl_Box.H>
#include "GUI.h"
-#include "dialogWindow.h"
+#include "paletteWindow.h"
#include "GmshDefines.h"
#include "OpenFile.h"
#include "CreateFile.h"
@@ -41,7 +41,7 @@ int arrow_editor(const char *title, double &a, double &b, double &c)
if(!editor){
editor = new _editor;
- editor->window = new dialogWindow
+ editor->window = new paletteWindow
(2 * BB + 3 * WB, 4 * BH + 3 * WB, CTX.non_modal_windows);
editor->sa = new Fl_Value_Slider(WB, WB, BB, BH, "Head radius");
editor->sa->type(FL_HOR_SLIDER);
diff --git a/Fltk/fieldWindow.cpp b/Fltk/fieldWindow.cpp
index 93a6d6cc718b644151fc0a21ff4c79c2a41322f1..b3e1789d72619aa079702c56735ad375229f2424 100644
--- a/Fltk/fieldWindow.cpp
+++ b/Fltk/fieldWindow.cpp
@@ -2,6 +2,10 @@
//
// See the LICENSE.txt file for license information. Please report all
// bugs and problems to <gmsh@geuz.org>.
+//
+// Contributor(s):
+// Jonathan Lambrechts
+//
#include <sstream>
#include <FL/Fl_Input.H>
@@ -12,7 +16,7 @@
#include "GUI.h"
#include "Draw.h"
#include "fieldWindow.h"
-#include "dialogWindow.h"
+#include "paletteWindow.h"
#include "fileDialogs.h"
#include "GmshDefines.h"
#include "GModel.h"
@@ -93,7 +97,7 @@ fieldWindow::fieldWindow(int deltaFontSize) : _deltaFontSize(deltaFontSize)
int width = (CTX.field_size[0] < width0) ? width0 : CTX.field_size[0];
int height = (CTX.field_size[1] < height0) ? height0 : CTX.field_size[1];
- win = new dialogWindow(width, height, CTX.non_modal_windows, "Fields");
+ win = new paletteWindow(width, height, CTX.non_modal_windows, "Fields");
win->box(GMSH_WINDOW_BOX);
int x = WB, y = WB, w = (int)(1.5 * BB), h = height - 2 * WB - 3 * BH;
diff --git a/Fltk/fileDialogs.cpp b/Fltk/fileDialogs.cpp
index 39192d827d5d43e82213c9c4e5df5b1f1906f30d..e22f31258c6344733c58241afd33e17ed3db9340 100644
--- a/Fltk/fileDialogs.cpp
+++ b/Fltk/fileDialogs.cpp
@@ -9,6 +9,7 @@
#include <limits>
#include <errno.h>
+#include <FL/Fl_Double_Window.H>
#include <FL/Fl_Check_Button.H>
#include <FL/Fl_Return_Button.H>
#include <FL/Fl_Value_Slider.H>
@@ -18,7 +19,6 @@
#include <FL/Fl_Round_Button.H>
#include <FL/Fl_Choice.H>
#include "GUI.h"
-#include "dialogWindow.h"
#include "GmshDefines.h"
#include "CreateFile.h"
#include "Options.h"
@@ -140,15 +140,14 @@ int generic_bitmap_dialog(const char *name, const char *title, int format)
if(!dialog){
dialog = new _generic_bitmap_dialog;
int h = 3 * WB + 2 * BH, w = 2 * BB + 3 * WB, y = WB;
- // not a "dialogWindow" since it is modal
dialog->window = new Fl_Double_Window(w, h);
dialog->window->box(GMSH_WINDOW_BOX);
+ dialog->window->set_modal();
dialog->b = new Fl_Check_Button
(WB, y, 2 * BB + WB, BH, "Print text strings"); y += BH;
dialog->b->type(FL_TOGGLE_BUTTON);
dialog->ok = new Fl_Return_Button(WB, y + WB, BB, BH, "OK");
dialog->cancel = new Fl_Button(2 * WB + BB, y + WB, BB, BH, "Cancel");
- dialog->window->set_modal();
dialog->window->end();
dialog->window->hotspot(dialog->window);
}
@@ -191,15 +190,14 @@ int latex_dialog(const char *name)
if(!dialog){
dialog = new _latex_dialog;
int h = 3 * WB + 2 * BH, w = 2 * BB + 3 * WB, y = WB;
- // not a "dialogWindow" since it is modal
dialog->window = new Fl_Double_Window(w, h, "LaTeX Options");
dialog->window->box(GMSH_WINDOW_BOX);
+ dialog->window->set_modal();
dialog->b = new Fl_Check_Button
(WB, y, 2 * BB + WB, BH, "Print strings as equations"); y += BH;
dialog->b->type(FL_TOGGLE_BUTTON);
dialog->ok = new Fl_Return_Button(WB, y + WB, BB, BH, "OK");
dialog->cancel = new Fl_Button(2 * WB + BB, y + WB, BB, BH, "Cancel");
- dialog->window->set_modal();
dialog->window->end();
dialog->window->hotspot(dialog->window);
}
@@ -242,9 +240,9 @@ int jpeg_dialog(const char *name)
if(!dialog){
dialog = new _jpeg_dialog;
int h = 3 * WB + 4 * BH, w = 2 * BB + 3 * WB, y = WB;
- // not a "dialogWindow" since it is modal
dialog->window = new Fl_Double_Window(w, h, "JPEG Options");
dialog->window->box(GMSH_WINDOW_BOX);
+ dialog->window->set_modal();
dialog->s[0] = new Fl_Value_Slider(WB, y, BB, BH, "Quality"); y += BH;
dialog->s[0]->type(FL_HOR_SLIDER);
dialog->s[0]->align(FL_ALIGN_RIGHT);
@@ -262,7 +260,6 @@ int jpeg_dialog(const char *name)
dialog->b->type(FL_TOGGLE_BUTTON);
dialog->ok = new Fl_Return_Button(WB, y + WB, BB, BH, "OK");
dialog->cancel = new Fl_Button(2 * WB + BB, y + WB, BB, BH, "Cancel");
- dialog->window->set_modal();
dialog->window->end();
dialog->window->hotspot(dialog->window);
}
@@ -308,9 +305,9 @@ int gif_dialog(const char *name)
if(!dialog){
dialog = new _gif_dialog;
int h = 3 * WB + 6 * BH, w = 2 * BB + 3 * WB, y = WB;
- // not a "dialogWindow" since it is modal
dialog->window = new Fl_Double_Window(w, h, "GIF Options");
dialog->window->box(GMSH_WINDOW_BOX);
+ dialog->window->set_modal();
dialog->b[0] = new Fl_Check_Button
(WB, y, 2 * BB + WB, BH, "Dither"); y += BH;
dialog->b[1] = new Fl_Check_Button
@@ -326,7 +323,6 @@ int gif_dialog(const char *name)
}
dialog->ok = new Fl_Return_Button(WB, y + WB, BB, BH, "OK");
dialog->cancel = new Fl_Button(2 * WB + BB, y + WB, BB, BH, "Cancel");
- dialog->window->set_modal();
dialog->window->end();
dialog->window->hotspot(dialog->window);
}
@@ -421,9 +417,9 @@ int gl2ps_dialog(const char *name, const char *title, int format)
if(!dialog){
dialog = new _gl2ps_dialog;
int h = 3 * WB + 8 * BH, w = 2 * BB + 3 * WB, y = WB;
- // not a "dialogWindow" since it is modal
dialog->window = new Fl_Double_Window(w, h);
dialog->window->box(GMSH_WINDOW_BOX);
+ dialog->window->set_modal();
dialog->c = new Fl_Choice(WB, y, BB + WB + BB / 2, BH, "Type"); y += BH;
dialog->c->menu(sortmenu);
dialog->c->align(FL_ALIGN_RIGHT);
@@ -444,7 +440,6 @@ int gl2ps_dialog(const char *name, const char *title, int format)
}
dialog->ok = new Fl_Return_Button(WB, y + WB, BB, BH, "OK");
dialog->cancel = new Fl_Button(2 * WB + BB, y + WB, BB, BH, "Cancel");
- dialog->window->set_modal();
dialog->window->end();
dialog->window->hotspot(dialog->window);
}
@@ -506,9 +501,9 @@ int options_dialog(const char *name)
if(!dialog){
dialog = new _options_dialog;
int h = 3 * WB + 3 * BH, w = 2 * BB + 3 * WB, y = WB;
- // not a "dialogWindow" since it is modal
dialog->window = new Fl_Double_Window(w, h, "Options");
dialog->window->box(GMSH_WINDOW_BOX);
+ dialog->window->set_modal();
dialog->b[0] = new Fl_Check_Button
(WB, y, 2 * BB + WB, BH, "Save only modified options"); y += BH;
dialog->b[0]->value(1);
@@ -519,7 +514,6 @@ int options_dialog(const char *name)
dialog->b[1]->type(FL_TOGGLE_BUTTON);
dialog->ok = new Fl_Return_Button(WB, y + WB, BB, BH, "OK");
dialog->cancel = new Fl_Button(2 * WB + BB, y + WB, BB, BH, "Cancel");
- dialog->window->set_modal();
dialog->window->end();
dialog->window->hotspot(dialog->window);
}
@@ -559,15 +553,14 @@ int geo_dialog(const char *name)
if(!dialog){
dialog = new _geo_dialog;
int h = 3 * WB + 2 * BH, w = 2 * BB + 3 * WB, y = WB;
- // not a "dialogWindow" since it is modal
dialog->window = new Fl_Double_Window(w, h, "GEO Options");
dialog->window->box(GMSH_WINDOW_BOX);
+ dialog->window->set_modal();
dialog->b = new Fl_Check_Button
(WB, y, 2 * BB + WB, BH, "Save physical group labels"); y += BH;
dialog->b->type(FL_TOGGLE_BUTTON);
dialog->ok = new Fl_Return_Button(WB, y + WB, BB, BH, "OK");
dialog->cancel = new Fl_Button(2 * WB + BB, y + WB, BB, BH, "Cancel");
- dialog->window->set_modal();
dialog->window->end();
dialog->window->hotspot(dialog->window);
}
@@ -609,9 +602,9 @@ int pos_dialog(const char *name)
if(!dialog){
dialog = new _pos_dialog;
int h = 3 * WB + 8 * BH, w = 2 * BBB + 3 * WB, y = WB;
- // not a "dialogWindow" since it is modal
dialog->window = new Fl_Double_Window(w, h, "POS Options");
dialog->window->box(GMSH_WINDOW_BOX);
+ dialog->window->set_modal();
dialog->b[0] = new Fl_Check_Button
(WB, y, 2 * BBB + WB, BH, "Save all (ignore physical groups)"); y += BH;
dialog->b[1] = new Fl_Check_Button
@@ -630,7 +623,6 @@ int pos_dialog(const char *name)
dialog->b[i]->type(FL_TOGGLE_BUTTON);
dialog->ok = new Fl_Return_Button(WB, y + WB, BBB, BH, "OK");
dialog->cancel = new Fl_Button(2 * WB + BBB, y + WB, BBB, BH, "Cancel");
- dialog->window->set_modal();
dialog->window->end();
dialog->window->hotspot(dialog->window);
}
@@ -694,9 +686,9 @@ int msh_dialog(const char *name)
if(!dialog){
dialog = new _msh_dialog;
int h = 3 * WB + 4 * BH, w = 2 * BBB + 3 * WB, y = WB;
- // not a "dialogWindow" since it is modal
dialog->window = new Fl_Double_Window(w, h, "MSH Options");
dialog->window->box(GMSH_WINDOW_BOX);
+ dialog->window->set_modal();
dialog->c = new Fl_Choice(WB, y, BBB + BBB / 2, BH, "Format"); y += BH;
dialog->c->menu(formatmenu);
dialog->c->align(FL_ALIGN_RIGHT);
@@ -708,7 +700,6 @@ int msh_dialog(const char *name)
dialog->p->type(FL_TOGGLE_BUTTON);
dialog->ok = new Fl_Return_Button(WB, y + WB, BBB, BH, "OK");
dialog->cancel = new Fl_Button(2 * WB + BBB, y + WB, BBB, BH, "Cancel");
- dialog->window->set_modal();
dialog->window->end();
dialog->window->hotspot(dialog->window);
}
@@ -759,9 +750,9 @@ int unv_dialog(const char *name)
if(!dialog){
dialog = new _unv_dialog;
int h = 3 * WB + 3 * BH, w = 2 * BBB + 3 * WB, y = WB;
- // not a "dialogWindow" since it is modal
dialog->window = new Fl_Double_Window(w, h, "UNV Options");
dialog->window->box(GMSH_WINDOW_BOX);
+ dialog->window->set_modal();
dialog->b[0] = new Fl_Check_Button
(WB, y, 2 * BBB + WB, BH, "Save all (ignore physical groups)"); y += BH;
dialog->b[0]->type(FL_TOGGLE_BUTTON);
@@ -770,7 +761,6 @@ int unv_dialog(const char *name)
dialog->b[1]->type(FL_TOGGLE_BUTTON);
dialog->ok = new Fl_Return_Button(WB, y + WB, BBB, BH, "OK");
dialog->cancel = new Fl_Button(2 * WB + BBB, y + WB, BBB, BH, "Cancel");
- dialog->window->set_modal();
dialog->window->end();
dialog->window->hotspot(dialog->window);
}
@@ -825,9 +815,9 @@ int bdf_dialog(const char *name)
if(!dialog){
dialog = new _bdf_dialog;
int h = 3 * WB + 3 * BH, w = 2 * BBB + 3 * WB, y = WB;
- // not a "dialogWindow" since it is modal
dialog->window = new Fl_Double_Window(w, h, "BDF Options");
dialog->window->box(GMSH_WINDOW_BOX);
+ dialog->window->set_modal();
dialog->c = new Fl_Choice(WB, y, BBB + BBB / 2, BH, "Format"); y += BH;
dialog->c->menu(formatmenu);
dialog->c->align(FL_ALIGN_RIGHT);
@@ -836,7 +826,6 @@ int bdf_dialog(const char *name)
dialog->b->type(FL_TOGGLE_BUTTON);
dialog->ok = new Fl_Return_Button(WB, y + WB, BBB, BH, "OK");
dialog->cancel = new Fl_Button(2 * WB + BBB, y + WB, BBB, BH, "Cancel");
- dialog->window->set_modal();
dialog->window->end();
dialog->window->hotspot(dialog->window);
}
@@ -890,9 +879,9 @@ int generic_mesh_dialog(const char *name, const char *title, int format,
if(!dialog){
dialog = new _generic_mesh_dialog;
int h = 3 * WB + 3 * BH, w = 2 * BBB + 3 * WB, y = WB;
- // not a "dialogWindow" since it is modal
dialog->window = new Fl_Double_Window(w, h);
dialog->window->box(GMSH_WINDOW_BOX);
+ dialog->window->set_modal();
dialog->c = new Fl_Choice(WB, y, BBB + BBB / 2, BH, "Format"); y += BH;
dialog->c->menu(formatmenu);
dialog->c->align(FL_ALIGN_RIGHT);
@@ -901,7 +890,6 @@ int generic_mesh_dialog(const char *name, const char *title, int format,
dialog->b->type(FL_TOGGLE_BUTTON);
dialog->ok = new Fl_Return_Button(WB, y + WB, BBB, BH, "OK");
dialog->cancel = new Fl_Button(2 * WB + BBB, y + WB, BBB, BH, "Cancel");
- dialog->window->set_modal();
dialog->window->end();
dialog->window->hotspot(dialog->window);
}
@@ -1148,8 +1136,9 @@ int cgns_write_dialog(const char *filename)
const int w = 3*WB + 4*BB; // Window width
int y = WB;
- dlg.window = new dialogWindow(w, h, true, "CGNS Options");
+ dlg.window = new Fl_Double_Window(w, h, "CGNS Options");
dlg.window->box(GMSH_WINDOW_BOX);
+ dlg.window->set_modal();
dlg.window->callback((Fl_Callback *)cgnsw_cancel_cb, &dlg);
// Zone definition
diff --git a/Fltk/graphicWindow.cpp b/Fltk/graphicWindow.cpp
index e428906ce3985468c99272fa14758ba0a26a372e..c19e44c21909b69333872461661c12eeb5377076 100644
--- a/Fltk/graphicWindow.cpp
+++ b/Fltk/graphicWindow.cpp
@@ -8,7 +8,7 @@
#include <FL/fl_ask.H>
#include "GUI.h"
#include "graphicWindow.h"
-#include "dialogWindow.h"
+#include "paletteWindow.h"
#include "mainWindow.h"
#include "menuWindow.h"
#include "messageWindow.h"
@@ -333,7 +333,7 @@ graphicWindow::graphicWindow(bool main, int numTiles)
win->callback(file_quit_cb);
}
else{
- win = new dialogWindow(width, height, false);
+ win = new paletteWindow(width, height, false);
win->callback(remove_graphic_window_cb);
}
diff --git a/Fltk/manipWindow.cpp b/Fltk/manipWindow.cpp
index 6cdd388fcaa4644de7e8eb7ac78cd7c42a3fb347..94af87076b97e2a40875ff18aa954c4f865a5bf6 100644
--- a/Fltk/manipWindow.cpp
+++ b/Fltk/manipWindow.cpp
@@ -8,7 +8,7 @@
#include "GUI.h"
#include "Draw.h"
#include "manipWindow.h"
-#include "dialogWindow.h"
+#include "paletteWindow.h"
#include "graphicWindow.h"
#include "Options.h"
#include "Context.h"
@@ -43,7 +43,7 @@ manipWindow::manipWindow(int deltaFontSize)
int width = 4 * BB + 2 * WB;
int height = 5 * BH + 3 * WB;
- win = new dialogWindow(width, height, CTX.non_modal_windows, "Manipulator");
+ win = new paletteWindow(width, height, CTX.non_modal_windows, "Manipulator");
win->box(GMSH_WINDOW_BOX);
Fl_Box *top[3], *left[3];
diff --git a/Fltk/messageWindow.cpp b/Fltk/messageWindow.cpp
index 45f50ef380ae1b753769fa2dbcaea946ad129f78..5bdc3cdf6764172e564cdc36282574824e7474a4 100644
--- a/Fltk/messageWindow.cpp
+++ b/Fltk/messageWindow.cpp
@@ -9,7 +9,7 @@
#include <FL/fl_ask.H>
#include "GUI.h"
#include "messageWindow.h"
-#include "dialogWindow.h"
+#include "paletteWindow.h"
#include "fileDialogs.h"
#include "GmshMessage.h"
#include "OS.h"
@@ -72,7 +72,7 @@ messageWindow::messageWindow(int deltaFontSize)
int width = CTX.msg_size[0];
int height = CTX.msg_size[1];
- win = new dialogWindow
+ win = new paletteWindow
(width, height, CTX.non_modal_windows, "Message Console");
win->box(GMSH_WINDOW_BOX);
diff --git a/Fltk/optionWindow.cpp b/Fltk/optionWindow.cpp
index 505bddd89945be62db8992cd8b6913895d7960f0..de02bbc4effd2576be55dcd3f2e33b3aa5d95af4 100644
--- a/Fltk/optionWindow.cpp
+++ b/Fltk/optionWindow.cpp
@@ -9,7 +9,7 @@
#include <FL/Fl_Color_Chooser.H>
#include "GUI.h"
#include "optionWindow.h"
-#include "dialogWindow.h"
+#include "paletteWindow.h"
#include "menuWindow.h"
#include "extraDialogs.h"
#include "Draw.h"
@@ -1148,7 +1148,7 @@ optionWindow::optionWindow(int deltaFontSize)
int height = 12 * BH + 4 * WB;
int L = 7 * FL_NORMAL_SIZE;
- win = new dialogWindow(width, height, CTX.non_modal_windows);
+ win = new paletteWindow(width, height, CTX.non_modal_windows);
win->box(GMSH_WINDOW_BOX);
win->label("Options - General");
diff --git a/Fltk/dialogWindow.h b/Fltk/paletteWindow.h
similarity index 86%
rename from Fltk/dialogWindow.h
rename to Fltk/paletteWindow.h
index 4c5f57edc09ceb9474e079be384ff38004b56421..3103996391c86245d3355d2bb360bbe8b1ffe0f8 100644
--- a/Fltk/dialogWindow.h
+++ b/Fltk/paletteWindow.h
@@ -3,15 +3,15 @@
// See the LICENSE.txt file for license information. Please report all
// bugs and problems to <gmsh@geuz.org>.
-#ifndef _DIALOG_WINDOW_H
-#define _DIALOG_WINDOW_H
+#ifndef _PALETTE_WINDOW_H
+#define _PALETTE_WINDOW_H
#include <FL/Fl.H>
#include <FL/Fl_Double_Window.H>
// Derive special windows from Fl_Double_Window to correctly process
// the OS-specific shorcuts (Esc & Cmd-w on Mac, Alt+F4 on Windows)
-class dialogWindow : public Fl_Double_Window {
+class paletteWindow : public Fl_Double_Window {
private:
int handle(int event)
{
@@ -33,7 +33,7 @@ class dialogWindow : public Fl_Double_Window {
return Fl_Double_Window::handle(event);
}
public:
- dialogWindow(int w, int h, int nonmodal=false, const char *l=0)
+ paletteWindow(int w, int h, int nonmodal=false, const char *l=0)
: Fl_Double_Window(w, h, l)
{
if(nonmodal) set_non_modal();
diff --git a/Fltk/partitionDialog.cpp b/Fltk/partitionDialog.cpp
index 6a2fcb01446c743de5dbdbc9fca7ca54aa20b83b..488585afe4f6db515bbb25660f7c6f05349c7a3a 100644
--- a/Fltk/partitionDialog.cpp
+++ b/Fltk/partitionDialog.cpp
@@ -19,7 +19,7 @@
#include <FL/Fl_Group.H>
#include <FL/Fl_Box.H>
#include "GUI.h"
-#include "dialogWindow.h"
+#include "paletteWindow.h"
#include "GmshDefines.h"
#include "GmshMessage.h"
#include "GModel.h"
@@ -467,8 +467,8 @@ void partition_dialog()
const int w = 3 * BB + IW + 3 * WB; // Window width
int y = 0;
- dlg.window = new dialogWindow(w, h, CTX.non_modal_windows,
- "Partitioner Options");
+ dlg.window = new paletteWindow
+ (w, h, CTX.non_modal_windows, "Partitioner Options");
dlg.window->box(GMSH_WINDOW_BOX);
dlg.window->callback((Fl_Callback *)partition_cancel_cb, &dlg);
diff --git a/Fltk/pluginWindow.cpp b/Fltk/pluginWindow.cpp
index 6d85898bd48ddb03e314c27d2ddddaa5a16da9a6..6c4f6040b78d5924ba17a383c5247cc06013e2c3 100644
--- a/Fltk/pluginWindow.cpp
+++ b/Fltk/pluginWindow.cpp
@@ -14,7 +14,7 @@
#include "GUI.h"
#include "Draw.h"
#include "pluginWindow.h"
-#include "dialogWindow.h"
+#include "paletteWindow.h"
#include "PView.h"
#include "PluginManager.h"
#include "Plugin.h"
@@ -239,7 +239,7 @@ pluginWindow::pluginWindow(int deltaFontSize)
int width = (CTX.plugin_size[0] < width0) ? width0 : CTX.plugin_size[0];
int height = (CTX.plugin_size[1] < height0) ? height0 : CTX.plugin_size[1];
- win = new dialogWindow(width, height, CTX.non_modal_windows, "Plugins");
+ win = new paletteWindow(width, height, CTX.non_modal_windows, "Plugins");
win->box(GMSH_WINDOW_BOX);
int L1 = (int)(0.3 * width), L2 = (int)(0.6 * L1);
diff --git a/Fltk/projectionEditor.cpp b/Fltk/projectionEditor.cpp
index 470c4f860bbcb523ef230f4965a313eaf99761e9..9ce5c044769d778be973f90e3cf7fd04c0711ca7 100644
--- a/Fltk/projectionEditor.cpp
+++ b/Fltk/projectionEditor.cpp
@@ -9,6 +9,7 @@
#include <FL/Fl_Repeat_Button.H>
#include "GUI.h"
#include "projectionEditor.h"
+#include "paletteWindow.h"
#include "fileDialogs.h"
#include "GModelIO_Fourier.h"
#include "MElement.h"
@@ -895,7 +896,7 @@ projectionEditor::projectionEditor()
const int width = (int)(3.75 * BB), height = 24 * BH;
// create all widgets (we construct this once, we never deallocate!)
- _window = new dialogWindow(width, height, CTX.non_modal_windows, "Reparameterize");
+ _window = new paletteWindow(width, height, CTX.non_modal_windows, "Reparameterize");
new Fl_Box(WB, WB + BH / 2, BB / 2, BH, "Select:");
diff --git a/Fltk/projectionEditor.h b/Fltk/projectionEditor.h
index 20363a6655176250e02190d50cb747ea38ba967e..146c0051d2a4e03b3516178cafabc39d79c24d6c 100644
--- a/Fltk/projectionEditor.h
+++ b/Fltk/projectionEditor.h
@@ -8,11 +8,11 @@
#include <vector>
#include <complex>
+#include <FL/Fl_Window.H>
#include <FL/Fl_Toggle_Button.H>
#include <FL/Fl_Round_Button.H>
#include <FL/Fl_Value_Input.H>
#include <FL/Fl_Hold_Browser.H>
-#include "dialogWindow.h"
#include "fourierProjectionFace.h"
#include "GModel.h"
#include "ColorTable.h"
diff --git a/Fltk/solverWindow.cpp b/Fltk/solverWindow.cpp
index 46fb66deda7b43df6f9911ecd137ac28a51ff80b..2091b2f26444a293d2b62416fe59849955c541b1 100644
--- a/Fltk/solverWindow.cpp
+++ b/Fltk/solverWindow.cpp
@@ -11,7 +11,7 @@
#include "GModel.h"
#include "GUI.h"
#include "solverWindow.h"
-#include "dialogWindow.h"
+#include "paletteWindow.h"
#include "optionWindow.h"
#include "messageWindow.h"
#include "fileDialogs.h"
@@ -200,7 +200,7 @@ solverWindow::solverWindow(int solverIndex, int deltaFontSize)
int height = (7 + SINFO[solverIndex].nboptions) * BH + 5 * WB;
int BBS = (width - 8 * WB) / 5;
- win = new dialogWindow
+ win = new paletteWindow
(width, height, CTX.non_modal_windows, "Solver");
win->box(GMSH_WINDOW_BOX);
{
diff --git a/Fltk/statisticsWindow.cpp b/Fltk/statisticsWindow.cpp
index 0236ce247c3cfeeff2bf1b30dbde5a482afe3df7..3692f4ff2775c9fa4b5cf70518112a9a9644c410 100644
--- a/Fltk/statisticsWindow.cpp
+++ b/Fltk/statisticsWindow.cpp
@@ -9,7 +9,7 @@
#include "GUI.h"
#include "Draw.h"
#include "statisticsWindow.h"
-#include "dialogWindow.h"
+#include "paletteWindow.h"
#include "GModel.h"
#include "MElement.h"
#include "PView.h"
@@ -84,7 +84,7 @@ statisticsWindow::statisticsWindow(int deltaFontSize)
int width = 26 * FL_NORMAL_SIZE;
int height = 5 * WB + 18 * BH;
- win = new dialogWindow(width, height, CTX.non_modal_windows, "Statistics");
+ win = new paletteWindow(width, height, CTX.non_modal_windows, "Statistics");
win->box(GMSH_WINDOW_BOX);
{
Fl_Tabs *o = new Fl_Tabs(WB, WB, width - 2 * WB, height - 3 * WB - BH);
diff --git a/Fltk/visibilityWindow.cpp b/Fltk/visibilityWindow.cpp
index 4baea1de2379b7efba838786437a5cd582615ff9..b60091337cf3043d9f82c6d53b86476796087620 100644
--- a/Fltk/visibilityWindow.cpp
+++ b/Fltk/visibilityWindow.cpp
@@ -13,7 +13,7 @@
#include "GUI.h"
#include "Draw.h"
#include "visibilityWindow.h"
-#include "dialogWindow.h"
+#include "paletteWindow.h"
#include "contextWindow.h"
#include "GmshDefines.h"
#include "GmshMessage.h"
@@ -1047,7 +1047,7 @@ visibilityWindow::visibilityWindow(int deltaFontSize)
int height = 18 * BH;
int brw = width - 4 * WB;
- win = new dialogWindow
+ win = new paletteWindow
(width, height, CTX.non_modal_windows, "Visibility");
win->box(GMSH_WINDOW_BOX);