QTfrontend/net/newnetclient.cpp
changeset 7731 262228c64f15
parent 7728 664738870325
child 7732 fad3408fdcc1
equal deleted inserted replaced
7730:2013733f9ca9 7731:262228c64f15
    50     m_roomPlayersModel = new QSortFilterProxyModel(this);
    50     m_roomPlayersModel = new QSortFilterProxyModel(this);
    51     m_roomPlayersModel->setSourceModel(m_playersModel);
    51     m_roomPlayersModel->setSourceModel(m_playersModel);
    52     m_roomPlayersModel->setSortRole(PlayersListModel::SortRole);
    52     m_roomPlayersModel->setSortRole(PlayersListModel::SortRole);
    53     m_roomPlayersModel->setDynamicSortFilter(true);
    53     m_roomPlayersModel->setDynamicSortFilter(true);
    54     m_roomPlayersModel->sort(0);
    54     m_roomPlayersModel->sort(0);
       
    55     m_roomPlayersModel->setFilterRole(PlayersListModel::RoomFilterRole);
       
    56     m_roomPlayersModel->setFilterFixedString("1");
    55 
    57 
    56     // socket stuff
    58     // socket stuff
    57     connect(&NetSocket, SIGNAL(readyRead()), this, SLOT(ClientRead()));
    59     connect(&NetSocket, SIGNAL(readyRead()), this, SLOT(ClientRead()));
    58     connect(&NetSocket, SIGNAL(connected()), this, SLOT(OnConnect()));
    60     connect(&NetSocket, SIGNAL(connected()), this, SLOT(OnConnect()));
    59     connect(&NetSocket, SIGNAL(disconnected()), this, SLOT(OnDisconnect()));
    61     connect(&NetSocket, SIGNAL(disconnected()), this, SLOT(OnDisconnect()));
   590                     emit configAsked();
   592                     emit configAsked();
   591             }
   593             }
   592 
   594 
   593             emit nickAdded(lst[i], isChief && (lst[i] != mynick));
   595             emit nickAdded(lst[i], isChief && (lst[i] != mynick));
   594             emit chatStringFromNet(tr("%1 *** %2 has joined the room").arg('\x03').arg(lst[i]));
   596             emit chatStringFromNet(tr("%1 *** %2 has joined the room").arg('\x03').arg(lst[i]));
       
   597             m_playersModel->playerJoinedRoom(lst[i]);
   595         }
   598         }
   596         return;
   599         return;
   597     }
   600     }
   598 
   601 
   599     if(netClientState == InRoom || netClientState == InGame)
   602     if(netClientState == InRoom || netClientState == InGame)
   716 
   719 
   717             for(int i = 1; i < lst.size(); ++i)
   720             for(int i = 1; i < lst.size(); ++i)
   718             {
   721             {
   719                 emit nickAdded(lst[i], isChief && (lst[i] != mynick));
   722                 emit nickAdded(lst[i], isChief && (lst[i] != mynick));
   720                 emit chatStringFromNet(tr("%1 *** %2 has joined the room").arg('\x03').arg(lst[i]));
   723                 emit chatStringFromNet(tr("%1 *** %2 has joined the room").arg('\x03').arg(lst[i]));
       
   724                 m_playersModel->playerJoinedRoom(lst[i]);
   721             }
   725             }
   722             return;
   726             return;
   723         }
   727         }
   724 
   728 
   725         if(lst[0] == "LEFT")
   729         if(lst[0] == "LEFT")
   732             emit nickRemoved(lst[1]);
   736             emit nickRemoved(lst[1]);
   733             if (lst.size() < 3)
   737             if (lst.size() < 3)
   734                 emit chatStringFromNet(tr("%1 *** %2 has left").arg('\x03').arg(lst[1]));
   738                 emit chatStringFromNet(tr("%1 *** %2 has left").arg('\x03').arg(lst[1]));
   735             else
   739             else
   736                 emit chatStringFromNet(tr("%1 *** %2 has left (%3)").arg('\x03').arg(lst[1], lst[2]));
   740                 emit chatStringFromNet(tr("%1 *** %2 has left (%3)").arg('\x03').arg(lst[1], lst[2]));
       
   741             m_playersModel->playerLeftRoom(lst[1]);
   737             return;
   742             return;
   738         }
   743         }
   739 
   744 
   740         // obsolete
   745         // obsolete
   741         if (lst[0] == "ROOM_CONTROL_ACCESS")
   746         if (lst[0] == "ROOM_CONTROL_ACCESS")