mirror of
https://github.com/ElvishArtisan/rivendell.git
synced 2025-04-09 14:33:28 +02:00
2020-02-25 Fred Gleason <fredg@paravelsystems.com>
* Removed the 'Q3ProgressDialog' dependency from the 'Select Cart' dialog.
This commit is contained in:
parent
758833120c
commit
080a89d139
@ -19698,3 +19698,6 @@
|
||||
dialog.
|
||||
2020-02-25 Fred Gleason <fredg@paravelsystems.com>
|
||||
* Added captioning to the 'Select Cart' dialog.
|
||||
2020-02-25 Fred Gleason <fredg@paravelsystems.com>
|
||||
* Removed the 'Q3ProgressDialog' dependency from the 'Select Cart'
|
||||
dialog.
|
||||
|
@ -1233,6 +1233,10 @@ ze &souboru</translation>
|
||||
<source>Open Audio File</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Cancel</source>
|
||||
<translation type="unfinished">Zrušit</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>RDCddbLookup</name>
|
||||
|
@ -1224,6 +1224,10 @@ senden</translation>
|
||||
<source>Open Audio File</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Cancel</source>
|
||||
<translation type="unfinished">Abbrechen</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>RDCddbLookup</name>
|
||||
|
@ -1224,6 +1224,10 @@ Color</translation>
|
||||
<source>Open Audio File</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Cancel</source>
|
||||
<translation type="unfinished">Cancelar</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>RDCddbLookup</name>
|
||||
|
@ -1074,6 +1074,10 @@ La Couleur</translation>
|
||||
<source>Open Audio File</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Cancel</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>RDCddbLookup</name>
|
||||
|
@ -1223,6 +1223,10 @@ farge</translation>
|
||||
<source>Open Audio File</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Cancel</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>RDCddbLookup</name>
|
||||
|
@ -1223,6 +1223,10 @@ farge</translation>
|
||||
<source>Open Audio File</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Cancel</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>RDCddbLookup</name>
|
||||
|
@ -1224,6 +1224,10 @@ Cor</translation>
|
||||
<source>Open Audio File</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Cancel</source>
|
||||
<translation type="unfinished">Cancelar</translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>RDCddbLookup</name>
|
||||
|
@ -94,8 +94,7 @@ RDCartDialog::RDCartDialog(QString *filter,QString *group,QString *schedcode,
|
||||
// Progress Dialog
|
||||
//
|
||||
cart_progress_dialog=
|
||||
new Q3ProgressDialog(tr("Please Wait..."),"Cancel",10,this,
|
||||
"cart_progress_dialog",false,
|
||||
new QProgressDialog(tr("Please Wait..."),tr("Cancel"),0,10,this,
|
||||
Qt::WStyle_Customize|Qt::WStyle_NormalBorder);
|
||||
cart_progress_dialog->setCaption(" ");
|
||||
QLabel *label=new QLabel(tr("Please Wait..."),cart_progress_dialog);
|
||||
@ -722,8 +721,8 @@ void RDCartDialog::RefreshCarts()
|
||||
q=new RDSqlQuery(sql);
|
||||
int step=0;
|
||||
int count=0;
|
||||
cart_progress_dialog->setTotalSteps(q->size()/RDCART_DIALOG_STEP_SIZE);
|
||||
cart_progress_dialog->setProgress(0);
|
||||
cart_progress_dialog->setMaximum(q->size()/RDCART_DIALOG_STEP_SIZE);
|
||||
cart_progress_dialog->setValue(0);
|
||||
while(q->next()) {
|
||||
l=new RDListViewItem(cart_cart_list);
|
||||
l->setId(q->value(10).toUInt());
|
||||
@ -760,7 +759,7 @@ void RDCartDialog::RefreshCarts()
|
||||
l->setText(12,"TFN");
|
||||
}
|
||||
if(count++>RDCART_DIALOG_STEP_SIZE) {
|
||||
cart_progress_dialog->setProgress(++step);
|
||||
cart_progress_dialog->setValue(++step);
|
||||
count=0;
|
||||
QApplication::processEvents(QEventLoop::ExcludeUserInputEvents);
|
||||
}
|
||||
|
@ -21,11 +21,11 @@
|
||||
#ifndef RDCART_DIALOG_H
|
||||
#define RDCART_DIALOG_H
|
||||
|
||||
#include <qlineedit.h>
|
||||
#include <qlabel.h>
|
||||
#include <qpushbutton.h>
|
||||
#include <q3progressdialog.h>
|
||||
#include <qcheckbox.h>
|
||||
#include <qlabel.h>
|
||||
#include <qlineedit.h>
|
||||
#include <qprogressdialog.h>
|
||||
#include <qpushbutton.h>
|
||||
|
||||
#include <rdbusydialog.h>
|
||||
#include <rdcart.h>
|
||||
@ -104,7 +104,7 @@ class RDCartDialog : public RDDialog
|
||||
QString *cart_service;
|
||||
int cart_service_quan;
|
||||
RDStation::FilterMode cart_filter_mode;
|
||||
Q3ProgressDialog *cart_progress_dialog;
|
||||
QProgressDialog *cart_progress_dialog;
|
||||
QString cart_import_path;
|
||||
QString cart_import_file_filter;
|
||||
bool *cart_temp_allowed;
|
||||
|
@ -19,6 +19,7 @@
|
||||
//
|
||||
|
||||
#include <q3filedialog.h>
|
||||
#include <q3progressdialog.h>
|
||||
|
||||
#include <qapplication.h>
|
||||
#include <qmessagebox.h>
|
||||
|
@ -22,6 +22,8 @@
|
||||
#include <unistd.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
#include <q3progressdialog.h>
|
||||
|
||||
#include <qlabel.h>
|
||||
#include <qmessagebox.h>
|
||||
#include <qapplication.h>
|
||||
|
Loading…
x
Reference in New Issue
Block a user