diff --git a/data/elementary/themes/Makefile.am b/data/elementary/themes/Makefile.am index 13d65707ff..35af37228a 100644 --- a/data/elementary/themes/Makefile.am +++ b/data/elementary/themes/Makefile.am @@ -987,7 +987,8 @@ elementary/themes/snd/kbd-tap5.wav \ elementary/themes/snd/kbd-tap.wav \ \ elementary/themes/fdo/actions/scalable \ -elementary/themes/fdo/categories/scalable \ +elementary/themes/fdo/categories/16 \ +elementary/themes/fdo/categories/128 \ elementary/themes/fdo/emblems/96 \ elementary/themes/fdo/places/16 \ elementary/themes/fdo/places/128 \ diff --git a/data/elementary/themes/edc/elm/icon_fdo.edc b/data/elementary/themes/edc/elm/icon_fdo.edc index c45ab35e55..3f99aaee96 100644 --- a/data/elementary/themes/edc/elm/icon_fdo.edc +++ b/data/elementary/themes/edc/elm/icon_fdo.edc @@ -361,20 +361,20 @@ ICO1(CTX, "emblem-synchronizing", 96) /* */ //// categories ///////////////////////////////////////////////////////////// #define CTX "categories" -// ICO1(CTX, "applications-accessories") -// ICO1(CTX, "applications-development") -// ICO1(CTX, "applications-games") -// ICO1(CTX, "applications-graphics") -// ICO1(CTX, "applications-internet") -// ICO1(CTX, "applications-multimedia") -// ICO1(CTX, "applications-office") -// ICO1(CTX, "applications-other") -// ICO1(CTX, "applications-science") -// ICO1(CTX, "applications-system") -// ICO1(CTX, "applications-utilities") -// ICO1(CTX, "preferences-desktop") -// ICO1(CTX, "preferences-system") -// ICO1(CTX, "preferences-other") +ICO2(CTX, "applications-accessories") +ICO2(CTX, "applications-development") +ICO2(CTX, "applications-games") +ICO2(CTX, "applications-graphics") +ICO2(CTX, "applications-internet") +ICO2(CTX, "applications-multimedia") +ICO2(CTX, "applications-office") +ICO2(CTX, "applications-other") +ICO2(CTX, "applications-science") +ICO2(CTX, "applications-system") +ICO2(CTX, "applications-utilities") +ICO2(CTX, "preferences-desktop") +ICO2(CTX, "preferences-system") +ICO2(CTX, "preferences-other") // TODO applications-engineering // TODO preferences-desktop-peripherals // TODO preferences-desktop-personal diff --git a/data/elementary/themes/fdo/categories/scalable/applications-accessories.svg b/data/elementary/themes/fdo/categories/128-svg/applications-accessories.svg similarity index 100% rename from data/elementary/themes/fdo/categories/scalable/applications-accessories.svg rename to data/elementary/themes/fdo/categories/128-svg/applications-accessories.svg diff --git a/data/elementary/themes/fdo/categories/scalable/applications-development.svg b/data/elementary/themes/fdo/categories/128-svg/applications-development.svg similarity index 100% rename from data/elementary/themes/fdo/categories/scalable/applications-development.svg rename to data/elementary/themes/fdo/categories/128-svg/applications-development.svg diff --git a/data/elementary/themes/fdo/categories/scalable/applications-games.svg b/data/elementary/themes/fdo/categories/128-svg/applications-games.svg similarity index 100% rename from data/elementary/themes/fdo/categories/scalable/applications-games.svg rename to data/elementary/themes/fdo/categories/128-svg/applications-games.svg diff --git a/data/elementary/themes/fdo/categories/scalable/applications-graphics.svg b/data/elementary/themes/fdo/categories/128-svg/applications-graphics.svg similarity index 100% rename from data/elementary/themes/fdo/categories/scalable/applications-graphics.svg rename to data/elementary/themes/fdo/categories/128-svg/applications-graphics.svg diff --git a/data/elementary/themes/fdo/categories/scalable/applications-internet.svg b/data/elementary/themes/fdo/categories/128-svg/applications-internet.svg similarity index 100% rename from data/elementary/themes/fdo/categories/scalable/applications-internet.svg rename to data/elementary/themes/fdo/categories/128-svg/applications-internet.svg diff --git a/data/elementary/themes/fdo/categories/scalable/applications-multimedia.svg b/data/elementary/themes/fdo/categories/128-svg/applications-multimedia.svg similarity index 100% rename from data/elementary/themes/fdo/categories/scalable/applications-multimedia.svg rename to data/elementary/themes/fdo/categories/128-svg/applications-multimedia.svg diff --git a/data/elementary/themes/fdo/categories/scalable/applications-office.svg b/data/elementary/themes/fdo/categories/128-svg/applications-office.svg similarity index 100% rename from data/elementary/themes/fdo/categories/scalable/applications-office.svg rename to data/elementary/themes/fdo/categories/128-svg/applications-office.svg diff --git a/data/elementary/themes/fdo/categories/scalable/applications-other.svg b/data/elementary/themes/fdo/categories/128-svg/applications-other.svg similarity index 100% rename from data/elementary/themes/fdo/categories/scalable/applications-other.svg rename to data/elementary/themes/fdo/categories/128-svg/applications-other.svg diff --git a/data/elementary/themes/fdo/categories/scalable/applications-science.svg b/data/elementary/themes/fdo/categories/128-svg/applications-science.svg similarity index 100% rename from data/elementary/themes/fdo/categories/scalable/applications-science.svg rename to data/elementary/themes/fdo/categories/128-svg/applications-science.svg diff --git a/data/elementary/themes/fdo/categories/scalable/applications-system.svg b/data/elementary/themes/fdo/categories/128-svg/applications-system.svg similarity index 100% rename from data/elementary/themes/fdo/categories/scalable/applications-system.svg rename to data/elementary/themes/fdo/categories/128-svg/applications-system.svg diff --git a/data/elementary/themes/fdo/categories/scalable/preferences-desktop.svg b/data/elementary/themes/fdo/categories/128-svg/preferences-desktop.svg similarity index 100% rename from data/elementary/themes/fdo/categories/scalable/preferences-desktop.svg rename to data/elementary/themes/fdo/categories/128-svg/preferences-desktop.svg diff --git a/data/elementary/themes/fdo/categories/128/applications-accessories.png b/data/elementary/themes/fdo/categories/128/applications-accessories.png new file mode 100644 index 0000000000..0e95d27679 Binary files /dev/null and b/data/elementary/themes/fdo/categories/128/applications-accessories.png differ diff --git a/data/elementary/themes/fdo/categories/128/applications-development.png b/data/elementary/themes/fdo/categories/128/applications-development.png new file mode 100644 index 0000000000..6e16b1d8e3 Binary files /dev/null and b/data/elementary/themes/fdo/categories/128/applications-development.png differ diff --git a/data/elementary/themes/fdo/categories/128/applications-games.png b/data/elementary/themes/fdo/categories/128/applications-games.png new file mode 100644 index 0000000000..0046179177 Binary files /dev/null and b/data/elementary/themes/fdo/categories/128/applications-games.png differ diff --git a/data/elementary/themes/fdo/categories/128/applications-graphics.png b/data/elementary/themes/fdo/categories/128/applications-graphics.png new file mode 100644 index 0000000000..a27593cb22 Binary files /dev/null and b/data/elementary/themes/fdo/categories/128/applications-graphics.png differ diff --git a/data/elementary/themes/fdo/categories/128/applications-internet.png b/data/elementary/themes/fdo/categories/128/applications-internet.png new file mode 100644 index 0000000000..65b59ed4a8 Binary files /dev/null and b/data/elementary/themes/fdo/categories/128/applications-internet.png differ diff --git a/data/elementary/themes/fdo/categories/128/applications-multimedia.png b/data/elementary/themes/fdo/categories/128/applications-multimedia.png new file mode 100644 index 0000000000..a2e9fa60d3 Binary files /dev/null and b/data/elementary/themes/fdo/categories/128/applications-multimedia.png differ diff --git a/data/elementary/themes/fdo/categories/128/applications-office.png b/data/elementary/themes/fdo/categories/128/applications-office.png new file mode 100644 index 0000000000..7520bcabee Binary files /dev/null and b/data/elementary/themes/fdo/categories/128/applications-office.png differ diff --git a/data/elementary/themes/fdo/categories/128/applications-other.png b/data/elementary/themes/fdo/categories/128/applications-other.png new file mode 100644 index 0000000000..25bd4a400f Binary files /dev/null and b/data/elementary/themes/fdo/categories/128/applications-other.png differ diff --git a/data/elementary/themes/fdo/categories/128/applications-science.png b/data/elementary/themes/fdo/categories/128/applications-science.png new file mode 100644 index 0000000000..c70f00933e Binary files /dev/null and b/data/elementary/themes/fdo/categories/128/applications-science.png differ diff --git a/data/elementary/themes/fdo/categories/128/applications-system.png b/data/elementary/themes/fdo/categories/128/applications-system.png new file mode 100644 index 0000000000..54e88afc75 Binary files /dev/null and b/data/elementary/themes/fdo/categories/128/applications-system.png differ diff --git a/data/elementary/themes/fdo/categories/128/applications-utilities.png b/data/elementary/themes/fdo/categories/128/applications-utilities.png new file mode 120000 index 0000000000..9447f512b8 --- /dev/null +++ b/data/elementary/themes/fdo/categories/128/applications-utilities.png @@ -0,0 +1 @@ +applications-accessories.png \ No newline at end of file diff --git a/data/elementary/themes/fdo/categories/128/preferences-desktop.png b/data/elementary/themes/fdo/categories/128/preferences-desktop.png new file mode 100644 index 0000000000..81e29144e5 Binary files /dev/null and b/data/elementary/themes/fdo/categories/128/preferences-desktop.png differ diff --git a/data/elementary/themes/fdo/categories/128/preferences-other.png b/data/elementary/themes/fdo/categories/128/preferences-other.png new file mode 120000 index 0000000000..5aba4b0c4e --- /dev/null +++ b/data/elementary/themes/fdo/categories/128/preferences-other.png @@ -0,0 +1 @@ +applications-other.png \ No newline at end of file diff --git a/data/elementary/themes/fdo/categories/128/preferences-system.png b/data/elementary/themes/fdo/categories/128/preferences-system.png new file mode 120000 index 0000000000..d4bd096084 --- /dev/null +++ b/data/elementary/themes/fdo/categories/128/preferences-system.png @@ -0,0 +1 @@ +applications-system.png \ No newline at end of file diff --git a/data/elementary/themes/fdo/categories/16/applications-accessories.png b/data/elementary/themes/fdo/categories/16/applications-accessories.png new file mode 100644 index 0000000000..41b09b42d4 Binary files /dev/null and b/data/elementary/themes/fdo/categories/16/applications-accessories.png differ diff --git a/data/elementary/themes/fdo/categories/16/applications-development.png b/data/elementary/themes/fdo/categories/16/applications-development.png new file mode 100644 index 0000000000..fb8425fed6 Binary files /dev/null and b/data/elementary/themes/fdo/categories/16/applications-development.png differ diff --git a/data/elementary/themes/fdo/categories/16/applications-games.png b/data/elementary/themes/fdo/categories/16/applications-games.png new file mode 100644 index 0000000000..03b4e82eb2 Binary files /dev/null and b/data/elementary/themes/fdo/categories/16/applications-games.png differ diff --git a/data/elementary/themes/fdo/categories/16/applications-graphics.png b/data/elementary/themes/fdo/categories/16/applications-graphics.png new file mode 100644 index 0000000000..fff25fb788 Binary files /dev/null and b/data/elementary/themes/fdo/categories/16/applications-graphics.png differ diff --git a/data/elementary/themes/fdo/categories/16/applications-internet.png b/data/elementary/themes/fdo/categories/16/applications-internet.png new file mode 100644 index 0000000000..54805fc1ad Binary files /dev/null and b/data/elementary/themes/fdo/categories/16/applications-internet.png differ diff --git a/data/elementary/themes/fdo/categories/16/applications-multimedia.png b/data/elementary/themes/fdo/categories/16/applications-multimedia.png new file mode 100644 index 0000000000..1b10a77b5c Binary files /dev/null and b/data/elementary/themes/fdo/categories/16/applications-multimedia.png differ diff --git a/data/elementary/themes/fdo/categories/16/applications-office.png b/data/elementary/themes/fdo/categories/16/applications-office.png new file mode 100644 index 0000000000..cd896637fb Binary files /dev/null and b/data/elementary/themes/fdo/categories/16/applications-office.png differ diff --git a/data/elementary/themes/fdo/categories/16/applications-other.png b/data/elementary/themes/fdo/categories/16/applications-other.png new file mode 100644 index 0000000000..bf8c7071e5 Binary files /dev/null and b/data/elementary/themes/fdo/categories/16/applications-other.png differ diff --git a/data/elementary/themes/fdo/categories/16/applications-science.png b/data/elementary/themes/fdo/categories/16/applications-science.png new file mode 100644 index 0000000000..f076f1c66e Binary files /dev/null and b/data/elementary/themes/fdo/categories/16/applications-science.png differ diff --git a/data/elementary/themes/fdo/categories/16/applications-system.png b/data/elementary/themes/fdo/categories/16/applications-system.png new file mode 100644 index 0000000000..295a74841d Binary files /dev/null and b/data/elementary/themes/fdo/categories/16/applications-system.png differ diff --git a/data/elementary/themes/fdo/categories/16/applications-utilities.png b/data/elementary/themes/fdo/categories/16/applications-utilities.png new file mode 120000 index 0000000000..9447f512b8 --- /dev/null +++ b/data/elementary/themes/fdo/categories/16/applications-utilities.png @@ -0,0 +1 @@ +applications-accessories.png \ No newline at end of file diff --git a/data/elementary/themes/fdo/categories/16/preferences-desktop.png b/data/elementary/themes/fdo/categories/16/preferences-desktop.png new file mode 100644 index 0000000000..b06eeff50d Binary files /dev/null and b/data/elementary/themes/fdo/categories/16/preferences-desktop.png differ diff --git a/data/elementary/themes/fdo/categories/16/preferences-other.png b/data/elementary/themes/fdo/categories/16/preferences-other.png new file mode 120000 index 0000000000..5aba4b0c4e --- /dev/null +++ b/data/elementary/themes/fdo/categories/16/preferences-other.png @@ -0,0 +1 @@ +applications-other.png \ No newline at end of file diff --git a/data/elementary/themes/fdo/categories/16/preferences-system.png b/data/elementary/themes/fdo/categories/16/preferences-system.png new file mode 120000 index 0000000000..d4bd096084 --- /dev/null +++ b/data/elementary/themes/fdo/categories/16/preferences-system.png @@ -0,0 +1 @@ +applications-system.png \ No newline at end of file diff --git a/data/elementary/themes/fdo/categories/scalable/applications-utilities.svg b/data/elementary/themes/fdo/categories/scalable/applications-utilities.svg deleted file mode 120000 index 210f51ca2f..0000000000 --- a/data/elementary/themes/fdo/categories/scalable/applications-utilities.svg +++ /dev/null @@ -1 +0,0 @@ -applications-accessories.svg \ No newline at end of file diff --git a/data/elementary/themes/fdo/categories/scalable/preferences-other.svg b/data/elementary/themes/fdo/categories/scalable/preferences-other.svg deleted file mode 120000 index 316547baee..0000000000 --- a/data/elementary/themes/fdo/categories/scalable/preferences-other.svg +++ /dev/null @@ -1 +0,0 @@ -applications-other.svg \ No newline at end of file diff --git a/data/elementary/themes/fdo/categories/scalable/preferences-system.svg b/data/elementary/themes/fdo/categories/scalable/preferences-system.svg deleted file mode 120000 index 9a40701e83..0000000000 --- a/data/elementary/themes/fdo/categories/scalable/preferences-system.svg +++ /dev/null @@ -1 +0,0 @@ -applications-system.svg \ No newline at end of file diff --git a/data/elementary/themes/fdo/index.theme b/data/elementary/themes/fdo/index.theme index 3dda183dd9..f9b1e26a34 100644 --- a/data/elementary/themes/fdo/index.theme +++ b/data/elementary/themes/fdo/index.theme @@ -2,7 +2,7 @@ Name=Bluish-X Inherits=hicolor Comment=The EFL Bluish-X Icon theme. Orig. Based on Rave-X, Mint-X and Faenza Icon Themes. -Directories=actions/scalable,status/scalable,places/128,places/16,emblems/96,categories/scalable +Directories=actions/scalable,status/scalable,places/128,places/16,emblems/96,categories/128,categories/16 Example=folder-home @@ -29,6 +29,20 @@ MinSize=8 MaxSize=256 +[categories/128] +Size=128 +Context=Categories +Type=Scalable +MinSize=23 +MaxSize=256 + +[categories/16] +Size=16 +Context=Categories +Type=Scalable +MinSize=16 +MaxSize=22 + [actions/scalable] Size=128 @@ -43,7 +57,3 @@ Type=Scalable MinSize=16 -[categories/scalable] -Size=128 -Context=Categories -Type=Scalable