Check-in [0eca8ff7a2]
Not logged in

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview

SHA1 Hash:0eca8ff7a27704f53e7f83c84d2ab9344a907451
Date: 2012-08-11 03:18:00
User: BarryK
Comment:major-category icons added to /usr/local/lib/x11/mini-icons, for use in ppm, ppm scripts modified

Tags And Properties
Changes

Changes to woof-code/rootfs-skeleton/usr/local/lib/X11/mini-icons/mini-BuildingBlock.xpm

@@ -1,1 +1,1 @@
-
+Executable.xpm

Changes to woof-code/rootfs-skeleton/usr/local/lib/X11/mini-icons/mini-Business.xpm

@@ -1,1 +1,1 @@
-
+mini-calc.xpm

Changes to woof-code/rootfs-skeleton/usr/local/lib/X11/mini-icons/mini-Calculate.xpm

@@ -1,1 +1,1 @@
-
+mini-calc.xpm

Changes to woof-code/rootfs-skeleton/usr/local/lib/X11/mini-icons/mini-Desktop.xpm

@@ -1,1 +1,1 @@
-
+mini-desktop.xpm

Changes to woof-code/rootfs-skeleton/usr/local/lib/X11/mini-icons/mini-Develop.xpm

@@ -1,1 +1,1 @@
-
+mini-hammer.xpm

Changes to woof-code/rootfs-skeleton/usr/local/lib/X11/mini-icons/mini-Document.xpm

@@ -1,1 +1,1 @@
-
+mini-doc1.xpm

Changes to woof-code/rootfs-skeleton/usr/local/lib/X11/mini-icons/mini-Filesystem.xpm

@@ -1,1 +1,1 @@
-
+mini-filemgr.xpm

Changes to woof-code/rootfs-skeleton/usr/local/lib/X11/mini-icons/mini-Fun.xpm

@@ -1,1 +1,1 @@
-
+mini-happy.xpm

Changes to woof-code/rootfs-skeleton/usr/local/lib/X11/mini-icons/mini-Graphic.xpm

@@ -1,1 +1,1 @@
-
+mini-palette.xpm

Changes to woof-code/rootfs-skeleton/usr/local/lib/X11/mini-icons/mini-Help.xpm

@@ -1,1 +1,1 @@
-
+mini-question.xpm

Changes to woof-code/rootfs-skeleton/usr/local/lib/X11/mini-icons/mini-Internet.xpm

@@ -1,1 +1,1 @@
-
+mini-world.xpm

Changes to woof-code/rootfs-skeleton/usr/local/lib/X11/mini-icons/mini-Multimedia.xpm

@@ -1,1 +1,1 @@
-
+Animation.xpm

Changes to woof-code/rootfs-skeleton/usr/local/lib/X11/mini-icons/mini-Network.xpm

@@ -1,1 +1,1 @@
-
+pc-2x.xpm

Changes to woof-code/rootfs-skeleton/usr/local/lib/X11/mini-icons/mini-Personal.xpm

@@ -1,1 +1,36 @@
-
+/* XPM */
+static char *Personal_xpm[] = {
+"16 16 16 1",
+" 	c None",
+"1	c #FF0000",
+"2	c #00FF00",
+"3	c #FFFF00",
+"4	c #0000FF",
+"5	c #FF00FF",
+"6	c #00FFFF",
+"7	c #FFFFFF",
+"8	c #DBDBDB",
+"9	c #B6B6B6",
+"A	c #929292",
+"B	c #6D6D6D",
+"C	c #494949",
+"D	c #242424",
+"E	c #DB0000",
+"F	c #B60000",
+"     FFFFFF     ",
+"   FFFFFFFFFF   ",
+"  FFFFFFFFFFFF  ",
+"  FFF777777FFF  ",
+"   D77777777D   ",
+"   D7DD77DD7D   ",
+"   D77777777D   ",
+"   D77777777D   ",
+"   D77DDDD77D   ",
+"    D777777D    ",
+"     D7777D     ",
+"  DDCC4444CCDD  ",
+" DCCCCC44CCCCCD ",
+" DCCCCC44CCCCCD ",
+"DCCCCCC44CCCCCCD",
+"DCCCCCC44CCCCCCD"
+};

Changes to woof-code/rootfs-skeleton/usr/local/lib/X11/mini-icons/mini-Setup.xpm

@@ -1,1 +1,1 @@
-
+wizard16.xpm

Changes to woof-code/rootfs-skeleton/usr/local/lib/X11/mini-icons/mini-System.xpm

@@ -1,1 +1,1 @@
-
+Card.xpm

Changes to woof-code/rootfs-skeleton/usr/local/lib/X11/mini-icons/mini-Utility.xpm

@@ -1,1 +1,1 @@
-
+mini-hammer.xpm

Changes to woof-code/rootfs-skeleton/usr/local/petget/configure.sh

@@ -6,10 +6,11 @@
 #110118 alternate user interfaces.
 #120203 BK: internationalized.
 #120210 01micko: Ziggy ui crashes if *all* repos unticked here (no one would do that, but it is still a bug).
 #120515 in some cases, Packages-puppy-${DISTRO_FILE_PREFIX}-* may not exist (ex, Racy only has Packages-puppy-wary5-official).
 #120529 checkbox to display app thumbnail icons.
+#120811 category field now supports sub-category |category;subcategory|, use as icon in ppm main window. -- always enabled.
 
 export TEXTDOMAIN=petget___configure.sh
 export OUTPUT_CHARSET=UTF-8
 
 #export LANG=C
@@ -51,18 +52,22 @@
  UI_RADIO="${UI_RADIO}<radiobutton><label>${ONEUI}</label><action>echo -n ${ONEUI} > /var/local/petget/ui_choice</action></radiobutton>"
 done
 
 #  <text><label>Choose an alternate User Interface:</label></text>
 
-#120529 note, same code in pkg_chooser.sh, so probably this not req'd...
-if [ -f /var/local/petget/flg_appicons ];then
- FLG_APPICONS="`cat /var/local/petget/flg_appicons`"
-else
- #test if pet installed with set of 16x16 app icons...
- [ "`grep 'icons_puppy_app' /root/.packages/woof-installed-packages /root/.packages/user-installed-packages`" != "" ] && FLG_APPICONS='true'
-fi
-[ "$FLG_APPICONS" = "" ] && FLG_APPICONS='false'
+#120811 remove...
+##120529 note, same code in pkg_chooser.sh, so probably this not req'd...
+#if [ -f /var/local/petget/flg_appicons ];then
+# FLG_APPICONS="`cat /var/local/petget/flg_appicons`"
+#else
+# #test if pet installed with set of 16x16 app icons...
+# [ "`grep 'icons_puppy_app' /root/.packages/woof-installed-packages /root/.packages/user-installed-packages`" != "" ] && FLG_APPICONS='true'
+#fi
+#[ "$FLG_APPICONS" = "" ] && FLG_APPICONS='false'
+
+#120811 removed...
+#  <checkbox><label>$(gettext 'Show application thumbnail icons')</label><variable>CHK_APPICONS</variable><default>${FLG_APPICONS}</default></checkbox>
 
 export CONFIG_DIALOG="<window title=\"$(gettext 'Puppy Package Manager: configure')\" icon-name=\"gtk-about\">
 <hbox>
 
 <vbox>
@@ -75,11 +80,10 @@
   <text><label>$(gettext "Warning: The database information for some repositories is quite large, about 1.5MB for 'slacky' and several MB for Ubuntu/Debian. If you are on dialup, be prepared for this.")</label></text>
   <text><label>$(gettext 'Technical note: if you would like to see the package databases, they are at') /root/.packages/Packages-*. $(gettext 'These are in a standardised format, regardless of which distribution they were obtained from. This format is considerably smaller than that of the original distro.')</label></text>
  </frame>
  <frame $(gettext 'User Interface')>
   ${UI_RADIO}
-  <checkbox><label>$(gettext 'Show application thumbnail icons')</label><variable>CHK_APPICONS</variable><default>${FLG_APPICONS}</default></checkbox>
  </frame>
 </vbox>
 
 <vbox>
  <text use-markup=\"true\"><label>\"<b>$(gettext 'Requires restart of PPM to see changes')</b>\"</label></text>
@@ -114,25 +118,26 @@
 #  CHECK_ubuntu-intrepid-universe="true"
 #  EXIT="OK"
 
 [ "`echo -n "$RETPARAMS" | grep 'EXIT' | grep 'OK'`" = "" ] && exit
 
-#120529
-PREVFLG="`cat /var/local/petget/flg_appicons`"
-if [ "`echo -n "$RETPARAMS" | grep 'CHK_APPICONS' | grep 'true'`" != "" ];then
- echo -n 'true' > /var/local/petget/flg_appicons
- NEWFLG='true'
-else
- echo -n 'false' > /var/local/petget/flg_appicons
- NEWFLG='false'
-fi
-if [ "$PREVFLG" != "$NEWFLG" ];then
- #rm -f /tmp/petget_fltrd_repo_*
- #rm -f /tmp/petget_installed_*
- rm -f /tmp/installedpkgs.results.post*
- rm -f /tmp/petget/filterpkgs.results.post*
-fi
+#120811 removed...
+##120529
+#PREVFLG="`cat /var/local/petget/flg_appicons`"
+#if [ "`echo -n "$RETPARAMS" | grep 'CHK_APPICONS' | grep 'true'`" != "" ];then
+# echo -n 'true' > /var/local/petget/flg_appicons
+# NEWFLG='true'
+#else
+# echo -n 'false' > /var/local/petget/flg_appicons
+# NEWFLG='false'
+#fi
+#if [ "$PREVFLG" != "$NEWFLG" ];then
+# #rm -f /tmp/petget_fltrd_repo_*
+# #rm -f /tmp/petget_installed_*
+# rm -f /tmp/installedpkgs.results.post*
+# rm -f /tmp/petget/filterpkgs.results.post*
+#fi
 
 enabledrepos=" "
 repocnt=1
 for ONEREPO in `ls -1 /root/.packages/Packages-*`
 do

Changes to woof-code/rootfs-skeleton/usr/local/petget/filterpkgs.sh

@@ -17,10 +17,11 @@
 #120504 some files moved into /tmp/petget
 #120504b improved dev,doc,nls,exe pkg selection.
 #120515 dev,doc,exe selection for Mageia .rpm pkgs, fix for 120504b.
 #120515 common code from pkg_chooser.sh, findnames.sh, filterpkgs.sh, extracted to /usr/local/petget/postfilterpkgs.sh.
 #120719 support raspbian.
+#120811 category field now supports sub-category |category;subcategory|, use as icon in ppm main window.
 
 export TEXTDOMAIN=petget___filterpkgs.sh
 export OUTPUT_CHARSET=UTF-8
 
 #export LANG=C
@@ -74,10 +75,11 @@
   ;;
   *)
    FLTRD_REPO="`printcols $REPO_FILE 1 2 3 5 10 6 9 | grep -i "^[${PKG_FIRST_CHAR}]" | grep "$categoryPATTERN" | sed -e 's%||$%|unknown|%'`"
   ;;
  esac
+ #...extracted fields, reordered: pkgname|nameonly|version|category|description|size|dependencies
  echo "$FLTRD_REPO" > /tmp/petget_fltrd_repo_${PKG_FIRST_CHAR}_${fltrCATEGORY}_Packages-${fltrREPO_TRIAD}
  #...file ex: /tmp/petget_fltrd_repo_a_Document_Packages-slackware-12.2-official
 fi
 
 #w480 extract names of packages that are already installed...
@@ -122,11 +124,13 @@
 
 #filter out installed pkgs from the repo pkg list...
 #ALIASES_PATTERNS="`echo -n "$PKG_ALIASES_INSTALLED" | tr -s ' ' | sed -e 's%^ %%' -e 's% $%%' | tr ' ' '\n' | sed -e 's%^%|%' -e 's%$%|%'`"
 #echo "$ALIASES_PATTERNS" >> /tmp/petget_installed_patterns
 fprPTN="s%$%|${fltrREPO_TRIAD}%" #120504 append repo-triad on end of each line.
-FPR="`grep --file=/tmp/petget_installed_patterns -v /tmp/petget_fltrd_repo_${PKG_FIRST_CHAR}_${fltrCATEGORY}_Packages-${fltrREPO_TRIAD} | cut -f 1,5 -d '|' | sed -e "$fprPTN"`"
+#FPR="`grep --file=/tmp/petget_installed_patterns -v /tmp/petget_fltrd_repo_${PKG_FIRST_CHAR}_${fltrCATEGORY}_Packages-${fltrREPO_TRIAD} | cut -f 1,5 -d '|' | sed -e "$fprPTN"`"
+#120811 keep subcategory for icon (if no subcategory, will use category)...
+FPR="`grep --file=/tmp/petget_installed_patterns -v /tmp/petget_fltrd_repo_${PKG_FIRST_CHAR}_${fltrCATEGORY}_Packages-${fltrREPO_TRIAD} | cut -f 1,4,5 -d '|' | cut -f 2-99 -d ';' | sed -e "$fprPTN"`"
 if  [ "$FPR" = "|${fltrREPO_TRIAD}" ];then
  echo -n "" > /tmp/petget/filterpkgs.results #nothing.
 else
  echo "$FPR" > /tmp/petget/filterpkgs.results
 fi

Changes to woof-code/rootfs-skeleton/usr/local/petget/findnames.sh

@@ -11,10 +11,11 @@
 #120410 Mavrothal: fix "getext" typo.
 #120504 Mavrothal: search with multiple keywords, both pkg name and description.
 #120504 some files moved into /tmp/petget
 #120515 common code from pkg_chooser.sh, findnames.sh, filterpkgs.sh, extracted to /usr/local/petget/postfilterpkgs.sh.
 #120529 fix if icon name appended each line.
+#120811 category field now supports sub-category |category;subcategory|, use as icon in ppm main window.
 
 export TEXTDOMAIN=petget___findnames.sh
 export OUTPUT_CHARSET=UTF-8
 
 . /etc/DISTRO_SPECS #has DISTRO_BINARY_COMPAT, DISTRO_COMPAT_VERSION
@@ -132,17 +133,20 @@
  #filterpkgs.results.post each line has package-name|description|repo-triad
  #when we have searched multiple repos, move repo-triad into description field, so that it will show up on main window...
  if [ "$SEARCH_REPOS_FLAG" = "all" ];then
   #creates descript field like: "[puppy-4-official] Abiword word processor"
   #note, printcols (see support/printcols.c in Woof) needs a '|' on the end to work.
-  FLG_APPICONS="`cat /var/local/petget/flg_appicons`"
-  if [ "$FLG_APPICONS" = "true" ];then
-   POSTPROCLIST="`printcols /tmp/petget/filterpkgs.results.post 1 2 4 3 4 | sed -e 's%|%FIRSTBARCHAR%' -e 's%|%SECBARCHAR[%' -e 's%|%] %' -e 's%FIRSTBARCHAR%|%' -e 's%SECBARCHAR%|%'`"
-  else
-   POSTPROCLIST="`printcols /tmp/petget/filterpkgs.results.post 1 3 2 3 | sed -e 's%|%FIRSTBARCHAR[%' -e 's%|%] %' -e 's%FIRSTBARCHAR%|%'`"
-  fi
+  #120811 format in /tmp/petget/filterpkgs.results.post now: pkgname|subcategory|description|dbfile,
+  # ex: htop-0.9-i486|System|View Running Processes|puppy-wary5-official (previously was: pkgname|description|dbfile)
+  #FLG_APPICONS="`cat /var/local/petget/flg_appicons`"
+  #if [ "$FLG_APPICONS" = "true" ];then
+  # POSTPROCLIST="`printcols /tmp/petget/filterpkgs.results.post 1 2 4 3 4 | sed -e 's%|%FIRSTBARCHAR%' -e 's%|%SECBARCHAR[%' -e 's%|%] %' -e 's%FIRSTBARCHAR%|%' -e 's%SECBARCHAR%|%'`"
+  #else
+  # POSTPROCLIST="`printcols /tmp/petget/filterpkgs.results.post 1 3 2 3 | sed -e 's%|%FIRSTBARCHAR[%' -e 's%|%] %' -e 's%FIRSTBARCHAR%|%'`"
+  #fi
+  POSTPROCLIST="`printcols /tmp/petget/filterpkgs.results.post 1 2 4 3 4 | sed -e 's%|%FIRSTBARCHAR%' -e 's%|%SECBARCHAR[%' -e 's%|%] %' -e 's%FIRSTBARCHAR%|%' -e 's%SECBARCHAR%|%'`"
   echo "$POSTPROCLIST" > /tmp/petget/filterpkgs.results.post
   #ex line: abiword-1.2.3|[puppy-4-official] Abiword word processor|puppy-4-official|
  fi
 
 fi
 

Changes to woof-code/rootfs-skeleton/usr/local/petget/installpreview.sh

@@ -10,10 +10,11 @@
 #120116 rev. 514 introduced icon rendering method which broke -reload at 547. fixed at rev. 574.
 #120203 BK: internationalized.
 #120504 if no pkgs in category, then when click in window in main dlg, comes here with TREE1="".
 #120504 select correct repo when have chosen a pkg from multiple-repo list.
 #120604 fix for prepended icons field.
+#120811 category field now supports sub-category |category;subcategory|, use as icon in ppm main window.
 
 export TEXTDOMAIN=petget___installpreview.sh
 export OUTPUT_CHARSET=UTF-8
 
 [ "$TREE1" = "" ] && exit #120504 nothing to install.
@@ -26,23 +27,24 @@
 X1PID=$!
 
 #ex: TREE1=abiword-1.2.4 (first field in database entry).
 DB_FILE=Packages-`cat /tmp/petget/current-repo-triad` #ex: Packages-slackware-12.2-official
 tPATTERN='^'"$TREE1"'|'
-xtPATTERN='|'"$TREE1"'|'
+#xtPATTERN='|'"$TREE1"'|'
 
 #120504 if findnames.sh searched multiple repos, /tmp/petget/current-repo-triad (set in pkg_chooser.sh) might be wrong...
 [ -f /tmp/petget/current-repo-triad.previous ] && rm -f /tmp/petget/current-repo-triad.previous
 if [ -f /tmp/petget/filterpkgs.results.post ];then
  #file ex line: abiword-1.2.3|[puppy-4-official] Abiword word processor|puppy-4-official|
+ #120811 removed...
  #120604 fix for prepended icons field...
- FLG_APPICONS="`cat /var/local/petget/flg_appicons`" #see configure.sh
- if [ "$FLG_APPICONS" = "true" ];then
-  ALTSEARCHREPO="$(grep "$xtPATTERN" /tmp/petget/filterpkgs.results.post | grep '|\[' | cut -f 2 -d '[' | cut -f 1 -d ']')"
- else
+ #FLG_APPICONS="`cat /var/local/petget/flg_appicons`" #see configure.sh
+ #if [ "$FLG_APPICONS" = "true" ];then
+ # ALTSEARCHREPO="$(grep "$xtPATTERN" /tmp/petget/filterpkgs.results.post | grep '|\[' | cut -f 2 -d '[' | cut -f 1 -d ']')"
+ #else
   ALTSEARCHREPO="$(grep "$tPATTERN" /tmp/petget/filterpkgs.results.post | grep '|\[' | cut -f 2 -d '[' | cut -f 1 -d ']')"
- fi
+ #fi
  [ "$ALTSEARCHREPO" ] && DB_FILE="Packages-${ALTSEARCHREPO}"
  #hmmm, other scripts, ex dependencies.sh, will need to have this correct...
  if [ "$ALTSEARCHREPO" ];then
   mv -f /tmp/petget/current-repo-triad /tmp/petget/current-repo-triad.previous #need to restore old one before exit this script.
   echo -n "$ALTSEARCHREPO" > /tmp/petget/current-repo-triad

Changes to woof-code/rootfs-skeleton/usr/local/petget/pkg_chooser.sh

@@ -22,10 +22,11 @@
 #120515 common code from pkg_chooser.sh, findnames.sh, filterpkgs.sh, extracted to /usr/local/petget/postfilterpkgs.sh.
 #120527 change gtkdialog3 to gtkdialog4. icon patterns for postfilterpkgs.sh.
 #120529 ui may show app thumbnail icons.
 #120603 /root/.packages/user-installed-packages missing at first boot.
 #120515 gentoo build.
+#120811 category field now supports sub-category |category;subcategory|, use as icon in ppm main window.
 
 export TEXTDOMAIN=petget___pkg_chooser.sh
 export OUTPUT_CHARSET=UTF-8
 
 [ "`whoami`" != "root" ] && exec sudo -A ${0} ${@} #110505
@@ -36,27 +37,29 @@
 
 . /etc/DISTRO_SPECS #has DISTRO_BINARY_COMPAT, DISTRO_COMPAT_VERSION
 . /root/.packages/DISTRO_PKGS_SPECS
 . /root/.packages/PKGS_MANAGEMENT #has PKG_REPOS_ENABLED, PKG_NAME_ALIASES
 
-#120527 need these patterns in postfilterpkgs.sh...
-#the awk stuff sorts the line by length of line, longer lines first. if only one char on line, append ^ ...
-#(fallback, any pkgs starting with 'k' are kde apps, or 'g' are gnome apps). also append '^' for 2-char lines...
-ICONPTNS="$(ls -1 /usr/share/icons/hicolor/16x16/apps | grep 'xpm$' | sed -e 's%\.xpm$%%' | awk '{print length, $0}' | sort -rn | awk '{$1=""; print $0 }' | sed -e 's%^ %%' | sed -r -e 's%(^[a-z][a-z]$)%^\1%' | sed -r -e 's%(^[a-z]$)%^\1%')"
-echo "$ICONPTNS" > /tmp/petget/postfilter_icon_ptns
-#echo -e 'perl\npython\ntcl\nmail\nkde\nqt\nQt\ndbus\ndb\n' >> /tmp/petget/postfilter_icon_ptns
+#120811 removed...
+##120527 need these patterns in postfilterpkgs.sh...
+##the awk stuff sorts the line by length of line, longer lines first. if only one char on line, append ^ ...
+##(fallback, any pkgs starting with 'k' are kde apps, or 'g' are gnome apps). also append '^' for 2-char lines...
+#ICONPTNS="$(ls -1 /usr/share/icons/hicolor/16x16/apps | grep 'xpm$' | sed -e 's%\.xpm$%%' | awk '{print length, $0}' | sort -rn | awk '{$1=""; print $0 }' | sed -e 's%^ %%' | sed -r -e 's%(^[a-z][a-z]$)%^\1%' | sed -r -e 's%(^[a-z]$)%^\1%')"
+#echo "$ICONPTNS" > /tmp/petget/postfilter_icon_ptns
+##echo -e 'perl\npython\ntcl\nmail\nkde\nqt\nQt\ndbus\ndb\n' >> /tmp/petget/postfilter_icon_ptns
 
 #120529 app icons
 touch /root/.packages/user-installed-packages #120603 missing at first boot.
-if [ -f /var/local/petget/flg_appicons ];then
- FLG_APPICONS="`cat /var/local/petget/flg_appicons`"
-else
- #test if pet installed with set of 16x16 app icons...
- [ "`grep 'icons_puppy_app' /root/.packages/woof-installed-packages /root/.packages/user-installed-packages`" != "" ] && FLG_APPICONS='true'
-fi
-[ "$FLG_APPICONS" = "" ] && FLG_APPICONS='false'
-echo -n "$FLG_APPICONS" > /var/local/petget/flg_appicons
+#120811 removed...
+#if [ -f /var/local/petget/flg_appicons ];then
+# FLG_APPICONS="`cat /var/local/petget/flg_appicons`"
+#else
+# #test if pet installed with set of 16x16 app icons...
+# [ "`grep 'icons_puppy_app' /root/.packages/woof-installed-packages /root/.packages/user-installed-packages`" != "" ] && FLG_APPICONS='true'
+#fi
+#[ "$FLG_APPICONS" = "" ] && FLG_APPICONS='false'
+#echo -n "$FLG_APPICONS" > /var/local/petget/flg_appicons
 
 #101129 choose to display EXE, DEV, DOC, NLS pkgs... note, this code-block is also in findnames.sh and filterpkgs.sh...
 DEF_CHK_EXE='true'
 DEF_CHK_DEV='false'
 DEF_CHK_DOC='false'

Changes to woof-code/rootfs-skeleton/usr/local/petget/postfilterpkgs.sh

@@ -3,10 +3,11 @@
 #post-process the selection of pkgs that is to be displayed, according to the exe, dev, doc, nls checkboxes.
 #120515 script created, common code extracted from above 3 scripts.
 #120525 fix post-filtering.
 #120529 prefix an icon to each line of results.
 #120719 support raspbian.
+#120811 category field now supports sub-category |category;subcategory|, use as icon in ppm main window.
 
 #ui_Ziggy and ui_Classic pass in two params, ex: EXE true
 [ $2 ] && echo -n "$2" > /var/local/petget/postfilter_${1}
 
 #101129 postprocess, show EXE, DEV, DOC, NLS...
@@ -32,63 +33,20 @@
 if [ "$DEF_CHK_EXE" = "false" ];then
  grep -E '_DEV|_DOC|_NLS|\-dev_|\-doc_|\-docs_|\-langpack|\-lang\-|\-devel\-|\-doc\-' /tmp/petget/filterpkgs.results.post > /tmp/petget/filterpkgs.results.post.tmp
  mv -f /tmp/petget/filterpkgs.results.post.tmp /tmp/petget/filterpkgs.results.post
 fi
 
-#120529 append an icon to each entry...
-cp -f /tmp/petget/filterpkgs.results.post /tmp/petget/filterpkgs.results.post-noicons
-FLG_APPICONS="`cat /var/local/petget/flg_appicons`" #see configure.sh
-if [ "$FLG_APPICONS" = "true" ];then
- #ex: 'abiword0-1.2.3|description of abiword|stuff' becomes 'abiword|abiword0-1.2.3|description of abiword|stuff'
- sed -i -r -e 's%(^[a-zA-Z]*)%\1|\1%' /tmp/petget/filterpkgs.results.post
-fi
-exit
+##120529 append an icon to each entry...
+#cp -f /tmp/petget/filterpkgs.results.post /tmp/petget/filterpkgs.results.post-noicons
+#FLG_APPICONS="`cat /var/local/petget/flg_appicons`" #see configure.sh
+#if [ "$FLG_APPICONS" = "true" ];then
+# #ex: 'abiword0-1.2.3|description of abiword|stuff' becomes 'abiword|abiword0-1.2.3|description of abiword|stuff'
+# sed -i -r -e 's%(^[a-zA-Z]*)%\1|\1%' /tmp/petget/filterpkgs.results.post
+#fi
 
-#120529 ***NOT USING THIS*** used it to create all the icon symlinks.
-FRP="`cat /tmp/petget/filterpkgs.results.post`"
-echo -n "" > /tmp/petget/filterpkgs.results.post
-CACHEFLAG='no'
-while read ONELINE
-do
- FIXED="$(echo "$ONELINE" | sed -r -e 's%(^[a-zA-Z]*)%\1|\1%')"
- echo "$FIXED" >> /tmp/petget/filterpkgs.results.post
- ICONNAME="${FIXED%%|*}"  #"$(echo -n "$FIXED" | cut -f 1 -d '|')"
- if [ ! -e /usr/share/icons/hicolor/16x16/apps/${ICONNAME}.xpm ];then
-  CACHEFLAG='yes'
-  #this file is created in pkg_chooser.sh, has names of images that are in above 16x16/apps (sorted by size)...
-  #change 'cdbs_0.4.100ubuntu2|common build system for Debian packages|ubuntu-precise-main' to 'cdbs|common build system for Debian packages'...
-  ICONPTN="$(echo "$FIXED" | cut -f 1,3 -d '|' | grep -i -o -f /tmp/petget/postfilter_icon_ptns | head -n 1 | tr '[A-Z]' '[a-z]')"
-  #search all of pkg name, but screen out 'ubuntu' 'debian'...
-  [ "$ICONPTN" = "" ] && ICONPTN="$(echo "$FIXED" | cut -f 2 -d '|' | sed -e 's%ubuntu%%' -e 's%debian%%' -e 's%raspbian%%' | grep -i -o -f /tmp/petget/postfilter_icon_ptns | head -n 1 | tr '[A-Z]' '[a-z]')"
-  if [ "$ICONPTN" ];then
-   ln -s ${ICONPTN}.xpm /usr/share/icons/hicolor/16x16/apps/${ICONNAME}.xpm
-  else
-   #ln -s executable.xpm /usr/share/icons/hicolor/16x16/apps/${ICONNAME}.xpm
-   #no, link to the current category...
-   CURRENTCATEGORY="`cat /tmp/petget_filtercategory`"
-   case $CURRENTCATEGORY in
-    Desktop) CURICON='xorg' ;;
-    System) CURICON='systemapp' ;;
-    Setup) CURICON='setupapp' ;;
-    Utility) CURICON='utilityapp' ;;
-    Filesystem) CURICON='fileapp' ;;
-    Graphic) CURICON='graphicapp' ;;
-    Document) CURICON='documentapp' ;;
-    Business) CURICON='calculateapp' ;;
-    Personal) CURICON='personalapp' ;;
-    Network) CURICON='networkapp' ;;
-    Internet) CURICON='internetapp' ;;
-    Multimedia) CURICON='multimediaapp' ;;
-    Fun) CURICON='gameapp' ;;
-    *) CURICON='executable' ;;
-   esac
-   ln -s ${CURICON}.xpm /usr/share/icons/hicolor/16x16/apps/${ICONNAME}.xpm
-   #fPTN="s%^${ICONNAME}|%${CURICON}|%"
-   #sed -i -e "$fPTN" /tmp/petget/filterpkgs.results.post
-  fi
- fi
-done<<_END1
-$(echo "$FRP")
-_END1
-[ "$CACHEFLAG" = "yes" ] && gtk-update-icon-cache -f /usr/share/icons/hicolor
+#120811 icon name is now 2nd field, want append "mini-"...
+#ex line: htop-0.9-i486|System|View Running Processes|puppy-wary5-official
+#so, get "mini-System", which is name of an icon in /usr/local/lib/X11/mini-icons
+sed -i -e 's%|%|mini-%' /tmp/petget/filterpkgs.results.post
+
 
 ###END###

Changes to woof-code/rootfs-skeleton/usr/local/petget/ui_Classic

@@ -3,20 +3,22 @@
 #120224 handle translated help.htm
 #120504 some files moved into /tmp/petget
 #120515 calls to /tmp/petget/filterpkgs.results.postfilter.sh replace by /usr/local/petget/postfilterpkgs.sh.
 #120527 first column of tree now an icon.
 #120529 app icons in tree. variable FLG_APPICONS created in pkg_chooser.sh
+#120811 category field now supports sub-category |category;subcategory|, use as icon in ppm main window.
 
 export TEXTDOMAIN=petget___ui_Classic
 export OUTPUT_CHARSET=UTF-8
 
-#120529
-if [ "$FLG_APPICONS" = "true" ];then
- APPICONXMLINSERT=' icon-column="0"'
-else
- APPICONXMLINSERT=''
-fi
+#120529 120811
+#if [ "$FLG_APPICONS" = "true" ];then
+# APPICONXMLINSERT=' icon-column="0"'
+#else
+# APPICONXMLINSERT=''
+#fi
+APPICONXMLINSERT=' icon-column="1"' #120811 each line is format: abiword0-1.2.3|subcategory|description of abiword|stuff
 
 #120224 handle translated help.htm
 LANG1="${LANG%_*}" #ex: de
 HELPFILE="/usr/local/petget/help.htm"
 [ -f /usr/local/petget/help-${LANG1}.htm ] && HELPFILE="/usr/local/petget/help-${LANG1}.htm"

Changes to woof-code/rootfs-skeleton/usr/local/petget/ui_Ziggy

@@ -5,10 +5,11 @@
 #120225 fix for translated categories.
 #120504 some files moved into /tmp/petget
 #120508 01micko: bugfix. ref: http://murga-linux.com/puppy/viewtopic.php?p=625843#625843
 #120515 calls to /tmp/petget/filterpkgs.results.postfilter.sh replace by /usr/local/petget/postfilterpkgs.sh.
 #120529 app icons in tree. variable FLG_APPICONS created in pkg_chooser.sh
+#120811 category field now supports sub-category |category;subcategory|, use as icon in ppm main window.
 
 export TEXTDOMAIN=petget___ui_Ziggy
 export OUTPUT_CHARSET=UTF-8
 
 ALLITEM='' ; ALLSTOCK='' ; CATHEIGHT='100' ; WINHEIGHT='380'
@@ -17,16 +18,17 @@
  ALLSTOCK='stock["gtk-ALL"] = {{ "pet24.png", *, *, *}}'
  CATHEIGHT='112'
  WINHEIGHT='388'
 fi
 
-#120529
-if [ "$FLG_APPICONS" = "true" ];then
- APPICONXMLINSERT=' icon-column="0"'
-else
- APPICONXMLINSERT=''
-fi
+##120529
+#if [ "$FLG_APPICONS" = "true" ];then
+# APPICONXMLINSERT=' icon-column="0"'
+#else
+# APPICONXMLINSERT=''
+#fi
+APPICONXMLINSERT=' icon-column="1"' #120811 each line is format: abiword0-1.2.3|subcategory|description of abiword|stuff
 
 #120224 handle translated help.htm
 LANG1="${LANG%_*}" #ex: de
 HELPFILE="/usr/local/petget/help.htm"
 [ -f /usr/local/petget/help-${LANG1}.htm ] && HELPFILE="/usr/local/petget/help-${LANG1}.htm"