diff options
| -rw-r--r-- | src/corelib/fpg_main.pas | 4 | ||||
| -rw-r--r-- | src/corelib/fpg_pofiles.pas | 1 | ||||
| -rw-r--r-- | src/corelib/fpg_widget.pas | 3 | ||||
| -rw-r--r-- | src/corelib/gdi/fpgui_toolkit.lpk | 644 | ||||
| -rw-r--r-- | src/corelib/gdi/fpgui_toolkit.pas | 14 | ||||
| -rw-r--r-- | src/corelib/x11/fpg_x11.pas | 2 | ||||
| -rw-r--r-- | src/corelib/x11/fpgui_toolkit.lpk | 124 | ||||
| -rw-r--r-- | src/corelib/x11/fpgui_toolkit.pas | 14 | ||||
| -rw-r--r-- | src/gui/db/fpgui_db.pas | 2 | ||||
| -rw-r--r-- | src/gui/fpg_animation.pas (renamed from src/gui/gui_animation.pas) | 2 | ||||
| -rw-r--r-- | src/gui/fpg_basegrid.pas (renamed from src/gui/gui_basegrid.pas) | 4 | ||||
| -rw-r--r-- | src/gui/fpg_button.pas (renamed from src/gui/gui_button.pas) | 4 | ||||
| -rw-r--r-- | src/gui/fpg_checkbox.pas (renamed from src/gui/gui_checkbox.pas) | 2 | ||||
| -rw-r--r-- | src/gui/fpg_combobox.pas (renamed from src/gui/gui_combobox.pas) | 4 | ||||
| -rw-r--r-- | src/gui/fpg_customgrid.pas (renamed from src/gui/gui_customgrid.pas) | 4 | ||||
| -rw-r--r-- | src/gui/fpg_dialogs.pas (renamed from src/gui/gui_dialogs.pas) | 22 | ||||
| -rw-r--r-- | src/gui/fpg_edit.pas (renamed from src/gui/gui_edit.pas) | 6 | ||||
| -rw-r--r-- | src/gui/fpg_editcombo.pas (renamed from src/gui/gui_editcombo.pas) | 8 | ||||
| -rw-r--r-- | src/gui/fpg_form.pas (renamed from src/gui/gui_form.pas) | 4 | ||||
| -rw-r--r-- | src/gui/fpg_gauge.pas (renamed from src/gui/gui_gauge.pas) | 2 | ||||
| -rw-r--r-- | src/gui/fpg_grid.pas (renamed from src/gui/gui_grid.pas) | 6 | ||||
| -rw-r--r-- | src/gui/fpg_hint.pas (renamed from src/gui/gui_hint.pas) | 6 | ||||
| -rw-r--r-- | src/gui/fpg_hyperlink.pas (renamed from src/gui/gui_hyperlink.pas) | 4 | ||||
| -rw-r--r-- | src/gui/fpg_iniutils.pas (renamed from src/gui/gui_iniutils.pas) | 4 | ||||
| -rw-r--r-- | src/gui/fpg_label.pas (renamed from src/gui/gui_label.pas) | 2 | ||||
| -rw-r--r-- | src/gui/fpg_listbox.pas (renamed from src/gui/gui_listbox.pas) | 4 | ||||
| -rw-r--r-- | src/gui/fpg_listview.pas (renamed from src/gui/gui_listview.pas) | 4 | ||||
| -rw-r--r-- | src/gui/fpg_memo.pas (renamed from src/gui/gui_memo.pas) | 6 | ||||
| -rw-r--r-- | src/gui/fpg_menu.pas (renamed from src/gui/gui_menu.pas) | 2 | ||||
| -rw-r--r-- | src/gui/fpg_mru.pas (renamed from src/gui/gui_mru.pas) | 6 | ||||
| -rw-r--r-- | src/gui/fpg_panel.pas (renamed from src/gui/gui_panel.pas) | 2 | ||||
| -rw-r--r-- | src/gui/fpg_popupcalendar.pas (renamed from src/gui/gui_popupcalendar.pas) | 14 | ||||
| -rw-r--r-- | src/gui/fpg_progressbar.pas (renamed from src/gui/gui_progressbar.pas) | 2 | ||||
| -rw-r--r-- | src/gui/fpg_radiobutton.pas (renamed from src/gui/gui_radiobutton.pas) | 2 | ||||
| -rw-r--r-- | src/gui/fpg_scrollbar.pas (renamed from src/gui/gui_scrollbar.pas) | 2 | ||||
| -rw-r--r-- | src/gui/fpg_splitter.pas (renamed from src/gui/gui_splitter.pas) | 2 | ||||
| -rw-r--r-- | src/gui/fpg_style.pas (renamed from src/gui/gui_style.pas) | 2 | ||||
| -rw-r--r-- | src/gui/fpg_tab.pas (renamed from src/gui/gui_tab.pas) | 4 | ||||
| -rw-r--r-- | src/gui/fpg_trackbar.pas (renamed from src/gui/gui_trackbar.pas) | 2 | ||||
| -rw-r--r-- | src/gui/fpg_tree.pas (renamed from src/gui/gui_tree.pas) | 6 | ||||
| -rw-r--r-- | src/gui/logo.inc | 2 | ||||
| -rw-r--r-- | uidesigner/newformdesigner.pas | 24 | ||||
| -rw-r--r-- | uidesigner/vfddesigner.pas | 18 | ||||
| -rw-r--r-- | uidesigner/vfdeditors.pas | 6 | ||||
| -rw-r--r-- | uidesigner/vfdfile.pas | 10 | ||||
| -rw-r--r-- | uidesigner/vfdformparser.pas | 2 | ||||
| -rw-r--r-- | uidesigner/vfdforms.pas | 18 | ||||
| -rw-r--r-- | uidesigner/vfdmain.pas | 4 | ||||
| -rw-r--r-- | uidesigner/vfdpropeditgrid.pas | 22 | ||||
| -rw-r--r-- | uidesigner/vfdprops.pas | 8 | ||||
| -rw-r--r-- | uidesigner/vfdutils.pas | 12 | ||||
| -rw-r--r-- | uidesigner/vfdwidgets.pas | 38 |
52 files changed, 558 insertions, 558 deletions
diff --git a/src/corelib/fpg_main.pas b/src/corelib/fpg_main.pas index 58b8f6e4..9a0abf9e 100644 --- a/src/corelib/fpg_main.pas +++ b/src/corelib/fpg_main.pas @@ -386,8 +386,8 @@ uses fpg_constants, fpg_stringutils, fpg_widget, - gui_dialogs, - gui_hint; + fpg_dialogs, + fpg_hint; var fpgTimers: TList; diff --git a/src/corelib/fpg_pofiles.pas b/src/corelib/fpg_pofiles.pas index 806e1dc7..3af333fe 100644 --- a/src/corelib/fpg_pofiles.pas +++ b/src/corelib/fpg_pofiles.pas @@ -54,7 +54,6 @@ interface uses Classes, SysUtils, - Contnrs, fpg_stringhashlist; type diff --git a/src/corelib/fpg_widget.pas b/src/corelib/fpg_widget.pas index e471dd9d..5b3535e7 100644 --- a/src/corelib/fpg_widget.pas +++ b/src/corelib/fpg_widget.pas @@ -167,7 +167,8 @@ function FindKeyboardFocus: TfpgWidget; implementation uses - math, fpg_constants, gui_hint; + fpg_constants, + fpg_hint; var diff --git a/src/corelib/gdi/fpgui_toolkit.lpk b/src/corelib/gdi/fpgui_toolkit.lpk index 61ab6a60..31b266e3 100644 --- a/src/corelib/gdi/fpgui_toolkit.lpk +++ b/src/corelib/gdi/fpgui_toolkit.lpk @@ -1,324 +1,324 @@ -<?xml version="1.0"?>
-<CONFIG>
- <Package Version="3">
- <PathDelim Value="\"/>
- <Name Value="fpgui_toolkit"/>
- <Author Value="Graeme Geldenhuys"/>
- <CompilerOptions>
- <Version Value="8"/>
- <PathDelim Value="\"/>
- <SearchPaths>
- <OtherUnitFiles Value="..\;..\..\gui\;..\..\gui\db\"/>
- <UnitOutputDirectory Value="..\..\..\lib"/>
- </SearchPaths>
- <Parsing>
- <SyntaxOptions>
- <CStyleOperator Value="False"/>
- <AllowLabel Value="False"/>
- <CPPInline Value="False"/>
- </SyntaxOptions>
- </Parsing>
- <Other>
- <CompilerPath Value="$(CompPath)"/>
- </Other>
- </CompilerOptions>
+<?xml version="1.0"?> +<CONFIG> + <Package Version="3"> + <PathDelim Value="\"/> + <Name Value="fpgui_toolkit"/> + <Author Value="Graeme Geldenhuys"/> + <CompilerOptions> + <Version Value="8"/> + <PathDelim Value="\"/> + <SearchPaths> + <OtherUnitFiles Value="..\;..\..\gui\;..\..\gui\db\"/> + <UnitOutputDirectory Value="..\..\..\lib"/> + </SearchPaths> + <Parsing> + <SyntaxOptions> + <CStyleOperator Value="False"/> + <AllowLabel Value="False"/> + <CPPInline Value="False"/> + </SyntaxOptions> + </Parsing> + <Other> + <CompilerPath Value="$(CompPath)"/> + </Other> + </CompilerOptions> <Description Value="fpGUI Toolkit -"/>
+"/> <License Value="Modified LGPL -"/>
- <Version Minor="6" Release="2"/>
- <Files Count="69">
- <Item1>
- <Filename Value="..\stdimages.inc"/>
- <Type Value="Include"/>
- </Item1>
- <Item2>
- <Filename Value="..\fpg_base.pas"/>
- <UnitName Value="fpg_base"/>
- </Item2>
- <Item3>
- <Filename Value="..\fpg_main.pas"/>
- <UnitName Value="fpg_main"/>
- </Item3>
- <Item4>
- <Filename Value="..\fpg_cmdlineparams.pas"/>
- <UnitName Value="fpg_cmdlineparams"/>
- </Item4>
- <Item5>
- <Filename Value="..\fpg_command_intf.pas"/>
- <UnitName Value="fpg_command_intf"/>
- </Item5>
- <Item6>
- <Filename Value="..\fpg_constants.pas"/>
- <UnitName Value="fpg_constants"/>
- </Item6>
- <Item7>
- <Filename Value="..\fpg_extinterpolation.pas"/>
- <UnitName Value="fpg_extinterpolation"/>
- </Item7>
- <Item8>
- <Filename Value="..\fpg_imagelist.pas"/>
- <UnitName Value="fpg_imagelist"/>
- </Item8>
- <Item9>
- <Filename Value="..\fpg_imgfmt_bmp.pas"/>
- <UnitName Value="fpg_imgfmt_bmp"/>
- </Item9>
- <Item10>
- <Filename Value="..\fpg_msgqueue.inc"/>
- <Type Value="Include"/>
- </Item10>
- <Item11>
- <Filename Value="..\fpg_pofiles.pas"/>
- <UnitName Value="fpg_pofiles"/>
- </Item11>
- <Item12>
- <Filename Value="..\fpg_popupwindow.pas"/>
- <UnitName Value="fpg_popupwindow"/>
- </Item12>
- <Item13>
- <Filename Value="..\fpg_stdimages.pas"/>
- <UnitName Value="fpg_stdimages"/>
- </Item13>
- <Item14>
- <Filename Value="..\fpg_stringhashlist.pas"/>
- <UnitName Value="fpg_stringhashlist"/>
- </Item14>
- <Item15>
- <Filename Value="..\fpg_translations.pas"/>
- <UnitName Value="fpg_translations"/>
- </Item15>
- <Item16>
- <Filename Value="..\fpg_stringutils.pas"/>
- <UnitName Value="fpg_stringutils"/>
- </Item16>
- <Item17>
- <Filename Value="..\fpg_utils.pas"/>
- <UnitName Value="fpg_utils"/>
- </Item17>
- <Item18>
- <Filename Value="..\fpg_widget.pas"/>
- <UnitName Value="fpg_widget"/>
- </Item18>
- <Item19>
- <Filename Value="..\fpg_wuline.pas"/>
- <UnitName Value="fpg_wuline"/>
- </Item19>
- <Item20>
- <Filename Value="..\keys.inc"/>
- <Type Value="Include"/>
- </Item20>
- <Item21>
- <Filename Value="..\lang_afrikaans.inc"/>
- <Type Value="Include"/>
- </Item21>
- <Item22>
- <Filename Value="..\lang_english.inc"/>
- <Type Value="Include"/>
- </Item22>
- <Item23>
- <Filename Value="..\lang_french.inc"/>
- <Type Value="Include"/>
- </Item23>
- <Item24>
- <Filename Value="..\lang_german.inc"/>
- <Type Value="Include"/>
- </Item24>
- <Item25>
- <Filename Value="..\lang_italian.inc"/>
- <Type Value="Include"/>
- </Item25>
- <Item26>
- <Filename Value="..\lang_portuguese.inc"/>
- <Type Value="Include"/>
- </Item26>
- <Item27>
- <Filename Value="..\lang_russian.inc"/>
- <Type Value="Include"/>
- </Item27>
- <Item28>
- <Filename Value="..\lang_spanish.inc"/>
- <Type Value="Include"/>
- </Item28>
- <Item29>
- <Filename Value="..\predefinedcolors.inc"/>
- <Type Value="Include"/>
- </Item29>
- <Item30>
- <Filename Value="..\..\gui\promptuserdialog.inc"/>
- <Type Value="Include"/>
- </Item30>
- <Item31>
- <Filename Value="..\..\gui\gui_animation.pas"/>
- <UnitName Value="gui_animation"/>
- </Item31>
- <Item32>
- <Filename Value="..\..\gui\gui_basegrid.pas"/>
- <UnitName Value="gui_basegrid"/>
- </Item32>
- <Item33>
- <Filename Value="..\..\gui\gui_button.pas"/>
- <UnitName Value="gui_button"/>
- </Item33>
- <Item34>
- <Filename Value="..\..\gui\gui_checkbox.pas"/>
- <UnitName Value="gui_checkbox"/>
- </Item34>
- <Item35>
- <Filename Value="..\..\gui\gui_combobox.pas"/>
- <UnitName Value="gui_combobox"/>
- </Item35>
- <Item36>
- <Filename Value="..\..\gui\gui_customgrid.pas"/>
- <UnitName Value="gui_customgrid"/>
- </Item36>
- <Item37>
- <Filename Value="..\..\gui\gui_dialogs.pas"/>
- <UnitName Value="gui_dialogs"/>
- </Item37>
- <Item38>
- <Filename Value="..\..\gui\gui_editcombo.pas"/>
- <UnitName Value="gui_editcombo"/>
- </Item38>
- <Item39>
- <Filename Value="..\..\gui\gui_edit.pas"/>
- <UnitName Value="gui_edit"/>
- </Item39>
- <Item40>
- <Filename Value="..\..\gui\gui_form.pas"/>
- <UnitName Value="gui_form"/>
- </Item40>
- <Item41>
- <Filename Value="..\..\gui\gui_gauge.pas"/>
- <UnitName Value="gui_gauge"/>
- </Item41>
- <Item42>
- <Filename Value="..\..\gui\gui_grid.pas"/>
- <UnitName Value="gui_grid"/>
- </Item42>
- <Item43>
- <Filename Value="..\..\gui\gui_hyperlink.pas"/>
- <UnitName Value="gui_hyperlink"/>
- </Item43>
- <Item44>
- <Filename Value="..\..\gui\gui_iniutils.pas"/>
- <UnitName Value="gui_iniutils"/>
- </Item44>
- <Item45>
- <Filename Value="..\..\gui\gui_label.pas"/>
- <UnitName Value="gui_label"/>
- </Item45>
- <Item46>
- <Filename Value="..\..\gui\gui_listbox.pas"/>
- <UnitName Value="gui_listbox"/>
- </Item46>
- <Item47>
- <Filename Value="..\..\gui\gui_listview.pas"/>
- <UnitName Value="gui_listview"/>
- </Item47>
- <Item48>
- <Filename Value="..\..\gui\gui_memo.pas"/>
- <UnitName Value="gui_memo"/>
- </Item48>
- <Item49>
- <Filename Value="..\..\gui\gui_menu.pas"/>
- <UnitName Value="gui_menu"/>
- </Item49>
- <Item50>
- <Filename Value="..\..\gui\gui_mru.pas"/>
- <UnitName Value="gui_mru"/>
- </Item50>
- <Item51>
- <Filename Value="..\..\gui\gui_panel.pas"/>
- <UnitName Value="gui_panel"/>
- </Item51>
- <Item52>
- <Filename Value="..\..\gui\gui_popupcalendar.pas"/>
- <UnitName Value="gui_popupcalendar"/>
- </Item52>
- <Item53>
- <Filename Value="..\..\gui\gui_progressbar.pas"/>
- <UnitName Value="gui_progressbar"/>
- </Item53>
- <Item54>
- <Filename Value="..\..\gui\gui_radiobutton.pas"/>
- <UnitName Value="gui_radiobutton"/>
- </Item54>
- <Item55>
- <Filename Value="..\..\gui\gui_scrollbar.pas"/>
- <UnitName Value="gui_scrollbar"/>
- </Item55>
- <Item56>
- <Filename Value="..\..\gui\gui_style.pas"/>
- <UnitName Value="gui_style"/>
- </Item56>
- <Item57>
- <Filename Value="..\..\gui\gui_tab.pas"/>
- <UnitName Value="gui_tab"/>
- </Item57>
- <Item58>
- <Filename Value="..\..\gui\gui_trackbar.pas"/>
- <UnitName Value="gui_trackbar"/>
- </Item58>
- <Item59>
- <Filename Value="..\..\gui\gui_tree.pas"/>
- <UnitName Value="gui_tree"/>
- </Item59>
- <Item60>
- <Filename Value="..\..\gui\logo.inc"/>
- <Type Value="Include"/>
- </Item60>
- <Item61>
- <Filename Value="..\..\gui\messagedialog.inc"/>
- <Type Value="Include"/>
- </Item61>
- <Item62>
- <Filename Value="..\..\gui\newdirdialog.inc"/>
- <Type Value="Include"/>
- </Item62>
- <Item63>
- <Filename Value="..\..\gui\db\fpgui_db.pas"/>
- <UnitName Value="fpgui_db"/>
- </Item63>
- <Item64>
- <Filename Value="fpg_utils_impl.inc"/>
- <Type Value="Include"/>
- </Item64>
- <Item65>
- <Filename Value="fpg_gdi.pas"/>
- <UnitName Value="fpg_gdi"/>
- </Item65>
- <Item66>
- <Filename Value="fpg_impl.pas"/>
- <UnitName Value="fpg_impl"/>
- </Item66>
- <Item67>
- <Filename Value="fpg_keys_gdi.inc"/>
- <Type Value="Include"/>
- </Item67>
- <Item68>
- <Filename Value="..\..\gui\gui_splitter.pas"/>
- <UnitName Value="gui_splitter"/>
- </Item68>
- <Item69>
- <Filename Value="..\..\gui\gui_hint.pas"/>
- <UnitName Value="gui_hint"/>
- </Item69>
- </Files>
- <LazDoc Paths="..\..\..\docs\xml\corelib\;..\..\..\docs\xml\corelib\x11\;..\..\..\docs\xml\corelib\gdi\;..\..\..\docs\xml\gui\"/>
- <RequiredPkgs Count="1">
- <Item1>
- <PackageName Value="FCL"/>
- <MinVersion Major="1" Valid="True"/>
- </Item1>
- </RequiredPkgs>
- <UsageOptions>
- <UnitPath Value="$(PkgOutDir)\"/>
- </UsageOptions>
- <PublishOptions>
- <Version Value="2"/>
- <DestinationDirectory Value="$(TestDir)\publishedpackage\"/>
- <IgnoreBinaries Value="False"/>
- </PublishOptions>
- </Package>
-</CONFIG>
+"/> + <Version Minor="6" Release="2"/> + <Files Count="69"> + <Item1> + <Filename Value="..\stdimages.inc"/> + <Type Value="Include"/> + </Item1> + <Item2> + <Filename Value="..\fpg_base.pas"/> + <UnitName Value="fpg_base"/> + </Item2> + <Item3> + <Filename Value="..\fpg_main.pas"/> + <UnitName Value="fpg_main"/> + </Item3> + <Item4> + <Filename Value="..\fpg_cmdlineparams.pas"/> + <UnitName Value="fpg_cmdlineparams"/> + </Item4> + <Item5> + <Filename Value="..\fpg_command_intf.pas"/> + <UnitName Value="fpg_command_intf"/> + </Item5> + <Item6> + <Filename Value="..\fpg_constants.pas"/> + <UnitName Value="fpg_constants"/> + </Item6> + <Item7> + <Filename Value="..\fpg_extinterpolation.pas"/> + <UnitName Value="fpg_extinterpolation"/> + </Item7> + <Item8> + <Filename Value="..\fpg_imagelist.pas"/> + <UnitName Value="fpg_imagelist"/> + </Item8> + <Item9> + <Filename Value="..\fpg_imgfmt_bmp.pas"/> + <UnitName Value="fpg_imgfmt_bmp"/> + </Item9> + <Item10> + <Filename Value="..\fpg_msgqueue.inc"/> + <Type Value="Include"/> + </Item10> + <Item11> + <Filename Value="..\fpg_pofiles.pas"/> + <UnitName Value="fpg_pofiles"/> + </Item11> + <Item12> + <Filename Value="..\fpg_popupwindow.pas"/> + <UnitName Value="fpg_popupwindow"/> + </Item12> + <Item13> + <Filename Value="..\fpg_stdimages.pas"/> + <UnitName Value="fpg_stdimages"/> + </Item13> + <Item14> + <Filename Value="..\fpg_stringhashlist.pas"/> + <UnitName Value="fpg_stringhashlist"/> + </Item14> + <Item15> + <Filename Value="..\fpg_translations.pas"/> + <UnitName Value="fpg_translations"/> + </Item15> + <Item16> + <Filename Value="..\fpg_stringutils.pas"/> + <UnitName Value="fpg_stringutils"/> + </Item16> + <Item17> + <Filename Value="..\fpg_utils.pas"/> + <UnitName Value="fpg_utils"/> + </Item17> + <Item18> + <Filename Value="..\fpg_widget.pas"/> + <UnitName Value="fpg_widget"/> + </Item18> + <Item19> + <Filename Value="..\fpg_wuline.pas"/> + <UnitName Value="fpg_wuline"/> + </Item19> + <Item20> + <Filename Value="..\keys.inc"/> + <Type Value="Include"/> + </Item20> + <Item21> + <Filename Value="..\lang_afrikaans.inc"/> + <Type Value="Include"/> + </Item21> + <Item22> + <Filename Value="..\lang_english.inc"/> + <Type Value="Include"/> + </Item22> + <Item23> + <Filename Value="..\lang_french.inc"/> + <Type Value="Include"/> + </Item23> + <Item24> + <Filename Value="..\lang_german.inc"/> + <Type Value="Include"/> + </Item24> + <Item25> + <Filename Value="..\lang_italian.inc"/> + <Type Value="Include"/> + </Item25> + <Item26> + <Filename Value="..\lang_portuguese.inc"/> + <Type Value="Include"/> + </Item26> + <Item27> + <Filename Value="..\lang_russian.inc"/> + <Type Value="Include"/> + </Item27> + <Item28> + <Filename Value="..\lang_spanish.inc"/> + <Type Value="Include"/> + </Item28> + <Item29> + <Filename Value="..\predefinedcolors.inc"/> + <Type Value="Include"/> + </Item29> + <Item30> + <Filename Value="..\..\gui\promptuserdialog.inc"/> + <Type Value="Include"/> + </Item30> + <Item31> + <Filename Value="..\..\gui\fpg_animation.pas"/> + <UnitName Value="fpg_animation"/> + </Item31> + <Item32> + <Filename Value="..\..\gui\fpg_basegrid.pas"/> + <UnitName Value="fpg_basegrid"/> + </Item32> + <Item33> + <Filename Value="..\..\gui\fpg_button.pas"/> + <UnitName Value="fpg_button"/> + </Item33> + <Item34> + <Filename Value="..\..\gui\fpg_checkbox.pas"/> + <UnitName Value="fpg_checkbox"/> + </Item34> + <Item35> + <Filename Value="..\..\gui\fpg_combobox.pas"/> + <UnitName Value="fpg_combobox"/> + </Item35> + <Item36> + <Filename Value="..\..\gui\fpg_customgrid.pas"/> + <UnitName Value="fpg_customgrid"/> + </Item36> + <Item37> + <Filename Value="..\..\gui\fpg_dialogs.pas"/> + <UnitName Value="fpg_dialogs"/> + </Item37> + <Item38> + <Filename Value="..\..\gui\fpg_editcombo.pas"/> + <UnitName Value="fpg_editcombo"/> + </Item38> + <Item39> + <Filename Value="..\..\gui\fpg_edit.pas"/> + <UnitName Value="fpg_edit"/> + </Item39> + <Item40> + <Filename Value="..\..\gui\fpg_form.pas"/> + <UnitName Value="fpg_form"/> + </Item40> + <Item41> + <Filename Value="..\..\gui\fpg_gauge.pas"/> + <UnitName Value="fpg_gauge"/> + </Item41> + <Item42> + <Filename Value="..\..\gui\fpg_grid.pas"/> + <UnitName Value="fpg_grid"/> + </Item42> + <Item43> + <Filename Value="..\..\gui\fpg_hyperlink.pas"/> + <UnitName Value="fpg_hyperlink"/> + </Item43> + <Item44> + <Filename Value="..\..\gui\fpg_iniutils.pas"/> + <UnitName Value="fpg_iniutils"/> + </Item44> + <Item45> + <Filename Value="..\..\gui\fpg_label.pas"/> + <UnitName Value="fpg_label"/> + </Item45> + <Item46> + <Filename Value="..\..\gui\fpg_listbox.pas"/> + <UnitName Value="fpg_listbox"/> + </Item46> + <Item47> + <Filename Value="..\..\gui\fpg_listview.pas"/> + <UnitName Value="fpg_listview"/> + </Item47> + <Item48> + <Filename Value="..\..\gui\fpg_memo.pas"/> + <UnitName Value="fpg_memo"/> + </Item48> + <Item49> + <Filename Value="..\..\gui\fpg_menu.pas"/> + <UnitName Value="fpg_menu"/> + </Item49> + <Item50> + <Filename Value="..\..\gui\fpg_mru.pas"/> + <UnitName Value="fpg_mru"/> + </Item50> + <Item51> + <Filename Value="..\..\gui\fpg_panel.pas"/> + <UnitName Value="fpg_panel"/> + </Item51> + <Item52> + <Filename Value="..\..\gui\fpg_popupcalendar.pas"/> + <UnitName Value="fpg_popupcalendar"/> + </Item52> + <Item53> + <Filename Value="..\..\gui\fpg_progressbar.pas"/> + <UnitName Value="fpg_progressbar"/> + </Item53> + <Item54> + <Filename Value="..\..\gui\fpg_radiobutton.pas"/> + <UnitName Value="fpg_radiobutton"/> + </Item54> + <Item55> + <Filename Value="..\..\gui\fpg_scrollbar.pas"/> + <UnitName Value="fpg_scrollbar"/> + </Item55> + <Item56> + <Filename Value="..\..\gui\fpg_style.pas"/> + <UnitName Value="fpg_style"/> + </Item56> + <Item57> + <Filename Value="..\..\gui\fpg_tab.pas"/> + <UnitName Value="fpg_tab"/> + </Item57> + <Item58> + <Filename Value="..\..\gui\fpg_trackbar.pas"/> + <UnitName Value="fpg_trackbar"/> + </Item58> + <Item59> + <Filename Value="..\..\gui\fpg_tree.pas"/> + <UnitName Value="fpg_tree"/> + </Item59> + <Item60> + <Filename Value="..\..\gui\logo.inc"/> + <Type Value="Include"/> + </Item60> + <Item61> + <Filename Value="..\..\gui\messagedialog.inc"/> + <Type Value="Include"/> + </Item61> + <Item62> + <Filename Value="..\..\gui\newdirdialog.inc"/> + <Type Value="Include"/> + </Item62> + <Item63> + <Filename Value="..\..\gui\db\fpgui_db.pas"/> + <UnitName Value="fpgui_db"/> + </Item63> + <Item64> + <Filename Value="fpg_utils_impl.inc"/> + <Type Value="Include"/> + </Item64> + <Item65> + <Filename Value="fpg_gdi.pas"/> + <UnitName Value="fpg_gdi"/> + </Item65> + <Item66> + <Filename Value="fpg_impl.pas"/> + <UnitName Value="fpg_impl"/> + </Item66> + <Item67> + <Filename Value="fpg_keys_gdi.inc"/> + <Type Value="Include"/> + </Item67> + <Item68> + <Filename Value="..\..\gui\fpg_splitter.pas"/> + <UnitName Value="fpg_splitter"/> + </Item68> + <Item69> + <Filename Value="..\..\gui\fpg_hint.pas"/> + <UnitName Value="fpg_hint"/> + </Item69> + </Files> + <LazDoc Paths="..\..\..\docs\xml\corelib\;..\..\..\docs\xml\corelib\x11\;..\..\..\docs\xml\corelib\gdi\;..\..\..\docs\xml\gui\"/> + <RequiredPkgs Count="1"> + <Item1> + <PackageName Value="FCL"/> + <MinVersion Major="1" Valid="True"/> + </Item1> + </RequiredPkgs> + <UsageOptions> + <UnitPath Value="$(PkgOutDir)\"/> + </UsageOptions> + <PublishOptions> + <Version Value="2"/> + <DestinationDirectory Value="$(TestDir)\publishedpackage\"/> + <IgnoreBinaries Value="False"/> + </PublishOptions> + </Package> +</CONFIG> diff --git a/src/corelib/gdi/fpgui_toolkit.pas b/src/corelib/gdi/fpgui_toolkit.pas index 49c99c7a..d4a92342 100644 --- a/src/corelib/gdi/fpgui_toolkit.pas +++ b/src/corelib/gdi/fpgui_toolkit.pas @@ -10,13 +10,13 @@ uses fpg_base, fpg_main, fpg_cmdlineparams, fpg_command_intf, fpg_constants, 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, 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, fpg_gdi, fpg_impl, gui_splitter, gui_hint; + fpg_stringutils, fpg_utils, fpg_widget, fpg_wuline, 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_gdi, fpg_impl, fpg_splitter, fpg_hint; implementation 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 diff --git a/src/gui/db/fpgui_db.pas b/src/gui/db/fpgui_db.pas index dd2381de..1e814ba0 100644 --- a/src/gui/db/fpgui_db.pas +++ b/src/gui/db/fpgui_db.pas @@ -29,7 +29,7 @@ uses Classes, db, fpg_widget, - gui_label{, gui_edit}; + fpg_label{, fpg_edit}; type diff --git a/src/gui/gui_animation.pas b/src/gui/fpg_animation.pas index 5ad6042d..b95d83ac 100644 --- a/src/gui/gui_animation.pas +++ b/src/gui/fpg_animation.pas @@ -17,7 +17,7 @@ demo for image examples. } -unit gui_animation; +unit fpg_animation; {$mode objfpc}{$H+} diff --git a/src/gui/gui_basegrid.pas b/src/gui/fpg_basegrid.pas index 9916761a..a1cc01d0 100644 --- a/src/gui/gui_basegrid.pas +++ b/src/gui/fpg_basegrid.pas @@ -16,7 +16,7 @@ component. } -unit gui_basegrid; +unit fpg_basegrid; {$mode objfpc}{$H+} @@ -30,7 +30,7 @@ uses fpg_base, fpg_main, fpg_widget, - gui_scrollbar; + fpg_scrollbar; type diff --git a/src/gui/gui_button.pas b/src/gui/fpg_button.pas index 01a05145..fdb2f634 100644 --- a/src/gui/gui_button.pas +++ b/src/gui/fpg_button.pas @@ -15,7 +15,7 @@ Defines a push button control. } -unit gui_button; +unit fpg_button; {$mode objfpc}{$H+} @@ -162,7 +162,7 @@ function CreateButton(AOwner: TComponent; x, y, w: TfpgCoord; AText: string; implementation uses - gui_form; {$Note Try and remove this gui_form dependency.} + fpg_form; {$Note Try and remove this fpg_form dependency.} function CreateButton(AOwner: TComponent; x, y, w: TfpgCoord; AText: string; AOnClickEvent: TNotifyEvent; AImage: string): TfpgButton; diff --git a/src/gui/gui_checkbox.pas b/src/gui/fpg_checkbox.pas index 17146eb3..c185272c 100644 --- a/src/gui/gui_checkbox.pas +++ b/src/gui/fpg_checkbox.pas @@ -15,7 +15,7 @@ Defines a CheckBox control. Also known as a Check Button control. } -unit gui_checkbox; +unit fpg_checkbox; {$mode objfpc}{$H+} diff --git a/src/gui/gui_combobox.pas b/src/gui/fpg_combobox.pas index 7fc2ef18..799708c1 100644 --- a/src/gui/gui_combobox.pas +++ b/src/gui/fpg_combobox.pas @@ -15,7 +15,7 @@ Defines a ComboBox control. Also known as a Choice List control. } -unit gui_combobox; +unit fpg_combobox; {$mode objfpc}{$H+} @@ -159,7 +159,7 @@ function CreateComboBox(AOwner: TComponent; x, y, w: TfpgCoord; AList: TStringLi implementation uses - gui_listbox, + fpg_listbox, math; var diff --git a/src/gui/gui_customgrid.pas b/src/gui/fpg_customgrid.pas index f3f989dc..7b042799 100644 --- a/src/gui/gui_customgrid.pas +++ b/src/gui/fpg_customgrid.pas @@ -15,7 +15,7 @@ Defines a Custom Grid control and basic Column class. } -unit gui_customgrid; +unit fpg_customgrid; {$mode objfpc}{$H+} @@ -34,7 +34,7 @@ uses SysUtils, fpg_base, fpg_main, - gui_basegrid; + fpg_basegrid; type diff --git a/src/gui/gui_dialogs.pas b/src/gui/fpg_dialogs.pas index 0f1035fb..10267f4a 100644 --- a/src/gui/gui_dialogs.pas +++ b/src/gui/fpg_dialogs.pas @@ -15,7 +15,7 @@ Standard dialogs used by fpGUI based applications. } -unit gui_dialogs; +unit fpg_dialogs; {$mode objfpc}{$H+} @@ -37,16 +37,16 @@ uses fpg_main, fpg_imgfmt_bmp, fpg_constants, - gui_form, - gui_button, - gui_label, - gui_listbox, - gui_checkbox, - gui_edit, - gui_grid, - gui_combobox, - gui_panel, - gui_memo; + fpg_form, + fpg_button, + fpg_label, + fpg_listbox, + fpg_checkbox, + fpg_edit, + fpg_grid, + fpg_combobox, + fpg_panel, + fpg_memo; type TfpgMsgDlgType = (mtAbout, mtWarning, mtError, mtInformation, mtConfirmation, diff --git a/src/gui/gui_edit.pas b/src/gui/fpg_edit.pas index 1ea1bf2c..342718c2 100644 --- a/src/gui/gui_edit.pas +++ b/src/gui/fpg_edit.pas @@ -15,7 +15,7 @@ Defines a Text Edit control. Also known a Text Entry control. } -unit gui_edit; +unit fpg_edit; {$mode objfpc}{$H+} @@ -27,7 +27,7 @@ uses fpg_base, fpg_main, fpg_widget, - gui_menu; + fpg_menu; type TfpgEditBorderStyle = (ebsNone, ebsDefault, ebsSingle); @@ -298,7 +298,7 @@ implementation uses fpg_stringutils, fpg_constants, - gui_hint; + fpg_hint; const // internal popupmenu item names diff --git a/src/gui/gui_editcombo.pas b/src/gui/fpg_editcombo.pas index d8f182ef..efa97423 100644 --- a/src/gui/gui_editcombo.pas +++ b/src/gui/fpg_editcombo.pas @@ -15,7 +15,7 @@ Defines a edit ComboBox control with auto-complete feature. } -unit gui_editcombo; +unit fpg_editcombo; {$mode objfpc}{$H+} @@ -58,7 +58,7 @@ uses fpg_main, fpg_widget, fpg_popupwindow, - gui_combobox; + fpg_combobox; type TAllowNew = (anNo, anYes, anAsk); @@ -140,8 +140,8 @@ implementation uses fpg_stringutils, fpg_constants, - gui_listbox, - gui_dialogs, + fpg_listbox, + fpg_dialogs, math; var diff --git a/src/gui/gui_form.pas b/src/gui/fpg_form.pas index 230cfd44..f9740a36 100644 --- a/src/gui/gui_form.pas +++ b/src/gui/fpg_form.pas @@ -16,7 +16,7 @@ controls. } -unit gui_form; +unit fpg_form; {$mode objfpc}{$H+} @@ -125,7 +125,7 @@ implementation uses fpg_main, fpg_popupwindow, - gui_menu; + fpg_menu; type // to access protected methods diff --git a/src/gui/gui_gauge.pas b/src/gui/fpg_gauge.pas index 68fb864f..b8678828 100644 --- a/src/gui/gui_gauge.pas +++ b/src/gui/fpg_gauge.pas @@ -16,7 +16,7 @@ Dial, Pie etc. } -unit gui_gauge; +unit fpg_gauge; {$mode objfpc}{$H+} diff --git a/src/gui/gui_grid.pas b/src/gui/fpg_grid.pas index 41b19402..72fd29bf 100644 --- a/src/gui/gui_grid.pas +++ b/src/gui/fpg_grid.pas @@ -15,7 +15,7 @@ Defines a File Grid and String Grid. Both are decendants of Custom Grid. } -unit gui_grid; +unit fpg_grid; {$mode objfpc}{$H+} @@ -35,8 +35,8 @@ uses SysUtils, fpg_base, fpg_main, - gui_basegrid, - gui_customgrid; + fpg_basegrid, + fpg_customgrid; type diff --git a/src/gui/gui_hint.pas b/src/gui/fpg_hint.pas index 58e0441f..a59c1636 100644 --- a/src/gui/gui_hint.pas +++ b/src/gui/fpg_hint.pas @@ -15,7 +15,7 @@ Defines a window that gets used to display help hints (aka a HintWindow) } -unit gui_hint; +unit fpg_hint; {$mode objfpc}{$H+} @@ -28,8 +28,8 @@ uses SysUtils, fpg_base, fpg_main, - gui_form, - gui_label; + fpg_form, + fpg_label; type TfpgHintWindow = class(TfpgForm) diff --git a/src/gui/gui_hyperlink.pas b/src/gui/fpg_hyperlink.pas index 48efdf9e..ffed0bfb 100644 --- a/src/gui/gui_hyperlink.pas +++ b/src/gui/fpg_hyperlink.pas @@ -17,7 +17,7 @@ } -unit gui_hyperlink; +unit fpg_hyperlink; {$mode objfpc}{$H+} @@ -28,7 +28,7 @@ uses Sysutils, fpg_base, fpg_main, - gui_label; + fpg_label; type diff --git a/src/gui/gui_iniutils.pas b/src/gui/fpg_iniutils.pas index b961cbb4..3fefc1d4 100644 --- a/src/gui/gui_iniutils.pas +++ b/src/gui/fpg_iniutils.pas @@ -16,7 +16,7 @@ information. } -unit gui_iniutils; +unit fpg_iniutils; {$mode objfpc}{$H+} @@ -26,7 +26,7 @@ uses Classes, SysUtils, IniFiles, - gui_form; + fpg_form; type diff --git a/src/gui/gui_label.pas b/src/gui/fpg_label.pas index c4c2d271..94a0df4c 100644 --- a/src/gui/gui_label.pas +++ b/src/gui/fpg_label.pas @@ -15,7 +15,7 @@ Defines a basic Label control. Also known as a Caption component. } -unit gui_label; +unit fpg_label; {$mode objfpc}{$H+} diff --git a/src/gui/gui_listbox.pas b/src/gui/fpg_listbox.pas index 5dd626ff..98633295 100644 --- a/src/gui/gui_listbox.pas +++ b/src/gui/fpg_listbox.pas @@ -16,7 +16,7 @@ control has been implemented. } -unit gui_listbox; +unit fpg_listbox; {$mode objfpc}{$H+} @@ -37,7 +37,7 @@ uses fpg_base, fpg_main, fpg_widget, - gui_scrollbar; + fpg_scrollbar; type diff --git a/src/gui/gui_listview.pas b/src/gui/fpg_listview.pas index 948038fe..acb4e337 100644 --- a/src/gui/gui_listview.pas +++ b/src/gui/fpg_listview.pas @@ -15,7 +15,7 @@ Defines a Listview control. } -unit gui_listview; +unit fpg_listview; {$mode objfpc}{$H+} @@ -27,7 +27,7 @@ uses fpg_base, fpg_main, fpg_widget, - gui_scrollbar; + fpg_scrollbar; type TfpgListView = class; diff --git a/src/gui/gui_memo.pas b/src/gui/fpg_memo.pas index b9780779..a93b06d8 100644 --- a/src/gui/gui_memo.pas +++ b/src/gui/fpg_memo.pas @@ -15,7 +15,7 @@ Defines a Memo control. Also known as a multi-line text edit control. } -unit gui_memo; +unit fpg_memo; {$mode objfpc}{$H+} @@ -29,8 +29,8 @@ uses fpg_base, fpg_main, fpg_widget, - gui_scrollbar, - gui_menu; + fpg_scrollbar, + fpg_menu; type diff --git a/src/gui/gui_menu.pas b/src/gui/fpg_menu.pas index 4c415345..fa1c8bad 100644 --- a/src/gui/gui_menu.pas +++ b/src/gui/fpg_menu.pas @@ -15,7 +15,7 @@ Defines a MainMenu Bar, Popup Menu and Menu Item controls. } -unit gui_menu; +unit fpg_menu; {$mode objfpc}{$H+} diff --git a/src/gui/gui_mru.pas b/src/gui/fpg_mru.pas index 4e4d9e9e..64feb793 100644 --- a/src/gui/gui_mru.pas +++ b/src/gui/fpg_mru.pas @@ -16,14 +16,14 @@ inserted in the File menu. } -unit gui_mru; +unit fpg_mru; {$mode objfpc}{$H+} interface uses - Classes, SysUtils, gui_menu; + Classes, SysUtils, fpg_menu; type @@ -67,7 +67,7 @@ type implementation uses - gui_iniutils; + fpg_iniutils; type //to be able to recognize MRU menu item when deleting diff --git a/src/gui/gui_panel.pas b/src/gui/fpg_panel.pas index 7b988a96..6e75dda0 100644 --- a/src/gui/gui_panel.pas +++ b/src/gui/fpg_panel.pas @@ -16,7 +16,7 @@ This control can also draw itself like a GroupBox component. } -unit gui_panel; +unit fpg_panel; {$mode objfpc}{$H+} diff --git a/src/gui/gui_popupcalendar.pas b/src/gui/fpg_popupcalendar.pas index a31d2cf1..5884a722 100644 --- a/src/gui/gui_popupcalendar.pas +++ b/src/gui/fpg_popupcalendar.pas @@ -16,7 +16,7 @@ popup windows like Calender Combobox, or directly in a Form. } -unit gui_popupcalendar; +unit fpg_popupcalendar; {$mode objfpc}{$H+} @@ -51,11 +51,11 @@ uses fpg_main, fpg_widget, fpg_popupwindow, - gui_edit, - gui_button, - gui_combobox, - gui_grid, - gui_dialogs; + fpg_edit, + fpg_button, + fpg_combobox, + fpg_grid, + fpg_dialogs; type @@ -163,7 +163,7 @@ type implementation uses - gui_scrollbar, + fpg_scrollbar, fpg_constants; diff --git a/src/gui/gui_progressbar.pas b/src/gui/fpg_progressbar.pas index 14619bee..72355493 100644 --- a/src/gui/gui_progressbar.pas +++ b/src/gui/fpg_progressbar.pas @@ -15,7 +15,7 @@ Defines a component for a progress bar. } -unit gui_progressbar; +unit fpg_progressbar; {$mode objfpc}{$H+} diff --git a/src/gui/gui_radiobutton.pas b/src/gui/fpg_radiobutton.pas index 33322a26..1d58e0ea 100644 --- a/src/gui/gui_radiobutton.pas +++ b/src/gui/fpg_radiobutton.pas @@ -15,7 +15,7 @@ Defines a Radio Button control. } -unit gui_radiobutton; +unit fpg_radiobutton; {$mode objfpc}{$H+} diff --git a/src/gui/gui_scrollbar.pas b/src/gui/fpg_scrollbar.pas index 9e207303..92793fa9 100644 --- a/src/gui/gui_scrollbar.pas +++ b/src/gui/fpg_scrollbar.pas @@ -15,7 +15,7 @@ Defines Scrollbar controls. } -unit gui_scrollbar; +unit fpg_scrollbar; {$mode objfpc}{$H+} diff --git a/src/gui/gui_splitter.pas b/src/gui/fpg_splitter.pas index ac556d03..cf627081 100644 --- a/src/gui/gui_splitter.pas +++ b/src/gui/fpg_splitter.pas @@ -15,7 +15,7 @@ Defines a Splitter control. } -unit gui_splitter; +unit fpg_splitter; {$mode objfpc}{$H+} diff --git a/src/gui/gui_style.pas b/src/gui/fpg_style.pas index 7a5b1e91..b5a799c2 100644 --- a/src/gui/gui_style.pas +++ b/src/gui/fpg_style.pas @@ -17,7 +17,7 @@ This is still work in progress! } -unit gui_style; +unit fpg_style; {$mode objfpc}{$H+} diff --git a/src/gui/gui_tab.pas b/src/gui/fpg_tab.pas index 69a93244..3f368774 100644 --- a/src/gui/gui_tab.pas +++ b/src/gui/fpg_tab.pas @@ -15,7 +15,7 @@ Defines a Page Control and Tab Sheets. } -unit gui_tab; +unit fpg_tab; {$mode objfpc}{$H+} @@ -36,7 +36,7 @@ uses fpg_base, fpg_main, fpg_widget, - gui_button; + fpg_button; type // forward declaration diff --git a/src/gui/gui_trackbar.pas b/src/gui/fpg_trackbar.pas index c8f1ce56..9dc15b95 100644 --- a/src/gui/gui_trackbar.pas +++ b/src/gui/fpg_trackbar.pas @@ -15,7 +15,7 @@ Defines two types of TrackBar controls. Also known as Slider controls. } -unit gui_trackbar; +unit fpg_trackbar; {$mode objfpc}{$H+} diff --git a/src/gui/gui_tree.pas b/src/gui/fpg_tree.pas index 7e76e4c4..2a13c803 100644 --- a/src/gui/gui_tree.pas +++ b/src/gui/fpg_tree.pas @@ -17,7 +17,7 @@ Each Node as .prev and .next property pointing to it's neighbours. } -unit gui_tree; +unit fpg_tree; {$mode objfpc}{$H+} @@ -43,8 +43,8 @@ uses fpg_main, fpg_widget, fpg_imagelist, - gui_scrollbar, - gui_menu; + fpg_scrollbar, + fpg_menu; type diff --git a/src/gui/logo.inc b/src/gui/logo.inc index 3a99e5f4..2fdef319 100644 --- a/src/gui/logo.inc +++ b/src/gui/logo.inc @@ -1,4 +1,4 @@ -{%mainunit gui_dialogs.pas} +{%mainunit fpg_dialogs.pas} const // This is a ugly logo purely as an example. It will be replaced soon. 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 |