From: Christian Heller Date: Mon, 31 Mar 2014 02:47:03 +0000 (+0200) Subject: Client: Shorten strings whose width does not fit well into compact size. X-Git-Tag: tce~786 X-Git-Url: https://plomlompom.com/repos/%7B%7B%20web_path%20%7D%7D/%7B%7Bdb.prefix%7D%7D/%7B%7Bprefix%7D%7D/static/day?a=commitdiff_plain;h=5edadcdcd6831d8c4a5e0a3931e7675d21942780;p=plomrogue Client: Shorten strings whose width does not fit well into compact size. --- diff --git a/confclient/commands b/confclient/commands index dddcd7f..99775ee 100644 --- a/confclient/commands +++ b/confclient/commands @@ -44,17 +44,17 @@ move 7 % pick -pick up object from ground +pick up pick_up 0 % use -use selected inventory object +use object use i % drop -drop object from inventory +drop drop i % @@ -62,16 +62,16 @@ quit quit % cyc_win_f -cycle window selection forwards +nav down window % cyc_win_b -cycle window selection backwards +nav up window % shift_f -shift window forwards +shift down window % shift_b -shift window backwards +shift up window % scrl_l scroll pad left @@ -80,28 +80,28 @@ scrl_r scroll pad right % g_keys_d -global keybindings nav down +nav down global keys % g_keys_u -global keybindings nav up +nav up global keys % g_keys_m -global keybindings modify +mod global keys % winconf -toggle window configuration view +toggle win config view % grow_h -grow window horizontally +grow window width % shri_h -shrink window horizontally +shrink window width % grow_v -grow window vertically +grow window height % shri_v -shrink window vertically +shrink window height % to_break toggle line break type @@ -113,43 +113,43 @@ to_width_t toggle window width type % inv_d -inventory selection down +nav down object % inv_u -inventory selection up +nav up object % w_keys_d -win keys nav down +nav down window keys % w_keys_u -win keys nav up +nav up window nav % w_keys_m -win keys mod +mod window key % wg_keys_d -win geometry config keybindings nav down +nav down win geometry config keys % wg_keys_u -win geometry config keybindings nav up +nav up win geometry config keys % wg_keys_m -win geometry config keybindings modify +mod win geometry config keys % wk_keys_d -win keybindings config keybindings nav down +nav down win keys config keys % wk_keys_u -win keybindings config keybindings nav up +nav up win keys config keys % wk_keys_m -win keybindings config keybindings modify +mod win keys config keys % reload_conf -reload windows and keybindings configuration +reload interface config % save_conf -save windows and keybindings +save interface config % map_u map up @@ -167,26 +167,26 @@ map_c map center player % to_a_keywin -toggle view of available keybindings +toggle available keys view % to_inv -toggle inventory window +toggle inventory view % to_g_keywin -toggle global keys window +toggle global keys view % to_mapwin -toggle map window +toggle map view % to_infowin -toggle info window +toggle info view % to_logwin -toggle log window +toggle log view % to_wg_keywin -toggle window geometry keys window +toggle geometry keys view % to_wk_keywin -toggle window keybinding keys window +toggle keybinding keys view % diff --git a/src/client/draw_wins.c b/src/client/draw_wins.c index e31dcc4..d075d7a 100644 --- a/src/client/draw_wins.c +++ b/src/client/draw_wins.c @@ -397,7 +397,7 @@ extern void draw_win_inventory(struct Win * win) extern void draw_win_available_keybindings(struct Win * win) { - char * title = "Active window's keybindings:"; + char * title = "Active window's keys:"; struct KeyBindingDB * kbdb; struct Win * win_active = get_win_by_id(world.winDB.active); if (0 == win_active->view) @@ -415,7 +415,7 @@ extern void draw_win_available_keybindings(struct Win * win) uint16_t offset = 0; draw_titled_keybinding_list(title, win, &offset, 0, kbdb); add_line(win, " ", 0, &offset, 0); - title = "Global keybindings:"; + title = "Global keys:"; draw_titled_keybinding_list(title, win, &offset, 1, &world.kb_global); } @@ -448,7 +448,7 @@ extern void draw_win_keybindings_winconf_keybindings(struct Win * win) extern void draw_winconf_keybindings(struct Win * win) { - char * title = "Window's keybindings:"; + char * title = "Window's keys:"; uint16_t offset = 0; add_line(win, title, 0, &offset, 0); add_line(win, " ", 0, &offset, 0);