Menu
▾
▴
[Seq-cvs-commit] SF.net SVN: seq:[1087] showeq/branches/pre_6_0_beta/src
|
From: <cn...@us...> - 2020-10-28 14:23:10
|
Revision: 1087
http://sourceforge.net/p/seq/svn/1087
Author: cn187
Date: 2020-10-28 14:23:07 +0000 (Wed, 28 Oct 2020)
Log Message:
-----------
Replace Q3PopupMenu with QMenu
Modified Paths:
--------------
showeq/branches/pre_6_0_beta/src/messagewindow.cpp
showeq/branches/pre_6_0_beta/src/messagewindow.h
showeq/branches/pre_6_0_beta/src/spelllist.h
Modified: showeq/branches/pre_6_0_beta/src/messagewindow.cpp
===================================================================
--- showeq/branches/pre_6_0_beta/src/messagewindow.cpp 2020-10-28 14:22:59 UTC (rev 1086)
+++ showeq/branches/pre_6_0_beta/src/messagewindow.cpp 2020-10-28 14:23:07 UTC (rev 1087)
@@ -26,7 +26,7 @@
#include "messages.h"
#include "main.h"
-#include <Q3PopupMenu>
+#include <QMenu>
#include <QInputDialog>
#include <QFontDialog>
#include <QColorDialog>
@@ -524,18 +524,20 @@
this, SLOT(toggleLockedText()));
m_menu = new QMenu;
- QMenu* typeStyleMenu = new Q3PopupMenu;
+ QMenu* typeStyleMenu = new QMenu("Type St&yles");
- m_typeFilterMenu = new QMenu;
- m_menu->insertItem("Message &Type Filter - Show", m_typeFilterMenu);
+ m_typeFilterMenu = new QMenu("Message &Type Filter - Show");
+ m_menu->addMenu(m_typeFilterMenu);
- m_typeFilterMenu->insertItem("&Enable All",
- this, SLOT(enableAllTypeFilters()), 0, 64);
- m_typeFilterMenu->insertItem("&Disable All",
- this, SLOT(disableAllTypeFilters()), 0, 65);
-
- m_typeFilterMenu->insertSeparator(-1);
+ QAction* tmpAction;
+ tmpAction = m_typeFilterMenu->addAction("&Enable All", this, SLOT(enableAllTypeFilters()));
+ tmpAction->setData(-1);
+ tmpAction = m_typeFilterMenu->addAction("&Disable All", this, SLOT(disableAllTypeFilters()));
+ tmpAction->setData(-1);
+
+ m_typeFilterMenu->addSeparator();
+
QString typeName;
// iterate over the message types, filling in various menus and getting
// font color preferences
@@ -544,37 +546,46 @@
typeName = MessageEntry::messageTypeString((MessageType)i);
if (!typeName.isEmpty())
{
- m_typeFilterMenu->insertItem(typeName, i);
- m_typeFilterMenu->setItemChecked(i, (((uint64_t(1) << i) & m_enabledTypes) != 0));
- typeStyleMenu->insertItem(typeName + "...", i);
+ tmpAction = m_typeFilterMenu->addAction(typeName);
+ tmpAction->setData(i);
+ tmpAction->setCheckable(true);
+ tmpAction->setChecked(((uint64_t(1) << i) & m_enabledTypes) != 0);
+ tmpAction = typeStyleMenu->addAction(typeName + "...");
+ tmpAction->setData(i);
+
m_typeStyles[i].load(preferenceName(), typeName);
}
}
-
- connect(m_typeFilterMenu, SIGNAL(activated(int)),
- this, SLOT(toggleTypeFilter(int)));
- connect(typeStyleMenu, SIGNAL(activated(int)),
- this, SLOT(setTypeStyle(int)));
- m_showUserFilterMenu = new QMenu;
- m_menu->insertItem("User Message Filter - &Show", m_showUserFilterMenu);
+ connect(m_typeFilterMenu, SIGNAL(triggered(QAction*)),
+ this, SLOT(toggleTypeFilter(QAction*)));
+ connect(typeStyleMenu, SIGNAL(triggered(QAction*)),
+ this, SLOT(setTypeStyle(QAction*)));
- m_showUserFilterMenu->insertItem("&Enable All",
- this, SLOT(enableAllShowUserFilters()), 0, 66);
- m_showUserFilterMenu->insertItem("&Disable All",
- this, SLOT(disableAllShowUserFilters()), 0, 67);
- m_showUserFilterMenu->insertSeparator(-1);
+ m_showUserFilterMenu = new QMenu("User Message Filter - &Show");
+ m_menu->addMenu(m_showUserFilterMenu);
- m_hideUserFilterMenu = new QMenu;
- m_menu->insertItem("User Message Filter - &Hide", m_hideUserFilterMenu);
+ tmpAction = m_showUserFilterMenu->addAction("&Enable All", this,
+ SLOT(enableAllShowUserFilters()));
+ tmpAction->setData(-1);
+ tmpAction = m_showUserFilterMenu->addAction("&Disable All", this,
+ SLOT(disableAllShowUserFilters()));
+ tmpAction->setData(-1);
+ m_showUserFilterMenu->addSeparator();
- m_hideUserFilterMenu->insertItem("&Enable All",
- this, SLOT(enableAllHideUserFilters()), 0, 66);
- m_hideUserFilterMenu->insertItem("&Disable All",
- this, SLOT(disableAllHideUserFilters()), 0, 67);
- m_hideUserFilterMenu->insertSeparator(-1);
+ m_hideUserFilterMenu = new QMenu("User Message Filter - &Hide");
+ m_menu->addMenu(m_hideUserFilterMenu);
+
+ tmpAction = m_hideUserFilterMenu->addAction("&Enable All", this,
+ SLOT(enableAllHideUserFilters()));
+ tmpAction->setData(-1);
+ tmpAction = m_hideUserFilterMenu->addAction("&Disable All", this,
+ SLOT(disableAllHideUserFilters()));
+ tmpAction->setData(-1);
+ m_hideUserFilterMenu->addSeparator();
+
const MessageFilter* filter;
for(int i = 0; i < maxMessageFilters; i++)
{
@@ -581,54 +592,71 @@
filter = m_messageFilters->filter(i);
if (filter)
{
- m_showUserFilterMenu->insertItem(filter->name(), i);
- m_showUserFilterMenu->setItemChecked(i, (1 << i) & m_enabledShowUserFilters);
+ tmpAction = m_showUserFilterMenu->addAction(filter->name());
+ tmpAction->setData(i);
+ tmpAction->setCheckable(true);
+ tmpAction->setChecked((1 << i) & m_enabledShowUserFilters);
- m_hideUserFilterMenu->insertItem(filter->name(), i);
- m_hideUserFilterMenu->setItemChecked(i, (1 << i) & m_enabledHideUserFilters);
+ tmpAction = m_hideUserFilterMenu->addAction(filter->name());
+ tmpAction->setData(i);
+ tmpAction->setCheckable(true);
+ tmpAction->setChecked((1 << i) & m_enabledHideUserFilters);
}
}
- connect(m_showUserFilterMenu, SIGNAL(activated(int)),
- this, SLOT(toggleShowUserFilter(int)));
- connect(m_hideUserFilterMenu, SIGNAL(activated(int)),
- this, SLOT(toggleHideUserFilter(int)));
- m_menu->insertItem("Edit User &Message Filters...",
- this, SLOT(messageFilterDialog()));
+ connect(m_showUserFilterMenu, SIGNAL(triggered(QAction*)),
+ this, SLOT(toggleShowUserFilter(QAction*)));
+ connect(m_hideUserFilterMenu, SIGNAL(triggered(QAction*)),
+ this, SLOT(toggleHideUserFilter(QAction*)));
- m_menu->insertSeparator(-1);
- m_menu->insertItem("&Find...", this, SLOT(findDialog()),
- Qt::CTRL+Qt::Key_F);
- m_menu->insertSeparator(-1);
- m_id_lockText = m_menu->insertItem("&Lock Text", this,
- SLOT(toggleLockedText()), Qt::CTRL+Qt::Key_L);
- int x;
- x = m_menu->insertItem("Refresh Messages...", this, SLOT(refreshMessages()),
- Qt::CTRL+Qt::Key_R);
- m_menu->insertItem("Save Message Text...", this, SLOT(saveText()),
- Qt::CTRL+Qt::Key_S);
- m_menu->insertSeparator(-1);
- m_menu->setItemChecked(x, m_lockedText);
- m_menu->insertSeparator(-1);
- x = m_menu->insertItem("&Display Type", this, SLOT(toggleDisplayType(int)));
- m_menu->setItemChecked(x, m_displayType);
- x = m_menu->insertItem("Display T&ime/Date", this,
- SLOT(toggleDisplayTime(int)));
- m_menu->setItemChecked(x, m_displayDateTime);
- x = m_menu->insertItem("Display &EQ Date/Time", this,
- SLOT(toggleEQDisplayTime(int)));
- m_menu->setItemChecked(x, m_displayEQDateTime);
- x = m_menu->insertItem("&Use Type Styles", this,
- SLOT(toggleUseTypeStyles(int)));
- m_menu->setItemChecked(x, m_useTypeStyles);
- x = m_menu->insertItem("&Wrap Text", this, SLOT(toggleWrapText(int)));
- m_menu->setItemChecked(x, m_wrapText);
- m_menu->insertItem("Fo&nt...", this, SLOT(setFont()));
- m_menu->insertItem("&Caption...", this, SLOT(setCaption()));
- m_menu->insertItem("Text Colo&r...", this, SLOT(setColor()));
- m_menu->insertItem("Text Back&ground Color...", this, SLOT(setBGColor()));
- m_menu->insertItem("Type St&yles", typeStyleMenu);
+ m_menu->addAction("Edit User &Message Filters...", this,
+ SLOT(messageFilterDialog()));
+ m_menu->addSeparator();
+ m_menu->addAction("&Find...", this, SLOT(findDialog()), Qt::CTRL+Qt::Key_F);
+ m_menu->addSeparator();
+
+ m_action_lockText = m_menu->addAction("&Lock Text", this,
+ SLOT(toggleLockedText()), Qt::CTRL+Qt::Key_L);
+ m_action_lockText->setCheckable(true);
+ m_action_lockText->setChecked(m_lockedText);
+ m_menu->addAction("Refresh Messages...", this,
+ SLOT(refreshMessages()), Qt::CTRL+Qt::Key_R);
+ m_menu->addAction("Save Message Text...", this, SLOT(saveText()),
+ Qt::CTRL+Qt::Key_S);
+ m_menu->addSeparator();
+
+ tmpAction = m_menu->addAction("&Display Type", this,
+ SLOT(toggleDisplayType(bool)));
+ tmpAction->setCheckable(true);
+ tmpAction->setChecked(m_displayType);
+
+ tmpAction = m_menu->addAction("Display T&ime/Date", this,
+ SLOT(toggleDisplayTime(bool)));
+ tmpAction->setCheckable(true);
+ tmpAction->setChecked(m_displayDateTime);
+
+ tmpAction = m_menu->addAction("Display &EQ Date/Time", this,
+ SLOT(toggleEQDisplayTime(bool)));
+ tmpAction->setCheckable(true);
+ tmpAction->setChecked(m_displayEQDateTime);
+
+ tmpAction = m_menu->addAction("&Use Type Styles", this,
+ SLOT(toggleUseTypeStyles(bool)));
+ tmpAction->setCheckable(true);
+ tmpAction->setChecked(m_useTypeStyles);
+
+ tmpAction = m_menu->addAction("&Wrap Text", this, SLOT(toggleWrapText(bool)));
+ tmpAction->setCheckable(true);
+ tmpAction->setChecked(m_wrapText);
+
+ m_menu->addAction("Fo&nt...", this, SLOT(setFont()));
+ m_menu->addAction("&Caption...", this, SLOT(setCaption()));
+ m_menu->addAction("Text Colo&r...", this, SLOT(setColor()));
+ m_menu->addAction("Text Back&ground Color...", this, SLOT(setBGColor()));
+
+ m_menu->addMenu(typeStyleMenu);
+
refreshMessages();
}
@@ -769,7 +797,7 @@
m_messageWindow->append(" ");
// set the cursor to the beginning of the document
- //m_messageWindow->moveCursor(QTextCursor::Start, QTextCursor::MoveAnchor);
+ m_messageWindow->moveCursor(QTextCursor::Start, QTextCursor::MoveAnchor);
// move the cursor to the end of the document
m_messageWindow->moveCursor(QTextEdit::MoveEnd, QTextCursor::MoveAnchor);
@@ -842,8 +870,17 @@
}
}
-void MessageWindow::toggleTypeFilter(int id)
+void MessageWindow::toggleTypeFilter(QAction* action)
{
+
+ int id = action->data().value<int>();
+
+ //Enable/Disable All also invokes this method (due to connecting via the
+ //menu rather than the individual items), and this causes issues
+ //with MT_Guild since it's type 0. So we've given Enable/Disable all their
+ //own bogus type value
+ if (id == -1) return;
+
// toggle whether the message type is shown or not
if (((uint64_t(1) << id) & m_enabledTypes) != 0)
m_enabledTypes &= ~(uint64_t(1) << id);
@@ -853,8 +890,6 @@
// save the new setting
pSEQPrefs->setPrefUInt64("EnabledTypes", preferenceName(), m_enabledTypes);
- // (un)check the appropriate menu item
- m_typeFilterMenu->setItemChecked(id, ((m_enabledTypes & (uint64_t(1) << id)) != 0));
}
void MessageWindow::disableAllTypeFilters()
@@ -863,17 +898,16 @@
m_enabledTypes = 0;
pSEQPrefs->setPrefUInt64("EnabledTypes", preferenceName(), m_enabledTypes);
- // make sure the All menu items are unchecked
- m_typeFilterMenu->setItemChecked(64, false);
- m_typeFilterMenu->setItemChecked(65, false);
// uncheck all the menu items
- QString typeName;
- for (int i = MT_Guild; i <= MT_Max; i++)
+ foreach (QAction* action, m_typeFilterMenu->actions())
{
- typeName = MessageEntry::messageTypeString((MessageType)i);
- if (!typeName.isEmpty())
- m_typeFilterMenu->setItemChecked(i, false);
+ if (action->text().contains("&Enable All") ||
+ action->text().contains("&Disable All") ||
+ action->isSeparator())
+ continue;
+
+ action->setChecked(false);
}
}
@@ -883,22 +917,29 @@
m_enabledTypes = 0xFFFFFFFFFFFFFFFFULL;
pSEQPrefs->setPrefUInt64("EnabledTypes", preferenceName(), m_enabledTypes);
- // make sure the All menu items are unchecked
- m_typeFilterMenu->setItemChecked(64, false);
- m_typeFilterMenu->setItemChecked(65, false);
// check all the menu items
- QString typeName;
- for (int i = MT_Guild; i <= MT_Max; i++)
+ foreach (QAction* action, m_typeFilterMenu->actions())
{
- typeName = MessageEntry::messageTypeString((MessageType)i);
- if (!typeName.isEmpty())
- m_typeFilterMenu->setItemChecked(i, true);
+ if (action->text().contains("&Enable All") ||
+ action->text().contains("&Disable All") ||
+ action->isSeparator())
+ continue;
+
+ action->setChecked(true);
}
}
-void MessageWindow::toggleShowUserFilter(int id)
+void MessageWindow::toggleShowUserFilter(QAction* action)
{
+ int id = action->data().value<int>();
+
+ //Enable/Disable All also invokes this method (due to connecting via the
+ //menu rather than the individual items), and this causes issues
+ //with MT_Guild since it's type 0. So we've given Enable/Disable all their
+ //own bogus type value
+ if (id == -1) return;
+
// toggle whether the filter is enabled/disabled
if (((1 << id) & m_enabledShowUserFilters) != 0)
m_enabledShowUserFilters &= ~(1 << id);
@@ -906,12 +947,9 @@
m_enabledShowUserFilters |= (1 << id);
// save the new setting
- pSEQPrefs->setPrefUInt("EnabledShowUserFilters", preferenceName(),
- m_enabledShowUserFilters);
-
- // (un)check the appropriate menu item
- m_showUserFilterMenu->setItemChecked(id,
- ((m_enabledShowUserFilters & (1 << id)) != 0));
+ pSEQPrefs->setPrefUInt("EnabledShowUserFilters", preferenceName(),
+ m_enabledShowUserFilters);
+
}
void MessageWindow::disableAllShowUserFilters()
@@ -918,19 +956,18 @@
{
// set and save all filters disabled setting
m_enabledShowUserFilters = 0;
- pSEQPrefs->setPrefUInt("EnabledShowUserFilters", preferenceName(),
- m_enabledShowUserFilters);
-
- // make sure the All menu items are unchecked
- m_showUserFilterMenu->setItemChecked(66, false);
- m_showUserFilterMenu->setItemChecked(67, false);
+ pSEQPrefs->setPrefUInt("EnabledShowUserFilters", preferenceName(),
+ m_enabledShowUserFilters);
// uncheck all the menu items
- QString typeName;
- for (int i = 0; i <= maxMessageFilters; i++)
+ foreach (QAction* action, m_showUserFilterMenu->actions())
{
- if (m_messageFilters->filter(i))
- m_showUserFilterMenu->setItemChecked(i, false);
+ if (action->text().contains("&Enable All") ||
+ action->text().contains("&Disable All") ||
+ action->isSeparator())
+ continue;
+
+ action->setChecked(false);
}
}
@@ -938,24 +975,31 @@
{
// set and save all filters enabled flag
m_enabledShowUserFilters = 0xFFFFFFFF;
- pSEQPrefs->setPrefUInt("EnabledShowUserFilters", preferenceName(),
- m_enabledShowUserFilters);
+ pSEQPrefs->setPrefUInt("EnabledShowUserFilters", preferenceName(),
+ m_enabledShowUserFilters);
- // make sure the All menu items are unchecked
- m_showUserFilterMenu->setItemChecked(66, false);
- m_showUserFilterMenu->setItemChecked(67, false);
-
// check all the menu items
- QString typeName;
- for (int i = 0; i <= maxMessageFilters; i++)
+ foreach (QAction* action, m_showUserFilterMenu->actions())
{
- if (m_messageFilters->filter(i))
- m_showUserFilterMenu->setItemChecked(i, true);
+ if (action->text().contains("&Enable All") ||
+ action->text().contains("&Disable All") ||
+ action->isSeparator())
+ continue;
+
+ action->setChecked(true);
}
}
-void MessageWindow::toggleHideUserFilter(int id)
+void MessageWindow::toggleHideUserFilter(QAction* action)
{
+ int id = action->data().value<int>();
+
+ //Enable/Disable All also invokes this method (due to connecting via the
+ //menu rather than the individual items), and this causes issues
+ //with MT_Guild since it's type 0. So we've given Enable/Disable all their
+ //own bogus type value
+ if (id == -1) return;
+
// toggle whether the filter is enabled/disabled
if (((1 << id) & m_enabledHideUserFilters) != 0)
m_enabledHideUserFilters &= ~(1 << id);
@@ -963,12 +1007,8 @@
m_enabledHideUserFilters |= (1 << id);
// save the new setting
- pSEQPrefs->setPrefUInt("EnabledHideUserFilters", preferenceName(),
- m_enabledHideUserFilters);
-
- // (un)check the appropriate menu item
- m_hideUserFilterMenu->setItemChecked(id,
- ((m_enabledHideUserFilters & (1 << id)) != 0));
+ pSEQPrefs->setPrefUInt("EnabledHideUserFilters", preferenceName(),
+ m_enabledHideUserFilters);
}
void MessageWindow::disableAllHideUserFilters()
@@ -975,19 +1015,18 @@
{
// set and save all filters disabled setting
m_enabledHideUserFilters = 0;
- pSEQPrefs->setPrefUInt("EnabledHideUserFilters", preferenceName(),
- m_enabledHideUserFilters);
-
- // make sure the All menu items are unchecked
- m_hideUserFilterMenu->setItemChecked(66, false);
- m_hideUserFilterMenu->setItemChecked(67, false);
+ pSEQPrefs->setPrefUInt("EnabledHideUserFilters", preferenceName(),
+ m_enabledHideUserFilters);
// uncheck all the menu items
- QString typeName;
- for (int i = 0; i <= maxMessageFilters; i++)
+ foreach (QAction* action, m_hideUserFilterMenu->actions())
{
- if (m_messageFilters->filter(i))
- m_hideUserFilterMenu->setItemChecked(i, false);
+ if (action->text().contains("&Enable All") ||
+ action->text().contains("&Disable All") ||
+ action->isSeparator())
+ continue;
+
+ action->setChecked(false);
}
}
@@ -995,26 +1034,25 @@
{
// set and save all filters enabled flag
m_enabledHideUserFilters = 0xFFFFFFFF;
- pSEQPrefs->setPrefUInt("EnabledHideUserFilters", preferenceName(),
- m_enabledHideUserFilters);
+ pSEQPrefs->setPrefUInt("EnabledHideUserFilters", preferenceName(),
+ m_enabledHideUserFilters);
- // make sure the All menu items are unchecked
- m_hideUserFilterMenu->setItemChecked(66, false);
- m_hideUserFilterMenu->setItemChecked(67, false);
-
// check all the menu items
- QString typeName;
- for (int i = 0; i <= maxMessageFilters; i++)
+ foreach (QAction* action, m_hideUserFilterMenu->actions())
{
- if (m_messageFilters->filter(i))
- m_hideUserFilterMenu->setItemChecked(i, true);
+ if (action->text().contains("&Enable All") ||
+ action->text().contains("&Disable All") ||
+ action->isSeparator())
+ continue;
+
+ action->setChecked(true);
}
}
void MessageWindow::toggleLockedText()
{
+// m_lockedText = enable;
m_lockedText = !m_lockedText;
- m_menu->setItemChecked(m_id_lockText, m_lockedText);
// if the text had been locked, refresh the messages
if (!m_lockedText)
@@ -1021,41 +1059,39 @@
refreshMessages();
}
-void MessageWindow::toggleDisplayType(int id)
+void MessageWindow::toggleDisplayType(bool enable)
{
- m_displayType = !m_displayType;
- m_menu->setItemChecked(id, m_displayType);
+ m_displayType = enable;
pSEQPrefs->setPrefBool("DisplayType", preferenceName(), m_displayType);
}
-void MessageWindow::toggleDisplayTime(int id)
+void MessageWindow::toggleDisplayTime(bool enable)
{
- m_displayDateTime = !m_displayDateTime;
- m_menu->setItemChecked(id, m_displayDateTime);
+ m_displayDateTime = enable;
+
pSEQPrefs->setPrefBool("DisplayDateTime", preferenceName(),
- m_displayDateTime);
+ m_displayDateTime);
}
-void MessageWindow::toggleEQDisplayTime(int id)
+void MessageWindow::toggleEQDisplayTime(bool enable)
{
- m_displayEQDateTime = ! m_displayEQDateTime;
- m_menu->setItemChecked(id, m_displayEQDateTime);
+ m_displayEQDateTime = enable;
+
pSEQPrefs->setPrefBool("DisplayEQDateTime", preferenceName(),
- m_displayEQDateTime);
+ m_displayEQDateTime);
}
-void MessageWindow::toggleUseTypeStyles(int id)
+void MessageWindow::toggleUseTypeStyles(bool enable)
{
- m_useTypeStyles = !m_useTypeStyles;
- m_menu->setItemChecked(id, m_useTypeStyles);
+ m_useTypeStyles = enable;
+
pSEQPrefs->setPrefBool("UseTypeStyles", preferenceName(), m_useTypeStyles);
}
-void MessageWindow::toggleWrapText(int id)
+void MessageWindow::toggleWrapText(bool enable)
{
- m_wrapText = !m_wrapText;
- m_menu->setItemChecked(id, m_wrapText);
+ m_wrapText = enable;
pSEQPrefs->setPrefBool("WrapText", preferenceName(), m_wrapText);
@@ -1064,8 +1100,11 @@
QTextEdit::WidgetWidth : QTextEdit::NoWrap);
}
-void MessageWindow::setTypeStyle(int id)
+void MessageWindow::setTypeStyle(QAction* action)
{
+
+ int id = action->data().value<int>();
+
// Create the dialog object
QString typeName = MessageEntry::messageTypeString((MessageType)id);
QString styleCaption = caption() + " - " + typeName + " Style";
@@ -1197,11 +1236,16 @@
void MessageWindow::addedFilter(uint32_t mask, uint8_t filterid,
const MessageFilter& filter)
{
+ QAction* action;
// insert a user filter menu item for the new filter
- m_showUserFilterMenu->insertItem(filter.name(), filterid);
+ action = m_showUserFilterMenu->addAction(filter.name());
+ action->setCheckable(true);
+ action->setData(filterid);
// insert a user filter menu item for the new filter
- m_hideUserFilterMenu->insertItem(filter.name(), filterid);
+ action = m_hideUserFilterMenu->addAction(filter.name());
+ action->setCheckable(true);
+ action->setData(filterid);
}
#ifndef QMAKEBUILD
Modified: showeq/branches/pre_6_0_beta/src/messagewindow.h
===================================================================
--- showeq/branches/pre_6_0_beta/src/messagewindow.h 2020-10-28 14:22:59 UTC (rev 1086)
+++ showeq/branches/pre_6_0_beta/src/messagewindow.h 2020-10-28 14:23:07 UTC (rev 1087)
@@ -178,22 +178,22 @@
void saveText(void);
protected slots:
- void toggleTypeFilter(int);
+ void toggleTypeFilter(QAction*);
void disableAllTypeFilters();
void enableAllTypeFilters();
- void toggleShowUserFilter(int);
+ void toggleShowUserFilter(QAction*);
void disableAllShowUserFilters();
void enableAllShowUserFilters();
- void toggleHideUserFilter(int);
+ void toggleHideUserFilter(QAction*);
void disableAllHideUserFilters();
void enableAllHideUserFilters();
void toggleLockedText();
- void toggleDisplayType(int);
- void toggleDisplayTime(int);
- void toggleEQDisplayTime(int);
- void toggleUseTypeStyles(int);
- void toggleWrapText(int);
- void setTypeStyle(int);
+ void toggleDisplayType(bool);
+ void toggleDisplayTime(bool);
+ void toggleEQDisplayTime(bool);
+ void toggleUseTypeStyles(bool);
+ void toggleWrapText(bool);
+ void setTypeStyle(QAction*);
void setColor();
void setBGColor();
void setFont();
@@ -205,7 +205,7 @@
protected:
void addMessage(const MessageEntry& message);
void addColorMessage(const MessageEntry& message);
-
+
Messages* m_messages;
MessageFilters* m_messageFilters;
MessageBrowser* m_messageWindow;
@@ -213,7 +213,7 @@
QMenu* m_typeFilterMenu;
QMenu* m_showUserFilterMenu;
QMenu* m_hideUserFilterMenu;
- int m_id_lockText;
+ QAction* m_action_lockText;
MessageFindDialog* m_findDialog;
MessageFilterDialog* m_filterDialog;
uint64_t m_enabledTypes;
Modified: showeq/branches/pre_6_0_beta/src/spelllist.h
===================================================================
--- showeq/branches/pre_6_0_beta/src/spelllist.h 2020-10-28 14:22:59 UTC (rev 1086)
+++ showeq/branches/pre_6_0_beta/src/spelllist.h 2020-10-28 14:23:07 UTC (rev 1087)
@@ -31,7 +31,6 @@
#include <QList>
#include <Q3ListView>
-#include <Q3PopupMenu>
#include <ctime>
#include <sys/time.h>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
