ADD: Patch [2790883] "delete to trash can in linux" from sash0k

This commit is contained in:
Alexander Koblov 2009-05-13 19:46:48 +00:00
commit f83cd606f9
16 changed files with 1830 additions and 1716 deletions

View file

@ -819,12 +819,12 @@ msgstr "Дата до:"
msgid "Day(s)"
msgstr "Ден/ дни"
#, fuzzy
#: TFRMFINDDLG.CBDIRECTORY.CAPTION
msgctxt "TFRMFINDDLG.CBDIRECTORY.CAPTION"
msgid "Directory"
msgstr ""
#, fuzzy
#: TFRMFINDDLG.CBFILESIZEFROM.CAPTION
msgid "File Size From:"
msgstr "Размер от:"
@ -907,6 +907,7 @@ msgstr "Добре"
msgid "Use '-' to off attribute and '?' to any"
msgstr ""
#, fuzzy
#: TFRMFINDDLG.GBFINDDATA.CAPTION
msgid "Find Data"
msgstr "Търсене на данни"
@ -916,7 +917,6 @@ msgstr "Търсене на данни"
msgid "Current"
msgstr "Текущ"
#, fuzzy
#: TFRMFINDDLG.LBLENCODING.CAPTION
msgctxt "TFRMFINDDLG.LBLENCODING.CAPTION"
msgid "Encoding:"
@ -3013,10 +3013,18 @@ msgstr "Презаписване на избрания „%s“?"
msgid "Delete %d selected files/directories?"
msgstr "Изтриване на %d избраните папки/файлове?"
#: ulng.rsmsgdelfldrt
msgid "Delete %d selected files/directories into trash can?"
msgstr ""
#: ulng.rsmsgdelsel
msgid "Delete selected \"%s\"?"
msgstr "Изтриване на избрания \"%s\"?"
#: ulng.rsmsgdelselt
msgid "Delete selected \"%s\" into trash can?"
msgstr ""
#: ulng.rsmsgdisknotavail
msgid "Disk is not available"
msgstr "Дискът не е на разположение"

View file

@ -819,12 +819,12 @@ msgstr "结束日期:"
msgid "Day(s)"
msgstr "天"
#, fuzzy
#: TFRMFINDDLG.CBDIRECTORY.CAPTION
msgctxt "TFRMFINDDLG.CBDIRECTORY.CAPTION"
msgid "Directory"
msgstr ""
#, fuzzy
#: TFRMFINDDLG.CBFILESIZEFROM.CAPTION
msgid "File Size From:"
msgstr "最小:"
@ -907,6 +907,7 @@ msgstr "确定"
msgid "Use '-' to off attribute and '?' to any"
msgstr ""
#, fuzzy
#: TFRMFINDDLG.GBFINDDATA.CAPTION
msgid "Find Data"
msgstr "查找数据"
@ -916,7 +917,6 @@ msgstr "查找数据"
msgid "Current"
msgstr "当前"
#, fuzzy
#: TFRMFINDDLG.LBLENCODING.CAPTION
msgctxt "TFRMFINDDLG.LBLENCODING.CAPTION"
msgid "Encoding:"
@ -3013,10 +3013,18 @@ msgstr "复制选中的 \"%s\" 吗?"
msgid "Delete %d selected files/directories?"
msgstr "删除 %d 选中的文件/目录吗?"
#: ulng.rsmsgdelfldrt
msgid "Delete %d selected files/directories into trash can?"
msgstr ""
#: ulng.rsmsgdelsel
msgid "Delete selected \"%s\"?"
msgstr "删除选中的 \"%s\"?"
#: ulng.rsmsgdelselt
msgid "Delete selected \"%s\" into trash can?"
msgstr ""
#: ulng.rsmsgdisknotavail
msgid "Disk is not available"
msgstr "无效的磁盘"

View file

@ -1,3 +1,4 @@
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: Double Commander 0.3 alpha\n"
@ -13,16 +14,15 @@ msgstr ""
"X-Poedit-Country: CZECH REPUBLIC\n"
"X-Poedit-Bookmarks: -1,-1,-1,-1,-1,-1,-1,444,-1,-1\n"
#, fuzzy
#: TFCOLUMNSSETCONF.BTNALLTEXT.CAPTION
msgid "All"
msgstr "Vše"
#, fuzzy
#: TFCOLUMNSSETCONF.BTNNEXT.CAPTION
msgid "->"
msgstr "->"
#, fuzzy
#: TFCOLUMNSSETCONF.BTNPREV.CAPTION
msgid "<-"
msgstr "<-"
@ -102,6 +102,7 @@ msgctxt "TFRMABOUT.LBLTITLE.CAPTION"
msgid "Double Commander"
msgstr "Double Commander"
#, fuzzy
#: TFRMABOUT.LBLVERSION.CAPTION
msgid "Version %s"
msgstr "Verze %s"
@ -127,7 +128,6 @@ msgstr "frmColumsProps"
msgid "ComboBox1"
msgstr "ComboBox1"
#, fuzzy
#: TFRMCOLUMSPROPS.GBOX1.CAPTION
msgid "Gbox1"
msgstr "Gbox1"
@ -399,11 +399,11 @@ msgstr "&Podtržené"
msgid "Predefined"
msgstr "Předvoleno"
#, fuzzy
#: TFRMEDITORCONF.LBSAMPLE.CAPTION
msgid "Sample"
msgstr "Ukázka"
#, fuzzy
#: TFRMEDITSEARCHREPLACE.BTNCANCEL.CAPTION
msgctxt "TFRMEDITSEARCHREPLACE.BTNCANCEL.CAPTION"
msgid "Cancel"
@ -592,11 +592,11 @@ msgctxt "TFRMFILEASSOC.MIEDIT.CAPTION"
msgid "Edit"
msgstr "Edit"
#, fuzzy
#: TFRMFILEASSOC.MIEDITOR.CAPTION
msgid "Open in Editor"
msgstr "Otevřít v editoru"
#, fuzzy
#: TFRMFILEASSOC.MIFILENAME.CAPTION
msgctxt "TFRMFILEASSOC.MIFILENAME.CAPTION"
msgid "File name"
@ -606,11 +606,11 @@ msgstr "Název souboru"
msgid "File path"
msgstr "Cesta k souboru"
#, fuzzy
#: TFRMFILEASSOC.MIFULLPATH.CAPTION
msgid "Full path"
msgstr "Úplná cesta"
#, fuzzy
#: TFRMFILEASSOC.MIGETOUTPUTFROMCOMMAND.CAPTION
msgid "Get output from command"
msgstr "Získat výstup příkazu"
@ -831,12 +831,12 @@ msgstr "Datum do:"
msgid "Day(s)"
msgstr "Dnů(í)"
#, fuzzy
#: TFRMFINDDLG.CBDIRECTORY.CAPTION
msgctxt "TFRMFINDDLG.CBDIRECTORY.CAPTION"
msgid "Directory"
msgstr ""
#, fuzzy
#: TFRMFINDDLG.CBFILESIZEFROM.CAPTION
msgid "File Size From:"
msgstr "Velikost od:"
@ -919,6 +919,7 @@ msgstr "OK"
msgid "Use '-' to off attribute and '?' to any"
msgstr ""
#, fuzzy
#: TFRMFINDDLG.GBFINDDATA.CAPTION
msgid "Find Data"
msgstr "Hledat data"
@ -928,7 +929,6 @@ msgstr "Hledat data"
msgid "Current"
msgstr "Aktuální"
#, fuzzy
#: TFRMFINDDLG.LBLENCODING.CAPTION
msgctxt "TFRMFINDDLG.LBLENCODING.CAPTION"
msgid "Encoding:"
@ -966,11 +966,11 @@ msgstr ""
msgid "Show In Viewer"
msgstr "Zobrazit v prohlížeči"
#, fuzzy
#: TFRMFINDDLG.TSADVANCED.CAPTION
msgid "Advanced"
msgstr "Rozžířené"
#, fuzzy
#: TFRMFINDDLG.TSLOADSAVE.CAPTION
msgid "Load/Save"
msgstr ""
@ -1336,11 +1336,11 @@ msgstr "Uzamčít záložku"
msgid "Transfer dir under cursor to left window"
msgstr "Přenést adresář pod kursorem do levého okna"
#, fuzzy
#: TFRMMAIN.ACTTRANSFERRIGHT.CAPTION
msgid "Transfer dir under cursor to right window"
msgstr "Přenést adresář pod kursorem do pravého okna"
#, fuzzy
#: TFRMMAIN.ACTUNMARKCURRENTEXTENSION.CAPTION
msgid "Unselect all with same extension"
msgstr "Zrušit označení všech se stejnou příponou"
@ -1625,11 +1625,11 @@ msgctxt "TFRMMULTIRENAME.BTNOK.CAPTION"
msgid "OK"
msgstr "OK"
#, fuzzy
#: TFRMMULTIRENAME.BTNRESTORE.CAPTION
msgid "Restore All"
msgstr "Obnovit vše"
#, fuzzy
#: TFRMMULTIRENAME.CAPTION
msgid "MultiRename"
msgstr "Hromadné přejmenování"
@ -2373,20 +2373,20 @@ msgstr "Parametr:"
msgid "Run in terminal:"
msgstr "Spustit v terminálu:"
#, fuzzy
#: TFRMOPTIONS.LBLRUNTERM.CAPTION
msgid "Run terminal:"
msgstr "Spustit terminál:"
#, fuzzy
#: TFRMOPTIONS.LBLVIEWERFONT.CAPTION
msgid "Viewer font"
msgstr "Písmo prohlížeče"
#, fuzzy
#: TFRMOPTIONS.LBLWATCHEXCLUDEDRIVES.CAPTION
msgid "No refresh for &these drives:"
msgstr ""
#, fuzzy
#: TFRMOPTIONS.LBLWCXDESCRIPTION.CAPTION
msgid "Packer plugins are used to work with archives."
msgstr "Komprimační zásuvný modul pro práci s archívy."
@ -2631,11 +2631,11 @@ msgctxt "TFRMTWEAKPLUGIN.BTNCANCEL.CAPTION"
msgid "Cancel"
msgstr "Zrušit"
#, fuzzy
#: TFRMTWEAKPLUGIN.BTNCHANGE.CAPTION
msgid "Change"
msgstr "Změnit"
#, fuzzy
#: TFRMTWEAKPLUGIN.BTNDEFAULT.CAPTION
msgid "Default"
msgstr "Výchozí"
@ -2682,11 +2682,11 @@ msgstr "Můžete měnit stávající archívy"
msgid "Archive can contain multiple files"
msgstr "Archiv může obsahovat více souborů"
#, fuzzy
#: TFRMTWEAKPLUGIN.CBPK_CAPS_NEW.CAPTION
msgid "Can create new archives"
msgstr "Můžete vytvářet nové archívy"
#, fuzzy
#: TFRMTWEAKPLUGIN.CBPK_CAPS_OPTIONS.CAPTION
msgid "Supports the options dialogbox"
msgstr "Podporuje dialog s nastavením"
@ -3032,10 +3032,18 @@ msgstr "Kopírovat vybrané \"%s\"?"
msgid "Delete %d selected files/directories?"
msgstr "Vymazat %d vybrané soubory / adresáře?"
#: ulng.rsmsgdelfldrt
msgid "Delete %d selected files/directories into trash can?"
msgstr ""
#: ulng.rsmsgdelsel
msgid "Delete selected \"%s\"?"
msgstr "Vymazat vybrané \"%s\"?"
#: ulng.rsmsgdelselt
msgid "Delete selected \"%s\" into trash can?"
msgstr ""
#: ulng.rsmsgdisknotavail
msgid "Disk is not available"
msgstr "Disk není dostupný"
@ -3116,11 +3124,11 @@ msgstr "Buffer je příliš malý"
msgid "Too many files to pack"
msgstr "Příliš mnoho souborů pro kompresi"
#, fuzzy
#: ulng.rsmsgerrunknownformat
msgid "Archive format unknown"
msgstr "Neznámý formát archívu"
#, fuzzy
#: ulng.rsmsgfilechangedsave
msgid "File %s changed, save?"
msgstr "Soubor %s byl změněn, uložit?"
@ -3373,11 +3381,11 @@ msgctxt "ulng.rsoptquicksearch"
msgid "Quick search"
msgstr "Rychlé hledání"
#, fuzzy
#: ulng.rsopttools
msgid "Tools"
msgstr "Nástroje"
#, fuzzy
#: ulng.rspositionsaved
msgid "Position saved."
msgstr "Pozice uložena."
@ -3386,6 +3394,7 @@ msgstr "Pozice uložena."
msgid "File"
msgstr "Soubor"
#, fuzzy
#: ulng.rspropsfolder
msgctxt "ulng.rspropsfolder"
msgid "Directory"
@ -3396,7 +3405,6 @@ msgstr "Adresář"
msgid "Named pipe"
msgstr "Pojmenované roury"
#, fuzzy
#: ulng.rspropsno
msgid "No"
msgstr "Ne"

View file

@ -811,12 +811,12 @@ msgstr "Vor Datum:"
msgid "Day(s)"
msgstr "Tag(e)"
#, fuzzy
#: TFRMFINDDLG.CBDIRECTORY.CAPTION
msgctxt "TFRMFINDDLG.CBDIRECTORY.CAPTION"
msgid "Directory"
msgstr "Verzeichnis"
#, fuzzy
#: TFRMFINDDLG.CBFILESIZEFROM.CAPTION
msgid "File Size From:"
msgstr "Dateigrösse ab:"
@ -899,6 +899,7 @@ msgstr "OK"
msgid "Use '-' to off attribute and '?' to any"
msgstr "Nutze '-' um Attribut abszuschalten und '?' als Platzhalter"
#, fuzzy
#: TFRMFINDDLG.GBFINDDATA.CAPTION
msgid "Find Data"
msgstr "Suche Daten"
@ -908,7 +909,6 @@ msgstr "Suche Daten"
msgid "Current"
msgstr "Aktuell"
#, fuzzy
#: TFRMFINDDLG.LBLENCODING.CAPTION
msgctxt "TFRMFINDDLG.LBLENCODING.CAPTION"
msgid "Encoding:"
@ -3005,10 +3005,18 @@ msgstr "Markierte \"%s kopieren\"?"
msgid "Delete %d selected files/directories?"
msgstr "Löschen von %d Dateien / Verzeichnissen?"
#: ulng.rsmsgdelfldrt
msgid "Delete %d selected files/directories into trash can?"
msgstr ""
#: ulng.rsmsgdelsel
msgid "Delete selected \"%s\"?"
msgstr "Markierte \"%s löschen\"?"
#: ulng.rsmsgdelselt
msgid "Delete selected \"%s\" into trash can?"
msgstr ""
#: ulng.rsmsgdisknotavail
msgid "Disk is not available"
msgstr "Laufwerk steht nicht zur Verfügung"

View file

@ -819,12 +819,12 @@ msgstr "Fecha final:"
msgid "Day(s)"
msgstr "Día(s)"
#, fuzzy
#: TFRMFINDDLG.CBDIRECTORY.CAPTION
msgctxt "TFRMFINDDLG.CBDIRECTORY.CAPTION"
msgid "Directory"
msgstr ""
#, fuzzy
#: TFRMFINDDLG.CBFILESIZEFROM.CAPTION
msgid "File Size From:"
msgstr "Tamaño desde:"
@ -907,6 +907,7 @@ msgstr "Aceptar"
msgid "Use '-' to off attribute and '?' to any"
msgstr ""
#, fuzzy
#: TFRMFINDDLG.GBFINDDATA.CAPTION
msgid "Find Data"
msgstr "Buscar datos"
@ -916,7 +917,6 @@ msgstr "Buscar datos"
msgid "Current"
msgstr "Actual"
#, fuzzy
#: TFRMFINDDLG.LBLENCODING.CAPTION
msgctxt "TFRMFINDDLG.LBLENCODING.CAPTION"
msgid "Encoding:"
@ -3013,10 +3013,18 @@ msgstr "Copiar el seleccionado \"%s\"?"
msgid "Delete %d selected files/directories?"
msgstr "Borrar %d ficheros/directorios seleccionados?"
#: ulng.rsmsgdelfldrt
msgid "Delete %d selected files/directories into trash can?"
msgstr ""
#: ulng.rsmsgdelsel
msgid "Delete selected \"%s\"?"
msgstr "Borrar el seleccionado \"%s\"?"
#: ulng.rsmsgdelselt
msgid "Delete selected \"%s\" into trash can?"
msgstr ""
#: ulng.rsmsgdisknotavail
msgid "Disk is not available"
msgstr "Disco no disponible"

View file

@ -819,12 +819,12 @@ msgstr "Datum tot:"
msgid "Day(s)"
msgstr "Dag(en)"
#, fuzzy
#: TFRMFINDDLG.CBDIRECTORY.CAPTION
msgctxt "TFRMFINDDLG.CBDIRECTORY.CAPTION"
msgid "Directory"
msgstr ""
#, fuzzy
#: TFRMFINDDLG.CBFILESIZEFROM.CAPTION
msgid "File Size From:"
msgstr "Bestandsgrootte vanaf:"
@ -907,6 +907,7 @@ msgstr "OK"
msgid "Use '-' to off attribute and '?' to any"
msgstr ""
#, fuzzy
#: TFRMFINDDLG.GBFINDDATA.CAPTION
msgid "Find Data"
msgstr "Zoek Data"
@ -916,7 +917,6 @@ msgstr "Zoek Data"
msgid "Current"
msgstr "Huidig"
#, fuzzy
#: TFRMFINDDLG.LBLENCODING.CAPTION
msgctxt "TFRMFINDDLG.LBLENCODING.CAPTION"
msgid "Encoding:"
@ -3013,10 +3013,18 @@ msgstr "Kopiëer geselecteerde \"%s\"?"
msgid "Delete %d selected files/directories?"
msgstr "Verwijder %d geselecteerde bestanden/mappen?"
#: ulng.rsmsgdelfldrt
msgid "Delete %d selected files/directories into trash can?"
msgstr ""
#: ulng.rsmsgdelsel
msgid "Delete selected \"%s\"?"
msgstr "Verwijder geselecteerde \"%s\"?"
#: ulng.rsmsgdelselt
msgid "Delete selected \"%s\" into trash can?"
msgstr ""
#: ulng.rsmsgdisknotavail
msgid "Disk is not available"
msgstr "Disk is niet voorhanden"

View file

@ -3014,10 +3014,18 @@ msgstr ""
msgid "Delete %d selected files/directories?"
msgstr ""
#: ulng.rsmsgdelfldrt
msgid "Delete %d selected files/directories into trash can?"
msgstr ""
#: ulng.rsmsgdelsel
msgid "Delete selected \"%s\"?"
msgstr ""
#: ulng.rsmsgdelselt
msgid "Delete selected \"%s\" into trash can?"
msgstr ""
#: ulng.rsmsgdisknotavail
msgid "Disk is not available"
msgstr ""

View file

@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Double Commander 0.3.5 alpha\n"
"POT-Creation-Date: \n"
"PO-Revision-Date: 2009-05-07 01:31+0300\n"
"PO-Revision-Date: 2009-05-13 23:41+0300\n"
"Last-Translator: Alexander Koblov <Alexx2000@mail.ru>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
@ -3012,10 +3012,18 @@ msgstr "Копировать выделенное \"%s\"?"
msgid "Delete %d selected files/directories?"
msgstr "Удалить %d выбранных файлов/каталогов?"
#: ulng.rsmsgdelfldrt
msgid "Delete %d selected files/directories into trash can?"
msgstr "Удалить %d выбранных файлов/каталогов в корзину?"
#: ulng.rsmsgdelsel
msgid "Delete selected \"%s\"?"
msgstr "Удалить выбранный \"%s\"?"
#: ulng.rsmsgdelselt
msgid "Delete selected \"%s\" into trash can?"
msgstr "Удалить выбранный \"%s\" в корзину?"
#: ulng.rsmsgdisknotavail
msgid "Disk is not available"
msgstr "Диск недоступен"

View file

@ -828,12 +828,12 @@ msgstr "Дата до:"
msgid "Day(s)"
msgstr "День"
#, fuzzy
#: TFRMFINDDLG.CBDIRECTORY.CAPTION
msgctxt "TFRMFINDDLG.CBDIRECTORY.CAPTION"
msgid "Directory"
msgstr ""
#, fuzzy
#: TFRMFINDDLG.CBFILESIZEFROM.CAPTION
msgid "File Size From:"
msgstr "Розмір файла від:"
@ -916,6 +916,7 @@ msgstr "Так"
msgid "Use '-' to off attribute and '?' to any"
msgstr ""
#, fuzzy
#: TFRMFINDDLG.GBFINDDATA.CAPTION
msgid "Find Data"
msgstr "З текстом"
@ -925,7 +926,6 @@ msgstr "З текстом"
msgid "Current"
msgstr "Поточний"
#, fuzzy
#: TFRMFINDDLG.LBLENCODING.CAPTION
msgctxt "TFRMFINDDLG.LBLENCODING.CAPTION"
msgid "Encoding:"
@ -3025,10 +3025,18 @@ msgstr "Копиювати виділене \"%s\"?"
msgid "Delete %d selected files/directories?"
msgstr "Видалити %d вибраних файлів/каталогів?"
#: ulng.rsmsgdelfldrt
msgid "Delete %d selected files/directories into trash can?"
msgstr ""
#: ulng.rsmsgdelsel
msgid "Delete selected \"%s\"?"
msgstr "Видалити вибраний \"%s\"?"
#: ulng.rsmsgdelselt
msgid "Delete selected \"%s\" into trash can?"
msgstr ""
#: ulng.rsmsgdisknotavail
msgid "Disk is not available"
msgstr "Диск не доступний"

View file

@ -1356,14 +1356,13 @@ begin
begin
if ((not edtCommand.Focused) and (edtCommand.Tag = 0)) or (Key = VK_F8) then
begin
if gUseTrash then // 05.05.2009 - флаг из конфигурации. Если корзина включена.
begin
if Shift=[ssShift] then // если шифт - удаляем напрямую
Actions.cm_Delete('')
else
Actions.cm_Delete('recycle'); // без шифта удаляем в корзину
end
else Actions.cm_Delete(''); // если корзина отключена в конфигурации, удалять напрямую.
if gUseTrash {$IFDEF UNIX}and gUseTrashLinux{$ENDIF} then // 12.05.2009 - additional check for linux
begin
if Shift=[ssShift] then // если шифт - удаляем напрямую
Actions.cm_Delete('')
else Actions.cm_Delete('recycle'); // без шифта удаляем в корзину
end
else Actions.cm_Delete(''); // если корзина отключена в конфигурации, удалять напрямую.
Exit;
end;
end;

File diff suppressed because it is too large Load diff

View file

@ -34,6 +34,9 @@ const
_PATH_FSTAB = '/etc/fstab';
_PATH_MOUNTED = '/etc/mtab';
// 12.05.2009 - path to 'gvfs-trash'
_PATH_GVFS_TRASH = '/usr/bin/gvfs-trash';
const
DE_UNKNOWN = 0;
DE_KDE = 1;

View file

@ -1102,6 +1102,8 @@ procedure TActs.cm_Delete(param:string);
var
fl:TFileList;
DT : TDeleteThread;
// 12.05.2009 - if delete to trash, then show another messages
MsgDelSel, MsgDelFlDr : string;
begin
with frmMain do
begin
@ -1118,8 +1120,20 @@ begin
if SelectFileIfNoSelected(GetActiveItem) = False then Exit;
end;
case msgYesNoCancel(GetFileDlgStr(rsMsgDelSel,rsMsgDelFlDr)) of
// 12.05.2009
// Showing delete dialog: to trash or to /dev/null :)
If (param = 'recycle') then
begin
MsgDelSel := rsMsgDelSelT;
MsgDelFlDr := rsMsgDelFlDrT;
end
else
begin
MsgDelSel := rsMsgDelSel;
MsgDelFlDr := rsMsgDelFlDr;
end;
// ------------------------------------------------------
case msgYesNoCancel(GetFileDlgStr(MsgDelSel,MsgDelFlDr)) of
mmrNo:
begin
ActiveFrame.UnMarkAll;

View file

@ -81,7 +81,7 @@ end;
function TDeleteThread.DeleteFile (fr:PFileRecItem):Boolean;
begin
try
If (FRecycle = false) {$IFNDEF MSWINDOWS} or True{$ENDIF} then
If (FRecycle = false) then
begin
if FPS_ISDIR(fr^.iMode) then // directory
begin

View file

@ -155,8 +155,11 @@ var
gWipePassNumber: Integer;
gProcessComments: Boolean;
gShowCopyTabSelectPanel:boolean;
gUseTrash : Boolean = True; // 05.05.2009 - флаг удаления в корзину. По умолчанию включен.
gUseTrash : Boolean = True; // 05.05.2009 - global trash variable. Enabled by default.
{$IFDEF UNIX}
// 12.05.2009 - additional trash variable for linux
gUseTrashLinux : Boolean = False;
{$ENDIF}
gRenameSelOnlyName:boolean;
{ Folder tabs page }
@ -234,7 +237,12 @@ var
implementation
uses
LCLProc, SysUtils, uGlobsPaths, uLng, uShowMsg, uFileProcs, uOSUtils;
LCLProc, SysUtils, uGlobsPaths, uLng, uShowMsg, uFileProcs, uOSUtils
{$IFDEF UNIX}
// 12.05.2009 - for linux path to gvfs-trash
, uMyUnix
{$ENDIF}
;
procedure LoadDefaultHotkeyBindings;
begin
@ -533,9 +541,15 @@ begin
gProcessComments := gIni.ReadBool('Configuration', 'ProcessComments', True);
gRenameSelOnlyName:= gIni.ReadBool('Configuration', 'RenameSelOnlyName', false);
gShowCopyTabSelectPanel:= gIni.ReadBool('Configuration', 'ShowCopyTabSelectPanel', false);
gUseTrash := gIni.ReadBool('Configuration', 'UseTrash', True); // 05.05.2009 - добавил опцию использования корзины в конфиге.
// If gUseTrash then DebugLn('Trash on')
// else DebugLn('Trash off');
gUseTrash := gIni.ReadBool('Configuration', 'UseTrash', True); // 05.05.2009 - read global trash option from configuration file
{$IFDEF UNIX}
// 12.05.2009 - determine trash under linux (gnome, xfce)
gUseTrashLinux := mbFileExists(_PATH_GVFS_TRASH);
// just for test
If gUseTrashLinux then DebugLn('linux trash on')
else DebugLn('linux trash off');
{$ENDIF}
{ Log }
gLogFile := gIni.ReadBool('Configuration', 'LogFile', True);
gLogFileName := gIni.ReadString('Configuration', 'LogFileName', gpIniDir + 'doublecmd.log');

View file

@ -36,6 +36,10 @@ resourcestring
rsMsgNewFile = 'New file';
rsMsgDelFlDr = 'Delete %d selected files/directories?';
rsMsgDelSel = 'Delete selected "%s"?';
// 12.05.2009 - another message, when deleting to trash
rsMsgDelFlDrT = 'Delete %d selected files/directories into trash can?';
rsMsgDelSelT = 'Delete selected "%s" into trash can?';
// ---
rsMsgCpFlDr = 'Copy %d selected files/directories?';
rsMsgCpSel = 'Copy selected "%s"?';
rsMsgRenFlDr = 'Rename/move %d selected files/directories?';