Changeset 0e07e12 in tol for tolbase

Timestamp:

Feb 15, 2012, 11:55:07 PM (15 years ago)

Author:

Jorge Pérez <josp.jorge@…>

Branches:

1941-docker-image-to-test, devel, master

Children:

878425e

Parents:

1efd6f9

Message:

fixes #1432, se implementa una opcion de menu contextual "Escape text" que abre una ventana de dialogo para realizar el escape del texto deseado. Si en el momento de seleccionar esta opción de menú hay un texto seleccionado este se utiliza como texto inicial a escapar. La ventana ofrece un botón para sustituir el texto seleccionado por el texto escapado.

git-svn-id: ​https://www.tol-project.org/svn/tolp/trunk@4145 be4846ae-f051-483a-831f-b64e7d08527f

Location:

tolbase/lib/toltk

Files:

• bystext.tcl (modified) (3 diffs)
• editor.tcl (modified) (2 diffs)
• msgs/es.msg (modified) (2 diffs)
• tolbase.tcl (modified) (2 diffs)

tolbase/lib/toltk/bystext.tcl

@@ -8 +8 @@
 #/////////////////////////////////////////////////////////////////////////////
 # Put if {1} for testing this file.
+
+package require snit
+
 if {0} {
   package require Tk
@@ -19 +22 @@
 }
 
+::snit::widgetadaptor rotext {
+
+  constructor {args} {
+    # Turn off the insert cursor
+    #installhull using text $self -insertwidth 0
+    # DDG the $self gaves an error at least with 0.97 onwards
+    installhull using text -insertwidth 0
+    
+    # Apply an options passed at creation time.
+    $self configurelist $args
+  }
+  
+  # Disable the insert and delete methods, to make this readonly.
+  method insert {args} {}
+  method delete {args} {}
+  
+  # Enable ins and del as synonyms, so the program can insert and
+  # delete.
+  delegate method ins to hull as insert
+  delegate method del to hull as delete
+  
+  # Pass all other methods and options to the real text widget, so
+  # that the remaining behavior is as expected.
+  delegate method * to hull
+  delegate option * to hull
+}
 
 #/////////////////////////////////////////////////////////////////////////////
@@ -793 +822 @@
 }
 
+proc ::BayesText::TolEscape { buffer } {
+  return [ string map [ list \n \\n \t \\t \" \\\" \\ \\\\ ] $buffer ]
+}
+
+proc ::BayesText::DlgEscapeTextApply { editor } {
+  set w .dlgescape
+
+  set idxs [ $editor tag ranges sel ]
+  if { [ llength $idxs ] } {
+    foreach {i0 i1} $idxs break
+    $editor configure -undo 0
+    $editor delete $i0 $i1
+    $editor configure -undo 1
+    set f [ $w getframe ]
+    set buffer [ $f.t get 1.0 "end -1 char" ]
+    set len [ string length $buffer ]
+    $editor insert $i0 $buffer
+    $editor tag add sel $i0 "$i0 + $len char"
+  }
+}
+
+proc ::BayesText::DlgEscapeText { editor } {
+  set w .dlgescape
+  if { [ winfo exists $w ] } {
+    set f [ $w getframe ]
+    raise $w
+    focus $f.o
+  } else {
+    Dialog $w -title [ mc "Escape text" ] \
+        -default 2 -modal none -parent $editor -separator 1
+    $w add -text [ mc "Close" ] -command "destroy $w"
+    $w add -text [ mc "Apply" ]
+    set f [ $w getframe ]
+    label $f.lo -text [ mc "Original:" ]
+    text $f.o -width 40 -height 4
+    label $f.lt -text [ mc "Transformed:" ]
+    rotext $f.t -width 40 -height 4
+    bind $f.o <<Modified>> {
+      if { [ %W edit modified ] == 1 } {
+        set f [ winfo parent %W ]
+        set tt $f.t
+        set buffer [ %W get 1.0 "end -1 char" ]
+        $tt del 1.0 end
+        $tt ins end [ ::BayesText::TolEscape $buffer ]
+        %W edit modified 0
+      }
+    }
+    grid $f.lo -row 0 -column 0 -sticky w
+    grid $f.o -row 1 -column 0 -sticky snew
+    grid $f.lt -row 0 -column 1 -sticky w
+    grid $f.t -row 1 -column 1 -sticky snew
+    foreach c {0 1} {
+      grid columnconfigure $f $c -weight 1
+    }
+    grid rowconfigure $f 1 -weight 1
+    $w draw
+  }
+  $f.o delete 1.0 end
+  set idxs [ $editor tag ranges sel ]
+  if { [ llength $idxs ] } {
+    $f.o insert end [ $editor get [ lindex $idxs 0 ] [ lindex $idxs 1 ] ]
+  }
+  $w itemconfigure 1 -command [ list ::BayesText::DlgEscapeTextApply $editor ]
+}
 
 #/////////////////////////////////////////////////////////////////////////////

tolbase/lib/toltk/editor.tcl

@@ -463 +463 @@
      "savecom"     "CmdSaveCompile" "[mc [list Save and Compile]] (F9)" \
      "decom"       "CmdDecompile"  "[mc Decompile] (F8)" \
-     "syntaxcheck" "CmdSyntaxCheck" "[mc [list Syntax Check]] (F7)" \
+     "syntaxcheck" "CmdSyntaxCheck" "[mc [list Syntax check]] (F7)" \
      "refresh"     "CmdRefresh" "[mc Refresh] (F5)"\
      "balloon"     "CmdBalloon"    "[mc BalloonHelp]" \
@@ -549 +549 @@
                  -command [list ::Editor::CmdSaveAs $this]
   $m add separator
+  $m add command -label [ mc "Escape text" ]... \
+      -command [ list ::BayesText::DlgEscapeText $data(txt) ]
   $m add command -label "[mc Find]..." -accelerator CTRL+F \
                  -command [list ::Editor::CmdFind $this]

tolbase/lib/toltk/msgs/es.msg

@@ -151 +151 @@
 mcset es "Decompile"       "Decompilar"
 mcset es "Show history file"  "Mostrar archivo de histórico"
-mcset es "Syntax Check"       "Chequear sintaxis"
+mcset es "Syntax check"       "Chequear sintaxis"
+mcset es "Escape text"        "Escapar texto"
 mcset es "Delete all"         "Borrar todo"
 mcset es "Delete all the messages of the window of output" \
@@ -758 +759 @@
 mcset es "Save and Compile"  "Guardar y compilar"
 mcset es "Decompile"         "Decompilar"
-mcset es "Syntax Check"      "Chequear sintaxis"
 mcset es "Refresh"           "Refrescar"
 mcset es "Help on line"      "Ayuda"

tolbase/lib/toltk/tolbase.tcl

@@ -304 +304 @@
   $m insert 0 command -label [mc Refresh]   -accelerator F5\
      -command [list ::BayesText::Refresh $w_eval]
-  $m insert 0 command -label [mc "Syntax Check"] -accelerator F7 \
+  $m insert 0 command -label [mc "Syntax check"] -accelerator F7 \
      -command [list ::BayesText::TolSyntaxCheck $w_eval]
   $m insert 0 command -label [mc Decompile] -accelerator F8\
@@ -315 +315 @@
   $m insert 0 command -label [mc "Delete all"] \
      -command [list ::BayesText::DeleteAll $w_eval]
+  $m add command -label [ mc "Escape text" ]... \
+      -command [ list ::BayesText::DlgEscapeText $w_eval ]
+
   bind $w_eval <F9> "::TolConsole::Compile ; break"
   bind $w_eval <F8> "::TolConsole::ClearConsole ; break"