From b313a28b3f3c52537eaffa5924520cc7b1439126 Mon Sep 17 00:00:00 2001 From: vsv Date: Fri, 4 Apr 2014 12:10:41 +0400 Subject: [PATCH] Removing using of TS file --- src/XGUI/CMakeLists.txt | 14 +-- src/XGUI/XGUI_MainMenu.cpp | 2 +- src/XGUI/XGUI_MainWindow.cpp | 4 +- src/XGUI/XGUI_ViewWindow.cpp | 32 ++--- src/XGUI/XGUI_Viewer.cpp | 10 +- src/XGUI/XGUI_Workshop.cpp | 16 +-- src/XGUI/XGUI_msg_en.ts | 226 ----------------------------------- 7 files changed, 39 insertions(+), 265 deletions(-) delete mode 100644 src/XGUI/XGUI_msg_en.ts diff --git a/src/XGUI/CMakeLists.txt b/src/XGUI/CMakeLists.txt index 7d38c58d1..90632e71e 100644 --- a/src/XGUI/CMakeLists.txt +++ b/src/XGUI/CMakeLists.txt @@ -50,9 +50,9 @@ SET(PROJECT_RESOURCES XGUI_pictures.qrc ) -SET(TEXT_RESOURCES - XGUI_msg_en.ts -) +#SET(TEXT_RESOURCES +# XGUI_msg_en.ts +#) SET(PROJECT_LIBRARIES opengl32 @@ -68,9 +68,10 @@ SET(PROJECT_LIBRARIES ) QT5_ADD_RESOURCES(PROJECT_COMPILED_RESOURCES ${PROJECT_RESOURCES}) -QT5_ADD_TRANSLATION(QM_RESOURCES ${TEXT_RESOURCES}) +#QT5_ADD_TRANSLATION(QM_RESOURCES ${TEXT_RESOURCES}) -SOURCE_GROUP ("Generated Files" FILES ${PROJECT_AUTOMOC} ${PROJECT_COMPILED_RESOURCES} ${QM_RESOURCES}) +#SOURCE_GROUP ("Generated Files" FILES ${PROJECT_AUTOMOC} ${PROJECT_COMPILED_RESOURCES} ${QM_RESOURCES}) +SOURCE_GROUP ("Generated Files" FILES ${PROJECT_AUTOMOC} ${PROJECT_COMPILED_RESOURCES}) SOURCE_GROUP ("Resource Files" FILES ${TEXT_RESOURCES} ${PROJECT_RESOURCES}) ADD_DEFINITIONS(${CAS_DEFINITIONS} ) @@ -89,7 +90,6 @@ ADD_EXECUTABLE(XGUI WIN32 ${PROJECT_HEADERS} ${PROJECT_COMPILED_RESOURCES} ${TEXT_RESOURCES} - ${QM_RESOURCES} ) ADD_DEPENDENCIES(XGUI ModelAPI) @@ -98,4 +98,4 @@ ADD_DEPENDENCIES(XGUI ModelAPI) TARGET_LINK_LIBRARIES(XGUI ${PROJECT_LIBRARIES}) INSTALL(TARGETS XGUI DESTINATION bin) -INSTALL(FILES ${QM_RESOURCES} DESTINATION bin) +#INSTALL(FILES ${QM_RESOURCES} DESTINATION bin) diff --git a/src/XGUI/XGUI_MainMenu.cpp b/src/XGUI/XGUI_MainMenu.cpp index bb7bbd582..efce9ab2c 100644 --- a/src/XGUI/XGUI_MainMenu.cpp +++ b/src/XGUI/XGUI_MainMenu.cpp @@ -11,7 +11,7 @@ XGUI_MainMenu::XGUI_MainMenu(XGUI_MainWindow *parent) : QObject(parent), myDesktop(parent) { parent->setTabPosition(Qt::TopDockWidgetArea, QTabWidget::North); - myGeneralPage = addWorkbench(tr("GEN_MENU_TITLE")); + myGeneralPage = addWorkbench(tr("General")); } XGUI_MainMenu::~XGUI_MainMenu(void) diff --git a/src/XGUI/XGUI_MainWindow.cpp b/src/XGUI/XGUI_MainWindow.cpp index 3fd85eca5..007198fc2 100644 --- a/src/XGUI/XGUI_MainWindow.cpp +++ b/src/XGUI/XGUI_MainWindow.cpp @@ -29,12 +29,12 @@ XGUI_MainWindow::XGUI_MainWindow(QWidget* parent) myObjectBrowser(0), myPythonConsole(0) { - setWindowTitle(tr("WINDOW_TITLE")); + setWindowTitle(tr("New Geom")); myMenuBar = new XGUI_MainMenu(this); QDockWidget* aDoc = new QDockWidget(this); aDoc->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea); - aDoc->setWindowTitle(tr("OBJECT_BROWSER_TITLE")); + aDoc->setWindowTitle(tr("Object browser")); myObjectBrowser = new XGUI_ObjectsBrowser(aDoc); //myObjectBrowser->setColumnCount(1); diff --git a/src/XGUI/XGUI_ViewWindow.cpp b/src/XGUI/XGUI_ViewWindow.cpp index c536c7c41..ef9e5403f 100644 --- a/src/XGUI/XGUI_ViewWindow.cpp +++ b/src/XGUI/XGUI_ViewWindow.cpp @@ -167,63 +167,63 @@ XGUI_ViewWindow::XGUI_ViewWindow(XGUI_Viewer* theViewer, V3d_TypeOfView theType) QAction* aBtn; // Dump view - aBtn = new QAction(QIcon(":pictures/occ_view_camera_dump.png"), tr("DUMP_VIEW"), myViewBar); + aBtn = new QAction(QIcon(":pictures/occ_view_camera_dump.png"), tr("Dump view"), myViewBar); connect(aBtn, SIGNAL(triggered()), SLOT(dumpView())); myViewBar->addAction(aBtn); // Fit all - aBtn = new QAction(QIcon(":pictures/occ_view_fitall.png"), tr("FIT_ALL"), myViewBar); + aBtn = new QAction(QIcon(":pictures/occ_view_fitall.png"), tr("Fit all"), myViewBar); connect(aBtn, SIGNAL(triggered()), SLOT(fitAll())); myViewBar->addAction(aBtn); // Fit area - aBtn = new QAction(QIcon(":pictures/occ_view_fitarea.png"), tr("FIT_AREA"), myViewBar); + aBtn = new QAction(QIcon(":pictures/occ_view_fitarea.png"), tr("Fit area"), myViewBar); connect(aBtn, SIGNAL(triggered()), SLOT(activateWindowFit())); myViewBar->addAction(aBtn); // Zoom - aBtn = new QAction(QIcon(":pictures/occ_view_zoom.png"), tr("ZOOM_VIEW"), myViewBar); + aBtn = new QAction(QIcon(":pictures/occ_view_zoom.png"), tr("Zoom"), myViewBar); connect(aBtn, SIGNAL(triggered()), SLOT(activateZoom())); myViewBar->addAction(aBtn); // Pan - aBtn = new QAction(QIcon(":pictures/occ_view_pan.png"), tr("PAN_VIEW"), myViewBar); + aBtn = new QAction(QIcon(":pictures/occ_view_pan.png"), tr("Panning"), myViewBar); connect(aBtn, SIGNAL(triggered()), SLOT(activatePanning())); myViewBar->addAction(aBtn); // Global Panning - aBtn = new QAction(QIcon(":pictures/occ_view_glpan.png"), tr("GLOB_PAN_VIEW"), myViewBar); + aBtn = new QAction(QIcon(":pictures/occ_view_glpan.png"), tr("Global panning"), myViewBar); connect(aBtn, SIGNAL(triggered()), SLOT(activateGlobalPanning())); myViewBar->addAction(aBtn); // Rotation - aBtn = new QAction(QIcon(":pictures/occ_view_rotate.png"), tr("ROTATE_VIEW"), myViewBar); + aBtn = new QAction(QIcon(":pictures/occ_view_rotate.png"), tr("Rotate"), myViewBar); connect(aBtn, SIGNAL(triggered()), SLOT(activateRotation())); myViewBar->addAction(aBtn); // Reset - aBtn = new QAction(QIcon(":pictures/occ_view_reset.png"), tr("RESET_VIEW"), myViewBar); + aBtn = new QAction(QIcon(":pictures/occ_view_reset.png"), tr("Reset"), myViewBar); connect(aBtn, SIGNAL(triggered()), SLOT(reset())); myViewBar->addAction(aBtn); // Front view - aBtn = new QAction(QIcon(":pictures/occ_view_front.png"), tr("FRONT_VIEW"), myViewBar); + aBtn = new QAction(QIcon(":pictures/occ_view_front.png"), tr("Front"), myViewBar); connect(aBtn, SIGNAL(triggered()), SLOT(frontView())); myViewBar->addAction(aBtn); // Back view - aBtn = new QAction(QIcon(":pictures/occ_view_back.png"), tr("BACK_VIEW"), myViewBar); + aBtn = new QAction(QIcon(":pictures/occ_view_back.png"), tr("Back"), myViewBar); connect(aBtn, SIGNAL(triggered()), SLOT(backView())); myViewBar->addAction(aBtn); // Top view - aBtn = new QAction(QIcon(":pictures/occ_view_top.png"), tr("TOP_VIEW"), myViewBar); + aBtn = new QAction(QIcon(":pictures/occ_view_top.png"), tr("Top"), myViewBar); connect(aBtn, SIGNAL(triggered()), SLOT(topView())); myViewBar->addAction(aBtn); // Bottom view - aBtn = new QAction(QIcon(":pictures/occ_view_bottom.png"), tr("BOTTOM_VIEW"), myViewBar); + aBtn = new QAction(QIcon(":pictures/occ_view_bottom.png"), tr("Bottom"), myViewBar); connect(aBtn, SIGNAL(triggered()), SLOT(bottomView())); myViewBar->addAction(aBtn); // Left view - aBtn = new QAction(QIcon(":pictures/occ_view_left.png"), tr("LEFT_VIEW"), myViewBar); + aBtn = new QAction(QIcon(":pictures/occ_view_left.png"), tr("Left"), myViewBar); connect(aBtn, SIGNAL(triggered()), SLOT(leftView())); myViewBar->addAction(aBtn); // Right view - aBtn = new QAction(QIcon(":pictures/occ_view_right.png"), tr("RIGHT_VIEW"), myViewBar); + aBtn = new QAction(QIcon(":pictures/occ_view_right.png"), tr("Right"), myViewBar); connect(aBtn, SIGNAL(triggered()), SLOT(rightView())); myViewBar->addAction(aBtn); // Clone view - aBtn = new QAction(QIcon(":pictures/occ_view_clone.png"), tr("CLONE_VIEW"), myViewBar); + aBtn = new QAction(QIcon(":pictures/occ_view_clone.png"), tr("Clone"), myViewBar); connect(aBtn, SIGNAL(triggered()), SLOT(cloneView())); myViewBar->addAction(aBtn); @@ -946,7 +946,7 @@ void XGUI_ViewWindow::cloneView() void XGUI_ViewWindow::dumpView() { - QString aFilter(tr("OCC_IMAGE_FILES")); + QString aFilter(tr("Images Files (*.bmp *.png *.jpg *.jpeg *.eps *.ps)")); QString aSelectedFilter; QString aFileName = QFileDialog::getSaveFileName(this, "Save picture", QString(), aFilter, &aSelectedFilter); if (!aFileName.isNull()) { diff --git a/src/XGUI/XGUI_Viewer.cpp b/src/XGUI/XGUI_Viewer.cpp index 881b91f87..6bec77168 100644 --- a/src/XGUI/XGUI_Viewer.cpp +++ b/src/XGUI/XGUI_Viewer.cpp @@ -61,17 +61,17 @@ Handle(V3d_Viewer) CreateViewer(const Standard_ExtString name, const Standard_CS */ QString XGUI_Viewer::backgroundData(QStringList& gradList, QIntList& idList, QIntList& txtList) { - gradList << tr("GT_HORIZONTALGRADIENT") << tr("GT_VERTICALGRADIENT") - << tr("GT_FIRSTDIAGONALGRADIENT") << tr("GT_SECONDDIAGONALGRADIENT") - << tr("GT_FIRSTCORNERGRADIENT") << tr("GT_SECONDCORNERGRADIENT") - << tr("GT_THIRDCORNERGRADIENT") << tr("GT_FORTHCORNERGRADIENT"); + gradList << tr("Horizontal gradient") << tr("Vertical gradient") + << tr("First diagonal gradient") << tr("Second diagonal gradient") + << tr("First corner gradient") << tr("Second corner gradient") + << tr("Third corner gradient") << tr("Fourth corner gradient"); idList << XGUI::HorizontalGradient << XGUI::VerticalGradient << XGUI::Diagonal1Gradient << XGUI::Diagonal2Gradient << XGUI::Corner1Gradient << XGUI::Corner2Gradient << XGUI::Corner3Gradient << XGUI::Corner4Gradient; #ifdef OCC_ENABLE_TEXTURED_BACKGROUND txtList << XGUI::CenterTexture << XGUI::TileTexture << XGUI::StretchTexture; #endif - return tr("BG_IMAGE_FILES"); + return tr("Image files (*.bmp *.gif *.pix *.xwd *.rgb *.rs)"); } XGUI_Viewer::XGUI_Viewer(XGUI_MainWindow* theParent, bool DisplayTrihedron) diff --git a/src/XGUI/XGUI_Workshop.cpp b/src/XGUI/XGUI_Workshop.cpp index 9de01423a..1403e3b00 100644 --- a/src/XGUI/XGUI_Workshop.cpp +++ b/src/XGUI/XGUI_Workshop.cpp @@ -65,34 +65,34 @@ void XGUI_Workshop::initMenu() XGUI_Command* aCommand; - aCommand = aGroup->addFeature("SAVE_CMD", tr("SAVE_MENU"), tr("SAVE_MENU_TIP"), + aCommand = aGroup->addFeature("SAVE_CMD", tr("Save..."), tr("Save the document"), QIcon(":pictures/save.png"), QKeySequence::Save); aCommand->connectTo(this, SLOT(onSave())); //aCommand->disable(); - aCommand = aGroup->addFeature("UNDO_CMD", tr("UNDO_MENU"), tr("UNDO_MENU_TIP"), + aCommand = aGroup->addFeature("UNDO_CMD", tr("Undo"), tr("Undo last command"), QIcon(":pictures/undo.png"), QKeySequence::Undo); - aCommand = aGroup->addFeature("REDO_CMD", tr("REDO_MENU"), tr("REDO_MENU_TIP"), + aCommand = aGroup->addFeature("REDO_CMD", tr("Redo"), tr("Redo last command"), QIcon(":pictures/redo.png"), QKeySequence::Redo); - aCommand = aGroup->addFeature("REBUILD_CMD", tr("REBUILD_MENU"), tr("REBUILD_MENU_TIP"), + aCommand = aGroup->addFeature("REBUILD_CMD", tr("Rebuild"), tr("Rebuild data objects"), QIcon(":pictures/rebuild.png")); - aCommand = aGroup->addFeature("SAVEAS_CMD", tr("SAVEAS_MENU"), tr("SAVEAS_MENU_TIP"), + aCommand = aGroup->addFeature("SAVEAS_CMD", tr("Save as..."), tr("Save the document into a file"), QIcon(":pictures/save.png")); aCommand->connectTo(this, SLOT(onSaveAs())); //aCommand->disable(); - aCommand = aGroup->addFeature("OPEN_CMD", tr("OPEN_MENU"), tr("OPEN_MENU_TIP"), + aCommand = aGroup->addFeature("OPEN_CMD", tr("Open..."), tr("Open a new document"), QIcon(":pictures/open.png"), QKeySequence::Open); aCommand->connectTo(this, SLOT(onOpen())); - aCommand = aGroup->addFeature("NEW_CMD", tr("NEW_MENU"), tr("NEW_MENU_TIP"), + aCommand = aGroup->addFeature("NEW_CMD", tr("New"), tr("Create a new document"), QIcon(":pictures/new.png"), QKeySequence::New); aCommand->connectTo(this, SLOT(onNew())); - aCommand = aGroup->addFeature("EXIT_CMD", tr("EXIT_MENU"), tr("EXIT_MENU_TIP"), + aCommand = aGroup->addFeature("EXIT_CMD", tr("Exit"), tr("Exit application"), QIcon(":pictures/close.png"), QKeySequence::Close); aCommand->connectTo(this, SLOT(onExit())); diff --git a/src/XGUI/XGUI_msg_en.ts b/src/XGUI/XGUI_msg_en.ts deleted file mode 100644 index afe0ddcae..000000000 --- a/src/XGUI/XGUI_msg_en.ts +++ /dev/null @@ -1,226 +0,0 @@ - - - - - @default - - - XGUI_Workshop - - NEW_MENU - New - - - NEW_MENU_TIP - Create new document - - - OPEN_MENU - Open... - - - OPEN_MENU_TIP - Open document - - - SAVE_MENU - Save - - - SAVE_MENU_TIP - Save document - - - SAVEAS_MENU - Save As... - - - SAVEAS_MENU_TIP - Save document in another file - - - EXIT_MENU - Exit - - - EXIT_MENU_TIP - Exit from application - - - UNDO_MENU - Undo - - - UNDO_MENU_TIP - Undo last command - - - REDO_MENU - Redo - - - REDO_MENU_TIP - Redo last command - - - CUT_MENU - Cut - - - CUT_MENU_TIP - Cut selected object - - - COPY_MENU - Copy - - - COPY_MENU_TIP - Copy selected object - - - PASTE_MENU - Paste - - - PASTE_MENU_TIP - Paste copied object - - - REBUILD_MENU - Rebuild - - - REBUILD_MENU_TIP - Rebuild data objects - - - - XGUI_MainWindow - - WINDOW_TITLE - New GEOM - - - OBJECT_BROWSER_TITLE - Object Browser - - - - XGUI_MainMenu - - MENU_TITLE - Menu - - - GEN_MENU_TITLE - General - - - - XGUI_Viewer - - GT_HORIZONTALGRADIENT - Horizontal gradient - - - GT_VERTICALGRADIENT - Vertical gradient - - - GT_FIRSTDIAGONALGRADIENT - First diagonal gradient - - - GT_SECONDDIAGONALGRADIENT - Second diagonal gradient - - - GT_FIRSTCORNERGRADIENT - First corner gradient - - - GT_SECONDCORNERGRADIENT - Second corner gradient - - - GT_THIRDCORNERGRADIENT - Third corner gradient - - - GT_FORTHCORNERGRADIENT - Fourth corner gradient - - - BG_IMAGE_FILES - Image files (*.bmp *.gif *.pix *.xwd *.rgb *.rs) - - - - XGUI_ViewWindow - - OCC_IMAGE_FILES - Images Files (*.bmp *.png *.jpg *.jpeg *.eps *.ps) - - - DUMP_VIEW - Dump view - - - FIT_ALL - Fit all - - - FIT_AREA - Fit area - - - CLONE_VIEW - Clone view - - - ZOOM_VIEW - Zoom - - - PAN_VIEW - Panning - - - GLOB_PAN_VIEW - Global panning - - - ROTATE_VIEW - Rotate - - - FRONT_VIEW - Front - - - BACK_VIEW - Back - - - TOP_VIEW - Top - - - BOTTOM_VIEW - Bottom - - - LEFT_VIEW - Left - - - RIGHT_VIEW - Right - - - RESET_VIEW - Reset - - - -- 2.39.2