Check-in [3df37e36e2]
Not logged in

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

Overview

SHA1 Hash:3df37e36e2e07e2dc604004aad7a2a86e727847c
Date: 2012-02-24 10:56:05
User: BarryK
Comment:ppm Ziggy interface fixed -- translations, icons

Tags And Properties
Changes

Changes to woof-code/rootfs-skeleton/usr/bin/xwin

@@ -543,10 +543,11 @@
 esac
 echo -n "false" > /etc/.XLOADED #see note above.
 #...if PC hung, run xorgwizard at next bootup (see further up).
 
 #unicode_start #i18n rodin.s for unicode start after exit from X. ??????what is this??????
+#120224 ...console font is loaded in quicksetup if locale changed.
 echo ''$(gettext 'Exited from X. Type "xwin [fvwm95|jwm]" to restart X ([ ] mean optional).')''
 echo ''$(gettext '(To shutdown PC type "poweroff", to reboot PC type "reboot")')''
 if [ -f /usr/X11R7/bin/Xfbdev ];then
  echo ''$(gettext '(To run the Xfbdev Framebuffer Wizard, type "framebufferwizard")')''
 fi
@@ -593,16 +594,15 @@
  #restart window manager...
  #make a gross assumption, if wmexitmode.txt exists, haven't already exited this script, then want
  #to restart maybe with different window manager. /etc/windowmanager already has desired w.m.
  rm -f /tmp/wmexitmode.txt #definitely delete it now.
   #v1.0.5 thanks GuestToo for advice on this, works with chooselocale script...
-  #NEWLANG="`cat /etc/profile | grep "LANG=" | cut -f 2 -d '='`"
-  NEWLANG="`cat /etc/profile | grep '^[[:blank:]]*LANG=' | tail -n 1| cut -f 2 -d '='`" #w482 shinobar bugfix.
+  NEWLANG="`cat /etc/profile | grep '^LANG=' | cut -f 2 -d '='`"
   if [ "$NEWLANG" ];then #precaution
-   if [ ! "$NEWLANG" = "$LANG" ];then
+   if [ "$NEWLANG" != "$LANG" ];then
     export LANG=$NEWLANG
    fi
   fi
  exec xwin
 fi
 
 #the end#

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

@@ -1,131 +1,132 @@
 #alternate user interface designed by zigbert.
 #120203 rodin.s: internationalized.
+#120224 more gettext's required. icons were missing.
 
 export TEXTDOMAIN=petget___ui_Ziggy
 export OUTPUT_CHARSET=UTF-8
 
 ALLITEM='' ; ALLSTOCK='' ; CATHEIGHT='100' ; WINHEIGHT='380'
 if [ "$ALLCATEGORY" != "" ];then
- ALLITEM='<item stock="gtk-ALL">ALL</item>'
+ ALLITEM="<item stock=\"gtk-ALL\">$(gettext 'ALL')</item>"
  ALLSTOCK='stock["gtk-ALL"] = {{ "pet24.png", *, *, *}}'
  CATHEIGHT='112'
  WINHEIGHT='388'
 fi
 
-export MAIN_DIALOG='<window title="'$(gettext 'Puppy Package Manager')'" icon-name="gtk-about" default_height="'${WINHEIGHT}'" default_width="680">
+export MAIN_DIALOG="<window title=\"$(gettext 'Puppy Package Manager')\" icon-name=\"gtk-about\" default_height=\"${WINHEIGHT}\" default_width=\"680\">
 <hbox>
  <vbox>
   <hbox>
-   <button tooltip-text="'$(gettext 'Uninstall packages')'">
-    <label>'$(gettext 'Uninstall')'</label>
-    <input file icon="gtk-clear"></input>
+   <button tooltip-text=\"$(gettext 'Uninstall packages')\">
+    <label>$(gettext 'Uninstall')</label>
+    <input file icon=\"gtk-clear\"></input>
     <action>launch:INSTALLED_DIALOG</action>
    </button>
-   <button tooltip-text="'$(gettext 'Configure package manager')'">
-    <input file icon="gtk-preferences"></input>
+   <button tooltip-text=\"$(gettext 'Configure package manager')\">
+    <input file icon=\"gtk-preferences\"></input>
     <action>/usr/local/petget/configure.sh</action>
     <action>/usr/local/petget/filterpkgs.sh</action>
     <action>refresh:TREE1</action>
    </button>
-   <button tooltip-text="'$(gettext 'Help')'">
-    <input file icon="gtk-help"></input>
+   <button tooltip-text=\"$(gettext 'Help')\">
+    <input file>/usr/local/lib/X11/pixmaps/help24.png</input>
     <action>defaulthtmlviewer file:///usr/local/petget/help.htm & </action>
    </button>
-   <button type="exit"  tooltip-text="'$(gettext 'Quit package manager')'">
-    <input file icon="gtk-quit"></input>
+   <button type=\"exit\"  tooltip-text=\"$(gettext 'Quit package manager')\">
+    <input file>/usr/local/lib/X11/pixmaps/shutdown24.png</input>
    </button>
    </hbox>
 
 
- <frame '$(gettext 'Repositories')'>
+ <frame $(gettext 'Repositories')>
  <vbox>
-  '${DB_ORDERED}'
+  ${DB_ORDERED}
  </vbox>
  </frame>
 
 
-   <frame '$(gettext 'package types')'>
+   <frame $(gettext 'package types')>
   <vbox>
    <checkbox>
-    <default>'${DEF_CHK_EXE}'</default>
+    <default>${DEF_CHK_EXE}</default>
     <label>EXE</label>
     <variable>CHK_EXE</variable>
     <action>/tmp/filterpkgs.results.postfilter.sh EXE $CHK_EXE</action>
     <action>refresh:TREE1</action>
    </checkbox>
    <checkbox>
-    <default>'${DEF_CHK_DEV}'</default>
+    <default>${DEF_CHK_DEV}</default>
     <label>DEV</label>
     <variable>CHK_DEV</variable>
     <action>/tmp/filterpkgs.results.postfilter.sh DEV $CHK_DEV</action>
     <action>refresh:TREE1</action>
    </checkbox>
    <checkbox>
-    <default>'${DEF_CHK_DOC}'</default>
+    <default>${DEF_CHK_DOC}</default>
     <label>DOC</label>
     <variable>CHK_DOC</variable>
     <action>/tmp/filterpkgs.results.postfilter.sh DOC $CHK_DOC</action>
     <action>refresh:TREE1</action>
    </checkbox>
    <checkbox>
-    <default>'${DEF_CHK_NLS}'</default>
+    <default>${DEF_CHK_NLS}</default>
     <label>NLS</label>
     <variable>CHK_NLS</variable>
     <action>/tmp/filterpkgs.results.postfilter.sh NLS $CHK_NLS</action>
     <action>refresh:TREE1</action>
    </checkbox>
   </vbox>
   </frame>
 
-  <hbox width-request="100">
-   <text><label>'$(gettext 'Find:')'</label></text>
-   <entry activates-default="true">
+  <hbox width-request=\"100\">
+   <text><label>$(gettext 'Find:')</label></text>
+   <entry activates-default=\"true\">
     <variable>ENTRY1</variable>
    </entry>
-   <button can-default="true" has-default="true" use-stock="true">
-    <label>'$(gettext 'Go')'</label>
+   <button can-default=\"true\" has-default=\"true\" use-stock=\"true\">
+    <label>$(gettext 'Go')</label>
     <action>/usr/local/petget/findnames.sh</action>
     <action>refresh:TREE1</action>
    </button>
   </hbox>
 </vbox>
 
 <vbox>
    <tree>
-   <label>'$(gettext 'Category')'</label>
+   <label>$(gettext 'Category')</label>
    <variable>CATEGORY</variable>
-   <item stock="gtk-Desktop">Desktop</item>
-   <item stock="gtk-System">System</item>
-   <item stock="gtk-Setup">Setup</item>
-   <item stock="gtk-Utility">Utility</item>
-   <item stock="gtk-Filesystem">Filesystem</item>
-   <item stock="gtk-Graphic">Graphic</item>
-   <item stock="gtk-Document">Document</item>
-   <item stock="gtk-Business">Business</item>
-   <item stock="gtk-Personal">Personal</item>
-   <item stock="gtk-Network">Network</item>
-   <item stock="gtk-Internet">Internet</item>
-   <item stock="gtk-Multimedia">Multimedia</item>
-   <item stock="gtk-Fun">Fun</item>
-   '${ALLITEM}'
-   <width>140</width><height>'${CATHEIGHT}'</height>
-   <action signal="button-release-event">/usr/local/petget/filterpkgs.sh $CATEGORY</action>
-   <action signal="button-release-event">refresh:TREE1</action>
+   <item stock=\"gtk-Desktop\">$(gettext 'Desktop')</item>
+   <item stock=\"gtk-System\">$(gettext 'System')</item>
+   <item stock=\"gtk-Setup\">$(gettext 'Setup')</item>
+   <item stock=\"gtk-Utility\">$(gettext 'Utility')</item>
+   <item stock=\"gtk-Filesystem\">$(gettext 'Filesystem')</item>
+   <item stock=\"gtk-Graphic\">$(gettext 'Graphic')</item>
+   <item stock=\"gtk-Document\">$(gettext 'Document')</item>
+   <item stock=\"gtk-Business\">$(gettext 'Business')</item>
+   <item stock=\"gtk-Personal\">$(gettext 'Personal')</item>
+   <item stock=\"gtk-Network\">$(gettext 'Network')</item>
+   <item stock=\"gtk-Internet\">$(gettext 'Internet')</item>
+   <item stock=\"gtk-Multimedia\">$(gettext 'Multimedia')</item>
+   <item stock=\"gtk-Fun\">$(gettext 'Fun')</item>
+   ${ALLITEM}
+   <width>140</width><height>${CATHEIGHT}</height>
+   <action signal=\"button-release-event\">/usr/local/petget/filterpkgs.sh $CATEGORY</action>
+   <action signal=\"button-release-event\">refresh:TREE1</action>
   </tree>
 </vbox>
   <tree>
-    <label>'$(gettext 'Package|Description')'</label>
+    <label>$(gettext 'Package|Description')</label>
     <variable>TREE1</variable>
     <input>cat /tmp/filterpkgs.results.post</input>
-    <action signal="button-release-event">/usr/local/petget/installpreview.sh</action>
-    <action signal="button-release-event">/usr/local/petget/finduserinstalledpkgs.sh</action>
-    <action signal="button-release-event">refresh:TREE2</action>
+    <action signal=\"button-release-event\">/usr/local/petget/installpreview.sh</action>
+    <action signal=\"button-release-event\">/usr/local/petget/finduserinstalledpkgs.sh</action>
+    <action signal=\"button-release-event\">refresh:TREE2</action>
   </tree>
 
 </hbox>
-</window>'
+</window>"
 
 export INSTALLED_DIALOG='<window title="'$(gettext 'Uninstall Puppy Package')'" icon-name="gtk-about" default_height="380" default_width="450">
  <vbox>
   <text><label>'$(gettext 'Click on an item in the list to uninstall package')'</label></text>
   <tree>

Changes to woof-code/rootfs-skeleton/usr/sbin/quicksetup

@@ -24,10 +24,11 @@
 #120213 when locale change, inform if langpack PET needed.
 #120215 offer to translate initrd.
 #120215 rc.country calls 'chooselocale cli quiet', to run localedef without asking any questions or popups.
 #120216 insert /PUPPYKEYMAP into initrd. moved SET_KEYBOARD before SET_LOCALE processing.
 #120216 call 'lang2initrd'
+#120224 load console font. (code based on that in 'init')
 
 [ "`whoami`" != "root" ] && exec sudo -A ${0} ${@}
 
 export TEXTDOMAIN=quicksetup
 export OUTPUT_CHARSET=UTF-8
@@ -757,10 +758,11 @@
   echo -n "$NEW_KMAP" > /etc/keymap
   #echo -n "$FONTMAP" > /etc/fontmap
   echo -n "$CODEPAGE" > /etc/codepage
 
   keymap-set --load #111020 script by shinobar.
+  #120224 fontmap will be handled in locale code below.
 
 #  gzip -dcf /lib/keymaps/$NEW_KMAP.gz | loadkmap
 #  [ "$FONTMAP" ] && gzip -dcf /lib/consolefonts/${FONTMAP}.gz | loadfont
 #  #this code also in /usr/bin/xwin and /usr/sbin/xorgwizard...
 #  if [ -e /etc/X11/xorg.conf ];then
@@ -843,26 +845,43 @@
    else
     localedef -f UTF-8 -i $LANGCHOICE --no-archive ${LANGCHOICE}.utf8 > /dev/null #111022
     NEWLANGLINE="LANG=${LANGCHOICE}.UTF-8"
    fi
   fi
+  NEWLANG="`echo -n "$NEWLANGLINE" | cut -f 2 -d '='`" #ex: de_DE.UTF-8
 
   if [ "$PARAM2" = "quiet" ];then #120215 refer to /etc/rc.d/rc.country.
    #scripts fixdesk and fixmenus translate files to new language (as specified in /usr/share/sss/menu_strings and desk_strings).
    #so need to call them here...
    #note, these are also called in /etc/rc.d/rc.update, and further down.
-   LANG=${LANGCHOICE}${UTF8} fixscripts
-   LANG=${LANGCHOICE}${UTF8} fixdesk
-   LANG=${LANGCHOICE}${UTF8} fixmenus
+   LANG=${NEWLANG} fixscripts
+   LANG=${NEWLANG} fixdesk
+   LANG=${NEWLANG} fixmenus
    exit
   fi
 
-  NEWLANG="`echo -n "$NEWLANGLINE" | cut -f 2 -d '='`" #ex: de_DE.UTF-8
   if [ "$OLDLANGLINE" != "$NEWLANGLINE" ];then
    #langPATTERN="s/${OLDLANGLINE}/${NEWLANGLINE}/"
    langPATTERN="s%^LANG=.*%${NEWLANGLINE}%" #111022
    sed -i -e "$langPATTERN" /etc/profile
+
+   #120224 load console font... (code based on that in 'init')
+   case $NEWLANG in
+    en*)
+     #er, no, really want to unload all console fonts.
+     zcat /lib/consolefonts/lat1-12.psfu.gz | loadfont
+     echo -n "" > /etc/fontmap #well, next boot, no font will be loaded.
+    ;;
+    ar*|iw*) #L18L no Greek
+     setfont /lib/consolefonts/LatArCyrHeb-16.psfu.gz -C /dev/tty1
+     echo -n 'LatArCyrHeb-16.psfu' > /etc/fontmap
+    ;;
+    *) #L18L All European languages; new default ?!
+     zcat /lib/consolefonts/LatGrkCyr-8x16.psfu.gz | loadfont
+     echo -n 'LatGrkCyr-8x16.psfu' > /etc/fontmap
+    ;;
+   esac
 
    #120213 need language-pack...
    LANG1="`echo -n $LANGCHOICE | cut -f 1 -d '_'`"  #ex: de
    LANG12="`echo -n $LANGCHOICE | cut -f 1 -d '.'`" #ex: de_DE
    l1PTN="|langpack_${LANG1}|"

Changes to woof-code/rootfs-skeleton/usr/sbin/sfsget

@@ -7,10 +7,11 @@
 #110422 DISTRO_VERSION variable now has dotted format. note, also now using full dotted version# in puppy filenames.
 #110813 bug fix, sfs file has '_' in name.
 #120202 BK: internationalized.
 #120204 more gettext.
 #120224 bugfix for racy.
+#120224 add slacko support.
 
 export TEXTDOMAIN=sfsget
 export OUTPUT_CHARSET=UTF-8
 
 SFS_FILE=''; SFS_DIR=''
@@ -65,10 +66,14 @@
   SFS_DIR2="sfs_modules-${MAJNUM}"
  ;;
  fd64) #kirk's fatdog64
   x_REPOS="`echo -n "$PET_REPOS" | tr ' ' '\n' | grep '/fatdog'`"
   SFS_DIR0="sfs/${MAJNUM}00"
+ ;;
+ slacko) #01micko's spup
+  x_REPOS="`echo -n "$PET_REPOS" | tr ' ' '\n' | grep '/puppylinux'`"
+  SFS_DIR0="pet_packages-slacko"
  ;;
  *)
   x_REPOS="`echo -n "$PET_REPOS" | tr ' ' '\n' | grep -v '/quirky'`"
   SFS_DIR0="puppy-${DOTVER}"
   SFS_DIR1="sfs_modules-${MAJNUM}"