Skip to content

Commit

Permalink
New icons; readme changed
Browse files Browse the repository at this point in the history
  • Loading branch information
@magicxor
magicxor committed Sep 1, 2015
1 parent 1dba32e commit 38e5b6f
Show file tree
Hide file tree
Showing 20 changed files with 1,174 additions and 674 deletions.
311 changes: 213 additions & 98 deletions BukvoezhkaCrossplatform/BukvoezhkaCrossplatform.dproj
View file

Large diffs are not rendered by default.

Binary file modified BukvoezhkaCrossplatform/BukvoezhkaCrossplatform.res
View file
Binary file not shown.
111 changes: 82 additions & 29 deletions BukvoezhkaDesktop/BukvoezhkaDesktop.dproj
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ProjectGuid>{41B510C7-504B-41CB-A8E4-6B894A769687}</ProjectGuid>
<ProjectVersion>16.1</ProjectVersion>
<ProjectVersion>17.2</ProjectVersion>
<MainSource>BukvoezhkaDesktop.dpr</MainSource>
<Base>True</Base>
<Config Condition="'$(Config)'==''">Release</Config>
<AppType>Application</AppType>
<FrameworkType>VCL</FrameworkType>
<DCC_DCCCompiler>DCC32</DCC_DCCCompiler>
<Platform Condition="'$(Platform)'==''">Win64</Platform>
<Platform Condition="'$(Platform)'==''">Win32</Platform>
<TargetedPlatforms>3</TargetedPlatforms>
</PropertyGroup>
<PropertyGroup Condition="'$(Config)'=='Base' or '$(Base)'!=''">
Expand Down Expand Up @@ -106,16 +106,16 @@
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
<DCC_OutputDRCFile>false</DCC_OutputDRCFile>
<DCC_IOChecking>false</DCC_IOChecking>
<VerInfo_Keys>CompanyName=magicxor;FileDescription=Буквоежка;FileVersion=1.2.0.87;InternalName=bukvoezhka;LegalCopyright=Ilya Burakov;LegalTrademarks=https://github.com/magicxor;OriginalFilename=;ProductName=Буквоежка;ProductVersion=1.2;Comments=;LastCompiledTime=2015.03.22 02:51:08</VerInfo_Keys>
<VerInfo_Build>87</VerInfo_Build>
<VerInfo_Keys>CompanyName=magicxor;FileDescription=Буквоежка;FileVersion=1.2.0.89;InternalName=bukvoezhka;LegalCopyright=Ilya Burakov;LegalTrademarks=https://github.com/magicxor;OriginalFilename=;ProductName=Буквоежка;ProductVersion=1.2;Comments=;LastCompiledTime=2015.03.22 02:51:08</VerInfo_Keys>
<VerInfo_Build>89</VerInfo_Build>
</PropertyGroup>
<PropertyGroup Condition="'$(Cfg_2_Win64)'!=''">
<VerInfo_MinorVer>2</VerInfo_MinorVer>
<VerInfo_Locale>1033</VerInfo_Locale>
<VerInfo_AutoIncVersion>true</VerInfo_AutoIncVersion>
<VerInfo_IncludeVerInfo>true</VerInfo_IncludeVerInfo>
<VerInfo_Build>38</VerInfo_Build>
<VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.2.0.38;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.2;Comments=;LastCompiledTime=2015.03.25 11:43:35</VerInfo_Keys>
<VerInfo_Build>39</VerInfo_Build>
<VerInfo_Keys>CompanyName=;FileDescription=;FileVersion=1.2.0.39;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=;ProductName=;ProductVersion=1.2;Comments=;LastCompiledTime=2015.03.25 11:43:35</VerInfo_Keys>
</PropertyGroup>
<ItemGroup>
<DelphiCompile Include="$(MainSource)">
Expand Down Expand Up @@ -207,7 +207,7 @@
<Platform value="Win32">True</Platform>
<Platform value="Win64">True</Platform>
</Platforms>
<Deployment>
<Deployment Version="2">
<DeployFile LocalName="BukvoezhkaDesktop.todo" Configuration="Release" Class="ProjectFile">
<Platform Name="Win32">
<RemoteDir>.\</RemoteDir>
Expand Down Expand Up @@ -246,7 +246,7 @@
</Platform>
</DeployFile>
<DeployClass Required="true" Name="DependencyPackage">
<Platform Name="iOSDevice">
<Platform Name="iOSDevice64">
<Operation>1</Operation>
<Extensions>.dylib</Extensions>
</Platform>
Expand All @@ -263,9 +263,13 @@
<Operation>1</Operation>
<Extensions>.dylib</Extensions>
</Platform>
<Platform Name="iOSDevice32">
<Operation>1</Operation>
<Extensions>.dylib</Extensions>
</Platform>
</DeployClass>
<DeployClass Name="DependencyModule">
<Platform Name="iOSDevice">
<Platform Name="iOSDevice64">
<Operation>1</Operation>
<Extensions>.dylib</Extensions>
</Platform>
Expand All @@ -282,14 +286,21 @@
<Operation>1</Operation>
<Extensions>.dylib</Extensions>
</Platform>
<Platform Name="iOSDevice32">
<Operation>1</Operation>
<Extensions>.dylib</Extensions>
</Platform>
</DeployClass>
<DeployClass Name="iPad_Launch2048">
<Platform Name="iOSDevice">
<Platform Name="iOSDevice64">
<Operation>1</Operation>
</Platform>
<Platform Name="iOSSimulator">
<Operation>1</Operation>
</Platform>
<Platform Name="iOSDevice32">
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Name="ProjectOSXInfoPList">
<Platform Name="OSX32">
Expand All @@ -298,7 +309,11 @@
</Platform>
</DeployClass>
<DeployClass Name="ProjectiOSDeviceDebug">
<Platform Name="iOSDevice">
<Platform Name="iOSDevice64">
<RemoteDir>..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF</RemoteDir>
<Operation>1</Operation>
</Platform>
<Platform Name="iOSDevice32">
<RemoteDir>..\$(PROJECTNAME).app.dSYM\Contents\Resources\DWARF</RemoteDir>
<Operation>1</Operation>
</Platform>
Expand All @@ -316,12 +331,15 @@
</Platform>
</DeployClass>
<DeployClass Name="ProjectiOSResource">
<Platform Name="iOSDevice">
<Platform Name="iOSDevice64">
<Operation>1</Operation>
</Platform>
<Platform Name="iOSSimulator">
<Operation>1</Operation>
</Platform>
<Platform Name="iOSDevice32">
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Name="ProjectOSXEntitlements">
<Platform Name="OSX32">
Expand All @@ -336,12 +354,15 @@
</Platform>
</DeployClass>
<DeployClass Name="iPhone_Launch640">
<Platform Name="iOSDevice">
<Platform Name="iOSDevice64">
<Operation>1</Operation>
</Platform>
<Platform Name="iOSSimulator">
<Operation>1</Operation>
</Platform>
<Platform Name="iOSDevice32">
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Name="Android_SplashImage960">
<Platform Name="Android">
Expand All @@ -356,12 +377,15 @@
</Platform>
</DeployClass>
<DeployClass Name="iPhone_Launch320">
<Platform Name="iOSDevice">
<Platform Name="iOSDevice64">
<Operation>1</Operation>
</Platform>
<Platform Name="iOSSimulator">
<Operation>1</Operation>
</Platform>
<Platform Name="iOSDevice32">
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Name="Android_LauncherIcon144">
<Platform Name="Android">
Expand Down Expand Up @@ -410,7 +434,11 @@
</Platform>
</DeployClass>
<DeployClass Name="ProjectiOSEntitlements">
<Platform Name="iOSDevice">
<Platform Name="iOSDevice64">
<RemoteDir>../</RemoteDir>
<Operation>1</Operation>
</Platform>
<Platform Name="iOSDevice32">
<RemoteDir>../</RemoteDir>
<Operation>1</Operation>
</Platform>
Expand All @@ -435,20 +463,26 @@
</Platform>
</DeployClass>
<DeployClass Name="ProjectiOSInfoPList">
<Platform Name="iOSDevice">
<Platform Name="iOSDevice64">
<Operation>1</Operation>
</Platform>
<Platform Name="iOSSimulator">
<Operation>1</Operation>
</Platform>
<Platform Name="iOSDevice32">
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Name="iPad_Launch1024">
<Platform Name="iOSDevice">
<Platform Name="iOSDevice64">
<Operation>1</Operation>
</Platform>
<Platform Name="iOSSimulator">
<Operation>1</Operation>
</Platform>
<Platform Name="iOSDevice32">
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Name="Android_DefaultAppIcon">
<Platform Name="Android">
Expand All @@ -463,26 +497,32 @@
</Platform>
</DeployClass>
<DeployClass Name="ProjectiOSDeviceResourceRules">
<Platform Name="iOSDevice">
<Platform Name="iOSDevice64">
<Operation>1</Operation>
</Platform>
<Platform Name="iOSDevice32">
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Name="iPad_Launch768">
<Platform Name="iOSDevice">
<Platform Name="iOSDevice64">
<Operation>1</Operation>
</Platform>
<Platform Name="iOSSimulator">
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Required="true" Name="ProjectOutput">
<Platform Name="iOSDevice">
<Platform Name="iOSDevice32">
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Required="true" Name="ProjectOutput">
<Platform Name="Android">
<RemoteDir>library\lib\armeabi-v7a</RemoteDir>
<Operation>1</Operation>
</Platform>
<Platform Name="iOSDevice64">
<Operation>1</Operation>
</Platform>
<Platform Name="Win32">
<Operation>0</Operation>
</Platform>
Expand All @@ -493,6 +533,9 @@
<Platform Name="iOSSimulator">
<Operation>1</Operation>
</Platform>
<Platform Name="iOSDevice32">
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Name="AndroidLibnativeArmeabiFile">
<Platform Name="Android">
Expand All @@ -507,10 +550,10 @@
</Platform>
</DeployClass>
<DeployClass Name="File">
<Platform Name="iOSDevice">
<Platform Name="Android">
<Operation>0</Operation>
</Platform>
<Platform Name="Android">
<Platform Name="iOSDevice64">
<Operation>0</Operation>
</Platform>
<Platform Name="Win32">
Expand All @@ -523,14 +566,20 @@
<Platform Name="iOSSimulator">
<Operation>0</Operation>
</Platform>
<Platform Name="iOSDevice32">
<Operation>0</Operation>
</Platform>
</DeployClass>
<DeployClass Name="iPhone_Launch640x1136">
<Platform Name="iOSDevice">
<Platform Name="iOSDevice64">
<Operation>1</Operation>
</Platform>
<Platform Name="iOSSimulator">
<Operation>1</Operation>
</Platform>
<Platform Name="iOSDevice32">
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Name="Android_LauncherIcon36">
<Platform Name="Android">
Expand All @@ -545,12 +594,15 @@
</Platform>
</DeployClass>
<DeployClass Name="iPad_Launch1536">
<Platform Name="iOSDevice">
<Platform Name="iOSDevice64">
<Operation>1</Operation>
</Platform>
<Platform Name="iOSSimulator">
<Operation>1</Operation>
</Platform>
<Platform Name="iOSDevice32">
<Operation>1</Operation>
</Platform>
</DeployClass>
<DeployClass Name="Android_LauncherIcon48">
<Platform Name="Android">
Expand All @@ -569,12 +621,13 @@
<Operation>1</Operation>
</Platform>
</DeployClass>
<ProjectRoot Platform="iOSSimulator" Name="$(PROJECTNAME).app"/>
<ProjectRoot Platform="Android" Name="$(PROJECTNAME)"/>
<ProjectRoot Platform="iOSDevice" Name="$(PROJECTNAME).app"/>
<ProjectRoot Platform="Win32" Name="$(PROJECTNAME)"/>
<ProjectRoot Platform="OSX32" Name="$(PROJECTNAME).app"/>
<ProjectRoot Platform="iOSSimulator" Name="$(PROJECTNAME).app"/>
<ProjectRoot Platform="iOSDevice64" Name="$(PROJECTNAME).app"/>
<ProjectRoot Platform="Win64" Name="$(PROJECTNAME)"/>
<ProjectRoot Platform="OSX32" Name="$(PROJECTNAME).app"/>
<ProjectRoot Platform="iOSDevice32" Name="$(PROJECTNAME).app"/>
</Deployment>
</BorlandProject>
<ProjectFileVersion>12</ProjectFileVersion>
Expand Down
Binary file modified BukvoezhkaDesktop/BukvoezhkaDesktop.res
View file
Binary file not shown.
14 changes: 7 additions & 7 deletions BukvoezhkaDesktop/BukvoezhkaDesktop.todo
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{TODO : �������� 2chTools fixed font}
{TODO : ������� desktop-FMX ������}
{TODO : �������� ����������� � ����}
{TODO :�������� � Fixed Font ����� �������, ��� +_-/\=}


{TODO :�������� ����������, ���������� � ����� � �������� PW}
{DONE : ���������, ��� �� ������� ����� ��� Win7}
{DONE :�������� ������ ��� Android}









Binary file added BukvoezhkaDesktop/img/find.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added BukvoezhkaDesktop/img/info28.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
0 BukvoezhkaDesktop/img/delete8.bmp → BukvoezhkaDesktop/img/old/delete8.bmp
View file
File renamed without changes.
0 BukvoezhkaDesktop/img/information38.bmp → BukvoezhkaDesktop/img/old/information38.bmp
View file
File renamed without changes.
0 BukvoezhkaDesktop/img/translation.bmp → BukvoezhkaDesktop/img/old/translation.bmp
View file
File renamed without changes.
Binary file added BukvoezhkaDesktop/img/recycle77.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 6 additions & 5 deletions BukvoezhkaDesktop/uASCIIartMaker.pas
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
unit uASCIIartMaker;

// Автор оригинального алгоритма преобразования картинки в текст - fabiin
// (2003, http://codes-sources.commentcamarche.net/source/12384-ascii-t-petit-soft-d-ascii-art)
// thanks to fabiin
// (http://codes-sources.commentcamarche.net/source/12384-ascii-t-petit-soft-d-ascii-art)

interface

Expand Down Expand Up @@ -34,6 +34,7 @@ implementation
uses SysUtils;

procedure TASCIIartMaker.QuickSort(iLo, iHi: integer);
// TODO: Get rid of it in favor of the sort TArray<T> with standard comparer.
var
Lo, Hi: integer;
Mid: single;
Expand Down Expand Up @@ -70,7 +71,7 @@ function TASCIIartMaker.MakeASCIIfromBitmap(SrcBitmap: TBitmap;
DonorFont: string = 'Lucida Console'; contrast: integer = 255; zoom: integer = 0;
IsNegative: boolean = false; CharacterSet: Byte = 0): string;

procedure FaireTblDensite; // Создаем таблицу Плотности
procedure FaireTblDensite; // Создаем таблицу плотности
var
a, b, c: integer;
TmpB: TBitmap;
Expand Down Expand Up @@ -275,8 +276,8 @@ function TASCIIartMaker.MakeASCIIfromText(SrcText: string; DonorFont: string = '
Result := '';
if SrcText.Length > 0 then
begin
TmpBitmap := TBitmap.Create;
Strs := TStringList.Create;
TmpBitmap := TBitmap.Create;// TODO: try/finally
Strs := TStringList.Create; // TODO: try/finally
// Задаём параметры шрифта
TmpBitmap.Canvas.Font.Style := [fsBold];
TmpBitmap.Canvas.Font.Size := RenderFontSize;
Expand Down
2 changes: 2 additions & 0 deletions BukvoezhkaDesktop/uConstASCIIartFonts.pas
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ interface

uses uConstCharArrays;

// TODO: add +_-/\= symbols

var
C_First_Font_RU: ArrArrStr =
[['░░░░░░░░',
Expand Down
Loading

0 comments on commit 38e5b6f

Please sign in to comment.