refs #288, adjusted server and network views

* aircraft settings are gone, move to login screen
* no selected server needed anymore
* marked outdated methods as deprecated
This commit is contained in:
Klaus Basan
2014-11-15 01:30:50 +01:00
committed by Roland Winklmeier
parent d1d02d6c3c
commit 44d0cd002b
9 changed files with 59 additions and 405 deletions

View File

@@ -37,29 +37,5 @@ namespace BlackGui
(void)QT_TRANSLATE_NOOP("ViewServerList", "userid");
}
/*
* Special functions
*/
QVariant CServerListModel::data(const QModelIndex &index, int role) const
{
if (role == Qt::BackgroundRole)
{
if (!this->hasSelectedServer()) return QVariant();
CServer currentRow = this->at(index);
if (currentRow == this->getSelectedServer())
{
QBrush background(Qt::green);
return background;
}
else
{
return QVariant();
}
}
else
{
return CListModelBase::data(index, role);
}
}
} // class
} // namespace

View File

@@ -24,9 +24,6 @@ namespace BlackGui
class CServerListModel : public CListModelBase<BlackMisc::Network::CServer, BlackMisc::Network::CServerList>
{
private:
BlackMisc::Network::CServer m_selectedServer;
public:
//! Constructor
@@ -34,27 +31,6 @@ namespace BlackGui
//! Destructor
virtual ~CServerListModel() {}
//! Has selected server?
bool hasSelectedServer() const
{
return this->m_selectedServer.isValidForLogin();
}
//! Get selected server
const BlackMisc::Network::CServer &getSelectedServer() const
{
return this->m_selectedServer;
}
//! Set selected server
void setSelectedServer(const BlackMisc::Network::CServer &selectedServer)
{
this->m_selectedServer = selectedServer;
}
//! \copydoc CListModelBase::data
virtual QVariant data(const QModelIndex &index, int role) const override;
};
}
}