[kde-doc-english] [skrooge] /: Merge branch 'master' of kde:skrooge
Stephane Mankowski
stephane at mankowski.fr
Thu Apr 2 20:46:50 UTC 2015
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 => 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 sentense "abc def"</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>Date>2015-03-01 => Keep lines where Date attribute is greater than 2015-03-01</para></listitem>
+ <listitem><para>Amount<10 =>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><html><head/><body><p>Searching is case-insensitive. So table, Table, and TABLE are all the same.<br/>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). <br/>If you want to add (logical operator OR) some line, you must prefix your word by "+".<br/>If you want to remove (logical operator NOT) some line, you must prefix your word by "-".<br/>If you want to search only on one column, you must prefix your word by the column name like: col1:word.<br/>If you want to use the character ":" in value, you must specify the column name like this: col1:value:rest.<br/>If you want to search for a phrase or something that contains spaces, you must put it in quotes, like: "yes, this is a phrase".</p><p>You can also use operator "<" and ">".</p><p><span style=" font-weight:600; text-decoration: underline;">Examples:</span><br/>+val1 +val2 => Keep lines containing val1 OR val2<br/>+val1 -val2 => Keep lines containing val1 but NOT val2<br/>"abc def" => Keep lines containing the sentense "abc def" <br/>abc:def => Keep lines having a column name starting by abc and containing def<br/>:abc:def => Keep lines containing "abc:def"<br/>Date>2015-03-01 => Keep lines where Date attribute is greater than 2015-03-01<br/>Amount<10 =>Keep lines where Amount attribute is less than 10</p></body></html></string>
- <string><html><head/><body><p>Searching is case-insensitive. So table, Table, and TABLE are all the same.<br/>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). <br/>If you want to add (logical operator OR) some line, you must prefix your word by "+".<br/>If you want to remove (logical operator NOT) some line, you must prefix your word by "-".<br/>If you want to search only on one column, you must prefix your word by the column name like: col1:word.</p><p>If you want to use the character ":" in value, you must specify the column name like this: col1:value:rest.<br/>If you want to search for a phrase or something that contains spaces, you must put it in quotes, like: "yes, this is a phrase".</p><p><span style=" font-weight:600; text-decoration: underline;">Examples:</span><br/>+val1 +val2 => Keep lines containing val1 OR val2<br/>+val1 -val2 => Keep lines containing val1 but NOT val2<br/>"abc def" => Keep lines containing the sentence "abc def" <br/>abc:def => Keep lines having a column name starting by abc and containing def<br/>:abc:def => Keep lines containing "abc:def"</p></body></html></string>
++ <string><html><head/><body><p>Searching is case-insensitive. So table, Table, and TABLE are all the same.<br/>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). <br/>If you want to add (logical operator OR) some line, you must prefix your word by "+".<br/>If you want to remove (logical operator NOT) some line, you must prefix your word by "-".<br/>If you want to search only on one column, you must prefix your word by the column name like: col1:word.<br/>If you want to use the character ":" in value, you must specify the column name like this: col1:value:rest.<br/>If you want to search for a phrase or something that contains spaces, you must put it in quotes, like: "yes, this is a phrase".</p><p>You can also use operator "<" and ">".</p><p><span style=" font-weight:600; text-decoration: underline;">Examples:</span><br/>+val1 +val2 => Keep lines containing val1 OR val2<br/>+val1 -val2 => Keep lines containing val1 but NOT val2<br/>"abc def" => Keep lines containing the sentence "abc def" <br/>abc:def => Keep lines having a column name starting by abc and containing def<br/>:abc:def => Keep lines containing "abc:def"<br/>Date>2015-03-01 => Keep lines where Date attribute is greater than 2015-03-01<br/>Amount<10 =>Keep lines where Amount attribute is less than 10</p></body></html></string>
</property>
</widget>
</item>
More information about the kde-doc-english
mailing list