Index: apps/action.h
===================================================================
--- apps/action.h (Revision 19572)
+++ apps/action.h (Arbeitskopie)
@@ -188,13 +188,12 @@
/* bookmark screen */
ACTION_BMS_DELETE,
- /* alarm menu screen */
-
/* quickscreen */
ACTION_QS_LEFT,
ACTION_QS_RIGHT,
ACTION_QS_DOWN,
- ACTION_QS_DOWNINV, /* why is this not called up?? :p */
+ ACTION_QS_DOWNINV, /* for flipped display on recorder and remotes */
+ ACTION_QS_TOP, /* other targets can use a 4th item */
/* pitchscreen */
/* obviously ignore if you dont have thise screen */
Index: apps/lang/deutsch.lang
===================================================================
--- apps/lang/deutsch.lang (Revision 19572)
+++ apps/lang/deutsch.lang (Arbeitskopie)
@@ -12187,3 +12187,20 @@
quickscreen: ""
+
+ id: LANG_TOP_QS_ITEM
+ desc: used for the submenu name for the quickscreen items
+ user:
+
+ *: none
+ quickscreen: "Set as Top Quickscreen Item"
+
+
+ *: none
+ quickscreen: "Als obere Schnelleinstellung verwenden"
+
+
+ *: none
+ quickscreen: "Als obere Schnelleinstellung verwenden"
+
+
Index: apps/lang/english.lang
===================================================================
--- apps/lang/english.lang (Revision 19572)
+++ apps/lang/english.lang (Arbeitskopie)
@@ -12243,3 +12243,20 @@
quickscreen: "Set as Bottom Quickscreen Item"
+
+ id: LANG_TOP_QS_ITEM
+ desc: used for the submenu name for the quickscreen items
+ user:
+
+ *: none
+ quickscreen: "Set as Top Quickscreen Item"
+
+
+ *: none
+ quickscreen: "Set as Top Quickscreen Item"
+
+
+ *: none
+ quickscreen: "Set as Top Quickscreen Item"
+
+
Index: apps/gui/quickscreen.c
===================================================================
--- apps/gui/quickscreen.c (Revision 19572)
+++ apps/gui/quickscreen.c (Arbeitskopie)
@@ -39,17 +39,20 @@
#include "talk.h"
#include "list.h"
#include "splash.h"
+#include "debug.h"
static struct viewport vps[NB_SCREENS][QUICKSCREEN_ITEM_COUNT];
static struct viewport vp_icons[NB_SCREENS];
-/* vp_icons will be used like this:
- the side icons will be aligned to the top of this vp and to their sides
- the bottom icon wil be aligned center and at the bottom of this vp */
+/* vp_icons will contain 4 icons for normal screens, and 3 for remotes
+ * this is because remotes only show 3 items due to limited space
+ * and a rather odd button situation */
-#define MIN_LINES 4
-#define MAX_NEEDED_LINES 8
-#define CENTER_MARGIN 10 /* pixels between the 2 center items minimum */
-#define CENTER_ICONAREA_WIDTH (CENTER_MARGIN+8*2)
+#define MIN_LINES 6 /* 2 top, 2 bottom, 2 on either side */
+#define MAX_NEEDED_LINES 10
+ /* pixels between the 2 center items minimum or between text and icons,
+ * and between text and parent boundaries */
+#define MARGIN 10
+#define CENTER_ICONAREA_SIZE (MARGIN+8*2)
static void quickscreen_fix_viewports(struct gui_quickscreen *qs,
struct screen *display,
@@ -60,52 +63,67 @@
#else
const int screen = 0;
#endif
-
- int char_height, i, width, pad = 0;
- int left_width, right_width, bottom_lines = 2;
+ /* remotes do not show the top item so MIN_LINES is only 4 */
+ const int min_lines = (screen == SCREEN_MAIN ? MIN_LINES : MIN_LINES - 2);
+ int char_height, width, pad = 0;
+ int left_width, right_width, vert_lines;
unsigned char *s;
int nb_lines = viewport_get_nb_lines(parent);
char_height = parent->height/nb_lines;
/* center the icons VP first */
vp_icons[screen] = *parent;
- vp_icons[screen].width = CENTER_ICONAREA_WIDTH; /* abosulte smallest allowed */
- vp_icons[screen].x = (parent->width-parent->x-CENTER_ICONAREA_WIDTH)/2;
+ vp_icons[screen].width = CENTER_ICONAREA_SIZE; /* abosulte smallest allowed */
+ vp_icons[screen].x = parent->x;
+ vp_icons[screen].x += (parent->width-CENTER_ICONAREA_SIZE)/2;
+
vps[screen][QUICKSCREEN_BOTTOM] = *parent;
- if (nb_lines <= MIN_LINES) /* make the bottom item use 1 line */
- bottom_lines = 1;
+ vps[screen][QUICKSCREEN_TOP] = *parent;
+ /* depending on the space the top/buttom items use 1 or 2 lines */
+ if (nb_lines < min_lines)
+ vert_lines = 1;
else
- bottom_lines = 2;
- vps[screen][QUICKSCREEN_BOTTOM].height = bottom_lines*char_height;
- vps[screen][QUICKSCREEN_BOTTOM].y =
- parent->y + parent->height - bottom_lines*char_height;
+ vert_lines = 2;
+ vps[screen][QUICKSCREEN_TOP].y = parent->y;
+ vps[screen][QUICKSCREEN_TOP].height = vps[screen][QUICKSCREEN_BOTTOM].height
+ = vert_lines*char_height;
+ vps[screen][QUICKSCREEN_BOTTOM].y
+ = parent->y + parent->height - vps[screen][QUICKSCREEN_BOTTOM].height;
+
+ /* enough space vertically, so put a nice margin */
if (nb_lines >= MAX_NEEDED_LINES)
{
- vps[screen][QUICKSCREEN_BOTTOM].y -= char_height;
+ vps[screen][QUICKSCREEN_TOP].y += MARGIN;
+ vps[screen][QUICKSCREEN_BOTTOM].y -= MARGIN;
}
+ vp_icons[screen].y = vps[screen][QUICKSCREEN_TOP].y
+ + vps[screen][QUICKSCREEN_TOP].height;
+ vp_icons[screen].height = parent->height - vp_icons[screen].y;
+ vp_icons[screen].height -= parent->height - vps[screen][QUICKSCREEN_BOTTOM].y;
+
/* adjust the left/right items widths to fit the screen nicely */
s = P2STR(ID2P(qs->items[QUICKSCREEN_LEFT]->lang_id));
left_width = display->getstringsize(s, NULL, NULL);
s = P2STR(ID2P(qs->items[QUICKSCREEN_RIGHT]->lang_id));
right_width = display->getstringsize(s, NULL, NULL);
- nb_lines -= bottom_lines;
-
+
width = MAX(left_width, right_width);
if (width*2 + vp_icons[screen].width > display->lcdwidth)
width = (display->lcdwidth - vp_icons[screen].width)/2;
else /* add more gap in icons vp */
{
int excess = display->lcdwidth - vp_icons[screen].width - width*2;
- if (excess > CENTER_MARGIN*4)
+ if (excess > MARGIN*4)
{
- pad = CENTER_MARGIN;
- excess -= CENTER_MARGIN*2;
+ pad = MARGIN;
+ excess -= MARGIN*2;
}
vp_icons[screen].x -= excess/2;
vp_icons[screen].width += excess;
}
+
vps[screen][QUICKSCREEN_LEFT] = *parent;
vps[screen][QUICKSCREEN_LEFT].x = parent->x + pad;
vps[screen][QUICKSCREEN_LEFT].width = width;
@@ -113,32 +131,37 @@
vps[screen][QUICKSCREEN_RIGHT] = *parent;
vps[screen][QUICKSCREEN_RIGHT].x = parent->x + parent->width - width - pad;
vps[screen][QUICKSCREEN_RIGHT].width = width;
-
+
+ vps[screen][QUICKSCREEN_LEFT].height = vps[screen][QUICKSCREEN_RIGHT].height
+ = 2*char_height;
+
+ if (screen == SCREEN_MAIN)
+ {
+ vps[screen][QUICKSCREEN_LEFT].y = vps[screen][QUICKSCREEN_RIGHT].y
+ = parent->y + (parent->height/2) - char_height;
+ }
+ else
+ {
+ /* remotes only show 3 items so fix the viewport here to match with
+ * left/right items */
+ vps[screen][QUICKSCREEN_LEFT].y = vps[screen][QUICKSCREEN_RIGHT].y
+ = parent->y;
+ vp_icons[screen].y = vps[screen][QUICKSCREEN_LEFT].y + char_height/2;
+ vp_icons[screen].height = parent->height
+ - vps[screen][QUICKSCREEN_BOTTOM].height - char_height/2;
+ }
/* shrink the icons vp by a few pixels if there is room so the arrows
aren't drawn right next to the text */
- if (vp_icons[screen].width > CENTER_ICONAREA_WIDTH+8)
+ if (vp_icons[screen].width > CENTER_ICONAREA_SIZE+MARGIN*2)
{
- vp_icons[screen].width -= 8;
- vp_icons[screen].x += 4;
+ vp_icons[screen].width -= MARGIN*2;
+ vp_icons[screen].x += MARGIN;
}
-
-
- if (nb_lines <= MIN_LINES)
- i = 0;
- else
- i = nb_lines/2;
- vps[screen][QUICKSCREEN_LEFT].y = parent->y + (i*char_height);
- vps[screen][QUICKSCREEN_RIGHT].y = parent->y + (i*char_height);
- if (nb_lines >= 3)
- i = 3*char_height;
- else
- i = nb_lines*char_height;
-
- vps[screen][QUICKSCREEN_LEFT].height = i;
- vps[screen][QUICKSCREEN_RIGHT].height = i;
- vp_icons[screen].y = vps[screen][QUICKSCREEN_LEFT].y + (char_height/2);
- vp_icons[screen].height =
- vps[screen][QUICKSCREEN_BOTTOM].y - vp_icons[screen].y;
+ if (vp_icons[screen].height > CENTER_ICONAREA_SIZE+MARGIN*2)
+ {
+ vp_icons[screen].height -= MARGIN*2;
+ vp_icons[screen].y += MARGIN;
+ }
}
static void quickscreen_draw_text(char *s, int item, bool title,
@@ -152,6 +175,7 @@
line = 1;
switch (item)
{
+ case QUICKSCREEN_TOP:
case QUICKSCREEN_BOTTOM:
x = (vp->width - w)/2;
break;
@@ -187,6 +211,9 @@
display->clear_viewport();
for (i=0; iitems[i])
continue;
display->set_viewport(&vps[screen][i]);
@@ -213,13 +240,25 @@
}
/* draw the icons */
display->set_viewport(&vp_icons[screen]);
- display->mono_bitmap(bitmap_icons_7x8[Icon_FastForward],
- vp_icons[screen].width - 8, 0, 7, 8);
- display->mono_bitmap(bitmap_icons_7x8[Icon_FastBackward], 0, 0, 7, 8);
+ if (screen == SCREEN_MAIN)
+ {
+ display->mono_bitmap(bitmap_icons_7x8[Icon_UpArrow],
+ (vp_icons[screen].width/2) - 4, 0, 7, 8);
+ display->mono_bitmap(bitmap_icons_7x8[Icon_FastForward],
+ vp_icons[screen].width - 8,
+ (vp_icons[screen].height/2) - 4, 7, 8);
+ display->mono_bitmap(bitmap_icons_7x8[Icon_FastBackward], 0,
+ (vp_icons[screen].height/2) - 4, 7, 8);
+ }
+ else
+ {
+ display->mono_bitmap(bitmap_icons_7x8[Icon_FastForward],
+ vp_icons[screen].width - 8, 0, 7, 8);
+ display->mono_bitmap(bitmap_icons_7x8[Icon_FastBackward], 0, 0, 7, 8);
+ }
display->mono_bitmap(bitmap_icons_7x8[Icon_DownArrow],
(vp_icons[screen].width/2) - 4,
- vp_icons[screen].height - 7, 7, 8);
- display->update_viewport();
+ vp_icons[screen].height - 7, 7, 8);
display->set_viewport(parent);
display->update_viewport();
@@ -247,6 +286,9 @@
int item;
switch(button)
{
+ case ACTION_QS_TOP:
+ item = QUICKSCREEN_TOP;
+ break;
case ACTION_QS_LEFT:
item = QUICKSCREEN_LEFT;
break;
@@ -337,6 +379,9 @@
bool oldshuffle = global_settings.playlist_shuffle;
int oldrepeat = global_settings.repeat_mode;
+ qs.items[QUICKSCREEN_TOP] =
+ get_setting(global_settings.qs_item_top,
+ find_setting(&global_settings.crossfeed, NULL));
qs.items[QUICKSCREEN_LEFT] =
get_setting(global_settings.qs_item_left,
find_setting(&global_settings.playlist_shuffle, NULL));
@@ -422,6 +467,8 @@
}
switch (item)
{
+ case QUICKSCREEN_TOP:
+ global_settings.qs_item_top = i;
case QUICKSCREEN_LEFT:
global_settings.qs_item_left = i;
break;
@@ -431,7 +478,7 @@
case QUICKSCREEN_BOTTOM:
global_settings.qs_item_bottom = i;
break;
- default: /* shut the copiler up */
+ default: /* shut the compiler up */
break;
}
}
Index: apps/gui/quickscreen.h
===================================================================
--- apps/gui/quickscreen.h (Revision 19572)
+++ apps/gui/quickscreen.h (Arbeitskopie)
@@ -30,7 +30,8 @@
#include "screen_access.h"
enum QUICKSCREEN_ITEM {
- QUICKSCREEN_LEFT = 0,
+ QUICKSCREEN_TOP = 0,
+ QUICKSCREEN_LEFT,
QUICKSCREEN_RIGHT,
QUICKSCREEN_BOTTOM,
QUICKSCREEN_ITEM_COUNT,
Index: apps/menu.c
===================================================================
--- apps/menu.c (Revision 19572)
+++ apps/menu.c (Arbeitskopie)
@@ -505,6 +505,7 @@
MENUITEM_STRINGLIST(quickscreen_able_option,
ID2P(LANG_ONPLAY_MENU_TITLE), NULL,
ID2P(LANG_RESET_SETTING),
+ ID2P(LANG_TOP_QS_ITEM),
ID2P(LANG_LEFT_QS_ITEM),
ID2P(LANG_BOTTOM_QS_ITEM),
ID2P(LANG_RIGHT_QS_ITEM));
@@ -531,13 +532,16 @@
break;
#ifdef HAVE_QUICKSCREEN
break;
- case 1: /* set as left QS item */
+ case 1: /* set as top QS item */
+ set_as_qs_item(setting, QUICKSCREEN_TOP);
+ break;
+ case 2: /* set as left QS item */
set_as_qs_item(setting, QUICKSCREEN_LEFT);
break;
- case 2: /* set as bottom QS item */
+ case 3: /* set as bottom QS item */
set_as_qs_item(setting, QUICKSCREEN_BOTTOM);
break;
- case 3: /* set as right QS item */
+ case 4: /* set as right QS item */
set_as_qs_item(setting, QUICKSCREEN_RIGHT);
break;
#endif
Index: apps/settings.h
===================================================================
--- apps/settings.h (Revision 19572)
+++ apps/settings.h (Arbeitskopie)
@@ -768,6 +768,7 @@
#endif
#ifdef HAVE_QUICKSCREEN
/* these are split because settings_list cant handle arrays */
+ int qs_item_top;
int qs_item_left;
int qs_item_right;
int qs_item_bottom;
Index: apps/settings_list.c
===================================================================
--- apps/settings_list.c (Revision 19572)
+++ apps/settings_list.c (Arbeitskopie)
@@ -1433,6 +1433,10 @@
ID2P(LANG_NORMAL), ID2P(LANG_HIGH)),
#endif
#ifdef HAVE_QUICKSCREEN
+ CUSTOM_SETTING(0, qs_item_top, LANG_TOP_QS_ITEM,
+ &global_settings.crossfeed, "qs top",
+ qs_load_from_cfg, qs_write_to_cfg,
+ qs_is_changed, qs_set_default),
CUSTOM_SETTING(0, qs_item_left, LANG_LEFT_QS_ITEM,
&global_settings.playlist_shuffle, "qs left",
qs_load_from_cfg, qs_write_to_cfg,
Index: apps/keymaps/keymap-m200.c
===================================================================
--- apps/keymaps/keymap-m200.c (Revision 19572)
+++ apps/keymaps/keymap-m200.c (Arbeitskopie)
@@ -164,8 +164,8 @@
{ ACTION_NONE, BUTTON_LEFT, BUTTON_NONE },
{ ACTION_STD_CANCEL, BUTTON_POWER|BUTTON_REL, BUTTON_NONE },
- { ACTION_QS_DOWNINV, BUTTON_UP|BUTTON_REL, BUTTON_NONE },
- { ACTION_QS_DOWNINV, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE },
+ { ACTION_QS_TOP, BUTTON_UP|BUTTON_REL, BUTTON_NONE },
+ { ACTION_QS_TOP, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE },
{ ACTION_QS_DOWN, BUTTON_DOWN|BUTTON_REL, BUTTON_NONE },
{ ACTION_QS_DOWN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE },
Index: apps/keymaps/keymap-sa9200.c
===================================================================
--- apps/keymaps/keymap-sa9200.c (Revision 19572)
+++ apps/keymaps/keymap-sa9200.c (Arbeitskopie)
@@ -215,8 +215,8 @@
}; /* button_context_time */
static const struct button_mapping button_context_quickscreen[] = {
- { ACTION_QS_DOWNINV, BUTTON_UP, BUTTON_NONE },
- { ACTION_QS_DOWNINV, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE },
+ { ACTION_QS_TOP, BUTTON_UP, BUTTON_NONE },
+ { ACTION_QS_TOP, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE },
{ ACTION_QS_DOWN, BUTTON_DOWN, BUTTON_NONE },
{ ACTION_QS_DOWN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE },
{ ACTION_QS_LEFT, BUTTON_REW, BUTTON_NONE },
Index: apps/keymaps/keymap-m3.c
===================================================================
--- apps/keymaps/keymap-m3.c (Revision 19572)
+++ apps/keymaps/keymap-m3.c (Arbeitskopie)
@@ -184,8 +184,8 @@
/** Quickscreen **/
static const struct button_mapping button_context_quickscreen[] = {
- { ACTION_QS_DOWNINV, BUTTON_VOL_UP, BUTTON_NONE },
- { ACTION_QS_DOWNINV, BUTTON_VOL_UP|BUTTON_REPEAT, BUTTON_NONE },
+ { ACTION_QS_TOP, BUTTON_VOL_UP, BUTTON_NONE },
+ { ACTION_QS_TOP, BUTTON_VOL_UP|BUTTON_REPEAT, BUTTON_NONE },
{ ACTION_QS_DOWN, BUTTON_VOL_DOWN, BUTTON_NONE },
{ ACTION_QS_DOWN, BUTTON_VOL_DOWN|BUTTON_REPEAT, BUTTON_NONE },
{ ACTION_QS_LEFT, BUTTON_LEFT, BUTTON_NONE },
Index: apps/keymaps/keymap-h1x0_h3x0.c
===================================================================
--- apps/keymaps/keymap-h1x0_h3x0.c (Revision 19572)
+++ apps/keymaps/keymap-h1x0_h3x0.c (Arbeitskopie)
@@ -204,8 +204,8 @@
}; /* button_context_settings_bmark */
static const struct button_mapping button_context_quickscreen[] = {
- { ACTION_QS_DOWNINV, BUTTON_UP, BUTTON_NONE },
- { ACTION_QS_DOWNINV, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE },
+ { ACTION_QS_TOP, BUTTON_UP, BUTTON_NONE },
+ { ACTION_QS_TOP, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE },
{ ACTION_QS_DOWN, BUTTON_DOWN, BUTTON_NONE },
{ ACTION_QS_DOWN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE },
{ ACTION_QS_LEFT, BUTTON_LEFT, BUTTON_NONE },
Index: apps/keymaps/keymap-creativezv.c
===================================================================
--- apps/keymaps/keymap-creativezv.c (Revision 19572)
+++ apps/keymaps/keymap-creativezv.c (Arbeitskopie)
@@ -177,8 +177,8 @@
}; /* button_context_time */
static const struct button_mapping button_context_quickscreen[] = {
- { ACTION_QS_DOWNINV, BUTTON_UP, BUTTON_NONE },
- { ACTION_QS_DOWNINV, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE },
+ { ACTION_QS_TOP, BUTTON_UP, BUTTON_NONE },
+ { ACTION_QS_TOP, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE },
{ ACTION_QS_DOWN, BUTTON_DOWN, BUTTON_NONE },
{ ACTION_QS_DOWN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE },
{ ACTION_QS_LEFT, BUTTON_LEFT, BUTTON_NONE },
Index: apps/keymaps/keymap-touchscreen.c
===================================================================
--- apps/keymaps/keymap-touchscreen.c (Revision 19572)
+++ apps/keymaps/keymap-touchscreen.c (Arbeitskopie)
@@ -172,8 +172,8 @@
static const struct button_mapping button_context_quickscreen[] = {
{ ACTION_STD_CANCEL, BUTTON_CENTER|BUTTON_REL, BUTTON_NONE },
- { ACTION_QS_DOWNINV, BUTTON_TOPMIDDLE|BUTTON_REL, BUTTON_NONE },
- { ACTION_QS_DOWNINV, BUTTON_TOPMIDDLE|BUTTON_REPEAT, BUTTON_NONE },
+ { ACTION_QS_TOP, BUTTON_TOPMIDDLE|BUTTON_REL, BUTTON_NONE },
+ { ACTION_QS_TOP, BUTTON_TOPMIDDLE|BUTTON_REPEAT, BUTTON_NONE },
{ ACTION_QS_DOWN, BUTTON_BOTTOMMIDDLE|BUTTON_REL, BUTTON_NONE },
{ ACTION_QS_DOWN, BUTTON_BOTTOMMIDDLE|BUTTON_REPEAT, BUTTON_NONE },
{ ACTION_QS_LEFT, BUTTON_MIDLEFT|BUTTON_REL, BUTTON_NONE },
Index: apps/keymaps/keymap-ifp7xx.c
===================================================================
--- apps/keymaps/keymap-ifp7xx.c (Revision 19572)
+++ apps/keymaps/keymap-ifp7xx.c (Arbeitskopie)
@@ -109,8 +109,8 @@
}; /* button_context_settings_bmark */
static const struct button_mapping button_context_quickscreen[] = {
- { ACTION_QS_DOWNINV, BUTTON_UP, BUTTON_NONE },
- { ACTION_QS_DOWNINV, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE },
+ { ACTION_QS_TOP, BUTTON_UP, BUTTON_NONE },
+ { ACTION_QS_TOP, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE },
{ ACTION_QS_DOWN, BUTTON_DOWN, BUTTON_NONE },
{ ACTION_QS_DOWN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE },
{ ACTION_QS_LEFT, BUTTON_LEFT, BUTTON_NONE },
Index: apps/keymaps/keymap-iaudio67.c
===================================================================
--- apps/keymaps/keymap-iaudio67.c (Revision 19572)
+++ apps/keymaps/keymap-iaudio67.c (Arbeitskopie)
@@ -153,8 +153,8 @@
{ ACTION_NONE, BUTTON_LEFT, BUTTON_NONE },
{ ACTION_STD_CANCEL, BUTTON_MENU|BUTTON_REL, BUTTON_NONE },
- { ACTION_QS_DOWNINV, BUTTON_VOLUP|BUTTON_REL, BUTTON_NONE },
- { ACTION_QS_DOWNINV, BUTTON_VOLUP|BUTTON_REPEAT, BUTTON_NONE },
+ { ACTION_QS_TOP, BUTTON_VOLUP|BUTTON_REL, BUTTON_NONE },
+ { ACTION_QS_TOP, BUTTON_VOLUP|BUTTON_REPEAT, BUTTON_NONE },
{ ACTION_QS_DOWN, BUTTON_VOLDOWN|BUTTON_REL, BUTTON_NONE },
{ ACTION_QS_DOWN, BUTTON_VOLDOWN|BUTTON_REPEAT, BUTTON_NONE },
Index: apps/keymaps/keymap-clip.c
===================================================================
--- apps/keymaps/keymap-clip.c (Revision 19572)
+++ apps/keymaps/keymap-clip.c (Arbeitskopie)
@@ -152,8 +152,8 @@
static const struct button_mapping button_context_quickscreen[] = {
{ ACTION_NONE, BUTTON_LEFT, BUTTON_NONE },
{ ACTION_STD_CANCEL, BUTTON_POWER|BUTTON_REL, BUTTON_NONE },
- { ACTION_QS_DOWNINV, BUTTON_UP|BUTTON_REL, BUTTON_NONE },
- { ACTION_QS_DOWNINV, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE },
+ { ACTION_QS_TOP, BUTTON_UP|BUTTON_REL, BUTTON_NONE },
+ { ACTION_QS_TOP, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE },
{ ACTION_QS_DOWN, BUTTON_DOWN|BUTTON_REL, BUTTON_NONE },
{ ACTION_QS_DOWN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE },
{ ACTION_QS_LEFT, BUTTON_LEFT|BUTTON_REL, BUTTON_NONE },
Index: apps/keymaps/keymap-h10.c
===================================================================
--- apps/keymaps/keymap-h10.c (Revision 19572)
+++ apps/keymaps/keymap-h10.c (Arbeitskopie)
@@ -206,8 +206,8 @@
}; /* button_context_settings_yesno */
static const struct button_mapping button_context_quickscreen[] = {
- { ACTION_QS_DOWNINV, BUTTON_SCROLL_UP, BUTTON_NONE },
- { ACTION_QS_DOWNINV, BUTTON_SCROLL_UP|BUTTON_REPEAT, BUTTON_NONE },
+ { ACTION_QS_TOP, BUTTON_SCROLL_UP, BUTTON_NONE },
+ { ACTION_QS_TOP, BUTTON_SCROLL_UP|BUTTON_REPEAT, BUTTON_NONE },
{ ACTION_QS_DOWN, BUTTON_SCROLL_DOWN, BUTTON_NONE },
{ ACTION_QS_DOWN, BUTTON_SCROLL_DOWN|BUTTON_REPEAT, BUTTON_NONE },
{ ACTION_QS_LEFT, BUTTON_REW, BUTTON_NONE },
Index: apps/keymaps/keymap-av300.c
===================================================================
--- apps/keymaps/keymap-av300.c (Revision 19572)
+++ apps/keymaps/keymap-av300.c (Arbeitskopie)
@@ -134,8 +134,8 @@
LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
};
static const struct button_mapping button_context_quickscreen[] = {
- { ACTION_QS_DOWNINV, BUTTON_UP, BUTTON_NONE },
- { ACTION_QS_DOWNINV, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE },
+ { ACTION_QS_TOP, BUTTON_UP, BUTTON_NONE },
+ { ACTION_QS_TOP, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE },
{ ACTION_QS_DOWN, BUTTON_DOWN, BUTTON_NONE },
{ ACTION_QS_DOWN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE },
{ ACTION_QS_LEFT, BUTTON_LEFT, BUTTON_NONE },
Index: apps/keymaps/keymap-x5.c
===================================================================
--- apps/keymaps/keymap-x5.c (Revision 19572)
+++ apps/keymaps/keymap-x5.c (Arbeitskopie)
@@ -172,8 +172,8 @@
/** Quickscreen **/
static const struct button_mapping button_context_quickscreen[] = {
- { ACTION_QS_DOWNINV, BUTTON_UP, BUTTON_NONE },
- { ACTION_QS_DOWNINV, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE },
+ { ACTION_QS_TOP, BUTTON_UP, BUTTON_NONE },
+ { ACTION_QS_TOP, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE },
{ ACTION_QS_DOWN, BUTTON_DOWN, BUTTON_NONE },
{ ACTION_QS_DOWN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE },
{ ACTION_QS_LEFT, BUTTON_LEFT, BUTTON_NONE },
Index: apps/keymaps/keymap-creativezvm.c
===================================================================
--- apps/keymaps/keymap-creativezvm.c (Revision 19572)
+++ apps/keymaps/keymap-creativezvm.c (Arbeitskopie)
@@ -176,8 +176,8 @@
}; /* button_context_time */
static const struct button_mapping button_context_quickscreen[] = {
- { ACTION_QS_DOWNINV, BUTTON_UP, BUTTON_NONE },
- { ACTION_QS_DOWNINV, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE },
+ { ACTION_QS_TOP, BUTTON_UP, BUTTON_NONE },
+ { ACTION_QS_TOP, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE },
{ ACTION_QS_DOWN, BUTTON_DOWN, BUTTON_NONE },
{ ACTION_QS_DOWN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE },
{ ACTION_QS_LEFT, BUTTON_LEFT, BUTTON_NONE },
Index: apps/keymaps/keymap-mr100.c
===================================================================
--- apps/keymaps/keymap-mr100.c (Revision 19572)
+++ apps/keymaps/keymap-mr100.c (Arbeitskopie)
@@ -212,8 +212,8 @@
}; /* button_context_time */
static const struct button_mapping button_context_quickscreen[] = {
- { ACTION_QS_DOWNINV, BUTTON_UP, BUTTON_NONE },
- { ACTION_QS_DOWNINV, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE },
+ { ACTION_QS_TOP, BUTTON_UP, BUTTON_NONE },
+ { ACTION_QS_TOP, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE },
{ ACTION_QS_DOWN, BUTTON_DOWN, BUTTON_NONE },
{ ACTION_QS_DOWN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE },
{ ACTION_QS_LEFT, BUTTON_LEFT, BUTTON_NONE },
Index: apps/keymaps/keymap-logikdax.c
===================================================================
--- apps/keymaps/keymap-logikdax.c (Revision 19572)
+++ apps/keymaps/keymap-logikdax.c (Arbeitskopie)
@@ -147,8 +147,8 @@
{ ACTION_NONE, BUTTON_LEFT, BUTTON_NONE },
{ ACTION_STD_CANCEL, BUTTON_MODE|BUTTON_REL, BUTTON_NONE },
- { ACTION_QS_DOWNINV, BUTTON_UP|BUTTON_REL, BUTTON_NONE },
- { ACTION_QS_DOWNINV, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE },
+ { ACTION_QS_TOP, BUTTON_UP|BUTTON_REL, BUTTON_NONE },
+ { ACTION_QS_TOP, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE },
{ ACTION_QS_DOWN, BUTTON_DOWN|BUTTON_REL, BUTTON_NONE },
{ ACTION_QS_DOWN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE },
Index: apps/keymaps/keymap-gigabeat.c
===================================================================
--- apps/keymaps/keymap-gigabeat.c (Revision 19572)
+++ apps/keymaps/keymap-gigabeat.c (Arbeitskopie)
@@ -215,8 +215,8 @@
}; /* button_context_time */
static const struct button_mapping button_context_quickscreen[] = {
- { ACTION_QS_DOWNINV, BUTTON_UP, BUTTON_NONE },
- { ACTION_QS_DOWNINV, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE },
+ { ACTION_QS_TOP, BUTTON_UP, BUTTON_NONE },
+ { ACTION_QS_TOP, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE },
{ ACTION_QS_DOWN, BUTTON_DOWN, BUTTON_NONE },
{ ACTION_QS_DOWN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE },
{ ACTION_QS_LEFT, BUTTON_LEFT, BUTTON_NONE },
Index: apps/keymaps/keymap-gigabeat-s.c
===================================================================
--- apps/keymaps/keymap-gigabeat-s.c (Revision 19572)
+++ apps/keymaps/keymap-gigabeat-s.c (Arbeitskopie)
@@ -222,8 +222,8 @@
}; /* button_context_time */
static const struct button_mapping button_context_quickscreen[] = {
- { ACTION_QS_DOWNINV, BUTTON_UP, BUTTON_NONE },
- { ACTION_QS_DOWNINV, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE },
+ { ACTION_QS_TOP, BUTTON_UP, BUTTON_NONE },
+ { ACTION_QS_TOP, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE },
{ ACTION_QS_DOWN, BUTTON_DOWN, BUTTON_NONE },
{ ACTION_QS_DOWN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE },
{ ACTION_QS_LEFT, BUTTON_LEFT, BUTTON_NONE },
Index: apps/keymaps/keymap-c100.c
===================================================================
--- apps/keymaps/keymap-c100.c (Revision 19572)
+++ apps/keymaps/keymap-c100.c (Arbeitskopie)
@@ -153,8 +153,8 @@
{ ACTION_NONE, BUTTON_LEFT, BUTTON_NONE },
{ ACTION_STD_CANCEL, BUTTON_MENU|BUTTON_REL, BUTTON_NONE },
- { ACTION_QS_DOWNINV, BUTTON_VOLUP|BUTTON_REL, BUTTON_NONE },
- { ACTION_QS_DOWNINV, BUTTON_VOLUP|BUTTON_REPEAT, BUTTON_NONE },
+ { ACTION_QS_TOP, BUTTON_VOLUP|BUTTON_REL, BUTTON_NONE },
+ { ACTION_QS_TOP, BUTTON_VOLUP|BUTTON_REPEAT, BUTTON_NONE },
{ ACTION_QS_DOWN, BUTTON_VOLDOWN|BUTTON_REL, BUTTON_NONE },
{ ACTION_QS_DOWN, BUTTON_VOLDOWN|BUTTON_REPEAT, BUTTON_NONE },
Index: apps/keymaps/keymap-c200.c
===================================================================
--- apps/keymaps/keymap-c200.c (Revision 19572)
+++ apps/keymaps/keymap-c200.c (Arbeitskopie)
@@ -164,8 +164,8 @@
{ ACTION_NONE, BUTTON_LEFT, BUTTON_NONE },
{ ACTION_STD_CANCEL, BUTTON_POWER|BUTTON_REL, BUTTON_NONE },
- { ACTION_QS_DOWNINV, BUTTON_UP|BUTTON_REL, BUTTON_NONE },
- { ACTION_QS_DOWNINV, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE },
+ { ACTION_QS_TOP, BUTTON_UP|BUTTON_REL, BUTTON_NONE },
+ { ACTION_QS_TOP, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE },
{ ACTION_QS_DOWN, BUTTON_DOWN|BUTTON_REL, BUTTON_NONE },
{ ACTION_QS_DOWN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE },
Index: apps/keymaps/keymap-e200.c
===================================================================
--- apps/keymaps/keymap-e200.c (Revision 19572)
+++ apps/keymaps/keymap-e200.c (Arbeitskopie)
@@ -152,8 +152,8 @@
static const struct button_mapping button_context_quickscreen[] = {
{ ACTION_NONE, BUTTON_LEFT, BUTTON_NONE },
{ ACTION_STD_CANCEL, BUTTON_POWER|BUTTON_REL, BUTTON_NONE },
- { ACTION_QS_DOWNINV, BUTTON_UP|BUTTON_REL, BUTTON_NONE },
- { ACTION_QS_DOWNINV, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE },
+ { ACTION_QS_TOP, BUTTON_UP|BUTTON_REL, BUTTON_NONE },
+ { ACTION_QS_TOP, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE },
{ ACTION_QS_DOWN, BUTTON_DOWN|BUTTON_REL, BUTTON_NONE },
{ ACTION_QS_DOWN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE },
{ ACTION_QS_LEFT, BUTTON_LEFT|BUTTON_REL, BUTTON_NONE },
Index: apps/keymaps/keymap-meizu-m6sl.c
===================================================================
--- apps/keymaps/keymap-meizu-m6sl.c (Revision 19572)
+++ apps/keymaps/keymap-meizu-m6sl.c (Arbeitskopie)
@@ -202,8 +202,8 @@
}; /* button_context_time */
static const struct button_mapping button_context_quickscreen[] = {
- { ACTION_QS_DOWNINV, BUTTON_UP, BUTTON_NONE },
- { ACTION_QS_DOWNINV, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE },
+ { ACTION_QS_TOP, BUTTON_UP, BUTTON_NONE },
+ { ACTION_QS_TOP, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE },
{ ACTION_QS_DOWN, BUTTON_DOWN, BUTTON_NONE },
{ ACTION_QS_DOWN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE },
{ ACTION_QS_LEFT, BUTTON_LEFT, BUTTON_NONE },
Index: apps/keymaps/keymap-hdd1630.c
===================================================================
--- apps/keymaps/keymap-hdd1630.c (Revision 19572)
+++ apps/keymaps/keymap-hdd1630.c (Arbeitskopie)
@@ -215,8 +215,8 @@
}; /* button_context_time */
static const struct button_mapping button_context_quickscreen[] = {
- { ACTION_QS_DOWNINV, BUTTON_UP, BUTTON_NONE },
- { ACTION_QS_DOWNINV, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE },
+ { ACTION_QS_TOP, BUTTON_UP, BUTTON_NONE },
+ { ACTION_QS_TOP, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE },
{ ACTION_QS_DOWN, BUTTON_DOWN, BUTTON_NONE },
{ ACTION_QS_DOWN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE },
{ ACTION_QS_LEFT, BUTTON_LEFT, BUTTON_NONE },
Index: apps/keymaps/keymap-fuze.c
===================================================================
--- apps/keymaps/keymap-fuze.c (Revision 19572)
+++ apps/keymaps/keymap-fuze.c (Arbeitskopie)
@@ -150,8 +150,8 @@
static const struct button_mapping button_context_quickscreen[] = {
{ ACTION_NONE, BUTTON_LEFT, BUTTON_NONE },
{ ACTION_STD_CANCEL, BUTTON_HOME|BUTTON_REL, BUTTON_NONE },
- { ACTION_QS_DOWNINV, BUTTON_UP|BUTTON_REL, BUTTON_NONE },
- { ACTION_QS_DOWNINV, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE },
+ { ACTION_QS_TOP, BUTTON_UP|BUTTON_REL, BUTTON_NONE },
+ { ACTION_QS_TOP, BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE },
{ ACTION_QS_DOWN, BUTTON_DOWN|BUTTON_REL, BUTTON_NONE },
{ ACTION_QS_DOWN, BUTTON_DOWN|BUTTON_REPEAT, BUTTON_NONE },
{ ACTION_QS_LEFT, BUTTON_LEFT|BUTTON_REL, BUTTON_NONE },