flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-03-22 23:05:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

refs #526, improved some filters

Browse Source 
* validators
* layout
This commit is contained in:
Klaus Basan
2016-01-02 20:53:58 +01:00
parent 3daa0ef0cd
commit 3168ef266a
6 changed files with 66 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/blackgui/filters/aircrafticaofilterbar.cpp
View File

@@ -8,9 +8,11 @@
*/
#include "aircrafticaofilterbar.h"
#include "blackgui/uppercasevalidator.h"
#include "ui_aircrafticaofilterbar.h"
using namespace BlackMisc::Aviation;
using namespace BlackGui;
using namespace BlackGui::Models;
namespace BlackGui
@@ -26,6 +28,10 @@ namespace BlackGui
connect(ui->le_Designator, &QLineEdit::returnPressed, this, &CFilterWidget::triggerFilter);
connect(ui->le_Manufacturer, &QLineEdit::returnPressed, this, &CFilterWidget::triggerFilter);
connect(ui->le_Description, &QLineEdit::returnPressed, this, &CFilterWidget::triggerFilter);
CUpperCaseValidator *ucv = new CUpperCaseValidator(this);
this->ui->le_Designator->setValidator(ucv);
this->ui->le_Manufacturer->setValidator(ucv);
}
CAircraftIcaoFilterBar::~CAircraftIcaoFilterBar()

8
src/blackgui/filters/aircrafticaofilterbar.ui
View File

@@ -83,7 +83,7 @@
</size>
</property>
<property name="maxLength">
<number>4</number>
<number>6</number>
</property>
<property name="placeholderText">
<string>ICAO</string>
@@ -115,7 +115,11 @@
</widget>
</item>
<item row="0" column="6">
<widget class="QLineEdit" name="le_Description"/>
<widget class="QLineEdit" name="le_Description">
<property name="placeholderText">
<string>Descriptive text</string>
</property>
</widget>
</item>
<item row="1" column="0" colspan="5">
<widget class="BlackGui::CAircraftCombinedTypeSelector" name="combinedtype_Selector">

8
src/blackgui/filters/aircraftmodelfilterbar.cpp
View File

@@ -9,7 +9,9 @@
#include "aircraftmodelfilterbar.h"
#include "ui_aircraftmodelfilterbar.h"
#include "blackgui/uppercasevalidator.h"
using namespace BlackGui;
using namespace BlackGui::Models;
namespace BlackGui
@@ -30,6 +32,12 @@ namespace BlackGui
connect(ui->le_LiveryCode, &QLineEdit::returnPressed, this, &CFilterWidget::triggerFilter);
connect(ui->le_ModelDescription, &QLineEdit::returnPressed, this, &CFilterWidget::triggerFilter);
connect(ui->le_ModelKey, &QLineEdit::returnPressed, this, &CFilterWidget::triggerFilter);
CUpperCaseValidator *ucv = new CUpperCaseValidator(this);
this->ui->le_AircraftIcao->setValidator(ucv);
this->ui->le_AirlineIcao->setValidator(ucv);
this->ui->le_ModelKey->setValidator(ucv);
this->ui->le_AircraftManufacturer->setValidator(ucv);
}
CAircraftModelFilterBar::~CAircraftModelFilterBar()

18
src/blackgui/filters/countryfilterbar.cpp
View File

@@ -1,6 +1,17 @@
/* Copyright (C) 2015
* swift project Community / Contributors
*
* This file is part of swift project. It is subject to the license terms in the LICENSE file found in the top-level
* directory of this distribution and at http://www.swift-project.org/license.html. No part of swift project,
* including this file, may be copied, modified, propagated, or distributed except according to the terms
* contained in the LICENSE file.
*/
#include "countryfilterbar.h"
#include "ui_countryfilterbar.h"
#include "blackgui/uppercasevalidator.h"
using namespace BlackGui;
using namespace BlackGui::Models;
using namespace BlackMisc;
using namespace BlackMisc::Network;
@@ -17,6 +28,9 @@ namespace BlackGui
this->setButtonsAndCount(this->ui->filter_Buttons);
connect(ui->le_IsoCode, &QLineEdit::returnPressed, this, &CFilterWidget::triggerFilter);
connect(ui->le_Name, &QLineEdit::returnPressed, this, &CFilterWidget::triggerFilter);
CUpperCaseValidator *ucv = new CUpperCaseValidator(this);
this->ui->le_IsoCode->setValidator(ucv);
}
CCountryFilterBar::~CCountryFilterBar()
@@ -46,5 +60,5 @@ namespace BlackGui
ui->le_IsoCode->clear();
ui->le_Name->clear();
}
}
}
} // ns
} // ns

11
src/blackgui/filters/countryfilterbar.h
View File

@@ -1,3 +1,14 @@
/* Copyright (C) 2015
* swift project Community / Contributors
*
* This file is part of swift project. It is subject to the license terms in the LICENSE file found in the top-level
* directory of this distribution and at http://www.swift-project.org/license.html. No part of swift project,
* including this file, may be copied, modified, propagated, or distributed except according to the terms
* contained in the LICENSE file.
*/
//! \file
#ifndef BLACKGUI_FILTERS_COUNTRYFILTERBAR_H
#define BLACKGUI_FILTERS_COUNTRYFILTERBAR_H

38
src/blackgui/filters/filterbarbuttons.ui
View File

@@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>140</width>
<height>24</height>
<height>25</height>
</rect>
</property>
<property name="minimumSize">
@@ -69,23 +69,7 @@
</property>
</widget>
</item>
<item>
<spacer name="hs_FilterBarButtons">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>10</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<item alignment="Qt::AlignLeft">
<widget class="QToolButton" name="tb_Filter">
<property name="toolTip">
<string>filter</string>
@@ -113,7 +97,7 @@
</property>
</widget>
</item>
<item>
<item alignment="Qt::AlignLeft">
<widget class="QToolButton" name="tb_ClearForm">
<property name="toolTip">
<string>clear form</string>
@@ -130,6 +114,22 @@
</property>
</widget>
</item>
<item>
<spacer name="hs_FilterBarButtons">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>10</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
<resources>