Changeset 2c0158d in tol


Ignore:
Timestamp:
Feb 8, 2012, 2:29:02 PM (15 years ago)
Author:
Jorge Pérez <josp.jorge@…>
Branches:
1941-docker-image-to-test, devel, master
Children:
72b4d96
Parents:
4c42e65
Message:

refs #1417, implementamos un metodo de wtree para facilitar la modificación/consulat de las columnas en items creados, el ícono del nodo de un paquete refleja el estado de sus hijos (paquetes con versión específica), se corrige un error cuando la ruta de instalación de los paquetes tiene espacio en el nombre

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

Location:
tolbase/lib
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • tolbase/lib/toltk/tolpkg.tcl

    r4c42e65 r2c0158d  
    139139proc ::TolPkg::GetLocalPackages { } {
    140140  set localRoot [ file normalize \
    141                       [ toltcl::eval { Text TolPackage::_.localRoot } ] ]
     141                      [ lindex [ toltcl::eval { Text TolPackage::_.localRoot } ] 0 ] ]
    142142  set clientRoot [ file join $localRoot Client ]
    143   set dirs [ glob -tail -dir $clientRoot -types {d r} * ]
     143  set dirs [ glob -nocomplain -tail -dir $clientRoot -types {d r} * ]
    144144  set pkgsInfo {}
    145145  foreach d $dirs {

  • tolbase/lib/toltk/tolpkg_gui.tcl

    r4c42e65 r2c0158d  
    370370    }
    371371  }
    372   if { [ lsearch [ image names ] product_update_32 ] == -1 } {
    373     image create photo product_update_32 -data {
    374       R0lGODlhIAAgAOf/AAAjAgEkAAQwBhM1DQM8AAA/AAs+Dhk7EwpCAxhAEQBKAQNOACVBHxRJCgBS
    375       ABJNDipHJAVYABlQGABdAC5NLx9WHUVHRClTKABoAABvAAZtBjZbNRZyAEJgPEBiN0FjOCFxDhB4
    376       ACtuJTFvM0RpQz1tOSt1JACGAACHACh5IDxxNhp/ERCDB2FjYE5sRyZ/HQCPAEF3PByJEWlraACZ
    377       BAGcADSLKCCUElGBTA2fAEOKOCiUJ0CLPnd5dmOCW3V6fGGDYlCLR0uQN2CGXlWORBilGXx+e3uA
    378       ghisACOoEBGtFEiYRH6DhYGDgFuWUi2oKQy1ECiuJDioMoiKh1ufWG+YYyK7BI2RlFmpU2yiYzu5
    379       JmWqT0q1N12wUi3DJSvGGm+rZUy5Q2SvYHmoale5RG6wYnqrc1u4Uj7FMzDOJXiyeD7MJHi0bVHF
    380       RZeplnS5cKKnqUHRNKaopU/MQ1/ISXDBaT7XMIu4hqesrpuyl17NXDreK62vrKuwsnrFdHPKape8
    381       jLCyr4zBjWHUU1DdQE3dSUngOVXbUKG9m5fCiovIf5LFi33OdXDUZGHcUnbUa1zfTJjKkLLAtK3E
    382       qbDDr3DebKvHpI3TiILZd2XmU4fYfl/qTX/dc1btT1rtR17rVlHxSnHma2DtWKjQpbjKt2zpZb7I
    383       w7zKvnvmbJvZj8HMupTfjKrYpITodsDQtqDcn2H2V77VuqDhnbjXuqPhl6fgnWz4Y8DYvLHfq4P0
    384       cZ3plbbfs8/U18bZxc/Wy4/wi73hvKzoq5L1iIH8d9Lb1sjgxL3mud3a39fc36bynrTtqs7izeLb
    385       59rf4tfh3N7g3Nzh5L/uutPm0s3o0uLg5MPtwLfztcjtyN/k57L5rOni79Ts0Ofl6dDw0uPo6ubp
    386       5eHr5uXq7e7n8+vp7ffp9+zu6+/t8env8ffs8+vx5vTt+dL8z+b058/+yezy9PPw9e/y7vL08fbz
    387       +PD19+P83/3y+fvz//n3+/P5+/f59vX88Pf9//v9+v78//3//P///yH+EUNyZWF0ZWQgd2l0aCBH
    388       SU1QACH5BAEKAP8ALAAAAAAgACAAAAj+AP8JHEiwoMGDBwP5W8iwocOHC6ckhEiRH798+PDlm+eP
    389       ycR9FS1azIcxX7x57jpObLjPYr+XMO+R3BgPnrt9RyaKdNmPH7117dbRy3fvHkp4SPnlNKhwZz99
    390       2XLZggWrU6ZKwdjdc/cO3jmcOvn18xcNkh07hjZ12kToC5Iwu+B9O3cOn5Gw/mRZgYIEjSNUrUId
    391       QnMjgggcPsyFszsxn79dMFCwkLKqWzp46a49kqLiQQEElMzNu2uQj79+8UQsqKADV7979d6ps1cv
    392       lZQuNzLcUTfvx8E+C90AYDDiVb93riKlWqRKXa1GmDApefJNXo+Dpv11ELChTD90iSD+2RqWbBAi
    393       adY01fmD5I4936X9fRsAoQSrfpO8GKpU7doeLaao8802yvixiDzwFWSaLwl4EMQ09mxBQxSRvHNJ
    394       EjWMMQ43HHIDzTkJEmRaOafEcks58AjhwAuW3MOGDRM4saEzzjxDzTnXxXdPP/XI8845RLiQBylm
    395       9KIAAVWI00sWQ5AgyTshDoSHP8WMMosv6KgDCAcgrBDCLSZgMIk4o8RAQQBP5liQHP6w8gQPVAgS
    396       yzNbnJADFFHcAAY14rzxwQEJEDNOlALh0Q84SbTBCBZLqEGNInQ4Qscix2hTDA8UAAAEN96oSZAc
    397       +dQjBgpc/BEGLuRo8wwxzWijzTL+WFxgAAKn3EjoP3Lg8w4lC0Rggg5k4IKNq9o0s8sZKWiQARjc
    398       NDPaQXDMEw42F0jQQAM7oFHJKrSswskcReTwlo3e7NPEQXK44804lJDyhgw0eFHIJ6KwtcYXaTTi
    399       DKfnqGQQHO94g80443zDih5xGOKJJ6AsXEot1HATzjkpeTpQuthgAw001KgKjC6/CCNMMsY8ow03
    400       3yAFjz8zQGuOxtA0I/MxzDBzzM01U+NNOe7YdBNCcpyz8czNIGO00TdHPM477jQ9TzkIwTGOzDIf
    401       jfQxzWDjzTk2wYOPP/ksVRo+4YTjjTeccno21/jwAxI/8/ByBUICtdDEEXjnbQQS3kY0McXfUzQx
    402       gwV0F2644QEBADs=
    403     }
    404   }
    405   if { [ lsearch [ image names ] file_remove_32 ] == -1 } {
    406     image create photo file_remove_32 -data {
    407       R0lGODlhIAAgAOf/AMIABToqFMMWGMUaIFZBH1pFI11HJcYpKcYpL19JJ8gqKmBKKGFLKExOS2NM
    408       JMIvLmVNJmZOJlFTUGlRKWxTJW5VJ3BXKcc9Os48PXhZLHBaPNE+P3ddL19hXntdNnpgMYFgLtFH
    409       R4RjMHRnUWhqZ4hmM9FPT4VuT5JuNYtvQJNvNpRwN5VxOJZyOZdzOnZ4dZh0O5p1PIJ4bJt2PZx3
    410       Pp14P555QJ96QKB7QYh+cs5qa4OAcqF8QqJ9Q8ttbKN+RKJ+SsxubaR/RZ2AUKN/S6aARqWATKeB
    411       R6GDTaiCSKKETqmDSY6GgKWFSaOFT6qESqWGUKuFS5qIZ6yGTImLiK2HTaiJU66ITq2IVLCJT9l6
    412       eLGKUJONjN95erKLUbGMV7OMUo+Rjq2OV7SNU7ONWbWOU6yPZLaPVLWPWt9/fZKUkbGRVKKTfLOS
    413       VZmUkraRXOGBf7OTXLWUV7SUXbiTXeKDhrWVXrqUXraWX5ial7iXWreXYK2ZceGIibmZYaybfqib
    414       irqaY+SLi7ycZL2dZZ+hnr6eZr+fZ8CgaOSSkMGhacChb8KiasOja+CWl8KjceaVmcSkbMalbcOl
    415       eaeppcembsWmdKiqp+Sam8inb+Ccm8mocMiodsqpccmpd8uqcs2sc8yses+tdc2te7Cyruejoc2v
    416       gsixgs+wfc6wg+mlo7K0sbO1su2opsa2n9G0s8y2ssi7qby+u+izsr2/vL7BvcHDv8LEwcPFwsTG
    417       w8XHxMbIxdHFxeq+wcfJxu2/vMjKx9THx8nLyNTJvNXIyMrMye/CxenExcvOys3Py+3HyM7QzdvO
    418       z+/JytHT0NLU0djT0tPV0t/S0tXX1OHU1NvW1NbY1enU19ja1t7Z2Nnb19rc2dze293f3N7g3d/h
    419       3ubh3+Hk4Ojj4uPl4eTm4+Xn5Ozm5ebo5efp5ujq5+nr6Ors6fDr6evu6u3v6+7w7e/x7vXw7vDy
    420       7/Hz8Pjy8fL08fP18vT38/b49Pf59vj69/n7+Pr8+fv9+v3//P///yH+EUNyZWF0ZWQgd2l0aCBH
    421       SU1QACH5BAEKAP8ALAAAAAAgACAAAAj+AP8JHEiwoMGDCAXWQkjFG7qEEHGhe1jQ1jhv7ihCLEgJ
    422       XTp46brlEehN3blv796F2VjQWbp079y1a+fw3bpz4eDBY8WS4LN06tbNa5dxHLyM5+bNE9ZzYLSg
    423       7ea5ewcv3Dx569Ldu4etqcBo64i+mwdPnrp59o7m0/fN679pRKfWk4d2Hr6r+/Spcwt3Krx69e7h
    424       y7cPH75++OS5xeZ3XmDC/Pr587dP6WKqdO9BnjwZH9GejEaFGoXKlGlTqFKdNp3q1ClLnDwtSlhJ
    425       lG3bnzbp3pQpUyVJwCU1YsSo0SPalX4DbzRckSJEhw4ZIkQo0KRhyc6p05bsIHTp1AP+iQ+0pzye
    426       83RcYUMHz7E9e/N2ESy/5zweO3PmxEGD5kyZMmOAEYs26phDVz32xENPPV0JhIUVUESohBJIGGGh
    427       hUBkyEd215SijFLxGKNMPPPIMlAVRRTxw4or8uDiizzcMg01iSQCyTHszKJKK7/M804HAolRRRVT
    428       TBHFkU88scQSTSRhBi3dgKNJHX0IgomNmDTjIyUCtQHgGAF6scUWWWQxZBV/5MLNOOA40kUacFDZ
    429       C13vICOQHnTkyR9/ZPRJxpiA4KJNOOFQY8IGGISgRTrrvNPONALJsd8ZXoY5pplVsHHJLs8QgwAA
    430       oIIaRDfeYOOLQGW0YWmZQxqZpBTWheTCywOhDhCqDt5Mw9M/YmJKZBRKLpHEEUUMoYYtsAggKjQX
    431       gHpANtFQIRCRrgo7bIoquijDKr68IoAP2GDD7AHMTHOqQEpem2KLPOBwww02pMCFLcUEM0242lQj
    432       zTTJkDAQtj+86K4NNtRAwwwxxHCCG7cAk0w0907zDDLSDiQwvDUYjLALHLfAwgoe7ECKLsAIg0wx
    433       skhQUAwF03BwDBy74PEKKqiAwgoulKDBCDkw8UIDBxVQggggfMBBBhZUQMEEEUDgwNMQMLBAAgYQ
    434       EIBbWB8UEAA7
    435     }
    436   }
    437   if { [ lsearch [ image names ] check_connection_32 ] == -1 } {
    438     image create photo check_connection_32 -data {
    439       R0lGODlhIAAgAOeWAGhoaGlpaQCUAGxsbACYAG5ubgCbAHFxcQCeAHNzcwChAACiAHR0dHV1dXZ2
    440       dgClAHd3d3h4eACoAHl5eQumC3p6egCrAHt7ewCsAA6nDnx8fA+oD319fQCvAH5+foCAgACzAIGB
    441       gQC1AIKCggC2AIODgwC4AEKeQoSEhAC5AIWFhYaGhoeHhwC9AImJiYqKioyMjI2NjY6Ojo+Pj5CQ
    442       kJGRkZKSkpOTk5SUlJWVlZaWlpiYmJmZmVS3VJubm5ycnJ6enlS8VJ+fn6GhoaKioqOjo2y9bKen
    443       p6ioqJSylKurq6ysrK6urq+vr7CwsLKysrOzs7S0tLW1tbe3t7i4uIfPh7y8vL29vb+/v8PDw8TE
    444       xMXFxcbGxsfHx8jIyMnJycrKysvLy8zMzM3Nzc7Ozs/Pz9DQ0NHR0dLS0rrcutPT09TU1NXV1dbW
    445       1tfX19jY2NnZ2dra2tvb28jjyNzc3N3d3d7e3t/f3+Dg4OHh4eLi4uLj4uPj4+Tk5OXl5ebm5ufn
    446       5+jo6Onp6erq6uvr6+zs7O3t7e7u7u/v7/Dw8PHx8fLy8vPz8/T09PX19fb29vf39/j4+Pr6+vn7
    447       +fv7+/z8/P//////////////////////////////////////////////////////////////////
    448       ////////////////////////////////////////////////////////////////////////////
    449       ////////////////////////////////////////////////////////////////////////////
    450       ////////////////////////////////////////////////////////////////////////////
    451       ////////////////////////////////////////////////////////////////////////////
    452       /////////////////////////////////////////////////////yH+EUNyZWF0ZWQgd2l0aCBH
    453       SU1QACH5BAEKAP8ALAAAAAAgACAAAAj+AP8JHEiwoMGDCBMqXMiwoUOFLJCsMAjgocEYY9qooUGQ
    454       RgCLBF+YWYPmjRwfXdZsqQFyoAs0cAqRKUMHzxEwcVoKZKGmDp0/isygsfPnyBudKtjkgYPmzqCg
    455       SvX8aFnCTZ8/kNyoyVNI0Zk3fOSosDiiDSCihiC9YdMHkSI0cf6YsfiEUCM9awQhUvsG6KKhb4o0
    456       rEDjRhtFlPi0IaQIEhw5ghopGqMFCEMOdCwJ4aGGUeI3hxhFimNHkJwtShhWaFMpUCMcO8o8Siwn
    457       kaNIbtZoWcLwgplIlCrFYQRDxxhIlfrYYaSIThYmDCd8abToUSVJcAKNuOFFUvI6b7T+NNHAMEtj
    458       OIIYVcJd50INLpQWmcnixMNAAQivHDr0SG2gRZU80gYaDchAhRv0cTAQAQwaNAUhd9xRyCOOmJVI
    459       JYyo0cUBGtCwRAgDGSCiiATN8McgFZb2CCNr+GHIJHOEYcUEL9gnEAI44liQB1f0EdoadADyyFt7
    460       BJFBGljwQJACCzS5wEElTJHHIYqoIYcfkCDSwwMPbJAECgNxKSZCDHzQxB2HJHJGHHxAUoUEcFJA
    461       EJxwKjTCBEjAcYghZcCBxyFGYCCoBQIJKuhCb1SQABFoHELIGHKEIcUJHVRqaaUMxQFGBAX4IMYh
    462       gHgRRQz/gGDqqSAwVMMWa3QBwQAtOWjRBRQzDCQCCbiSwFAAHA3kwAAqDGFDQSakkEJDFRXkgAMK
    463       GtSCTtBG+1BAADs=
    464     }
    465   }
    466372  if { [ lsearch [ image names ] package_down_16 ] == -1 } {
    467373    image create photo package_down_16 -data {
    … …  
    487393    }
    488394  }
    489   if { [ lsearch [ image names ] software_update_16 ] == -1 } {
    490     image create photo software_update_16 -data {
    491       R0lGODlhEAAQAPYAAM5cAM5dAM9dAM5dAc9dAc9eAc9eAs9fAs9eA89fBNBeAdBfAtBfA9FhBNFh
    492       BdBhBtBiB9FjCNFjCtFkCtJkCtNlC9RlCNJmDdJnD9ptDdJoENNoENNpEt1xENhzHN96IN97IuF/
    493       JfaDE/WEEvaFE/aGFfaFF/aKGfKIH/eNH/iQG/iRHfiSH9+FMeKAJu6FIO+FIfCHIvCHI/OKIPaL
    494       I/KNK/iWIfWSL+OOPPGTNPSWN/iYMfmeMviaNPmhOfmhPfqmPvafRfahRvmiQfqnQPqoQfemTvSm
    495       UveoUPWrV/u0V/u3XvayYvSzZvW0aPa3a/q0avq0a/u3bfa4bPm4aPu6cfu6cvm9cfrAdPvBdPzB
    496       df7kv//qzQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
    497       AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5
    498       BAEAAF0ALAAAAAAQABAAAAeYgF2Cg4SFhoIHCYeGBy04C4tdEhwGE1dYGgQYFwCFG1pTTUtKTk9Z
    499       HoYBTEVEW1tEQFQIhQURRz42XFw2PEkVkIIEIEZDLCq6Kis/SC4GggYfQT1WurpVO0IhzoICEDkp
    500       UrpSJzoUCoY1JSRRUCQjNwOGDjQyLyYiMDE0FoYMEAUMUMxwUOBBg06HBGTocC7SoAIEHEoUFAgA
    501       Ow==
     395  if { [ lsearch [ image names ] system_software_update_16 ] == -1 } {
     396    image create photo system_software_update_16 -data {
     397      R0lGODlhEAAQAPcAANpuFd5uFtVwFd1xFedyFedyFul7Fel8FuBxGOd2H+Z6G+l+G99yJ9x/IOBz
     398      JeZ6Ieh7JOJ3LeJ4K+h/Leh7Meh7Muh8Mul+P+R/QOh/QcmBGM2GGd+AGt2LHdiRG9qTHN+YHd+a
     399      HuWAH+CPHeOMH+iHJuyMJ+uOK+qdKOiCPOiFPuqOOuuOO+2WPeycPe2hLO+kP/CtPueGR+mCROmL
     400      SuqMS+mMTOuOT+OZQeqRSOuSS+qQTuyZTueLU+mQVeqRVeybVeuTWO6qTvCwQvK3T/K4UuuQYeiS
     401      YOuSY+uUYeqYZ+ued++oYOuheu6meeuhfO6kfvC1cvG3ffPCeu2mgO6ngO+uhe6ujfK9hfC1jO2s
     402      kO+ukO2uku+xlO6xl+6ymPG6kPK+lfK/lvC4nvC5oPK+ovK/ovG9pfG9pvG9p/XJiPPAkPXJnPbO
     403      nfXMoPTGq/LDrvTKr/TLsfjetfbWufbUuvbUvPbWvPbVvvfavfjevfnhu/bVxfbYwvjexPbXyPbW
     404      yfbXyffZyPbZzffe0frmyfrny/jj1fji1vji1/nm1vjg2Pjh2fjl2vnk2/rp2frr2frs2/no4fvu
     405      5Pz08AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
     406      AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
     407      AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
     408      AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
     409      AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
     410      AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAJUALAAAAAAQABAA
     411      AAjJACsJHEiwoMFKWrx84XJw4JItY9CkIdPlycEjVM4AWsRoEJwrTQpiUFLGUaM/fBJJCmSmB0EZ
     412      VhAJqoLECBRClOT4GMjARpxDTmZcyJDkjZ0sNCIIdLCjD54bFihUSFEjyA8VEgQGeJBDx4QEBQgQ
     413      gACmTg4EAgEoABJGDI8FBg6wuENnxYCBIqRMUsTkhIkWax5hKSFgYIMoeiL5ccMmD6Q2LjgUxCFk
     414      ypxChvaogUHiYAcUMYgUGfJiRMNKGjyACPFhw+nXAgMCADs=
    502415    }
    503416  }
    … …  
    583496    }
    584497  }
     498  if { [ lsearch [ image names ] software_update_urgent_16 ] == -1 } {
     499    image create photo software_update_urgent_16 -data {
     500      R0lGODlhEAAQAPYAAHgXF6wiIqUtLa8vL7AjI+EXF+AZGeIaGuUdHdQoKNUpKdYrK9ctLdcvL8ox
     501      Mco5OdgxMdg1Ndg2Ntk/P+giIu4nJ+gqKu4oKO4qKustLewxMe8wMO8zM+80NO44OO84OOk+PvA6
     502      OvA7O/A8PPA+PsFCQshHR9hTU95YWOpHR+5FRe9FRetISOxKSvBCQvBDQ/BERPFGRvFMTOtSUuVe
     503      Xu9YWPBQUPBTU/JWVvNbW/JcXPNcXPJeXvNeXulhYfR8fPV+fvR/f+mAgOqFhfWAgPjR0fjV1fzY
     504      2Pje3vzf3/zn5/rq6vzu7v309P729v34+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
     505      AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
     506      AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5
     507      BAEAAFAALAAAAAAQABAAAAdzgFCCg4SFhoeIEIIFBoiDDRUHT08WUAmIkAhLTBoVCokXFEhKHRUL
     508      iBIbGUZJHBgMhg8TKSEeRUcfHCARDoUzMC8uQUQkIyIshgE1MipCQysxNgSHAjwtTU43OAOOJT0/
     509      QDomjoInOzko5IM0PuqEAO7qgQA7
     510    }
     511  }
     512  if { [ lsearch [ image names ] view_refresh_16 ] == -1 } {
     513    image create photo view_refresh_16 -data {
     514      R0lGODlhEAAQAPeiAChAYClBYipDZSxIbixIby9LcS9Mcy9MdC9NdS9NdjBMcjBMczZSdzZSeDZS
     515      eTZTeTdTeTdTejdUelBtlVBtllFvl1BvmFFvmFJvmFRxmFVymSxtxCltyC1wyyxwzDJxxjZzxzZ0
     516      xjZ1yz56yzl5zj580EB+0GqJs2uJs2uLtmyLt22MuHCPuHKQunWTu0eBzkiAzEyCzE6DzEyDzk+F
     517      zU+Fz0mD0U2H00yG1E+I1FGI1FGJ1FOL1VSL1FSL1VWM1VuN0FmO11mP11qP11yQ11+S2GaV1WuY
     518      1GCT2GOV2WSW2WWW2WqZ2Wqa22yb222c23Ce3Hih13Wg2nSh3XWh3Xai3nih2Xih2n6l2Xmj3Xij
     519      3nmk3nmk332n34ekzYqnzoem0Iin0Iin0Y6q0Yqv35Ov1ZWx1p643J+53YCp4Ias4Yiu4o2x446z
     520      45a24Ze45p664J+74Zi55py75J6+55++56O94KO94aC84qK+46e/4KC+5qS/5KTA5afB5KjB4ajB
     521      463F5qTB6afE6ajE6avG6qvG667H6a3H667I67HI57LJ6LXN7bfO7rjP7r/U78DU78fX7cLV8Mja
     522      8cnb8svc8szc8tvn9uDq+OHr+OLr+Pf6/fj6/fr7/Pv8/v39/f7+/v7+/////wAAAAAAAAAAAAAA
     523      AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
     524      AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
     525      AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
     526      AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
     527      AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAAKMALAAAAAAQABAA
     528      AAjyAEcJFKggwYIFCRQMXCgQQosyihaZcRGB4SgEGPy0odLkSZc3gTQgWFiBUBIfVBIN4rIEyqEM
     529      AyHkIXJDUihRojxNKsIEkINRClakKdRIFCU5dSqJEqSDDIuCYoZcEpXpyRQtUxA56mFkjEE+JiBx
     530      srSmiZMmStgwmfHnIJ8SPnDsEFIEiRpMoubA0IMwDA8Siejk4PEjiKZPkYB8Sagii4c1ohhV2fII
     531      lJsjWFAolBDHRgdDm3B26vNBBpoHAy/secFBhJQrIzbEwDNh4QELcKzUABGCRpQzFAwwFNAgBZg7
     532      drycYBDAosAABAoUGACAYUAAOw==
     533    }
     534  }
    585535}
    586536
    … …  
    656606      set img "package_down_16"
    657607      set nodeStatus new
    658       set statusLabel "new ($lastremote)"
     608      set statusLabel [ mc "new (%s)" $lastremote ]
    659609    } else {
    660610      set idx [ CmpVersion $lastremote $lastlocal ]
    … …  
    663613        set img "cdr_tick_16"
    664614        set nodeStatus ok
    665         set statusLabel "ok"
     615        set statusLabel [ mc "ok" ]
    666616      } else {
    667617        puts "$lastremote > $lastlocal"
    668         set img "software_update_16"
     618        set img "system_software_update_16"
    669619        set nodeStatus upgrade
    670         set statusLabel "upgrade ($lastremote)"
     620        set statusLabel [ mc "upgrade (%s)" $lastremote ]
    671621      }
    672622    }
    … …  
    674624    set img ""
    675625    set nodeStatus unknown
    676     set statusLabel "unknown"
    677  }
    678   set treeParents($p) [ $T insert [ list [ list $img $p ] [ list $statusLabel ] \
    679                                         [ list $repo ] ] -at end -relative root \
    680                                         -button auto ]
    681   set nodesInfo($treeParents($p),type) pkg
    682   set nodesInfo($treeParents($p),status) $nodeStatus
     626    set statusLabel [ mc "unknown" ]
     627  }
     628  set nid [ $T insert [ list [ list $img $p ] [ list $statusLabel ] \
     629                            [ list $repo ] ] -at end -relative root \
     630                -button auto ]
     631  set treeParents($p) $nid
     632  set nodesInfo($nid,type) pkg
     633  set nodesInfo($nid,status) $nodeStatus
     634  foreach st {new ok update upgrade unknown} {
     635    set nodesInfo($nid,children,$st) 0
     636  }
    683637  lappend nodesInfo($nodeStatus) $treeParents($p)
    684638}
    … …  
    739693        set img "package_down_16"
    740694        set nodeStatus new
    741         set statusLabel "new"
     695        set statusLabel [ mc "new" ]
    742696      } else {
    743697        set idx [ string compare $dateremote $datelocal ]
    … …  
    746700          set img "cdr_tick_16"
    747701          set nodeStatus ok
    748           set statusLabel "ok"
     702          set statusLabel [ mc "ok" ]
    749703        } else {
    750704          puts "$pv OUTDATED : $dateremote > $datelocal"
    751           set img "software_update_16"
     705          set img "view_refresh_16"
    752706          set nodeStatus update
    753           set statusLabel "outdated"
     707          set statusLabel [ mc "update" ]
    754708        }
    755709      }
    … …  
    757711      set img ""
    758712      set nodeStatus unknown
     713      set statusLabel [ mc "unknown" ]
    759714    }
    760715    set repo [ GetRepoId $pkgRepo ]
     716    set parent $treeParents($pkgRoot)
    761717    set nid [ $T insert [ list [ list $img $pv ] [ list $statusLabel ] [ list $repo ] ] \
    762                   -at end -relative $treeParents($pkgRoot) -button auto ]
     718                  -at end -relative $parent -button auto ]
    763719    set nodesInfo($nid,type) pkgver
    764720    set nodesInfo($nid,status) $nodeStatus
     721    incr nodesInfo($parent,children,$nodeStatus)
     722    if { $nodeStatus eq "update" } {
     723      if { $nodesInfo($parent,status) ne "update" } {
     724        if { $nodesInfo($parent,status) eq "upgrade" } {
     725          set nodesInfo($parent,status) "upgupd"
     726          $T itemcolumn $parent NAME {image "software_update_urgent_16"}
     727          set txtUpgrade [ lindex [ lindex [ $T itemcolumn $parent STATUS text ] 0 ] 1 ]
     728          $T itemcolumn $parent STATUS \
     729              [ list text [ mc "update/%s" $txtUpgrade ] ]
     730        } elseif { $nodesInfo($parent,status) ne "upgupd"} {
     731          set $nodesInfo($parent,status) "update"
     732          $T itemcolumn $parent NAME {image "view_refresh_16"}
     733          $T itemcolumn $parent STATUS [list text [ mc "update" ] ]
     734        }
     735      }
     736    }
    765737    lappend nodesInfo($nodeStatus) $nid
    766738    foreach {{} d} $pkg(_.autodoc.dependencies) {
    … …  
    818790    lappend selectionInfo($nodesInfo($nid,type)) $nid
    819791  }
    820   $w add command  -label "[ mc {Add New Repository} ]..." \
     792  $w add command  -label [ mc "Add New Repository" ]... \
    821793      -command ::TolPkgGUI::AddNewRepository
    822794  set lenRepo [ llength $selectionInfo(repo) ]
    823795  if { $lenRepo } {
    824     $w add cascade  -label "[ mc {Check Repository} ]" \
     796    $w add cascade  -label [ mc "Check Repository" ] \
    825797        -menu $w.check
    826798    if { [ winfo exists $w.check ] } {
    … …  
    861833        lappend listNEW [ list $pkgInfo(lastremote) $nid ]
    862834      }
    863       "upgrade" {
    864         lappend listUPG [ list $pkg $nid ]
    865       }
     835      "upgrade" -
     836      "update" -
     837      "upgupd" {
     838        if { $nodesInfo($nid,status) eq "upgrade" ||
     839             $nodesInfo($nid,status) eq "upgupd" } {
     840          lappend listUPG [ list $pkg $nid ]
     841        }
     842        if { $nodesInfo($nid,status) eq "update" ||
     843             $nodesInfo($nid,status) eq "upgupd" } {
     844          foreach chId [ $T item children $nid ] {
     845            if { $nodesInfo($chId,status) eq "update" } {
     846              lappend listUPD [ list [ $T item text $chId 0 ] $chId ]
     847            }
     848          }
     849        }
     850      }
    866851      "ok" {
    867852      }
    … …  
    869854      }
    870855      default {
    871         puts "unexpected status $status for pkg $pkg"
     856        puts "unexpected status $nodesInfo($nid,status) for pkg $pkg"
    872857      }
    873858    }
    … …  
    889874      }
    890875      default {
    891         puts "unexpected status $status for pkg $pkg"
     876        puts "unexpected status $nodesInfo($nid,status) for pkg $pkg"
    892877      }
    893878    }

  • tolbase/lib/wtree/wtree.tcl

    r4c42e65 r2c0158d  
    792792  }
    793793
     794  method itemcolumn { item col args } {
     795    set colid [ $tree column id $col ]
     796    if { $colid eq "" } {
     797      puts "$col does not reference a valid column"
     798      return
     799    }
     800    set ret {}
     801    foreach elemdata $args {
     802      set v ""
     803      foreach { e v } $elemdata break
     804      if { $v eq "" } {
     805        array set def_prop {
     806          text -text
     807          image -image
     808        }
     809        lappend ret [ list $e [ $tree item element cget $item $colid $elements($e) $def_prop($e) ] ]
     810      } else {
     811        set e_conf [ $self _build_element_config $e $v ]
     812        eval $tree item element configure $item $colid $e_conf
     813      }
     814    }
     815    return $ret
     816  }
     817
    794818  method insert { data args } {
    795819    array set insopt {
    … …  
    10211045}
    10221046
     1047msgcat::mcload [ file join [ file dir [ info script ] ] msgs ]
     1048
    10231049package provide wtree 1.0
Note: See TracChangeset for help on using the changeset viewer.