--- s10k/Vago/bgImageWizard/bgimagepage2.cpp 2017/12/30 13:43:28 1092 +++ s10k/Vago/bgImageWizard/bgimagepage2.cpp 2017/12/30 13:57:32 1093 @@ -1,12 +1,11 @@ #include "bgimagepage2.h" #include "ui_bgimagepage2.h" -BGImagePage2::BGImagePage2(Logger *myLogger, QWidget *parent) : +BGImagePage2::BGImagePage2(QWidget *parent) : QWizardPage(parent), ui(new Ui::BGImagePage2) { ui->setupUi(this); - this->myLogger = myLogger; this->setTitle("Image to use as background"); this->setSubTitle("Add here the image that you want to convert. Image width and height must be greater than or equal 256 pixels. Example of valid image resolutions: 640x480, 1024x768."); @@ -45,7 +44,7 @@ bool BGImagePage2::validatePage(){ bool BGImagePage2::validateField(QString &field){ if(field.isEmpty()){ - Util::showErrorPopUp("You need to choose an image."); + Util::Dialogs::showError("You need to choose an image."); return false; } @@ -65,12 +64,12 @@ void BGImagePage2::on_pbBrowse_clicked() QImage myImage; if(!myImage.load(selectedImage)){ - UtilVago::showAndLogErrorPopUp(this->myLogger,"Couldn't load image '" + Util::cutNameWithoutBackSlash(selectedImage) + "'. Is the image corrupt?"); + UtilVago::showAndLogErrorPopUp("Couldn't load image '" + Util::FileSystem::cutNameWithoutBackSlash(selectedImage) + "'. Is the image corrupt?"); return; } if(myImage.width() < 256 || myImage.height() < 256){ - UtilVago::showAndLogErrorPopUp(this->myLogger,"Image '" + Util::cutNameWithoutBackSlash(selectedImage) + + UtilVago::showAndLogErrorPopUp("Image '" + Util::FileSystem::cutNameWithoutBackSlash(selectedImage) + "' does not have a width and height >= 256."); return; }