forked from mirror/openmw-tes3mp
Fix -Woverloaded-virtual clang warnings
This commit is contained in:
parent
141e9d36a4
commit
e23775e338
26 changed files with 38 additions and 38 deletions
|
@ -73,7 +73,7 @@ namespace MWGui
|
||||||
mPages.clear();
|
mPages.clear();
|
||||||
}
|
}
|
||||||
|
|
||||||
void BookWindow::open (MWWorld::Ptr book, bool showTakeButton)
|
void BookWindow::openBook (MWWorld::Ptr book, bool showTakeButton)
|
||||||
{
|
{
|
||||||
mBook = book;
|
mBook = book;
|
||||||
|
|
||||||
|
|
|
@ -16,7 +16,7 @@ namespace MWGui
|
||||||
|
|
||||||
virtual void exit();
|
virtual void exit();
|
||||||
|
|
||||||
void open(MWWorld::Ptr book, bool showTakeButton);
|
void openBook(MWWorld::Ptr book, bool showTakeButton);
|
||||||
void setInventoryAllowed(bool allowed);
|
void setInventoryAllowed(bool allowed);
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
|
|
|
@ -84,7 +84,7 @@ void CompanionWindow::onItemSelected(int index)
|
||||||
if (count > 1 && !shift)
|
if (count > 1 && !shift)
|
||||||
{
|
{
|
||||||
CountDialog* dialog = MWBase::Environment::get().getWindowManager()->getCountDialog();
|
CountDialog* dialog = MWBase::Environment::get().getWindowManager()->getCountDialog();
|
||||||
dialog->open(object.getClass().getName(object), "#{sTake}", count);
|
dialog->openCountDialog(object.getClass().getName(object), "#{sTake}", count);
|
||||||
dialog->eventOkClicked.clear();
|
dialog->eventOkClicked.clear();
|
||||||
dialog->eventOkClicked += MyGUI::newDelegate(this, &CompanionWindow::dragItem);
|
dialog->eventOkClicked += MyGUI::newDelegate(this, &CompanionWindow::dragItem);
|
||||||
}
|
}
|
||||||
|
@ -106,7 +106,7 @@ void CompanionWindow::onBackgroundSelected()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void CompanionWindow::open(const MWWorld::Ptr& npc)
|
void CompanionWindow::openCompanion(const MWWorld::Ptr& npc)
|
||||||
{
|
{
|
||||||
mPtr = npc;
|
mPtr = npc;
|
||||||
updateEncumbranceBar();
|
updateEncumbranceBar();
|
||||||
|
|
|
@ -22,7 +22,7 @@ namespace MWGui
|
||||||
|
|
||||||
virtual void resetReference();
|
virtual void resetReference();
|
||||||
|
|
||||||
void open(const MWWorld::Ptr& npc);
|
void openCompanion(const MWWorld::Ptr& npc);
|
||||||
void onFrame ();
|
void onFrame ();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
|
|
@ -16,7 +16,7 @@ namespace MWGui
|
||||||
mOkButton->eventMouseButtonClick += MyGUI::newDelegate(this, &ConfirmationDialog::onOkButtonClicked);
|
mOkButton->eventMouseButtonClick += MyGUI::newDelegate(this, &ConfirmationDialog::onOkButtonClicked);
|
||||||
}
|
}
|
||||||
|
|
||||||
void ConfirmationDialog::open(const std::string& message, const std::string& confirmMessage, const std::string& cancelMessage)
|
void ConfirmationDialog::askForConfirmation(const std::string& message, const std::string& confirmMessage, const std::string& cancelMessage)
|
||||||
{
|
{
|
||||||
setVisible(true);
|
setVisible(true);
|
||||||
|
|
||||||
|
|
|
@ -9,7 +9,7 @@ namespace MWGui
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
ConfirmationDialog();
|
ConfirmationDialog();
|
||||||
void open(const std::string& message, const std::string& confirmMessage="#{sOk}", const std::string& cancelMessage="#{sCancel}");
|
void askForConfirmation(const std::string& message, const std::string& confirmMessage="#{sOk}", const std::string& cancelMessage="#{sCancel}");
|
||||||
virtual void exit();
|
virtual void exit();
|
||||||
|
|
||||||
typedef MyGUI::delegates::CMultiDelegate0 EventHandle_Void;
|
typedef MyGUI::delegates::CMultiDelegate0 EventHandle_Void;
|
||||||
|
|
|
@ -83,7 +83,7 @@ namespace MWGui
|
||||||
if (count > 1 && !shift)
|
if (count > 1 && !shift)
|
||||||
{
|
{
|
||||||
CountDialog* dialog = MWBase::Environment::get().getWindowManager()->getCountDialog();
|
CountDialog* dialog = MWBase::Environment::get().getWindowManager()->getCountDialog();
|
||||||
dialog->open(object.getClass().getName(object), "#{sTake}", count);
|
dialog->openCountDialog(object.getClass().getName(object), "#{sTake}", count);
|
||||||
dialog->eventOkClicked.clear();
|
dialog->eventOkClicked.clear();
|
||||||
dialog->eventOkClicked += MyGUI::newDelegate(this, &ContainerWindow::dragItem);
|
dialog->eventOkClicked += MyGUI::newDelegate(this, &ContainerWindow::dragItem);
|
||||||
}
|
}
|
||||||
|
@ -131,7 +131,7 @@ namespace MWGui
|
||||||
dropItem();
|
dropItem();
|
||||||
}
|
}
|
||||||
|
|
||||||
void ContainerWindow::open(const MWWorld::Ptr& container, bool loot)
|
void ContainerWindow::openContainer(const MWWorld::Ptr& container, bool loot)
|
||||||
{
|
{
|
||||||
mPickpocketDetected = false;
|
mPickpocketDetected = false;
|
||||||
mPtr = container;
|
mPtr = container;
|
||||||
|
|
|
@ -33,7 +33,7 @@ namespace MWGui
|
||||||
public:
|
public:
|
||||||
ContainerWindow(DragAndDrop* dragAndDrop);
|
ContainerWindow(DragAndDrop* dragAndDrop);
|
||||||
|
|
||||||
void open(const MWWorld::Ptr& container, bool loot=false);
|
void openContainer(const MWWorld::Ptr& container, bool loot=false);
|
||||||
virtual void close();
|
virtual void close();
|
||||||
|
|
||||||
virtual void resetReference();
|
virtual void resetReference();
|
||||||
|
|
|
@ -29,7 +29,7 @@ namespace MWGui
|
||||||
mItemEdit->eventEditSelectAccept += MyGUI::newDelegate(this, &CountDialog::onEnterKeyPressed);
|
mItemEdit->eventEditSelectAccept += MyGUI::newDelegate(this, &CountDialog::onEnterKeyPressed);
|
||||||
}
|
}
|
||||||
|
|
||||||
void CountDialog::open(const std::string& item, const std::string& message, const int maxCount)
|
void CountDialog::openCountDialog(const std::string& item, const std::string& message, const int maxCount)
|
||||||
{
|
{
|
||||||
setVisible(true);
|
setVisible(true);
|
||||||
|
|
||||||
|
|
|
@ -14,7 +14,7 @@ namespace MWGui
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
CountDialog();
|
CountDialog();
|
||||||
void open(const std::string& item, const std::string& message, const int maxCount);
|
void openCountDialog(const std::string& item, const std::string& message, const int maxCount);
|
||||||
void cancel();
|
void cancel();
|
||||||
virtual void exit();
|
virtual void exit();
|
||||||
|
|
||||||
|
|
|
@ -237,7 +237,7 @@ namespace MWGui
|
||||||
{
|
{
|
||||||
CountDialog* dialog = MWBase::Environment::get().getWindowManager()->getCountDialog();
|
CountDialog* dialog = MWBase::Environment::get().getWindowManager()->getCountDialog();
|
||||||
std::string message = mTrading ? "#{sQuanityMenuMessage01}" : "#{sTake}";
|
std::string message = mTrading ? "#{sQuanityMenuMessage01}" : "#{sTake}";
|
||||||
dialog->open(object.getClass().getName(object), message, count);
|
dialog->openCountDialog(object.getClass().getName(object), message, count);
|
||||||
dialog->eventOkClicked.clear();
|
dialog->eventOkClicked.clear();
|
||||||
if (mTrading)
|
if (mTrading)
|
||||||
dialog->eventOkClicked += MyGUI::newDelegate(this, &InventoryWindow::sellItem);
|
dialog->eventOkClicked += MyGUI::newDelegate(this, &InventoryWindow::sellItem);
|
||||||
|
|
|
@ -103,7 +103,7 @@ void ItemView::update()
|
||||||
MyGUI::Align::Stretch);
|
MyGUI::Align::Stretch);
|
||||||
dragArea->setNeedMouseFocus(true);
|
dragArea->setNeedMouseFocus(true);
|
||||||
dragArea->eventMouseButtonClick += MyGUI::newDelegate(this, &ItemView::onSelectedBackground);
|
dragArea->eventMouseButtonClick += MyGUI::newDelegate(this, &ItemView::onSelectedBackground);
|
||||||
dragArea->eventMouseWheel += MyGUI::newDelegate(this, &ItemView::onMouseWheel);
|
dragArea->eventMouseWheel += MyGUI::newDelegate(this, &ItemView::onMouseWheelMoved);
|
||||||
|
|
||||||
for (ItemModel::ModelIndex i=0; i<static_cast<int>(mModel->getItemCount()); ++i)
|
for (ItemModel::ModelIndex i=0; i<static_cast<int>(mModel->getItemCount()); ++i)
|
||||||
{
|
{
|
||||||
|
@ -122,7 +122,7 @@ void ItemView::update()
|
||||||
itemWidget->setCount(item.mCount);
|
itemWidget->setCount(item.mCount);
|
||||||
|
|
||||||
itemWidget->eventMouseButtonClick += MyGUI::newDelegate(this, &ItemView::onSelectedItem);
|
itemWidget->eventMouseButtonClick += MyGUI::newDelegate(this, &ItemView::onSelectedItem);
|
||||||
itemWidget->eventMouseWheel += MyGUI::newDelegate(this, &ItemView::onMouseWheel);
|
itemWidget->eventMouseWheel += MyGUI::newDelegate(this, &ItemView::onMouseWheelMoved);
|
||||||
}
|
}
|
||||||
|
|
||||||
layoutWidgets();
|
layoutWidgets();
|
||||||
|
@ -139,7 +139,7 @@ void ItemView::onSelectedBackground(MyGUI::Widget *sender)
|
||||||
eventBackgroundClicked();
|
eventBackgroundClicked();
|
||||||
}
|
}
|
||||||
|
|
||||||
void ItemView::onMouseWheel(MyGUI::Widget *_sender, int _rel)
|
void ItemView::onMouseWheelMoved(MyGUI::Widget *_sender, int _rel)
|
||||||
{
|
{
|
||||||
if (mScrollView->getViewOffset().left + _rel*0.3f > 0)
|
if (mScrollView->getViewOffset().left + _rel*0.3f > 0)
|
||||||
mScrollView->setViewOffset(MyGUI::IntPoint(0, 0));
|
mScrollView->setViewOffset(MyGUI::IntPoint(0, 0));
|
||||||
|
|
|
@ -40,7 +40,7 @@ namespace MWGui
|
||||||
|
|
||||||
void onSelectedItem (MyGUI::Widget* sender);
|
void onSelectedItem (MyGUI::Widget* sender);
|
||||||
void onSelectedBackground (MyGUI::Widget* sender);
|
void onSelectedBackground (MyGUI::Widget* sender);
|
||||||
void onMouseWheel(MyGUI::Widget* _sender, int _rel);
|
void onMouseWheelMoved(MyGUI::Widget* _sender, int _rel);
|
||||||
|
|
||||||
ItemModel* mModel;
|
ItemModel* mModel;
|
||||||
MyGUI::ScrollView* mScrollView;
|
MyGUI::ScrollView* mScrollView;
|
||||||
|
|
|
@ -112,7 +112,7 @@ namespace MWGui
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
ConfirmationDialog* dialog = MWBase::Environment::get().getWindowManager()->getConfirmationDialog();
|
ConfirmationDialog* dialog = MWBase::Environment::get().getWindowManager()->getConfirmationDialog();
|
||||||
dialog->open("#{sMessage2}");
|
dialog->askForConfirmation("#{sMessage2}");
|
||||||
dialog->eventOkClicked.clear();
|
dialog->eventOkClicked.clear();
|
||||||
dialog->eventOkClicked += MyGUI::newDelegate(this, &MainMenu::onExitConfirmed);
|
dialog->eventOkClicked += MyGUI::newDelegate(this, &MainMenu::onExitConfirmed);
|
||||||
dialog->eventCancelClicked.clear();
|
dialog->eventCancelClicked.clear();
|
||||||
|
@ -125,7 +125,7 @@ namespace MWGui
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
ConfirmationDialog* dialog = MWBase::Environment::get().getWindowManager()->getConfirmationDialog();
|
ConfirmationDialog* dialog = MWBase::Environment::get().getWindowManager()->getConfirmationDialog();
|
||||||
dialog->open("#{sNotifyMessage54}");
|
dialog->askForConfirmation("#{sNotifyMessage54}");
|
||||||
dialog->eventOkClicked.clear();
|
dialog->eventOkClicked.clear();
|
||||||
dialog->eventOkClicked += MyGUI::newDelegate(this, &MainMenu::onNewGameConfirmed);
|
dialog->eventOkClicked += MyGUI::newDelegate(this, &MainMenu::onNewGameConfirmed);
|
||||||
dialog->eventCancelClicked.clear();
|
dialog->eventCancelClicked.clear();
|
||||||
|
|
|
@ -650,7 +650,7 @@ namespace MWGui
|
||||||
void MapWindow::onNoteEditDelete()
|
void MapWindow::onNoteEditDelete()
|
||||||
{
|
{
|
||||||
ConfirmationDialog* confirmation = MWBase::Environment::get().getWindowManager()->getConfirmationDialog();
|
ConfirmationDialog* confirmation = MWBase::Environment::get().getWindowManager()->getConfirmationDialog();
|
||||||
confirmation->open("#{sDeleteNote}", "#{sYes}", "#{sNo}");
|
confirmation->askForConfirmation("#{sDeleteNote}", "#{sYes}", "#{sNo}");
|
||||||
confirmation->eventCancelClicked.clear();
|
confirmation->eventCancelClicked.clear();
|
||||||
confirmation->eventOkClicked.clear();
|
confirmation->eventOkClicked.clear();
|
||||||
confirmation->eventOkClicked += MyGUI::newDelegate(this, &MapWindow::onNoteEditDeleteConfirm);
|
confirmation->eventOkClicked += MyGUI::newDelegate(this, &MapWindow::onNoteEditDeleteConfirm);
|
||||||
|
|
|
@ -73,7 +73,7 @@ namespace MWGui
|
||||||
void SaveGameDialog::confirmDeleteSave()
|
void SaveGameDialog::confirmDeleteSave()
|
||||||
{
|
{
|
||||||
ConfirmationDialog* dialog = MWBase::Environment::get().getWindowManager()->getConfirmationDialog();
|
ConfirmationDialog* dialog = MWBase::Environment::get().getWindowManager()->getConfirmationDialog();
|
||||||
dialog->open("#{sMessage3}");
|
dialog->askForConfirmation("#{sMessage3}");
|
||||||
dialog->eventOkClicked.clear();
|
dialog->eventOkClicked.clear();
|
||||||
dialog->eventOkClicked += MyGUI::newDelegate(this, &SaveGameDialog::onDeleteSlotConfirmed);
|
dialog->eventOkClicked += MyGUI::newDelegate(this, &SaveGameDialog::onDeleteSlotConfirmed);
|
||||||
dialog->eventCancelClicked.clear();
|
dialog->eventCancelClicked.clear();
|
||||||
|
@ -232,7 +232,7 @@ namespace MWGui
|
||||||
if (mCurrentSlot != NULL && !reallySure)
|
if (mCurrentSlot != NULL && !reallySure)
|
||||||
{
|
{
|
||||||
ConfirmationDialog* dialog = MWBase::Environment::get().getWindowManager()->getConfirmationDialog();
|
ConfirmationDialog* dialog = MWBase::Environment::get().getWindowManager()->getConfirmationDialog();
|
||||||
dialog->open("#{sMessage4}");
|
dialog->askForConfirmation("#{sMessage4}");
|
||||||
dialog->eventOkClicked.clear();
|
dialog->eventOkClicked.clear();
|
||||||
dialog->eventOkClicked += MyGUI::newDelegate(this, &SaveGameDialog::onConfirmationGiven);
|
dialog->eventOkClicked += MyGUI::newDelegate(this, &SaveGameDialog::onConfirmationGiven);
|
||||||
dialog->eventCancelClicked.clear();
|
dialog->eventCancelClicked.clear();
|
||||||
|
|
|
@ -48,7 +48,7 @@ namespace MWGui
|
||||||
center();
|
center();
|
||||||
}
|
}
|
||||||
|
|
||||||
void ScrollWindow::open (MWWorld::Ptr scroll, bool showTakeButton)
|
void ScrollWindow::openScroll (MWWorld::Ptr scroll, bool showTakeButton)
|
||||||
{
|
{
|
||||||
// no 3d sounds because the object could be in a container.
|
// no 3d sounds because the object could be in a container.
|
||||||
MWBase::Environment::get().getSoundManager()->playSound ("scroll", 1.0, 1.0);
|
MWBase::Environment::get().getSoundManager()->playSound ("scroll", 1.0, 1.0);
|
||||||
|
|
|
@ -17,7 +17,7 @@ namespace MWGui
|
||||||
public:
|
public:
|
||||||
ScrollWindow ();
|
ScrollWindow ();
|
||||||
|
|
||||||
void open (MWWorld::Ptr scroll, bool showTakeButton);
|
void openScroll (MWWorld::Ptr scroll, bool showTakeButton);
|
||||||
virtual void exit();
|
virtual void exit();
|
||||||
void setInventoryAllowed(bool allowed);
|
void setInventoryAllowed(bool allowed);
|
||||||
|
|
||||||
|
|
|
@ -271,7 +271,7 @@ namespace MWGui
|
||||||
return;
|
return;
|
||||||
|
|
||||||
ConfirmationDialog* dialog = MWBase::Environment::get().getWindowManager()->getConfirmationDialog();
|
ConfirmationDialog* dialog = MWBase::Environment::get().getWindowManager()->getConfirmationDialog();
|
||||||
dialog->open("#{sNotifyMessage67}");
|
dialog->askForConfirmation("#{sNotifyMessage67}");
|
||||||
dialog->eventOkClicked.clear();
|
dialog->eventOkClicked.clear();
|
||||||
dialog->eventOkClicked += MyGUI::newDelegate(this, &SettingsWindow::onResolutionAccept);
|
dialog->eventOkClicked += MyGUI::newDelegate(this, &SettingsWindow::onResolutionAccept);
|
||||||
dialog->eventCancelClicked.clear();
|
dialog->eventCancelClicked.clear();
|
||||||
|
@ -540,7 +540,7 @@ namespace MWGui
|
||||||
void SettingsWindow::onResetDefaultBindings(MyGUI::Widget* _sender)
|
void SettingsWindow::onResetDefaultBindings(MyGUI::Widget* _sender)
|
||||||
{
|
{
|
||||||
ConfirmationDialog* dialog = MWBase::Environment::get().getWindowManager()->getConfirmationDialog();
|
ConfirmationDialog* dialog = MWBase::Environment::get().getWindowManager()->getConfirmationDialog();
|
||||||
dialog->open("#{sNotifyMessage66}");
|
dialog->askForConfirmation("#{sNotifyMessage66}");
|
||||||
dialog->eventOkClicked.clear();
|
dialog->eventOkClicked.clear();
|
||||||
dialog->eventOkClicked += MyGUI::newDelegate(this, &SettingsWindow::onResetDefaultBindingsAccept);
|
dialog->eventOkClicked += MyGUI::newDelegate(this, &SettingsWindow::onResetDefaultBindingsAccept);
|
||||||
dialog->eventCancelClicked.clear();
|
dialog->eventCancelClicked.clear();
|
||||||
|
|
|
@ -289,7 +289,7 @@ namespace MWGui
|
||||||
|
|
||||||
widget->setUserString(sSpellModelIndex, MyGUI::utility::toString(index));
|
widget->setUserString(sSpellModelIndex, MyGUI::utility::toString(index));
|
||||||
|
|
||||||
widget->eventMouseWheel += MyGUI::newDelegate(this, &SpellView::onMouseWheel);
|
widget->eventMouseWheel += MyGUI::newDelegate(this, &SpellView::onMouseWheelMoved);
|
||||||
widget->eventMouseButtonClick += MyGUI::newDelegate(this, &SpellView::onSpellSelected);
|
widget->eventMouseButtonClick += MyGUI::newDelegate(this, &SpellView::onSpellSelected);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -303,7 +303,7 @@ namespace MWGui
|
||||||
eventSpellClicked(getSpellModelIndex(_sender));
|
eventSpellClicked(getSpellModelIndex(_sender));
|
||||||
}
|
}
|
||||||
|
|
||||||
void SpellView::onMouseWheel(MyGUI::Widget* _sender, int _rel)
|
void SpellView::onMouseWheelMoved(MyGUI::Widget* _sender, int _rel)
|
||||||
{
|
{
|
||||||
if (mScrollView->getViewOffset().top + _rel*0.3f > 0)
|
if (mScrollView->getViewOffset().top + _rel*0.3f > 0)
|
||||||
mScrollView->setViewOffset(MyGUI::IntPoint(0, 0));
|
mScrollView->setViewOffset(MyGUI::IntPoint(0, 0));
|
||||||
|
|
|
@ -84,7 +84,7 @@ namespace MWGui
|
||||||
void adjustSpellWidget(const Spell& spell, SpellModel::ModelIndex index, MyGUI::Widget* widget);
|
void adjustSpellWidget(const Spell& spell, SpellModel::ModelIndex index, MyGUI::Widget* widget);
|
||||||
|
|
||||||
void onSpellSelected(MyGUI::Widget* _sender);
|
void onSpellSelected(MyGUI::Widget* _sender);
|
||||||
void onMouseWheel(MyGUI::Widget* _sender, int _rel);
|
void onMouseWheelMoved(MyGUI::Widget* _sender, int _rel);
|
||||||
|
|
||||||
SpellModel::ModelIndex getSpellModelIndex(MyGUI::Widget* _sender);
|
SpellModel::ModelIndex getSpellModelIndex(MyGUI::Widget* _sender);
|
||||||
|
|
||||||
|
|
|
@ -134,7 +134,7 @@ namespace MWGui
|
||||||
ConfirmationDialog* dialog = MWBase::Environment::get().getWindowManager()->getConfirmationDialog();
|
ConfirmationDialog* dialog = MWBase::Environment::get().getWindowManager()->getConfirmationDialog();
|
||||||
std::string question = MWBase::Environment::get().getWindowManager()->getGameSettingString("sQuestionDeleteSpell", "Delete %s?");
|
std::string question = MWBase::Environment::get().getWindowManager()->getGameSettingString("sQuestionDeleteSpell", "Delete %s?");
|
||||||
question = boost::str(boost::format(question) % spell->mName);
|
question = boost::str(boost::format(question) % spell->mName);
|
||||||
dialog->open(question);
|
dialog->askForConfirmation(question);
|
||||||
dialog->eventOkClicked.clear();
|
dialog->eventOkClicked.clear();
|
||||||
dialog->eventOkClicked += MyGUI::newDelegate(this, &SpellWindow::onDeleteSpellAccept);
|
dialog->eventOkClicked += MyGUI::newDelegate(this, &SpellWindow::onDeleteSpellAccept);
|
||||||
dialog->eventCancelClicked.clear();
|
dialog->eventCancelClicked.clear();
|
||||||
|
|
|
@ -194,7 +194,7 @@ namespace MWGui
|
||||||
{
|
{
|
||||||
CountDialog* dialog = MWBase::Environment::get().getWindowManager()->getCountDialog();
|
CountDialog* dialog = MWBase::Environment::get().getWindowManager()->getCountDialog();
|
||||||
std::string message = "#{sQuanityMenuMessage02}";
|
std::string message = "#{sQuanityMenuMessage02}";
|
||||||
dialog->open(object.getClass().getName(object), message, count);
|
dialog->openCountDialog(object.getClass().getName(object), message, count);
|
||||||
dialog->eventOkClicked.clear();
|
dialog->eventOkClicked.clear();
|
||||||
dialog->eventOkClicked += MyGUI::newDelegate(this, &TradeWindow::sellItem);
|
dialog->eventOkClicked += MyGUI::newDelegate(this, &TradeWindow::sellItem);
|
||||||
mItemToSell = mSortModel->mapToSource(index);
|
mItemToSell = mSortModel->mapToSource(index);
|
||||||
|
|
|
@ -1524,7 +1524,7 @@ namespace MWGui
|
||||||
void WindowManager::showCompanionWindow(MWWorld::Ptr actor)
|
void WindowManager::showCompanionWindow(MWWorld::Ptr actor)
|
||||||
{
|
{
|
||||||
pushGuiMode(MWGui::GM_Companion);
|
pushGuiMode(MWGui::GM_Companion);
|
||||||
mCompanionWindow->open(actor);
|
mCompanionWindow->openCompanion(actor);
|
||||||
}
|
}
|
||||||
|
|
||||||
void WindowManager::changePointer(const std::string &name)
|
void WindowManager::changePointer(const std::string &name)
|
||||||
|
@ -1927,19 +1927,19 @@ namespace MWGui
|
||||||
void WindowManager::openContainer(const MWWorld::Ptr &container, bool loot)
|
void WindowManager::openContainer(const MWWorld::Ptr &container, bool loot)
|
||||||
{
|
{
|
||||||
pushGuiMode(GM_Container);
|
pushGuiMode(GM_Container);
|
||||||
mContainerWindow->open(container, loot);
|
mContainerWindow->openContainer(container, loot);
|
||||||
}
|
}
|
||||||
|
|
||||||
void WindowManager::showBook(const MWWorld::Ptr &item, bool showTakeButton)
|
void WindowManager::showBook(const MWWorld::Ptr &item, bool showTakeButton)
|
||||||
{
|
{
|
||||||
pushGuiMode(GM_Book);
|
pushGuiMode(GM_Book);
|
||||||
mBookWindow->open(item, showTakeButton);
|
mBookWindow->openBook(item, showTakeButton);
|
||||||
}
|
}
|
||||||
|
|
||||||
void WindowManager::showScroll(const MWWorld::Ptr &item, bool showTakeButton)
|
void WindowManager::showScroll(const MWWorld::Ptr &item, bool showTakeButton)
|
||||||
{
|
{
|
||||||
pushGuiMode(GM_Scroll);
|
pushGuiMode(GM_Scroll);
|
||||||
mScrollWindow->open(item, showTakeButton);
|
mScrollWindow->openScroll(item, showTakeButton);
|
||||||
}
|
}
|
||||||
|
|
||||||
std::string WindowManager::correctIconPath(const std::string& path)
|
std::string WindowManager::correctIconPath(const std::string& path)
|
||||||
|
|
|
@ -70,7 +70,7 @@ namespace Gui
|
||||||
button->setCaption((*it));
|
button->setCaption((*it));
|
||||||
button->getSubWidgetText()->setWordWrap(true);
|
button->getSubWidgetText()->setWordWrap(true);
|
||||||
button->getSubWidgetText()->setTextAlign(MyGUI::Align::Left);
|
button->getSubWidgetText()->setTextAlign(MyGUI::Align::Left);
|
||||||
button->eventMouseWheel += MyGUI::newDelegate(this, &MWList::onMouseWheel);
|
button->eventMouseWheel += MyGUI::newDelegate(this, &MWList::onMouseWheelMoved);
|
||||||
button->eventMouseButtonClick += MyGUI::newDelegate(this, &MWList::onItemSelected);
|
button->eventMouseButtonClick += MyGUI::newDelegate(this, &MWList::onItemSelected);
|
||||||
|
|
||||||
int height = button->getTextSize().height;
|
int height = button->getTextSize().height;
|
||||||
|
@ -135,7 +135,7 @@ namespace Gui
|
||||||
mItems.clear();
|
mItems.clear();
|
||||||
}
|
}
|
||||||
|
|
||||||
void MWList::onMouseWheel(MyGUI::Widget* _sender, int _rel)
|
void MWList::onMouseWheelMoved(MyGUI::Widget* _sender, int _rel)
|
||||||
{
|
{
|
||||||
//NB view offset is negative
|
//NB view offset is negative
|
||||||
if (mScrollView->getViewOffset().top + _rel*0.3f > 0)
|
if (mScrollView->getViewOffset().top + _rel*0.3f > 0)
|
||||||
|
|
|
@ -55,7 +55,7 @@ namespace Gui
|
||||||
|
|
||||||
void redraw(bool scrollbarShown = false);
|
void redraw(bool scrollbarShown = false);
|
||||||
|
|
||||||
void onMouseWheel(MyGUI::Widget* _sender, int _rel);
|
void onMouseWheelMoved(MyGUI::Widget* _sender, int _rel);
|
||||||
void onItemSelected(MyGUI::Widget* _sender);
|
void onItemSelected(MyGUI::Widget* _sender);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
|
Loading…
Reference in a new issue