Formatting, tweaks, style sheet

This commit is contained in:
Klaus Basan
2014-06-27 13:14:34 +01:00
parent 4d26b77fa4
commit 9afe8b0f8b
3 changed files with 13 additions and 16 deletions

View File

@@ -7,7 +7,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>300</width> <width>300</width>
<height>180</height> <height>185</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@@ -17,7 +17,7 @@
<string notr="true">QFrame#fr_InfoWindow { <string notr="true">QFrame#fr_InfoWindow {
border-style: solid; border-style: solid;
border-width: 2px; border-width: 2px;
border-radius: 20px; border-radius: 10px;
border-color: white; border-color: white;
} }
@@ -51,19 +51,19 @@ QTextEdit {
</property> </property>
<layout class="QVBoxLayout" name="vl_InfoWindow"> <layout class="QVBoxLayout" name="vl_InfoWindow">
<property name="spacing"> <property name="spacing">
<number>0</number> <number>2</number>
</property> </property>
<property name="leftMargin"> <property name="leftMargin">
<number>0</number> <number>2</number>
</property> </property>
<property name="topMargin"> <property name="topMargin">
<number>0</number> <number>2</number>
</property> </property>
<property name="rightMargin"> <property name="rightMargin">
<number>0</number> <number>2</number>
</property> </property>
<property name="bottomMargin"> <property name="bottomMargin">
<number>0</number> <number>2</number>
</property> </property>
<item> <item>
<widget class="QFrame" name="fr_InfoWindow"> <widget class="QFrame" name="fr_InfoWindow">

View File

@@ -183,7 +183,7 @@ namespace BlackMisc
changedFlag = this->m_trafficNetworkServers.contains(&CServer::getName, server.getName()); changedFlag = this->m_trafficNetworkServers.contains(&CServer::getName, server.getName());
this->m_trafficNetworkServers.removeIf(&CServer::getName, server.getName()); this->m_trafficNetworkServers.removeIf(&CServer::getName, server.getName());
} }
msgs.push_back(CStatusMessage::getInfoMessage("set current server", CStatusMessage::TypeSettings)); msgs.push_back(CStatusMessage::getInfoMessage("Set current server", CStatusMessage::TypeSettings));
return msgs; return msgs;
} }
else if (path == CSettingsNetwork::ValueBookingServiceUrl()) else if (path == CSettingsNetwork::ValueBookingServiceUrl())

View File

@@ -15,20 +15,18 @@
namespace BlackSim namespace BlackSim
{ {
//! \brief Value object encapsulating a list of SimulatorInfo. //! Value object encapsulating a list of SimulatorInfo objects.
class CSimulatorInfoList : public BlackMisc::CSequence<CSimulatorInfo> class CSimulatorInfoList : public BlackMisc::CSequence<CSimulatorInfo>
{ {
public: public:
//! Default constructor
CSimulatorInfoList(); CSimulatorInfoList();
//! \brief Construct from a base class object. //! Construct from a base class object.
CSimulatorInfoList(const CSequence<CSimulatorInfo> &other); CSimulatorInfoList(const CSequence<CSimulatorInfo> &other);
//! \copydoc CValueObject::toQVariant //! \copydoc CValueObject::toQVariant
virtual QVariant toQVariant() const virtual QVariant toQVariant() const { return QVariant::fromValue(*this); }
{
return QVariant::fromValue(*this);
}
//! Is simulator supported //! Is simulator supported
bool supportsSimulator(const CSimulatorInfo &info); bool supportsSimulator(const CSimulatorInfo &info);
@@ -36,11 +34,10 @@ namespace BlackSim
//! String list with meaningful representations //! String list with meaningful representations
QStringList toStringList(bool i18n = false) const; QStringList toStringList(bool i18n = false) const;
}; };
} }
Q_DECLARE_METATYPE(BlackSim::CSimulatorInfoList) Q_DECLARE_METATYPE(BlackSim::CSimulatorInfoList)
Q_DECLARE_METATYPE(BlackMisc::CCollection<BlackSim::CSimulatorInfo>) Q_DECLARE_METATYPE(BlackMisc::CCollection<BlackSim::CSimulatorInfo>)
Q_DECLARE_METATYPE(BlackMisc::CSequence<BlackSim::CSimulatorInfo>) Q_DECLARE_METATYPE(BlackMisc::CSequence<BlackSim::CSimulatorInfo>)
#endif // BLACKSIM_SIMULATORINFOLIST_H #endif // guard