* 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.

3 files changed, 70 insertions, 70 deletions

diff --git a/src/corelib/x11/fpg_x11.pas b/src/corelib/x11/fpg_x11.pas
index 66fa7a62..4c7fa049 100644
--- a/src/corelib/x11/fpg_x11.pas
+++ b/src/corelib/x11/fpg_x11.pas
@@ -303,7 +303,7 @@ uses
   fpg_widget,
   fpg_popupwindow,
   fpg_stringutils,  // used for GetTextWidth
-  gui_form,         // for modal event support
+  fpg_form,         // for modal event support
   cursorfont,
   xatom;            // used for XA_WM_NAME
 
diff --git a/src/corelib/x11/fpgui_toolkit.lpk b/src/corelib/x11/fpgui_toolkit.lpk
index e3a6b911..376b0224 100644
--- a/src/corelib/x11/fpgui_toolkit.lpk
+++ b/src/corelib/x11/fpgui_toolkit.lpk
@@ -175,120 +175,120 @@
         <Type Value="Include"/>
       </Item36>
       <Item37>
-        <Filename Value="../../gui/gui_animation.pas"/>
-        <UnitName Value="gui_animation"/>
+        <Filename Value="../../gui/fpg_animation.pas"/>
+        <UnitName Value="fpg_animation"/>
       </Item37>
       <Item38>
-        <Filename Value="../../gui/gui_basegrid.pas"/>
-        <UnitName Value="gui_basegrid"/>
+        <Filename Value="../../gui/fpg_basegrid.pas"/>
+        <UnitName Value="fpg_basegrid"/>
       </Item38>
       <Item39>
-        <Filename Value="../../gui/gui_button.pas"/>
-        <UnitName Value="gui_button"/>
+        <Filename Value="../../gui/fpg_button.pas"/>
+        <UnitName Value="fpg_button"/>
       </Item39>
       <Item40>
-        <Filename Value="../../gui/gui_checkbox.pas"/>
-        <UnitName Value="gui_checkbox"/>
+        <Filename Value="../../gui/fpg_checkbox.pas"/>
+        <UnitName Value="fpg_checkbox"/>
       </Item40>
       <Item41>
-        <Filename Value="../../gui/gui_combobox.pas"/>
-        <UnitName Value="gui_combobox"/>
+        <Filename Value="../../gui/fpg_combobox.pas"/>
+        <UnitName Value="fpg_combobox"/>
       </Item41>
       <Item42>
-        <Filename Value="../../gui/gui_customgrid.pas"/>
-        <UnitName Value="gui_customgrid"/>
+        <Filename Value="../../gui/fpg_customgrid.pas"/>
+        <UnitName Value="fpg_customgrid"/>
       </Item42>
       <Item43>
-        <Filename Value="../../gui/gui_dialogs.pas"/>
-        <UnitName Value="gui_dialogs"/>
+        <Filename Value="../../gui/fpg_dialogs.pas"/>
+        <UnitName Value="fpg_dialogs"/>
       </Item43>
       <Item44>
-        <Filename Value="../../gui/gui_editcombo.pas"/>
-        <UnitName Value="gui_editcombo"/>
+        <Filename Value="../../gui/fpg_editcombo.pas"/>
+        <UnitName Value="fpg_editcombo"/>
       </Item44>
       <Item45>
-        <Filename Value="../../gui/gui_edit.pas"/>
-        <UnitName Value="gui_edit"/>
+        <Filename Value="../../gui/fpg_edit.pas"/>
+        <UnitName Value="fpg_edit"/>
       </Item45>
       <Item46>
-        <Filename Value="../../gui/gui_form.pas"/>
-        <UnitName Value="gui_form"/>
+        <Filename Value="../../gui/fpg_form.pas"/>
+        <UnitName Value="fpg_form"/>
       </Item46>
       <Item47>
-        <Filename Value="../../gui/gui_gauge.pas"/>
-        <UnitName Value="gui_gauge"/>
+        <Filename Value="../../gui/fpg_gauge.pas"/>
+        <UnitName Value="fpg_gauge"/>
       </Item47>
       <Item48>
-        <Filename Value="../../gui/gui_grid.pas"/>
-        <UnitName Value="gui_grid"/>
+        <Filename Value="../../gui/fpg_grid.pas"/>
+        <UnitName Value="fpg_grid"/>
       </Item48>
       <Item49>
-        <Filename Value="../../gui/gui_hyperlink.pas"/>
-        <UnitName Value="gui_hyperlink"/>
+        <Filename Value="../../gui/fpg_hyperlink.pas"/>
+        <UnitName Value="fpg_hyperlink"/>
       </Item49>
       <Item50>
-        <Filename Value="../../gui/gui_iniutils.pas"/>
-        <UnitName Value="gui_iniutils"/>
+        <Filename Value="../../gui/fpg_iniutils.pas"/>
+        <UnitName Value="fpg_iniutils"/>
       </Item50>
       <Item51>
-        <Filename Value="../../gui/gui_label.pas"/>
-        <UnitName Value="gui_label"/>
+        <Filename Value="../../gui/fpg_label.pas"/>
+        <UnitName Value="fpg_label"/>
       </Item51>
       <Item52>
-        <Filename Value="../../gui/gui_listbox.pas"/>
-        <UnitName Value="gui_listbox"/>
+        <Filename Value="../../gui/fpg_listbox.pas"/>
+        <UnitName Value="fpg_listbox"/>
       </Item52>
       <Item53>
-        <Filename Value="../../gui/gui_listview.pas"/>
-        <UnitName Value="gui_listview"/>
+        <Filename Value="../../gui/fpg_listview.pas"/>
+        <UnitName Value="fpg_listview"/>
       </Item53>
       <Item54>
-        <Filename Value="../../gui/gui_memo.pas"/>
-        <UnitName Value="gui_memo"/>
+        <Filename Value="../../gui/fpg_memo.pas"/>
+        <UnitName Value="fpg_memo"/>
       </Item54>
       <Item55>
-        <Filename Value="../../gui/gui_menu.pas"/>
-        <UnitName Value="gui_menu"/>
+        <Filename Value="../../gui/fpg_menu.pas"/>
+        <UnitName Value="fpg_menu"/>
       </Item55>
       <Item56>
-        <Filename Value="../../gui/gui_mru.pas"/>
-        <UnitName Value="gui_mru"/>
+        <Filename Value="../../gui/fpg_mru.pas"/>
+        <UnitName Value="fpg_mru"/>
       </Item56>
       <Item57>
-        <Filename Value="../../gui/gui_panel.pas"/>
-        <UnitName Value="gui_panel"/>
+        <Filename Value="../../gui/fpg_panel.pas"/>
+        <UnitName Value="fpg_panel"/>
       </Item57>
       <Item58>
-        <Filename Value="../../gui/gui_popupcalendar.pas"/>
-        <UnitName Value="gui_popupcalendar"/>
+        <Filename Value="../../gui/fpg_popupcalendar.pas"/>
+        <UnitName Value="fpg_popupcalendar"/>
       </Item58>
       <Item59>
-        <Filename Value="../../gui/gui_progressbar.pas"/>
-        <UnitName Value="gui_progressbar"/>
+        <Filename Value="../../gui/fpg_progressbar.pas"/>
+        <UnitName Value="fpg_progressbar"/>
       </Item59>
       <Item60>
-        <Filename Value="../../gui/gui_radiobutton.pas"/>
-        <UnitName Value="gui_radiobutton"/>
+        <Filename Value="../../gui/fpg_radiobutton.pas"/>
+        <UnitName Value="fpg_radiobutton"/>
       </Item60>
       <Item61>
-        <Filename Value="../../gui/gui_scrollbar.pas"/>
-        <UnitName Value="gui_scrollbar"/>
+        <Filename Value="../../gui/fpg_scrollbar.pas"/>
+        <UnitName Value="fpg_scrollbar"/>
       </Item61>
       <Item62>
-        <Filename Value="../../gui/gui_style.pas"/>
-        <UnitName Value="gui_style"/>
+        <Filename Value="../../gui/fpg_style.pas"/>
+        <UnitName Value="fpg_style"/>
       </Item62>
       <Item63>
-        <Filename Value="../../gui/gui_tab.pas"/>
-        <UnitName Value="gui_tab"/>
+        <Filename Value="../../gui/fpg_tab.pas"/>
+        <UnitName Value="fpg_tab"/>
       </Item63>
       <Item64>
-        <Filename Value="../../gui/gui_trackbar.pas"/>
-        <UnitName Value="gui_trackbar"/>
+        <Filename Value="../../gui/fpg_trackbar.pas"/>
+        <UnitName Value="fpg_trackbar"/>
       </Item64>
       <Item65>
-        <Filename Value="../../gui/gui_tree.pas"/>
-        <UnitName Value="gui_tree"/>
+        <Filename Value="../../gui/fpg_tree.pas"/>
+        <UnitName Value="fpg_tree"/>
       </Item65>
       <Item66>
         <Filename Value="../../gui/logo.inc"/>
@@ -307,12 +307,12 @@
         <UnitName Value="fpgui_db"/>
       </Item69>
       <Item70>
-        <Filename Value="../../gui/gui_splitter.pas"/>
-        <UnitName Value="gui_splitter"/>
+        <Filename Value="../../gui/fpg_splitter.pas"/>
+        <UnitName Value="fpg_splitter"/>
       </Item70>
       <Item71>
-        <Filename Value="../../gui/gui_hint.pas"/>
-        <UnitName Value="gui_hint"/>
+        <Filename Value="../../gui/fpg_hint.pas"/>
+        <UnitName Value="fpg_hint"/>
       </Item71>
     </Files>
     <LazDoc Paths="../../../docs/xml/corelib/;../../../docs/xml/corelib/x11/;../../../docs/xml/corelib/gdi/;../../../docs/xml/gui/"/>
diff --git a/src/corelib/x11/fpgui_toolkit.pas b/src/corelib/x11/fpgui_toolkit.pas
index 504536a2..4d37c9c8 100644
--- a/src/corelib/x11/fpgui_toolkit.pas
+++ b/src/corelib/x11/fpgui_toolkit.pas
@@ -11,13 +11,13 @@ uses
   fpg_extinterpolation, fpg_imagelist, fpg_imgfmt_bmp, fpg_pofiles, 
   fpg_popupwindow, fpg_stdimages, fpg_stringhashlist, fpg_translations, 
   fpg_stringutils, fpg_utils, fpg_widget, fpg_wuline, fpg_impl, fpg_x11, 
-  fpg_netlayer_x11, fpg_keyconv_x11, fpg_xft_x11, gui_animation, gui_basegrid, 
-  gui_button, gui_checkbox, gui_combobox, gui_customgrid, gui_dialogs, 
-  gui_editcombo, gui_edit, gui_form, gui_gauge, gui_grid, gui_hyperlink, 
-  gui_iniutils, gui_label, gui_listbox, gui_listview, gui_memo, gui_menu, 
-  gui_mru, gui_panel, gui_popupcalendar, gui_progressbar, gui_radiobutton, 
-  gui_scrollbar, gui_style, gui_tab, gui_trackbar, gui_tree, fpgui_db, 
-  gui_splitter, gui_hint;
+  fpg_netlayer_x11, fpg_keyconv_x11, fpg_xft_x11, fpg_animation, fpg_basegrid, 
+  fpg_button, fpg_checkbox, fpg_combobox, fpg_customgrid, fpg_dialogs, 
+  fpg_editcombo, fpg_edit, fpg_form, fpg_gauge, fpg_grid, fpg_hyperlink, 
+  fpg_iniutils, fpg_label, fpg_listbox, fpg_listview, fpg_memo, fpg_menu, 
+  fpg_mru, fpg_panel, fpg_popupcalendar, fpg_progressbar, fpg_radiobutton, 
+  fpg_scrollbar, fpg_style, fpg_tab, fpg_trackbar, fpg_tree, fpgui_db, 
+  fpg_splitter, fpg_hint;
 
 implementation