From 2a84b711d4c9c28fd6e03457311fd05203318d24 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 16 Nov 2011 16:05:53 -0600 Subject: Finish rename from prior commit --- src/settings/kdesvn-use-external-update.sh | 31 ---- src/settings/kdesvn_part.kcfg | 261 ----------------------------- src/settings/kdesvnsettings.kcfgc | 6 - src/settings/tdesvn-use-external-update.sh | 31 ++++ src/settings/tdesvn_part.kcfg | 261 +++++++++++++++++++++++++++++ src/settings/tdesvnsettings.kcfgc | 6 + 6 files changed, 298 insertions(+), 298 deletions(-) delete mode 100755 src/settings/kdesvn-use-external-update.sh delete mode 100644 src/settings/kdesvn_part.kcfg delete mode 100644 src/settings/kdesvnsettings.kcfgc create mode 100755 src/settings/tdesvn-use-external-update.sh create mode 100644 src/settings/tdesvn_part.kcfg create mode 100644 src/settings/tdesvnsettings.kcfgc (limited to 'src/settings') diff --git a/src/settings/kdesvn-use-external-update.sh b/src/settings/kdesvn-use-external-update.sh deleted file mode 100755 index c97242a..0000000 --- a/src/settings/kdesvn-use-external-update.sh +++ /dev/null @@ -1,31 +0,0 @@ -#!/bin/sh - -display= -lastvalue= - -while read line ; do - if [ "${line#\[}" != "$line" ]; then - continue; - fi - KEY="${line%%=*}" - VALUE="${line#*=}" - if echo "$KEY" | grep 'use_kompare_for_diff' >/dev/null 2>/dev/null; then - display=$VALUE - echo '# DELETE [general_items]use_kompare_for_diff' - elif echo "$KEY" | grep 'external_diff_display' > /dev/null 2>/dev/null; then - exdisplay=$VALUE - elif [ "x$KEY" != "x" ]; then - echo "$KEY=$VALUE" - fi -done - -if [ "x$exdisplay" = "x" -o "x$display" = "x1" ]; then - exdisplay="kompare -on -" -fi -if [ "x$display" = "x2" -o "x$display" = "x1" ]; then - display=true -else - display=false -fi -echo "use_external_diff=$display" -echo "external_diff_display=$exdisplay" diff --git a/src/settings/kdesvn_part.kcfg b/src/settings/kdesvn_part.kcfg deleted file mode 100644 index 3754d4a..0000000 --- a/src/settings/kdesvn_part.kcfg +++ /dev/null @@ -1,261 +0,0 @@ - - - - tqstring.h - - - - true - - - - 22 - - - - true - - - - false - - - - false - - - - kompare -on - - - - - default - - - - false - - - - false - - - - false - - - - 20 - - - - true - - - 0,0 - - - false - - - - - - true - - - - false - - - - true - - - - true - - - - true - - - - false - - - - true - - - - true - - - - true - - - - true - - - - 0 - - - - false - - - - false - - - - true - - - - false - - - - false - - - - true - - - - true - - - - true - - - - - - kdiff3 %s1 %s2 %t - - - - kdiff3 %o %m %n -o %t - - - - false - - - - - - true - - - 101,224,76 - - - #CC0000 - - - #BBBBBB - - - #c50003 - - - #ff8888 - - - #a3a3a3 - - - #85bae0 - - - #de5e5e - - - 255,0,0 - - - - - - - - - - - - - - - - 0 - - - - #00FF00 - - - - #FF0000 - - - - #C0C0C0 - - - - #C0C0C0 - - - - #a0a0a4 - - - - 0,0 - - - - false - - - - - - false - - - - true - - - - 0 - - - - false - - - - Revision made with tdesvn KIO. - - - - - - This value computes how casesensitive string ordering will made. -Never overwrite the default computed value unless you know what you're doing. - QString("a").localeAwareCompare("B")>0 - - - - diff --git a/src/settings/kdesvnsettings.kcfgc b/src/settings/kdesvnsettings.kcfgc deleted file mode 100644 index 4c60cf0..0000000 --- a/src/settings/kdesvnsettings.kcfgc +++ /dev/null @@ -1,6 +0,0 @@ -# Code generation options for kconfig_compiler -File=tdesvn_part.kcfg -ClassName=Kdesvnsettings -Singleton=true -Mutators=true -# will create the necessary code for setting those variables diff --git a/src/settings/tdesvn-use-external-update.sh b/src/settings/tdesvn-use-external-update.sh new file mode 100755 index 0000000..c97242a --- /dev/null +++ b/src/settings/tdesvn-use-external-update.sh @@ -0,0 +1,31 @@ +#!/bin/sh + +display= +lastvalue= + +while read line ; do + if [ "${line#\[}" != "$line" ]; then + continue; + fi + KEY="${line%%=*}" + VALUE="${line#*=}" + if echo "$KEY" | grep 'use_kompare_for_diff' >/dev/null 2>/dev/null; then + display=$VALUE + echo '# DELETE [general_items]use_kompare_for_diff' + elif echo "$KEY" | grep 'external_diff_display' > /dev/null 2>/dev/null; then + exdisplay=$VALUE + elif [ "x$KEY" != "x" ]; then + echo "$KEY=$VALUE" + fi +done + +if [ "x$exdisplay" = "x" -o "x$display" = "x1" ]; then + exdisplay="kompare -on -" +fi +if [ "x$display" = "x2" -o "x$display" = "x1" ]; then + display=true +else + display=false +fi +echo "use_external_diff=$display" +echo "external_diff_display=$exdisplay" diff --git a/src/settings/tdesvn_part.kcfg b/src/settings/tdesvn_part.kcfg new file mode 100644 index 0000000..3754d4a --- /dev/null +++ b/src/settings/tdesvn_part.kcfg @@ -0,0 +1,261 @@ + + + + tqstring.h + + + + true + + + + 22 + + + + true + + + + false + + + + false + + + + kompare -on - + + + + default + + + + false + + + + false + + + + false + + + + 20 + + + + true + + + 0,0 + + + false + + + + + + true + + + + false + + + + true + + + + true + + + + true + + + + false + + + + true + + + + true + + + + true + + + + true + + + + 0 + + + + false + + + + false + + + + true + + + + false + + + + false + + + + true + + + + true + + + + true + + + + + + kdiff3 %s1 %s2 %t + + + + kdiff3 %o %m %n -o %t + + + + false + + + + + + true + + + 101,224,76 + + + #CC0000 + + + #BBBBBB + + + #c50003 + + + #ff8888 + + + #a3a3a3 + + + #85bae0 + + + #de5e5e + + + 255,0,0 + + + + + + + + + + + + + + + + 0 + + + + #00FF00 + + + + #FF0000 + + + + #C0C0C0 + + + + #C0C0C0 + + + + #a0a0a4 + + + + 0,0 + + + + false + + + + + + false + + + + true + + + + 0 + + + + false + + + + Revision made with tdesvn KIO. + + + + + + This value computes how casesensitive string ordering will made. +Never overwrite the default computed value unless you know what you're doing. + QString("a").localeAwareCompare("B")>0 + + + + diff --git a/src/settings/tdesvnsettings.kcfgc b/src/settings/tdesvnsettings.kcfgc new file mode 100644 index 0000000..4c60cf0 --- /dev/null +++ b/src/settings/tdesvnsettings.kcfgc @@ -0,0 +1,6 @@ +# Code generation options for kconfig_compiler +File=tdesvn_part.kcfg +ClassName=Kdesvnsettings +Singleton=true +Mutators=true +# will create the necessary code for setting those variables -- cgit v1.2.1