Browse Source

Show error messages, change window title

Kandrashin Denis 13 years ago
parent
commit
33d3248c38
3 changed files with 15 additions and 2 deletions
  1. 6 0
      source/fb2app.cpp
  2. 7 2
      source/fb2main.cpp
  3. 2 0
      source/fb2read.cpp

+ 6 - 0
source/fb2app.cpp

@@ -1,14 +1,20 @@
 #include <QApplication>
+#include <QErrorMessage>
 
 #include "fb2main.h"
 
 int main(int argc, char *argv[])
 {
     Q_INIT_RESOURCE(fb2edit);
+
     QApplication app(argc, argv);
     app.setApplicationName("fb2edit");
     app.setOrganizationName("LinTest");
+
+    QErrorMessage::qtHandler();
+
     MainWindow * mainWin = new MainWindow;
     mainWin->show();
+
     return app.exec();
 }

+ 7 - 2
source/fb2main.cpp

@@ -116,6 +116,10 @@ void MainWindow::about()
 
 void MainWindow::documentWasModified()
 {
+    QFileInfo info = windowFilePath();
+    QString title = info.fileName();
+    title += QString("[*]") += QString(" - ") += qApp->applicationName();
+    setWindowTitle(title);
     setWindowModified(true);
 }
 
@@ -137,8 +141,7 @@ void MainWindow::init()
 
     readSettings();
 
-    connect(textEdit->document(), SIGNAL(contentsChanged()),
-            this, SLOT(documentWasModified()));
+    connect(textEdit->document(), SIGNAL(contentsChanged()), this, SLOT(documentWasModified()));
 
     setUnifiedTitleAndToolBarOnMac(true);
 }
@@ -332,6 +335,8 @@ void MainWindow::setCurrentFile(const QString &filename, QTextDocument * documen
     setWindowModified(false);
     setWindowFilePath(curFile);
     setWindowTitle(title);
+
+    connect(textEdit->document(), SIGNAL(contentsChanged()), this, SLOT(documentWasModified()));
 }
 
 QString MainWindow::strippedName(const QString &fullFileName)

+ 2 - 0
source/fb2read.cpp

@@ -1,5 +1,6 @@
 #include <QtGui>
 #include <QTextEdit>
+#include <QtDebug>
 
 #include "fb2read.h"
 
@@ -40,6 +41,7 @@ bool Fb2Handler::RootHandler::doStart(const QString &name, const QXmlAttributes
         case Body   : return m_owner.setHandler(new BodyHandler(this));
         case Binary : return m_owner.setHandler(new BinaryHandler(this, attributes));
     }
+    qCritical() << QObject::tr("Unknown XML tag: ") << name;
     return false;
 }