summaryrefslogtreecommitdiffstats
path: root/examples/mimetypeviewer
diff options
context:
space:
mode:
authorWolf-Michael Bolle <wolf-michael.bolle@nokia.com>2011-10-18 11:05:48 +0200
committerWolf-Michael Bolle <wolf-michael.bolle@nokia.com>2011-10-18 11:05:48 +0200
commitc1186a6e2aa23396bffe1564ddb710ad582a9a1b (patch)
tree9d247af14866d4a56248ca4d5da9ba8d4b37eadd /examples/mimetypeviewer
parent2ea9e59d29d6b0fc637218994eb3845e4f2952b0 (diff)
Added QMimeType::allParentMimeTypes()
Diffstat (limited to 'examples/mimetypeviewer')
-rw-r--r--examples/mimetypeviewer/mimetypeviewer.cpp3
-rw-r--r--examples/mimetypeviewer/mimetypeviewer.ui26
2 files changed, 22 insertions, 7 deletions
diff --git a/examples/mimetypeviewer/mimetypeviewer.cpp b/examples/mimetypeviewer/mimetypeviewer.cpp
index 9aa180d..8ad0cf4 100644
--- a/examples/mimetypeviewer/mimetypeviewer.cpp
+++ b/examples/mimetypeviewer/mimetypeviewer.cpp
@@ -51,7 +51,8 @@ void MimeTypeViewer::setMimeType(const QMimeType &mimeType)
ui->iconNameLabel->setText(mimeType.iconName());
ui->globPatternsLabel->setText(mimeType.globPatterns().join(", "));
- ui->subClassesOfLabel->setText(mimeType.parentMimeTypes().join(", "));
+ ui->parentMimeTypesLabel->setText(mimeType.parentMimeTypes().join(", "));
+ ui->allParentMimeTypesLabel->setText(mimeType.allParentMimeTypes().join(", "));
ui->suffixesLabel->setText(mimeType.suffixes().join(", "));
ui->preferredSuffixLabel->setText(mimeType.preferredSuffix());
diff --git a/examples/mimetypeviewer/mimetypeviewer.ui b/examples/mimetypeviewer/mimetypeviewer.ui
index 6dea73e..1de33e3 100644
--- a/examples/mimetypeviewer/mimetypeviewer.ui
+++ b/examples/mimetypeviewer/mimetypeviewer.ui
@@ -174,48 +174,62 @@
</widget>
</item>
<item row="9" column="1">
- <widget class="QLabel" name="subClassesOfLabel">
+ <widget class="QLabel" name="parentMimeTypesLabel">
<property name="text">
<string>&lt;&gt;</string>
</property>
</widget>
</item>
<item row="10" column="0">
+ <widget class="QLabel" name="label_9">
+ <property name="text">
+ <string>SubClasses of:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="10" column="1">
+ <widget class="QLabel" name="allParentMimeTypesLabel">
+ <property name="text">
+ <string>&lt;&gt;</string>
+ </property>
+ </widget>
+ </item>
+ <item row="11" column="0">
<widget class="QLabel" name="label_10">
<property name="text">
<string>Suffixes:</string>
</property>
</widget>
</item>
- <item row="10" column="1">
+ <item row="11" column="1">
<widget class="QLabel" name="suffixesLabel">
<property name="text">
<string>&lt;&gt;</string>
</property>
</widget>
</item>
- <item row="11" column="0">
+ <item row="12" column="0">
<widget class="QLabel" name="label_11">
<property name="text">
<string>Preferred suffix:</string>
</property>
</widget>
</item>
- <item row="11" column="1">
+ <item row="12" column="1">
<widget class="QLabel" name="preferredSuffixLabel">
<property name="text">
<string>&lt;&gt;</string>
</property>
</widget>
</item>
- <item row="12" column="0">
+ <item row="13" column="0">
<widget class="QLabel" name="label_12">
<property name="text">
<string>Filter string:</string>
</property>
</widget>
</item>
- <item row="12" column="1">
+ <item row="13" column="1">
<widget class="QLabel" name="filterStringLabel">
<property name="text">
<string>&lt;&gt;</string>