--- Vago/trunk/Vago/utilvago.cpp 2016/09/16 22:51:26 1047 +++ Vago/trunk/Vago/utilvago.cpp 2016/10/12 21:35:13 1054 @@ -6,6 +6,44 @@ void openLogFile(){ QDesktopServices::openUrl(QUrl("file:///"+getAppPath()+"/"+GlobalVars::AppLogName)); } +void showAndLogWarningPopUp(Logger *logger, const QString &message){ + logger->writeString(message); + + QMessageBox msgBox; + msgBox.setIcon(QMessageBox::Warning); + msgBox.setText(message); + msgBox.exec(); +} + +//Same of above but allow open log file (doesn't write in log file!!) +void showWarningPopUpLogButton(const QString &message){ + QMessageBox msgBox; + msgBox.setIcon(QMessageBox::Warning); + msgBox.setText(message); + QPushButton *viewb = msgBox.addButton("View log", QMessageBox::ActionRole); + msgBox.setStandardButtons(QMessageBox::Close); + msgBox.exec(); + if(msgBox.clickedButton() == (QAbstractButton*)(viewb)){ + openLogFile(); + } +} + +//Same of above but also writtes directly to the log file the error +void showAndLogWarningPopUpLogButton(Logger *logger, const QString &message){ + + logger->writeString(message); + + QMessageBox msgBox; + msgBox.setIcon(QMessageBox::Warning); + msgBox.setText(message); + QPushButton *viewb = msgBox.addButton("View log", QMessageBox::ActionRole); + msgBox.setStandardButtons(QMessageBox::Close); + msgBox.exec(); + if(msgBox.clickedButton() == (QAbstractButton*)(viewb)){ + openLogFile(); + } +} + void showAndLogErrorPopUp(Logger *logger, const QString &message){ logger->writeString(message); @@ -66,17 +104,27 @@ QString getAppPath(){ return getOSIndependentAppPath(); } -QString getOniSplitExeAbsolutePath(){ +// Absolute paths +QString getOniSplitExecutableAbsolutePath(){ + return getAppPath() + "/" + GlobalVars::ToolsFolder + "/" + GlobalVars::OniSplitString; +} + +QString getXmlToolsExecutableAbsolutePath(){ + return getAppPath() + "/" + GlobalVars::ToolsFolder + "/" + GlobalVars::XmlToolsString; +} + +// Executables (includes mono if necessary) +QString getOniSplitExecutable(){ #ifdef Q_OS_MAC - return getMonoExecutablePath() + " " + getAppPath() + "/" + GlobalVars::ToolsFolder + "/" + GlobalVars::OniSplitString; + return getMonoExecutablePath() + " " + Util::insertQuotes(getOniSplitExecutableAbsolutePath()); #else - return getAppPath() + "/" + GlobalVars::ToolsFolder + "/" + GlobalVars::OniSplitString; + return Util::insertQuotes(getOniSplitExecutableAbsolutePath()); #endif } -QString getXmlToolsExeAbsolutePath(){ - return getAppPath() + "/" + GlobalVars::ToolsFolder + "/" + GlobalVars::XmlToolsString; +QString getXmlToolsExecutable(){ + return Util::insertQuotes(getXmlToolsExecutableAbsolutePath()); } #ifdef Q_OS_MAC