From 4eb9cacd76e19fdbb1b3c7d5376d7806108e8b05 Mon Sep 17 00:00:00 2001 From: Fred Gleason Date: Wed, 10 Feb 2021 16:31:08 -0500 Subject: [PATCH] 2021-02-09 Fred Gleason * Removed the 'Q3PopupMenu' dependency from rdlogmanager(1). Signed-off-by: Fred Gleason --- ChangeLog | 2 ++ rdlogmanager/edit_grid.cpp | 44 ++++++++++-------------------- rdlogmanager/edit_grid.h | 11 ++++---- rdlogmanager/rdlogmanager_cs.ts | 2 +- rdlogmanager/rdlogmanager_de.ts | 2 +- rdlogmanager/rdlogmanager_es.ts | 2 +- rdlogmanager/rdlogmanager_fr.ts | 4 --- rdlogmanager/rdlogmanager_nb.ts | 4 --- rdlogmanager/rdlogmanager_nn.ts | 4 --- rdlogmanager/rdlogmanager_pt_BR.ts | 2 +- 10 files changed, 26 insertions(+), 51 deletions(-) diff --git a/ChangeLog b/ChangeLog index b5c70c2f..71bcc768 100644 --- a/ChangeLog +++ b/ChangeLog @@ -21093,3 +21093,5 @@ 2021-02-09 Fred Gleason * Refactored the 'Log Grids' dialog in rdlogmanager(1) to use the model based API. +2021-02-09 Fred Gleason + * Removed the 'Q3PopupMenu' dependency from rdlogmanager(1). diff --git a/rdlogmanager/edit_grid.cpp b/rdlogmanager/edit_grid.cpp index ccc7bd91..4055c4d4 100644 --- a/rdlogmanager/edit_grid.cpp +++ b/rdlogmanager/edit_grid.cpp @@ -2,7 +2,7 @@ // // Edit Rivendell Log Grid // -// (C) Copyright 2002-2019 Fred Gleason +// (C) Copyright 2002-2021 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -45,7 +45,6 @@ EditGrid::EditGrid(QString servicename,QWidget *parent) // // Hour Buttons // - // QLabel *label; QSignalMapper *mapper=new QSignalMapper(this); connect(mapper,SIGNAL(mapped(int)),this,SLOT(hourButtonData(int))); for(int i=0;i<5;i++) { @@ -84,12 +83,12 @@ EditGrid::EditGrid(QString servicename,QWidget *parent) // // Right Button Menu // - edit_right_menu=new Q3PopupMenu(this); - connect(edit_right_menu,SIGNAL(aboutToShow()),this,SLOT(aboutToShowData())); - edit_right_menu-> - insertItem(tr("Edit Clock"),this,SLOT(editClockData()),0,0); - edit_right_menu-> - insertItem(tr("Clear Hour"),this,SLOT(clearHourData()),0,1); + edit_mouse_menu=new QMenu(this); + + edit_edit_clock_action=edit_mouse_menu-> + addAction(tr("Edit Clock"),this,SLOT(editClockData())); + edit_edit_clock_action->setCheckable(false); + connect(edit_mouse_menu,SIGNAL(aboutToShow()),this,SLOT(aboutToShowData())); // // Change All Button @@ -191,14 +190,15 @@ void EditGrid::rightHourButtonData(int id,const QPoint &pt) edit_rightclick_id=id; int dayofweek=edit_rightclick_id/24+1; int hour=edit_rightclick_id-24*(dayofweek-1); - edit_right_menu-> + + edit_mouse_menu-> setGeometry(edit_hour_button[dayofweek-1][hour]->geometry().x()+ geometry().x()+pt.x()+2, edit_hour_button[dayofweek-1][hour]->geometry().y()+ geometry().y()+pt.y(), - edit_right_menu->sizeHint().width(), - edit_right_menu->sizeHint().height()); - edit_right_menu->exec(); + edit_mouse_menu->sizeHint().width(), + edit_mouse_menu->sizeHint().height()); + edit_mouse_menu->exec(); } @@ -206,8 +206,8 @@ void EditGrid::aboutToShowData() { int dayofweek=edit_rightclick_id/24+1; int hour=edit_rightclick_id-24*(dayofweek-1); - edit_right_menu->setItemEnabled(0,!GetClock(dayofweek,hour).isEmpty()); - edit_right_menu->setItemEnabled(1,!GetClock(dayofweek,hour).isEmpty()); + + edit_edit_clock_action->setEnabled(!GetClock(dayofweek,hour).isEmpty()); } @@ -251,22 +251,6 @@ void EditGrid::closeData() } -void EditGrid::paintEvent(QPaintEvent *e) -{ - /* - QPainter *p=new QPainter(this); - p->setPen(Qt::black); - for(int i=0;i<5;i++) { - p->drawRect(5,21+75*i,sizeHint().width()-10,55); - } - for(int i=5;i<7;i++) { - p->drawRect(5,51+75*i,sizeHint().width()-10,55); - } - p->end(); - */ -} - - void EditGrid::closeEvent(QCloseEvent *e) { closeData(); diff --git a/rdlogmanager/edit_grid.h b/rdlogmanager/edit_grid.h index b8d59ae8..ac502523 100644 --- a/rdlogmanager/edit_grid.h +++ b/rdlogmanager/edit_grid.h @@ -2,7 +2,7 @@ // // Edit A Rivendell Log Grid // -// (C) Copyright 2002-2019 Fred Gleason +// (C) Copyright 2002-2021 Fred Gleason // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License version 2 as @@ -21,8 +21,9 @@ #ifndef EDIT_GRID_H #define EDIT_GRID_H -#include -#include +#include +#include +#include #include #include @@ -45,7 +46,6 @@ class EditGrid : public RDDialog void closeData(); protected: - void paintEvent(QPaintEvent *e); void closeEvent(QCloseEvent *e); private: @@ -56,8 +56,9 @@ class EditGrid : public RDDialog QString current_clockname; QGroupBox *edit_day_boxes[7]; RDPushButton *edit_hour_button[7][24]; - Q3PopupMenu *edit_right_menu; int edit_rightclick_id; + QMenu *edit_mouse_menu; + QAction *edit_edit_clock_action; }; diff --git a/rdlogmanager/rdlogmanager_cs.ts b/rdlogmanager/rdlogmanager_cs.ts index ef95db73..be26ad07 100644 --- a/rdlogmanager/rdlogmanager_cs.ts +++ b/rdlogmanager/rdlogmanager_cs.ts @@ -676,7 +676,7 @@ existující událostí. Clear Hour - Smazat hodiny + Smazat hodiny Change diff --git a/rdlogmanager/rdlogmanager_de.ts b/rdlogmanager/rdlogmanager_de.ts index f977f62a..1a78ca57 100644 --- a/rdlogmanager/rdlogmanager_de.ts +++ b/rdlogmanager/rdlogmanager_de.ts @@ -676,7 +676,7 @@ einem bereits existierendem Event. Clear Hour - Stunde löschen + Stunde löschen Change diff --git a/rdlogmanager/rdlogmanager_es.ts b/rdlogmanager/rdlogmanager_es.ts index 80f9d1ae..7d9261d6 100644 --- a/rdlogmanager/rdlogmanager_es.ts +++ b/rdlogmanager/rdlogmanager_es.ts @@ -678,7 +678,7 @@ un evento ya existente. Clear Hour - Limpiar tortas + Limpiar tortas Change diff --git a/rdlogmanager/rdlogmanager_fr.ts b/rdlogmanager/rdlogmanager_fr.ts index ce478e9d..b78a6c8f 100644 --- a/rdlogmanager/rdlogmanager_fr.ts +++ b/rdlogmanager/rdlogmanager_fr.ts @@ -479,10 +479,6 @@ already existing event. &Close - - Clear Hour - - Change &All diff --git a/rdlogmanager/rdlogmanager_nb.ts b/rdlogmanager/rdlogmanager_nb.ts index c8c15bb7..35fc65a9 100644 --- a/rdlogmanager/rdlogmanager_nb.ts +++ b/rdlogmanager/rdlogmanager_nb.ts @@ -675,10 +675,6 @@ ei anna hending som finst frå før. &Close &Lukk - - Clear Hour - - Change &All diff --git a/rdlogmanager/rdlogmanager_nn.ts b/rdlogmanager/rdlogmanager_nn.ts index c8c15bb7..35fc65a9 100644 --- a/rdlogmanager/rdlogmanager_nn.ts +++ b/rdlogmanager/rdlogmanager_nn.ts @@ -675,10 +675,6 @@ ei anna hending som finst frå før. &Close &Lukk - - Clear Hour - - Change &All diff --git a/rdlogmanager/rdlogmanager_pt_BR.ts b/rdlogmanager/rdlogmanager_pt_BR.ts index c138b2c2..43b67775 100644 --- a/rdlogmanager/rdlogmanager_pt_BR.ts +++ b/rdlogmanager/rdlogmanager_pt_BR.ts @@ -674,7 +674,7 @@ evento existente. Clear Hour - Limpar Hora + Limpar Hora &Close