--- kim/install.sh 2006-08-01 10:59:23.000000000 +0200
+++ kim/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."
--- kim/src/bin/kim_album 2006-02-09 17:40:42.000000000 +0100
+++ kim/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
--- kim/src/bin/kim_compress 2006-01-25 00:46:43.000000000 +0100
+++ kim/src/bin/kim_compress 2008-11-18 14:13:41.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 test "true" = `qdbus $dbusRef wasCancelled`;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;;
--- kim/src/bin/kim_convert 2006-01-25 00:46:40.000000000 +0100
+++ kim/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
--- kim/src/bin/kim_flipflop 2006-01-25 00:46:36.000000000 +0100
+++ kim/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
--- kim/src/bin/kim_galery 2006-09-13 11:22:01.000000000 +0200
+++ kim/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 '
' >> $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;
--- kim/src/bin/kim_multiburst 2006-02-09 17:44:23.000000000 +0100
+++ kim/src/bin/kim_multiburst 2008-11-18 14:17:06.000000000 +0100
@@ -23,13 +23,13 @@
# Mathieu Vilaplana
# Raphaël Pinson
-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
--- kim/src/bin/kim_other 2006-01-25 00:48:48.000000000 +0100
+++ kim/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;;
--- kim/src/bin/kim_pelemele 2006-08-07 10:32:42.000000000 +0200
+++ kim/src/bin/kim_pelemele 2008-11-18 14:17:06.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,15 +33,15 @@ 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
@@ -60,11 +60,11 @@ for i in "$@";do
-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"
+ 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`;
--- kim/src/bin/kim_print 2006-08-07 11:03:48.000000000 +0200
+++ kim/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
--- kim/src/bin/kim_record 2006-02-09 17:32:59.000000000 +0100
+++ kim/src/bin/kim_record 2008-11-18 14:17:06.000000000 +0100
@@ -20,7 +20,7 @@
# Author: Charles Bouveyron
# Raphaël Pinson
-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
--- kim/src/bin/kim_record_mpg 2006-02-09 17:36:57.000000000 +0100
+++ kim/src/bin/kim_record_mpg 2008-11-18 14:17:06.000000000 +0100
@@ -20,7 +20,7 @@
# Author: Charles Bouveyron
# Raphaël Pinson
-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
--- kim/src/bin/kim_rename 2006-04-25 09:59:02.000000000 +0200
+++ kim/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;;
--- kim/src/bin/kim_resize 2006-04-20 11:57:56.000000000 +0200
+++ kim/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;;
--- kim/src/bin/kim_resizeandsend 2006-11-07 15:46:24.000000000 +0100
+++ kim/src/bin/kim_resizeandsend 2008-11-18 14:17:06.000000000 +0100
@@ -21,7 +21,7 @@
# Mathieu Vilaplana
# Raphaël Pinson
-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,22 @@ 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"`"
+ qdbus $dbusRef org.freedesktop.DBus.Properties.Set org.kde.kdialog.ProgressDialog value $compteur
case "$choice" in
1) cp $i $TMPDIR;;
2) convert -resize 800x800 "$ATTACHMENTS" "$TMPDIR"/`basename "$ATTACHMENTS"`;;
@@ -56,6 +56,6 @@ for i in "$@";do
done
kmail --attach "$TMPDIR"/*;
-dcop "$dcopRef" close;
+qdbus $dbusRef close;
kdialog --msgbox "Kim - Send by mail: you can write your message!"
rm -rf "$TMPDIR"
--- kim/src/bin/kim_rotate 2007-12-26 12:17:29.000000000 +0100
+++ kim/src/bin/kim_rotate 2008-11-18 14:17:06.000000000 +0100
@@ -24,15 +24,15 @@
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"
@@ -41,9 +41,9 @@ for i in "$@";do
mogrify -auto-orient "$FILE";
else mogrify -rotate $ANGLE "$FILE"
fi
- dcop "$dcopRef" setLabel "Kim - Rotating file: `basename "$FILE"`"
- dcop "$dcopRef" setProgress "$compteur"
+ qdbus $dbusRef setLabelText "Kim - Rotating file: `basename "$FILE"`"
+ qdbus $dbusRef org.freedesktop.DBus.Properties.Set org.kde.kdialog.ProgressDialog value "$compteur"
fi;
done
-dcop "$dcopRef" close
+qdbus $dbusRef close
--- kim/src/bin/kim_rotate~ 2006-02-10 15:56:14.000000000 +0100
+++ kim/src/bin/kim_rotate~ 1970-01-01 01:00:00.000000000 +0100
@@ -1,46 +0,0 @@
-#!/bin/bash
-#
-# Copyright (C) 2005,2006 Charles Bouveyron
-#
-# 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
-# Alessandro Faggiano <>
-# Mathieu Vilaplana
-# Raphaël Pinson
-
-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
--- kim/src/bin/kim_rotatewithexif 2007-12-26 12:06:56.000000000 +0100
+++ kim/src/bin/kim_rotatewithexif 2008-11-18 14:17:06.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"
mogrify -rotate $ANGLE "$FILE"
- dcop "$dcopRef" setLabel "Kim - Rotating file: `basename "$FILE"`"
- dcop "$dcopRef" setProgress "$compteur"
+ qdbus $dbusRef setLabelText "Kim - Rotating file: `basename "$FILE"`"
+ qdbus $dbusRef org.freedesktop.DBus.Properties.Set org.kde.kdialog.ProgressDialog value "$compteur"
fi;
done
-dcop "$dcopRef" close
+qdbus $dbusRef close
--- kim/src/bin/kim_slideshow 2006-04-02 22:33:15.000000000 +0200
+++ kim/src/bin/kim_slideshow 2008-11-18 14:17:06.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 '' >> $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 '' >> $DIR/dewslider.xml;
-dcop "$dcopRef" close;
+qdbus $dbusRef close;
konqueror $DIR/index.html;
--- kim/src/bin/kim_sortbydate 2006-08-01 12:57:17.000000000 +0200
+++ kim/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;;
--- kim/src/bin/kim_treatment 2006-01-25 00:59:51.000000000 +0100
+++ kim/src/bin/kim_treatment 2008-11-18 14:17:06.000000000 +0100
@@ -32,20 +32,20 @@ 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
+ 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 - Treatment of file: `basename "$ATTACHMENTS"`"
- dcop "$dcopRef" setProgress "$compteur"
+ qdbus $dbusRef setLabelText "Kim - Treatment of file: `basename "$ATTACHMENTS"`"
+ qdbus $dbusRef org.freedesktop.DBus.Properties.Set org.kde.kdialog.ProgressDialog value "$compteur"
case "$SCELTA" in
gray)
mogrify -colorspace gray "$ATTACHMENTS"
@@ -68,23 +68,23 @@ case $? in
esac
fi;
done
- dcop "$dcopRef" close;;
+ qdbus $dbusRef close;;
1) # Save files with another name !
- 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 - Treatment of file: `basename "$ATTACHMENTS"`"
- dcop "$dcopRef" setProgress "$compteur"
+ qdbus $dbusRef setLabelText "Kim - Treatment of file: `basename "$ATTACHMENTS"`"
+ qdbus $dbusRef org.freedesktop.DBus.Properties.Set org.kde.kdialog.ProgressDialog value "$compteur"
case "$SCELTA" in
gray)
convert -colorspace gray "$ATTACHMENTS" "$DIR/gray_`basename "$ATTACHMENTS"`"
@@ -107,7 +107,7 @@ case $? in
esac
fi;
done
- dcop "$dcopRef" close;;
+ qdbus $dbusRef close;;
2) kdialog --title "Kim" --msgbox "The action was cancelled by user !"
exit 1;;
--- kim/src/bin/kim_webexport 2006-01-25 01:00:44.000000000 +0100
+++ kim/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;;
--- kim/src/galery/index.part1 2006-04-01 12:46:09.000000000 +0200
+++ kim/src/galery/index.part1 1970-01-01 01:00:00.000000000 +0100
@@ -1,34 +0,0 @@
-
-
-
-
-Image gallery (Kde Image Menu)
-
-
-
-
--- kim/src/galery/index.part2 2006-03-31 20:06:59.000000000 +0200
+++ kim/src/galery/index.part2 1970-01-01 01:00:00.000000000 +0100
@@ -1,9 +0,0 @@
-
-
-
-Galery created with Kde Image Menu
-
-
-
-
-
--- kim/src/gallery/index.part1 1970-01-01 01:00:00.000000000 +0100
+++ kim/src/gallery/index.part1 2006-04-01 12:46:09.000000000 +0200
@@ -0,0 +1,34 @@
+
+
+
+
+Image gallery (Kde Image Menu)
+
+
+
+
--- kim/src/gallery/index.part2 1970-01-01 01:00:00.000000000 +0100
+++ kim/src/gallery/index.part2 2006-03-31 20:06:59.000000000 +0200
@@ -0,0 +1,9 @@
+
+
+
+Galery created with Kde Image Menu
+
+
+
+
+
--- kim/src/kim_compressandresize.desktop 2006-04-20 11:44:43.000000000 +0200
+++ kim/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
--- kim/src/kim_convertandrotate.desktop 2007-12-26 12:19:18.000000000 +0100
+++ kim/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
--- kim/src/kim_convertandrotate.desktop~ 2006-04-18 09:27:41.000000000 +0200
+++ kim/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
-#
-# 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
--- kim/src/kim_publication.desktop 2006-11-12 23:35:11.000000000 +0100
+++ kim/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
--- kim/uninstall.sh 2006-08-01 10:59:44.000000000 +0200
+++ kim/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."