diff --git a/uppsrc/CodeEditor/CodeEditor.h b/uppsrc/CodeEditor/CodeEditor.h index 633fd5ada..adac46af2 100644 --- a/uppsrc/CodeEditor/CodeEditor.h +++ b/uppsrc/CodeEditor/CodeEditor.h @@ -169,7 +169,7 @@ public: enum { HIGHLIGHT_NONE = -1, HIGHLIGHT_CPP = 0, HIGHLIGHT_USC, HIGHLIGHT_JAVA, HIGHLIGHT_T, - HIGHLIGHT_CALC, HIGHLIGHT_SCH, + HIGHLIGHT_CALC, HIGHLIGHT_SCH, HIGHLIGHT_SQL, HIGHLIGHT_COUNT }; diff --git a/uppsrc/CodeEditor/Highlight.cpp b/uppsrc/CodeEditor/Highlight.cpp index b40a1e787..0bfefed1d 100644 --- a/uppsrc/CodeEditor/Highlight.cpp +++ b/uppsrc/CodeEditor/Highlight.cpp @@ -390,14 +390,91 @@ void CodeEditor::InitKeywords() "COLUMN", "COLUMN_ARRAY", "ATTRIBUTE", "INLINE_ATTRIBUTE", NULL }; + static const char *sql[] = { + "ACCESSIBLE", "ADD", "ALL", + "ALTER", "ANALYZE", "AND", + "AS", "ASC", "ASENSITIVE", + "BEFORE", "BETWEEN", "BIGINT", + "BINARY", "BLOB", "BOTH", "BEGIN", "END", + "BY", "CALL", "CASCADE", + "CASE", "CHANGE", "CHAR", + "CHARACTER", "CHECK", "COLLATE", + "COLUMN", "CONDITION", "CONSTRAINT", + "CONTINUE", "CONVERT", "CREATE", + "CROSS", "CURRENT_DATE", "CURRENT_TIME", + "CURRENT_TIMESTAMP", "CURRENT_USER", "CURSOR", + "DATABASE", "DATABASES", "DAY_HOUR", + "DAY_MICROSECOND", "DAY_MINUTE", "DAY_SECOND", + "DEC", "DECIMAL", "DECLARE", + "DEFAULT", "DELAYED", "DELETE", + "DESC", "DESCRIBE", "DETERMINISTIC", + "DISTINCT", "DISTINCTROW", "DIV", + "DOUBLE", "DROP", "DUAL", + "EACH", "ELSE", "ELSEIF", + "ENCLOSED", "ESCAPED", "EXISTS", + "EXIT", "EXPLAIN", "FALSE", + "FETCH", "FLOAT", "FLOAT4", + "FLOAT8", "FOR", "FORCE", + "FOREIGN", "FROM", "FULLTEXT", + "GRANT", "GROUP", "HAVING", + "HIGH_PRIORITY", "HOUR_MICROSECOND", "HOUR_MINUTE", + "HOUR_SECOND", "IF", "IGNORE", + "IN", "INDEX", "INFILE", + "INNER", "INOUT", "INSENSITIVE", + "INSERT", "INT", "INT1", + "INT2", "INT3", "INT4", + "INT8", "INTEGER", "INTERVAL", + "INTO", "IS", "ITERATE", + "JOIN", "KEY", "KEYS", + "KILL", "LEADING", "LEAVE", + "LEFT", "LIKE", "LIMIT", + "LINEAR", "LINES", "LOAD", + "LOCALTIME", "LOCALTIMESTAMP", "LOCK", + "LONG", "LONGBLOB", "LONGTEXT", + "LOOP", "LOW_PRIORITY", "MASTER_SSL_VERIFY_SERVER_CERT", + "MATCH", "MEDIUMBLOB", "MEDIUMINT", + "MEDIUMTEXT", "MIDDLEINT", "MINUTE_MICROSECOND", + "MINUTE_SECOND", "MOD", "MODIFIES", + "NATURAL", "NOT", "NO_WRITE_TO_BINLOG", + "NULL", "NUMERIC", "ON", + "OPTIMIZE", "OPTION", "OPTIONALLY", + "OR", "ORDER", "OUT", + "OUTER", "OUTFILE", "PRECISION", + "PRIMARY", "PROCEDURE", "PURGE", + "RANGE", "READ", "READS", + "READ_WRITE", "REAL", "REFERENCES", + "REGEXP", "RELEASE", "RENAME", + "REPEAT", "REPLACE", "REQUIRE", + "RESTRICT", "RETURN", "REVOKE", + "RIGHT", "RLIKE", "SCHEMA", + "SCHEMAS", "SECOND_MICROSECOND", "SELECT", + "SENSITIVE", "SEPARATOR", "SET", + "SHOW", "SMALLINT", "SPATIAL", + "SPECIFIC", "SQL", "SQLEXCEPTION", + "SQLSTATE", "SQLWARNING", "SQL_BIG_RESULT", + "SQL_CALC_FOUND_ROWS", "SQL_SMALL_RESULT", "SSL", + "STARTING", "STRAIGHT_JOIN", "TABLE", + "TERMINATED", "THEN", "TINYBLOB", + "TINYINT", "TINYTEXT", "TO", + "TRAILING", "TRIGGER", "TRUE", + "UNDO", "UNION", "UNIQUE", + "UNLOCK", "UNSIGNED", "UPDATE", + "USAGE", "USE", "USING", + "UTC_DATE", "UTC_TIME", "UTC_TIMESTAMP", + "VALUES", "VARBINARY", "VARCHAR", + "VARCHARACTER", "VARYING", "WHEN", + "WHERE", "WHILE", "WITH", + "WRITE", "XOR", "YEAR_MONTH", + "ZEROFILL", + }; static const char *javan[] = { NULL }; static const char **kw[HIGHLIGHT_COUNT] = { - cpp, usc, java, tfile, usc, sch + cpp, usc, java, tfile, usc, sch, sql }; static const char **nm[HIGHLIGHT_COUNT] = { - upp, usclib, javan, tlng, usclib, javan + upp, usclib, javan, tlng, usclib, javan, javan }; const char **q = NULL; for(int i = 0; i < HIGHLIGHT_COUNT; i++) { @@ -619,6 +696,8 @@ void CodeEditor::HighlightLine(int line, Vector& hl, int po while(iscid(*q) && q < e) id.Cat(*q++); String iid = id; + if(highlight == HIGHLIGHT_SQL) + iid = ToUpper(iid); int uq = kw_upp.Find(iid); int nq; hls.Put(int(q - p), (nq = keyword[highlight].Find(iid)) >= 0 ? hl_style[INK_KEYWORD] : diff --git a/uppsrc/ide/icon.ico b/uppsrc/ide/icon.ico index 02b1119e5..54590179a 100644 Binary files a/uppsrc/ide/icon.ico and b/uppsrc/ide/icon.ico differ diff --git a/uppsrc/ide/ide.iml b/uppsrc/ide/ide.iml index 88f516418..2f16920eb 100644 --- a/uppsrc/ide/ide.iml +++ b/uppsrc/ide/ide.iml @@ -2011,183 +2011,184 @@ IMAGE_DATA(133,78,120,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0) IMAGE_END_DATA(59744, 12) IMAGE_BEGIN_DATA -IMAGE_DATA(120,156,237,156,77,136,37,87,21,199,75,72,192,24,73,196,68,220,116,178,147,96,204,70,113,145,12,184,142,155,100,161) -IMAGE_DATA(153,32,18,13,58,32,136,136,140,146,132,4,34,157,16,221,152,6,227,194,129,1,117,17,2,102,22,110,2,138,136,56) -IMAGE_DATA(186,24,23,126,225,66,20,65,145,1,63,16,36,72,22,65,9,148,115,222,235,223,244,255,253,251,220,143,122,239,117,79) -IMAGE_DATA(79,172,211,28,186,94,213,61,247,243,124,221,115,79,213,112,243,112,211,48,142,131,194,216,249,127,42,180,232,214,169,119) -IMAGE_DATA(156,128,235,212,189,201,243,22,93,253,255,77,195,205,190,48,173,198,215,89,184,158,123,173,223,215,91,61,155,205,207,77) -IMAGE_DATA(101,137,169,53,152,113,161,223,111,253,206,232,106,220,61,229,249,81,245,111,72,158,15,43,247,223,126,229,175,194,233,199) -IMAGE_DATA(4,187,227,18,183,93,150,242,58,194,22,45,245,143,99,187,173,221,241,48,246,148,237,233,243,81,148,13,24,39,206,223) -IMAGE_DATA(4,120,199,149,191,35,100,166,77,108,204,184,187,187,91,197,70,29,139,50,37,56,46,250,77,251,127,241,226,197,5,114) -IMAGE_DATA(173,255,231,246,143,167,125,255,127,76,237,15,195,246,125,180,58,148,148,65,81,10,12,74,116,187,49,25,29,232,245,76) -IMAGE_DATA(161,213,58,50,218,90,93,89,89,189,183,34,248,133,62,103,229,123,203,181,218,207,202,247,244,169,54,199,61,101,182,77) -IMAGE_DATA(191,73,255,179,242,165,58,122,203,77,93,191,41,252,179,41,255,66,63,165,14,96,48,40,78,188,193,10,209,150,61,131) -IMAGE_DATA(150,38,107,226,186,160,244,104,111,189,86,108,209,111,171,253,86,63,180,47,199,49,254,82,223,182,221,190,214,211,106,155) -IMAGE_DATA(255,222,254,212,190,180,218,247,62,248,245,182,198,191,33,94,91,8,101,80,135,113,204,177,5,37,186,158,122,14,149,49) -IMAGE_DATA(172,213,113,112,191,177,112,67,94,199,65,155,37,230,57,160,95,41,111,215,229,14,228,244,135,250,114,136,153,141,113,107) -IMAGE_DATA(243,53,161,253,58,125,123,252,197,49,172,49,254,124,254,129,246,252,175,187,254,14,83,249,175,167,142,109,201,66,121,188) -IMAGE_DATA(57,125,15,236,211,23,60,131,154,182,74,38,103,165,108,131,241,226,249,97,164,142,14,230,61,201,244,155,142,191,54,255) -IMAGE_DATA(99,242,44,155,255,12,10,66,220,13,155,208,175,40,179,53,234,216,132,62,245,198,38,212,177,9,125,209,27,236,172,163) -IMAGE_DATA(182,206,155,172,101,25,18,207,224,244,21,188,119,66,21,247,238,211,40,236,93,193,75,87,112,167,66,183,179,95,102,175) -IMAGE_DATA(242,124,111,241,127,103,231,96,224,203,235,131,103,171,112,218,238,197,239,210,68,106,159,119,132,118,28,14,198,127,249,204) -IMAGE_DATA(153,101,249,221,221,37,198,245,254,189,203,251,101,238,221,167,161,221,149,54,131,230,236,217,3,122,174,11,125,241,121,92) -IMAGE_DATA(148,221,217,89,210,5,198,181,208,251,216,247,124,156,167,79,31,208,81,79,220,75,230,35,91,135,197,88,239,190,251,160) -IMAGE_DATA(255,113,205,156,36,229,247,246,231,101,101,252,209,30,237,199,117,50,254,203,67,190,158,227,253,247,47,145,246,249,157,180) -IMAGE_DATA(191,35,255,47,81,119,244,85,202,47,174,165,255,227,112,152,79,47,15,171,235,113,181,207,140,101,56,188,102,151,229,218) -IMAGE_DATA(215,48,227,193,172,140,223,59,126,240,179,190,115,231,206,141,129,90,70,239,233,179,210,189,140,62,251,237,247,91,229,123) -IMAGE_DATA(127,183,218,169,141,175,54,174,218,248,174,222,43,28,158,30,114,15,228,94,102,46,252,222,33,179,82,48,51,189,102,104) -IMAGE_DATA(210,243,86,59,133,250,122,198,213,158,31,59,60,237,177,151,134,187,157,184,94,249,94,208,242,173,8,146,151,63,105,245) -IMAGE_DATA(7,232,185,72,246,123,211,242,189,253,153,132,155,51,211,52,92,167,179,39,145,230,56,203,78,93,236,173,49,199,134,204) -IMAGE_DATA(180,46,120,13,243,239,227,251,173,11,218,243,123,157,246,250,160,29,175,221,135,27,111,60,61,188,229,45,83,118,107,171) -IMAGE_DATA(240,174,119,237,13,247,220,115,161,171,236,173,183,158,61,212,214,3,15,92,30,30,124,240,178,149,220,89,244,203,33,104) -IMAGE_DATA(159,125,118,28,62,248,193,75,139,235,27,110,56,61,60,246,216,56,124,233,75,227,226,58,232,238,184,227,194,162,76,105) -IMAGE_DATA(76,247,221,119,105,248,230,55,199,225,145,71,198,225,83,159,26,135,56,134,15,252,204,103,150,247,226,217,169,83,151,138) -IMAGE_DATA(99,136,122,31,125,116,28,94,121,101,73,243,252,243,75,140,235,184,247,201,79,150,219,14,136,126,126,236,99,227,240,217) -IMAGE_DATA(207,142,195,207,126,54,14,223,253,238,18,227,58,238,125,252,227,227,112,203,45,103,15,181,121,219,109,123,195,83,79,141) -IMAGE_DATA(195,19,79,140,195,87,190,50,14,223,248,198,146,238,247,191,95,98,92,199,189,120,246,248,227,227,162,236,221,119,95,88) -IMAGE_DATA(208,198,92,222,117,215,133,225,225,135,47,15,79,62,57,14,207,61,55,14,47,188,48,14,47,191,124,64,31,215,113,47) -IMAGE_DATA(158,69,153,40,27,52,190,14,209,255,152,183,24,239,143,126,52,14,47,189,180,196,184,142,123,167,78,197,90,150,199,31) -IMAGE_DATA(253,121,232,161,113,248,193,15,150,227,221,219,91,98,92,199,189,120,86,155,191,88,191,243,231,199,197,28,158,57,51,14) -IMAGE_DATA(207,60,179,196,184,142,123,241,236,206,59,115,126,140,122,99,173,163,14,248,231,139,95,28,23,24,215,113,47,158,69,153) -IMAGE_DATA(188,15,59,131,239,48,159,126,122,92,160,183,211,43,83,183,223,190,183,192,117,97,217,78,45,74,114,228,57,94,25,100) -IMAGE_DATA(154,110,10,109,246,123,147,17,100,90,183,183,127,135,181,184,254,213,205,122,94,95,207,223,113,210,247,187,41,249,248,119) -IMAGE_DATA(59,48,163,159,78,123,64,63,28,122,222,67,59,84,203,182,105,15,232,251,231,235,100,193,182,149,65,43,201,77,146,221) -IMAGE_DATA(138,244,45,102,110,209,111,218,126,11,122,232,135,253,211,177,108,147,60,133,126,221,246,87,35,38,7,125,233,165,95,221) -IMAGE_DATA(239,172,246,101,168,48,117,214,190,71,111,172,253,49,163,215,118,189,237,30,122,29,55,244,36,89,246,182,239,115,238,7) -IMAGE_DATA(125,217,28,100,244,74,59,230,252,59,42,253,154,252,187,185,20,95,131,236,239,117,233,166,212,83,183,126,117,250,163,174) -IMAGE_DATA(255,205,78,223,91,127,15,253,166,214,245,40,45,244,73,170,99,59,112,84,202,96,246,16,234,22,114,170,133,142,227,130) -IMAGE_DATA(117,218,15,186,165,149,92,253,63,165,125,61,178,184,22,237,103,227,239,93,191,210,188,23,44,116,177,125,109,183,98,225) -IMAGE_DATA(171,244,29,30,194,10,253,38,252,187,22,188,49,220,115,245,58,29,253,12,51,204,48,195,12,51,204,48,195,12,51,204) -IMAGE_DATA(48,195,12,51,204,48,195,12,51,204,112,93,194,127,254,251,198,85,252,251,191,94,27,255,252,183,87,87,240,213,215,94) -IMAGE_DATA(95,96,60,159,97,134,25,174,95,8,57,14,25,15,44,201,59,207,3,103,185,159,97,134,235,11,176,215,33,203,191,251) -IMAGE_DATA(203,63,199,139,191,249,203,248,202,165,63,142,47,126,255,215,69,140,231,81,46,202,163,3,176,253,51,204,48,195,201,3) -IMAGE_DATA(228,252,151,127,248,235,66,134,207,126,245,229,241,3,79,253,36,197,83,207,255,170,136,159,56,255,219,113,239,219,63,92) -IMAGE_DATA(200,63,178,63,203,253,12,51,156,12,8,255,27,187,28,50,126,215,195,95,27,223,243,200,185,241,125,159,251,94,42,219) -IMAGE_DATA(189,114,31,207,67,246,213,238,207,48,195,12,215,14,216,159,135,61,127,247,135,191,58,222,252,161,47,143,239,253,244,119) -IMAGE_DATA(14,217,243,144,253,184,31,186,32,202,129,161,23,226,62,186,193,117,64,252,142,50,97,239,177,245,51,244,131,198,74,3) -IMAGE_DATA(241,193,52,70,10,206,48,67,13,216,163,135,172,191,245,253,159,95,200,111,200,173,98,200,114,200,43,114,30,250,32,48) -IMAGE_DATA(202,7,198,117,220,143,231,248,5,42,255,33,243,241,59,202,69,59,97,231,255,223,121,83,229,214,207,61,98,47,5,254) -IMAGE_DATA(227,79,63,95,193,63,252,244,165,34,198,243,152,219,89,159,206,144,1,62,124,38,235,33,159,200,57,24,178,28,50,27) -IMAGE_DATA(255,195,86,7,158,254,194,249,171,242,143,188,43,34,251,200,123,220,139,54,3,255,95,0,185,14,57,100,79,195,28,4) -IMAGE_DATA(134,92,199,179,144,217,127,159,251,200,248,198,143,119,154,248,223,243,239,188,138,65,243,139,23,191,190,160,143,152,233,44) -IMAGE_DATA(239,51,100,0,175,97,179,107,178,30,24,101,66,190,177,61,196,226,66,238,227,217,237,31,253,86,145,54,16,255,63,120) -IMAGE_DATA(50,232,223,172,160,231,146,106,175,57,223,136,249,138,152,70,204,165,206,69,204,103,200,238,235,79,191,173,41,223,200,184) -IMAGE_DATA(158,141,196,122,206,103,161,51,100,128,173,9,158,11,219,142,156,102,178,26,247,240,215,131,38,120,139,179,55,48,158,133) -IMAGE_DATA(188,251,94,64,49,158,71,61,193,159,193,227,111,70,190,196,103,138,249,65,174,3,61,14,194,30,40,230,14,121,15,90) -IMAGE_DATA(100,94,229,91,109,184,203,120,208,114,230,57,239,225,103,200,64,253,248,146,93,86,95,28,219,142,156,170,45,225,220,46) -IMAGE_DATA(120,55,234,185,243,204,247,138,24,207,169,39,248,186,215,22,93,79,241,168,208,163,49,39,232,191,236,28,35,228,61,116) -IMAGE_DATA(108,232,90,124,44,252,165,240,201,195,190,131,106,199,209,177,179,124,159,28,184,30,120,83,109,59,177,248,146,172,99,219) -IMAGE_DATA(227,127,240,153,251,141,186,255,71,119,104,236,94,145,253,59,62,129,159,199,107,252,25,158,70,126,64,207,227,233,213,23) -IMAGE_DATA(154,35,88,66,246,217,78,231,249,131,181,245,37,246,201,185,5,114,142,93,71,239,17,3,33,6,135,31,175,50,30,247) -IMAGE_DATA(145,115,108,185,230,50,121,63,21,3,252,94,11,75,117,181,104,166,206,113,214,239,222,252,76,141,109,30,119,78,103,214) -IMAGE_DATA(95,229,77,98,165,138,173,186,90,243,213,139,190,30,10,248,155,153,109,71,214,61,206,22,188,137,13,98,28,209,103,198) -IMAGE_DATA(201,190,180,150,127,23,207,209,23,81,143,143,157,189,174,231,242,193,239,160,231,242,49,111,37,64,70,168,219,49,91,179) -IMAGE_DATA(168,211,243,10,105,159,56,155,183,137,254,139,252,5,61,167,140,57,198,247,9,185,143,231,33,207,248,237,153,45,247,188) -IMAGE_DATA(69,237,31,62,1,125,208,126,50,30,143,7,214,144,50,172,167,159,17,212,144,185,215,60,76,250,224,115,156,229,94,106) -IMAGE_DATA(92,67,247,137,60,7,224,103,250,154,209,80,247,54,229,94,101,60,203,51,173,241,38,227,200,244,92,139,39,123,209,249) -IMAGE_DATA(34,179,161,240,164,238,219,75,182,29,123,237,126,60,160,188,209,219,71,141,33,195,47,113,175,150,203,87,202,239,137,189) -IMAGE_DATA(49,103,124,217,120,89,167,168,155,242,25,134,175,19,101,208,217,161,155,188,63,218,110,180,201,187,3,218,86,208,226,55) -IMAGE_DATA(177,199,9,187,30,117,69,157,53,57,103,207,143,94,40,245,151,56,95,64,244,35,126,227,63,196,250,49,31,244,165,54) -IMAGE_DATA(238,88,99,116,57,99,103,220,37,26,198,131,190,129,55,162,173,18,13,253,70,71,160,255,75,243,75,159,208,63,248,77) -IMAGE_DATA(45,26,248,96,27,50,175,54,40,227,135,30,222,244,28,83,229,147,214,60,247,98,212,193,216,221,6,233,254,50,243,229) -IMAGE_DATA(221,182,7,207,178,207,68,78,125,46,245,236,184,101,79,144,73,213,213,228,243,33,27,158,223,195,94,64,159,235,188,194) -IMAGE_DATA(127,106,115,92,31,65,159,229,0,234,126,58,230,141,54,85,238,20,227,126,22,119,100,191,195,249,100,102,203,75,246,28) -IMAGE_DATA(251,64,252,180,148,211,72,221,193,67,156,139,4,70,159,208,49,232,34,246,89,241,44,27,119,220,143,231,209,71,236,99) -IMAGE_DATA(252,103,255,85,163,65,118,85,71,212,250,205,26,34,55,172,119,54,199,140,51,202,225,115,180,104,2,227,25,253,218,244) -IMAGE_DATA(188,23,59,4,63,104,187,202,159,140,139,179,236,108,44,129,232,96,228,36,230,185,198,147,189,168,107,200,122,168,124,194) -IMAGE_DATA(7,234,203,151,100,93,125,121,124,135,210,62,169,148,251,85,218,239,33,235,232,29,143,109,49,151,228,5,68,57,174,201) -IMAGE_DATA(253,243,181,142,50,200,60,125,212,184,100,70,23,191,145,111,242,135,2,93,247,100,241,117,207,37,224,108,50,234,235,145) -IMAGE_DATA(115,246,63,234,119,227,27,68,27,158,183,76,187,232,37,98,38,172,33,114,136,61,97,95,161,227,214,255,122,62,138,239) -IMAGE_DATA(21,245,122,236,193,243,36,53,230,234,253,46,201,59,185,90,154,163,149,229,112,130,248,149,140,65,105,178,117,129,247,53) -IMAGE_DATA(174,188,174,141,199,174,71,219,110,103,88,7,230,1,123,136,220,103,57,232,222,47,98,220,248,215,173,156,244,90,174,58) -IMAGE_DATA(243,164,251,32,198,141,174,132,87,52,254,238,242,174,231,103,248,224,219,122,215,13,63,0,89,143,249,240,124,62,214,24) -IMAGE_DATA(219,67,191,153,99,207,225,195,70,171,158,67,222,89,55,213,99,138,232,18,100,9,222,172,205,15,58,8,91,18,115,27) -IMAGE_DATA(227,34,246,166,103,105,26,111,15,57,143,254,176,255,227,44,14,255,9,25,44,245,83,251,8,127,233,124,169,31,204,56) -IMAGE_DATA(178,186,52,159,66,247,90,204,149,235,125,245,247,52,230,10,111,176,119,41,181,69,255,130,22,221,16,215,89,121,231,1) -IMAGE_DATA(244,24,109,151,104,144,43,236,211,58,121,71,236,183,51,89,135,63,153,59,230,65,99,180,58,7,202,211,244,157,189,9) -IMAGE_DATA(126,92,150,167,162,188,93,67,245,191,53,182,134,188,251,254,178,230,203,211,199,150,47,63,21,116,63,141,126,203,242,124) -IMAGE_DATA(84,118,53,159,36,155,39,234,208,53,208,189,101,137,239,53,143,40,202,48,70,214,142,53,42,249,61,216,119,120,94,99) -IMAGE_DATA(236,46,231,241,12,219,143,140,5,13,250,51,234,65,159,193,211,190,46,250,222,2,250,9,253,135,239,131,47,175,186,163) -IMAGE_DATA(148,251,164,250,20,132,55,50,26,213,55,26,175,105,217,15,109,11,95,134,245,47,249,150,238,175,168,12,234,154,120,172) -IMAGE_DATA(73,229,125,106,236,14,222,212,252,177,44,175,156,121,213,216,157,202,21,241,89,69,230,0,62,86,95,210,81,249,174,164) -IMAGE_DATA(219,176,199,42,39,238,127,179,111,112,254,175,249,242,212,229,186,99,93,64,62,124,62,189,221,64,226,64,26,127,45,241) -IMAGE_DATA(35,186,78,115,88,160,111,201,144,242,8,237,101,239,2,121,60,33,230,38,206,211,92,206,51,223,157,61,135,182,133,95) -IMAGE_DATA(128,94,202,198,166,121,201,252,70,214,177,149,232,64,245,229,221,23,242,60,103,198,135,95,30,168,122,206,219,7,125,127) -IMAGE_DATA(71,191,93,118,181,207,170,27,105,15,121,247,241,169,142,32,78,193,250,163,87,178,242,74,67,27,83,229,157,88,15,243) -IMAGE_DATA(83,202,55,101,159,129,29,116,222,44,205,53,227,33,46,160,72,60,151,253,139,235,105,183,247,248,50,106,143,221,255,206) -IMAGE_DATA(206,225,74,182,29,185,243,92,205,77,192,109,123,54,159,241,95,115,81,216,31,186,205,202,252,27,149,119,223,3,148,124) -IMAGE_DATA(38,116,169,158,169,148,244,59,186,154,253,121,38,231,46,235,26,239,201,246,71,240,153,234,97,151,179,204,190,234,25,157) -IMAGE_DATA(218,90,246,23,37,222,163,190,204,47,71,158,244,221,39,167,241,253,190,198,247,74,253,70,55,50,110,100,74,229,61,163) -IMAGE_DATA(193,143,160,61,215,17,25,13,99,154,234,143,114,110,165,252,146,217,67,95,67,61,27,213,243,200,18,150,202,176,31,68) -IMAGE_DATA(119,102,182,70,249,16,189,139,92,100,246,56,219,187,103,246,93,247,238,204,183,235,74,127,71,179,7,163,63,202,31,153) -IMAGE_DATA(172,115,157,157,83,16,99,42,237,109,84,118,225,253,154,63,128,78,83,255,90,247,176,26,87,64,94,137,195,169,175,94) -IMAGE_DATA(178,233,196,83,84,183,160,199,162,29,245,229,137,41,186,220,104,159,233,43,107,236,231,191,202,63,250,110,83,75,158,212) -IMAGE_DATA(151,175,201,147,198,44,212,39,168,233,8,250,225,103,229,53,26,124,121,242,53,88,203,222,49,233,217,119,175,188,247,236) -IMAGE_DATA(117,125,13,209,41,122,214,164,62,98,134,158,131,160,126,168,198,164,149,71,51,155,70,156,87,125,153,236,140,95,247,77) -IMAGE_DATA(53,95,94,227,0,174,43,75,239,121,101,168,101,240,99,74,249,250,122,79,115,112,29,51,127,78,101,87,121,95,227,95) -IMAGE_DATA(94,30,30,193,63,85,89,193,182,211,135,168,151,120,123,143,77,87,253,227,109,233,94,203,125,30,149,19,221,195,185,93) -IMAGE_DATA(209,220,121,120,135,120,172,199,31,74,50,168,227,134,223,90,242,164,123,69,61,135,235,209,17,238,151,123,255,220,47,87) -IMAGE_DATA(25,193,47,45,209,168,142,208,179,164,94,80,255,81,207,60,178,57,208,54,60,30,158,125,219,209,191,243,168,185,169,186) -IMAGE_DATA(247,242,189,138,202,59,109,199,111,244,138,203,186,235,54,245,23,90,242,230,107,171,177,78,218,107,229,87,104,158,5,246) -IMAGE_DATA(172,212,190,199,114,117,207,195,92,104,140,74,99,85,26,195,210,181,40,249,242,238,195,104,78,148,198,89,213,166,151,228) -IMAGE_DATA(92,101,157,216,59,58,41,243,197,225,97,245,229,213,118,101,60,150,217,21,244,167,230,246,170,78,175,201,109,230,151,171) -IMAGE_DATA(157,46,197,13,212,78,79,181,185,240,140,238,247,91,126,185,210,232,222,221,105,52,118,163,243,219,178,237,250,28,95,190) -IMAGE_DATA(103,14,74,231,85,189,126,46,237,113,230,167,109,150,226,18,196,229,208,75,232,251,90,126,55,242,94,59,155,82,121,215) -IMAGE_DATA(184,146,230,100,43,79,181,206,8,233,43,252,201,156,149,100,29,61,227,57,138,89,238,98,134,216,17,247,229,51,189,134) -IMAGE_DATA(221,207,246,176,156,129,215,108,186,203,58,254,187,218,81,231,97,245,3,89,19,143,147,57,47,183,236,10,224,62,105,205) -IMAGE_DATA(182,187,47,223,242,47,50,59,29,255,51,249,112,191,124,170,142,240,115,131,214,152,220,151,215,182,90,168,57,201,189,241) -IMAGE_DATA(1,245,121,167,2,251,116,215,123,110,123,227,30,246,14,59,150,249,239,181,247,12,84,222,179,184,120,73,222,85,87,170) -IMAGE_DATA(61,106,229,6,233,153,56,188,232,231,203,46,127,232,104,143,205,227,7,181,222,23,80,155,197,156,181,124,24,231,43,250) -IMAGE_DATA(172,251,116,151,115,100,61,116,65,172,1,245,233,122,185,175,169,185,4,232,100,181,43,174,39,244,156,201,99,41,153,175) -IMAGE_DATA(74,94,178,230,126,100,242,174,103,56,190,223,207,104,116,175,52,213,230,122,140,189,103,191,239,58,66,247,101,83,116,68) -IMAGE_DATA(203,54,208,70,38,127,25,102,103,95,248,233,61,251,89,174,117,239,148,249,217,240,45,125,161,143,154,227,212,19,155,208) -IMAGE_DATA(53,242,115,197,76,222,57,115,128,63,145,41,108,123,43,31,64,215,59,59,27,203,218,68,71,115,166,73,140,79,237,124) -IMAGE_DATA(246,62,137,238,69,217,195,250,57,156,239,135,50,95,62,202,171,255,158,201,185,202,122,208,197,158,165,230,147,41,15,235) -IMAGE_DATA(57,92,204,165,198,201,178,125,71,41,70,148,173,181,251,164,181,189,177,142,91,247,198,153,109,231,204,68,253,11,205,133) -IMAGE_DATA(200,218,41,233,136,154,13,85,63,34,59,135,203,198,164,122,69,207,22,149,71,179,252,61,242,80,137,113,215,226,149,42) -IMAGE_DATA(239,196,16,177,51,196,94,107,254,39,109,196,154,105,14,116,38,231,42,235,204,29,223,69,208,51,153,158,247,4,152,119) -IMAGE_DATA(206,154,52,103,200,101,95,99,221,218,134,238,137,93,87,248,153,129,230,123,49,118,165,245,118,157,63,240,73,216,7,120) -IMAGE_DATA(206,109,182,118,196,176,74,121,98,218,63,198,167,250,100,138,172,163,111,178,24,168,235,109,205,55,97,62,61,70,148,197) -IMAGE_DATA(105,200,35,106,249,242,248,10,202,179,165,189,32,190,66,41,230,230,253,192,151,85,95,30,62,82,31,219,199,173,58,66) -IMAGE_DATA(125,249,90,91,153,207,149,233,8,215,135,186,150,248,43,61,249,252,180,225,122,215,227,187,154,47,19,168,239,203,169,60) -IMAGE_DATA(57,226,143,43,159,184,127,235,122,133,241,240,46,24,239,221,232,123,166,232,144,218,247,158,117,159,18,253,200,242,194,85) -IMAGE_DATA(254,24,131,242,181,158,75,43,79,186,252,177,110,248,152,216,53,98,97,89,155,186,71,84,153,208,51,196,210,158,1,155) -IMAGE_DATA(144,229,146,106,27,180,73,204,93,249,42,176,37,235,124,107,70,245,121,150,43,232,115,137,159,193,26,6,6,168,79,156) -IMAGE_DATA(233,77,230,82,207,123,51,95,190,116,158,228,186,78,253,26,157,91,215,141,190,46,122,142,168,54,215,125,53,207,57,85) -IMAGE_DATA(59,237,251,125,167,81,29,145,237,247,51,125,232,126,161,198,92,125,30,52,71,78,237,167,199,48,50,91,166,246,93,207) -IMAGE_DATA(220,209,17,81,62,123,103,0,61,175,62,138,202,185,251,115,180,237,239,219,184,109,99,61,90,126,61,253,100,14,75,239) -IMAGE_DATA(131,32,27,218,46,103,100,46,63,254,158,67,38,235,236,93,74,186,134,250,201,93,82,190,66,71,100,122,5,158,243,51) -IMAGE_DATA(97,120,170,52,190,168,79,115,234,162,127,42,235,254,205,56,253,205,187,171,236,251,52,127,168,53,151,232,167,88,175,0) -IMAGE_DATA(229,151,108,78,241,67,52,135,42,91,95,151,247,218,62,75,121,31,89,207,244,162,190,163,227,118,58,235,183,210,193,215) -IMAGE_DATA(26,63,213,179,216,140,78,223,253,240,189,6,121,78,78,227,57,243,238,255,151,98,222,234,123,232,59,245,236,107,178,57) -IMAGE_DATA(243,220,172,44,222,166,62,7,207,56,151,242,179,162,76,183,186,220,101,239,43,105,223,91,242,14,95,68,89,116,176,191) -IMAGE_DATA(231,231,239,29,101,239,105,149,100,53,234,36,23,64,101,93,191,141,129,174,41,237,173,244,29,174,168,207,243,220,104,75) -IMAGE_DATA(243,9,61,198,206,154,149,244,74,212,171,60,197,119,164,90,223,132,197,182,235,152,176,91,37,159,46,211,81,212,81,219) -IMAGE_DATA(167,32,55,61,57,205,250,222,104,212,95,90,83,230,143,243,77,218,47,233,27,228,73,101,80,227,174,37,58,247,203,53) -IMAGE_DATA(231,175,166,35,220,231,98,255,88,211,17,238,203,151,124,28,245,61,84,175,232,153,185,234,138,146,190,100,30,179,220,14) -IMAGE_DATA(236,29,58,157,122,61,78,93,242,5,75,250,89,245,136,238,173,122,226,118,228,245,96,111,241,125,75,223,159,83,57,243) -IMAGE_DATA(239,209,105,142,169,126,3,39,59,55,64,215,168,29,210,111,191,100,109,101,239,29,192,23,174,87,180,110,228,47,67,207) -IMAGE_DATA(91,136,255,33,239,53,31,222,109,59,62,181,242,9,251,217,108,30,105,27,25,227,189,28,236,107,169,175,26,171,110,229) -IMAGE_DATA(144,48,126,124,92,239,7,99,71,79,242,173,12,248,187,52,87,234,95,104,140,189,212,111,221,179,170,28,234,251,32,222) -IMAGE_DATA(158,231,79,248,126,95,115,45,124,126,84,71,96,163,181,29,71,214,192,207,70,53,255,5,185,210,246,66,158,107,60,169) -IMAGE_DATA(241,12,100,33,214,11,29,162,249,35,165,190,121,93,142,234,203,247,216,119,205,145,67,239,98,19,163,30,246,237,62,22) -IMAGE_DATA(69,198,206,55,97,244,189,94,207,253,242,51,66,109,151,152,0,250,177,212,30,254,18,239,125,83,191,234,21,226,39,196) -IMAGE_DATA(234,120,143,36,174,21,185,175,125,38,78,206,187,172,53,140,50,81,214,229,140,216,27,109,120,188,135,254,51,95,1,200) -IMAGE_DATA(91,214,79,234,209,28,139,214,251,200,170,79,117,94,65,109,159,51,76,109,135,190,104,159,124,174,88,99,47,235,52,218) -IMAGE_DATA(111,221,3,212,104,60,95,222,215,178,132,26,151,199,190,247,208,148,114,201,92,38,176,135,37,57,196,110,171,44,104,60) -IMAGE_DATA(93,215,121,27,168,115,218,99,223,245,219,20,186,239,213,126,122,44,16,116,157,237,231,156,240,126,45,239,7,249,210,54) -IMAGE_DATA(75,103,110,238,71,82,206,219,211,247,204,90,223,216,81,190,69,134,152,139,218,185,159,218,89,127,151,0,30,209,241,56) -IMAGE_DATA(210,174,159,173,212,80,235,237,89,91,230,182,214,15,157,211,158,185,210,216,65,47,13,101,181,142,158,118,232,183,198,196) -IMAGE_DATA(122,215,82,207,10,167,140,73,109,146,175,101,38,19,53,254,84,222,164,30,125,239,107,91,216,163,255,75,114,239,223,60) -IMAGE_DATA(212,125,109,198,39,142,140,201,243,131,107,109,106,158,81,173,238,172,45,214,43,243,31,252,187,151,218,119,231,123,98,221) -IMAGE_DATA(78,95,203,129,206,198,167,243,216,26,143,246,95,249,187,214,207,146,175,84,147,121,95,79,215,145,165,246,75,125,33,22) -IMAGE_DATA(204,252,244,188,11,134,142,82,154,90,123,62,214,210,90,102,72,255,122,219,81,154,210,90,214,230,176,71,22,116,12,58) -IMAGE_DATA(95,90,182,134,42,135,94,126,10,63,148,228,207,191,53,90,210,73,154,47,228,50,48,229,253,67,109,211,219,205,242,148) -IMAGE_DATA(104,171,213,158,215,91,203,199,155,210,231,222,241,212,116,134,247,191,247,27,206,155,204,109,173,253,117,231,202,191,203,220) -IMAGE_DATA(162,91,103,93,142,139,38,203,101,168,201,132,202,69,175,44,244,174,117,15,250,120,55,229,89,231,221,18,250,59,0,71) -IMAGE_DATA(217,102,246,206,65,111,157,173,119,23,182,9,83,218,62,202,126,246,214,185,78,31,214,237,247,81,210,172,51,158,158,121) -IMAGE_DATA(221,22,127,158,4,158,232,133,227,106,103,134,25,102,152,97,134,25,102,152,97,134,25,102,200,225,127,142,13,191,201,0) -IMAGE_END_DATA(5632, 21) +IMAGE_DATA(120,156,237,156,77,168,173,101,21,199,223,64,33,83,42,210,104,114,116,22,146,57,41,28,216,133,198,54,177,65,121,68) +IMAGE_DATA(196,138,186,32,72,68,220,43,42,9,198,73,212,73,30,40,7,94,184,80,13,68,72,7,77,132,34,34,50,7,183,65) +IMAGE_DATA(95,52,8,37,40,228,66,31,4,33,225,64,18,225,237,174,189,253,221,243,223,255,179,158,143,119,239,125,143,247,232,187) +IMAGE_DATA(14,139,179,247,251,190,235,89,207,199,250,122,214,179,222,61,92,61,92,53,140,227,160,48,118,254,159,10,45,186,117,218) +IMAGE_DATA(29,39,224,58,109,111,114,191,69,87,255,127,213,112,181,47,76,139,249,58,11,215,115,173,245,253,184,181,179,217,252,92) +IMAGE_DATA(85,214,152,26,195,76,10,253,122,235,123,70,87,147,238,41,247,47,85,255,134,228,254,176,114,253,154,11,127,21,73,63) +IMAGE_DATA(34,216,27,151,184,237,103,121,94,71,216,162,165,253,113,108,243,218,27,15,99,207,179,61,125,190,20,207,6,140,19,231) +IMAGE_DATA(111,2,124,248,194,223,37,20,166,77,124,204,184,183,183,87,197,70,27,139,103,74,112,84,244,155,246,255,197,23,95,92) +IMAGE_DATA(32,159,245,255,204,255,104,248,251,255,35,226,63,12,219,143,209,234,80,50,6,69,45,48,40,209,237,197,100,116,160,183) +IMAGE_DATA(51,133,86,219,200,104,107,109,101,207,234,181,21,197,47,244,57,123,190,247,185,22,255,236,249,158,62,213,230,184,231,153) +IMAGE_DATA(109,211,111,210,255,236,249,82,27,189,207,77,93,191,41,242,179,169,252,66,63,165,13,96,48,40,78,188,193,10,209,150) +IMAGE_DATA(35,131,150,37,107,226,186,160,244,88,111,253,172,216,162,223,22,255,86,63,180,47,71,49,254,82,223,182,205,95,219,105) +IMAGE_DATA(241,230,191,243,159,218,151,22,127,239,131,127,222,214,248,55,196,119,22,194,24,92,2,216,185,128,251,67,62,224,184,126) +IMAGE_DATA(107,131,182,103,226,74,109,192,247,252,219,109,41,220,250,246,245,184,255,124,129,254,98,251,215,92,115,205,168,40,109,212) +IMAGE_DATA(22,239,226,189,160,185,32,114,11,20,250,149,103,142,130,254,244,233,211,235,208,175,59,126,157,127,95,163,221,225,96,254) +IMAGE_DATA(75,244,189,235,127,174,64,79,27,37,249,59,63,180,101,160,7,104,35,147,179,94,56,39,109,108,210,143,221,13,232,15) +IMAGE_DATA(160,16,25,212,172,85,203,178,101,22,115,133,254,194,213,67,72,27,21,171,123,28,232,55,29,127,109,254,199,228,94,175) +IMAGE_DATA(103,89,120,192,198,51,53,216,132,126,197,59,175,209,198,38,244,105,52,54,161,141,77,232,139,209,96,103,27,71,31,73) +IMAGE_DATA(36,145,65,88,153,154,231,118,184,117,56,108,153,194,42,135,213,171,89,204,157,183,159,217,175,220,223,95,252,223,217,57) +IMAGE_DATA(24,248,242,243,193,189,85,216,181,107,241,189,52,145,218,231,29,161,213,168,227,252,201,147,203,231,247,246,150,24,159,223) +IMAGE_DATA(190,134,53,199,83,194,119,133,103,208,156,58,117,64,207,231,66,95,124,30,23,207,238,236,44,233,2,227,179,208,251,216) +IMAGE_DATA(15,121,195,221,221,3,58,218,137,107,201,124,100,235,176,24,235,77,55,29,244,63,62,51,39,201,243,251,195,170,231,95) +IMAGE_DATA(208,4,63,248,199,231,100,252,231,135,124,61,199,219,110,91,34,252,249,158,240,223,145,255,120,220,69,95,229,249,197,103) +IMAGE_DATA(233,63,17,134,242,85,79,187,203,28,194,95,230,78,159,57,47,159,125,13,51,25,204,158,217,142,119,223,4,252,172,239) +IMAGE_DATA(204,153,51,99,160,62,163,215,244,94,233,90,70,159,125,247,235,173,231,123,191,183,248,212,198,87,27,87,109,124,23,175) +IMAGE_DATA(21,14,79,15,133,7,114,45,115,23,126,237,144,91,41,184,153,94,55,52,233,126,139,79,161,189,158,113,181,231,199,14) +IMAGE_DATA(79,123,252,165,225,94,39,174,247,124,47,232,243,173,12,146,63,127,185,181,31,160,231,34,217,247,77,159,239,237,207,36) +IMAGE_DATA(220,92,152,166,225,58,157,189,28,105,142,242,217,169,139,189,53,225,216,80,152,214,5,111,97,254,126,116,223,117,65,123) +IMAGE_DATA(190,175,195,175,15,186,243,181,87,94,185,59,188,239,125,83,118,107,171,240,209,143,238,15,55,223,220,151,31,251,208,135) +IMAGE_DATA(78,29,226,117,251,237,231,135,207,127,222,243,90,59,139,126,57,4,237,163,143,142,195,45,183,156,91,124,190,226,138,221) +IMAGE_DATA(225,129,7,198,225,254,251,199,197,231,160,187,254,250,231,23,207,148,198,244,153,207,156,27,158,126,122,28,238,185,103,28) +IMAGE_DATA(190,250,213,113,136,99,248,192,123,239,93,94,139,123,39,78,148,115,134,209,238,87,190,50,14,47,188,176,164,121,242,201) +IMAGE_DATA(37,198,231,184,246,229,47,151,121,7,68,63,239,186,107,28,238,187,111,28,94,122,105,28,126,252,227,37,198,231,184,118) +IMAGE_DATA(247,221,227,240,193,15,158,58,196,243,218,107,247,135,135,31,30,135,135,30,26,135,199,31,31,135,167,158,90,210,189,252) +IMAGE_DATA(242,18,227,115,92,139,123,15,62,56,46,158,189,233,166,231,23,180,49,151,55,222,248,252,112,231,157,231,135,111,125,107) +IMAGE_DATA(28,30,123,108,28,190,255,253,113,120,238,185,3,250,248,28,215,226,94,60,19,207,6,141,175,67,244,63,230,45,198,251) +IMAGE_DATA(139,95,140,195,179,207,46,49,62,199,181,19,39,178,124,238,234,88,238,184,99,28,126,246,179,229,120,247,247,151,24,159) +IMAGE_DATA(227,90,220,171,205,95,172,223,217,179,227,98,14,79,158,28,135,239,124,103,137,241,57,174,197,189,27,110,200,229,49,218) +IMAGE_DATA(141,181,142,54,144,159,211,167,199,5,198,231,184,22,247,226,153,188,15,59,131,239,48,31,121,100,92,160,243,233,213,169) +IMAGE_DATA(235,174,219,95,224,186,176,228,83,207,43,95,226,26,175,12,50,75,55,133,54,251,190,201,8,50,171,219,219,191,195,86) +IMAGE_DATA(92,255,234,110,61,111,175,231,239,40,233,251,195,148,124,252,123,29,152,209,79,167,61,160,31,14,221,239,161,29,170,207) +IMAGE_DATA(182,105,15,232,251,231,235,242,130,109,27,131,86,145,155,20,187,21,233,91,194,220,162,223,148,127,11,122,232,135,97,137) +IMAGE_DATA(217,38,121,10,253,186,252,87,51,38,7,125,233,165,95,221,239,172,246,101,168,8,117,198,223,179,55,198,127,204,232,149) +IMAGE_DATA(175,243,238,161,215,113,67,79,145,101,47,127,159,115,63,232,203,230,32,163,87,218,49,151,223,81,233,215,148,223,205,181) +IMAGE_DATA(120,46,235,56,4,173,246,187,203,58,42,112,28,232,215,29,255,92,214,209,15,199,162,172,99,99,152,35,132,186,135,156) +IMAGE_DATA(234,161,227,184,96,29,254,65,183,244,146,171,255,167,240,215,35,139,119,130,127,54,254,222,245,43,205,123,193,67,23,249) +IMAGE_DATA(43,223,138,135,175,210,119,68,8,43,244,155,200,239,90,240,214,112,243,197,207,233,232,103,152,97,134,25,102,152,97,134) +IMAGE_DATA(25,102,152,97,134,25,102,152,97,134,25,102,152,97,134,99,9,255,123,243,173,139,248,207,255,188,62,254,237,31,175,173) +IMAGE_DATA(224,107,175,191,177,192,184,63,195,12,51,28,95,8,61,14,29,15,44,233,59,247,3,103,189,159,97,134,227,5,248,235) +IMAGE_DATA(208,229,63,191,250,239,241,197,63,190,58,190,112,238,47,227,51,63,253,67,17,227,126,60,23,207,99,3,240,253,51,204) +IMAGE_DATA(48,195,229,7,232,249,239,94,249,251,66,135,79,61,241,220,248,233,135,127,149,226,137,39,127,95,196,47,157,253,211,184) +IMAGE_DATA(255,195,159,47,244,31,221,159,245,126,134,25,46,15,136,248,27,191,28,58,126,227,157,223,29,63,126,207,153,241,147,95) +IMAGE_DATA(255,73,170,219,189,122,31,247,67,247,213,239,207,48,195,12,239,28,176,63,15,127,254,177,207,61,49,94,253,217,111,143) +IMAGE_DATA(159,248,218,143,14,249,243,208,253,184,30,182,32,158,3,195,46,196,117,108,131,219,128,248,30,207,132,191,199,215,207,208) +IMAGE_DATA(15,154,43,13,36,6,211,28,41,56,195,12,53,96,143,30,186,254,254,79,125,99,161,191,161,183,138,161,203,161,175,232) +IMAGE_DATA(121,216,131,192,120,62,48,62,199,245,184,79,92,160,250,31,58,31,223,227,185,224,19,126,254,189,46,155,170,183,126,238) +IMAGE_DATA(17,123,41,240,95,127,253,205,10,190,242,235,103,139,24,247,99,110,103,123,58,67,6,196,240,153,174,135,126,162,231,96) +IMAGE_DATA(232,114,232,108,252,15,95,29,184,251,205,179,23,245,31,125,87,68,247,209,247,184,22,60,3,223,43,128,94,135,30,178) +IMAGE_DATA(167,97,14,2,67,175,227,94,232,236,127,207,124,97,124,235,151,59,77,124,243,236,71,46,98,208,252,246,153,239,45,232) +IMAGE_DATA(35,103,58,235,251,12,25,32,107,248,236,154,174,7,198,51,161,223,248,30,114,113,161,247,113,239,186,47,254,160,72,27) +IMAGE_DATA(72,252,31,50,25,244,239,86,208,115,73,245,215,156,111,196,124,69,78,35,230,82,231,34,230,51,116,247,141,71,62,208) +IMAGE_DATA(212,111,116,92,207,70,98,61,231,179,208,25,50,192,215,132,204,133,111,71,79,51,93,141,107,196,235,65,19,178,197,217) +IMAGE_DATA(27,24,247,66,223,125,47,160,24,247,163,157,144,207,144,241,119,163,92,18,51,197,252,160,215,129,158,7,97,15,20,115) +IMAGE_DATA(135,190,7,45,58,175,250,173,62,220,117,60,104,57,243,156,247,240,51,100,160,113,124,201,47,107,44,142,111,71,79,213) +IMAGE_DATA(151,112,110,23,178,27,237,220,112,242,39,69,140,251,180,19,114,221,235,139,142,83,62,42,236,104,204,9,246,47,59,199) +IMAGE_DATA(8,125,15,27,27,182,150,24,139,120,41,98,242,240,239,160,250,113,108,236,172,223,151,15,28,7,217,84,223,78,46,190) +IMAGE_DATA(164,235,248,246,248,31,114,230,113,163,238,255,177,29,154,187,87,100,255,78,76,224,231,241,154,127,70,166,209,31,208,235) +IMAGE_DATA(120,122,237,133,214,8,150,144,125,182,211,121,253,96,109,125,201,125,114,110,129,158,227,215,177,123,228,64,200,193,17,199) +IMAGE_DATA(171,142,199,117,244,28,95,174,181,76,222,79,197,0,191,214,194,82,91,45,154,169,115,156,245,187,183,62,83,115,155,71) +IMAGE_DATA(93,211,153,245,87,101,147,92,169,98,171,173,214,124,245,162,175,135,2,241,102,230,219,209,117,207,179,133,108,226,131,24) +IMAGE_DATA(71,244,153,113,178,47,173,213,223,197,125,236,69,180,227,99,103,175,235,181,124,200,59,232,181,124,204,91,9,208,17,218) +IMAGE_DATA(118,204,214,44,218,244,186,66,248,147,103,115,158,216,191,168,95,208,115,202,152,99,98,159,208,251,184,31,250,76,220,158) +IMAGE_DATA(249,114,175,91,212,254,17,19,208,7,237,39,227,241,124,96,13,121,134,245,244,51,130,26,50,247,90,135,73,31,124,142) +IMAGE_DATA(179,218,75,205,107,232,62,145,251,0,242,76,95,51,26,218,222,166,222,171,142,103,117,166,53,217,100,28,153,157,107,201) +IMAGE_DATA(100,47,186,92,100,62,20,153,212,125,123,201,183,227,175,61,142,7,84,54,122,251,168,57,100,228,37,174,213,106,249,74) +IMAGE_DATA(245,61,177,55,230,140,47,27,47,235,20,109,243,124,134,17,235,196,51,216,236,176,77,222,31,229,27,60,121,119,64,121) +IMAGE_DATA(5,45,113,19,123,156,240,235,209,86,180,89,211,115,246,252,216,133,82,127,201,243,5,68,63,226,59,241,67,172,31,243) +IMAGE_DATA(65,95,106,227,142,53,198,150,51,118,198,93,162,97,60,216,27,100,35,120,149,104,232,55,54,2,251,95,154,95,250,132) +IMAGE_DATA(253,33,110,106,209,32,7,219,208,121,245,65,153,60,244,200,166,215,152,170,156,180,230,185,23,163,13,198,238,62,72,247) +IMAGE_DATA(151,89,44,239,190,61,100,150,125,38,122,234,115,169,103,199,45,127,130,78,170,173,166,158,15,221,240,250,30,246,2,122) +IMAGE_DATA(95,231,21,249,83,159,227,246,8,250,172,6,80,247,211,49,111,240,84,189,83,140,235,89,222,145,253,14,231,147,153,47) +IMAGE_DATA(47,249,115,252,3,249,211,82,77,35,109,135,12,113,46,18,24,125,194,198,96,139,216,103,197,189,108,220,113,61,238,71) +IMAGE_DATA(31,241,143,241,159,253,87,141,6,221,85,27,81,235,55,107,136,222,176,222,217,28,51,206,120,142,152,163,69,19,24,247) +IMAGE_DATA(232,215,166,231,189,248,33,228,65,249,170,124,50,46,206,178,179,177,4,98,131,209,147,152,231,154,76,246,162,174,33,235) +IMAGE_DATA(161,250,137,28,104,44,95,210,117,141,229,137,29,74,251,164,82,237,87,105,191,135,174,99,119,60,183,197,92,82,23,16) +IMAGE_DATA(207,241,153,218,63,95,235,120,6,157,167,143,154,151,204,232,226,59,250,77,253,80,160,219,158,44,191,238,181,4,156,77) +IMAGE_DATA(70,123,61,122,206,254,71,227,110,98,131,224,225,117,203,240,197,46,145,51,97,13,209,67,252,9,251,10,29,183,254,215) +IMAGE_DATA(243,81,98,175,104,215,115,15,94,39,169,57,87,239,119,73,223,169,213,210,26,173,172,134,19,36,174,100,12,74,147,173) +IMAGE_DATA(11,178,175,121,229,117,125,60,126,61,120,187,159,97,29,152,7,252,33,122,159,213,160,123,191,200,113,19,95,183,106,210) +IMAGE_DATA(107,181,234,204,147,238,131,24,55,182,18,89,209,252,187,235,187,158,159,17,131,111,235,93,55,226,0,116,61,230,195,235) +IMAGE_DATA(249,88,99,124,15,253,102,142,189,134,15,31,173,118,14,125,103,221,212,142,41,98,75,208,37,100,179,54,63,216,32,124) +IMAGE_DATA(73,204,109,140,139,220,155,158,165,105,190,61,244,60,250,195,254,143,179,56,226,39,116,176,212,79,237,35,242,165,243,165) +IMAGE_DATA(113,48,227,200,218,210,122,10,221,107,49,87,110,247,53,222,211,156,43,178,193,222,165,196,139,254,5,45,182,33,62,103) +IMAGE_DATA(207,187,12,96,199,224,93,162,65,175,240,79,235,212,29,177,223,206,116,29,249,100,238,152,7,205,209,234,28,168,76,211) +IMAGE_DATA(119,246,38,196,113,89,157,138,202,118,13,53,254,214,220,26,250,238,251,203,90,44,79,31,91,177,252,84,208,253,52,246) +IMAGE_DATA(45,171,243,81,221,213,122,146,108,158,104,67,215,64,247,150,37,185,215,58,162,120,134,49,178,118,172,81,41,238,193,191) +IMAGE_DATA(35,243,154,99,119,61,143,123,248,126,116,44,104,176,159,209,14,246,12,153,246,117,209,247,22,176,79,216,63,98,31,98) +IMAGE_DATA(121,181,29,165,218,39,181,167,32,178,145,209,168,189,209,124,77,203,127,40,47,98,25,214,191,20,91,122,188,162,58,168) +IMAGE_DATA(107,226,185,38,213,247,169,185,59,100,83,235,199,178,186,114,230,85,115,119,170,87,228,103,21,153,3,228,88,99,73,71) +IMAGE_DATA(149,187,146,109,195,31,171,158,120,252,205,190,193,229,191,22,203,211,150,219,142,117,1,253,240,249,116,190,129,228,129,52) +IMAGE_DATA(255,90,146,71,108,157,214,176,64,223,210,33,149,17,248,101,239,2,121,62,33,230,38,206,211,92,207,179,216,157,61,135) +IMAGE_DATA(242,34,46,192,46,101,99,211,186,100,190,163,235,248,74,108,160,198,242,30,11,121,157,51,227,35,46,15,84,59,231,252) +IMAGE_DATA(65,223,223,209,111,215,93,237,179,218,70,248,161,239,62,62,181,17,228,41,88,127,236,74,246,188,210,192,99,170,190,147) +IMAGE_DATA(235,97,126,74,245,166,236,51,240,131,46,155,165,185,102,60,228,5,20,201,231,178,127,113,59,237,254,158,88,70,253,177) +IMAGE_DATA(199,223,217,57,92,201,183,163,119,94,171,185,9,184,111,207,230,51,254,107,45,10,251,67,247,89,89,124,163,250,238,123) +IMAGE_DATA(128,82,204,132,45,213,51,149,146,125,199,86,179,63,207,244,220,117,93,243,61,217,254,8,57,83,59,236,122,150,249,87) +IMAGE_DATA(61,163,83,95,203,254,162,36,123,180,151,197,229,232,147,190,251,228,52,190,223,215,252,94,169,223,216,70,198,141,78,169) +IMAGE_DATA(190,103,52,196,17,240,115,27,145,209,48,166,169,241,40,231,86,42,47,153,63,244,53,212,179,81,61,143,44,97,233,25) +IMAGE_DATA(246,131,216,206,204,215,168,28,98,119,209,139,204,31,103,123,247,204,191,235,222,157,249,118,91,233,239,104,246,96,244,71) +IMAGE_DATA(229,35,211,117,62,103,231,20,228,152,74,123,27,213,93,100,191,22,15,96,211,52,190,214,61,172,230,21,208,87,242,112) +IMAGE_DATA(26,171,151,124,58,249,20,181,45,216,177,224,163,177,60,57,69,215,27,237,51,125,101,141,253,252,87,229,71,223,109,106) +IMAGE_DATA(233,147,198,242,53,125,210,156,133,198,4,53,27,65,63,252,172,188,70,67,44,79,189,6,107,217,59,38,61,251,238,213) +IMAGE_DATA(247,158,189,174,175,33,54,69,207,154,52,70,204,208,107,16,52,14,213,156,180,202,104,230,211,200,243,106,44,147,157,241) +IMAGE_DATA(235,190,169,22,203,107,30,192,109,101,233,61,175,12,245,25,226,152,82,189,190,94,211,26,92,199,44,158,83,221,85,217) +IMAGE_DATA(215,252,151,63,143,140,16,159,170,174,224,219,233,67,180,75,190,189,199,167,171,253,113,94,186,215,242,152,71,245,68,247) +IMAGE_DATA(112,238,87,180,118,30,217,33,31,235,249,135,146,14,234,184,145,183,150,62,233,94,81,207,225,122,108,132,199,229,222,63) +IMAGE_DATA(143,203,85,71,136,75,75,52,106,35,244,44,169,23,52,126,212,51,143,108,14,148,135,231,195,179,223,118,244,223,121,212) +IMAGE_DATA(218,84,221,123,249,94,69,245,29,222,241,29,187,226,186,238,182,77,227,133,150,190,249,218,106,174,19,126,173,250,10,173) +IMAGE_DATA(179,192,159,149,248,123,46,87,247,60,204,133,230,168,52,87,165,57,44,93,139,82,44,239,49,140,214,68,105,158,85,125) +IMAGE_DATA(122,73,207,85,215,201,189,99,147,178,88,28,25,214,88,94,125,87,38,99,153,95,193,126,106,109,175,218,244,154,222,102) +IMAGE_DATA(113,185,250,233,82,222,64,253,244,84,159,139,204,232,126,191,21,151,43,141,238,221,157,70,115,55,58,191,45,223,174,247) +IMAGE_DATA(137,229,123,230,160,116,94,213,27,231,194,143,51,63,229,89,202,75,144,151,195,46,97,239,107,245,221,232,123,237,108,74) +IMAGE_DATA(245,93,243,74,90,147,173,50,213,58,35,164,175,200,39,115,86,210,117,236,140,215,40,102,181,139,25,226,71,60,150,207) +IMAGE_DATA(236,26,126,63,219,195,114,6,94,243,233,174,235,196,239,234,71,93,134,53,14,100,77,60,79,230,178,220,242,43,128,199) +IMAGE_DATA(164,53,223,238,177,124,43,190,200,252,116,252,207,244,195,227,242,169,54,194,207,13,90,99,242,88,94,121,181,80,107,146) +IMAGE_DATA(123,243,3,26,243,78,5,246,233,110,247,220,247,198,53,252,29,126,44,139,223,107,239,25,168,190,103,121,241,146,190,171) +IMAGE_DATA(173,84,127,212,170,13,210,51,113,100,209,207,151,93,255,176,209,158,155,39,14,106,189,47,160,62,139,57,107,197,48,46) +IMAGE_DATA(87,244,89,247,233,174,231,232,122,216,130,88,3,218,211,245,242,88,83,107,9,176,201,234,87,220,78,232,57,147,231,82) +IMAGE_DATA(178,88,149,186,100,173,253,200,244,93,207,112,124,191,159,209,232,94,105,170,207,245,28,123,207,126,223,109,132,238,203,166) +IMAGE_DATA(216,136,150,111,128,71,166,127,25,102,103,95,196,233,61,251,89,62,235,222,41,139,179,145,91,250,66,31,181,198,169,39) +IMAGE_DATA(55,161,107,228,231,138,153,190,115,230,128,124,162,83,248,246,86,61,128,174,119,118,54,150,241,196,70,115,166,73,142,79) +IMAGE_DATA(253,124,246,62,137,238,69,217,195,250,57,156,239,135,178,88,62,158,215,248,61,211,115,213,245,160,139,61,75,45,38,83) +IMAGE_DATA(25,214,115,184,152,75,205,147,101,251,142,82,142,40,91,107,143,73,107,123,99,29,183,238,141,51,223,206,153,137,198,23) +IMAGE_DATA(90,11,145,241,41,217,136,154,15,213,56,34,59,135,203,198,164,118,69,207,22,85,70,179,250,61,234,80,201,113,215,242) +IMAGE_DATA(149,170,239,228,16,241,51,228,94,107,241,39,60,98,205,180,6,58,211,115,213,117,230,142,223,69,208,51,153,158,247,4) +IMAGE_DATA(152,119,206,154,180,102,200,117,95,115,221,202,67,247,196,110,43,252,204,64,235,189,24,187,210,58,95,151,15,98,18,246) +IMAGE_DATA(1,94,115,155,173,29,57,172,82,157,152,246,143,241,169,61,153,162,235,216,155,44,7,234,118,91,235,77,152,79,207,17) +IMAGE_DATA(101,121,26,234,136,90,177,60,177,130,202,108,105,47,72,172,80,202,185,121,63,136,101,53,150,71,142,52,198,246,113,171) +IMAGE_DATA(141,208,88,190,198,43,139,185,50,27,225,246,80,215,146,120,165,167,158,31,30,110,119,61,191,171,245,50,129,250,190,156) +IMAGE_DATA(234,147,35,241,184,202,137,199,183,110,87,24,15,239,130,241,222,141,190,103,138,13,169,253,222,179,238,83,162,31,89,93) +IMAGE_DATA(184,234,31,99,80,185,214,115,105,149,73,215,63,214,141,24,19,191,70,46,44,227,169,123,68,213,9,61,67,44,237,25) +IMAGE_DATA(240,9,89,45,169,242,128,39,57,119,149,171,192,150,174,243,91,51,106,207,179,90,65,159,75,226,12,214,48,48,64,99) +IMAGE_DATA(226,204,110,50,151,122,222,155,197,242,165,243,36,183,117,26,215,232,220,186,109,244,117,209,115,68,245,185,30,171,121,205) +IMAGE_DATA(169,250,105,223,239,59,141,218,136,108,191,159,217,67,143,11,53,231,234,243,160,53,114,234,63,61,135,145,249,50,245,239) +IMAGE_DATA(122,230,142,141,136,231,179,119,6,176,243,26,163,168,158,123,60,7,111,127,223,198,125,27,235,209,138,235,233,39,115,88) +IMAGE_DATA(122,31,4,221,80,190,156,145,185,254,248,123,14,153,174,179,119,41,217,26,218,167,118,73,229,10,27,145,217,21,100,206) +IMAGE_DATA(207,132,145,169,210,248,162,61,173,169,139,254,169,174,251,111,198,233,119,222,93,101,223,167,245,67,173,185,196,62,197,122) +IMAGE_DATA(5,168,188,100,115,74,28,162,53,84,217,250,186,190,215,246,89,42,251,232,122,102,23,245,29,29,247,211,89,191,149,14) +IMAGE_DATA(185,214,252,169,158,197,102,116,250,238,135,239,53,168,115,114,26,175,153,247,248,191,148,243,214,216,67,223,169,103,95,147) +IMAGE_DATA(205,153,215,102,101,249,54,141,57,184,199,185,148,159,21,101,182,213,245,46,123,95,73,251,222,210,119,228,34,158,197,6) +IMAGE_DATA(251,123,126,254,222,81,246,158,86,73,87,163,77,106,1,84,215,245,183,49,176,53,165,189,149,190,195,21,237,121,157,27) +IMAGE_DATA(188,180,158,208,115,236,172,89,201,174,68,187,42,83,252,142,84,235,55,97,241,237,58,38,252,86,41,166,203,108,20,109) +IMAGE_DATA(212,246,41,232,77,79,77,179,190,55,26,237,151,214,148,249,227,124,19,254,37,123,131,62,169,14,106,222,181,68,231,113) +IMAGE_DATA(185,214,252,213,108,132,199,92,236,31,107,54,194,99,249,82,140,163,177,135,218,21,61,51,87,91,81,178,151,204,99,86) +IMAGE_DATA(219,129,191,195,166,211,174,231,169,75,177,96,201,62,171,29,209,189,85,79,222,142,186,30,252,45,177,111,233,247,231,84) +IMAGE_DATA(207,252,247,232,180,198,84,127,3,39,59,55,192,214,168,31,210,223,126,201,120,101,239,29,32,23,110,87,180,109,244,47) +IMAGE_DATA(67,175,91,136,255,161,239,181,24,222,125,59,49,181,202,9,251,217,108,30,225,141,142,241,94,14,254,181,212,87,205,85) +IMAGE_DATA(183,106,72,24,63,49,174,247,131,177,99,39,249,173,12,228,187,52,87,26,95,104,142,189,212,111,221,179,170,30,234,251) +IMAGE_DATA(32,206,207,235,39,124,191,175,181,22,62,63,106,35,240,209,202,199,145,53,240,179,81,173,127,65,175,148,95,232,115,77) +IMAGE_DATA(38,53,159,129,46,196,122,97,67,180,126,164,212,55,111,203,81,99,249,30,255,174,53,114,216,93,124,98,180,195,190,221) +IMAGE_DATA(199,162,200,216,249,77,24,125,175,215,107,191,252,140,80,249,146,19,192,62,150,248,17,47,241,222,55,237,171,93,33,127) +IMAGE_DATA(66,174,142,247,72,226,179,34,215,181,207,228,201,121,151,181,134,241,76,60,235,122,70,238,13,30,158,239,161,255,204,87) +IMAGE_DATA(0,250,150,245,147,118,180,198,162,245,62,178,218,83,157,87,80,249,115,134,169,124,232,139,246,201,231,138,53,246,103,157) +IMAGE_DATA(70,251,173,123,128,26,141,215,203,251,90,150,80,243,242,248,247,30,154,82,45,153,235,4,254,176,164,135,248,109,213,5) +IMAGE_DATA(205,167,235,58,111,3,117,78,123,252,187,254,54,133,238,123,181,159,158,11,4,221,102,251,57,39,178,95,171,251,65,191) +IMAGE_DATA(148,103,233,204,205,227,72,158,115,126,250,158,89,235,55,118,84,110,209,33,230,162,118,238,167,126,214,223,37,64,70,116) +IMAGE_DATA(60,142,240,245,179,149,26,106,187,61,107,203,220,214,250,161,115,218,51,87,154,59,232,165,225,89,109,163,135,15,253,214) +IMAGE_DATA(156,88,239,90,234,89,225,148,49,169,79,242,181,204,116,162,38,159,42,155,180,163,239,125,109,11,123,236,127,73,239,253) +IMAGE_DATA(55,15,117,95,155,201,137,35,99,242,250,224,26,79,173,51,170,181,157,241,98,189,178,248,193,127,247,82,251,238,114,79) +IMAGE_DATA(174,219,233,107,53,208,217,248,116,30,91,227,209,254,171,124,215,250,89,138,149,106,58,239,235,233,54,178,196,191,212,23) +IMAGE_DATA(114,193,204,79,207,187,96,216,40,165,169,241,243,177,150,214,50,67,250,215,203,71,105,74,107,89,155,195,30,93,208,49) +IMAGE_DATA(232,124,233,179,53,84,61,244,231,167,200,67,73,255,252,183,70,75,54,73,235,133,92,7,166,188,127,168,60,157,111,86) +IMAGE_DATA(167,4,175,22,63,111,183,86,143,55,165,207,189,227,169,217,12,239,127,239,111,56,111,50,183,53,254,235,206,149,255,46) +IMAGE_DATA(115,139,110,157,117,57,42,154,172,150,161,166,19,170,23,189,186,208,187,214,61,232,227,221,84,102,93,118,75,232,239,0) +IMAGE_DATA(92,74,158,217,59,7,189,109,182,222,93,216,38,76,225,125,41,251,217,219,230,58,125,88,183,223,151,146,102,157,241,244) +IMAGE_DATA(204,235,182,228,243,114,144,137,94,56,42,62,51,204,48,195,12,51,204,48,195,12,51,204,48,67,14,255,7,127,161,135) +IMAGE_DATA(88,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0) +IMAGE_END_DATA(5664, 21) IMAGE_BEGIN_DATA IMAGE_DATA(120,156,237,152,79,72,20,81,28,199,191,41,91,254,201,88,21,130,194,204,46,74,22,27,180,30,178,14,42,69,18,185) diff --git a/uppsrc/ide/idefile.cpp b/uppsrc/ide/idefile.cpp index 2fd3bf4f5..6cd92b0b8 100644 --- a/uppsrc/ide/idefile.cpp +++ b/uppsrc/ide/idefile.cpp @@ -26,6 +26,9 @@ void Ide::SetupEditor(int f, String hl, String fn) else if(ext == ".sch") editor.Highlight(CodeEditor::HIGHLIGHT_SCH); + else + if(ext == ".sql") + editor.Highlight(CodeEditor::HIGHLIGHT_SQL); else editor.Highlight(CodeEditor::HIGHLIGHT_NONE); }