Mercurial > hg > forks > UniversalIndentGUI

changeset 292:ad0b94e8d5bd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Replaced all calls of error message dialogs by own error message dialog and enhanced this one, to show given a window title. git-svn-id: svn://svn.code.sf.net/p/universalindent/code/trunk@514 59b1889a-e5ac-428c-b0c7-476e01d41282
author thomas_-_s <thomas_-_s@59b1889a-e5ac-428c-b0c7-476e01d41282>
date Tue, 11 Dec 2007 11:46:21 +0000
parents 54f9f1983080
children 66949ae2f9af
files src/indenthandler.cpp src/indenthandler.h src/uiguierrormessage.cpp src/uiguierrormessage.h
diffstat 4 files changed, 16 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- a/src/indenthandler.cpp	Mon Dec 10 11:13:15 2007 +0000
+++ b/src/indenthandler.cpp	Tue Dec 11 11:46:21 2007 +0000
@@ -76,10 +76,9 @@
             indenterID = indenterIniFileList.count() - 1;
         }
 
-        // reads and parses first found indent ini file and creates toolbox entries
+        // reads and parses the by indenterID defined indent ini file and creates toolbox entries
         readIndentIniFile( dataDirctoryStr + indenterIniFileList.at(indenterID) );
     }
-    noIndenterExecExistDialogAlreadyShown = false;
 
     errorMessageDialog = new UiGuiErrorMessage(mainWindow);
 }
@@ -258,16 +257,13 @@
     // the unformatted source code. Else continue calling the indenter.
 #if defined(Q_OS_WIN32)
     indenterExecutableExists = QFile::exists(dataDirctoryStr + indenterFileName+".exe");
-    indenterExecutableExists |= QFile::exists(dataDirctoryStr + indenterFileName+".bat");
+    //indenterExecutableExists |= QFile::exists(dataDirctoryStr + indenterFileName+".bat");
 #else
     indenterExecutableExists = QFile::exists(dataDirctoryStr + indenterFileName) || QFile::exists(dataDirctoryStr + indenterFileName+".exe");
 #endif
     if ( !indenterExecutableExists ) {
-        if ( !noIndenterExecExistDialogAlreadyShown ) {
-            QMessageBox::warning(NULL, tr("No indenter executable"), tr("There exists no indenter executable with the name \"")
-                +indenterFileName+ tr("\" in the directory \"") +dataDirctoryStr+"\".");
-            noIndenterExecExistDialogAlreadyShown = true;
-        }
+        errorMessageDialog->showMessage(tr("No indenter executable"), tr("There exists no indenter executable with the name \"")
+            +indenterFileName+ tr("\" in the directory \"") +dataDirctoryStr+"\".");
         return sourceCode;
     }
 
@@ -301,7 +297,7 @@
 
     if ( !wineInstalled ) {
         QApplication::restoreOverrideCursor();
-        QMessageBox::warning(NULL, tr("wine not installed"), tr("There exists only a win32 executable of the indenter and wine does not seem to be installed. Please install wine to be able to run the indenter.") );
+        errorMessageDialog->showMessage(tr("wine not installed"), tr("There exists only a win32 executable of the indenter and wine does not seem to be installed. Please install wine to be able to run the indenter.") );
     }
     else {
         // set the directory for the indenter execution
@@ -339,7 +335,7 @@
             }
             processReturnString += tr("<br><b>Callstring was:</b> ") + indentCallString + "</html></body>";
             QApplication::restoreOverrideCursor();
-            QMessageBox::warning(NULL, tr("Error calling Indenter"), processReturnString);
+            errorMessageDialog->showMessage(tr("Error calling Indenter"), processReturnString);
         }
         // there was no problem starting the process/indenter so fetch, what it returned
         else {
@@ -354,8 +350,7 @@
                                 tr("<b>Indent console output was:</b> ") + processReturnString + "<br>" +
                                 tr("<br><b>Callstring was:</b> ") + indentCallString + "</html></body>";
             QApplication::restoreOverrideCursor();
-            //QMessageBox::warning(NULL, tr("Indenter returned error"), processReturnString);
-            errorMessageDialog->showMessage(processReturnString);
+            errorMessageDialog->showMessage( tr("Indenter returned error"), processReturnString );
         }
     }
 
@@ -986,6 +981,7 @@
     return fileTypes;
 }
 
+
 /*!
     \brief Returns the path and filename of the current indenter config file.
  */
--- a/src/indenthandler.h	Mon Dec 10 11:13:15 2007 +0000
+++ b/src/indenthandler.h	Tue Dec 11 11:46:21 2007 +0000
@@ -130,9 +130,7 @@
     QString outputFileName;
     QString fileTypes;
     QString useCfgFileParameter;
-    bool noIndenterExecExistDialogAlreadyShown;
     QMainWindow *mainWindow;
-
     UiGuiErrorMessage *errorMessageDialog;
 
 public slots:
--- a/src/uiguierrormessage.cpp	Mon Dec 10 11:13:15 2007 +0000
+++ b/src/uiguierrormessage.cpp	Tue Dec 11 11:46:21 2007 +0000
@@ -26,13 +26,15 @@
 UiGuiErrorMessage::~UiGuiErrorMessage(void) {
 }
 
-void UiGuiErrorMessage::showMessage( const QString &message ) {
+void UiGuiErrorMessage::showMessage( const QString &title, const QString &message ) {
     bool showAgain = true;
 
     if ( showAgainCheckBox != 0 ) {
         showAgain = showAgainCheckBox->isChecked();
     }
 
+    setWindowTitle(title);
+
     if ( !errorMessageList.contains(message) ) {
         errorMessageList << message;
         if ( showAgainCheckBox != 0 ) {
@@ -43,5 +45,8 @@
     else if ( showAgain ) {
         QErrorMessage::showMessage( message );
     }
-    
 }
+
+void UiGuiErrorMessage::showMessage( const QString &message ) {
+    showMessage( "UniversalIndentGUI", message );
+}
--- a/src/uiguierrormessage.h	Mon Dec 10 11:13:15 2007 +0000
+++ b/src/uiguierrormessage.h	Tue Dec 11 11:46:21 2007 +0000
@@ -29,6 +29,7 @@
     UiGuiErrorMessage(QWidget *parent = 0);
     ~UiGuiErrorMessage(void);
     void showMessage( const QString &message );
+    void showMessage( const QString &title, const QString &message );
 
 private:
     QCheckBox *showAgainCheckBox;