Merge branch 'master' into master

OMEdit/OMEditGUI/Annotations/ShapePropertiesDialog.cpp

@@ -204,11 +204,11 @@ ShapePropertiesDialog::ShapePropertiesDialog(ShapeAnnotation *pShapeAnnotation,
   mpFontSizeSpinBox->setValue(mpShapeAnnotation->getFontSize());
   mpFontSizeSpinBox->setSingleStep(1);
   mpFontStyleLabel = new Label(tr("Style:"));
-  mpTextBoldCheckBox = new QCheckBox(tr("Bold"));
+  mpTextBoldCheckBox = new QCheckBox(Helper::bold);
   mpTextBoldCheckBox->setChecked(StringHandler::getFontWeight(mpShapeAnnotation->getTextStyles()) == QFont::Bold ? true : false);
-  mpTextItalicCheckBox = new QCheckBox(tr("Italic"));
+  mpTextItalicCheckBox = new QCheckBox(Helper::italic);
   mpTextItalicCheckBox->setChecked(StringHandler::getFontItalic(mpShapeAnnotation->getTextStyles()));
-  mpTextUnderlineCheckBox = new QCheckBox(tr("Underline"));
+  mpTextUnderlineCheckBox = new QCheckBox(Helper::underline);
   mpTextUnderlineCheckBox->setChecked(StringHandler::getFontUnderline(mpShapeAnnotation->getTextStyles()));
   mpTextHorizontalAlignmentLabel = new Label(tr("Horizontal Alignment:"));
   mpTextHorizontalAlignmentComboBox = new QComboBox;

OMEdit/OMEditGUI/MainWindow.cpp

@@ -2545,7 +2545,6 @@ void MainWindow::createActions()
   // simulate action
   mpSimulateModelAction = new QAction(QIcon(":/Resources/icons/simulate.svg"), Helper::simulate, this);
   mpSimulateModelAction->setStatusTip(Helper::simulateTip);
-  mpSimulateModelAction->setShortcut(QKeySequence("Ctrl+b"));
   mpSimulateModelAction->setEnabled(false);
   connect(mpSimulateModelAction, SIGNAL(triggered()), SLOT(simulateModel()));
   // simulate with transformational debugger action

OMEdit/OMEditGUI/Makefile.unix.in

@@ -17,7 +17,7 @@ LRELEASE=@LRELEASE@
 install: build Resources/nls/qm.stamp
 	mkdir -p ../../build/share/omedit/nls/
 	cp -p $(resourcedir)/*.qm @OMBUILDDIR@/share/omedit/nls/
-	if [ "$(APP)" = ".app" ]; then cp -rp ../bin/OMEdit.app @OMBUILDDIR@/Applications/ ; else cp -p ../bin/OMEdit @OMBUILDDIR@/bin/OMEdit; fi
+	if [ "$(APP)" = ".app" ]; then mkdir -p @OMBUILDDIR@/Applications/ ; cp -rp ../bin/OMEdit.app @OMBUILDDIR@/Applications/ ; else cp -p ../bin/OMEdit @OMBUILDDIR@/bin/OMEdit; fi
 
 Resources/nls/qm.stamp: OMEditGUI.pro Resources/nls/*.ts
 	$(LRELEASE) $<

OMEdit/OMEditGUI/Modeling/DocumentationWidget.h

@@ -37,15 +37,25 @@
 
 #include <QWidget>
 #include <QToolButton>
+#include <QTabbar>
 #include <QFile>
 #include <QWebView>
+#include <QToolBar>
+#include <QComboBox>
+#include <QFontComboBox>
+#include <QSpinBox>
+#include <QColorDialog>
 
 class LibraryTreeItem;
 class DocumentationHistory
 {
 public:
   LibraryTreeItem *mpLibraryTreeItem;
   DocumentationHistory(LibraryTreeItem *pLibraryTreeItem) {mpLibraryTreeItem = pLibraryTreeItem;}
+  bool operator==(const DocumentationHistory &documentationHistory) const
+  {
+    return (documentationHistory.mpLibraryTreeItem == this->mpLibraryTreeItem);
+  }
 };
 
 class DocumentationViewer;
@@ -62,26 +72,63 @@ class DocumentationWidget : public QWidget
   };
   DocumentationWidget(QWidget *pParent = 0);
   ~DocumentationWidget();
-  QToolButton* getPreviousToolButton() {return mpPreviousToolButton;}
-  QToolButton* getNextToolButton() {return mpNextToolButton;}
+  QAction* getPreviousAction() {return mpPreviousAction;}
+  QAction* getNextAction() {return mpNextAction;}
   DocumentationViewer* getDocumentationViewer() {return mpDocumentationViewer;}
   void showDocumentation(LibraryTreeItem *pLibraryTreeItem);
+  void execCommand(const QString &commandName);
+  void execCommand(const QString &commandName, const QString &valueArgument);
+  bool queryCommandState(const QString &commandName);
+  QString queryCommandValue(const QString &commandName);
 private:
   QFile mDocumentationFile;
-  QToolButton *mpPreviousToolButton;
-  QToolButton *mpNextToolButton;
-  QToolButton *mpEditInfoToolButton;
-  QToolButton *mpEditRevisionsToolButton;
-  QToolButton *mpEditInfoHeaderToolButton;
-  QToolButton *mpSaveToolButton;
-  QToolButton *mpCancelToolButton;
+  QAction *mpPreviousAction;
+  QAction *mpNextAction;
+  QAction *mpEditInfoAction;
+  QAction *mpEditRevisionsAction;
+  QAction *mpEditInfoHeaderAction;
+  QAction *mpSaveAction;
+  QAction *mpCancelAction;
   DocumentationViewer *mpDocumentationViewer;
-  HTMLEditor *mpHTMLEditor;
+  QWidget *mpEditorsWidget;
+  QTabBar *mpTabBar;
+  QWidget *mpHTMLEditorWidget;
+  QToolBar *mpEditorToolBar;
+  DocumentationViewer *mpHTMLEditor;
+  QComboBox *mpStyleComboBox;
+  QFontComboBox *mpFontComboBox;
+  QSpinBox *mpFontSizeSpinBox;
+  QAction *mpBoldAction;
+  QAction *mpItalicAction;
+  QAction *mpUnderlineAction;
+  QAction *mpStrikethroughAction;
+  QAction *mpSubscriptAction;
+  QAction *mpSuperscriptAction;
+  QColor mTextColor;
+  QColorDialog *mpTextColorDialog;
+  QToolButton *mpTextColorToolButton;
+  QColor mBackgroundColor;
+  QColorDialog *mpBackgroundColorDialog;
+  QToolButton *mpBackgroundColorToolButton;
+  QToolButton *mpAlignLeftToolButton;
+  QToolButton *mpAlignCenterToolButton;
+  QToolButton *mpAlignRightToolButton;
+  QToolButton *mpJustifyToolButton;
+  QAction *mpDecreaseIndentAction;
+  QAction *mpIncreaseIndentAction;
+  QAction *mpBulletListAction;
+  QAction *mpNumberedListAction;
+  QAction *mpLinkAction;
+  QAction *mpUnLinkAction;
+  HTMLEditor *mpHTMLSourceEditor;
   EditType mEditType;
   QList<DocumentationHistory> *mpDocumentationHistoryList;
   int mDocumentationHistoryPos;
 
+  QPixmap createPixmapForToolButton(QColor color, QIcon icon);
   void updatePreviousNextButtons();
+  void writeDocumentationFile(QString documentation);
+  bool isLinkSelected();
 public slots:
   void previousDocumentation();
   void nextDocumentation();
@@ -90,6 +137,25 @@ public slots:
   void editInfoHeaderDocumentation();
   void saveDocumentation(LibraryTreeItem *pNextLibraryTreeItem = 0);
   void cancelDocumentation();
+  void toggleEditor(int tabIndex);
+  void updateActions();
+  void formatBlock(int index);
+  void fontName(QFont font);
+  void fontSize(int size);
+  void applyTextColor();
+  void applyTextColor(QColor color);
+  void applyBackgroundColor();
+  void applyBackgroundColor(QColor color);
+  void alignLeft();
+  void alignCenter();
+  void alignRight();
+  void justify();
+  void bulletList();
+  void numberedList();
+  void createLink();
+  void removeLink();
+  void updateHTMLSourceEditor();
+  void updateDocumentationHistory();
 };
 
 class DocumentationViewer : public QWebView
@@ -98,7 +164,8 @@ class DocumentationViewer : public QWebView
 private:
   DocumentationWidget *mpDocumentationWidget;
 public:
-  DocumentationViewer(DocumentationWidget *pParent);
+  DocumentationViewer(DocumentationWidget *pDocumentationWidget, bool isContentEditable = false);
+  void setFocusInternal();
 private:
   void createActions();
   void resetZoom();
@@ -108,6 +175,7 @@ public slots:
   void processLinkHover(QString link, QString title, QString textContent);
   void showContextMenu(QPoint point);
 protected:
+  virtual void paintEvent(QPaintEvent *event);
   virtual QWebView* createWindow(QWebPage::WebWindowType type);
   virtual void keyPressEvent(QKeyEvent *event);
   virtual void wheelEvent(QWheelEvent *event);