Changeset 66


Ignore:
Timestamp:
Dec 10, 2021, 12:17:46 AM (3 years ago)
Author:
chronos
Message:
  • Fixed: Missing Version field definition causing error in contacts generation form.
  • Fixed: Default profile image location detection under Linux.
  • Fixed: Languages were not loaded in snap and deb Linux packages.
Files:
14 edited

Legend:

Unmodified
Added
Removed

  • tags/1.0.0/Install/snap/snapcraft.yaml

    r23 r66  
    8888      - desktop
    8989      - x11
     90      - home
    9091
    9192layout:

  • tags/1.1.0/Install/deb/debian/rules

    r11 r66  
    1616        install -d -m 755 $(ROOT)/usr/bin
    1717        install -s -m 755 vCardStudio $(ROOT)/usr/bin
    18         install -d -m 755 $(ROOT)/usr/share/vCardStudio/languages
    19         install -m 755 Languages/vCardStudio.po $(ROOT)/usr/share/vCardStudio/languages
    20         install -m 755 Languages/vCardStudio.cs.po $(ROOT)/usr/share/vCardStudio/languages
     18        install -d -m 755 $(ROOT)/usr/share/vCardStudio/Languages
     19        install -m 755 Languages/vCardStudio.po $(ROOT)/usr/share/vCardStudio/Languages
     20        install -m 755 Languages/vCardStudio.cs.po $(ROOT)/usr/share/vCardStudio/Languages
     21        install -d -m 755 $ROOT/usr/share/vCardStudio/Images
     22        install -m 755 Images/Profile.png $ROOT/usr/share/vCardStudio/Images
    2123        install -d -m 755 $(ROOT)/usr/share/applications
    2224        install -m 755 Install/deb/vCardStudio.desktop $(ROOT)/usr/share/applications

  • tags/1.1.0/Install/snap/snapcraft.yaml

    r54 r66  
    3737      install -m 755 Languages/UFormAbout.po $ROOT/usr/share/vCardStudio/Languages
    3838      install -m 755 Languages/UFormAbout.cs.po $ROOT/usr/share/vCardStudio/Languages
     39      install -d -m 755 $ROOT/usr/share/vCardStudio/Images
     40      install -m 755 Images/Profile.png $ROOT/usr/share/vCardStudio/Images
    3941      install -d -m 755 $ROOT/usr/share/applications
    4042      install -m 755 Install/snap/local/vCardStudio.desktop $ROOT/usr/share/applications

  • tags/1.1.0/Languages/vCardStudio.cs.po

    r65 r66  
    980980msgstr "Soubor vCard"
    981981
     982#: ucontact.sversion
     983msgid "Version"
     984msgstr "Verze"
     985
    982986#: ucontact.svoipphone
    983987msgid "VoIP phone"
    … …  
    11511155msgid "Invalid line length for encoded text"
    11521156msgstr "Neplatná délka řádky kódovaného textu"
    1153 

  • tags/1.1.0/Languages/vCardStudio.po

    r62 r66  
    968968msgstr ""
    969969
     970#: ucontact.sversion
     971msgid "Version"
     972msgstr ""
     973
    970974#: ucontact.svoipphone
    971975msgid "VoIP phone"

  • tags/1.1.0/UContact.pas

    r63 r66  
    174174  SContactHasNoParent = 'Contact has no parent';
    175175  SExpectedProperty = 'Expected contact property';
     176  SVersion = 'Version';
    176177  SLastName = 'Last Name';
    177178  SFirstName = 'First Name';
    … …  
    978979begin
    979980  with Fields do begin
     981    AddNew('VERSION', [], [], SVersion, cfVersion, dtString);
    980982    AddNew('N', [], [], SLastName, cfLastName, dtString, 0);
    981983    AddNew('N', [], [], SFirstName, cfFirstName, dtString, 1);

  • tags/1.1.0/UCore.pas

    r63 r66  
    7474    ProfileImage: TImage;
    7575    LastSplitDir: string;
     76    ProfilePhotoFileName: string;
    7677    procedure FileModified(Sender: TObject);
    7778    function FindFirstNonOption: string;
    … …  
    322323{$IFDEF Linux}
    323324const
    324   LinuxLanguagesDir = '/usr/share/vCardStudio/Languages';
     325  LinuxDataFilesDir = '/usr/share/vCardStudio';
     326  LinuxLanguagesDir = LinuxDataFilesDir + '/Languages';
     327  LinuxImagesDir = LinuxDataFilesDir + '/Images';
    325328{$ENDIF}
    326329begin
     330  ProfilePhotoFileName := 'Images/Profile.png';
    327331  {$IFDEF Linux}
    328332  // If installed in Linux system then use installation directory for po files
    329   if not DirectoryExists(Translator.POFilesFolder) and DirectoryExists(LinuxLanguagesDir) then
     333  if not DirectoryExists(Translator.POFilesFolder) and DirectoryExists(LinuxLanguagesDir) then begin
    330334    Translator.POFilesFolder := LinuxLanguagesDir;
     335  end;
     336  // If installed in Linux system then use installation directory for images files
     337  if not DirectoryExists('Images') and DirectoryExists(LinuxImagesDir) then begin
     338    ProfilePhotoFileName := LinuxImagesDir + DirectorySeparator + 'Profile.png';
     339  end;
    331340  {$ENDIF}
    332341
    … …  
    510519
    511520function TCore.GetProfileImage: TImage;
    512 const
    513   ProfilePhotoFileName = 'Images/Profile.png';
    514521begin
    515522  if not Assigned(ProfileImage) then begin

  • trunk/Install/deb/debian/rules

    r11 r66  
    1616        install -d -m 755 $(ROOT)/usr/bin
    1717        install -s -m 755 vCardStudio $(ROOT)/usr/bin
    18         install -d -m 755 $(ROOT)/usr/share/vCardStudio/languages
    19         install -m 755 Languages/vCardStudio.po $(ROOT)/usr/share/vCardStudio/languages
    20         install -m 755 Languages/vCardStudio.cs.po $(ROOT)/usr/share/vCardStudio/languages
     18        install -d -m 755 $(ROOT)/usr/share/vCardStudio/Languages
     19        install -m 755 Languages/vCardStudio.po $(ROOT)/usr/share/vCardStudio/Languages
     20        install -m 755 Languages/vCardStudio.cs.po $(ROOT)/usr/share/vCardStudio/Languages
     21        install -d -m 755 $ROOT/usr/share/vCardStudio/Images
     22        install -m 755 Images/Profile.png $ROOT/usr/share/vCardStudio/Images
    2123        install -d -m 755 $(ROOT)/usr/share/applications
    2224        install -m 755 Install/deb/vCardStudio.desktop $(ROOT)/usr/share/applications

  • trunk/Install/snap/snapcraft.yaml

    r65 r66  
    3737      install -m 755 Languages/UFormAbout.po $ROOT/usr/share/vCardStudio/Languages
    3838      install -m 755 Languages/UFormAbout.cs.po $ROOT/usr/share/vCardStudio/Languages
     39      install -d -m 755 $ROOT/usr/share/vCardStudio/Images
     40      install -m 755 Images/Profile.png $ROOT/usr/share/vCardStudio/Images
    3941      install -d -m 755 $ROOT/usr/share/applications
    4042      install -m 755 Install/snap/local/vCardStudio.desktop $ROOT/usr/share/applications

  • trunk/Languages/vCardStudio.cs.po

    r62 r66  
    980980msgstr "Soubor vCard"
    981981
     982#: ucontact.sversion
     983msgid "Version"
     984msgstr "Verze"
     985
    982986#: ucontact.svoipphone
    983987msgid "VoIP phone"

  • trunk/Languages/vCardStudio.po

    r62 r66  
    968968msgstr ""
    969969
     970#: ucontact.sversion
     971msgid "Version"
     972msgstr ""
     973
    970974#: ucontact.svoipphone
    971975msgid "VoIP phone"

  • trunk/UContact.pas

    r63 r66  
    174174  SContactHasNoParent = 'Contact has no parent';
    175175  SExpectedProperty = 'Expected contact property';
     176  SVersion = 'Version';
    176177  SLastName = 'Last Name';
    177178  SFirstName = 'First Name';
    … …  
    978979begin
    979980  with Fields do begin
     981    AddNew('VERSION', [], [], SVersion, cfVersion, dtString);
    980982    AddNew('N', [], [], SLastName, cfLastName, dtString, 0);
    981983    AddNew('N', [], [], SFirstName, cfFirstName, dtString, 1);

  • trunk/UCore.lfm

    r65 r66  
    44  OldCreateOrder = False
    55  Height = 529
    6   HorizontalOffset = 461
    7   VerticalOffset = 359
     6  HorizontalOffset = 669
     7  VerticalOffset = 607
    88  Width = 726
    99  PPI = 144
    … …  
    497497  object ApplicationInfo1: TApplicationInfo
    498498    Identification = 1
    499     VersionMajor = 2
     499    VersionMajor = 1
    500500    VersionMinor = 1
    501501    VersionBugFix = 0
    … …  
    506506    AppName = 'vCard Studio'
    507507    Description = 'vCard files management tool'
    508     ReleaseDate = 44524
     508    ReleaseDate = 44539
    509509    RegistryKey = '\Software\Chronosoft\vCard Studio'
    510510    RegistryRoot = rrKeyCurrentUser

  • trunk/UCore.pas

    r63 r66  
    7474    ProfileImage: TImage;
    7575    LastSplitDir: string;
     76    ProfilePhotoFileName: string;
    7677    procedure FileModified(Sender: TObject);
    7778    function FindFirstNonOption: string;
    … …  
    322323{$IFDEF Linux}
    323324const
    324   LinuxLanguagesDir = '/usr/share/vCardStudio/Languages';
     325  LinuxDataFilesDir = '/usr/share/vCardStudio';
     326  LinuxLanguagesDir = LinuxDataFilesDir + '/Languages';
     327  LinuxImagesDir = LinuxDataFilesDir + '/Images';
    325328{$ENDIF}
    326329begin
     330  ProfilePhotoFileName := 'Images/Profile.png';
    327331  {$IFDEF Linux}
    328332  // If installed in Linux system then use installation directory for po files
    329   if not DirectoryExists(Translator.POFilesFolder) and DirectoryExists(LinuxLanguagesDir) then
     333  if not DirectoryExists(Translator.POFilesFolder) and DirectoryExists(LinuxLanguagesDir) then begin
    330334    Translator.POFilesFolder := LinuxLanguagesDir;
     335  end;
     336  // If installed in Linux system then use installation directory for images files
     337  if not DirectoryExists('Images') and DirectoryExists(LinuxImagesDir) then begin
     338    ProfilePhotoFileName := LinuxImagesDir + DirectorySeparator + 'Profile.png';
     339  end;
    331340  {$ENDIF}
    332341
    … …  
    510519
    511520function TCore.GetProfileImage: TImage;
    512 const
    513   ProfilePhotoFileName = 'Images/Profile.png';
    514521begin
    515522  if not Assigned(ProfileImage) then begin
Note: See TracChangeset for help on using the changeset viewer.