Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 19993 → Rev 19994

/trunk/Scribus/scribus/plugins/picbrowser/picturebrowser.cpp
25,7 → 25,10
#include "util_icon.h"
#include "util_formats.h"
 
PictureBrowser::PictureBrowser ( ScribusDoc* doc, QWidget *parent ) : QDialog ( parent )
PictureBrowser::PictureBrowser ( ScribusDoc* doc, QWidget *parent ) :
QDialog ( parent ),
pImages(0),
pModel(0)
{
setupUi ( this );
 
282,7 → 285,15
{
}
 
void PictureBrowser::closeEvent(QCloseEvent* e)
{
delete pImages;
pImages=0;
delete pModel;
pModel=0;
}
 
 
void PictureBrowser::callLoadImageThread ( int row, int pId )
{
previewImage *imageToLoad = pModel->modelItemsList.at ( row );
1569,7 → 1580,8
 
if ( sort )
{
pImages->sortPreviewImages ( pbSettings.sortSetting );
if (pImages)
pImages->sortPreviewImages ( pbSettings.sortSetting );
}
 
if ( reload )
1585,7 → 1597,8
}
}
 
pModel->setModelItemsList ( pImages->previewImagesList );
if (pModel)
pModel->setModelItemsList ( pImages->previewImagesList );
statusLabel->setText ( QString ( "%1 image(s) displayed, %2 image(s) filtered" ).arg ( imagesDisplayed ).arg ( imagesFiltered ) );
}
 
/trunk/Scribus/scribus/plugins/picbrowser/picturebrowser.h
7,6 → 7,7
#ifndef PICTUREBROWSER_H
#define PICTUREBROWSER_H
 
#include <QCloseEvent>
#include <QDirModel>
#include "ui_picturebrowser.h"
 
100,6 → 101,7
public:
PictureBrowser ( ScribusDoc* doc, QWidget *parent = 0 );
~PictureBrowser();
void closeEvent(QCloseEvent *e);
void changedDocument ( ScribusDoc* doc );
void closedDocument();