Skip to content

Commit

Permalink
* rename "custombutton" to "button"
Browse files Browse the repository at this point in the history
* "custombutton" is deprecated now
  • Loading branch information
bayo committed Apr 29, 2012
1 parent 40a03e5 commit 7cdd243
Show file tree
Hide file tree
Showing 27 changed files with 95 additions and 83 deletions.
10 changes: 5 additions & 5 deletions base/ufos/ui/_menu.ufo
Expand Up @@ -86,7 +86,7 @@ component panel cmpMapSlot
onWheelDown { cmd "mn_nextmap;" }
}

custombutton prev_map
button prev_map
{
pos "0 0"
size "35 35"
Expand All @@ -95,7 +95,7 @@ component panel cmpMapSlot
onWheelDown { cmd "mn_nextmap;" }
onClick { cmd "mn_prevmap;" }
}
custombutton next_map
button next_map
{
pos "285 0"
size "35 35"
Expand Down Expand Up @@ -135,7 +135,7 @@ component panel cmpDefBaseHeader {
contentalign ALIGN_UR
}

custombutton bt_back_to_baseview
button bt_back_to_baseview
{
tooltip "_Back to baseview"
background "buttons/big_blue"
Expand Down Expand Up @@ -187,7 +187,7 @@ component cmpDefBaseHeader cmpBaseHeader
}
}

custombutton prev_base
button prev_base
{
tooltip "_Switch to the previous base"
icon "icons/prev"
Expand All @@ -198,7 +198,7 @@ component cmpDefBaseHeader cmpBaseHeader
onWheelDown { cmd "ui_pop; mn_base_prev;" }
}

custombutton next_base
button next_base
{
tooltip "_Switch to the next base"
icon "icons/next"
Expand Down
8 changes: 4 additions & 4 deletions base/ufos/ui/_objectinfo.ufo
Expand Up @@ -20,14 +20,14 @@ window objectinfo
panel itemdescription {
{ }
string header_item { }
custombutton action_dec { }
button action_dec { }
string item_name { }
custombutton action_inc { }
button action_inc { }

string header_firemode { }
custombutton firemode_dec { }
button firemode_dec { }
string firemode_name { }
custombutton firemode_inc { }
button firemode_inc { }
}

/**
Expand Down
2 changes: 1 addition & 1 deletion base/ufos/ui/aircraft_info.ufo
Expand Up @@ -54,7 +54,7 @@ window aircraft extends iaircraft
contentalign ALIGN_UL
}

custombutton aircraft_return
button aircraft_return
{
pos "726 510"
icon "icons/aircraft_return"
Expand Down
2 changes: 1 addition & 1 deletion base/ufos/ui/aliencont.ufo
Expand Up @@ -189,7 +189,7 @@ window aliencont
// kill living aliens button
// ==========================

custombutton bt_alc_killaliens
button bt_alc_killaliens
{
tooltip "_Kill all aliens in this base"
pos "275 165"
Expand Down
10 changes: 5 additions & 5 deletions base/ufos/ui/bases.ufo
Expand Up @@ -85,7 +85,7 @@ window bases
}

// here we need the back-to-geoscape button
custombutton bt_back_to_geoscape
button bt_back_to_geoscape
{
tooltip "_Back to geoscape"
icon "icons/geoscape"
Expand Down Expand Up @@ -205,7 +205,7 @@ window bases
{
size "230 70"
}
custombutton soldier
button soldier
{
tooltip "_Soldiers"
icon "icons/bighead_soldier"
Expand All @@ -221,7 +221,7 @@ window bases
color "0 0.8 0 1"
contentalign ALIGN_CL
}
custombutton pilot
button pilot
{
tooltip "_Pilots"
icon "icons/bighead_pilot"
Expand All @@ -237,7 +237,7 @@ window bases
color "0 0.8 0 1"
contentalign ALIGN_CL
}
custombutton scientist
button scientist
{
tooltip "_Scientists"
icon "icons/bighead_scientist"
Expand All @@ -253,7 +253,7 @@ window bases
color "0 0.8 0 1"
contentalign ALIGN_CL
}
custombutton worker
button worker
{
tooltip "_Workers"
icon "icons/bighead_worker"
Expand Down
2 changes: 1 addition & 1 deletion base/ufos/ui/buildings.ufo
Expand Up @@ -175,7 +175,7 @@ window popup_buildingpreview
}


custombutton ufopedia_link
button ufopedia_link
{
icon "icons/bordered_magnifying_glass"
tooltip "_UFOpaedia"
Expand Down
10 changes: 5 additions & 5 deletions base/ufos/ui/equipment.ufo
Expand Up @@ -292,7 +292,7 @@ window equipment extends objectinfo
font "f_small"
}

custombutton action_dec
button action_dec
{
pos "120 290"
icon "icons/prev"
Expand All @@ -309,7 +309,7 @@ window equipment extends objectinfo
font "f_small"
}

custombutton action_inc
button action_inc
{
pos "334 290"
icon "icons/next"
Expand All @@ -329,7 +329,7 @@ window equipment extends objectinfo
font "f_small"
}

custombutton firemode_dec
button firemode_dec
{
tooltip "_Previous firemode"
pos "120 314"
Expand All @@ -347,7 +347,7 @@ window equipment extends objectinfo
font "f_small"
}

custombutton firemode_inc
button firemode_inc
{
tooltip "_Next firemode"
pos "334 314"
Expand Down Expand Up @@ -664,7 +664,7 @@ window equipment extends objectinfo
// ==================
// additional stuff
// ==================
custombutton bt_go {
button bt_go {
tooltip "_Done"
background "buttons/large_blue"
pos "940 720"
Expand Down
10 changes: 5 additions & 5 deletions base/ufos/ui/geoscape.ufo
Expand Up @@ -587,7 +587,7 @@ window geoscape
// small buttons
// ==================

custombutton bt_show_overlay
button bt_show_overlay
{
tooltip "_Highlight nation borders"
background "buttons/blue3"
Expand All @@ -597,7 +597,7 @@ window geoscape
onClick { cmd "map_overlay nations;" }
}

custombutton bt_show_radar
button bt_show_radar
{
tooltip "_Show radar range"
background "buttons/blue3"
Expand All @@ -607,7 +607,7 @@ window geoscape
onClick { cmd "map_overlay radar;" }
}

custombutton bt_show_xvi
button bt_show_xvi
{
visiblewhen "*cvar:mn_xvimap == 1"
tooltip "_Show XVI map"
Expand All @@ -618,7 +618,7 @@ window geoscape
onClick { cmd "map_overlay xvi;" }
}

custombutton bt_mapcenter
button bt_mapcenter
{
tooltip "_Center objects on the map"
background "buttons/blue3"
Expand All @@ -628,7 +628,7 @@ window geoscape
onClick { cmd "map_center;" }
}

custombutton bt_menu
button bt_menu
{
tooltip "_Go to Options"
background "buttons/blue3"
Expand Down
8 changes: 4 additions & 4 deletions base/ufos/ui/hire.ufo
Expand Up @@ -499,7 +499,7 @@ window employees
contentalign ALIGN_UC
}

custombutton icon_soldier {
button icon_soldier {
icon "icons/bighead_soldier"
pos "190 28"
size "42 42"
Expand All @@ -518,7 +518,7 @@ window employees
contentalign ALIGN_UR
}

custombutton icon_pilot {
button icon_pilot {
icon "icons/bighead_pilot"
pos "250 28"
size "42 42"
Expand All @@ -537,7 +537,7 @@ window employees
contentalign ALIGN_UR
}

custombutton icon_worker {
button icon_worker {
icon "icons/bighead_worker"
pos "310 28"
size "42 42"
Expand All @@ -556,7 +556,7 @@ window employees
contentalign ALIGN_UR
}

custombutton icon_scientist {
button icon_scientist {
icon "icons/bighead_scientist"
pos "370 28"
size "42 42"
Expand Down
2 changes: 1 addition & 1 deletion base/ufos/ui/hospital.ufo
Expand Up @@ -69,7 +69,7 @@ window hospital
cmpBaseHeader baseHeader {
}

custombutton bt_continue
button bt_continue
{
tooltip "_Back to baseview"
background "buttons/big_blue"
Expand Down
4 changes: 2 additions & 2 deletions base/ufos/ui/hud_default.ufo
Expand Up @@ -515,7 +515,7 @@ window hud_default extends hud
ghost true
}

custombutton bt_rescuezone
button bt_rescuezone
{
tooltip "_Show rescue zone"
background "buttons/large_blue"
Expand All @@ -526,7 +526,7 @@ window hud_default extends hud
onClick { cmd "toggle_rescuezone;" }
}

custombutton bt_nextround
button bt_nextround
{
tooltip "_Finish round"
background "buttons/large_blue"
Expand Down
2 changes: 1 addition & 1 deletion base/ufos/ui/hud_mini.ufo
Expand Up @@ -1962,7 +1962,7 @@ window hud_mini extends hud
size "160 55"
}
/*
custombutton bt_rescuezone
button bt_rescuezone
{
tooltip "_Show rescue zone"
background "buttons/bigred"
Expand Down

0 comments on commit 7cdd243

Please sign in to comment.