Changeset 1611 for lliurex-conky/trunk/fuentes/lliurex-conky.install-files/usr/share/lliurex-conky/conkyrc_gui

Timestamp:

May 20, 2016, 11:53:01 AM (5 years ago)

Author:

daduve

Message:

Upated color selection

File:

• lliurex-conky/trunk/fuentes/lliurex-conky.install-files/usr/share/lliurex-conky/conkyrc_gui (modified) (5 diffs)

lliurex-conky/trunk/fuentes/lliurex-conky.install-files/usr/share/lliurex-conky/conkyrc_gui

@@ -21 +21 @@
 MSG_INICIAL=$(gettext "Do you want conky on desktop?")
 MSG_CONFIGURATOR=$(gettext "CONKY CONFIGUTATOR. SELECT THE FORMAT THAT YOU LIKE")
-MSG_SELECT_COLOUR=$(gettext "SELECT YOUR FAVOURITE COLOUR FOR YOUR INFO CONKY TEXT")
-MSG_SELECT_COLOUR2=$(gettext "SELECT YOUR FAVOURITE COLOUR FOR YOUR TITLE CONKY TEXT")
+MSG_SELECT_COLOUR=$(gettext "<b><big>INFO </big></b>CONKY TEXT: <small>Select your favourite colour or personalice it</small>")
+MSG_SELECT_COLOUR2=$(gettext "<b><big>TITLE </big></b>CONKY TEXT: <small>Select you favourite colour or personalice it</small>")
 MSG_SELECT_COLOUR_PREDEF=$(gettext "SELECT ONE COLOUR")
-MSG_SELECT_COLOUR_PERSONAL=$(gettext "ENTER YOU FAVOURITE COLOUR FOR INFO TEXT IN HEX MODE")
-MSG_SELECT_COLOUR_PERSONAL2=$(gettext "ENTER YOU FAVOURITE COLOUR FOR TITLE TEXT IN HEX MODE")
+MSG_SELECT_COLOUR_PERSONAL=$(gettext "Select your favourite colour for the: TITLES")
+MSG_SELECT_COLOUR_PERSONAL2=$(gettext "Select your favourite colour for the: INFO ")
 MSG_SELECCIONA=$(gettext "SELECT")
 MSG_ESTILO=$(gettext "STYLE")
@@ -184 +184 @@
 ##QUEREMOS CONKY VISIBLE O NO##
 function avaiable (){
-        zenity --title "$MSG_TITLE" --question --text "$MSG_INICIAL"  
+        zenity --title "$MSG_TITLE" --question --text "<b>$MSG_INICIAL</b>"  
         cancelar $?
 }
@@ -267 +267 @@
         #SE QUIERE COLOR PERSONALIZADO
         if [[  $? -eq  1 ]]; then
-                SELECTION_COLOUR=`zenity  --title "$MSG_TITLE" --entry --width 200 --height=130 --text "$MSG_SELECT_COLOUR_PERSONAL" `
+                SELECTION_COLOUR=`zenity --title "$MSG_SELECT_COLOUR_PERSONAL2" --color-selection --show-palette `
                 cancelar $?
-        fi
-}
+                COL1=$( echo "$SELECTION_COLOUR" | cut -d "," -f1 | cut -d "(" -f2 )
+                COL2=$( echo "$SELECTION_COLOUR" | cut -d "," -f2 )
+                COL3=$( echo "$SELECTION_COLOUR" | cut -d "," -f3 | cut -d ")" -f2 )
+                SELECTION_COLOUR=$( hexcolor COL1 COL2 COL3 )
+                SELECTION_COLOUR=$( echo "$SELECTION_COLOUR" | cut -d "#" -f2 )
+        fi
+}
+
+##funcion para pasar a hexadecimal el rgb
+function hexcolor() {
+    local a b c=({0..9} {a..f}) d=\#
+    for b ;do
+        for a in / % ;do
+            d+=${c[$b$a 0x10]}
+        done
+    done
+    echo $d
+}
+
 
 function text_colour_server {
 
-        SELECTION_COLOUR=`zenity  --title "$MSG_TITLE" --list  --width 400 --height=300 --text "$MSG_SELECT_COLOUR" --radiolist  --column "$MSG_SELECCIONA" --hide-column=2 --column "SELECCIONA" --column "$MSG_SELECT_COLOUR_PREDEF" --cancel-label="PERSONAL COLOUR"\
+        SELECTION_COLOUR2=`zenity  --title "$MSG_TITLE" --list  --width 400 --height=300 --text "$MSG_SELECT_COLOUR2" --radiolist  --column "$MSG_SELECCIONA" --hide-column=2 --column "SELECCIONA" --column "$MSG_SELECT_COLOUR_PREDEF" --cancel-label="PERSONAL COLOUR"\
                                         TRUE "BLACK" "black" \
                                         FALSE "WHITE" "white" \
@@ -285 +302 @@
         #SE QUIERE COLOR PERSONALIZADO
         if [[  $? -eq  1 ]]; then
-                SELECTION_COLOUR=`zenity --title "$MSG_TITLE" --entry --width 200 --height=130 --text "$MSG_SELECT_COLOUR_PERSONAL" `
+                SELECTION_COLOUR2=`zenity --title "$MSG_SELECT_COLOUR_PERSONAL" --color-selection --show-palette `
                 cancelar $?
+                COL1=$( echo "$SELECTION_COLOUR2" | cut -d "," -f1 | cut -d "(" -f2 )
+                COL2=$( echo "$SELECTION_COLOUR2" | cut -d "," -f2 )
+                COL3=$( echo "$SELECTION_COLOUR2" | cut -d "," -f3 | cut -d ")" -f2 )
+                SELECTION_COLOUR2=$( hexcolor COL1 COL2 COL3 )
+                SELECTION_COLOUR2=$( echo "$SELECTION_COLOUR2" | cut -d "#" -f2 )
         fi
                 
         
-        SELECTION_COLOUR2=`zenity --title "$MSG_TITLE" --list  --width 400 --height=300 --text "$MSG_SELECT_COLOUR2" --radiolist  --column "$MSG_SELECCIONA" --hide-column=2 --column "SELECCIONA" --column "$MSG_SELECT_COLOUR_PREDEF"   --cancel-label="PERSONAL COLOUR"\
+        SELECTION_COLOUR=`zenity --title "$MSG_TITLE" --list  --width 400 --height=300 --text "$MSG_SELECT_COLOUR" --radiolist  --column "$MSG_SELECCIONA" --hide-column=2 --column "SELECCIONA" --column "$MSG_SELECT_COLOUR_PREDEF"   --cancel-label="PERSONAL COLOUR"\
                                         TRUE "BLACK" "black" \
                                         FALSE "WHITE" "white" \
@@ -301 +323 @@
         #SE QUIERE COLOR PERSONALIZADO
         if [[  $? -eq  1 ]]; then
-                SELECTION_COLOUR2=`zenity --title "$MSG_TITLE" --entry --width 200 --height=130 --text "$MSG_SELECT_COLOUR_PERSONAL2" `
+                SELECTION_COLOUR=`zenity --title "$MSG_SELECT_COLOUR_PERSONAL2" --color-selection --show-palette `
                 cancelar $?
+                COL1=$( echo "$SELECTION_COLOUR" | cut -d "," -f1 | cut -d "(" -f2 )
+                COL2=$( echo "$SELECTION_COLOUR" | cut -d "," -f2 )
+                COL3=$( echo "$SELECTION_COLOUR" | cut -d "," -f3 | cut -d ")" -f2 )
+                SELECTION_COLOUR=$( hexcolor COL1 COL2 COL3 )
+                SELECTION_COLOUR=$( echo "$SELECTION_COLOUR" | cut -d "#" -f2 )
+                
         fi
 }