diff -Nru doublecmd-0.9.0/debian/changelog doublecmd-0.9.1/debian/changelog --- doublecmd-0.9.0/debian/changelog 2019-02-13 14:12:00.000000000 +0000 +++ doublecmd-0.9.1/debian/changelog 2019-02-24 07:03:41.000000000 +0000 @@ -1,3 +1,13 @@ +doublecmd (0.9.1-1) unstable; urgency=medium + + * New upstream release + * Update debian/copyright + * Suggest libunrar5 instead of libunrar0 since #720051 is fixed + * Suggest libffmpegthumbnailer4v5 instead of libffmpegthumbnailer4 + * Drop obsolete Breaks/Replaces on doublecmd-*-dbg packages + + -- Graham Inggs Sun, 24 Feb 2019 07:03:41 +0000 + doublecmd (0.9.0-1) unstable; urgency=medium * New upstream release diff -Nru doublecmd-0.9.0/debian/control doublecmd-0.9.1/debian/control --- doublecmd-0.9.0/debian/control 2019-02-13 14:07:00.000000000 +0000 +++ doublecmd-0.9.1/debian/control 2019-02-24 07:02:30.000000000 +0000 @@ -28,17 +28,14 @@ ${shlibs:Depends} Provides: doublecmd Conflicts: doublecmd -Replaces: doublecmd, - doublecmd-gtk-dbg (<< 0.7.1-2~), - doublecmd-qt-dbg (<< 0.7.1-2~) -Breaks: doublecmd-gtk-dbg (<< 0.7.1-2~), doublecmd-qt-dbg (<< 0.7.1-2~) +Replaces: doublecmd Description: twin-panel (commander-style) file manager (GTK2) Double Commander is a cross platform open source file manager with two panels side by side. It is inspired by Total Commander and features some new ideas. . Support for RAR archives can be enabled by installing the - libunrar0 package from non-free. + libunrar5 package from non-free. . This package contains the GTK2 user interface. @@ -50,17 +47,14 @@ ${shlibs:Depends} Provides: doublecmd Conflicts: doublecmd -Replaces: doublecmd, - doublecmd-gtk-dbg (<< 0.7.1-2~), - doublecmd-qt-dbg (<< 0.7.1-2~) -Breaks: doublecmd-gtk-dbg (<< 0.7.1-2~), doublecmd-qt-dbg (<< 0.7.1-2~) +Replaces: doublecmd Description: twin-panel (commander-style) file manager (Qt5) Double Commander is a cross platform open source file manager with two panels side by side. It is inspired by Total Commander and features some new ideas. . Support for RAR archives can be enabled by installing the - libunrar0 package from non-free. + libunrar5 package from non-free. . This package contains the Qt5 user interface. @@ -73,7 +67,7 @@ and features some new ideas. . Support for RAR archives can be enabled by installing the - libunrar0 package from non-free. + libunrar5 package from non-free. . This package contains plugins. @@ -83,8 +77,8 @@ Recommends: doublecmd-gtk | doublecmd-qt Depends: desktop-file-utils, ${misc:Depends} Suggests: doublecmd-help-en | doublecmd-help, - libffmpegthumbnailer4, - libunrar0, + libffmpegthumbnailer4v5, + libunrar5, mplayer, rabbitvcs-core, xterm | x-terminal-emulator @@ -94,6 +88,6 @@ and features some new ideas. . Support for RAR archives can be enabled by installing the - libunrar0 package from non-free. + libunrar-dev package from non-free. . This package contains common files. diff -Nru doublecmd-0.9.0/debian/copyright doublecmd-0.9.1/debian/copyright --- doublecmd-0.9.0/debian/copyright 2019-02-13 12:36:00.000000000 +0000 +++ doublecmd-0.9.1/debian/copyright 2019-02-24 07:02:30.000000000 +0000 @@ -4,7 +4,7 @@ Source: http://doublecmd.sourceforge.net/ Files: * -Copyright: 2006-2017 Alexander Koblov +Copyright: 2006-2019 Alexander Koblov 2008 Dmitry Kolomiets 2009-2013 Przemysław Nagay License: GPL-2.0+ @@ -21,9 +21,9 @@ Copyright: 1999-2002 David Barton License: X11 -Files: components/dcpcrypt/Hashes/Keccak/* +Files: components/dcpcrypt/Hashes/Private/* components/dcpcrypt/Random/isaac.pas -Copyright: 2002-2016 Wolfgang Ehrhardt +Copyright: 2002-2017 Wolfgang Ehrhardt License: Zlib Files: components/multithreadprocs/* @@ -232,7 +232,7 @@ Files: debian/* Copyright: 2010-2013 Alexander Koblov - 2013-2018 Graham Inggs + 2013-2019 Graham Inggs License: GPL-2.0+ License: GPL-2.0+ diff -Nru doublecmd-0.9.0/debian/patches/libunrar5.patch doublecmd-0.9.1/debian/patches/libunrar5.patch --- doublecmd-0.9.0/debian/patches/libunrar5.patch 1970-01-01 00:00:00.000000000 +0000 +++ doublecmd-0.9.1/debian/patches/libunrar5.patch 2019-02-24 07:02:30.000000000 +0000 @@ -0,0 +1,16 @@ +Description: Dynamically load libunrar.so.5 instead of libunrar.so +Forwarded: yes +Author: Graham Inggs +Last-Update: 2019-02-22 + +--- a/plugins/wcx/unrar/src/unrarfunc.pas ++++ b/plugins/wcx/unrar/src/unrarfunc.pas +@@ -41,7 +41,7 @@ + _unrar = 'libunrar.dylib'; + {$ELSEIF DEFINED(UNIX)} + // libunrar must be built with sizeof(wchar_t) = 4 (default on Unix) +- _unrar = 'libunrar.so'; ++ _unrar = 'libunrar.so.5'; + {$ENDIF} + + const diff -Nru doublecmd-0.9.0/debian/patches/series doublecmd-0.9.1/debian/patches/series --- doublecmd-0.9.0/debian/patches/series 2019-02-13 13:09:00.000000000 +0000 +++ doublecmd-0.9.1/debian/patches/series 2019-02-24 07:02:30.000000000 +0000 @@ -1,3 +1,4 @@ x-terminal-emulator.patch hide-build-info.patch disable-splash.patch +libunrar5.patch diff -Nru doublecmd-0.9.0/install/create_packages.bat doublecmd-0.9.1/install/create_packages.bat --- doublecmd-0.9.0/install/create_packages.bat 2018-11-22 14:40:49.000000000 +0000 +++ doublecmd-0.9.1/install/create_packages.bat 2019-02-16 09:03:19.000000000 +0000 @@ -1,6 +1,6 @@ rem Set Double Commander version -set DC_VER=0.9.0 +set DC_VER=0.9.1 rem Path to subversion set SVN_EXE="c:\Program Files\SlikSvn\bin\svn.exe" diff -Nru doublecmd-0.9.0/install/create_packages.mac doublecmd-0.9.1/install/create_packages.mac --- doublecmd-0.9.0/install/create_packages.mac 2017-07-22 12:33:11.000000000 +0000 +++ doublecmd-0.9.1/install/create_packages.mac 2019-02-16 09:03:19.000000000 +0000 @@ -1,7 +1,7 @@ #!/bin/sh # Set Double Commander version -DC_VER=0.9.0 +DC_VER=0.9.1 # The new package will be saved here PACK_DIR=$(pwd)/darwin/release diff -Nru doublecmd-0.9.0/install/create_packages.sh doublecmd-0.9.1/install/create_packages.sh --- doublecmd-0.9.0/install/create_packages.sh 2018-11-22 14:48:09.000000000 +0000 +++ doublecmd-0.9.1/install/create_packages.sh 2019-02-16 09:03:19.000000000 +0000 @@ -1,7 +1,7 @@ #!/bin/sh # Set Double Commander version -DC_VER=0.9.0 +DC_VER=0.9.1 # The new package will be saved here PACK_DIR=$(pwd)/linux/release diff -Nru doublecmd-0.9.0/install/linux/rpm/doublecmd-gtk.spec doublecmd-0.9.1/install/linux/rpm/doublecmd-gtk.spec --- doublecmd-0.9.0/install/linux/rpm/doublecmd-gtk.spec 2018-08-11 12:32:53.000000000 +0000 +++ doublecmd-0.9.1/install/linux/rpm/doublecmd-gtk.spec 2019-02-16 09:03:19.000000000 +0000 @@ -1,6 +1,6 @@ Name: doublecmd-gtk Summary: Twin-panel (commander-style) file manager (GTK2) -Version: 0.9.0 +Version: 0.9.1 Release: 1 URL: http://doublecmd.sourceforge.net Source0: doublecmd_%{version}.orig.tar.gz diff -Nru doublecmd-0.9.0/install/linux/rpm/doublecmd-help.spec doublecmd-0.9.1/install/linux/rpm/doublecmd-help.spec --- doublecmd-0.9.0/install/linux/rpm/doublecmd-help.spec 2017-07-22 12:33:11.000000000 +0000 +++ doublecmd-0.9.1/install/linux/rpm/doublecmd-help.spec 2019-02-16 09:03:19.000000000 +0000 @@ -4,7 +4,7 @@ Name: doublecmd-help-en Summary: Documentation for the Double Commander (English) -Version: 0.9.0 +Version: 0.9.1 Release: 1 Url: http://doublecmd.sourceforge.net/ License: GPL-2+ diff -Nru doublecmd-0.9.0/install/linux/rpm/doublecmd-qt5.spec doublecmd-0.9.1/install/linux/rpm/doublecmd-qt5.spec --- doublecmd-0.9.0/install/linux/rpm/doublecmd-qt5.spec 2017-07-22 12:33:11.000000000 +0000 +++ doublecmd-0.9.1/install/linux/rpm/doublecmd-qt5.spec 2019-02-16 09:03:19.000000000 +0000 @@ -4,7 +4,7 @@ Name: doublecmd-qt5 Summary: Twin-panel (commander-style) file manager (Qt5) -Version: 0.9.0 +Version: 0.9.1 Release: 1 URL: http://doublecmd.sourceforge.net Source0: %{doublecmd}-%{version}.tar.gz diff -Nru doublecmd-0.9.0/install/linux/rpm/doublecmd-qt.spec doublecmd-0.9.1/install/linux/rpm/doublecmd-qt.spec --- doublecmd-0.9.0/install/linux/rpm/doublecmd-qt.spec 2018-08-11 12:32:53.000000000 +0000 +++ doublecmd-0.9.1/install/linux/rpm/doublecmd-qt.spec 2019-02-16 09:03:19.000000000 +0000 @@ -1,6 +1,6 @@ Name: doublecmd-qt Summary: Twin-panel (commander-style) file manager (Qt4) -Version: 0.9.0 +Version: 0.9.1 Release: 1 URL: http://doublecmd.sourceforge.net Source0: doublecmd_%{version}.orig.tar.gz diff -Nru doublecmd-0.9.0/install/linux/update-repo-obs.sh doublecmd-0.9.1/install/linux/update-repo-obs.sh --- doublecmd-0.9.0/install/linux/update-repo-obs.sh 2017-07-22 12:33:11.000000000 +0000 +++ doublecmd-0.9.1/install/linux/update-repo-obs.sh 2019-02-16 09:03:19.000000000 +0000 @@ -3,7 +3,7 @@ # This script updates Double Commander Open Build Service (OBS) repository # Set Double Commander version -DC_VER=0.9.0 +DC_VER=0.9.1 # Temp directory DC_TEMP_DIR=/var/tmp/doublecmd-$(date +%y.%m.%d) diff -Nru doublecmd-0.9.0/install/linux/update-repo-ppa.sh doublecmd-0.9.1/install/linux/update-repo-ppa.sh --- doublecmd-0.9.0/install/linux/update-repo-ppa.sh 2017-12-07 20:12:26.000000000 +0000 +++ doublecmd-0.9.1/install/linux/update-repo-ppa.sh 2019-02-16 09:03:19.000000000 +0000 @@ -3,7 +3,7 @@ # This script updates Double Commander Personal Package Archive (PPA) repository # Set Double Commander version -DC_VER=0.9.0 +DC_VER=0.9.1 # Set Ubuntu series DISTRO=( xenial zesty artful ) diff -Nru doublecmd-0.9.0/install/windows/doublecmd.iss doublecmd-0.9.1/install/windows/doublecmd.iss --- doublecmd-0.9.0/install/windows/doublecmd.iss 2018-11-22 14:43:00.000000000 +0000 +++ doublecmd-0.9.1/install/windows/doublecmd.iss 2019-02-16 09:03:19.000000000 +0000 @@ -3,7 +3,7 @@ [Setup] AppName=Double Commander -AppVerName=Double Commander 0.9.0 beta +AppVerName=Double Commander 0.9.1 beta AppPublisherURL=http://doublecmd.sourceforge.net AppSupportURL=http://doublecmd.sourceforge.net AppUpdatesURL=http://doublecmd.sourceforge.net diff -Nru doublecmd-0.9.0/plugins/wfx/ftp/src/sftp/scpsend.pas doublecmd-0.9.1/plugins/wfx/ftp/src/sftp/scpsend.pas --- doublecmd-0.9.0/plugins/wfx/ftp/src/sftp/scpsend.pas 2018-11-21 15:17:27.000000000 +0000 +++ doublecmd-0.9.1/plugins/wfx/ftp/src/sftp/scpsend.pas 2019-02-15 21:30:26.000000000 +0000 @@ -599,12 +599,13 @@ function TScpSend.RetrieveFile(const FileName: string; FileSize: Int64; Restore: Boolean): Boolean; -var - FBuffer: PByte; - BytesRead: PtrInt; - RetrStream: TFileStreamEx; - TotalBytesToRead: Int64 = 0; - SourceHandle: PLIBSSH2_CHANNEL; +var + FBuffer: PByte; + BytesRead: PtrInt; + BytesToRead: Integer; + RetrStream: TFileStreamEx; + TotalBytesToRead: Int64 = 0; + SourceHandle: PLIBSSH2_CHANNEL; begin RetrStream := TFileStreamEx.Create(FDirectFileName, fmCreate or fmShareDenyWrite); @@ -626,16 +627,20 @@ end; until not ((SourceHandle = nil) and (FLastError = LIBSSH2_ERROR_EAGAIN)); - FBuffer:= GetMem(SMB_BUFFER_SIZE); - TotalBytesToRead:= FileSize - TotalBytesToRead; - try - while TotalBytesToRead > 0 do - begin - repeat - BytesRead := libssh2_channel_read(SourceHandle, PAnsiChar(FBuffer), SMB_BUFFER_SIZE); - if BytesRead = LIBSSH2_ERROR_EAGAIN then begin - DoProgress((FileSize - TotalBytesToRead) * 100 div FileSize); - FSock.CanRead(10); + FBuffer:= GetMem(SMB_BUFFER_SIZE); + TotalBytesToRead:= FileSize - TotalBytesToRead; + try + BytesToRead:= SMB_BUFFER_SIZE; + while TotalBytesToRead > 0 do + begin + if (BytesToRead > TotalBytesToRead) then begin + BytesToRead := TotalBytesToRead; + end; + repeat + BytesRead := libssh2_channel_read(SourceHandle, PAnsiChar(FBuffer), BytesToRead); + if BytesRead = LIBSSH2_ERROR_EAGAIN then begin + DoProgress((FileSize - TotalBytesToRead) * 100 div FileSize); + FSock.CanRead(10); end; until BytesRead <> LIBSSH2_ERROR_EAGAIN; diff -Nru doublecmd-0.9.0/src/doublecmd.lpi doublecmd-0.9.1/src/doublecmd.lpi --- doublecmd-0.9.0/src/doublecmd.lpi 2019-01-26 15:07:43.000000000 +0000 +++ doublecmd-0.9.1/src/doublecmd.lpi 2019-02-16 09:03:19.000000000 +0000 @@ -25,6 +25,7 @@ + diff -Nru doublecmd-0.9.0/src/fattributesedit.pas doublecmd-0.9.1/src/fattributesedit.pas --- doublecmd-0.9.0/src/fattributesedit.pas 2017-07-23 20:05:38.000000000 +0000 +++ doublecmd-0.9.1/src/fattributesedit.pas 2019-02-15 21:30:26.000000000 +0000 @@ -102,6 +102,9 @@ {$R *.lfm} +uses + LCLVersion; + procedure TfrmAttributesEdit.btnOkClick(Sender: TObject); begin if Assigned(FOnOk) then @@ -121,6 +124,10 @@ procedure TfrmAttributesEdit.cbAttrCheckBoxChanged(Sender: TObject); begin +{$if lcl_fullversion = 2000004} + // Workaround: https://bugs.freepascal.org/view.php?id=35018 + if csLoading in TCheckBox(Sender).ComponentState then Exit; +{$endif} // Note: OnChange may work incorrectly with tri-state checkboxes, // so OnClick is also used. UpdateText; @@ -128,6 +135,10 @@ procedure TfrmAttributesEdit.cbAttrCheckBoxClicked(Sender: TObject); begin +{$if lcl_fullversion = 2000004} + // Workaround: https://bugs.freepascal.org/view.php?id=35018 + if csLoading in TCheckBox(Sender).ComponentState then Exit; +{$endif} UpdateText; end; diff -Nru doublecmd-0.9.0/src/filesources/filesystem/ufilesystemutil.pas doublecmd-0.9.1/src/filesources/filesystem/ufilesystemutil.pas --- doublecmd-0.9.0/src/filesources/filesystem/ufilesystemutil.pas 2019-02-03 09:07:06.000000000 +0000 +++ doublecmd-0.9.1/src/filesources/filesystem/ufilesystemutil.pas 2019-02-15 21:30:26.000000000 +0000 @@ -158,6 +158,9 @@ DCBasicTypes, uFileSource, uFileSystemFileSource, uFileProperty, StrUtils, DCDateTimeUtils, uShowMsg, Forms, LazUTF8, uHash; +const + HASH_TYPE = HASH_BLAKE2S; + function ApplyRenameMask(aFile: TFile; NameMask: String; ExtMask: String): String; overload; begin // Only change name for files. @@ -592,7 +595,7 @@ SourceFileStream := nil; TargetFileStream := nil; // for safety exception handling BytesToRead := FBufferSize; - if FVerify then HashInit(Context, HASH_BLAKE2S); + if FVerify then HashInit(Context, HASH_TYPE); try try OpenSourceFile; @@ -778,12 +781,14 @@ CopyAttrResult := mbFileCopyAttr(SourceFile.FullPath, TargetFileName, ACopyAttributesOptions); end; if ACopyTime then - begin + try // Copy time from properties because move operation change time of original folder if not mbFileSetTime(TargetFileName, DateTimeToFileTime(SourceFile.ModificationTime), {$IF DEFINED(MSWINDOWS)}DateTimeToFileTime(SourceFile.CreationTime){$ELSE}0{$ENDIF}, DateTimeToFileTime(SourceFile.LastAccessTime)) then CopyAttrResult += [caoCopyTime]; + except + on E: EDateOutOfRange do CopyAttrResult += [caoCopyTime]; end; if CopyAttrResult <> [] then begin @@ -1573,7 +1578,7 @@ {$PUSH}{$HINTS OFF}{$WARNINGS OFF} Aligned:= Pointer(PtrUInt(Buffer + BytesToRead - 1) and not (BytesToRead - 1)); {$POP} - HashInit(Context, HASH_SHA3_224); + HashInit(Context, HASH_TYPE); try Handle:= mbFileOpen(FileName, fmOpenRead or fmShareDenyWrite or fmOpenSync or fmOpenDirect); diff -Nru doublecmd-0.9.0/src/fileviews/ufileviewwithmainctrl.pas doublecmd-0.9.1/src/fileviews/ufileviewwithmainctrl.pas --- doublecmd-0.9.0/src/fileviews/ufileviewwithmainctrl.pas 2019-02-03 09:07:06.000000000 +0000 +++ doublecmd-0.9.1/src/fileviews/ufileviewwithmainctrl.pas 2019-02-12 18:10:42.000000000 +0000 @@ -1209,7 +1209,7 @@ try if aFile.IsNameValid then ShowRenameFileEdit(aFile) - else + else if gCurDir then ShowPathEdit; finally FreeAndNil(aFile); diff -Nru doublecmd-0.9.0/src/fmain.lfm doublecmd-0.9.1/src/fmain.lfm --- doublecmd-0.9.0/src/fmain.lfm 2019-01-23 19:41:51.000000000 +0000 +++ doublecmd-0.9.1/src/fmain.lfm 2019-02-12 18:10:42.000000000 +0000 @@ -541,6 +541,8 @@ Top = 299 Width = 760 Align = alBottom + Color = clWindow + Font.Color = clWindowText Font.Height = -16 Font.Name = 'courier' Font.Pitch = fpFixed diff -Nru doublecmd-0.9.0/src/fmain.pas doublecmd-0.9.1/src/fmain.pas --- doublecmd-0.9.0/src/fmain.pas 2019-02-07 19:44:32.000000000 +0000 +++ doublecmd-0.9.1/src/fmain.pas 2019-02-15 21:30:26.000000000 +0000 @@ -3971,11 +3971,11 @@ Special := True; case LogMsgType of lmtInfo: - FG := clNavy; + FG := gLogInfoColor; lmtSuccess: - FG := clGreen; + FG := gLogSuccessColor; lmtError: - FG := clRed + FG := gLogErrorColor else FG := clWindowText; end; diff -Nru doublecmd-0.9.0/src/platform/udcversion.pas doublecmd-0.9.1/src/platform/udcversion.pas --- doublecmd-0.9.0/src/platform/udcversion.pas 2019-02-07 19:45:49.000000000 +0000 +++ doublecmd-0.9.1/src/platform/udcversion.pas 2019-02-16 09:03:19.000000000 +0000 @@ -34,7 +34,7 @@ {$I revision.inc} // Lazarus revision number const - dcVersion = '0.9.0 beta'; + dcVersion = '0.9.1 beta'; dcBuildDate = {$I %DATE%}; lazVersion = lcl_version; // Lazarus version (major.minor.micro) lazRevision = RevisionStr; // Lazarus SVN revision diff -Nru doublecmd-0.9.0/src/platform/unix/ukeyfile.pas doublecmd-0.9.1/src/platform/unix/ukeyfile.pas --- doublecmd-0.9.0/src/platform/unix/ukeyfile.pas 2017-11-20 18:24:41.000000000 +0000 +++ doublecmd-0.9.1/src/platform/unix/ukeyfile.pas 2019-02-12 18:10:42.000000000 +0000 @@ -187,14 +187,15 @@ function TKeyFile.ReadStringList(const Section, Ident: String): TDynamicStringArray; var + ALength: gsize; + AIndex: Integer; AValue: PPgchar; - AIndex, ALength: gsize; begin AValue:= g_key_file_get_string_list(FGKeyFile, Pgchar(Section), Pgchar(Ident), @ALength, nil); if Assigned(AValue) then begin SetLength(Result, ALength); - for AIndex:= 0 to Pred(ALength) do + for AIndex:= 0 to Pred(Integer(ALength)) do begin Result[AIndex]:= StrPas(AValue[AIndex]); end; diff -Nru doublecmd-0.9.0/src/platform/uOSUtils.pas doublecmd-0.9.1/src/platform/uOSUtils.pas --- doublecmd-0.9.0/src/platform/uOSUtils.pas 2018-12-24 17:44:40.000000000 +0000 +++ doublecmd-0.9.1/src/platform/uOSUtils.pas 2019-02-16 08:58:13.000000000 +0000 @@ -220,7 +220,9 @@ function GetComputerNetName: String; var - AdministratorPrivileges: Boolean = False; + // While elevated operations is not implemented + // https://doublecmd.sourceforge.io/mantisbt/view.php?id=110 + AdministratorPrivileges: Boolean = True; implementation @@ -1149,11 +1151,4 @@ end; {$ENDIF} -initialization - {$IF DEFINED(UNIX)} - AdministratorPrivileges:= True; // (fpGetUID = 0); temporary while ExecCmdAdmin not implemented - {$ELSE} - AdministratorPrivileges:= IsUserAdmin; - {$ENDIF} - end. diff -Nru doublecmd-0.9.0/src/uadministrator.pas doublecmd-0.9.1/src/uadministrator.pas --- doublecmd-0.9.0/src/uadministrator.pas 2018-05-02 13:54:31.000000000 +0000 +++ doublecmd-0.9.1/src/uadministrator.pas 2019-02-16 08:58:13.000000000 +0000 @@ -121,7 +121,7 @@ ANode := Xml.AddNode(Xml.RootNode, 'FileList'); Xml.SetAttr(ANode, 'Path', Files.Path); - for I:= Index to Files.Count - 1 do + for I:= 0 to Index do begin SubNode := Xml.AddNode(ANode, 'Item'); Xml.SetAttr(SubNode, 'Name', Files[I].FullPath); diff -Nru doublecmd-0.9.0/src/uglobs.pas doublecmd-0.9.1/src/uglobs.pas --- doublecmd-0.9.0/src/uglobs.pas 2019-01-23 19:33:12.000000000 +0000 +++ doublecmd-0.9.1/src/uglobs.pas 2019-02-15 21:30:26.000000000 +0000 @@ -411,6 +411,10 @@ gIndForeColor, // foreColor of use space on drive label gIndBackColor: TColor; // backColor of free space on drive label + gLogInfoColor, + gLogErrorColor, + gLogSuccessColor: TColor; + gShowIcons: TShowIconsMode; gShowIconsNew: TShowIconsMode; gIconOverlays : Boolean; @@ -1559,6 +1563,10 @@ gIndForeColor := clBlack; gIndBackColor := clWhite; + gLogInfoColor:= clNavy; + gLogErrorColor:= clRed; + gLogSuccessColor:= clGreen; + { Layout page } gMainMenu := True; gButtonBar := True; @@ -2406,6 +2414,11 @@ gIndUseGradient := GetValue(Node, 'FreeSpaceIndicator/UseGradient', gIndUseGradient); gIndForeColor := GetValue(Node, 'FreeSpaceIndicator/ForeColor', gIndForeColor); gIndBackColor := GetValue(Node, 'FreeSpaceIndicator/BackColor', gIndBackColor); + + gLogInfoColor:= GetValue(Node, 'LogWindow/Info', gLogInfoColor); + gLogErrorColor:= GetValue(Node, 'LogWindow/Error', gLogErrorColor); + gLogSuccessColor:= GetValue(Node, 'LogWindow/Success', gLogSuccessColor); + gColorExt.Load(gConfig, Node); end; @@ -3036,6 +3049,11 @@ SetValue(Node, 'FreeSpaceIndicator/UseGradient', gIndUseGradient); SetValue(Node, 'FreeSpaceIndicator/ForeColor', gIndForeColor); SetValue(Node, 'FreeSpaceIndicator/BackColor', gIndBackColor); + + SetValue(Node, 'LogWindow/Info', gLogInfoColor); + SetValue(Node, 'LogWindow/Error', gLogErrorColor); + SetValue(Node, 'LogWindow/Success', gLogSuccessColor); + gColorExt.Save(gConfig, Node); { ToolTips page } diff -Nru doublecmd-0.9.0/units/dcrevision.inc doublecmd-0.9.1/units/dcrevision.inc --- doublecmd-0.9.0/units/dcrevision.inc 2019-02-09 10:52:20.000000000 +0000 +++ doublecmd-0.9.1/units/dcrevision.inc 2019-02-16 10:25:51.000000000 +0000 @@ -1,2 +1,2 @@ // Created by Svn2RevisionInc -const dcRevision = '8649'; +const dcRevision = '8664';