diff --git a/src/resources.tcl b/src/resources.tcl index c24cffaf..e459f492 100644 --- a/src/resources.tcl +++ b/src/resources.tcl @@ -39,16 +39,17 @@ ## # generate gif and base64 encode. ## # we need to lose transparency in gif otherwise all antialiasing in png image is lost ## # so we set white background and eliminate alpha channel (unsupported in gif). -## convert -background white -alpha remove -alpha off paste.png gif:- |base64 +## convert -background white -alpha remove -alpha off paste.png -transparent white gif:-|base64 ## ## Following shell function (and call) converts a png base64 encoded to proper ## gif89a base64 encoded format: ## to_gif () { ## echo "image create photo $1 -data \"" -## echo -n "$2" | base64 -d |convert -background white -alpha remove -alpha off - gif:- |base64 +## echo -n "$2" | base64 -d |convert -background white -alpha remove -alpha off - -transparent white gif:- |base64 ## echo '"' ## } ## +## to_gif imgFileOpen "...." ## ## Toolbar buttons @@ -133,18 +134,18 @@ hBFOClkREgOHFWMJF5TgpHGHD4SJZLAgqRFJRkVKlCSSAtKTzZs4bwYCADs= " image create photo imgEditCopy -data " -R0lGODlhGAAYAPYAAAAAAAEBAQMDAwYGBgwMDBAQEBISEhUVFRkZGRoaGhsbGxwcHB8fHyQkJCcn -JzMzMzk5OTw8PD09PT4+PkFBQUxMTE5OTlJSUlRUVFtbW11dXV9fX2FhYWdnZ2lpaWtra2xsbG5u -bm9vb3JycnR0dHh4eHt7e4eHh4yMjI2NjY6OjpCQkJGRkZOTk5WVlZaWlpeXl5iYmJmZmZqamp2d -naGhoaWlpaampqqqqrCwsLS0tL29vb+/v8DAwMHBwcTExMfHx8jIyNDQ0NPT09vb2+Dg4OLi4uPj -4+Tk5OXl5ebm5ufn5+vr6+/v7/T09Pn5+fr6+vv7+/z8/P39/f7+/gAAAAAAAAAAAAAAAAAAAAAA +R0lGODlhGAAYAPYAAAAAAAcHBwoKCg4ODhAQEBERESUlJSsrKywsLC0tLS4uLi8vLzAwMDExMTMz +Mzg4ODk5OTo6OkBAQEFBQURERFJSUlNTU1RUVFVVVVpaWmFhYWRkZGVlZXd3d35+foGBgYODg4SE +hIWFhYaGhoiIiJWVlZaWlpmZmZ+fn6urq66urq+vr7S0tLW1tbm5ubu7u76+vr+/v8DAwMTExMzM +zNbW1tfX1+Xl5efn5+zs7O3t7e7u7vDw8PLy8vf39/v7+/7+/gAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5 -BAEAAFUALAAAAAAYABgAAAf7gFVVKAkAhoeHDjmCjI2CI4iRAAM0jpYeAA0vm5syJwUAL5aOmBNQ -jkgLoaONpaeNSIWirIKuqKqztLaCVFRFuFWvVFBUrQCmjEAZFjpAJA8gxB4WOMbIgjIACUhVrlAT -ACDWr1U9HCVNVTcbKL0oGzfjtPPdx+RORUzFjVRMRU7yBNUo8IAbvwsESgSs8gLAAoOMvgHwYCyB -h4seSryoAZBfjhU9GpGQRJFeIxwYJqicAIEEkCDkeAnhQYTfMCg4GTqEKAgKhYn0sjXgGeynuHlI -eMB0RGVmTZNQaQ1ZwbHcihy9cqAIOS/bw3qmJI6gl6PBV28TDqAQFAgAOw== +BAEAAEEALAAAAAAYABgAAAfRgD8BAISFhoUwQYqLijiHj4UjjIw5hBknmJmYH4Qpk4uVACafijad +pEGho6SmABo/ijMkMoqqqK0AnkENAA21hKufuC6KDwAPv6K3hB9AjTA4ycGTrbqftqyniiYUq9jC +2kELAAvJJ8u5ixcAFtLo1qmgwO+o39ThHAQcyQIFBQQAAw4Id4BcMkiHJCka4UBhEA0GLkicSLHB +Ax+oUPWg0WORDRugaOTIGIQCgAiKZBBKVBIABZLjygVhoS0myRYdWCjq4eEDxiA4W5AcSrQoo0AA +Ow== " image create photo imgEditCut -data " @@ -172,14 +173,18 @@ AIDwUUgNmeHED+VRxGJtI85oI0MBAQA7 " image create photo imgEditPaste -data " -R0lGODlhGAAYAPUAAAICAgQEBAoKCg0NDRQUFBoaGhwcHCAgICUlJSsrKywsLDMzMzo6Oj8/P0tL -S1VVVVhYWGJiYmlpaWtra3Jycnd3d3t7e39/f4ODg4uLi5SUlJiYmJ6enqOjo6qqqq6urrS0tLu7 -u76+vsjIyM7OztfX1+np6erq6u/v7/T09Pz8/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAACsALAAAAAAYABgAAAbMwAhg -SBwaTKqVcslUFp+ATXPqBBQe2EdjqKFOhxCmaCj1MsFisvkMCC/H0fVy+EgDuvIV+s3N6wF1fHF5 -e0pwZXJDDB6MHhd9hFBEiCYhlpchIysIkkMiSxmSBysmjBMSEhoeHSBMoVAKTAVDFiskBimgkrFL -B0MUtgIOurBMvgAGFxICAhVKr0+8SsdPBB8r0EUJTAadBybZRNugBJIOKeFD0koYBgfvAQAJKNiS -41QkAwUkz/Zm+YjSyTNTQgITDggQJFCYIMGCFUEAADs= +R0lGODlhGAAYAPYAAAAAAAEBAQUFBQoKCgsLCw4ODg8PDxAQEBkZGRsbGx0dHR8fHyAgICEhISMj +IyYmJicnJy0tLS4uLi8vLzAwMDIyMjMzMzU1NTg4ODk5OUFBQUJCQkREREVFRUZGRkxMTE1NTVBQ +UFFRUVRUVFdXV1paWl1dXWpqanR0dHd3d3h4eHx8fH19fX5+foODg4iIiI2NjY+Pj5ycnJ6enqCg +oKOjo6qqqqysrK2trbW1tbu7u8vLy87Ozs/Pz9PT09vb29zc3N3d3eDg4Onp6erq6uvr6+7u7vDw +8PLy8vX19f39/QAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5 +BAEAAEsALAAAAAAYABgAAAfUgEsmAAlLSz8AADOGgwqGj5BLIQAFhjyJMIaTlZGQPCo3hkowLUWW +oJ2pkEYqNTavsLA0LUmGPi85kA+JvL29GZqUkAq+xYkShiWEkBsAFDrQ0dEMACSGRjpBzAAbqksS +1d7N3arg1ks3HC3b5KnmhiDCj+Pe70sozuz14YZHSvrl+KWiF/CciwMcDBVhIIDbvnPxCBjawatd +J3szKJwwlIRDAYcFxYF0J7ATBwAZgqhcuXLXuVTUjPm64C2mTF7IVPkI0eKFz58/VZAQ4q2o0aOp +AgEAOw== " image create photo imgEditDelete -data " @@ -355,14 +360,13 @@ CnFwc1wVRx9oZwFqR1nGXGBKUFRUVk7U1dbX2EVBADs= " image create photo imgToolInsertText -data " -R0lGODlhGAAYAPUAAAAAABsbGx8fHyAgIC8vLzIyMjc3Nz4+PkVFRU9PT1NTU1ZWVltbW11dXWBg -YGZmZmlpaXBwcHZ2dnh4eHt7e4iIiJmZmZqamq6urre3t7u7u8TExMzMzNPT09TU1NjY2OXl5enp -6e/v7/f39/n5+QAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAACUALAAAAAAYABgAAAbVwBID -QCwajwBEabkkIZ9Hj4g5Ig4WioVWq8hqBcbEsgpoaM7oc4h5OJJKZIWhQK8XMMyIlfgmO5iAgRJE -CnxwRAwXiouMICWDAIUAfYRbXlwLG4+EhmQNgaCbkZ1EDRWnqKcdTJCSlAALEA+ztA+aS62kAH+h -gLmTh7ATwxISE8USHLicwGQMx8bH0B7Lo81EvL3VrsGWWwsZvsyviYyK1Kzjwdnav68BBg618w8E -6k5Q+dwlCPlPBQ0MLflgJYGCBAgTKlwABtgSEP7yBUoQEcmnEkEAADs= +R0lGODlhGAAYAPUAAAAAAAMDAwQEBAgICBERERMTExUVFRYWFh8fHyAgICIiIjQ0NERERFVVVVZW +VlhYWGZmZnd3d3h4eH19fY2NjZSUlKCgoKqqqqurq7u7u729vcvLy83NzdDQ0NHR0dLS0t3d3eHh +4eLi4u3t7e7u7vLy8vX19fb29vz8/P39/f7+/gAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAACsALAAAAAAYABgAAAZ2wJVQ +qCIZSSXTcMlckhSAqLTSrAo/0uzDarVEvt+JiEsum8/cz2XNbrPHVZAgS88aVFXRvF5H4PMZgYKD +GoUkaIiJZhQQjY6NEiVmHHxTZiULBJqbmgofiqChomQmDJynnAYSVZSVdQRVKhMNtLW2thejurtc +QQA7 " image create photo imgToolInsertWire -data " @@ -556,10 +560,13 @@ JxgWWhALBwBqRSIFYI1zCB8hRigAlkIVUSNDIFEceQolJkQpGxgACAoGBAJkVAsSEw4RJEVBADs= " image create photo CtxmenuPaste -data " -R0lGODlhEAAQAPQAAAAAAAICAgsLCwwMDBQUFBcXFyEhISQkJCsrKzw8PENDQ05OTlRUVFlZWXx8 -fIGBgZycnM3NzdbW1t/f3+rq6u7u7vLy8vr6+gAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEA -ABgALAAAAAAQABAAAAVPICaOZGmeaKqO0oEgjfmQEWAvpsFcYn2LkISQAFBYMD4ADuOwOQEJpHP5 -IFgFAEQEGbAxRBdLpeKa9JzfkqIySi5TkYFcsbpM7pSVfr8PAQA7 +R0lGODlhEAAQAPUAAAAAAAEBAQUFBQkJCQ0NDScnJy0tLTQ0NEBAQEZGRk1NTU9PT1BQUFNTU1lZ +WWBgYGFhYWNjY2VlZWlpaWxsbG5ubnNzc3R0dHZ2dnd3d3h4eICAgIGBgYmJiYqKio6OjpCQkJGR +kZmZmaKioqenp6qqqq6urrm5ubq6usHBwcXFxcnJydXV1dvb293d3d7e3uDg4OPj4+Tk5Onp6erq +6u3t7e/v7/Dw8PX19fb29vf39/39/QAAAAAAAAAAAAAAACH5BAEAADwALAAAAAAQABAAAAaAQFkg +wgMFTrwDgcds4hwknqrx4nUqzWw2dcB4vxLFjjawMBuCgHqtbtkKHebm+KrXJYGYds7SWvI3ByBy +AX1ZGHk0Alg8fH55e4WPMTgRJjwrBpKHeTFDPB9qhk2Ieiw2PDgTAS2TWhoBGiKzswmQWQpsulVZ +Nh0lwMEjI1rFxUEAOw== " image create photo CtxmenuDelete -data " @@ -598,13 +605,13 @@ HCceBW2BB4kWQxgDCBYXJScZFgwAEEUST0UODSZFJhFGEyNIqKmqqydBADs= " image create photo CtxmenuCopy -data " -R0lGODlhEAAQAPUAAAAAAAYGBgwMDA8PDxERERgYGCIiIikpKSwsLDIyMjQ0NDk5OUJCQkRERE1N -TVNTU1VVVWVlZXd3d3l5eX5+foeHh5eXl5qamqioqKurq7KysrW1tb29vcLCwsbGxszMzNLS0tfX -1+rq6u/v7/Pz8/T09Pv7+wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA -AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAACcALAAAAAAQABAAAAZ6wNNJ -9AmdPp+RcMlkAACW58LCXIYSH9DxUylUhRrA8tI4BBiNNEe4EQsdhgYCQidQhCXM0hGpKu4nHQN7 -fUx/YG4nfH6AgoSMeHpvhUuHJxsBICAYCpRClh4ADhBPD5B4JicjDZ4nllUOAwazswGAVRwSursT -Rl+/S0EAOw== +R0lGODlhEAAQAPUAAAAAAAICAgUFBQoKCgwMDBERERMTExcXFxkZGRoaGiIiIiQkJCkpKS4uLjAw +MDMzMzk5OTw8PEpKSlxcXGZmZnV1dXh4eHx8fIWFhYaGhoqKio2NjY6Ojo+Pj52dnaCgoKGhoaOj +o6urq6ysrLOzs7e3t7m5uby8vL29vcHBwcfHx8nJycrKys7OztHR0dPT09fX19ra2t/f3+Dg4OHh +4ePj4+3t7fPz8/X19fb29vn5+fr6+gAAAAAAAAAAAAAAACH5BAEAADwALAAAAAAQABAAAAaGwAxg +SCSmeEgkByChOJ0QwDHJ8wBMVN5ylbViqR2AghcTaKrX7DLCoyk86G8yrOqmwYB6zRGKZ+lkABl+ +eHVUXn95PDYTJzwXAAQGk5MDACQ8LQAWPCUGDQ8ODqEMCDRILjdZPC4cOTwjIzw5HC6rFQBcCAg8 +KwAVqzIgOzwnjjsgp6vLSUEAOw== " image create photo CtxmenuEdit -data " diff --git a/src/xschem.tcl b/src/xschem.tcl index 08060fc3..e14bf195 100644 --- a/src/xschem.tcl +++ b/src/xschem.tcl @@ -3170,72 +3170,72 @@ proc context_menu { } { set x [expr {[winfo pointerx .ctxmenu] - 10}] set y [expr {[winfo pointery .ctxmenu] - 10}] if { !$selection} { - button .ctxmenu.b9 -text {Open most recent} -padx 3 -pady 0 -anchor w -activebackground red \ + button .ctxmenu.b9 -text {Open most recent} -padx 3 -pady 0 -anchor w -activebackground grey50 \ -image CtxmenuRecent -compound left \ -font [subst $font] -command {set retval 9; destroy .ctxmenu} } - button .ctxmenu.b10 -text {Edit attributes} -padx 3 -pady 0 -anchor w -activebackground red \ + button .ctxmenu.b10 -text {Edit attributes} -padx 3 -pady 0 -anchor w -activebackground grey50 \ -image CtxmenuEdit -compound left \ -font [subst $font] -command {set retval 10; destroy .ctxmenu} - button .ctxmenu.b11 -text {Edit attr in editor} -padx 3 -pady 0 -anchor w -activebackground red \ + button .ctxmenu.b11 -text {Edit attr in editor} -padx 3 -pady 0 -anchor w -activebackground grey50 \ -image CtxmenuEdit -compound left \ -font [subst $font] -command {set retval 11; destroy .ctxmenu} if {$selection} { - button .ctxmenu.b12 -text {Descend schematic} -padx 3 -pady 0 -anchor w -activebackground red \ + button .ctxmenu.b12 -text {Descend schematic} -padx 3 -pady 0 -anchor w -activebackground grey50 \ -image CtxmenuDown -compound left \ -font [subst $font] -command {set retval 12; destroy .ctxmenu} - button .ctxmenu.b13 -text {Descend symbol} -padx 3 -pady 0 -anchor w -activebackground red \ + button .ctxmenu.b13 -text {Descend symbol} -padx 3 -pady 0 -anchor w -activebackground grey50 \ -image CtxmenuDownSym -compound left \ -font [subst $font] -command {set retval 13; destroy .ctxmenu} - button .ctxmenu.b18 -text {Delete selection} -padx 3 -pady 0 -anchor w -activebackground red \ + button .ctxmenu.b18 -text {Delete selection} -padx 3 -pady 0 -anchor w -activebackground grey50 \ -image CtxmenuDelete -compound left \ -font [subst $font] -command {set retval 18; destroy .ctxmenu} - button .ctxmenu.b7 -text {Cut selection} -padx 3 -pady 0 -anchor w -activebackground red \ + button .ctxmenu.b7 -text {Cut selection} -padx 3 -pady 0 -anchor w -activebackground grey50 \ -image CtxmenuCut -compound left \ -font [subst $font] -command {set retval 7; destroy .ctxmenu} - button .ctxmenu.b15 -text {Copy selection} -padx 3 -pady 0 -anchor w -activebackground red \ + button .ctxmenu.b15 -text {Copy selection} -padx 3 -pady 0 -anchor w -activebackground grey50 \ -image CtxmenuCopy -compound left \ -font [subst $font] -command {set retval 15; destroy .ctxmenu} - button .ctxmenu.b16 -text {Move Selection} -padx 3 -pady 0 -anchor w -activebackground red \ + button .ctxmenu.b16 -text {Move Selection} -padx 3 -pady 0 -anchor w -activebackground grey50 \ -image CtxmenuMove -compound left \ -font [subst $font] -command {set retval 16; destroy .ctxmenu} - button .ctxmenu.b17 -text {Duplicate Selection} -padx 3 -pady 0 -anchor w -activebackground red \ + button .ctxmenu.b17 -text {Duplicate Selection} -padx 3 -pady 0 -anchor w -activebackground grey50 \ -image CtxmenuDuplicate -compound left \ -font [subst $font] -command {set retval 17; destroy .ctxmenu} } if {!$selection} { - button .ctxmenu.b14 -text {Go to upper level} -padx 3 -pady 0 -anchor w -activebackground red \ + button .ctxmenu.b14 -text {Go to upper level} -padx 3 -pady 0 -anchor w -activebackground grey50 \ -image CtxmenuUp -compound left \ -font [subst $font] -command {set retval 14; destroy .ctxmenu} - button .ctxmenu.b1 -text {Insert symbol} -padx 3 -pady 0 -anchor w -activebackground red \ + button .ctxmenu.b1 -text {Insert symbol} -padx 3 -pady 0 -anchor w -activebackground grey50 \ -image CtxmenuSymbol -compound left \ -font [subst $font] -command {set retval 1; destroy .ctxmenu} - button .ctxmenu.b2 -text {Insert wire} -padx 3 -pady 0 -anchor w -activebackground red \ + button .ctxmenu.b2 -text {Insert wire} -padx 3 -pady 0 -anchor w -activebackground grey50 \ -image CtxmenuWire -compound left \ -font [subst $font] -command {set retval 2; destroy .ctxmenu} - button .ctxmenu.b3 -text {Insert line} -padx 3 -pady 0 -anchor w -activebackground red \ + button .ctxmenu.b3 -text {Insert line} -padx 3 -pady 0 -anchor w -activebackground grey50 \ -image CtxmenuLine -compound left \ -font [subst $font] -command {set retval 3; destroy .ctxmenu} - button .ctxmenu.b4 -text {Insert box} -padx 3 -pady 0 -anchor w -activebackground red \ + button .ctxmenu.b4 -text {Insert box} -padx 3 -pady 0 -anchor w -activebackground grey50 \ -image CtxmenuBox -compound left \ -font [subst $font] -command {set retval 4; destroy .ctxmenu} - button .ctxmenu.b5 -text {Insert polygon} -padx 3 -pady 0 -anchor w -activebackground red \ + button .ctxmenu.b5 -text {Insert polygon} -padx 3 -pady 0 -anchor w -activebackground grey50 \ -image CtxmenuPoly -compound left \ -font [subst $font] -command {set retval 5; destroy .ctxmenu} - button .ctxmenu.b19 -text {Insert arc} -padx 3 -pady 0 -anchor w -activebackground red \ + button .ctxmenu.b19 -text {Insert arc} -padx 3 -pady 0 -anchor w -activebackground grey50 \ -image CtxmenuArc -compound left \ -font [subst $font] -command {set retval 19; destroy .ctxmenu} - button .ctxmenu.b20 -text {Insert circle} -padx 3 -pady 0 -anchor w -activebackground red \ + button .ctxmenu.b20 -text {Insert circle} -padx 3 -pady 0 -anchor w -activebackground grey50 \ -image CtxmenuCircle -compound left \ -font [subst $font] -command {set retval 20; destroy .ctxmenu} - button .ctxmenu.b6 -text {Insert text} -padx 3 -pady 0 -anchor w -activebackground red \ + button .ctxmenu.b6 -text {Insert text} -padx 3 -pady 0 -anchor w -activebackground grey50 \ -image CtxmenuText -compound left \ -font [subst $font] -command {set retval 6; destroy .ctxmenu} - button .ctxmenu.b8 -text {Paste} -padx 3 -pady 0 -anchor w -activebackground red \ + button .ctxmenu.b8 -text {Paste selection} -padx 3 -pady 0 -anchor w -activebackground grey50 \ -image CtxmenuPaste -compound left \ -font [subst $font] -command {set retval 8; destroy .ctxmenu} } - button .ctxmenu.b21 -text {Abort command} -padx 3 -pady 0 -anchor w -activebackground red \ + button .ctxmenu.b21 -text {Abort command} -padx 3 -pady 0 -anchor w -activebackground grey50 \ -image CtxmenuAbort -compound left \ -font [subst $font] -command {set retval 21; destroy .ctxmenu}