From: <wel...@us...> - 2009-09-27 10:09:46
|
Revision: 4551 http://planeshift.svn.sourceforge.net/planeshift/?rev=4551&view=rev Author: weltall2 Date: 2009-09-27 10:09:37 +0000 (Sun, 27 Sep 2009) Log Message: ----------- fixed pawsslot getting on top without reason Modified Paths: -------------- trunk/src/client/gui/pawsslot.cpp Modified: trunk/src/client/gui/pawsslot.cpp =================================================================== --- trunk/src/client/gui/pawsslot.cpp 2009-09-27 10:03:30 UTC (rev 4550) +++ trunk/src/client/gui/pawsslot.cpp 2009-09-27 10:09:37 UTC (rev 4551) @@ -156,7 +156,7 @@ image = PawsManager::GetSingleton().GetTextureManager()->GetPawsImage(imageName); if (drawStackCount) - stackCountLabel->Show(); + stackCountLabel->ShowBehind(); stackCount = count; StackCount( count ); @@ -230,11 +230,11 @@ purifySign->Hide(); break; case 1: - purifySign->Show(); + purifySign->ShowBehind(); purifySign->SetBackground("GlyphSlotPurifying"); break; case 2: - purifySign->Show(); + purifySign->ShowBehind(); purifySign->SetBackground("GlyphSlotPurified"); break; } @@ -245,7 +245,7 @@ drawStackCount = value; if (value) - stackCountLabel->Show(); + stackCountLabel->ShowBehind(); else stackCountLabel->Hide(); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2009-11-27 07:17:35
|
Revision: 4802 http://planeshift.svn.sourceforge.net/planeshift/?rev=4802&view=rev Author: weltall2 Date: 2009-11-27 07:17:26 +0000 (Fri, 27 Nov 2009) Log Message: ----------- fixed additional space in front of the tooltip Modified Paths: -------------- trunk/src/client/gui/pawsslot.cpp Modified: trunk/src/client/gui/pawsslot.cpp =================================================================== --- trunk/src/client/gui/pawsslot.cpp 2009-11-27 06:52:16 UTC (rev 4801) +++ trunk/src/client/gui/pawsslot.cpp 2009-11-27 07:17:26 UTC (rev 4802) @@ -297,7 +297,7 @@ data.GetWordNumber(2,count); data.GetWordNumber(3,status); data.GetWordNumber(4,mesh); - data.GetSubString( name, icon.Length()+count.Length()+status.Length()+mesh.Length()+3, data.Length()); + data.GetSubString( name, icon.Length()+count.Length()+status.Length()+mesh.Length()+4, data.Length()); PlaceItem( icon, mesh, atoi( count.GetData() ) ); SetToolTip( name ); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2010-02-16 20:33:20
|
Revision: 5568 http://planeshift.svn.sourceforge.net/planeshift/?rev=5568&view=rev Author: weltall2 Date: 2010-02-16 20:33:14 +0000 (Tue, 16 Feb 2010) Log Message: ----------- additional patch from rlydontknow for PS#4101 - [releaseblocker] Inventory tooltips only show last character of item's name. Modified Paths: -------------- trunk/src/client/gui/pawsslot.cpp Modified: trunk/src/client/gui/pawsslot.cpp =================================================================== --- trunk/src/client/gui/pawsslot.cpp 2010-02-16 11:11:38 UTC (rev 5567) +++ trunk/src/client/gui/pawsslot.cpp 2010-02-16 20:33:14 UTC (rev 5568) @@ -303,14 +303,14 @@ psString material; psString status; - data.GetWordNumber(1,icon); - data.GetWordNumber(2,count); - data.GetWordNumber(3,status); - data.GetWordNumber(4,mesh); - data.GetSubString( material, icon.Length()+count.Length()+status.Length()+mesh.Length()+4, data.Find(" ", icon.Length()+count.Length()+status.Length()+mesh.Length()+4)); - // data.GetWordNumber(5,material); + csStringArray words; + words.SplitString(data.GetData(), " ", csStringArray::delimSplitEach); + icon = words[0]; + count = words[1]; + status = words[2]; + mesh = words[3]; + material = words[4]; data.GetSubString( name, icon.Length()+count.Length()+status.Length()+mesh.Length()+material.Length()+5, data.Length()); - Error4("Found item %s [%s](%s)", name.GetData(), material.GetData(), icon.GetData()); PlaceItem( icon, mesh, material, atoi( count.GetData() ) ); SetToolTip( name ); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2010-11-05 12:57:01
|
Revision: 6342 http://planeshift.svn.sourceforge.net/planeshift/?rev=6342&view=rev Author: weltall2 Date: 2010-11-05 12:56:55 +0000 (Fri, 05 Nov 2010) Log Message: ----------- silenced a printf Modified Paths: -------------- trunk/src/client/gui/pawsslot.cpp Modified: trunk/src/client/gui/pawsslot.cpp =================================================================== --- trunk/src/client/gui/pawsslot.cpp 2010-11-05 12:55:31 UTC (rev 6341) +++ trunk/src/client/gui/pawsslot.cpp 2010-11-05 12:56:55 UTC (rev 6342) @@ -172,7 +172,7 @@ void pawsSlot::PlaceItem( const char* imageName, const char* meshFactName, const char* matName, int count ) { - printf( "Placing Image: %s\n", imageName); + //printf( "Placing Image: %s\n", imageName); meshfactName = meshFactName; materialName = matName; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2010-12-13 14:01:06
|
Revision: 6529 http://planeshift.svn.sourceforge.net/planeshift/?rev=6529&view=rev Author: weltall2 Date: 2010-12-13 14:01:00 +0000 (Mon, 13 Dec 2010) Log Message: ----------- allowed pawsslot to use the new system Modified Paths: -------------- trunk/src/client/gui/pawsslot.cpp Modified: trunk/src/client/gui/pawsslot.cpp =================================================================== --- trunk/src/client/gui/pawsslot.cpp 2010-12-13 14:00:00 UTC (rev 6528) +++ trunk/src/client/gui/pawsslot.cpp 2010-12-13 14:01:00 UTC (rev 6529) @@ -192,7 +192,7 @@ empty = false; - image = PawsManager::GetSingleton().GetTextureManager()->GetPawsImage(imageName); + image = PawsManager::GetSingleton().GetTextureManager()->GetOrAddPawsImage(imageName); if (drawStackCount) stackCountLabel->ShowBehind(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2010-12-30 11:25:34
|
Revision: 6630 http://planeshift.svn.sourceforge.net/planeshift/?rev=6630&view=rev Author: weltall2 Date: 2010-12-30 11:25:28 +0000 (Thu, 30 Dec 2010) Log Message: ----------- allow to change hotbar buttons after initializing them Modified Paths: -------------- trunk/src/client/gui/pawsslot.cpp Modified: trunk/src/client/gui/pawsslot.cpp =================================================================== --- trunk/src/client/gui/pawsslot.cpp 2010-12-29 23:31:08 UTC (rev 6629) +++ trunk/src/client/gui/pawsslot.cpp 2010-12-30 11:25:28 UTC (rev 6630) @@ -109,7 +109,7 @@ printf("Is Bartender Slot: %d, Empty %d\n", isBartender ,empty); - if ( isBartender && empty == false) + if ( isBartender && (!empty && !psengine->GetSlotManager()->IsDragging())) { printf("This is a bartender button with action: %s\n", action.GetData()); psengine->GetCmdHandler()->Execute(action.GetData()); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2010-12-31 12:18:54
|
Revision: 6656 http://planeshift.svn.sourceforge.net/planeshift/?rev=6656&view=rev Author: weltall2 Date: 2010-12-31 12:18:48 +0000 (Fri, 31 Dec 2010) Log Message: ----------- allow deletion of bartender slots Modified Paths: -------------- trunk/src/client/gui/pawsslot.cpp Modified: trunk/src/client/gui/pawsslot.cpp =================================================================== --- trunk/src/client/gui/pawsslot.cpp 2010-12-31 10:54:23 UTC (rev 6655) +++ trunk/src/client/gui/pawsslot.cpp 2010-12-31 12:18:48 UTC (rev 6656) @@ -115,8 +115,18 @@ printf("Is Bartender Slot: %d, Empty %d\n", isBartender ,empty); + //if it's a bartender slot and we aren't dragging if ( isBartender && (!empty && !psengine->GetSlotManager()->IsDragging())) { + //check if ctrl+alt is being held if so delete (probably should use a lock feature and allow + //to drag them around and out making the "deleted"?) + if((modifiers & CSMASK_CTRL) && (modifiers & CSMASK_ALT)) + { + Clear(); + action.Empty(); + return true; + } + //in case they are not just act normally printf("This is a bartender button with action: %s\n", action.GetData()); psengine->GetCmdHandler()->Execute(action.GetData()); return true; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2010-12-31 12:19:33
|
Revision: 6657 http://planeshift.svn.sourceforge.net/planeshift/?rev=6657&view=rev Author: weltall2 Date: 2010-12-31 12:19:26 +0000 (Fri, 31 Dec 2010) Log Message: ----------- allow to move bartender slots if ctrl is pressed. ctrl+alt will delete and no button pressed will just execute the action Modified Paths: -------------- trunk/src/client/gui/pawsslot.cpp Modified: trunk/src/client/gui/pawsslot.cpp =================================================================== --- trunk/src/client/gui/pawsslot.cpp 2010-12-31 12:18:48 UTC (rev 6656) +++ trunk/src/client/gui/pawsslot.cpp 2010-12-31 12:19:26 UTC (rev 6657) @@ -126,10 +126,14 @@ action.Empty(); return true; } - //in case they are not just act normally - printf("This is a bartender button with action: %s\n", action.GetData()); - psengine->GetCmdHandler()->Execute(action.GetData()); - return true; + //if we aren't pressing ctrl we execute the command else we allow drag and drop + else if(!(modifiers & CSMASK_CTRL)) + { + //in case they are not just act normally + printf("This is a bartender button with action: %s\n", action.GetData()); + psengine->GetCmdHandler()->Execute(action.GetData()); + return true; + } } if ( !empty && psengine->GetMouseBinds()->CheckBind("ContextMenu",button,modifiers) ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2010-12-31 13:41:39
|
Revision: 6661 http://planeshift.svn.sourceforge.net/planeshift/?rev=6661&view=rev Author: weltall2 Date: 2010-12-31 13:41:33 +0000 (Fri, 31 Dec 2010) Log Message: ----------- removed superflous call Modified Paths: -------------- trunk/src/client/gui/pawsslot.cpp Modified: trunk/src/client/gui/pawsslot.cpp =================================================================== --- trunk/src/client/gui/pawsslot.cpp 2010-12-31 13:41:02 UTC (rev 6660) +++ trunk/src/client/gui/pawsslot.cpp 2010-12-31 13:41:33 UTC (rev 6661) @@ -123,7 +123,6 @@ if((modifiers & CSMASK_CTRL) && (modifiers & CSMASK_ALT)) { Clear(); - clearBartenderAction(); return true; } //if we aren't pressing ctrl we execute the command else we allow drag and drop This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <wel...@us...> - 2010-12-31 14:12:40
|
Revision: 6666 http://planeshift.svn.sourceforge.net/planeshift/?rev=6666&view=rev Author: weltall2 Date: 2010-12-31 14:12:34 +0000 (Fri, 31 Dec 2010) Log Message: ----------- added support for bartender use of items in the inventory (not container. the items are used with /use itemname) Modified Paths: -------------- trunk/src/client/gui/pawsslot.cpp Modified: trunk/src/client/gui/pawsslot.cpp =================================================================== --- trunk/src/client/gui/pawsslot.cpp 2010-12-31 14:12:10 UTC (rev 6665) +++ trunk/src/client/gui/pawsslot.cpp 2010-12-31 14:12:34 UTC (rev 6666) @@ -114,7 +114,7 @@ return true; - printf("Is Bartender Slot: %d, Empty %d\n", isBartender ,empty); + //printf("Is Bartender Slot: %d, Empty %d\n", isBartender ,empty); //if it's a bartender slot and we aren't dragging if ( isBartender && (!empty && !psengine->GetSlotManager()->IsDragging())) { @@ -129,7 +129,7 @@ else if(!(modifiers & CSMASK_CTRL)) { //in case they are not just act normally - printf("This is a bartender button with action: %s\n", action.GetData()); + //printf("This is a bartender button with action: %s\n", action.GetData()); psengine->GetCmdHandler()->Execute(action.GetData()); return true; } @@ -377,6 +377,9 @@ PlaceItem( icon, mesh, material, atoi( count.GetData() ) ); SetToolTip( name ); + //as here are only items for now at least we assign an use bartenderaction. + csString action = "/use " + name; + SetBartenderAction(action); SetPurifyStatus( atoi(status.GetData()) ); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ral...@us...> - 2013-10-29 03:48:43
|
Revision: 8933 http://sourceforge.net/p/planeshift/code/8933 Author: ralphcampbell Date: 2013-10-29 03:48:40 +0000 (Tue, 29 Oct 2013) Log Message: ----------- Fix typo for thay Modified Paths: -------------- trunk/src/client/gui/pawsslot.cpp Modified: trunk/src/client/gui/pawsslot.cpp =================================================================== --- trunk/src/client/gui/pawsslot.cpp 2013-10-27 18:36:37 UTC (rev 8932) +++ trunk/src/client/gui/pawsslot.cpp 2013-10-29 03:48:40 UTC (rev 8933) @@ -212,7 +212,7 @@ frame.ymin += excess/2; frame.ymax -= excess/2; } - //Deal with money slots that are wider than thay are high + //Deal with money slots that are wider than they are high if (frame.Height() < frame.Width()) { int excess = frame.Width() - frame.Height(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |