office/okular
office/okular
1
0
Fork 0
mirror of https://invent.kde.org/graphics/okular synced 2024-09-12 20:51:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge 434125:435261

Browse source 
svn path=/branches/work/kde4/kdegraphics/kdvi/; revision=435284
This commit is contained in:
Thiago Macieira 2005-07-16 13:31:49 +00:00
parent 255acb100a 8d38bacff8
commit bc74a57315
6 changed files with 46 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
dviFile.cpp
View file

@ -97,7 +97,6 @@ dvifile::dvifile(const dvifile *old, fontPool *fp)
find_postamble();
read_postamble();
prepare_pages();
isModified = false;
}
@ -305,7 +304,6 @@ dvifile::dvifile(QString fname, fontPool *pool)
find_postamble();
read_postamble();
prepare_pages();
isModified = false;
return;
}
@ -364,6 +362,5 @@ bool dvifile::saveAs(const QString &filename)
if (out.writeBlock ( (char *)(dvi_Data()), size_of_file ) == -1)
return false;
out.close();
isModified = false;
return true;
}

3
dviFile.h
View file

@ -34,7 +34,6 @@ class dvifile : public bigEndianByteReader
~dvifile();
bool isModified;
fontPool * font_pool;
QString filename;
QString generatorString;
@ -92,7 +91,7 @@ class dvifile : public bigEndianByteReader
/** Sets new DVI data; all old data is erased. EXPERIMENTAL, use
with care. */
void setNewData(Q3MemArray<Q_UINT8> newData) {dviData = newData; isModified=true;};
void setNewData(Q3MemArray<Q_UINT8> newData) {dviData = newData;};
/** Page numbers that appear in a DVI document need not be
ordered. Worse, page numbers need not be unique. This method

57
dviRenderer.cpp
View file

@ -123,12 +123,11 @@ dviRenderer::~dviRenderer()
void dviRenderer::setPrefs(bool flag_showPS, const QString &str_editorCommand, bool useFontHints )
{
mutex.lock();
QMutexLocker locker(&mutex);
_postscript = flag_showPS;
editorCommand = str_editorCommand;
font_pool.setParameters( useFontHints );
mutex.unlock();
emit(needsRepainting());
emit(documentIsChanged());
}
@ -307,7 +306,6 @@ void dviRenderer::embedPostScript(void)
embedPS_numOfProgressedFiles = 0;
Q_UINT16 currPageSav = current_page;
errorMsg = QString::null;
for(current_page=0; current_page < dviFile->total_pages; current_page++) {
@ -368,6 +366,7 @@ void dviRenderer::embedPostScript(void)
kdDebug(4300) << "Time required for prescan phase: " << preScanTimer.restart() << "ms" << endl;
#endif
current_page = currPageSav;
_isModified = true;
}
@ -401,7 +400,7 @@ bool dviRenderer::setFile(const QString &fname)
kdDebug(4300) << "dviRenderer::setFile( fname='" << fname << "', ref='" << ref << "', sourceMarker=" << sourceMarker << " )" << endl;
#endif
mutex.lock();
QMutexLocker lock(&mutex);
QFileInfo fi(fname);
QString filename = fi.absFilePath();
@ -413,22 +412,19 @@ bool dviRenderer::setFile(const QString &fname)
info->setDVIData(0);
delete dviFile;
dviFile = 0;
mutex.unlock();
return true;
}
// Make sure the file actually exists.
if (!fi.exists() || fi.isDir()) {
KMessageBox::error( parentWidget,
i18n("<qt><strong>File error.</strong> The specified file '%1' does not exist. "
"KDVI already tried to add the ending '.dvi'.</qt>").arg(filename),
i18n("File Error!"));
mutex.unlock();
return false;
}
// Check if we are really loading a DVI file, and complain about the
// mime type, if the file is not DVI. Perhaps we should move the
// procedure later to the kviewpart, instead of the implementaton in
@ -440,19 +436,17 @@ bool dviRenderer::setFile(const QString &fname)
"type <strong>%2</strong>. KDVI can only load DVI (.dvi) files.</qt>" )
.arg( fname )
.arg( mimetype ) );
mutex.unlock();
return false;
}
QApplication::setOverrideCursor( Qt::waitCursor );
dvifile *dviFile_new = new dvifile(filename, &font_pool);
if ((dviFile == 0) || (dviFile->filename != filename))
dviFile_new->sourceSpecialMarker = true;
else
dviFile_new->sourceSpecialMarker = false;
if ((dviFile_new->dvi_Data() == NULL)||(dviFile_new->errorMsg.isEmpty() != true)) {
QApplication::restoreOverrideCursor();
if (dviFile_new->errorMsg.isEmpty() != true)
@ -461,23 +455,24 @@ bool dviRenderer::setFile(const QString &fname)
"likely this means that the DVI file is broken.</qt>"),
dviFile_new->errorMsg, i18n("DVI File Error"));
delete dviFile_new;
mutex.unlock();
return false;
}
delete dviFile;
dviFile = dviFile_new;
numPages = dviFile->total_pages;
info->setDVIData(dviFile);
_isModified = false;
font_pool.setExtraSearchPath( fi.dirPath(true) );
font_pool.setCMperDVIunit( dviFile->getCmPerDVIunit() );
// Extract PostScript from the DVI file, and store the PostScript
// specials in PostScriptDirectory, and the headers in the
// PostScriptHeaderString.
PS_interface->clear();
// Files that reside under "tmp" or under the "data" resource are most
// likely remote files. We limit the files they are able to read to
// the directory they are in in order to limit the possibilities of a
@ -489,35 +484,32 @@ bool dviRenderer::setFile(const QString &fname)
if (!filename.startsWith(tmp))
restrictIncludePath = false;
}
QString includePath;
if (restrictIncludePath) {
includePath = filename;
includePath.truncate(includePath.findRev('/'));
}
PS_interface->setIncludePath(includePath);
// We will also generate a list of hyperlink-anchors and source-file
// anchors in the document. So declare the existing lists empty.
anchorList.clear();
sourceHyperLinkAnchors.clear();
bookmarks.clear();
prebookmarks.clear();
if (dviFile->page_offset.isEmpty() == true) {
mutex.unlock();
if (dviFile->page_offset.isEmpty() == true)
return false;
}
// Locate fonts.
font_pool.locateFonts();
// Update the list of fonts in the info window
if (info != 0)
info->setFontInfo(&font_pool);
// We should pre-scan the document now (to extract embedded,
// PostScript, Hyperlinks, ets).
@ -551,7 +543,6 @@ bool dviRenderer::setFile(const QString &fname)
}
PostScriptOutPutString = NULL;
// Generate the list of bookmarks
bookmarks.clear();
QPtrStack<Bookmark> stack;
@ -577,16 +568,14 @@ bool dviRenderer::setFile(const QString &fname)
current_page = currPageSav;
// PRESCAN ENDS HERE
pageSizes.resize(0);
if (dviFile->suggestedPageSize != 0) {
// Fill the vector pageSizes with total_pages identical entries
pageSizes.resize(dviFile->total_pages, *(dviFile->suggestedPageSize));
}
emit(needsRepainting());
QApplication::restoreOverrideCursor();
mutex.unlock();
return true;
}

3
dviRenderer_prescan.cpp
View file

@ -147,7 +147,7 @@ void dviRenderer::prescan_embedPS(char *cp, Q_UINT8 *beginningOfSpecialCommand)
PS = PS.simplifyWhiteSpace();
dviFile->isModified = true;
_isModified = true;
Q_UINT32 lengthOfOldSpecial = command_pointer - beginningOfSpecialCommand;
Q_UINT32 lengthOfNewSpecial = PS.length()+5;
@ -208,7 +208,6 @@ void dviRenderer::prescan_embedPS(char *cp, Q_UINT8 *beginningOfSpecialCommand)
command_pointer = newDVI.data() + (command_pointer - dviFile->dvi_Data()) + lengthOfNewSpecial-lengthOfOldSpecial;
end_pointer = newDVI.data() + (end_pointer - dviFile->dvi_Data()) + lengthOfNewSpecial-lengthOfOldSpecial;
dviFile->setNewData(newDVI);
embedPS_progress->progressBar()->advance(1);

43
kdvi_multipage.cpp
View file

@ -49,6 +49,8 @@ int performanceFlag = 0;
typedef KParts::GenericFactory<KDVIMultiPage> KDVIMultiPageFactory;
K_EXPORT_COMPONENT_FACTORY(kdvipart, KDVIMultiPageFactory)
KDVIMultiPage::KDVIMultiPage(QWidget *parentWidget, const char *widgetName, QObject *parent,
const char *name, const QStringList& args)
: KMultiPage(parentWidget, widgetName, parent, name), DVIRenderer(parentWidget)
@ -68,13 +70,11 @@ KDVIMultiPage::KDVIMultiPage(QWidget *parentWidget, const char *widgetName, QObj
setRenderer(&DVIRenderer);
docInfoAction = new KAction(i18n("Document &Info"), 0, &DVIRenderer, SLOT(showInfo()), actionCollection(), "info_dvi");
embedPSAction = new KAction(i18n("Embed External PostScript Files..."), 0, this, SLOT(slotEmbedPostScript()), actionCollection(), "embed_postscript");
embedPSAction = new KAction(i18n("Embed External PostScript Files..."), 0, this, SLOT(slotEmbedPostScript()), actionCollection(), "embed_postscript");
new KAction(i18n("Enable All Warnings && Messages"), 0, this, SLOT(doEnableWarnings()), actionCollection(), "enable_msgs");
exportPSAction = new KAction(i18n("PostScript..."), 0, &DVIRenderer, SLOT(exportPS()), actionCollection(), "export_postscript");
exportPDFAction = new KAction(i18n("PDF..."), 0, &DVIRenderer, SLOT(exportPDF()), actionCollection(), "export_pdf");
exportTextAction = new KAction(i18n("Text..."), 0, this, SLOT(doExportText()), actionCollection(), "export_text");
exportPSAction = new KAction(i18n("PostScript..."), 0, &DVIRenderer, SLOT(exportPS()), actionCollection(), "export_postscript");
exportPDFAction = new KAction(i18n("PDF..."), 0, &DVIRenderer, SLOT(exportPDF()), actionCollection(), "export_pdf");
exportTextAction = new KAction(i18n("Text..."), 0, this, SLOT(doExportText()), actionCollection(), "export_text");
KStdAction::tipOfDay(this, SLOT(showTip()), actionCollection(), "help_tipofday");
@ -88,6 +88,20 @@ KDVIMultiPage::KDVIMultiPage(QWidget *parentWidget, const char *widgetName, QObj
QTimer::singleShot(0,this,SLOT(showTipOnStart()));
}
KDVIMultiPage::~KDVIMultiPage()
{
delete docInfoAction;
delete embedPSAction;
delete exportPSAction;
delete exportPDFAction;
delete exportTextAction;
writeSettings();
Prefs::writeConfig();
}
KAboutData* KDVIMultiPage::createAboutData()
{
KAboutData* about = new KAboutData("kdvi", I18N_NOOP("KDVI"), "1.3",
@ -111,6 +125,7 @@ KAboutData* KDVIMultiPage::createAboutData()
return about;
}
void KDVIMultiPage::slotEmbedPostScript(void)
{
DVIRenderer.embedPostScript();
@ -175,22 +190,6 @@ void KDVIMultiPage::slotSave_defaultFilename()
}
bool KDVIMultiPage::isModified()
{
if ((DVIRenderer.dviFile == 0) || (DVIRenderer.dviFile->dvi_Data() == 0))
return false;
else
return DVIRenderer.dviFile->isModified;
}
KDVIMultiPage::~KDVIMultiPage()
{
writeSettings();
Prefs::writeConfig();
}
void KDVIMultiPage::setFile(bool r)
{
enableActions(r);

4
kdvi_multipage.h
View file

@ -30,10 +30,6 @@ public:
/// method and return true here.
virtual bool isReadWrite() {return true;};
/// multipage implementations that offer read- and write
/// functionality should re-implement this method.
virtual bool isModified();
virtual void addConfigDialogs(KConfigDialog* configDialog);
static KAboutData* createAboutData();