Changeset 561 for trunk/tools/designer/src/lib/shared/qtresourceview.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/designer/src/lib/shared/qtresourceview.cpp (modified) (22 diffs)

trunk/tools/designer/src/lib/shared/qtresourceview.cpp

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information ([email protected])
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
 **
 ** This file is part of the Qt Designer 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 
+** @nokia.com.
 ** $QT_END_LICENSE$
 **
@@ -45 +45 @@
 #include "qtresourceeditordialog_p.h"
 #include "iconloader_p.h"
+
 
 #include <QtDesigner/QDesignerFormEditorInterface>
@@ -149 +150 @@
     void slotCopyResourcePath();
     void slotListWidgetContextMenuRequested(const QPoint &pos);
+
     void createPaths();
     QTreeWidgetItem *createPath(const QString &path, QTreeWidgetItem *parent);
@@ -157 +159 @@
     void saveSettings();
     void updateActions();
+
 
     QPixmap makeThumbnail(const QPixmap &pix) const;
@@ -163 +166 @@
     QtResourceModel *m_resourceModel;
     QToolBar *m_toolBar;
+
     QTreeWidget *m_treeWidget;
     QListWidget *m_listWidget;
     QSplitter *m_splitter;
-    QMap<QString, QStringList>       m_pathToContents; // full path to contents file names
+    QMap<QString, QStringList>       m_pathToContents; // full path to contents file names (full path to its resource filenames)
+    QMap<QString, QString>           m_pathToParentPath; // full path to full parent path
+    QMap<QString, QStringList>       m_pathToSubPaths; // full path to full sub paths
     QMap<QString, QTreeWidgetItem *> m_pathToItem;
     QMap<QTreeWidgetItem *, QString> m_itemToPath;
@@ -180 +186 @@
     QString m_settingsKey;
     bool m_resourceEditingEnabled;
+
 };
 
@@ -256 +263 @@
 }
 
+
+
+
+
+
+
 void QtResourceViewPrivate::storeExpansionState()
 {
@@ -299 +312 @@
     m_editResourcesAction->setEnabled(resourceActive);
     m_reloadResourcesAction->setEnabled(resourceActive);
+
 }
 
@@ -312 +326 @@
     m_treeWidget->clear();
     m_pathToContents.clear();
+
+
     m_pathToItem.clear();
     m_itemToPath.clear();
@@ -325 +341 @@
     else if (!currentPath.isEmpty())
         q_ptr->selectResource(currentPath);
+
 }
 
@@ -366 +383 @@
 
     const QString root(QLatin1Char(':'));
-
-    QMap<QString, QString> pathToParentPath; // full path to full parent path
-    QMap<QString, QStringList> pathToSubPaths; // full path to full sub paths
 
     QMap<QString, QString> contents = m_resourceModel->contents();
@@ -377 +391 @@
         QString dirPath = fi.absolutePath();
         m_pathToContents[dirPath].append(fi.fileName());
-        while (!pathToParentPath.contains(dirPath) && dirPath != root) {
+        while (!
             const QFileInfo fd(dirPath);
             const QString parentDirPath = fd.absolutePath();
-            pathToParentPath[dirPath] = parentDirPath;
-            pathToSubPaths[parentDirPath].append(dirPath);
+            pathToParentPath[dirPath] = parentDirPath;
+            pathToSubPaths[parentDirPath].append(dirPath);
             dirPath = parentDirPath;
         }
@@ -392 +406 @@
         const QString path = pathToParentItem.first;
         QTreeWidgetItem *item = createPath(path, pathToParentItem.second);
-        QStringList subPaths = pathToSubPaths.value(path);
+        QStringList subPaths = pathToSubPaths.value(path);
         QStringListIterator itSubPaths(subPaths);
         while (itSubPaths.hasNext())
             pathToParentItemQueue.enqueue(qMakePair(itSubPaths.next(), item));
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+