From 751b334963bebbf81a5be4f2ee46270182fbb467 Mon Sep 17 00:00:00 2001 From: Sergey Kalinin Date: Tue, 21 Apr 2026 11:22:19 +0300 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B0=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BA=D0=B0=20?= =?UTF-8?q?=D1=81=20=D1=81=D0=BE=D0=B7=D0=B4=D0=B0=D0=BD=D0=B8=D0=B5=D0=BC?= =?UTF-8?q?=20=D0=BD=D0=BE=D0=B2=D0=BE=D0=B3=D0=BE=20=D1=84=D0=B0=D0=B9?= =?UTF-8?q?=D0=BB=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- debian/changelog | 7 +++++++ lib/files.tcl | 5 ++++- projman.tcl | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5837abc..8a358cb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +projman (2.0.0-beta6) stable; urgency=medium + + * Новая сборка + + -- Sergey Kalinin Wed, 15 Apr 2026 17:03:28 +0300 + projman (2.0.0-beta6) stable; urgency=medium * Добавлена логика для работы с troff/groff файлами @@ -550,5 +556,6 @@ projman (2.0.0-alfa0) stable; urgency=medium + diff --git a/lib/files.tcl b/lib/files.tcl index 0569b73..1ec6ecc 100644 --- a/lib/files.tcl +++ b/lib/files.tcl @@ -7,7 +7,6 @@ # Working with files module ###################################################### - namespace eval FileOper { global packages variable types @@ -47,6 +46,9 @@ namespace eval FileOper { proc GetFileMimeType {fileFullPath {opt ""}} { global cfgVariables + if [regexp -nocase -- {untitled} $fileFullPath mattch] { + return text + } # Проверям наличие программы в системе, если есть то добавляем опции # если нет то используем тиклевый пакет if [file exists $cfgVariables(fileTypeCommand)] { @@ -67,6 +69,7 @@ namespace eval FileOper { if [regexp -nocase -- {(\w+)/([\w\-_\.]+); charset=([[:alnum:]-]+)} $pipe m fType fExt fCharset] { DebugPuts "$fType $fExt $fCharset" } + switch $opt { "charset" { if [info exists fCharset] { diff --git a/projman.tcl b/projman.tcl index 9366c76..157f1f8 100755 --- a/projman.tcl +++ b/projman.tcl @@ -10,7 +10,7 @@ exec wish8.6 "$0" -- "$@" ###################################################### # Version: 2.0.0 # Release: beta6 -# Build: 15042026165805 +# Build: 21042026112023 ###################################################### # определим текущую версию, релиз и т.д.