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

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

Revision: 1001
          http://sourceforge.net/p/seq/svn/1001
Author:   cn187
Date:     2020-01-03 21:19:34 +0000 (Fri, 03 Jan 2020)
Log Message:
-----------
Fix adding filters from spawnlist menus, fix filter dialog title bug

Modified Paths:
--------------
    showeq/branches/pre_6_0_beta/configure.in
    showeq/branches/pre_6_0_beta/src/filtermgr.cpp
    showeq/branches/pre_6_0_beta/src/spawnlistcommon.cpp
    showeq/branches/pre_6_0_beta/src/spawnlistcommon.h

Modified: showeq/branches/pre_6_0_beta/configure.in
===================================================================
--- showeq/branches/pre_6_0_beta/configure.in	2019-12-22 14:07:36 UTC (rev 1000)
+++ showeq/branches/pre_6_0_beta/configure.in	2020-01-03 21:19:34 UTC (rev 1001)
@@ -2,7 +2,7 @@
 dnl $Id$ $Name$
 
 AC_PREREQ(2.59)
-AC_INIT(showeq, 6.0.0.0-pre8)
+AC_INIT(showeq, 6.0.0.0-pre9)
 AC_CONFIG_SRCDIR(src/main.cpp)
 AC_CONFIG_MACRO_DIR([m4])
 AC_CANONICAL_SYSTEM

Modified: showeq/branches/pre_6_0_beta/src/filtermgr.cpp
===================================================================
--- showeq/branches/pre_6_0_beta/src/filtermgr.cpp	2019-12-22 14:07:36 UTC (rev 1000)
+++ showeq/branches/pre_6_0_beta/src/filtermgr.cpp	2020-01-03 21:19:34 UTC (rev 1001)
@@ -125,7 +125,7 @@
 
 QString FilterMgr::filterName(uint8_t filter) const
 {
-  return m_types->names(filter);
+  return m_types->name(filter);
 }
 
 void FilterMgr::loadFilters(void)

Modified: showeq/branches/pre_6_0_beta/src/spawnlistcommon.cpp
===================================================================
--- showeq/branches/pre_6_0_beta/src/spawnlistcommon.cpp	2019-12-22 14:07:36 UTC (rev 1000)
+++ showeq/branches/pre_6_0_beta/src/spawnlistcommon.cpp	2020-01-03 21:19:34 UTC (rev 1001)
@@ -534,49 +534,51 @@
   connect (spawnListColMenu, SIGNAL(triggered(QAction*)),
 	   this, SLOT(toggle_spawnListCol(QAction*)));
 
-  int x;
-  QMenu* filterMenu = new QMenu;
-  m_id_filterMenu = insertItem("Add &Filter", filterMenu);
-  setItemEnabled(m_id_filterMenu, false);
-  x = filterMenu->insertItem("&Hunt...");
-  filterMenu->setItemParameter(x, HUNT_FILTER);
-  x = filterMenu->insertItem("&Caution...");
-  filterMenu->setItemParameter(x, CAUTION_FILTER);
-  x = filterMenu->insertItem("&Danger...");
-  filterMenu->setItemParameter(x, DANGER_FILTER);
-  x = filterMenu->insertItem("&Locate...");
-  filterMenu->setItemParameter(x, LOCATE_FILTER);
-  x = filterMenu->insertItem("&Alert...");
-  filterMenu->setItemParameter(x, ALERT_FILTER);
-  x = filterMenu->insertItem("&Filtered...");
-  filterMenu->setItemParameter(x, FILTERED_FILTER);
-  x = filterMenu->insertItem("&Tracer...");
-  filterMenu->setItemParameter(x, TRACER_FILTER);
-  connect (filterMenu, SIGNAL(activated(int)), 
-	   this, SLOT(add_filter(int)));
+  QAction* tmpAction;
+  m_filterMenu = new QMenu("Add &Filter");
+  addMenu(m_filterMenu);
+  m_filterMenu->setEnabled(false);
+  tmpAction = m_filterMenu->addAction("&Hunt...");
+  tmpAction->setData(HUNT_FILTER);
+  tmpAction = m_filterMenu->addAction("&Caution...");
+  tmpAction->setData(CAUTION_FILTER);
+  tmpAction = m_filterMenu->addAction("&Danger...");
+  tmpAction->setData(DANGER_FILTER);
+  tmpAction = m_filterMenu->addAction("&Locate...");
+  tmpAction->setData(LOCATE_FILTER);
+  tmpAction = m_filterMenu->addAction("&Alert...");
+  tmpAction->setData(ALERT_FILTER);
+  tmpAction = m_filterMenu->addAction("&Filtered...");
+  tmpAction->setData(FILTERED_FILTER);
+  tmpAction = m_filterMenu->addAction("&Tracer...");
+  tmpAction->setData(TRACER_FILTER);
+  connect (m_filterMenu, SIGNAL(triggered(QAction*)),
+          this, SLOT(add_filter(QAction*)));
 
-  QMenu* zoneFilterMenu = new QMenu;
-  m_id_zoneFilterMenu = insertItem("Add &Zone Filter", zoneFilterMenu);
-  setItemEnabled(m_id_zoneFilterMenu, false);
-  x = zoneFilterMenu->insertItem("&Hunt...");
-  zoneFilterMenu->setItemParameter(x, HUNT_FILTER);
-  x = zoneFilterMenu->insertItem("&Caution...");
-  zoneFilterMenu->setItemParameter(x, CAUTION_FILTER);
-  x = zoneFilterMenu->insertItem("&Danger...");
-  zoneFilterMenu->setItemParameter(x, DANGER_FILTER);
-  x = zoneFilterMenu->insertItem("&Locate...");
-  zoneFilterMenu->setItemParameter(x, LOCATE_FILTER);
-  x = zoneFilterMenu->insertItem("&Alert...");
-  zoneFilterMenu->setItemParameter(x, ALERT_FILTER);
-  x = zoneFilterMenu->insertItem("&Filtered...");
-  zoneFilterMenu->setItemParameter(x, FILTERED_FILTER);
-  x = zoneFilterMenu->insertItem("&Tracer...");
-  zoneFilterMenu->setItemParameter(x, TRACER_FILTER);
-  connect (zoneFilterMenu, SIGNAL(activated(int)), 
-	   this, SLOT(add_zoneFilter(int)));
 
+  m_zoneFilterMenu = new QMenu("Add &Zone Filter");
+  addMenu(m_zoneFilterMenu);
+  m_zoneFilterMenu->setEnabled(false);
+  tmpAction = m_zoneFilterMenu->addAction("&Hunt...");
+  tmpAction->setData(HUNT_FILTER);
+  tmpAction = m_zoneFilterMenu->addAction("&Caution...");
+  tmpAction->setData(CAUTION_FILTER);
+  tmpAction = m_zoneFilterMenu->addAction("&Danger...");
+  tmpAction->setData(DANGER_FILTER);
+  tmpAction = m_zoneFilterMenu->addAction("&Locate...");
+  tmpAction->setData(LOCATE_FILTER);
+  tmpAction = m_zoneFilterMenu->addAction("&Alert...");
+  tmpAction->setData(ALERT_FILTER);
+  tmpAction = m_zoneFilterMenu->addAction("&Filtered...");
+  tmpAction->setData(FILTERED_FILTER);
+  tmpAction = m_zoneFilterMenu->addAction("&Tracer...");
+  tmpAction->setData(TRACER_FILTER);
+  connect (m_zoneFilterMenu, SIGNAL(triggered(QAction*)),
+	   this, SLOT(add_zoneFilter(QAction*)));
+
   insertSeparator(-1);
 
+  int x;
   x = insertItem("&Add Category...", this, SLOT(add_category(int)));
   m_id_edit_category = 
     insertItem("&Edit Category...", this, SLOT(edit_category(int)));
@@ -633,22 +635,18 @@
   m_currentItem = item;
 
   // enable/disable item depending on if there is one
-  setItemEnabled(m_id_filterMenu, (item != NULL));
-  setItemEnabled(m_id_zoneFilterMenu, (item != NULL));
+  m_filterMenu->setEnabled(item != NULL);
+  m_zoneFilterMenu->setEnabled(item != NULL);
 
   if (item != NULL)
   {
-    changeItem(m_id_filterMenu,
-	       "Add '" + item->name() + "' &Filter");
-    changeItem(m_id_zoneFilterMenu,
-	       "Add '" + item->name() + "' &Zone Filter");
+    m_filterMenu->setTitle("Add '" + item->name() + "' &Filter");
+    m_zoneFilterMenu->setTitle("Add '" + item->name() + "' &Zone Filter");
   }
   else
   {
-    changeItem(m_id_filterMenu,
-	       "Add &Filter");
-    changeItem(m_id_zoneFilterMenu,
-	       "Add &Zone Filter");
+    m_filterMenu->setTitle("Add &Filter");
+    m_zoneFilterMenu->setTitle("Add &Zone Filter");
   }
 }
 
@@ -658,12 +656,12 @@
   m_spawnlist->setColumnVisible(colnum, col->isChecked());
 }
 
-void SpawnListMenu::add_filter(int id)
+void SpawnListMenu::add_filter(QAction* selection)
 {
   if (m_currentItem == NULL)
     return;
 
-  int filter = itemParameter(id);
+  int filter = selection->data().value<int>();
   QString filterName = m_filterMgr->filterName(filter);
   QString filterString = m_currentItem->filterString();
 
@@ -681,12 +679,12 @@
     m_filterMgr->addFilter(filter, filterString);
 }
 
-void SpawnListMenu::add_zoneFilter(int id)
+void SpawnListMenu::add_zoneFilter(QAction* selection)
 {
   if (m_currentItem == NULL)
     return;
 
-  int filter = itemParameter(id);
+  int filter = selection->data().value<int>();
   QString filterName = m_filterMgr->filterName(filter);
   QString filterString = m_currentItem->filterString();
 

Modified: showeq/branches/pre_6_0_beta/src/spawnlistcommon.h
===================================================================
--- showeq/branches/pre_6_0_beta/src/spawnlistcommon.h	2019-12-22 14:07:36 UTC (rev 1000)
+++ showeq/branches/pre_6_0_beta/src/spawnlistcommon.h	2020-01-03 21:19:34 UTC (rev 1001)
@@ -127,8 +127,8 @@
  protected slots:
    void init_Menu(void);
    void toggle_spawnListCol( QAction* col );
-   void add_filter(int id);
-   void add_zoneFilter(int id);
+   void add_filter(QAction* selection);
+   void add_zoneFilter(QAction* selection);
    void add_category(int id);
    void edit_category(int id);
    void delete_category(int id);
@@ -143,8 +143,8 @@
   CategoryMgr* m_categoryMgr;
   const Category* m_currentCategory;
   const Item* m_currentItem;
-  int m_id_filterMenu;
-  int m_id_zoneFilterMenu;
+  QMenu* m_filterMenu;
+  QMenu* m_zoneFilterMenu;
   QAction* m_action_spawnList_Cols[tSpawnColMaxCols];
   int m_id_edit_category;
   int m_id_delete_category;

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