#3265

- Changed copy to duplicate.

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@25386 f25d12d1-65f4-0310-ae8a-bbce733d8d8e

Author: adeas31

OMEdit/OMEditGUI/Modeling/LibraryTreeWidget.cpp

@@ -549,9 +549,12 @@ void LibraryTreeWidget::createActions()
   mpSimulationSetupAction->setStatusTip(Helper::simulationSetupTip);
   connect(mpSimulationSetupAction, SIGNAL(triggered()), SLOT(simulationSetup()));
   // copy action
-  mpCopyClassAction = new QAction(QIcon(":/Resources/icons/duplicate.svg"), Helper::copy, this);
-  mpCopyClassAction->setStatusTip(tr("Creates a copy of the class"));
-  connect(mpCopyClassAction, SIGNAL(triggered()), SLOT(copyClass()));
+  /* Ticket #3265
+   * Changed the name from Copy to Duplicate.
+   */
+  mpDuplicateClassAction = new QAction(QIcon(":/Resources/icons/duplicate.svg"), Helper::duplicate, this);
+  mpDuplicateClassAction->setStatusTip(Helper::duplicateTip);
+  connect(mpDuplicateClassAction, SIGNAL(triggered()), SLOT(duplicateClass()));
   // unload Action
   mpUnloadClassAction = new QAction(QIcon(":/Resources/icons/delete.svg"), Helper::unloadClass, this);
   mpUnloadClassAction->setStatusTip(Helper::unloadClassTip);
@@ -1533,7 +1536,7 @@ void LibraryTreeWidget::showContextMenu(QPoint point)
         /* If item is OpenModelica or part of it or is search tree item then don't show the unload for it. */
         if (!((StringHandler::getFirstWordBeforeDot(pLibraryTreeNode->getNameStructure()).compare("OpenModelica") == 0)  || isSearchedTree())) {
           menu.addSeparator();
-          menu.addAction(mpCopyClassAction);
+          menu.addAction(mpDuplicateClassAction);
           menu.addAction(mpUnloadClassAction);
           /* Only used for development testing. */
           /*menu.addAction(mpRefreshAction);*/
@@ -1652,14 +1655,19 @@ void LibraryTreeWidget::checkAllModels()
     mpMainWindow->checkAllModels(pLibraryTreeNode);
 }
 
-void LibraryTreeWidget::copyClass()
+/*!
+ * \brief LibraryTreeWidget::duplicateClass
+ * Opens the DuplicateClassDialog.
+ */
+void LibraryTreeWidget::duplicateClass()
 {
   QList<QTreeWidgetItem*> selectedItemsList = selectedItems();
-  if (selectedItemsList.isEmpty())
+  if (selectedItemsList.isEmpty()) {
     return;
+  }
   LibraryTreeNode *pLibraryTreeNode = dynamic_cast<LibraryTreeNode*>(selectedItemsList.at(0));
   if (pLibraryTreeNode) {
-    CopyClassDialog *pCopyClassDialog = new CopyClassDialog(pLibraryTreeNode, mpMainWindow);
+    DuplicateClassDialog *pCopyClassDialog = new DuplicateClassDialog(pLibraryTreeNode, mpMainWindow);
     pCopyClassDialog->exec();
   }
 }

OMEdit/OMEditGUI/Modeling/LibraryTreeWidget.h

@@ -204,7 +204,7 @@ class LibraryTreeWidget : public QTreeWidget
   QAction *mpSimulateWithTransformationalDebuggerAction;
   QAction *mpSimulateWithAlgorithmicDebuggerAction;
   QAction *mpSimulationSetupAction;
-  QAction *mpCopyClassAction;
+  QAction *mpDuplicateClassAction;
   QAction *mpUnloadClassAction;
   QAction *mpUnloadTextFileAction;
   QAction *mpUnloadXMLFileAction;
@@ -235,7 +235,7 @@ public slots:
   void instantiateModel();
   void checkModel();
   void checkAllModels();
-  void copyClass();
+  void duplicateClass();
   void unloadClass();
   void unloadTextFile();
   void unloadXMLFile();

OMEdit/OMEditGUI/Modeling/ModelWidgetContainer.cpp

@@ -884,8 +884,8 @@ void GraphicsView::createActions()
   mpDeleteAction->setShortcut(QKeySequence::Delete);
   mpDeleteAction->setDisabled(isSystemLibrary);
   // Duplicate Action
-  mpDuplicateAction = new QAction(QIcon(":/Resources/icons/duplicate.svg"), tr("Duplicate"), this);
-  mpDuplicateAction->setStatusTip(tr("Duplicates the item"));
+  mpDuplicateAction = new QAction(QIcon(":/Resources/icons/duplicate.svg"), Helper::duplicate, this);
+  mpDuplicateAction->setStatusTip(Helper::duplicateTip);
   mpDuplicateAction->setShortcut(QKeySequence("Ctrl+d"));
   mpDuplicateAction->setDisabled(isSystemLibrary);
   // Rotate ClockWise Action

OMEdit/OMEditGUI/Modeling/ModelicaClassDialog.cpp

@@ -776,11 +776,11 @@ void SaveAsClassDialog::showHideSaveContentsInOneFileCheckBox(QString text)
   \param nameStructure - qualified name of Modelica class
   \param pParent - pointer to MainWindow
   */
-CopyClassDialog::CopyClassDialog(LibraryTreeNode *pLibraryTreeNode, MainWindow *pMainWindow)
+DuplicateClassDialog::DuplicateClassDialog(LibraryTreeNode *pLibraryTreeNode, MainWindow *pMainWindow)
   : QDialog(pMainWindow, Qt::WindowTitleHint), mpLibraryTreeNode(pLibraryTreeNode), mpMainWindow(pMainWindow)
 {
   setAttribute(Qt::WA_DeleteOnClose);
-  setWindowTitle(QString(Helper::applicationName).append(" - Copy ").append(mpLibraryTreeNode->getNameStructure()));
+  setWindowTitle(QString("%1 - %2 %3").arg(Helper::applicationName).arg(Helper::duplicate).arg(mpLibraryTreeNode->getNameStructure()));
   mpNameLabel = new Label(Helper::name);
   mpNameTextBox = new QLineEdit;
   mpPathLabel = new Label(Helper::path);
@@ -791,7 +791,7 @@ CopyClassDialog::CopyClassDialog(LibraryTreeNode *pLibraryTreeNode, MainWindow *
   // Create the buttons
   mpOkButton = new QPushButton(Helper::ok);
   mpOkButton->setAutoDefault(true);
-  connect(mpOkButton, SIGNAL(clicked()), SLOT(copyClass()));
+  connect(mpOkButton, SIGNAL(clicked()), SLOT(duplicateClass()));
   mpCancelButton = new QPushButton(Helper::cancel);
   mpCancelButton->setAutoDefault(false);
   connect(mpCancelButton, SIGNAL(clicked()), SLOT(reject()));
@@ -811,25 +811,26 @@ CopyClassDialog::CopyClassDialog(LibraryTreeNode *pLibraryTreeNode, MainWindow *
   setLayout(pMainLayout);
 }
 
-void CopyClassDialog::browsePath()
+void DuplicateClassDialog::browsePath()
 {
   LibraryBrowseDialog *pLibraryBrowseDialog = new LibraryBrowseDialog(tr("Select Path"), mpPathTextBox, mpMainWindow->getLibraryTreeWidget());
   pLibraryBrowseDialog->exec();
 }
 
-void CopyClassDialog::copyClass()
+/*!
+ * \brief DuplicateClassDialog::duplicateClass
+ * Duplicates the class.
+ */
+void DuplicateClassDialog::duplicateClass()
 {
-  if (mpNameTextBox->text().isEmpty())
-  {
+  if (mpNameTextBox->text().isEmpty()) {
     QMessageBox::critical(this, QString(Helper::applicationName).append(" - ").append(Helper::error),
                           GUIMessages::getMessage(GUIMessages::ENTER_NAME).arg("class"), Helper::ok);
     return;
   }
   /* if path class doesn't exist. */
-  if (!mpPathTextBox->text().isEmpty())
-  {
-    if (!mpMainWindow->getOMCProxy()->existClass(mpPathTextBox->text()))
-    {
+  if (!mpPathTextBox->text().isEmpty()) {
+    if (!mpMainWindow->getOMCProxy()->existClass(mpPathTextBox->text())) {
       QMessageBox::critical(this, QString(Helper::applicationName).append(" - ").append(Helper::error), GUIMessages::getMessage(
                               GUIMessages::INSERT_IN_CLASS_NOT_FOUND).arg(mpPathTextBox->text()), Helper::ok);
       return;
@@ -843,7 +844,7 @@ void CopyClassDialog::copyClass()
                           .arg((mpPathTextBox->text().isEmpty() ? "Top Level" : mpPathTextBox->text())), Helper::ok);
     return;
   }
-  // if everything is fine then copy the class.
+  // if everything is fine then duplicate the class.
   if (mpMainWindow->getOMCProxy()->copyClass(mpLibraryTreeNode->getNameStructure(), mpNameTextBox->text(), mpPathTextBox->text())) {
     LibraryTreeWidget *pLibraryTreeWidget = mpMainWindow->getLibraryTreeWidget();
     LibraryTreeNode *pLibraryTreeNode;

OMEdit/OMEditGUI/Modeling/ModelicaClassDialog.h

@@ -146,11 +146,11 @@ private slots:
 };
 
 class LibraryTreeNode;
-class CopyClassDialog : public QDialog
+class DuplicateClassDialog : public QDialog
 {
   Q_OBJECT
 public:
-  CopyClassDialog(LibraryTreeNode *pLibraryTreeNode, MainWindow *pMainWindow);
+  DuplicateClassDialog(LibraryTreeNode *pLibraryTreeNode, MainWindow *pMainWindow);
 private:
   LibraryTreeNode *mpLibraryTreeNode;
   MainWindow *mpMainWindow;
@@ -164,7 +164,7 @@ class CopyClassDialog : public QDialog
   QDialogButtonBox *mpButtonBox;
 public slots:
   void browsePath();
-  void copyClass();
+  void duplicateClass();
 };
 
 class RenameClassDialog : public QDialog

OMEdit/OMEditGUI/Util/Helper.cpp

@@ -186,6 +186,8 @@ QString Helper::loading;
 QString Helper::question;
 QString Helper::search;
 QString Helper::unloadClass;
+QString Helper::duplicate;
+QString Helper::duplicateTip;
 QString Helper::unloadClassTip;
 QString Helper::unloadXMLTip;
 QString Helper::refresh;
@@ -362,6 +364,8 @@ void Helper::initHelperVariables()
   Helper::loading = tr("Loading");
   Helper::question = tr("Question");
   Helper::search = tr("Search");
+  Helper::duplicate = tr("Duplicate");
+  Helper::duplicateTip = tr("Duplicates the item");
   Helper::unloadClass = tr("Unload");
   Helper::unloadClassTip = tr("Unload the Modelica class");
   Helper::unloadXMLTip = tr("Unload the XML file");

OMEdit/OMEditGUI/Util/Helper.h

@@ -187,6 +187,8 @@ class Helper : public QObject
   static QString loading;
   static QString question;
   static QString search;
+  static QString duplicate;
+  static QString duplicateTip;
   static QString unloadClass;
   static QString unloadClassTip;
   static QString unloadXMLTip;