[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[gnue] r9490 - in trunk/gnue-forms: defaults defaults/default images/def
|
From: |
reinhard |
|
Subject: |
[gnue] r9490 - in trunk/gnue-forms: defaults defaults/default images/default images/gnome images/kde3 src src/GFObjects |
|
Date: |
Wed, 11 Apr 2007 07:53:17 -0500 (CDT) |
Author: reinhard
Date: 2007-04-11 07:53:16 -0500 (Wed, 11 Apr 2007)
New Revision: 9490
Added:
trunk/gnue-forms/images/default/apply_filter-16x16.png
trunk/gnue-forms/images/default/apply_filter-24x24-gray.png
trunk/gnue-forms/images/default/apply_filter-24x24.bmp
trunk/gnue-forms/images/default/apply_filter-24x24.png
trunk/gnue-forms/images/default/deleterecord-16x16.png
trunk/gnue-forms/images/default/deleterecord-24x24-gray.png
trunk/gnue-forms/images/default/deleterecord-24x24.bmp
trunk/gnue-forms/images/default/deleterecord-24x24.png
trunk/gnue-forms/images/default/init_filter-16x16.png
trunk/gnue-forms/images/default/init_filter-24x24-gray.png
trunk/gnue-forms/images/default/init_filter-24x24.bmp
trunk/gnue-forms/images/default/init_filter-24x24.png
trunk/gnue-forms/images/gnome/apply_filter-16x16.png
trunk/gnue-forms/images/gnome/apply_filter-24x24.png
trunk/gnue-forms/images/gnome/apply_filter-32x32.png
trunk/gnue-forms/images/gnome/deleterecord-16x16.png
trunk/gnue-forms/images/gnome/deleterecord-24x24.png
trunk/gnue-forms/images/gnome/deleterecord-32x32.png
trunk/gnue-forms/images/gnome/init_filter-16x16.png
trunk/gnue-forms/images/gnome/init_filter-24x24.png
trunk/gnue-forms/images/gnome/init_filter-32x32.png
trunk/gnue-forms/images/kde3/apply_filter-16x16.png
trunk/gnue-forms/images/kde3/apply_filter-24x24.png
trunk/gnue-forms/images/kde3/apply_filter-32x32.png
trunk/gnue-forms/images/kde3/deleterecord-16x16.png
trunk/gnue-forms/images/kde3/deleterecord-24x24.png
trunk/gnue-forms/images/kde3/deleterecord-32x32.png
trunk/gnue-forms/images/kde3/init_filter-16x16.png
trunk/gnue-forms/images/kde3/init_filter-24x24.png
trunk/gnue-forms/images/kde3/init_filter-32x32.png
Removed:
trunk/gnue-forms/images/default/enterquery-16x16.png
trunk/gnue-forms/images/default/enterquery-24x24-gray.png
trunk/gnue-forms/images/default/enterquery-24x24.bmp
trunk/gnue-forms/images/default/enterquery-24x24.png
trunk/gnue-forms/images/default/execquery-16x16.png
trunk/gnue-forms/images/default/execquery-24x24-gray.png
trunk/gnue-forms/images/default/execquery-24x24.bmp
trunk/gnue-forms/images/default/execquery-24x24.png
trunk/gnue-forms/images/default/markfordelete-16x16.png
trunk/gnue-forms/images/default/markfordelete-24x24-gray.png
trunk/gnue-forms/images/default/markfordelete-24x24.bmp
trunk/gnue-forms/images/default/markfordelete-24x24.png
trunk/gnue-forms/images/gnome/enterquery-16x16.png
trunk/gnue-forms/images/gnome/enterquery-24x24.png
trunk/gnue-forms/images/gnome/enterquery-32x32x.png
trunk/gnue-forms/images/gnome/execquery-16x16.png
trunk/gnue-forms/images/gnome/execquery-24x24.png
trunk/gnue-forms/images/gnome/execquery-32x32.png
trunk/gnue-forms/images/gnome/markfordelete-16x16.png
trunk/gnue-forms/images/gnome/markfordelete-24x24.png
trunk/gnue-forms/images/gnome/markfordelete-32x32.png
trunk/gnue-forms/images/kde3/enterquery-16x16.png
trunk/gnue-forms/images/kde3/enterquery-24x24.png
trunk/gnue-forms/images/kde3/enterquery-32x32.png
trunk/gnue-forms/images/kde3/execquery-16x16.png
trunk/gnue-forms/images/kde3/execquery-24x24.png
trunk/gnue-forms/images/kde3/execquery-32x32.png
trunk/gnue-forms/images/kde3/markfordelete-16x16.png
trunk/gnue-forms/images/kde3/markfordelete-24x24.png
trunk/gnue-forms/images/kde3/markfordelete-32x32.png
Modified:
trunk/gnue-forms/defaults/default.gfd
trunk/gnue-forms/defaults/default/de.gfd
trunk/gnue-forms/defaults/default/hu.gfd
trunk/gnue-forms/src/GFForm.py
trunk/gnue-forms/src/GFObjects/GFBlock.py
Log:
query -> filter.
Modified: trunk/gnue-forms/defaults/default/de.gfd
===================================================================
--- trunk/gnue-forms/defaults/default/de.gfd 2007-04-11 09:57:21 UTC (rev
9489)
+++ trunk/gnue-forms/defaults/default/de.gfd 2007-04-11 12:53:16 UTC (rev
9490)
@@ -27,10 +27,10 @@
<action name="act__undelete_record__" label="Datensatz nicht löschen"
description="Löschmarkierung für den aktuellen Datensatz rückgängig machen"/>
<!-- Queries -->
- <action name="act__init_query__" label="Filtermodus einschalten"
description="Filtermodus einschalten, um Filterkriterien einzugeben"/>
- <action name="act__copy_query__" label="Filter wiederholen"
description="Filtermodus einschalten und zuletzt verwendete Filterkriterien
wiederholen"/>
- <action name="act__cancel_query__" label="Filtermodus abbrechen"
description="Filtermodus ausschalten, ohne Filter anzuwenden"/>
- <action name="act__execute_query__" label="Filter anwenden"
description="Eingegebene Filterkriterien anwenden"/>
+ <action name="act__init_filter__" label="Filter definieren"
description="Neue Filterkriterien definieren"/>
+ <action name="act__change_filter__" label="Filter ändern"
description="Filterkriterien ändern"/>
+ <action name="act__discard_filter__" label="Filteränderungen verwerfen"
description="Änderungen an den Filterkriterien verwerfen und vorherigen Stand
des Filters wiederherstellen"/>
+ <action name="act__apply_filter__" label="Filter anwenden"
description="Eingegebene Filterkriterien anwenden"/>
<!-- Transactions -->
<action name="act__commit__" label="Speichern" description="Alle Änderungen
speichern"/>
Modified: trunk/gnue-forms/defaults/default/hu.gfd
===================================================================
--- trunk/gnue-forms/defaults/default/hu.gfd 2007-04-11 09:57:21 UTC (rev
9489)
+++ trunk/gnue-forms/defaults/default/hu.gfd 2007-04-11 12:53:16 UTC (rev
9490)
@@ -52,10 +52,10 @@
<action name="act__undelete_record__" label="&Rekord törlésének
visszavonása" description="Törlésre kijelölt rekord kijelölésének
megszüntetése." />
<!-- Queries -->
- <action name="act__init_query__" label="Váltás lekérdezés módba."
description="Váltás lekérdezés módba." />
- <action name="act__copy_query__" label="Előző lekérdezés megismétlése"
description="Váltás lekérdezés módba a legutóbbi szűrő felhasználásával." />
- <action name="act__cancel_query__" label="Lekérdezés mód megszakítása"
description="Visszatérés lekérdezés módból a szűrés végrehajtása nélkül." />
- <action name="act__execute_query__" label="Lekérdezés végrehajtása"
description="Szűrés alkalmazása." />
+ <action name="act__init_filter__" label="Váltás lekérdezés módba."
description="Váltás lekérdezés módba." />
+ <action name="act__change_filter__" label="Előző lekérdezés megismétlése"
description="Váltás lekérdezés módba a legutóbbi szűrő felhasználásával." />
+ <action name="act__discard_filter__" label="Lekérdezés mód megszakítása"
description="Visszatérés lekérdezés módból a szűrés végrehajtása nélkül." />
+ <action name="act__apply_filter__" label="Lekérdezés végrehajtása"
description="Szűrés alkalmazása." />
<!-- Transactions -->
<action name="act__commit__" label="Változások m&entése"
description="Összes változás mentése az adatbázisba." />
Modified: trunk/gnue-forms/defaults/default.gfd
===================================================================
--- trunk/gnue-forms/defaults/default.gfd 2007-04-11 09:57:21 UTC (rev
9489)
+++ trunk/gnue-forms/defaults/default.gfd 2007-04-11 12:53:16 UTC (rev
9490)
@@ -89,7 +89,7 @@
description="Insert a new record in the current block">
form.new_record()
</action>
- <action name="act__delete_record__" icon="markfordelete"
+ <action name="act__delete_record__" icon="deleterecord"
label="&Delete Record"
description="Mark the current record for deletion">
form.delete_record()
@@ -99,22 +99,22 @@
form.undelete_record()
</action>
- <!-- Queries -->
- <action name="act__init_query__" icon="enterquery" label="Enter Query Mode"
- description="Switch the form to query mode">
- form.init_query()
+ <!-- Filter -->
+ <action name="act__init_filter__" icon="init_filter" label="Define Filter"
+ description="Define new filter criteria">
+ form.init_filter()
</action>
- <action name="act__copy_query__" label="Repeat Last Query"
- description="Switch the form to query mode and use last filter criteria">
- form.copy_query()
+ <action name="act__change_filter__" label="Change Filter"
+ description="Change filter criteria">
+ form.change_filter()
</action>
- <action name="act__cancel_query__" label="Cancel Query Mode"
- description="Return from query mode without applying the new filter">
- form.cancel_query()
+ <action name="act__discard_filter__" label="Discard Filter Changes"
+ description="Discard changes to filter criteria and restore previous
filter state">
+ form.discard_filter()
</action>
- <action name="act__execute_query__" icon="execquery" label="Perform Query"
+ <action name="act__apply_filter__" icon="apply_filter" label="Apply Filter"
description="Apply the filter">
- form.execute_query()
+ form.apply_filter()
</action>
<!-- Transactions -->
@@ -161,18 +161,18 @@
('undelete_record', form.act__undelete_record__)):
action.enabled = (operation in possible_operations)
- if form.in_query_mode():
- form.act__init_query__.enabled = False
- form.act__copy_query__.enabled = False
- form.act__cancel_query__.enabled = True
- form.act__execute_query__.enabled = True
+ if form.in_filter_mode():
+ form.act__init_filter__.enabled = False
+ form.act__change_filter__.enabled = False
+ form.act__discard_filter__.enabled = True
+ form.act__apply_filter__.enabled = True
form.act__commit__.enabled = False
form.act__rollback__.enabled = False
else:
- form.act__init_query__.enabled = True
- form.act__copy_query__.enabled = True
- form.act__cancel_query__.enabled = False
- form.act__execute_query__.enabled = False
+ form.act__init_filter__.enabled = True
+ form.act__change_filter__.enabled = True
+ form.act__discard_filter__.enabled = False
+ form.act__apply_filter__.enabled = False
form.act__commit__.enabled = not form.is_saved()
form.act__rollback__.enabled = True
</trigger>
@@ -223,13 +223,13 @@
hotkey="F3"/>
</menu>
<menu name="__filter__" label="F&ilter">
- <menuitem name="__init_query__" action="act__init_query__"
+ <menuitem name="__init_filter__" action="act__init_filter__"
hotkey="F8"/>
- <menuitem name="__cancel_query__" action="act__cancel_query__"
+ <menuitem name="__change_filter__" action="act__change_filter__"
+ hotkey="SHIFT+F8"/>
+ <menuitem name="__discard_filter__" action="act__discard_filter__"
hotkey="SHIFT+F9"/>
- <menuitem name="__copy_query__" action="act__copy_query__"
- hotkey="SHIFT+F8"/>
- <menuitem name="__execute_query__" action="act__execute_query__"
+ <menuitem name="__apply_filter__" action="act__apply_filter__"
hotkey="F9"/>
</menu>
</menu>
@@ -252,9 +252,9 @@
<toolbutton name="__last_record__" action="act__last_record__"/>
<toolbutton name="__ask_record__" action="act__ask_record__"/>
<toolbutton name="__sep3__"/>
- <toolbutton name="__init_query__" action="act__init_query__"
- action_off="act__cancel_query__"/>
- <toolbutton name="__execute_query__" action="act__execute_query__"/>
+ <toolbutton name="__init_filter__" action="act__init_filter__"
+ action_off="act__discard_filter__"/>
+ <toolbutton name="__apply_filter__" action="act__apply_filter__"/>
<toolbutton name="__sep4__"/>
<toolbutton name="__printout__" action="act__printout__"/>
<toolbutton name="__sep5__"/>
Copied: trunk/gnue-forms/images/default/apply_filter-16x16.png (from rev 9482,
trunk/gnue-forms/images/default/execquery-16x16.png)
Copied: trunk/gnue-forms/images/default/apply_filter-24x24-gray.png (from rev
9482, trunk/gnue-forms/images/default/execquery-24x24-gray.png)
Copied: trunk/gnue-forms/images/default/apply_filter-24x24.bmp (from rev 9482,
trunk/gnue-forms/images/default/execquery-24x24.bmp)
Copied: trunk/gnue-forms/images/default/apply_filter-24x24.png (from rev 9482,
trunk/gnue-forms/images/default/execquery-24x24.png)
Copied: trunk/gnue-forms/images/default/deleterecord-16x16.png (from rev 9482,
trunk/gnue-forms/images/default/markfordelete-16x16.png)
Copied: trunk/gnue-forms/images/default/deleterecord-24x24-gray.png (from rev
9482, trunk/gnue-forms/images/default/markfordelete-24x24-gray.png)
Copied: trunk/gnue-forms/images/default/deleterecord-24x24.bmp (from rev 9482,
trunk/gnue-forms/images/default/markfordelete-24x24.bmp)
Copied: trunk/gnue-forms/images/default/deleterecord-24x24.png (from rev 9482,
trunk/gnue-forms/images/default/markfordelete-24x24.png)
Deleted: trunk/gnue-forms/images/default/enterquery-16x16.png
===================================================================
--- trunk/gnue-forms/images/default/enterquery-16x16.png 2007-04-11
09:57:21 UTC (rev 9489)
+++ trunk/gnue-forms/images/default/enterquery-16x16.png 2007-04-11
12:53:16 UTC (rev 9490)
@@ -1,5 +0,0 @@
-�PNG
-
-
IHDR ��a gAMA �� �a bKGD �C� address@hidden
�� 7� ��E-RZ�AZ�M(address@hidden"W�566*�Ծ�\.玎����ノ�������������y�����߿��:�W�L&#""Z��A����+�DB������Iwww�����nJ���g���$kgm-����a����P__'�Nf�D۶{��t���0��SS���:E�P
��ee%�Ѧ���l��m;Ww9VWW���
}}�Mfggx��5�T.�P,�d��y������v��n�B�B�@("�NaY�p���E,��4Mjj�F
�0 �R��� �h��/��} ���G C)��"��C����QJ
�+h�D�a::N���S�� uu���L��������� ����;.;Z��K�-F8"�Z���PUYͽ��1x����ik;��z;�;address@hidden
- LD�5��1�&�d�|>���{\�e-���;�eO)��NUW ���9:;;�z<ض
� ����\ �ʊ��]���2�ec�L&+%��
-���5 g��/��� /���>2[���- IEND�B`�
\ No newline at end of file
Deleted: trunk/gnue-forms/images/default/enterquery-24x24-gray.png
===================================================================
--- trunk/gnue-forms/images/default/enterquery-24x24-gray.png 2007-04-11
09:57:21 UTC (rev 9489)
+++ trunk/gnue-forms/images/default/enterquery-24x24-gray.png 2007-04-11
12:53:16 UTC (rev 9490)
@@ -1,4 +0,0 @@
-�PNG
-
-
IHDR �w=� gAMA �� �a bKGD �C�
address@hidden,q��W��,D��"+XZXna�.X����JHaa��&FX
)D���¢�A$Q'�����˰ټĸ�~pa�����s�7��������
��J �z]>���� ���V�n����n�T"
��:J)�/address@hidden&mAnnndaaA�����r}}-""�L���~���\N���%�JI�R�B�
�dR&&&�����{�|>/�LF���euu�I�ו`~~^]���^���dkkK۲-��rqq!���M���*���grr�B��eY���044��� ������~b�>�����P��e����eYX��i�h����C��R���>��z�~G���i�������\.cY�H���a����V�m�t]'
�F�������l���g��� ����L&i44��s�p�cE����#�xܕ����$
QJ�RJNOO���f��f�eY���Q,q �������r����v:�fjj
-�'�ϮM�B�b1��(�H�4�F�$
������^�q,��u�m[l��q�T*��ښ[*��T*i4rpp�R�����i��ax�^��0���lnn�>����T�w=��/(�`ff�����*�b�P(Ԧ��Z�������z1M������a
"� ��4>��"����j;�lp�V����UX>�����㥖����i�� �������~w|�z�
<������Lx IEND�B`�
\ No newline at end of file
Deleted: trunk/gnue-forms/images/default/enterquery-24x24.bmp
===================================================================
(Binary files differ)
Deleted: trunk/gnue-forms/images/default/enterquery-24x24.png
===================================================================
--- trunk/gnue-forms/images/default/enterquery-24x24.png 2007-04-11
09:57:21 UTC (rev 9489)
+++ trunk/gnue-forms/images/default/enterquery-24x24.png 2007-04-11
12:53:16 UTC (rev 9490)
@@ -1,11 +0,0 @@
-�PNG
-
-
IHDR �w=� gAMA �� �a bKGD � � ����� address@hidden
-8��� �IDATxڽ�_h\E�3��&���M�6b1J!�lc�6i�PK �56
-�>(�om}(��)���
-��+�-,�$`�`�M
}�$XHӤf����;3>l�M��6*x.�s�2|g��̙��?ڛ����Xm366f\�53��̍7Loo���0
ʁ.�h\�%��j5�L˲�B477� o�Y���A%pcL)j��<�D"address@hidden;D�Q��8�������˓��/u��8D" ������
�N| D���c���(���̅ ̮]�ƲbƲbfϞ��ܹ ͼ�����J��C
������1Ξ���Ǐq��۴�>���\�r�3g~������bzz��219ɭ?oq��(�������
-�%8y�s 裫k'6����� ����S��d.;G
����HK�Ӵ����7.B�)[�5Z)FF��e˳�_����e �%�uihx��G���B
-�m�$ address@hidden|
J�Z݇,address@hidden/\w �qI&�illbǎ��rx�G>�!�DkM��˲XU tw�%����WG��s��kY��QZ[�����h�Kͷ��TWUf�+ ��w���8
�ĥK� ���<G ����x����*}��[_ cX|��$RJa�&�c�v655ѻ��|�C���v���w����l��
R�"�e�d�"+E(" �����T��m��v��T��� *��ƾ���������/�&�bQR�����~� =={���8q� �}� W��D*��|>_��;^
�F#�B��N�`0H��{I�� �� �LOc�6Z�'�f�(��E@)�*
-!J1 �L&�h�Ɠ͛��r�KUUue$j,�1so�Zk�hc�B��X4J*e#���Y����� 2��
- �$�ш�h1���
-�����?�~m��w��q�?��� �r��Yx��%����10��*�� IEND�B`�
\ No newline at end of file
Deleted: trunk/gnue-forms/images/default/execquery-16x16.png
===================================================================
--- trunk/gnue-forms/images/default/execquery-16x16.png 2007-04-11 09:57:21 UTC
(rev 9489)
+++ trunk/gnue-forms/images/default/execquery-16x16.png 2007-04-11 12:53:16 UTC
(rev 9490)
@@ -1,5 +0,0 @@
-�PNG
-
-
IHDR ��a gAMA �� �a bKGD �C�
pHYs d_� �IDATxڅ��K�Q��{}g� ���q�бI METJK[��D�vQ�6 �h�
���E�($���Ր�D�W��� ��k���6������9��s��s`����
a�t:��}��졂m�^\\|�����Z[�U�_�M��D~�JM_��n����G�x��D�Q�+�q(address@hidden
L���7U(R���7M �u��J�O$]�C��#����I�0�! ~��C��#WQኔ2^RR����ys��E%�|����� ���
0��f_(�����Oww �/address@hidden >���wV�v�6��
co����kk��DrŮ�z%�����ʞ��]
-T� ! �R�Á���ﯤ>address@hidden&˧�g�\.������&XE��^�K��Gy�.�d�������9�i�7����%!���_�v������?��)QQ��}�����椩�
-`
XӀ��ѱ�5��:;ڕ]י��WJ12> ���x/m6��~ﾶ ?� !l�|~Xr���
���y�e����쏟 ˆ�� � ���I c
���|address@hidden@0ٶ ���>+�[/��k��D%�2�FM IEND�B`�
\ No newline at end of file
Deleted: trunk/gnue-forms/images/default/execquery-24x24-gray.png
===================================================================
--- trunk/gnue-forms/images/default/execquery-24x24-gray.png 2007-04-11
09:57:21 UTC (rev 9489)
+++ trunk/gnue-forms/images/default/execquery-24x24-gray.png 2007-04-11
12:53:16 UTC (rev 9490)
@@ -1,8 +0,0 @@
-�PNG
-
-
IHDR �w=� gAMA �� �a bKGD �C�
pHYs d_� �IDATxڥ�OHcW�7�L��#�X� ��+7��
-�Ec��袼v�JW.[�+-HY���!�BD��B�h��F�Pi���h^�Ljn�/}�
�����r������]h #���4�i�c�!`��0'.�J�&�ρG���ﺀ��R�A�����l\__377�zgX[ ��\.NNND$A���
|
-��k���Ҫ")emttTd2p�\���0;;address@hidden ������ٙ��rbkkK
-���J�[E���Cpo�i�055UmJ�xO�_IfU��Vf�>hJ� ��"�P�RJ��
P n�����UaW � R�������%P�4MnooKM�$P���� Ёa"�=
���� 8>::zC�ut]o�1��a��I��D�Q�@ address@hidden e�'5a��
address@hidden>
C� �4�
-����"��������X,address@hidden
�J���n�އ��hr;�[��;? �www�x<��n��lnn������-^�9��4̮��}LH) �������ň�b�������f�
u�����_�ߍ t`pB�X__grr�U4E�u���YXX(address@hidden,��\^^6����4�d���i
�� �H��'�8u��f����gp���kտ��'�HȨ�0�v�xx��� address@hidden
�:address@hidden o��Bi�o/�%{��V IEND�B`�
\ No newline at end of file
Deleted: trunk/gnue-forms/images/default/execquery-24x24.bmp
===================================================================
(Binary files differ)
Deleted: trunk/gnue-forms/images/default/execquery-24x24.png
===================================================================
--- trunk/gnue-forms/images/default/execquery-24x24.png 2007-04-11 09:57:21 UTC
(rev 9489)
+++ trunk/gnue-forms/images/default/execquery-24x24.png 2007-04-11 12:53:16 UTC
(rev 9490)
@@ -1,4 +0,0 @@
-�PNG
-
-
IHDR �w=� gAMA �� �a bKGD � � �����
pHYs ��~� tIME� 7 �i �IDATxڥ�]lSe��]��&S3�$&F�(A"e
b�+��;cf���h"��7.�
!~ě%�#f)address@hidden J�gE@:�e�r�YI$8 E�'address@hidden
|$��j �|
����n�*����ݠ��� ���1��J����%�� ��W�u����U�Kuu5�/]��O?7���!eZ\
�(�� �cwWTd�Ѩ���V.�_0�U�$���>#���`Ռ\�;�oM��6 �9+�dvUVk�=����� �� �ᡨ, ��$0'��<��O%���(G��b���3��k}Ʒ��1��>P�vԐ���DQV �NٹN��tsS��'����gggp:K�����5Ԁg�~`r�4
��L ����/address@hidden
-1>~�pGM?5�ݸ M����J���Y��a�cpY����}@,address@hidden
���/ ��y��u �w��?r���32ghh��~h���n�X)��>�9z������Oly���73=5Iۯ"��9y�G 8� #��iv��N`[�_����Q\�2z��������Db����U�/� ��$pR f�zP��)?��͟��p���� ]��F$�ˉ/��'&�h
,=Ձ�b��j�6��\ ��m��ۧ��]yWt���4�B
������j �'�=�_���1�ц��K �c��� ��V�}�E����JԒ��pY��Y�bpk�C�X � �� a��nu�bx�����K�j2*<bt.��q`J�t
`�QrV:�r
�!���0Sȁ�;�fv�$Bґ� IEND�B`�
\ No newline at end of file
Copied: trunk/gnue-forms/images/default/init_filter-16x16.png (from rev 9482,
trunk/gnue-forms/images/default/enterquery-16x16.png)
Copied: trunk/gnue-forms/images/default/init_filter-24x24-gray.png (from rev
9482, trunk/gnue-forms/images/default/enterquery-24x24-gray.png)
Copied: trunk/gnue-forms/images/default/init_filter-24x24.bmp (from rev 9482,
trunk/gnue-forms/images/default/enterquery-24x24.bmp)
Copied: trunk/gnue-forms/images/default/init_filter-24x24.png (from rev 9482,
trunk/gnue-forms/images/default/enterquery-24x24.png)
Deleted: trunk/gnue-forms/images/default/markfordelete-16x16.png
===================================================================
--- trunk/gnue-forms/images/default/markfordelete-16x16.png 2007-04-11
09:57:21 UTC (rev 9489)
+++ trunk/gnue-forms/images/default/markfordelete-16x16.png 2007-04-11
12:53:16 UTC (rev 9490)
@@ -1,4 +0,0 @@
-�PNG
-
-
IHDR ��a gAMA �� �a bKGD �C�
pHYs �#�u �IDATx�U�MoU��{=���x�8�� address@hidden DM!�
���Llg<���㙹�NH�tg�>address@hidden&��o�uc�Ν���_�0
-8����^�Ï?�-�p���ǣ��h����ڗ�~���b!~ppD�a�g�"
#��V�VWi�O1����'�� >z躽��a�4 �|��G nmm�� d,���
}� ���N�XYY&oN��r�ح�U9:j�<�u]��t�H2�d�j���2�n�t�-�>�x �4�� �����CkE�_ymy��|�J�U�z�( ��w�� �f�z��������� ���o{��k,
� �%r�� ��m�
\l����ƶ[�}pB��=F��ok���W���������
2)@H:N����z�طyR{���j9��9 ��1�g������V�qPJ�oY�
address@hidden �J���QJ1 �/address@hidden)��-�,address@hidden/27gb��d�SH)�R
address@hidden)
$�0�\���r�A#������3�w��2��0ꜞvׇóy��'�"address@hidden:��]*nF
È1 �A�7��7J���� {����a� ��� IEND�B`�
\ No newline at end of file
Deleted: trunk/gnue-forms/images/default/markfordelete-24x24-gray.png
===================================================================
--- trunk/gnue-forms/images/default/markfordelete-24x24-gray.png
2007-04-11 09:57:21 UTC (rev 9489)
+++ trunk/gnue-forms/images/default/markfordelete-24x24-gray.png
2007-04-11 12:53:16 UTC (rev 9490)
@@ -1,13 +0,0 @@
-�PNG
-
-
IHDR �w=� gAMA �� �a bKGD �C�
pHYs �#�u 7IDATxڥ�OH g�����qw]ǚ�`LBY
�U�� ��T҂5��B0Gb.���$�B.^�!���E�
-�V^$Q0�euuGY����qg� �٬Qk�>��͟��y��}���������o��XLLNN�Z|��A����"/���
-������АX__�a{{[<y�D����V� ��)�d�w������r�
address@hidden �N��z�LOO���
address@hidden:::p�\���a����x����O��`xx���
è���ގ���A4Mcmm���]n߾���,--q��=��4 ���E(�"����O�4�e�\.G"� �P(�N��~�:B�444�H$x��- >��=� `qq�P(D4�
address@hidden"address@hidden"�H0??���g��
- �r���㴴�\8jMMM����m������D�u�s�*���;J��L�\.G$AQ�~?GGG��e2� �����q���B
I�,���)�Jg ��322B�X$����z1MI�(
-�AL�����|>����A2� �x���4Mc|| ���
-����eoo�T*�����n� �\�B����>address@hidden(�t��G4���第��F9<<$�L���0MUU/PI�PU��Oss3��S.�
�Ô�e �i��x�T*��j�-H��M�&�P�o nݺE?^�EQ�q�F5�p8�����P(�իW?���
-d>�I d��S3��5z{{���BUU�ܹ��i8 0�c���D���y�e~�mWP(�;�#_�T>G� �/ˢ��������?�ڶaˢ"�8���������C�P�_�|�$ᰔ�����1
�`ff�4���$�H �2N穉&��S�TH�R���W� ~��0%�(|�j�
-��u���v4M��� address@hidden'�^t+ ��oE�� k� IEND�B`�
\ No newline at end of file
Deleted: trunk/gnue-forms/images/default/markfordelete-24x24.bmp
===================================================================
(Binary files differ)
Deleted: trunk/gnue-forms/images/default/markfordelete-24x24.png
===================================================================
--- trunk/gnue-forms/images/default/markfordelete-24x24.png 2007-04-11
09:57:21 UTC (rev 9489)
+++ trunk/gnue-forms/images/default/markfordelete-24x24.png 2007-04-11
12:53:16 UTC (rev 9490)
@@ -1,6 +0,0 @@
-�PNG
-
-
IHDR �w=� gAMA �� �a bKGD � � �����
pHYs d_� tIME� )�E�� �IDATxڥ�[lu�3���ζ�{˭��� D�
h���1>����l�[�%��
F�b�c)Q�I �)jw��k���ٝ�ٙ�n�Z�x��33��?�w�����5@,���?�`x���bhhH��.����}��8s��8p��<�p��e�Y��,�ط�e�~�u�Om�bP�֬n��M��2(�ݮ�_ ;5�������Z�Z_ N�����C8 2��4�\�FPU�r��QFA8���}���Dc���(hE�4� z �E`t��Q�wO���p8L���ƦV2�<n��?^�Ν
$ ��r�� LL���餫��������������{�$`Æg0M
�ׇϧ�Do/�Pxi������GH%3�Z�I(��k��c�6��4�K��t��� �`^"19q���.��'A�` �h
�SA��H�#HR�(������
�����q�ޝ����Z�L�x�,��8�v�F�elۤ��B�5|>/�� �e�Hƨ����io[�lN#�s��
�bi�)���Q�i����ٹ�:U���
�<o���,�;�a�K�rY������+D�q��B�� ��')�M� E =�l!����x���,���ŪLŢd�9l!�%
Y�)� ̲��\�[�?<address@hidden(J=�m!I����.�]�PHS����~
-�"S��n��J����� �.��� �.}O2i�ɜbpp���UE��U)�J�Ft*������(^_; }� �����zp� ġCo�J�p:��J��40::��� Ǐ _���M}tv��L����9w��1�
-�^N����}x<n�����r��;�Y����{�ys������`˲ ����E��^dI"address@hidden
��WG���R�m�a�H���!ת"address@hidden&�E���T�`�\% ,��$; �. >�E
x�R �z �V`�zN�Y�A��K|>�Fմ�=�P�H�E&�R�Ǻ_].]7j's~��\e� � =�-�����l�Ht��x
-�!�p.�C�
l�&��b�N�<
p(פ%jU� �X�]���GU�%z{א�̒��0Ϳ����O��{�0��,address@hidden
\ No newline at end of file
Copied: trunk/gnue-forms/images/gnome/apply_filter-16x16.png (from rev 9482,
trunk/gnue-forms/images/gnome/execquery-16x16.png)
Copied: trunk/gnue-forms/images/gnome/apply_filter-24x24.png (from rev 9482,
trunk/gnue-forms/images/gnome/execquery-24x24.png)
Copied: trunk/gnue-forms/images/gnome/apply_filter-32x32.png (from rev 9482,
trunk/gnue-forms/images/gnome/execquery-32x32.png)
Copied: trunk/gnue-forms/images/gnome/deleterecord-16x16.png (from rev 9482,
trunk/gnue-forms/images/gnome/markfordelete-16x16.png)
Copied: trunk/gnue-forms/images/gnome/deleterecord-24x24.png (from rev 9482,
trunk/gnue-forms/images/gnome/markfordelete-24x24.png)
Copied: trunk/gnue-forms/images/gnome/deleterecord-32x32.png (from rev 9482,
trunk/gnue-forms/images/gnome/markfordelete-32x32.png)
Deleted: trunk/gnue-forms/images/gnome/enterquery-16x16.png
===================================================================
(Binary files differ)
Deleted: trunk/gnue-forms/images/gnome/enterquery-24x24.png
===================================================================
(Binary files differ)
Deleted: trunk/gnue-forms/images/gnome/enterquery-32x32x.png
===================================================================
(Binary files differ)
Deleted: trunk/gnue-forms/images/gnome/execquery-16x16.png
===================================================================
(Binary files differ)
Deleted: trunk/gnue-forms/images/gnome/execquery-24x24.png
===================================================================
(Binary files differ)
Deleted: trunk/gnue-forms/images/gnome/execquery-32x32.png
===================================================================
(Binary files differ)
Copied: trunk/gnue-forms/images/gnome/init_filter-16x16.png (from rev 9482,
trunk/gnue-forms/images/gnome/enterquery-16x16.png)
Copied: trunk/gnue-forms/images/gnome/init_filter-24x24.png (from rev 9482,
trunk/gnue-forms/images/gnome/enterquery-24x24.png)
Copied: trunk/gnue-forms/images/gnome/init_filter-32x32.png (from rev 9482,
trunk/gnue-forms/images/gnome/enterquery-32x32x.png)
Deleted: trunk/gnue-forms/images/gnome/markfordelete-16x16.png
===================================================================
(Binary files differ)
Deleted: trunk/gnue-forms/images/gnome/markfordelete-24x24.png
===================================================================
(Binary files differ)
Deleted: trunk/gnue-forms/images/gnome/markfordelete-32x32.png
===================================================================
(Binary files differ)
Copied: trunk/gnue-forms/images/kde3/apply_filter-16x16.png (from rev 9482,
trunk/gnue-forms/images/kde3/execquery-16x16.png)
Copied: trunk/gnue-forms/images/kde3/apply_filter-24x24.png (from rev 9482,
trunk/gnue-forms/images/kde3/execquery-24x24.png)
Copied: trunk/gnue-forms/images/kde3/apply_filter-32x32.png (from rev 9482,
trunk/gnue-forms/images/kde3/execquery-32x32.png)
Copied: trunk/gnue-forms/images/kde3/deleterecord-16x16.png (from rev 9482,
trunk/gnue-forms/images/kde3/markfordelete-16x16.png)
Copied: trunk/gnue-forms/images/kde3/deleterecord-24x24.png (from rev 9482,
trunk/gnue-forms/images/kde3/markfordelete-24x24.png)
Copied: trunk/gnue-forms/images/kde3/deleterecord-32x32.png (from rev 9482,
trunk/gnue-forms/images/kde3/markfordelete-32x32.png)
Deleted: trunk/gnue-forms/images/kde3/enterquery-16x16.png
===================================================================
(Binary files differ)
Deleted: trunk/gnue-forms/images/kde3/enterquery-24x24.png
===================================================================
(Binary files differ)
Deleted: trunk/gnue-forms/images/kde3/enterquery-32x32.png
===================================================================
(Binary files differ)
Deleted: trunk/gnue-forms/images/kde3/execquery-16x16.png
===================================================================
(Binary files differ)
Deleted: trunk/gnue-forms/images/kde3/execquery-24x24.png
===================================================================
(Binary files differ)
Deleted: trunk/gnue-forms/images/kde3/execquery-32x32.png
===================================================================
(Binary files differ)
Copied: trunk/gnue-forms/images/kde3/init_filter-16x16.png (from rev 9482,
trunk/gnue-forms/images/kde3/enterquery-16x16.png)
Copied: trunk/gnue-forms/images/kde3/init_filter-24x24.png (from rev 9482,
trunk/gnue-forms/images/kde3/enterquery-24x24.png)
Copied: trunk/gnue-forms/images/kde3/init_filter-32x32.png (from rev 9482,
trunk/gnue-forms/images/kde3/enterquery-32x32.png)
Deleted: trunk/gnue-forms/images/kde3/markfordelete-16x16.png
===================================================================
(Binary files differ)
Deleted: trunk/gnue-forms/images/kde3/markfordelete-24x24.png
===================================================================
(Binary files differ)
Deleted: trunk/gnue-forms/images/kde3/markfordelete-32x32.png
===================================================================
(Binary files differ)
Modified: trunk/gnue-forms/src/GFForm.py
===================================================================
--- trunk/gnue-forms/src/GFForm.py 2007-04-11 09:57:21 UTC (rev 9489)
+++ trunk/gnue-forms/src/GFForm.py 2007-04-11 12:53:16 UTC (rev 9490)
@@ -106,8 +106,8 @@
self._currentBlock = None
self._currentEntry = None
- # Is the form in query mode?
- self.__in_query_mode = False
+ # Is the form in filter mode?
+ self.__in_filter_mode = False
# Set to true while focus is moving so a record change in
# focusin/focusout triggers doesn't run endEditing and beginEditing
@@ -170,7 +170,7 @@
'select_files': {'function': self.select_files},
'select_dir': {'function': self.select_dir},
- # User feedback - depreciated
+ # User feedback - deprecated
'setStatusText': {
'function': self.status_message,
'global': True},
@@ -208,13 +208,20 @@
'delete_record': {'function': self.delete_record},
'undelete_record': {'function': self.undelete_record},
- # Queries
- 'init_query': {'function': self.init_query},
- 'copy_query': {'function': self.copy_query},
- 'cancel_query': {'function': self.cancel_query},
- 'execute_query': {'function': self.execute_query},
- 'in_query_mode': {'function': self.in_query_mode},
+ # Filter
+ 'init_filter': {'function': self.init_filter},
+ 'change_filter': {'function': self.change_filter},
+ 'discard_filter': {'function': self.discard_filter},
+ 'apply_filter': {'function': self.apply_filter},
+ 'in_filter_mode': {'function': self.in_filter_mode},
+ # Filter - deprecated
+ 'init_query': {'function': self.init_filter},
+ 'copy_query': {'function': self.change_filter},
+ 'cancel_query': {'function': self.discard_filter},
+ 'execute_query': {'function': self.apply_filter},
+ 'in_query_mode': {'function': self.in_filter_mode},
+
# Transactions
'commit': {'function': self.commit, 'global': True},
'rollback': {'function': self.rollback, 'global': True},
@@ -1112,7 +1119,7 @@
Returns the editing mode of the current record
@return: 'query', 'new' or 'edit'
"""
- if self.__in_query_mode:
+ if self.__in_filter_mode:
return 'query'
elif self._currentBlock is not None \
and self._currentBlock.get_record_status() \
@@ -1389,7 +1396,7 @@
# Queries
# -------------------------------------------------------------------------
- def init_query(self):
+ def init_filter(self):
"""
Enters the form into Query mode.
"""
@@ -1398,8 +1405,8 @@
# We *must* run _focus_out() here: letting the user leave an entry
# with an invalid value here would make it possible to enter an
- # invalid value, switch to query mode, move the focus somewhere
- # else, cancel the query (and so getting back the original result
+ # invalid value, switch to filter mode, move the focus somewhere
+ # else, cancel the filter (and so getting back the original result
# set) and then saving the unchecked data.
# The _focus_out() can run outside the try-except block because it
# already does the beginEditing in case of an exception.
@@ -1408,26 +1415,26 @@
try:
if not self._must_save():
- # We must refresh the UI events now as otherwise the query
- # button will stick in.
+ # We must refresh the UI events now as otherwise the "init
+ # filter" button will stick in.
self.refreshUIEvents()
self.beginEditing()
return
- self.__in_query_mode = True
+ self.__in_filter_mode = True
for block in self._logic._blockList:
- block.init_query()
+ block.init_filter()
- self.status_message(u_('Enter your query criteria.'))
+ self.status_message(u_('Enter your filter criteria.'))
finally:
self.beginEditing()
# -------------------------------------------------------------------------
- def copy_query(self):
+ def change_filter(self):
"""
- Copies the Query, ie brings back conditions from the last query.
+ Copies the Query, ie brings back conditions from the last filter.
"""
# self.endEditing() # happens via focus_out()
@@ -1441,18 +1448,18 @@
self.beginEditing()
return
- self.__in_query_mode = True
+ self.__in_filter_mode = True
for block in self._logic._blockList:
- block.copy_query()
+ block.change_filter()
- self.status_message(u_('Enter your query criteria.'))
+ self.status_message(u_('Enter your filter criteria.'))
finally:
self.beginEditing()
# -------------------------------------------------------------------------
- def cancel_query(self):
+ def discard_filter(self):
"""
Cancels Query mode.
"""
@@ -1460,10 +1467,10 @@
self.endEditing()
try:
- self.__in_query_mode = False
+ self.__in_filter_mode = False
for block in self._logic._blockList:
- block.cancel_query()
+ block.discard_filter()
self.status_message(u_('Query canceled.'))
finally:
@@ -1475,9 +1482,9 @@
# -------------------------------------------------------------------------
- def execute_query(self):
+ def apply_filter(self):
"""
- Runs the query.
+ Applies the filter.
"""
if self._currentBlock is None:
return
@@ -1490,9 +1497,9 @@
self.__rollback_all_connections()
try:
- self.__in_query_mode = False
+ self.__in_filter_mode = False
- self._currentBlock.execute_query()
+ self._currentBlock.apply_filter()
except DBError:
self.__rollback_all_connections()
@@ -1511,11 +1518,11 @@
# -------------------------------------------------------------------------
- def in_query_mode(self):
+ def in_filter_mode(self):
"""
- Return True if the form is in query mode.
+ Return True if the form is in filter mode.
"""
- return self.__in_query_mode
+ return self.__in_filter_mode
# -------------------------------------------------------------------------
@@ -1811,15 +1818,15 @@
('new_record', 'NEWRECORD'),
('delete_record', 'MARKFORDELETE'),
('undelete_record', 'UNDELETE'),
- ('init_query', 'ENTERQUERY'),
- ('cancel_query', 'CANCELQUERY'),
- ('execute_query', 'EXECQUERY')):
+ ('init_filter', 'ENTERQUERY'),
+ ('discard_filter', 'CANCELQUERY'),
+ ('apply_filter', 'EXECQUERY')):
if operation in possible_operations:
dispatchEvent('can' + event)
else:
dispatchEvent('cannot' + event)
- if self.in_query_mode():
+ if self.in_filter_mode():
dispatchEvent('cannotCOMMIT')
dispatchEvent('cannotROLLBACK')
else:
Modified: trunk/gnue-forms/src/GFObjects/GFBlock.py
===================================================================
--- trunk/gnue-forms/src/GFObjects/GFBlock.py 2007-04-11 09:57:21 UTC (rev
9489)
+++ trunk/gnue-forms/src/GFObjects/GFBlock.py 2007-04-11 12:53:16 UTC (rev
9490)
@@ -45,9 +45,10 @@
A block covers all aspects of a form's connection to a data source.
- Blocks can be filled with data by using the L{init_query}, L{copy_query},
- and L{execute_query} methods or in a single step with the L{query} method.
- The L{clear} method populates the block with a single empty record.
+ Blocks can be filled with data by using the L{init_filter}, L{copy_filter},
+ and L{execute_filter} methods or in a single step with the L{set_filter}
+ method. The L{clear} method populates the block with a single empty
+ record.
Within the result set, blocks maintain a pointer to a current record which
can be moved around with the L{first_record}, L{prev_record},
@@ -100,7 +101,7 @@
# Current mode of the block. Can be 'normal', 'commit' (during commit
# triggers), 'init' (during record initialization triggers), or 'query'
- # (if the form is in query mode).
+ # (if the form is in filter mode).
self.mode = 'normal'
# The underlying resultset.
@@ -115,13 +116,13 @@
# The total number of records.
self.__record_count = 0
- # The default query criteria, defined through the fields.
+ # The default filter criteria, defined through the fields.
self._queryDefaults = {} # FIXME: make private!
- # The current query criteria.
+ # The current filter criteria.
self.__query_values = {}
- # The criteria of the last query that was executed.
+ # The criteria of the last filter that was executed.
self.__last_query_values = {}
# Flag set to True while a query is running.
@@ -168,7 +169,8 @@
self._triggerGlobal = True
self._triggerFunctions = {
# Query
- 'query': {'function': self.query},
+ 'set_filter': {'function': self.set_filter},
+ 'query': {'function': self.set_filter}, # Deprecated!
'clear': {'function': self.clear},
# Record navigation
@@ -508,19 +510,19 @@
return
if self.startup == 'full':
- self.query()
+ self.set_filter()
elif self.startup == 'empty':
self.clear()
# -------------------------------------------------------------------------
- def init_query(self):
+ def init_filter(self):
"""
- Set the block into query mode.
+ Set the block into filter mode.
From this point on, changes to fields within this block will be
- understood as query criteria. Use L{execute_query} to run the query and
- populate the block with its result.
+ understood as filter criteria. Use L{apply_filter} to apply the filter
+ and populate the block with all records matching the criteria.
"""
self.mode = 'query'
@@ -532,14 +534,14 @@
# -------------------------------------------------------------------------
- def copy_query(self):
+ def change_filter(self):
"""
- Set the block into query mode and initialize the query criteria with
- the last executed query.
+ Set the block into filter mode and initialize the filter criteria with
+ the last executed filter.
From this point on, changes to fields within this block will be
- understood as query criteria. Use L{execute_query} to run the query and
- populate the block with its result.
+ understood as filter criteria. Use L{apply_filter} to apply the filter
+ and populate the block with all records matching the criteria.
"""
self.mode = 'query'
@@ -551,12 +553,12 @@
# -------------------------------------------------------------------------
- def cancel_query(self):
+ def discard_filter(self):
"""
- Reset the block from query mode back to data browsing mode without
- executing a query.
+ Reset the block from filter mode back to data browsing mode without
+ applying the new filter.
- The result set that was active before switching to query mode remains
+ The result set that was active before switching to filter mode remains
active.
"""
@@ -565,18 +567,18 @@
# -------------------------------------------------------------------------
- def execute_query(self):
+ def apply_filter(self):
"""
- Execute a query based on query criteria defined through field values.
+ Apply the filter defined through the field values.
- The block switches back from query mode to data browsing mode and is
- populated with the result of the query.
+ The block switches back from filter mode to data browsing mode and is
+ populated with all records that match the filter criteria.
"""
# Set the maxList to a single master block as a placeholder.
maxList = [self.__get_top_master_block()]
- # Find the longest master/detail chain that contains query values. This
+ # Find the longest master/detail chain that contains filter values.
This
# will become the chain that is queried.
for block in self._logic._blockList:
if block.__query_values.keys():
@@ -617,7 +619,7 @@
for block in self._logic._blockList:
block.mode = 'normal'
- # FIXME: This leaves blocks not affected from this query unupdated
+ # FIXME: This leaves blocks not affected from this filter unupdated
self.__in_query = True
try:
rootBlock._dataSourceLink.createResultSet(conditions)
@@ -631,21 +633,21 @@
# -------------------------------------------------------------------------
- def query(self, *args, **params):
+ def set_filter(self, *args, **params):
"""
- Execute a query and populate the block with its result.
+ Set new filter criteria for this block.
@param args: zero, one or more condition trees, can be in dictionary
format, in prefix notation, or GCondition object trees. Field names
in these conditions are passed directly to the backend, i.e. they
are database column names. This is useful to create queries of
arbitary complexity.
- @param params: simple query values in the notation C{fieldname=value}
+ @param params: simple filter values in the notation C{fieldname=value}
where the fieldname is the name of a GFField. This is useful to
- create straightforward simple queries where the database columns
+ create straightforward simple filters where the database columns
included in the condition have their GFField assigned. This also
works for lookup fields.
- @returns: True if the query was executed, False if the user aborted
+ @returns: True if the filter was applied, False if the user aborted
when being asked whether or not to save changes.
"""
@@ -901,11 +903,11 @@
result = []
if self.mode == 'query':
- result.append('cancel_query')
- result.append('execute_query')
+ result.append('discard_filter')
+ result.append('apply_filter')
else:
- result.append('init_query')
- result.append('copy_query')
+ result.append('init_filter')
+ result.append('change_filter')
if self._dataSourceLink.type != 'unbound':
rs = self.__resultset
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [gnue] r9490 - in trunk/gnue-forms: defaults defaults/default images/default images/gnome images/kde3 src src/GFObjects,
reinhard <=