Skip to content

Commit

Permalink
spelling policy hits again
Browse files Browse the repository at this point in the history 
git-svn-id: svn://tron.homeunix.org/simutrans/simutrans/trunk@6714 8aca7d54-2c30-db11-9de9-000461428c89
  • Loading branch information
@Dwachs
Dwachs committed Sep 14, 2013
1 parent 4edc6b8 commit 673aad3
Show file tree
Hide file tree
Showing 20 changed files with 68 additions and 66 deletions.
16 changes: 8 additions & 8 deletions gui/banner.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -147,22 +147,22 @@ void banner_t::zeichnen(koord pos, koord gr )
cursor.y += L_LINESPACE_EXTRA_5;

#ifdef REVISION
display_shadow_proportional( cursor.x, cursor.y, SYSCOL_TEXT_HIGHLITE, COL_BLACK, "Version " VERSION_NUMBER " " VERSION_DATE " r" QUOTEME(REVISION), true );
display_shadow_proportional( cursor.x, cursor.y, SYSCOL_TEXT_HIGHLIGHT, COL_BLACK, "Version " VERSION_NUMBER " " VERSION_DATE " r" QUOTEME(REVISION), true );
#else
display_shadow_proportional( cursor.x, cursor.y, SYSCOL_TEXT_HIGHLITE, COL_BLACK, "Version " VERSION_NUMBER " " VERSION_DATE, true );
display_shadow_proportional( cursor.x, cursor.y, SYSCOL_TEXT_HIGHLIGHT, COL_BLACK, "Version " VERSION_NUMBER " " VERSION_DATE, true );
#endif
cursor.y += L_LINESPACE_EXTRA_7;

display_shadow_proportional( cursor.x, cursor.y, COL_PT, COL_BLACK, "The version is developed by", true );
cursor += koord (L_TEXT_INDENT,L_LINESPACE_EXTRA_5);

display_shadow_proportional( cursor.x, cursor.y, SYSCOL_TEXT_HIGHLITE, COL_BLACK, "the simutrans team", true );
display_shadow_proportional( cursor.x, cursor.y, SYSCOL_TEXT_HIGHLIGHT, COL_BLACK, "the simutrans team", true );
cursor.y += L_LINESPACE_EXTRA_2;

display_shadow_proportional( cursor.x, cursor.y, SYSCOL_TEXT_HIGHLITE, COL_BLACK, "under the Artistic Licence", true );
display_shadow_proportional( cursor.x, cursor.y, SYSCOL_TEXT_HIGHLIGHT, COL_BLACK, "under the Artistic Licence", true );
cursor.y += L_LINESPACE_EXTRA_2;

display_shadow_proportional( cursor.x, cursor.y, SYSCOL_TEXT_HIGHLITE, COL_BLACK, "based on Simutrans 84.22.1", true );
display_shadow_proportional( cursor.x, cursor.y, SYSCOL_TEXT_HIGHLIGHT, COL_BLACK, "based on Simutrans 84.22.1", true );
cursor += koord (-L_TEXT_INDENT,L_LINESPACE_EXTRA_7);

display_shadow_proportional( cursor.x, cursor.y, COL_ORANGE, COL_BLACK, "Selling of the program is forbidden.", true );
Expand All @@ -171,13 +171,13 @@ void banner_t::zeichnen(koord pos, koord gr )
display_shadow_proportional( cursor.x, cursor.y, COL_PT, COL_BLACK, "For questions and support please visit:", true );
cursor += koord (L_TEXT_INDENT,L_LINESPACE_EXTRA_2);

display_shadow_proportional( cursor.x, cursor.y, SYSCOL_TEXT_HIGHLITE, COL_BLACK, "http://www.simutrans.com", true );
display_shadow_proportional( cursor.x, cursor.y, SYSCOL_TEXT_HIGHLIGHT, COL_BLACK, "http://www.simutrans.com", true );
cursor.y += L_LINESPACE_EXTRA_2;

display_shadow_proportional( cursor.x, cursor.y, SYSCOL_TEXT_HIGHLITE, COL_BLACK, "http://forum.simutrans.com", true );
display_shadow_proportional( cursor.x, cursor.y, SYSCOL_TEXT_HIGHLIGHT, COL_BLACK, "http://forum.simutrans.com", true );
cursor.y += L_LINESPACE_EXTRA_2;

display_shadow_proportional( cursor.x, cursor.y, SYSCOL_TEXT_HIGHLITE, COL_BLACK, "http://wiki.simutrans-germany.com/", true );
display_shadow_proportional( cursor.x, cursor.y, SYSCOL_TEXT_HIGHLIGHT, COL_BLACK, "http://wiki.simutrans-germany.com/", true );
cursor.y += L_LINESPACE_EXTRA_7;

// now the scrolling
Expand Down
2 changes: 1 addition & 1 deletion gui/citybuilding_edit.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ static bool compare_haus_besch(const haus_besch_t* a, const haus_besch_t* b)
citybuilding_edit_frame_t::citybuilding_edit_frame_t(spieler_t* sp_, karte_t* welt) :
extend_edit_gui_t(translator::translate("citybuilding builder"), sp_, welt),
hauslist(16),
lb_rotation( rot_str, SYSCOL_TEXT_HIGHLITE, gui_label_t::right ),
lb_rotation( rot_str, SYSCOL_TEXT_HIGHLIGHT, gui_label_t::right ),
lb_rotation_info( translator::translate("Rotation"), COL_BLACK, gui_label_t::left )
{
rot_str[0] = 0;
Expand Down
2 changes: 1 addition & 1 deletion gui/climates.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ climate_gui_t::climate_gui_t(settings_t* const sets_par) :
add_komponente( numberinput_lbl+labelnr );
labelnr++;
sprintf( snowline_txt ,"%d", sets->get_climate_borders()[arctic_climate] );
summer_snowline.init( snowline_txt, cursor, SYSCOL_TEXT_HIGHLITE);
summer_snowline.init( snowline_txt, cursor, SYSCOL_TEXT_HIGHLIGHT);
summer_snowline.align_to(&mountain_roughness,ALIGN_RIGHT,koord(gui_theme_t::gui_arrow_right_size.x,0));
add_komponente( &summer_snowline );
cursor.y += LINESPACE+D_V_SPACE;
Expand Down
6 changes: 3 additions & 3 deletions gui/components/gui_chart.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,12 +143,12 @@ void gui_chart_t::zeichnen(koord offset)

// draw zero number only, if it will not disturb any other printed values!
if ((baseline > 18) && (baseline < groesse.y -18)) {
display_proportional_clip(offset.x - 4, offset.y+(KOORD_VAL)baseline-3, "0", ALIGN_RIGHT, SYSCOL_TEXT_HIGHLITE, true );
display_proportional_clip(offset.x - 4, offset.y+(KOORD_VAL)baseline-3, "0", ALIGN_RIGHT, SYSCOL_TEXT_HIGHLIGHT, true );
}

// display min/max money values
display_proportional_clip(offset.x - 4, offset.y-5, cmax, ALIGN_RIGHT, SYSCOL_TEXT_HIGHLITE, true );
display_proportional_clip(offset.x - 4, offset.y+groesse.y-5, cmin, ALIGN_RIGHT, SYSCOL_TEXT_HIGHLITE, true );
display_proportional_clip(offset.x - 4, offset.y-5, cmax, ALIGN_RIGHT, SYSCOL_TEXT_HIGHLIGHT, true );
display_proportional_clip(offset.x - 4, offset.y+groesse.y-5, cmin, ALIGN_RIGHT, SYSCOL_TEXT_HIGHLIGHT, true );
}

// draw chart frame
Expand Down
4 changes: 2 additions & 2 deletions gui/components/gui_numberinput.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ gui_numberinput_t::gui_numberinput_t() :
bt_left.add_listener(this );

textinp.set_alignment( ALIGN_RIGHT );
textinp.set_color( SYSCOL_TEXT_HIGHLITE );
textinp.set_color( SYSCOL_TEXT_HIGHLIGHT );
textinp.add_listener( this );

bt_right.set_typ(button_t::repeatarrowright );
Expand Down Expand Up @@ -69,7 +69,7 @@ void gui_numberinput_t::set_value(sint32 new_value)
sprintf(textbuffer, "%d", new_value);
textinp.set_text(textbuffer, 20);
}
textinp.set_color( value == new_value ? (b_enabled ? SYSCOL_TEXT_HIGHLITE : COL_GREY3) : COL_RED );
textinp.set_color( value == new_value ? (b_enabled ? SYSCOL_TEXT_HIGHLIGHT : COL_GREY3) : COL_RED );
value = new_value;
}

Expand Down
4 changes: 2 additions & 2 deletions gui/components/gui_tab_panel.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ void gui_tab_panel_t::zeichnen(koord parent_pos)
if( required_groesse.x>groesse.x || offset_tab > 0) {
left.zeichnen( parent_pos+pos );
right.zeichnen( parent_pos+pos );
display_fillbox_wh_clip(xpos, ypos+TAB_HEADER_V_SIZE-1, 10, 1, SYSCOL_TEXT_HIGHLITE, true);
display_fillbox_wh_clip(xpos, ypos+TAB_HEADER_V_SIZE-1, 10, 1, SYSCOL_TEXT_HIGHLIGHT, true);
xpos += 10;
}

Expand Down Expand Up @@ -180,7 +180,7 @@ void gui_tab_panel_t::zeichnen(koord parent_pos)
display_vline_wh_clip(text_x+width+3, ypos+5, TAB_HEADER_V_SIZE-6, MN_GREY0, true);

if(text) {
display_proportional_clip(text_x, ypos+7, text, ALIGN_LEFT, SYSCOL_TEXT_HIGHLITE, true);
display_proportional_clip(text_x, ypos+7, text, ALIGN_LEFT, SYSCOL_TEXT_HIGHLIGHT, true);
}
else {
KOORD_VAL const y = ypos - iter.img->get_pic()->y + 10 - iter.img->get_pic()->h / 2;
Expand Down
2 changes: 1 addition & 1 deletion gui/curiosity_edit.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ static bool compare_haus_besch(const haus_besch_t* a, const haus_besch_t* b)
curiosity_edit_frame_t::curiosity_edit_frame_t(spieler_t* sp_, karte_t* welt) :
extend_edit_gui_t(translator::translate("curiosity builder"), sp_, welt),
hauslist(16),
lb_rotation( rot_str, SYSCOL_TEXT_HIGHLITE, gui_label_t::right ),
lb_rotation( rot_str, SYSCOL_TEXT_HIGHLIGHT, gui_label_t::right ),
lb_rotation_info( translator::translate("Rotation"), COL_BLACK, gui_label_t::left )
{
rot_str[0] = 0;
Expand Down
12 changes: 6 additions & 6 deletions gui/display_settings.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -275,31 +275,31 @@ gui_frame_t( translator::translate("Helligk. u. Farben") )
// Frame time label
frame_time_label.init("Frame time:", label_cursor, COL_BLACK );
sprintf(frame_time_buf," ***** ms" );
frame_time_value_label.init( frame_time_buf, koord(0, label_cursor.y), SYSCOL_TEXT_HIGHLITE );
frame_time_value_label.init( frame_time_buf, koord(0, label_cursor.y), SYSCOL_TEXT_HIGHLIGHT );
label_container.add_komponente( &frame_time_label );
value_container.add_komponente( &frame_time_value_label );
label_cursor.y += LINESPACE;

// Idle time label
idle_time_label.init("Idle:", label_cursor, COL_BLACK);
sprintf(idle_time_buf," ***** ms" );
idle_time_value_label.init( idle_time_buf, koord(0, label_cursor.y), SYSCOL_TEXT_HIGHLITE );
idle_time_value_label.init( idle_time_buf, koord(0, label_cursor.y), SYSCOL_TEXT_HIGHLIGHT );
label_container.add_komponente( &idle_time_label );
value_container.add_komponente( &idle_time_value_label );
label_cursor.y += LINESPACE;

// FPS label
fps_label.init("FPS:", label_cursor, COL_BLACK );
sprintf(fps_buf," *** fps*" );
fps_value_label.init( fps_buf, koord(0, label_cursor.y), SYSCOL_TEXT_HIGHLITE );
fps_value_label.init( fps_buf, koord(0, label_cursor.y), SYSCOL_TEXT_HIGHLIGHT );
label_container.add_komponente( &fps_label );
value_container.add_komponente( &fps_value_label );
label_cursor.y += LINESPACE;

// Simloops label
simloops_label.init("Sim:", label_cursor, COL_BLACK );
sprintf(simloops_buf," ********" );
simloops_value_label.init( simloops_buf, koord(0, label_cursor.y), SYSCOL_TEXT_HIGHLITE );
simloops_value_label.init( simloops_buf, koord(0, label_cursor.y), SYSCOL_TEXT_HIGHLIGHT );
label_container.add_komponente( &simloops_label );
value_container.add_komponente( &simloops_value_label );
label_cursor.y += LINESPACE;
Expand Down Expand Up @@ -612,7 +612,7 @@ void color_gui_t::zeichnen(koord pos, koord gr)
uint32 loops;
uint32 target_fps = welt->is_fast_forward() ? 10 : umgebung_t::fps;
loops = welt->get_realFPS();
color = SYSCOL_TEXT_HIGHLITE;
color = SYSCOL_TEXT_HIGHLIGHT;
if( loops < (target_fps*3)/4 ) {
color = ( loops <= target_fps/2 ) ? COL_RED : COL_YELLOW;
}
Expand All @@ -626,7 +626,7 @@ void color_gui_t::zeichnen(koord pos, koord gr)

//simloops_label
loops = welt->get_simloops();
color = SYSCOL_TEXT_HIGHLITE;
color = SYSCOL_TEXT_HIGHLIGHT;
if( loops <= 30 ) {
color = (loops<=20) ? COL_RED : COL_YELLOW;
}
Expand Down
2 changes: 1 addition & 1 deletion gui/factory_edit.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ static bool compare_fabrik_besch(const fabrik_besch_t* a, const fabrik_besch_t*
factory_edit_frame_t::factory_edit_frame_t(spieler_t* sp_, karte_t* welt) :
extend_edit_gui_t(translator::translate("factorybuilder"), sp_, welt),
fablist(16),
lb_rotation( rot_str, SYSCOL_TEXT_HIGHLITE, gui_label_t::right ),
lb_rotation( rot_str, SYSCOL_TEXT_HIGHLIGHT, gui_label_t::right ),
lb_rotation_info( translator::translate("Rotation"), COL_BLACK, gui_label_t::left ),
lb_production_info( translator::translate("Produktion"), COL_BLACK, gui_label_t::left )
{
Expand Down
2 changes: 1 addition & 1 deletion gui/fahrplan_gui.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ void fahrplan_gui_stats_t::zeichnen(koord offset)
if( fpl->empty() ) {
buf.clear();
buf.append(translator::translate("Please click on the map to add\nwaypoints or stops to this\nschedule."));
sint16 const width = display_multiline_text(offset.x + 4, offset.y, buf, SYSCOL_TEXT_HIGHLITE );
sint16 const width = display_multiline_text(offset.x + 4, offset.y, buf, SYSCOL_TEXT_HIGHLIGHT );
set_groesse(koord(width + 4 + 16, 3 * LINESPACE));
}
else {
Expand Down
8 changes: 4 additions & 4 deletions gui/goods_frame_t.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ karte_t *goods_frame_t::welt = NULL;
goods_frame_t::goods_frame_t(karte_t *wl) :
gui_frame_t( translator::translate("gl_title") ),
sort_label(translator::translate("hl_txt_sort")),
change_speed_label(NULL,SYSCOL_TEXT_HIGHLITE,gui_label_t::right),
change_speed_label(NULL,SYSCOL_TEXT_HIGHLIGHT,gui_label_t::right),
goods_stats( wl ),
scrolly(&goods_stats)
{
Expand Down Expand Up @@ -257,7 +257,7 @@ void goods_frame_t::zeichnen(koord pos, koord gr)
(welt->get_average_speed(water_wt)*relative_speed_change)/100,
(welt->get_average_speed(air_wt)*relative_speed_change)/100
);
display_multiline_text( pos.x + D_MARGIN_LEFT, pos.y + D_BUTTON_HEIGHT + 4, speed_message, SYSCOL_TEXT_HIGHLITE );
display_multiline_text( pos.x + D_MARGIN_LEFT, pos.y + D_BUTTON_HEIGHT + 4, speed_message, SYSCOL_TEXT_HIGHLIGHT );

speed_message.clear();
speed_message.printf(translator::translate("tram %i km/h, monorail %i km/h\nmaglev %i km/h, narrowgauge %i km/h."),
Expand All @@ -266,11 +266,11 @@ void goods_frame_t::zeichnen(koord pos, koord gr)
(welt->get_average_speed(maglev_wt)*relative_speed_change)/100,
(welt->get_average_speed(narrowgauge_wt)*relative_speed_change)/100
);
display_multiline_text( pos.x + D_MARGIN_LEFT, pos.y + D_BUTTON_HEIGHT + 4 + 3 * LINESPACE, speed_message, SYSCOL_TEXT_HIGHLITE );
display_multiline_text( pos.x + D_MARGIN_LEFT, pos.y + D_BUTTON_HEIGHT + 4 + 3 * LINESPACE, speed_message, SYSCOL_TEXT_HIGHLIGHT );

speed_message.clear();
speed_message.printf(translator::translate("100 km/h = %i tiles/month"),
welt->speed_to_tiles_per_month(kmh_to_speed(100))
);
display_multiline_text( pos.x + D_MARGIN_LEFT, pos.y + D_BUTTON_HEIGHT + 4 + 5 * LINESPACE, speed_message, SYSCOL_TEXT_HIGHLITE );
display_multiline_text( pos.x + D_MARGIN_LEFT, pos.y + D_BUTTON_HEIGHT + 4 + 5 * LINESPACE, speed_message, SYSCOL_TEXT_HIGHLIGHT );
}
4 changes: 2 additions & 2 deletions gui/gui_theme.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ COLOR_VAL gui_theme_t::theme_color_shadow = MN_GREY0;
COLOR_VAL gui_theme_t::theme_color_face = MN_GREY2;
COLOR_VAL gui_theme_t::theme_color_button_text = COL_BLACK;
COLOR_VAL gui_theme_t::theme_color_text = COL_BLACK;
COLOR_VAL gui_theme_t::theme_color_text_highlite = COL_WHITE;
COLOR_VAL gui_theme_t::theme_color_text_highlight = COL_WHITE;
COLOR_VAL gui_theme_t::theme_color_selected_text = COL_WHITE;
COLOR_VAL gui_theme_t::theme_color_selected_background = COL_BLUE;
COLOR_VAL gui_theme_t::theme_color_static_text = COL_BLACK;
Expand Down Expand Up @@ -260,7 +260,7 @@ bool gui_theme_t::themes_init(const char *file_name)

// maybe not the best place, rather use simwin for the static defines?
gui_theme_t::theme_color_text = (COLOR_VAL)contents.get_color("gui_text_color", SYSCOL_TEXT);
gui_theme_t::theme_color_text_highlite = (COLOR_VAL)contents.get_color("gui_text_highlite", SYSCOL_TEXT_HIGHLITE);
gui_theme_t::theme_color_text_highlight =(COLOR_VAL)contents.get_color("gui_text_highlight", SYSCOL_TEXT_HIGHLIGHT);
gui_theme_t::theme_color_static_text = (COLOR_VAL)contents.get_color("gui_static_text_color", SYSCOL_STATIC_TEXT);
gui_theme_t::theme_color_disabled_text = (COLOR_VAL)contents.get_color("gui_disabled_text_color", SYSCOL_DISABLED_TEXT);
gui_theme_t::theme_color_highlight = (COLOR_VAL)contents.get_color("gui_highlight_color", SYSCOL_HIGHLIGHT);
Expand Down
2 changes: 1 addition & 1 deletion gui/gui_theme.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ class gui_theme_t
static COLOR_VAL theme_color_face; //@< Colour to draw surface in buttons etc... MN_GREY2
static COLOR_VAL theme_color_button_text; //@< Colour to draw button text
static COLOR_VAL theme_color_text; //@< Colour to draw interactive text checkbox etc...
static COLOR_VAL theme_color_text_highlite; //@< Colour to draw different text (mostly in labels)
static COLOR_VAL theme_color_text_highlight; //@< Colour to draw different text (mostly in labels)
static COLOR_VAL theme_color_static_text; //@< Colour to draw non interactive text in labels etc...
static COLOR_VAL theme_color_disabled_text; //@< Colour to draw disabled text in buttons etc...

Expand Down
54 changes: 27 additions & 27 deletions gui/money_frame.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -195,33 +195,33 @@ bool money_frame_t::is_chart_table_zero(int ttoption)

money_frame_t::money_frame_t(spieler_t *sp)
: gui_frame_t( translator::translate("Finanzen"), sp),
tylabel("This Year", SYSCOL_TEXT_HIGHLITE, gui_label_t::right),
lylabel("Last Year", SYSCOL_TEXT_HIGHLITE, gui_label_t::right),
conmoney(NULL, SYSCOL_TEXT_HIGHLITE, gui_label_t::money),
nvmoney(NULL, SYSCOL_TEXT_HIGHLITE, gui_label_t::money),
vrmoney(NULL, SYSCOL_TEXT_HIGHLITE, gui_label_t::money),
imoney(NULL, SYSCOL_TEXT_HIGHLITE, gui_label_t::money),
tmoney(NULL, SYSCOL_TEXT_HIGHLITE, gui_label_t::money),
mmoney(NULL, SYSCOL_TEXT_HIGHLITE, gui_label_t::money),
omoney(NULL, SYSCOL_TEXT_HIGHLITE, gui_label_t::money),
old_conmoney(NULL, SYSCOL_TEXT_HIGHLITE, gui_label_t::money),
old_nvmoney(NULL, SYSCOL_TEXT_HIGHLITE, gui_label_t::money),
old_vrmoney(NULL, SYSCOL_TEXT_HIGHLITE, gui_label_t::money),
old_imoney(NULL, SYSCOL_TEXT_HIGHLITE, gui_label_t::money),
old_tmoney(NULL, SYSCOL_TEXT_HIGHLITE, gui_label_t::money),
old_mmoney(NULL, SYSCOL_TEXT_HIGHLITE, gui_label_t::money),
old_omoney(NULL, SYSCOL_TEXT_HIGHLITE, gui_label_t::money),
tylabel2("This Year", SYSCOL_TEXT_HIGHLITE, gui_label_t::right),
gtmoney(NULL, SYSCOL_TEXT_HIGHLITE, gui_label_t::money),
vtmoney(NULL, SYSCOL_TEXT_HIGHLITE, gui_label_t::money),
money(NULL, SYSCOL_TEXT_HIGHLITE, gui_label_t::money),
margin(NULL, SYSCOL_TEXT_HIGHLITE, gui_label_t::money),
transport(NULL, SYSCOL_TEXT_HIGHLITE, gui_label_t::right),
old_transport(NULL, SYSCOL_TEXT_HIGHLITE, gui_label_t::right),
toll(NULL, SYSCOL_TEXT_HIGHLITE, gui_label_t::money),
old_toll(NULL, SYSCOL_TEXT_HIGHLITE, gui_label_t::money),
maintenance_label("This Month",SYSCOL_TEXT_HIGHLITE, gui_label_t::right),
maintenance_money(NULL, SYSCOL_TEXT_HIGHLITE, gui_label_t::money),
tylabel("This Year", SYSCOL_TEXT_HIGHLIGHT, gui_label_t::right),
lylabel("Last Year", SYSCOL_TEXT_HIGHLIGHT, gui_label_t::right),
conmoney(NULL, SYSCOL_TEXT_HIGHLIGHT, gui_label_t::money),
nvmoney(NULL, SYSCOL_TEXT_HIGHLIGHT, gui_label_t::money),
vrmoney(NULL, SYSCOL_TEXT_HIGHLIGHT, gui_label_t::money),
imoney(NULL, SYSCOL_TEXT_HIGHLIGHT, gui_label_t::money),
tmoney(NULL, SYSCOL_TEXT_HIGHLIGHT, gui_label_t::money),
mmoney(NULL, SYSCOL_TEXT_HIGHLIGHT, gui_label_t::money),
omoney(NULL, SYSCOL_TEXT_HIGHLIGHT, gui_label_t::money),
old_conmoney(NULL, SYSCOL_TEXT_HIGHLIGHT, gui_label_t::money),
old_nvmoney(NULL, SYSCOL_TEXT_HIGHLIGHT, gui_label_t::money),
old_vrmoney(NULL, SYSCOL_TEXT_HIGHLIGHT, gui_label_t::money),
old_imoney(NULL, SYSCOL_TEXT_HIGHLIGHT, gui_label_t::money),
old_tmoney(NULL, SYSCOL_TEXT_HIGHLIGHT, gui_label_t::money),
old_mmoney(NULL, SYSCOL_TEXT_HIGHLIGHT, gui_label_t::money),
old_omoney(NULL, SYSCOL_TEXT_HIGHLIGHT, gui_label_t::money),
tylabel2("This Year", SYSCOL_TEXT_HIGHLIGHT, gui_label_t::right),
gtmoney(NULL, SYSCOL_TEXT_HIGHLIGHT, gui_label_t::money),
vtmoney(NULL, SYSCOL_TEXT_HIGHLIGHT, gui_label_t::money),
money(NULL, SYSCOL_TEXT_HIGHLIGHT, gui_label_t::money),
margin(NULL, SYSCOL_TEXT_HIGHLIGHT, gui_label_t::money),
transport(NULL, SYSCOL_TEXT_HIGHLIGHT, gui_label_t::right),
old_transport(NULL, SYSCOL_TEXT_HIGHLIGHT, gui_label_t::right),
toll(NULL, SYSCOL_TEXT_HIGHLIGHT, gui_label_t::money),
old_toll(NULL, SYSCOL_TEXT_HIGHLIGHT, gui_label_t::money),
maintenance_label("This Month",SYSCOL_TEXT_HIGHLIGHT, gui_label_t::right),
maintenance_money(NULL, SYSCOL_TEXT_HIGHLIGHT, gui_label_t::money),
warn("", COL_YELLOW, gui_label_t::left),
scenario("", COL_BLACK, gui_label_t::left),
transport_type_option(0),
Expand Down
2 changes: 1 addition & 1 deletion gui/savegame_frame.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -575,7 +575,7 @@ void savegame_frame_t::add_section(std::string &name){

sprintf(label_text,"%s %s", prefix_label , shortened_path);

gui_label_t* l = new gui_label_t(NULL, SYSCOL_TEXT_HIGHLITE);
gui_label_t* l = new gui_label_t(NULL, SYSCOL_TEXT_HIGHLIGHT);
l->set_text_pointer(label_text);
l->set_tooltip(path_expanded);

Expand Down
2 changes: 1 addition & 1 deletion simcolor.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ typedef unsigned char COLOR_VAL;
#define SYSCOL_BUTTON_TEXT gui_theme_t::button_color_text
#define SYSCOL_DISABLED_BUTTON_TEXT gui_theme_t::button_color_disabled_text
#define SYSCOL_TEXT gui_theme_t::theme_color_text
#define SYSCOL_TEXT_HIGHLITE gui_theme_t::theme_color_text_highlite
#define SYSCOL_TEXT_HIGHLIGHT gui_theme_t::theme_color_text_highlight
#define SYSCOL_SELECTED_TEXT gui_theme_t::theme_color_selected_text
#define SYSCOL_SELECTED_BACGROUND gui_theme_t::theme_color_selected_background
#define SYSCOL_STATIC_TEXT gui_theme_t::theme_color_static_text
Expand Down
2 changes: 1 addition & 1 deletion simloadingscreen.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ void loadingscreen_t::display()
display_fillbox_wh( quarter_width, half_height - 5, bar_len, 12, COL_BLUE, true );

if( what ) {
display_proportional( half_width, half_height-4, what, ALIGN_CENTER_H, SYSCOL_TEXT_HIGHLITE, false );
display_proportional( half_width, half_height-4, what, ALIGN_CENTER_H, SYSCOL_TEXT_HIGHLIGHT, false );
}

dr_flush();
Expand Down
3 changes: 2 additions & 1 deletion simutrans/themes/themes.tab
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
# Default simutrans theme
#
# name of the theme (will be shown with file selector)
name=Simutrans (standard size)
Expand Down Expand Up @@ -27,7 +28,7 @@ tooltip_duration = 5000
#cursor_overlay_color = 149

# in default theme white text
gui_text_highlite = #FFFFFF
gui_text_highlight= #FFFFFF

##################################window stuff##################################

Expand Down
Loading

0 comments on commit 673aad3

Please sign in to comment.