diff options
| author | rubidium <rubidium@openttd.org> | 2009-11-04 18:28:59 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2009-11-04 18:28:59 +0000 |
| commit | 32b568a7e9fb8c608315ff4990a7d8278393bd9f (patch) | |
| tree | fc078b6248731bf3254dbea08c3bfa24b205d58c | |
| parent | b2946819e470a79bac3d3cc2ccdc5b5771d7954c (diff) | |
| download | openttd-32b568a7e9fb8c608315ff4990a7d8278393bd9f.tar.xz | |
(svn r17971) -Codechange: make the code of the toolbar more uniform; give the switch bar a tooltip and unify the naming of sprites.
| -rw-r--r-- | src/lang/english.txt | 1 | ||||
| -rw-r--r-- | src/table/sprites.h | 2 | ||||
| -rw-r--r-- | src/toolbar_gui.cpp | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/src/lang/english.txt b/src/lang/english.txt index 03e64ec9c..ada0207d8 100644 --- a/src/lang/english.txt +++ b/src/lang/english.txt @@ -314,6 +314,7 @@ STR_TOOLBAR_TOOLTIP_LANDSCAPING :{BLACK}Open the STR_TOOLBAR_TOOLTIP_SHOW_SOUND_MUSIC_WINDOW :{BLACK}Show sound/music window STR_TOOLBAR_TOOLTIP_SHOW_LAST_MESSAGE_NEWS :{BLACK}Show last message/news report, show message options STR_TOOLBAR_TOOLTIP_LAND_BLOCK_INFORMATION :{BLACK}Land area information, console, AI debug, screenshots, about OpenTTD +STR_TOOLBAR_TOOLTIP_SWITCH_TOOLBAR :{BLACK}Switch toolbars # Extra tooltips for the scenario editor toolbar STR_SCENEDIT_TOOLBAR_TOOLTIP_SAVE_SCENARIO_LOAD_SCENARIO :{BLACK}Save scenario, load scenario, abandon scenario editor, quit diff --git a/src/table/sprites.h b/src/table/sprites.h index e522ec71f..4ac86fc9c 100644 --- a/src/table/sprites.h +++ b/src/table/sprites.h @@ -133,7 +133,7 @@ enum Sprites { SPR_GROUP_REPLACE_OFF_SHIP = SPR_OPENTTD_BASE + 132, SPR_GROUP_REPLACE_OFF_AIRCRAFT = SPR_OPENTTD_BASE + 133, - SPR_SWITCH_TOOLBAR = SPR_OPENTTD_BASE + 144, + SPR_IMG_SWITCH_TOOLBAR = SPR_OPENTTD_BASE + 144, SPR_SIGNALS_BASE = SPR_OPENTTD_BASE + OPENTTD_SPRITE_COUNT, PRESIGNAL_SPRITE_COUNT = 48, diff --git a/src/toolbar_gui.cpp b/src/toolbar_gui.cpp index c5d415be0..e46c9aa04 100644 --- a/src/toolbar_gui.cpp +++ b/src/toolbar_gui.cpp @@ -1188,7 +1188,7 @@ static const Widget _toolb_normal_widgets[] = { { WWT_IMGBTN, RESIZE_NONE, COLOUR_GREY, 0, 0, 0, 21, SPR_IMG_MUSIC, STR_TOOLBAR_TOOLTIP_SHOW_SOUND_MUSIC_WINDOW}, // TBN_MUSICSOUND { WWT_IMGBTN, RESIZE_NONE, COLOUR_GREY, 0, 0, 0, 21, SPR_IMG_MESSAGES, STR_TOOLBAR_TOOLTIP_SHOW_LAST_MESSAGE_NEWS}, // TBN_NEWSREPORT { WWT_IMGBTN, RESIZE_NONE, COLOUR_GREY, 0, 0, 0, 21, SPR_IMG_QUERY, STR_TOOLBAR_TOOLTIP_LAND_BLOCK_INFORMATION}, // TBN_HELP -{ WWT_IMGBTN, RESIZE_NONE, COLOUR_GREY, 0, 0, 0, 21, SPR_SWITCH_TOOLBAR, STR_NULL}, // TBN_SWITCHBAR +{ WWT_IMGBTN, RESIZE_NONE, COLOUR_GREY, 0, 0, 0, 21, SPR_IMG_SWITCH_TOOLBAR, STR_TOOLBAR_TOOLTIP_SWITCH_TOOLBAR}, // TBN_SWITCHBAR { WIDGETS_END}, }; |