Skip to content

Commit

Permalink
v1.0.5a6
Browse files Browse the repository at this point in the history
  • Loading branch information
aplsimple committed Oct 13, 2021
1 parent 8beac47 commit 5d731c9
Show file tree
Hide file tree
Showing 49 changed files with 483 additions and 307 deletions.
30 changes: 28 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,36 @@
# LAST CHANGES:


Version `1.0.4 (29 Sep'21)`
Version `1.0.5 (30 Oct'21)`

- TODO : save unit's position at any switching to another unit/file
- TODO : BUGFIX: demo 2.Units: favorites not passed to new project - FIX the demo
- TODO : NEW : basic .md highlighting: lists, titles, quotes
- TODO : NEW : more integrated with tclkits
- TODO : CHANGE: save unit's position at any switching to another unit/file
(except for navigating inside a text, but including mouse clicks)
- TODO : CHANGE: revise help & doc

- BUGFIX: demo 1.Start ~01:10 : 'All #1 1-0' in tip of 'Row', if 'No name'
- BUGFIX: demo 3.Project ~10:00 : not see for a current proc
- BUGFIX: switching (popup menu) from file to unit tree if the latter is one line
- BUGFIX: no updating icons at "Replace all in session"
- BUGFIX: no updating file tree at opening files from 'File / Open'
- BUGFIX: pressing Enter if current & next lines begin with *, -, #
- BUGFIX: false movings in the tree (no Ctrl+click, just click & move)
- BUGFIX: false saving modified files at "Tcl/Tk help"
- NEW : "Rename file" from the tree
- NEW : selected units to be added to Favorites (popup menu)
- NEW : "Don't ask again" checkbox at adding to Favorites
- NEW : "Your commands" for Tcl syntax
- CHANGE: faster switching tabs
- CHANGE: faster opening 'Preferences'
- CHANGE: faster opening a file from the file tree
- CHANGE: faster opening 'All Tcl Files' from the file tree
- CHANGE: hl_tcl, apave, e_menu packages


Version `1.0.4 (29 Sep'21)`

- BUGFIX: command autocompletion at 1st column failed
- BUGFIX: e_menu could fail due to font2's multiple words
- BUGFIX: Default buttons of Preferences didn't update colors properly
Expand Down
9 changes: 5 additions & 4 deletions data/help/pref-nbk-f3.txt
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,11 @@
- "Unit lines per 1 red bar" is a number of lines to mark a unit
(proc/method) with 1 red bar in its icon; a fully red icon is bad!

- "Multi-line strings" is strongly recommended be OFF; it's only for
granular (with small source files) projects the ON value could be
a good choice as it can slow your work; use it on your own risk.
- "Multi-line strings" is recommended be OFF for projects with giant
files; it's only for granular (with small source files) projects
the ON value could be a good choice because it can slow your work;
use it on your own risk.

If you don't want to use these defaults, switch the top checkbox off.
While preparing a new project in "Projects" dialogue, you would input
its options in the "Options" tab.
its options in the "Options" tab.
5 changes: 4 additions & 1 deletion data/help/pref-nbk2-f2.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,7 @@
appropriate constructs of Tcl.

Use "Default" button to restore the default colors
for highlighting.
for highlighting.

At need, you can enter your own commands to highlight,
in the text field. They are highlighted as Tk ones.
2 changes: 1 addition & 1 deletion data/help/pref-nbk2-f3.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@
for highlighting.

At need, you can enter your own key words to highlight,
in the text field.
in the text field. They are highlighted as C++ ones.
9 changes: 5 additions & 4 deletions data/help/project.txt
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,11 @@
- "Unit lines per 1 red bar" is a number of lines to mark a unit
(proc/method) with 1 red bar in its icon; a fully red icon is bad!

- "Multi-line strings" is strongly recommended be OFF; it's only for
granular (with small source files) projects the ON value could be
a good choice as it can slow your work; use it on your own risk.
- "Multi-line strings" is recommended be OFF for projects with giant
files; it's only for granular (with small source files) projects
the ON value could be a good choice because it can slow your work;
use it on your own risk.

The buttons under the list are used to add / change / delete a project.
At adding / changing a project, you can choose to include the current
files into it. Other choices are "replace", "clear" and "don't change".
files into it. Other choices are "replace", "clear" and "don't change".
32 changes: 18 additions & 14 deletions data/msgs/ru.msg
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ namespace eval ::alited {
{Change EOL...} {Сменить EOL...}
{Tools} {Снасти}
{Setup} {Опции}
{Help} {Справка}
{Help} {Помощь}
{Yes} {Да}
{No} {Нет}
{Cancel} {Отмена}
Expand Down Expand Up @@ -57,7 +57,7 @@ namespace eval ::alited {
{Look for Word} {Искать слово}
{Run} {Запуск}
{Moving} {Перемещение}
{Help of alited} {Справка alited}
{Help of alited} {Помощь alited}
{Color Picker} {Выбор цвета}
{Date Picker} {Выбор даты}
{Screen Loupe} {Экранная лупа}
Expand All @@ -81,14 +81,14 @@ namespace eval ::alited {
{Line} {№ ст.}
{Lines} {Строки}
"All of \"%f\"" "Всё из \"%f\""
{Not recommended!} {Не рекомендуется!}
"Not recommended for projects\nwith large files (>2000 LOC)!" "Не рекомендуется для проектов\nс большими файлами (>2000 строк)!"
{Move Unit Up} {Поднять юнит}
{Move Unit Down} {Опустить юнит}
{Move File Up} {Переместить файл вверх}
{Move File Down} {Переместить файл вниз}
{Only files are moved by alited.} {Только файлы перемещает alited.}
{Lists of Favorites} {Списки избранного}
{Last Visited} {Последние посещения}
{Last Visited} {Последние входы}
{Switch to Unit Tree} {Перейти на список юнитов}
{Switch to File Tree} {Перейти на список файлов}
{Create File} {Создать файл}
Expand All @@ -102,7 +102,7 @@ namespace eval ::alited {
{Contract All} {Свернуть всё}
{Expand All} {Развернуть всё}
"Move %f\nto\n%d\n?" "Переместить %f\nв\n%d\n?"
{To Last Visited} {На последнее посещение}
{To Last Visited} {На последний вход}
{To Matched Bracket} {На парную скобку}
{Go to Line} {Перейти на строку}
{Line number:} {Номер строки:}
Expand Down Expand Up @@ -136,6 +136,8 @@ namespace eval ::alited {
"File \"%f\" was modified by some application.\n\nCancel your edition and reload the file?" "Файл \"%f\" был изменен другим приложением.\n\nОтменить вашу редакцию и перезагрузить файл?"
"File \"%f\" was deleted by some application.\n\nSave the file?" "Файл \"%f\" был удален другим приложением.\n\nСохранить файл?"
{Tip File Info} {Данные о файлах}
{Rename File} {Переименовать файл}
{Select one file in the tree.} {Выберите один файл в списке.}
}

## ________________________ Templates ________________________ ##
Expand Down Expand Up @@ -225,19 +227,20 @@ namespace eval ::alited {
{Non-favorite files to be:} {Файлы не Избранного должны}
{kept} {остаться}
{closed} {закрыться}
"Doesn't close any tab without favorites\nat choosing the favorites' list" "Не закрывать \"неизбранные\" закладки\nпри выборе списка Избранного"
"Closes all tabs without favorites\nat choosing the favorites' list" "Закрывать \"неизбранные\" закладки\nпри выборе списка Избранного"
"Sets a list of favorites\nthat was active initially." "Восстанавливает список Избранного,\nдействовавший вначале."
"Doesn't close any tab without favorites\nat choosing Favorites' list" "Не закрывать \"неизбранные\" закладки\nпри выборе списка Избранного"
"Closes all tabs without favorites\nat choosing Favorites' list" "Закрывать \"неизбранные\" закладки\nпри выборе списка Избранного"
"Sets a list of Favorites\nthat was active initially." "Восстанавливает список Избранного,\nдействовавший вначале."
{Delete a favorites' list #%n ?} {Удалить список Избранного #%n ?}
{Favorites} {Избранное}
"Add \"%n\" of %f\nto the favorites?" "Добавить \"%n\" файла %f\nв Избранное?"
"Item \"%n\" of %f\nis already in the favorites." "Юнит \"%n\" из %f\nуже есть в Избранном."
"Remove \"%n\" of %f\nfrom the favorites?" "Удалить \"%n\" файла %f\nиз Избранного?"
"Add \"%n\" of %f\nto Favorites?" "Добавить \"%n\" файла %f\nв Избранное?"
"Item \"%n\" of %f\nis already in Favorites." "Юнит \"%n\" из %f\nуже есть в Избранном."
"Remove \"%n\" of %f\nfrom Favorites?" "Удалить \"%n\" файла %f\nиз Избранного?"
"\"%n\" unit of %f\nis not in Favorites." "Юнит \"%n\" файла %f\nотсутствует в Избранном."
{Add to Favorites} {Добавить в Избранное}
{Remove from Favorites} {Удалить из Избранного}
{Remove All} {Удалить всё}
{Remove all of the favorites?} {Удалить всё из Избранного?}
{Remove all of the last visited?} {Удалить всё из Последних посещений?}
{Remove all of Favorites?} {Удалить всё из Избранного?}
{Remove all of the last visited?} {Удалить всё из Последних входов?}
}

## ________________________ Icons of toolbar: tips ________________________ ##
Expand Down Expand Up @@ -360,7 +363,7 @@ namespace eval ::alited {
{Current file} {Текущий файл}
{All files} {Все файлы}
{'Recent Files' length:} {Длина списка 'Недавние файлы':}
{'Last Visited' length:} {Длина списка 'Последние посещения':}
{'Last Visited' length:} {Длина списка 'Последние входы':}
{Maximum of project files:} {Число файлов проекта не более:}
{Confirm exit:} {Подтверждать выход:}
{Save configuration on} {Сохранять конфигурацию при}
Expand Down Expand Up @@ -419,6 +422,7 @@ namespace eval ::alited {
{Color of return/goto:} {Цвет return/goto:}
{Color of your key words:} {Цвет ваших ключевых слов:}
{Colors} {Цвета}
{Your commands:} {Ваши команды:}
{Your key words:} {Ваши ключевые слова:}
}

Expand Down
2 changes: 1 addition & 1 deletion doc/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -470,7 +470,7 @@ <h2 id="units">Units</h3>
</p>

<p>
The <em>Last Visited</em> list is a comrade of the favorites. It allows fast access to the last visited units. The <em>last visits</em> are registered at clicking units in the unit tree or at clicking found lines in the info listbox.
The <em>Last Visited</em> list is a comrade of Favorites. It allows fast access to the last visited units. The <em>last visits</em> are registered at clicking units in the unit tree or at clicking found lines in the info listbox.
</p>

<p>
Expand Down
5 changes: 3 additions & 2 deletions lib/e_menu/e_menu.tcl
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
package require Tk

namespace eval ::em {
variable em_version "e_menu 3.4.5b10"
variable em_version "e_menu 3.4.5.3"
variable solo [expr {[info exist ::em::executable] || ( \
[info exist ::argv0] && [file normalize $::argv0] eq [file normalize [info script]])} ? 1 : 0]
variable Argv0
Expand Down Expand Up @@ -625,7 +625,8 @@ proc ::em::checkForShell {rsel} {
set res yes
}
if {[string first "tclsh " $sel]==0 || [string first "wish " $sel]==0} {
set sel [append _ [Tclexe] [string range $sel [string first { } $sel] end]]
set tclexe [string map {wish.exe tclsh.exe} [Tclexe]]
set sel [append _ $tclexe [string range $sel [string first { } $sel] end]]
}
return $res
}
Expand Down
26 changes: 18 additions & 8 deletions lib/e_menu/src/apave.tcl
Original file line number Diff line number Diff line change
Expand Up @@ -1643,8 +1643,8 @@ oo::class create ::apave::APave {
} else {
set dn [file dirname $fn]
set fn [file tail $fn]
set args [::apave::removeOptions $args -initialdir]
}
set dn [::apave::extractOptions args -initialdir $dn]
set args "-initialfile \"$fn\" -initialdir \"$dn\" $parent $args"
incr isfilename
} elseif {$nchooser eq "tk_chooseDirectory"} {
Expand Down Expand Up @@ -2828,7 +2828,7 @@ oo::class create ::apave::APave {
if {[string index $st1 0] in [list \t { }]} {
# if space(s) are at the right, remove them at cutting
set n1 [my leadingSpaces $st1]
$w delete [$w index $idx1] [$w index "$idx1 +$n1 char"]
$w delete $idx1 [$w index "$idx1 +$n1 char"]
} elseif {$ch2 eq "\{" && $st1 eq {}} {
# indent + closing brace
if {$st2 eq {}} {
Expand All @@ -2846,11 +2846,13 @@ oo::class create ::apave::APave {
set nchars [my leadingSpaces $st2]
set indent [string range $st2 0 [expr {$nchars-1}]]
}
if {$islist} {
if {$islist && ![string match *.0 $idx1] && \
[string trim [$w get "$idx1 linestart" $idx1]] ne {}} {
# a new line supplied with "list-like pattern"
set indent "$indent$ch1"
incr nchars 2
}
$w insert [$w index $idx1] \n$indent
$w insert $idx1 \n$indent
::tk::TextSetCursor $w [$w index "$idx2 linestart +$nchars char"]
return -code break
}
Expand Down Expand Up @@ -3158,9 +3160,10 @@ oo::class create ::apave::APave {
set lst1 [lindex $lwidgets $i]
if {[my Replace_Tcl i lwlen lwidgets {*}$lst1] ne ""} {incr i}
}
set lwlen [llength $lwidgets]
# firstly, normalize all names that are "subwidgets": .lab instead fra.lab etc
for {set i $lwlen} {$i} {incr i -1} {
set i [set lwlen [llength $lwidgets]]
while {$i>1} {
incr i -1
set lst1 [lindex $lwidgets $i]
lassign $lst1 name neighbor
lassign [my NormalizeName name i lwidgets] name wname
Expand Down Expand Up @@ -3385,8 +3388,15 @@ oo::class create ::apave::APave {
if {[set ontop [::apave::getOption -ontop {*}$args]] eq {}} {
set ontop no
catch {
set wpar [winfo parent $win]
set ontop [wm attributes $wpar -topmost]
set ontop [wm attributes [winfo parent $win] -topmost]
}
if {!$ontop} {
# find if a window child of "." is topmost
# if so, let this one be topmost too
foreach w [winfo children .] {
catch {set ontop [wm attributes $w -topmost]}
if {$ontop} break
}
}
}
if {[set modal [::apave::getOption -modal {*}$args]] eq {}} {
Expand Down
2 changes: 1 addition & 1 deletion lib/e_menu/src/apaveinput.tcl
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@

package require Tk

package provide apave 3.4.5b10
package provide apave 3.4.5.4

source [file join [file dirname [info script]] apavedialog.tcl]

Expand Down
Loading

0 comments on commit 5d731c9

Please sign in to comment.