From 3f7be11b1cc80f799119ba22cc79312ead678622 Mon Sep 17 00:00:00 2001 From: Fred Gleason Date: Fri, 19 Jun 2020 17:59:42 -0400 Subject: [PATCH] 2020-06-19 Fred Gleason * Removed the 'Q3PopupMenu' dependency from rdlogmanager(1). Signed-off-by: Fred Gleason --- ChangeLog | 2 ++ rdlogmanager/import_listview.cpp | 16 ++++++++-------- rdlogmanager/import_listview.h | 4 ++-- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index c6461678..a858a27b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -19901,3 +19901,5 @@ * Modified the 'Edit Event' dialog in rdlogmanager(1) to show '[auto]' as the transition type for the leading event in Pre-/Post-Import lists. +2020-06-19 Fred Gleason + * Removed the 'Q3PopupMenu' dependency from rdlogmanager(1). diff --git a/rdlogmanager/import_listview.cpp b/rdlogmanager/import_listview.cpp index ce9fc6e1..e0cd8fb9 100644 --- a/rdlogmanager/import_listview.cpp +++ b/rdlogmanager/import_listview.cpp @@ -71,26 +71,26 @@ ImportListView::ImportListView(QWidget *parent) // // Right Button Menu // - import_menu=new Q3PopupMenu(this); + import_menu=new QMenu(this); connect(import_menu,SIGNAL(aboutToShow()),this,SLOT(aboutToShowData())); import_menu->insertItem(tr("Insert Log Note"),this,SLOT(insertNoteMenuData()), - 0,MENU_INSERT_NOTE); + 0,MENU_INSERT_NOTE); import_menu->insertItem(tr("Edit Log Note"),this,SLOT(editNoteMenuData()), - 0,MENU_EDIT_NOTE); + 0,MENU_EDIT_NOTE); import_menu->insertSeparator(); import_menu->insertItem(tr("Insert Voice Track"), - this,SLOT(insertTrackMenuData()), - 0,MENU_INSERT_TRACK); + this,SLOT(insertTrackMenuData()), + 0,MENU_INSERT_TRACK); import_menu->insertItem(tr("Edit Voice Track"),this,SLOT(editTrackMenuData()), - 0,MENU_EDIT_TRACK); + 0,MENU_EDIT_TRACK); import_menu->insertSeparator(); import_menu->insertItem(tr("PLAY Transition"),this,SLOT(playMenuData()), 0,MENU_PLAY_TRANS); import_menu->insertItem(tr("SEGUE Transition"),this,SLOT(segueMenuData()), - 0,MENU_SEGUE_TRANS); + 0,MENU_SEGUE_TRANS); import_menu->insertSeparator(); import_menu->insertItem(tr("Delete"),this,SLOT(deleteMenuData()), - 0,MENU_DELETE); + 0,MENU_DELETE); import_allow_first_trans=true; setAcceptDrops(true); } diff --git a/rdlogmanager/import_listview.h b/rdlogmanager/import_listview.h index 2f71eb75..9a58dee9 100644 --- a/rdlogmanager/import_listview.h +++ b/rdlogmanager/import_listview.h @@ -23,7 +23,7 @@ #include #include -#include +#include #include @@ -70,7 +70,7 @@ class ImportListView : public Q3ListView QPixmap *import_macro_map; QPixmap *import_notemarker_map; QPixmap *import_mic16_map; - Q3PopupMenu *import_menu; + QMenu *import_menu; int import_menu_line; RDEventImportItem *import_menu_i_item; Q3ListViewItem *import_menu_item;