Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 172428 Details for
Bug 247649
kde-misc/kim for KDE-4
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
kim4.patch
kim4.patch (text/plain), 55.03 KB, created by
Bjoern Olausson
on 2008-11-20 00:43:42 UTC
(
hide
)
Description:
kim4.patch
Filename:
MIME Type:
Creator:
Bjoern Olausson
Created:
2008-11-20 00:43:42 UTC
Size:
55.03 KB
patch
obsolete
>diff -Nrup kim/install.sh kim4/install.sh >--- kim/install.sh 2006-08-01 10:59:23.000000000 +0200 >+++ kim4/install.sh 2008-11-18 14:24:23.000000000 +0100 >@@ -17,12 +17,12 @@ > # along with Foobar; if not, write to the Free Software > # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA > >-kdeinstdir=`kde-config --prefix` >+kdeinstdir=`kde4-config --prefix` > >-cp src/kim*.desktop $kdeinstdir/share/apps/konqueror/servicemenus/ >-cp src/bin/kim* $kdeinstdir/bin/ >-chmod a+rx $kdeinstdir/bin/kim* >-chmod a+r $kdeinstdir/share/apps/konqueror/servicemenus/kim*.desktop >+cp src/kim_*.desktop $kdeinstdir/share/kde4/services/ServiceMenus >+cp src/bin/kim_* $kdeinstdir/bin/ >+chmod a+rx $kdeinstdir/bin/kim_* >+chmod a+r $kdeinstdir/share/apps/konqueror/servicemenus/kim_*.desktop > > mkdir $kdeinstdir/share/apps/kim > cp COPYING $kdeinstdir/share/apps/kim/kim_about.txt >@@ -30,11 +30,7 @@ cp COPYING $kdeinstdir/share/apps/kim/ki > mkdir $kdeinstdir/share/apps/kim/slideshow/ > cp src/slideshow/* $kdeinstdir/share/apps/kim/slideshow/ > >-mkdir $kdeinstdir/share/apps/kim/galery >-cp src/galery/* $kdeinstdir/share/apps/kim/galery >- >-cd $kdeinstdir/share/apps/konqueror/servicemenus/ >-mv imageconverter.desktop imageconverter.desktop~ >-mv jpegorient.desktop jpegorient.desktop~ >+mkdir $kdeinstdir/share/apps/kim/gallery >+cp src/gallery/* $kdeinstdir/share/apps/kim/gallery > > echo "Installation completed. Good bye." >\ No newline at end of file >diff -Nrup kim/src/bin/kim_album kim4/src/bin/kim_album >--- kim/src/bin/kim_album 2006-02-09 17:40:42.000000000 +0100 >+++ kim4/src/bin/kim_album 2008-11-18 14:17:06.000000000 +0100 >@@ -19,62 +19,62 @@ > dir="$1"; > nb=`kdialog --radiolist "Kim - Select album type:" 1 "1x1 portrait album" off 2 "1x1 landscape album" off 3 "1x2 landscape album" off 4 "2x1 portrait album" off 5 "2x2 landscape album" on 6 "3x2 portrait album" off 7 "3x4 landscape album" off 8 "4x4 landscape album" off` > >-test -n "$KDEHOME" || KDEHOME="`kde-config --localprefix`"; export KDEHOME >+test -n "$KDEHOME" || KDEHOME="`kde4-config --localprefix`"; export KDEHOME > #KIMDIR=`mktemp -d "$KDEHOME"/tmp-"$USER"/kim.XXXXXXXX` || exit 1 > KIMDIR=`mktemp -d "$KDEHOME"/tmp-"$HOST"/kim.XXXXXXXX` || exit 1 > >-dcopRef=`kdialog --progressbar "Kim - Creating miniatures ..." 2` >+dbusRef=`kdialog --progressbar "Kim - Creating miniatures ..." 2` > case "$nb" in > 1) montage -tile 1x1 -geometry 800x600+5+5 -page 842x595 "$@" "$KIMDIR"/miniature.jpg >- dcop "$dcopRef" setLabel "Kim - Creating album ..." >- dcop "$dcopRef" setProgress 1 >+ qdbus $dbusRef setLabelText "Kim - Creating album ..." >+ qdbus $dbusRef org.freedesktop.DBus.Properties.Set org.kde.kdialog.ProgressDialog value 1 > montage -tile 1x1 -geometry 600x800+5+5 -page 842x595 "$KIMDIR"/miniature*.jpg* `kdialog --getsavefilename "$dir" > *.pdf`;; > > 2) montage -tile 1x1 -geometry 800x600+5+5 -page 595x842 "$@" "$KIMDIR"/miniature.jpg >- dcop "$dcopRef" setLabel "Kim - Creating album ..." >- dcop "$dcopRef" setProgress 1 >+ qdbus $dbusRef setLabelText "Kim - Creating album ..." >+ qdbus $dbusRef org.freedesktop.DBus.Properties.Set org.kde.kdialog.ProgressDialog value 1 > montage -tile 1x1 -geometry 800x600+5+5 -page 595x842 "$KIMDIR"/miniature*.jpg* `kdialog --getsavefilename "$dir" > *.pdf`;; > > 3) montage -tile 1x2 -geometry 640x480+5+5 -page 595x842 "$@" "$KIMDIR"/miniature.jpg >- dcop "$dcopRef" setLabel "Kim - Creating album ..." >- dcop "$dcopRef" setProgress 1 >+ qdbus $dbusRef setLabelText "Kim - Creating album ..." >+ qdbus $dbusRef org.freedesktop.DBus.Properties.Set org.kde.kdialog.ProgressDialog value 1 > montage -tile 1x1 -geometry 640x480+5+5 -page 595x842 "$KIMDIR"/miniature*.jpg* `kdialog --getsavefilename "$dir" *.pdf`;; > > 4) montage -tile 1x2 -geometry 640x480+5+5 -page 842x595 "$@" "$KIMDIR"/miniature.jpg >- dcop "$dcopRef" setLabel "Kim - Creating album ..." >- dcop "$dcopRef" setProgress 1 >+ qdbus $dbusRef setLabelText "Kim - Creating album ..." >+ qdbus $dbusRef org.freedesktop.DBus.Properties.Set org.kde.kdialog.ProgressDialog value 1 > montage -tile 1x1 -geometry 480x640+5+5 -page 842x595 "$KIMDIR"/miniature*.jpg* `kdialog --getsavefilename "$dir" *.pdf`;; > > 5) montage -tile 2x2 -geometry 640x480+5+5 -page 595x842 "$@" "$KIMDIR"/miniature.jpg >- dcop "$dcopRef" setLabel "Kim - Creating album ..." >- dcop "$dcopRef" setProgress 1 >+ qdbus $dbusRef setLabelText "Kim - Creating album ..." >+ qdbus $dbusRef org.freedesktop.DBus.Properties.Set org.kde.kdialog.ProgressDialog value 1 > montage -tile 1x1 -geometry 640x480+5+5 -page 595x842 "$KIMDIR"/miniature*.jpg* `kdialog --getsavefilename "$dir" *.pdf`;; > > 6) montage -tile 2x3 -geometry 640x480+5+5 -page 842x595 "$@" "$KIMDIR"/miniature.jpg >- dcop "$dcopRef" setLabel "Kim - Creating album ..." >- dcop "$dcopRef" setProgress 1 >+ qdbus $dbusRef setLabelText "Kim - Creating album ..." >+ qdbus $dbusRef org.freedesktop.DBus.Properties.Set org.kde.kdialog.ProgressDialog value 1 > montage -tile 1x1 -geometry 480x640+5+5 -page 842x595 "$KIMDIR"/miniature*.jpg* `kdialog --getsavefilename "$dir" *.pdf`;; > > 7) montage -tile 4x3 -geometry 640x480+5+5 -page 595x842 "$@" "$KIMDIR"/miniature.jpg >- dcop "$dcopRef" setLabel "Kim - Creating album ..." >- dcop "$dcopRef" setProgress 1 >+ qdbus $dbusRef setLabelText "Kim - Creating album ..." >+ qdbus $dbusRef org.freedesktop.DBus.Properties.Set org.kde.kdialog.ProgressDialog value 1 > montage -tile 1x1 -geometry 640x480+5+5 -page 595x842 "$KIMDIR"/miniature*.jpg* `kdialog --getsavefilename "$dir" *.pdf`;; > > 8) montage -tile 4x4 -geometry 640x480+5+5 -page 595x842 "$@" "$KIMDIR"/miniature.jpg >- dcop "$dcopRef" setLabel "Kim - Creating album ..." >- dcop "$dcopRef" setProgress 1 >+ qdbus $dbusRef setLabelText "Kim - Creating album ..." >+ qdbus $dbusRef org.freedesktop.DBus.Properties.Set org.kde.kdialog.ProgressDialog value 1 > montage -tile 1x1 -geometry 640x480+5+5 -page 595x842 "$KIMDIR"/miniature*.jpg* `kdialog --getsavefilename "$dir" *.pdf`;; > > *) kdialog --msgbox "Kim - Unrecognized option ! ";; > esac > >-dcop "$dcopRef" setLabel "Kim - Deleting miniatures ..." >-dcop "$dcopRef" setProgress 2 >+qdbus $dbusRef setLabelText "Kim - Deleting miniatures ..." >+qdbus $dbusRef org.freedesktop.DBus.Properties.Set org.kde.kdialog.ProgressDialog value 2 > #rm "$KIMDIR"/miniature*.jpg* > rm -rf "$KIMDIR" >-dcop "$dcopRef" close >+qdbus $dbusRef close > > > >diff -Nrup kim/src/bin/kim_compress kim4/src/bin/kim_compress >--- kim/src/bin/kim_compress 2006-01-25 00:46:43.000000000 +0100 >+++ kim4/src/bin/kim_compress 2008-11-19 23:49:46.000000000 +0100 >@@ -28,44 +28,44 @@ let "nbfiles = ($# -1)/2" > kdialog --title "Kim" --yesnocancel "Do you want to replace exisiting files ?" > case $? in > 0) # Replace exisiting files ! >- dcopRef=`kdialog --progressbar "Kim - Initialising ..." $nbfiles` >- dcop "$dcopRef" showCancelButton true >+ dbusRef=`kdialog --progressbar "Kim - Initialising ..." $nbfiles` >+ qdbus $dbusRef showCancelButton true > compteur=0 > for i in "$@";do > if [ -f "$i" ];then > #test if cancel button has been pushed >- if test "true" = `dcop "$dcopRef" wasCancelled`;then >- dcop "$dcopRef" close >+ if [[ "$(qdbus $dbusRef wasCancelled)" == "true" ]] ; then >+ qdbus $dbusRef close > exit 1 > fi > let "compteur +=1" > FILE="$i" >+ qdbus $dbusRef setLabelText "Kim - Compressing file: `basename "$FILE"`" > mogrify -quality $QUALITY "$FILE" >- dcop "$dcopRef" setLabel "Kim - Compressing file: `basename "$FILE"`" >- dcop "$dcopRef" setProgress "$compteur" >+ qdbus $dbusRef org.freedesktop.DBus.Properties.Set org.kde.kdialog.ProgressDialog value $compteur > fi; > done >- dcop "$dcopRef" close;; >+ qdbus $dbusRef close;; > > 1) >- dcopRef=`kdialog --progressbar "Kim - Initialising ..." $nbfiles` >- dcop "$dcopRef" showCancelButton true >+ dbusRef=`kdialog --progressbar "Kim - Initialising ..." $nbfiles` >+ qdbus $dbusRef showCancelButton true > compteur=0 > for i in "$@";do > if [ -f "$i" ];then > #test if cancel button has been pushed >- if test "true" = `dcop "$dcopRef" wasCancelled`;then >- dcop "$dcopRef" close >+ if [[ "$(qdbus $dbusRef wasCancelled)" == "true" ]] ; then >+ qdbus $dbusRef close > exit 1 > fi > let "compteur +=1" > FILE="$i" > convert -quality $QUALITY "$FILE" $DIR/compressed_"`basename "$FILE"`" >- dcop "$dcopRef" setLabel "Kim - Compressing file: `basename "$FILE"`" >- dcop "$dcopRef" setProgress "$compteur" >+ qdbus $dbusRef setLabelText "Kim - Compressing file: `basename "$FILE"`" >+# qdbus $dbusRef setProgress "$compteur" > fi; > done >- dcop "$dcopRef" close;; >+ qdbus $dbusRef close;; > > 2) kdialog --title "Kim" --msgbox "The action was cancelled by user !" > exit 1;; >diff -Nrup kim/src/bin/kim_convert kim4/src/bin/kim_convert >--- kim/src/bin/kim_convert 2006-01-25 00:46:40.000000000 +0100 >+++ kim4/src/bin/kim_convert 2008-11-18 14:12:58.000000000 +0100 >@@ -24,23 +24,23 @@ > FILE=""; > FORMAT="$1"; > let "nbfiles = $# -1" >-dcopRef=`kdialog --progressbar "Kim - Initialising ..." "$nbfiles"` >-dcop "$dcopRef" showCancelButton true >+dbusRef=`kdialog --progressbar "Kim - Initialising ..." "$nbfiles"` >+qdbus $dbusRef showCancelButton "true" > > compteur=0 > for i in "$@";do > if [ -f "$i" ];then > #test if cancel button has been pushed >- if test "true" = `dcop "$dcopRef" wasCancelled`;then >- dcop "$dcopRef" close >+ if [[ "$(qdbus $dbusRef wasCancelled)" == "true" ]] ; then >+ qdbus $dbusRef close > exit 1 > fi > let "compteur +=1" > FILE="$i" >+ qdbus $dbusRef setLabelText "Kim - Converting file: `basename "$FILE"`" > mogrify -format "$FORMAT" "$FILE" >- dcop "$dcopRef" setLabel "Kim - Converting file: `basename "$FILE"`" >- dcop "$dcopRef" setProgress "$compteur" >+ qdbus $dbusRef org.freedesktop.DBus.Properties.Set org.kde.kdialog.ProgressDialog value $compteur > fi; > done > >-dcop "$dcopRef" close >+qdbus $dbusRef close >diff -Nrup kim/src/bin/kim_flipflop kim4/src/bin/kim_flipflop >--- kim/src/bin/kim_flipflop 2006-01-25 00:46:36.000000000 +0100 >+++ kim4/src/bin/kim_flipflop 2008-11-18 14:18:52.000000000 +0100 >@@ -24,23 +24,23 @@ > FILE=""; > ANGLE="$1"; > let "nbfiles = $# -1" >-dcopRef=`kdialog --progressbar "Kim - Initialising ..." $nbfiles` >-dcop "$dcopRef" showCancelButton true >+dbusRef=`kdialog --progressbar "Kim - Initialising ..." $nbfiles` >+qdbus $dbusRef showCancelButton true > > compteur=0 > for i in "$@";do > if [ -f "$i" ];then > #test if cancel button has been pushed >- if test "true" = `dcop "$dcopRef" wasCancelled`;then >- dcop "$dcopRef" close >+ if [[ "$(qdbus $dbusRef wasCancelled)" == "true" ]] ; then >+ qdbus $dbusRef close > exit 1 > fi > let "compteur +=1" > FILE="$i" >+ qdbus $dbusRef setLabelText "Kim - Rotating file: `basename "$FILE"`" > mogrify -$ANGLE "$FILE" >- dcop "$dcopRef" setLabel "Kim - Rotating file: `basename "$FILE"`" >- dcop "$dcopRef" setProgress "$compteur" >+ qdbus $dbusRef org.freedesktop.DBus.Properties.Set org.kde.kdialog.ProgressDialog value "$compteur" > fi; > done > >-dcop "$dcopRef" close >+qdbus $dbusRef close >diff -Nrup kim/src/bin/kim_galery kim4/src/bin/kim_galery >--- kim/src/bin/kim_galery 2006-09-13 11:22:01.000000000 +0200 >+++ kim4/src/bin/kim_galery 2008-11-18 14:17:06.000000000 +0100 >@@ -1,9 +1,9 @@ > #!/bin/sh >-# Create a html galery >+# Create a html gallery > FILE=""; > let "nbfiles = $#" >-kdeinstdir=`kde-config --prefix` >-KIM_DIR=$kdeinstdir/share/apps/kim/galery >+kdeinstdir=`kde4-config --prefix` >+KIM_DIR=$kdeinstdir/share/apps/kim/gallery > TITLE=`kdialog --inputbox "Kim - Title:" "My title ..."`; > AUTHOR=`kdialog --inputbox "Kim - Author:" "$USER"`; > DATE=`date '+%A %-d %B %Y'`; >@@ -14,8 +14,8 @@ DIR=`kdialog --getexistingdirectory /hom > W="200"; > H="150"; > >-dcopRef=`kdialog --progressbar "Kim - Initialising ..." $nbfiles` >-dcop "$dcopRef" showCancelButton true >+dbusRef=`kdialog --progressbar "Kim - Initialising ..." $nbfiles` >+qdbus $dbusRef showCancelButton true > > # Creation of directories > mkdir $DIR/images; >@@ -31,8 +31,8 @@ tmp=0; > for i in "$@";do > if [ -f "$i" ];then > #test if cancel button has been pushed >- if test "true" = `dcop "$dcopRef" wasCancelled`;then >- dcop "$dcopRef" close >+ if [[ "$(qdbus $dbusRef wasCancelled)" == "true" ]] ; then >+ qdbus $dbusRef close > exit 1 > fi > let "compteur +=1" >@@ -54,12 +54,12 @@ for i in "$@";do > then echo '</tr><tr>' >> $DIR/index.html; > tmp=0; > fi >- dcop "$dcopRef" setLabel "Kim - Treatment of file: "$IMAGE"" >- dcop "$dcopRef" setProgress "$compteur" >+ qdbus $dbusRef setLabelText "Kim - Treatment of file: "$IMAGE"" >+ qdbus $dbusRef org.freedesktop.DBus.Properties.Set org.kde.kdialog.ProgressDialog value "$compteur" > fi; > done > > cat $KIM_DIR/index.part2 >> $DIR/index.html; >-dcop "$dcopRef" close; >+qdbus $dbusRef close; > > konqueror $DIR/index.html; >\ No newline at end of file >diff -Nrup kim/src/bin/kim_multiburst kim4/src/bin/kim_multiburst >--- kim/src/bin/kim_multiburst 2006-02-09 17:44:23.000000000 +0100 >+++ kim4/src/bin/kim_multiburst 2008-11-18 14:17:06.000000000 +0100 >@@ -23,13 +23,13 @@ > # Mathieu Vilaplana <mathieu@creationgif.com> > # Raphaël Pinson <raphink@raphink.net> > >-test -n "$KDEHOME" || KDEHOME="`kde-config --localprefix`"; export KDEHOME >+test -n "$KDEHOME" || KDEHOME="`kde4-config --localprefix`"; export KDEHOME > #KIMDIR=`mktemp -d "$KDEHOME"/tmp-"$USER"/kim.XXXXXXXX` || exit 1 > KIMDIR=`mktemp -d "$KDEHOME"/tmp-"$HOST"/kim.XXXXXXXX` || exit 1 > > let "nbfiles = $# -1" >-dcopRef=`kdialog --progressbar "Kim - Initialising compression" "$nbfiles"` >-dcop "$dcopRef" showCancelButton true >+dbusRef=`kdialog --progressbar "Kim - Initialising compression" "$nbfiles"` >+qdbus $dbusRef showCancelButton true > > compteur=0 > >@@ -39,16 +39,16 @@ do > for ((j=1;j<=4;j++)) > do > #test if cancel button has been pushed >- if test "true" = `dcop "$dcopRef" wasCancelled`;then >- dcop "$dcopRef" close >+ if [[ "$(qdbus $dbusRef wasCancelled)" == "true" ]] ; then >+ qdbus $dbusRef close > exit 1 > fi > let "compteur +=1" > x=$((($j-1)*320)); > y=$((($i-1)*240)); > convert -crop 320x240+$x+$y "$1" "$KIMDIR"/imagette.$i.$j.jpg >- dcop "$dcopRef" setLabel "Kim - Compressing file `basename "$FILE"`" >- dcop "$dcopRef" setProgress "$compteur" >+ qdbus $dbusRef setLabelText "Kim - Compressing file `basename "$FILE"`" >+ qdbus $dbusRef org.freedesktop.DBus.Properties.Set org.kde.kdialog.ProgressDialog value "$compteur" > done > done > >@@ -59,5 +59,5 @@ convert -adjoin -delay 5 imagette.*.jpg > rm "$KIMDIR"/imagette.*.jpg > rm -rf "$KIMDIR" > >-dcop "$dcopRef" close >+qdbus $dbusRef close > >diff -Nrup kim/src/bin/kim_other kim4/src/bin/kim_other >--- kim/src/bin/kim_other 2006-01-25 00:48:48.000000000 +0100 >+++ kim4/src/bin/kim_other 2008-11-18 14:17:06.000000000 +0100 >@@ -21,7 +21,7 @@ > > ATTACHMENTS=""; > ACTION="$1"; >-kdeinstdir=`kde-config --prefix` >+kdeinstdir=`kde4-config --prefix` > > case $ACTION in > about) kdialog --textbox "$kdeinstdir/share/apps/kim/kim_about.txt" 600 400;; >diff -Nrup kim/src/bin/kim_pelemele kim4/src/bin/kim_pelemele >--- kim/src/bin/kim_pelemele 2006-08-07 10:32:42.000000000 +0200 >+++ kim4/src/bin/kim_pelemele 2008-11-20 00:10:17.000000000 +0100 >@@ -22,7 +22,7 @@ > FILE=""; > let "nbfiles = $#" > >-test -n "$KDEHOME" || KDEHOME="`kde-config --localprefix`"; export KDEHOME >+test -n "$KDEHOME" || KDEHOME="`kde4-config --localprefix`"; export KDEHOME > TMPDIR=`mktemp -d "$KDEHOME"/tmp-"$HOST"/kim.XXXXXXXX` || exit 1 > > SIZE=`kdialog --inputbox "Size of small images:" 400x400`; >@@ -33,23 +33,23 @@ W=`echo $SIZE | sed 's/[^0-9]/ /g' | awk > let "OVER = ($RATIO*$W)/100"; > let "BORDER = (2*$W)/100"; > >-dcopRef=`kdialog --progressbar "Kim - Initialising ..." $nbfiles` >-dcop "$dcopRef" showCancelButton true >+dbusRef=`kdialog --progressbar "Kim - Initialising ..." $nbfiles` >+qdbus $dbusRef showCancelButton true > compteur=0 > > for i in "$@";do > if [ -f "$i" ];then > #test if cancel button has been pushed >- if test "true" = `dcop "$dcopRef" wasCancelled`;then >- dcop "$dcopRef" close >+ if [[ "$(qdbus $dbusRef wasCancelled)" == "true" ]] ; then >+ qdbus $dbusRef close > rm -rf "$KDEHOME"/tmp-"$HOST"/kim.* > exit 1 > fi > let "compteur +=1" > FILE=`basename "$i"`; >- RANDOM=`perl -e 'print int(rand(1000000))'`; >- while [ -e "$TMPDIR/pelemele_$RANDOM.png" ]; do >- RANDOM=`perl -e 'print int(rand(1000000))'`; >+ RAND="$RANDOM"; >+ while [ -e "$TMPDIR/pelemele_$RAND.png" ]; do >+ RAND="$RANDOM"; > done > convert -resize $SIZE $i "$TMPDIR/$FILE" > convert "$TMPDIR/$FILE" thumbnail.gif \ >@@ -58,13 +58,12 @@ for i in "$@";do > -background none -rotate `perl -e 'print rand() * 30 - 15'` \ > -background black \( +clone -shadow 60x4+4+4 \) +swap \ > -background none -flatten \ >- -depth 8 -quality 95 "$TMPDIR/pelemele_$RANDOM.png" >- # -depth 8 -quality 95 "$TMPDIR/pelemele_$FILE.png" >- dcop "$dcopRef" setLabel "Kim - resizing of file: $FILE" >- dcop "$dcopRef" setProgress "$compteur" >+ -depth 8 -quality 95 "$TMPDIR/pelemele_$RAND.png" >+ qdbus $dbusRef setLabelText "Kim - resizing of file: $FILE" >+ qdbus $dbusRef org.freedesktop.DBus.Properties.Set org.kde.kdialog.ProgressDialog value "$compteur" > fi; > done >-dcop "$dcopRef" close; >+qdbus $dbusRef close; > > montage -background $COLOR -tile $TILE -geometry -$OVER-$OVER $TMPDIR/pelemele_*.png `kdialog --getsavefilename ~ *.png`; > >diff -Nrup kim/src/bin/kim_print kim4/src/bin/kim_print >--- kim/src/bin/kim_print 2006-08-07 11:03:48.000000000 +0200 >+++ kim4/src/bin/kim_print 2008-11-18 14:17:06.000000000 +0100 >@@ -18,78 +18,78 @@ > > dir="$1"; > let "nbfiles = $#" >-test -n "$KDEHOME" || KDEHOME="`kde-config --localprefix`"; export KDEHOME; >+test -n "$KDEHOME" || KDEHOME="`kde4-config --localprefix`"; export KDEHOME; > KIMDIR=`mktemp -d "$KDEHOME"/tmp-"$HOST"/kim.XXXXXXXX` || exit 1; > > nb=`kdialog --radiolist "Kim - Select album type:" 1 "9x13 cm: 2x2 images, landscape" off 2 "10x15 cm: 1x2 images, portrait" off 3 "11.5x15 cm: 1x2 images, portrait" on 4 "13x18 cm: 1x2 images, portrait" off 5 "20x25 cm: 1 image, landscape" off 6 "3x2 portrait album" off 7 "Thumbnails: 4x5 images, portrait" off` > >-dcopRef=`kdialog --progressbar "Kim - Initialising ..." $nbfiles` >-dcop "$dcopRef" showCancelButton true >+dbusRef=`kdialog --progressbar "Kim - Initialising ..." $nbfiles` >+qdbus $dbusRef showCancelButton true > compteur=0 > > case "$nb" in > 1) for i in "$@";do > if [ -f "$i" ];then >- if test "true" = `dcop "$dcopRef" wasCancelled`;then >- dcop "$dcopRef" close >+ if [[ "$(qdbus $dbusRef wasCancelled)" == "true" ]] ; then >+ qdbus $dbusRef close > rm -rf "$KDEHOME"/tmp-"$HOST"/kim.* > exit 1 > fi > let "compteur +=1" > FILE=`basename "$i"`; > convert -resize 640x480 -rotate '90<' $i "$TMPDIR/mini_$FILE"; >- dcop "$dcopRef" setLabel "Kim - resizing of file: $FILE" >- dcop "$dcopRef" setProgress "$compteur" >+ qdbus $dbusRef setLabelText "Kim - resizing of file: $FILE" >+ qdbus $dbusRef org.freedesktop.DBus.Properties.Set org.kde.kdialog.ProgressDialog value "$compteur" > fi; > done >- dcop "$dcopRef" close; >+ qdbus $dbusRef close; > montage -tile 2x2 -geometry 600x800+5+5 -page 595x842 "$KIMDIR"/mini_* `kdialog --getsavefilename "$dir" *.pdf`; > rm -rf "$KDEHOME"/tmp-"$HOST"/kim.*;; > > 2) montage -tile 1x1 -geometry 800x600+5+5 -page 595x842 "$@" "$KIMDIR"/miniature.jpg >- dcop "$dcopRef" setLabel "Kim - Creating album ..." >- dcop "$dcopRef" setProgress 1 >+ qdbus $dbusRef setLabelText "Kim - Creating album ..." >+ qdbus $dbusRef org.freedesktop.DBus.Properties.Set org.kde.kdialog.ProgressDialog value 1 > montage -tile 1x1 -geometry 800x600+5+5 -page 595x842 "$KIMDIR"/miniature*.jpg* `kdialog --getsavefilename "$dir" > *.pdf`;; > > 3) montage -tile 1x2 -geometry 640x480+5+5 -page 595x842 "$@" "$KIMDIR"/miniature.jpg >- dcop "$dcopRef" setLabel "Kim - Creating album ..." >- dcop "$dcopRef" setProgress 1 >+ qdbus $dbusRef setLabelText "Kim - Creating album ..." >+ qdbus $dbusRef org.freedesktop.DBus.Properties.Set org.kde.kdialog.ProgressDialog value 1 > montage -tile 1x1 -geometry 640x480+5+5 -page 595x842 "$KIMDIR"/miniature*.jpg* `kdialog --getsavefilename "$dir" *.pdf`;; > > 4) montage -tile 1x2 -geometry 640x480+5+5 -page 842x595 "$@" "$KIMDIR"/miniature.jpg >- dcop "$dcopRef" setLabel "Kim - Creating album ..." >- dcop "$dcopRef" setProgress 1 >+ qdbus $dbusRef setLabelText "Kim - Creating album ..." >+ qdbus $dbusRef org.freedesktop.DBus.Properties.Set org.kde.kdialog.ProgressDialog value 1 > montage -tile 1x1 -geometry 480x640+5+5 -page 842x595 "$KIMDIR"/miniature*.jpg* `kdialog --getsavefilename "$dir" *.pdf`;; > > 5) montage -tile 2x2 -geometry 640x480+5+5 -page 595x842 "$@" "$KIMDIR"/miniature.jpg >- dcop "$dcopRef" setLabel "Kim - Creating album ..." >- dcop "$dcopRef" setProgress 1 >+ qdbus $dbusRef setLabelText "Kim - Creating album ..." >+ qdbus $dbusRef org.freedesktop.DBus.Properties.Set org.kde.kdialog.ProgressDialog value 1 > montage -tile 1x1 -geometry 640x480+5+5 -page 595x842 "$KIMDIR"/miniature*.jpg* `kdialog --getsavefilename "$dir" *.pdf`;; > > 6) montage -tile 2x3 -geometry 640x480+5+5 -page 842x595 "$@" "$KIMDIR"/miniature.jpg >- dcop "$dcopRef" setLabel "Kim - Creating album ..." >- dcop "$dcopRef" setProgress 1 >+ qdbus $dbusRef setLabelText "Kim - Creating album ..." >+ qdbus $dbusRef org.freedesktop.DBus.Properties.Set org.kde.kdialog.ProgressDialog value 1 > montage -tile 1x1 -geometry 480x640+5+5 -page 842x595 "$KIMDIR"/miniature*.jpg* `kdialog --getsavefilename "$dir" *.pdf`;; > > 7) montage -tile 4x3 -geometry 640x480+5+5 -page 595x842 "$@" "$KIMDIR"/miniature.jpg >- dcop "$dcopRef" setLabel "Kim - Creating album ..." >- dcop "$dcopRef" setProgress 1 >+ qdbus $dbusRef setLabelText "Kim - Creating album ..." >+ qdbus $dbusRef org.freedesktop.DBus.Properties.Set org.kde.kdialog.ProgressDialog value 1 > montage -tile 1x1 -geometry 640x480+5+5 -page 595x842 "$KIMDIR"/miniature*.jpg* `kdialog --getsavefilename "$dir" *.pdf`;; > > 8) montage -tile 4x4 -geometry 640x480+5+5 -page 595x842 "$@" "$KIMDIR"/miniature.jpg >- dcop "$dcopRef" setLabel "Kim - Creating album ..." >- dcop "$dcopRef" setProgress 1 >+ qdbus $dbusRef setLabelText "Kim - Creating album ..." >+ qdbus $dbusRef org.freedesktop.DBus.Properties.Set org.kde.kdialog.ProgressDialog value 1 > montage -tile 1x1 -geometry 640x480+5+5 -page 595x842 "$KIMDIR"/miniature*.jpg* `kdialog --getsavefilename "$dir" *.pdf`;; > > *) kdialog --msgbox "Kim - Unrecognized option ! ";; > esac > >-dcop "$dcopRef" setLabel "Kim - Deleting miniatures ..." >-dcop "$dcopRef" setProgress 2 >+qdbus $dbusRef setLabelText "Kim - Deleting miniatures ..." >+qdbus $dbusRef org.freedesktop.DBus.Properties.Set org.kde.kdialog.ProgressDialog value 2 > #rm "$KIMDIR"/miniature*.jpg* > rm -rf "$KIMDIR" >-dcop "$dcopRef" close >+qdbus $dbusRef close > > > >diff -Nrup kim/src/bin/kim_record kim4/src/bin/kim_record >--- kim/src/bin/kim_record 2006-02-09 17:32:59.000000000 +0100 >+++ kim4/src/bin/kim_record 2008-11-18 14:17:06.000000000 +0100 >@@ -20,7 +20,7 @@ > # Author: Charles Bouveyron <charles.bouveyron@free.fr> > # Raphaël Pinson <raphink@raphink.net> > >-test -n "$KDEHOME" || KDEHOME="`kde-config --localprefix`"; export KDEHOME >+test -n "$KDEHOME" || KDEHOME="`kde4-config --localprefix`"; export KDEHOME > #KIMDIR=`mktemp -d "$KDEHOME"/tmp-"$USER"/kim.XXXXXXXX` || exit 1 > KIMDIR=`mktemp -d "$KDEHOME"/tmp-"$HOST"/kim.XXXXXXXX` || exit 1 > >diff -Nrup kim/src/bin/kim_record_mpg kim4/src/bin/kim_record_mpg >--- kim/src/bin/kim_record_mpg 2006-02-09 17:36:57.000000000 +0100 >+++ kim4/src/bin/kim_record_mpg 2008-11-18 14:17:06.000000000 +0100 >@@ -20,7 +20,7 @@ > # Author: Charles Bouveyron <charles.bouveyron@free.fr> > # Raphaël Pinson <raphink@raphink.net> > >-test -n "$KDEHOME" || KDEHOME="`kde-config --localprefix`"; export KDEHOME >+test -n "$KDEHOME" || KDEHOME="`kde4-config --localprefix`"; export KDEHOME > #KIMDIR=`mktemp -d "$KDEHOME"/tmp-"$USER"/kim.XXXXXXXX` || exit 1 > KIMDIR=`mktemp -d "$KDEHOME"/tmp-"$HOST"/kim.XXXXXXXX` || exit 1 > >diff -Nrup kim/src/bin/kim_rename kim4/src/bin/kim_rename >--- kim/src/bin/kim_rename 2006-04-25 09:59:02.000000000 +0200 >+++ kim4/src/bin/kim_rename 2008-11-18 14:17:06.000000000 +0100 >@@ -27,15 +27,15 @@ DIR="$1"; > kdialog --title "Kim" --yesnocancel "Do you want to replace exisiting files ?" > case $? in > 0) # Replace exisiting files ! >- dcopRef=`kdialog --progressbar "Kim - Initialising ..." $nbfiles` >- dcop "$dcopRef" showCancelButton true >+ dbusRef=`kdialog --progressbar "Kim - Initialising ..." $nbfiles` >+ qdbus $dbusRef showCancelButton true > compteur=0 > newname=`kdialog --inputbox "Choose the new name of images:" "wallpaper_"` > for i in "$@";do > if [ -f "$i" ];then > #test if cancel button has been pushed >- if test "true" = `dcop "$dcopRef" wasCancelled`;then >- dcop "$dcopRef" close >+ if [[ "$(qdbus $dbusRef wasCancelled)" == "true" ]] ; then >+ qdbus $dbusRef close > exit 1 > fi > let "compteur +=1" >@@ -48,22 +48,22 @@ case $? in > fi > fi > mv "$FILE" "$DIR/$newname$suff$compteur.jpg" >- dcop "$dcopRef" setLabel "Kim - Renaming file: `basename "$FILE"`" >- dcop "$dcopRef" setProgress "$compteur" >+ qdbus $dbusRef setLabelText "Kim - Renaming file: `basename "$FILE"`" >+ qdbus $dbusRef org.freedesktop.DBus.Properties.Set org.kde.kdialog.ProgressDialog value "$compteur" > fi; > done >- dcop "$dcopRef" close;; >+ qdbus $dbusRef close;; > > 1) >- dcopRef=`kdialog --progressbar "Kim - Initialising ..." "$nbfiles"` >- dcop "$dcopRef" showCancelButton true >+ dbusRef=`kdialog --progressbar "Kim - Initialising ..." "$nbfiles"` >+ qdbus $dbusRef showCancelButton true > compteur=0 > newname="`kdialog --inputbox "Choose the new name of images:" "wallpaper_"`" > for i in "$@";do > if [ -f "$i" ];then > #test if cancel button has been pushed >- if test "true" = `dcop "$dcopRef" wasCancelled`;then >- dcop "$dcopRef" close >+ if [[ "$(qdbus $dbusRef wasCancelled)" == "true" ]] ; then >+ qdbus $dbusRef close > exit 1 > fi > let "compteur +=1" >@@ -76,11 +76,11 @@ case $? in > fi > fi > cp "$FILE" "$DIR/$newname$suff$compteur.jpg" >- dcop "$dcopRef" setLabel "Kim - Renaming file: `basename "$FILE"`" >- dcop "$dcopRef" setProgress "$compteur" >+ qdbus $dbusRef setLabelText "Kim - Renaming file: `basename "$FILE"`" >+ qdbus $dbusRef org.freedesktop.DBus.Properties.Set org.kde.kdialog.ProgressDialog value "$compteur" > fi; > done >- dcop "$dcopRef" close;; >+ qdbus $dbusRef close;; > > 2) kdialog --title "Kim" --msgbox "The action was cancelled by user !" > exit 1;; >diff -Nrup kim/src/bin/kim_resize kim4/src/bin/kim_resize >--- kim/src/bin/kim_resize 2006-04-20 11:57:56.000000000 +0200 >+++ kim4/src/bin/kim_resize 2008-11-18 14:17:06.000000000 +0100 >@@ -28,44 +28,44 @@ DIR="$2"; > kdialog --title "Kim" --yesnocancel "Do you want to replace exisiting files ?" > case $? in > 0) # Replace exisiting files ! >- dcopRef=`kdialog --progressbar "Kim - Initialising ..." "$nbfiles"` >- dcop "$dcopRef" showCancelButton true >+ dbusRef=`kdialog --progressbar "Kim - Initialising ..." "$nbfiles"` >+ qdbus $dbusRef showCancelButton true > compteur=0 > for i in "$@";do > if [ -f "$i" ];then > #test if cancel button has been pushed >- if test "true" = `dcop "$dcopRef" wasCancelled`;then >- dcop "$dcopRef" close >+ if [[ "$(qdbus $dbusRef wasCancelled)" == "true" ]] ; then >+ qdbus $dbusRef close > exit 1 > fi > let "compteur +=1" > FILE="$i" > mogrify -resize "$SCALE" "$FILE"; >- dcop "$dcopRef" setLabel "Kim - Resizing file: `basename "$FILE"`" >- dcop "$dcopRef" setProgress "$compteur" >+ qdbus $dbusRef setLabelText "Kim - Resizing file: `basename "$FILE"`" >+ qdbus $dbusRef org.freedesktop.DBus.Properties.Set org.kde.kdialog.ProgressDialog value "$compteur" > fi; > done >- dcop "$dcopRef" close;; >+ qdbus $dbusRef close;; > > 1) >- dcopRef=`kdialog --progressbar "Kim - Initialising ..." "$nbfiles"` >- dcop "$dcopRef" showCancelButton true >+ dbusRef=`kdialog --progressbar "Kim - Initialising ..." "$nbfiles"` >+ qdbus $dbusRef showCancelButton true > compteur=0 > for i in "$@";do > if [ -f "$i" ];then > #test if cancel button has been pushed >- if test "true" = `dcop "$dcopRef" wasCancelled`;then >- dcop "$dcopRef" close >+ if [[ "$(qdbus $dbusRef wasCancelled)" == "true" ]] ; then >+ qdbus $dbusRef close > exit 1 > fi > let "compteur +=1" > FILE="$i" > convert -resize "$SCALE" "$FILE" "$DIR/resized_`basename "$FILE"`"; >- dcop "$dcopRef" setLabel "Kim - Resizing file: `basename "$FILE"`" >- dcop "$dcopRef" setProgress "$compteur" >+ qdbus $dbusRef setLabelText "Kim - Resizing file: `basename "$FILE"`" >+ qdbus $dbusRef org.freedesktop.DBus.Properties.Set org.kde.kdialog.ProgressDialog value "$compteur" > fi; > done >- dcop "$dcopRef" close;; >+ qdbus $dbusRef close;; > > 2) kdialog --title "Kim" --msgbox "The action was cancelled by user !" > exit 1;; >diff -Nrup kim/src/bin/kim_resizeandsend kim4/src/bin/kim_resizeandsend >--- kim/src/bin/kim_resizeandsend 2006-11-07 15:46:24.000000000 +0100 >+++ kim4/src/bin/kim_resizeandsend 2008-11-20 00:12:36.000000000 +0100 >@@ -21,7 +21,7 @@ > # Mathieu Vilaplana <mathieu@creationgif.com> > # Raphaël Pinson <raphink@raphink.net> > >-test -n "$KDEHOME" || KDEHOME="`kde-config --localprefix`"; export KDEHOME >+test -n "$KDEHOME" || KDEHOME="`kde4-config --localprefix`"; export KDEHOME > TMPDIR=`mktemp -d "$KDEHOME"/tmp-"$HOST"/kim.XXXXXXXX` || exit 1 > > ATTACHMENTS=""; >@@ -29,22 +29,21 @@ ATTACHMENTS=""; > choice=`kdialog --radiolist "Kim - Send by mail:" 1 "Full size" off 2 "800x600 px" on 3 "600x450 px" off 4 "300x225 px" off`; > > let "nbfiles = $#" >-dcopRef=`kdialog --progressbar "Kim - Initialising ..." $nbfiles` >-dcop $dcopRef showCancelButton true >+dbusRef=`kdialog --progressbar "Kim - Initialising ..." $nbfiles` >+qdbus $dbusRef showCancelButton true > > compteur=0 > > for i in "$@";do > if [ -f "$i" ];then > #test if cancel button has been pushed >- if test "true" = `dcop $dcopRef wasCancelled`;then >- dcop "$dcopRef" close >+ if [[ "$(qdbus $dbusRef wasCancelled)" == "true" ]] ; then >+ qdbus $dbusRef close > exit 1 > fi > ATTACHMENTS="$i" > let "compteur +=1" >- dcop "$dcopRef" setLabel "Kim - Resizing and compressing file: `basename "$ATTACHMENTS"`" >- dcop "$dcopRef" setProgress $compteur >+ qdbus $dbusRef setLabelText "Kim - Resizing and compressing file: `basename "$ATTACHMENTS"`" > case "$choice" in > 1) cp $i $TMPDIR;; > 2) convert -resize 800x800 "$ATTACHMENTS" "$TMPDIR"/`basename "$ATTACHMENTS"`;; >@@ -52,10 +51,11 @@ for i in "$@";do > 4) convert -resize 300x300 "$ATTACHMENTS" "$TMPDIR"/`basename "$ATTACHMENTS"`;; > *)exit 1;; > esac >+ qdbus $dbusRef org.freedesktop.DBus.Properties.Set org.kde.kdialog.ProgressDialog value $compteur > fi; > done > > kmail --attach "$TMPDIR"/*; >-dcop "$dcopRef" close; >+qdbus $dbusRef close; > kdialog --msgbox "Kim - Send by mail: you can write your message!" > rm -rf "$TMPDIR" >diff -Nrup kim/src/bin/kim_rotate kim4/src/bin/kim_rotate >--- kim/src/bin/kim_rotate 2007-12-26 12:17:29.000000000 +0100 >+++ kim4/src/bin/kim_rotate 2008-11-19 23:58:56.000000000 +0100 >@@ -24,26 +24,27 @@ > FILE=""; > ANGLE="$1"; > let "nbfiles = $# -1" >-dcopRef=`kdialog --progressbar "Kim - Initialising ..." $nbfiles` >-dcop "$dcopRef" showCancelButton true >+dbusRef=`kdialog --progressbar "Kim - Initialising ..." $nbfiles` >+qdbus $dbusRef showCancelButton true > > compteur=0 > for i in "$@";do > if [ -f "$i" ];then > #test if cancel button has been pushed >- if test "true" = `dcop "$dcopRef" wasCancelled`;then >- dcop "$dcopRef" close >+ if [[ "$(qdbus $dbusRef wasCancelled)" == "true" ]] ; then >+ qdbus $dbusRef close > exit 1 > fi > let "compteur +=1" > FILE="$i" >- if test "EXIF" = $ANGLE; then >+ qdbus $dbusRef setLabelText "Kim - Rotating file: `basename "$FILE"`" >+ if [[ "EXIF" == "$ANGLE" ]] ; then > mogrify -auto-orient "$FILE"; >- else mogrify -rotate $ANGLE "$FILE" >+ else >+ mogrify -rotate $ANGLE "$FILE" > fi >- dcop "$dcopRef" setLabel "Kim - Rotating file: `basename "$FILE"`" >- dcop "$dcopRef" setProgress "$compteur" >+ qdbus $dbusRef org.freedesktop.DBus.Properties.Set org.kde.kdialog.ProgressDialog value "$compteur" > fi; > done > >-dcop "$dcopRef" close >+qdbus $dbusRef close >diff -Nrup kim/src/bin/kim_rotatewithexif kim4/src/bin/kim_rotatewithexif >--- kim/src/bin/kim_rotatewithexif 2007-12-26 12:06:56.000000000 +0100 >+++ kim4/src/bin/kim_rotatewithexif 2008-11-19 23:05:34.000000000 +0100 >@@ -24,23 +24,23 @@ > FILE=""; > ANGLE="$1"; > let "nbfiles = $# -1" >-dcopRef=`kdialog --progressbar "Kim - Initialising ..." $nbfiles` >-dcop "$dcopRef" showCancelButton true >+dbusRef=`kdialog --progressbar "Kim - Initialising ..." $nbfiles` >+qdbus $dbusRef showCancelButton true > > compteur=0 > for i in "$@";do >- if [ -f "$i" ];then >+ if [[ -f "$i" ]] ; then > #test if cancel button has been pushed >- if test "true" = `dcop "$dcopRef" wasCancelled`;then >- dcop "$dcopRef" close >+ if [[ "$(qdbus $dbusRef wasCancelled)" == "true" ]] ; then >+ qdbus $dbusRef close > exit 1 > fi > let "compteur +=1" > FILE="$i" >+ qdbus $dbusRef setLabelText "Kim - Rotating file: `basename "$FILE"`" > mogrify -rotate $ANGLE "$FILE" >- dcop "$dcopRef" setLabel "Kim - Rotating file: `basename "$FILE"`" >- dcop "$dcopRef" setProgress "$compteur" >+ qdbus $dbusRef org.freedesktop.DBus.Properties.Set org.kde.kdialog.ProgressDialog value "$compteur" > fi; > done > >-dcop "$dcopRef" close >+qdbus $dbusRef close >diff -Nrup kim/src/bin/kim_rotate~ kim4/src/bin/kim_rotate~ >--- kim/src/bin/kim_rotate~ 2006-02-10 15:56:14.000000000 +0100 >+++ kim4/src/bin/kim_rotate~ 1970-01-01 01:00:00.000000000 +0100 >@@ -1,46 +0,0 @@ >-#!/bin/bash >-# >-# Copyright (C) 2005,2006 Charles Bouveyron <charles.bouveyron@free.fr> >-# >-# This program is free software; you can redistribute it and/or >-# modify it under the terms of the GNU General Public License >-# as published by the Free Software Foundation; either version 2 >-# of the License, or (at your option) any later version. >-# >-# This program is distributed in the hope that it will be useful, >-# but WITHOUT ANY WARRANTY; without even the implied warranty of >-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the >-# GNU General Public License for more details. >-# >-# You should have received a copy of the GNU General Public License >-# along with this program; if not, write to the Free Software >-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, U >-# >-# Author : Charles Bouveyron <charles.bouveyron@free.fr> >-# Alessandro Faggiano <> >-# Mathieu Vilaplana <mathieu@creationgif.com> >-# Raphaël Pinson <raphink@raphink.net> >- >-FILE=""; >-ANGLE="$1"; >-let "nbfiles = $# -1" >-dcopRef=`kdialog --progressbar "Kim - Initialising ..." $nbfiles` >-dcop "$dcopRef" showCancelButton true >- >-compteur=0 >-for i in "$@";do >- if [ -f "$i" ];then >- #test if cancel button has been pushed >- if test "true" = `dcop "$dcopRef" wasCancelled`;then >- dcop "$dcopRef" close >- exit 1 >- fi >- let "compteur +=1" >- FILE="$i" >- mogrify -rotate $ANGLE "$FILE" >- dcop "$dcopRef" setLabel "Kim - Rotating file: `basename "$FILE"`" >- dcop "$dcopRef" setProgress "$compteur" >- fi; >-done >- >-dcop "$dcopRef" close >diff -Nrup kim/src/bin/kim_slideshow kim4/src/bin/kim_slideshow >--- kim/src/bin/kim_slideshow 2006-04-02 22:33:15.000000000 +0200 >+++ kim4/src/bin/kim_slideshow 2008-11-20 00:05:38.000000000 +0100 >@@ -2,7 +2,7 @@ > # Create a Flash slideshow > FILE=""; > let "nbfiles = $#" >-kdeinstdir=`kde-config --prefix` >+kdeinstdir=`kde4-config --prefix` > KIM_DIR=$kdeinstdir/share/apps/kim/slideshow > TITLE=`kdialog --inputbox "Kim - Title:" "My title ..."`; > AUTHOR=`kdialog --inputbox "Kim - Author:" "$USER"`; >@@ -12,8 +12,8 @@ DIR=`kdialog --getexistingdirectory /hom > W=`echo $SCALE | sed 's/[^0-9]/ /g' | awk '{print $1}'`; > H=`echo $SCALE | sed 's/[^0-9]/ /g' | awk '{print $2}'`; > >-dcopRef=`kdialog --progressbar "Kim - Initialising ..." $nbfiles` >-dcop "$dcopRef" showCancelButton true >+dbusRef=`kdialog --progressbar "Kim - Initialising ..." $nbfiles` >+qdbus $dbusRef showCancelButton true > > mkdir $DIR/images; > cp $KIM_DIR/dewslider.swf $DIR; >@@ -39,19 +39,19 @@ compteur=0 > for i in "$@";do > if [ -f "$i" ];then > #test if cancel button has been pushed >- if test "true" = `dcop "$dcopRef" wasCancelled`;then >- dcop "$dcopRef" close >+ if [[ "$(qdbus $dbusRef wasCancelled)" == "true" ]] ; then >+ qdbus $dbusRef close > exit 1 > fi > let "compteur +=1" > FILE="$i" > convert -resize $SCALE "$FILE" $DIR/images/`basename "$FILE"`.jpg; > echo '<img src="images/'`basename "$FILE"`'.jpg" title="'`basename "$FILE"`'" />' >> $DIR/dewslider.xml; >- dcop "$dcopRef" setLabel "Kim - Treatment of file: `basename "$FILE"`" >- dcop "$dcopRef" setProgress "$compteur" >+ qdbus $dbusRef setLabelText "Kim - Treatment of file: `basename "$FILE"`" >+ qdbus $dbusRef org.freedesktop.DBus.Properties.Set org.kde.kdialog.ProgressDialog value "$compteur" > fi; > done > > echo '</album>' >> $DIR/dewslider.xml; >-dcop "$dcopRef" close; >+qdbus $dbusRef close; > konqueror $DIR/index.html; >\ No newline at end of file >diff -Nrup kim/src/bin/kim_sortbydate kim4/src/bin/kim_sortbydate >--- kim/src/bin/kim_sortbydate 2006-08-01 12:57:17.000000000 +0200 >+++ kim4/src/bin/kim_sortbydate 2008-11-18 14:17:06.000000000 +0100 >@@ -23,21 +23,21 @@ FILE=""; > DIR="$1" > let "nbfiles = $#/2" > >-test -n "$KDEHOME" || KDEHOME="`kde-config --localprefix`"; export KDEHOME >+test -n "$KDEHOME" || KDEHOME="`kde4-config --localprefix`"; export KDEHOME > TMPDIR=`mktemp -d "$KDEHOME"/tmp-"$HOST"/kim.XXXXXXXX` || exit 1 > > kdialog --title "Kim" --yesnocancel "Do you want to replace exisiting files ?" > > case $? in > 0) # Replace exisiting files ! >- dcopRef=`kdialog --progressbar "Kim - Initialising ..." $nbfiles` >- dcop "$dcopRef" showCancelButton true >+ dbusRef=`kdialog --progressbar "Kim - Initialising ..." $nbfiles` >+ qdbus $dbusRef showCancelButton true > compteur=0 > for i in "$@";do > if [ -f "$i" ];then > #test if cancel button has been pushed >- if test "true" = `dcop "$dcopRef" wasCancelled`;then >- dcop "$dcopRef" close >+ if [[ "$(qdbus $dbusRef wasCancelled)" == "true" ]] ; then >+ qdbus $dbusRef close > exit 1 > fi > let "compteur +=1" >@@ -59,21 +59,21 @@ case $? in > NEWNAME="$NAME"_"$tmp.jpg" > done > mv "$TMPDIR/$FILE" "$DIR/$NEWNAME" >- dcop "$dcopRef" setLabel "Kim - Renaming file: $FILE" >- dcop "$dcopRef" setProgress "$compteur" >+ qdbus $dbusRef setLabelText "Kim - Renaming file: $FILE" >+ qdbus $dbusRef org.freedesktop.DBus.Properties.Set org.kde.kdialog.ProgressDialog value "$compteur" > fi; > done >- dcop "$dcopRef" close;; >+ qdbus $dbusRef close;; > > 1) # Do not replace exisiting files ! >- dcopRef=`kdialog --progressbar "Kim - Initialising ..." "$nbfiles"` >- dcop "$dcopRef" showCancelButton true >+ dbusRef=`kdialog --progressbar "Kim - Initialising ..." "$nbfiles"` >+ qdbus $dbusRef showCancelButton true > compteur=0 > for i in "$@";do > if [ -f "$i" ];then > #test if cancel button has been pushed >- if test "true" = `dcop "$dcopRef" wasCancelled`;then >- dcop "$dcopRef" close >+ if [[ "$(qdbus $dbusRef wasCancelled)" == "true" ]] ; then >+ qdbus $dbusRef close > exit 1 > fi > let "compteur +=1" >@@ -95,11 +95,11 @@ case $? in > NEWNAME="$NAME"_"$tmp.jpg" > done > mv "$TMPDIR/$FILE" "$DIR/$NEWNAME" >- dcop "$dcopRef" setLabel "Kim - Renaming file: $FILE" >- dcop "$dcopRef" setProgress "$compteur" >+ qdbus $dbusRef setLabelText "Kim - Renaming file: $FILE" >+ qdbus $dbusRef org.freedesktop.DBus.Properties.Set org.kde.kdialog.ProgressDialog value "$compteur" > fi; > done >- dcop "$dcopRef" close;; >+ qdbus $dbusRef close;; > > 2) kdialog --title "Kim" --msgbox "The action was cancelled by user !" > exit 1;; >diff -Nrup kim/src/bin/kim_treatment kim4/src/bin/kim_treatment >--- kim/src/bin/kim_treatment 2006-01-25 00:59:51.000000000 +0100 >+++ kim4/src/bin/kim_treatment 2008-11-19 23:46:53.000000000 +0100 >@@ -24,93 +24,97 @@ > ATTACHMENTS=""; > SCELTA="$1"; > DIR="$2"; >+ > let "nbfiles = ($# -1)/2" >+ > case $SCELTA in >- mark) annotation=`kdialog --inputbox "Choose your annotation:" "My annotation"`;; >- border) color=`kdialog --radiolist "Kim - Select border color:" 1 "white" on 2 "black" off`;; >+ mark) annotation=`kdialog --inputbox "Choose your annotation:" "My annotation"` ;; >+ border) color=`kdialog --radiolist "Kim - Select border color:" 1 "white" on 2 "black" off` ;; > esac >+ > kdialog --title "Kim" --yesnocancel "Do you want to replace exisiting files ?" >-case $? in >- 0) # Replace exisiting files ! >- dcopRef=`kdialog --progressbar "Kim - Initialising ..." "$nbfiles"` >- dcop "$dcopRef" showCancelButton true >+ >+function RENAME { >+ if [[ "$REPLACE" == "YES" ]] ; then >+ ATTACHMENT_NAME_NEW="${1}-${3}.${2}" >+ else >+ ATTACHMENT_NAME_NEW="${1}.${2}" >+ fi >+} >+ >+function TREATMENT { > compteur=0 > for i in "$@";do > if [ -f "$i" ];then > #test if cancel button has been pushed >- if test "true" = `dcop "$dcopRef" wasCancelled`;then >- dcop "$dcopRef" close >+ if [[ "$(qdbus $dbusRef wasCancelled)" == "true" ]] ; then >+ qdbus $dbusRef close > exit 1 > fi >+ > ATTACHMENTS="$i" >+ ATTACHMENT_NAME=`basename "$ATTACHMENTS"` >+ BASE=${ATTACHMENT_NAME%.*} >+ EXT=${ATTACHMENT_NAME##*.} >+ > let "compteur +=1" >- dcop "$dcopRef" setLabel "Kim - Treatment of file: `basename "$ATTACHMENTS"`" >- dcop "$dcopRef" setProgress "$compteur" >+ >+ qdbus $dbusRef setLabelText "Kim - Treatment of file: $ATTACHMENT_NAME" >+ > case "$SCELTA" in > gray) >- mogrify -colorspace gray "$ATTACHMENTS" >- ;; >+ RENAME "${BASE}" "${EXT}" "gray" >+ convert -colorspace gray "$ATTACHMENTS" "$DIR/${ATTACHMENT_NAME_NEW}" ;; > sepia) >- mogrify -sepia-tone 80% "$ATTACHMENTS" >- ;; >+ RENAME "${BASE}" "${EXT}" "sepia" >+ convert -sepia-tone 80% "$ATTACHMENTS" "$DIR/${ATTACHMENT_NAME_NEW}" ;; > border) > case "$color" in >- 1) mogrify -border 10x10 -bordercolor white "$ATTACHMENTS";; >- 2) mogrify -border 10x10 -bordercolor black "$ATTACHMENTS";; >- esac >- ;; >+ 1) RENAME "${BASE}" "${EXT}" "border_white" >+ convert -border 10x10 -bordercolor white "$ATTACHMENTS" "$DIR/${ATTACHMENT_NAME_NEW}" ;; >+ 2) RENAME "${BASE}" "${EXT}" "border_black" >+ convert -border 10x10 -bordercolor black "$ATTACHMENTS" "$DIR/${ATTACHMENT_NAME_NEW}" ;; >+ esac ;; > mark) >- mogrify -font SheerBeauty -pointsize 20 -draw "gravity southeast text 0,0 '$annotation'" "$ATTACHMENTS" >- ;; >+ RENAME "${BASE}" "${EXT}" "text" >+ #convert -font SheerBeauty -pointsize 80 -draw "gravity southeast text 0,0 '$annotation'" "$ATTACHMENTS" "$DIR/${ATTACHMENT_NAME_NEW}" ;; >+ convert -font SheerBeauty -pointsize 80 -draw " gravity southeast \ >+ fill black text 27,67 '$annotation' \ >+ text 25,68 '$annotation' \ >+ text 23,67 '$annotation' \ >+ text 22,65 '$annotation' \ >+ text 23,63 '$annotation' \ >+ text 25,62 '$annotation' \ >+ text 27,63 '$annotation' \ >+ text 28,65 '$annotation' \ >+ fill white text 25,65 '$annotation' " "$ATTACHMENTS" "$DIR/${ATTACHMENT_NAME_NEW}" >+ ;; > *) >- exit 1 >- ;; >+ exit 1 ;; > esac >+ qdbus $dbusRef org.freedesktop.DBus.Properties.Set org.kde.kdialog.ProgressDialog value "$compteur" > fi; > done >- dcop "$dcopRef" close;; >+} >+ >+case $? in >+ 0) # Replace exisiting files! >+ dbusRef=`kdialog --progressbar "Kim - Initialising ..." "$nbfiles"` >+ qdbus $dbusRef showCancelButton true >+ REPLACE="YES" >+ TREATMENT "$@" >+ qdbus $dbusRef close ;; > >- 1) # Save files with another name ! >- dcopRef=`kdialog --progressbar "Kim - Initialising ..." "$nbfiles"` >- dcop "$dcopRef" showCancelButton true >- compteur=0 >- for i in "$@";do >- if [ -f "$i" ];then >- #test if cancel button has been pushed >- if test "true" = `dcop "$dcopRef" wasCancelled`;then >- dcop "$dcopRef" close >- exit 1 >- fi >- ATTACHMENTS="$i" >- let "compteur +=1" >- dcop "$dcopRef" setLabel "Kim - Treatment of file: `basename "$ATTACHMENTS"`" >- dcop "$dcopRef" setProgress "$compteur" >- case "$SCELTA" in >- gray) >- convert -colorspace gray "$ATTACHMENTS" "$DIR/gray_`basename "$ATTACHMENTS"`" >- ;; >- sepia) >- convert -sepia-tone 80% "$ATTACHMENTS" "$DIR/sepia_`basename "$ATTACHMENTS"`" >- ;; >- border) >- case "$color" in >- 1) convert -border 10x10 -bordercolor white "$ATTACHMENTS" "$DIR/border_`basename "$ATTACHMENTS"`";; >- 2) convert -border 10x10 -bordercolor black "$ATTACHMENTS" "$DIR/border_`basename "$ATTACHMENTS"`";; >- esac >- ;; >- mark) >- convert -font SheerBeauty -pointsize 20 -draw "gravity southeast text 0,0 '$annotation'" "$ATTACHMENTS" "$DIR"/text_`basename "$ATTACHMENTS"` >- ;; >- *) >- exit 1 >- ;; >- esac >- fi; >- done >- dcop "$dcopRef" close;; >+ 1) # Save files with another name! >+ dbusRef=`kdialog --progressbar "Kim - Initialising ..." "$nbfiles"` >+ qdbus $dbusRef showCancelButton true >+ REPLACE="NO" >+ TREATMENT "$@" >+ qdbus $dbusRef close ;; > >- 2) kdialog --title "Kim" --msgbox "The action was cancelled by user !" >- exit 1;; >+ 2) #cancelled by user! >+ kdialog --title "Kim" --msgbox "The action was cancelled by user !" >+ exit 1 ;; > esac; > > >diff -Nrup kim/src/bin/kim_webexport kim4/src/bin/kim_webexport >--- kim/src/bin/kim_webexport 2006-01-25 01:00:44.000000000 +0100 >+++ kim4/src/bin/kim_webexport 2008-11-18 14:17:06.000000000 +0100 >@@ -28,44 +28,44 @@ let "nbfiles = ($# -1)/2" > kdialog --title "Kim" --yesnocancel "Do you want to replace exisiting files ?" > case $? in > 0) # Replace exisiting files ! >- dcopRef=`kdialog --progressbar "Kim - Initialising compression" "$nbfiles"` >- dcop "$dcopRef" showCancelButton true >+ dbusRef=`kdialog --progressbar "Kim - Initialising compression" "$nbfiles"` >+ qdbus $dbusRef showCancelButton true > compteur=0 > for i in "$@";do > if [ -f "$i" ];then > #test if cancel button has been pushed >- if test "true" = `dcop "$dcopRef" wasCancelled`;then >- dcop "$dcopRef" close >+ if [[ "$(qdbus $dbusRef wasCancelled)" == "true" ]] ; then >+ qdbus $dbusRef close > exit 1 > fi > let "compteur +=1" > FILE="$i" > mogrify -resize "$SCELTA" -quality 75 "$FILE" >- dcop "$dcopRef" setLabel "Kim - Compressing file `basename "$FILE"`" >- dcop "$dcopRef" setProgress "$compteur" >+ qdbus $dbusRef setLabelText "Kim - Compressing file `basename "$FILE"`" >+ qdbus $dbusRef org.freedesktop.DBus.Properties.Set org.kde.kdialog.ProgressDialog value "$compteur" > fi; > done >- dcop "$dcopRef" close;; >+ qdbus $dbusRef close;; > > 1) >- dcopRef=`kdialog --progressbar "Kim - Initialising compression" "$nbfiles"` >- dcop "$dcopRef" showCancelButton true >+ dbusRef=`kdialog --progressbar "Kim - Initialising compression" "$nbfiles"` >+ qdbus $dbusRef showCancelButton true > compteur=0 > for i in "$@";do > if [ -f "$i" ];then > #test if cancel button has been pushed >- if test "true" = `dcop "$dcopRef" wasCancelled`;then >- dcop "$dcopRef" close >+ if [[ "$(qdbus $dbusRef wasCancelled)" == "true" ]] ; then >+ qdbus $dbusRef close > exit 1 > fi > let "compteur +=1" > FILE="$i" > convert -resize $SCELTA -quality 75 "$FILE" "$DIR/web_`basename "$FILE"`" >- dcop "$dcopRef" setLabel "Kim - Compressing file `basename "$FILE"`" >- dcop "$dcopRef" setProgress "$compteur" >+ qdbus $dbusRef setLabelText "Kim - Compressing file `basename "$FILE"`" >+ qdbus $dbusRef org.freedesktop.DBus.Properties.Set org.kde.kdialog.ProgressDialog value "$compteur" > fi; > done >- dcop "$dcopRef" close;; >+ qdbus $dbusRef close;; > > 2) kdialog --title "Kim" --msgbox "The action was cancelled by user !" > exit 1;; >diff -Nrup kim/src/galery/index.part1 kim4/src/galery/index.part1 >--- kim/src/galery/index.part1 2006-04-01 12:46:09.000000000 +0200 >+++ kim4/src/galery/index.part1 1970-01-01 01:00:00.000000000 +0100 >@@ -1,34 +0,0 @@ >-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd"> >-<html> >-<head> >-<meta http-equiv="content-type" content="text/html; charset=utf-8"> >-<title>Image gallery (Kde Image Menu)</title> >-<style type="text/css"> >-body { >- background:#eee; >- text-align:center; >- height:100%; >- padding-top:1em; >-} >-a,p { >- color:#aaa; >- font-family:Verdana,Arial,Helvetica,Sans-serif; >- text-decoration:none; >- font-size:xx-small; >-} >-a:hover { >- color:#666; >- text-decoration:underline; >-} >-img.photo { >- border: 5px solid #ffffff; >-} >-table { >- text-align: center; >- margin-left: auto; >- margin-right: auto; >-} >-</style> >-</style> >-</head> >-<body> >diff -Nrup kim/src/galery/index.part2 kim4/src/galery/index.part2 >--- kim/src/galery/index.part2 2006-03-31 20:06:59.000000000 +0200 >+++ kim4/src/galery/index.part2 1970-01-01 01:00:00.000000000 +0100 >@@ -1,9 +0,0 @@ >-</tr></table> >- >-<p style="margin-top:4em;"> >-Galery created with <a href="http://bouveyron.free.fr/kim">Kde Image Menu</a> >-</p> >- >-</body> >-</html> >- >diff -Nrup kim/src/gallery/index.part1 kim4/src/gallery/index.part1 >--- kim/src/gallery/index.part1 1970-01-01 01:00:00.000000000 +0100 >+++ kim4/src/gallery/index.part1 2006-04-01 12:46:09.000000000 +0200 >@@ -0,0 +1,34 @@ >+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd"> >+<html> >+<head> >+<meta http-equiv="content-type" content="text/html; charset=utf-8"> >+<title>Image gallery (Kde Image Menu)</title> >+<style type="text/css"> >+body { >+ background:#eee; >+ text-align:center; >+ height:100%; >+ padding-top:1em; >+} >+a,p { >+ color:#aaa; >+ font-family:Verdana,Arial,Helvetica,Sans-serif; >+ text-decoration:none; >+ font-size:xx-small; >+} >+a:hover { >+ color:#666; >+ text-decoration:underline; >+} >+img.photo { >+ border: 5px solid #ffffff; >+} >+table { >+ text-align: center; >+ margin-left: auto; >+ margin-right: auto; >+} >+</style> >+</style> >+</head> >+<body> >diff -Nrup kim/src/gallery/index.part2 kim4/src/gallery/index.part2 >--- kim/src/gallery/index.part2 1970-01-01 01:00:00.000000000 +0100 >+++ kim4/src/gallery/index.part2 2006-03-31 20:06:59.000000000 +0200 >@@ -0,0 +1,9 @@ >+</tr></table> >+ >+<p style="margin-top:4em;"> >+Galery created with <a href="http://bouveyron.free.fr/kim">Kde Image Menu</a> >+</p> >+ >+</body> >+</html> >+ >diff -Nrup kim/src/kim_compressandresize.desktop kim4/src/kim_compressandresize.desktop >--- kim/src/kim_compressandresize.desktop 2006-04-20 11:44:43.000000000 +0200 >+++ kim4/src/kim_compressandresize.desktop 2008-11-18 11:52:07.000000000 +0100 >@@ -17,7 +17,8 @@ > # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, U > > [Desktop Entry] >-ServiceTypes=image/* >+Type=Service >+ServiceTypes=KonqPopupMenu/Plugin,image/* > Actions=Rcprs75;Rcprs80;Rcprs90;RcprsCustom;_SEPARATOR_;Rsize300;Rsize600;Rsize800;Rsize1024;Rsize1200;Rsize1400;RsizeCustom;_SEPARATOR_;WebExp75640;WebExp75800;WebExp751024 > Encoding=UTF-8 > X-KDE-Submenu=Kim - Compress and Resize >diff -Nrup kim/src/kim_convertandrotate.desktop kim4/src/kim_convertandrotate.desktop >--- kim/src/kim_convertandrotate.desktop 2007-12-26 12:19:18.000000000 +0100 >+++ kim4/src/kim_convertandrotate.desktop 2008-11-18 11:52:17.000000000 +0100 >@@ -17,7 +17,8 @@ > # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, U > > [Desktop Entry] >-ServiceTypes=image/* >+Type=Service >+ServiceTypes=KonqPopupMenu/Plugin,image/* > Actions=JPEG;PNG;GIF;TIF;PDF;ConvCustom;_SEPARATOR_;GrayScale;Sepia;_SEPARATOR_;AutoRot;Rot90;Rot180;Rot270;RotCustom;_SEPARATOR_;Flip;Flop > Encoding=UTF-8 > X-KDE-Submenu=Kim - Convert and Rotate >diff -Nrup kim/src/kim_convertandrotate.desktop~ kim4/src/kim_convertandrotate.desktop~ >--- kim/src/kim_convertandrotate.desktop~ 2006-04-18 09:27:41.000000000 +0200 >+++ kim4/src/kim_convertandrotate.desktop~ 1970-01-01 01:00:00.000000000 +0100 >@@ -1,114 +0,0 @@ >-# Servicemenu image converter >-# >-# Copyright (C) 2005,2006 Charles Bouveyron <charles.bouveyron@free.fr> >-# >-# This program is free software; you can redistribute it and/or >-# modify it under the terms of the GNU General Public License >-# as published by the Free Software Foundation; either version 2 >-# of the License, or (at your option) any later version. >-# >-# This program is distributed in the hope that it will be useful, >-# but WITHOUT ANY WARRANTY; without even the implied warranty of >-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the >-# GNU General Public License for more details. >-# >-# You should have received a copy of the GNU General Public License >-# along with this program; if not, write to the Free Software >-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, U >- >-[Desktop Entry] >-ServiceTypes=image/* >-Actions=JPEG;PNG;GIF;TIF;PDF;ConvCustom;_SEPARATOR_;GrayScale;Sepia;_SEPARATOR_;Rot90;Rot180;Rot270;RotCustom;_SEPARATOR_;Flip;Flop >-Encoding=UTF-8 >-X-KDE-Submenu=Kim - Convert and Rotate >-X-KDE-Submenu[fr]=Kim - Convertir et tourner >- >-[Desktop Action JPEG] >-Name=Convert to JPEG >-Name[fr]=Convertir en JPEG >-Icon=image >-Exec=kim_convert jpg %U >- >-[Desktop Action PNG] >-Name=Convert to PNG >-Name[fr]=Convertir en PNG >-Icon=image >-Exec=kim_convert png %U >- >-[Desktop Action GIF] >-Name=Convert to GIF >-Name[fr]=Convertir en GIF >-Icon=image >-Exec=kim_convert gif %U >- >-[Desktop Action TIF] >-Name=Convert to TIF >-Name[fr]=Convertir en TIF >-Icon=image >-Exec=kim_convert tiff %U >- >-[Desktop Action PDF] >-Name=Convert to PDF >-Name[fr]=Convertir en PDF >-Icon=image >-Exec=kim_convert pdf %U >- >-[Desktop Action ConvCustom] >-Name=Convert custom ... >-Name[fr]=Conversion personnalisée >-Icon=image >-Exec=kim_convert `kdialog --inputbox "Choose format to convert:" ` %U; >- >-[Desktop Action GrayScale] >-Name=Convert to graysale >-Name[fr]=Convertir en échelle de gris >-Icon=image >-Exec=kim_treatment gray %D %U >- >-[Desktop Action Sepia] >-Name=Convert in sepia tone >-Name[fr]=Convertir en sépia >-Icon=image >-Exec=kim_treatment sepia %D %U >- >-[Desktop Action Rot90] >-Name=Rotate (90°) >-Name[fr]=Tourner de 90° >-Icon=rotate_cw >-Exec=kim_rotate 90 %U >- >-[Desktop Action Rot180] >-Name=Rotate (180°) >-Name[fr]=Tourner de 180° >-Icon=rotate_cw >-Exec=kim_rotate 180 %U >- >-[Desktop Action Rot270] >-Name=Rotate (270°) >-Name[fr]=Tourner de 270° >-Icon=rotate_cw >-Exec=kim_rotate 270 %U >- >-[Desktop Action RotCustom] >-Name=Rotate custom... >-Name[fr]=Rotation personnalisée >-Icon=rotate_cw >-Exec=kim_rotate `kdialog --inputbox "Rotate x degrees:" 45` %U; >- >-[Desktop Action Flip] >-Name=Verticaly >-Name[es]=Verticalmente >-Name[fr]=Verticalement >-Name[hu]=Tükrözés vÃzszintesen >-Name[de]=Vertikal spiegeln >-Icon=2uparrow >-Exec=kim_flipflop flip %U >- >-[Desktop Action Flop] >-Name=Horizontaly >-Name[es]=Horizontalmente >-Name[fr]=Horizontalement >-Name[hu]=Tükrözés függÅlegesen >-Name[de]=Horizontal spiegeln >-Icon=2rightarrow >-Exec=kim_flipflop flop %U >diff -Nrup kim/src/kim_publication.desktop kim4/src/kim_publication.desktop >--- kim/src/kim_publication.desktop 2006-11-12 23:35:11.000000000 +0100 >+++ kim4/src/kim_publication.desktop 2008-11-18 11:52:23.000000000 +0100 >@@ -17,7 +17,8 @@ > # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, U > > [Desktop Entry] >-ServiceTypes=image/* >+Type=Service >+ServiceTypes=KonqPopupMenu/Plugin,image/* > Actions=Rename;SortByDate;SendByMail;_SEPARATOR_;PeleMele;Slideshow;Galery;_SEPARATOR_;Watermark;Border;_SEPARATOR_;Animation;Multiburst;Adjoin;_SEPARATOR_;Apropos; > Encoding=UTF-8 > X-KDE-Submenu=Kim - Treatment and publication >diff -Nrup kim/uninstall.sh kim4/uninstall.sh >--- kim/uninstall.sh 2006-08-01 10:59:44.000000000 +0200 >+++ kim4/uninstall.sh 2008-11-18 14:25:50.000000000 +0100 >@@ -19,13 +19,8 @@ > > kdeinstdir=`kde-config --prefix` > >-rm $kdeinstdir/share/apps/konqueror/servicemenus/kim*.desktop >-rm $kdeinstdir/bin/kim* >- >-cd $kdeinstdir/share/apps/konqueror/servicemenus/ >-mv imageconverter.desktop~ imageconverter.desktop >-mv jpegorient.desktop~ jpegorient.desktop >- >+rm $kdeinstdir/share/apps/konqueror/servicemenus/kim_*.desktop >+rm $kdeinstdir/bin/kim_* > rm -rf $kdeinstdir/share/apps/kim > > echo "Kim is removed. Good bye." >\ No newline at end of file
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=172428">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 247649
:
172427
| 172428 |
172430
