diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000000000000000000000000000000000000..b98734c0b924d0208937b05cb5df2da49c4b733f --- /dev/null +++ b/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2021 samvo + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/README.md b/README.md index ab6247965080b94193de992ff9267c46e5d0f834..d5020d84235096df46458e25b71872cb8ff862a0 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,102 @@ -Create new folder from selected files -Written on bash with kdialog, detect existed folder. +# Create new folder from selected files -Install: -Copy files selected2folder.desktop and selected2folder.sh to ~/.local/share/kservices5/ServiceMenus/selected2folder.sh +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +## Dolphin service menu addon +======= +## Dolphin service menu addon +>>>>>>> 43a562e... Update README.md +======= +## Dolphin service menu addon +>>>>>>> 43a562e... Update README.md + +======= +>>>>>>> ecdacf6... Add localization +======= +## Dolphin service menu addon + +>>>>>>> d248411... readme +[Addon on Pling](https://www.pling.com/p/1560212/) + +### Feature: + +- Written on bash with kdialog +<<<<<<< HEAD +<<<<<<< HEAD +- Auto detect exists folder +- Localizable + +### Install: + +Copy files `s2fLocalization.sh`, `selected2folder.desktop` and `selected2folder.s` to `~/.local/share/kservices5/ServiceMenus/selected2folder.sh` +======= +======= +>>>>>>> 77132b0... Up readme +Written on bash with kdialog and detect existed folder. + +### Install: + +Copy files s2fLocalization.sh, selected2folder.desktop and selected2folder.sh to ~/.local/share/kservices5/ServiceMenus/selected2folder.sh +<<<<<<< HEAD +>>>>>>> 77132b0... Up readme +======= +======= +======= +## Dolphin service menu addon + +>>>>>>> 51ce04e... readme +[Addon on Pling](https://www.pling.com/p/1560212/) + +>>>>>>> 0b9a51d... Up readme +### Feature: + +- Written on bash with kdialog +- Auto detect exists folder +======= + +- Auto detect exists folder + +>>>>>>> ecdacf6... Add localization +======= +- Auto detect exists folder +>>>>>>> d248411... readme +- Localizable + +### Install: + +Copy files `s2fLocalization.sh`, `selected2folder.desktop` and `selected2folder.s` to `~/.local/share/kservices5/ServiceMenus/selected2folder.sh` +<<<<<<< HEAD +>>>>>>> 8f70121... Up readme +======= +>>>>>>> ecdacf6... Add localization +======= +>>>>>>> 77132b0... Up readme +======= +======= +======= +## Dolphin service menu addon + +>>>>>>> 51ce04e... readme +[Addon on Pling](https://www.pling.com/p/1560212/) + +>>>>>>> 0b9a51d... Up readme +### Feature: + +- Written on bash with kdialog +- Auto detect exists folder +- Localizable + +### Install: + +Copy files `s2fLocalization.sh`, `selected2folder.desktop` and `selected2folder.s` to `~/.local/share/kservices5/ServiceMenus/selected2folder.sh` +>>>>>>> 8f70121... Up readme diff --git a/selected2folder/s2fLocalization.sh b/selected2folder/s2fLocalization.sh new file mode 100644 index 0000000000000000000000000000000000000000..0364272d51a61d0431e12140168472327ad13794 --- /dev/null +++ b/selected2folder/s2fLocalization.sh @@ -0,0 +1,56 @@ +#!/bin/bash + +locales_arr=("${LANGUAGE//:/}") +first_locale="${locales_arr[0]:0:2}" + +function window_title() +{ + case "$first_locale" in + "ru") + printf "Создание новой папки";; + *) + printf "Create new folder";; + esac +} + +function set_name() +{ + case "$first_locale" in + "ru") + printf "Укажите Ð¸Ð¼Ñ Ð½Ð¾Ð²Ð¾Ð¹ папки";; + *) + printf "Set new folder name";; + esac +} + +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +#Standart system name for new folder +======= +>>>>>>> 17a6744... Add localization +======= +#Standart system name for new folder +>>>>>>> 51ce04e... readme +======= +>>>>>>> ecdacf6... Add localization +======= +#Standart system name for new folder +>>>>>>> d248411... readme +======= +>>>>>>> 17a6744... Add localization +======= +#Standart system name for new folder +>>>>>>> 51ce04e... readme +function def_name() +{ + case "$first_locale" in + "ru") + printf "ÐÐ¾Ð²Ð°Ñ Ð¿Ð°Ð¿ÐºÐ°";; + *) + printf "New folder";; + esac +} diff --git a/selected2folder/selected2folder.desktop b/selected2folder/selected2folder.desktop index 1c68e282de59fb8a2d783fd304c1cae9a56a98a0..7944f5f8fb4bf86bc5b51f604a3443c9610dd651 100644 --- a/selected2folder/selected2folder.desktop +++ b/selected2folder/selected2folder.desktop @@ -8,5 +8,17 @@ Actions=selected2newfolder Name=Create folder from selected Name[nl]=Map aanmaken met selectie Name[ru]=ПеремеÑтить в новую папку -Exec=DIR=`sh "/home/samvo/.local/share/kservices5/ServiceMenus/selected2folder.sh"` && cd "$DIR" && mv %F . +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +Exec=$HOME/.local/share/kservices5/ServiceMenus/selected2folder.sh %F . +======= +Exec=DIR=`sh "$HOME/.local/share/kservices5/ServiceMenus/selected2folder.sh"` && cd "$DIR" && mv %F . +>>>>>>> d77db7f... fix home folder +======= +Exec=$HOME/.local/share/kservices5/ServiceMenus/selected2folder.sh %F . +>>>>>>> ecdacf6... Add localization +======= +Exec=$HOME/.local/share/kservices5/ServiceMenus/selected2folder.sh %F . +>>>>>>> 17a6744... Add localization Icon=folder diff --git a/selected2folder/selected2folder.sh b/selected2folder/selected2folder.sh index f23ad73a7f1550d55997ab97a6d9b42b4511c0e0..5c7e227e39591677714ff2d8c7ac0704e62077e1 100755 --- a/selected2folder/selected2folder.sh +++ b/selected2folder/selected2folder.sh @@ -1,16 +1,60 @@ #!/bin/bash + +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +. $HOME/.local/share/kservices5/ServiceMenus/s2fLocalization.sh + +NAME="$(def_name)" +if [ ! -d "$NAME" ] +then +NAME=`kdialog --title "$(window_title)" --inputbox "$(set_name)" "$NAME" --geometry 450x300` +# mkdir "$NAME" && printf "$NAME" +mkdir "$NAME" && cd "$NAME" && mv "$@" +======= NAME="New folder" -NEWNAME="New folder (1)" if [ ! -d "$NAME" ] then -NAME=`kdialog --title "$NAME" --inputbox "Folder name" "$NAME"` -mkdir "$NAME" && echo "$NAME" +NAME=`kdialog --title "$NAME" --inputbox "Folder name" "$NAME" --geometry 450x300` +mkdir "$NAME" && printf "$NAME" +>>>>>>> 125161b... optim +======= +. $HOME/.local/share/kservices5/ServiceMenus/s2fLocalization.sh + +NAME="$(def_name)" +if [ ! -d "$NAME" ] +then +NAME=`kdialog --title "$(window_title)" --inputbox "$(set_name)" "$NAME" --geometry 450x300` +# mkdir "$NAME" && printf "$NAME" +mkdir "$NAME" && cd "$NAME" && mv "$@" +>>>>>>> ecdacf6... Add localization +======= +. $HOME/.local/share/kservices5/ServiceMenus/s2fLocalization.sh + +NAME="$(def_name)" +if [ ! -d "$NAME" ] +then +NAME=`kdialog --title "$(window_title)" --inputbox "$(set_name)" "$NAME" --geometry 450x300` +# mkdir "$NAME" && printf "$NAME" +mkdir "$NAME" && cd "$NAME" && mv "$@" +>>>>>>> 17a6744... Add localization else -NEWNAME=`kdialog --title "$NEWNAME " --inputbox "Folder $NAME exist" "$NEWNAME"` -# NAME=$NEWNAME +NEWNAME=$NAME if [ ! -d "$NEWNAME" ] then -mkdir "$NEWNAME" && echo "$NEWNAME" +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +mkdir "$NAME" && cd "$NAME" && mv "$@" +======= +mkdir "$NAME" && printf "$NAME" +>>>>>>> 125161b... optim +======= +mkdir "$NAME" && cd "$NAME" && mv "$@" +>>>>>>> ecdacf6... Add localization +======= +mkdir "$NAME" && cd "$NAME" && mv "$@" +>>>>>>> 17a6744... Add localization else while [ -d "$NEWNAME" ] do @@ -18,11 +62,40 @@ NUM=0 while [ -d "$NEWNAME" ] do NUM="$(($NUM+1))" -NEWNAME="$NAME ($NUM)" +NEWNAME="$NAME"\ "($NUM)" +done +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +<<<<<<< HEAD +NEWNAME=`kdialog --title "$(window_title)" --inputbox "$(set_name)" "$NEWNAME" --geometry 450x300` +NAME=$NEWNAME done -NEWNAME=`kdialog --title "$NAME" --inputbox "Folder $NEWNAME exist" "$NEWNAME"` +NAME=$NEWNAME +mkdir "$NAME" && cd "$NAME" && mv "$@" +======= +NEWNAME=`kdialog --title "$NAME" --inputbox "3Folder $NEWNAME exist" "$NEWNAME" --geometry 450x300` +======= +NEWNAME=`kdialog --title "$NAME" --inputbox "Folder $NEWNAME exist" "$NEWNAME" --geometry 450x300` +>>>>>>> 238b5d7... optim +NAME=$NEWNAME +done +NAME=$NEWNAME +mkdir "$NAME" && printf "$NAME" +>>>>>>> 125161b... optim +======= +NEWNAME=`kdialog --title "$(window_title)" --inputbox "$(set_name)" "$NEWNAME" --geometry 450x300` NAME=$NEWNAME done -mkdir "$NEWNAME" && echo "$NEWNAME" +NAME=$NEWNAME +mkdir "$NAME" && cd "$NAME" && mv "$@" +>>>>>>> ecdacf6... Add localization +======= +NEWNAME=`kdialog --title "$(window_title)" --inputbox "$(set_name)" "$NEWNAME" --geometry 450x300` +NAME=$NEWNAME +done +NAME=$NEWNAME +mkdir "$NAME" && cd "$NAME" && mv "$@" +>>>>>>> 17a6744... Add localization fi fi