* Phase 2 of the unit rename is complete. The gui units have now been renamed.

* UI Designer has been updated to reflect the new gui unit names.

11 files changed, 81 insertions, 81 deletions

diff --git a/uidesigner/newformdesigner.pas b/uidesigner/newformdesigner.pas
index 098f3fd1..34e9c1c9 100644
--- a/uidesigner/newformdesigner.pas
+++ b/uidesigner/newformdesigner.pas
@@ -26,16 +26,16 @@ uses
   Classes,
   fpg_base,
   fpg_widget,
-  gui_form,
-  gui_label,
-  gui_button,
-  gui_edit,
-  gui_listbox,
-  gui_memo,
-  gui_combobox,
-  gui_menu,
-  gui_mru,
-  gui_hyperlink,
+  fpg_form,
+  fpg_label,
+  fpg_button,
+  fpg_edit,
+  fpg_listbox,
+  fpg_memo,
+  fpg_combobox,
+  fpg_menu,
+  fpg_mru,
+  fpg_hyperlink,
   vfdwidgetclass,
   vfdwidgets;
 
@@ -169,8 +169,8 @@ implementation
 uses
   fpg_main,
   vfdmain,
-  gui_iniutils,
-  gui_dialogs;
+  fpg_iniutils,
+  fpg_dialogs;
 
 
 // Anchor images
diff --git a/uidesigner/vfddesigner.pas b/uidesigner/vfddesigner.pas
index bd10cfe1..e3b505c5 100644
--- a/uidesigner/vfddesigner.pas
+++ b/uidesigner/vfddesigner.pas
@@ -28,15 +28,15 @@ uses
   fpg_base,
   fpg_main,
   fpg_widget,
-  gui_form,
-  gui_dialogs,
-  gui_label,
-  gui_edit,
-  gui_button,
-  gui_listbox,
-  gui_memo,
-  gui_combobox,
-  gui_checkbox,
+  fpg_form,
+  fpg_dialogs,
+  fpg_label,
+  fpg_edit,
+  fpg_button,
+  fpg_listbox,
+  fpg_memo,
+  fpg_combobox,
+  fpg_checkbox,
   vfdresizer,
   vfdforms,
   vfdeditors,
diff --git a/uidesigner/vfdeditors.pas b/uidesigner/vfdeditors.pas
index 9860f907..b9e8cce9 100644
--- a/uidesigner/vfdeditors.pas
+++ b/uidesigner/vfdeditors.pas
@@ -25,9 +25,9 @@ uses
   Classes,
   SysUtils,
   fpg_widget,
-  gui_label,
-  gui_button,
-  gui_memo,
+  fpg_label,
+  fpg_button,
+  fpg_memo,
   vfdforms;
 
 type
diff --git a/uidesigner/vfdfile.pas b/uidesigner/vfdfile.pas
index 2361e215..2c63890a 100644
--- a/uidesigner/vfdfile.pas
+++ b/uidesigner/vfdfile.pas
@@ -352,11 +352,11 @@ begin
     'interface' + LineEnding + LineEnding +
     'uses' + LineEnding +
     '  SysUtils, Classes, fpg_base, fpg_main, fpg_widget,' + LineEnding +
-    '  gui_edit, gui_form, gui_label, gui_button,' + LineEnding +
-    '  gui_listbox, gui_memo, gui_combobox, gui_basegrid, gui_grid, ' + LineEnding +
-    '  gui_dialogs, gui_checkbox, gui_tree, gui_trackbar, ' + LineEnding +
-    '  gui_progressbar, gui_radiobutton, gui_tab, gui_menu,' + LineEnding +
-    '  gui_panel, gui_popupcalendar, gui_gauge;' + LineEnding + LineEnding +
+    '  fpg_edit, fpg_form, fpg_label, fpg_button,' + LineEnding +
+    '  fpg_listbox, fpg_memo, fpg_combobox, fpg_basegrid, fpg_grid, ' + LineEnding +
+    '  fpg_dialogs, fpg_checkbox, fpg_tree, fpg_trackbar, ' + LineEnding +
+    '  fpg_progressbar, fpg_radiobutton, fpg_tab, fpg_menu,' + LineEnding +
+    '  fpg_panel, fpg_popupcalendar, fpg_gauge;' + LineEnding + LineEnding +
     'type' + LineEnding + LineEnding +
     '{@VFD_NEWFORM_DECL}' + LineEnding + LineEnding +
     'implementation' + LineEnding + LineEnding +
diff --git a/uidesigner/vfdformparser.pas b/uidesigner/vfdformparser.pas
index 5e20fb92..2f41c308 100644
--- a/uidesigner/vfdformparser.pas
+++ b/uidesigner/vfdformparser.pas
@@ -26,7 +26,7 @@ uses
   SysUtils,
   fpg_main,
   fpg_widget,
-  gui_form,
+  fpg_form,
   vfddesigner,
   vfdwidgetclass,
   vfdwidgets;
diff --git a/uidesigner/vfdforms.pas b/uidesigner/vfdforms.pas
index 9b50eeea..8987c49d 100644
--- a/uidesigner/vfdforms.pas
+++ b/uidesigner/vfdforms.pas
@@ -26,14 +26,14 @@ uses
   SysUtils,
   fpg_base,
   fpg_widget,
-  gui_form,
-  gui_label,
-  gui_edit,
-  gui_button,
-  gui_listbox,
-  gui_combobox,
-  gui_trackbar,
-  gui_checkbox;
+  fpg_form,
+  fpg_label,
+  fpg_edit,
+  fpg_button,
+  fpg_listbox,
+  fpg_combobox,
+  fpg_trackbar,
+  fpg_checkbox;
 
 type
 
@@ -131,7 +131,7 @@ implementation
 
 uses
   fpg_main,
-  gui_iniutils,
+  fpg_iniutils,
   fpg_constants,
   vfdprops; // used to get Object Inspector defaults
 
diff --git a/uidesigner/vfdmain.pas b/uidesigner/vfdmain.pas
index 612def1d..a310acfd 100644
--- a/uidesigner/vfdmain.pas
+++ b/uidesigner/vfdmain.pas
@@ -25,7 +25,7 @@ uses
   Classes,
   SysUtils,
   fpg_widget,
-  gui_dialogs,
+  fpg_dialogs,
   vfdprops,
   vfdforms,
   vfddesigner,
@@ -83,7 +83,7 @@ implementation
 
 uses
   vfdformparser,
-  gui_iniutils,
+  fpg_iniutils,
   fpg_utils,
   fpg_main;
 
diff --git a/uidesigner/vfdpropeditgrid.pas b/uidesigner/vfdpropeditgrid.pas
index 1004a56f..2af4daad 100644
--- a/uidesigner/vfdpropeditgrid.pas
+++ b/uidesigner/vfdpropeditgrid.pas
@@ -26,17 +26,17 @@ uses
   SysUtils,
   fpg_base,
   fpg_widget,
-  gui_form,
-  gui_label,
-  gui_edit,
-  gui_button,
-  gui_listbox,
-  gui_memo,
-  gui_combobox,
-  gui_customgrid,
-  gui_basegrid,
-  gui_grid,
-  gui_checkbox,
+  fpg_form,
+  fpg_label,
+  fpg_edit,
+  fpg_button,
+  fpg_listbox,
+  fpg_memo,
+  fpg_combobox,
+  fpg_customgrid,
+  fpg_basegrid,
+  fpg_grid,
+  fpg_checkbox,
   vfdforms,
   vfdwidgetclass,
   vfdprops,
diff --git a/uidesigner/vfdprops.pas b/uidesigner/vfdprops.pas
index 13000c78..93c2dff5 100644
--- a/uidesigner/vfdprops.pas
+++ b/uidesigner/vfdprops.pas
@@ -27,9 +27,9 @@ uses
   fpg_base,
   fpg_widget,
   vfdwidgetclass,
-  gui_edit,
-  gui_button,
-  gui_combobox;
+  fpg_edit,
+  fpg_button,
+  fpg_combobox;
 
 type
 
@@ -152,7 +152,7 @@ uses
   vfdformparser,
   vfdeditors,
   fpg_main,
-  gui_dialogs;
+  fpg_dialogs;
 
 
 procedure EditStringList(sl: TStringList);
diff --git a/uidesigner/vfdutils.pas b/uidesigner/vfdutils.pas
index 8a7fd4c3..a97cf432 100644
--- a/uidesigner/vfdutils.pas
+++ b/uidesigner/vfdutils.pas
@@ -25,12 +25,12 @@ uses
   Classes,
   SysUtils,
   fpg_widget,
-  gui_form,
-  gui_label,
-  gui_edit,
-  gui_button,
-  gui_memo,
-  gui_checkbox;
+  fpg_form,
+  fpg_label,
+  fpg_edit,
+  fpg_button,
+  fpg_memo,
+  fpg_checkbox;
 
 
 procedure SetWidgetText(wg: TfpgWidget; txt: string);
diff --git a/uidesigner/vfdwidgets.pas b/uidesigner/vfdwidgets.pas
index 489dee3c..6771f5f1 100644
--- a/uidesigner/vfdwidgets.pas
+++ b/uidesigner/vfdwidgets.pas
@@ -43,25 +43,25 @@ implementation
 uses
   fpg_main,
   vfddesigner,
-  gui_form,
-  gui_label,
-  gui_edit,
-  gui_button,
-  gui_listbox,
-  gui_memo,
-  gui_combobox,
-  gui_grid,
-  gui_checkbox,
-  gui_panel,
-  gui_tree,
-  gui_radiobutton,
-  gui_listview,
-  gui_trackbar,
-  gui_menu,
-  gui_progressbar,
-  gui_tab,
-  gui_popupcalendar,
-  gui_gauge,
+  fpg_form,
+  fpg_label,
+  fpg_edit,
+  fpg_button,
+  fpg_listbox,
+  fpg_memo,
+  fpg_combobox,
+  fpg_grid,
+  fpg_checkbox,
+  fpg_panel,
+  fpg_tree,
+  fpg_radiobutton,
+  fpg_listview,
+  fpg_trackbar,
+  fpg_menu,
+  fpg_progressbar,
+  fpg_tab,
+  fpg_popupcalendar,
+  fpg_gauge,
   vfdpropeditgrid;
 
 var