From dcd3a7e39e7ccf1989d8168005c211abe69108fb Mon Sep 17 00:00:00 2001 From: Andrew Borodin Date: Sat, 22 Feb 2020 10:00:25 +0300 Subject: [PATCH] Skins: move items from [widget-common] section to [widget-panel] one. Signed-off-by: Andrew Borodin --- misc/skins/dark.ini | 4 +--- misc/skins/darkfar.ini | 4 +--- misc/skins/default.ini | 4 +--- misc/skins/double-lines.ini | 4 +--- misc/skins/featured-plus.ini | 15 +-------------- misc/skins/featured.ini | 15 +-------------- misc/skins/gray-green-purple256.ini | 4 +--- misc/skins/gray-orange-blue256.ini | 4 +--- misc/skins/julia256.ini | 4 +--- misc/skins/mc46.ini | 4 +--- misc/skins/modarcon16-defbg.ini | 4 +--- misc/skins/modarcon16.ini | 4 +--- misc/skins/modarcon16root-defbg.ini | 4 +--- misc/skins/modarcon16root.ini | 4 +--- misc/skins/modarin256-defbg.ini | 4 +--- misc/skins/modarin256.ini | 4 +--- misc/skins/modarin256root-defbg.ini | 4 +--- misc/skins/modarin256root.ini | 4 +--- misc/skins/nicedark.ini | 4 +--- misc/skins/sand256.ini | 4 +--- misc/skins/seasons-autumn16M.ini | 4 +--- misc/skins/seasons-spring16M.ini | 4 +--- misc/skins/seasons-summer16M.ini | 4 +--- misc/skins/seasons-winter16M.ini | 4 +--- misc/skins/xoria256.ini | 4 +--- misc/skins/yadt256-defbg.ini | 4 +--- misc/skins/yadt256.ini | 4 +--- src/filemanager/panel.c | 5 ++--- 28 files changed, 29 insertions(+), 106 deletions(-) diff --git a/misc/skins/dark.ini b/misc/skins/dark.ini index d6ad4ae9d..84db1f534 100644 --- a/misc/skins/dark.ini +++ b/misc/skins/dark.ini @@ -126,11 +126,9 @@ removed = white;red error = red;lightgray -[widget-common] +[widget-panel] sort-sign-up = ↑ sort-sign-down = ↓ - -[widget-panel] hiddenfiles-sign-show = • hiddenfiles-sign-hide = ○ history-prev-item-sign = ← diff --git a/misc/skins/darkfar.ini b/misc/skins/darkfar.ini index b4a8d3a49..dd13b9763 100644 --- a/misc/skins/darkfar.ini +++ b/misc/skins/darkfar.ini @@ -126,11 +126,9 @@ removed = white;red error = red; -[widget-common] +[widget-panel] sort-sign-up = ↑ sort-sign-down = ↓ - -[widget-panel] hiddenfiles-sign-show = • hiddenfiles-sign-hide = ○ history-prev-item-sign = ← diff --git a/misc/skins/default.ini b/misc/skins/default.ini index e28e4df44..05fb12f2e 100644 --- a/misc/skins/default.ini +++ b/misc/skins/default.ini @@ -126,11 +126,9 @@ removed = white;red error = red;lightgray -[widget-common] +[widget-panel] sort-sign-up = ' sort-sign-down = . - -[widget-panel] filename-scroll-left-char = { filename-scroll-right-char = } diff --git a/misc/skins/double-lines.ini b/misc/skins/double-lines.ini index 3afeb6846..efd2a4b53 100644 --- a/misc/skins/double-lines.ini +++ b/misc/skins/double-lines.ini @@ -126,11 +126,9 @@ removed = white;red error = red;lightgray -[widget-common] +[widget-panel] sort-sign-up = ' sort-sign-down = . - -[widget-panel] filename-scroll-left-char = { filename-scroll-right-char = } diff --git a/misc/skins/featured-plus.ini b/misc/skins/featured-plus.ini index fff233646..33a0753d3 100644 --- a/misc/skins/featured-plus.ini +++ b/misc/skins/featured-plus.ini @@ -128,11 +128,9 @@ removed = white;red error = red;lightgray -[widget-common] +[widget-panel] sort-sign-up = ↑ sort-sign-down = ↓ - -[widget-panel] hiddenfiles-sign-show = ⋅ hiddenfiles-sign-hide = • history-prev-item-sign = « @@ -140,17 +138,6 @@ history-show-list-sign = ^ filename-scroll-left-char = « filename-scroll-right-char = » - horiz = ─ - vert = │ - lefttop = ┌ - righttop = ┐ - leftbottom = └ - rightbottom = ┘ - topmiddle = ┬ - bottommiddle = ┴ - leftmiddle = ├ - rightmiddle = ┤ - cross = ┼ [widget-editor] window-state-char = ↕ diff --git a/misc/skins/featured.ini b/misc/skins/featured.ini index bc1952f39..96afa835e 100644 --- a/misc/skins/featured.ini +++ b/misc/skins/featured.ini @@ -128,11 +128,9 @@ removed = white;red error = red;lightgray -[widget-common] +[widget-panel] sort-sign-up = ↑ sort-sign-down = ↓ - -[widget-panel] hiddenfiles-sign-show = ⋅ hiddenfiles-sign-hide = • history-prev-item-sign = « @@ -140,17 +138,6 @@ history-show-list-sign = ^ filename-scroll-left-char = « filename-scroll-right-char = » - horiz = ─ - vert = │ - lefttop = ┌ - righttop = ┐ - leftbottom = └ - rightbottom = ┘ - topmiddle = ┬ - bottommiddle = ┴ - leftmiddle = ├ - rightmiddle = ┤ - cross = ┼ [widget-editor] window-state-char = ↕ diff --git a/misc/skins/gray-green-purple256.ini b/misc/skins/gray-green-purple256.ini index bd7e57b1b..d0b862784 100644 --- a/misc/skins/gray-green-purple256.ini +++ b/misc/skins/gray-green-purple256.ini @@ -135,11 +135,9 @@ # "white" might change color when going bold, so use "rgb555" instead error = rgb555;rgb400;bold -[widget-common] +[widget-panel] sort-sign-up = ▴ sort-sign-down = ▾ - -[widget-panel] hiddenfiles-sign-show = • hiddenfiles-sign-hide = ○ history-prev-item-sign = ◂ diff --git a/misc/skins/gray-orange-blue256.ini b/misc/skins/gray-orange-blue256.ini index 1e7e77a1e..f63644ab9 100644 --- a/misc/skins/gray-orange-blue256.ini +++ b/misc/skins/gray-orange-blue256.ini @@ -135,11 +135,9 @@ # "white" might change color when going bold, so use "rgb555" instead error = rgb555;rgb400;bold -[widget-common] +[widget-panel] sort-sign-up = ▴ sort-sign-down = ▾ - -[widget-panel] hiddenfiles-sign-show = • hiddenfiles-sign-hide = ○ history-prev-item-sign = ◂ diff --git a/misc/skins/julia256.ini b/misc/skins/julia256.ini index 129f19fae..232471256 100644 --- a/misc/skins/julia256.ini +++ b/misc/skins/julia256.ini @@ -131,11 +131,9 @@ removed = white;red error = red;lightgray -[widget-common] +[widget-panel] sort-sign-up = ↑ sort-sign-down = ↓ - -[widget-panel] hiddenfiles-sign-show = • hiddenfiles-sign-hide = ○ history-prev-item-sign = ← diff --git a/misc/skins/mc46.ini b/misc/skins/mc46.ini index b94d6a2f1..6d03fda20 100644 --- a/misc/skins/mc46.ini +++ b/misc/skins/mc46.ini @@ -117,11 +117,9 @@ removed = white;red error = red;lightgray -[widget-common] +[widget-panel] sort-sign-up = ' sort-sign-down = . - -[widget-panel] filename-scroll-left-char = { filename-scroll-right-char = } diff --git a/misc/skins/modarcon16-defbg.ini b/misc/skins/modarcon16-defbg.ini index 9dd4c66c6..ccf4b2c52 100644 --- a/misc/skins/modarcon16-defbg.ini +++ b/misc/skins/modarcon16-defbg.ini @@ -164,11 +164,9 @@ removed = color8;color0 error = color15;color1 -[widget-common] +[widget-panel] sort-sign-up = ↑ sort-sign-down = ↓ - -[widget-panel] hiddenfiles-sign-show = • hiddenfiles-sign-hide = ○ history-prev-item-sign = « diff --git a/misc/skins/modarcon16.ini b/misc/skins/modarcon16.ini index faf8e0b79..10cbca543 100644 --- a/misc/skins/modarcon16.ini +++ b/misc/skins/modarcon16.ini @@ -164,11 +164,9 @@ removed = color8;color0 error = color15;color1 -[widget-common] +[widget-panel] sort-sign-up = ↑ sort-sign-down = ↓ - -[widget-panel] hiddenfiles-sign-show = • hiddenfiles-sign-hide = ○ history-prev-item-sign = « diff --git a/misc/skins/modarcon16root-defbg.ini b/misc/skins/modarcon16root-defbg.ini index 45be80c0b..c7edd1ae9 100644 --- a/misc/skins/modarcon16root-defbg.ini +++ b/misc/skins/modarcon16root-defbg.ini @@ -164,11 +164,9 @@ removed = color8;color0 error = color15;color1 -[widget-common] +[widget-panel] sort-sign-up = ↑ sort-sign-down = ↓ - -[widget-panel] hiddenfiles-sign-show = • hiddenfiles-sign-hide = ○ history-prev-item-sign = « diff --git a/misc/skins/modarcon16root.ini b/misc/skins/modarcon16root.ini index e5988d247..4c91e7ecb 100644 --- a/misc/skins/modarcon16root.ini +++ b/misc/skins/modarcon16root.ini @@ -164,11 +164,9 @@ removed = color8;color0 error = color15;color1 -[widget-common] +[widget-panel] sort-sign-up = ↑ sort-sign-down = ↓ - -[widget-panel] hiddenfiles-sign-show = • hiddenfiles-sign-hide = ○ history-prev-item-sign = « diff --git a/misc/skins/modarin256-defbg.ini b/misc/skins/modarin256-defbg.ini index b36544b8e..9858dcc2b 100644 --- a/misc/skins/modarin256-defbg.ini +++ b/misc/skins/modarin256-defbg.ini @@ -164,11 +164,9 @@ removed = ;color234 error = color231;color160 -[widget-common] +[widget-panel] sort-sign-up = ↑ sort-sign-down = ↓ - -[widget-panel] hiddenfiles-sign-show = • hiddenfiles-sign-hide = ○ history-prev-item-sign = « diff --git a/misc/skins/modarin256.ini b/misc/skins/modarin256.ini index 31c84b7e9..cc6844ac5 100644 --- a/misc/skins/modarin256.ini +++ b/misc/skins/modarin256.ini @@ -164,11 +164,9 @@ removed = ;color235 error = color231;color160 -[widget-common] +[widget-panel] sort-sign-up = ↑ sort-sign-down = ↓ - -[widget-panel] hiddenfiles-sign-show = • hiddenfiles-sign-hide = ○ history-prev-item-sign = « diff --git a/misc/skins/modarin256root-defbg.ini b/misc/skins/modarin256root-defbg.ini index ea4497d8b..411a7ef9f 100644 --- a/misc/skins/modarin256root-defbg.ini +++ b/misc/skins/modarin256root-defbg.ini @@ -164,11 +164,9 @@ removed = ;color234 error = color231;color160 -[widget-common] +[widget-panel] sort-sign-up = ↑ sort-sign-down = ↓ - -[widget-panel] hiddenfiles-sign-show = • hiddenfiles-sign-hide = ○ history-prev-item-sign = « diff --git a/misc/skins/modarin256root.ini b/misc/skins/modarin256root.ini index f760f1146..f8d2bf790 100644 --- a/misc/skins/modarin256root.ini +++ b/misc/skins/modarin256root.ini @@ -164,11 +164,9 @@ removed = ;color235 error = color231;color160 -[widget-common] +[widget-panel] sort-sign-up = ↑ sort-sign-down = ↓ - -[widget-panel] hiddenfiles-sign-show = • hiddenfiles-sign-hide = ○ history-prev-item-sign = « diff --git a/misc/skins/nicedark.ini b/misc/skins/nicedark.ini index e30df8636..795580f2c 100644 --- a/misc/skins/nicedark.ini +++ b/misc/skins/nicedark.ini @@ -126,11 +126,9 @@ removed = white;red error = red;lightgray -[widget-common] +[widget-panel] sort-sign-up = ↑ sort-sign-down = ↓ - -[widget-panel] hiddenfiles-sign-show = • hiddenfiles-sign-hide = ○ history-prev-item-sign = « diff --git a/misc/skins/sand256.ini b/misc/skins/sand256.ini index 1a4e5f586..671e30a8b 100644 --- a/misc/skins/sand256.ini +++ b/misc/skins/sand256.ini @@ -184,11 +184,9 @@ removed = ;rgb511 error = rgb554;rgb320 -[widget-common] +[widget-panel] sort-sign-up = ↑ sort-sign-down = ↓ - -[widget-panel] hiddenfiles-sign-show = • hiddenfiles-sign-hide = ○ history-prev-item-sign = « diff --git a/misc/skins/seasons-autumn16M.ini b/misc/skins/seasons-autumn16M.ini index 76000cd8d..9822d0af3 100644 --- a/misc/skins/seasons-autumn16M.ini +++ b/misc/skins/seasons-autumn16M.ini @@ -190,11 +190,9 @@ removed = ;DiffGap error = #fff;Error -[widget-common] +[widget-panel] sort-sign-up = ▴ sort-sign-down = ▾ - -[widget-panel] hiddenfiles-sign-show = • hiddenfiles-sign-hide = ○ history-prev-item-sign = ◂ diff --git a/misc/skins/seasons-spring16M.ini b/misc/skins/seasons-spring16M.ini index 12d0c5e13..c2b8c7aac 100644 --- a/misc/skins/seasons-spring16M.ini +++ b/misc/skins/seasons-spring16M.ini @@ -190,11 +190,9 @@ removed = ;DiffGap error = #fff;Error -[widget-common] +[widget-panel] sort-sign-up = ▴ sort-sign-down = ▾ - -[widget-panel] hiddenfiles-sign-show = • hiddenfiles-sign-hide = ○ history-prev-item-sign = ◂ diff --git a/misc/skins/seasons-summer16M.ini b/misc/skins/seasons-summer16M.ini index bd40fba1b..6129c07c9 100644 --- a/misc/skins/seasons-summer16M.ini +++ b/misc/skins/seasons-summer16M.ini @@ -190,11 +190,9 @@ removed = ;DiffGap error = #fff;Error -[widget-common] +[widget-panel] sort-sign-up = ▴ sort-sign-down = ▾ - -[widget-panel] hiddenfiles-sign-show = • hiddenfiles-sign-hide = ○ history-prev-item-sign = ◂ diff --git a/misc/skins/seasons-winter16M.ini b/misc/skins/seasons-winter16M.ini index a00a76361..ce4c1531a 100644 --- a/misc/skins/seasons-winter16M.ini +++ b/misc/skins/seasons-winter16M.ini @@ -190,11 +190,9 @@ removed = ;DiffGap error = #fff;Error -[widget-common] +[widget-panel] sort-sign-up = ▴ sort-sign-down = ▾ - -[widget-panel] hiddenfiles-sign-show = • hiddenfiles-sign-hide = ○ history-prev-item-sign = ◂ diff --git a/misc/skins/xoria256.ini b/misc/skins/xoria256.ini index f1192d8c1..361e71db8 100644 --- a/misc/skins/xoria256.ini +++ b/misc/skins/xoria256.ini @@ -168,11 +168,9 @@ removed = ;color235 error = rgb554;rgb320 -[widget-common] +[widget-panel] sort-sign-up = ↑ sort-sign-down = ↓ - -[widget-panel] hiddenfiles-sign-show = • hiddenfiles-sign-hide = ○ history-prev-item-sign = « diff --git a/misc/skins/yadt256-defbg.ini b/misc/skins/yadt256-defbg.ini index 01a3772ee..29537f11d 100644 --- a/misc/skins/yadt256-defbg.ini +++ b/misc/skins/yadt256-defbg.ini @@ -131,11 +131,9 @@ removed = ;color234 error = color231;color160 -[widget-common] +[widget-panel] sort-sign-up = ↑ sort-sign-down = ↓ - -[widget-panel] hiddenfiles-sign-show = • hiddenfiles-sign-hide = ○ history-prev-item-sign = < diff --git a/misc/skins/yadt256.ini b/misc/skins/yadt256.ini index 3552f82f1..6ffae8d99 100644 --- a/misc/skins/yadt256.ini +++ b/misc/skins/yadt256.ini @@ -130,11 +130,9 @@ removed = ;color234 error = color231;color160 -[widget-common] +[widget-panel] sort-sign-up = ↑ sort-sign-down = ↓ - -[widget-panel] hiddenfiles-sign-show = • hiddenfiles-sign-hide = ○ history-prev-item-sign = < diff --git a/src/filemanager/panel.c b/src/filemanager/panel.c index 78712b69d..11c4f9675 100644 --- a/src/filemanager/panel.c +++ b/src/filemanager/panel.c @@ -4977,9 +4977,8 @@ panel_get_user_possible_fields (gsize * array_size) void panel_init (void) { - panel_sort_up_sign = mc_skin_get ("widget-common", "sort-sign-up", "'"); - panel_sort_down_sign = mc_skin_get ("widget-common", "sort-sign-down", "."); - + panel_sort_up_sign = mc_skin_get ("widget-panel", "sort-sign-up", "'"); + panel_sort_down_sign = mc_skin_get ("widget-panel", "sort-sign-down", "."); panel_hiddenfiles_sign_show = mc_skin_get ("widget-panel", "hiddenfiles-sign-show", "."); panel_hiddenfiles_sign_hide = mc_skin_get ("widget-panel", "hiddenfiles-sign-hide", "."); panel_history_prev_item_sign = mc_skin_get ("widget-panel", "history-prev-item-sign", "<");