Merge branch 'master' of https://github.com/RxLaboratory/Ramses-Client

Author: Nico-Duduf

src/duqf-app/duui.cpp

@@ -132,7 +132,7 @@ void DuUI::replaceCSS(QWidget *w, const QString &css, const QString &where)
         newStyleList << css;
         newStyleList << "/*DuUI:End:"+where+"*/";
     }
-    qDebug() << newStyleList.join("\n");
+
     w->setStyleSheet(newStyleList.join("\n"));
 }
 

src/rameditwidgets/statuseditwidget.cpp

@@ -5,6 +5,7 @@
 #include "ramabstractitem.h"
 #include "ramses.h"
 #include "ramworkingfolder.h"
+#include "ramobjectdelegate.h"
 
 StatusEditWidget::StatusEditWidget(QWidget *parent) :
     ObjectEditWidget( parent)
@@ -190,6 +191,10 @@ void StatusEditWidget::reInit(RamObject *o)
 
         this->setEnabled(false);
     }
+
+
+    // Set the priority color
+    updatePriorityColor();
 }
 
 void StatusEditWidget::setState(RamState *state)
@@ -362,6 +367,8 @@ void StatusEditWidget::setDueDate()
 
     RamUser *currentUser = Ramses::instance()->currentUser();
     m_status->setModifiedBy(currentUser);
+
+    updatePriorityColor();
 }
 
 void StatusEditWidget::setPriority(QVariant p)
@@ -370,6 +377,8 @@ void StatusEditWidget::setPriority(QVariant p)
     m_status->setPriority(
         static_cast<RamStatus::Priority>(p.toInt())
         );
+
+    updatePriorityColor();
 }
 
 void StatusEditWidget::mainFileSelected()
@@ -560,6 +569,27 @@ void StatusEditWidget::removeSelectedPreviewFile()
     refresh();
 }
 
+void StatusEditWidget::updatePriorityColor()
+{
+    if (!m_status) {
+        DuUI::replaceCSS(ui_priorityBox, "/* Default */", "priorityColor");
+        return;
+    }
+
+    float p = m_status->lateness() + m_status->priority();
+    QColor color = RamObjectDelegate::priorityColor(p);
+
+    if (color.alpha() == 0) {
+        DuUI::replaceCSS(ui_priorityBox, "/* Default */", "priorityColor");
+        return;
+    }
+
+    QString colorStyle = "background-color: " + color.name() + "; ";
+    if (color.lightness() > 80) colorStyle += "color: #232323;  ";
+    colorStyle = "QComboBox { " + colorStyle + "}";
+    DuUI::replaceCSS(ui_priorityBox, colorStyle, "priorityColor");
+}
+
 void StatusEditWidget::setupUi()
 {
     this->setMinimumWidth(300);

src/rameditwidgets/statuseditwidget.h

@@ -64,9 +64,12 @@ private slots:
     void openPreviewFile();
     void removeSelectedPreviewFile();
 
+    void updatePriorityColor();
+
 private:
     void setupUi();
     void connectEvents();
+
     RamStateBox *ui_stateBox;
     DuQFSpinBox *ui_completionBox;
     AutoSelectSpinBox *ui_versionBox;

src/rammanagerwidgets/itemmanagerwidget.cpp

@@ -469,6 +469,21 @@ void ItemManagerWidget::setCompletion()
     }
 }
 
+void ItemManagerWidget::setPriority()
+{
+    QAction* action = qobject_cast<QAction*>( sender() );
+    auto priority = static_cast<RamStatus::Priority>( action->data().toInt() );
+    QVector<RamStatus*> status = beginEditSelectedStatus();
+
+    RamUser *currentUser = Ramses::instance()->currentUser();
+
+    for (int i = 0; i < status.count(); i++)
+    {
+        status.at(i)->setPriority( priority );
+        status.at(i)->setModifiedBy(currentUser);
+    }
+}
+
 void ItemManagerWidget::copyComment()
 {
     QModelIndex currentIndex = ui_table->selectionModel()->currentIndex();
@@ -844,6 +859,21 @@ void ItemManagerWidget::setupUi()
     completionMenu->addAction(ui_completion100);
     statusMenu->addMenu(completionMenu);
 
+    DuMenu *priorityMenu = new DuMenu("Set priority", this);
+    ui_priorityNone   = new QAction("None",this);
+    ui_priorityLow  = new QAction("Low",this);
+    ui_priorityMedium  = new QAction("Medium",this);
+    ui_priorityHigh  = new QAction("High",this);
+    ui_priorityNone->setData(RamStatus::NoPriority);
+    ui_priorityLow->setData(RamStatus::LowPriority);
+    ui_priorityMedium->setData(RamStatus::MediumPriority);
+    ui_priorityHigh->setData(RamStatus::HighPriority);
+    priorityMenu->addAction(ui_priorityNone  );
+    priorityMenu->addAction(ui_priorityLow );
+    priorityMenu->addAction(ui_priorityMedium );
+    priorityMenu->addAction(ui_priorityHigh );
+    statusMenu->addMenu(priorityMenu);
+
 
     QToolButton *statusButton = new QToolButton(this);
     statusButton->setText(" Status");
@@ -911,6 +941,13 @@ void ItemManagerWidget::setupUi()
     completionContextMenu->addAction(ui_completion100);
     ui_contextMenu->addMenu(completionContextMenu);
 
+    DuMenu *priorityContextMenu = new DuMenu("Set priority", this);
+    priorityContextMenu->addAction(ui_priorityNone  );
+    priorityContextMenu->addAction(ui_priorityLow );
+    priorityContextMenu->addAction(ui_priorityMedium );
+    priorityContextMenu->addAction(ui_priorityHigh );
+    ui_contextMenu->addMenu(priorityContextMenu);
+
     ui_contextMenu->addSeparator();
 
     ui_actionCopyFileName = new QAction(tr("Copy file name"));
@@ -952,6 +989,10 @@ void ItemManagerWidget::connectEvents()
     connect(ui_completion75 , SIGNAL(triggered()), this, SLOT( setCompletion() ) );
     connect(ui_completion90 , SIGNAL(triggered()), this, SLOT( setCompletion() ) );
     connect(ui_completion100, SIGNAL(triggered()), this, SLOT( setCompletion() ) );
+    connect(ui_priorityNone, SIGNAL(triggered()), this, SLOT( setPriority() ) );
+    connect(ui_priorityLow, SIGNAL(triggered()), this, SLOT( setPriority() ) );
+    connect(ui_priorityMedium, SIGNAL(triggered()), this, SLOT( setPriority() ) );
+    connect(ui_priorityHigh, SIGNAL(triggered()), this, SLOT( setPriority() ) );
     connect(ui_table, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(contextMenuRequested(QPoint)));
     // view actions
     //connect(ui_actionTimeTracking, SIGNAL(toggled(bool)), ui_table, SLOT(setTimeTracking(bool)));

src/rammanagerwidgets/itemmanagerwidget.h

@@ -83,6 +83,7 @@ private slots:
     void setVeryHard();
     void setDiffculty(RamStatus::Difficulty difficulty);
     void setCompletion();
+    void setPriority();
     void copyComment();
     void cutComment();
     void pasteComment();
@@ -152,6 +153,10 @@ private slots:
     QAction *ui_completion75;
     QAction *ui_completion90;
     QAction *ui_completion100;
+    QAction *ui_priorityNone;
+    QAction *ui_priorityLow;
+    QAction *ui_priorityMedium;
+    QAction *ui_priorityHigh;
     DuMenu *ui_contextMenu;
     QAction *ui_copyComment;
     QAction *ui_cutComment;

src/ramobjectdelegates/ramobjectdelegate.cpp

@@ -254,36 +254,36 @@ void RamObjectDelegate::paintProgress(const QModelIndex &index, QPainter *painte
     }
 }
 
-QColor RamObjectDelegate::priorityColor(qreal priority) const
+QColor RamObjectDelegate::priorityColor(qreal priority)
 {
     if (priority < .75) {
         qreal v = Interpolations::linear(priority, .5, .75, 0, 1);
-        QColor c(88, 95, 191);
+        QColor c(250, 237, 95);
         c.setAlpha(v*256);
         return c;
     }
     else if (priority < 1) {
         qreal v = Interpolations::linear(priority, .75, 1, 0, 1);
 
         return ColorUtils::interpolateRGB(
-            QColor(88, 95, 191),
-            QColor(195, 121, 69),
+            QColor(250, 237, 95),
+            QColor(250, 160, 36),
             v );
     }
     else if (priority < 2) {
         qreal v = Interpolations::linear(priority, 1, 2, 0, 1);
 
         return ColorUtils::interpolateRGB(
-            QColor(195, 121, 69),
-            QColor(154, 25, 45),
+            QColor(250, 160, 36),
+            QColor(250, 20, 20),
             v );
     }
     else {
         qreal v = Interpolations::linear(priority, 2, 3, 0, 1);
 
         return ColorUtils::interpolateRGB(
-            QColor(154, 25, 45),
-            QColor(127, 52, 157),
+            QColor(250, 20, 20),
+            QColor(250, 20, 230),
             v );
     }
     return QColor();

src/ramobjectdelegates/ramobjectdelegate.h

@@ -26,6 +26,8 @@ class RamObjectDelegate : public QStyledItemDelegate
 {
     Q_OBJECT
 public:
+    static QColor priorityColor(qreal priority);
+
     RamObjectDelegate(QObject *parent = nullptr);
 
     void paint(QPainter *painter, const QStyleOptionViewItem &option,
@@ -88,7 +90,6 @@ public slots:
     void paintButtons(QPainter *painter, PaintParameters *params, const QModelIndex &index) const;
     void paintDetails(const QModelIndex &index, QPainter *painter, PaintParameters *params) const;
     void paintProgress(const QModelIndex &index, QPainter *painter, PaintParameters *params) const;
-    QColor priorityColor(qreal priority) const;
 
     // Settings
     bool m_editable = false;

src/resources/styles/duDock.css

@@ -7,9 +7,31 @@
 }
 
 .duDock QWidget {
-    background-color: rgba(0,0,0,0);
+    background-color: transparent;
+}
+
+/* CALENDAR POPUP */
+/* normal days */
+.duDock QCalendarWidget QAbstractItemView:enabled
+{
+    background-color: @color-less-dark-grey;
+    color: @color-light-grey;
+}
+
+/* header row */
+.duDock QCalendarWidget QWidget {
+    alternate-background-color: @color-dark-grey;
 }
 
+/* navigation bar */
+.duDock QCalendarWidget QWidget#qt_calendar_navigationbar
+{
+    background-color: @color-less-dark-grey;
+}
+
+
+/* OTHER */
+
 /* Sub Blocks */
 .duDock .duBlock {
     background-color: @color-very-dark-grey;

src/resources/styles/style.css

@@ -197,6 +197,86 @@ QDateTimeEdit::down-arrow:disabled {
       image: none;
 }
 
+/* CALENDAR */
+
+/* normal days */
+QCalendarWidget QAbstractItemView:enabled
+{
+    background-color: @color-less-dark-grey;
+    color: @color-light-grey;
+}
+
+/* header row */
+QCalendarWidget QWidget {
+    alternate-background-color: @color-dark-grey;
+}
+
+/* navigation bar */
+QCalendarWidget QWidget#qt_calendar_navigationbar
+{
+    background-color: @color-less-dark-grey;
+}
+
+/*QCalendarWidget QToolButton {
+    height: 60px;
+    width: 150px;
+    color: white;
+    font-size: 24px;
+    icon-size: 56px, 56px;
+    background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop: 0 #cccccc, stop: 1 #333333);
+}
+
+QCalendarWidget QMenu {
+    width: 150px;
+    left: 20px;
+    color: white;
+    font-size: 18px;
+    background-color: rgb(100, 100, 100);
+}
+
+QCalendarWidget QSpinBox {
+    width: 150px;
+    font-size:24px;
+    color: white;
+    background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop: 0 #cccccc, stop: 1 #333333);
+    selection-background-color: rgb(136, 136, 136);
+    selection-color: rgb(255, 255, 255);
+}
+
+QCalendarWidget QSpinBox::up-button { subcontrol-origin: border;  subcontrol-position: top right;  width:65px; }
+
+QCalendarWidget QSpinBox::down-button {subcontrol-origin: border; subcontrol-position: bottom right;  width:65px;}
+
+QCalendarWidget QSpinBox::up-arrow { width:56px;  height:56px; }
+
+QCalendarWidget QSpinBox::down-arrow { width:56px;  height:56px; }*/
+
+/* header row */
+/*QCalendarWidget QWidget { alternate-background-color: rgb(128, 128, 128); }*/
+
+/* normal days */
+/*QCalendarWidget QAbstractItemView:enabled
+{
+    background-color: blue;
+}
+
+QCalendarWidget
+{
+    background-color: red;
+}*/
+
+/* days in other months */
+/* navigation bar */
+/*QCalendarWidget QWidget#qt_calendar_navigationbar
+{
+    background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop: 0 #cccccc, stop: 1 #333333);
+}*/
+
+/*QCalendarWidget QAbstractItemView:disabled
+{
+    color: rgb(64, 64, 64);
+}*/
+
 /* EDIT TEXTS */
 
 QTextEdit,