diff --git a/res/58/cancel.png b/res/58/cancel.png new file mode 100644 index 0000000..6fb48be Binary files /dev/null and b/res/58/cancel.png differ diff --git a/res/58/disk.png b/res/58/disk.png new file mode 100644 index 0000000..2ed55b2 Binary files /dev/null and b/res/58/disk.png differ diff --git a/res/58/edit-copy.png b/res/58/edit-copy.png new file mode 100644 index 0000000..aae59b2 Binary files /dev/null and b/res/58/edit-copy.png differ diff --git a/res/58/edit-cut.png b/res/58/edit-cut.png new file mode 100644 index 0000000..213bea4 Binary files /dev/null and b/res/58/edit-cut.png differ diff --git a/res/58/edit-paste.png b/res/58/edit-paste.png new file mode 100644 index 0000000..11311a0 Binary files /dev/null and b/res/58/edit-paste.png differ diff --git a/res/58/edit.png b/res/58/edit.png new file mode 100644 index 0000000..762a3e8 Binary files /dev/null and b/res/58/edit.png differ diff --git a/res/58/file-text.png b/res/58/file-text.png new file mode 100644 index 0000000..065f4b4 Binary files /dev/null and b/res/58/file-text.png differ diff --git a/res/58/file.png b/res/58/file.png new file mode 100644 index 0000000..6d102f0 Binary files /dev/null and b/res/58/file.png differ diff --git a/res/58/floppy.png b/res/58/floppy.png new file mode 100644 index 0000000..f9a19b9 Binary files /dev/null and b/res/58/floppy.png differ diff --git a/res/58/folder-new.png b/res/58/folder-new.png new file mode 100644 index 0000000..6d9eb32 Binary files /dev/null and b/res/58/folder-new.png differ diff --git a/res/58/folder.png b/res/58/folder.png new file mode 100644 index 0000000..4fd56fe Binary files /dev/null and b/res/58/folder.png differ diff --git a/res/58/image.png b/res/58/image.png new file mode 100644 index 0000000..e8124b2 Binary files /dev/null and b/res/58/image.png differ diff --git a/res/58/keyboard_arrow.png b/res/58/keyboard_arrow.png new file mode 100644 index 0000000..a092e8f Binary files /dev/null and b/res/58/keyboard_arrow.png differ diff --git a/res/58/keyboard_backspace.png b/res/58/keyboard_backspace.png new file mode 100644 index 0000000..9c9a6e3 Binary files /dev/null and b/res/58/keyboard_backspace.png differ diff --git a/res/58/keyboard_enter.png b/res/58/keyboard_enter.png new file mode 100644 index 0000000..7dbfa14 Binary files /dev/null and b/res/58/keyboard_enter.png differ diff --git a/res/58/keyboard_shift_empty.png b/res/58/keyboard_shift_empty.png new file mode 100644 index 0000000..5992d61 Binary files /dev/null and b/res/58/keyboard_shift_empty.png differ diff --git a/res/58/keyboard_shift_full.png b/res/58/keyboard_shift_full.png new file mode 100644 index 0000000..b2fd897 Binary files /dev/null and b/res/58/keyboard_shift_full.png differ diff --git a/res/58/none.png b/res/58/none.png new file mode 100644 index 0000000..800904c Binary files /dev/null and b/res/58/none.png differ diff --git a/res/58/plus.png b/res/58/plus.png new file mode 100644 index 0000000..2dd7953 Binary files /dev/null and b/res/58/plus.png differ diff --git a/res/58/quit.png b/res/58/quit.png new file mode 100644 index 0000000..d969d05 Binary files /dev/null and b/res/58/quit.png differ diff --git a/res/58/select.png b/res/58/select.png new file mode 100644 index 0000000..0940936 Binary files /dev/null and b/res/58/select.png differ diff --git a/res/58/trash.png b/res/58/trash.png new file mode 100644 index 0000000..d2b6e8c Binary files /dev/null and b/res/58/trash.png differ diff --git a/res/58/up.png b/res/58/up.png new file mode 100644 index 0000000..3f4871b Binary files /dev/null and b/res/58/up.png differ diff --git a/src/def.h b/src/def.h index 89e6505..839eae7 100644 --- a/src/def.h +++ b/src/def.h @@ -24,6 +24,7 @@ #define MARGIN_X 8 #define KEYBOARD_MARGIN 3 #define KEYBOARD_KEY_SPACING 3 + #define KEYBOARD_SYMBOL_SIZE 24 // Parameters for RG351V #elif defined(DEVICE_RG351V) @@ -39,6 +40,7 @@ #define MARGIN_X 10 #define KEYBOARD_MARGIN 8 #define KEYBOARD_KEY_SPACING 4 + #define KEYBOARD_SYMBOL_SIZE 24 // Parameters for RG351MP #elif defined(DEVICE_RG351MP) @@ -54,6 +56,7 @@ #define MARGIN_X 10 #define KEYBOARD_MARGIN 8 #define KEYBOARD_KEY_SPACING 4 + #define KEYBOARD_SYMBOL_SIZE 24 // Parameters for RGB10 #elif defined(DEVICE_RGB10) @@ -69,6 +72,7 @@ #define MARGIN_X 8 #define KEYBOARD_MARGIN 3 #define KEYBOARD_KEY_SPACING 3 + #define KEYBOARD_SYMBOL_SIZE 24 // Parameters for RK2020 #elif defined(DEVICE_RK2020) @@ -84,6 +88,7 @@ #define MARGIN_X 8 #define KEYBOARD_MARGIN 3 #define KEYBOARD_KEY_SPACING 3 + #define KEYBOARD_SYMBOL_SIZE 24 // Parameters for CHI #elif defined(DEVICE_CHI) @@ -99,6 +104,7 @@ #define MARGIN_X 10 #define KEYBOARD_MARGIN 8 #define KEYBOARD_KEY_SPACING 4 + #define KEYBOARD_SYMBOL_SIZE 24 // Paramaters for desktop PC #else @@ -114,6 +120,7 @@ #define MARGIN_X 10 #define KEYBOARD_MARGIN 8 #define KEYBOARD_KEY_SPACING 4 + #define KEYBOARD_SYMBOL_SIZE 24 #endif // Colors diff --git a/src/keyboard.cpp b/src/keyboard.cpp index 32609d5..53f6d66 100644 --- a/src/keyboard.cpp +++ b/src/keyboard.cpp @@ -23,7 +23,7 @@ Keyboard::Keyboard(IWindow *p_parent, const bool p_quitOnEnter): m_keyLabel[2] = "1234567890 .,:!?/\\\"' ()[]<>_;$"; m_keyLabel[3] = "1234567890 ()[]{}~|^ @#%&*-+=`"; std::ostringstream oss; - oss << '/' << ICON_SIZE; + oss << '/' << KEYBOARD_SYMBOL_SIZE; m_texShiftEmpty = SDLUtils::loadTexture(std::string(RES_PATH) + oss.str() + "/keyboard_shift_empty.png"); m_texShiftFull = SDLUtils::loadTexture(std::string(RES_PATH) + oss.str() + "/keyboard_shift_full.png"); m_texEnter = SDLUtils::loadTexture(std::string(RES_PATH) + oss.str() + "/keyboard_enter.png");