mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

(svn r23544) -Codechange: document and rename widgets to be consistent and understandable

This commit is contained in:
truebrain 2011-12-16 18:02:27 +00:00
parent 78ca3e3358
commit e2d8abeec5
9 changed files with 523 additions and 524 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/bootstrap_gui.cpp
View File

@ -66,7 +66,7 @@ public:
/** Nested widgets for the download window. */ /** Nested widgets for the download window. */
static const NWidgetPart _nested_boostrap_download_status_window_widgets[] = { static const NWidgetPart _nested_boostrap_download_status_window_widgets[] = {
NWidget(WWT_CAPTION, COLOUR_GREY), SetDataTip(STR_CONTENT_DOWNLOAD_TITLE, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS), NWidget(WWT_CAPTION, COLOUR_GREY), SetDataTip(STR_CONTENT_DOWNLOAD_TITLE, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS),
NWidget(WWT_PANEL, COLOUR_GREY, NCDSWW_BACKGROUND), NWidget(WWT_PANEL, COLOUR_GREY, WID_NCDS_BACKGROUND),
NWidget(NWID_SPACER), SetMinimalSize(350, 0), SetMinimalTextLines(3, WD_FRAMERECT_TOP + WD_FRAMERECT_BOTTOM + 30), NWidget(NWID_SPACER), SetMinimalSize(350, 0), SetMinimalTextLines(3, WD_FRAMERECT_TOP + WD_FRAMERECT_BOTTOM + 30),
EndContainer(), EndContainer(),
}; };

152
src/music_gui.cpp
View File

@ -293,16 +293,16 @@ struct MusicTrackSelectionWindow : public Window {
MusicTrackSelectionWindow(const WindowDesc *desc, WindowNumber number) : Window() MusicTrackSelectionWindow(const WindowDesc *desc, WindowNumber number) : Window()
{ {
this->InitNested(desc, number); this->InitNested(desc, number);
this->LowerWidget(MTSW_LIST_LEFT); this->LowerWidget(WID_MTS_LIST_LEFT);
this->LowerWidget(MTSW_LIST_RIGHT); this->LowerWidget(WID_MTS_LIST_RIGHT);
this->SetWidgetDisabledState(MTSW_CLEAR, _settings_client.music.playlist <= 3); this->SetWidgetDisabledState(WID_MTS_CLEAR, _settings_client.music.playlist <= 3);
this->LowerWidget(MTSW_ALL + _settings_client.music.playlist); this->LowerWidget(WID_MTS_ALL + _settings_client.music.playlist);
} }
virtual void SetStringParameters(int widget) const virtual void SetStringParameters(int widget) const
{ {
switch (widget) { switch (widget) {
case MTSW_PLAYLIST: case WID_MTS_PLAYLIST:
SetDParam(0, STR_MUSIC_PLAYLIST_ALL + _settings_client.music.playlist); SetDParam(0, STR_MUSIC_PLAYLIST_ALL + _settings_client.music.playlist);
break; break;
} }
@ -317,16 +317,16 @@ struct MusicTrackSelectionWindow : public Window {
{ {
if (!gui_scope) return; if (!gui_scope) return;
for (int i = 0; i < 6; i++) { for (int i = 0; i < 6; i++) {
this->SetWidgetLoweredState(MTSW_ALL + i, i == _settings_client.music.playlist); this->SetWidgetLoweredState(WID_MTS_ALL + i, i == _settings_client.music.playlist);
} }
this->SetWidgetDisabledState(MTSW_CLEAR, _settings_client.music.playlist <= 3); this->SetWidgetDisabledState(WID_MTS_CLEAR, _settings_client.music.playlist <= 3);
this->SetDirty(); this->SetDirty();
} }
virtual void UpdateWidgetSize(int widget, Dimension *size, const Dimension &padding, Dimension *fill, Dimension *resize) virtual void UpdateWidgetSize(int widget, Dimension *size, const Dimension &padding, Dimension *fill, Dimension *resize)
{ {
switch (widget) { switch (widget) {
case MTSW_PLAYLIST: { case WID_MTS_PLAYLIST: {
Dimension d = {0, 0}; Dimension d = {0, 0};
for (int i = 0; i < 6; i++) { for (int i = 0; i < 6; i++) {
@ -339,7 +339,7 @@ struct MusicTrackSelectionWindow : public Window {
break; break;
} }
case MTSW_LIST_LEFT: case MTSW_LIST_RIGHT: { case WID_MTS_LIST_LEFT: case WID_MTS_LIST_RIGHT: {
Dimension d = {0, 0}; Dimension d = {0, 0};
for (uint i = 0; i < NUM_SONGS_AVAILABLE; i++) { for (uint i = 0; i < NUM_SONGS_AVAILABLE; i++) {
@ -364,7 +364,7 @@ struct MusicTrackSelectionWindow : public Window {
virtual void DrawWidget(const Rect &r, int widget) const virtual void DrawWidget(const Rect &r, int widget) const
{ {
switch (widget) { switch (widget) {
case MTSW_LIST_LEFT: { case WID_MTS_LIST_LEFT: {
GfxFillRect(r.left + 1, r.top + 1, r.right - 1, r.bottom - 1, PC_BLACK); GfxFillRect(r.left + 1, r.top + 1, r.right - 1, r.bottom - 1, PC_BLACK);
int y = r.top + WD_FRAMERECT_TOP; int y = r.top + WD_FRAMERECT_TOP;
@ -381,7 +381,7 @@ struct MusicTrackSelectionWindow : public Window {
break; break;
} }
case MTSW_LIST_RIGHT: { case WID_MTS_LIST_RIGHT: {
GfxFillRect(r.left + 1, r.top + 1, r.right - 1, r.bottom - 1, PC_BLACK); GfxFillRect(r.left + 1, r.top + 1, r.right - 1, r.bottom - 1, PC_BLACK);
int y = r.top + WD_FRAMERECT_TOP; int y = r.top + WD_FRAMERECT_TOP;
@ -401,7 +401,7 @@ struct MusicTrackSelectionWindow : public Window {
virtual void OnClick(Point pt, int widget, int click_count) virtual void OnClick(Point pt, int widget, int click_count)
{ {
switch (widget) { switch (widget) {
case MTSW_LIST_LEFT: { // add to playlist case WID_MTS_LIST_LEFT: { // add to playlist
int y = this->GetRowFromWidget(pt.y, widget, 0, FONT_HEIGHT_SMALL); int y = this->GetRowFromWidget(pt.y, widget, 0, FONT_HEIGHT_SMALL);
if (_settings_client.music.playlist < 4) return; if (_settings_client.music.playlist < 4) return;
@ -426,7 +426,7 @@ struct MusicTrackSelectionWindow : public Window {
break; break;
} }
case MTSW_LIST_RIGHT: { // remove from playlist case WID_MTS_LIST_RIGHT: { // remove from playlist
int y = this->GetRowFromWidget(pt.y, widget, 0, FONT_HEIGHT_SMALL); int y = this->GetRowFromWidget(pt.y, widget, 0, FONT_HEIGHT_SMALL);
if (_settings_client.music.playlist < 4) return; if (_settings_client.music.playlist < 4) return;
@ -442,16 +442,16 @@ struct MusicTrackSelectionWindow : public Window {
break; break;
} }
case MTSW_CLEAR: // clear case WID_MTS_CLEAR: // clear
for (uint i = 0; _playlists[_settings_client.music.playlist][i] != 0; i++) _playlists[_settings_client.music.playlist][i] = 0; for (uint i = 0; _playlists[_settings_client.music.playlist][i] != 0; i++) _playlists[_settings_client.music.playlist][i] = 0;
this->SetDirty(); this->SetDirty();
StopMusic(); StopMusic();
SelectSongToPlay(); SelectSongToPlay();
break; break;
case MTSW_ALL: case MTSW_OLD: case MTSW_NEW: case WID_MTS_ALL: case WID_MTS_OLD: case WID_MTS_NEW:
case MTSW_EZY: case MTSW_CUSTOM1: case MTSW_CUSTOM2: // set playlist case WID_MTS_EZY: case WID_MTS_CUSTOM1: case WID_MTS_CUSTOM2: // set playlist
SelectPlaylist(widget - MTSW_ALL); SelectPlaylist(widget - WID_MTS_ALL);
StopMusic(); StopMusic();
SelectSongToPlay(); SelectSongToPlay();
break; break;
@ -469,26 +469,26 @@ static const NWidgetPart _nested_music_track_selection_widgets[] = {
/* Left panel. */ /* Left panel. */
NWidget(NWID_VERTICAL), NWidget(NWID_VERTICAL),
NWidget(WWT_LABEL, COLOUR_GREY), SetDataTip(STR_PLAYLIST_TRACK_INDEX, STR_NULL), NWidget(WWT_LABEL, COLOUR_GREY), SetDataTip(STR_PLAYLIST_TRACK_INDEX, STR_NULL),
NWidget(WWT_PANEL, COLOUR_GREY, MTSW_LIST_LEFT), SetMinimalSize(180, 194), SetDataTip(0x0, STR_PLAYLIST_TOOLTIP_CLICK_TO_ADD_TRACK), EndContainer(), NWidget(WWT_PANEL, COLOUR_GREY, WID_MTS_LIST_LEFT), SetMinimalSize(180, 194), SetDataTip(0x0, STR_PLAYLIST_TOOLTIP_CLICK_TO_ADD_TRACK), EndContainer(),
NWidget(NWID_SPACER), SetMinimalSize(0, 2), NWidget(NWID_SPACER), SetMinimalSize(0, 2),
EndContainer(), EndContainer(),
/* Middle buttons. */ /* Middle buttons. */
NWidget(NWID_VERTICAL), NWidget(NWID_VERTICAL),
NWidget(NWID_SPACER), SetMinimalSize(60, 30), // Space above the first button from the title bar. NWidget(NWID_SPACER), SetMinimalSize(60, 30), // Space above the first button from the title bar.
NWidget(WWT_TEXTBTN, COLOUR_GREY, MTSW_ALL), SetFill(1, 0), SetDataTip(STR_MUSIC_PLAYLIST_ALL, STR_MUSIC_TOOLTIP_SELECT_ALL_TRACKS_PROGRAM), NWidget(WWT_TEXTBTN, COLOUR_GREY, WID_MTS_ALL), SetFill(1, 0), SetDataTip(STR_MUSIC_PLAYLIST_ALL, STR_MUSIC_TOOLTIP_SELECT_ALL_TRACKS_PROGRAM),
NWidget(WWT_TEXTBTN, COLOUR_GREY, MTSW_OLD), SetFill(1, 0), SetDataTip(STR_MUSIC_PLAYLIST_OLD_STYLE, STR_MUSIC_TOOLTIP_SELECT_OLD_STYLE_MUSIC), NWidget(WWT_TEXTBTN, COLOUR_GREY, WID_MTS_OLD), SetFill(1, 0), SetDataTip(STR_MUSIC_PLAYLIST_OLD_STYLE, STR_MUSIC_TOOLTIP_SELECT_OLD_STYLE_MUSIC),
NWidget(WWT_TEXTBTN, COLOUR_GREY, MTSW_NEW), SetFill(1, 0), SetDataTip(STR_MUSIC_PLAYLIST_NEW_STYLE, STR_MUSIC_TOOLTIP_SELECT_NEW_STYLE_MUSIC), NWidget(WWT_TEXTBTN, COLOUR_GREY, WID_MTS_NEW), SetFill(1, 0), SetDataTip(STR_MUSIC_PLAYLIST_NEW_STYLE, STR_MUSIC_TOOLTIP_SELECT_NEW_STYLE_MUSIC),
NWidget(WWT_TEXTBTN, COLOUR_GREY, MTSW_EZY), SetFill(1, 0), SetDataTip(STR_MUSIC_PLAYLIST_EZY_STREET, STR_MUSIC_TOOLTIP_SELECT_EZY_STREET_STYLE), NWidget(WWT_TEXTBTN, COLOUR_GREY, WID_MTS_EZY), SetFill(1, 0), SetDataTip(STR_MUSIC_PLAYLIST_EZY_STREET, STR_MUSIC_TOOLTIP_SELECT_EZY_STREET_STYLE),
NWidget(WWT_TEXTBTN, COLOUR_GREY, MTSW_CUSTOM1), SetFill(1, 0), SetDataTip(STR_MUSIC_PLAYLIST_CUSTOM_1, STR_MUSIC_TOOLTIP_SELECT_CUSTOM_1_USER_DEFINED), NWidget(WWT_TEXTBTN, COLOUR_GREY, WID_MTS_CUSTOM1), SetFill(1, 0), SetDataTip(STR_MUSIC_PLAYLIST_CUSTOM_1, STR_MUSIC_TOOLTIP_SELECT_CUSTOM_1_USER_DEFINED),
NWidget(WWT_TEXTBTN, COLOUR_GREY, MTSW_CUSTOM2), SetFill(1, 0), SetDataTip(STR_MUSIC_PLAYLIST_CUSTOM_2, STR_MUSIC_TOOLTIP_SELECT_CUSTOM_2_USER_DEFINED), NWidget(WWT_TEXTBTN, COLOUR_GREY, WID_MTS_CUSTOM2), SetFill(1, 0), SetDataTip(STR_MUSIC_PLAYLIST_CUSTOM_2, STR_MUSIC_TOOLTIP_SELECT_CUSTOM_2_USER_DEFINED),
NWidget(NWID_SPACER), SetMinimalSize(0, 16), // Space above 'clear' button NWidget(NWID_SPACER), SetMinimalSize(0, 16), // Space above 'clear' button
NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, MTSW_CLEAR), SetFill(1, 0), SetDataTip(STR_PLAYLIST_CLEAR, STR_PLAYLIST_TOOLTIP_CLEAR_CURRENT_PROGRAM_CUSTOM1), NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_MTS_CLEAR), SetFill(1, 0), SetDataTip(STR_PLAYLIST_CLEAR, STR_PLAYLIST_TOOLTIP_CLEAR_CURRENT_PROGRAM_CUSTOM1),
NWidget(NWID_SPACER), SetFill(0, 1), NWidget(NWID_SPACER), SetFill(0, 1),
EndContainer(), EndContainer(),
/* Right panel. */ /* Right panel. */
NWidget(NWID_VERTICAL), NWidget(NWID_VERTICAL),
NWidget(WWT_LABEL, COLOUR_GREY, MTSW_PLAYLIST), SetDataTip(STR_PLAYLIST_PROGRAM, STR_NULL), NWidget(WWT_LABEL, COLOUR_GREY, WID_MTS_PLAYLIST), SetDataTip(STR_PLAYLIST_PROGRAM, STR_NULL),
NWidget(WWT_PANEL, COLOUR_GREY, MTSW_LIST_RIGHT), SetMinimalSize(180, 194), SetDataTip(0x0, STR_PLAYLIST_TOOLTIP_CLICK_TO_REMOVE_TRACK), EndContainer(), NWidget(WWT_PANEL, COLOUR_GREY, WID_MTS_LIST_RIGHT), SetMinimalSize(180, 194), SetDataTip(0x0, STR_PLAYLIST_TOOLTIP_CLICK_TO_REMOVE_TRACK), EndContainer(),
NWidget(NWID_SPACER), SetMinimalSize(0, 2), NWidget(NWID_SPACER), SetMinimalSize(0, 2),
EndContainer(), EndContainer(),
EndContainer(), EndContainer(),
@ -513,17 +513,17 @@ struct MusicWindow : public Window {
MusicWindow(const WindowDesc *desc, WindowNumber number) : Window() MusicWindow(const WindowDesc *desc, WindowNumber number) : Window()
{ {
this->InitNested(desc, number); this->InitNested(desc, number);
this->LowerWidget(_settings_client.music.playlist + MW_ALL); this->LowerWidget(_settings_client.music.playlist + WID_M_ALL);
this->SetWidgetLoweredState(MW_SHUFFLE, _settings_client.music.shuffle); this->SetWidgetLoweredState(WID_M_SHUFFLE, _settings_client.music.shuffle);
} }
virtual void UpdateWidgetSize(int widget, Dimension *size, const Dimension &padding, Dimension *fill, Dimension *resize) virtual void UpdateWidgetSize(int widget, Dimension *size, const Dimension &padding, Dimension *fill, Dimension *resize)
{ {
switch (widget) { switch (widget) {
/* Make sure that MW_SHUFFLE and MW_PROGRAMME have the same size. /* Make sure that WID_M_SHUFFLE and WID_M_PROGRAMME have the same size.
* This can't be done by using NC_EQUALSIZE as the MW_INFO is * This can't be done by using NC_EQUALSIZE as the WID_M_INFO is
* between those widgets and of different size. */ * between those widgets and of different size. */
case MW_SHUFFLE: case MW_PROGRAMME: { case WID_M_SHUFFLE: case WID_M_PROGRAMME: {
Dimension d = maxdim(GetStringBoundingBox(STR_MUSIC_PROGRAM), GetStringBoundingBox(STR_MUSIC_SHUFFLE)); Dimension d = maxdim(GetStringBoundingBox(STR_MUSIC_PROGRAM), GetStringBoundingBox(STR_MUSIC_SHUFFLE));
d.width += padding.width; d.width += padding.width;
d.height += padding.height; d.height += padding.height;
@ -531,7 +531,7 @@ struct MusicWindow : public Window {
break; break;
} }
case MW_TRACK_NR: { case WID_M_TRACK_NR: {
Dimension d = GetStringBoundingBox(STR_MUSIC_TRACK_NONE); Dimension d = GetStringBoundingBox(STR_MUSIC_TRACK_NONE);
d.width += WD_FRAMERECT_LEFT + WD_FRAMERECT_RIGHT; d.width += WD_FRAMERECT_LEFT + WD_FRAMERECT_RIGHT;
d.height += WD_FRAMERECT_TOP + WD_FRAMERECT_BOTTOM; d.height += WD_FRAMERECT_TOP + WD_FRAMERECT_BOTTOM;
@ -539,7 +539,7 @@ struct MusicWindow : public Window {
break; break;
} }
case MW_TRACK_NAME: { case WID_M_TRACK_NAME: {
Dimension d = GetStringBoundingBox(STR_MUSIC_TITLE_NONE); Dimension d = GetStringBoundingBox(STR_MUSIC_TITLE_NONE);
for (uint i = 0; i < NUM_SONGS_AVAILABLE; i++) { for (uint i = 0; i < NUM_SONGS_AVAILABLE; i++) {
SetDParamStr(0, GetSongName(i)); SetDParamStr(0, GetSongName(i));
@ -553,16 +553,16 @@ struct MusicWindow : public Window {
/* Hack-ish: set the proper widget data; only needs to be done once /* Hack-ish: set the proper widget data; only needs to be done once
* per (Re)Init as that's the only time the language changes. */ * per (Re)Init as that's the only time the language changes. */
case MW_PREV: this->GetWidget<NWidgetCore>(MW_PREV)->widget_data = _current_text_dir == TD_RTL ? SPR_IMG_SKIP_TO_NEXT : SPR_IMG_SKIP_TO_PREV; break; case WID_M_PREV: this->GetWidget<NWidgetCore>(WID_M_PREV)->widget_data = _current_text_dir == TD_RTL ? SPR_IMG_SKIP_TO_NEXT : SPR_IMG_SKIP_TO_PREV; break;
case MW_NEXT: this->GetWidget<NWidgetCore>(MW_NEXT)->widget_data = _current_text_dir == TD_RTL ? SPR_IMG_SKIP_TO_PREV : SPR_IMG_SKIP_TO_NEXT; break; case WID_M_NEXT: this->GetWidget<NWidgetCore>(WID_M_NEXT)->widget_data = _current_text_dir == TD_RTL ? SPR_IMG_SKIP_TO_PREV : SPR_IMG_SKIP_TO_NEXT; break;
case MW_PLAY: this->GetWidget<NWidgetCore>(MW_PLAY)->widget_data = _current_text_dir == TD_RTL ? SPR_IMG_PLAY_MUSIC_RTL : SPR_IMG_PLAY_MUSIC; break; case WID_M_PLAY: this->GetWidget<NWidgetCore>(WID_M_PLAY)->widget_data = _current_text_dir == TD_RTL ? SPR_IMG_PLAY_MUSIC_RTL : SPR_IMG_PLAY_MUSIC; break;
} }
} }
virtual void DrawWidget(const Rect &r, int widget) const virtual void DrawWidget(const Rect &r, int widget) const
{ {
switch (widget) { switch (widget) {
case MW_TRACK_NR: { case WID_M_TRACK_NR: {
GfxFillRect(r.left + 1, r.top + 1, r.right, r.bottom, PC_BLACK); GfxFillRect(r.left + 1, r.top + 1, r.right, r.bottom, PC_BLACK);
StringID str = STR_MUSIC_TRACK_NONE; StringID str = STR_MUSIC_TRACK_NONE;
if (_song_is_active != 0 && _music_wnd_cursong != 0) { if (_song_is_active != 0 && _music_wnd_cursong != 0) {
@ -574,7 +574,7 @@ struct MusicWindow : public Window {
break; break;
} }
case MW_TRACK_NAME: { case WID_M_TRACK_NAME: {
GfxFillRect(r.left, r.top + 1, r.right - 1, r.bottom, PC_BLACK); GfxFillRect(r.left, r.top + 1, r.right - 1, r.bottom, PC_BLACK);
StringID str = STR_MUSIC_TITLE_NONE; StringID str = STR_MUSIC_TITLE_NONE;
if (_song_is_active != 0 && _music_wnd_cursong != 0) { if (_song_is_active != 0 && _music_wnd_cursong != 0) {
@ -585,9 +585,9 @@ struct MusicWindow : public Window {
break; break;
} }
case MW_MUSIC_VOL: case MW_EFFECT_VOL: { case WID_M_MUSIC_VOL: case WID_M_EFFECT_VOL: {
DrawFrameRect(r.left, r.top + 2, r.right, r.bottom - 2, COLOUR_GREY, FR_LOWERED); DrawFrameRect(r.left, r.top + 2, r.right, r.bottom - 2, COLOUR_GREY, FR_LOWERED);
byte volume = (widget == MW_MUSIC_VOL) ? _settings_client.music.music_vol : _settings_client.music.effect_vol; byte volume = (widget == WID_M_MUSIC_VOL) ? _settings_client.music.music_vol : _settings_client.music.effect_vol;
int x = (volume * (r.right - r.left) / 127); int x = (volume * (r.right - r.left) / 127);
if (_current_text_dir == TD_RTL) { if (_current_text_dir == TD_RTL) {
x = r.right - x; x = r.right - x;
@ -609,7 +609,7 @@ struct MusicWindow : public Window {
{ {
if (!gui_scope) return; if (!gui_scope) return;
for (int i = 0; i < 6; i++) { for (int i = 0; i < 6; i++) {
this->SetWidgetLoweredState(MW_ALL + i, i == _settings_client.music.playlist); this->SetWidgetLoweredState(WID_M_ALL + i, i == _settings_client.music.playlist);
} }
this->SetDirty(); this->SetDirty();
} }
@ -617,36 +617,36 @@ struct MusicWindow : public Window {
virtual void OnClick(Point pt, int widget, int click_count) virtual void OnClick(Point pt, int widget, int click_count)
{ {
switch (widget) { switch (widget) {
case MW_PREV: // skip to prev case WID_M_PREV: // skip to prev
if (!_song_is_active) return; if (!_song_is_active) return;
SkipToPrevSong(); SkipToPrevSong();
this->SetDirty(); this->SetDirty();
break; break;
case MW_NEXT: // skip to next case WID_M_NEXT: // skip to next
if (!_song_is_active) return; if (!_song_is_active) return;
SkipToNextSong(); SkipToNextSong();
this->SetDirty(); this->SetDirty();
break; break;
case MW_STOP: // stop playing case WID_M_STOP: // stop playing
_settings_client.music.playing = false; _settings_client.music.playing = false;
break; break;
case MW_PLAY: // start playing case WID_M_PLAY: // start playing
_settings_client.music.playing = true; _settings_client.music.playing = true;
break; break;
case MW_MUSIC_VOL: case MW_EFFECT_VOL: { // volume sliders case WID_M_MUSIC_VOL: case WID_M_EFFECT_VOL: { // volume sliders
int x = pt.x - this->GetWidget<NWidgetBase>(widget)->pos_x; int x = pt.x - this->GetWidget<NWidgetBase>(widget)->pos_x;
byte *vol = (widget == MW_MUSIC_VOL) ? &_settings_client.music.music_vol : &_settings_client.music.effect_vol; byte *vol = (widget == WID_M_MUSIC_VOL) ? &_settings_client.music.music_vol : &_settings_client.music.effect_vol;
byte new_vol = x * 127 / this->GetWidget<NWidgetBase>(widget)->current_x; byte new_vol = x * 127 / this->GetWidget<NWidgetBase>(widget)->current_x;
if (_current_text_dir == TD_RTL) new_vol = 127 - new_vol; if (_current_text_dir == TD_RTL) new_vol = 127 - new_vol;
if (new_vol != *vol) { if (new_vol != *vol) {
*vol = new_vol; *vol = new_vol;
if (widget == MW_MUSIC_VOL) MusicVolumeChanged(new_vol); if (widget == WID_M_MUSIC_VOL) MusicVolumeChanged(new_vol);
this->SetDirty(); this->SetDirty();
} }
@ -654,22 +654,22 @@ struct MusicWindow : public Window {
break; break;
} }
case MW_SHUFFLE: // toggle shuffle case WID_M_SHUFFLE: // toggle shuffle
_settings_client.music.shuffle ^= 1; _settings_client.music.shuffle ^= 1;
this->SetWidgetLoweredState(MW_SHUFFLE, _settings_client.music.shuffle); this->SetWidgetLoweredState(WID_M_SHUFFLE, _settings_client.music.shuffle);
this->SetWidgetDirty(MW_SHUFFLE); this->SetWidgetDirty(WID_M_SHUFFLE);
StopMusic(); StopMusic();
SelectSongToPlay(); SelectSongToPlay();
this->SetDirty(); this->SetDirty();
break; break;
case MW_PROGRAMME: // show track selection case WID_M_PROGRAMME: // show track selection
ShowMusicTrackSelection(); ShowMusicTrackSelection();
break; break;
case MW_ALL: case MW_OLD: case MW_NEW: case WID_M_ALL: case WID_M_OLD: case WID_M_NEW:
case MW_EZY: case MW_CUSTOM1: case MW_CUSTOM2: // playlist case WID_M_EZY: case WID_M_CUSTOM1: case WID_M_CUSTOM2: // playlist
SelectPlaylist(widget - MW_ALL); SelectPlaylist(widget - WID_M_ALL);
StopMusic(); StopMusic();
SelectSongToPlay(); SelectSongToPlay();
this->SetDirty(); this->SetDirty();
@ -688,18 +688,18 @@ static const NWidgetPart _nested_music_window_widgets[] = {
NWidget(NWID_VERTICAL), NWidget(NWID_VERTICAL),
NWidget(WWT_PANEL, COLOUR_GREY, -1), SetFill(1, 1), EndContainer(), NWidget(WWT_PANEL, COLOUR_GREY, -1), SetFill(1, 1), EndContainer(),
NWidget(NWID_HORIZONTAL), NWidget(NWID_HORIZONTAL),
NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, MW_PREV), SetMinimalSize(22, 22), SetDataTip(SPR_IMG_SKIP_TO_PREV, STR_MUSIC_TOOLTIP_SKIP_TO_PREVIOUS_TRACK), NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, WID_M_PREV), SetMinimalSize(22, 22), SetDataTip(SPR_IMG_SKIP_TO_PREV, STR_MUSIC_TOOLTIP_SKIP_TO_PREVIOUS_TRACK),
NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, MW_NEXT), SetMinimalSize(22, 22), SetDataTip(SPR_IMG_SKIP_TO_NEXT, STR_MUSIC_TOOLTIP_SKIP_TO_NEXT_TRACK_IN_SELECTION), NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, WID_M_NEXT), SetMinimalSize(22, 22), SetDataTip(SPR_IMG_SKIP_TO_NEXT, STR_MUSIC_TOOLTIP_SKIP_TO_NEXT_TRACK_IN_SELECTION),
NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, MW_STOP), SetMinimalSize(22, 22), SetDataTip(SPR_IMG_STOP_MUSIC, STR_MUSIC_TOOLTIP_STOP_PLAYING_MUSIC), NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, WID_M_STOP), SetMinimalSize(22, 22), SetDataTip(SPR_IMG_STOP_MUSIC, STR_MUSIC_TOOLTIP_STOP_PLAYING_MUSIC),
NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, MW_PLAY), SetMinimalSize(22, 22), SetDataTip(SPR_IMG_PLAY_MUSIC, STR_MUSIC_TOOLTIP_START_PLAYING_MUSIC), NWidget(WWT_PUSHIMGBTN, COLOUR_GREY, WID_M_PLAY), SetMinimalSize(22, 22), SetDataTip(SPR_IMG_PLAY_MUSIC, STR_MUSIC_TOOLTIP_START_PLAYING_MUSIC),
EndContainer(), EndContainer(),
NWidget(WWT_PANEL, COLOUR_GREY, -1), SetFill(1, 1), EndContainer(), NWidget(WWT_PANEL, COLOUR_GREY, -1), SetFill(1, 1), EndContainer(),
EndContainer(), EndContainer(),
NWidget(WWT_PANEL, COLOUR_GREY, MW_SLIDERS), NWidget(WWT_PANEL, COLOUR_GREY, WID_M_SLIDERS),
NWidget(NWID_HORIZONTAL), SetPIP(20, 20, 20), NWidget(NWID_HORIZONTAL), SetPIP(20, 20, 20),
NWidget(NWID_VERTICAL), NWidget(NWID_VERTICAL),
NWidget(WWT_LABEL, COLOUR_GREY, -1), SetFill(1, 0), SetDataTip(STR_MUSIC_MUSIC_VOLUME, STR_NULL), NWidget(WWT_LABEL, COLOUR_GREY, -1), SetFill(1, 0), SetDataTip(STR_MUSIC_MUSIC_VOLUME, STR_NULL),
NWidget(WWT_EMPTY, COLOUR_GREY, MW_MUSIC_VOL), SetMinimalSize(67, 0), SetMinimalTextLines(1, 0), SetFill(1, 0), SetDataTip(0x0, STR_MUSIC_TOOLTIP_DRAG_SLIDERS_TO_SET_MUSIC), NWidget(WWT_EMPTY, COLOUR_GREY, WID_M_MUSIC_VOL), SetMinimalSize(67, 0), SetMinimalTextLines(1, 0), SetFill(1, 0), SetDataTip(0x0, STR_MUSIC_TOOLTIP_DRAG_SLIDERS_TO_SET_MUSIC),
NWidget(NWID_HORIZONTAL), NWidget(NWID_HORIZONTAL),
NWidget(WWT_LABEL, COLOUR_GREY, -1), SetDataTip(STR_MUSIC_RULER_MIN, STR_NULL), NWidget(WWT_LABEL, COLOUR_GREY, -1), SetDataTip(STR_MUSIC_RULER_MIN, STR_NULL),
NWidget(WWT_LABEL, COLOUR_GREY, -1), SetDataTip(STR_MUSIC_RULER_MARKER, STR_NULL), SetFill(1, 0), NWidget(WWT_LABEL, COLOUR_GREY, -1), SetDataTip(STR_MUSIC_RULER_MARKER, STR_NULL), SetFill(1, 0),
@ -712,7 +712,7 @@ static const NWidgetPart _nested_music_window_widgets[] = {
EndContainer(), EndContainer(),
NWidget(NWID_VERTICAL), NWidget(NWID_VERTICAL),
NWidget(WWT_LABEL, COLOUR_GREY, -1), SetFill(1, 0), SetDataTip(STR_MUSIC_EFFECTS_VOLUME, STR_NULL), NWidget(WWT_LABEL, COLOUR_GREY, -1), SetFill(1, 0), SetDataTip(STR_MUSIC_EFFECTS_VOLUME, STR_NULL),
NWidget(WWT_EMPTY, COLOUR_GREY, MW_EFFECT_VOL), SetMinimalSize(67, 0), SetMinimalTextLines(1, 0), SetFill(1, 0), SetDataTip(0x0, STR_MUSIC_TOOLTIP_DRAG_SLIDERS_TO_SET_MUSIC), NWidget(WWT_EMPTY, COLOUR_GREY, WID_M_EFFECT_VOL), SetMinimalSize(67, 0), SetMinimalTextLines(1, 0), SetFill(1, 0), SetDataTip(0x0, STR_MUSIC_TOOLTIP_DRAG_SLIDERS_TO_SET_MUSIC),
NWidget(NWID_HORIZONTAL), NWidget(NWID_HORIZONTAL),
NWidget(WWT_LABEL, COLOUR_GREY, -1), SetDataTip(STR_MUSIC_RULER_MIN, STR_NULL), NWidget(WWT_LABEL, COLOUR_GREY, -1), SetDataTip(STR_MUSIC_RULER_MIN, STR_NULL),
NWidget(WWT_LABEL, COLOUR_GREY, -1), SetDataTip(STR_MUSIC_RULER_MARKER, STR_NULL), SetFill(1, 0), NWidget(WWT_LABEL, COLOUR_GREY, -1), SetDataTip(STR_MUSIC_RULER_MARKER, STR_NULL), SetFill(1, 0),
@ -726,35 +726,35 @@ static const NWidgetPart _nested_music_window_widgets[] = {
EndContainer(), EndContainer(),
EndContainer(), EndContainer(),
EndContainer(), EndContainer(),
NWidget(WWT_PANEL, COLOUR_GREY, MW_BACKGROUND), NWidget(WWT_PANEL, COLOUR_GREY, WID_M_BACKGROUND),
NWidget(NWID_HORIZONTAL), SetPIP(6, 0, 6), NWidget(NWID_HORIZONTAL), SetPIP(6, 0, 6),
NWidget(NWID_VERTICAL), NWidget(NWID_VERTICAL),
NWidget(NWID_SPACER), SetFill(0, 1), NWidget(NWID_SPACER), SetFill(0, 1),
NWidget(WWT_TEXTBTN, COLOUR_GREY, MW_SHUFFLE), SetMinimalSize(50, 8), SetDataTip(STR_MUSIC_SHUFFLE, STR_MUSIC_TOOLTIP_TOGGLE_PROGRAM_SHUFFLE), NWidget(WWT_TEXTBTN, COLOUR_GREY, WID_M_SHUFFLE), SetMinimalSize(50, 8), SetDataTip(STR_MUSIC_SHUFFLE, STR_MUSIC_TOOLTIP_TOGGLE_PROGRAM_SHUFFLE),
NWidget(NWID_SPACER), SetFill(0, 1), NWidget(NWID_SPACER), SetFill(0, 1),
EndContainer(), EndContainer(),
NWidget(NWID_VERTICAL), SetPadding(0, 0, 3, 3), NWidget(NWID_VERTICAL), SetPadding(0, 0, 3, 3),
NWidget(WWT_LABEL, COLOUR_GREY, MW_TRACK), SetFill(0, 0), SetDataTip(STR_MUSIC_TRACK, STR_NULL), NWidget(WWT_LABEL, COLOUR_GREY, WID_M_TRACK), SetFill(0, 0), SetDataTip(STR_MUSIC_TRACK, STR_NULL),
NWidget(WWT_PANEL, COLOUR_GREY, MW_TRACK_NR), EndContainer(), NWidget(WWT_PANEL, COLOUR_GREY, WID_M_TRACK_NR), EndContainer(),
EndContainer(), EndContainer(),
NWidget(NWID_VERTICAL), SetPadding(0, 3, 3, 0), NWidget(NWID_VERTICAL), SetPadding(0, 3, 3, 0),
NWidget(WWT_LABEL, COLOUR_GREY, MW_TRACK_TITLE), SetFill(1, 0), SetDataTip(STR_MUSIC_XTITLE, STR_NULL), NWidget(WWT_LABEL, COLOUR_GREY, WID_M_TRACK_TITLE), SetFill(1, 0), SetDataTip(STR_MUSIC_XTITLE, STR_NULL),
NWidget(WWT_PANEL, COLOUR_GREY, MW_TRACK_NAME), SetFill(1, 0), EndContainer(), NWidget(WWT_PANEL, COLOUR_GREY, WID_M_TRACK_NAME), SetFill(1, 0), EndContainer(),
EndContainer(), EndContainer(),
NWidget(NWID_VERTICAL), NWidget(NWID_VERTICAL),
NWidget(NWID_SPACER), SetFill(0, 1), NWidget(NWID_SPACER), SetFill(0, 1),
NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, MW_PROGRAMME), SetMinimalSize(50, 8), SetDataTip(STR_MUSIC_PROGRAM, STR_MUSIC_TOOLTIP_SHOW_MUSIC_TRACK_SELECTION), NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_M_PROGRAMME), SetMinimalSize(50, 8), SetDataTip(STR_MUSIC_PROGRAM, STR_MUSIC_TOOLTIP_SHOW_MUSIC_TRACK_SELECTION),
NWidget(NWID_SPACER), SetFill(0, 1), NWidget(NWID_SPACER), SetFill(0, 1),
EndContainer(), EndContainer(),
EndContainer(), EndContainer(),
EndContainer(), EndContainer(),
NWidget(NWID_HORIZONTAL, NC_EQUALSIZE), NWidget(NWID_HORIZONTAL, NC_EQUALSIZE),
NWidget(WWT_TEXTBTN, COLOUR_GREY, MW_ALL), SetFill(1, 0), SetDataTip(STR_MUSIC_PLAYLIST_ALL, STR_MUSIC_TOOLTIP_SELECT_ALL_TRACKS_PROGRAM), NWidget(WWT_TEXTBTN, COLOUR_GREY, WID_M_ALL), SetFill(1, 0), SetDataTip(STR_MUSIC_PLAYLIST_ALL, STR_MUSIC_TOOLTIP_SELECT_ALL_TRACKS_PROGRAM),
NWidget(WWT_TEXTBTN, COLOUR_GREY, MW_OLD), SetFill(1, 0), SetDataTip(STR_MUSIC_PLAYLIST_OLD_STYLE, STR_MUSIC_TOOLTIP_SELECT_OLD_STYLE_MUSIC), NWidget(WWT_TEXTBTN, COLOUR_GREY, WID_M_OLD), SetFill(1, 0), SetDataTip(STR_MUSIC_PLAYLIST_OLD_STYLE, STR_MUSIC_TOOLTIP_SELECT_OLD_STYLE_MUSIC),
NWidget(WWT_TEXTBTN, COLOUR_GREY, MW_NEW), SetFill(1, 0), SetDataTip(STR_MUSIC_PLAYLIST_NEW_STYLE, STR_MUSIC_TOOLTIP_SELECT_NEW_STYLE_MUSIC), NWidget(WWT_TEXTBTN, COLOUR_GREY, WID_M_NEW), SetFill(1, 0), SetDataTip(STR_MUSIC_PLAYLIST_NEW_STYLE, STR_MUSIC_TOOLTIP_SELECT_NEW_STYLE_MUSIC),
NWidget(WWT_TEXTBTN, COLOUR_GREY, MW_EZY), SetFill(1, 0), SetDataTip(STR_MUSIC_PLAYLIST_EZY_STREET, STR_MUSIC_TOOLTIP_SELECT_EZY_STREET_STYLE), NWidget(WWT_TEXTBTN, COLOUR_GREY, WID_M_EZY), SetFill(1, 0), SetDataTip(STR_MUSIC_PLAYLIST_EZY_STREET, STR_MUSIC_TOOLTIP_SELECT_EZY_STREET_STYLE),
NWidget(WWT_TEXTBTN, COLOUR_GREY, MW_CUSTOM1), SetFill(1, 0), SetDataTip(STR_MUSIC_PLAYLIST_CUSTOM_1, STR_MUSIC_TOOLTIP_SELECT_CUSTOM_1_USER_DEFINED), NWidget(WWT_TEXTBTN, COLOUR_GREY, WID_M_CUSTOM1), SetFill(1, 0), SetDataTip(STR_MUSIC_PLAYLIST_CUSTOM_1, STR_MUSIC_TOOLTIP_SELECT_CUSTOM_1_USER_DEFINED),
NWidget(WWT_TEXTBTN, COLOUR_GREY, MW_CUSTOM2), SetFill(1, 0), SetDataTip(STR_MUSIC_PLAYLIST_CUSTOM_2, STR_MUSIC_TOOLTIP_SELECT_CUSTOM_2_USER_DEFINED), NWidget(WWT_TEXTBTN, COLOUR_GREY, WID_M_CUSTOM2), SetFill(1, 0), SetDataTip(STR_MUSIC_PLAYLIST_CUSTOM_2, STR_MUSIC_TOOLTIP_SELECT_CUSTOM_2_USER_DEFINED),
EndContainer(), EndContainer(),
}; };

28
src/network/network_chat_gui.cpp
View File

@ -314,7 +314,7 @@ struct NetworkChatWindow : public QueryStringBaseWindow {
this->InitNested(desc, type); this->InitNested(desc, type);
this->SetFocusedWidget(NWCW_TEXTBOX); this->SetFocusedWidget(WID_NC_TEXTBOX);
InvalidateWindowData(WC_NEWS_WINDOW, 0, this->height); InvalidateWindowData(WC_NEWS_WINDOW, 0, this->height);
_chat_tab_completion_active = false; _chat_tab_completion_active = false;
@ -468,7 +468,7 @@ struct NetworkChatWindow : public QueryStringBaseWindow {
virtual void OnPaint() virtual void OnPaint()
{ {
this->DrawWidgets(); this->DrawWidgets();
this->DrawEditBox(NWCW_TEXTBOX); this->DrawEditBox(WID_NC_TEXTBOX);
} }
virtual Point OnInitialPosition(const WindowDesc *desc, int16 sm_width, int16 sm_height, int window_number) virtual Point OnInitialPosition(const WindowDesc *desc, int16 sm_width, int16 sm_height, int window_number)
@ -479,7 +479,7 @@ struct NetworkChatWindow : public QueryStringBaseWindow {
virtual void UpdateWidgetSize(int widget, Dimension *size, const Dimension &padding, Dimension *fill, Dimension *resize) virtual void UpdateWidgetSize(int widget, Dimension *size, const Dimension &padding, Dimension *fill, Dimension *resize)
{ {
if (widget != NWCW_DESTINATION) return; if (widget != WID_NC_DESTINATION) return;
if (this->dtype == DESTTYPE_CLIENT) { if (this->dtype == DESTTYPE_CLIENT) {
SetDParamStr(0, NetworkClientInfo::GetByClientID((ClientID)this->dest)->client_name); SetDParamStr(0, NetworkClientInfo::GetByClientID((ClientID)this->dest)->client_name);
@ -492,7 +492,7 @@ struct NetworkChatWindow : public QueryStringBaseWindow {
virtual void DrawWidget(const Rect &r, int widget) const virtual void DrawWidget(const Rect &r, int widget) const
{ {
if (widget != NWCW_DESTINATION) return; if (widget != WID_NC_DESTINATION) return;
if (this->dtype == DESTTYPE_CLIENT) { if (this->dtype == DESTTYPE_CLIENT) {
SetDParamStr(0, NetworkClientInfo::GetByClientID((ClientID)this->dest)->client_name); SetDParamStr(0, NetworkClientInfo::GetByClientID((ClientID)this->dest)->client_name);
@ -504,15 +504,15 @@ struct NetworkChatWindow : public QueryStringBaseWindow {
{ {
switch (widget) { switch (widget) {
/* Send */ /* Send */
case NWCW_SENDBUTTON: SendChat(this->text.buf, this->dtype, this->dest); case WID_NC_SENDBUTTON: SendChat(this->text.buf, this->dtype, this->dest);
/* FALL THROUGH */ /* FALL THROUGH */
case NWCW_CLOSE: /* Cancel */ delete this; break; case WID_NC_CLOSE: /* Cancel */ delete this; break;
} }
} }
virtual void OnMouseLoop() virtual void OnMouseLoop()
{ {
this->HandleEditBox(NWCW_TEXTBOX); this->HandleEditBox(WID_NC_TEXTBOX);
} }
virtual EventState OnKeyPress(uint16 key, uint16 keycode) virtual EventState OnKeyPress(uint16 key, uint16 keycode)
@ -523,7 +523,7 @@ struct NetworkChatWindow : public QueryStringBaseWindow {
state = ES_HANDLED; state = ES_HANDLED;
} else { } else {
_chat_tab_completion_active = false; _chat_tab_completion_active = false;
switch (this->HandleEditBoxKey(NWCW_TEXTBOX, key, keycode, state)) { switch (this->HandleEditBoxKey(WID_NC_TEXTBOX, key, keycode, state)) {
default: NOT_REACHED(); default: NOT_REACHED();
case HEBR_EDITING: { case HEBR_EDITING: {
Window *osk = FindWindowById(WC_OSK, 0); Window *osk = FindWindowById(WC_OSK, 0);
@ -542,7 +542,7 @@ struct NetworkChatWindow : public QueryStringBaseWindow {
virtual void OnOpenOSKWindow(int wid) virtual void OnOpenOSKWindow(int wid)
{ {
ShowOnScreenKeyboard(this, wid, NWCW_CLOSE, NWCW_SENDBUTTON); ShowOnScreenKeyboard(this, wid, WID_NC_CLOSE, WID_NC_SENDBUTTON);
} }
/** /**
@ -559,13 +559,13 @@ struct NetworkChatWindow : public QueryStringBaseWindow {
/** The widgets of the chat window. */ /** The widgets of the chat window. */
static const NWidgetPart _nested_chat_window_widgets[] = { static const NWidgetPart _nested_chat_window_widgets[] = {
NWidget(NWID_HORIZONTAL), NWidget(NWID_HORIZONTAL),
NWidget(WWT_CLOSEBOX, COLOUR_GREY, NWCW_CLOSE), NWidget(WWT_CLOSEBOX, COLOUR_GREY, WID_NC_CLOSE),
NWidget(WWT_PANEL, COLOUR_GREY, NWCW_BACKGROUND), NWidget(WWT_PANEL, COLOUR_GREY, WID_NC_BACKGROUND),
NWidget(NWID_HORIZONTAL), NWidget(NWID_HORIZONTAL),
NWidget(WWT_TEXT, COLOUR_GREY, NWCW_DESTINATION), SetMinimalSize(62, 12), SetPadding(1, 0, 1, 0), SetDataTip(STR_NULL, STR_NULL), NWidget(WWT_TEXT, COLOUR_GREY, WID_NC_DESTINATION), SetMinimalSize(62, 12), SetPadding(1, 0, 1, 0), SetDataTip(STR_NULL, STR_NULL),
NWidget(WWT_EDITBOX, COLOUR_GREY, NWCW_TEXTBOX), SetMinimalSize(100, 12), SetPadding(1, 0, 1, 0), SetResize(1, 0), NWidget(WWT_EDITBOX, COLOUR_GREY, WID_NC_TEXTBOX), SetMinimalSize(100, 12), SetPadding(1, 0, 1, 0), SetResize(1, 0),
SetDataTip(STR_NETWORK_CHAT_OSKTITLE, STR_NULL), SetDataTip(STR_NETWORK_CHAT_OSKTITLE, STR_NULL),
NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, NWCW_SENDBUTTON), SetMinimalSize(62, 12), SetPadding(1, 0, 1, 0), SetDataTip(STR_NETWORK_CHAT_SEND, STR_NULL), NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_NC_SENDBUTTON), SetMinimalSize(62, 12), SetPadding(1, 0, 1, 0), SetDataTip(STR_NETWORK_CHAT_SEND, STR_NULL),
EndContainer(), EndContainer(),
EndContainer(), EndContainer(),
EndContainer(), EndContainer(),

126
src/network/network_content_gui.cpp
View File

@ -30,11 +30,11 @@
/** Nested widgets for the download window. */ /** Nested widgets for the download window. */
static const NWidgetPart _nested_network_content_download_status_window_widgets[] = { static const NWidgetPart _nested_network_content_download_status_window_widgets[] = {
NWidget(WWT_CAPTION, COLOUR_GREY), SetDataTip(STR_CONTENT_DOWNLOAD_TITLE, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS), NWidget(WWT_CAPTION, COLOUR_GREY), SetDataTip(STR_CONTENT_DOWNLOAD_TITLE, STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS),
NWidget(WWT_PANEL, COLOUR_GREY, NCDSWW_BACKGROUND), NWidget(WWT_PANEL, COLOUR_GREY, WID_NCDS_BACKGROUND),
NWidget(NWID_SPACER), SetMinimalSize(350, 0), SetMinimalTextLines(3, WD_FRAMERECT_TOP + WD_FRAMERECT_BOTTOM + 30), NWidget(NWID_SPACER), SetMinimalSize(350, 0), SetMinimalTextLines(3, WD_FRAMERECT_TOP + WD_FRAMERECT_BOTTOM + 30),
NWidget(NWID_HORIZONTAL), NWidget(NWID_HORIZONTAL),
NWidget(NWID_SPACER), SetMinimalSize(125, 0), NWidget(NWID_SPACER), SetMinimalSize(125, 0),
NWidget(WWT_PUSHTXTBTN, COLOUR_WHITE, NCDSWW_CANCELOK), SetMinimalSize(101, 12), SetDataTip(STR_BUTTON_CANCEL, STR_NULL), NWidget(WWT_PUSHTXTBTN, COLOUR_WHITE, WID_NCDS_CANCELOK), SetMinimalSize(101, 12), SetDataTip(STR_BUTTON_CANCEL, STR_NULL),
NWidget(NWID_SPACER), SetFill(1, 0), NWidget(NWID_SPACER), SetFill(1, 0),
EndContainer(), EndContainer(),
NWidget(NWID_SPACER), SetMinimalSize(0, 4), NWidget(NWID_SPACER), SetMinimalSize(0, 4),
@ -65,7 +65,7 @@ BaseNetworkContentDownloadStatusWindow::~BaseNetworkContentDownloadStatusWindow(
/* virtual */ void BaseNetworkContentDownloadStatusWindow::DrawWidget(const Rect &r, int widget) const /* virtual */ void BaseNetworkContentDownloadStatusWindow::DrawWidget(const Rect &r, int widget) const
{ {
if (widget != NCDSWW_BACKGROUND) return; if (widget != WID_NCDS_BACKGROUND) return;
/* Draw nice progress bar :) */ /* Draw nice progress bar :) */
DrawFrameRect(r.left + 20, r.top + 4, r.left + 20 + (int)((this->width - 40LL) * this->downloaded_bytes / this->total_bytes), r.top + 14, COLOUR_MAUVE, FR_NONE); DrawFrameRect(r.left + 20, r.top + 4, r.left + 20 + (int)((this->width - 40LL) * this->downloaded_bytes / this->total_bytes), r.top + 14, COLOUR_MAUVE, FR_NONE);
@ -198,7 +198,7 @@ public:
virtual void OnClick(Point pt, int widget, int click_count) virtual void OnClick(Point pt, int widget, int click_count)
{ {
if (widget == NCDSWW_CANCELOK) { if (widget == WID_NCDS_CANCELOK) {
if (this->downloaded_bytes != this->total_bytes) { if (this->downloaded_bytes != this->total_bytes) {
_network_content_client.Close(); _network_content_client.Close();
delete this; delete this;
@ -217,7 +217,7 @@ public:
/* When downloading is finished change cancel in ok */ /* When downloading is finished change cancel in ok */
if (this->downloaded_bytes == this->total_bytes) { if (this->downloaded_bytes == this->total_bytes) {
this->GetWidget<NWidgetCore>(NCDSWW_CANCELOK)->widget_data = STR_BUTTON_OK; this->GetWidget<NWidgetCore>(WID_NCDS_CANCELOK)->widget_data = STR_BUTTON_OK;
} }
} }
}; };
@ -356,14 +356,14 @@ public:
list_pos(0) list_pos(0)
{ {
this->CreateNestedTree(desc); this->CreateNestedTree(desc);
this->vscroll = this->GetScrollbar(NCLWW_SCROLLBAR); this->vscroll = this->GetScrollbar(WID_NCL_SCROLLBAR);
this->FinishInitNested(desc, 1); this->FinishInitNested(desc, 1);
this->GetWidget<NWidgetStacked>(NCLWW_SEL_ALL_UPDATE)->SetDisplayedPlane(select_all); this->GetWidget<NWidgetStacked>(WID_NCL_SEL_ALL_UPDATE)->SetDisplayedPlane(select_all);
this->afilter = CS_ALPHANUMERAL; this->afilter = CS_ALPHANUMERAL;
InitializeTextBuffer(&this->text, this->edit_str_buf, this->edit_str_size, EDITBOX_MAX_LENGTH); InitializeTextBuffer(&this->text, this->edit_str_buf, this->edit_str_size, EDITBOX_MAX_LENGTH);
this->SetFocusedWidget(NCLWW_FILTER); this->SetFocusedWidget(WID_NCL_FILTER);
_network_content_client.AddCallback(this); _network_content_client.AddCallback(this);
this->content.SetListing(this->last_sorting); this->content.SetListing(this->last_sorting);
@ -385,11 +385,11 @@ public:
virtual void UpdateWidgetSize(int widget, Dimension *size, const Dimension &padding, Dimension *fill, Dimension *resize) virtual void UpdateWidgetSize(int widget, Dimension *size, const Dimension &padding, Dimension *fill, Dimension *resize)
{ {
switch (widget) { switch (widget) {
case NCLWW_FILTER_CAPT: case WID_NCL_FILTER_CAPT:
*size = maxdim(*size, GetStringBoundingBox(STR_CONTENT_FILTER_TITLE)); *size = maxdim(*size, GetStringBoundingBox(STR_CONTENT_FILTER_TITLE));
break; break;
case NCLWW_TYPE: { case WID_NCL_TYPE: {
Dimension d = *size; Dimension d = *size;
for (int i = CONTENT_TYPE_BEGIN; i < CONTENT_TYPE_END; i++) { for (int i = CONTENT_TYPE_BEGIN; i < CONTENT_TYPE_END; i++) {
d = maxdim(d, GetStringBoundingBox(STR_CONTENT_TYPE_BASE_GRAPHICS + i - CONTENT_TYPE_BASE_GRAPHICS)); d = maxdim(d, GetStringBoundingBox(STR_CONTENT_TYPE_BASE_GRAPHICS + i - CONTENT_TYPE_BASE_GRAPHICS));
@ -398,7 +398,7 @@ public:
break; break;
} }
case NCLWW_MATRIX: case WID_NCL_MATRIX:
resize->height = FONT_HEIGHT_NORMAL + WD_MATRIX_TOP + WD_MATRIX_BOTTOM; resize->height = FONT_HEIGHT_NORMAL + WD_MATRIX_TOP + WD_MATRIX_BOTTOM;
size->height = 10 * resize->height; size->height = 10 * resize->height;
break; break;
@ -409,15 +409,15 @@ public:
virtual void DrawWidget(const Rect &r, int widget) const virtual void DrawWidget(const Rect &r, int widget) const
{ {
switch (widget) { switch (widget) {
case NCLWW_FILTER_CAPT: case WID_NCL_FILTER_CAPT:
DrawString(r.left, r.right, r.top, STR_CONTENT_FILTER_TITLE, TC_FROMSTRING, SA_RIGHT); DrawString(r.left, r.right, r.top, STR_CONTENT_FILTER_TITLE, TC_FROMSTRING, SA_RIGHT);
break; break;
case NCLWW_DETAILS: case WID_NCL_DETAILS:
this->DrawDetails(r); this->DrawDetails(r);
break; break;
case NCLWW_MATRIX: case WID_NCL_MATRIX:
this->DrawMatrix(r); this->DrawMatrix(r);
break; break;
} }
@ -434,12 +434,12 @@ public:
this->DrawWidgets(); this->DrawWidgets();
/* Edit box to filter for keywords */ /* Edit box to filter for keywords */
this->DrawEditBox(NCLWW_FILTER); this->DrawEditBox(WID_NCL_FILTER);
switch (this->content.SortType()) { switch (this->content.SortType()) {
case NCLWW_CHECKBOX - NCLWW_CHECKBOX: this->DrawSortButtonState(NCLWW_CHECKBOX, arrow); break; case WID_NCL_CHECKBOX - WID_NCL_CHECKBOX: this->DrawSortButtonState(WID_NCL_CHECKBOX, arrow); break;
case NCLWW_TYPE - NCLWW_CHECKBOX: this->DrawSortButtonState(NCLWW_TYPE, arrow); break; case WID_NCL_TYPE - WID_NCL_CHECKBOX: this->DrawSortButtonState(WID_NCL_TYPE, arrow); break;
case NCLWW_NAME - NCLWW_CHECKBOX: this->DrawSortButtonState(NCLWW_NAME, arrow); break; case WID_NCL_NAME - WID_NCL_CHECKBOX: this->DrawSortButtonState(WID_NCL_NAME, arrow); break;
} }
} }
@ -449,9 +449,9 @@ public:
*/ */
void DrawMatrix(const Rect &r) const void DrawMatrix(const Rect &r) const
{ {
const NWidgetBase *nwi_checkbox = this->GetWidget<NWidgetBase>(NCLWW_CHECKBOX); const NWidgetBase *nwi_checkbox = this->GetWidget<NWidgetBase>(WID_NCL_CHECKBOX);
const NWidgetBase *nwi_name = this->GetWidget<NWidgetBase>(NCLWW_NAME); const NWidgetBase *nwi_name = this->GetWidget<NWidgetBase>(WID_NCL_NAME);
const NWidgetBase *nwi_type = this->GetWidget<NWidgetBase>(NCLWW_TYPE); const NWidgetBase *nwi_type = this->GetWidget<NWidgetBase>(WID_NCL_TYPE);
/* Fill the matrix with the information */ /* Fill the matrix with the information */
@ -599,14 +599,14 @@ public:
virtual void OnClick(Point pt, int widget, int click_count) virtual void OnClick(Point pt, int widget, int click_count)
{ {
switch (widget) { switch (widget) {
case NCLWW_MATRIX: { case WID_NCL_MATRIX: {
uint id_v = this->vscroll->GetScrolledRowFromWidget(pt.y, this, NCLWW_MATRIX); uint id_v = this->vscroll->GetScrolledRowFromWidget(pt.y, this, WID_NCL_MATRIX);
if (id_v >= this->content.Length()) return; // click out of bounds if (id_v >= this->content.Length()) return; // click out of bounds
this->selected = *this->content.Get(id_v); this->selected = *this->content.Get(id_v);
this->list_pos = id_v; this->list_pos = id_v;
const NWidgetBase *checkbox = this->GetWidget<NWidgetBase>(NCLWW_CHECKBOX); const NWidgetBase *checkbox = this->GetWidget<NWidgetBase>(WID_NCL_CHECKBOX);
if (click_count > 1 || IsInsideBS(pt.x, checkbox->pos_x, checkbox->current_x)) { if (click_count > 1 || IsInsideBS(pt.x, checkbox->pos_x, checkbox->current_x)) {
_network_content_client.ToggleSelectedState(this->selected); _network_content_client.ToggleSelectedState(this->selected);
this->content.ForceResort(); this->content.ForceResort();
@ -616,14 +616,14 @@ public:
break; break;
} }
case NCLWW_CHECKBOX: case WID_NCL_CHECKBOX:
case NCLWW_TYPE: case WID_NCL_TYPE:
case NCLWW_NAME: case WID_NCL_NAME:
if (this->content.SortType() == widget - NCLWW_CHECKBOX) { if (this->content.SortType() == widget - WID_NCL_CHECKBOX) {
this->content.ToggleSortOrder(); this->content.ToggleSortOrder();
this->list_pos = this->content.Length() - this->list_pos - 1; this->list_pos = this->content.Length() - this->list_pos - 1;
} else { } else {
this->content.SetSortType(widget - NCLWW_CHECKBOX); this->content.SetSortType(widget - WID_NCL_CHECKBOX);
this->content.ForceResort(); this->content.ForceResort();
this->SortContentList(); this->SortContentList();
} }
@ -631,33 +631,33 @@ public:
this->InvalidateData(); this->InvalidateData();
break; break;
case NCLWW_SELECT_ALL: case WID_NCL_SELECT_ALL:
_network_content_client.SelectAll(); _network_content_client.SelectAll();
this->InvalidateData(); this->InvalidateData();
break; break;
case NCLWW_SELECT_UPDATE: case WID_NCL_SELECT_UPDATE:
_network_content_client.SelectUpgrade(); _network_content_client.SelectUpgrade();
this->InvalidateData(); this->InvalidateData();
break; break;
case NCLWW_UNSELECT: case WID_NCL_UNSELECT:
_network_content_client.UnselectAll(); _network_content_client.UnselectAll();
this->InvalidateData(); this->InvalidateData();
break; break;
case NCLWW_CANCEL: case WID_NCL_CANCEL:
delete this; delete this;
break; break;
case NCLWW_OPEN_URL: case WID_NCL_OPEN_URL:
if (this->selected != NULL) { if (this->selected != NULL) {
extern void OpenBrowser(const char *url); extern void OpenBrowser(const char *url);
OpenBrowser(this->selected->url); OpenBrowser(this->selected->url);
} }
break; break;
case NCLWW_DOWNLOAD: case WID_NCL_DOWNLOAD:
if (BringWindowToFrontById(WC_NETWORK_STATUS_WINDOW, 0) == NULL) new NetworkContentDownloadStatusWindow(); if (BringWindowToFrontById(WC_NETWORK_STATUS_WINDOW, 0) == NULL) new NetworkContentDownloadStatusWindow();
break; break;
} }
@ -665,7 +665,7 @@ public:
virtual void OnMouseLoop() virtual void OnMouseLoop()
{ {
this->HandleEditBox(NCLWW_FILTER); this->HandleEditBox(WID_NCL_FILTER);
} }
virtual EventState OnKeyPress(uint16 key, uint16 keycode) virtual EventState OnKeyPress(uint16 key, uint16 keycode)
@ -698,7 +698,7 @@ public:
case WKC_SPACE: case WKC_SPACE:
case WKC_RETURN: case WKC_RETURN:
if (keycode == WKC_RETURN || !IsWidgetFocused(NCLWW_FILTER)) { if (keycode == WKC_RETURN || !IsWidgetFocused(WID_NCL_FILTER)) {
if (this->selected != NULL) { if (this->selected != NULL) {
_network_content_client.ToggleSelectedState(this->selected); _network_content_client.ToggleSelectedState(this->selected);
this->content.ForceResort(); this->content.ForceResort();
@ -711,8 +711,8 @@ public:
default: { default: {
/* Handle editbox input */ /* Handle editbox input */
EventState state = ES_NOT_HANDLED; EventState state = ES_NOT_HANDLED;
if (this->HandleEditBoxKey(NCLWW_FILTER, key, keycode, state) == HEBR_EDITING) { if (this->HandleEditBoxKey(WID_NCL_FILTER, key, keycode, state) == HEBR_EDITING) {
this->OnOSKInput(NCLWW_FILTER); this->OnOSKInput(WID_NCL_FILTER);
} }
return state; return state;
@ -740,8 +740,8 @@ public:
virtual void OnResize() virtual void OnResize()
{ {
this->vscroll->SetCapacityFromWidget(this, NCLWW_MATRIX); this->vscroll->SetCapacityFromWidget(this, WID_NCL_MATRIX);
this->GetWidget<NWidgetCore>(NCLWW_MATRIX)->widget_data = (this->vscroll->GetCapacity() << MAT_ROW_START) + (1 << MAT_COL_START); this->GetWidget<NWidgetCore>(WID_NCL_MATRIX)->widget_data = (this->vscroll->GetCapacity() << MAT_ROW_START) + (1 << MAT_COL_START);
} }
virtual void OnReceiveContentInfo(const ContentInfo *rci) virtual void OnReceiveContentInfo(const ContentInfo *rci)
@ -801,13 +801,13 @@ public:
} }
/* If data == 2 then the status window caused this OnInvalidate */ /* If data == 2 then the status window caused this OnInvalidate */
this->SetWidgetDisabledState(NCLWW_DOWNLOAD, this->filesize_sum == 0 || (FindWindowById(WC_NETWORK_STATUS_WINDOW, 0) != NULL && data != 2)); this->SetWidgetDisabledState(WID_NCL_DOWNLOAD, this->filesize_sum == 0 || (FindWindowById(WC_NETWORK_STATUS_WINDOW, 0) != NULL && data != 2));
this->SetWidgetDisabledState(NCLWW_UNSELECT, this->filesize_sum == 0); this->SetWidgetDisabledState(WID_NCL_UNSELECT, this->filesize_sum == 0);
this->SetWidgetDisabledState(NCLWW_SELECT_ALL, !show_select_all); this->SetWidgetDisabledState(WID_NCL_SELECT_ALL, !show_select_all);
this->SetWidgetDisabledState(NCLWW_SELECT_UPDATE, !show_select_upgrade); this->SetWidgetDisabledState(WID_NCL_SELECT_UPDATE, !show_select_upgrade);
this->SetWidgetDisabledState(NCLWW_OPEN_URL, this->selected == NULL || StrEmpty(this->selected->url)); this->SetWidgetDisabledState(WID_NCL_OPEN_URL, this->selected == NULL || StrEmpty(this->selected->url));
this->GetWidget<NWidgetCore>(NCLWW_CANCEL)->widget_data = this->filesize_sum == 0 ? STR_AI_SETTINGS_CLOSE : STR_AI_LIST_CANCEL; this->GetWidget<NWidgetCore>(WID_NCL_CANCEL)->widget_data = this->filesize_sum == 0 ? STR_AI_SETTINGS_CLOSE : STR_AI_LIST_CANCEL;
} }
}; };
@ -830,12 +830,12 @@ static const NWidgetPart _nested_network_content_list_widgets[] = {
NWidget(WWT_CLOSEBOX, COLOUR_LIGHT_BLUE), NWidget(WWT_CLOSEBOX, COLOUR_LIGHT_BLUE),
NWidget(WWT_CAPTION, COLOUR_LIGHT_BLUE), SetDataTip(STR_CONTENT_TITLE, STR_NULL), NWidget(WWT_CAPTION, COLOUR_LIGHT_BLUE), SetDataTip(STR_CONTENT_TITLE, STR_NULL),
EndContainer(), EndContainer(),
NWidget(WWT_PANEL, COLOUR_LIGHT_BLUE, NCLWW_BACKGROUND), NWidget(WWT_PANEL, COLOUR_LIGHT_BLUE, WID_NCL_BACKGROUND),
NWidget(NWID_SPACER), SetMinimalSize(0, 7), SetResize(1, 0), NWidget(NWID_SPACER), SetMinimalSize(0, 7), SetResize(1, 0),
NWidget(NWID_HORIZONTAL, NC_EQUALSIZE), SetPIP(8, 8, 8), NWidget(NWID_HORIZONTAL, NC_EQUALSIZE), SetPIP(8, 8, 8),
/* Top */ /* Top */
NWidget(WWT_EMPTY, COLOUR_LIGHT_BLUE, NCLWW_FILTER_CAPT), SetFill(1, 0), SetResize(1, 0), NWidget(WWT_EMPTY, COLOUR_LIGHT_BLUE, WID_NCL_FILTER_CAPT), SetFill(1, 0), SetResize(1, 0),
NWidget(WWT_EDITBOX, COLOUR_LIGHT_BLUE, NCLWW_FILTER), SetFill(1, 0), SetResize(1, 0), NWidget(WWT_EDITBOX, COLOUR_LIGHT_BLUE, WID_NCL_FILTER), SetFill(1, 0), SetResize(1, 0),
SetDataTip(STR_LIST_FILTER_OSKTITLE, STR_LIST_FILTER_TOOLTIP), SetDataTip(STR_LIST_FILTER_OSKTITLE, STR_LIST_FILTER_TOOLTIP),
EndContainer(), EndContainer(),
NWidget(NWID_SPACER), SetMinimalSize(0, 7), SetResize(1, 0), NWidget(NWID_SPACER), SetMinimalSize(0, 7), SetResize(1, 0),
@ -845,41 +845,41 @@ static const NWidgetPart _nested_network_content_list_widgets[] = {
NWidget(NWID_HORIZONTAL), NWidget(NWID_HORIZONTAL),
NWidget(NWID_VERTICAL), NWidget(NWID_VERTICAL),
NWidget(NWID_HORIZONTAL), NWidget(NWID_HORIZONTAL),
NWidget(WWT_PUSHTXTBTN, COLOUR_WHITE, NCLWW_CHECKBOX), SetMinimalSize(13, 1), SetDataTip(STR_EMPTY, STR_NULL), NWidget(WWT_PUSHTXTBTN, COLOUR_WHITE, WID_NCL_CHECKBOX), SetMinimalSize(13, 1), SetDataTip(STR_EMPTY, STR_NULL),
NWidget(WWT_PUSHTXTBTN, COLOUR_WHITE, NCLWW_TYPE), NWidget(WWT_PUSHTXTBTN, COLOUR_WHITE, WID_NCL_TYPE),
SetDataTip(STR_CONTENT_TYPE_CAPTION, STR_CONTENT_TYPE_CAPTION_TOOLTIP), SetDataTip(STR_CONTENT_TYPE_CAPTION, STR_CONTENT_TYPE_CAPTION_TOOLTIP),
NWidget(WWT_PUSHTXTBTN, COLOUR_WHITE, NCLWW_NAME), SetResize(1, 0), SetFill(1, 0), NWidget(WWT_PUSHTXTBTN, COLOUR_WHITE, WID_NCL_NAME), SetResize(1, 0), SetFill(1, 0),
SetDataTip(STR_CONTENT_NAME_CAPTION, STR_CONTENT_NAME_CAPTION_TOOLTIP), SetDataTip(STR_CONTENT_NAME_CAPTION, STR_CONTENT_NAME_CAPTION_TOOLTIP),
EndContainer(), EndContainer(),
NWidget(WWT_MATRIX, COLOUR_LIGHT_BLUE, NCLWW_MATRIX), SetResize(1, 14), SetFill(1, 1), SetScrollbar(NCLWW_SCROLLBAR), SetDataTip(STR_NULL, STR_CONTENT_MATRIX_TOOLTIP), NWidget(WWT_MATRIX, COLOUR_LIGHT_BLUE, WID_NCL_MATRIX), SetResize(1, 14), SetFill(1, 1), SetScrollbar(WID_NCL_SCROLLBAR), SetDataTip(STR_NULL, STR_CONTENT_MATRIX_TOOLTIP),
EndContainer(), EndContainer(),
NWidget(NWID_VSCROLLBAR, COLOUR_LIGHT_BLUE, NCLWW_SCROLLBAR), NWidget(NWID_VSCROLLBAR, COLOUR_LIGHT_BLUE, WID_NCL_SCROLLBAR),
EndContainer(), EndContainer(),
EndContainer(), EndContainer(),
/* Right side. */ /* Right side. */
NWidget(NWID_VERTICAL), NWidget(NWID_VERTICAL),
NWidget(WWT_PANEL, COLOUR_LIGHT_BLUE, NCLWW_DETAILS), SetResize(1, 1), SetFill(1, 1), EndContainer(), NWidget(WWT_PANEL, COLOUR_LIGHT_BLUE, WID_NCL_DETAILS), SetResize(1, 1), SetFill(1, 1), EndContainer(),
EndContainer(), EndContainer(),
EndContainer(), EndContainer(),
NWidget(NWID_SPACER), SetMinimalSize(0, 7), SetResize(1, 0), NWidget(NWID_SPACER), SetMinimalSize(0, 7), SetResize(1, 0),
/* Bottom. */ /* Bottom. */
NWidget(NWID_HORIZONTAL, NC_EQUALSIZE), SetPIP(8, 8, 8), NWidget(NWID_HORIZONTAL, NC_EQUALSIZE), SetPIP(8, 8, 8),
NWidget(NWID_HORIZONTAL, NC_EQUALSIZE), SetPIP(8, 8, 8), NWidget(NWID_HORIZONTAL, NC_EQUALSIZE), SetPIP(8, 8, 8),
NWidget(NWID_SELECTION, INVALID_COLOUR, NCLWW_SEL_ALL_UPDATE), SetResize(1, 0), SetFill(1, 0), NWidget(NWID_SELECTION, INVALID_COLOUR, WID_NCL_SEL_ALL_UPDATE), SetResize(1, 0), SetFill(1, 0),
NWidget(WWT_PUSHTXTBTN, COLOUR_WHITE, NCLWW_SELECT_UPDATE), SetResize(1, 0), SetFill(1, 0), NWidget(WWT_PUSHTXTBTN, COLOUR_WHITE, WID_NCL_SELECT_UPDATE), SetResize(1, 0), SetFill(1, 0),
SetDataTip(STR_CONTENT_SELECT_UPDATES_CAPTION, STR_CONTENT_SELECT_UPDATES_CAPTION_TOOLTIP), SetDataTip(STR_CONTENT_SELECT_UPDATES_CAPTION, STR_CONTENT_SELECT_UPDATES_CAPTION_TOOLTIP),
NWidget(WWT_PUSHTXTBTN, COLOUR_WHITE, NCLWW_SELECT_ALL), SetResize(1, 0), SetFill(1, 0), NWidget(WWT_PUSHTXTBTN, COLOUR_WHITE, WID_NCL_SELECT_ALL), SetResize(1, 0), SetFill(1, 0),
SetDataTip(STR_CONTENT_SELECT_ALL_CAPTION, STR_CONTENT_SELECT_ALL_CAPTION_TOOLTIP), SetDataTip(STR_CONTENT_SELECT_ALL_CAPTION, STR_CONTENT_SELECT_ALL_CAPTION_TOOLTIP),
EndContainer(), EndContainer(),
NWidget(WWT_PUSHTXTBTN, COLOUR_WHITE, NCLWW_UNSELECT), SetResize(1, 0), SetFill(1, 0), NWidget(WWT_PUSHTXTBTN, COLOUR_WHITE, WID_NCL_UNSELECT), SetResize(1, 0), SetFill(1, 0),
SetDataTip(STR_CONTENT_UNSELECT_ALL_CAPTION, STR_CONTENT_UNSELECT_ALL_CAPTION_TOOLTIP), SetDataTip(STR_CONTENT_UNSELECT_ALL_CAPTION, STR_CONTENT_UNSELECT_ALL_CAPTION_TOOLTIP),
EndContainer(), EndContainer(),
NWidget(NWID_HORIZONTAL, NC_EQUALSIZE), SetPIP(8, 8, 8), NWidget(NWID_HORIZONTAL, NC_EQUALSIZE), SetPIP(8, 8, 8),
NWidget(WWT_PUSHTXTBTN, COLOUR_WHITE, NCLWW_OPEN_URL), SetResize(1, 0), SetFill(1, 0), NWidget(WWT_PUSHTXTBTN, COLOUR_WHITE, WID_NCL_OPEN_URL), SetResize(1, 0), SetFill(1, 0),
SetDataTip(STR_CONTENT_OPEN_URL, STR_CONTENT_OPEN_URL_TOOLTIP), SetDataTip(STR_CONTENT_OPEN_URL, STR_CONTENT_OPEN_URL_TOOLTIP),
NWidget(WWT_PUSHTXTBTN, COLOUR_WHITE, NCLWW_CANCEL), SetResize(1, 0), SetFill(1, 0), NWidget(WWT_PUSHTXTBTN, COLOUR_WHITE, WID_NCL_CANCEL), SetResize(1, 0), SetFill(1, 0),
SetDataTip(STR_BUTTON_CANCEL, STR_NULL), SetDataTip(STR_BUTTON_CANCEL, STR_NULL),
NWidget(WWT_PUSHTXTBTN, COLOUR_WHITE, NCLWW_DOWNLOAD), SetResize(1, 0), SetFill(1, 0), NWidget(WWT_PUSHTXTBTN, COLOUR_WHITE, WID_NCL_DOWNLOAD), SetResize(1, 0), SetFill(1, 0),
SetDataTip(STR_CONTENT_DOWNLOAD_CAPTION, STR_CONTENT_DOWNLOAD_CAPTION_TOOLTIP), SetDataTip(STR_CONTENT_DOWNLOAD_CAPTION, STR_CONTENT_DOWNLOAD_CAPTION_TOOLTIP),
EndContainer(), EndContainer(),
EndContainer(), EndContainer(),

464
src/network/network_gui.cpp
View File

File diff suppressed because it is too large Load Diff

60
src/widgets/music_widget.h
View File

@ -14,40 +14,40 @@
/** Widgets of the WC_MUSIC_TRACK_SELECTION. */ /** Widgets of the WC_MUSIC_TRACK_SELECTION. */
enum MusicTrackSelectionWidgets { enum MusicTrackSelectionWidgets {
MTSW_LIST_LEFT, WID_MTS_LIST_LEFT, ///< Left button.
MTSW_PLAYLIST, WID_MTS_PLAYLIST, ///< Playlist.
MTSW_LIST_RIGHT, WID_MTS_LIST_RIGHT, ///< Right button.
MTSW_ALL, WID_MTS_ALL, ///< All button.
MTSW_OLD, WID_MTS_OLD, ///< Old button.
MTSW_NEW, WID_MTS_NEW, ///< New button.
MTSW_EZY, WID_MTS_EZY, ///< Ezy button.
MTSW_CUSTOM1, WID_MTS_CUSTOM1, ///< Custom1 button.
MTSW_CUSTOM2, WID_MTS_CUSTOM2, ///< Custom2 button.
MTSW_CLEAR, WID_MTS_CLEAR, ///< Clear button.
}; };
/** Widgets of the WC_MUSIC_WINDOW. */ /** Widgets of the WC_MUSIC_WINDOW. */
enum MusicWidgets { enum MusicWidgets {
MW_PREV, WID_M_PREV, ///< Previous button.
MW_NEXT, WID_M_NEXT, ///< Next button.
MW_STOP, WID_M_STOP, ///< Stop button.
MW_PLAY, WID_M_PLAY, ///< Play button.
MW_SLIDERS, WID_M_SLIDERS, ///< Sliders.
MW_MUSIC_VOL, WID_M_MUSIC_VOL, ///< Music volume.
MW_EFFECT_VOL, WID_M_EFFECT_VOL, ///< Effect volume.
MW_BACKGROUND, WID_M_BACKGROUND, ///< Background of the window.
MW_TRACK, WID_M_TRACK, ///< Track playing.
MW_TRACK_NR, WID_M_TRACK_NR, ///< Track number.
MW_TRACK_TITLE, WID_M_TRACK_TITLE, ///< Track title.
MW_TRACK_NAME, WID_M_TRACK_NAME, ///< Track name.
MW_SHUFFLE, WID_M_SHUFFLE, ///< Shuffle button.
MW_PROGRAMME, WID_M_PROGRAMME, ///< Program button.
MW_ALL, WID_M_ALL, ///< All button.
MW_OLD, WID_M_OLD, ///< Old button.
MW_NEW, WID_M_NEW, ///< New button.
MW_EZY, WID_M_EZY, ///< Ezy button.
MW_CUSTOM1, WID_M_CUSTOM1, ///< Custom1 button.
MW_CUSTOM2, WID_M_CUSTOM2, ///< Custom2 button.
}; };
#endif /* WIDGETS_MUSIC_WIDGET_H */ #endif /* WIDGETS_MUSIC_WIDGET_H */

10
src/widgets/network_chat_widget.h
View File

@ -14,11 +14,11 @@
/** Widgets of the WC_SEND_NETWORK_MSG. */ /** Widgets of the WC_SEND_NETWORK_MSG. */
enum NetWorkChatWidgets { enum NetWorkChatWidgets {
NWCW_CLOSE, WID_NC_CLOSE, ///< Close button.
NWCW_BACKGROUND, WID_NC_BACKGROUND, ///< Background of the window.
NWCW_DESTINATION, WID_NC_DESTINATION, ///< Destination.
NWCW_TEXTBOX, WID_NC_TEXTBOX, ///< Textbox.
NWCW_SENDBUTTON, WID_NC_SENDBUTTON, ///< Send button.
}; };

40
src/widgets/network_content_widget.h
View File

@ -13,35 +13,35 @@
#define WIDGETS_NETWORK_CONTENT_WIDGET_H #define WIDGETS_NETWORK_CONTENT_WIDGET_H
/** Widgets of the WC_NETWORK_STATUS_WINDOW (WC_NETWORK_STATUS_WINDOW is also used in NetworkJoinStatusWidgets). */ /** Widgets of the WC_NETWORK_STATUS_WINDOW (WC_NETWORK_STATUS_WINDOW is also used in NetworkJoinStatusWidgets). */
enum NetworkContentDownloadStatusWindowWidgets { enum NetworkContentDownloadStatusWidgets {
NCDSWW_BACKGROUND, ///< Background WID_NCDS_BACKGROUND, ///< Background of the window.
NCDSWW_CANCELOK, ///< (Optional) Cancel/OK button WID_NCDS_CANCELOK, ///< (Optional) Cancel/OK button.
}; };
/** Widgets of the WC_NETWORK_WINDOW (WC_NETWORK_WINDOW is also used in NetworkGameWindowWidgets, NetworkStartServerWidgets, and NetworkLobbyWindowWidgets). */ /** Widgets of the WC_NETWORK_WINDOW (WC_NETWORK_WINDOW is also used in NetworkGameWindowWidgets, NetworkStartServerWidgets, and NetworkLobbyWindowWidgets). */
enum NetworkContentListWindowWidgets { enum NetworkContentListWidgets {
NCLWW_BACKGROUND, ///< Resize button WID_NCL_BACKGROUND, ///< Resize button.
NCLWW_FILTER_CAPT, ///< Caption for the filter editbox WID_NCL_FILTER_CAPT, ///< Caption for the filter editbox.
NCLWW_FILTER, ///< Filter editbox WID_NCL_FILTER, ///< Filter editbox.
NCLWW_CHECKBOX, ///< Button above checkboxes WID_NCL_CHECKBOX, ///< Button above checkboxes.
NCLWW_TYPE, ///< 'Type' button WID_NCL_TYPE, ///< 'Type' button.
NCLWW_NAME, ///< 'Name' button WID_NCL_NAME, ///< 'Name' button.
NCLWW_MATRIX, ///< Panel with list of content WID_NCL_MATRIX, ///< Panel with list of content.
NCLWW_SCROLLBAR, ///< Scrollbar of matrix WID_NCL_SCROLLBAR, ///< Scrollbar of matrix.
NCLWW_DETAILS, ///< Panel with content details WID_NCL_DETAILS, ///< Panel with content details.
NCLWW_SELECT_ALL, ///< 'Select all' button WID_NCL_SELECT_ALL, ///< 'Select all' button.
NCLWW_SELECT_UPDATE, ///< 'Select updates' button WID_NCL_SELECT_UPDATE, ///< 'Select updates' button.
NCLWW_UNSELECT, ///< 'Unselect all' button WID_NCL_UNSELECT, ///< 'Unselect all' button.
NCLWW_OPEN_URL, ///< 'Open url' button WID_NCL_OPEN_URL, ///< 'Open url' button.
NCLWW_CANCEL, ///< 'Cancel' button WID_NCL_CANCEL, ///< 'Cancel' button.
NCLWW_DOWNLOAD, ///< 'Download' button WID_NCL_DOWNLOAD, ///< 'Download' button.
NCLWW_SEL_ALL_UPDATE, ///< #NWID_SELECTION widget for select all/update buttons. WID_NCL_SEL_ALL_UPDATE, ///< #NWID_SELECTION widget for select all/update buttons..
}; };
#endif /* WIDGETS_NETWORK_CONTENT_WIDGET_H */ #endif /* WIDGETS_NETWORK_CONTENT_WIDGET_H */

165
src/widgets/network_widget.h
View File

@ -12,117 +12,116 @@
#ifndef WIDGETS_NETWORK_WIDGET_H #ifndef WIDGETS_NETWORK_WIDGET_H
#define WIDGETS_NETWORK_WIDGET_H #define WIDGETS_NETWORK_WIDGET_H
/** Widgets of the WC_NETWORK_WINDOW (WC_NETWORK_WINDOW is also used in NetworkContentListWindowWidgets, NetworkStartServerWidgets, and NetworkLobbyWindowWidgets). */ /** Widgets of the WC_NETWORK_WINDOW (WC_NETWORK_WINDOW is also used in NetworkContentListWidgets, NetworkStartServerWidgets, and NetworkLobbyWidgets). */
enum NetworkGameWindowWidgets { enum NetworkGameWidgets {
NGWW_MAIN, ///< Main panel WID_NG_MAIN, ///< Main panel.
NGWW_CONNECTION, ///< Label in front of connection droplist WID_NG_CONNECTION, ///< Label in front of connection droplist.
NGWW_CONN_BTN, ///< 'Connection' droplist button WID_NG_CONN_BTN, ///< 'Connection' droplist button.
NGWW_CLIENT_LABEL, ///< Label in front of client name edit box WID_NG_CLIENT_LABEL, ///< Label in front of client name edit box.
NGWW_CLIENT, ///< Panel with editbox to set client name WID_NG_CLIENT, ///< Panel with editbox to set client name.
NGWW_HEADER, ///< Header container of the matrix WID_NG_HEADER, ///< Header container of the matrix.
NGWW_NAME, ///< 'Name' button WID_NG_NAME, ///< 'Name' button.
NGWW_CLIENTS, ///< 'Clients' button WID_NG_CLIENTS, ///< 'Clients' button.
NGWW_MAPSIZE, ///< 'Map size' button WID_NG_MAPSIZE, ///< 'Map size' button.
NGWW_DATE, ///< 'Date' button WID_NG_DATE, ///< 'Date' button.
NGWW_YEARS, ///< 'Years' button WID_NG_YEARS, ///< 'Years' button.
NGWW_INFO, ///< Third button in the game list panel WID_NG_INFO, ///< Third button in the game list panel.
NGWW_MATRIX, ///< Panel with list of games WID_NG_MATRIX, ///< Panel with list of games.
NGWW_SCROLLBAR, ///< Scrollbar of matrix WID_NG_SCROLLBAR, ///< Scrollbar of matrix.
NGWW_LASTJOINED_LABEL, ///< Label "Last joined server:" WID_NG_LASTJOINED_LABEL, ///< Label "Last joined server:".
NGWW_LASTJOINED, ///< Info about the last joined server WID_NG_LASTJOINED, ///< Info about the last joined server.
NGWW_LASTJOINED_SPACER, ///< Spacer after last joined server panel WID_NG_LASTJOINED_SPACER, ///< Spacer after last joined server panel.
NGWW_DETAILS, ///< Panel with game details WID_NG_DETAILS, ///< Panel with game details.
NGWW_DETAILS_SPACER, ///< Spacer for game actual details WID_NG_DETAILS_SPACER, ///< Spacer for game actual details.
NGWW_JOIN, ///< 'Join game' button WID_NG_JOIN, ///< 'Join game' button.
NGWW_REFRESH, ///< 'Refresh server' button WID_NG_REFRESH, ///< 'Refresh server' button.
NGWW_NEWGRF, ///< 'NewGRF Settings' button WID_NG_NEWGRF, ///< 'NewGRF Settings' button.
NGWW_NEWGRF_SEL, ///< Selection 'widget' to hide the NewGRF settings WID_NG_NEWGRF_SEL, ///< Selection 'widget' to hide the NewGRF settings.
NGWW_NEWGRF_MISSING, ///< 'Find missing NewGRF online' button WID_NG_NEWGRF_MISSING, ///< 'Find missing NewGRF online' button.
NGWW_NEWGRF_MISSING_SEL, ///< Selection widget for the above button WID_NG_NEWGRF_MISSING_SEL, ///< Selection widget for the above button.
NGWW_FIND, ///< 'Find server' button WID_NG_FIND, ///< 'Find server' button.
NGWW_ADD, ///< 'Add server' button WID_NG_ADD, ///< 'Add server' button.
NGWW_START, ///< 'Start server' button WID_NG_START, ///< 'Start server' button.
NGWW_CANCEL, ///< 'Cancel' button WID_NG_CANCEL, ///< 'Cancel' button.
}; };
/** Widgets of the WC_NETWORK_WINDOW (WC_NETWORK_WINDOW is also used in NetworkContentListWindowWidgets, NetworkGameWindowWidgets, and NetworkLobbyWindowWidgets). */ /** Widgets of the WC_NETWORK_WINDOW (WC_NETWORK_WINDOW is also used in NetworkContentListWidgets, NetworkGameWidgets, and NetworkLobbyWidgets). */
enum NetworkStartServerWidgets { enum NetworkStartServerWidgets {
NSSW_BACKGROUND, WID_NSS_BACKGROUND, ///< Background of the window.
NSSW_GAMENAME_LABEL, WID_NSS_GAMENAME_LABEL, ///< Label for the game name.
NSSW_GAMENAME, ///< Background for editbox to set game name WID_NSS_GAMENAME, ///< Background for editbox to set game name.
NSSW_SETPWD, ///< 'Set password' button WID_NSS_SETPWD, ///< 'Set password' button.
NSSW_CONNTYPE_LABEL, WID_NSS_CONNTYPE_LABEL, ///< Label for 'connection type'.
NSSW_CONNTYPE_BTN, ///< 'Connection type' droplist button WID_NSS_CONNTYPE_BTN, ///< 'Connection type' droplist button.
NSSW_CLIENTS_LABEL, WID_NSS_CLIENTS_LABEL, ///< Label for 'max clients'.
NSSW_CLIENTS_BTND, ///< 'Max clients' downarrow WID_NSS_CLIENTS_BTND, ///< 'Max clients' downarrow.
NSSW_CLIENTS_TXT, ///< 'Max clients' text WID_NSS_CLIENTS_TXT, ///< 'Max clients' text.
NSSW_CLIENTS_BTNU, ///< 'Max clients' uparrow WID_NSS_CLIENTS_BTNU, ///< 'Max clients' uparrow.
NSSW_COMPANIES_LABEL, WID_NSS_COMPANIES_LABEL, ///< Label for 'max companies'.
NSSW_COMPANIES_BTND, ///< 'Max companies' downarrow WID_NSS_COMPANIES_BTND, ///< 'Max companies' downarrow.
NSSW_COMPANIES_TXT, ///< 'Max companies' text WID_NSS_COMPANIES_TXT, ///< 'Max companies' text.
NSSW_COMPANIES_BTNU, ///< 'Max companies' uparrow WID_NSS_COMPANIES_BTNU, ///< 'Max companies' uparrow.
NSSW_SPECTATORS_LABEL, WID_NSS_SPECTATORS_LABEL, ///< Label for 'max spectators'.
NSSW_SPECTATORS_BTND, ///< 'Max spectators' downarrow WID_NSS_SPECTATORS_BTND, ///< 'Max spectators' downarrow.
NSSW_SPECTATORS_TXT, ///< 'Max spectators' text WID_NSS_SPECTATORS_TXT, ///< 'Max spectators' text.
NSSW_SPECTATORS_BTNU, ///< 'Max spectators' uparrow WID_NSS_SPECTATORS_BTNU, ///< 'Max spectators' uparrow.
NSSW_LANGUAGE_LABEL, WID_NSS_LANGUAGE_LABEL, ///< Label for 'language spoken'.
NSSW_LANGUAGE_BTN, ///< 'Language spoken' droplist button WID_NSS_LANGUAGE_BTN, ///< 'Language spoken' droplist button.
NSSW_GENERATE_GAME, ///< New game button WID_NSS_GENERATE_GAME, ///< New game button.
NSSW_LOAD_GAME, ///< Load game button WID_NSS_LOAD_GAME, ///< Load game button.
NSSW_PLAY_SCENARIO, ///< Play scenario button WID_NSS_PLAY_SCENARIO, ///< Play scenario button.
NSSW_PLAY_HEIGHTMAP, ///< Play heightmap button WID_NSS_PLAY_HEIGHTMAP, ///< Play heightmap button.
NSSW_CANCEL, ///< 'Cancel' button WID_NSS_CANCEL, ///< 'Cancel' button.
}; };
/** Widgets of the WC_NETWORK_WINDOW (WC_NETWORK_WINDOW is also used in NetworkContentListWindowWidgets, NetworkGameWindowWidgets, and NetworkStartServerWidgets). */ /** Widgets of the WC_NETWORK_WINDOW (WC_NETWORK_WINDOW is also used in NetworkContentListWidgets, NetworkGameWidgets, and NetworkStartServerWidgets). */
enum NetworkLobbyWindowWidgets { enum NetworkLobbyWidgets {
NLWW_BACKGROUND, ///< Background panel WID_NL_BACKGROUND, ///< Background of the window.
NLWW_TEXT, ///< Heading text WID_NL_TEXT, ///< Heading text.
NLWW_HEADER, ///< Header above list of companies WID_NL_HEADER, ///< Header above list of companies.
NLWW_MATRIX, ///< List of companies WID_NL_MATRIX, ///< List of companies.
NLWW_SCROLLBAR, ///< Scroll bar WID_NL_SCROLLBAR, ///< Scroll bar.
NLWW_DETAILS, ///< Company details WID_NL_DETAILS, ///< Company details.
NLWW_JOIN, ///< 'Join company' button WID_NL_JOIN, ///< 'Join company' button.
NLWW_NEW, ///< 'New company' button WID_NL_NEW, ///< 'New company' button.
NLWW_SPECTATE, ///< 'Spectate game' button WID_NL_SPECTATE, ///< 'Spectate game' button.
NLWW_REFRESH, ///< 'Refresh server' button WID_NL_REFRESH, ///< 'Refresh server' button.
NLWW_CANCEL, ///< 'Cancel' button WID_NL_CANCEL, ///< 'Cancel' button.
}; };
/** Widgets of the WC_CLIENT_LIST. */ /** Widgets of the WC_CLIENT_LIST. */
enum ClientListWidgets { enum ClientListWidgets {
CLW_PANEL, WID_CL_PANEL, ///< Panel of the window.
}; };
/** Widgets of the WC_CLIENT_LIST_POPUP. */ /** Widgets of the WC_CLIENT_LIST_POPUP. */
enum ClientListPopupWidgets { enum ClientListPopupWidgets {
CLPW_PANEL, WID_CLP_PANEL, ///< Panel of the window.
}; };
/** Widgets of the WC_NETWORK_STATUS_WINDOW (WC_NETWORK_STATUS_WINDOW is also used in NetworkContentDownloadStatusWindowWidgets). */ /** Widgets of the WC_NETWORK_STATUS_WINDOW (WC_NETWORK_STATUS_WINDOW is also used in NetworkContentDownloadStatusWidgets). */
enum NetworkJoinStatusWidgets { enum NetworkJoinStatusWidgets {
NJSW_BACKGROUND, ///< Background WID_NJS_BACKGROUND, ///< Background of the window.
NJSW_CANCELOK, ///< Cancel/OK button WID_NJS_CANCELOK, ///< Cancel / OK button.
}; };
/** Widgets of the WC_COMPANY_PASSWORD_WINDOW. */ /** Widgets of the WC_COMPANY_PASSWORD_WINDOW. */
enum NetworkCompanyPasswordWindowWidgets { enum NetworkCompanyPasswordWidgets {
NCPWW_BACKGROUND, ///< The background of the interface WID_NCP_BACKGROUND, ///< Background of the window.
NCPWW_LABEL, ///< Label in front of the password field WID_NCP_LABEL, ///< Label in front of the password field.
NCPWW_PASSWORD, ///< Input field for the password WID_NCP_PASSWORD, ///< Input field for the password.
NCPWW_SAVE_AS_DEFAULT_PASSWORD, ///< Toggle 'button' for saving the current password as default password WID_NCP_SAVE_AS_DEFAULT_PASSWORD, ///< Toggle 'button' for saving the current password as default password.
NCPWW_CANCEL, ///< Close the window without changing anything WID_NCP_CANCEL, ///< Close the window without changing anything.
NCPWW_OK, ///< Safe the password etc. WID_NCP_OK, ///< Safe the password etc.
}; };
#endif /* WIDGETS_NETWORK_WIDGET_H */ #endif /* WIDGETS_NETWORK_WIDGET_H */