Copy the KDE 3.5 branch to branches/trinity for new KDE 3.5 features.

BUG:215923


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1054174 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

3 files changed, 193 insertions, 0 deletions

diff --git a/kreadconfig/Makefile.am b/kreadconfig/Makefile.am
new file mode 100644
index 000000000..c7b5644cf
--- /dev/null
+++ b/kreadconfig/Makefile.am
@@ -0,0 +1,13 @@
+AM_CPPFLAGS = -DQT_NO_CAST_ASCII 
+
+INCLUDES = $(all_includes)
+AM_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+LDADD   =       $(LIB_KDECORE)
+
+bin_PROGRAMS	= kreadconfig kwriteconfig
+kreadconfig_SOURCES	= kreadconfig.cpp
+kwriteconfig_SOURCES	= kwriteconfig.cpp
+
+messages:
+	$(XGETTEXT) $(kreadconfig_SOURCES) -o $(podir)/kreadconfig.pot
+	$(XGETTEXT) $(kwriteconfig_SOURCES) -o $(podir)/kwriteconfig.pot
diff --git a/kreadconfig/kreadconfig.cpp b/kreadconfig/kreadconfig.cpp
new file mode 100644
index 000000000..8ad4d79f1
--- /dev/null
+++ b/kreadconfig/kreadconfig.cpp
@@ -0,0 +1,105 @@
+/* Read KConfig() entries - for use in shell scripts.
+ * (c) 2001 Red Hat, Inc.
+ * Programmed by Bernhard Rosenkraenzer <[email protected]>
+ *
+ * If --type is specified as bool, the return value is 0 if the value
+ * is set, 1 if it isn't set. There is no output.
+ *
+ * If --type is specified as num, the return value matches the value
+ * of the key. There is no output.
+ *
+ * If --type is not set, the value of the key is simply printed to stdout.
+ *
+ * Usage examples:
+ *	if kreadconfig --group KDE --key macStyle --type bool; then
+ *		echo "We're using Mac-Style menus."
+ *	else
+ *		echo "We're using normal menus."
+ *	fi
+ *
+ *	TRASH=`kreadconfig --group Paths --key Trash`
+ *	if test -n "$TRASH"; then
+ *		mv someFile "$TRASH"
+ *	else
+ *		rm someFile
+ *	fi
+ */
+#include <kconfig.h>
+#include <kglobal.h>
+#include <kapplication.h>
+#include <kcmdlineargs.h>
+#include <klocale.h>
+#include <kaboutdata.h>
+#include <stdio.h>
+
+static KCmdLineOptions options[] =
+{
+	{ "file <file>", I18N_NOOP("Use <file> instead of global config"), 0 },
+	{ "group <group>", I18N_NOOP("Group to look in"), "KDE" },
+        { "key <key>", I18N_NOOP("Key to look for"), 0 },
+        { "default <default>", I18N_NOOP("Default value"), 0 },
+	{ "type <type>", I18N_NOOP("Type of variable"), 0 },
+        KCmdLineLastOption
+};
+int main(int argc, char **argv)
+{
+	KAboutData aboutData("kreadconfig", I18N_NOOP("KReadConfig"),
+		"1.0.1",
+		I18N_NOOP("Read KConfig entries - for use in shell scripts"),
+		KAboutData::License_GPL,
+		"(c) 2001 Red Hat, Inc.");
+	aboutData.addAuthor("Bernhard Rosenkraenzer", 0, "[email protected]");
+	KCmdLineArgs::init(argc, argv, &aboutData);
+	KCmdLineArgs::addCmdLineOptions(options);
+	KCmdLineArgs *args=KCmdLineArgs::parsedArgs();
+
+	QString group=QString::fromLocal8Bit(args->getOption("group"));
+	QString key=QString::fromLocal8Bit(args->getOption("key"));
+	QString file=QString::fromLocal8Bit(args->getOption("file"));
+	QCString dflt=args->getOption("default");
+	QCString type=args->getOption("type").lower();
+
+	if (key.isNull()) {
+		KCmdLineArgs::usage();
+		return 1;
+	}
+
+	KInstance inst(&aboutData);
+	KGlobal::config();
+
+	KConfig *konfig;
+        bool configMustDeleted = false;
+	if (file.isEmpty())
+	   konfig = KGlobal::config();
+	else
+        {
+	   konfig = new KConfig(file, true, false);
+           configMustDeleted=true;
+        }
+	konfig->setGroup(group);
+	if(type=="bool") {
+		dflt=dflt.lower();
+		bool def=(dflt=="true" || dflt=="on" || dflt=="yes" || dflt=="1");
+                bool retValue = !konfig->readBoolEntry(key, def);
+                if ( configMustDeleted )
+                    delete konfig;
+		return retValue;
+	} else if((type=="num") || (type=="int")) {
+            long retValue = konfig->readLongNumEntry(key, dflt.toLong());
+            if ( configMustDeleted )
+                delete konfig;
+            return retValue;
+	} else if (type=="path"){
+                fprintf(stdout, "%s\n", konfig->readPathEntry(key, dflt).local8Bit().data());
+                if ( configMustDeleted )
+                    delete konfig;
+		return 0;
+	} else {
+            /* Assume it's a string... */
+                fprintf(stdout, "%s\n", konfig->readEntry(key, dflt).local8Bit().data());
+                if ( configMustDeleted )
+                    delete konfig;
+		return 0;
+	}
+}
+
diff --git a/kreadconfig/kwriteconfig.cpp b/kreadconfig/kwriteconfig.cpp
new file mode 100644
index 000000000..0246ec709
--- /dev/null
+++ b/kreadconfig/kwriteconfig.cpp
@@ -0,0 +1,75 @@
+/* Write KConfig() entries - for use in shell scripts.
+ * (c) 2001 Red Hat, Inc. & Lu�s Pedro Coelho
+ * Programmed by Lu�s Pedro Coelho <[email protected]>
+ *  based on kreadconfig by Bernhard Rosenkraenzer <[email protected]>
+ *
+ * License: GPL
+ *
+ */
+#include <kconfig.h>
+#include <kglobal.h>
+#include <kapplication.h>
+#include <kcmdlineargs.h>
+#include <klocale.h>
+#include <kaboutdata.h>
+#include <stdio.h>
+
+static KCmdLineOptions options[] =
+{
+	{ "file <file>", I18N_NOOP("Use <file> instead of global config"), 0 },
+	{ "group <group>", I18N_NOOP("Group to look in"), "KDE" },
+        { "key <key>", I18N_NOOP("Key to look for"), 0 },
+	{ "type <type>", I18N_NOOP("Type of variable. Use \"bool\" for a boolean, otherwise it is treated as a string"), 0 },
+	{ "+value", I18N_NOOP( "The value to write. Mandatory, on a shell use '' for empty" ), 0 },
+        KCmdLineLastOption
+};
+int main(int argc, char **argv)
+{
+	KAboutData aboutData("kwriteconfig", I18N_NOOP("KWriteConfig"),
+		"1.0.0",
+		I18N_NOOP("Write KConfig entries - for use in shell scripts"),
+		KAboutData::License_GPL,
+		"(c) 2001 Red Hat, Inc. & Lu�s Pedro Coelho");
+	aboutData.addAuthor("Lu�s Pedro Coelho", 0, "[email protected]");
+	aboutData.addAuthor("Bernhard Rosenkraenzer", "Wrote kreadconfig on which this is based", "[email protected]");
+	KCmdLineArgs::init(argc, argv, &aboutData);
+	KCmdLineArgs::addCmdLineOptions(options);
+	KCmdLineArgs *args=KCmdLineArgs::parsedArgs();
+
+	QString group=QString::fromLocal8Bit(args->getOption("group"));
+	QString key=QString::fromLocal8Bit(args->getOption("key"));
+	QString file=QString::fromLocal8Bit(args->getOption("file"));
+	QCString type=args->getOption("type").lower();
+
+
+	if (key.isNull() || !args->count()) {
+		KCmdLineArgs::usage();
+		return 1;
+	}
+	QCString value = args->arg( 0 );
+
+	KInstance inst(&aboutData);
+
+	KConfig *konfig;
+	if (file.isEmpty())
+	   konfig = new KConfig(QString::fromLatin1("kdeglobals"), false, false);
+	else
+	   konfig = new KConfig(file, false, false);
+
+	konfig->setGroup(group);
+	if ( konfig->getConfigState() != KConfig::ReadWrite || konfig->entryIsImmutable( key ) ) return 2;
+
+	if(type=="bool") {
+		// For symmetry with kreadconfig we accept a wider range of values as true than Qt
+		bool boolvalue=(value=="true" || value=="on" || value=="yes" || value=="1");
+		konfig->writeEntry( key, boolvalue );
+	} else if (type=="path") {
+		konfig->writePathEntry( key, QString::fromLocal8Bit( value ) );
+	} else {
+		konfig->writeEntry( key, QString::fromLocal8Bit( value ) );
+	}
+	konfig->sync();
+        delete konfig;
+	return 0;
+}
+