From 630b1290f5b9d8240540ca34a66d1fafd0979aad Mon Sep 17 00:00:00 2001 From: vsr Date: Tue, 21 Aug 2007 13:38:25 +0000 Subject: [PATCH] *** empty log message *** --- src/CAF/CAF_Application.cxx | 4 ++-- src/CAF/Makefile.am | 5 ----- src/CAF/resources/CAF_images.ts | 13 ------------- src/CAF/resources/redo.png | Bin 211 -> 0 bytes src/CAF/resources/undo.png | Bin 210 -> 0 bytes src/SalomeApp/SalomeApp_ListView.cxx | 4 ++-- 6 files changed, 4 insertions(+), 22 deletions(-) delete mode 100644 src/CAF/resources/CAF_images.ts delete mode 100755 src/CAF/resources/redo.png delete mode 100755 src/CAF/resources/undo.png 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 @@ - - - @default - - ICON_APP_EDIT_REDO - redo.png - - - ICON_APP_EDIT_UNDO - undo.png - - - diff --git a/src/CAF/resources/redo.png b/src/CAF/resources/redo.png deleted file mode 100755 index ac72e5c27cb02fdb6aebd6fdf3a8f08b4a4bb2fb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 211 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!7%)r1n>(-?sK#pjDPl)S*0|(O5(ij+KrlrjU z0tN;ko8e_7w;YgSED7=pW^j0R10=?n*?YcQZXkvfq^-UO^uOFVzQz_10&lEi3m{%2_6XphGc;j yHqF!^hL=hVK9Uk42TzGOSUK#9bu1CEvt^K0XP(n=mTxoAAO=rYKbLh*2~7a~`8MzX diff --git a/src/CAF/resources/undo.png b/src/CAF/resources/undo.png deleted file mode 100755 index 61b19777e4f9527d8961358b7dde84d4af2d16e6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 210 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!7%)r1n>(-?sK#ov=Pl)S*0|(O5(ij+Krlrkf zU;r{0c8fE|0x8ClAirP+hi5lHVvI@N?k=o9@?RbYa>PnpBT9nv(@M${i&7cVGt-O; z^3oNI^bGV2ZR7T309Dv~x;TbZ%t=mQU}j}wb7#{iVECBO(8;)tf!9FG&|rfFL+EA) z6N97`4y=4Uemp!~4sBgbS7OxF+1c3AYpNKu@|hn*9eH^jXcU8|tDnm{r-UW|1Q0o1 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)); -- 2.39.2