- rename lscd_mkdir into customcd_mkdir

- add treecd_opts config
- re-arrange some options in 'Advanced' category
- improve treecd
- rename Advanced > Extras into BashStyle-NG
- rename Advanced > Misc into Bash Builtin
- update german translation
parent fb59ff38
......@@ -38,6 +38,9 @@ Overview of changes in v9.1 "Dial T for TNT"
++ before: two combined combo boxes (not optimal from usability view)
++ after : a separate combo box for each color setting
* re-arrange some settings in 'Advanced' category. Rename 'Extra' sub-section
into 'BashStyle-NG', 'Misc' sub-section into 'Bash Builtin'.
* re-align widget groups for the better looks
* show what category the user is currently in, in the header
* added missing revert-to-default icons for PWD Length Spinbutton
......@@ -68,6 +71,10 @@ Overview of changes in v9.1 "Dial T for TNT"
so users are able to grab the values in all cases. Add all three to the
Custom Prompt Builder.
* rename lscd_mkdir config into customcd_mkdir and make it apply for both lscd
and treecd
* add treecd_opts config (similar to lscd_opts)
* improve treecd (make it internally work like lscd)
* make colorshell a trap rather than embedding it in PROMPT_COMMAND
* remove PRE_PROMPT_COMMAND
......
ini_version = 18
ini_version = 19
[Style]
use_bashstyle = False
......@@ -62,8 +62,9 @@ path = ""
directory_indicator = /
use_lscd = True
lscd_opts = --group-directories-first -CF --color
lscd_mkdir = False
customcd_mkdir = False
use_treecd = False
treecd_opts = ""
dd_noerror = True
restore_directory = False
debug_verbose = False
......
ini_version = 18
ini_version = 19
[Style]
use_bashstyle = True
......@@ -62,8 +62,9 @@ path = ""
directory_indicator = /
use_lscd = True
lscd_opts = --group-directories-first -CF --color
lscd_mkdir = False
customcd_mkdir = False
use_treecd = False
treecd_opts = ""
dd_noerror = True
restore_directory = True
debug_verbose = False
......
This diff is collapsed.
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: BashStyle-NG\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2015-09-20 16:38+0200\n"
"POT-Creation-Date: 2015-09-20 19:03+0200\n"
"PO-Revision-Date: 2015-09-15 21:45+0200\n"
"Last-Translator: Christopher Roy Bratusek <nano@jpberlin.de>\n"
"Language-Team: German (Germany) (http://www.transifex.com/projects/p/bs-ng/"
......@@ -52,8 +52,8 @@ msgstr "BashStyle-NG Debugging: Aktiv"
msgid "BashStyle-NG Logfile:"
msgstr "BashStyle-NG Logdatei:"
#: rc/nx-rc:72 rc/nx-rc:103 rc/nx-rc:107 rc/nx-rc:125 rc/nx-rc:134 rc/nx-rc:137
#: rc/nx-rc:140 rc/nx-rc:144 rc/nx-rc:245 rc/settings/alias-rc:13
#: rc/nx-rc:72 rc/nx-rc:87 rc/nx-rc:91 rc/nx-rc:109 rc/nx-rc:118 rc/nx-rc:121
#: rc/nx-rc:124 rc/nx-rc:128 rc/nx-rc:229 rc/settings/alias-rc:13
#: rc/settings/alias-rc:16 rc/settings/alias-rc:21 rc/settings/alias-rc:26
#: rc/settings/alias-rc:31 rc/settings/alias-rc:36 rc/settings/alias-rc:41
#: rc/settings/alias-rc:46 rc/settings/alias-rc:51 rc/settings/alias-rc:56
......@@ -100,35 +100,35 @@ msgstr "Eigene Einstellungen"
msgid "BashStyle-NG"
msgstr "BashStyle-NG"
#: rc/nx-rc:103
#: rc/nx-rc:87
msgid "ps2 ps3 ps4 char"
msgstr "ps2 ps3 ps4 Zeichen"
#: rc/nx-rc:107
#: rc/nx-rc:91
msgid "Random Prompt"
msgstr "Zufälliger Prompt"
#: rc/nx-rc:125
#: rc/nx-rc:109
msgid "randomly choosen"
msgstr "zufällig ausgewählt"
#: rc/nx-rc:134
#: rc/nx-rc:118
msgid "Custom Prompt"
msgstr "Eigener Prompt"
#: rc/nx-rc:137
#: rc/nx-rc:121
msgid "Prompt"
msgstr "Prompt"
#: rc/nx-rc:140
#: rc/nx-rc:124
msgid "Fallback Prompt"
msgstr "Ausfall-Prompt"
#: rc/nx-rc:144
#: rc/nx-rc:128
msgid "PS2 PS3 PS4"
msgstr "PS2 PS3 PS4"
#: rc/nx-rc:245
#: rc/nx-rc:229
msgid "Welcome Message"
msgstr "Willkommensgruß"
......
......@@ -17,7 +17,7 @@ export BSNG_DATA_DIR=@DATADIR@
export BSNG_RC_DIR=${BSNG_DATA_DIR}/bashstyle-ng/rc
export BSNG_VERSION=@VERSION@
export BSNG_YEAR="2007 - 2015"
INI_VERSION=18
INI_VERSION=19
source ${BSNG_RC_DIR}/internal/misc
source ${BSNG_RC_DIR}/internal/logging
......@@ -245,7 +245,7 @@ function lscd() {
builtin cd "${*}" &>/dev/null
elif [[ ! "${1}" ]]; then
builtin cd
elif [[ $(ini_get lscd_mkdir) == True ]]; then
elif [[ $(ini_get customcd_mkdir) == True ]]; then
mkdir -p "${1}"
builtin cd "${1}" &>/dev/null
fi
......@@ -262,10 +262,30 @@ function lscd() {
}
function treecd () {
builtin cd "${@}" &>/dev/null
OLD_PWD=${PWD}
clear
if [[ -f "${1}" ]]; then
builtin cd "${1%/*}" &>/dev/null
elif [[ -d "${1}" ]]; then
builtin cd "${1}" &>/dev/null
elif [[ "${1}" == -* ]]; then
builtin cd "${*}" &>/dev/null
elif [[ ! "${1}" ]]; then
builtin cd
elif [[ $(ini_get customcd_mkdir) == True ]]; then
mkdir -p "${1}"
builtin cd "${1}" &>/dev/null
fi
if [[ ${OLD_PWD} != ${PWD} ]]; then
echo -e "\n${epink}content:\n"
if [[ $(systemkit countvisibleitems) -gt 0 ]]; then
tree -L ${TREECD_OPTS}
else echo -e "${ecream}-- empty --\n"
fi
fi
echo -e "${epink}content:"
tree -L 1 ${TREE_OPTS}
echo "${PWD}" > ${HOME}/.lastpwd
}
......
This diff is collapsed.
......@@ -118,8 +118,9 @@ class BashStyleNG(object):
WidgetHandler.InitWidget("dirchar", "Advanced", "directory_indicator", "text", None)
WidgetHandler.InitWidget("enable_lscd", "Advanced", "use_lscd", "bool", None)
WidgetHandler.InitWidget("enable_treecd", "Advanced", "use_treecd", "bool", None)
WidgetHandler.InitWidget("lscd_mkdir", "Advanced", "lscd_mkdir", "bool", None)
WidgetHandler.InitWidget("customcd_mkdir", "Advanced", "customcd_mkdir", "bool", None)
WidgetHandler.InitWidget("lscd_options", "Advanced", "lscd_opts", "text", None)
WidgetHandler.InitWidget("treecd_options", "Advanced", "treecd_opts", "text", None)
WidgetHandler.InitWidget("birthday", "Advanced", "user_birthday", "text", None)
WidgetHandler.InitWidget("dd_noerror", "Advanced", "dd_noerror", "bool", None)
WidgetHandler.InitWidget("restore_pwd", "Advanced", "restore_directory", "bool", None)
......
......@@ -31,7 +31,7 @@ USER_DEFAULTS_SAVE = (os.getenv('HOME') + '/.bs-ng.ini.save')
FACTORY_DEFAULTS = (DATADIR + '/bashstyle-ng/bs-ng.ini')
VENDOR_DEFAULTS = ('/etc/bs-ng_vendor.ini')
app_ini_version = 18
app_ini_version = 19
class Config(object):
def InitConfig(self):
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment