diff options
Diffstat (limited to 'extras/tiopf')
23 files changed, 69 insertions, 87 deletions
diff --git a/extras/tiopf/demos/Demo_06_CreateTable/demo_06.lpi b/extras/tiopf/demos/Demo_06_CreateTable/demo_06.lpi index a1d58616..3e2e075a 100644 --- a/extras/tiopf/demos/Demo_06_CreateTable/demo_06.lpi +++ b/extras/tiopf/demos/Demo_06_CreateTable/demo_06.lpi @@ -28,13 +28,10 @@ <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T 'Lazarus Run Output' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/> </local> </RunParams> - <RequiredPackages Count="2"> + <RequiredPackages Count="1"> <Item1> <PackageName Value="tiOPFfpGUI"/> </Item1> - <Item2> - <PackageName Value="fpgui_package"/> - </Item2> </RequiredPackages> <Units Count="2"> <Unit0> @@ -50,16 +47,13 @@ </Units> </ProjectOptions> <CompilerOptions> - <Version Value="5"/> + <Version Value="8"/> <Parsing> <SyntaxOptions> <AllowLabel Value="False"/> <CPPInline Value="False"/> </SyntaxOptions> </Parsing> - <CodeGeneration> - <Generate Value="Faster"/> - </CodeGeneration> <Other> <CustomOptions Value="-FUunits -dUseCThreads"/> diff --git a/extras/tiopf/demos/Demo_06_CreateTable/demo_06.lpr b/extras/tiopf/demos/Demo_06_CreateTable/demo_06.lpr index 3e97bf30..8e966dc7 100644 --- a/extras/tiopf/demos/Demo_06_CreateTable/demo_06.lpr +++ b/extras/tiopf/demos/Demo_06_CreateTable/demo_06.lpr @@ -6,7 +6,8 @@ uses {$IFDEF UNIX}{$IFDEF UseCThreads} cthreads, {$ENDIF}{$ENDIF} - Classes, SysUtils, fpgfx, frm_main, tiOPFManager, tiConstants; + Classes, SysUtils, + fpg_main, frm_main, tiOPFManager, tiConstants; procedure MainProc; diff --git a/extras/tiopf/demos/Demo_06_CreateTable/frm_main.pas b/extras/tiopf/demos/Demo_06_CreateTable/frm_main.pas index 87e2d08e..f413aa38 100644 --- a/extras/tiopf/demos/Demo_06_CreateTable/frm_main.pas +++ b/extras/tiopf/demos/Demo_06_CreateTable/frm_main.pas @@ -5,9 +5,9 @@ unit frm_main; interface uses - SysUtils, Classes, fpgfx, - gfx_widget, gui_form, gui_label, gui_button, - gui_memo, gui_dialogs; + SysUtils, Classes, + fpg_main, fpg_widget, fpg_form, fpg_label, fpg_button, + fpg_memo, fpg_dialogs; type diff --git a/extras/tiopf/demos/Demo_07_VisitorBasics/demo_07.lpi b/extras/tiopf/demos/Demo_07_VisitorBasics/demo_07.lpi index c07629aa..a4d89aea 100644 --- a/extras/tiopf/demos/Demo_07_VisitorBasics/demo_07.lpi +++ b/extras/tiopf/demos/Demo_07_VisitorBasics/demo_07.lpi @@ -29,13 +29,10 @@ <LaunchingApplication PathPlusParams="/usr/X11R6/bin/xterm -T 'Lazarus Run Output' -e $(LazarusDir)/tools/runwait.sh $(TargetCmdLine)"/> </local> </RunParams> - <RequiredPackages Count="2"> + <RequiredPackages Count="1"> <Item1> <PackageName Value="tiOPFfpGUI"/> </Item1> - <Item2> - <PackageName Value="fpgui_package"/> - </Item2> </RequiredPackages> <Units Count="3"> <Unit0> @@ -56,16 +53,13 @@ </Units> </ProjectOptions> <CompilerOptions> - <Version Value="5"/> + <Version Value="8"/> <Parsing> <SyntaxOptions> <AllowLabel Value="False"/> <CPPInline Value="False"/> </SyntaxOptions> </Parsing> - <CodeGeneration> - <Generate Value="Faster"/> - </CodeGeneration> <Other> <CustomOptions Value="-FUunits -dUseCThreads"/> diff --git a/extras/tiopf/demos/Demo_07_VisitorBasics/demo_07.lpr b/extras/tiopf/demos/Demo_07_VisitorBasics/demo_07.lpr index 9a7ccd15..125dd248 100644 --- a/extras/tiopf/demos/Demo_07_VisitorBasics/demo_07.lpr +++ b/extras/tiopf/demos/Demo_07_VisitorBasics/demo_07.lpr @@ -6,7 +6,7 @@ uses {$IFDEF UNIX}{$IFDEF UseCThreads} cthreads, {$ENDIF}{$ENDIF} - Classes, fpgfx, frm_main, tiOIDGUID, tiOPFManager, Client_BOM; + Classes, fpg_main, frm_main, tiOIDGUID, tiOPFManager, Client_BOM; procedure MainProc; diff --git a/extras/tiopf/demos/Demo_07_VisitorBasics/frm_main.pas b/extras/tiopf/demos/Demo_07_VisitorBasics/frm_main.pas index 526823ee..8a10f2df 100644 --- a/extras/tiopf/demos/Demo_07_VisitorBasics/frm_main.pas +++ b/extras/tiopf/demos/Demo_07_VisitorBasics/frm_main.pas @@ -6,7 +6,7 @@ interface uses SysUtils, Classes, - fpgfx, gui_form, gui_button, + fpg_main, fpg_form, fpg_button, Client_BOM; type diff --git a/extras/tiopf/demos/Demo_08_Collection/demo_08.lpr b/extras/tiopf/demos/Demo_08_Collection/demo_08.lpr index 67acbdd2..c1d14863 100644 --- a/extras/tiopf/demos/Demo_08_Collection/demo_08.lpr +++ b/extras/tiopf/demos/Demo_08_Collection/demo_08.lpr @@ -10,7 +10,7 @@ uses {$IFDEF UNIX}{$IFDEF UseCThreads} cthreads, {$ENDIF}{$ENDIF} - Classes, SysUtils, fpgfx, frm_main, + Classes, SysUtils, fpg_main, frm_main, Client_DBIndependentVisitors_Svr, Client_BOM, Client_AutoMap_Svr, Client_HardCodedVisitors_Svr, tiOPFManager, tiConstants{, tiLog, tiLogToConsole}; diff --git a/extras/tiopf/demos/Demo_08_Collection/frm_main.pas b/extras/tiopf/demos/Demo_08_Collection/frm_main.pas index cb269a6b..170ef96b 100644 --- a/extras/tiopf/demos/Demo_08_Collection/frm_main.pas +++ b/extras/tiopf/demos/Demo_08_Collection/frm_main.pas @@ -5,12 +5,12 @@ unit frm_main; interface uses - SysUtils, Classes, gfxbase, fpgfx, gui_edit, - gfx_widget, gui_form, gui_label, gui_button, - gui_listbox, gui_memo, gui_combobox, gui_grid, - gui_dialogs, gui_checkbox, gui_tree, gui_trackbar, - gui_progressbar, gui_radiobutton, gui_tab, gui_menu, - gui_bevel, Client_BOM, tiFormMediator; + SysUtils, Classes, fpg_base, fpg_main, fpg_edit, + fpg_widget, fpg_form, fpg_label, fpg_button, + fpg_listbox, fpg_memo, fpg_combobox, fpg_grid, + fpg_dialogs, fpg_checkbox, fpg_tree, fpg_trackbar, + fpg_progressbar, fpg_radiobutton, fpg_tab, fpg_menu, + fpg_panel, Client_BOM, tiFormMediator; type diff --git a/extras/tiopf/demos/Demo_20_ListMediators/demo_listmediators.lpr b/extras/tiopf/demos/Demo_20_ListMediators/demo_listmediators.lpr index 3b66ebde..5db2a346 100644 --- a/extras/tiopf/demos/Demo_20_ListMediators/demo_listmediators.lpr +++ b/extras/tiopf/demos/Demo_20_ListMediators/demo_listmediators.lpr @@ -6,7 +6,7 @@ uses {$IFDEF UNIX}{$IFDEF UseCThreads} cthreads, {$ENDIF}{$ENDIF} - Classes, fpgfx, frmMain, Model, Constants, Model_View; + Classes, fpg_main, frmMain, Model, Constants, Model_View; procedure MainProc; diff --git a/extras/tiopf/demos/Demo_20_ListMediators/frmMain.pas b/extras/tiopf/demos/Demo_20_ListMediators/frmMain.pas index 40c108e5..85a51e30 100644 --- a/extras/tiopf/demos/Demo_20_ListMediators/frmMain.pas +++ b/extras/tiopf/demos/Demo_20_ListMediators/frmMain.pas @@ -5,8 +5,8 @@ unit frmMain; interface uses - SysUtils, Classes, gfxbase, fpgfx, gfx_widget, gui_form, gui_button, - gui_grid, gui_checkbox, gui_panel, gui_listview, gui_listbox, + SysUtils, Classes, fpg_base, fpg_main, fpg_widget, fpg_form, fpg_button, + fpg_grid, fpg_checkbox, fpg_panel, fpg_listview, fpg_listbox, fpg_combobox, Model, tiFormMediator, tiMediators; type @@ -108,7 +108,7 @@ begin FMediator.Subject := FPersonList; FMediator.Active := True; - medCombo := TMediatorComboBoxView.CreateCustom(cbName1, FPerson); +// medCombo := TMediatorComboBoxView.CreateCustom(cbName1, FPerson); end; constructor TMainForm.Create(AOwner: TComponent); diff --git a/extras/tiopf/demos/Demo_21_AdrsBook_MGM/demo_adrsbook_mgm.lpr b/extras/tiopf/demos/Demo_21_AdrsBook_MGM/demo_adrsbook_mgm.lpr index f062e4d8..d5e48414 100644 --- a/extras/tiopf/demos/Demo_21_AdrsBook_MGM/demo_adrsbook_mgm.lpr +++ b/extras/tiopf/demos/Demo_21_AdrsBook_MGM/demo_adrsbook_mgm.lpr @@ -6,7 +6,7 @@ uses {$IFDEF UNIX}{$IFDEF UseCThreads} cthreads, {$ENDIF}{$ENDIF} - Classes, fpgfx, frmmain, frmcontactmaint, frmCityList, frmcitymaint, + Classes, fpg_main, frmmain, frmcontactmaint, frmCityList, frmcitymaint, frmcountrylist, frmaddressmaint; diff --git a/extras/tiopf/demos/Demo_21_AdrsBook_MGM/frmaddressmaint.pas b/extras/tiopf/demos/Demo_21_AdrsBook_MGM/frmaddressmaint.pas index 1b042cd9..8314e59f 100644 --- a/extras/tiopf/demos/Demo_21_AdrsBook_MGM/frmaddressmaint.pas +++ b/extras/tiopf/demos/Demo_21_AdrsBook_MGM/frmaddressmaint.pas @@ -5,12 +5,12 @@ unit frmAddressMaint; interface uses - SysUtils, Classes, gfxbase, fpgfx, gui_edit, - gfx_widget, gui_form, gui_label, gui_button, - gui_listbox, gui_memo, gui_combobox, gui_basegrid, gui_grid, - gui_dialogs, gui_checkbox, gui_tree, gui_trackbar, - gui_progressbar, gui_radiobutton, gui_tab, gui_menu, - gui_panel, gui_popupcalendar, gui_gauge, + SysUtils, Classes, fpg_base, fpg_main, fpg_edit, + fpg_widget, fpg_form, fpg_label, fpg_button, + fpg_listbox, fpg_memo, fpg_combobox, fpg_basegrid, fpg_grid, + fpg_dialogs, fpg_checkbox, fpg_tree, fpg_trackbar, + fpg_progressbar, fpg_radiobutton, fpg_tab, fpg_menu, + fpg_panel, fpg_popupcalendar, fpg_gauge, model, tiFormMediator; type diff --git a/extras/tiopf/demos/Demo_21_AdrsBook_MGM/frmcitylist.pas b/extras/tiopf/demos/Demo_21_AdrsBook_MGM/frmcitylist.pas index 37143a72..f14c13ee 100644 --- a/extras/tiopf/demos/Demo_21_AdrsBook_MGM/frmcitylist.pas +++ b/extras/tiopf/demos/Demo_21_AdrsBook_MGM/frmcitylist.pas @@ -5,10 +5,10 @@ unit frmCityList; interface uses - SysUtils, Classes, gfxbase, fpgfx, - gfx_widget, gui_form, gui_button, - gui_grid, gui_dialogs, gui_menu, - gui_panel, + SysUtils, Classes, fpg_base, fpg_main, + fpg_widget, fpg_form, fpg_button, + fpg_grid, fpg_dialogs, fpg_menu, + fpg_panel, tiFormMediator, model; type diff --git a/extras/tiopf/demos/Demo_21_AdrsBook_MGM/frmcitymaint.pas b/extras/tiopf/demos/Demo_21_AdrsBook_MGM/frmcitymaint.pas index d2f281a0..31a6326d 100644 --- a/extras/tiopf/demos/Demo_21_AdrsBook_MGM/frmcitymaint.pas +++ b/extras/tiopf/demos/Demo_21_AdrsBook_MGM/frmcitymaint.pas @@ -5,9 +5,9 @@ unit frmCityMaint; interface uses - SysUtils, Classes, gfxbase, fpgfx, gui_edit, - gfx_widget, gui_form, gui_label, gui_button, - gui_dialogs, gui_combobox, + SysUtils, Classes, fpg_base, fpg_main, fpg_edit, + fpg_widget, fpg_form, fpg_label, fpg_button, + fpg_dialogs, fpg_combobox, model, tiFormMediator; type diff --git a/extras/tiopf/demos/Demo_21_AdrsBook_MGM/frmcontactmaint.pas b/extras/tiopf/demos/Demo_21_AdrsBook_MGM/frmcontactmaint.pas index f78dc0f3..b166c05e 100644 --- a/extras/tiopf/demos/Demo_21_AdrsBook_MGM/frmcontactmaint.pas +++ b/extras/tiopf/demos/Demo_21_AdrsBook_MGM/frmcontactmaint.pas @@ -5,9 +5,9 @@ unit frmContactMaint; interface uses - SysUtils, Classes, gfxbase, fpgfx, gui_edit, - gfx_widget, gui_form, gui_label, gui_button, - gui_listview, gui_memo, + SysUtils, Classes, fpg_base, fpg_main, fpg_edit, + fpg_widget, fpg_form, fpg_label, fpg_button, + fpg_listview, fpg_memo, model, tiFormMediator; type diff --git a/extras/tiopf/demos/Demo_21_AdrsBook_MGM/frmcountrylist.pas b/extras/tiopf/demos/Demo_21_AdrsBook_MGM/frmcountrylist.pas index 104e8137..7bed804d 100644 --- a/extras/tiopf/demos/Demo_21_AdrsBook_MGM/frmcountrylist.pas +++ b/extras/tiopf/demos/Demo_21_AdrsBook_MGM/frmcountrylist.pas @@ -5,12 +5,12 @@ unit frmCountryList; interface uses - SysUtils, Classes, gfxbase, fpgfx, gui_edit, - gfx_widget, gui_form, gui_label, gui_button, - gui_listbox, gui_memo, gui_combobox, gui_basegrid, gui_grid, - gui_dialogs, gui_checkbox, gui_tree, gui_trackbar, - gui_progressbar, gui_radiobutton, gui_tab, gui_menu, - gui_panel, gui_popupcalendar, gui_gauge, + SysUtils, Classes, fpg_base, fpg_main, fpg_edit, + fpg_widget, fpg_form, fpg_label, fpg_button, + fpg_listbox, fpg_memo, fpg_combobox, fpg_basegrid, fpg_grid, + fpg_dialogs, fpg_checkbox, fpg_tree, fpg_trackbar, + fpg_progressbar, fpg_radiobutton, fpg_tab, fpg_menu, + fpg_panel, fpg_popupcalendar, fpg_gauge, model, tiFormMediator; type diff --git a/extras/tiopf/demos/Demo_21_AdrsBook_MGM/frmmain.pas b/extras/tiopf/demos/Demo_21_AdrsBook_MGM/frmmain.pas index df6edbf1..2e13aa09 100644 --- a/extras/tiopf/demos/Demo_21_AdrsBook_MGM/frmmain.pas +++ b/extras/tiopf/demos/Demo_21_AdrsBook_MGM/frmmain.pas @@ -5,10 +5,10 @@ unit frmmain; interface uses - SysUtils, Classes, gfxbase, fpgfx, gui_edit, - gfx_widget, gui_form, gui_label, gui_button, - gui_basegrid, gui_grid, gui_dialogs, gui_menu, - gui_panel, gui_popupcalendar, gui_gauge, tiFormMediator; + SysUtils, Classes, fpg_base, fpg_main, fpg_edit, + fpg_widget, fpg_form, fpg_label, fpg_button, + fpg_basegrid, fpg_grid, fpg_dialogs, fpg_menu, + fpg_panel, fpg_popupcalendar, fpg_gauge, tiFormMediator; type { The main application window } diff --git a/extras/tiopf/demos/Demo_TtiBaseObject/PerformanceTesting.lpi b/extras/tiopf/demos/Demo_TtiBaseObject/PerformanceTesting.lpi index 4d24712d..08c1bbe6 100644 --- a/extras/tiopf/demos/Demo_TtiBaseObject/PerformanceTesting.lpi +++ b/extras/tiopf/demos/Demo_TtiBaseObject/PerformanceTesting.lpi @@ -28,8 +28,7 @@ </RunParams> <RequiredPackages Count="2"> <Item1> - <PackageName Value="fpgui_package"/> - <MinVersion Minor="5" Release="1" Valid="True"/> + <PackageName Value="fpgui_toolkit"/> </Item1> <Item2> <PackageName Value="tiOPF"/> @@ -48,10 +47,7 @@ </Units> </ProjectOptions> <CompilerOptions> - <Version Value="5"/> - <CodeGeneration> - <Generate Value="Faster"/> - </CodeGeneration> + <Version Value="8"/> <Other> <CustomOptions Value="-FUunits -dUseCThreads diff --git a/extras/tiopf/demos/Demo_TtiBaseObject/PerformanceTesting.lpr b/extras/tiopf/demos/Demo_TtiBaseObject/PerformanceTesting.lpr index 85ac297a..e43592fd 100644 --- a/extras/tiopf/demos/Demo_TtiBaseObject/PerformanceTesting.lpr +++ b/extras/tiopf/demos/Demo_TtiBaseObject/PerformanceTesting.lpr @@ -8,7 +8,7 @@ uses {$IFDEF UNIX}{$IFDEF UseCThreads} cthreads, {$ENDIF}{$ENDIF} - Classes, fpgfx, frm_main; + Classes, fpg_main, frm_main; procedure MainProc; diff --git a/extras/tiopf/demos/Demo_TtiBaseObject/frm_main.pas b/extras/tiopf/demos/Demo_TtiBaseObject/frm_main.pas index e4aec833..6b39cf0d 100644 --- a/extras/tiopf/demos/Demo_TtiBaseObject/frm_main.pas +++ b/extras/tiopf/demos/Demo_TtiBaseObject/frm_main.pas @@ -10,12 +10,12 @@ unit frm_main; interface uses - SysUtils, Classes, gfxbase, fpgfx, gui_edit, - gfx_widget, gui_form, gui_label, gui_button, - gui_listbox, gui_memo, gui_combobox, gui_grid, - gui_dialogs, gui_checkbox, gui_tree, gui_trackbar, - gui_progressbar, gui_radiobutton, gui_tab, gui_menu, - gui_bevel, gui_popupcalendar, gui_gauge; + SysUtils, Classes, fpg_base, fpg_main, fpg_edit, + fpg_widget, fpg_form, fpg_label, fpg_button, + fpg_listbox, fpg_memo, fpg_combobox, fpg_grid, + fpg_dialogs, fpg_checkbox, fpg_tree, fpg_trackbar, + fpg_progressbar, fpg_radiobutton, fpg_tab, fpg_menu, + fpg_panel, fpg_popupcalendar, fpg_gauge; type diff --git a/extras/tiopf/demos/Demo_TtiBaseObject/performancetest.lpi b/extras/tiopf/demos/Demo_TtiBaseObject/performancetest.lpi index bb61968c..a7940dba 100644 --- a/extras/tiopf/demos/Demo_TtiBaseObject/performancetest.lpi +++ b/extras/tiopf/demos/Demo_TtiBaseObject/performancetest.lpi @@ -32,7 +32,7 @@ <IsPartOfProject Value="True"/> <UnitName Value="performancetest"/> <CursorPos X="1" Y="13"/> - <TopLine Value="1"/> + <TopLine Value="43"/> <EditorIndex Value="0"/> <UsageCount Value="20"/> <Loaded Value="True"/> @@ -47,7 +47,7 @@ <Loaded Value="True"/> </Unit1> <Unit2> - <Filename Value="/opt/fpc_2.2.0/src/packages/fcl-base/src/inc/custapp.pp"/> + <Filename Value="../../../../../../../../opt/fpc_2.2.0/src/packages/fcl-base/src/inc/custapp.pp"/> <UnitName Value="CustApp"/> <CursorPos X="3" Y="26"/> <TopLine Value="11"/> @@ -70,14 +70,14 @@ <Unit5> <Filename Value="../../../../../3rdParty/tiOPF2/Source/Core/tiBaseObject.pas"/> <UnitName Value="tiBaseObject"/> - <CursorPos X="1" Y="658"/> - <TopLine Value="631"/> + <CursorPos X="1" Y="128"/> + <TopLine Value="94"/> <EditorIndex Value="3"/> <UsageCount Value="10"/> <Loaded Value="True"/> </Unit5> <Unit6> - <Filename Value="/opt/fpc_2.2.0/src/rtl/inc/objpash.inc"/> + <Filename Value="../../../../../../../../opt/fpc_2.2.0/src/rtl/inc/objpash.inc"/> <CursorPos X="29" Y="220"/> <TopLine Value="212"/> <EditorIndex Value="1"/> @@ -85,7 +85,7 @@ <Loaded Value="True"/> </Unit6> <Unit7> - <Filename Value="/opt/fpc_2.2.0/src/rtl/inc/objpas.inc"/> + <Filename Value="../../../../../../../../opt/fpc_2.2.0/src/rtl/inc/objpas.inc"/> <CursorPos X="9" Y="709"/> <TopLine Value="705"/> <EditorIndex Value="2"/> @@ -112,10 +112,7 @@ </JumpHistory> </ProjectOptions> <CompilerOptions> - <Version Value="5"/> - <CodeGeneration> - <Generate Value="Faster"/> - </CodeGeneration> + <Version Value="8"/> <Other> <CompilerPath Value="$(CompPath)"/> </Other> diff --git a/extras/tiopf/demos/EditControlsDemo/editmediators.lpr b/extras/tiopf/demos/EditControlsDemo/editmediators.lpr index 7e462e83..0dd11cc8 100644 --- a/extras/tiopf/demos/EditControlsDemo/editmediators.lpr +++ b/extras/tiopf/demos/EditControlsDemo/editmediators.lpr @@ -6,7 +6,7 @@ uses {$IFDEF UNIX}{$IFDEF UseCThreads} cthreads, {$ENDIF}{$ENDIF} - Classes, fpgfx, frmMain; + Classes, fpg_main, frmMain; diff --git a/extras/tiopf/demos/EditControlsDemo/frmMain.pas b/extras/tiopf/demos/EditControlsDemo/frmMain.pas index 7e85f4a2..75719922 100644 --- a/extras/tiopf/demos/EditControlsDemo/frmMain.pas +++ b/extras/tiopf/demos/EditControlsDemo/frmMain.pas @@ -5,8 +5,8 @@ unit frmMain; interface uses - Classes, SysUtils, gui_form, gui_button, gui_label, gui_edit, gui_trackbar, - gui_combobox, gui_memo, Model, tiFormMediator, Model_View; + Classes, SysUtils, fpg_form, fpg_button, fpg_label, fpg_edit, fpg_trackbar, + fpg_combobox, fpg_memo, Model, tiFormMediator, Model_View; type TMainForm = class(TfpgForm) @@ -41,7 +41,7 @@ type implementation uses - gui_dialogs + fpg_dialogs ; { TMainForm } |