Changeset 561 for trunk/tools/linguist/linguist/mainwindow.cpp

Timestamp:

Feb 11, 2010, 11:19:06 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.1 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• tools/linguist/linguist/mainwindow.cpp (modified) (23 diffs)

trunk/tools/linguist/linguist/mainwindow.cpp

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the Qt Linguist of the Qt Toolkit.
@@ -21 +22 @@
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
@@ -34 +34 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
@@ -51 +51 @@
 #include "finddialog.h"
 #include "formpreviewview.h"
+#include "globals.h"
 #include "messageeditor.h"
 #include "messagemodel.h"
@@ -82 +83 @@
 #include <QMessageBox>
 #include <QPrintDialog>
+#include <QPrinter>
 #include <QProcess>
 #include <QRegExp>
@@ -97 +99 @@
 static const int MessageMS = 2500;
 
-const QString &settingsPrefix()
-{
-    static QString prefix = QString(QLatin1String("%1.%2/"))
-        .arg((QT_VERSION >> 16) & 0xff)
-        .arg((QT_VERSION >> 8) & 0xff);
-    return prefix;
-}
-
 enum Ending {
     End_None,
@@ -122 +116 @@
 {
     str = str.simplified();
-    int ch = 0;
-    if (!str.isEmpty())
-        ch = str.right(1)[0].unicode();
-
-    switch (ch) {
+    if (str.isEmpty())
+        return End_None;
+
+    switch (str.at(str.length() - 1).unicode()) {
     case 0x002e: // full stop
-        if (str.endsWith(QString(QLatin1String("..."))))
+        if (str.endsWith(QLatin1String("...")))
             return End_Ellipsis;
         else
@@ -266 +259 @@
     : QMainWindow(0, Qt::Window),
       m_assistantProcess(0),
+      m_printer(0),
       m_findMatchCase(Qt::CaseInsensitive),
       m_findIgnoreAccelerators(true),
@@ -276 +270 @@
       m_statistics(0)
 {
+    setUnifiedTitleAndToolBarOnMac(true);
     m_ui.setupUi(this);
 
@@ -311 +306 @@
     m_contextView->header()->setMovable(false);
     m_contextView->setColumnHidden(0, true);
-    m_contextView->header()->setResizeMode(1, QHeaderView::Stretch);
-    m_contextView->header()->setResizeMode(2, QHeaderView::ResizeToContents);
     m_contextView->header()->setStretchLastSection(false);
 
@@ -341 +334 @@
     m_messageView->header()->setMovable(false);
     m_messageView->setColumnHidden(0, true);
-    m_messageView->setColumnHidden(2, true);
-    // last visible column auto-stretches
 
     m_messagesDock->setWidget(m_messageView);
@@ -449 +440 @@
 
     modelCountChanged();
+    initViewHeaders();
     resetSorting();
 
@@ -479 +471 @@
     connect(m_findDialog, SIGNAL(findNext(QString,DataModel::FindLocation,bool,bool)),
             this, SLOT(findNext(QString,DataModel::FindLocation,bool,bool)));
-    connect(m_translateDialog, SIGNAL(requestMatchUpdate(bool &)), SLOT(updateTranslateHit(bool &)));
+    connect(m_translateDialog, SIGNAL(requestMatchUpdate(bool&)), SLOT(updateTranslateHit(bool&)));
     connect(m_translateDialog, SIGNAL(activated(int)), SLOT(translate(int)));
 
@@ -488 +480 @@
     readConfig();
     m_statistics = 0;
+
+    connect(m_ui.actionLengthVariants, SIGNAL(toggled(bool)),
+            m_messageEditor, SLOT(setLengthVariants(bool)));
+    m_messageEditor->setLengthVariants(m_ui.actionLengthVariants->isChecked());
 
     m_focusWatcher = new FocusWatcher(m_messageEditor, this);
@@ -508 +504 @@
     delete m_dataModel;
     delete m_statistics;
+    delete m_printer;
+}
+
+void MainWindow::initViewHeaders()
+{
+    m_contextView->header()->setResizeMode(1, QHeaderView::Stretch);
+    m_contextView->header()->setResizeMode(2, QHeaderView::ResizeToContents);
+    m_messageView->setColumnHidden(2, true);
+    // last visible column auto-stretches
 }
 
@@ -741 +746 @@
         m_dataModel->closeAll();
         modelCountChanged();
+        initViewHeaders();
         recentFiles().closeGroup();
         return true;
@@ -875 +881 @@
 }
 
+QPrinter *MainWindow::printer()
+{
+    if (!m_printer)
+        m_printer = new QPrinter;
+    return m_printer;
+}
+
 void MainWindow::print()
 {
 #ifndef QT_NO_PRINTER
     int pageNum = 0;
-    QPrintDialog dlg(&m_printer, this);
+    QPrintDialog dlg(printer(), this);
     if (dlg.exec()) {
         QApplication::setOverrideCursor(Qt::WaitCursor);
-        m_printer.setDocName(m_dataModel->condensedSrcFileNames(true));
+        printer()->setDocName(m_dataModel->condensedSrcFileNames(true));
         statusBar()->showMessage(tr("Printing..."));
-        PrintOut pout(&m_printer);
+        PrintOut pout(printer());
 
         for (int i = 0; i < m_dataModel->contextCount(); ++i) {
@@ -1237 +1250 @@
     int pageNum = 0;
 
-    QPrintDialog dlg(&m_printer, this);
+    QPrintDialog dlg(printer(), this);
     if (dlg.exec()) {
-        m_printer.setDocName(phraseBook->fileName());
+        printer()->setDocName(phraseBook->fileName());
         statusBar()->showMessage(tr("Printing..."));
-        PrintOut pout(&m_printer);
+        PrintOut pout(printer());
         pout.setRule(PrintOut::ThinRule);
         foreach (const Phrase *p, phraseBook->phrases()) {
@@ -1347 +1360 @@
     version = version.arg(QLatin1String(QT_VERSION_STR));
 
-    // TODO: Remove this variable for 4.6.0.  Must keep this way for 4.5.x due to string freeze.
-    QString edition;
-
     box.setText(tr("<center><img src=\":/images/splash.png\"/></img><p>%1</p></center>"
                     "<p>Qt Linguist is a tool for adding translations to Qt "
                     "applications.</p>"
-                    "<p>%2</p>"
                     "<p>Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies)."
-                    "</p><p>The program is provided AS IS with NO WARRANTY OF ANY KIND,"
-                    " INCLUDING THE WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A"
-                    " PARTICULAR PURPOSE.</p>").arg(version).arg(edition));
+                   ).arg(version));
 
     box.setWindowTitle(QApplication::translate("AboutDialog", "Qt Linguist"));
@@ -2352 +2359 @@
 }
 
+static bool haveMnemonic(const QString &str)
+{
+    QString mnemonic = QKeySequence::mnemonic(str);
+    if (mnemonic == QLatin1String("Alt+Space")) {
+        // "Nobody" ever really uses these, and they are highly annoying
+        // because we get a lot of false positives.
+        return false;
+    }
+    return !mnemonic.isEmpty();
+}
+
 void MainWindow::updateDanger(const MultiDataIndex &index, bool verbose)
 {
@@ -2375 +2393 @@
             QStringList translations = m->translations();
 
+            // Truncated variants are permitted to be "denormalized"
+            for (int i = 0; i < translations.count(); ++i) {
+                int sep = translations.at(i).indexOf(QChar(Translator::BinaryVariantSeparator));
+                if (sep >= 0)
+                    translations[i].truncate(sep);
+            }
+
             if (m_ui.actionAccelerators->isChecked()) {
-                bool sk = !QKeySequence::mnemonic(source).isEmpty();
+                bool sk = haveMnemonic(source);
                 bool tk = true;
                 for (int i = 0; i < translations.count() && tk; ++i) {
-                    tk &= !QKeySequence::mnemonic(translations[i]).isEmpty();
+                    tk &= haveMnemonic(translations[i]);
                 }
 
@@ -2503 +2528 @@
 void MainWindow::readConfig()
 {
-    QString keybase = settingsPrefix();
     QSettings config;
 
     QRect r(pos(), size());
-    restoreGeometry(config.value(keybase + QLatin1String("Geometry/WindowGeometry")).toByteArray());
-    restoreState(config.value(keybase + QLatin1String("MainWindowState")).toByteArray());
+    restoreGeometry(config.value(settingPath("Geometry/WindowGeometry")).toByteArray());
+    restoreState(config.value(settingPath("MainWindowState")).toByteArray());
 
     m_ui.actionAccelerators->setChecked(
-        config.value(keybase + QLatin1String("Validators/Accelerator"), true).toBool());
+        config.value(settingPath("Validators/Accelerator"), true).toBool());
     m_ui.actionEndingPunctuation->setChecked(
-        config.value(keybase + QLatin1String("Validators/EndingPunctuation"), true).toBool());
+        config.value(settingPath("Validators/EndingPunctuation"), true).toBool());
     m_ui.actionPhraseMatches->setChecked(
-        config.value(keybase + QLatin1String("Validators/PhraseMatch"), true).toBool());
+        config.value(settingPath("Validators/PhraseMatch"), true).toBool());
     m_ui.actionPlaceMarkerMatches->setChecked(
-        config.value(keybase + QLatin1String("Validators/PlaceMarkers"), true).toBool());
+        config.value(settingPath("Validators/PlaceMarkers"), true).toBool());
+    m_ui.actionLengthVariants->setChecked(
+        config.value(settingPath("Options/LengthVariants"), false).toBool());
 
     recentFiles().readConfig();
 
-    int size = config.beginReadArray(keybase + QLatin1String("OpenedPhraseBooks"));
+    int size = config.beginReadArray(settingPath("OpenedPhraseBooks"));
     for (int i = 0; i < size; ++i) {
         config.setArrayIndex(i);
@@ -2531 +2557 @@
 void MainWindow::writeConfig()
 {
-    QString keybase = settingsPrefix();
     QSettings config;
-    config.setValue(keybase + QLatin1String("Geometry/WindowGeometry"),
+    config.setValue(settingPath("Geometry/WindowGeometry"),
         saveGeometry());
-    config.setValue(keybase + QLatin1String("Validators/Accelerator"),
+    config.setValue(settingPath("Validators/Accelerator"),
         m_ui.actionAccelerators->isChecked());
-    config.setValue(keybase + QLatin1String("Validators/EndingPunctuation"),
+    config.setValue(settingPath("Validators/EndingPunctuation"),
         m_ui.actionEndingPunctuation->isChecked());
-    config.setValue(keybase + QLatin1String("Validators/PhraseMatch"),
+    config.setValue(settingPath("Validators/PhraseMatch"),
         m_ui.actionPhraseMatches->isChecked());
-    config.setValue(keybase + QLatin1String("Validators/PlaceMarkers"),
+    config.setValue(settingPath("Validators/PlaceMarkers"),
         m_ui.actionPlaceMarkerMatches->isChecked());
-    config.setValue(keybase + QLatin1String("MainWindowState"),
+    config.setValue(settingPath("Options/LengthVariants"),
+        m_ui.actionLengthVariants->isChecked());
+    config.setValue(settingPath("MainWindowState"),
         saveState());
     recentFiles().writeConfig();
 
-    config.beginWriteArray(keybase + QLatin1String("OpenedPhraseBooks"),
+    config.beginWriteArray(settingPath("OpenedPhraseBooks"),
         m_phraseBooks.size());
     for (int i = 0; i < m_phraseBooks.size(); ++i) {