Changeset 846 for trunk/tools/designer/src/components/taskmenu

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• tools/designer/src/components/taskmenu/button_taskmenu.cpp (modified) (1 diff)
• tools/designer/src/components/taskmenu/button_taskmenu.h (modified) (1 diff)
• tools/designer/src/components/taskmenu/combobox_taskmenu.cpp (modified) (1 diff)
• tools/designer/src/components/taskmenu/combobox_taskmenu.h (modified) (1 diff)
• tools/designer/src/components/taskmenu/containerwidget_taskmenu.cpp (modified) (1 diff)
• tools/designer/src/components/taskmenu/containerwidget_taskmenu.h (modified) (1 diff)
• tools/designer/src/components/taskmenu/groupbox_taskmenu.cpp (modified) (1 diff)
• tools/designer/src/components/taskmenu/groupbox_taskmenu.h (modified) (1 diff)
• tools/designer/src/components/taskmenu/inplace_editor.cpp (modified) (1 diff)
• tools/designer/src/components/taskmenu/inplace_editor.h (modified) (1 diff)
• tools/designer/src/components/taskmenu/inplace_widget_helper.cpp (modified) (1 diff)
• tools/designer/src/components/taskmenu/inplace_widget_helper.h (modified) (1 diff)
• tools/designer/src/components/taskmenu/itemlisteditor.cpp (modified) (3 diffs)
• tools/designer/src/components/taskmenu/itemlisteditor.h (modified) (1 diff)
• tools/designer/src/components/taskmenu/itemlisteditor.ui (modified) (1 diff)
• tools/designer/src/components/taskmenu/label_taskmenu.cpp (modified) (1 diff)
• tools/designer/src/components/taskmenu/label_taskmenu.h (modified) (1 diff)
• tools/designer/src/components/taskmenu/layouttaskmenu.cpp (modified) (1 diff)
• tools/designer/src/components/taskmenu/layouttaskmenu.h (modified) (1 diff)
• tools/designer/src/components/taskmenu/lineedit_taskmenu.cpp (modified) (1 diff)
• tools/designer/src/components/taskmenu/lineedit_taskmenu.h (modified) (1 diff)
• tools/designer/src/components/taskmenu/listwidget_taskmenu.cpp (modified) (1 diff)
• tools/designer/src/components/taskmenu/listwidget_taskmenu.h (modified) (1 diff)
• tools/designer/src/components/taskmenu/listwidgeteditor.cpp (modified) (1 diff)
• tools/designer/src/components/taskmenu/listwidgeteditor.h (modified) (1 diff)
• tools/designer/src/components/taskmenu/menutaskmenu.cpp (modified) (1 diff)
• tools/designer/src/components/taskmenu/menutaskmenu.h (modified) (1 diff)
• tools/designer/src/components/taskmenu/tablewidget_taskmenu.cpp (modified) (1 diff)
• tools/designer/src/components/taskmenu/tablewidget_taskmenu.h (modified) (1 diff)
• tools/designer/src/components/taskmenu/tablewidgeteditor.cpp (modified) (1 diff)
• tools/designer/src/components/taskmenu/tablewidgeteditor.h (modified) (1 diff)
• tools/designer/src/components/taskmenu/tablewidgeteditor.ui (modified) (1 diff)
• tools/designer/src/components/taskmenu/taskmenu_component.cpp (modified) (1 diff)
• tools/designer/src/components/taskmenu/taskmenu_component.h (modified) (1 diff)
• tools/designer/src/components/taskmenu/taskmenu_global.h (modified) (1 diff)
• tools/designer/src/components/taskmenu/textedit_taskmenu.cpp (modified) (1 diff)
• tools/designer/src/components/taskmenu/textedit_taskmenu.h (modified) (1 diff)
• tools/designer/src/components/taskmenu/toolbar_taskmenu.cpp (modified) (1 diff)
• tools/designer/src/components/taskmenu/toolbar_taskmenu.h (modified) (1 diff)
• tools/designer/src/components/taskmenu/treewidget_taskmenu.cpp (modified) (1 diff)
• tools/designer/src/components/taskmenu/treewidget_taskmenu.h (modified) (1 diff)
• tools/designer/src/components/taskmenu/treewidgeteditor.cpp (modified) (1 diff)
• tools/designer/src/components/taskmenu/treewidgeteditor.h (modified) (1 diff)
• tools/designer/src/components/taskmenu/treewidgeteditor.ui (modified) (1 diff)

trunk/tools/designer/src/components/taskmenu/button_taskmenu.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/tools/designer/src/components/taskmenu/button_taskmenu.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/tools/designer/src/components/taskmenu/combobox_taskmenu.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/tools/designer/src/components/taskmenu/combobox_taskmenu.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/tools/designer/src/components/taskmenu/containerwidget_taskmenu.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/tools/designer/src/components/taskmenu/containerwidget_taskmenu.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/tools/designer/src/components/taskmenu/groupbox_taskmenu.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/tools/designer/src/components/taskmenu/groupbox_taskmenu.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/tools/designer/src/components/taskmenu/inplace_editor.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/tools/designer/src/components/taskmenu/inplace_editor.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/tools/designer/src/components/taskmenu/inplace_widget_helper.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/tools/designer/src/components/taskmenu/inplace_widget_helper.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/tools/designer/src/components/taskmenu/itemlisteditor.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
@@ -115 +115 @@
 
 static const char * const itemFlagNames[] = {
-    "Selectable",
-    "Editable",
-    "DragEnabled",
-    "DropEnabled",
-    "UserCheckable",
-    "Enabled",
-    "Tristate",
+    QT_TRANSLATE_NOOP("AbstractItemEditor", "Selectable"),
+    QT_TRANSLATE_NOOP("AbstractItemEditor", "Editable"),
+    QT_TRANSLATE_NOOP("AbstractItemEditor", "DragEnabled"),
+    QT_TRANSLATE_NOOP("AbstractItemEditor", "DropEnabled"),
+    QT_TRANSLATE_NOOP("AbstractItemEditor", "UserCheckable"),
+    QT_TRANSLATE_NOOP("AbstractItemEditor", "Enabled"),
+    QT_TRANSLATE_NOOP("AbstractItemEditor", "Tristate"),
     0
 };
 
 static const char * const checkStateNames[] = {
-    "Unchecked",
-    "PartiallyChecked",
-    "Checked",
+    QT_TRANSLATE_NOOP("AbstractItemEditor", "Unchecked"),
+    QT_TRANSLATE_NOOP("AbstractItemEditor", "PartiallyChecked"),
+    QT_TRANSLATE_NOOP("AbstractItemEditor", "Checked"),
     0
 };
@@ -136 +136 @@
     QStringList out;
     for (int i = 0; in[i]; i++)
-        out << QLatin1String(in[i]);
+        out << AbstractItemEditor::tr(in[i]);
     return out;
 }

trunk/tools/designer/src/components/taskmenu/itemlisteditor.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/tools/designer/src/components/taskmenu/itemlisteditor.ui

@@ -2 +2 @@
  <comment>*********************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/tools/designer/src/components/taskmenu/label_taskmenu.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/tools/designer/src/components/taskmenu/label_taskmenu.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/tools/designer/src/components/taskmenu/layouttaskmenu.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/tools/designer/src/components/taskmenu/layouttaskmenu.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/tools/designer/src/components/taskmenu/lineedit_taskmenu.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/tools/designer/src/components/taskmenu/lineedit_taskmenu.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/tools/designer/src/components/taskmenu/listwidget_taskmenu.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/tools/designer/src/components/taskmenu/listwidget_taskmenu.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/tools/designer/src/components/taskmenu/listwidgeteditor.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/tools/designer/src/components/taskmenu/listwidgeteditor.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/tools/designer/src/components/taskmenu/menutaskmenu.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/tools/designer/src/components/taskmenu/menutaskmenu.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/tools/designer/src/components/taskmenu/tablewidget_taskmenu.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/tools/designer/src/components/taskmenu/tablewidget_taskmenu.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/tools/designer/src/components/taskmenu/tablewidgeteditor.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/tools/designer/src/components/taskmenu/tablewidgeteditor.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/tools/designer/src/components/taskmenu/tablewidgeteditor.ui

@@ -2 +2 @@
  <comment>*********************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/tools/designer/src/components/taskmenu/taskmenu_component.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/tools/designer/src/components/taskmenu/taskmenu_component.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/tools/designer/src/components/taskmenu/taskmenu_global.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/tools/designer/src/components/taskmenu/textedit_taskmenu.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/tools/designer/src/components/taskmenu/textedit_taskmenu.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/tools/designer/src/components/taskmenu/toolbar_taskmenu.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/tools/designer/src/components/taskmenu/toolbar_taskmenu.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/tools/designer/src/components/taskmenu/treewidget_taskmenu.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/tools/designer/src/components/taskmenu/treewidget_taskmenu.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/tools/designer/src/components/taskmenu/treewidgeteditor.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/tools/designer/src/components/taskmenu/treewidgeteditor.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)

trunk/tools/designer/src/components/taskmenu/treewidgeteditor.ui

@@ -2 +2 @@
  <comment>*********************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)