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

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

Revision: 988
          http://sourceforge.net/p/seq/svn/988
Author:   cn187
Date:     2019-10-31 01:59:53 +0000 (Thu, 31 Oct 2019)
Log Message:
-----------
Fix window titles for font and color picker dialogs

Modified Paths:
--------------
    showeq/branches/pre_6_0_beta/src/category.cpp
    showeq/branches/pre_6_0_beta/src/map.cpp
    showeq/branches/pre_6_0_beta/src/spawnlistcommon.cpp
    showeq/branches/pre_6_0_beta/src/spawnpointlist.cpp

Modified: showeq/branches/pre_6_0_beta/src/category.cpp
===================================================================
--- showeq/branches/pre_6_0_beta/src/category.cpp	2019-10-31 01:59:50 UTC (rev 987)
+++ showeq/branches/pre_6_0_beta/src/category.cpp	2019-10-31 01:59:53 UTC (rev 988)
@@ -163,7 +163,7 @@
 void CategoryDlg::select_color(void)
 {
   QColor newColor = 
-    QColorDialog::getColor(m_Color->backgroundColor(), this, "Category Color");
+    QColorDialog::getColor(m_Color->backgroundColor(), this, QString("Category Color"));
 
   if (newColor.isValid())
     m_Color->setPalette(QPalette(QColor(newColor)));

Modified: showeq/branches/pre_6_0_beta/src/map.cpp
===================================================================
--- showeq/branches/pre_6_0_beta/src/map.cpp	2019-10-31 01:59:50 UTC (rev 987)
+++ showeq/branches/pre_6_0_beta/src/map.cpp	2019-10-31 01:59:53 UTC (rev 988)
@@ -1394,7 +1394,7 @@
   QString name = QString("ShowEQ - ") + m_map->preferenceName() 
     + " Grid Tick Color";
   QColor newColor = QColorDialog::getColor(m_map->gridTickColor(),
-                       m_map, (const char*)name);
+                       m_map, name);
 
   if (newColor.isValid())
     m_map->setGridTickColor(newColor);
@@ -1403,9 +1403,9 @@
 void MapMenu::select_gridLineColor()
 {
   QString name = QString("ShowEQ - ") + m_map->preferenceName() 
-    + " Grid Tick Color";
+    + " Grid Line Color";
   QColor newColor = QColorDialog::getColor(m_map->gridLineColor(),
-                       m_map, (const char*)name);
+                       m_map, name);
 
   if (newColor.isValid())
     m_map->setGridLineColor(newColor);
@@ -1416,7 +1416,7 @@
   QString name = QString("ShowEQ - ") + m_map->preferenceName() 
     + " Background Color";
   QColor newColor = QColorDialog::getColor(m_map->backgroundColor(),
-                       m_map, (const char*)name);
+                       m_map, name);
 
   if (newColor.isValid())
     m_map->setBackgroundColor(newColor);
@@ -1428,7 +1428,7 @@
     + " Font";
   bool ok = false;
   QFont newFont;
-  newFont = QFontDialog::getFont(&ok, m_map->font(), m_map, (const char*)name);
+  newFont = QFontDialog::getFont(&ok, m_map->font(), m_map, name);
 
   if (ok)
     m_map->setFont(newFont);
@@ -1439,7 +1439,7 @@
   QString name = QString("ShowEQ - ") + m_map->preferenceName() 
     + " Player FOV Color";
   QColor newColor = QColorDialog::getColor(m_map->fovColor(),
-                       m_map, (const char*)name);
+                       m_map, name);
 
   if (newColor.isValid())
     m_map->setFOVColor(newColor);

Modified: showeq/branches/pre_6_0_beta/src/spawnlistcommon.cpp
===================================================================
--- showeq/branches/pre_6_0_beta/src/spawnlistcommon.cpp	2019-10-31 01:59:50 UTC (rev 987)
+++ showeq/branches/pre_6_0_beta/src/spawnlistcommon.cpp	2019-10-31 01:59:53 UTC (rev 988)
@@ -746,7 +746,7 @@
   bool ok = false;
   // get a new font
   newFont = QFontDialog::getFont(&ok, m_spawnlistWindow->font(),
-				 this, "ShowEQ Spawn List Font");
+				 this, QString("ShowEQ Spawn List Font"));
     
     
     // if the user entered a font and clicked ok, set the windows font

Modified: showeq/branches/pre_6_0_beta/src/spawnpointlist.cpp
===================================================================
--- showeq/branches/pre_6_0_beta/src/spawnpointlist.cpp	2019-10-31 01:59:50 UTC (rev 987)
+++ showeq/branches/pre_6_0_beta/src/spawnpointlist.cpp	2019-10-31 01:59:53 UTC (rev 988)
@@ -514,7 +514,7 @@
 
   // get a new font
   newFont = QFontDialog::getFont(&ok, window->font(), 
-				 this, "ShowEQ Spawn Point List Font");
+				 this, QString("ShowEQ Spawn Point List Font"));
     
     
     // if the user entered a font and clicked ok, set the windows font

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