[kde-doc-english] [skrooge] /: Merge branch 'master' of kde:skrooge

[Stephane Mankowski]

Git commit 7bebee2c500616f30cef5ee3cf21491b11d7c021 by Stephane Mankowski.
Committed on 02/04/2015 at 20:46.
Pushed by smankowski into branch 'master'.

Merge branch 'master' of kde:skrooge

Conflicts:
        doc/index.docbook
        skgbasegui/skgfilteredtableview.ui

M  +1    -1    doc/index.docbook
M  +1    -1    skgbasegui/skgfilteredtableview.ui

http://commits.kde.org/skrooge/7bebee2c500616f30cef5ee3cf21491b11d7c021

diff --cc doc/index.docbook
index 96eec8b,afa5c29..c5e10ba
--- a/doc/index.docbook
+++ b/doc/index.docbook
@@@ -594,13 -593,11 +594,13 @@@
            Some examples are better to explain:
          </para>
            <itemizedlist>
 -            <listitem><para>+val1 +val2 => Keep lines containing val1 OR 
val2</para></listitem>
 -            <listitem><para>+val1 -val2 => Keep lines containing val1 but NOT 
val2</para></listitem>
 -            <listitem><para>"abc def" => Keep lines containing the sentence 
"abc def"</para></listitem>
 -            <listitem><para>abc:def => Keep lines having a column name 
starting by abc and containing def</para></listitem>
 -            <listitem><para>:abc:def => Keep lines containing 
"abc:def"</para></listitem>
 +            <listitem><para>+val1 +val2 =&gt; Keep lines containing val1 OR 
val2</para></listitem>
 +            <listitem><para>+val1 -val2 =&gt; Keep lines containing val1 but 
NOT val2</para></listitem>
-             <listitem><para>"abc def" =&gt; Keep lines containing the 
sentense "abc def"</para></listitem>
++            <listitem><para>"abc def" =&gt; Keep lines containing the 
sentence "abc def"</para></listitem>
 +            <listitem><para>abc:def =&gt; Keep lines having a column name 
starting by abc and containing def</para></listitem>
 +            <listitem><para>:abc:def =&gt; Keep lines containing 
"abc:def"</para></listitem>
 +            <listitem><para>Date&gt;2015-03-01 =&gt; Keep lines where Date 
attribute is greater than 2015-03-01</para></listitem>
 +            <listitem><para>Amount&lt;10 =&gt;Keep lines where Amount 
attribute is less than 10</para></listitem>
            </itemizedlist>
        </tip>
        </sect3>
diff --cc skgbasegui/skgfilteredtableview.ui
index a3670ed,ef8cfc2..f332315
--- a/skgbasegui/skgfilteredtableview.ui
+++ b/skgbasegui/skgfilteredtableview.ui
@@@ -101,7 -101,7 +101,7 @@@
          <enum>Qt::WheelFocus</enum>
         </property>
         <property name="toolTip">
-         <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Searching is 
case-insensitive. So table, Table, and TABLE are all the same.&lt;br/&gt;If you 
just put a word or series of words in the search box, the application will 
filter the table to keep all lines having these words (logical operator AND). 
&lt;br/&gt;If you want to add (logical operator OR) some line, you must prefix 
your word by &amp;quot;+&amp;quot;.&lt;br/&gt;If you want to remove (logical 
operator NOT) some line, you must prefix your word by 
&amp;quot;-&amp;quot;.&lt;br/&gt;If you want to search only on one column, you 
must prefix your word by the column name like: col1:word.&lt;br/&gt;If you want 
to use the character &amp;quot;:&amp;quot; in value, you must specify the 
column name like this: col1:value:rest.&lt;br/&gt;If you want to search for a 
phrase or something that contains spaces, you must put it in quotes, like: 
&amp;quot;yes, this is a phrase&amp;quot;.&lt;/p&gt;&lt;p&gt;You can also use 
operator &amp;quot;&amp;lt;&amp;quot; and 
&amp;quot;&amp;gt;&amp;quot;.&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; 
font-weight:600; text-decoration: 
underline;&quot;&gt;Examples:&lt;/span&gt;&lt;br/&gt;+val1 +val2 =&amp;gt; Keep 
lines containing val1 OR val2&lt;br/&gt;+val1 -val2 =&amp;gt; Keep lines 
containing val1 but NOT val2&lt;br/&gt;&amp;quot;abc def&amp;quot; =&amp;gt; 
Keep lines containing the sentense &amp;quot;abc def&amp;quot; 
&lt;br/&gt;abc:def =&amp;gt; Keep lines having a column name starting by abc 
and containing def&lt;br/&gt;:abc:def =&amp;gt; Keep lines containing 
&amp;quot;abc:def&amp;quot;&lt;br/&gt;Date&amp;gt;2015-03-01 =&amp;gt; Keep 
lines where Date attribute is greater than 
2015-03-01&lt;br/&gt;Amount&amp;lt;10 =&amp;gt;Keep lines where Amount 
attribute is less than 10&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
 -        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Searching is 
case-insensitive. So table, Table, and TABLE are all the same.&lt;br/&gt;If you 
just put a word or series of words in the search box, the application will 
filter the table to keep all lines having these words (logical operator AND). 
&lt;br/&gt;If you want to add (logical operator OR) some line, you must prefix 
your word by &amp;quot;+&amp;quot;.&lt;br/&gt;If you want to remove (logical 
operator NOT) some line, you must prefix your word by 
&amp;quot;-&amp;quot;.&lt;br/&gt;If you want to search only on one column, you 
must prefix your word by the column name like: col1:word.&lt;/p&gt;&lt;p&gt;If 
you want to use the character &amp;quot;:&amp;quot; in value, you must specify 
the column name like this: col1:value:rest.&lt;br/&gt;If you want to search for 
a phrase or something that contains spaces, you must put it in quotes, like: 
&amp;quot;yes, this is a phrase&amp;quot;.&lt;/p&gt;&lt;p&gt;&lt;span 
style=&quot; font-weight:600; text-decoration: 
underline;&quot;&gt;Examples:&lt;/span&gt;&lt;br/&gt;+val1 +val2 =&amp;gt; Keep 
lines containing val1 OR val2&lt;br/&gt;+val1 -val2 =&amp;gt; Keep lines 
containing val1 but NOT val2&lt;br/&gt;&amp;quot;abc def&amp;quot; =&amp;gt; 
Keep lines containing the sentence &amp;quot;abc def&amp;quot; 
&lt;br/&gt;abc:def =&amp;gt; Keep lines having a column name starting by abc 
and containing def&lt;br/&gt;:abc:def =&amp;gt; Keep lines containing 
&amp;quot;abc:def&amp;quot;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
++        <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Searching is 
case-insensitive. So table, Table, and TABLE are all the same.&lt;br/&gt;If you 
just put a word or series of words in the search box, the application will 
filter the table to keep all lines having these words (logical operator AND). 
&lt;br/&gt;If you want to add (logical operator OR) some line, you must prefix 
your word by &amp;quot;+&amp;quot;.&lt;br/&gt;If you want to remove (logical 
operator NOT) some line, you must prefix your word by 
&amp;quot;-&amp;quot;.&lt;br/&gt;If you want to search only on one column, you 
must prefix your word by the column name like: col1:word.&lt;br/&gt;If you want 
to use the character &amp;quot;:&amp;quot; in value, you must specify the 
column name like this: col1:value:rest.&lt;br/&gt;If you want to search for a 
phrase or something that contains spaces, you must put it in quotes, like: 
&amp;quot;yes, this is a phrase&amp;quot;.&lt;/p&gt;&lt;p&gt;You can also use 
operator &amp;quot;&amp;lt;&amp;quot; and 
&amp;quot;&amp;gt;&amp;quot;.&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; 
font-weight:600; text-decoration: 
underline;&quot;&gt;Examples:&lt;/span&gt;&lt;br/&gt;+val1 +val2 =&amp;gt; Keep 
lines containing val1 OR val2&lt;br/&gt;+val1 -val2 =&amp;gt; Keep lines 
containing val1 but NOT val2&lt;br/&gt;&amp;quot;abc def&amp;quot; =&amp;gt; 
Keep lines containing the sentence &amp;quot;abc def&amp;quot; 
&lt;br/&gt;abc:def =&amp;gt; Keep lines having a column name starting by abc 
and containing def&lt;br/&gt;:abc:def =&amp;gt; Keep lines containing 
&amp;quot;abc:def&amp;quot;&lt;br/&gt;Date&amp;gt;2015-03-01 =&amp;gt; Keep 
lines where Date attribute is greater than 
2015-03-01&lt;br/&gt;Amount&amp;lt;10 =&amp;gt;Keep lines where Amount 
attribute is less than 10&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
         </property>
        </widget>
       </item>