forked from Mirrors/openclonk
parent
d81e82a7b4
commit
1d7c5c00c8
|
@ -272,13 +272,13 @@ public func ToggleVisibility(int player, ...)
|
|||
{
|
||||
// Close menu
|
||||
menu.Visibility = VIS_None;
|
||||
Sound("GUI_BuyMenu::CloseBuyMenu", true, nil, GetOwner());
|
||||
Sound("UI::Close", true, nil, GetOwner());
|
||||
}
|
||||
else
|
||||
{
|
||||
// Open menu
|
||||
menu.Visibility = VIS_Owner;
|
||||
Sound("GUI_BuyMenu::OpenBuyMenu", true, nil, GetOwner());
|
||||
Sound("UI::Open", true, nil, GetOwner());
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
|
Binary file not shown.
Binary file not shown.
|
@ -187,7 +187,7 @@ namespace C4GUI
|
|||
// already down?
|
||||
if (fDown) return;
|
||||
// play sound
|
||||
GUISound("Objects::Arrow::HitGround");
|
||||
GUISound("UI::Tick");
|
||||
// set down
|
||||
fDown = true;
|
||||
}
|
||||
|
@ -197,7 +197,7 @@ namespace C4GUI
|
|||
// already up?
|
||||
if (!fDown) return;
|
||||
// play sound
|
||||
GUISound(fPress ? "UI::Click" : "Objects::Arrow::HitGround");
|
||||
GUISound(fPress ? "UI::Click" : "UI::Tick");
|
||||
// set up
|
||||
fDown = false;
|
||||
}
|
||||
|
|
|
@ -74,7 +74,7 @@ namespace C4GUI
|
|||
// user can't toggle if disabled
|
||||
if (fByUser && !fEnabled) return;
|
||||
// sound
|
||||
if (fByUser) GUISound("Objects::Arrow::HitGround");
|
||||
if (fByUser) GUISound("UI::Tick");
|
||||
// toggle state
|
||||
fChecked = !fChecked;
|
||||
// callback (last call; may destroy element)
|
||||
|
|
|
@ -444,11 +444,11 @@ namespace C4GUI
|
|||
OnPosChanged();
|
||||
// start dragging
|
||||
rMouse.pDragElement = this;
|
||||
GUISound("Command");
|
||||
GUISound("UI::Select");
|
||||
}
|
||||
}
|
||||
// sound effekt when buttons are pressed
|
||||
if ((fTopDown || fBottomDown) != fPrevDown) GUISound("Objects::Arrow::HitGround");
|
||||
if ((fTopDown || fBottomDown) != fPrevDown) GUISound("UI::Tick");
|
||||
}
|
||||
|
||||
void ScrollBar::DoDragging(CMouse &rMouse, int32_t iX, int32_t iY, DWORD dwKeyParam)
|
||||
|
|
|
@ -578,7 +578,7 @@ namespace C4GUI
|
|||
if (pSelectedItem)
|
||||
{
|
||||
// effect
|
||||
if (fByUser) GUISound("Command");
|
||||
if (fByUser) GUISound("UI::Select");
|
||||
}
|
||||
// callback (caution: May do periluous things...)
|
||||
if (pSelectionChangeHandler) pSelectionChangeHandler->DoCall(pSelectedItem);
|
||||
|
|
|
@ -170,7 +170,7 @@ namespace C4GUI
|
|||
void ContextMenu::Abort(bool fByUser)
|
||||
{
|
||||
// effect
|
||||
if (fByUser) GUISound("Buildings::DoorClose");
|
||||
if (fByUser) GUISound("UI::Close");
|
||||
// simply del menu: dtor will remove itself
|
||||
delete this;
|
||||
}
|
||||
|
@ -427,7 +427,7 @@ namespace C4GUI
|
|||
if (pSelectedItem)
|
||||
{
|
||||
// effect
|
||||
if (fByUser) GUISound("Command");
|
||||
if (fByUser) GUISound("UI::Select");
|
||||
}
|
||||
// close any submenu from prev selection
|
||||
if (pSubmenu) pSubmenu->Abort(true);
|
||||
|
@ -477,7 +477,7 @@ namespace C4GUI
|
|||
// set target
|
||||
this->pTarget = pTarget;
|
||||
// effect :)
|
||||
GUISound("Buildings::DoorOpen");
|
||||
GUISound("UI::Open");
|
||||
// done
|
||||
}
|
||||
|
||||
|
|
|
@ -261,7 +261,7 @@ namespace C4GUI
|
|||
if (pActiveSheet)
|
||||
{
|
||||
// effect
|
||||
if (fByUser) GUISound("Command");
|
||||
if (fByUser) GUISound("UI::Select");
|
||||
// update in sheet
|
||||
pActiveSheet->OnShown(fByUser);
|
||||
}
|
||||
|
@ -494,7 +494,7 @@ namespace C4GUI
|
|||
if (iButton == C4MC_Button_LeftDown && fScrollingRight && Inside(iX, rcBounds.Wdt-iScrollSize,rcBounds.Wdt))
|
||||
{
|
||||
fProcessed = fScrollingRightDown = true;
|
||||
GUISound("Command");
|
||||
GUISound("UI::Select");
|
||||
DoCaptionScroll(+1);
|
||||
}
|
||||
else if (fScrollingLeft)
|
||||
|
@ -502,7 +502,7 @@ namespace C4GUI
|
|||
if (iButton == C4MC_Button_LeftDown && Inside(iX, d,d+iScrollSize))
|
||||
{
|
||||
fProcessed = fScrollingLeftDown = true;
|
||||
GUISound("Command");
|
||||
GUISound("UI::Select");
|
||||
DoCaptionScroll(-1);
|
||||
}
|
||||
d -= iCaptionScrollPos + iScrollSize;
|
||||
|
@ -564,7 +564,7 @@ namespace C4GUI
|
|||
if (fScrollingLeftDown || fScrollingRightDown)
|
||||
{
|
||||
// stop scrolling
|
||||
GUISound("Command");
|
||||
GUISound("UI::Select");
|
||||
fScrollingLeftDown = fScrollingRightDown = false;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -846,7 +846,7 @@ void C4StartupPlrSelDlg::OnCrewBtn(C4GUI::Control *btn)
|
|||
void C4StartupPlrSelDlg::SetPlayerMode()
|
||||
{
|
||||
// change view to listing players
|
||||
C4GUI::GUISound("Buildings::DoorClose");
|
||||
C4GUI::GUISound("UI::Close");
|
||||
StdStrBuf LastPlrFilename;
|
||||
LastPlrFilename.Copy(static_cast<const StdStrBuf &>(CurrPlayer.Grp.GetFullName()));
|
||||
CurrPlayer.Grp.Close();
|
||||
|
@ -875,7 +875,7 @@ void C4StartupPlrSelDlg::SetCrewMode(PlayerListItem *pSel)
|
|||
strCrew.getData(), C4GUI::Ico_Player);
|
||||
return;
|
||||
}
|
||||
C4GUI::GUISound("Buildings::DoorOpen");
|
||||
C4GUI::GUISound("UI::Open");
|
||||
eMode = PSDM_Crew;
|
||||
UpdatePlayerList();
|
||||
UpdateSelection();
|
||||
|
@ -1290,7 +1290,7 @@ void C4StartupPlrColorPickerDlg::Picker::MouseInput(C4GUI::CMouse &rMouse, int32
|
|||
if (HandleMouseDown(iX, iY))
|
||||
{
|
||||
rMouse.pDragElement = this;
|
||||
C4GUI::GUISound("Command");
|
||||
C4GUI::GUISound("UI::Select");
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
|
@ -1929,7 +1929,7 @@ void C4StartupScenSelDlg::OnButtonScenario(C4GUI::Control *pEl)
|
|||
void C4StartupScenSelDlg::DeselectAll()
|
||||
{
|
||||
// Deselect all so current folder info is displayed
|
||||
if (GetFocus()) C4GUI::GUISound("Objects::Arrow::HitGround");
|
||||
if (GetFocus()) C4GUI::GUISound("UI::Tick");
|
||||
SetFocus(NULL, true);
|
||||
if (pMapData) pMapData->ResetSelection();
|
||||
UpdateSelection();
|
||||
|
|
Loading…
Reference in New Issue