Changeset 09d414b in tol

Timestamp:

Feb 14, 2012, 10:56:46 AM (15 years ago)

Author:

Jorge Pérez <josp.jorge@…>

Branches:

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

Children:

3d8e270

Parents:

2f74496

Message:

fixes #1168, ctrl-i control-u se habilitan en la la ventana eval, también se corrige un error en el término ident, debe ser indent.

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

Location:

tolbase/lib/toltk

Files:

• bystext.tcl (modified) (2 diffs)
• editor.tcl (modified) (8 diffs)
• images/indent.gif (moved) (moved from tolbase/lib/toltk/images/ident.gif)
• images/unindent.gif (moved) (moved from tolbase/lib/toltk/images/unident.gif)
• msgs/es.msg (modified) (2 diffs)
• tolbase.tcl (modified) (3 diffs)
• tolconfig_gui.tcl (modified) (1 diff)

tolbase/lib/toltk/bystext.tcl

@@ -634 +634 @@
 
 #///////////////////////////////////////////////////////////////////////////// 
-proc ::BayesText::Ident {editor chars} {
-#
-# PURPOSE: Ident text
+proc ::BayesText::Indent {editor chars} {
+#
+# PURPOSE: Indent text
 #
 #/////////////////////////////////////////////////////////////////////////////   
@@ -655 +655 @@
 
 #///////////////////////////////////////////////////////////////////////////// 
-proc ::BayesText::UnIdent {editor chars} {
-#
-# PURPOSE: UnIdent text
+proc ::BayesText::UnIndent {editor chars} {
+#
+# PURPOSE: UnIndent text
 #
 #/////////////////////////////////////////////////////////////////////////////   

tolbase/lib/toltk/editor.tcl

@@ -454 +454 @@
      "funsearch"   "CmdSearch"   "[mc {Search function}] (CTRL+G)" \
      "sep4"        "--"          ""\
-     "unident"     "CmdUnIdent"  "[mc Unident] (CTRL+U)" \
-     "ident"       "CmdIdent"    "[mc Ident] (CTRL+I)" \
+     "unindent"     "CmdUnIndent"  "[mc Unindent] (CTRL+U)" \
+     "indent"       "CmdIndent"    "[mc Indent] (CTRL+I)" \
      "sep5"        "--"          ""\
      "bprint"      "CmdPrint"    "[mc Print]" \
@@ -751 +751 @@
     F { ::Editor::CmdFind      $this }
     G { ::Editor::CmdSearch    $this }
-    I { ::Editor::CmdIdent     $this }
+    I { ::Editor::CmdIndent     $this }
     N { ::Editor::CmdNew       $this }
     R { ::Editor::CmdReplace   $this }
     S { ::Editor::CmdSave      $this }
     T { ::Editor::CmdFont      $this }
-    U { ::Editor::CmdUnIdent   $this }
+    U { ::Editor::CmdUnIndent   $this }
     X { ::Editor::CmdCut       $this }
     Y { ::Editor::CmdRedo      $this }
@@ -1354 +1354 @@
 }
 
-proc ::Editor::CmdIdent {this} {
+proc ::Editor::CmdIndent {this} {
   upvar \#0 ${this}::data data
   variable options
-  ::BayesText::Ident $data(txt,ctext) $options(charsIdent)
-}
-
-proc ::Editor::CmdUnIdent {this} {
+  ::BayesText::Indent $data(txt,ctext) $options(charsIndent)
+}
+
+proc ::Editor::CmdUnIndent {this} {
   upvar \#0 ${this}::data data
   variable options
-  ::BayesText::UnIdent $data(txt,ctext) $options(charsIdent)
+  ::BayesText::UnIndent $data(txt,ctext) $options(charsIndent)
 }
 
@@ -1749 +1749 @@
   label $f1.lChars -text [mc characters]
   
-  label $f1.lCharsIdent -text [mc "Characters to ident"]
-  SpinBox $f1.sbCharsIdent -justify right -width 4 \
+  label $f1.lCharsIndent -text [mc "Characters to indent"]
+  SpinBox $f1.sbCharsIndent -justify right -width 4 \
           -editable 0 -range {1 8} \
-          -textvariable ::Editor::tmpOpt(var,charsIdent)
+          -textvariable ::Editor::tmpOpt(var,charsIndent)
 
   frame $f1.f -width 25
@@ -1758 +1758 @@
   grid $f1.f $f1.chEdited     $f1.sbEdited     $f1.lFiles -sticky nw -padx 2
   grid ^     $f1.chLine       $f1.sbLinePos    $f1.lChars -sticky nw -padx 2
-  grid ^     $f1.lCharsIdent  $f1.sbCharsIdent         -sticky nw -padx 2
+  grid ^     $f1.lCharsIndent  $f1.sbCharsIndent         -sticky nw -padx 2
   grid rowconfigure    $f1 2 -weight 1
   grid columnconfigure $f1 3 -weight 1
@@ -1782 +1782 @@
   set tmpOpt(var,chLine)     $options(chLine)
   set tmpOpt(var,posLine)    $options(posLine)
-  set tmpOpt(var,charsIdent) $options(charsIdent)
+  set tmpOpt(var,charsIndent) $options(charsIndent)
 }
 
@@ -1881 +1881 @@
   set options(chLine)     [$rini Editor chLine    1]
   set options(posLine)    [$rini Editor posLine  78]
-  set options(charsIdent) [$rini Editor charsIdent 2]
+  # ticket https://www.tol-project.org/ticket/1168
+  set cindent [$rini Editor charsIndent -1] 
+  if { $cindent == -1 } {
+    # no aparecia la clave charsIndent, pregunto por la vieja
+    set options(charsIndent) [$rini Editor charsIdent 2]
+  } else {
+    # aparecia la clave, hay que pasar al nombre Indent
+    set options(charsIndent) $cindent
+  }
 }
 
@@ -1908 +1916 @@
   $wini Editor chLine       $options(chLine)
   $wini Editor posLine      $options(posLine)
-  $wini Editor charsIdent   $options(charsIdent)
+  $wini Editor charsIndent   $options(charsIndent)
   ::iniFile::Flush
 }

tolbase/lib/toltk/msgs/es.msg

@@ -753 +753 @@
 mcset es "Undo"        "Deshacer"
 mcset es "Redo"        "Rehacer"
-mcset es "Ident"       "Aumentar sangría"
-mcset es "Unident"     "Disminuir sangría"
+mcset es "Indent"       "Aumentar sangría"
+mcset es "Unindent"     "Disminuir sangría"
 mcset es "Font"        "Fuente"
 mcset es "Save and Compile"  "Guardar y compilar"
@@ -812 +812 @@
 mcset es "Show line at"               "Mostrar línea en"
 mcset es "characters"                 "caracteres"
-mcset es "Characters to ident"        "Caracteres a identar"
+mcset es "Characters to indent"       "Caracteres a indentar"
 mcset es "CVS Options"                "Opciones de CVS"
 mcset es "Show differences"           "Mostrar diferencias"

tolbase/lib/toltk/tolbase.tcl

@@ -57 +57 @@
 }
 
+source [file join $toltk_script_path "editor.tcl"]
 source [file join $toltk_script_path "markuphelper.tcl"]
 source [file join $toltk_script_path "tolpkg.tcl"]
@@ -293 +294 @@
   set widgets(eval) $sw1.eval
 
+  # aseguramos que se lean las opciones de Editor que vamos a compartir
   #Creamos text con resaltado TOL
   set w_eval [::BayesText::CreateHLText $widgets(eval) tol \
@@ -318 +320 @@
   bind $w_eval <F7> "::BayesText::TolSyntaxCheck $w_eval ; break"
   bind $w_eval <F10> "::TolConsole::OpenEval ; break"
+
+  bind $w_eval <Control-Key-i> {
+    ::BayesText::Indent %W $::Editor::options(charsIndent)
+    break
+  }
+
+  bind $w_eval <Control-Key-u> {
+    ::BayesText::UnIndent %W $::Editor::options(charsIndent)
+    break
+  } 
   
   ## 1) Create a horizontal toolbar frame...

tolbase/lib/toltk/tolconfig_gui.tcl

@@ -90 +90 @@
     grid rowconfigure $f 0 -weight 1
     grid columnconfigure $f 0 -weight 1
+    set pw [ PanedWindow $f.pw -side bottom -pad 0 -width 4 ]
+    set paneLeft  [ $pwMain add ]
+    set paneRight [ $pwMain add ]
+
     set tree $f.tree
     wtree  $tree
     $tree configure -table no -filter yes -columns {
       { {image text} -tags NAME -label "Name" }
-      { {text} -tags STATUS -label "Value" -editable yes }
+      { {text} -tags STATUS -label "Value" }
     }
     grid $tree -row 0 -column 0 -sticky "snew"