LazReport, check that we are under a KDE session before to handle KDE locale specifics

git-svn-id: trunk@19225 -
This commit is contained in:
jesus 2009-04-05 00:36:04 +00:00
parent 7ee15b0d8e
commit c9a334c974
3 changed files with 14 additions and 7 deletions

View File

@ -27,7 +27,7 @@ Lazarus Port: Olivier Guilbaud, Jesus Reyes A.
See license.txt and license-lazreport.txt for details.
"/>
<Version Minor="9" Release="5"/>
<Files Count="54">
<Files Count="55">
<Item1>
<Filename Value="lr_class.pas"/>
<UnitName Value="LR_Class"/>
@ -245,6 +245,10 @@ See license.txt and license-lazreport.txt for details.
<Filename Value="lr_iflds.pas"/>
<UnitName Value="LR_IFlds"/>
</Item54>
<Item55>
<Filename Value="sysutilsadds.pas"/>
<UnitName Value="SysUtilsAdds"/>
</Item55>
</Files>
<i18n>
<EnableI18N Value="True"/>

View File

@ -10,7 +10,8 @@ uses
LR_Class, LR_Desgn, LR_Register, LR_Flds, LR_DBSet, LR_BarC, LR_BndEd,
LR_PGrid, LR_View, lr_expres, lr_funct_editor_unit, lr_funct_editor_unit1,
LR_Prntr, LR_Edit, LR_Pars, LR_fmted, LR_Const, LR_pgopt, LR_Dopt, LR_GEdit,
LR_Utils, LR_GrpEd, lr_propedit, LR_progr, LR_IFlds, LazarusPackageIntf;
LR_Utils, LR_GrpEd, lr_propedit, LR_progr, LR_IFlds, SysUtilsAdds,
LazarusPackageIntf;
implementation

View File

@ -179,14 +179,16 @@ Var i : Integer;
begin
DFMT := ShortDateFormat; //nl_langinfo(D_FMT)
TFMT := ShortTimeFormat; //nl_langinfo(T_FMT)
TFMTAP := LongTimeFormat; //nl_langinfo(T_FMT_AMPM)
//GNOME: GNOME_DESKTOP_SESSION_ID
//KDE config
if DirectoryExistsUTF8(ExpandFileNameUTF8('~/.kde/share/config')) then
if (GetEnvironmentVariable('KDE_FULL_SESSION')<>'') and
(DirectoryExistsUTF8(ExpandFileNameUTF8('~/.kde/share/config'))) then
begin
DFMT := ShortDateFormat; //nl_langinfo(D_FMT)
TFMT := ShortTimeFormat; //nl_langinfo(T_FMT)
TFMTAP := LongTimeFormat; //nl_langinfo(T_FMT_AMPM)
Lg:=Copy(GetEnvironmentVariableUTF8('LANG'),1,2); //Langue
LstKde:=TStringList.Create;
try