From 9b55f775d9a4786381c44cbef3a96d7d90e58e88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antonio=20Ca=C3=B1as=20Vargas?= Date: Mon, 7 Nov 2016 12:59:44 +0100 Subject: [PATCH] Version 16.48.3 --- swad_changelog.h | 3 ++- swad_icon.c | 27 +++++++++++++++++++++++---- 2 files changed, 25 insertions(+), 5 deletions(-) diff --git a/swad_changelog.h b/swad_changelog.h index a04b3ed72..43bb975f3 100644 --- a/swad_changelog.h +++ b/swad_changelog.h @@ -156,13 +156,14 @@ /****************************** Public constants *****************************/ /*****************************************************************************/ -#define Log_PLATFORM_VERSION "SWAD 16.48.2 (2016-11-07)" +#define Log_PLATFORM_VERSION "SWAD 16.48.3 (2016-11-07)" #define CSS_FILE "swad16.32.1.css" #define JS_FILE "swad16.46.1.js" // Number of lines (includes comments but not blank lines) has been got with the following command: // nl swad*.c swad*.h css/swad*.css py/swad*.py js/swad*.js soap/swad*.h sql/swad*.sql | tail -1 /* + Version 16.48.3: Nov 07, 2016 Icon in preferences-icons to show figure (statistics). (206449 lines) Version 16.48.2: Nov 07, 2016 Icon in preferences-first-day-of-week to show figure (statistics). (206433 lines) Version 16.48.1: Nov 07, 2016 Icon in preferences-language to show figure (statistics). (206429 lines) Version 16.48: Nov 07, 2016 Icon in messages to show figure (statistics). diff --git a/swad_icon.c b/swad_icon.c index cb62f52b6..36a799246 100644 --- a/swad_icon.c +++ b/swad_icon.c @@ -60,6 +60,12 @@ const char *Ico_IconSetNames[Ico_NUM_ICON_SETS] = "Nuvola", }; +/*****************************************************************************/ +/***************************** Private prototypes ****************************/ +/*****************************************************************************/ + +static void Ico_PutIconsIconSet (void); + /*****************************************************************************/ /************************ Put icons to select a IconSet **********************/ /*****************************************************************************/ @@ -69,8 +75,9 @@ void Ico_PutIconsToSelectIconSet (void) extern const char *Txt_Icons; Ico_IconSet_t IconSet; - Lay_StartRoundFrameTable (NULL,0,Txt_Icons); - fprintf (Gbl.F.Out,""); + Lay_StartRoundFrame (NULL,Txt_Icons,Ico_PutIconsIconSet); + fprintf (Gbl.F.Out,"" + ""); for (IconSet = (Ico_IconSet_t) 0; IconSet < Ico_NUM_ICON_SETS; IconSet++) @@ -92,8 +99,20 @@ void Ico_PutIconsToSelectIconSet (void) Act_FormEnd (); fprintf (Gbl.F.Out,""); } - fprintf (Gbl.F.Out,""); - Lay_EndRoundFrameTable (); + fprintf (Gbl.F.Out,"" + "
"); + Lay_EndRoundFrame (); + } + +/*****************************************************************************/ +/*************** Put contextual icons in icon-set preference *****************/ +/*****************************************************************************/ + +static void Ico_PutIconsIconSet (void) + { + /***** Put icon to show a figure *****/ + Gbl.Stat.FigureType = Sta_ICON_SETS; + Sta_PutIconToShowFigure (); } /*****************************************************************************/