forked from Miroirs/x49gp
eliminate buttons' shapes. simplify
This commit is contained in:
parent
f04a835918
commit
c3e54608fe
9 changed files with 6 additions and 422 deletions
|
@ -11,11 +11,4 @@
|
|||
#include "bitmaps/ann_busy.xbm"
|
||||
#include "bitmaps/ann_io.xbm"
|
||||
|
||||
#include "bitmaps/button_tiny.xbm"
|
||||
#include "bitmaps/button_small.xbm"
|
||||
#include "bitmaps/button_normal.xbm"
|
||||
#include "bitmaps/button_large.xbm"
|
||||
#include "bitmaps/button_round.xbm"
|
||||
#include "bitmaps/button_round.pix"
|
||||
|
||||
#endif /* !(_X49GP_BITMAPS_H) */
|
||||
|
|
|
@ -1,19 +0,0 @@
|
|||
#define button_large_width 46
|
||||
#define button_large_height 32
|
||||
static unsigned char button_large_bits[] = {
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xff, 0xff, 0xff, 0xff, 0x07,
|
||||
0xfc, 0xff, 0xff, 0xff, 0xff, 0x0f, 0xfe, 0xff, 0xff, 0xff, 0xff, 0x1f,
|
||||
0xfe, 0xff, 0xff, 0xff, 0xff, 0x1f, 0xfe, 0xff, 0xff, 0xff, 0xff, 0x1f,
|
||||
0xfe, 0xff, 0xff, 0xff, 0xff, 0x1f, 0xfe, 0xff, 0xff, 0xff, 0xff, 0x1f,
|
||||
0xfe, 0xff, 0xff, 0xff, 0xff, 0x1f, 0xfe, 0xff, 0xff, 0xff, 0xff, 0x1f,
|
||||
0xfe, 0xff, 0xff, 0xff, 0xff, 0x1f, 0xfe, 0xff, 0xff, 0xff, 0xff, 0x1f,
|
||||
0xfe, 0xff, 0xff, 0xff, 0xff, 0x1f, 0xfe, 0xff, 0xff, 0xff, 0xff, 0x1f,
|
||||
0xfe, 0xff, 0xff, 0xff, 0xff, 0x1f, 0xfe, 0xff, 0xff, 0xff, 0xff, 0x1f,
|
||||
0xfe, 0xff, 0xff, 0xff, 0xff, 0x1f, 0xfe, 0xff, 0xff, 0xff, 0xff, 0x1f,
|
||||
0xfe, 0xff, 0xff, 0xff, 0xff, 0x1f, 0xfe, 0xff, 0xff, 0xff, 0xff, 0x1f,
|
||||
0xfe, 0xff, 0xff, 0xff, 0xff, 0x1f, 0xfe, 0xff, 0xff, 0xff, 0xff, 0x1f,
|
||||
0xfe, 0xff, 0xff, 0xff, 0xff, 0x1f, 0xfe, 0xff, 0xff, 0xff, 0xff, 0x1f,
|
||||
0xfc, 0xff, 0xff, 0xff, 0xff, 0x0f, 0xe0, 0xff, 0xff, 0xff, 0xff, 0x01,
|
||||
0x00, 0xfe, 0xff, 0xff, 0x1f, 0x00, 0x00, 0x80, 0xff, 0x7f, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
|
|
@ -1,17 +0,0 @@
|
|||
#define button_normal_width 46
|
||||
#define button_normal_height 28
|
||||
static unsigned char button_normal_bits[] = {
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xff, 0xff, 0xff, 0xff, 0x07,
|
||||
0xfc, 0xff, 0xff, 0xff, 0xff, 0x0f, 0xfe, 0xff, 0xff, 0xff, 0xff, 0x1f,
|
||||
0xfe, 0xff, 0xff, 0xff, 0xff, 0x1f, 0xfe, 0xff, 0xff, 0xff, 0xff, 0x1f,
|
||||
0xfe, 0xff, 0xff, 0xff, 0xff, 0x1f, 0xfe, 0xff, 0xff, 0xff, 0xff, 0x1f,
|
||||
0xfe, 0xff, 0xff, 0xff, 0xff, 0x1f, 0xfe, 0xff, 0xff, 0xff, 0xff, 0x1f,
|
||||
0xfe, 0xff, 0xff, 0xff, 0xff, 0x1f, 0xfe, 0xff, 0xff, 0xff, 0xff, 0x1f,
|
||||
0xfe, 0xff, 0xff, 0xff, 0xff, 0x1f, 0xfe, 0xff, 0xff, 0xff, 0xff, 0x1f,
|
||||
0xfe, 0xff, 0xff, 0xff, 0xff, 0x1f, 0xfe, 0xff, 0xff, 0xff, 0xff, 0x1f,
|
||||
0xfe, 0xff, 0xff, 0xff, 0xff, 0x1f, 0xfe, 0xff, 0xff, 0xff, 0xff, 0x1f,
|
||||
0xfe, 0xff, 0xff, 0xff, 0xff, 0x1f, 0xfe, 0xff, 0xff, 0xff, 0xff, 0x1f,
|
||||
0xfc, 0xff, 0xff, 0xff, 0xff, 0x0f, 0xe0, 0xff, 0xff, 0xff, 0xff, 0x01,
|
||||
0x00, 0xfe, 0xff, 0xff, 0x1f, 0x00, 0x00, 0x80, 0xff, 0x7f, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
|
|
@ -1,157 +0,0 @@
|
|||
/* GdkPixbuf RGBA C-Source image dump */
|
||||
|
||||
#ifdef __SUNPRO_C
|
||||
#pragma align 4 (button_round)
|
||||
#endif
|
||||
#ifdef __GNUC__
|
||||
static const guint8 button_round[] __attribute__ ((__aligned__ (4))) =
|
||||
#else
|
||||
static const guint8 button_round[] =
|
||||
#endif
|
||||
{ ""
|
||||
/* Pixbuf magic (0x47646b50) */
|
||||
"GdkP"
|
||||
/* length: header (24) + pixel_data (4356) */
|
||||
"\0\0\21\34"
|
||||
/* pixdata_type (0x1010002) */
|
||||
"\1\1\0\2"
|
||||
/* rowstride (132) */
|
||||
"\0\0\0\204"
|
||||
/* width (33) */
|
||||
"\0\0\0!"
|
||||
/* height (33) */
|
||||
"\0\0\0!"
|
||||
/* pixel_data: */
|
||||
"\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\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\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\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\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\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\0\255\0\0\0\244\0\0\0\232\0\0\0\232"
|
||||
"\0\0\0\232\0\0\0\244\0\0\0\255\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\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\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\0\0\247\0\0\0\215\0\0\0|\0\0\0o\0\0\0_\0\0\0Z\0\0\0Z\0\0"
|
||||
"\0_\0\0\0f\0\0\0o\0\0\0\201\0\0\0\225\0\0\0\255\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\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\0\0\0\0\0\0\0\0\0\0\0\0\0\247\0\0"
|
||||
"\0\211\0\0\0h\0\0\0W\0\0\0D\0\0\0:\0\0\0""1\0\0\0/\0\0\0,\0\0\0/\0\0"
|
||||
"\0""4\0\0\0:\0\0\0H\0\0\0Z\0\0\0r\0\0\0\215\0\0\0\255\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\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\0\225\0\0\0o\0\0\0R\0\0\0:\0"
|
||||
"\0\0*\0\0\0!\0\0\0\34\0\0\0\27\0\0\0\26\0\0\0\26\0\0\0\26\0\0\0\27\0"
|
||||
"\0\0\35\0\0\0#\0\0\0/\0\0\0A\0\0\0W\0\0\0|\0\0\0\244\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\0\0\0\0\0\0\0\0\0\0\0"
|
||||
"\0\0\0\0\0\0\0\0\0\261\0\0\0\215\0\0\0_\0\0\0D\0\0\0,\0\0\0\35\0\0\0"
|
||||
"\26\0\0\0\21\0\0\0\16\0\0\0\15\0\0\0\13\0\0\0\13\0\0\0\13\0\0\0\15\0"
|
||||
"\0\0\16\0\0\0\22\0\0\0\27\0\0\0\37\0\0\0""1\0\0\0K\0\0\0h\0\0\0\225\0"
|
||||
"\0\0\273\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\0\0\0\0\0\0\0\0\0\0\0\0\211\0\0\0_\0\0\0:\0\0\0#\0\0\0\27\0\0\0\20"
|
||||
"\0\0\0\14\0\0\0\10\0\0\0\7\0\0\0\6\0\0\0\6\0\0\0\5\0\0\0\6\0\0\0\6\0"
|
||||
"\0\0\7\0\0\0\11\0\0\0\15\0\0\0\22\0\0\0\31\0\0\0(\0\0\0D\0\0\0h\0\0\0"
|
||||
"\225\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\0"
|
||||
"\0\0\0\0\0\0\0\222\0\0\0_\0\0\0:\0\0\0!\0\0\0\24\0\0\0\15\0\0\0\11\0"
|
||||
"\0\0\6\0\0\0\5\0\0\0\4\0\0\0\4\0\0\0\3\0\0\0\3\0\0\0\3\0\0\0\4\0\0\0"
|
||||
"\4\0\0\0\5\0\0\0\6\0\0\0\11\0\0\0\17\0\0\0\27\0\0\0&\0\0\0D\0\0\0o\0"
|
||||
"\0\0\244\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\244\0\0\0o\0\0\0A\0\0\0#\0\0\0\24\0\0\0\15\0\0\0\10\0\0\0\5\0\0\0"
|
||||
"\4\0\0\0\3\0\0\0\3\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\3\0"
|
||||
"\0\0\3\0\0\0\4\0\0\0\6\0\0\0\10\0\0\0\16\0\0\0\27\0\0\0*\0\0\0K\0\0\0"
|
||||
"|\0\0\0\255\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\211"
|
||||
"\0\0\0O\0\0\0*\0\0\0\27\0\0\0\15\0\0\0\10\0\0\0\5\0\0\0\4\0\0\0\3\0\0"
|
||||
"\0\2\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\2"
|
||||
"\0\0\0\3\0\0\0\4\0\0\0\5\0\0\0\10\0\0\0\17\0\0\0\32\0\0\0""1\0\0\0_\0"
|
||||
"\0\0\222\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\244\0\0\0f\0\0"
|
||||
"\0:\0\0\0\35\0\0\0\20\0\0\0\10\0\0\0\5\0\0\0\3\0\0\0\3\0\0\0\2\0\0\0"
|
||||
"\2\0\0\0\2\0\0\0\2\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\2\0\0\0\2\0\0\0\2\0"
|
||||
"\0\0\2\0\0\0\3\0\0\0\4\0\0\0\6\0\0\0\12\0\0\0\22\0\0\0!\0\0\0A\0\0\0"
|
||||
"r\0\0\0\255\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\211\0\0\0R\0\0\0(\0"
|
||||
"\0\0\24\0\0\0\13\0\0\0\6\0\0\0\4\0\0\0\3\0\0\0\2\0\0\0\2\0\0\0\2\0\0"
|
||||
"\0\1\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\2\0\0\0\2"
|
||||
"\0\0\0\2\0\0\0\3\0\0\0\4\0\0\0\7\0\0\0\15\0\0\0\31\0\0\0""1\0\0\0_\0"
|
||||
"\0\0\225\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0y\0\0\0A\0\0\0\37\0\0\0"
|
||||
"\20\0\0\0\10\0\0\0\5\0\0\0\3\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\1\0\0\0\1"
|
||||
"\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\2\0\0"
|
||||
"\0\2\0\0\0\2\0\0\0\3\0\0\0\5\0\0\0\12\0\0\0\23\0\0\0&\0\0\0O\0\0\0\211"
|
||||
"\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\247\0\0\0f\0\0\0""4\0\0\0\31\0\0\0\15"
|
||||
"\0\0\0\6\0\0\0\4\0\0\0\3\0\0\0\2\0\0\0\2\0\0\0\1\0\0\0\1\0\0\0\1\0\0"
|
||||
"\0\1\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\2"
|
||||
"\0\0\0\2\0\0\0\3\0\0\0\4\0\0\0\10\0\0\0\17\0\0\0\37\0\0\0A\0\0\0y\0\0"
|
||||
"\0\261\0\0\0\0\0\0\0\0\0\0\0\232\0\0\0_\0\0\0/\0\0\0\27\0\0\0\14\0\0"
|
||||
"\0\6\0\0\0\3\0\0\0\2\0\0\0\2\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\1"
|
||||
"\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\2\0\0"
|
||||
"\0\2\0\0\0\3\0\0\0\4\0\0\0\6\0\0\0\15\0\0\0\32\0\0\0""7\0\0\0h\0\0\0"
|
||||
"\255\0\0\0\0\0\0\0\0\0\0\0\225\0\0\0W\0\0\0*\0\0\0\24\0\0\0\12\0\0\0"
|
||||
"\5\0\0\0\3\0\0\0\2\0\0\0\2\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\1\0"
|
||||
"\0\0\1\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0"
|
||||
"\2\0\0\0\2\0\0\0\4\0\0\0\6\0\0\0\15\0\0\0\27\0\0\0""1\0\0\0f\0\0\0\244"
|
||||
"\0\0\0\0\0\0\0\0\0\0\0\222\0\0\0R\0\0\0(\0\0\0\23\0\0\0\11\0\0\0\5\0"
|
||||
"\0\0\3\0\0\0\2\0\0\0\2\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0"
|
||||
"\1\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\2\0"
|
||||
"\0\0\2\0\0\0\4\0\0\0\6\0\0\0\14\0\0\0\27\0\0\0""1\0\0\0_\0\0\0\244\0"
|
||||
"\0\0\0\0\0\0\0\0\0\0\225\0\0\0W\0\0\0*\0\0\0\24\0\0\0\12\0\0\0\5\0\0"
|
||||
"\0\3\0\0\0\2\0\0\0\2\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\1"
|
||||
"\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\2\0\0"
|
||||
"\0\2\0\0\0\4\0\0\0\6\0\0\0\15\0\0\0\27\0\0\0""1\0\0\0f\0\0\0\244\0\0"
|
||||
"\0\0\0\0\0\0\0\0\0\232\0\0\0_\0\0\0/\0\0\0\26\0\0\0\13\0\0\0\6\0\0\0"
|
||||
"\3\0\0\0\2\0\0\0\2\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\1\0"
|
||||
"\0\0\1\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\2\0\0\0\2\0\0\0"
|
||||
"\3\0\0\0\4\0\0\0\6\0\0\0\15\0\0\0\32\0\0\0""7\0\0\0h\0\0\0\255\0\0\0"
|
||||
"\0\0\0\0\0\0\0\0\244\0\0\0f\0\0\0""4\0\0\0\31\0\0\0\15\0\0\0\6\0\0\0"
|
||||
"\4\0\0\0\3\0\0\0\2\0\0\0\2\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\1\0"
|
||||
"\0\0\1\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\2\0\0\0\2\0\0\0"
|
||||
"\3\0\0\0\4\0\0\0\10\0\0\0\17\0\0\0\37\0\0\0A\0\0\0r\0\0\0\261\0\0\0\0"
|
||||
"\0\0\0\0\0\0\0\0\0\0\0y\0\0\0A\0\0\0\37\0\0\0\20\0\0\0\10\0\0\0\5\0\0"
|
||||
"\0\3\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\1"
|
||||
"\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\3\0\0"
|
||||
"\0\5\0\0\0\12\0\0\0\23\0\0\0&\0\0\0O\0\0\0\211\0\0\0\0\0\0\0\0\0\0\0"
|
||||
"\0\0\0\0\0\0\0\0\211\0\0\0R\0\0\0(\0\0\0\24\0\0\0\13\0\0\0\6\0\0\0\4"
|
||||
"\0\0\0\3\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\1\0\0\0\1\0\0\0\1\0\0\0\1\0\0"
|
||||
"\0\1\0\0\0\1\0\0\0\1\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\3\0\0\0\4\0\0\0\7"
|
||||
"\0\0\0\15\0\0\0\27\0\0\0""1\0\0\0_\0\0\0\225\0\0\0\0\0\0\0\0\0\0\0\0"
|
||||
"\0\0\0\0\0\0\0\244\0\0\0f\0\0\0""7\0\0\0\35\0\0\0\20\0\0\0\10\0\0\0\5"
|
||||
"\0\0\0\3\0\0\0\3\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\1\0\0\0\1\0\0"
|
||||
"\0\1\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\3\0\0\0\4\0\0\0\6\0\0\0\12"
|
||||
"\0\0\0\23\0\0\0!\0\0\0D\0\0\0r\0\0\0\255\0\0\0\0\0\0\0\0\0\0\0\0\0\0"
|
||||
"\0\0\0\0\0\0\0\0\0\211\0\0\0O\0\0\0*\0\0\0\27\0\0\0\15\0\0\0\10\0\0\0"
|
||||
"\5\0\0\0\4\0\0\0\3\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\2\0"
|
||||
"\0\0\2\0\0\0\2\0\0\0\2\0\0\0\3\0\0\0\4\0\0\0\5\0\0\0\10\0\0\0\17\0\0"
|
||||
"\0\32\0\0\0""1\0\0\0_\0\0\0\222\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\244\0\0\0o\0\0\0D\0\0\0#\0\0\0\24\0\0\0\15\0\0\0\7\0"
|
||||
"\0\0\5\0\0\0\4\0\0\0\3\0\0\0\3\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0\2\0\0\0"
|
||||
"\2\0\0\0\3\0\0\0\3\0\0\0\4\0\0\0\6\0\0\0\10\0\0\0\16\0\0\0\27\0\0\0*"
|
||||
"\0\0\0K\0\0\0|\0\0\0\255\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\222\0\0\0_\0\0\0:\0\0\0!\0\0\0\24\0\0\0\15\0\0\0\11"
|
||||
"\0\0\0\6\0\0\0\5\0\0\0\4\0\0\0\4\0\0\0\3\0\0\0\3\0\0\0\3\0\0\0\4\0\0"
|
||||
"\0\4\0\0\0\5\0\0\0\6\0\0\0\12\0\0\0\17\0\0\0\27\0\0\0&\0\0\0D\0\0\0h"
|
||||
"\0\0\0\244\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\0\0\0\0\0\0\0\0\215\0\0\0_\0\0\0>\0\0\0#\0\0\0\27\0\0\0\20\0\0\0"
|
||||
"\14\0\0\0\11\0\0\0\7\0\0\0\6\0\0\0\6\0\0\0\5\0\0\0\6\0\0\0\6\0\0\0\7"
|
||||
"\0\0\0\11\0\0\0\15\0\0\0\22\0\0\0\32\0\0\0*\0\0\0D\0\0\0h\0\0\0\225\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\0\0\0\0"
|
||||
"\0\0\0\0\0\0\0\0\261\0\0\0\215\0\0\0_\0\0\0D\0\0\0*\0\0\0\35\0\0\0\26"
|
||||
"\0\0\0\21\0\0\0\15\0\0\0\14\0\0\0\13\0\0\0\12\0\0\0\13\0\0\0\15\0\0\0"
|
||||
"\17\0\0\0\22\0\0\0\27\0\0\0\37\0\0\0""1\0\0\0K\0\0\0o\0\0\0\225\0\0\0"
|
||||
"\273\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\0"
|
||||
"\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\225\0\0\0r\0\0\0R\0\0\0:\0\0\0"
|
||||
"*\0\0\0\37\0\0\0\32\0\0\0\27\0\0\0\26\0\0\0\26\0\0\0\27\0\0\0\31\0\0"
|
||||
"\0\35\0\0\0#\0\0\0/\0\0\0A\0\0\0Z\0\0\0y\0\0\0\244\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\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\0\247\0\0\0\211\0\0\0h\0\0\0R"
|
||||
"\0\0\0D\0\0\0:\0\0\0""1\0\0\0/\0\0\0,\0\0\0/\0\0\0""4\0\0\0:\0\0\0H\0"
|
||||
"\0\0Z\0\0\0r\0\0\0\215\0\0\0\255\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\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\0\0\0\0\0\0\0\0\0\0\0\0\0\247\0\0\0\215\0\0\0|\0"
|
||||
"\0\0o\0\0\0f\0\0\0_\0\0\0_\0\0\0_\0\0\0f\0\0\0o\0\0\0\201\0\0\0\225\0"
|
||||
"\0\0\255\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\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\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\0\0\255\0"
|
||||
"\0\0\244\0\0\0\232\0\0\0\232\0\0\0\232\0\0\0\244\0\0\0\255\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\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\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\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\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\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"};
|
||||
|
||||
|
|
@ -1,17 +0,0 @@
|
|||
#define button_round_width 33
|
||||
#define button_round_height 33
|
||||
static unsigned char button_round_bits[] = {
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x0f, 0x00, 0x00, 0x00, 0xfc,
|
||||
0x7f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x01, 0x00, 0x80, 0xff, 0xff, 0x03,
|
||||
0x00, 0xe0, 0xff, 0xff, 0x0f, 0x00, 0xe0, 0xff, 0xff, 0x0f, 0x00, 0xf0,
|
||||
0xff, 0xff, 0x1f, 0x00, 0xf8, 0xff, 0xff, 0x3f, 0x00, 0xf8, 0xff, 0xff,
|
||||
0x3f, 0x00, 0xfc, 0xff, 0xff, 0x7f, 0x00, 0xfc, 0xff, 0xff, 0x7f, 0x00,
|
||||
0xfc, 0xff, 0xff, 0x7f, 0x00, 0xfe, 0xff, 0xff, 0xff, 0x00, 0xfe, 0xff,
|
||||
0xff, 0xff, 0x00, 0xfe, 0xff, 0xff, 0xff, 0x00, 0xfe, 0xff, 0xff, 0xff,
|
||||
0x00, 0xfe, 0xff, 0xff, 0xff, 0x00, 0xfe, 0xff, 0xff, 0xff, 0x00, 0xfe,
|
||||
0xff, 0xff, 0xff, 0x00, 0xfc, 0xff, 0xff, 0x7f, 0x00, 0xfc, 0xff, 0xff,
|
||||
0x7f, 0x00, 0xfc, 0xff, 0xff, 0x7f, 0x00, 0xf8, 0xff, 0xff, 0x3f, 0x00,
|
||||
0xf8, 0xff, 0xff, 0x3f, 0x00, 0xf0, 0xff, 0xff, 0x1f, 0x00, 0xe0, 0xff,
|
||||
0xff, 0x0f, 0x00, 0xe0, 0xff, 0xff, 0x0f, 0x00, 0x80, 0xff, 0xff, 0x03,
|
||||
0x00, 0x00, 0xff, 0xff, 0x01, 0x00, 0x00, 0xfc, 0x7f, 0x00, 0x00, 0x00,
|
||||
0xe0, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
|
|
@ -1,15 +0,0 @@
|
|||
#define button_small_width 36
|
||||
#define button_small_height 28
|
||||
static unsigned char button_small_bits[] = {
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0xf8, 0xff, 0xff, 0xff, 0x01, 0xfc, 0xff, 0xff, 0xff,
|
||||
0x03, 0xfe, 0xff, 0xff, 0xff, 0x07, 0xfe, 0xff, 0xff, 0xff, 0x07, 0xfe,
|
||||
0xff, 0xff, 0xff, 0x07, 0xfe, 0xff, 0xff, 0xff, 0x07, 0xfe, 0xff, 0xff,
|
||||
0xff, 0x07, 0xfe, 0xff, 0xff, 0xff, 0x07, 0xfe, 0xff, 0xff, 0xff, 0x07,
|
||||
0xfe, 0xff, 0xff, 0xff, 0x07, 0xfe, 0xff, 0xff, 0xff, 0x07, 0xfe, 0xff,
|
||||
0xff, 0xff, 0x07, 0xfe, 0xff, 0xff, 0xff, 0x07, 0xfe, 0xff, 0xff, 0xff,
|
||||
0x07, 0xfe, 0xff, 0xff, 0xff, 0x07, 0xfe, 0xff, 0xff, 0xff, 0x07, 0xfe,
|
||||
0xff, 0xff, 0xff, 0x07, 0xfe, 0xff, 0xff, 0xff, 0x07, 0xfe, 0xff, 0xff,
|
||||
0xff, 0x07, 0xfc, 0xff, 0xff, 0xff, 0x03, 0xf0, 0xff, 0xff, 0xff, 0x00,
|
||||
0x00, 0xff, 0xff, 0x0f, 0x00, 0x00, 0xe0, 0x7f, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
|
|
@ -1,13 +0,0 @@
|
|||
#define button_tiny_width 36
|
||||
#define button_tiny_height 22
|
||||
static unsigned char button_tiny_bits[] = {
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xff,
|
||||
0xff, 0xff, 0x01, 0xfc, 0xff, 0xff, 0xff, 0x03, 0xfe, 0xff, 0xff, 0xff,
|
||||
0x07, 0xfe, 0xff, 0xff, 0xff, 0x07, 0xfe, 0xff, 0xff, 0xff, 0x07, 0xfe,
|
||||
0xff, 0xff, 0xff, 0x07, 0xfe, 0xff, 0xff, 0xff, 0x07, 0xfe, 0xff, 0xff,
|
||||
0xff, 0x07, 0xfe, 0xff, 0xff, 0xff, 0x07, 0xfe, 0xff, 0xff, 0xff, 0x07,
|
||||
0xfe, 0xff, 0xff, 0xff, 0x07, 0xfe, 0xff, 0xff, 0xff, 0x07, 0xfe, 0xff,
|
||||
0xff, 0xff, 0x07, 0xfe, 0xff, 0xff, 0xff, 0x07, 0xfe, 0xff, 0xff, 0xff,
|
||||
0x07, 0xfe, 0xff, 0xff, 0xff, 0x07, 0xfe, 0xff, 0xff, 0xff, 0x07, 0xfc,
|
||||
0xff, 0xff, 0xff, 0x03, 0xf8, 0xff, 0xff, 0xff, 0x01, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00};
|
166
src/x49gpng/ui.c
166
src/x49gpng/ui.c
|
@ -42,7 +42,6 @@ static const x49gp_ui_key_t ui_keys[ NB_KEYS ] = {
|
|||
.color = UI_COLOR_BLACK,
|
||||
.font_size = 12.0,
|
||||
.font_weight = CAIRO_FONT_WEIGHT_BOLD,
|
||||
.shape = UI_SHAPE_BUTTON_TINY,
|
||||
.letter_size = 12.0,
|
||||
.layout = UI_LAYOUT_LEFT,
|
||||
.x = 0,
|
||||
|
@ -63,7 +62,6 @@ static const x49gp_ui_key_t ui_keys[ NB_KEYS ] = {
|
|||
.color = UI_COLOR_BLACK,
|
||||
.font_size = 12.0,
|
||||
.font_weight = CAIRO_FONT_WEIGHT_BOLD,
|
||||
.shape = UI_SHAPE_BUTTON_TINY,
|
||||
.letter_size = 12.0,
|
||||
.layout = UI_LAYOUT_LEFT,
|
||||
.x = 50,
|
||||
|
@ -84,7 +82,6 @@ static const x49gp_ui_key_t ui_keys[ NB_KEYS ] = {
|
|||
.color = UI_COLOR_BLACK,
|
||||
.font_size = 12.0,
|
||||
.font_weight = CAIRO_FONT_WEIGHT_BOLD,
|
||||
.shape = UI_SHAPE_BUTTON_TINY,
|
||||
.letter_size = 12.0,
|
||||
.layout = UI_LAYOUT_LEFT,
|
||||
.x = 99,
|
||||
|
@ -105,7 +102,6 @@ static const x49gp_ui_key_t ui_keys[ NB_KEYS ] = {
|
|||
.color = UI_COLOR_BLACK,
|
||||
.font_size = 12.0,
|
||||
.font_weight = CAIRO_FONT_WEIGHT_BOLD,
|
||||
.shape = UI_SHAPE_BUTTON_TINY,
|
||||
.letter_size = 12.0,
|
||||
.layout = UI_LAYOUT_LEFT,
|
||||
.x = 149,
|
||||
|
@ -126,7 +122,6 @@ static const x49gp_ui_key_t ui_keys[ NB_KEYS ] = {
|
|||
.color = UI_COLOR_BLACK,
|
||||
.font_size = 12.0,
|
||||
.font_weight = CAIRO_FONT_WEIGHT_BOLD,
|
||||
.shape = UI_SHAPE_BUTTON_TINY,
|
||||
.letter_size = 12.0,
|
||||
.layout = UI_LAYOUT_LEFT,
|
||||
.x = 198,
|
||||
|
@ -147,7 +142,6 @@ static const x49gp_ui_key_t ui_keys[ NB_KEYS ] = {
|
|||
.color = UI_COLOR_BLACK,
|
||||
.font_size = 12.0,
|
||||
.font_weight = CAIRO_FONT_WEIGHT_BOLD,
|
||||
.shape = UI_SHAPE_BUTTON_TINY,
|
||||
.letter_size = 12.0,
|
||||
.layout = UI_LAYOUT_LEFT,
|
||||
.x = 247,
|
||||
|
@ -168,7 +162,6 @@ static const x49gp_ui_key_t ui_keys[ NB_KEYS ] = {
|
|||
.color = UI_COLOR_WHITE,
|
||||
.font_size = 10.0,
|
||||
.font_weight = CAIRO_FONT_WEIGHT_BOLD,
|
||||
.shape = UI_SHAPE_BUTTON_SMALL,
|
||||
.letter_size = 10.0,
|
||||
.layout = UI_LAYOUT_BELOW,
|
||||
.x = 0,
|
||||
|
@ -189,7 +182,6 @@ static const x49gp_ui_key_t ui_keys[ NB_KEYS ] = {
|
|||
.color = UI_COLOR_WHITE,
|
||||
.font_size = 10.0,
|
||||
.font_weight = CAIRO_FONT_WEIGHT_BOLD,
|
||||
.shape = UI_SHAPE_BUTTON_SMALL,
|
||||
.letter_size = 10.0,
|
||||
.layout = UI_LAYOUT_BELOW,
|
||||
.x = 50,
|
||||
|
@ -210,7 +202,6 @@ static const x49gp_ui_key_t ui_keys[ NB_KEYS ] = {
|
|||
.color = UI_COLOR_WHITE,
|
||||
.font_size = 10.0,
|
||||
.font_weight = CAIRO_FONT_WEIGHT_BOLD,
|
||||
.shape = UI_SHAPE_BUTTON_SMALL,
|
||||
.letter_size = 10.0,
|
||||
.layout = UI_LAYOUT_BELOW,
|
||||
.x = 99,
|
||||
|
@ -231,7 +222,6 @@ static const x49gp_ui_key_t ui_keys[ NB_KEYS ] = {
|
|||
.color = UI_COLOR_WHITE,
|
||||
.font_size = 10.0,
|
||||
.font_weight = CAIRO_FONT_WEIGHT_BOLD,
|
||||
.shape = UI_SHAPE_BUTTON_SMALL,
|
||||
.letter_size = 10.0,
|
||||
.layout = UI_LAYOUT_BELOW,
|
||||
.x = 0,
|
||||
|
@ -252,7 +242,6 @@ static const x49gp_ui_key_t ui_keys[ NB_KEYS ] = {
|
|||
.color = UI_COLOR_WHITE,
|
||||
.font_size = 10.0,
|
||||
.font_weight = CAIRO_FONT_WEIGHT_BOLD,
|
||||
.shape = UI_SHAPE_BUTTON_SMALL,
|
||||
.letter_size = 10.0,
|
||||
.layout = UI_LAYOUT_BELOW,
|
||||
.x = 50,
|
||||
|
@ -273,7 +262,6 @@ static const x49gp_ui_key_t ui_keys[ NB_KEYS ] = {
|
|||
.color = UI_COLOR_WHITE,
|
||||
.font_size = 10.0,
|
||||
.font_weight = CAIRO_FONT_WEIGHT_BOLD,
|
||||
.shape = UI_SHAPE_BUTTON_SMALL,
|
||||
.letter_size = 10.0,
|
||||
.layout = UI_LAYOUT_BELOW,
|
||||
.x = 99,
|
||||
|
@ -294,7 +282,6 @@ static const x49gp_ui_key_t ui_keys[ NB_KEYS ] = {
|
|||
.color = UI_COLOR_BLACK,
|
||||
.font_size = 10.0,
|
||||
.font_weight = CAIRO_FONT_WEIGHT_BOLD,
|
||||
.shape = UI_SHAPE_BUTTON_ROUND,
|
||||
.letter_size = 0.0,
|
||||
.layout = 0,
|
||||
.x = 200,
|
||||
|
@ -315,7 +302,6 @@ static const x49gp_ui_key_t ui_keys[ NB_KEYS ] = {
|
|||
.color = UI_COLOR_BLACK,
|
||||
.font_size = 10.0,
|
||||
.font_weight = CAIRO_FONT_WEIGHT_BOLD,
|
||||
.shape = UI_SHAPE_BUTTON_ROUND,
|
||||
.letter_size = 0.0,
|
||||
.layout = 0,
|
||||
.x = 164,
|
||||
|
@ -336,7 +322,6 @@ static const x49gp_ui_key_t ui_keys[ NB_KEYS ] = {
|
|||
.color = UI_COLOR_BLACK,
|
||||
.font_size = 10.0,
|
||||
.font_weight = CAIRO_FONT_WEIGHT_BOLD,
|
||||
.shape = UI_SHAPE_BUTTON_ROUND,
|
||||
.letter_size = 0.0,
|
||||
.layout = 0,
|
||||
.x = 200,
|
||||
|
@ -357,7 +342,6 @@ static const x49gp_ui_key_t ui_keys[ NB_KEYS ] = {
|
|||
.color = UI_COLOR_BLACK,
|
||||
.font_size = 10.0,
|
||||
.font_weight = CAIRO_FONT_WEIGHT_BOLD,
|
||||
.shape = UI_SHAPE_BUTTON_ROUND,
|
||||
.letter_size = 0.0,
|
||||
.layout = 0,
|
||||
.x = 236,
|
||||
|
@ -378,7 +362,6 @@ static const x49gp_ui_key_t ui_keys[ NB_KEYS ] = {
|
|||
/* .color = UI_COLOR_BLACK, */
|
||||
/* .font_size = 0.0, */
|
||||
/* .font_weight = 0, */
|
||||
/* .shape = UI_SHAPE_BUTTON_ROUND, */
|
||||
/* .letter_size = 0.0, */
|
||||
/* .layout = 0, */
|
||||
/* .x = 200, */
|
||||
|
@ -399,7 +382,6 @@ static const x49gp_ui_key_t ui_keys[ NB_KEYS ] = {
|
|||
/* .color = UI_COLOR_BLACK, */
|
||||
/* .font_size = 0.0, */
|
||||
/* .font_weight = 0, */
|
||||
/* .shape = UI_SHAPE_BUTTON_ROUND, */
|
||||
/* .letter_size = 0.0, */
|
||||
/* .layout = 0, */
|
||||
/* .x = 164, */
|
||||
|
@ -420,7 +402,6 @@ static const x49gp_ui_key_t ui_keys[ NB_KEYS ] = {
|
|||
/* .color = UI_COLOR_BLACK, */
|
||||
/* .font_size = 0.0, */
|
||||
/* .font_weight = 0, */
|
||||
/* .shape = UI_SHAPE_BUTTON_ROUND, */
|
||||
/* .letter_size = 0.0, */
|
||||
/* .layout = 0, */
|
||||
/* .x = 200, */
|
||||
|
@ -441,7 +422,6 @@ static const x49gp_ui_key_t ui_keys[ NB_KEYS ] = {
|
|||
/* .color = UI_COLOR_BLACK, */
|
||||
/* .font_size = 0.0, */
|
||||
/* .font_weight = 0, */
|
||||
/* .shape = UI_SHAPE_BUTTON_ROUND, */
|
||||
/* .letter_size = 0.0, */
|
||||
/* .layout = 0, */
|
||||
/* .x = 236, */
|
||||
|
@ -462,7 +442,6 @@ static const x49gp_ui_key_t ui_keys[ NB_KEYS ] = {
|
|||
.color = UI_COLOR_WHITE,
|
||||
.font_size = 12.0,
|
||||
.font_weight = CAIRO_FONT_WEIGHT_BOLD,
|
||||
.shape = UI_SHAPE_BUTTON_NORMAL,
|
||||
.letter_size = 12.0,
|
||||
.layout = UI_LAYOUT_LEFT,
|
||||
.x = 0,
|
||||
|
@ -483,7 +462,6 @@ static const x49gp_ui_key_t ui_keys[ NB_KEYS ] = {
|
|||
.color = UI_COLOR_WHITE,
|
||||
.font_size = 12.0,
|
||||
.font_weight = CAIRO_FONT_WEIGHT_BOLD,
|
||||
.shape = UI_SHAPE_BUTTON_NORMAL,
|
||||
.letter_size = 12.0,
|
||||
.layout = UI_LAYOUT_LEFT,
|
||||
.x = 59,
|
||||
|
@ -504,7 +482,6 @@ static const x49gp_ui_key_t ui_keys[ NB_KEYS ] = {
|
|||
.color = UI_COLOR_WHITE,
|
||||
.font_size = 12.0,
|
||||
.font_weight = CAIRO_FONT_WEIGHT_BOLD,
|
||||
.shape = UI_SHAPE_BUTTON_NORMAL,
|
||||
.letter_size = 12.0,
|
||||
.layout = UI_LAYOUT_LEFT,
|
||||
.x = 119,
|
||||
|
@ -525,7 +502,6 @@ static const x49gp_ui_key_t ui_keys[ NB_KEYS ] = {
|
|||
.color = UI_COLOR_WHITE,
|
||||
.font_size = 12.0,
|
||||
.font_weight = CAIRO_FONT_WEIGHT_BOLD,
|
||||
.shape = UI_SHAPE_BUTTON_NORMAL,
|
||||
.letter_size = 12.0,
|
||||
.layout = UI_LAYOUT_LEFT,
|
||||
.x = 179,
|
||||
|
@ -546,7 +522,6 @@ static const x49gp_ui_key_t ui_keys[ NB_KEYS ] = {
|
|||
.color = UI_COLOR_WHITE,
|
||||
.font_size = 12.0,
|
||||
.font_weight = CAIRO_FONT_WEIGHT_BOLD,
|
||||
.shape = UI_SHAPE_BUTTON_NORMAL,
|
||||
.letter_size = 0.0,
|
||||
.layout = 0,
|
||||
.x = 238,
|
||||
|
@ -567,7 +542,6 @@ static const x49gp_ui_key_t ui_keys[ NB_KEYS ] = {
|
|||
.color = UI_COLOR_WHITE,
|
||||
.font_size = 12.0,
|
||||
.font_weight = CAIRO_FONT_WEIGHT_BOLD,
|
||||
.shape = UI_SHAPE_BUTTON_NORMAL,
|
||||
.letter_size = 12.0,
|
||||
.layout = UI_LAYOUT_LEFT,
|
||||
.x = 0,
|
||||
|
@ -588,7 +562,6 @@ static const x49gp_ui_key_t ui_keys[ NB_KEYS ] = {
|
|||
.color = UI_COLOR_WHITE,
|
||||
.font_size = 12.0,
|
||||
.font_weight = CAIRO_FONT_WEIGHT_BOLD,
|
||||
.shape = UI_SHAPE_BUTTON_NORMAL,
|
||||
.letter_size = 12.0,
|
||||
.layout = UI_LAYOUT_LEFT,
|
||||
.x = 59,
|
||||
|
@ -609,7 +582,6 @@ static const x49gp_ui_key_t ui_keys[ NB_KEYS ] = {
|
|||
.color = UI_COLOR_WHITE,
|
||||
.font_size = 12.0,
|
||||
.font_weight = CAIRO_FONT_WEIGHT_BOLD,
|
||||
.shape = UI_SHAPE_BUTTON_NORMAL,
|
||||
.letter_size = 12.0,
|
||||
.layout = UI_LAYOUT_LEFT,
|
||||
.x = 119,
|
||||
|
@ -630,7 +602,6 @@ static const x49gp_ui_key_t ui_keys[ NB_KEYS ] = {
|
|||
.color = UI_COLOR_WHITE,
|
||||
.font_size = 12.0,
|
||||
.font_weight = CAIRO_FONT_WEIGHT_BOLD,
|
||||
.shape = UI_SHAPE_BUTTON_NORMAL,
|
||||
.letter_size = 12.0,
|
||||
.layout = UI_LAYOUT_LEFT,
|
||||
.x = 179,
|
||||
|
@ -651,7 +622,6 @@ static const x49gp_ui_key_t ui_keys[ NB_KEYS ] = {
|
|||
.color = UI_COLOR_WHITE,
|
||||
.font_size = 12.0,
|
||||
.font_weight = CAIRO_FONT_WEIGHT_BOLD,
|
||||
.shape = UI_SHAPE_BUTTON_NORMAL,
|
||||
.letter_size = 12.0,
|
||||
.layout = UI_LAYOUT_LEFT,
|
||||
.x = 238,
|
||||
|
@ -672,7 +642,6 @@ static const x49gp_ui_key_t ui_keys[ NB_KEYS ] = {
|
|||
.color = UI_COLOR_WHITE,
|
||||
.font_size = 12.0,
|
||||
.font_weight = CAIRO_FONT_WEIGHT_BOLD,
|
||||
.shape = UI_SHAPE_BUTTON_NORMAL,
|
||||
.letter_size = 12.0,
|
||||
.layout = UI_LAYOUT_LEFT,
|
||||
.x = 0,
|
||||
|
@ -693,7 +662,6 @@ static const x49gp_ui_key_t ui_keys[ NB_KEYS ] = {
|
|||
.color = UI_COLOR_WHITE,
|
||||
.font_size = 12.0,
|
||||
.font_weight = CAIRO_FONT_WEIGHT_BOLD,
|
||||
.shape = UI_SHAPE_BUTTON_NORMAL,
|
||||
.letter_size = 12.0,
|
||||
.layout = UI_LAYOUT_LEFT,
|
||||
.x = 59,
|
||||
|
@ -714,7 +682,6 @@ static const x49gp_ui_key_t ui_keys[ NB_KEYS ] = {
|
|||
.color = UI_COLOR_WHITE,
|
||||
.font_size = 12.0,
|
||||
.font_weight = CAIRO_FONT_WEIGHT_BOLD,
|
||||
.shape = UI_SHAPE_BUTTON_NORMAL,
|
||||
.letter_size = 12.0,
|
||||
.layout = UI_LAYOUT_LEFT,
|
||||
.x = 119,
|
||||
|
@ -735,7 +702,6 @@ static const x49gp_ui_key_t ui_keys[ NB_KEYS ] = {
|
|||
.color = UI_COLOR_WHITE,
|
||||
.font_size = 12.0,
|
||||
.font_weight = CAIRO_FONT_WEIGHT_BOLD,
|
||||
.shape = UI_SHAPE_BUTTON_NORMAL,
|
||||
.letter_size = 12.0,
|
||||
.layout = UI_LAYOUT_LEFT,
|
||||
.x = 179,
|
||||
|
@ -756,7 +722,6 @@ static const x49gp_ui_key_t ui_keys[ NB_KEYS ] = {
|
|||
.color = UI_COLOR_WHITE,
|
||||
.font_size = 19.0,
|
||||
.font_weight = CAIRO_FONT_WEIGHT_BOLD,
|
||||
.shape = UI_SHAPE_BUTTON_NORMAL,
|
||||
.letter_size = 12.0,
|
||||
.layout = UI_LAYOUT_LEFT_NO_SPACE,
|
||||
.x = 238,
|
||||
|
@ -777,7 +742,6 @@ static const x49gp_ui_key_t ui_keys[ NB_KEYS ] = {
|
|||
.color = UI_COLOR_BLACK,
|
||||
.font_size = 12.0,
|
||||
.font_weight = CAIRO_FONT_WEIGHT_BOLD,
|
||||
.shape = UI_SHAPE_BUTTON_LARGE,
|
||||
.letter_size = 0.0,
|
||||
.layout = 0,
|
||||
.x = 0,
|
||||
|
@ -798,7 +762,6 @@ static const x49gp_ui_key_t ui_keys[ NB_KEYS ] = {
|
|||
.color = UI_COLOR_WHITE,
|
||||
.font_size = 19.0,
|
||||
.font_weight = CAIRO_FONT_WEIGHT_BOLD,
|
||||
.shape = UI_SHAPE_BUTTON_LARGE,
|
||||
.letter_size = 0.0,
|
||||
.layout = 0,
|
||||
.x = 59,
|
||||
|
@ -819,7 +782,6 @@ static const x49gp_ui_key_t ui_keys[ NB_KEYS ] = {
|
|||
.color = UI_COLOR_WHITE,
|
||||
.font_size = 19.0,
|
||||
.font_weight = CAIRO_FONT_WEIGHT_BOLD,
|
||||
.shape = UI_SHAPE_BUTTON_LARGE,
|
||||
.letter_size = 0.0,
|
||||
.layout = 0,
|
||||
.x = 119,
|
||||
|
@ -840,7 +802,6 @@ static const x49gp_ui_key_t ui_keys[ NB_KEYS ] = {
|
|||
.color = UI_COLOR_WHITE,
|
||||
.font_size = 19.0,
|
||||
.font_weight = CAIRO_FONT_WEIGHT_BOLD,
|
||||
.shape = UI_SHAPE_BUTTON_LARGE,
|
||||
.letter_size = 0.0,
|
||||
.layout = 0,
|
||||
.x = 179,
|
||||
|
@ -861,7 +822,6 @@ static const x49gp_ui_key_t ui_keys[ NB_KEYS ] = {
|
|||
.color = UI_COLOR_WHITE,
|
||||
.font_size = 19.0,
|
||||
.font_weight = CAIRO_FONT_WEIGHT_BOLD,
|
||||
.shape = UI_SHAPE_BUTTON_LARGE,
|
||||
.letter_size = 0.0,
|
||||
.layout = 0,
|
||||
.x = 238,
|
||||
|
@ -882,7 +842,6 @@ static const x49gp_ui_key_t ui_keys[ NB_KEYS ] = {
|
|||
.color = UI_COLOR_BLACK,
|
||||
.font_size = 19.0,
|
||||
.font_weight = CAIRO_FONT_WEIGHT_BOLD,
|
||||
.shape = UI_SHAPE_BUTTON_LARGE,
|
||||
.letter_size = 0.0,
|
||||
.layout = 0,
|
||||
.x = 0,
|
||||
|
@ -903,7 +862,6 @@ static const x49gp_ui_key_t ui_keys[ NB_KEYS ] = {
|
|||
.color = UI_COLOR_WHITE,
|
||||
.font_size = 19.0,
|
||||
.font_weight = CAIRO_FONT_WEIGHT_BOLD,
|
||||
.shape = UI_SHAPE_BUTTON_LARGE,
|
||||
.letter_size = 0.0,
|
||||
.layout = 0,
|
||||
.x = 59,
|
||||
|
@ -924,7 +882,6 @@ static const x49gp_ui_key_t ui_keys[ NB_KEYS ] = {
|
|||
.color = UI_COLOR_WHITE,
|
||||
.font_size = 19.0,
|
||||
.font_weight = CAIRO_FONT_WEIGHT_BOLD,
|
||||
.shape = UI_SHAPE_BUTTON_LARGE,
|
||||
.letter_size = 0.0,
|
||||
.layout = 0,
|
||||
.x = 119,
|
||||
|
@ -945,7 +902,6 @@ static const x49gp_ui_key_t ui_keys[ NB_KEYS ] = {
|
|||
.color = UI_COLOR_WHITE,
|
||||
.font_size = 19.0,
|
||||
.font_weight = CAIRO_FONT_WEIGHT_BOLD,
|
||||
.shape = UI_SHAPE_BUTTON_LARGE,
|
||||
.letter_size = 0.0,
|
||||
.layout = 0,
|
||||
.x = 179,
|
||||
|
@ -966,7 +922,6 @@ static const x49gp_ui_key_t ui_keys[ NB_KEYS ] = {
|
|||
.color = UI_COLOR_WHITE,
|
||||
.font_size = 19.0,
|
||||
.font_weight = CAIRO_FONT_WEIGHT_BOLD,
|
||||
.shape = UI_SHAPE_BUTTON_LARGE,
|
||||
.letter_size = 0.0,
|
||||
.layout = 0,
|
||||
.x = 238,
|
||||
|
@ -987,7 +942,6 @@ static const x49gp_ui_key_t ui_keys[ NB_KEYS ] = {
|
|||
.color = UI_COLOR_BLACK,
|
||||
.font_size = 19.0,
|
||||
.font_weight = CAIRO_FONT_WEIGHT_BOLD,
|
||||
.shape = UI_SHAPE_BUTTON_LARGE,
|
||||
.letter_size = 0.0,
|
||||
.layout = 0,
|
||||
.x = 0,
|
||||
|
@ -1008,7 +962,6 @@ static const x49gp_ui_key_t ui_keys[ NB_KEYS ] = {
|
|||
.color = UI_COLOR_WHITE,
|
||||
.font_size = 19.0,
|
||||
.font_weight = CAIRO_FONT_WEIGHT_BOLD,
|
||||
.shape = UI_SHAPE_BUTTON_LARGE,
|
||||
.letter_size = 0.0,
|
||||
.layout = 0,
|
||||
.x = 59,
|
||||
|
@ -1029,7 +982,6 @@ static const x49gp_ui_key_t ui_keys[ NB_KEYS ] = {
|
|||
.color = UI_COLOR_WHITE,
|
||||
.font_size = 19.0,
|
||||
.font_weight = CAIRO_FONT_WEIGHT_BOLD,
|
||||
.shape = UI_SHAPE_BUTTON_LARGE,
|
||||
.letter_size = 0.0,
|
||||
.layout = 0,
|
||||
.x = 119,
|
||||
|
@ -1050,7 +1002,6 @@ static const x49gp_ui_key_t ui_keys[ NB_KEYS ] = {
|
|||
.color = UI_COLOR_WHITE,
|
||||
.font_size = 19.0,
|
||||
.font_weight = CAIRO_FONT_WEIGHT_BOLD,
|
||||
.shape = UI_SHAPE_BUTTON_LARGE,
|
||||
.letter_size = 0.0,
|
||||
.layout = 0,
|
||||
.x = 179,
|
||||
|
@ -1071,7 +1022,6 @@ static const x49gp_ui_key_t ui_keys[ NB_KEYS ] = {
|
|||
.color = UI_COLOR_WHITE,
|
||||
.font_size = 19.0,
|
||||
.font_weight = CAIRO_FONT_WEIGHT_BOLD,
|
||||
.shape = UI_SHAPE_BUTTON_LARGE,
|
||||
.letter_size = 0.0,
|
||||
.layout = 0,
|
||||
.x = 238,
|
||||
|
@ -1092,7 +1042,6 @@ static const x49gp_ui_key_t ui_keys[ NB_KEYS ] = {
|
|||
.color = UI_COLOR_WHITE,
|
||||
.font_size = 12.0,
|
||||
.font_weight = CAIRO_FONT_WEIGHT_BOLD,
|
||||
.shape = UI_SHAPE_BUTTON_LARGE,
|
||||
.letter_size = 0.0,
|
||||
.layout = 0,
|
||||
.x = 0,
|
||||
|
@ -1113,7 +1062,6 @@ static const x49gp_ui_key_t ui_keys[ NB_KEYS ] = {
|
|||
.color = UI_COLOR_WHITE,
|
||||
.font_size = 19.0,
|
||||
.font_weight = CAIRO_FONT_WEIGHT_BOLD,
|
||||
.shape = UI_SHAPE_BUTTON_LARGE,
|
||||
.letter_size = 0.0,
|
||||
.layout = 0,
|
||||
.x = 59,
|
||||
|
@ -1134,7 +1082,6 @@ static const x49gp_ui_key_t ui_keys[ NB_KEYS ] = {
|
|||
.color = UI_COLOR_WHITE,
|
||||
.font_size = 19.0,
|
||||
.font_weight = CAIRO_FONT_WEIGHT_BOLD,
|
||||
.shape = UI_SHAPE_BUTTON_LARGE,
|
||||
.letter_size = 0.0,
|
||||
.layout = 0,
|
||||
.x = 119,
|
||||
|
@ -1155,7 +1102,6 @@ static const x49gp_ui_key_t ui_keys[ NB_KEYS ] = {
|
|||
.color = UI_COLOR_WHITE,
|
||||
.font_size = 12.0,
|
||||
.font_weight = CAIRO_FONT_WEIGHT_BOLD,
|
||||
.shape = UI_SHAPE_BUTTON_LARGE,
|
||||
.letter_size = 0.0,
|
||||
.layout = 0,
|
||||
.x = 179,
|
||||
|
@ -1176,7 +1122,6 @@ static const x49gp_ui_key_t ui_keys[ NB_KEYS ] = {
|
|||
.color = UI_COLOR_WHITE,
|
||||
.font_size = 12.0,
|
||||
.font_weight = CAIRO_FONT_WEIGHT_BOLD,
|
||||
.shape = UI_SHAPE_BUTTON_LARGE,
|
||||
.letter_size = 0.0,
|
||||
.layout = 0,
|
||||
.x = 238,
|
||||
|
@ -1200,7 +1145,6 @@ static const x49gp_ui_key_t ui_newrpl_keys[ NB_KEYS ] = {
|
|||
.color = UI_COLOR_BLACK,
|
||||
.font_size = 12.0,
|
||||
.font_weight = CAIRO_FONT_WEIGHT_BOLD,
|
||||
.shape = UI_SHAPE_BUTTON_TINY,
|
||||
.letter_size = 12.0,
|
||||
.layout = UI_LAYOUT_LEFT,
|
||||
.x = 0,
|
||||
|
@ -1221,7 +1165,6 @@ static const x49gp_ui_key_t ui_newrpl_keys[ NB_KEYS ] = {
|
|||
.color = UI_COLOR_BLACK,
|
||||
.font_size = 12.0,
|
||||
.font_weight = CAIRO_FONT_WEIGHT_BOLD,
|
||||
.shape = UI_SHAPE_BUTTON_TINY,
|
||||
.letter_size = 12.0,
|
||||
.layout = UI_LAYOUT_LEFT,
|
||||
.x = 50,
|
||||
|
@ -1242,7 +1185,6 @@ static const x49gp_ui_key_t ui_newrpl_keys[ NB_KEYS ] = {
|
|||
.color = UI_COLOR_BLACK,
|
||||
.font_size = 12.0,
|
||||
.font_weight = CAIRO_FONT_WEIGHT_BOLD,
|
||||
.shape = UI_SHAPE_BUTTON_TINY,
|
||||
.letter_size = 12.0,
|
||||
.layout = UI_LAYOUT_LEFT,
|
||||
.x = 99,
|
||||
|
@ -1263,7 +1205,6 @@ static const x49gp_ui_key_t ui_newrpl_keys[ NB_KEYS ] = {
|
|||
.color = UI_COLOR_BLACK,
|
||||
.font_size = 12.0,
|
||||
.font_weight = CAIRO_FONT_WEIGHT_BOLD,
|
||||
.shape = UI_SHAPE_BUTTON_TINY,
|
||||
.letter_size = 12.0,
|
||||
.layout = UI_LAYOUT_LEFT,
|
||||
.x = 149,
|
||||
|
@ -1284,7 +1225,6 @@ static const x49gp_ui_key_t ui_newrpl_keys[ NB_KEYS ] = {
|
|||
.color = UI_COLOR_BLACK,
|
||||
.font_size = 12.0,
|
||||
.font_weight = CAIRO_FONT_WEIGHT_BOLD,
|
||||
.shape = UI_SHAPE_BUTTON_TINY,
|
||||
.letter_size = 12.0,
|
||||
.layout = UI_LAYOUT_LEFT,
|
||||
.x = 198,
|
||||
|
@ -1305,7 +1245,6 @@ static const x49gp_ui_key_t ui_newrpl_keys[ NB_KEYS ] = {
|
|||
.color = UI_COLOR_BLACK,
|
||||
.font_size = 12.0,
|
||||
.font_weight = CAIRO_FONT_WEIGHT_BOLD,
|
||||
.shape = UI_SHAPE_BUTTON_TINY,
|
||||
.letter_size = 12.0,
|
||||
.layout = UI_LAYOUT_LEFT,
|
||||
.x = 247,
|
||||
|
@ -1326,7 +1265,6 @@ static const x49gp_ui_key_t ui_newrpl_keys[ NB_KEYS ] = {
|
|||
.color = UI_COLOR_WHITE,
|
||||
.font_size = 10.0,
|
||||
.font_weight = CAIRO_FONT_WEIGHT_BOLD,
|
||||
.shape = UI_SHAPE_BUTTON_SMALL,
|
||||
.letter_size = 10.0,
|
||||
.layout = UI_LAYOUT_BELOW,
|
||||
.x = 0,
|
||||
|
@ -1347,7 +1285,6 @@ static const x49gp_ui_key_t ui_newrpl_keys[ NB_KEYS ] = {
|
|||
.color = UI_COLOR_WHITE,
|
||||
.font_size = 10.0,
|
||||
.font_weight = CAIRO_FONT_WEIGHT_BOLD,
|
||||
.shape = UI_SHAPE_BUTTON_SMALL,
|
||||
.letter_size = 10.0,
|
||||
.layout = UI_LAYOUT_BELOW,
|
||||
.x = 50,
|
||||
|
@ -1368,7 +1305,6 @@ static const x49gp_ui_key_t ui_newrpl_keys[ NB_KEYS ] = {
|
|||
.color = UI_COLOR_WHITE,
|
||||
.font_size = 10.0,
|
||||
.font_weight = CAIRO_FONT_WEIGHT_BOLD,
|
||||
.shape = UI_SHAPE_BUTTON_SMALL,
|
||||
.letter_size = 10.0,
|
||||
.layout = UI_LAYOUT_BELOW,
|
||||
.x = 99,
|
||||
|
@ -1389,7 +1325,6 @@ static const x49gp_ui_key_t ui_newrpl_keys[ NB_KEYS ] = {
|
|||
.color = UI_COLOR_WHITE,
|
||||
.font_size = 10.0,
|
||||
.font_weight = CAIRO_FONT_WEIGHT_BOLD,
|
||||
.shape = UI_SHAPE_BUTTON_SMALL,
|
||||
.letter_size = 10.0,
|
||||
.layout = UI_LAYOUT_BELOW,
|
||||
.x = 0,
|
||||
|
@ -1410,7 +1345,6 @@ static const x49gp_ui_key_t ui_newrpl_keys[ NB_KEYS ] = {
|
|||
.color = UI_COLOR_WHITE,
|
||||
.font_size = 10.0,
|
||||
.font_weight = CAIRO_FONT_WEIGHT_BOLD,
|
||||
.shape = UI_SHAPE_BUTTON_SMALL,
|
||||
.letter_size = 10.0,
|
||||
.layout = UI_LAYOUT_BELOW,
|
||||
.x = 50,
|
||||
|
@ -1431,7 +1365,6 @@ static const x49gp_ui_key_t ui_newrpl_keys[ NB_KEYS ] = {
|
|||
.color = UI_COLOR_WHITE,
|
||||
.font_size = 10.0,
|
||||
.font_weight = CAIRO_FONT_WEIGHT_BOLD,
|
||||
.shape = UI_SHAPE_BUTTON_SMALL,
|
||||
.letter_size = 10.0,
|
||||
.layout = UI_LAYOUT_BELOW,
|
||||
.x = 99,
|
||||
|
@ -1452,7 +1385,6 @@ static const x49gp_ui_key_t ui_newrpl_keys[ NB_KEYS ] = {
|
|||
.color = UI_COLOR_BLACK,
|
||||
.font_size = 10.0,
|
||||
.font_weight = CAIRO_FONT_WEIGHT_BOLD,
|
||||
.shape = UI_SHAPE_BUTTON_ROUND,
|
||||
.letter_size = 0.0,
|
||||
.layout = 0,
|
||||
.x = 200,
|
||||
|
@ -1473,7 +1405,6 @@ static const x49gp_ui_key_t ui_newrpl_keys[ NB_KEYS ] = {
|
|||
.color = UI_COLOR_BLACK,
|
||||
.font_size = 10.0,
|
||||
.font_weight = CAIRO_FONT_WEIGHT_BOLD,
|
||||
.shape = UI_SHAPE_BUTTON_ROUND,
|
||||
.letter_size = 0.0,
|
||||
.layout = 0,
|
||||
.x = 164,
|
||||
|
@ -1494,7 +1425,6 @@ static const x49gp_ui_key_t ui_newrpl_keys[ NB_KEYS ] = {
|
|||
.color = UI_COLOR_BLACK,
|
||||
.font_size = 10.0,
|
||||
.font_weight = CAIRO_FONT_WEIGHT_BOLD,
|
||||
.shape = UI_SHAPE_BUTTON_ROUND,
|
||||
.letter_size = 0.0,
|
||||
.layout = 0,
|
||||
.x = 200,
|
||||
|
@ -1515,7 +1445,6 @@ static const x49gp_ui_key_t ui_newrpl_keys[ NB_KEYS ] = {
|
|||
.color = UI_COLOR_BLACK,
|
||||
.font_size = 10.0,
|
||||
.font_weight = CAIRO_FONT_WEIGHT_BOLD,
|
||||
.shape = UI_SHAPE_BUTTON_ROUND,
|
||||
.letter_size = 0.0,
|
||||
.layout = 0,
|
||||
.x = 236,
|
||||
|
@ -1536,7 +1465,6 @@ static const x49gp_ui_key_t ui_newrpl_keys[ NB_KEYS ] = {
|
|||
.color = UI_COLOR_WHITE,
|
||||
.font_size = 12.0,
|
||||
.font_weight = CAIRO_FONT_WEIGHT_BOLD,
|
||||
.shape = UI_SHAPE_BUTTON_NORMAL,
|
||||
.letter_size = 12.0,
|
||||
.layout = UI_LAYOUT_LEFT,
|
||||
.x = 0,
|
||||
|
@ -1557,7 +1485,6 @@ static const x49gp_ui_key_t ui_newrpl_keys[ NB_KEYS ] = {
|
|||
.color = UI_COLOR_WHITE,
|
||||
.font_size = 12.0,
|
||||
.font_weight = CAIRO_FONT_WEIGHT_BOLD,
|
||||
.shape = UI_SHAPE_BUTTON_NORMAL,
|
||||
.letter_size = 12.0,
|
||||
.layout = UI_LAYOUT_LEFT,
|
||||
.x = 59,
|
||||
|
@ -1578,7 +1505,6 @@ static const x49gp_ui_key_t ui_newrpl_keys[ NB_KEYS ] = {
|
|||
.color = UI_COLOR_WHITE,
|
||||
.font_size = 12.0,
|
||||
.font_weight = CAIRO_FONT_WEIGHT_BOLD,
|
||||
.shape = UI_SHAPE_BUTTON_NORMAL,
|
||||
.letter_size = 12.0,
|
||||
.layout = UI_LAYOUT_LEFT,
|
||||
.x = 119,
|
||||
|
@ -1599,7 +1525,6 @@ static const x49gp_ui_key_t ui_newrpl_keys[ NB_KEYS ] = {
|
|||
.color = UI_COLOR_WHITE,
|
||||
.font_size = 12.0,
|
||||
.font_weight = CAIRO_FONT_WEIGHT_BOLD,
|
||||
.shape = UI_SHAPE_BUTTON_NORMAL,
|
||||
.letter_size = 12.0,
|
||||
.layout = UI_LAYOUT_LEFT,
|
||||
.x = 179,
|
||||
|
@ -1620,7 +1545,6 @@ static const x49gp_ui_key_t ui_newrpl_keys[ NB_KEYS ] = {
|
|||
.color = UI_COLOR_WHITE,
|
||||
.font_size = 12.0,
|
||||
.font_weight = CAIRO_FONT_WEIGHT_BOLD,
|
||||
.shape = UI_SHAPE_BUTTON_NORMAL,
|
||||
.letter_size = 0.0,
|
||||
.layout = 0,
|
||||
.x = 238,
|
||||
|
@ -1641,7 +1565,6 @@ static const x49gp_ui_key_t ui_newrpl_keys[ NB_KEYS ] = {
|
|||
.color = UI_COLOR_WHITE,
|
||||
.font_size = 12.0,
|
||||
.font_weight = CAIRO_FONT_WEIGHT_BOLD,
|
||||
.shape = UI_SHAPE_BUTTON_NORMAL,
|
||||
.letter_size = 12.0,
|
||||
.layout = UI_LAYOUT_LEFT,
|
||||
.x = 0,
|
||||
|
@ -1662,7 +1585,6 @@ static const x49gp_ui_key_t ui_newrpl_keys[ NB_KEYS ] = {
|
|||
.color = UI_COLOR_WHITE,
|
||||
.font_size = 12.0,
|
||||
.font_weight = CAIRO_FONT_WEIGHT_BOLD,
|
||||
.shape = UI_SHAPE_BUTTON_NORMAL,
|
||||
.letter_size = 12.0,
|
||||
.layout = UI_LAYOUT_LEFT,
|
||||
.x = 59,
|
||||
|
@ -1683,7 +1605,6 @@ static const x49gp_ui_key_t ui_newrpl_keys[ NB_KEYS ] = {
|
|||
.color = UI_COLOR_WHITE,
|
||||
.font_size = 12.0,
|
||||
.font_weight = CAIRO_FONT_WEIGHT_BOLD,
|
||||
.shape = UI_SHAPE_BUTTON_NORMAL,
|
||||
.letter_size = 12.0,
|
||||
.layout = UI_LAYOUT_LEFT,
|
||||
.x = 119,
|
||||
|
@ -1704,7 +1625,6 @@ static const x49gp_ui_key_t ui_newrpl_keys[ NB_KEYS ] = {
|
|||
.color = UI_COLOR_WHITE,
|
||||
.font_size = 12.0,
|
||||
.font_weight = CAIRO_FONT_WEIGHT_BOLD,
|
||||
.shape = UI_SHAPE_BUTTON_NORMAL,
|
||||
.letter_size = 12.0,
|
||||
.layout = UI_LAYOUT_LEFT,
|
||||
.x = 179,
|
||||
|
@ -1725,7 +1645,6 @@ static const x49gp_ui_key_t ui_newrpl_keys[ NB_KEYS ] = {
|
|||
.color = UI_COLOR_WHITE,
|
||||
.font_size = 12.0,
|
||||
.font_weight = CAIRO_FONT_WEIGHT_BOLD,
|
||||
.shape = UI_SHAPE_BUTTON_NORMAL,
|
||||
.letter_size = 12.0,
|
||||
.layout = UI_LAYOUT_LEFT,
|
||||
.x = 238,
|
||||
|
@ -1746,7 +1665,6 @@ static const x49gp_ui_key_t ui_newrpl_keys[ NB_KEYS ] = {
|
|||
.color = UI_COLOR_WHITE,
|
||||
.font_size = 12.0,
|
||||
.font_weight = CAIRO_FONT_WEIGHT_BOLD,
|
||||
.shape = UI_SHAPE_BUTTON_NORMAL,
|
||||
.letter_size = 12.0,
|
||||
.layout = UI_LAYOUT_LEFT,
|
||||
.x = 0,
|
||||
|
@ -1767,7 +1685,6 @@ static const x49gp_ui_key_t ui_newrpl_keys[ NB_KEYS ] = {
|
|||
.color = UI_COLOR_WHITE,
|
||||
.font_size = 12.0,
|
||||
.font_weight = CAIRO_FONT_WEIGHT_BOLD,
|
||||
.shape = UI_SHAPE_BUTTON_NORMAL,
|
||||
.letter_size = 12.0,
|
||||
.layout = UI_LAYOUT_LEFT,
|
||||
.x = 59,
|
||||
|
@ -1788,7 +1705,6 @@ static const x49gp_ui_key_t ui_newrpl_keys[ NB_KEYS ] = {
|
|||
.color = UI_COLOR_WHITE,
|
||||
.font_size = 12.0,
|
||||
.font_weight = CAIRO_FONT_WEIGHT_BOLD,
|
||||
.shape = UI_SHAPE_BUTTON_NORMAL,
|
||||
.letter_size = 12.0,
|
||||
.layout = UI_LAYOUT_LEFT,
|
||||
.x = 119,
|
||||
|
@ -1809,7 +1725,6 @@ static const x49gp_ui_key_t ui_newrpl_keys[ NB_KEYS ] = {
|
|||
.color = UI_COLOR_WHITE,
|
||||
.font_size = 12.0,
|
||||
.font_weight = CAIRO_FONT_WEIGHT_BOLD,
|
||||
.shape = UI_SHAPE_BUTTON_NORMAL,
|
||||
.letter_size = 12.0,
|
||||
.layout = UI_LAYOUT_LEFT,
|
||||
.x = 179,
|
||||
|
@ -1830,7 +1745,6 @@ static const x49gp_ui_key_t ui_newrpl_keys[ NB_KEYS ] = {
|
|||
.color = UI_COLOR_WHITE,
|
||||
.font_size = 19.0,
|
||||
.font_weight = CAIRO_FONT_WEIGHT_BOLD,
|
||||
.shape = UI_SHAPE_BUTTON_NORMAL,
|
||||
.letter_size = 12.0,
|
||||
.layout = UI_LAYOUT_LEFT_NO_SPACE,
|
||||
.x = 238,
|
||||
|
@ -1851,7 +1765,6 @@ static const x49gp_ui_key_t ui_newrpl_keys[ NB_KEYS ] = {
|
|||
.color = UI_COLOR_BLACK,
|
||||
.font_size = 12.0,
|
||||
.font_weight = CAIRO_FONT_WEIGHT_BOLD,
|
||||
.shape = UI_SHAPE_BUTTON_LARGE,
|
||||
.letter_size = 0.0,
|
||||
.layout = 0,
|
||||
.x = 0,
|
||||
|
@ -1872,7 +1785,6 @@ static const x49gp_ui_key_t ui_newrpl_keys[ NB_KEYS ] = {
|
|||
.color = UI_COLOR_WHITE,
|
||||
.font_size = 19.0,
|
||||
.font_weight = CAIRO_FONT_WEIGHT_BOLD,
|
||||
.shape = UI_SHAPE_BUTTON_LARGE,
|
||||
.letter_size = 0.0,
|
||||
.layout = 0,
|
||||
.x = 59,
|
||||
|
@ -1893,7 +1805,6 @@ static const x49gp_ui_key_t ui_newrpl_keys[ NB_KEYS ] = {
|
|||
.color = UI_COLOR_WHITE,
|
||||
.font_size = 19.0,
|
||||
.font_weight = CAIRO_FONT_WEIGHT_BOLD,
|
||||
.shape = UI_SHAPE_BUTTON_LARGE,
|
||||
.letter_size = 0.0,
|
||||
.layout = 0,
|
||||
.x = 119,
|
||||
|
@ -1914,7 +1825,6 @@ static const x49gp_ui_key_t ui_newrpl_keys[ NB_KEYS ] = {
|
|||
.color = UI_COLOR_WHITE,
|
||||
.font_size = 19.0,
|
||||
.font_weight = CAIRO_FONT_WEIGHT_BOLD,
|
||||
.shape = UI_SHAPE_BUTTON_LARGE,
|
||||
.letter_size = 0.0,
|
||||
.layout = 0,
|
||||
.x = 179,
|
||||
|
@ -1935,7 +1845,6 @@ static const x49gp_ui_key_t ui_newrpl_keys[ NB_KEYS ] = {
|
|||
.color = UI_COLOR_WHITE,
|
||||
.font_size = 19.0,
|
||||
.font_weight = CAIRO_FONT_WEIGHT_BOLD,
|
||||
.shape = UI_SHAPE_BUTTON_LARGE,
|
||||
.letter_size = 0.0,
|
||||
.layout = 0,
|
||||
.x = 238,
|
||||
|
@ -1956,7 +1865,6 @@ static const x49gp_ui_key_t ui_newrpl_keys[ NB_KEYS ] = {
|
|||
.color = UI_COLOR_BLACK,
|
||||
.font_size = 19.0,
|
||||
.font_weight = CAIRO_FONT_WEIGHT_BOLD,
|
||||
.shape = UI_SHAPE_BUTTON_LARGE,
|
||||
.letter_size = 0.0,
|
||||
.layout = 0,
|
||||
.x = 0,
|
||||
|
@ -1977,7 +1885,6 @@ static const x49gp_ui_key_t ui_newrpl_keys[ NB_KEYS ] = {
|
|||
.color = UI_COLOR_WHITE,
|
||||
.font_size = 19.0,
|
||||
.font_weight = CAIRO_FONT_WEIGHT_BOLD,
|
||||
.shape = UI_SHAPE_BUTTON_LARGE,
|
||||
.letter_size = 0.0,
|
||||
.layout = 0,
|
||||
.x = 59,
|
||||
|
@ -1998,7 +1905,6 @@ static const x49gp_ui_key_t ui_newrpl_keys[ NB_KEYS ] = {
|
|||
.color = UI_COLOR_WHITE,
|
||||
.font_size = 19.0,
|
||||
.font_weight = CAIRO_FONT_WEIGHT_BOLD,
|
||||
.shape = UI_SHAPE_BUTTON_LARGE,
|
||||
.letter_size = 0.0,
|
||||
.layout = 0,
|
||||
.x = 119,
|
||||
|
@ -2019,7 +1925,6 @@ static const x49gp_ui_key_t ui_newrpl_keys[ NB_KEYS ] = {
|
|||
.color = UI_COLOR_WHITE,
|
||||
.font_size = 19.0,
|
||||
.font_weight = CAIRO_FONT_WEIGHT_BOLD,
|
||||
.shape = UI_SHAPE_BUTTON_LARGE,
|
||||
.letter_size = 0.0,
|
||||
.layout = 0,
|
||||
.x = 179,
|
||||
|
@ -2040,7 +1945,6 @@ static const x49gp_ui_key_t ui_newrpl_keys[ NB_KEYS ] = {
|
|||
.color = UI_COLOR_WHITE,
|
||||
.font_size = 19.0,
|
||||
.font_weight = CAIRO_FONT_WEIGHT_BOLD,
|
||||
.shape = UI_SHAPE_BUTTON_LARGE,
|
||||
.letter_size = 0.0,
|
||||
.layout = 0,
|
||||
.x = 238,
|
||||
|
@ -2061,7 +1965,6 @@ static const x49gp_ui_key_t ui_newrpl_keys[ NB_KEYS ] = {
|
|||
.color = UI_COLOR_BLACK,
|
||||
.font_size = 19.0,
|
||||
.font_weight = CAIRO_FONT_WEIGHT_BOLD,
|
||||
.shape = UI_SHAPE_BUTTON_LARGE,
|
||||
.letter_size = 0.0,
|
||||
.layout = 0,
|
||||
.x = 0,
|
||||
|
@ -2082,7 +1985,6 @@ static const x49gp_ui_key_t ui_newrpl_keys[ NB_KEYS ] = {
|
|||
.color = UI_COLOR_WHITE,
|
||||
.font_size = 19.0,
|
||||
.font_weight = CAIRO_FONT_WEIGHT_BOLD,
|
||||
.shape = UI_SHAPE_BUTTON_LARGE,
|
||||
.letter_size = 0.0,
|
||||
.layout = 0,
|
||||
.x = 59,
|
||||
|
@ -2103,7 +2005,6 @@ static const x49gp_ui_key_t ui_newrpl_keys[ NB_KEYS ] = {
|
|||
.color = UI_COLOR_WHITE,
|
||||
.font_size = 19.0,
|
||||
.font_weight = CAIRO_FONT_WEIGHT_BOLD,
|
||||
.shape = UI_SHAPE_BUTTON_LARGE,
|
||||
.letter_size = 0.0,
|
||||
.layout = 0,
|
||||
.x = 119,
|
||||
|
@ -2124,7 +2025,6 @@ static const x49gp_ui_key_t ui_newrpl_keys[ NB_KEYS ] = {
|
|||
.color = UI_COLOR_WHITE,
|
||||
.font_size = 19.0,
|
||||
.font_weight = CAIRO_FONT_WEIGHT_BOLD,
|
||||
.shape = UI_SHAPE_BUTTON_LARGE,
|
||||
.letter_size = 0.0,
|
||||
.layout = 0,
|
||||
.x = 179,
|
||||
|
@ -2145,7 +2045,6 @@ static const x49gp_ui_key_t ui_newrpl_keys[ NB_KEYS ] = {
|
|||
.color = UI_COLOR_WHITE,
|
||||
.font_size = 19.0,
|
||||
.font_weight = CAIRO_FONT_WEIGHT_BOLD,
|
||||
.shape = UI_SHAPE_BUTTON_LARGE,
|
||||
.letter_size = 0.0,
|
||||
.layout = 0,
|
||||
.x = 238,
|
||||
|
@ -2166,7 +2065,6 @@ static const x49gp_ui_key_t ui_newrpl_keys[ NB_KEYS ] = {
|
|||
.color = UI_COLOR_WHITE,
|
||||
.font_size = 12.0,
|
||||
.font_weight = CAIRO_FONT_WEIGHT_BOLD,
|
||||
.shape = UI_SHAPE_BUTTON_LARGE,
|
||||
.letter_size = 0.0,
|
||||
.layout = 0,
|
||||
.x = 0,
|
||||
|
@ -2187,7 +2085,6 @@ static const x49gp_ui_key_t ui_newrpl_keys[ NB_KEYS ] = {
|
|||
.color = UI_COLOR_WHITE,
|
||||
.font_size = 19.0,
|
||||
.font_weight = CAIRO_FONT_WEIGHT_BOLD,
|
||||
.shape = UI_SHAPE_BUTTON_LARGE,
|
||||
.letter_size = 0.0,
|
||||
.layout = 0,
|
||||
.x = 59,
|
||||
|
@ -2208,7 +2105,6 @@ static const x49gp_ui_key_t ui_newrpl_keys[ NB_KEYS ] = {
|
|||
.color = UI_COLOR_WHITE,
|
||||
.font_size = 19.0,
|
||||
.font_weight = CAIRO_FONT_WEIGHT_BOLD,
|
||||
.shape = UI_SHAPE_BUTTON_LARGE,
|
||||
.letter_size = 0.0,
|
||||
.layout = 0,
|
||||
.x = 119,
|
||||
|
@ -2229,7 +2125,6 @@ static const x49gp_ui_key_t ui_newrpl_keys[ NB_KEYS ] = {
|
|||
.color = UI_COLOR_WHITE,
|
||||
.font_size = 12.0,
|
||||
.font_weight = CAIRO_FONT_WEIGHT_BOLD,
|
||||
.shape = UI_SHAPE_BUTTON_LARGE,
|
||||
.letter_size = 0.0,
|
||||
.layout = 0,
|
||||
.x = 179,
|
||||
|
@ -2250,7 +2145,6 @@ static const x49gp_ui_key_t ui_newrpl_keys[ NB_KEYS ] = {
|
|||
.color = UI_COLOR_WHITE,
|
||||
.font_size = 12.0,
|
||||
.font_weight = CAIRO_FONT_WEIGHT_BOLD,
|
||||
.shape = UI_SHAPE_BUTTON_LARGE,
|
||||
.letter_size = 0.0,
|
||||
.layout = 0,
|
||||
.x = 238,
|
||||
|
@ -2298,37 +2192,10 @@ static void x49gp_ui_style_init( GtkStyle* style, GtkWidget* widget, GdkColor* f
|
|||
style->ythickness = 0;
|
||||
}
|
||||
|
||||
static GdkPixbuf* x49gp_pixbuf_new_from_inline( gint data_length, const guint8* data )
|
||||
{
|
||||
const pixbuf_inline_data_t* pbd = ( const pixbuf_inline_data_t* )data;
|
||||
uint32_t magic, rowstride, width, height, length;
|
||||
const guint8* pixdata;
|
||||
|
||||
magic = ntohl( pbd->magic );
|
||||
const uint32_t PIXBUF_MAGIC = 0x47646b50;
|
||||
if ( magic != PIXBUF_MAGIC )
|
||||
return NULL;
|
||||
|
||||
length = ntohl( pbd->length );
|
||||
/* The data comes from a C string, which contains a trailing \0. */
|
||||
/* This will be counted by sizeof(), but the embedded header */
|
||||
/* specifies the true size. Compensate by adding 1 to it. */
|
||||
if ( length + 1 != data_length )
|
||||
return NULL;
|
||||
|
||||
width = ntohl( pbd->width );
|
||||
height = ntohl( pbd->height );
|
||||
rowstride = ntohl( pbd->rowstride );
|
||||
|
||||
pixdata = ( void* )( pbd + 1 );
|
||||
|
||||
return gdk_pixbuf_new_from_data( pixdata, GDK_COLORSPACE_RGB, true, 8, width, height, rowstride, NULL, NULL );
|
||||
}
|
||||
|
||||
static int x49gp_ui_button_pixmaps_init( x49gp_t* x49gp, x49gp_ui_button_t* button, x49gp_ui_color_t color )
|
||||
{
|
||||
x49gp_ui_t* ui = x49gp->ui;
|
||||
GdkPixbuf *src, *dst;
|
||||
GdkPixbuf *src;
|
||||
cairo_t* cr;
|
||||
GtkStyle* style = gtk_style_new();
|
||||
|
||||
|
@ -2337,24 +2204,10 @@ static int x49gp_ui_button_pixmaps_init( x49gp_t* x49gp, x49gp_ui_button_t* butt
|
|||
for ( int i = 0; i < 5; i++ ) {
|
||||
style->bg_pixmap[ i ] = gdk_pixmap_new( gtk_widget_get_window( ui->window ), button->key->width, button->key->height, -1 );
|
||||
|
||||
if ( i == GTK_STATE_ACTIVE ) {
|
||||
if ( color == UI_COLOR_SILVER ) {
|
||||
src = gdk_pixbuf_new_subpixbuf( ui->bg_pixbuf, ui->kb_x_offset + button->key->x, ui->kb_y_offset + button->key->y,
|
||||
button->key->width, button->key->height );
|
||||
dst = gdk_pixbuf_copy( src );
|
||||
g_object_unref( src );
|
||||
|
||||
src = x49gp_pixbuf_new_from_inline( sizeof( button_round ), button_round );
|
||||
|
||||
gdk_pixbuf_composite( src, dst, 0, 0, button->key->width, button->key->height, 0.0, 0.0, 1.0, 1.0, GDK_INTERP_HYPER, 0xff );
|
||||
|
||||
g_object_unref( src );
|
||||
src = dst;
|
||||
} else
|
||||
if ( i == GTK_STATE_ACTIVE )
|
||||
src = gdk_pixbuf_new_subpixbuf( ui->bg_pixbuf, ui->kb_x_offset + button->key->x, ui->kb_y_offset + button->key->y + 1,
|
||||
button->key->width, button->key->height );
|
||||
|
||||
} else
|
||||
else
|
||||
src = gdk_pixbuf_new_subpixbuf( ui->bg_pixbuf, ui->kb_x_offset + button->key->x, ui->kb_y_offset + button->key->y,
|
||||
button->key->width, button->key->height );
|
||||
|
||||
|
@ -3905,18 +3758,6 @@ static int gui_load( x49gp_module_t* module, GKeyFile* keyfile )
|
|||
x49gp_t* x49gp = module->x49gp;
|
||||
x49gp_ui_t* ui = module->user_data;
|
||||
|
||||
/* create all buttons' shapes */
|
||||
ui->shapes[ UI_SHAPE_BUTTON_TINY ] =
|
||||
gdk_bitmap_create_from_data( NULL, ( char* )button_tiny_bits, button_tiny_width, button_tiny_height );
|
||||
ui->shapes[ UI_SHAPE_BUTTON_SMALL ] =
|
||||
gdk_bitmap_create_from_data( NULL, ( char* )button_small_bits, button_small_width, button_small_height );
|
||||
ui->shapes[ UI_SHAPE_BUTTON_NORMAL ] =
|
||||
gdk_bitmap_create_from_data( NULL, ( char* )button_normal_bits, button_normal_width, button_normal_height );
|
||||
ui->shapes[ UI_SHAPE_BUTTON_LARGE ] =
|
||||
gdk_bitmap_create_from_data( NULL, ( char* )button_large_bits, button_large_width, button_large_height );
|
||||
ui->shapes[ UI_SHAPE_BUTTON_ROUND ] =
|
||||
gdk_bitmap_create_from_data( NULL, ( char* )button_round_bits, button_round_width, button_round_height );
|
||||
|
||||
/* create all colors */
|
||||
x49gp_ui_color_init( &ui->colors[ UI_COLOR_BLACK ], 0x00, 0x00, 0x00 ); /* #000000 */
|
||||
x49gp_ui_color_init( &ui->colors[ UI_COLOR_WHITE ], 0xff, 0xff, 0xff ); /* #ffffff */
|
||||
|
@ -4055,7 +3896,6 @@ static int gui_load( x49gp_module_t* module, GKeyFile* keyfile )
|
|||
button->box = gtk_event_box_new();
|
||||
gtk_event_box_set_visible_window( GTK_EVENT_BOX( button->box ), true );
|
||||
gtk_event_box_set_above_child( GTK_EVENT_BOX( button->box ), false );
|
||||
gtk_widget_shape_combine_mask( button->box, ui->shapes[ keys[ i ].shape ], 0, 0 );
|
||||
gtk_container_add( GTK_CONTAINER( button->box ), button->button );
|
||||
|
||||
x49gp_ui_place_at( x49gp, GTK_FIXED( ui->fixed ), button->box, ui->kb_x_offset + keys[ i ].x, ui->kb_y_offset + keys[ i ].y,
|
||||
|
|
|
@ -40,15 +40,6 @@ typedef enum {
|
|||
UI_COLOR_MAX
|
||||
} x49gp_ui_color_t;
|
||||
|
||||
typedef enum {
|
||||
UI_SHAPE_BUTTON_TINY = 0,
|
||||
UI_SHAPE_BUTTON_SMALL,
|
||||
UI_SHAPE_BUTTON_NORMAL,
|
||||
UI_SHAPE_BUTTON_LARGE,
|
||||
UI_SHAPE_BUTTON_ROUND,
|
||||
UI_SHAPE_MAX
|
||||
} x49gp_ui_shape_t;
|
||||
|
||||
typedef enum { UI_LAYOUT_LEFT = 0, UI_LAYOUT_LEFT_NO_SPACE, UI_LAYOUT_BELOW, UI_LAYOUT_MAX } x49gp_ui_layout_t;
|
||||
|
||||
typedef enum {
|
||||
|
@ -67,7 +58,6 @@ typedef struct {
|
|||
x49gp_ui_color_t color;
|
||||
double font_size;
|
||||
cairo_font_weight_t font_weight;
|
||||
x49gp_ui_shape_t shape;
|
||||
double letter_size;
|
||||
x49gp_ui_layout_t layout;
|
||||
int x;
|
||||
|
@ -105,7 +95,6 @@ struct __x49gp_ui_s__ {
|
|||
GtkWidget* background;
|
||||
|
||||
GdkColor colors[ UI_COLOR_MAX ];
|
||||
GdkBitmap* shapes[ UI_SHAPE_MAX ];
|
||||
|
||||
x49gp_ui_calculator_t calculator;
|
||||
|
||||
|
|
Loading…
Reference in a new issue