[denncoCreator] fixed minor issues.

diff --git a/Source/dialog/dcaddcelldialog.cpp b/Source/dialog/dcaddcelldialog.cpp
index 60e6f63..d374fab 100644 (file)
--- a/Source/dialog/dcaddcelldialog.cpp
+++ b/Source/dialog/dcaddcelldialog.cpp
@@ -128,6 +128,7 @@ bool DCAddCellDialog::checkInput()
         {
             d_statusText->setText(QString::fromStdString(path));
             d_okButton->setEnabled(true);
+            d_okButton->setDefault(true);
             return true;
         }
     }
@@ -136,6 +137,7 @@ bool DCAddCellDialog::checkInput()
         d_message->setText(tr("Input cell name"));
     }
     d_okButton->setEnabled(false);
+    d_cancelButton->setDefault(true);
     return false;
 }
 

diff --git a/Source/mainwindow.ui b/Source/mainwindow.ui
index 083655d..389db37 100644 (file)
--- a/Source/mainwindow.ui
+++ b/Source/mainwindow.ui
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>MainWindow</string>
+   <string>dennco creator</string>
   </property>
   <widget class="QWidget" name="centralWidget"/>
   <widget class="QMenuBar" name="menuBar">

diff --git a/Source/treeview/dctreeviewwidget.cpp b/Source/treeview/dctreeviewwidget.cpp
index aa47695..eae8ca5 100644 (file)
--- a/Source/treeview/dctreeviewwidget.cpp
+++ b/Source/treeview/dctreeviewwidget.cpp
@@ -35,12 +35,15 @@
 
 static DCTreeViewWidget *s_treeViewWidget = NULL;
 
-static bool IsIndexUnderContainer(const QFileSystemModel *model, QModelIndex index)
+static bool IsIndexUnderContainer(const QFileSystemModel *model, QModelIndex index, bool includesContainerDir = false)
 {
     bool r = false;
 
-    if (index.isValid())
-        index = index.parent();
+    if (!includesContainerDir)
+    {
+        if (index.isValid())
+            index = index.parent();
+    }
 
     while (index.isValid())
     {
@@ -263,7 +266,7 @@ void DCTreeViewWidget::doContextMenu(const QPoint &pos)
         if (isDir)
         {
             addDictionaryAction = menu.addAction(tr("Add folder"));
-            if (IsIndexUnderContainer(&d_fileSystemModel, index))
+            if (IsIndexUnderContainer(&d_fileSystemModel, index, true))
             {
                 addPageAction = menu.addAction(tr("Add page..."));
             }

diff --git a/Source/visualizer/dcglvisualizerwidget.cpp b/Source/visualizer/dcglvisualizerwidget.cpp
index 1adc65d..844d5bc 100644 (file)
--- a/Source/visualizer/dcglvisualizerwidget.cpp
+++ b/Source/visualizer/dcglvisualizerwidget.cpp
@@ -498,6 +498,9 @@ void DCUIGraphicsScene::sceneSelectedPageChanged(const void* requester, const DC
     if (d_scene != scene)
         return;
 
+    if (d_eventHandler)
+        d_eventHandler->selectedPageChanged(requester);
+
     d_requestRedraw = true;
 }
 

diff --git a/Source/visualizer/eventhandler/dcveventhandler.h b/Source/visualizer/eventhandler/dcveventhandler.h
index 756c2dc..d93d61f 100644 (file)
--- a/Source/visualizer/eventhandler/dcveventhandler.h
+++ b/Source/visualizer/eventhandler/dcveventhandler.h
@@ -48,6 +48,7 @@ public:
     virtual void keyPressEvent(QKeyEvent *event) = 0;
     virtual void keyReleaseEvent(QKeyEvent *event) = 0;
     virtual void showContextMenu(const QPoint &globalPos) = 0;
+    virtual void selectedPageChanged(const void *requester) = 0;
 };
 
 #endif // DCVEVENTHANDLER_H

diff --git a/Source/visualizer/eventhandler/dcvlayoutmodehandler.cpp b/Source/visualizer/eventhandler/dcvlayoutmodehandler.cpp
index 394cddd..6a27704 100644 (file)
--- a/Source/visualizer/eventhandler/dcvlayoutmodehandler.cpp
+++ b/Source/visualizer/eventhandler/dcvlayoutmodehandler.cpp
@@ -514,3 +514,8 @@ void DCVLayoutModeHandler::showContextMenu(const QPoint &globalPos)
         // nothing was chosen
     }
 }
+
+void DCVLayoutModeHandler::selectedPageChanged(const void *requester)
+{
+
+}

diff --git a/Source/visualizer/eventhandler/dcvlayoutmodehandler.h b/Source/visualizer/eventhandler/dcvlayoutmodehandler.h
index fc3d584..5a1cb27 100644 (file)
--- a/Source/visualizer/eventhandler/dcvlayoutmodehandler.h
+++ b/Source/visualizer/eventhandler/dcvlayoutmodehandler.h
@@ -42,6 +42,7 @@ public:
     virtual void keyPressEvent(QKeyEvent *event) ;
     virtual void keyReleaseEvent(QKeyEvent *event) ;
     virtual void showContextMenu(const QPoint &globalPos);
+    virtual void selectedPageChanged(const void *requester);
 };
 
 #endif // DCVLAYOUTMODEHANDLER_H

diff --git a/Source/visualizer/eventhandler/dcvterminalfromaxonmodehandler.cpp b/Source/visualizer/eventhandler/dcvterminalfromaxonmodehandler.cpp
index d17374e..4efdc1a 100644 (file)
--- a/Source/visualizer/eventhandler/dcvterminalfromaxonmodehandler.cpp
+++ b/Source/visualizer/eventhandler/dcvterminalfromaxonmodehandler.cpp
@@ -68,6 +68,8 @@ void DCVTerminalFromAxonModeHandler::mousePressEvent(QGraphicsSceneMouseEvent *e
 
     QPointF mousePos = event->scenePos();
 
+    d_draggedObject.assign(NULL);
+
     DCVComponent *obj = getView()->getObjectAt(mousePos.x(), mousePos.y(), d_cursor);
     if (!obj)
         return;
@@ -77,7 +79,7 @@ void DCVTerminalFromAxonModeHandler::mousePressEvent(QGraphicsSceneMouseEvent *e
         return;
 
     if (obj !=  getScene()->getTerminalEditCursor() && obj != page)
-            return;
+        return;
 
     switch(getScene()->getPersMode())
     {
@@ -344,4 +346,16 @@ void DCVTerminalFromAxonModeHandler::showContextMenu(const QPoint &globalPos)
 
 }
 
+void DCVTerminalFromAxonModeHandler::selectedPageChanged(const void *requester)
+{
+    if (requester == this)
+        return;
+
+    QList<DCVCPage*> pages = getScene()->getSelectedPages();
+    if (pages.length() == 0)
+        return;
+
+    if (d_cursor->getPageBelonging() != pages.at(0))
+        d_cursor->changePageBelonging(pages.at(0));
 
+}

diff --git a/Source/visualizer/eventhandler/dcvterminalfromaxonmodehandler.h b/Source/visualizer/eventhandler/dcvterminalfromaxonmodehandler.h
index 1cfcafd..b292452 100644 (file)
--- a/Source/visualizer/eventhandler/dcvterminalfromaxonmodehandler.h
+++ b/Source/visualizer/eventhandler/dcvterminalfromaxonmodehandler.h
@@ -49,6 +49,7 @@ public:
     virtual void keyPressEvent(QKeyEvent *event) ;
     virtual void keyReleaseEvent(QKeyEvent *event) ;
     virtual void showContextMenu(const QPoint &globalPos);
+    virtual void selectedPageChanged(const void *requester);
 };
 
 #endif // DCVTERMINALFROMAXONMODEHANDLER_H

diff --git a/Source/visualizer/eventhandler/dcvterminalfromreceptormodehandler.cpp b/Source/visualizer/eventhandler/dcvterminalfromreceptormodehandler.cpp
index 32768f2..2d09c78 100644 (file)
--- a/Source/visualizer/eventhandler/dcvterminalfromreceptormodehandler.cpp
+++ b/Source/visualizer/eventhandler/dcvterminalfromreceptormodehandler.cpp
@@ -50,6 +50,8 @@ void DCVTerminalFromReceptorModeHandler::mousePressEvent(QGraphicsSceneMouseEven
 
     QPointF mousePos = event->scenePos();
 
+    d_draggedObject.assign(NULL);
+
     DCVComponent *obj = getView()->getObjectAt(mousePos.x(), mousePos.y(), d_cursor);
     if (!obj)
         return;
@@ -327,3 +329,17 @@ void DCVTerminalFromReceptorModeHandler::showContextMenu(const QPoint &globalPos
 
 }
 
+void DCVTerminalFromReceptorModeHandler::selectedPageChanged(const void *requester)
+{
+    if (requester == this)
+        return;
+
+    QList<DCVCPage*> pages = getScene()->getSelectedPages();
+    if (pages.length() == 0)
+        return;
+
+    if (d_cursor->getPageBelonging() != pages.at(0))
+        d_cursor->changePageBelonging(pages.at(0));
+
+}
+

diff --git a/Source/visualizer/eventhandler/dcvterminalfromreceptormodehandler.h b/Source/visualizer/eventhandler/dcvterminalfromreceptormodehandler.h
index 5b54528..456fb57 100644 (file)
--- a/Source/visualizer/eventhandler/dcvterminalfromreceptormodehandler.h
+++ b/Source/visualizer/eventhandler/dcvterminalfromreceptormodehandler.h
@@ -45,5 +45,6 @@ public:
     virtual void keyPressEvent(QKeyEvent *event) ;
     virtual void keyReleaseEvent(QKeyEvent *event) ;
     virtual void showContextMenu(const QPoint &globalPos);
+    virtual void selectedPageChanged(const void *requester);
 };
 #endif // DCVTERMINALFROMRECEPTORHANDLER_H

diff --git a/Source/visualizer/toolwindow/dceditablelabel.cpp b/Source/visualizer/toolwindow/dceditablelabel.cpp
index edab281..022aecb 100644 (file)
--- a/Source/visualizer/toolwindow/dceditablelabel.cpp
+++ b/Source/visualizer/toolwindow/dceditablelabel.cpp
@@ -24,15 +24,15 @@
 #include <QMouseEvent>
 
 static const QString HOVERSTYLE =
-        "background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,stop: 0 rgba(0,0,0,60), stop: 0.3 rgba(70,80,70,60), stop: 0.9 rgba(70,80,70,60), stop: 1.0 rgba(0,0,0,60));"
-        "border: 1px solid rgba(40,50,40,60); text-align:left; padding: 0 4px;";
+        "background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,stop: 0 rgb(80,80,80), stop: 0.3 rgb(120,128,120), stop: 0.9 rgb(120,128,120), stop: 1.0 rgb(80,80,80));"
+        "border: 1px solid rgb(100,100,100); text-align:left; padding: 0 4px;";
 
 static const QString NORMALSTYLE =
-        "background: rgba(0,0,0,50); border: 1px solid rgba(0,0,0,60); text-align:left; padding: 0 4px;";
+        "background: rgb(80,80,80); border: 1px solid rgb(100,100,100); text-align:left; padding: 0 4px;";
 
 static const QString EDITSTYLE =
         "background: qlineargradient(x1: 0, y1: 0, x2: 0, y2: 1,stop: 0 rgb(0,0,0), stop: 0.3 rgb(40,40,40), stop: 1.0 rgb(40,40,40));"
-        "border: 1px solid rgb(40,50,40); text-align:left; padding: 0 4px;";
+        "border: 1px solid rgb(80,80,80); text-align:left; padding: 0 4px;";
 
 DCEditableLabel::DCEditableLabel(DCToolWindowBase *parent, const QString &text) :
     QLineEdit(text), d_parent(parent), d_mouseOver(false)

diff --git a/Source/visualizer/toolwindow/dctoolwindowbase.cpp b/Source/visualizer/toolwindow/dctoolwindowbase.cpp
index 4b73374..144d580 100644 (file)
--- a/Source/visualizer/toolwindow/dctoolwindowbase.cpp
+++ b/Source/visualizer/toolwindow/dctoolwindowbase.cpp
@@ -20,22 +20,23 @@
 
 const static QString DialogContentStyle =
         "* {color: white} "
-        "QDialog {background-color: rgba(255,255,255,60);} "
+        "QDialog {background-color: rgb(110,110,110);} "
         "QRadioButton {background-color: transparent;} "
         "QPlainTextEdit {background: black;} "
-        "QGroupBox { border: 1px solid gray; border-radius: 3px;} "
+        "QGroupBox {border: 1px solid rgb(160,160,160); border-radius: 3px;} "
         "QTableView { background: black;} "
         "QPushButton { background-color: rgb(128,128,128);} "
-        "QComboBox { background-color: rgb(128,128,128); "
-        "       border: 1px solid gray;"
+        "QComboBox { background-color: rgb(80,80,80); "
+        "       border: 1px  rgb(80,80,80);"
         "       border-radius: 3px;"
         "       padding: 1px 18px 1px 3px;"
         "       }"
-        "QComboBox QAbstractItemView {"
-        "       background: rgb(128,128,128);"
+        "QAbstractItemView {"
+        "       background: rgb(80,80,80);"
         "       color: white;"
-        "       selection-background-color: rgb(128,128,255);"
-        "}";
+        "       selection-background-color: rgb(80,80,255);"
+        "}"
+        ;
 
 DCToolWindowBase::DCToolWindowBase(const QString &windowTitle,DCCreator *creator)
     : QDialog(0,Qt::CustomizeWindowHint | Qt::FramelessWindowHint), d_collapsed(false), d_creator(creator)

diff --git a/Source/visualizer/toolwindow/dctoolwindowcellcodeeditor.cpp b/Source/visualizer/toolwindow/dctoolwindowcellcodeeditor.cpp
index f641a34..c5e88a7 100644 (file)
--- a/Source/visualizer/toolwindow/dctoolwindowcellcodeeditor.cpp
+++ b/Source/visualizer/toolwindow/dctoolwindowcellcodeeditor.cpp
@@ -42,6 +42,7 @@
 DCToolWindowCellCodeEditor::DCToolWindowCellCodeEditor(DCCreator *creator) :
     DCToolWindowBase("CELL CODE:", creator), d_mode(CELLCLASS_EDIT_MODE), d_container(NULL), d_cellCodeClass(NULL), d_ownerCell(NULL)
 {
+    setWindowOpacity(0.95);
     d_editor = new DCCodeEditor;
 
     QHBoxLayout *layout = new QHBoxLayout;
@@ -58,12 +59,9 @@ DCToolWindowCellCodeEditor::DCToolWindowCellCodeEditor(DCCreator *creator) :
     d_uiClassName = new DCEditableLabel(this, "");
     d_uiClassType = new DCCellCodeTypeComboBox(creator, this);
     d_uiClassUnsetButton = new QPushButton(tr("Unset class"));
-    d_uiClassUserList = new QTableView;
     cellclassGroupBoxLayoutInnder1->addWidget(d_uiClassName, 0,1);
     cellclassGroupBoxLayoutInnder1->addWidget(d_uiClassType, 1,1);
     cellclassGroupBoxLayoutInnder1->addWidget(d_uiClassUnsetButton, 2,0,1,2);
-    cellclassGroupBoxLayoutInnder1->addWidget(new QLabel(tr("Cells uses the cell code")), 3,0,1,2);
-    cellclassGroupBoxLayoutInnder1->addWidget(d_uiClassUserList, 4,0,1,2);
 
     QVBoxLayout *cellclassGroupBoxLayoutInnder2 = new QVBoxLayout;
     d_uiClassAssignButton = new QPushButton(tr("Assign a class"));

diff --git a/Source/visualizer/toolwindow/dctoolwindowcellcodeeditor.h b/Source/visualizer/toolwindow/dctoolwindowcellcodeeditor.h
index ec4d36d..51de735 100644 (file)
--- a/Source/visualizer/toolwindow/dctoolwindowcellcodeeditor.h
+++ b/Source/visualizer/toolwindow/dctoolwindowcellcodeeditor.h
@@ -47,7 +47,6 @@ private:
     QGroupBox               *d_uiClassGroupBox;
     DCEditableLabel         *d_uiClassName;
     DCCellCodeTypeComboBox  *d_uiClassType;
-    QTableView              *d_uiClassUserList;
     QPushButton             *d_uiClassUnsetButton;
     QPushButton             *d_uiClassAssignButton;
 

diff --git a/Source/visualizer/toolwindow/dctoolwindowcelleditor.cpp b/Source/visualizer/toolwindow/dctoolwindowcelleditor.cpp
index 9e89579..130a188 100644 (file)
--- a/Source/visualizer/toolwindow/dctoolwindowcelleditor.cpp
+++ b/Source/visualizer/toolwindow/dctoolwindowcelleditor.cpp
@@ -60,6 +60,11 @@ public:
         if (!cell)
             return false;
 
+        if (index.column() != 0)
+        {
+            return DCQtItemModel::setData(index, value, role);
+        }
+
         DCQtItemModelItem *item = getItem(index);
         QString oldReceptorName = item->data(index.column()).toString();
         QString newReceptorName = value.toString().trimmed();
@@ -143,6 +148,11 @@ public:
         if (!cell)
             return false;
 
+        if (index.column() != 0)
+        {
+            return DCQtItemModel::setData(index, value, role);
+        }
+
         DCQtItemModelItem *item = getItem(index);
         QString oldReceptorName = item->data(index.column()).toString();
         QString newReceptorName = value.toString().trimmed();