Merge lp:~stolowski/unity-scopes-api/new-widgets-doc-wily into lp:unity-scopes-api/devel

Proposed by Paweł Stołowski
Status: Merged
Approved by: Michi Henning
Approved revision: 622
Merged at revision: 623
Proposed branch: lp:~stolowski/unity-scopes-api/new-widgets-doc-wily
Merge into: lp:unity-scopes-api/devel
Diff against target: 76 lines (+47/-0)
1 file modified
src/scopes/PreviewWidget.cpp (+47/-0)
To merge this branch: bzr merge lp:~stolowski/unity-scopes-api/new-widgets-doc-wily
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Michi Henning (community) Approve
Andrea Cimitan (community) Approve
Albert Astals Cid (community) Approve
Review via email: mp+267921@code.launchpad.net

Commit message

Added doc for comment, comment-input and icon-actions widgets

Description of the change

Added doc for comment, comment-input and icon-actions widgets.

To post a comment you must log in.
Revision history for this message
Albert Astals Cid (aacid) wrote :

LGTM

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Andrea Cimitan (cimi) :
review: Needs Information
Revision history for this message
Paweł Stołowski (stolowski) wrote :

See my reply below.

Revision history for this message
Andrea Cimitan (cimi) :
review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Michi Henning (michihenning) wrote :

Looks good, thanks!

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
622. By Paweł Stołowski

Merged devel

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/scopes/PreviewWidget.cpp'
--- src/scopes/PreviewWidget.cpp 2015-05-19 09:19:13 +0000
+++ src/scopes/PreviewWidget.cpp 2015-08-20 14:48:09 +0000
@@ -87,11 +87,14 @@
87\arg \c gallery87\arg \c gallery
88\arg \c header88\arg \c header
89\arg \c actions89\arg \c actions
90\arg \c icon-actions
90\arg \c progress91\arg \c progress
91\arg \c text92\arg \c text
92\arg \c rating-input93\arg \c rating-input
93\arg \c rating-edit94\arg \c rating-edit
94\arg \c reviews95\arg \c reviews
96\arg \c comment-input
97\arg \c comment
95\arg \c expandable98\arg \c expandable
9699
97\subsection audio audio widget100\subsection audio audio widget
@@ -242,6 +245,17 @@
242}245}
243\endcode246\endcode
244247
248\subsection icon-actions icon-actions widget
249
250The icon-actions widget displays one or more buttons represented by icons and/or labels. It's similar to actions widget, but uses different layout.
251Every button can provide an optional temporary icon to be displayed immediately after user taps it.
252
253List of attributes:
254
255\arg \c actions A composite attribute containing an array of tuples, where each tuple has at least
256these fields: \c id (a mandatory string that is passed to unity::scopes::ScopeBase::activate_preview_action()),
257\c label (optional string), \c icon (optional URI, required if label is missing), \c temporaryIcon (optional URI).
258
245\subsection progress progress widget259\subsection progress progress widget
246260
247The progress widget displays the progress of an action, such as download progress.261The progress widget displays the progress of an action, such as download progress.
@@ -378,6 +392,39 @@
378}392}
379\endcode393\endcode
380394
395\subsection comment-input comment-input widget
396
397The comment-input widget allows users to add comments. It displays an input box along with "Send" button.
398
399When a user presses the "Send" button, the scope receives a preview
400action activation with the id \c "commented". The actual comment
401can be accessed via unity::scopes::ActionMetadata::scope_data.
402The scope data will be a VariantMap with the \c "comment" field holding
403the text entered by the user.
404
405List of attributes:
406
407\arg \c submit-label String for the label of the submit button (optional, uses "Submit" by default).
408
409\code{.cpp}
410{
411 PreviewWidget w1("cmt", "comment-input");
412
413 w1.add_attribute_value("submit-label", Variant("Comment it!"));
414 ...
415}
416\endcode
417
418\subsection comment comment widget
419
420The comment widget shows an avatar, author name, subtitle and a comment text.
421
422List of attributes:
423\arg \c source URI for an avatar icon (optional)
424\arg \c author A string specifying the author of the comment (mandatory)
425\arg \c subtitle A string for the subtitle (optional)
426\arg \c comment A string for the comment text (mandatory)
427
381\subsection expandable expandable widget428\subsection expandable expandable widget
382429
383The expandable widget is used to group several widgets into an expandable pane.430The expandable widget is used to group several widgets into an expandable pane.

Subscribers

People subscribed via source and target branches

to all changes: