diff --git a/src/ideU.prj b/src/ideU.prj index 794288f4..aa6e9623 100644 --- a/src/ideU.prj +++ b/src/ideU.prj @@ -29,9 +29,9 @@ findinfiledialog=98 [findinfileadialogfo.wholeword] value=0 [findinfileadialogfo.indirectories] - value=0 - [findinfileadialogfo.inprojectdir] value=1 + [findinfileadialogfo.inprojectdir] + value=0 [findinfileadialogfo.casesensitive] value=0 [findinfileadialogfo.mask] @@ -52,17 +52,17 @@ findinfiledialog=98 "*.pas" "*.pp" "*.inc" "*.prj" [findinfileadialogfo.dir] filenames=1 - /home/fred/strumpract/ + /home/fred/svnfpctrunk/trunk/ filecolwidth=174 x=560 y=211 cx=554 cy=316 filehistory=28 - /home/fred/strumpract/ + /home/fred/svnfpctrunk/trunk/ /home/fred/mseide-msegui/ + /home/fred/strumpract/ /home/fred/ideu_ok/ - /home/fred/svnfpctrunk/trunk/ /home/fred/uos/ /home/fred/mseuniverse/ /home/fred/eschecs_mse/ @@ -90,8 +90,11 @@ findinfiledialog=98 filefilterindex=0 filefilter="*.pas" "*.pp" "*.inc" [findinfileadialogfo.findtext] - value=dodialogfiles + value=TFPCustomImageReader history=20 + TFPCustomImageReader + Assign(TPersistent) + InternalRead dodialogfiles findline childscaled @@ -109,15 +112,12 @@ findinfiledialog=98 syntaxdeffile case $warn 6060 - fontline - beauty - complete class [findinfileadialogfo] stackedunder= x=554 y=175 cx=234 - cy=360 + cy=308 finddialog=8 [finddialogfo.selectedonly] value=0 @@ -823,14 +823,17 @@ settingsstorage=0 settingsprojecttree=0 settingsautoload=0 settingsautosave=0 -modulenames=2 +modulenames=3 ACTIONSMO + SETTINGS_FORM MAINFO -moduletypes=2 +moduletypes=3 TACTIONSMO + TSETTINGSFO TMAINFO -modulefiles=2 +modulefiles=3 /home/fred/ideu/src/actionsmodule.mfm + /home/fred/ideu/src/ideusettings.mfm /home/fred/ideu/src/main.mfm befcommandon=0 makeoptionson=11 @@ -846,10 +849,10 @@ makeoptionson=11 4091 4095 compilerusedon=29 - 2047 - 0 + 2043 0 0 + 4 0 0 0 @@ -1473,22 +1476,27 @@ findhistory=20 writecon hello findoptions=1 -editpos=3 +editpos=4 0,0 - 20,6 0,0 + 0,-1073741823 + 0,163 bookmarks0=0 bookmarks1=0 bookmarks2=0 -sourcefiles=3 +bookmarks3=0 +sourcefiles=4 ${PROJECTDIR}/actionsmodule.pas ${PROJECTDIR}/main.pas ${PROJECTDIR}/ideU.pas -relpaths=3 + ${PROJECTDIR}/ideusettings.pas +relpaths=4 actionsmodule.pas main.pas ideU.pas -ismoduletexts=3 + ideusettings.pas +ismoduletexts=4 + 0 0 0 0 @@ -1498,8 +1506,8 @@ modules=7 /home/fred/ideu/src/actionsmodule.mfm /home/fred/ideu/src/guitemplates.mfm /home/fred/ideu/src/formdesigner.mfm - /home/fred/ideu/src/sourcepage.mfm /home/fred/ideu/src/msefiledialogres.mfm + /home/fred/ideu/src/ideusettings.mfm moduleoptions=7 0 0 @@ -1514,8 +1522,8 @@ visiblemodules=7 -1 0 0 - -1 0 + -1 nomenumodules=7 -1 0 @@ -1523,12 +1531,17 @@ nomenumodules=7 -1 -1 -1 - -1 + 0 [sourcefo.files_tab] +order=4 + 0 + 3 + 2 + 1 firsttab=0 -index=0 +index=1 [layout] -windowlayout=680 +windowlayout=673 [mainfo.basedock] splitdir=2 useroptions=268450944 @@ -1542,8 +1555,8 @@ windowlayout=680 ny=0 ncx=0 ncy=0 - x=125 - y=46 + x=71 + y=131 cx=1157 cy=621 rcx=0 @@ -1590,7 +1603,7 @@ windowlayout=680 [memoryfo] splitdir=0 useroptions=268451963 - stackedunder=about_form + stackedunder=dialogfilesfo parent= mdistate=0 nx=0 @@ -1636,7 +1649,7 @@ windowlayout=680 [findinfilefo] splitdir=0 useroptions=268451947 - stackedunder= + stackedunder=_mse_sourcefo_mse_ parent= mdistate=0 nx=0 @@ -1662,19 +1675,19 @@ windowlayout=680 x=0 y=0 cx=205 - cy=442 + cy=445 rcx=0 rcy=0 [projecttreefo.grid] - propcolwidthref=73 + propcolwidthref=88 width0=117 sortdescend0=0 - width1=67 + width1=82 sortdescend1=0 sorted=0 col=1 row=-1073741823 - rowheight=21 + rowheight=17 [stackfo] splitdir=0 useroptions=268460137 @@ -1712,7 +1725,7 @@ windowlayout=680 active=0 visible=0 [watchpointsfo.grid] - propcolwidthref=352 + propcolwidthref=332 sortdescend0=0 values1=1 0 @@ -1721,7 +1734,7 @@ windowlayout=680 sortdescend1=0 values2=1 pinteger(0x126c6b4)^ - width2=158 + width2=149 sortdescend2=0 width4=34 sortdescend4=0 @@ -1732,7 +1745,7 @@ windowlayout=680 sortdescend5=0 values6=1 - width6=184 + width6=172 sortdescend6=0 [breakpointsfo] splitdir=0 @@ -1758,7 +1771,7 @@ windowlayout=680 [objectinspectorfo] splitdir=0 useroptions=268451947 - stackedunder= + stackedunder=_mse_settings_form_mse_ parent= mdistate=0 nx=0 @@ -1773,12 +1786,12 @@ windowlayout=680 rcy=0 wsize=0 active=0 - visible=0 + visible=1 [objectinspectorfo.grid] - propcolwidthref=306 - width0=136 + propcolwidthref=291 + width0=129 sortdescend0=0 - width1=164 + width1=156 sortdescend1=0 [symbolfo] splitdir=0 @@ -1842,7 +1855,7 @@ windowlayout=680 rcx=1262 rcy=583 [watchfo.grid] - propcolwidthref=111 + propcolwidthref=121 values0=0 values0_ci=-1 sortdescend0=0 @@ -1871,9 +1884,9 @@ windowlayout=680 ncx=0 ncy=0 x=0 - y=505 + y=508 cx=1147 - cy=91 + cy=92 rcx=0 rcy=0 [componentstorefo] @@ -1942,7 +1955,7 @@ windowlayout=680 [componentpalettefo] splitdir=0 useroptions=268460139 - stackedunder=dialogfilesfo + stackedunder= parent= mdistate=3 nx=0 @@ -1984,8 +1997,8 @@ windowlayout=680 mdistate=0 nx=0 ny=0 - ncx=1147 - ncy=57 + ncx=1111 + ncy=52 x=0 y=0 cx=1147 @@ -1999,58 +2012,46 @@ windowlayout=680 [debuggerfo.edit_compiler] value=Pascal [debuggerfo.file_history] - value=/home/fred/ideu/src/actionsmodule.pas - history=50 - /home/fred/atest/test.prj - /home/fred/ideu/src/ideU.prj - /home/fred/mseide-msegui/apps/ide/mseide.prj - /home/fred/uos/examples/simpleplayer.prj - /home/fred/ideu_ok/src/ideU.prj - /home/fred/eschecs_mse/eschecs.prj - /home/fred/mselang-master/src/mselang.prj - /home/fred/mseide-msegui/apps/ide/mseide_zeos.prj - /home/fred/strumpract/src/strumpract.prj - /home/fred/ideu_badplug/src/demos/voiceassist/helloworld/helloworld.prj - /home/fred/xtop/src/ptop.prj - /home/fred/xtop/src/jtop.prj - /home/fred/idegraeme/mseide.prj - /home/fred/fptop/src/jtop.prj - /home/fred/fptop/src/ptop.prj - /home/fred/ptop_fred/ptop.prj - /home/fred/eschecs_mse_argh/eschecs.prj - /home/fred/Downloads/jcf-cli-master/CommandLine/Lazarus/jcf.prj - /home/fred/mseuniverse/samples/widgets/grids/chessboard/chessboard.prj - /home/fred/msegui-chessboard-modern-master/chessboard.prj - /home/fred/msegui-chessboard-master/chessboard.prj - /home/fred/msegui/apps/ide/mseide.prj - /home/fred/Downloads/eschecs-console-master/eschecs-c.prj - /home/fred/eschecs-console-master/eschecs-c.prj - /home/fred/eschecs_mse (copie 1)/eschecs.prj - /home/fred/Downloads/mseuniverse-master/samples/widgets/widgetblendanim/widgetblendanim.prj - /home/fred/Downloads/mseuniverse-master/samples/widgets/imagedarkening/imagedarkening.prj - /home/fred/Downloads/mseuniverse-master/samples/widgets/imageblend/imageblend.prj - /home/fred/Downloads/mseuniverse-master/samples/animations/windowopacity/windowopacity.prj - /home/fred/eschecs_mse_dockmain/eschecs.prj - /home/fred/ideu_bin/ideu_1.9.7_linux64/layout/Dock_Commandor_Editor_Message_MSE.prj - /home/fred/ideu_bin/ideu_1.9.7_linux64/layout/Dock_Commandor_Dock_Tree_Editor_Message.prj - /home/fred/mse_textedit/textedit.prj - /home/fred/mseuniverse-master/samples/widgets/grids/textedit/textedit.prj - /home/fred/mseuniverse-master/tools/virtualkeyboard/testvirtualkeyboard.prj - /home/fred/mseuniverse-master/tools/msetune/msetune.prj - /home/fred/mseuniverse-master/samples/widgets/grids/itemedit/itemedit.prj - /home/fred/eschecs_mse_nodock/eschecs.prj - /home/fred/eschecs_mse_copie/eschecs.prj - /home/fred/uos/examples/simpleplayer_fpGUI.prj - /home/fred/ideu/src/layout/Menu_Only.prj - /home/fred/eschecs_mse2/eschecs.prj - /home/fred/mse_chessboard/eschecs.prj - /home/fred/mse_chessboard/chessboard.prj - /home/fred/Downloads/mseuniverse-master/samples/widgets/grids/chessboard/chessboard.prj - /home/fred/msetest/test.prj - /home/fred/uoslib/src/uoslib.prj - /home/fred/uoslib/examples/demos/fpc/simpleplayer.prj - /home/fred/eschecs/source/eschecs.prj - /home/fred/mseuniverse-master/samples/db/gridselectedrow/gridselectedrow.prj + value=/home/fred/ideu/src/ideusettings.pas + history=38 + /home/fred/mseide-msegui/lib/common/fpccompatibility/fpreadxwd.pas + /home/fred/ideu/src/finddialogform.pas + /home/fred/ideu/src/findinfileform.pas + /home/fred/ideu/src/findinfilepage.pas + /home/fred/ideu/src/msefiledialog.pas + /home/fred/ideu/src/confideu.pas + /home/fred/ideu/src/targetconsole.pas + /home/fred/ideu/src/replacedialogform.pas + /home/fred/ideu/src/aboutform.pas + /home/fred/ideu/src/dialogfiles.pas + /home/fred/ideu/src/msefiledialogres.pas + /home/fred/ideu/src/confdebugger.pas + /home/fred/ideu/src/confcompiler.pas + /home/fred/ideu/src/ideusettings.pas + /home/fred/atest/main.pas + /home/fred/msefpc/freepascal/compiler/globals.pas + /home/fred/msefpc/freepascaltest/compiler/globals.pas + /home/fred/msefpc/freepascaltest/compiler/cfileutl.pas + /home/fred/msefpc/freepascal/compiler/cfileutl.pas + /home/fred/msefpc/freepascal/cfileutl.pas + /home/fred/uos/examples/consoleplay.pas + /home/fred/svnfpc32/fixes_3_2/compiler/link.pas + /home/fred/msefpc/freepascaltest/compiler/link.pas + /home/fred/msefpc/test/compiler/link.pas + /home/fred/msefpc/freepascal/compiler/link.pas + /home/fred/msefpc/freepascaloldok/compiler/link.pas + /home/fred/msefpc/test/compiler/version.pas + /home/fred/msefpc/freepascal/compiler/systems/t_linux.pas + /home/fred/msefpc/test/compiler/systems/t_linux.pas + /home/fred/t_linux.pas + /home/fred/svnfpc32/fixes_3_2/compiler/systems/t_linux.pas + /home/fred/link.pas + /home/fred/svnfpctrunk/trunk/compiler/link.pas + /home/fred/trunk/packages/fpgtk/src/pgtk/pgtk.pp + /home/fred/trunk/packages/fpgtk/src/fpgtkext.pp + /home/fred/mseide-msegui/apps/ide/sourcepage.pas + /home/fred/mseide-msegui/apps/ide/projectoptionsform.pas + /home/fred/mseide-msegui/apps/ide/mseide.pas [debuggerfo.project_options] value=1 [debuggerfo.hints] @@ -2068,16 +2069,21 @@ windowlayout=680 x=208 y=0 cx=939 - cy=442 + cy=445 rcx=0 rcy=0 [sourcefo.files_tab] + order=4 + 0 + 3 + 2 + 1 firsttab=0 - index=0 + index=1 [confideufo.fontname] value=stf_default [confideufo.usedefaulteditoroptions] - value=0 + value=1 [cpuc86_64fo] irqoff=0 splitdir=0 @@ -2101,7 +2107,7 @@ windowlayout=680 [_mse_sourcefo_mse_] splitdir=0 useroptions=268451963 - stackedunder=_mse_sourcepage_mse_ + stackedunder=_mse_mainfo_mse_ parent= mdistate=3 nx=0 @@ -2155,29 +2161,10 @@ windowlayout=680 wsize=0 active=0 visible=0 - [_mse_sourcepage_mse_] - splitdir=0 - useroptions=268451963 - stackedunder=mainfo - parent= - mdistate=3 - nx=0 - ny=0 - ncx=0 - ncy=0 - x=441 - y=217 - cx=652 - cy=301 - rcx=0 - rcy=0 - wsize=0 - active=0 - visible=1 [_mse_filedialogres_mse_] splitdir=0 useroptions=268451963 - stackedunder=confcompilerfo + stackedunder=targetconsolefo parent= mdistate=3 nx=0 @@ -2206,9 +2193,28 @@ windowlayout=680 x=0 y=60 cx=1147 - cy=442 + cy=445 rcx=0 rcy=0 + [_mse_settings_form_mse_] + splitdir=0 + useroptions=268451963 + stackedunder=mainfo + parent= + mdistate=3 + nx=0 + ny=0 + ncx=0 + ncy=0 + x=270 + y=282 + cx=894 + cy=483 + rcx=0 + rcy=0 + wsize=0 + active=0 + visible=1 [targetconsole] finddtext=dump findhistory=1 diff --git a/src/ideusettings.mfm b/src/ideusettings.mfm index d7b46322..d3b601d3 100644 --- a/src/ideusettings.mfm +++ b/src/ideusettings.mfm @@ -2,8 +2,8 @@ object settings_form: tsettingsfo optionswidget = [ow_arrowfocus, ow_arrowfocusin, ow_arrowfocusout, ow_subfocus, ow_mousewheel, ow_destroywidgets, ow_hinton] color = 14342874 visible = False - bounds_x = 222 - bounds_y = 134 + bounds_x = 270 + bounds_y = 282 bounds_cx = 884 bounds_cy = 483 container.optionswidget = [ow_mousefocus, ow_tabfocus, ow_arrowfocus, ow_arrowfocusin, ow_arrowfocusout, ow_subfocus, ow_mousetransparent, ow_mousewheel, ow_destroywidgets] @@ -737,6 +737,7 @@ object settings_form: tsettingsfo bounds_cy = 39 state = [as_localcaption, as_localcolor, as_localonexecute] caption = '&Shortcuts' + onexecute = editshortcuts end end object but_ok: tbutton diff --git a/src/ideusettings_mfm.pas b/src/ideusettings_mfm.pas index 2d7f1fb2..ed0fcd18 100644 --- a/src/ideusettings_mfm.pas +++ b/src/ideusettings_mfm.pas @@ -8,8 +8,8 @@ implementation mseclasses,ideusettings; const - objdata: record size: integer; data: array[0..16388] of byte end = - (size: 16389; data: ( + objdata: record size: integer; data: array[0..16413] of byte end = + (size: 16414; data: ( 84,80,70,48,11,116,115,101,116,116,105,110,103,115,102,111,13,115,101,116, 116,105,110,103,115,95,102,111,114,109,13,111,112,116,105,111,110,115,119,105, 100,103,101,116,11,13,111,119,95,97,114,114,111,119,102,111,99,117,115,15, @@ -18,8 +18,8 @@ implementation 111,99,117,115,13,111,119,95,109,111,117,115,101,119,104,101,101,108,17,111, 119,95,100,101,115,116,114,111,121,119,105,100,103,101,116,115,9,111,119,95, 104,105,110,116,111,110,0,5,99,111,108,111,114,4,218,218,218,0,7,118, - 105,115,105,98,108,101,8,8,98,111,117,110,100,115,95,120,3,222,0,8, - 98,111,117,110,100,115,95,121,3,134,0,9,98,111,117,110,100,115,95,99, + 105,115,105,98,108,101,8,8,98,111,117,110,100,115,95,120,3,14,1,8, + 98,111,117,110,100,115,95,121,3,26,1,9,98,111,117,110,100,115,95,99, 120,3,116,3,9,98,111,117,110,100,115,95,99,121,3,227,1,23,99,111, 110,116,97,105,110,101,114,46,111,112,116,105,111,110,115,119,105,100,103,101, 116,11,13,111,119,95,109,111,117,115,101,102,111,99,117,115,11,111,119,95, @@ -808,28 +808,29 @@ implementation 101,11,15,97,115,95,108,111,99,97,108,99,97,112,116,105,111,110,13,97, 115,95,108,111,99,97,108,99,111,108,111,114,17,97,115,95,108,111,99,97, 108,111,110,101,120,101,99,117,116,101,0,7,99,97,112,116,105,111,110,6, - 10,38,83,104,111,114,116,99,117,116,115,0,0,0,7,116,98,117,116,116, - 111,110,6,98,117,116,95,111,107,17,102,114,97,109,101,46,111,112,116,105, - 111,110,115,115,107,105,110,11,8,102,115,111,95,102,108,97,116,0,16,102, - 114,97,109,101,46,108,111,99,97,108,112,114,111,112,115,11,15,102,114,108, - 95,111,112,116,105,111,110,115,115,107,105,110,0,17,102,114,97,109,101,46, - 108,111,99,97,108,112,114,111,112,115,49,11,0,15,102,97,99,101,46,108, - 111,99,97,108,112,114,111,112,115,11,0,13,102,97,99,101,46,116,101,109, - 112,108,97,116,101,7,19,115,111,117,114,99,101,102,111,46,116,102,97,99, - 101,99,111,109,112,49,8,116,97,98,111,114,100,101,114,2,1,8,98,111, - 117,110,100,115,95,120,3,9,3,8,98,111,117,110,100,115,95,121,2,2, - 9,98,111,117,110,100,115,95,99,120,2,99,9,98,111,117,110,100,115,95, - 99,121,2,16,7,97,110,99,104,111,114,115,11,6,97,110,95,116,111,112, - 8,97,110,95,114,105,103,104,116,0,5,115,116,97,116,101,11,17,97,115, - 95,108,111,99,97,108,105,110,118,105,115,105,98,108,101,15,97,115,95,108, - 111,99,97,108,99,97,112,116,105,111,110,17,97,115,95,108,111,99,97,108, - 111,110,101,120,101,99,117,116,101,0,7,99,97,112,116,105,111,110,6,3, - 38,79,75,11,109,111,100,97,108,114,101,115,117,108,116,7,5,109,114,95, - 111,107,0,0,0,9,116,115,116,97,116,102,105,108,101,10,116,115,116,97, - 116,102,105,108,101,49,8,102,105,108,101,110,97,109,101,6,14,115,101,116, - 116,105,110,103,115,102,111,46,115,116,97,7,111,112,116,105,111,110,115,11, - 10,115,102,111,95,109,101,109,111,114,121,0,4,108,101,102,116,3,28,1, - 3,116,111,112,2,86,0,0,0) + 10,38,83,104,111,114,116,99,117,116,115,9,111,110,101,120,101,99,117,116, + 101,7,13,101,100,105,116,115,104,111,114,116,99,117,116,115,0,0,0,7, + 116,98,117,116,116,111,110,6,98,117,116,95,111,107,17,102,114,97,109,101, + 46,111,112,116,105,111,110,115,115,107,105,110,11,8,102,115,111,95,102,108, + 97,116,0,16,102,114,97,109,101,46,108,111,99,97,108,112,114,111,112,115, + 11,15,102,114,108,95,111,112,116,105,111,110,115,115,107,105,110,0,17,102, + 114,97,109,101,46,108,111,99,97,108,112,114,111,112,115,49,11,0,15,102, + 97,99,101,46,108,111,99,97,108,112,114,111,112,115,11,0,13,102,97,99, + 101,46,116,101,109,112,108,97,116,101,7,19,115,111,117,114,99,101,102,111, + 46,116,102,97,99,101,99,111,109,112,49,8,116,97,98,111,114,100,101,114, + 2,1,8,98,111,117,110,100,115,95,120,3,9,3,8,98,111,117,110,100, + 115,95,121,2,2,9,98,111,117,110,100,115,95,99,120,2,99,9,98,111, + 117,110,100,115,95,99,121,2,16,7,97,110,99,104,111,114,115,11,6,97, + 110,95,116,111,112,8,97,110,95,114,105,103,104,116,0,5,115,116,97,116, + 101,11,17,97,115,95,108,111,99,97,108,105,110,118,105,115,105,98,108,101, + 15,97,115,95,108,111,99,97,108,99,97,112,116,105,111,110,17,97,115,95, + 108,111,99,97,108,111,110,101,120,101,99,117,116,101,0,7,99,97,112,116, + 105,111,110,6,3,38,79,75,11,109,111,100,97,108,114,101,115,117,108,116, + 7,5,109,114,95,111,107,0,0,0,9,116,115,116,97,116,102,105,108,101, + 10,116,115,116,97,116,102,105,108,101,49,8,102,105,108,101,110,97,109,101, + 6,14,115,101,116,116,105,110,103,115,102,111,46,115,116,97,7,111,112,116, + 105,111,110,115,11,10,115,102,111,95,109,101,109,111,114,121,0,4,108,101, + 102,116,3,28,1,3,116,111,112,2,86,0,0,0) ); initialization