Ticket #1703: SKIN: Make own colorpairs for buttonbar widget

Now buttonbar have own colorpairs:

[buttonbar]
    hotkey=red;black
    button=yellow;cyan

Signed-off-by: Ilia Maslakov <il.smind@gmail.com>
Signed-off-by: Slava Zanko <slavazanko@gmail.com>

misc/skins/darkfar.ini

@@ -77,6 +77,10 @@
 [viewer]
     viewunderline=brightred;black
 
+[buttonbar]
+    hotkey=red;white
+    button=black;white
+
 [widget-common]
     sort-sign-up=↑
     sort-sign-down=↓

misc/skins/default.ini

@@ -59,6 +59,10 @@
     menusel=white;black
     menuhotsel=yellow;black
 
+[buttonbar]
+    hotkey=white;black
+    button=black;cyan
+
 [help]
     _default_=black;lightgray
     helpitalic=red;lightgray

misc/skins/featured.ini

@@ -61,6 +61,10 @@
     menusel=white;black
     menuhotsel=yellow;black
 
+[buttonbar]
+    hotkey=white;black
+    button=black;cyan
+
 [help]
     _default_=black;lightgray
     helpitalic=red;lightgray

misc/skins/gotar.ini

@@ -76,3 +76,7 @@
 
 [viewer]
 	viewunderline=brightgreen;black
+
+[buttonbar]
+	hotkey=brightgreen;white
+	button=black;blue

src/skin/colors.c

@@ -230,6 +230,8 @@ mc_skin_color_cache_init (void)
     LINE_STATE_COLOR = mc_skin_color_get ("editor", "linestate");
     BOOK_MARK_COLOR = mc_skin_color_get ("editor", "bookmark");
     BOOK_MARK_FOUND_COLOR = mc_skin_color_get ("editor", "bookmarkfound");
+    BUTTONBAR_HOTKEY_COLOR = mc_skin_color_get ("buttonbar", "hotkey");
+    BUTTONBAR_BUTTON_COLOR = mc_skin_color_get ("buttonbar", "button");
 
 
 }

src/skin/skin.h

@@ -66,7 +66,10 @@
 #define BOOK_MARK_COLOR         mc_skin_color__cache[30]
 #define BOOK_MARK_FOUND_COLOR   mc_skin_color__cache[31]
 
-#define MC_SKIN_COLOR_CACHE_COUNT 32
+#define BUTTONBAR_HOTKEY_COLOR   mc_skin_color__cache[32]
+#define BUTTONBAR_BUTTON_COLOR   mc_skin_color__cache[33]
+
+#define MC_SKIN_COLOR_CACHE_COUNT 34
 
 
 /*** enums ***************************************************************************************/

src/widget.c

@@ -2597,9 +2597,9 @@ buttonbar_callback (Widget *w, widget_msg_t msg, int parm)
 
 	    for (i = 0; i < COLS / bb->btn_width && i < BUTTONBAR_LABELS_NUM; i++) {
 		widget_move (&bb->widget, 0, i * bb->btn_width);
-		tty_setcolor (DEFAULT_COLOR);
+		tty_setcolor (BUTTONBAR_HOTKEY_COLOR);
 		tty_printf ("%2d", i + 1);
-		tty_setcolor (SELECTED_COLOR);
+		tty_setcolor (BUTTONBAR_BUTTON_COLOR);
 		text = (bb->labels[i].text != NULL) ? bb->labels[i].text : "";
 		tty_print_string (str_fit_to_term (text, bb->btn_width - 2, J_CENTER_LEFT));
 	    }