summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--build/depends.py2
-rw-r--r--src/widget/wcuemenupopup.cpp (renamed from src/widget/cuemenu.cpp)20
-rw-r--r--src/widget/wcuemenupopup.h (renamed from src/widget/cuemenu.h)6
-rw-r--r--src/widget/woverview.cpp16
-rw-r--r--src/widget/woverview.h6
5 files changed, 25 insertions, 25 deletions
diff --git a/build/depends.py b/build/depends.py
index 90c2374b11..233ac86e1c 100644
--- a/build/depends.py
+++ b/build/depends.py
@@ -931,7 +931,6 @@ class MixxxCore(Feature):
"src/sources/soundsourceproxy.cpp",
"src/widget/controlwidgetconnection.cpp",
- "src/widget/cuemenu.cpp",
"src/widget/wbasewidget.cpp",
"src/widget/wwidget.cpp",
"src/widget/wwidgetgroup.cpp",
@@ -983,6 +982,7 @@ class MixxxCore(Feature):
"src/widget/wcoverartlabel.cpp",
"src/widget/wcoverartmenu.cpp",
"src/widget/wcolorpicker.cpp",
+ "src/widget/wcuemenupopup.cpp",
"src/widget/wsingletoncontainer.cpp",
"src/widget/wmainmenubar.cpp",
diff --git a/src/widget/cuemenu.cpp b/src/widget/wcuemenupopup.cpp
index eb13749fe9..89f1a482dd 100644
--- a/src/widget/cuemenu.cpp
+++ b/src/widget/wcuemenupopup.cpp
@@ -1,4 +1,4 @@
-#include "widget/cuemenu.h"
+#include "widget/wcuemenupopup.h"
#include <QHBoxLayout>
#include <QInputDialog>
@@ -7,11 +7,11 @@
#include "engine/engine.h"
#include "util/color/color.h"
-CueMenu::CueMenu(QWidget* parent)
+WCueMenuPopup::WCueMenuPopup(QWidget* parent)
: QWidget(parent) {
QWidget::hide();
setWindowFlags(Qt::Popup);
- setObjectName("CueMenu");
+ setObjectName("WCueMenuPopup");
m_pCueNumber = new QLabel(this);
m_pCueNumber->setToolTip(tr("cue number"));
@@ -26,17 +26,17 @@ CueMenu::CueMenu(QWidget* parent)
m_pEditLabel = new QLineEdit(this);
m_pEditLabel->setToolTip(tr("Edit cue label"));
m_pEditLabel->setObjectName("CueLabelEdit");
- connect(m_pEditLabel, &QLineEdit::textEdited, this, &CueMenu::slotEditLabel);
+ connect(m_pEditLabel, &QLineEdit::textEdited, this, &WCueMenuPopup::slotEditLabel);
m_pColorPicker = new WColorPicker(this);
m_pColorPicker->setObjectName("CueColorPicker");
- connect(m_pColorPicker, &WColorPicker::colorPicked, this, &CueMenu::slotChangeCueColor);
+ connect(m_pColorPicker, &WColorPicker::colorPicked, this, &WCueMenuPopup::slotChangeCueColor);
m_pRemoveCue = new QPushButton("", this);
m_pRemoveCue->setToolTip(tr("Remove this cue point"));
m_pRemoveCue->setFixedHeight(m_pEditLabel->sizeHint().height());
m_pRemoveCue->setObjectName("CueRemoveButton");
- connect(m_pRemoveCue, &QPushButton::clicked, this, &CueMenu::slotRemoveCue);
+ connect(m_pRemoveCue, &QPushButton::clicked, this, &WCueMenuPopup::slotRemoveCue);
QHBoxLayout* pLabelLayout = new QHBoxLayout();
pLabelLayout->addWidget(m_pCueNumber);
@@ -59,7 +59,7 @@ CueMenu::CueMenu(QWidget* parent)
setLayout(pMainLayout);
}
-void CueMenu::setTrackAndCue(TrackPointer pTrack, CuePointer pCue) {
+void WCueMenuPopup::setTrackAndCue(TrackPointer pTrack, CuePointer pCue) {
if (pTrack && pCue) {
m_pTrack = pTrack;
m_pCue = pCue;
@@ -98,14 +98,14 @@ void CueMenu::setTrackAndCue(TrackPointer pTrack, CuePointer pCue) {
}
}
-void CueMenu::slotEditLabel() {
+void WCueMenuPopup::slotEditLabel() {
VERIFY_OR_DEBUG_ASSERT(m_pCue != nullptr) {
return;
}
m_pCue->setLabel(m_pEditLabel->text());
}
-void CueMenu::slotChangeCueColor(PredefinedColorPointer pColor) {
+void WCueMenuPopup::slotChangeCueColor(PredefinedColorPointer pColor) {
VERIFY_OR_DEBUG_ASSERT(m_pCue != nullptr) {
return;
}
@@ -117,7 +117,7 @@ void CueMenu::slotChangeCueColor(PredefinedColorPointer pColor) {
hide();
}
-void CueMenu::slotRemoveCue() {
+void WCueMenuPopup::slotRemoveCue() {
VERIFY_OR_DEBUG_ASSERT(m_pCue != nullptr) {
return;
}
diff --git a/src/widget/cuemenu.h b/src/widget/wcuemenupopup.h
index e47ef4410d..04be43e085 100644
--- a/src/widget/cuemenu.h
+++ b/src/widget/wcuemenupopup.h
@@ -8,12 +8,12 @@
#include "track/track.h"
#include "widget/wcolorpicker.h"
-class CueMenu : public QWidget {
+class WCueMenuPopup : public QWidget {
Q_OBJECT
public:
- CueMenu(QWidget* parent = nullptr);
+ WCueMenuPopup(QWidget* parent = nullptr);
- ~CueMenu() {
+ ~WCueMenuPopup() {
delete m_pCueNumber;
delete m_pCuePosition;
delete m_pEditLabel;
diff --git a/src/widget/woverview.cpp b/src/widget/woverview.cpp
index 4c951c49e0..1580fee09a 100644
--- a/src/widget/woverview.cpp
+++ b/src/widget/woverview.cpp
@@ -54,7 +54,7 @@ WOverview::WOverview(
m_group(group),
m_pConfig(pConfig),
m_endOfTrack(false),
- m_pCueMenu(std::make_unique<CueMenu>(this)),
+ m_pCueMenuPopup(std::make_unique<WCueMenuPopup>(this)),
m_bShowCueTimes(true),
m_iPosSeconds(0),
m_iPos(0),
@@ -87,7 +87,7 @@ WOverview::WOverview(
connect(pPlayerManager, &PlayerManager::trackAnalyzerProgress,
this, &WOverview::onTrackAnalyzerProgress);
- connect(m_pCueMenu.get(), &CueMenu::aboutToHide, this, &WOverview::slotCueMenuAboutToHide);
+ connect(m_pCueMenuPopup.get(), &WCueMenuPopup::aboutToHide, this, &WOverview::slotCueMenuPopupAboutToHide);
}
void WOverview::setup(const QDomNode& node, const SkinContext& context) {
@@ -136,7 +136,7 @@ void WOverview::setup(const QDomNode& node, const SkinContext& context) {
? defaultMark->fillColor()
: m_signalColors.getAxesColor();
m_predefinedColorsRepresentation = context.getCueColorRepresentation(node, defaultColor);
- m_pCueMenu->useColorSet(&m_predefinedColorsRepresentation);
+ m_pCueMenuPopup->useColorSet(&m_predefinedColorsRepresentation);
for (const auto& pMark: m_marks) {
if (pMark->isValid()) {
@@ -398,8 +398,8 @@ void WOverview::mouseMoveEvent(QMouseEvent* e) {
// before hotcues in m_marksToRender so if there is a hotcue in the same
// location, the hotcue gets rendered on top. When right clicking, the
// the hotcue rendered on top must be assigned to m_pHoveredMark to show
- // the CueMenu. To accomplish this, m_marksToRender is iterated in reverse
- // and the loop breaks as soon as m_pHoveredMark is set.
+ // the CueMenuPopup. To accomplish this, m_marksToRender is iterated in
+ // reverse and the loop breaks as soon as m_pHoveredMark is set.
for (int i = m_marksToRender.size() - 1; i >= 0; --i) {
WaveformMarkPointer pMark = m_marksToRender.at(i);
int hoveredPosition;
@@ -469,15 +469,15 @@ void WOverview::mousePressEvent(QMouseEvent* e) {
}
}
if (pHoveredCue != nullptr) {
- m_pCueMenu->setTrackAndCue(m_pCurrentTrack, pHoveredCue);
- m_pCueMenu->popup(e->globalPos());
+ m_pCueMenuPopup->setTrackAndCue(m_pCurrentTrack, pHoveredCue);
+ m_pCueMenuPopup->popup(e->globalPos());
m_bHotcueMenuShowing = true;
}
}
}
}
-void WOverview::slotCueMenuAboutToHide() {
+void WOverview::slotCueMenuPopupAboutToHide() {
m_bHotcueMenuShowing = false;
m_pHoveredMark.clear();
update();
diff --git a/src/widget/woverview.h b/src/widget/woverview.h
index d5bcc4792a..96ab55709e 100644
--- a/src/widget/woverview.h
+++ b/src/widget/woverview.h
@@ -20,7 +20,7 @@
#include "analyzer/analyzerprogress.h"
#include "track/track.h"
-#include "widget/cuemenu.h"
+#include "widget/wcuemenupopup.h"
#include "widget/trackdroptarget.h"
#include "widget/wwidget.h"
@@ -101,7 +101,7 @@ class WOverview : public WWidget, public TrackDropTarget {
void receiveCuesUpdated();
void slotWaveformSummaryUpdated();
- void slotCueMenuAboutToHide();
+ void slotCueMenuPopupAboutToHide();
private:
// Append the waveform overview pixmap according to available data
@@ -143,7 +143,7 @@ class WOverview : public WWidget, public TrackDropTarget {
TrackPointer m_pCurrentTrack;
ConstWaveformPointer m_pWaveform;
- std::unique_ptr<CueMenu> m_pCueMenu;
+ std::unique_ptr<WCueMenuPopup> m_pCueMenuPopup;
bool m_bShowCueTimes;
int m_iPosSeconds;
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-27 15:49:41 +0000