diff options
| -rw-r--r-- | src/kreadconfig/Makefile.am | 4 | ||||
| -rw-r--r-- | src/kreadconfig/kreadconfig.cpp | 18 | ||||
| -rw-r--r-- | src/kreadconfig/kwriteconfig.cpp | 72 |
3 files changed, 87 insertions, 7 deletions
diff --git a/src/kreadconfig/Makefile.am b/src/kreadconfig/Makefile.am index 384f1092..c7b5644c 100644 --- a/src/kreadconfig/Makefile.am +++ b/src/kreadconfig/Makefile.am @@ -4,8 +4,10 @@ INCLUDES = $(all_includes) AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) LDADD = $(LIB_KDECORE) -bin_PROGRAMS = kreadconfig +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/src/kreadconfig/kreadconfig.cpp b/src/kreadconfig/kreadconfig.cpp index e5f64f56..c1a6d069 100644 --- a/src/kreadconfig/kreadconfig.cpp +++ b/src/kreadconfig/kreadconfig.cpp @@ -1,4 +1,4 @@ -/* Read KGlobal::config() entries - for use in shell scripts. +/* Read KConfig() entries - for use in shell scripts. * (c) 2001 Red Hat, Inc. * Programmed by Bernhard Rosenkraenzer <bero@redhat.com> * @@ -44,8 +44,8 @@ static KCmdLineOptions options[] = int main(int argc, char **argv) { KAboutData aboutData("kreadconfig", I18N_NOOP("KReadConfig"), - "1.0.0", - I18N_NOOP("Read KGlobal::config() entries - for use in shell scripts"), + "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, "bero@redhat.com"); @@ -53,12 +53,17 @@ int main(int argc, char **argv) KCmdLineArgs::addCmdLineOptions(options); KCmdLineArgs *args=KCmdLineArgs::parsedArgs(); - QString group=QString::fromLatin1(args->getOption("group")); - QString key=QString::fromLatin1(args->getOption("key")); - QString file=QString::fromLatin1(args->getOption("file")); + 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); KConfig *konfig; @@ -80,3 +85,4 @@ int main(int argc, char **argv) return 0; } } + diff --git a/src/kreadconfig/kwriteconfig.cpp b/src/kreadconfig/kwriteconfig.cpp new file mode 100644 index 00000000..16d17445 --- /dev/null +++ b/src/kreadconfig/kwriteconfig.cpp @@ -0,0 +1,72 @@ +/* Write KConfig() entries - for use in shell scripts. + * (c) 2001 Red Hat, Inc. & Luís Pedro Coelho + * Programmed by Luís Pedro Coelho <luis_pedro@netcabo.pt> + * based on kreadconfig by Bernhard Rosenkraenzer <bero@redhat.com> + * + * 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, "luis_pedro@netcabo.pt"); + aboutData.addAuthor("Bernhard Rosenkraenzer", "Wrote kreadconfig on which this is based", "bero@redhat.com"); + 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 { + konfig->writeEntry( key, QString::fromLocal8Bit( value ) ); + } + konfig->sync(); + return 0; +} + |