flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-02 23:25:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

refs #471, allow to search server by name and occupy less height for form

Browse Source
This commit is contained in:
Klaus Basan
2015-11-02 19:29:42 +01:00
committed by Mathew Sutcliffe
parent ace3b60062
commit 012543ef02
10 changed files with 157 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/blackgui/components/logincomponent.cpp
View File

@@ -139,12 +139,13 @@ namespace BlackGui
ps_validateAircraftValues();
ps_validateVatsimValues();
ps_onWebServiceDataRead(CEntityFlags::VatsimDataFile, CEntityFlags::ReadFinished, -1);
CServerList otherServers(this->m_trafficNetworkServers.get());
CServerList otherServers(this->m_otherTrafficNetworkServers.get());
// add a testserver when no servers can be loaded
if (otherServers.isEmpty() && CProject::isRunningInBetaOrDeveloperEnvironment())
{
otherServers.push_back(m_setup.get().fsdTestServers());
CLogMessage(this).info("Added servers (other) for testing");
}
this->ui->cbp_OtherServers->setServers(otherServers);
}
@@ -453,7 +454,7 @@ namespace BlackGui
void CLoginComponent::ps_reloadSettings()
{
CServerList otherServers(this->m_trafficNetworkServers.get());
CServerList otherServers(this->m_otherTrafficNetworkServers.get());
this->ui->cbp_OtherServers->setServers(otherServers);
}

2
src/blackgui/components/logincomponent.h
View File

@@ -147,7 +147,7 @@ namespace BlackGui
QScopedPointer<Ui::CLoginComponent> ui;
const int LogoffIntervalSeconds = 10;
QTimer *m_logoffCountdownTimer { nullptr };
BlackCore::CSetting<BlackCore::Settings::Network::TrafficServers> m_trafficNetworkServers { this, &CLoginComponent::ps_reloadSettings };
BlackCore::CSetting<BlackCore::Settings::Network::TrafficServers> m_otherTrafficNetworkServers { this, &CLoginComponent::ps_reloadSettings };
BlackCore::CData<BlackCore::Data::GlobalSetup> m_setup {this}; //!< setup cache
};

20
src/blackgui/components/settingsnetworkserverscomponent.ui
View File

@@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>260</width>
<height>273</height>
<height>334</height>
</rect>
</property>
<property name="windowTitle">
@@ -53,16 +53,10 @@
</item>
<item>
<widget class="BlackGui::CServerForm" name="frp_ServerForm">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>140</height>
<height>80</height>
</size>
</property>
<property name="frameShape">
@@ -155,17 +149,17 @@
</layout>
</widget>
<customwidgets>
<customwidget>
<class>BlackGui::Views::CServerView</class>
<extends>QTableView</extends>
<header>blackgui/views/serverview.h</header>
</customwidget>
<customwidget>
<class>BlackGui::CServerForm</class>
<extends>QFrame</extends>
<header>blackgui/serverform.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>BlackGui::Views::CServerView</class>
<extends>QTableView</extends>
<header>blackgui/views/serverview.h</header>
</customwidget>
</customwidgets>
<resources/>
<connections/>