Changeset e87e769 in tol

Timestamp:

Dec 10, 2015, 1:02:47 PM (11 years ago)

Author:

Pedro Gea <pgea@…>

Branches:

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

Children:

3ea8b10

Parents:

3634546

Message:

Se reubica la asignación del icono de tolbase al método initWM para que funcione adecuadamente en Linux.
Se usa wm iconphoto para poder poner un icono con colores.
Podría incorporarse la imagen del icono ya escalada a distintos tamaños 16x16, 32x32 y 64x64

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

Location:

tolbase/lib/toltk

Files:

• images/tolbase-256.png (added)
• project.tcl (modified) (5 diffs)

tolbase/lib/toltk/project.tcl

@@ -110 +110 @@
 #/////////////////////////////////////////////////////////////////////////////
   global tcl_platform
-  global toltk_images_path
   variable data
   variable widgets
@@ -128 +127 @@
   
   # Gives a name for the application
-  # tol platform selection
-  array set tol_platform [lindex [toltcl::eval {PlatformInfo(?)} -named 1] 1]
-  if {$tol_platform(CompilerID) eq "GNU"} {
-    set prjtitle "TOLBase (GNU)"
-  } elseif {$tol_platform(CompilerID) eq "MSVC"} {
-    set prjtitle "TOLBase (MSVC)"
+  if { [string equal $tcl_platform(platform) "unix"] } {
+    set prjtitle "TOLBase"  
   } else {
-    set prjtitle "TOLBase"
+    # tol platform selection
+    array set tol_platform [lindex [toltcl::eval {PlatformInfo(?)} -named 1] 1]
+    if {$tol_platform(CompilerID) eq "GNU"} {
+      set prjtitle "TOLBase (GNU)"
+    } elseif {$tol_platform(CompilerID) eq "MSVC"} {
+      set prjtitle "TOLBase (MSVC)"
+    } else {
+      set prjtitle "TOLBase"
+    }
   }
   
@@ -143 +146 @@
   wm title . $prjtitle
 
-  #if { [TolConReq] }
-    #Creamos frame de trabajo
-    set widgets(mainmenu) [::project::CreateMdiMenu .main.mdi]
-        set widgets(mainframe) [frame .main]
-        set widgets(mainmdi) [mdi .main.mdi -mdimenu $widgets(mainmenu) \
-                               -relief sunken -bd 1]
-    pack $widgets(mainmenu) -fill x -side top
-        pack $widgets(mainframe) -fill both -expand yes -side bottom
-    pack $widgets(mainmdi) -fill both -expand yes -side bottom
-        bind . <Control-Tab> "[list $widgets(mainmdi) cicle]; break"
-
-    #(pgea) se adelanta para no ver el icono de TK intermedio
-    if { [string equal $tcl_platform(platform) "unix"] } {
-      wm iconbitmap . "@[file join $toltk_images_path tolbase-gnu-64.xbm]"
-    } else {
-      # tol platform selection
-      if {$tol_platform(CompilerID) eq "GNU"} {
-        wm iconbitmap . -default [file join $toltk_images_path tolbase-gnu.ico]
-      } elseif {$tol_platform(CompilerID) eq "MSVC"} {
-        wm iconbitmap . -default [file join $toltk_images_path tolbase-msvc.ico]
-      } else {
-        wm iconbitmap . -default [file join $toltk_images_path tolbase.ico]
-      }
-    }
-
-        ::TolConsole::MainFrame $widgets(mainmdi) [TolConReq]
-  #
+  #Creamos frame de trabajo
+  set widgets(mainmenu) [::project::CreateMdiMenu .main.mdi]
+  set widgets(mainframe) [frame .main]
+  set widgets(mainmdi) [mdi .main.mdi -mdimenu $widgets(mainmenu) \
+                         -relief sunken -bd 1]
+  pack $widgets(mainmenu) -fill x -side top
+  pack $widgets(mainframe) -fill both -expand yes -side bottom
+  pack $widgets(mainmdi) -fill both -expand yes -side bottom
+  bind . <Control-Tab> "[list $widgets(mainmdi) cicle]; break"
+
+  ::TolConsole::MainFrame $widgets(mainmdi) [TolConReq]
   
   if { [TolConReq] } {
@@ -218 +205 @@
 #
 #/////////////////////////////////////////////////////////////////////////////
-  variable data
-
+  global tcl_platform
+  global toltk_images_path
+  variable data
+  
   bind . <Map> "::project::mapMain %W"
   bind . <Unmap> "::project::unmapMain %W"
@@ -226 +215 @@
   bind . <Destroy> "::project::OnDestroy %W"
   set defgeom "[winfo vrootw .]x[winfo vrooth .]+0+0"
+  
+  #(pgea) se adelanta para no ver el icono de TK intermedio
+  if { [string equal $tcl_platform(platform) "unix"] } {
+    wm iconphoto . [image create photo .icon256 -format png -file [file join $toltk_images_path tolbase-256.png] ]
+  } else {
+    # tol platform selection
+    array set tol_platform [lindex [toltcl::eval {PlatformInfo(?)} -named 1] 1]
+    if {$tol_platform(CompilerID) eq "GNU"} {
+      wm iconbitmap . -default [file join $toltk_images_path tolbase-gnu.ico]
+    } elseif {$tol_platform(CompilerID) eq "MSVC"} {
+      wm iconbitmap . -default [file join $toltk_images_path tolbase-msvc.ico]
+    } else {
+      wm iconbitmap . -default [file join $toltk_images_path tolbase.ico]
+    }
+  }
+    
   wm state . normal
   wm geometry . [set geom [::iniFile::Read Project topgeom $defgeom]]