From: nds Date: Wed, 8 Oct 2008 03:41:08 +0000 (+0000) Subject: Merging GUI_SRC module with the BR_V5_DEV branch. X-Git-Tag: TG_mergeto_BR_V5_DEV_finished~3 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=6074194127a4731373132a8c0cd94a229d60d6c0;p=modules%2Fgui.git 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 90fe0caa3..22597f0dc 100644 --- a/src/STD/resources/STD_images.ts +++ b/src/STD/resources/STD_images.ts @@ -33,10 +33,6 @@ ICON_EDIT_COPY copy.png - - ICON_APP_DEFAULTICON - default.png - ICON_FILE_SAVE save.png @@ -50,20 +46,20 @@ htile.png - ICON_APP_EDIT_REDO + ICON_EDIT_REDO redo.png - ICON_APP_EDIT_UNDO + ICON_EDIT_UNDO undo.png - ICON_DESK_WINDOW_VSPLIT - vtile.png + ICON_EDIT_DELETE + delete.png - ICON_DESK_DEFAULTICON - default.png + ICON_DESK_WINDOW_VSPLIT + vtile.png ICON_DESK_WINDOW_HTILE @@ -82,15 +78,4 @@ close.png - - SUIT_ViewPort - - ICON_CURSOR_ZOOM - cursor_zoom.png - - - ICON_CURSOR_ROTATE - cursor_rotate.png - - diff --git a/src/STD/resources/STD_msg_en.ts b/src/STD/resources/STD_msg_en.ts index 4c83de1dd..e619c05e1 100644 --- a/src/STD/resources/STD_msg_en.ts +++ b/src/STD/resources/STD_msg_en.ts @@ -1,467 +1,467 @@ - - - @default - - TOT_DESK_EDIT_CUT - Cut - - - PRP_DESK_EDIT_CUT - Cuts the selection and puts it to the Clipboard - - - MEN_DESK_EDIT_CUT - Cu&t - - - ERR_APP_NOAPP - No application - - - MEN_DESK_WINDOW - &Window - - - TOT_DESK_EDIT_COPY - Copy - - - MEN_DESK_WINDOW_CASCADE - &Cascade - - - PRP_DESK_EDIT_COPY - Copy the selection to the Clipboard - - - PRP_DESK_WINDOW_CASCADE - Arranges the windows as overlapping tiles - - - TOT_DESK_FILE_SAVEAS - Save document as... - - - MEN_DESK_EDIT_COPY - &Copy - - - MSG_CANT_SAVE - Can't save file "%1". - - - INF_DESK_TOOLBAR_STANDARD - Standard - - - ALL_FILES - All Files (*.*) - - - DESK_DEFAULTTITLE - Qt Application Desktop - - - QUE_DESK_EXIT - Are you sure you want to quit? - - - INF_INFO - Information - - - ERR_DOC_UNKNOWNTYPE_OPEN - You are trying to open a document of an unknown type -( %1 ) - - - ERR_DOC_UNKNOWNTYPE_SAVE - You are trying to save this document under an unknown type -( %1 ) - - - TOT_DESK_NEWWINDOW - Create new Window - - - BUT_CANCEL - &Cancel - - - MEN_DESK_HELP_ABOUT - &About... - - - PRP_DESK_NEWWINDOW - Create new Window - - - MEN_DESK_VIEW_STATUSBAR - &Status Bar - - - MEN_DESK_NEWWINDOW - &New Window - - - PRP_DESK_VIEW_STATUSBAR - Toggles status bar view on/off - - - ERR_DOC_DIRWITHNAMEEXIST_SAVE - Can not save file %1. -Directory with this name exist on disc. Try to use another name - - - BUT_NO - &No - - - BUT_OK - &Ok - - - FILTER_FILES - %1 Files (%2) - - - PRP_DESK_WINDOW_ACTIVATE - Activates this window - - - TOT_DESK_FILE_PRINT - Print document - - - TOT_DESK_FILE_CLOSE - Close document - - - TOT_DESK_FILE_NEW - New document - - - PRP_DESK_FILE_NEW - Creates a new document - - - PRP_DESK_FILE_MRU - Opens a document - - - MEN_DESK_FILE_NEW - &New - - - MEN_DESK_FILE_MRU - Recent &Files - - - TOT_DESK_EDIT_PASTE - Paste - - - MEN_DESK_VIEW_DOCKWINDOWS - W&indows - - - BUT_YES - &Yes - - - MEN_DESK_VIEW - &View - - - PRP_DESK_HELP_ABOUT - Shows 'About' dialog - - - MEN_DESK_FILE - &File - - - MEN_DESK_EDIT - &Edit - - - MEN_DESK_HELP - &Help - - - ERR_ERROR - Error - - - ERR_DESK_NOAPP - No applications registered - - - INF_DESK_DOC_CREATE - Create a new document - - - QUE_DOC_ALREADYOPEN - The document %1 is already open. -Do you want to reload it ? - - - BUT_APPLY - &Apply - - - BUT_CLOSE - &Close - - - INF_DESK_EXIT - Exit - - - ERR_UNKNOWN - Unknown error - - - BUT_HELP - &Help - - - PRP_DESK_FILE_CLOSE - Closes the active document - - - PRP_DESK_FILE_PRINT - Prints the active document - - - WRN_WARNING - Warning - - - TOT_DESK_HELP_ABOUT - About... - - - MEN_DESK_VIEW_TOOLBARS - T&oolbars - - - PRP_DESK_WINDOW_HSPLIT - Splits the active window on two horizontal parts - - - MEN_DESK_WINDOW_HSPLIT - Split &Horizontally - - - PRP_DESK_EDIT_PASTE - Inserts the Clipboard content at the insertion point - - - DLG_LOAD_STUDY_CAPTION - Load Study - - - PRP_DESK_HELP_SEARCH - Searches help for a topic - - - PRP_DESK_FILE_SAVEAS - Saves the active document with a new name - - - INF_READY - Ready - - - INF_CANCELLED - Cancelled - - - PRP_DESK_WINDOW_VSPLIT - Splits the active window on two vertical parts - - - MEN_DESK_WINDOW_VSPLIT - Split &Vertically - - - PRP_DESK_WINDOW_TILE - Arranges the windows as nonoverlapping tiles - - - MEN_DESK_HELP_CONTENTS - &Contents - - - PRP_DESK_HELP_CONTENTS - Shows the whole help contents - - - MEN_DESK_WINDOW_HTILE - Tile &Horizontally - - - MEN_DESK_WINDOW_VTILE - Tile &Vertically - - - ERR_DOC_PERMISSIONDENIED_SAVE - Can not save file %1. Permission denied - - - INF_DESK_DOCALREADYOPEN - 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 ) - - - TIT_FILE_SAVEAS - Save As - - - MEN_DESK_FILE_CLOSE - &Close - - - MSG_FILE_EXISTS - File "%1" already exists. -Do you want to overwrite it? - - - MEN_DESK_FILE_PRINT - &Print - - - MEN_DESK_HELP_SEARCH - &Search... - - - MEN_DESK_VIEW_STDTOOLBAR - &Standard - - - MEN_DESK_FILE_SAVEAS - Save &As... - - - PRP_DESK_VIEW_STDTOOLBAR - Toggles standard toolbar on/off - - - TOT_DESK_FILE_SAVE - Save document - - - TOT_DESK_FILE_EXIT - Exit from application - - - TOT_DESK_FILE_LOAD - Load document - - - TOT_DESK_FILE_OPEN - Open document - - - PRP_DESK_FILE_EXIT - Exits the application - - - PRP_DESK_FILE_OPEN - Opens an existing document - - - PRP_DESK_FILE_SAVE - Saves the active document - - - PRP_DESK_FILE_LOAD - Load a document - - - PRP_DESK_WINDOW_HTILE - Arranges the windows as nonoverlapping horizontal tiles - - - PRP_DESK_WINDOW_VTILE - Arranges the windows as nonoverlapping vertical tiles - - - MEN_DESK_WINDOW_TILE - &Tile - - - MEN_DESK_FILE_EXIT - E&xit - - - MEN_DESK_FILE_OPEN - &Open... - - - MEN_DESK_FILE_LOAD - Conn&ect... - - - MEN_DESK_FILE_SAVE - &Save - - - MEN_DESK_EDIT_PASTE - &Paste - - - MEN_STUDIES_CHOICE - Choose existent study. - - - - STD_Application - - INF_DOC_MODIFIED - Document has been modified. -Do you want to save changes? - - - INF_DOC_SAVING - Saving study - - - INF_DOC_SAVED - Study %1 saved - - - TOT_DOCK_WINDOWS - Show / hide dockable windows and toolbars - - - MEN_DOCK_WINDOWS - Windows and Toolbars - - - ABOUT_INFO - SUIT Std application - - - INF_DOC_SAVING_FAILS - Can't save file "%1". -Possible reason is permission denied or disc full. -Try to use another file name. - - - INF_DOCUMENT_MODIFIED - Document "%1" has been modified. -Do you want to save changes? - - - CLOSE_STUDY - Close active study - - - CLOSE_QUESTION - Do you want to save study before closing? - - - + + + @default + + TOT_DESK_EDIT_CUT + Cut + + + PRP_DESK_EDIT_CUT + Cuts the selection and puts it to the Clipboard + + + MEN_DESK_EDIT_CUT + Cu&t + + + ERR_APP_NOAPP + No application + + + MEN_DESK_WINDOW + &Window + + + TOT_DESK_EDIT_COPY + Copy + + + MEN_DESK_WINDOW_CASCADE + &Cascade + + + PRP_DESK_EDIT_COPY + Copy the selection to the Clipboard + + + PRP_DESK_WINDOW_CASCADE + Arranges the windows as overlapping tiles + + + TOT_DESK_FILE_SAVEAS + Save document as... + + + MEN_DESK_EDIT_COPY + &Copy + + + MSG_CANT_SAVE + Can't save file "%1". + + + INF_DESK_TOOLBAR_STANDARD + Standard + + + ALL_FILES + All Files (*.*) + + + DESK_DEFAULTTITLE + Qt Application Desktop + + + QUE_DESK_EXIT + Are you sure you want to quit? + + + INF_INFO + Information + + + ERR_DOC_UNKNOWNTYPE_OPEN + You are trying to open a document of an unknown type +( %1 ) + + + ERR_DOC_UNKNOWNTYPE_SAVE + You are trying to save this document under an unknown type +( %1 ) + + + TOT_DESK_NEWWINDOW + Create new Window + + + BUT_CANCEL + &Cancel + + + MEN_DESK_HELP_ABOUT + &About... + + + PRP_DESK_NEWWINDOW + Create new Window + + + MEN_DESK_VIEW_STATUSBAR + &Status Bar + + + MEN_DESK_NEWWINDOW + &New Window + + + PRP_DESK_VIEW_STATUSBAR + Toggles status bar view on/off + + + ERR_DOC_DIRWITHNAMEEXIST_SAVE + Can not save file %1. +Directory with this name exist on disc. Try to use another name + + + BUT_NO + &No + + + BUT_OK + &Ok + + + FILTER_FILES + %1 Files (%2) + + + PRP_DESK_WINDOW_ACTIVATE + Activates this window + + + TOT_DESK_FILE_PRINT + Print document + + + TOT_DESK_FILE_CLOSE + Close document + + + TOT_DESK_FILE_NEW + New document + + + PRP_DESK_FILE_NEW + Creates a new document + + + PRP_DESK_FILE_MRU + Opens a document + + + MEN_DESK_FILE_NEW + &New + + + MEN_DESK_FILE_MRU + Recent &Files + + + TOT_DESK_EDIT_PASTE + Paste + + + MEN_DESK_VIEW_DOCKWINDOWS + W&indows + + + BUT_YES + &Yes + + + MEN_DESK_VIEW + &View + + + PRP_DESK_HELP_ABOUT + Shows 'About' dialog + + + MEN_DESK_FILE + &File + + + MEN_DESK_EDIT + &Edit + + + MEN_DESK_HELP + &Help + + + ERR_ERROR + Error + + + ERR_DESK_NOAPP + No applications registered + + + INF_DESK_DOC_CREATE + Create a new document + + + QUE_DOC_ALREADYOPEN + The document %1 is already open. +Do you want to reload it ? + + + BUT_APPLY + &Apply + + + BUT_CLOSE + &Close + + + INF_DESK_EXIT + Exit + + + ERR_UNKNOWN + Unknown error + + + BUT_HELP + &Help + + + PRP_DESK_FILE_CLOSE + Closes the active document + + + PRP_DESK_FILE_PRINT + Prints the active document + + + WRN_WARNING + Warning + + + TOT_DESK_HELP_ABOUT + About... + + + MEN_DESK_VIEW_TOOLBARS + T&oolbars + + + PRP_DESK_WINDOW_HSPLIT + Splits the active window on two horizontal parts + + + MEN_DESK_WINDOW_HSPLIT + Split &Horizontally + + + PRP_DESK_EDIT_PASTE + Inserts the Clipboard content at the insertion point + + + DLG_LOAD_STUDY_CAPTION + Load Study + + + PRP_DESK_HELP_SEARCH + Searches help for a topic + + + PRP_DESK_FILE_SAVEAS + Saves the active document with a new name + + + INF_READY + Ready + + + INF_CANCELLED + Cancelled + + + PRP_DESK_WINDOW_VSPLIT + Splits the active window on two vertical parts + + + MEN_DESK_WINDOW_VSPLIT + Split &Vertically + + + PRP_DESK_WINDOW_TILE + Arranges the windows as nonoverlapping tiles + + + MEN_DESK_HELP_CONTENTS + &Contents + + + PRP_DESK_HELP_CONTENTS + Shows the whole help contents + + + MEN_DESK_WINDOW_HTILE + Tile &Horizontally + + + MEN_DESK_WINDOW_VTILE + Tile &Vertically + + + ERR_DOC_PERMISSIONDENIED_SAVE + Can not save file %1. Permission denied + + + INF_DESK_DOCALREADYOPEN + 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 ) + + + TIT_FILE_SAVEAS + Save As + + + MEN_DESK_FILE_CLOSE + &Close + + + MSG_FILE_EXISTS + File "%1" already exists. +Do you want to overwrite it? + + + MEN_DESK_FILE_PRINT + &Print + + + MEN_DESK_HELP_SEARCH + &Search... + + + MEN_DESK_VIEW_STDTOOLBAR + &Standard + + + MEN_DESK_FILE_SAVEAS + Save &As... + + + PRP_DESK_VIEW_STDTOOLBAR + Toggles standard toolbar on/off + + + TOT_DESK_FILE_SAVE + Save document + + + TOT_DESK_FILE_EXIT + Exit from application + + + TOT_DESK_FILE_LOAD + Load document + + + TOT_DESK_FILE_OPEN + Open document + + + PRP_DESK_FILE_EXIT + Exits the application + + + PRP_DESK_FILE_OPEN + Opens an existing document + + + PRP_DESK_FILE_SAVE + Saves the active document + + + PRP_DESK_FILE_LOAD + Load a document + + + PRP_DESK_WINDOW_HTILE + Arranges the windows as nonoverlapping horizontal tiles + + + PRP_DESK_WINDOW_VTILE + Arranges the windows as nonoverlapping vertical tiles + + + MEN_DESK_WINDOW_TILE + &Tile + + + MEN_DESK_FILE_EXIT + E&xit + + + MEN_DESK_FILE_OPEN + &Open... + + + MEN_DESK_FILE_LOAD + Conn&ect... + + + MEN_DESK_FILE_SAVE + &Save + + + MEN_DESK_EDIT_PASTE + &Paste + + + MEN_STUDIES_CHOICE + Choose existent study. + + + + STD_Application + + INF_DOC_MODIFIED + Document has been modified. +Do you want to save changes? + + + INF_DOC_SAVING + Saving study + + + INF_DOC_SAVED + Study %1 saved + + + TOT_DOCK_WINDOWS + Show / hide dockable windows and toolbars + + + MEN_DOCK_WINDOWS + Windows and Toolbars + + + ABOUT_INFO + SUIT Std application + + + INF_DOC_SAVING_FAILS + Can't save file "%1". +Possible reason is permission denied or disc full. +Try to use another file name. + + + INF_DOCUMENT_MODIFIED + Document "%1" has been modified. +Do you want to save changes? + + + CLOSE_STUDY + Close active study + + + CLOSE_QUESTION + Do you want to save study before closing? + + + diff --git a/src/STD/resources/cursor_rotate.png b/src/STD/resources/cursor_rotate.png deleted file mode 100755 index a3cb0c1ec..000000000 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 index 0020fea39..000000000 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 index 717e0e6df..000000000 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 da3b3a035..3218615ca 100644 --- 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 index 161d1952d..000000000 --- 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 - -/*!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 index 0acd98e74..000000000 --- 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 - -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 index c7c438f3d..000000000 --- a/src/SUIT/resources/SUIT_images.ts +++ /dev/null @@ -1,17 +0,0 @@ - - - @default - - ICON_DESK_WINDOW_TILE - htile.png - - - ICON_DESK_WINDOW_CASCADE - cascade.png - - - ICON_DESK_WINDOW_VTILE - vtile.png - - - diff --git a/src/SUIT/resources/cascade.png b/src/SUIT/resources/cascade.png deleted file mode 100755 index 9cd171538..000000000 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 index b838286fb..000000000 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 index 1965d6405..000000000 Binary files a/src/SUIT/resources/vtile.png and /dev/null differ