Skip to content

Commit

Permalink
ETKPDF2CBX improvementes
Browse files Browse the repository at this point in the history 
  - ETKPDF2CBX:
    - Localizable texts.
    - Removing options to convert to JPG and to resize 2048px (not implemented).
    - Added Option to create a subfolder intead a CBX (default for Emuteca use).
    - Added a list of files in Temp folder.
  - EmutecaGUI PS TOSEC Import: Don't overwrite soft date if translation is found.
  - ETKDBEditor: Fixing cell's hints with '|'
  - Some DB's updated
  • Loading branch information
@Chixpy
Chixpy committed Dec 12, 2023
1 parent 3ff4a20 commit 126958f
Show file tree
Hide file tree
Showing 17 changed files with 33,422 additions and 33,829 deletions.
68 changes: 34 additions & 34 deletions ETKDBEditor/ETKDBEditor.lps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<Filename Value="ETKDBEditor.lpr"/>
<IsPartOfProject Value="True"/>
<EditorIndex Value="-1"/>
<UsageCount Value="64"/>
<UsageCount Value="65"/>
</Unit>
<Unit>
<Filename Value="src\forms\ufrETKDBEditorMain.pas"/>
Expand All @@ -19,7 +19,7 @@
<ResourceBaseClass Value="Form"/>
<EditorIndex Value="-1"/>
<CursorPos X="52" Y="32"/>
<UsageCount Value="64"/>
<UsageCount Value="65"/>
</Unit>
<Unit>
<Filename Value="..\CHXPas\Forms\ufrCHXForm.pas"/>
Expand All @@ -30,7 +30,7 @@
<EditorIndex Value="-1"/>
<TopLine Value="228"/>
<CursorPos X="45" Y="213"/>
<UsageCount Value="64"/>
<UsageCount Value="65"/>
</Unit>
<Unit>
<Filename Value="..\CHXPas\Frames\ufCHXFrame.pas"/>
Expand All @@ -41,7 +41,7 @@
<EditorIndex Value="-1"/>
<TopLine Value="338"/>
<CursorPos X="27" Y="184"/>
<UsageCount Value="64"/>
<UsageCount Value="65"/>
</Unit>
<Unit>
<Filename Value="src\frames\ufETKDBEditorMain.pas"/>
Expand All @@ -50,9 +50,9 @@
<HasResources Value="True"/>
<ResourceBaseClass Value="Frame"/>
<IsVisibleTab Value="True"/>
<TopLine Value="136"/>
<CursorPos X="5" Y="151"/>
<UsageCount Value="63"/>
<TopLine Value="256"/>
<CursorPos X="3" Y="260"/>
<UsageCount Value="64"/>
<Loaded Value="True"/>
<LoadedDesigner Value="True"/>
</Unit>
Expand All @@ -61,67 +61,67 @@
<IsPartOfProject Value="True"/>
<EditorIndex Value="-1"/>
<CursorPos X="14" Y="30"/>
<UsageCount Value="60"/>
<UsageCount Value="61"/>
</Unit>
<Unit>
<Filename Value="..\CHXPas\Units\uCHXStrUtils.pas"/>
<IsPartOfProject Value="True"/>
<EditorIndex Value="-1"/>
<CursorPos X="25" Y="18"/>
<UsageCount Value="60"/>
<UsageCount Value="61"/>
</Unit>
<Unit>
<Filename Value="..\CHXPas\Units\uCHXRscStr.pas"/>
<IsPartOfProject Value="True"/>
<EditorIndex Value="-1"/>
<TopLine Value="57"/>
<CursorPos X="19" Y="68"/>
<UsageCount Value="60"/>
<UsageCount Value="61"/>
</Unit>
<Unit>
<Filename Value="..\CHXPas\Units\uCHXConst.pas"/>
<IsPartOfProject Value="True"/>
<EditorIndex Value="-1"/>
<CursorPos X="16" Y="32"/>
<UsageCount Value="60"/>
<UsageCount Value="61"/>
</Unit>
<Unit>
<Filename Value="src\units\uETKDBEConst.pas"/>
<IsPartOfProject Value="True"/>
<EditorIndex Value="-1"/>
<TopLine Value="7"/>
<CursorPos X="18" Y="35"/>
<UsageCount Value="56"/>
<UsageCount Value="57"/>
</Unit>
<Unit>
<Filename Value="..\EmutecaCore\Units\uEmutecaRscStr.pas"/>
<IsPartOfProject Value="True"/>
<EditorIndex Value="-1"/>
<CursorPos X="20"/>
<UsageCount Value="53"/>
<UsageCount Value="54"/>
</Unit>
<Unit>
<Filename Value="..\EmutecaCore\Units\uEmutecaConst.pas"/>
<IsPartOfProject Value="True"/>
<EditorIndex Value="-1"/>
<TopLine Value="31"/>
<CursorPos X="3" Y="32"/>
<UsageCount Value="53"/>
<UsageCount Value="54"/>
</Unit>
<Unit>
<Filename Value="..\CHXPas\Units\uCHXVerInfo.pas"/>
<IsPartOfProject Value="True"/>
<EditorIndex Value="-1"/>
<CursorPos X="6" Y="10"/>
<UsageCount Value="34"/>
<UsageCount Value="35"/>
</Unit>
<Unit>
<Filename Value="src\units\uETKDBERscStr.pas"/>
<IsPartOfProject Value="True"/>
<EditorIndex Value="-1"/>
<TopLine Value="5"/>
<CursorPos X="16" Y="18"/>
<UsageCount Value="33"/>
<UsageCount Value="34"/>
</Unit>
<Unit>
<Filename Value="..\CHXPas\Misc\uVersionSupport.pas"/>
Expand Down Expand Up @@ -330,7 +330,7 @@
<EditorIndex Value="2"/>
<TopLine Value="14"/>
<CursorPos X="40" Y="28"/>
<UsageCount Value="11"/>
<UsageCount Value="12"/>
<Loaded Value="True"/>
</Unit>
<Unit>
Expand Down Expand Up @@ -369,27 +369,11 @@
<EditorIndex Value="1"/>
<TopLine Value="108"/>
<CursorPos X="10" Y="122"/>
<UsageCount Value="11"/>
<UsageCount Value="12"/>
<Loaded Value="True"/>
</Unit>
</Units>
<JumpHistory HistoryIndex="29">
<Position>
<Filename Value="src\frames\ufETKDBEditorMain.pas"/>
<Caret Line="242" Column="33" TopLine="233"/>
</Position>
<Position>
<Filename Value="src\frames\ufETKDBEditorMain.pas"/>
<Caret Line="243" Column="33" TopLine="234"/>
</Position>
<Position>
<Filename Value="src\frames\ufETKDBEditorMain.pas"/>
<Caret Line="249" Column="33" TopLine="240"/>
</Position>
<Position>
<Filename Value="src\frames\ufETKDBEditorMain.pas"/>
<Caret Line="189" Column="3" TopLine="187"/>
</Position>
<Position>
<Filename Value="src\frames\ufETKDBEditorMain.pas"/>
<Caret Line="188" Column="3" TopLine="186"/>
Expand Down Expand Up @@ -494,6 +478,22 @@
<Filename Value="src\frames\ufETKDBEditorMain.pas"/>
<Caret Line="150" TopLine="138"/>
</Position>
<Position>
<Filename Value="src\frames\ufETKDBEditorMain.pas"/>
<Caret Line="73" Column="28" TopLine="58"/>
</Position>
<Position>
<Filename Value="src\frames\ufETKDBEditorMain.pas"/>
<Caret Line="347" Column="42" TopLine="344"/>
</Position>
<Position>
<Filename Value="src\frames\ufETKDBEditorMain.pas"/>
<Caret Line="316" Column="37" TopLine="307"/>
</Position>
<Position>
<Filename Value="src\frames\ufETKDBEditorMain.pas"/>
<Caret Line="79" Column="26" TopLine="66"/>
</Position>
</JumpHistory>
<RunParams>
<FormatVersion Value="2"/>
Expand Down
9 changes: 6 additions & 3 deletions ETKDBEditor/src/frames/ufETKDBEditorMain.pas
View file
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,8 @@ procedure TfmETKDBEditor.chkFastEditModeChange(Sender : TObject);
procedure TfmETKDBEditor.sgMainGetCellHint(Sender : TObject;
ACol, ARow : integer; var HintText : string);
begin
HintText := sgMain.Cells[ACol, ARow];
HintText := UTF8StringReplace(sgMain.Cells[ACol, ARow], ' | ', LineEnding,
[rfReplaceAll]);
end;

procedure TfmETKDBEditor.sgMainKeyDown(Sender : TObject;
Expand Down Expand Up @@ -320,7 +321,7 @@ procedure TfmETKDBEditor.FastMove;
else
sgMain.Cells[cbxFastMove.ItemIndex, sgMain.Row] :=
FormatCellText(sgMain.Cells[cbxFastMove.ItemIndex, sgMain.Row] +
krsValueSeparator + Clipboard.AsText);
krsValueSeparator + FormatCellText(Clipboard.AsText));
end
else
begin
Expand All @@ -341,7 +342,9 @@ procedure TfmETKDBEditor.FastMove;
else
aText := aText + krsValueSeparator + sgMain.Cells[j, i];

sgMain.Cells[j, i] := EmptyStr;
// First columns can't be empty
if j <> 0 then
sgMain.Cells[j, i] := EmptyStr;
end;

Inc(j);
Expand Down
16 changes: 10 additions & 6 deletions ETKPDF2CBX/ETKPDF2CBX.lpi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,10 @@
</XPManifest>
<Icon Value="0"/>
</General>
<i18n>
<EnableI18N Value="True"/>
<OutDir Value="..\bin\locale"/>
</i18n>
<VersionInfo>
<UseVersionInfo Value="True"/>
<AutoIncrementBuild Value="True"/>
Expand All @@ -35,7 +39,7 @@
</Target>
<SearchPaths>
<IncludeFiles Value="$(ProjOutDir)"/>
<OtherUnitFiles Value="src\forms;..\CHXPas\Forms;..\CHXPas\Misc;src\units;..\CHXPas\Units;..\CHXPas\Abstract;..\CHXPas\Frames;src\frames;src\classes"/>
<OtherUnitFiles Value="..\CHXPas\Abstract;..\CHXPas\Forms;..\CHXPas\Frames;..\CHXPas\Units;src\classes;src\forms;src\frames;src\units"/>
<UnitOutputDirectory Value="..\lib\$(TargetCPU)-$(TargetOS)"/>
</SearchPaths>
<CodeGeneration>
Expand Down Expand Up @@ -89,10 +93,6 @@
<HasResources Value="True"/>
<ResourceBaseClass Value="Form"/>
</Unit>
<Unit>
<Filename Value="..\CHXPas\Misc\uVersionSupport.pas"/>
<IsPartOfProject Value="True"/>
</Unit>
<Unit>
<Filename Value="src\units\uP2CConst.pas"/>
<IsPartOfProject Value="True"/>
Expand Down Expand Up @@ -182,6 +182,10 @@
<Filename Value="..\CHXPas\Units\uCHXDlgUtils.pas"/>
<IsPartOfProject Value="True"/>
</Unit>
<Unit>
<Filename Value="..\CHXPas\Units\uCHXVerInfo.pas"/>
<IsPartOfProject Value="True"/>
</Unit>
</Units>
</ProjectOptions>
<CompilerOptions>
Expand All @@ -192,7 +196,7 @@
</Target>
<SearchPaths>
<IncludeFiles Value="$(ProjOutDir)"/>
<OtherUnitFiles Value="src\forms;..\CHXPas\Forms;..\CHXPas\Misc;src\units;..\CHXPas\Units;..\CHXPas\Abstract;..\CHXPas\Frames;src\frames;src\classes"/>
<OtherUnitFiles Value="..\CHXPas\Abstract;..\CHXPas\Forms;..\CHXPas\Frames;..\CHXPas\Units;src\classes;src\forms;src\frames;src\units"/>
<UnitOutputDirectory Value="..\lib\$(TargetCPU)-$(TargetOS)"/>
</SearchPaths>
<Parsing>
Expand Down
8 changes: 4 additions & 4 deletions ETKPDF2CBX/ETKPDF2CBX.lpr
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
athreads,
{$ENDIF}
Interfaces, // this includes the LCL widgetset
Forms, ufrMain, ufrCHXForm, uVersionSupport, uCHXConst, uCHXStrUtils,
Forms, ufrMain, ufrCHXForm, uCHXConst, uCHXStrUtils,
uCHXRscStr, uCHXFileUtils, uCHXImageUtils, uCHXExecute, uCHX7zWrapper,
uCHXDlgUtils, uaCHXConfig, uaCHXStorable, ufCHXFrame, ufCHXImgListPreview,
ufCHXFileListPreview, ufCHXImgViewer, ufCHXListPreview, uP2CConst, ufP2CMain,
ucP2CConfig
uCHXDlgUtils, uCHXVerInfo, uaCHXConfig, uaCHXStorable, ufCHXFrame,
ufCHXImgListPreview, ufCHXFileListPreview, ufCHXImgViewer, ufCHXListPreview,
uP2CConst, ufP2CMain, ucP2CConfig
{ you can add units after this };

{$R *.res}
Expand Down
Loading

0 comments on commit 126958f

Please sign in to comment.