tazpkg diff tazpkgbox @ rev 334

tazpkgbox: some improvements to gui
author Rohit Joshi <jozee@slitaz.org>
date Fri Mar 19 11:23:01 2010 +0000 (2010-03-19)
parents cd4d52716080
children d6183a5cf8c4
line diff
     1.1 --- a/tazpkgbox	Thu Mar 18 17:26:59 2010 +0000
     1.2 +++ b/tazpkgbox	Fri Mar 19 11:23:01 2010 +0000
     1.3 @@ -320,7 +320,7 @@
     1.4  				<item>non-free</item>
     1.5  			</combobox>
     1.6  			<button>
     1.7 -				<label>List</label>
     1.8 +				<label>List Packages</label>
     1.9  				<input file icon="reload"></input>
    1.10  				<action>echo "$CAT" > /tmp/tazpkgbox/category</action>
    1.11  				<action>echo "$STATUS" > /tmp/tazpkgbox/status</action>
    1.12 @@ -388,64 +388,75 @@
    1.13  			<action>refresh:PKG_STATS</action>
    1.14  			<action>refresh:CACHE_STATS</action>
    1.15  		</tree>
    1.16 +		
    1.17  		<hbox>
    1.18 -			<text>
    1.19 -				<label>"Undigest:"</label>
    1.20 -			</text>
    1.21 -			<combobox>
    1.22 -				<variable>UNDIGEST_ENTRY</variable>
    1.23 +			
    1.24 +			<button>
    1.25 +				<label>Setup/Add undigest mirrors</label>
    1.26 +				<input file icon="go-next"></input>
    1.27 +				<action type="launch">SETUP_UNDIGEST</action>
    1.28 +			</button>
    1.29 +		</hbox>
    1.30 +		<frame List packages on undigest mirrors>
    1.31 +			<hbox> 
    1.32 +				<text>
    1.33 +					<label>"Undigest:"</label>
    1.34 +				</text>
    1.35 +				<combobox>
    1.36 +					<variable>UNDIGEST_ENTRY</variable>
    1.37  '
    1.38  TAZPKG_DIALOG="$TAZPKG_DIALOG $tmp"
    1.39  for i in all $(ls /var/lib/tazpkg/undigest 2> /dev/null); do
    1.40  	TAZPKG_DIALOG="$TAZPKG_DIALOG <item>$i</item> "
    1.41  done
    1.42 -tmp='			</combobox>
    1.43 -			<button>
    1.44 -				<label>Setup undigest mirrors</label>
    1.45 -				<input file icon="go-next"></input>
    1.46 -				<action type="launch">SETUP_UNDIGEST</action>
    1.47 -			</button>
    1.48 -		</hbox>
    1.49 -		<hbox>
    1.50 -			<text>
    1.51 -				<label>"Status:"</label>
    1.52 -			</text>
    1.53 -			<combobox>
    1.54 -				<variable>UNDIGEST_STATUS</variable>
    1.55 -				<item>all</item>
    1.56 -				<item>installed</item>
    1.57 -				<item>installable</item>
    1.58 -				<item>blocked</item>
    1.59 -				<item>upgradeable</item>
    1.60 -			</combobox>
    1.61 -			<text>
    1.62 -				<label>"Category:"</label>
    1.63 -			</text>
    1.64 -			<combobox>
    1.65 -				<variable>UNDIGEST_CAT</variable>
    1.66 -				<item>all</item>
    1.67 -				<item>base-system</item>
    1.68 -				<item>x-window</item>
    1.69 -				<item>utilities</item>
    1.70 -				<item>network</item>
    1.71 -				<item>graphics</item>
    1.72 -				<item>multimedia</item>
    1.73 -				<item>office</item>
    1.74 -				<item>development</item>
    1.75 -				<item>system-tools</item>
    1.76 -				<item>security</item>
    1.77 -				<item>games</item>
    1.78 -				<item>misc</item>
    1.79 -				<item>meta</item>
    1.80 -				<item>non-free</item>
    1.81 -			</combobox>
    1.82 -			<button>
    1.83 -				<label>List</label>
    1.84 -				<input file icon="reload"></input>
    1.85 -				<action>echo "$UNDIGEST_CAT $UNDIGEST_ENTRY $UNDIGEST_STATUS" > /tmp/tazpkgbox/undigest-category</action>
    1.86 -				<action>refresh:DEV</action>
    1.87 -			</button>
    1.88 -		</hbox>
    1.89 +tmp='			</combobox>		
    1.90 +            			
    1.91 +				<text>
    1.92 +					<label>"Status:"</label>
    1.93 +				</text>
    1.94 +				<combobox>
    1.95 +					<variable>UNDIGEST_STATUS</variable>
    1.96 +					<item>all</item>
    1.97 +					<item>installed</item>
    1.98 +					<item>installable</item>
    1.99 +					<item>blocked</item>
   1.100 +					<item>upgradeable</item>
   1.101 +				</combobox>
   1.102 +			</hbox>
   1.103 +			<hbox>	
   1.104 +				<text>
   1.105 +					<label>"Category:"</label>
   1.106 +				</text>
   1.107 +				<combobox>
   1.108 +					<variable>UNDIGEST_CAT</variable>
   1.109 +					<item>all</item>
   1.110 +					<item>base-system</item>
   1.111 +					<item>x-window</item>
   1.112 +					<item>utilities</item>
   1.113 +					<item>network</item>
   1.114 +					<item>graphics</item>
   1.115 +					<item>multimedia</item>
   1.116 +					<item>office</item>
   1.117 +					<item>development</item>
   1.118 +					<item>system-tools</item>
   1.119 +					<item>security</item>
   1.120 +					<item>games</item>
   1.121 +					<item>misc</item>
   1.122 +					<item>meta</item>
   1.123 +					<item>non-free</item>
   1.124 +				</combobox>
   1.125 +				<text>
   1.126 +					<label>"          "</label>
   1.127 +				</text>
   1.128 +				<button>
   1.129 +					<label>"      List Packages            "</label>
   1.130 +					<input file icon="reload"></input>
   1.131 +					<action>echo "$UNDIGEST_CAT $UNDIGEST_ENTRY $UNDIGEST_STATUS" > /tmp/tazpkgbox/undigest-category</action>
   1.132 +					<action>refresh:DEV</action>
   1.133 +				</button>
   1.134 +				</hbox>	
   1.135 +		</frame>		
   1.136 +			
   1.137  	</vbox>
   1.138  
   1.139  	<vbox>
   1.140 @@ -489,6 +500,7 @@
   1.141  				</button>
   1.142  			</hbox>
   1.143  		</frame>
   1.144 +		<hbox>
   1.145  		<frame Mirror URL>
   1.146  			<hbox>
   1.147  				<entry>
   1.148 @@ -509,20 +521,25 @@
   1.149  					<action>clear:MIRROR</action>
   1.150  					<action>refresh:MIRROR</action>
   1.151  				</button>
   1.152 +			</hbox>
   1.153 +		</frame>
   1.154 +		<frame Mirror Packages>
   1.155 +				<hbox>	
   1.156  				<button>
   1.157  					<input file icon="media-cdrom"></input>
   1.158 -					<label>DVD</label>
   1.159 +					<label>DVD Box</label>
   1.160  					<action type="launch">SETUP_DVD</action>
   1.161  				</button>
   1.162 -			</hbox>
   1.163 +				</hbox>
   1.164  		</frame>
   1.165 +		</hbox>
   1.166  		<hbox>
   1.167 -			<frame Journal>
   1.168 +			<frame Install Logs>
   1.169  				<hbox>
   1.170  				<button>
   1.171 -					<label>Show journal</label>
   1.172 +					<label>View Logs</label>
   1.173  					<input file icon="find"></input>
   1.174 -					<action>xterm -fa MiscFixed -fs 11 -bg gray93 -fg black -T "$(ls -l /var/log/tazpkg.log | while read mod links user grep remain ; do echo $remain ; done) (q to quit)" -geometry 80x25+120+120 -e "cat /var/log/tazpkg.log | less"</action>
   1.175 +					<action>xterm -fa MiscFixed -fs 11 -T "$(ls -l /var/log/tazpkg.log | while read mod links user grep remain ; do echo $remain ; done) (q to quit)" -geometry 80x25+120+120 -e "cat /var/log/tazpkg.log | less"</action>
   1.176  				</button>
   1.177  				</hbox>
   1.178  			</frame>
   1.179 @@ -531,10 +548,10 @@
   1.180  				<button>
   1.181  					<label>Repack config</label>
   1.182  					<input file icon="edit-redo"></input>
   1.183 -					<action>xterm -fa MiscFixed -fs 11 -bg gray93 -fg black -T "Repack configs" -geometry 80x25+120+120 -e "tazpkg repack-config ; sleep 5" 2> /dev/null</action>
   1.184 +					<action>xterm -fa MiscFixed -fs 11 -T "Repack configs" -geometry 80x25+120+120 -e "tazpkg repack-config ; sleep 5" 2> /dev/null</action>
   1.185  				</button>
   1.186  				<button>
   1.187 -					<label>Show Files</label>
   1.188 +					<label>View Files</label>
   1.189  					<input file icon="tazpkg"></input>
   1.190  					<action type="launch">LIST_CONFIG_FILES</action>
   1.191  				</button>
   1.192 @@ -545,12 +562,12 @@
   1.193  				<button>
   1.194  					<label>Quick check</label>
   1.195  					<input file icon="system-search"></input>
   1.196 -					<action>xterm -fa MiscFixed -fs 11 -bg gray93 -fg black -T "Check packages (q to quit)" -geometry 80x25+120+120 -e "tazpkg check | less " 2> /dev/null</action>
   1.197 +					<action>xterm -fa MiscFixed -fs 11 -T "Check packages (q to quit)" -geometry 80x25+120+120 -e "tazpkg check | less " 2> /dev/null</action>
   1.198  				</button>
   1.199  				<button>
   1.200  					<label>Full check</label>
   1.201  					<input file icon="system-search"></input>
   1.202 -					<action>xterm -fa MiscFixed -fs 11 -bg gray93 -fg black -T "Check packages (q to quit)" -geometry 80x25+120+120 -e "tazpkg check --full | less " 2> /dev/null</action>
   1.203 +					<action>xterm -fa MiscFixed -fs 11 -T "Check packages (q to quit)" -geometry 80x25+120+120 -e "tazpkg check --full | less " 2> /dev/null</action>
   1.204  				</button>
   1.205  				</hbox>
   1.206  			</frame>
   1.207 @@ -586,9 +603,9 @@
   1.208  			<action>refresh:CACHE_STATS</action>
   1.209  		</button>
   1.210  		<button>
   1.211 -			<label>Wok</label>
   1.212 +			<label> View Wok</label>
   1.213  			<input file icon="gtk-open"></input>
   1.214 -			<action>firefox http://hg.slitaz.org/wok/file/</action>
   1.215 +			<action>browser http://hg.slitaz.org/wok/file/</action>
   1.216  		</button>
   1.217  		<button help>
   1.218  			<label>Help</label>