Menu
▾
▴
[Amsn-commits] SF.net SVN: amsn: [9532] trunk/amsn/plugins/ColoredNicks
|
From: <squ...@us...> - 2008-01-29 17:00:10
|
Revision: 9532
http://amsn.svn.sourceforge.net/amsn/?rev=9532&view=rev
Author: square87
Date: 2008-01-29 09:00:12 -0800 (Tue, 29 Jan 2008)
Log Message:
-----------
Enabled a draft background support. Previously background tags was only parsed and then removed.
Modified Paths:
--------------
trunk/amsn/plugins/ColoredNicks/colorednicks.tcl
trunk/amsn/plugins/ColoredNicks/plugininfo.xml
Modified: trunk/amsn/plugins/ColoredNicks/colorednicks.tcl
===================================================================
--- trunk/amsn/plugins/ColoredNicks/colorednicks.tcl 2008-01-29 15:01:30 UTC (rev 9531)
+++ trunk/amsn/plugins/ColoredNicks/colorednicks.tcl 2008-01-29 17:00:12 UTC (rev 9532)
@@ -31,7 +31,6 @@
upvar 2 $evpar(variable) nickArray
variable newparsednick ""
- variable list_background_colors [list ]
set num_elem [llength $nickArray]
set parsednick $nickArray
@@ -52,13 +51,13 @@
set old_pos_char $pos_char
set next_char1 [string range [lindex $unit 1] [expr $pos_char +1] [expr $pos_char +2] ]
if {$next_char1 eq "c="} {
- checkcolor
+ checkcolor setcolour
} elseif { $next_char1 eq "/c"} {
- checkfadedcolor
+ checkfadedcolor unsetcolour setfadecolour
} elseif {$next_char1 eq "C="} {
- checkcolor 1
+ checkcolor setcolour_UP
} elseif { $next_char1 eq "/C"} {
- checkfadedcolor 1
+ checkfadedcolor unsetcolour_UP setfadecolour_UP
}
if {$old_pos_char eq $pos_char} {
@@ -139,7 +138,7 @@
incr pos_char 3
}
} elseif { $next_char1 eq "a=" } {
- nick_background
+ checkcolor bg
} elseif { $next_char1 eq "/a"} {
faded_background_nick
} elseif {$next_char1 eq "B]"} {
@@ -263,21 +262,28 @@
lappend nickArray [lindex $elem]
} elseif {$firstelem eq "font"} {
lappend nickArray [lindex $elem]
+ } elseif {$firstelem eq "bg"} {
+ set cl [lindex $elem 1]
+ if {$cl ne "reset" && [string range $cl 0 0] ne "#"} {
+ set cl "#[getColor $cl]"
+ }
+ lappend nickArray [list bg $cl]
} elseif {$firstelem eq "newline"} {
lappend nickArray [lindex $elem]
}
}
}
+ lappend nickArray [list bg reset]
+
unset newparsednick
- unset list_background_colors
unset unit
unset pos_char
unset buffer
}
-proc colorortext {{up 0}} {
+proc colorortext {} {
variable newparsednick
variable idnum 0
@@ -775,7 +781,7 @@
}
-proc checkcolor {{up 0}} {
+proc checkcolor {type} {
variable unit
variable pos_char
variable newparsednick
@@ -783,13 +789,9 @@
set next_char2 [string index [lindex $unit 1] [expr $pos_char +3] ]
if {[string match \[0-9\] $next_char2]} {
- set num [findnum $up]
+ set num [findnum]
if {$num != -1} {
- if {$up == 0} {
- lappend newparsednick "[list setcolour $num]"
- } else {
- lappend newparsednick "[list setcolour_UP $num]"
- }
+ lappend newparsednick "[list $type $num]"
incr pos_char [expr [string length $num] + 3]
}
} elseif {$next_char2 eq "#"} {
@@ -798,11 +800,7 @@
set num [string range [lindex $unit 1] [expr $pos_char+4] [expr $pos_char+9]]
if { [catch {expr 0x${num}}] } { return }
unbuffer
- if {$up == 0} {
- lappend newparsednick "[list setcolour #$num]"
- } else {
- lappend newparsednick "[list setcolour_UP #$num]"
- }
+ lappend newparsednick "[list $type #$num]"
incr pos_char 10
}
} else {
@@ -811,11 +809,7 @@
set colorname [string range [lindex $unit 1] [expr $pos_char +3] [expr $end-1]]
if {[IsColorName $colorname]} {
unbuffer
- if {$up == 0} {
- lappend newparsednick "[list setcolour $colorname]"
- } else {
- lappend newparsednick "[list setcolour_UP $colorname]"
- }
+ lappend newparsednick "[list $type $colorname]"
incr pos_char [expr [string length $colorname] + 3]
}
}
@@ -866,7 +860,7 @@
}
-proc checkfadedcolor {{up 0}} {
+proc checkfadedcolor {typeclose type} {
variable unit
variable pos_char
variable newparsednick
@@ -874,11 +868,7 @@
set next_char2 [string index [lindex $unit 1] [expr $pos_char +3] ]
if { $next_char2 eq "\]" } {
unbuffer
- if {$up == 0} {
- lappend newparsednick [list unsetcolour]
- } else {
- lappend newparsednick [list unsetcolour_UP]
- }
+ lappend newparsednick [list $typeclose]
incr pos_char 3
} elseif { $next_char2 eq "=" } {
set next_char3 [string index [lindex $unit 1] [expr $pos_char +4]]
@@ -890,21 +880,13 @@
return
}
unbuffer
- if {$up == 0} {
- lappend newparsednick [list setfadecolour "#$num"]
- } else {
- lappend newparsednick [list setfadecolour_UP "#$num"]
- }
+ lappend newparsednick [list $type "#$num"]
incr pos_char 11
}
} elseif {[string match \[0-9\] $next_char3]} {
set num [findnum $up 1]
if {$num != -1} {
- if {$up == 0} {
- lappend newparsednick "[list setfadecolour $num]"
- } else {
- lappend newparsednick "[list setfadecolour_UP $num]"
- }
+ lappend newparsednick [list $type $num]
incr pos_char [expr [string length $num] + 4]
}
} else {
@@ -913,11 +895,7 @@
set colorname [string range [lindex $unit 1] [expr $pos_char +4] [expr $end-1]]
if {[IsColorName $colorname]} {
unbuffer
- if {$up == 0} {
- lappend newparsednick "[list setfadecolour $colorname]"
- } else {
- lappend newparsednick "[list setfadecolour_UP $colorname]"
- }
+ lappend newparsednick [list $type $colorname]
incr pos_char [expr [string length $colorname] + 4]
}
}
@@ -929,22 +907,23 @@
proc nick_background {} {
variable unit
variable pos_char
- variable list_background_colors
variable newparsednick
set next_char2 [string index [lindex $unit 1] [expr $pos_char +3] ]
if {[string match \[0-9\] $next_char2]} {
set next_char3 [string index [lindex $unit 1] [expr $pos_char +4] ]
if { $next_char3 eq "\]" } {
- lappend list_background_colors 0
unbuffer
+ set cl [getColor "0$next_char2"]
+ lappend newparsednick [list bg "#$cl"]
lappend newparsednick [list jump 5 wasbg]
incr pos_char 4
} else {
set next_char4 [string index [lindex $unit 1] [expr $pos_char +5] ]
if {$next_char4 eq "\]"} {
- lappend list_background_colors 0
unbuffer
+ set cl [getColor "$next_char2$next_char3"]
+ lappend newparsednick [list bg "#$cl"]
lappend newparsednick [list jump 6 wasbg]
incr pos_char 5
}
@@ -954,8 +933,8 @@
if {$next_char3 eq "\]"} {
set num [string range [lindex $unit 1] [expr $pos_char+4] [expr $pos_char+9]]
if { [catch {expr 0x${num}}] } { return }
- lappend list_background_colors 0
- unbuffer
+ unbuffer
+ lappend newparsednick [list bg "#$num"]
lappend newparsednick [list jump 11 wasbg]
incr pos_char 10
}
@@ -966,15 +945,12 @@
proc faded_background_nick {} {
variable unit
variable pos_char
- variable list_background_colors
variable newparsednick
- if {[llength $list_background_colors] == 0} { return 2 }
-
set next_char2 [string index [lindex $unit 1] [expr $pos_char +3] ]
if { $next_char2 eq "\]" } {
unbuffer
- set list_background_colors [lreplace $list_background_colors end end]
+ lappend newparsednick [list bg reset]
lappend newparsednick [list jump 4 wasbg]
incr pos_char 3
} elseif { $next_char2 eq "=" } {
@@ -985,7 +961,7 @@
set num [string range [lindex $unit 1] [expr $pos_char+5] [expr $pos_char+10]]
if { [catch {expr 0x${num}}] } { return }
unbuffer
- lappend list_background_colors "#${num}"
+ lappend newparsednick [list bg reset]
lappend newparsednick [list jump 12 wasbg]
incr pos_char 11
}
@@ -994,13 +970,14 @@
if { $next_char4 eq "\]" } {
lappend list_colors 0
unbuffer
+ lappend newparsednick [list bg reset]
lappend newparsednick [list jump 6 wasbg]
incr pos_char 5
} else {
set next_char5 [string index [lindex $unit 1] [expr $pos_char +6] ]
if {$next_char5 eq "\]"} {
- lappend list_background_colors 0
unbuffer
+ lappend newparsednick [list bg reset]
lappend newparsednick [list jump 7 wasbg]
incr pos_char 6
}
@@ -1377,7 +1354,7 @@
}
-proc findnum {up {opt 0}} {
+proc findnum {{opt 0}} {
variable unit
variable pos_char
Modified: trunk/amsn/plugins/ColoredNicks/plugininfo.xml
===================================================================
--- trunk/amsn/plugins/ColoredNicks/plugininfo.xml 2008-01-29 15:01:30 UTC (rev 9531)
+++ trunk/amsn/plugins/ColoredNicks/plugininfo.xml 2008-01-29 17:00:12 UTC (rev 9532)
@@ -3,17 +3,17 @@
<name>ColoredNicks</name>
<author>Giuseppe Bottiglieri (Square87)</author>
<description>ColoredNicks allows to see colored nicks in contact list. You can also colour your nick and your personal message. Background is not supported yet.</description>
- <description_fr>ColoredNicks vous permet de voirs les couleurs dans les pseudo de vos contacts. Vous pouvez aussi colorier votre pseudonyme et votre message personnel. Les couleurs ne sont pas encore supportées.</description_fr>
- <description_it>ColoredNicks permette di visualizzare i nick colorati nella lista dei contatti. Puoi anche colorare il tuo nick e il messaggio personale. Lo sfondo non è ancora supportato.</description_it>
- <description_hu>A ColoredNicks segítségével a becenevek színezése is látható . A saját beceneved és személyes üzeneted is színezhető. A háttér színezése jelenleg nem támogatott.</description_hu>
- <amsn_version>0.97</amsn_version>
- <plugin_version>0.3.1</plugin_version>
+ <description_fr>ColoredNicks vous permet de voirs les couleurs dans les pseudo de vos contacts. Vous pouvez aussi colorier votre pseudonyme et votre message personnel. Les couleurs ne sont pas encore support\xE9es.</description_fr>
+ <description_it>ColoredNicks permette di visualizzare i nick colorati nella lista dei contatti. Puoi anche colorare il tuo nick e il messaggio personale. Lo sfondo non \xE8 ancora supportato.</description_it>
+ <description_hu>A ColoredNicks seg\xEDts\xE9g\xE9vel a becenevek sz\xEDnez\xE9se is l\xE1that\xF3 . A saj\xE1t beceneved \xE9s szem\xE9lyes \xFCzeneted is sz\xEDnezhet?. A h\xE1tt\xE9r sz\xEDnez\xE9se jelenleg nem t\xE1mogatott.</description_hu>
+ <amsn_version>0.98b</amsn_version>
+ <plugin_version>0.3.2</plugin_version>
<plugin_file>colorednicks.tcl</plugin_file>
<plugin_namespace>colorednicks</plugin_namespace>
<init_procedure>init</init_procedure>
<deinit_procedure>deinit</deinit_procedure>
- <cvs_version>9081</cvs_version>
+ <cvs_version>9531</cvs_version>
<URL>
<main>http://www.amsn-project.net/autoupdater/plugins/ColoredNicks/colorednicks.tcl</main>
<plugininfo>http://www.amsn-project.net/autoupdater/plugins/ColoredNicks/plugininfo.xml</plugininfo>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|