From 293857a2cba0b9963c644585ac274e125f38dd11 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 20 Nov 2012 00:31:34 -0600 Subject: [PATCH 1/4] Use places instead of filesystems in icon themes --- IconThemes/ikons/index.theme | 10 +++++----- IconThemes/kdeclassic/index.theme | 10 +++++----- IconThemes/kids/index.theme | 18 +++++++++--------- IconThemes/locolor/index.theme | 6 +++--- IconThemes/slick/index.theme | 20 ++++++++++---------- 5 files changed, 32 insertions(+), 32 deletions(-) diff --git a/IconThemes/ikons/index.theme b/IconThemes/ikons/index.theme index f0a7d4a1..08579d08 100644 --- a/IconThemes/ikons/index.theme +++ b/IconThemes/ikons/index.theme @@ -83,7 +83,7 @@ SmallDefault=16 SmallSizes=16 PanelDefault=32 PanelSizes=16,32,48 -Directories=16x16/actions,22x22/actions,16x16/apps,32x32/apps,16x16/devices,32x32/devices,16x16/filesystems,32x32/filesystems,16x16/mimetypes,32x32/mimetypes,32x32/actions,48x48/apps,48x48/devices,48x48/filesystems,48x48/mimetypes,64x64/filesystems,64x64/mimetypes +Directories=16x16/actions,22x22/actions,16x16/apps,32x32/apps,16x16/devices,32x32/devices,16x16/places,32x32/places,16x16/mimetypes,32x32/mimetypes,32x32/actions,48x48/apps,48x48/devices,48x48/places,48x48/mimetypes,64x64/places,64x64/mimetypes [16x16/actions] Size=16 Context=Actions @@ -112,11 +112,11 @@ Type=Fixed Size=32 Context=Devices Type=Fixed -[16x16/filesystems] +[16x16/places] Size=16 Context=FileSystems Type=Fixed -[32x32/filesystems] +[32x32/places] Size=32 Context=FileSystems Type=Fixed @@ -136,7 +136,7 @@ Type=Fixed Size=48 Context=Devices Type=Fixed -[48x48/filesystems] +[48x48/places] Size=48 Context=FileSystems Type=Fixed @@ -152,7 +152,7 @@ Type=Fixed Size=64 Context=Applications Type=Fixed -[64x64/filesystems] +[64x64/places] Size=64 Context=FileSystems Type=Fixed diff --git a/IconThemes/kdeclassic/index.theme b/IconThemes/kdeclassic/index.theme index 7cca657c..140e292f 100644 --- a/IconThemes/kdeclassic/index.theme +++ b/IconThemes/kdeclassic/index.theme @@ -123,7 +123,7 @@ SmallDefault=16 SmallSizes=16 PanelDefault=32 PanelSizes=16,32,48 -Directories=16x16/actions,22x22/actions,16x16/apps,32x32/apps,16x16/devices,32x32/devices,16x16/filesystems,32x32/filesystems,16x16/mimetypes,32x32/mimetypes,32x32/actions,48x48/apps,48x48/devices,48x48/filesystems,48x48/mimetypes,64x64/filesystems,64x64/mimetypes,64x64 apps +Directories=16x16/actions,22x22/actions,16x16/apps,32x32/apps,16x16/devices,32x32/devices,16x16/places,32x32/places,16x16/mimetypes,32x32/mimetypes,32x32/actions,48x48/apps,48x48/devices,48x48/places,48x48/mimetypes,64x64/places,64x64/mimetypes,64x64 apps [16x16/actions] Size=16 Context=Actions @@ -152,11 +152,11 @@ Type=Threshold Size=32 Context=Devices Type=Threshold -[16x16/filesystems] +[16x16/places] Size=16 Context=FileSystems Type=Threshold -[32x32/filesystems] +[32x32/places] Size=32 Context=FileSystems Type=Threshold @@ -176,7 +176,7 @@ Type=Threshold Size=48 Context=Devices Type=Threshold -[48x48/filesystems] +[48x48/places] Size=48 Context=FileSystems Type=Threshold @@ -188,7 +188,7 @@ Type=Threshold Size=64 Context=MimeTypes Type=Threshold -[64x64/filesystems] +[64x64/places] Size=64 Context=FileSystems Type=Threshold diff --git a/IconThemes/kids/index.theme b/IconThemes/kids/index.theme index d8ee1ac1..285c6d72 100644 --- a/IconThemes/kids/index.theme +++ b/IconThemes/kids/index.theme @@ -99,7 +99,7 @@ SmallDefault=16 SmallSizes=16 PanelDefault=48 PanelSizes=16,32,48,64,128 -Directories=16x16/actions,22x22/actions,32x32/actions,48x48/actions,64x64/actions,128x128/actions,16x16/apps,32x32/apps,48x48/apps,64x64/apps,128x128/apps,16x16/devices,32x32/devices,48x48/devices,64x64/devices,128x128/devices,16x16/filesystems,32x32/filesystems,48x48/filesystems,64x64/filesystems,128x128/filesystems,16x16/mimetypes,32x32/mimetypes,48x48/mimetypes,64x64/mimetypes,128x128/mimetypes,48x48/devices,48x48/filesystems,48x48/mimetypes,64x64/filesystems,64x64/mimetypes,64x64/devices,64x64/apps,64x64/actions,128x128/mimetypes,128x128/filesystems,128x128/apps,128x128/devices,128x128/actions +Directories=16x16/actions,22x22/actions,32x32/actions,48x48/actions,64x64/actions,128x128/actions,16x16/apps,32x32/apps,48x48/apps,64x64/apps,128x128/apps,16x16/devices,32x32/devices,48x48/devices,64x64/devices,128x128/devices,16x16/places,32x32/places,48x48/places,64x64/places,128x128/places,16x16/mimetypes,32x32/mimetypes,48x48/mimetypes,64x64/mimetypes,128x128/mimetypes,48x48/devices,48x48/places,48x48/mimetypes,64x64/places,64x64/mimetypes,64x64/devices,64x64/apps,64x64/actions,128x128/mimetypes,128x128/places,128x128/apps,128x128/devices,128x128/actions [16x16/actions] Size=16 Context=Actions @@ -164,23 +164,23 @@ Type=Threshold Size=128 Context=Devices Type=Threshold -[16x16/filesystems] +[16x16/places] Size=16 Context=FileSystems Type=Threshold -[32x32/filesystems] +[32x32/places] Size=32 Context=FileSystems Type=Threshold -[48x48/filesystems] +[48x48/places] Size=48 Context=FileSystems Type=Threshold -[64x64/filesystems] +[64x64/places] Size=64 Context=FileSystems Type=Threshold -[128x128/filesystems] +[128x128/places] Size=128 Context=FileSystems Type=Threshold @@ -212,7 +212,7 @@ Type=Threshold Size=48 Context=Devices Type=Threshold -[48x48/filesystems] +[48x48/places] Size=48 Context=FileSystems Type=Threshold @@ -228,7 +228,7 @@ Type=Threshold Size=64 Context=Devices Type=Threshold -[64x64/filesystems] +[64x64/places] Size=64 Context=FileSystems Type=Threshold @@ -245,7 +245,7 @@ Type=Threshold Size=128 Context=Devices Type=Threshold -[128x128/filesystems] +[128x128/places] Size=128 Context=FileSystems Type=Threshold diff --git a/IconThemes/locolor/index.theme b/IconThemes/locolor/index.theme index fc62480b..99c2f069 100644 --- a/IconThemes/locolor/index.theme +++ b/IconThemes/locolor/index.theme @@ -116,7 +116,7 @@ SmallSizes=16 PanelDefault=16 PanelSizes=16,32 LockOverlay=lockoverlay -Directories=16x16/actions,16x16/apps,16x16/devices,16x16/filesystems,16x16/mimetypes,32x32/apps,32x32/devices,32x32/filesystems,32x32/mimetypes +Directories=16x16/actions,16x16/apps,16x16/devices,16x16/places,16x16/mimetypes,32x32/apps,32x32/devices,32x32/places,32x32/mimetypes [16x16/actions] Size=16 Context=Actions @@ -129,7 +129,7 @@ Type=Fixed Size=16 Context=Devices Type=Fixed -[16x16/filesystems] +[16x16/places] Size=16 Context=FileSystems Type=Fixed @@ -145,7 +145,7 @@ Type=Fixed Size=32 Context=Devices Type=Fixed -[32x32/filesystems] +[32x32/places] Size=32 Context=FileSystems Type=Fixed diff --git a/IconThemes/slick/index.theme b/IconThemes/slick/index.theme index 79905594..39734556 100644 --- a/IconThemes/slick/index.theme +++ b/IconThemes/slick/index.theme @@ -105,7 +105,7 @@ SmallDefault=16 SmallSizes=16,22 PanelDefault=32 PanelSizes=16,22,32,48,64,128 -Directories=16x16/actions,22x22/actions,22x22/apps,22x22/mimetypes,22x22/filesystems,32x32/actions,48x48/actions,64x64/actions,128x128/actions,16x16/apps,32x32/apps,48x48/apps,64x64/apps,128x128/apps,16x16/devices,22x22/devices,32x32/devices,48x48/devices,64x64/devices,128x128/devices,16x16/filesystems,32x32/filesystems,48x48/filesystems,64x64/filesystems,128x128/filesystems,16x16/mimetypes,32x32/mimetypes,48x48/mimetypes,64x64/mimetypes,128x128/mimetypes,48x48/devices,48x48/filesystems,48x48/mimetypes,64x64/filesystems,64x64/mimetypes,64x64/devices,64x64/apps,64x64/actions,128x128/mimetypes,128x128/filesystems,128x128/apps,128x128/devices,128x128/actions +Directories=16x16/actions,22x22/actions,22x22/apps,22x22/mimetypes,22x22/places,32x32/actions,48x48/actions,64x64/actions,128x128/actions,16x16/apps,32x32/apps,48x48/apps,64x64/apps,128x128/apps,16x16/devices,22x22/devices,32x32/devices,48x48/devices,64x64/devices,128x128/devices,16x16/places,32x32/places,48x48/places,64x64/places,128x128/places,16x16/mimetypes,32x32/mimetypes,48x48/mimetypes,64x64/mimetypes,128x128/mimetypes,48x48/devices,48x48/places,48x48/mimetypes,64x64/places,64x64/mimetypes,64x64/devices,64x64/apps,64x64/actions,128x128/mimetypes,128x128/places,128x128/apps,128x128/devices,128x128/actions [16x16/actions] Size=16 Context=Actions @@ -178,23 +178,23 @@ Type=Threshold Size=22 Context=Devices Type=Threshold -[16x16/filesystems] +[16x16/places] Size=16 Context=FileSystems Type=Threshold -[32x32/filesystems] +[32x32/places] Size=32 Context=FileSystems Type=Threshold -[48x48/filesystems] +[48x48/places] Size=48 Context=FileSystems Type=Threshold -[64x64/filesystems] +[64x64/places] Size=64 Context=FileSystems Type=Threshold -[128x128/filesystems] +[128x128/places] Size=128 Context=FileSystems Type=Threshold @@ -230,11 +230,11 @@ Type=Threshold Size=48 Context=Devices Type=Threshold -[48x48/filesystems] +[48x48/places] Size=48 Context=FileSystems Type=Threshold -[22x22/filesystems] +[22x22/places] Size=22 Context=FileSystems Type=Threshold @@ -250,7 +250,7 @@ Type=Threshold Size=64 Context=Devices Type=Threshold -[64x64/filesystems] +[64x64/places] Size=64 Context=FileSystems Type=Threshold @@ -266,7 +266,7 @@ Type=Threshold Size=128 Context=Devices Type=Threshold -[128x128/filesystems] +[128x128/places] Size=128 Context=FileSystems Type=Threshold From 181195deaa260570b5e8db52c53635d5855759a8 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 20 Nov 2012 01:25:13 -0600 Subject: [PATCH 2/4] Use Places category instead of FileSystems category in icon themes --- IconThemes/ikons/index.theme | 8 ++++---- IconThemes/kdeclassic/index.theme | 8 ++++---- IconThemes/kids/index.theme | 16 ++++++++-------- IconThemes/locolor/index.theme | 4 ++-- IconThemes/slick/index.theme | 18 +++++++++--------- 5 files changed, 27 insertions(+), 27 deletions(-) diff --git a/IconThemes/ikons/index.theme b/IconThemes/ikons/index.theme index 08579d08..6a726376 100644 --- a/IconThemes/ikons/index.theme +++ b/IconThemes/ikons/index.theme @@ -114,11 +114,11 @@ Context=Devices Type=Fixed [16x16/places] Size=16 -Context=FileSystems +Context=Places Type=Fixed [32x32/places] Size=32 -Context=FileSystems +Context=Places Type=Fixed [16x16/mimetypes] Size=16 @@ -138,7 +138,7 @@ Context=Devices Type=Fixed [48x48/places] Size=48 -Context=FileSystems +Context=Places Type=Fixed [48x48/mimetypes] Size=48 @@ -154,5 +154,5 @@ Context=Applications Type=Fixed [64x64/places] Size=64 -Context=FileSystems +Context=Places Type=Fixed diff --git a/IconThemes/kdeclassic/index.theme b/IconThemes/kdeclassic/index.theme index 140e292f..b9c0acd4 100644 --- a/IconThemes/kdeclassic/index.theme +++ b/IconThemes/kdeclassic/index.theme @@ -154,11 +154,11 @@ Context=Devices Type=Threshold [16x16/places] Size=16 -Context=FileSystems +Context=Places Type=Threshold [32x32/places] Size=32 -Context=FileSystems +Context=Places Type=Threshold [16x16/mimetypes] Size=16 @@ -178,7 +178,7 @@ Context=Devices Type=Threshold [48x48/places] Size=48 -Context=FileSystems +Context=Places Type=Threshold [48x48/mimetypes] Size=48 @@ -190,7 +190,7 @@ Context=MimeTypes Type=Threshold [64x64/places] Size=64 -Context=FileSystems +Context=Places Type=Threshold [64x64/apps] Size=64 diff --git a/IconThemes/kids/index.theme b/IconThemes/kids/index.theme index 285c6d72..6dfa935a 100644 --- a/IconThemes/kids/index.theme +++ b/IconThemes/kids/index.theme @@ -166,23 +166,23 @@ Context=Devices Type=Threshold [16x16/places] Size=16 -Context=FileSystems +Context=Places Type=Threshold [32x32/places] Size=32 -Context=FileSystems +Context=Places Type=Threshold [48x48/places] Size=48 -Context=FileSystems +Context=Places Type=Threshold [64x64/places] Size=64 -Context=FileSystems +Context=Places Type=Threshold [128x128/places] Size=128 -Context=FileSystems +Context=Places Type=Threshold [16x16/mimetypes] Size=16 @@ -214,7 +214,7 @@ Context=Devices Type=Threshold [48x48/places] Size=48 -Context=FileSystems +Context=Places Type=Threshold [48x48/mimetypes] Size=48 @@ -230,7 +230,7 @@ Context=Devices Type=Threshold [64x64/places] Size=64 -Context=FileSystems +Context=Places Type=Threshold [64x64/mimetypes] Size=64 @@ -247,7 +247,7 @@ Context=Devices Type=Threshold [128x128/places] Size=128 -Context=FileSystems +Context=Places Type=Threshold [128x128/mimetypes] Size=128 diff --git a/IconThemes/locolor/index.theme b/IconThemes/locolor/index.theme index 99c2f069..fe14032f 100644 --- a/IconThemes/locolor/index.theme +++ b/IconThemes/locolor/index.theme @@ -131,7 +131,7 @@ Context=Devices Type=Fixed [16x16/places] Size=16 -Context=FileSystems +Context=Places Type=Fixed [16x16/mimetypes] Size=16 @@ -147,7 +147,7 @@ Context=Devices Type=Fixed [32x32/places] Size=32 -Context=FileSystems +Context=Places Type=Fixed [32x32/mimetypes] Size=32 diff --git a/IconThemes/slick/index.theme b/IconThemes/slick/index.theme index 39734556..e34f6193 100644 --- a/IconThemes/slick/index.theme +++ b/IconThemes/slick/index.theme @@ -180,23 +180,23 @@ Context=Devices Type=Threshold [16x16/places] Size=16 -Context=FileSystems +Context=Places Type=Threshold [32x32/places] Size=32 -Context=FileSystems +Context=Places Type=Threshold [48x48/places] Size=48 -Context=FileSystems +Context=Places Type=Threshold [64x64/places] Size=64 -Context=FileSystems +Context=Places Type=Threshold [128x128/places] Size=128 -Context=FileSystems +Context=Places Type=Threshold [16x16/mimetypes] Size=16 @@ -232,11 +232,11 @@ Context=Devices Type=Threshold [48x48/places] Size=48 -Context=FileSystems +Context=Places Type=Threshold [22x22/places] Size=22 -Context=FileSystems +Context=Places Type=Threshold [48x48/mimetypes] Size=48 @@ -252,7 +252,7 @@ Context=Devices Type=Threshold [64x64/places] Size=64 -Context=FileSystems +Context=Places Type=Threshold [64x64/mimetypes] Size=64 @@ -268,7 +268,7 @@ Context=Devices Type=Threshold [128x128/places] Size=128 -Context=FileSystems +Context=Places Type=Threshold [128x128/mimetypes] Size=128 From b733d1683e750024ca28d7ee8e41c49442a722ed Mon Sep 17 00:00:00 2001 From: Automated System Date: Tue, 20 Nov 2012 01:49:26 -0600 Subject: [PATCH 3/4] Reset submodule main/tdeartwork/admin to latest HEAD --- admin | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admin b/admin index efdff81c..a84dfb91 160000 --- a/admin +++ b/admin @@ -1 +1 @@ -Subproject commit efdff81cd246d0737ecb1a82ef6fd588c0a6bc08 +Subproject commit a84dfb918b09c3e577b5ebd811761daf4fc8226c From 2811d000a0219ea78f0e0a4075889d7aaf73d74d Mon Sep 17 00:00:00 2001 From: Automated System Date: Tue, 20 Nov 2012 01:49:31 -0600 Subject: [PATCH 4/4] Reset submodule main/tdeartwork/cmake to latest HEAD --- cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake b/cmake index f1cea7f8..3e0a4c9f 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit f1cea7f894713183e061fa6d2b69b05889a90a03 +Subproject commit 3e0a4c9f3bb710512f7f21dc63970804ee09d09c