Subversion Repositories Scribus

Compare Revisions

Regard whitespace Rev 5370 → Rev 5369

/branches/Version13x/Scribus/scribus/scprogressbar.cpp
File deleted
Property changes:
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:keywords
## -1 +0,0 ##
-Author Date Id Revision
\ No newline at end of property
Index: Scribus/scribus/scprogressbar.h
===================================================================
--- Scribus/scribus/scprogressbar.h (revision 5370)
+++ Scribus/scribus/scprogressbar.h (nonexistent)
@@ -1,47 +0,0 @@
-/*
-For general Scribus (>=1.3.2) copyright and licensing information please refer
-to the COPYING file provided with the program. Following this notice may exist
-a copyright and/or license notice that predates the release of Scribus 1.3.2
-for which a new license (GPL+exception) is in place.
-*/
-/***************************************************************************
- scrpogressbar.cpp - description
- -------------------
- begin : Sat Jan 19 2002
- copyright : (C) 2006 by Craig Bradney
- email : cbradney@zip.com.au
- ***************************************************************************/
-
-/***************************************************************************
- * *
- * This program is free software; you can redistribute it and/or modify *
- * it under the terms of the GNU General Public License as published by *
- * the Free Software Foundation; either version 2 of the License, or *
- * (at your option) any later version. *
- * *
- ***************************************************************************/
-#ifndef SCPROGRESSBAR_H
-#define SCPROGRESSBAR_H
-
-#include <qprogressbar.h>
-
-/*!
- * @brief A Progress Bar that allows a number (X of Y) style or standard % indicator
- */
-class ScProgressBar : public QProgressBar
-{
- Q_OBJECT
-
- public:
- ScProgressBar( bool showNumbers, QWidget *parent=0, const char *name=0, WFlags f=0 );
- ScProgressBar( bool showNumbers, int totalSteps, QWidget* parent=0, const char* name=0, WFlags f=0 );
- virtual bool setIndicator( QString & indicator, int progress, int totalSteps );
-
- ~ScProgressBar();
-
- protected:
- bool m_useNumeric;
-
-};
-
-#endif
/Scribus/scribus/scprogressbar.h
Property changes:
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:keywords
## -1 +0,0 ##
-Author Date Id Revision
\ No newline at end of property
Index: Scribus/scribus/pdflib.cpp
===================================================================
--- Scribus/scribus/pdflib.cpp (revision 5370)
+++ Scribus/scribus/pdflib.cpp (revision 5369)
@@ -119,10 +119,8 @@
Q_CHECK_PTR(progressDialog);
QStringList barNames, barTexts;
barNames << "EMP" << "EP" << "ECPI";
- barTexts << tr("Exporting Master Page:") << tr("Exporting Page:") << tr("Exporting Items on Current Page:");
- QValueList<bool> barsNumeric;
- barsNumeric << true << true << false;
- progressDialog->addExtraProgressBars(barNames, barTexts, barsNumeric);
+ barTexts << tr("Exporting Master Pages:") << tr("Exporting Pages:") << tr("Exporting Items on Current Page:");
+ progressDialog->addExtraProgressBars(barNames, barTexts);
connect(progressDialog->buttonCancel, SIGNAL(clicked()), this, SLOT(cancelRequested()));
}
}
Index: Scribus/scribus/plugins/psimport/importps.cpp
===================================================================
--- Scribus/scribus/plugins/psimport/importps.cpp (revision 5370)
+++ Scribus/scribus/plugins/psimport/importps.cpp (revision 5369)
@@ -55,9 +55,7 @@
QStringList barNames, barTexts;
barNames << "GI";
barTexts << tr("Analyzing PostScript:");
- QValueList<bool> barsNumeric;
- barsNumeric << false;
- progressDialog->addExtraProgressBars(barNames, barTexts, barsNumeric);
+ progressDialog->addExtraProgressBars(barNames, barTexts);
progressDialog->setOverallTotalSteps(3);
progressDialog->setOverallProgress(0);
progressDialog->setProgress("GI", 0);
Index: Scribus/scribus/Makefile.am
===================================================================
--- Scribus/scribus/Makefile.am (revision 5370)
+++ Scribus/scribus/Makefile.am (revision 5369)
@@ -184,7 +184,6 @@
scpaths.cpp \
scplugin.cpp \
scpreview.cpp \
- scprogressbar.cpp \
scraction.cpp \
scrap.cpp \
scribusdoc.cpp \
Index: Scribus/scribus/pslib.cpp
===================================================================
--- Scribus/scribus/pslib.cpp (revision 5370)
+++ Scribus/scribus/pslib.cpp (revision 5369)
@@ -1099,10 +1099,8 @@
{
QStringList barNames, barTexts;
barNames << "EMP" << "EP";
- barTexts << tr("Processing Master Page:") << tr("Exporting Page:");
- QValueList<bool> barsNumeric;
- barsNumeric << true << true;
- progressDialog->addExtraProgressBars(barNames, barTexts, barsNumeric);
+ barTexts << tr("Processing Master Pages:") << tr("Exporting Pages:");
+ progressDialog->addExtraProgressBars(barNames, barTexts);
progressDialog->setOverallTotalSteps(pageNs.size()+Doc->MasterPages.count());
progressDialog->setTotalSteps("EMP", Doc->MasterPages.count());
progressDialog->setTotalSteps("EP", pageNs.size());
Index: Scribus/scribus/pdflib.h
===================================================================
--- Scribus/scribus/pdflib.h (revision 5370)
+++ Scribus/scribus/pdflib.h (revision 5369)
@@ -24,7 +24,7 @@
#ifndef PDFLIB_H
#define PDFLIB_H
-#include <qvaluelist.h>
+#include "qvaluelist.h"
#include <qfile.h>
#include <string>
#include <vector>
/branches/Version13x/Scribus/scribus/multiprogressdialog.h
30,18 → 30,15
#include "scribusapi.h"
#include "multiprogressdialogbase.h"
 
#include "scprogressbar.h"
#include <qdialog.h>
 
#include <qprogressbar.h>
#include <qpushbutton.h>
#include <qlabel.h>
#include <qlayout.h>
#include <qmap.h>
#include <qpushbutton.h>
#include <qstringlist.h>
#include <qstring.h>
#include <qvaluelist.h>
#include <qdialog.h>
#include <qmap.h>
 
 
class SCRIBUS_API MultiProgressDialog : public MultiProgressDialogBase
{
Q_OBJECT
68,16 → 65,15
void removeExtraProgressBars();
/**
* Add a list of progress bars, where barsList contains a list of references and barTexts
* contains the labels for the bars. Set the bools in barsNumerical to true to get a "X of Y" indicator
* contains the labels for the bars.
* Eg:
* "MYBAR1" -> "My Bar 1:"
* "MYBAR2" -> "My Bar 2:"
* @param barsList
* @param barsTexts
* @param barsNumerical
* @return Success
*/
bool addExtraProgressBars(const QStringList &barsList, const QStringList &barsTexts, const QValueList<bool>& barsNumerical);
bool addExtraProgressBars(const QStringList &barsList, const QStringList &barsTexts);
/**
* Set a new label for a user defined progress bar
* @param barName Progress bar name
140,7 → 136,7
protected:
QStringList progressBarTitles;
QMap<QString, ScProgressBar*> progressBars;
QMap<QString, QProgressBar*> progressBars;
QMap<QString, QLabel*> progressLabels;
};
 
/branches/Version13x/Scribus/scribus/multiprogressdialog.cpp
49,7 → 49,7
progressLabels.clear();
}
 
bool MultiProgressDialog::addExtraProgressBars(const QStringList &barsList, const QStringList &barsTexts, const QValueList<bool>& barsNumerical)
bool MultiProgressDialog::addExtraProgressBars(const QStringList &barsList, const QStringList &barsTexts)
{
uint barCount=barsList.count();
if (barCount==0)
61,7 → 61,7
if(progressBarTitles.contains(barName))
continue;
progressBarTitles.append(barName);
progressBars.insert(barName, new ScProgressBar(barsNumerical[i], this, barName));
progressBars.insert(barName, new QProgressBar(this, barName));
progressLabels.insert(barName, new QLabel(barsTexts[i], this, barName));
gridLayout->addWidget(progressLabels[barName], gridLayoutRow, 0);
gridLayout->addWidget(progressBars[barName], gridLayoutRow, 1);