From 4b9675e797c87ea363aa313854b72b5754122b79 Mon Sep 17 00:00:00 2001 From: Aaron Seigo Date: Mon, 28 Dec 2015 16:32:46 +0100 Subject: tighten this up a little --- akonadish/syntax_modules/akonadi_list.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'akonadish/syntax_modules') diff --git a/akonadish/syntax_modules/akonadi_list.cpp b/akonadish/syntax_modules/akonadi_list.cpp index 807119c..18f15e7 100644 --- a/akonadish/syntax_modules/akonadi_list.cpp +++ b/akonadish/syntax_modules/akonadi_list.cpp @@ -72,7 +72,6 @@ bool list(const QStringList &args, State &state) //qDebug() << "Listing"; int colSize = 38; //Necessary to display a complete UUID - state.print(" " + QObject::tr("Column") + " "); state.print(QObject::tr("Resource").leftJustified(colSize, ' ', true) + QObject::tr("Identifier").leftJustified(colSize, ' ', true)); for (int i = 0; i < model->columnCount(QModelIndex()); i++) { @@ -82,9 +81,8 @@ bool list(const QStringList &args, State &state) QObject::connect(model.data(), &QAbstractItemModel::rowsInserted, [model, colSize, state](const QModelIndex &index, int start, int end) { for (int i = start; i <= end; i++) { - state.print(" " + QObject::tr("Row %1").arg(QString::number(model->rowCount())).rightJustified(4, ' ') + ": "); auto object = model->data(model->index(i, 0, index), Akonadi2::Store::DomainObjectBaseRole).value(); - state.print(" " + object->resourceInstanceIdentifier().leftJustified(colSize, ' ', true)); + state.print(object->resourceInstanceIdentifier().leftJustified(colSize, ' ', true)); state.print(object->identifier().leftJustified(colSize, ' ', true)); for (int col = 0; col < model->columnCount(QModelIndex()); col++) { state.print(" | " + model->data(model->index(i, col, index)).toString().leftJustified(colSize, ' ', true)); -- cgit v1.2.3 From 7e48662cf11b5be7d062b082a9a1970419921a08 Mon Sep 17 00:00:00 2001 From: Aaron Seigo Date: Mon, 28 Dec 2015 20:20:16 +0100 Subject: pass the state object into the completer allows completion to use an eventloop e.g. --- akonadish/syntax_modules/core_syntax.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'akonadish/syntax_modules') diff --git a/akonadish/syntax_modules/core_syntax.cpp b/akonadish/syntax_modules/core_syntax.cpp index 31b824a..b4812df 100644 --- a/akonadish/syntax_modules/core_syntax.cpp +++ b/akonadish/syntax_modules/core_syntax.cpp @@ -76,7 +76,7 @@ bool showHelp(const QStringList &commands, State &state) return true; } -QStringList showHelpCompleter(const QStringList &commands, const QString &fragment) +QStringList showHelpCompleter(const QStringList &commands, const QString &fragment, State &) { QStringList items; -- cgit v1.2.3 From 67d664f6dc36e3bd85fac27d5008b84e4b1d5568 Mon Sep 17 00:00:00 2001 From: Aaron Seigo Date: Mon, 28 Dec 2015 20:26:44 +0100 Subject: resource automcompletion --- akonadish/syntax_modules/akonadi_clear.cpp | 6 +++--- akonadish/syntax_modules/akonadi_count.cpp | 6 +++--- akonadish/syntax_modules/akonadi_modify.cpp | 9 ++++----- akonadish/syntax_modules/akonadi_remove.cpp | 9 ++++----- akonadish/syntax_modules/akonadi_stat.cpp | 6 +++--- akonadish/syntax_modules/akonadi_sync.cpp | 6 +++--- 6 files changed, 20 insertions(+), 22 deletions(-) (limited to 'akonadish/syntax_modules') diff --git a/akonadish/syntax_modules/akonadi_clear.cpp b/akonadish/syntax_modules/akonadi_clear.cpp index d17fac2..d328849 100644 --- a/akonadish/syntax_modules/akonadi_clear.cpp +++ b/akonadish/syntax_modules/akonadi_clear.cpp @@ -50,10 +50,10 @@ bool clear(const QStringList &args, State &state) Syntax::List syntax() { - Syntax::List syntax; - syntax << Syntax("clear", QObject::tr("Clears the local cache of one or more resources (be careful!)"), &AkonadiClear::clear); + Syntax clear("clear", QObject::tr("Clears the local cache of one or more resources (be careful!)"), &AkonadiClear::clear); + clear.completer = &AkonadishUtils::resourceCompleter; - return syntax; + return Syntax::List() << clear; } REGISTER_SYNTAX(AkonadiClear) diff --git a/akonadish/syntax_modules/akonadi_count.cpp b/akonadish/syntax_modules/akonadi_count.cpp index cda7235..fa3f1fb 100644 --- a/akonadish/syntax_modules/akonadi_count.cpp +++ b/akonadish/syntax_modules/akonadi_count.cpp @@ -74,10 +74,10 @@ bool count(const QStringList &args, State &state) Syntax::List syntax() { - Syntax::List syntax; - syntax << Syntax("count", QObject::tr("Returns the number of items of a given type in a resource. Usage: count "), &AkonadiCount::count, Syntax::EventDriven); + Syntax count("count", QObject::tr("Returns the number of items of a given type in a resource. Usage: count "), &AkonadiCount::count, Syntax::EventDriven); + count.completer = &AkonadishUtils::resourceCompleter; - return syntax; + return Syntax::List() << count; } REGISTER_SYNTAX(AkonadiCount) diff --git a/akonadish/syntax_modules/akonadi_modify.cpp b/akonadish/syntax_modules/akonadi_modify.cpp index 8438301..8ab873a 100644 --- a/akonadish/syntax_modules/akonadi_modify.cpp +++ b/akonadish/syntax_modules/akonadi_modify.cpp @@ -107,13 +107,12 @@ bool resource(const QStringList &args, State &state) Syntax::List syntax() { - Syntax::List syntax; - Syntax modify("modify", QObject::tr("Modify items in a resource"), &AkonadiModify::modify); - modify.children << Syntax("resource", QObject::tr("Modify a resource"), &AkonadiModify::resource);//, Syntax::EventDriven); + Syntax resource("resource", QObject::tr("Modify a resource"), &AkonadiModify::resource);//, Syntax::EventDriven); + resource.completer = &AkonadishUtils::resourceCompleter; + modify.children << resource; - syntax << modify; - return syntax; + return Syntax::List() << modify; } REGISTER_SYNTAX(AkonadiModify) diff --git a/akonadish/syntax_modules/akonadi_remove.cpp b/akonadish/syntax_modules/akonadi_remove.cpp index bf09e2e..9691d78 100644 --- a/akonadish/syntax_modules/akonadi_remove.cpp +++ b/akonadish/syntax_modules/akonadi_remove.cpp @@ -97,13 +97,12 @@ bool resource(const QStringList &args, State &state) Syntax::List syntax() { - Syntax::List syntax; - Syntax remove("remove", QObject::tr("Remove items in a resource"), &AkonadiRemove::remove); - remove.children << Syntax("resource", QObject::tr("Removes a resource"), &AkonadiRemove::resource);//, Syntax::EventDriven); + Syntax resource("resource", QObject::tr("Removes a resource"), &AkonadiRemove::resource);//, Syntax::EventDriven); + resource.completer = &AkonadishUtils::resourceCompleter; + remove.children << resource; - syntax << remove; - return syntax; + return Syntax::List() << remove; } REGISTER_SYNTAX(AkonadiRemove) diff --git a/akonadish/syntax_modules/akonadi_stat.cpp b/akonadish/syntax_modules/akonadi_stat.cpp index 0ea65dd..9270f9d 100644 --- a/akonadish/syntax_modules/akonadi_stat.cpp +++ b/akonadish/syntax_modules/akonadi_stat.cpp @@ -111,10 +111,10 @@ bool stat(const QStringList &args, State &state) Syntax::List syntax() { - Syntax::List syntax; - syntax << Syntax("stat", QObject::tr("Shows database usage for the resources requested"), &AkonadiStat::stat, Syntax::EventDriven); + Syntax state("stat", QObject::tr("Shows database usage for the resources requested"), &AkonadiStat::stat, Syntax::EventDriven); + state.completer = &AkonadishUtils::resourceCompleter; - return syntax; + return Syntax::List() << state; } REGISTER_SYNTAX(AkonadiStat) diff --git a/akonadish/syntax_modules/akonadi_sync.cpp b/akonadish/syntax_modules/akonadi_sync.cpp index 1cf097d..03abbb4 100644 --- a/akonadish/syntax_modules/akonadi_sync.cpp +++ b/akonadish/syntax_modules/akonadi_sync.cpp @@ -58,10 +58,10 @@ bool sync(const QStringList &args, State &state) Syntax::List syntax() { - Syntax::List syntax; - syntax << Syntax("sync", QObject::tr("Syncronizes all resources that are listed; and empty list triggers a syncronizaton on all resources"), &AkonadiSync::sync, Syntax::EventDriven ); + Syntax sync("sync", QObject::tr("Syncronizes all resources that are listed; and empty list triggers a syncronizaton on all resources"), &AkonadiSync::sync, Syntax::EventDriven ); + sync.completer = &AkonadishUtils::resourceCompleter; - return syntax; + return Syntax::List() << sync; } REGISTER_SYNTAX(AkonadiSync) -- cgit v1.2.3 From cc5363fe4b0cd4ea95ac98d9d37f2028fe226145 Mon Sep 17 00:00:00 2001 From: Aaron Seigo Date: Mon, 28 Dec 2015 22:00:19 +0100 Subject: typeCompleter and resourceOrTypeCompleter --- akonadish/syntax_modules/akonadi_count.cpp | 2 +- akonadish/syntax_modules/akonadi_list.cpp | 7 +++---- akonadish/syntax_modules/akonadi_modify.cpp | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) (limited to 'akonadish/syntax_modules') diff --git a/akonadish/syntax_modules/akonadi_count.cpp b/akonadish/syntax_modules/akonadi_count.cpp index fa3f1fb..5acdcdd 100644 --- a/akonadish/syntax_modules/akonadi_count.cpp +++ b/akonadish/syntax_modules/akonadi_count.cpp @@ -75,7 +75,7 @@ bool count(const QStringList &args, State &state) Syntax::List syntax() { Syntax count("count", QObject::tr("Returns the number of items of a given type in a resource. Usage: count "), &AkonadiCount::count, Syntax::EventDriven); - count.completer = &AkonadishUtils::resourceCompleter; + count.completer = &AkonadishUtils::typeCompleter; return Syntax::List() << count; } diff --git a/akonadish/syntax_modules/akonadi_list.cpp b/akonadish/syntax_modules/akonadi_list.cpp index 18f15e7..82f13b5 100644 --- a/akonadish/syntax_modules/akonadi_list.cpp +++ b/akonadish/syntax_modules/akonadi_list.cpp @@ -106,10 +106,9 @@ bool list(const QStringList &args, State &state) Syntax::List syntax() { - Syntax::List syntax; - syntax << Syntax("list", QObject::tr("List all resources, or the contents of one or more resources"), &AkonadiList::list, Syntax::EventDriven); - - return syntax; + Syntax list("list", QObject::tr("List all resources, or the contents of one or more resources"), &AkonadiList::list, Syntax::EventDriven); + list.completer = &AkonadishUtils::resourceOrTypeCompleter; + return Syntax::List() << list; } REGISTER_SYNTAX(AkonadiList) diff --git a/akonadish/syntax_modules/akonadi_modify.cpp b/akonadish/syntax_modules/akonadi_modify.cpp index 8ab873a..76a7f5e 100644 --- a/akonadish/syntax_modules/akonadi_modify.cpp +++ b/akonadish/syntax_modules/akonadi_modify.cpp @@ -109,7 +109,7 @@ Syntax::List syntax() { Syntax modify("modify", QObject::tr("Modify items in a resource"), &AkonadiModify::modify); Syntax resource("resource", QObject::tr("Modify a resource"), &AkonadiModify::resource);//, Syntax::EventDriven); - resource.completer = &AkonadishUtils::resourceCompleter; + resource.completer = &AkonadishUtils::resourceOrTypeCompleter; modify.children << resource; return Syntax::List() << modify; -- cgit v1.2.3