Merging GUI_SRC module with the BR_V5_DEV branch.

diff --git a/src/STD/resources/STD_images.ts b/src/STD/resources/STD_images.ts
index 90fe0caa349c961e922d3f58141131d23267aad6..22597f0dc8433031106507da829d8187570215e0 100644 (file)
--- a/src/STD/resources/STD_images.ts
+++ b/src/STD/resources/STD_images.ts
@@ -33,10 +33,6 @@
         <source>ICON_EDIT_COPY</source>
         <translation>copy.png</translation>
     </message>
-    <message>
-        <source>ICON_APP_DEFAULTICON</source>
-        <translation>default.png</translation>
-    </message>
     <message>
         <source>ICON_FILE_SAVE</source>
         <translation>save.png</translation>
@@ -50,20 +46,20 @@
         <translation>htile.png</translation>
     </message>
     <message>
-        <source>ICON_APP_EDIT_REDO</source>
+        <source>ICON_EDIT_REDO</source>
         <translation>redo.png</translation>
     </message>
     <message>
-        <source>ICON_APP_EDIT_UNDO</source>
+        <source>ICON_EDIT_UNDO</source>
         <translation>undo.png</translation>
     </message>
     <message>
-        <source>ICON_DESK_WINDOW_VSPLIT</source>
-        <translation>vtile.png</translation>
+        <source>ICON_EDIT_DELETE</source>
+        <translation>delete.png</translation>
     </message>
     <message>
-        <source>ICON_DESK_DEFAULTICON</source>
-        <translation>default.png</translation>
+        <source>ICON_DESK_WINDOW_VSPLIT</source>
+        <translation>vtile.png</translation>
     </message>
     <message>
         <source>ICON_DESK_WINDOW_HTILE</source>
@@ -82,15 +78,4 @@
         <translation>close.png</translation>
     </message>
 </context>
-<context>
-    <name>SUIT_ViewPort</name>
-    <message>
-        <source>ICON_CURSOR_ZOOM</source>
-        <translation>cursor_zoom.png</translation>
-    </message>
-    <message>
-        <source>ICON_CURSOR_ROTATE</source>
-        <translation>cursor_rotate.png</translation>
-    </message>
-</context>
 </TS>

diff --git a/src/STD/resources/STD_msg_en.ts b/src/STD/resources/STD_msg_en.ts
index 4c83de1dd5dbcbff8fe736f5de6f9781c70abda7..e619c05e17194cb48d671b6646fa13a0d1c43405 100644 (file)
--- a/src/STD/resources/STD_msg_en.ts
+++ b/src/STD/resources/STD_msg_en.ts
@@ -1,467 +1,467 @@
-<!DOCTYPE TS><TS>\r
-<context>\r
-    <name>@default</name>\r
-    <message>\r
-        <source>TOT_DESK_EDIT_CUT</source>\r
-        <translation>Cut</translation>\r
-    </message>\r
-    <message>\r
-        <source>PRP_DESK_EDIT_CUT</source>\r
-        <translation>Cuts the selection and puts it to the Clipboard</translation>\r
-    </message>\r
-    <message>\r
-        <source>MEN_DESK_EDIT_CUT</source>\r
-        <translation>Cu&amp;t</translation>\r
-    </message>\r
-    <message>\r
-        <source>ERR_APP_NOAPP</source>\r
-        <translation>No application</translation>\r
-    </message>\r
-    <message>\r
-        <source>MEN_DESK_WINDOW</source>\r
-        <translation>&amp;Window</translation>\r
-    </message>\r
-    <message>\r
-        <source>TOT_DESK_EDIT_COPY</source>\r
-        <translation>Copy</translation>\r
-    </message>\r
-    <message>\r
-        <source>MEN_DESK_WINDOW_CASCADE</source>\r
-        <translation>&amp;Cascade</translation>\r
-    </message>\r
-    <message>\r
-        <source>PRP_DESK_EDIT_COPY</source>\r
-        <translation>Copy the selection to the Clipboard</translation>\r
-    </message>\r
-    <message>\r
-        <source>PRP_DESK_WINDOW_CASCADE</source>\r
-        <translation>Arranges the windows as overlapping tiles</translation>\r
-    </message>\r
-    <message>\r
-        <source>TOT_DESK_FILE_SAVEAS</source>\r
-        <translation>Save document as...</translation>\r
-    </message>\r
-    <message>\r
-        <source>MEN_DESK_EDIT_COPY</source>\r
-        <translation>&amp;Copy</translation>\r
-    </message>\r
-    <message>\r
-        <source>MSG_CANT_SAVE</source>\r
-        <translation>Can&apos;t save file &quot;%1&quot;.</translation>\r
-    </message>\r
-    <message>\r
-        <source>INF_DESK_TOOLBAR_STANDARD</source>\r
-        <translation>Standard</translation>\r
-    </message>\r
-    <message>\r
-        <source>ALL_FILES</source>\r
-        <translation>All Files (*.*)</translation>\r
-    </message>\r
-    <message>\r
-        <source>DESK_DEFAULTTITLE</source>\r
-        <translation>Qt Application Desktop</translation>\r
-    </message>\r
-    <message>\r
-        <source>QUE_DESK_EXIT</source>\r
-        <translation>Are you sure you want to quit?</translation>\r
-    </message>\r
-    <message>\r
-        <source>INF_INFO</source>\r
-        <translation>Information</translation>\r
-    </message>\r
-    <message>\r
-        <source>ERR_DOC_UNKNOWNTYPE_OPEN</source>\r
-        <translation>You are trying to open a document of an unknown type\r
-( %1 )</translation>\r
-    </message>\r
-    <message>\r
-        <source>ERR_DOC_UNKNOWNTYPE_SAVE</source>\r
-        <translation>You are trying to save this document under an unknown type\r
-( %1 )</translation>\r
-    </message>\r
-    <message>\r
-        <source>TOT_DESK_NEWWINDOW</source>\r
-        <translation>Create new Window</translation>\r
-    </message>\r
-    <message>\r
-        <source>BUT_CANCEL</source>\r
-        <translation>&amp;Cancel</translation>\r
-    </message>\r
-    <message>\r
-        <source>MEN_DESK_HELP_ABOUT</source>\r
-        <translation>&amp;About...</translation>\r
-    </message>\r
-    <message>\r
-        <source>PRP_DESK_NEWWINDOW</source>\r
-        <translation>Create new Window</translation>\r
-    </message>\r
-    <message>\r
-        <source>MEN_DESK_VIEW_STATUSBAR</source>\r
-        <translation>&amp;Status Bar</translation>\r
-    </message>\r
-    <message>\r
-        <source>MEN_DESK_NEWWINDOW</source>\r
-        <translation>&amp;New Window</translation>\r
-    </message>\r
-    <message>\r
-        <source>PRP_DESK_VIEW_STATUSBAR</source>\r
-        <translation>Toggles status bar view on/off</translation>\r
-    </message>\r
-    <message>\r
-        <source>ERR_DOC_DIRWITHNAMEEXIST_SAVE</source>\r
-        <translation>Can not save file %1.\r
-Directory with this name exist on disc. Try to use another name</translation>\r
-    </message>\r
-    <message>\r
-        <source>BUT_NO</source>\r
-        <translation>&amp;No</translation>\r
-    </message>\r
-    <message>\r
-        <source>BUT_OK</source>\r
-        <translation>&amp;Ok</translation>\r
-    </message>\r
-    <message>\r
-        <source>FILTER_FILES</source>\r
-        <translation>%1 Files (%2)</translation>\r
-    </message>\r
-    <message>\r
-        <source>PRP_DESK_WINDOW_ACTIVATE</source>\r
-        <translation>Activates this window</translation>\r
-    </message>\r
-    <message>\r
-        <source>TOT_DESK_FILE_PRINT</source>\r
-        <translation>Print document</translation>\r
-    </message>\r
-    <message>\r
-        <source>TOT_DESK_FILE_CLOSE</source>\r
-        <translation>Close document</translation>\r
-    </message>\r
-    <message>\r
-        <source>TOT_DESK_FILE_NEW</source>\r
-        <translation>New document</translation>\r
-    </message>\r
-    <message>\r
-        <source>PRP_DESK_FILE_NEW</source>\r
-        <translation>Creates a new document</translation>\r
-    </message>\r
-    <message>\r
-        <source>PRP_DESK_FILE_MRU</source>\r
-        <translation>Opens a document</translation>\r
-    </message>\r
-    <message>\r
-        <source>MEN_DESK_FILE_NEW</source>\r
-        <translation>&amp;New</translation>\r
-    </message>\r
-    <message>\r
-        <source>MEN_DESK_FILE_MRU</source>\r
-        <translation>Recent &amp;Files</translation>\r
-    </message>\r
-    <message>\r
-        <source>TOT_DESK_EDIT_PASTE</source>\r
-        <translation>Paste</translation>\r
-    </message>\r
-    <message>\r
-        <source>MEN_DESK_VIEW_DOCKWINDOWS</source>\r
-        <translation>W&amp;indows</translation>\r
-    </message>\r
-    <message>\r
-        <source>BUT_YES</source>\r
-        <translation>&amp;Yes</translation>\r
-    </message>\r
-    <message>\r
-        <source>MEN_DESK_VIEW</source>\r
-        <translation>&amp;View</translation>\r
-    </message>\r
-    <message>\r
-        <source>PRP_DESK_HELP_ABOUT</source>\r
-        <translation>Shows &apos;About&apos; dialog</translation>\r
-    </message>\r
-    <message>\r
-        <source>MEN_DESK_FILE</source>\r
-        <translation>&amp;File</translation>\r
-    </message>\r
-    <message>\r
-        <source>MEN_DESK_EDIT</source>\r
-        <translation>&amp;Edit</translation>\r
-    </message>\r
-    <message>\r
-        <source>MEN_DESK_HELP</source>\r
-        <translation>&amp;Help</translation>\r
-    </message>\r
-    <message>\r
-        <source>ERR_ERROR</source>\r
-        <translation>Error</translation>\r
-    </message>\r
-    <message>\r
-        <source>ERR_DESK_NOAPP</source>\r
-        <translation>No applications registered</translation>\r
-    </message>\r
-    <message>\r
-        <source>INF_DESK_DOC_CREATE</source>\r
-        <translation>Create a new document</translation>\r
-    </message>\r
-    <message>\r
-        <source>QUE_DOC_ALREADYOPEN</source>\r
-        <translation>The document %1 is already open.\r
-Do you want to reload it ?</translation>\r
-    </message>\r
-    <message>\r
-        <source>BUT_APPLY</source>\r
-        <translation>&amp;Apply</translation>\r
-    </message>\r
-    <message>\r
-        <source>BUT_CLOSE</source>\r
-        <translation>&amp;Close</translation>\r
-    </message>\r
-    <message>\r
-        <source>INF_DESK_EXIT</source>\r
-        <translation>Exit</translation>\r
-    </message>\r
-    <message>\r
-        <source>ERR_UNKNOWN</source>\r
-        <translation>Unknown error</translation>\r
-    </message>\r
-    <message>\r
-        <source>BUT_HELP</source>\r
-        <translation>&amp;Help</translation>\r
-    </message>\r
-    <message>\r
-        <source>PRP_DESK_FILE_CLOSE</source>\r
-        <translation>Closes the active document</translation>\r
-    </message>\r
-    <message>\r
-        <source>PRP_DESK_FILE_PRINT</source>\r
-        <translation>Prints the active document</translation>\r
-    </message>\r
-    <message>\r
-        <source>WRN_WARNING</source>\r
-        <translation>Warning</translation>\r
-    </message>\r
-    <message>\r
-        <source>TOT_DESK_HELP_ABOUT</source>\r
-        <translation>About...</translation>\r
-    </message>\r
-    <message>\r
-        <source>MEN_DESK_VIEW_TOOLBARS</source>\r
-        <translation>T&amp;oolbars</translation>\r
-    </message>\r
-    <message>\r
-        <source>PRP_DESK_WINDOW_HSPLIT</source>\r
-        <translation>Splits the active window on two horizontal parts</translation>\r
-    </message>\r
-    <message>\r
-        <source>MEN_DESK_WINDOW_HSPLIT</source>\r
-        <translation>Split &amp;Horizontally</translation>\r
-    </message>\r
-    <message>\r
-        <source>PRP_DESK_EDIT_PASTE</source>\r
-        <translation>Inserts the Clipboard content at the insertion point</translation>\r
-    </message>\r
-    <message>\r
-        <source>DLG_LOAD_STUDY_CAPTION</source>\r
-        <translation>Load Study</translation>\r
-    </message>\r
-    <message>\r
-        <source>PRP_DESK_HELP_SEARCH</source>\r
-        <translation>Searches help for a topic</translation>\r
-    </message>\r
-    <message>\r
-        <source>PRP_DESK_FILE_SAVEAS</source>\r
-        <translation>Saves the active document with a new name</translation>\r
-    </message>\r
-    <message>\r
-        <source>INF_READY</source>\r
-        <translation>Ready</translation>\r
-    </message>\r
-    <message>\r
-        <source>INF_CANCELLED</source>\r
-        <translation>Cancelled</translation>\r
-    </message>\r
-    <message>\r
-        <source>PRP_DESK_WINDOW_VSPLIT</source>\r
-        <translation>Splits the active window on two vertical parts</translation>\r
-    </message>\r
-    <message>\r
-        <source>MEN_DESK_WINDOW_VSPLIT</source>\r
-        <translation>Split &amp;Vertically</translation>\r
-    </message>\r
-    <message>\r
-        <source>PRP_DESK_WINDOW_TILE</source>\r
-        <translation>Arranges the windows as nonoverlapping tiles</translation>\r
-    </message>\r
-    <message>\r
-        <source>MEN_DESK_HELP_CONTENTS</source>\r
-        <translation>&amp;Contents</translation>\r
-    </message>\r
-    <message>\r
-        <source>PRP_DESK_HELP_CONTENTS</source>\r
-        <translation>Shows the whole help contents</translation>\r
-    </message>\r
-    <message>\r
-        <source>MEN_DESK_WINDOW_HTILE</source>\r
-        <translation>Tile &amp;Horizontally</translation>\r
-    </message>\r
-    <message>\r
-        <source>MEN_DESK_WINDOW_VTILE</source>\r
-        <translation>Tile &amp;Vertically</translation>\r
-    </message>\r
-    <message>\r
-        <source>ERR_DOC_PERMISSIONDENIED_SAVE</source>\r
-        <translation>Can not save file %1. Permission denied</translation>\r
-    </message>\r
-    <message>\r
-        <source>INF_DESK_DOCALREADYOPEN</source>\r
-        <translation>A document cannot be saved under a name of a document already opened.\r
-Please, type another name for the document you want to save.\r
-( %1 )</translation>\r
-    </message>\r
-    <message>\r
-        <source>TIT_FILE_SAVEAS</source>\r
-        <translation>Save As</translation>\r
-    </message>\r
-    <message>\r
-        <source>MEN_DESK_FILE_CLOSE</source>\r
-        <translation>&amp;Close</translation>\r
-    </message>\r
-    <message>\r
-        <source>MSG_FILE_EXISTS</source>\r
-        <translation>File &quot;%1&quot; already exists.\r
-Do you want to overwrite it?</translation>\r
-    </message>\r
-    <message>\r
-        <source>MEN_DESK_FILE_PRINT</source>\r
-        <translation>&amp;Print</translation>\r
-    </message>\r
-    <message>\r
-        <source>MEN_DESK_HELP_SEARCH</source>\r
-        <translation>&amp;Search...</translation>\r
-    </message>\r
-    <message>\r
-        <source>MEN_DESK_VIEW_STDTOOLBAR</source>\r
-        <translation>&amp;Standard</translation>\r
-    </message>\r
-    <message>\r
-        <source>MEN_DESK_FILE_SAVEAS</source>\r
-        <translation>Save &amp;As...</translation>\r
-    </message>\r
-    <message>\r
-        <source>PRP_DESK_VIEW_STDTOOLBAR</source>\r
-        <translation>Toggles standard toolbar on/off</translation>\r
-    </message>\r
-    <message>\r
-        <source>TOT_DESK_FILE_SAVE</source>\r
-        <translation>Save document</translation>\r
-    </message>\r
-    <message>\r
-        <source>TOT_DESK_FILE_EXIT</source>\r
-        <translation>Exit from application</translation>\r
-    </message>\r
-    <message>\r
-        <source>TOT_DESK_FILE_LOAD</source>\r
-        <translation>Load document</translation>\r
-    </message>\r
-    <message>\r
-        <source>TOT_DESK_FILE_OPEN</source>\r
-        <translation>Open document</translation>\r
-    </message>\r
-    <message>\r
-        <source>PRP_DESK_FILE_EXIT</source>\r
-        <translation>Exits the application</translation>\r
-    </message>\r
-    <message>\r
-        <source>PRP_DESK_FILE_OPEN</source>\r
-        <translation>Opens an existing document</translation>\r
-    </message>\r
-    <message>\r
-        <source>PRP_DESK_FILE_SAVE</source>\r
-        <translation>Saves the active document</translation>\r
-    </message>\r
-    <message>\r
-        <source>PRP_DESK_FILE_LOAD</source>\r
-        <translation>Load a document</translation>\r
-    </message>\r
-    <message>\r
-        <source>PRP_DESK_WINDOW_HTILE</source>\r
-        <translation>Arranges the windows as nonoverlapping horizontal tiles</translation>\r
-    </message>\r
-    <message>\r
-        <source>PRP_DESK_WINDOW_VTILE</source>\r
-        <translation>Arranges the windows as nonoverlapping vertical tiles</translation>\r
-    </message>\r
-    <message>\r
-        <source>MEN_DESK_WINDOW_TILE</source>\r
-        <translation>&amp;Tile</translation>\r
-    </message>\r
-    <message>\r
-        <source>MEN_DESK_FILE_EXIT</source>\r
-        <translation>E&amp;xit</translation>\r
-    </message>\r
-    <message>\r
-        <source>MEN_DESK_FILE_OPEN</source>\r
-        <translation>&amp;Open...</translation>\r
-    </message>\r
-    <message>\r
-        <source>MEN_DESK_FILE_LOAD</source>\r
-        <translation>Conn&amp;ect...</translation>\r
-    </message>\r
-    <message>\r
-        <source>MEN_DESK_FILE_SAVE</source>\r
-        <translation>&amp;Save</translation>\r
-    </message>\r
-    <message>\r
-        <source>MEN_DESK_EDIT_PASTE</source>\r
-        <translation>&amp;Paste</translation>\r
-    </message>\r
-    <message>\r
-        <source>MEN_STUDIES_CHOICE</source>\r
-        <translation>Choose existent study.</translation>\r
-    </message>\r
-</context>\r
-<context>\r
-    <name>STD_Application</name>\r
-    <message>\r
-        <source>INF_DOC_MODIFIED</source>\r
-        <translation>Document has been modified.\r
-Do you want to save changes?</translation>\r
-    </message>\r
-    <message>\r
-        <source>INF_DOC_SAVING</source>\r
-        <translation>Saving study </translation>\r
-    </message>\r
-    <message>\r
-        <source>INF_DOC_SAVED</source>\r
-        <translation>Study %1 saved</translation>\r
-    </message>\r
-    <message>\r
-        <source>TOT_DOCK_WINDOWS</source>\r
-        <translation>Show / hide dockable windows and toolbars</translation>\r
-    </message>\r
-    <message>\r
-        <source>MEN_DOCK_WINDOWS</source>\r
-        <translation>Windows and Toolbars</translation>\r
-    </message>\r
-    <message>\r
-        <source>ABOUT_INFO</source>\r
-        <translation>SUIT Std application</translation>\r
-    </message>\r
-    <message>\r
-        <source>INF_DOC_SAVING_FAILS</source>\r
-        <translation>Can&apos;t save file &quot;%1&quot;.\r
-Possible reason is permission denied or disc full.\r
-Try to use another file name.</translation>\r
-    </message>\r
-    <message>\r
-        <source>INF_DOCUMENT_MODIFIED</source>\r
-        <translation>Document &quot;%1&quot; has been modified.\r
-Do you want to save changes?</translation>\r
-    </message>\r
-    <message>\r
-        <source>CLOSE_STUDY</source>\r
-        <translation>Close active study</translation>\r
-    </message>\r
-    <message>\r
-        <source>CLOSE_QUESTION</source>\r
-        <translation>Do you want to save study before closing?</translation>\r
-    </message>\r
-</context>\r
-</TS>\r
+<!DOCTYPE TS><TS>
+<context>
+    <name>@default</name>
+    <message>
+        <source>TOT_DESK_EDIT_CUT</source>
+        <translation>Cut</translation>
+    </message>
+    <message>
+        <source>PRP_DESK_EDIT_CUT</source>
+        <translation>Cuts the selection and puts it to the Clipboard</translation>
+    </message>
+    <message>
+        <source>MEN_DESK_EDIT_CUT</source>
+        <translation>Cu&amp;t</translation>
+    </message>
+    <message>
+        <source>ERR_APP_NOAPP</source>
+        <translation>No application</translation>
+    </message>
+    <message>
+        <source>MEN_DESK_WINDOW</source>
+        <translation>&amp;Window</translation>
+    </message>
+    <message>
+        <source>TOT_DESK_EDIT_COPY</source>
+        <translation>Copy</translation>
+    </message>
+    <message>
+        <source>MEN_DESK_WINDOW_CASCADE</source>
+        <translation>&amp;Cascade</translation>
+    </message>
+    <message>
+        <source>PRP_DESK_EDIT_COPY</source>
+        <translation>Copy the selection to the Clipboard</translation>
+    </message>
+    <message>
+        <source>PRP_DESK_WINDOW_CASCADE</source>
+        <translation>Arranges the windows as overlapping tiles</translation>
+    </message>
+    <message>
+        <source>TOT_DESK_FILE_SAVEAS</source>
+        <translation>Save document as...</translation>
+    </message>
+    <message>
+        <source>MEN_DESK_EDIT_COPY</source>
+        <translation>&amp;Copy</translation>
+    </message>
+    <message>
+        <source>MSG_CANT_SAVE</source>
+        <translation>Can&apos;t save file &quot;%1&quot;.</translation>
+    </message>
+    <message>
+        <source>INF_DESK_TOOLBAR_STANDARD</source>
+        <translation>Standard</translation>
+    </message>
+    <message>
+        <source>ALL_FILES</source>
+        <translation>All Files (*.*)</translation>
+    </message>
+    <message>
+        <source>DESK_DEFAULTTITLE</source>
+        <translation>Qt Application Desktop</translation>
+    </message>
+    <message>
+        <source>QUE_DESK_EXIT</source>
+        <translation>Are you sure you want to quit?</translation>
+    </message>
+    <message>
+        <source>INF_INFO</source>
+        <translation>Information</translation>
+    </message>
+    <message>
+        <source>ERR_DOC_UNKNOWNTYPE_OPEN</source>
+        <translation>You are trying to open a document of an unknown type
+( %1 )</translation>
+    </message>
+    <message>
+        <source>ERR_DOC_UNKNOWNTYPE_SAVE</source>
+        <translation>You are trying to save this document under an unknown type
+( %1 )</translation>
+    </message>
+    <message>
+        <source>TOT_DESK_NEWWINDOW</source>
+        <translation>Create new Window</translation>
+    </message>
+    <message>
+        <source>BUT_CANCEL</source>
+        <translation>&amp;Cancel</translation>
+    </message>
+    <message>
+        <source>MEN_DESK_HELP_ABOUT</source>
+        <translation>&amp;About...</translation>
+    </message>
+    <message>
+        <source>PRP_DESK_NEWWINDOW</source>
+        <translation>Create new Window</translation>
+    </message>
+    <message>
+        <source>MEN_DESK_VIEW_STATUSBAR</source>
+        <translation>&amp;Status Bar</translation>
+    </message>
+    <message>
+        <source>MEN_DESK_NEWWINDOW</source>
+        <translation>&amp;New Window</translation>
+    </message>
+    <message>
+        <source>PRP_DESK_VIEW_STATUSBAR</source>
+        <translation>Toggles status bar view on/off</translation>
+    </message>
+    <message>
+        <source>ERR_DOC_DIRWITHNAMEEXIST_SAVE</source>
+        <translation>Can not save file %1.
+Directory with this name exist on disc. Try to use another name</translation>
+    </message>
+    <message>
+        <source>BUT_NO</source>
+        <translation>&amp;No</translation>
+    </message>
+    <message>
+        <source>BUT_OK</source>
+        <translation>&amp;Ok</translation>
+    </message>
+    <message>
+        <source>FILTER_FILES</source>
+        <translation>%1 Files (%2)</translation>
+    </message>
+    <message>
+        <source>PRP_DESK_WINDOW_ACTIVATE</source>
+        <translation>Activates this window</translation>
+    </message>
+    <message>
+        <source>TOT_DESK_FILE_PRINT</source>
+        <translation>Print document</translation>
+    </message>
+    <message>
+        <source>TOT_DESK_FILE_CLOSE</source>
+        <translation>Close document</translation>
+    </message>
+    <message>
+        <source>TOT_DESK_FILE_NEW</source>
+        <translation>New document</translation>
+    </message>
+    <message>
+        <source>PRP_DESK_FILE_NEW</source>
+        <translation>Creates a new document</translation>
+    </message>
+    <message>
+        <source>PRP_DESK_FILE_MRU</source>
+        <translation>Opens a document</translation>
+    </message>
+    <message>
+        <source>MEN_DESK_FILE_NEW</source>
+        <translation>&amp;New</translation>
+    </message>
+    <message>
+        <source>MEN_DESK_FILE_MRU</source>
+        <translation>Recent &amp;Files</translation>
+    </message>
+    <message>
+        <source>TOT_DESK_EDIT_PASTE</source>
+        <translation>Paste</translation>
+    </message>
+    <message>
+        <source>MEN_DESK_VIEW_DOCKWINDOWS</source>
+        <translation>W&amp;indows</translation>
+    </message>
+    <message>
+        <source>BUT_YES</source>
+        <translation>&amp;Yes</translation>
+    </message>
+    <message>
+        <source>MEN_DESK_VIEW</source>
+        <translation>&amp;View</translation>
+    </message>
+    <message>
+        <source>PRP_DESK_HELP_ABOUT</source>
+        <translation>Shows &apos;About&apos; dialog</translation>
+    </message>
+    <message>
+        <source>MEN_DESK_FILE</source>
+        <translation>&amp;File</translation>
+    </message>
+    <message>
+        <source>MEN_DESK_EDIT</source>
+        <translation>&amp;Edit</translation>
+    </message>
+    <message>
+        <source>MEN_DESK_HELP</source>
+        <translation>&amp;Help</translation>
+    </message>
+    <message>
+        <source>ERR_ERROR</source>
+        <translation>Error</translation>
+    </message>
+    <message>
+        <source>ERR_DESK_NOAPP</source>
+        <translation>No applications registered</translation>
+    </message>
+    <message>
+        <source>INF_DESK_DOC_CREATE</source>
+        <translation>Create a new document</translation>
+    </message>
+    <message>
+        <source>QUE_DOC_ALREADYOPEN</source>
+        <translation>The document %1 is already open.
+Do you want to reload it ?</translation>
+    </message>
+    <message>
+        <source>BUT_APPLY</source>
+        <translation>&amp;Apply</translation>
+    </message>
+    <message>
+        <source>BUT_CLOSE</source>
+        <translation>&amp;Close</translation>
+    </message>
+    <message>
+        <source>INF_DESK_EXIT</source>
+        <translation>Exit</translation>
+    </message>
+    <message>
+        <source>ERR_UNKNOWN</source>
+        <translation>Unknown error</translation>
+    </message>
+    <message>
+        <source>BUT_HELP</source>
+        <translation>&amp;Help</translation>
+    </message>
+    <message>
+        <source>PRP_DESK_FILE_CLOSE</source>
+        <translation>Closes the active document</translation>
+    </message>
+    <message>
+        <source>PRP_DESK_FILE_PRINT</source>
+        <translation>Prints the active document</translation>
+    </message>
+    <message>
+        <source>WRN_WARNING</source>
+        <translation>Warning</translation>
+    </message>
+    <message>
+        <source>TOT_DESK_HELP_ABOUT</source>
+        <translation>About...</translation>
+    </message>
+    <message>
+        <source>MEN_DESK_VIEW_TOOLBARS</source>
+        <translation>T&amp;oolbars</translation>
+    </message>
+    <message>
+        <source>PRP_DESK_WINDOW_HSPLIT</source>
+        <translation>Splits the active window on two horizontal parts</translation>
+    </message>
+    <message>
+        <source>MEN_DESK_WINDOW_HSPLIT</source>
+        <translation>Split &amp;Horizontally</translation>
+    </message>
+    <message>
+        <source>PRP_DESK_EDIT_PASTE</source>
+        <translation>Inserts the Clipboard content at the insertion point</translation>
+    </message>
+    <message>
+        <source>DLG_LOAD_STUDY_CAPTION</source>
+        <translation>Load Study</translation>
+    </message>
+    <message>
+        <source>PRP_DESK_HELP_SEARCH</source>
+        <translation>Searches help for a topic</translation>
+    </message>
+    <message>
+        <source>PRP_DESK_FILE_SAVEAS</source>
+        <translation>Saves the active document with a new name</translation>
+    </message>
+    <message>
+        <source>INF_READY</source>
+        <translation>Ready</translation>
+    </message>
+    <message>
+        <source>INF_CANCELLED</source>
+        <translation>Cancelled</translation>
+    </message>
+    <message>
+        <source>PRP_DESK_WINDOW_VSPLIT</source>
+        <translation>Splits the active window on two vertical parts</translation>
+    </message>
+    <message>
+        <source>MEN_DESK_WINDOW_VSPLIT</source>
+        <translation>Split &amp;Vertically</translation>
+    </message>
+    <message>
+        <source>PRP_DESK_WINDOW_TILE</source>
+        <translation>Arranges the windows as nonoverlapping tiles</translation>
+    </message>
+    <message>
+        <source>MEN_DESK_HELP_CONTENTS</source>
+        <translation>&amp;Contents</translation>
+    </message>
+    <message>
+        <source>PRP_DESK_HELP_CONTENTS</source>
+        <translation>Shows the whole help contents</translation>
+    </message>
+    <message>
+        <source>MEN_DESK_WINDOW_HTILE</source>
+        <translation>Tile &amp;Horizontally</translation>
+    </message>
+    <message>
+        <source>MEN_DESK_WINDOW_VTILE</source>
+        <translation>Tile &amp;Vertically</translation>
+    </message>
+    <message>
+        <source>ERR_DOC_PERMISSIONDENIED_SAVE</source>
+        <translation>Can not save file %1. Permission denied</translation>
+    </message>
+    <message>
+        <source>INF_DESK_DOCALREADYOPEN</source>
+        <translation>A document cannot be saved under a name of a document already opened.
+Please, type another name for the document you want to save.
+( %1 )</translation>
+    </message>
+    <message>
+        <source>TIT_FILE_SAVEAS</source>
+        <translation>Save As</translation>
+    </message>
+    <message>
+        <source>MEN_DESK_FILE_CLOSE</source>
+        <translation>&amp;Close</translation>
+    </message>
+    <message>
+        <source>MSG_FILE_EXISTS</source>
+        <translation>File &quot;%1&quot; already exists.
+Do you want to overwrite it?</translation>
+    </message>
+    <message>
+        <source>MEN_DESK_FILE_PRINT</source>
+        <translation>&amp;Print</translation>
+    </message>
+    <message>
+        <source>MEN_DESK_HELP_SEARCH</source>
+        <translation>&amp;Search...</translation>
+    </message>
+    <message>
+        <source>MEN_DESK_VIEW_STDTOOLBAR</source>
+        <translation>&amp;Standard</translation>
+    </message>
+    <message>
+        <source>MEN_DESK_FILE_SAVEAS</source>
+        <translation>Save &amp;As...</translation>
+    </message>
+    <message>
+        <source>PRP_DESK_VIEW_STDTOOLBAR</source>
+        <translation>Toggles standard toolbar on/off</translation>
+    </message>
+    <message>
+        <source>TOT_DESK_FILE_SAVE</source>
+        <translation>Save document</translation>
+    </message>
+    <message>
+        <source>TOT_DESK_FILE_EXIT</source>
+        <translation>Exit from application</translation>
+    </message>
+    <message>
+        <source>TOT_DESK_FILE_LOAD</source>
+        <translation>Load document</translation>
+    </message>
+    <message>
+        <source>TOT_DESK_FILE_OPEN</source>
+        <translation>Open document</translation>
+    </message>
+    <message>
+        <source>PRP_DESK_FILE_EXIT</source>
+        <translation>Exits the application</translation>
+    </message>
+    <message>
+        <source>PRP_DESK_FILE_OPEN</source>
+        <translation>Opens an existing document</translation>
+    </message>
+    <message>
+        <source>PRP_DESK_FILE_SAVE</source>
+        <translation>Saves the active document</translation>
+    </message>
+    <message>
+        <source>PRP_DESK_FILE_LOAD</source>
+        <translation>Load a document</translation>
+    </message>
+    <message>
+        <source>PRP_DESK_WINDOW_HTILE</source>
+        <translation>Arranges the windows as nonoverlapping horizontal tiles</translation>
+    </message>
+    <message>
+        <source>PRP_DESK_WINDOW_VTILE</source>
+        <translation>Arranges the windows as nonoverlapping vertical tiles</translation>
+    </message>
+    <message>
+        <source>MEN_DESK_WINDOW_TILE</source>
+        <translation>&amp;Tile</translation>
+    </message>
+    <message>
+        <source>MEN_DESK_FILE_EXIT</source>
+        <translation>E&amp;xit</translation>
+    </message>
+    <message>
+        <source>MEN_DESK_FILE_OPEN</source>
+        <translation>&amp;Open...</translation>
+    </message>
+    <message>
+        <source>MEN_DESK_FILE_LOAD</source>
+        <translation>Conn&amp;ect...</translation>
+    </message>
+    <message>
+        <source>MEN_DESK_FILE_SAVE</source>
+        <translation>&amp;Save</translation>
+    </message>
+    <message>
+        <source>MEN_DESK_EDIT_PASTE</source>
+        <translation>&amp;Paste</translation>
+    </message>
+    <message>
+        <source>MEN_STUDIES_CHOICE</source>
+        <translation>Choose existent study.</translation>
+    </message>
+</context>
+<context>
+    <name>STD_Application</name>
+    <message>
+        <source>INF_DOC_MODIFIED</source>
+        <translation>Document has been modified.
+Do you want to save changes?</translation>
+    </message>
+    <message>
+        <source>INF_DOC_SAVING</source>
+        <translation>Saving study </translation>
+    </message>
+    <message>
+        <source>INF_DOC_SAVED</source>
+        <translation>Study %1 saved</translation>
+    </message>
+    <message>
+        <source>TOT_DOCK_WINDOWS</source>
+        <translation>Show / hide dockable windows and toolbars</translation>
+    </message>
+    <message>
+        <source>MEN_DOCK_WINDOWS</source>
+        <translation>Windows and Toolbars</translation>
+    </message>
+    <message>
+        <source>ABOUT_INFO</source>
+        <translation>SUIT Std application</translation>
+    </message>
+    <message>
+        <source>INF_DOC_SAVING_FAILS</source>
+        <translation>Can&apos;t save file &quot;%1&quot;.
+Possible reason is permission denied or disc full.
+Try to use another file name.</translation>
+    </message>
+    <message>
+        <source>INF_DOCUMENT_MODIFIED</source>
+        <translation>Document &quot;%1&quot; has been modified.
+Do you want to save changes?</translation>
+    </message>
+    <message>
+        <source>CLOSE_STUDY</source>
+        <translation>Close active study</translation>
+    </message>
+    <message>
+        <source>CLOSE_QUESTION</source>
+        <translation>Do you want to save study before closing?</translation>
+    </message>
+</context>
+</TS>

diff --git a/src/STD/resources/cursor_rotate.png b/src/STD/resources/cursor_rotate.png
deleted file mode 100755 (executable)
index a3cb0c1..0000000
Binary files a/src/STD/resources/cursor_rotate.png and /dev/null differ

diff --git a/src/STD/resources/cursor_zoom.png b/src/STD/resources/cursor_zoom.png
deleted file mode 100755 (executable)
index 0020fea..0000000
Binary files a/src/STD/resources/cursor_zoom.png and /dev/null differ

diff --git a/src/STD/resources/undo_arrow.png b/src/STD/resources/undo_arrow.png
deleted file mode 100755 (executable)
index 717e0e6..0000000
Binary files a/src/STD/resources/undo_arrow.png and /dev/null differ

diff --git a/src/SUIT/SUIT.pro b/src/SUIT/SUIT.pro
index da3b3a035a4dbd7b2bd2c064c2bd8c36f25856e2..3218615ca71cf7ea7efbac7eda175ebb90aba8c9 100644 (file)
--- a/src/SUIT/SUIT.pro
+++ b/src/SUIT/SUIT.pro
@@ -22,8 +22,7 @@ HEADERS = *.h
 
 SOURCES = *.cxx
 
-TRANSLATIONS = resources/SUIT_images.ts \
-               resources/SUIT_msg_en.ts
+TRANSLATIONS = resources/SUIT_msg_en.ts
 
 unix:GUIResources = ../../resources
 win32:GUIResources = ..\\..\\resources

diff --git a/src/SUIT/SUIT_ToolButton.cxx b/src/SUIT/SUIT_ToolButton.cxx
deleted file mode 100755 (executable)
index 161d195..0000000
--- a/src/SUIT/SUIT_ToolButton.cxx
+++ /dev/null
@@ -1,105 +0,0 @@
-// Copyright (C) 2005  OPEN CASCADE, CEA/DEN, EDF R&D, PRINCIPIA R&D
-// 
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either 
-// version 2.1 of the License.
-// 
-// This library is distributed in the hope that it will be useful 
-// but WITHOUT ANY WARRANTY; without even the implied warranty of 
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-
-#include "SUIT_ToolButton.h"
-
-#include <QMenu>
-
-/*!Constructor.*/
-SUIT_ToolButton::SUIT_ToolButton( QWidget *parent, const char* /*name*/,
-                                  bool changeItemAfterClick )
-: QToolButton( parent ),
-myChangeItemAfterClick( changeItemAfterClick )
-{
-  initialize();
-}
-
-/*!Initialize tool buttons.*/
-void SUIT_ToolButton::initialize()
-{
-  myPopup = new QMenu( this );
-  setMenu( myPopup );
-  connect( myPopup, SIGNAL( triggered( QAction* ) ), SLOT( OnSelectAction( QAction* ) ) );
-}
-
-/*!drawButton is redefined to draw DownArrow*/
-void SUIT_ToolButton::drawButton( QPainter * /*p*/ )
-{
-/*
-  QToolButton::drawButton( p );
-
-//draw DownArrow
-  int x, y, w, h;
-  QStyle::visualRect(QRect(0, 0, width(), height()), this).rect( &x, &y, &w, &h );
-  style().drawPrimitive( QStyle::PE_ArrowDown,
-    p, QRect(x+w/2+3, y+h/2+3, w/2, h/2),   //QRect(x+(w-x)/2, y+(h-y)/2, w, h)
-    colorGroup(), isEnabled() );
-*/
-}
-
-/*! Add action into popup*/
-void SUIT_ToolButton::AddAction( QAction* theAction )
-{
-  bool aIsFirst = false;
-  if ( myPopup->actions().isEmpty() ) 
-  {
-    aIsFirst = true;
-    setIcon( theAction->icon() );
-    setText( theAction->text() );
-    myPopup->setActiveAction( theAction );
-  }
-  myPopup->addAction( theAction );
-}
-
-/*! Sets myPopup item with theIndex as current*/
-void SUIT_ToolButton::SetItem( int theIndex )
-{
-  QAction* a = myPopup->actions()[theIndex];
-  if ( a )
-  {
-    setIcon( a->icon() );
-    setText( a->text() );
-    myPopup->setActiveAction( a );
-  }
-}
-
-/*!Public SLOT.
- * On select action (icon and text set from action = \a theAction)
- */
-void SUIT_ToolButton::OnSelectAction( QAction* theAction )
-{
-  if ( theAction && myChangeItemAfterClick )
-  {
-    // Protection against unexpected null pointers returned
-    QIcon anIcon = theAction->icon();
-    if ( !anIcon.isNull() )
-      setIcon(anIcon);
-    setText(theAction->text());
-    myPopup->setActiveAction( theAction );
-  }
-}
-
-/*!On mouse release event.*/
-void SUIT_ToolButton::mouseReleaseEvent( QMouseEvent* theEvent )
-{
-  QToolButton::mouseReleaseEvent( theEvent );
-  QAction* anAction = myPopup->activeAction();
-  if ( anAction )
-    anAction->activate( QAction::Trigger );
-}

diff --git a/src/SUIT/SUIT_ToolButton.h b/src/SUIT/SUIT_ToolButton.h
deleted file mode 100755 (executable)
index 0acd98e..0000000
--- a/src/SUIT/SUIT_ToolButton.h
+++ /dev/null
@@ -1,63 +0,0 @@
-// Copyright (C) 2005  OPEN CASCADE, CEA/DEN, EDF R&D, PRINCIPIA R&D
-// 
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either 
-// version 2.1 of the License.
-// 
-// This library is distributed in the hope that it will be useful 
-// but WITHOUT ANY WARRANTY; without even the implied warranty of 
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
-// Lesser General Public License for more details.
-//
-// You should have received a copy of the GNU Lesser General Public  
-// License along with this library; if not, write to the Free Software 
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-//
-// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-//
-#ifndef SUIT_TOOLBUTTON_H
-#define SUIT_TOOLBUTTON_H
-
-#include "SUIT.h"
-
-#include <QToolButton>
-
-class QAction;
-class QPixmap;
-class QToolBar;
-
-/*! To draw down arrow on toolbutton.*/
-class SUIT_EXPORT SUIT_ToolButton : public QToolButton
-{
-  Q_OBJECT
-
-public:
-  /*! @name constructors*/
-  //@{
-  SUIT_ToolButton( QWidget *parent = 0, 
-                   const char *name = 0,
-                   bool changeItemAfterClick = true );
-  //@}
-
-  void drawButton( QPainter * pQPainter);
-
-  void AddAction(QAction* theAction);
-
-  void SetItem(int theIndex);
-
-public slots:
-  void OnSelectAction( QAction* theAction );
-
-protected:
-  void  mouseReleaseEvent (QMouseEvent * theEvent);
-
-private:
-  void initialize();
-
-  QMenu*   myPopup;
-  bool     myChangeItemAfterClick;
-
-};
-
-#endif

diff --git a/src/SUIT/resources/SUIT_images.ts b/src/SUIT/resources/SUIT_images.ts
deleted file mode 100644 (file)
index c7c438f..0000000
--- a/src/SUIT/resources/SUIT_images.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>@default</name>
-    <message>
-        <source>ICON_DESK_WINDOW_TILE</source>
-        <translation>htile.png</translation>
-    </message>
-    <message>
-        <source>ICON_DESK_WINDOW_CASCADE</source>
-        <translation>cascade.png</translation>
-    </message>
-    <message>
-        <source>ICON_DESK_WINDOW_VTILE</source>
-        <translation>vtile.png</translation>
-    </message>
-</context>
-</TS>

diff --git a/src/SUIT/resources/cascade.png b/src/SUIT/resources/cascade.png
deleted file mode 100755 (executable)
index 9cd1715..0000000
Binary files a/src/SUIT/resources/cascade.png and /dev/null differ

diff --git a/src/SUIT/resources/htile.png b/src/SUIT/resources/htile.png
deleted file mode 100755 (executable)
index b838286..0000000
Binary files a/src/SUIT/resources/htile.png and /dev/null differ

diff --git a/src/SUIT/resources/vtile.png b/src/SUIT/resources/vtile.png
deleted file mode 100755 (executable)
index 1965d64..0000000
Binary files a/src/SUIT/resources/vtile.png and /dev/null differ