[Seq-cvs-commit] SF.net SVN: seq:[987] showeq/branches/pre_6_0_beta/src

[<cn...@us...>]

Revision: 987
          http://sourceforge.net/p/seq/svn/987
Author:   cn187
Date:     2019-10-31 01:59:50 +0000 (Thu, 31 Oct 2019)
Log Message:
-----------
Fix setting custom con colors, typo in con color menu, and con color dialog title

Modified Paths:
--------------
    showeq/branches/pre_6_0_beta/src/interface.cpp
    showeq/branches/pre_6_0_beta/src/player.h

Modified: showeq/branches/pre_6_0_beta/src/interface.cpp
===================================================================
--- showeq/branches/pre_6_0_beta/src/interface.cpp	2019-10-31 01:59:47 UTC (rev 986)
+++ showeq/branches/pre_6_0_beta/src/interface.cpp	2019-10-31 01:59:50 UTC (rev 987)
@@ -1123,7 +1123,7 @@
    tmpAction = conColorBaseMenu->addAction("Even Spawn...");
    tmpAction->setData(tEvenSpawn);
 
-   tmpAction = conColorBaseMenu->addAction("Yello Spawn Base...");
+   tmpAction = conColorBaseMenu->addAction("Yellow Spawn Base...");
    tmpAction->setData(tYellowSpawn);
 
    tmpAction = conColorBaseMenu->addAction("Red Spawn Base...");
@@ -4516,14 +4516,13 @@
 void 
 EQInterface::select_opt_conColorBase(QAction* con)
 {
-  //ColorLevel level = (ColorLevel)menuBar()->itemParameter(id);
-  ColorLevel level = con->data().value<ColorLevel>();
+  ColorLevel level = (ColorLevel) con->data().value<int>();
 
   // get the current color
   QColor color = m_player->conColorBase(level);
 
   // get the new color
-  QColor newColor = QColorDialog::getColor(color, this, "ShowEQ - Con Color");
+  QColor newColor = QColorDialog::getColor(color, this, QString("ShowEQ - Con Color"));
 
   // only set if the user selected a valid color and clicked ok
   if (newColor.isValid())

Modified: showeq/branches/pre_6_0_beta/src/player.h
===================================================================
--- showeq/branches/pre_6_0_beta/src/player.h	2019-10-31 01:59:47 UTC (rev 986)
+++ showeq/branches/pre_6_0_beta/src/player.h	2019-10-31 01:59:50 UTC (rev 987)
@@ -52,8 +52,6 @@
   tMaxColorLevels = 8
 };
 
-Q_DECLARE_METATYPE(ColorLevel)
-
 //----------------------------------------------------------------------
 // Player
 class Player : public QObject, public Spawn

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.