Merge lp:~diegosarmentero/nuxplayground/nux-view-html-typos into lp:nuxplayground

Proposed by Diego Sarmentero on 2012-12-10
Status: Needs review
Proposed branch: lp:~diegosarmentero/nuxplayground/nux-view-html-typos
Merge into: lp:nuxplayground
Diff against target: 52 lines (+6/-6)
2 files modified
doc/html/hello-world.html (+3/-3)
doc/html/nux-view-from-1000-feet.html (+3/-3)
To merge this branch: bzr merge lp:~diegosarmentero/nuxplayground/nux-view-html-typos
Reviewer Review Type Date Requested Status
Nux Team 2012-12-10 Pending
Review via email: mp+138998@code.launchpad.net

Commit message

- Fixing some typos in "nux view from 1000 feet" html

To post a comment you must log in.
34. By Diego Sarmentero on 2012-12-10

fixing typos in hello world html

35. By Diego Sarmentero on 2012-12-10

new typos fixed

36. By Diego Sarmentero on 2012-12-10

last typo fixed

Unmerged revisions

36. By Diego Sarmentero on 2012-12-10

last typo fixed

35. By Diego Sarmentero on 2012-12-10

new typos fixed

34. By Diego Sarmentero on 2012-12-10

fixing typos in hello world html

33. By Diego Sarmentero on 2012-12-10

Fixing some typos

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'doc/html/hello-world.html'
2--- doc/html/hello-world.html 2012-07-12 16:29:26 +0000
3+++ doc/html/hello-world.html 2012-12-10 19:21:23 +0000
4@@ -8,7 +8,7 @@
5
6 <h1>Hello World!<br></h1>
7
8-<p>We go through through the code of mythical hello world program written with Nux. The program opens a window and display a text label with "Hello World!". The program source code is avaliable in <strong><a href="https://launchpad.net/nuxplayground">lp:nuxplayground</a></strong> in the folder src/helloworld.</p>
9+<p>We go through the code of mythical hello world program written with Nux. The program opens a window and display a text label with "Hello World!". The program source code is avaliable in <strong><a href="https://launchpad.net/nuxplayground">lp:nuxplayground</a></strong> in the folder src/helloworld.</p>
10
11 <h2>Initialization</h2>
12
13@@ -35,7 +35,7 @@
14 <p>Most of the parameter are self explanatory, but I will give more details on the last two parameters of CreateNuxWindow.</p>
15
16 <ul>
17-<li>UIInitialization: it is a user provided function where you may do the UI setup. It is called one the Window as been created. The goal of this function is to provide a point of entry for thr definition of the user interface. It is not mandatory though. If it NULL then the user may create the interface right after the call to CreateNuxWindow. In other words, you could put the content of UIInitialization right after CreateNuxWindow and the interface will be correctly created. For the moment UIInitialization is a static function but it could be replaced by a signal to a function or a member function of a class.</li>
18+<li>UIInitialization: it is a user provided function where you may do the UI setup. It is called once the Window has been created. The goal of this function is to provide a point of entry for the definition of the user interface. It is not mandatory though. If it is NULL then the user may create the interface right after the call to CreateNuxWindow. In other words, you could put the content of UIInitialization right after CreateNuxWindow and the interface will be correctly created. For the moment UIInitialization is a static function but it could be replaced by a signal to a function or a member function of a class.</li>
19 <li>data: this is the second parameter to UIInitialization. It provides a user defined parameter to the UI setup function.</li>
20 </ul>
21
22@@ -95,7 +95,7 @@
23
24 <h3>Setting the layout in the window</h3>
25
26-<p>A Nux window needs a layout in order to display the interface. That layout is know as the <strong>main layout</strong>. When a window is resized, it sets the main layout to match its own size and instructs it to initiate a layout management cycle. During the layout management cycle, thelayouts resize their children by following the instructions set with functions such as <em>AddView</em>.</p>
27+<p>A Nux window needs a layout in order to display the interface. That layout is know as the <strong>main layout</strong>. When a window is resized, it sets the main layout to match its own size and instructs it to initiate a layout management cycle. During the layout management cycle, the layouts resize their children by following the instructions set with functions such as <em>AddView</em>.</p>
28
29 <p><pre><code> // Add the layout to the window
30 nux::GetWindowThread()->SetLayout(layout);
31
32=== modified file 'doc/html/nux-view-from-1000-feet.html'
33--- doc/html/nux-view-from-1000-feet.html 2012-07-12 16:29:26 +0000
34+++ doc/html/nux-view-from-1000-feet.html 2012-12-10 19:21:23 +0000
35@@ -18,9 +18,9 @@
36 <h1>For UI development, what do I get out of the box?</h1>
37
38 <p>Nux offers the usual widgets such as button, checkbox, ... It also offers a set of custom widgets meant for specific purpose.
39-With Nux you can create any widgets you like and they may look as unique as you want them to be. The regular widgets are fine for most tasks, but if you want to create a new type of interactive widget, you have the ability to do so and your are not limited by the the toolkit for the visual since you have access to the wealth of rendering capabilities of the GPU.</p>
40+With Nux you can create any widgets you like and they may look as unique as you want them to be. The regular widgets are fine for most tasks, but if you want to create a new type of interactive widget, you have the ability to do so and your are not limited by the toolkit for the visual since you have access to the wealth of rendering capabilities of the GPU.</p>
41
42-<p>With access to the GPU, you can do any type of color blendings operaion and use programmable shaders for any type of visual effects. You can create unique UI visuals beyond the default set that is available in Nux.</p>
43+<p>With access to the GPU, you can do any type of color blendings operation and use programmable shaders for any type of visual effects. You can create unique UI visuals beyond the default set that is available in Nux.</p>
44
45 <p><img src="../images/frosted-glass.png" alt="Unity" title="An effect development tool build entirely with Nux."></p>
46
47@@ -57,4 +57,4 @@
48
49 <h1>Are there any examples or demo to try?</h1>
50
51-<p>You can finde a set of sample programs on launchpad at <strong><a href="https://launchpad.net/nuxplayground">lp:nuxplayground</a></strong></p>
52+<p>You can find a set of sample programs on launchpad at <strong><a href="https://launchpad.net/nuxplayground">lp:nuxplayground</a></strong></p>

Subscribers

People subscribed via source and target branches

to all changes: