Revision: 1545
http://rigsofrods.svn.sourceforge.net/rigsofrods/?rev=1545&view=rev
Author: rorthomas
Date: 2010-12-11 11:57:59 +0000 (Sat, 11 Dec 2010)
Log Message:
-----------
updates for trunk version of MyGUI
Modified Paths:
--------------
trunk/source/main/Console.cpp
trunk/source/main/LoadingWindow.cpp
trunk/source/main/MapControl.cpp
trunk/source/main/MapEntity.cpp
trunk/source/main/Replay.cpp
trunk/source/main/ScriptEngine.cpp
trunk/source/main/SelectorWindow.cpp
trunk/source/main/gui_friction.cpp
trunk/source/main/gui_manager.cpp
trunk/source/main/gui_menu.cpp
trunk/source/main/gui_mp.cpp
Modified: trunk/source/main/Console.cpp
===================================================================
--- trunk/source/main/Console.cpp 2010-12-11 11:41:21 UTC (rev 1544)
+++ trunk/source/main/Console.cpp 2010-12-11 11:57:59 UTC (rev 1545)
@@ -29,7 +29,7 @@
initialiseByAttributes(this);
// make it 1/3 of screen height and place over screen
- MyGUI::IntSize size = MyGUI::Gui::getInstance().getViewSize();
+ MyGUI::IntSize size = MyGUI::RenderManager::getInstance().getViewSize();
size.height = size.height/3;
mMainWidget->setCoord(0, -size.height, size.width, size.height);
Modified: trunk/source/main/LoadingWindow.cpp
===================================================================
--- trunk/source/main/LoadingWindow.cpp 2010-12-11 11:41:21 UTC (rev 1544)
+++ trunk/source/main/LoadingWindow.cpp 2010-12-11 11:57:59 UTC (rev 1545)
@@ -26,7 +26,8 @@
{
initialiseByAttributes(this);
-
mMainWidget->setPosition(MyGUI::Gui::getInstance().getViewSize().width/2 -
mMainWidget->getWidth()/2, MyGUI::Gui::getInstance().getViewSize().height/2 -
mMainWidget->getHeight()/2);
+ MyGUI::IntSize gui_area =
MyGUI::RenderManager::getInstance().getViewSize();
+ mMainWidget->setPosition(gui_area.width/2 - mMainWidget->getWidth()/2,
gui_area.height/2 - mMainWidget->getHeight()/2);
}
LoadingWindow::~LoadingWindow()
Modified: trunk/source/main/MapControl.cpp
===================================================================
--- trunk/source/main/MapControl.cpp 2010-12-11 11:41:21 UTC (rev 1544)
+++ trunk/source/main/MapControl.cpp 2010-12-11 11:57:59 UTC (rev 1545)
@@ -108,7 +108,7 @@
bool MapControl::getVisibility()
{
- return mMainWidget->isVisible();
+ return mMainWidget->getVisible();
}
void MapControl::setVisibility(bool value)
Modified: trunk/source/main/MapEntity.cpp
===================================================================
--- trunk/source/main/MapEntity.cpp 2010-12-11 11:41:21 UTC (rev 1544)
+++ trunk/source/main/MapEntity.cpp 2010-12-11 11:57:59 UTC (rev 1545)
@@ -104,7 +104,7 @@
bool MapEntity::getVisibility()
{
- return mMainWidget->isVisible();
+ return mMainWidget->getVisible();
}
void MapEntity::setVisibility(bool value)
Modified: trunk/source/main/Replay.cpp
===================================================================
--- trunk/source/main/Replay.cpp 2010-12-11 11:41:21 UTC (rev 1544)
+++ trunk/source/main/Replay.cpp 2010-12-11 11:57:59 UTC (rev 1545)
@@ -51,11 +51,11 @@
// windowing
int width = 300;
int height = 60;
- int x = (MyGUI::Gui::getInstance().getViewWidth() - width) / 2;
+ int x = (MyGUI::RenderManager::getInstance().getViewSize().width -
width) / 2;
int y = 0;
panel = MyGUI::Gui::getInstance().createWidget<MyGUI::Widget>("Panel",
x, y, width, height, MyGUI::Align::HCenter | MyGUI::Align::Top, "Back");
- panel->setCaption(_L("Replay"));
+ //panel->setCaption(_L("Replay"));
panel->setAlpha(0.6);
pr = panel->createWidget<MyGUI::Progress>("Progress", 10, 10, 280, 20,
MyGUI::Align::Default);
@@ -172,7 +172,7 @@
bool Replay::getVisible()
{
#ifdef USE_MYGUI
- return panel->isVisible();
+ return panel->getVisible();
#else
return false;
#endif //MYGUI
Modified: trunk/source/main/ScriptEngine.cpp
===================================================================
--- trunk/source/main/ScriptEngine.cpp 2010-12-11 11:41:21 UTC (rev 1544)
+++ trunk/source/main/ScriptEngine.cpp 2010-12-11 11:57:59 UTC (rev 1545)
@@ -155,7 +155,7 @@
LogManager::getSingleton().logMessage("line:
"+StringConverter::toString(line)+","+StringConverter::toString(col));
// Print the variables in the current function
- PrintVariables(ctx, -1);
+ //PrintVariables(ctx, -1);
// Show the call stack with the variables
LogManager::getSingleton().logMessage("--- call stack ---");
Modified: trunk/source/main/SelectorWindow.cpp
===================================================================
--- trunk/source/main/SelectorWindow.cpp 2010-12-11 11:41:21 UTC (rev
1544)
+++ trunk/source/main/SelectorWindow.cpp 2010-12-11 11:57:59 UTC (rev
1545)
@@ -68,7 +68,7 @@
void SelectorWindow::eventKeyButtonPressed_Main(MyGUI::WidgetPtr _sender,
MyGUI::KeyCode _key, MyGUI::Char _char)
{
- if(!mMainWidget->isVisible()) return;
+ if(!mMainWidget->getVisible()) return;
int cid = mTypeComboBox->getIndexSelected();
int iid = mModelList->getIndexSelected();
@@ -168,7 +168,7 @@
void SelectorWindow::eventComboChangePositionTypeComboBox(MyGUI::ComboBoxPtr
_sender, size_t _index)
{
- if(!mMainWidget->isVisible()) return;
+ if(!mMainWidget->getVisible()) return;
try
{
int categoryID = *mTypeComboBox->getItemDataAt<int>(_index);
@@ -181,7 +181,7 @@
void SelectorWindow::eventListChangePositionModelList(MyGUI::ListPtr _sender,
size_t _index)
{
- if(!mMainWidget->isVisible()) return;
+ if(!mMainWidget->getVisible()) return;
try
{
int entryID = *mModelList->getItemDataAt<int>(_index);
@@ -193,7 +193,7 @@
void SelectorWindow::eventComboAcceptConfigComboBox(MyGUI::ComboBoxPtr
_sender, size_t _index)
{
- if(!mMainWidget->isVisible()) return;
+ if(!mMainWidget->getVisible()) return;
try
{
mTruckConfigs.clear();
@@ -655,14 +655,14 @@
void SelectorWindow::eventSearchTextChange(MyGUI::WidgetPtr _sender)
{
- if(!mMainWidget->isVisible()) return;
+ if(!mMainWidget->getVisible()) return;
onCategorySelected(9994);
mTypeComboBox->setCaption(_L("Search Results"));
}
void SelectorWindow::eventSearchTextGotFocus(MyGUI::WidgetPtr _sender,
MyGUI::WidgetPtr oldWidget)
{
- if(!mMainWidget->isVisible()) return;
+ if(!mMainWidget->getVisible()) return;
mSearchLineEdit->setCaption("");
}
#endif //MYGUI
Modified: trunk/source/main/gui_friction.cpp
===================================================================
--- trunk/source/main/gui_friction.cpp 2010-12-11 11:41:21 UTC (rev 1544)
+++ trunk/source/main/gui_friction.cpp 2010-12-11 11:57:59 UTC (rev 1545)
@@ -366,7 +366,7 @@
void GUI_Friction::setShaded(bool value)
{
- if(!win || !win->isVisible()) return;
+ if(!win || !win->getVisible()) return;
if(value)
{
MyGUI::ControllerItem* item =
MyGUI::ControllerManager::getInstance().createItem(MyGUI::ControllerFadeAlpha::getClassTypeName());
@@ -415,7 +415,7 @@
bool GUI_Friction::getVisible()
{
- return win->isVisible();
+ return win->getVisible();
}
void GUI_Friction::setActiveCol(ground_model_t *gm)
@@ -563,7 +563,7 @@
void GUI_Friction::event_combo_grounds_eventComboAccept(MyGUI::ComboBoxPtr
_sender, size_t _index)
{
if(!col) return;
- if(!win->isVisible()) return;
+ if(!win->getVisible()) return;
MyGUI::ComboBoxPtr cb =
(MyGUI::ComboBoxPtr)win->findWidget("combo_grounds");
if(!cb) return;
ground_model_t *gm =
col->getGroundModelByString(cb->getItemNameAt(_index).asUTF8_c_str());
Modified: trunk/source/main/gui_manager.cpp
===================================================================
--- trunk/source/main/gui_manager.cpp 2010-12-11 11:41:21 UTC (rev 1544)
+++ trunk/source/main/gui_manager.cpp 2010-12-11 11:57:59 UTC (rev 1545)
@@ -134,31 +134,31 @@
void GUIManager::injectMouseMove(int _absx, int _absy, int _absz)
{
if (!mGUI) return;
- mGUI->injectMouseMove(_absx, _absy, _absz);
+ MyGUI::InputManager::getInstance().injectMouseMove(_absx, _absy, _absz);
}
void GUIManager::injectMousePress(int _absx, int _absy, MyGUI::MouseButton _id)
{
if (!mGUI) return;
- mGUI->injectMousePress(_absx, _absy, _id);
+ MyGUI::InputManager::getInstance().injectMousePress(_absx, _absy, _id);
}
void GUIManager::injectMouseRelease(int _absx, int _absy, MyGUI::MouseButton
_id)
{
if (!mGUI) return;
- mGUI->injectMouseRelease(_absx, _absy, _id);
+ MyGUI::InputManager::getInstance().injectMouseRelease(_absx, _absy,
_id);
}
void GUIManager::injectKeyPress(MyGUI::KeyCode _key, MyGUI::Char _text)
{
if (!mGUI) return;
- mGUI->injectKeyPress(_key, _text);
+ MyGUI::InputManager::getInstance().injectKeyPress(_key, _text);
}
void GUIManager::injectKeyRelease(MyGUI::KeyCode _key)
{
if (!mGUI) return;
- mGUI->injectKeyRelease(_key);
+ MyGUI::InputManager::getInstance().injectKeyRelease(_key);
}
#endif //MYGUI
Modified: trunk/source/main/gui_menu.cpp
===================================================================
--- trunk/source/main/gui_menu.cpp 2010-12-11 11:41:21 UTC (rev 1544)
+++ trunk/source/main/gui_menu.cpp 2010-12-11 11:57:59 UTC (rev 1545)
@@ -134,7 +134,7 @@
bool GUI_MainMenu::getVisible()
{
- return mainmenu->isVisible();
+ return mainmenu->getVisible();
}
#endif // MYGUI
Modified: trunk/source/main/gui_mp.cpp
===================================================================
--- trunk/source/main/gui_mp.cpp 2010-12-11 11:41:21 UTC (rev 1544)
+++ trunk/source/main/gui_mp.cpp 2010-12-11 11:57:59 UTC (rev 1545)
@@ -79,7 +79,7 @@
// now the main GUI
- MyGUI::IntSize gui_area =
GUIManager::getSingleton().getGUI()->getViewSize();
+ MyGUI::IntSize gui_area =
MyGUI::RenderManager::getInstance().getViewSize();
int x=gui_area.width - 200, y=30;
mpPanel =
MyGUI::Gui::getInstance().createWidget<MyGUI::Widget>("FlowContainer", x, y,
200, gui_area.height, MyGUI::Align::Default, "Main");
mpPanel->setVisible(true);
@@ -289,7 +289,7 @@
client_t clients[MAX_PEERS];
int slotid = 0;
- MyGUI::IntSize gui_area =
GUIManager::getSingleton().getGUI()->getViewSize();
+ MyGUI::IntSize gui_area =
MyGUI::RenderManager::getInstance().getViewSize();
int x=gui_area.width - 200, y=30;
mpPanel->setPosition(x,y);
@@ -380,7 +380,7 @@
bool GUI_Multiplayer::getVisible()
{
- return mpPanel->isVisible();
+ return mpPanel->getVisible();
}
#endif // USE_SOCKETW
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Oracle to DB2 Conversion Guide: Learn learn about native support for PL/SQL,
new data types, scalar functions, improved concurrency, built-in packages,
OCI, SQL*Plus, data movement tools, best practices and more.
http://p.sf.net/sfu/oracle-sfdev2dev
_______________________________________________
Rigsofrods-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/rigsofrods-devel
