diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2014-10-18 18:35:59 -0500 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2014-10-18 18:35:59 -0500 |
| commit | d67a1569e628385ae7325438ffe35c1fce92b0a0 (patch) | |
| tree | 5a7acb8961faa8598e282ddf1fd80bbc6a95e7e4 | |
| parent | bcdc321dcd1187891dc3c4b2357ab730d7fd3b83 (diff) | |
| parent | 4d06a443368088ac7aa768745c9bc8f988e88ebe (diff) | |
| download | tdelibs-d67a1569e628385ae7325438ffe35c1fce92b0a0.tar.gz tdelibs-d67a1569e628385ae7325438ffe35c1fce92b0a0.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdelibs
| -rw-r--r-- | pics/crystalsvg/index.theme | 26 | ||||
| -rw-r--r-- | tdecore/kiconloader.cpp | 2 | ||||
| -rw-r--r-- | tdeioslave/file/file.protocol | 2 |
3 files changed, 27 insertions, 3 deletions
diff --git a/pics/crystalsvg/index.theme b/pics/crystalsvg/index.theme index 805d2f73b..c93118b2a 100644 --- a/pics/crystalsvg/index.theme +++ b/pics/crystalsvg/index.theme @@ -115,7 +115,7 @@ SmallDefault=16 SmallSizes=16 PanelDefault=32 PanelSizes=16,22,32,48,64,128 -Directories=16x16/actions,16x16/apps,16x16/devices,16x16/places,16x16/mimetypes,22x22/actions,22x22/apps,22x22/devices,22x22/places,22x22/mimetypes,32x32/actions,32x32/apps,32x32/devices,32x32/places,32x32/mimetypes,48x48/actions,48x48/apps,48x48/devices,48x48/places,48x48/mimetypes,64x64/actions,64x64/apps,64x64/devices,64x64/places,64x64/mimetypes,128x128/actions,128x128/apps,128x128/devices,128x128/places,128x128/mimetypes +Directories=16x16/actions,16x16/apps,16x16/categories,16x16/devices,16x16/places,16x16/mimetypes,22x22/actions,22x22/apps,22x22/categories,22x22/devices,22x22/places,22x22/mimetypes,32x32/actions,32x32/apps,32x32/categories,32x32/devices,32x32/places,32x32/mimetypes,48x48/actions,48x48/apps,48x48/categories,48x48/devices,48x48/places,48x48/mimetypes,64x64/actions,64x64/apps,64x64/categories,64x64/devices,64x64/places,64x64/mimetypes,128x128/actions,128x128/apps,128x128/categories,128x128/devices,128x128/places,128x128/mimetypes [16x16/actions] Size=16 Context=Actions @@ -124,6 +124,10 @@ Type=Threshold Size=16 Context=Applications Type=Threshold +[16x16/categories] +Size=16 +Context=Categories +Type=Threshold [16x16/devices] Size=16 Context=Devices @@ -144,6 +148,10 @@ Type=Threshold Size=22 Context=Applications Type=Threshold +[22x22/categories] +Size=22 +Context=Categories +Type=Threshold [22x22/devices] Size=22 Context=Devices @@ -164,6 +172,10 @@ Type=Threshold Size=32 Context=Applications Type=Threshold +[32x32/categories] +Size=32 +Context=Categories +Type=Threshold [32x32/devices] Size=32 Context=Devices @@ -184,6 +196,10 @@ Type=Threshold Size=48 Context=Applications Type=Threshold +[48x48/categories] +Size=48 +Context=Categories +Type=Threshold [48x48/devices] Size=48 Context=Devices @@ -204,6 +220,10 @@ Type=Threshold Size=64 Context=Applications Type=Threshold +[64x64/categories] +Size=64 +Context=Categories +Type=Threshold [64x64/devices] Size=64 Context=Devices @@ -224,6 +244,10 @@ Type=Threshold Size=128 Context=Applications Type=Threshold +[128x128/categories] +Size=128 +Context=Categories +Type=Threshold [128x128/devices] Size=128 Context=Devices diff --git a/tdecore/kiconloader.cpp b/tdecore/kiconloader.cpp index 0f13f7cef..4d787c303 100644 --- a/tdecore/kiconloader.cpp +++ b/tdecore/kiconloader.cpp @@ -490,7 +490,7 @@ TDEIcon TDEIconLoader::findMatchingIcon(const TQString& name, int size) const for (int i = 0 ; i < count ; i++) { icon = themeNode->theme->iconPath(name + *ext[i], size, TDEIcon::MatchBest); - if (icon.isValid()) goto icon_found; + if (icon.isValid()) goto icon_found; } } icon_found: diff --git a/tdeioslave/file/file.protocol b/tdeioslave/file/file.protocol index ef3be0d90..c2a12f0fd 100644 --- a/tdeioslave/file/file.protocol +++ b/tdeioslave/file/file.protocol @@ -13,4 +13,4 @@ moving=true maxInstances=4 DocPath=tdeioslave/file/index.html Class=:local -Icon=filenew +Icon=document-new |