Skins: move items from [widget-common] section to [widget-panel] one.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
2025-01-01 00:54:24 +03:00 · 2020-02-22 10:00:25 +03:00 · 2020-02-22 10:00:25 +03:00 · dcd3a7e39e
commit dcd3a7e39e
parent 97eb8faab0
28 changed files with 29 additions and 106 deletions
--- 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 = ←
--- 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 = ←
--- 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 = }

--- 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 = }

--- 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 = ↕
--- 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 = ↕
--- 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 = ◂
--- 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 = ◂
--- 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 = ←
--- 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 = }

--- 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 = «
--- 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 = «
--- 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 = «
--- 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 = «
--- 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 = «
--- 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 = «
--- 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 = «
--- 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 = «
--- 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 = «
--- 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 = «
--- 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 = ◂
--- 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 = ◂
--- 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 = ◂
--- 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 = ◂
--- 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 = «
--- 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 = <
--- 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 = <
--- 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", "<");