Small changes

source/fb2main.cpp

@@ -12,50 +12,37 @@
 #include "fb2head.hpp"
 #include "fb2utils.h"
 
-FbMainWindow::FbMainWindow()
-{
-    init();
-    setCurrentFile();
-    viewText();
-    textFrame->view.load(":blank.fb2");
-}
-
 FbMainWindow::FbMainWindow(const QString &filename, ViewMode mode)
-{
-    init();
-    setCurrentFile(filename);
-    if (mode == FB2) {
-        viewText();
-        textFrame->view.load(filename);
-    } else {
-        viewCode();
-        loadXML(filename);
-    }
-}
-
-void FbMainWindow::init()
+    : QMainWindow()
+    , textFrame(0)
+    , codeEdit(0)
+    , headTree(0)
+    , noteEdit(0)
+    , toolEdit(0)
+    , dockTree(0)
+    , inspector(0)
+    , messageEdit(0)
+    , isSwitched(false)
+    , isUntitled(true)
 {
     connect(qApp, SIGNAL(logMessage(QString)), SLOT(logMessage(QString)));
 
+    setUnifiedTitleAndToolBarOnMac(true);
     setAttribute(Qt::WA_DeleteOnClose);
     setWindowIcon(QIcon(":icon.ico"));
 
-    isUntitled = true;
-
     createActions();
     createStatusBar();
-
-    textFrame = NULL;
-    noteEdit = NULL;
-    codeEdit = NULL;
-    headTree = NULL;
-    toolEdit = NULL;
-    dockTree = NULL;
-    messageEdit = NULL;
-
     readSettings();
 
-    setUnifiedTitleAndToolBarOnMac(true);
+    setCurrentFile(filename);
+    if (mode == FB2) {
+        viewText();
+        textFrame->view.load(filename.isEmpty() ? ":blank.fb2" : filename);
+    } else {
+        viewCode();
+        if (!filename.isEmpty()) loadXML(filename);
+    }
 }
 
 void FbMainWindow::logMessage(const QString &message)
@@ -178,24 +165,22 @@ void FbMainWindow::about()
 
 void FbMainWindow::documentWasModified()
 {
-    bool modified = false;
-    if (codeEdit) modified = codeEdit->isModified();
-    QFileInfo info = windowFilePath();
-    QString title = info.fileName();
-    if (modified) title += QString("[*]");
-    title += appTitle();
-    setWindowTitle(title);
-    setWindowModified(modified);
+    setModified(isSwitched || codeEdit->isModified());
 }
 
 void FbMainWindow::cleanChanged(bool clean)
+{
+    setModified(isSwitched || !clean);
+}
+
+void FbMainWindow::setModified(bool modified)
 {
     QFileInfo info = windowFilePath();
     QString title = info.fileName();
-    if (!clean) title += QString("[*]");
+    if (modified) title += QString("[*]");
     title += appTitle();
     setWindowTitle(title);
-    setWindowModified(!clean);
+    setWindowModified(modified);
 }
 
 void FbMainWindow::createActions()
@@ -547,41 +532,33 @@ bool FbMainWindow::saveFile(const QString &fileName, const QString &codec)
     }
 
     if (textFrame) {
+        isSwitched = false;
         textFrame->view.save(&file, codec);
         setCurrentFile(fileName);
+        return true;
     }
-    return true;
 
-/*
-    QTextStream out(&file);
-    QApplication::setOverrideCursor(Qt::WaitCursor);
-    out << textFrame->view.toPlainText();
-    QApplication::restoreOverrideCursor();
+    if (codeEdit) {
+        QTextStream out(&file);
+        out << codeEdit->toPlainText();
+        setCurrentFile(fileName);
+        return true;
+    }
 
-    setCurrentFile(fileName);
-    statusBar()->showMessage(tr("File saved"), 2000);
-*/
+    return false;
 }
 
 void FbMainWindow::setCurrentFile(const QString &filename)
 {
-    static int sequenceNumber = 1;
-
-    QString title;
-    isUntitled = filename.isEmpty();
-    if (isUntitled) {
+    if (filename.isEmpty()) {
+        static int sequenceNumber = 1;
         curFile = QString("book%1.fb2").arg(sequenceNumber++);
-        title = curFile;
     } else {
         QFileInfo info = filename;
         curFile = info.canonicalFilePath();
-        title = info.fileName();
     }
-    title += appTitle();
-
-    setWindowModified(false);
     setWindowFilePath(curFile);
-    setWindowTitle(title);
+    setModified(false);
 }
 
 QString FbMainWindow::appTitle() const
@@ -616,6 +593,7 @@ void FbMainWindow::viewCode()
     QByteArray xml;
     if (textFrame) {
         textFrame->view.save(&xml);
+        isSwitched = true;
         load = true;
     }
 
@@ -668,8 +646,15 @@ void FbMainWindow::viewCode()
 void FbMainWindow::viewText()
 {
     if (textFrame && centralWidget() == textFrame) return;
+
+    bool load = false;
     QString xml;
-    if (codeEdit) xml = codeEdit->text();
+    if (codeEdit) {
+        xml = codeEdit->text();
+        isSwitched = true;
+        load = true;
+    }
+
     FB2DELETE(codeEdit);
     FB2DELETE(headTree);
     if (!textFrame) {
@@ -723,7 +708,7 @@ void FbMainWindow::viewText()
     connect(actionZoomReset, SIGNAL(triggered()), textEdit, SLOT(zoomReset()));
     connect(actionInspect, SIGNAL(triggered()), textFrame, SLOT(showInspector()));
 
-    if (!xml.isEmpty()) textFrame->view.load(curFile, xml);
+    if (load) textFrame->view.load(curFile, xml);
 
     FB2DELETE(toolEdit);
     QToolBar *tool = toolEdit = addToolBar(tr("Edit"));

source/fb2main.hpp

@@ -26,8 +26,7 @@ class FbMainWindow : public QMainWindow
 
 public:
     enum ViewMode { FB2, XML };
-    explicit FbMainWindow();
-    explicit FbMainWindow(const QString &filename, ViewMode mode = FB2);
+    explicit FbMainWindow(const QString &filename = QString(), ViewMode mode = FB2);
 
 protected:
     void closeEvent(QCloseEvent *event);
@@ -67,29 +66,29 @@ private:
     QString appTitle() const;
 
 private:
-    void init();
     void createHead();
     void createTree();
     void createActions();
     void createStatusBar();
     void readSettings();
     void writeSettings();
+    void setModified(bool modified);
     bool maybeSave();
     bool saveFile(const QString &fileName, const QString &codec = QString());
     void setCurrentFile(const QString &fileName = QString());
     FbMainWindow *findFbMainWindow(const QString &fileName);
 
     FbTextFrame *textFrame;
-    QWebInspector *inspector;
+    FbCodeEdit *codeEdit;
     FbHeadView *headTree;
     QTextEdit *noteEdit;
-    QTextEdit *messageEdit;
+    QToolBar *toolEdit;
     QDockWidget *dockTree;
-    FbCodeEdit *codeEdit;
+    QWebInspector *inspector;
+    QTextEdit *messageEdit;
     QString curFile;
     bool isUntitled;
-
-    QToolBar *toolEdit;
+    bool isSwitched;
 
     QMenu
         *menuEdit,

source/fb2text.hpp

@@ -48,6 +48,11 @@ protected:
           m_timer.start();
      }
 
+     void keyPressEvent(QKeyEvent *event) {
+         if (event->key() == Qt::Key_Escape) return;
+         QWebView::keyPressEvent(event);
+     }
+
 private:
     QTimer m_timer;
     QSize m_size;