mirrors/doublecmd
2
0
Fork 0
mirror of https://github.com/doublecmd/doublecmd.git synced 2026-06-21 09:58:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

FIX: Bug [0000862] "empty zip.ini"

Browse source
This commit is contained in:
Alexander Koblov 2014-04-19 18:42:54 +00:00
commit 18247cccf5
2 changed files with 40 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

71
plugins/wcx/zip/src/ZipConfDlg.lfm
View file

@ -13,23 +13,23 @@ object DialogBox: TDialogBox
ClientWidth = 424
OnShow = DialogBoxShow
Position = poScreenCenter
LCLVersion = '0.9.31'
LCLVersion = '1.1'
object lblAbout: TLabel
Left = 6
Height = 109
Height = 115
Top = 6
Width = 412
Align = alClient
Anchors = [akTop, akLeft, akRight]
BorderSpacing.Top = 6
Caption = 'Zip plugin supports PKZIP-compatible, TAR, GZip and BZip2 data compression and archiving.'#13#10#13#10'Copyright (C) 2006-2012 Alexander Koblov (alexx2000@mail.ru)'
Caption = 'Zip plugin supports PKZIP-compatible, TAR, GZip and BZip2 data compression and archiving.'#13#10#13#10'Copyright (C) 2006-2014 Alexander Koblov (alexx2000@mail.ru)'
ParentColor = False
WordWrap = True
end
object gbCompression: TGroupBox
Left = 6
Height = 158
Top = 135
Height = 152
Top = 141
Width = 412
Align = alBottom
AutoSize = True
@ -37,16 +37,16 @@ object DialogBox: TDialogBox
Caption = 'Compression'
ChildSizing.LeftRightSpacing = 6
ChildSizing.TopBottomSpacing = 6
ClientHeight = 140
ClientHeight = 134
ClientWidth = 408
TabOrder = 0
object lblCompressionMethodToUse: TLabel
AnchorSideLeft.Control = gbCompression
AnchorSideTop.Control = gbCompression
Left = 6
Height = 16
Height = 13
Top = 6
Width = 154
Width = 137
Caption = 'Compression method to use:'
ParentColor = False
end
@ -55,9 +55,9 @@ object DialogBox: TDialogBox
AnchorSideTop.Control = lblCompressionMethodToUse
AnchorSideTop.Side = asrBottom
Left = 6
Height = 16
Top = 40
Width = 90
Height = 13
Top = 37
Width = 80
BorderSpacing.Top = 18
Caption = 'Deflation option:'
ParentColor = False
@ -67,13 +67,16 @@ object DialogBox: TDialogBox
AnchorSideLeft.Side = asrBottom
AnchorSideTop.Control = lblCompressionMethodToUse
AnchorSideTop.Side = asrCenter
Left = 172
Height = 23
Top = 3
Width = 156
AnchorSideRight.Control = gbCompression
AnchorSideRight.Side = asrBottom
Left = 155
Height = 21
Top = 2
Width = 247
Anchors = [akTop, akLeft, akRight]
BorderSpacing.Left = 12
BorderSpacing.Right = 6
ItemHeight = 15
ItemHeight = 13
ItemIndex = 2
Items.Strings = (
'smStored'
@ -91,12 +94,12 @@ object DialogBox: TDialogBox
AnchorSideTop.Side = asrCenter
AnchorSideRight.Control = cbCompressionMethodToUse
AnchorSideRight.Side = asrBottom
Left = 172
Height = 23
Top = 37
Width = 156
Left = 155
Height = 21
Top = 33
Width = 247
Anchors = [akTop, akLeft, akRight]
ItemHeight = 15
ItemHeight = 13
ItemIndex = 0
Items.Strings = (
'doNormal'
@ -113,10 +116,10 @@ object DialogBox: TDialogBox
AnchorSideTop.Control = btnCancel
AnchorSideTop.Side = asrCenter
AnchorSideRight.Control = btnCancel
Left = 216
Height = 25
Top = 109
Width = 42
Left = 296
Height = 23
Top = 105
Width = 40
Anchors = [akTop, akRight]
AutoSize = True
BorderSpacing.Right = 8
@ -129,10 +132,10 @@ object DialogBox: TDialogBox
AnchorSideTop.Side = asrBottom
AnchorSideRight.Control = cbDeflationOption
AnchorSideRight.Side = asrBottom
Left = 266
Height = 25
Top = 109
Width = 62
Left = 344
Height = 23
Top = 105
Width = 58
Anchors = [akTop, akRight]
AutoSize = True
BorderSpacing.Top = 24
@ -147,12 +150,12 @@ object DialogBox: TDialogBox
AnchorSideRight.Control = cbDeflationOption
AnchorSideRight.Side = asrBottom
Left = 6
Height = 19
Top = 66
Width = 322
Height = 17
Top = 64
Width = 396
Anchors = [akTop, akLeft, akRight]
BorderSpacing.Top = 6
Caption = 'Open *.tar.xxx archives at one step (slowly for big archives)'
BorderSpacing.Top = 10
Caption = 'Open *.tar.xxx archives at one step (slowly with big archives)'
TabOrder = 2
end
end

6
plugins/wcx/zip/src/ZipConfDlg.pas
View file

@ -3,7 +3,7 @@
-------------------------------------------------------------------------
WCX plugin for working with *.zip, *.gz, *.bz2, *.tar, *.tgz, *.tbz archives
Copyright (C) 2008-2013 Alexander Koblov (alexx2000@mail.ru)
Copyright (C) 2008-2014 Alexander Koblov (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
@ -143,8 +143,8 @@ var
begin
gIni:= TIniFileEx.Create(gStartupInfo.PluginConfDir + IniFileName);
try
gCompressionMethodToUse:= TAbZipSupportedMethod(gIni.ReadInteger('Configuration', 'CompressionMethodToUse', 2));
gDeflationOption:= TAbZipDeflationOption(gIni.ReadInteger('Configuration', 'DeflationOption', 0));
gCompressionMethodToUse:= TAbZipSupportedMethod(gIni.ReadInteger('Configuration', 'CompressionMethodToUse', Integer(AbDefCompressionMethodToUse)));
gDeflationOption:= TAbZipDeflationOption(gIni.ReadInteger('Configuration', 'DeflationOption', Integer(AbDefDeflationOption)));
gTarAutoHandle:= gIni.ReadBool('Configuration', 'TarAutoHandle', True);
finally
gIni.Free;