Revision: 1473
http://rigsofrods.svn.sourceforge.net/rigsofrods/?rev=1473&view=rev
Author: rorthomas
Date: 2010-07-20 08:36:21 +0000 (Tue, 20 Jul 2010)
Log Message:
-----------
improved icons
mp gui now hide-able with U key
Modified Paths:
--------------
trunk/source/main/RigsOfRods.cpp
trunk/source/main/RoRFrameListener.cpp
trunk/source/main/gui_mp.cpp
trunk/source/main/gui_mp.h
Modified: trunk/source/main/RigsOfRods.cpp
===================================================================
--- trunk/source/main/RigsOfRods.cpp 2010-07-20 08:35:28 UTC (rev 1472)
+++ trunk/source/main/RigsOfRods.cpp 2010-07-20 08:36:21 UTC (rev 1473)
@@ -153,6 +153,7 @@
loadMainResource("scripts",
ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME);
loadMainResource("textures",
ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME);
loadMainResource("flags",
ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME);
+ loadMainResource("icons",
ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME);
// optional ones
if (SETTINGS.getSetting("3D Sound renderer") != "No sound")
Modified: trunk/source/main/RoRFrameListener.cpp
===================================================================
--- trunk/source/main/RoRFrameListener.cpp 2010-07-20 08:35:28 UTC (rev
1472)
+++ trunk/source/main/RoRFrameListener.cpp 2010-07-20 08:36:21 UTC (rev
1473)
@@ -7727,6 +7727,7 @@
if(ow) ow->showEditorOverlay(false);
if(ow) ow->truckhud->show(false);
//if(bigMap) bigMap->setVisibility(false);
+ if(net) GUI_Multiplayer::getSingleton().setVisible(false);
}
else
{
@@ -7738,6 +7739,7 @@
if(ow) ow->showDashboardOverlays(true,
trucks[current_truck]->driveable);
//if(bigMap) bigMap->setVisibility(true);
}
+ if(net) GUI_Multiplayer::getSingleton().setVisible(true);
}
}
Modified: trunk/source/main/gui_mp.cpp
===================================================================
--- trunk/source/main/gui_mp.cpp 2010-07-20 08:35:28 UTC (rev 1472)
+++ trunk/source/main/gui_mp.cpp 2010-07-20 08:36:21 UTC (rev 1473)
@@ -202,29 +202,29 @@
row->userTruckOKImg->setUserString("uid",
StringConverter::toString(c->uniqueid));
row->userTruckOKRemoteImg->setUserString("uid",
StringConverter::toString(c->uniqueid));
row->userTruckOKImg->setPosition(x, y);
- x -= 18;
+ x -= 10;
row->userTruckOKRemoteImg->setPosition(x, y);
- x -= 18;
+ x -= 10;
bool ok =
BeamFactory::getSingleton().checkStreamsOK(c->uniqueid);
if(ok)
{
- row->userTruckOKImg->setImageTexture("accept.png");
+ row->userTruckOKImg->setImageTexture("arrow_down.png");
row->userTruckOKImg->setUserString("tooltip", "Truck
loaded correctly, no errors");
} else
{
- row->userTruckOKImg->setImageTexture("cancel.png");
+
row->userTruckOKImg->setImageTexture("arrow_down_red.png");
row->userTruckOKImg->setUserString("tooltip", "Truck
loading errors");
}
bool rok =
BeamFactory::getSingleton().checkStreamsRemoteOK(c->uniqueid);
if(rok)
{
-
row->userTruckOKRemoteImg->setImageTexture("accept.png");
+
row->userTruckOKRemoteImg->setImageTexture("arrow_up.png");
row->userTruckOKRemoteImg->setUserString("tooltip",
"Remote Truck loaded correctly, no errors");
} else
{
-
row->userTruckOKRemoteImg->setImageTexture("cancel.png");
+
row->userTruckOKRemoteImg->setImageTexture("arrow_up_red.png");
row->userTruckOKRemoteImg->setUserString("tooltip",
"Remote Truck loading errors");
}
} else
@@ -234,6 +234,9 @@
}
// user go img
+ row->usergoimg->setVisible(false);
+ /*
+ // disabled for now, since no use
if(!self)
{
row->usergoimg->setVisible(true);
@@ -253,6 +256,7 @@
{
row->usergoimg->setVisible(false);
}
+ */
}
int GUI_Multiplayer::update()
@@ -328,5 +332,14 @@
}
}
+void GUI_Multiplayer::setVisible(bool value)
+{
+ mpPanel->setVisible(value);
+}
+
+bool GUI_Multiplayer::getVisible()
+{
+ return mpPanel->isVisible();
+}
+
#endif //MYGUI
-
Modified: trunk/source/main/gui_mp.h
===================================================================
--- trunk/source/main/gui_mp.h 2010-07-20 08:35:28 UTC (rev 1472)
+++ trunk/source/main/gui_mp.h 2010-07-20 08:36:21 UTC (rev 1473)
@@ -41,6 +41,8 @@
static GUI_Multiplayer* getSingletonPtr(void);
int update();
+ void setVisible(bool value);
+ bool getVisible();
protected:
typedef struct player_row_t {
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
This SF.net email is sponsored by Sprint
What will you do first with EVO, the first 4G phone?
Visit sprint.com/first -- http://p.sf.net/sfu/sprint-com-first
_______________________________________________
Rigsofrods-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/rigsofrods-devel
