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

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

Revision: 1093
          http://sourceforge.net/p/seq/svn/1093
Author:   cn187
Date:     2020-11-02 01:42:23 +0000 (Mon, 02 Nov 2020)
Log Message:
-----------
Fix issues relating to setting of caption/font for windows

* Fix issue where setting default application/status fonts also prompted you
    to set the spawnlist font
* Fix issue where setting spawnpointlist font/caption set them for spawnlist2
    instead

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

Modified: showeq/branches/pre_6_0_beta/src/interface.cpp
===================================================================
--- showeq/branches/pre_6_0_beta/src/interface.cpp	2020-11-02 01:42:12 UTC (rev 1092)
+++ showeq/branches/pre_6_0_beta/src/interface.cpp	2020-11-02 01:42:23 UTC (rev 1093)
@@ -1715,11 +1715,13 @@
    QMenu* windowFontMenu = new QMenu("&Font");
    m_windowMenu->insertMenu(m_windowMenu->actions()[1], windowFontMenu);
 
-   windowFontMenu->addAction("&Application Default...", this,
+   tmpAction = windowFontMenu->addAction("&Application Default...", this,
            SLOT(set_main_Font()));
+   tmpAction->setData(-1);
 
-   windowFontMenu->addAction("Main Window Status Font...", this,
+   tmpAction = windowFontMenu->addAction("Main Window Status Font...", this,
            SLOT(set_main_statusbar_Font()));
+   tmpAction->setData(-1);
    //   x = windowFontMenu->insertItem("&Main Window");
    //   windowFontMenu->setItemParameter(x, 5);
 
@@ -2963,6 +2965,7 @@
     widget = m_spawnPointList;
 
     window = "Spawn Point List";
+    break;
   case 10: // Spawn List
     widget = m_spawnList2;
 
@@ -3015,6 +3018,16 @@
   // up it will have to do
   switch(winnum)
   {
+  case -1:
+      // since the entire submenu is bound to this function, this function
+      // gets called for font changes that aren't handled here (default app
+      // and status bar).  So we've set the ID to -1 in both case, and we
+      // ignore it here.
+      //
+      // TODO this can be fixed by creating an action group for the menu,
+      // adding the relevant entries to to, and then changing the connect
+      // call to connect the action group instead of the entire menu.
+      return;
   case 0: // Spawn List
     title = "Spawn List";
     
@@ -3062,6 +3075,7 @@
     title = "Spawn Point List";
 
     window = m_spawnPointList;
+    break;
   case 10: // Spawn List
     title = "Spawn List 2";
     

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