mirrors/doublecmd
2
0
Fork 0
mirror of https://github.com/doublecmd/doublecmd.git synced 2026-06-28 10:02:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

FIX: Bug [3149413] "Linux QT4 version not using proper icon theme"

Browse source
This commit is contained in:
Alexander Koblov 2011-01-02 11:14:19 +00:00
commit 68e317686e
2 changed files with 32 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/platform/unix/umyunix.pas
View file

@ -43,6 +43,7 @@ const
DE_KDE = 1;
DE_GNOME = 2;
DE_XFCE = 3;
DE_LXDE = 4;
type
PIOFILE = Pointer;
@ -213,6 +214,8 @@ begin
Exit(DE_KDE);
if GetEnvironmentVariable('GNOME_DESKTOP_SESSION_ID') <> '' then
Exit(DE_GNOME);
if GetEnvironmentVariable('_LXSESSION_PID') <> '' then
Exit(DE_LXDE);
DesktopSession:= GetEnvironmentVariable('DESKTOP_SESSION');
DesktopSession:= LowerCase(DesktopSession);
if Pos('kde', DesktopSession) <> 0 then
@ -221,6 +224,8 @@ begin
Exit(DE_GNOME);
if Pos('xfce', DesktopSession) <> 0 then
Exit(DE_XFCE);
if Pos('lxde', DesktopSession) <> 0 then
Exit(DE_LXDE);
end;
function FileIsLinkToFolder(const FileName: UTF8String; out LinkTarget: UTF8String): Boolean;

30
src/platform/unix/uunixicontheme.pas
View file

@ -3,7 +3,7 @@
-------------------------------------------------------------------------
Some useful functions for Icon Theme implementation
Copyright (C) 2009 Koblov Alexander (Alexx2000@mail.ru)
Copyright (C) 2009-2010 Koblov Alexander (Alexx2000@mail.ru)
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@ -49,10 +49,9 @@ const
var
kdeConfig: array[1..2] of String = (kde4Config, kde3Config);
I: Integer;
iniCfg: TIniFile;
iniCfg: TIniFile = nil;
begin
Result:= EmptyStr;
iniCfg:= nil;
for I:= Low(kdeConfig) to High(kdeConfig) do
if (Result = EmptyStr) and FileExists(GetHomeDir + kdeConfig[I]) then
try
@ -133,6 +132,29 @@ begin
end;
end;
function GetLxdeIconTheme: String;
const
lxdeConfig: String = '/.config/lxsession/%s/desktop.conf';
var
DesktopSession: String;
iniCfg: TIniFile = nil;
begin
Result:= EmptyStr;
DesktopSession:= GetEnvironmentVariable('DESKTOP_SESSION');
if Length(DesktopSession) <> 0 then
begin
DesktopSession:= GetHomeDir + Format(lxdeConfig, [DesktopSession]);
if FileExists(DesktopSession) then
try
iniCfg:= TIniFile.Create(DesktopSession);
Result:= iniCfg.ReadString('GTK', 'sNet/IconThemeName', EmptyStr);
finally
if Assigned(iniCfg) then
iniCfg.Free;
end;
end;
end;
function GetCurrentIconTheme: String;
begin
Result:= EmptyStr;
@ -145,6 +167,8 @@ begin
Result:= GetGnomeIconTheme;
DE_XFCE:
Result:= GetXfceIconTheme;
DE_LXDE:
Result:= GetLxdeIconTheme;
end;
if Result = EmptyStr then
Result:= DEFAULT_THEME_NAME;