Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-11-29 16:50:13 +01:00
Code Issues Projects Releases Wiki Activity

2021-08-12 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Adjusted layout in the 'Select Report Dates' dialog in
	rdlogmanager(1) to be compatible with short date format.
	* Adjusted layout in the 'Generate Log' dialog in
	rdlogmanager(1) to be compatible with short date format.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason
2021-08-12 03:10:29 -04:00
parent c174374781
commit 643a0370ff
5 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@@ -22238,3 +22238,8 @@
to be compatible with short date format. to be compatible with short date format.
* Adjusted layout in the 'Reports' dialog in rdlogedit(1) * Adjusted layout in the 'Reports' dialog in rdlogedit(1)
to be compatible with short date format. to be compatible with short date format.
2021-08-12 Fred Gleason <fredg@paravelsystems.com>
* Adjusted layout in the 'Select Report Dates' dialog in
rdlogmanager(1) to be compatible with short date format.
* Adjusted layout in the 'Generate Log' dialog in
rdlogmanager(1) to be compatible with short date format.

3
rdlogmanager/generate_log.cpp
View File

@@ -87,8 +87,7 @@ GenerateLog::GenerateLog(QWidget *parent,int cmd_switch,QString *cmd_service,
// //
// Date // Date
// //
gen_date_edit=new QDateEdit(this); gen_date_edit=new RDDateEdit(this);
gen_date_edit->setDisplayFormat("MM/dd/yyyy");
gen_date_label=new QLabel(tr("Date:"),this); gen_date_label=new QLabel(tr("Date:"),this);
gen_date_label->setFont(labelFont()); gen_date_label->setFont(labelFont());
gen_date_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); gen_date_label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);

5
rdlogmanager/generate_log.h
View File

@@ -21,11 +21,10 @@
#ifndef GENERATE_LOG_H #ifndef GENERATE_LOG_H
#define GENERATE_LOG_H #define GENERATE_LOG_H
#include <QDateTimeEdit>
#include <QProgressDialog> #include <QProgressDialog>
#include <rdcombobox.h> #include <rdcombobox.h>
#include <rddateedit.h>
#include <rddialog.h> #include <rddialog.h>
#include <rdnotification.h> #include <rdnotification.h>
@@ -58,7 +57,7 @@ class GenerateLog : public RDDialog
QLabel *gen_service_label; QLabel *gen_service_label;
RDComboBox *gen_service_box; RDComboBox *gen_service_box;
QLabel *gen_date_label; QLabel *gen_date_label;
QDateEdit *gen_date_edit; RDDateEdit *gen_date_edit;
QPushButton *gen_select_button; QPushButton *gen_select_button;
QLabel *gen_import_label; QLabel *gen_import_label;
QLabel *gen_available_label; QLabel *gen_available_label;

16
rdlogmanager/pick_report_dates.cpp
View File

@@ -55,7 +55,7 @@ PickReportDates::PickReportDates(const QString &svcname,QWidget *parent)
// //
edit_report_box=new QComboBox(this); edit_report_box=new QComboBox(this);
edit_report_box->setGeometry(75,11,sizeHint().width()-85,19); edit_report_box->setGeometry(75,11,sizeHint().width()-85,19);
QLabel *label=new QLabel(tr("&Report:"),this); QLabel *label=new QLabel(tr("Report:"),this);
label->setGeometry(10,11,60,19); label->setGeometry(10,11,60,19);
label->setFont(labelFont()); label->setFont(labelFont());
label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
@@ -72,11 +72,10 @@ PickReportDates::PickReportDates(const QString &svcname,QWidget *parent)
// //
// Start Date // Start Date
// //
edit_startdate_edit=new QDateEdit(this); edit_startdate_edit=new RDDateEdit(this);
edit_startdate_edit->setGeometry(150,35,100,22); edit_startdate_edit->setGeometry(150,35,100,22);
edit_startdate_edit->setDisplayFormat("MM/dd/yyyy");
edit_startdate_edit->setDate(yesterday_date); edit_startdate_edit->setDate(yesterday_date);
label=new QLabel(tr("&Start Date:"),this); label=new QLabel(tr("Start Date:"),this);
label->setGeometry(75,36,70,19); label->setGeometry(75,36,70,19);
label->setFont(labelFont()); label->setFont(labelFont());
label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
@@ -89,11 +88,10 @@ PickReportDates::PickReportDates(const QString &svcname,QWidget *parent)
// //
// End Date // End Date
// //
edit_enddate_edit=new QDateEdit(this); edit_enddate_edit=new RDDateEdit(this);
edit_enddate_edit->setGeometry(150,65,100,22); edit_enddate_edit->setGeometry(150,65,100,22);
edit_enddate_edit->setDisplayFormat("MM/dd/yyyy");
edit_enddate_edit->setDate(yesterday_date); edit_enddate_edit->setDate(yesterday_date);
label=new QLabel(tr("&End Date:"),this); label=new QLabel(tr("End Date:"),this);
label->setGeometry(75,66,70,19); label->setGeometry(75,66,70,19);
label->setFont(labelFont()); label->setFont(labelFont());
label->setAlignment(Qt::AlignRight|Qt::AlignVCenter); label->setAlignment(Qt::AlignRight|Qt::AlignVCenter);
@@ -109,7 +107,7 @@ PickReportDates::PickReportDates(const QString &svcname,QWidget *parent)
button=new QPushButton(this); button=new QPushButton(this);
button->setGeometry(10,sizeHint().height()-60,80,50); button->setGeometry(10,sizeHint().height()-60,80,50);
button->setFont(buttonFont()); button->setFont(buttonFont());
button->setText(tr("&Generate\nReport")); button->setText(tr("Generate\nReport"));
connect(button,SIGNAL(clicked()),this,SLOT(generateData())); connect(button,SIGNAL(clicked()),this,SLOT(generateData()));
// //
@@ -119,7 +117,7 @@ PickReportDates::PickReportDates(const QString &svcname,QWidget *parent)
button->setGeometry(sizeHint().width()-90,sizeHint().height()-60,80,50); button->setGeometry(sizeHint().width()-90,sizeHint().height()-60,80,50);
button->setDefault(true); button->setDefault(true);
button->setFont(buttonFont()); button->setFont(buttonFont());
button->setText(tr("C&lose")); button->setText(tr("Close"));
connect(button,SIGNAL(clicked()),this,SLOT(closeData())); connect(button,SIGNAL(clicked()),this,SLOT(closeData()));
} }

10
rdlogmanager/pick_report_dates.h
View File

@@ -2,7 +2,7 @@
// //
// Select a Set of Dates for a Rivendell Report // Select a Set of Dates for a Rivendell Report
// //
// (C) Copyright 2002-2019 Fred Gleason <fredg@paravelsystems.com> // (C) Copyright 2002-2021 Fred Gleason <fredg@paravelsystems.com>
// //
// This program is free software; you can redistribute it and/or modify // 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 // it under the terms of the GNU General Public License version 2 as
@@ -21,10 +21,10 @@
#ifndef PICK_REPORT_DATE_H #ifndef PICK_REPORT_DATE_H
#define PICK_REPORT_DATE_H #define PICK_REPORT_DATE_H
#include <qcombobox.h> #include <QComboBox>
#include <qdatetimeedit.h>
#include <rddialog.h> #include <rddialog.h>
#include <rddateedit.h>
#include "viewreportdialog.h" #include "viewreportdialog.h"
@@ -45,8 +45,8 @@ class PickReportDates : public RDDialog
private: private:
QComboBox *edit_report_box; QComboBox *edit_report_box;
QDateEdit *edit_startdate_edit; RDDateEdit *edit_startdate_edit;
QDateEdit *edit_enddate_edit; RDDateEdit *edit_enddate_edit;
QString edit_svcname; QString edit_svcname;
ViewReportDialog *edit_viewreport_dialog; ViewReportDialog *edit_viewreport_dialog;
}; };