From: vsr <vsr@opencascade.com>
Date: Tue, 21 Aug 2007 13:38:25 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: qt4_porting_delivery_220807~8
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=630b1290f5b9d8240540ca34a66d1fafd0979aad;p=modules%2Fgui.git

*** empty log message ***
---

diff --git a/src/CAF/CAF_Application.cxx b/src/CAF/CAF_Application.cxx
index e553490c0..ac268daaf 100755
--- a/src/CAF/CAF_Application.cxx
+++ b/src/CAF/CAF_Application.cxx
@@ -162,14 +162,14 @@ void CAF_Application::createActions()
 
   QtxListAction* editUndo = 
     new QtxListAction( tr( "TOT_APP_EDIT_UNDO" ), 
-		       resMgr->loadPixmap( "CAF", tr( "ICON_APP_EDIT_UNDO" ) ),
+		       resMgr->loadPixmap( "STD", tr( "ICON_EDIT_UNDO" ) ),
 		       tr( "MEN_APP_EDIT_UNDO" ), Qt::CTRL+Qt::Key_Z, desk );
   editUndo->setStatusTip( tr( "PRP_APP_EDIT_UNDO" ) );
   registerAction( EditUndoId, editUndo );
 
   QtxListAction* editRedo =
     new QtxListAction( tr( "TOT_APP_EDIT_REDO" ), 
-		       resMgr->loadPixmap( "CAF", tr( "ICON_APP_EDIT_REDO" ) ),
+		       resMgr->loadPixmap( "STD", tr( "ICON_EDIT_REDO" ) ),
 		       tr( "MEN_APP_EDIT_REDO" ), Qt::CTRL+Qt::Key_Y, desk );
   editRedo->setStatusTip( tr( "PRP_APP_EDIT_REDO" ) );
   registerAction( EditRedoId, editRedo );
diff --git a/src/CAF/Makefile.am b/src/CAF/Makefile.am
index 173a32f7d..f1c06ce16 100755
--- a/src/CAF/Makefile.am
+++ b/src/CAF/Makefile.am
@@ -44,12 +44,7 @@ MOC_FILES= \
 	CAF_Study_moc.cxx
 nodist_libcaf_la_SOURCES= $(MOC_FILES)
 
-dist_salomeres_DATA = \
-	resources/redo.png \
-	resources/undo.png
-
 nodist_salomeres_DATA = \
-	CAF_images.qm \
 	CAF_msg_en.qm
 
 libcaf_la_CPPFLAGS=$(QT_INCLUDES) $(CAS_CPPFLAGS) -I$(srcdir)/../STD -I$(srcdir)/../SUIT -I$(srcdir)/../Qtx
diff --git a/src/CAF/resources/CAF_images.ts b/src/CAF/resources/CAF_images.ts
deleted file mode 100644
index 1435c788d..000000000
--- a/src/CAF/resources/CAF_images.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-<!DOCTYPE TS><TS>
-<context>
-    <name>@default</name>
-    <message>
-        <source>ICON_APP_EDIT_REDO</source>
-        <translation>redo.png</translation>
-    </message>
-    <message>
-        <source>ICON_APP_EDIT_UNDO</source>
-        <translation>undo.png</translation>
-    </message>
-</context>
-</TS>
diff --git a/src/CAF/resources/redo.png b/src/CAF/resources/redo.png
deleted file mode 100755
index ac72e5c27..000000000
Binary files a/src/CAF/resources/redo.png and /dev/null differ
diff --git a/src/CAF/resources/undo.png b/src/CAF/resources/undo.png
deleted file mode 100755
index 61b19777e..000000000
Binary files a/src/CAF/resources/undo.png and /dev/null differ
diff --git a/src/SalomeApp/SalomeApp_ListView.cxx b/src/SalomeApp/SalomeApp_ListView.cxx
index 2c513719d..e0a70886b 100644
--- a/src/SalomeApp/SalomeApp_ListView.cxx
+++ b/src/SalomeApp/SalomeApp_ListView.cxx
@@ -1105,7 +1105,7 @@ myCancelBtn(0)
 
     QPixmap anIcon;
     if( mgr )
-      anIcon = mgr->loadPixmap( "STD", tr( "ICON_APPLY" ), false );
+      anIcon = mgr->loadPixmap( "SalomeApp", tr( "ICON_APPLY" ), false );
 
     myApplyBtn->setIcon(anIcon);
     myApplyBtn->setEnabled(false);
@@ -1120,7 +1120,7 @@ myCancelBtn(0)
     myCancelBtn = new QToolButton(this);
     QPixmap anIcon;
     if( mgr )
-      anIcon = mgr->loadPixmap( "STD", tr( "ICON_CANCEL" ), false );
+      anIcon = mgr->loadPixmap( "SalomeApp", tr( "ICON_CANCEL" ), false );
     myCancelBtn->setIcon(anIcon);
     myCancelBtn->setEnabled(false);
     myCancelBtn->setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed));