Changeset 1e43dec in tol for tolbase/lib/toltk

Timestamp:

May 25, 2015, 8:00:31 AM (11 years ago)

Author:

Pedro Gea <pgea@…>

Branches:

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

Children:

ee9644c

Parents:

53456bc

Message:

Refs #1827
Se incorporan nuevos iconos para TOLBase 3.2. Se hace diferencia entre el TOL compilado con GNU-GCC (MinGW en Windows) y el TOL con MSVC.
Se introducen cambios en TOLBase para adoptar estas nuevas imágenes.

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

Location:

tolbase/lib/toltk

Files:

• images/splash-gnu.gif (added)
• images/splash-msvc.gif (added)
• images/splash.gif (modified) (previous)
• images/tolbase-gnu-64.xbm (added)
• images/tolbase-gnu.ico (added)
• images/tolbase-msvc.ico (added)
• images/tolbase.ico (added)
• project.tcl (modified) (3 diffs)
• tolbase.tcl (modified) (1 diff)

tolbase/lib/toltk/project.tcl

@@ -128 +128 @@
   
   # Gives a name for the application
-  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"
+  }
+  
   if { [info exists projects(Project,title)] && $projects(Project,title) ne "" } {
     set prjtitle $projects(Project,title)
@@ -144 +153 @@
     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]
   #
@@ -156 +180 @@
   $widgets(mainmenu) draw
 
-  if { [string equal $tcl_platform(platform) "unix"] } {
-    wm iconbitmap . "@[file join $toltk_images_path bayes.xbm]"
-  } else {
-    wm iconbitmap . -default [file join $toltk_images_path bayes.ico]
-  }
   if { [TolConReq] } {
     ::TolInspector::Busy

tolbase/lib/toltk/tolbase.tcl

@@ -1319 +1319 @@
   global GuiVersionInfo
 
-  set imgfile [file join $toltk_library toltk images splash.gif]
+  # tol platform selection
+  array set tol_platform [lindex [toltcl::eval {PlatformInfo(?)} -named 1] 1]
+  if {$tol_platform(CompilerID) eq "GNU"} {
+    set imgfile [file join $toltk_library toltk images splash-gnu.gif]
+  } elseif {$tol_platform(CompilerID) eq "MSVC"} {
+    set imgfile [file join $toltk_library toltk images splash-msvc.gif]
+  } else {
+    set imgfile [file join $toltk_library toltk images splash.gif]
+  }
   set img [image create photo -file $imgfile]
   toplevel $w