diff --git a/src/map/IMG/rgnfile.cpp b/src/map/IMG/rgnfile.cpp index 58e15b3d..8e7fefa4 100644 --- a/src/map/IMG/rgnfile.cpp +++ b/src/map/IMG/rgnfile.cpp @@ -346,7 +346,8 @@ bool RGNFile::pointObjects(Handle &hdl, const SubDiv *subdiv, point.poi = labelPtr & 0x400000; if (lbl && (labelPtr & 0x3FFFFF)) point.label = lbl->label(lblHdl, labelPtr & 0x3FFFFF, point.poi, - !(point.type == 0x1400 || point.type == 0x1500)); + !(point.type == 0x1400 || point.type == 0x1500 + || point.type == 0x1e00)); points->append(point); } diff --git a/src/map/IMG/style.cpp b/src/map/IMG/style.cpp index 25938067..1be926af 100644 --- a/src/map/IMG/style.cpp +++ b/src/map/IMG/style.cpp @@ -116,6 +116,7 @@ void Style::defaultLineStyle() _lines[TYPE(0x18)].setTextColor(QColor("#9fc4e1")); //_lines[TYPE(0x1a)] = Line(QPen(QColor("#7697b7"), 1, Qt::DashLine)); _lines[TYPE(0x1b)] = Line(QPen(QColor("#7697b7"), 1, Qt::DashLine)); + _lines[TYPE(0x1c)] = Line(QPen(QColor("#505145"), 1, Qt::DashLine)); _lines[TYPE(0x1e)] = Line(QPen(QColor("#505145"), 2, Qt::DashDotLine)); _lines[TYPE(0x1f)] = Line(QPen(QColor("#9fc4e1"), 3, Qt::SolidLine)); _lines[TYPE(0x1f)].setTextColor(QColor("#9fc4e1")); @@ -146,12 +147,14 @@ void Style::defaultLineStyle() void Style::defaultPointStyle() { // Countries - _points[TYPE(0x14)].setTextColor(QColor("#777777")); + _points[TYPE(0x14)].setTextColor(QColor("#505145")); _points[TYPE(0x14)].setTextFontSize(Small); - _points[TYPE(0x15)].setTextColor(QColor("#777777")); + _points[TYPE(0x15)].setTextColor(QColor("#505145")); _points[TYPE(0x15)].setTextFontSize(Small); // Regions + _points[TYPE(0x1e)].setTextColor(QColor("#505145")); + _points[TYPE(0x1e)].setTextFontSize(ExtraSmall); _points[TYPE(0x28)].setTextFontSize(Small); // Cities diff --git a/src/map/IMG/style.h b/src/map/IMG/style.h index 7f8780d2..40c9d88e 100644 --- a/src/map/IMG/style.h +++ b/src/map/IMG/style.h @@ -16,7 +16,8 @@ public: None = 1, Small = 2, Normal = 3, - Large = 4 + Large = 4, + ExtraSmall = 5 }; enum POIClass { diff --git a/src/map/imgmap.cpp b/src/map/imgmap.cpp index 10634e1b..c1e8acba 100644 --- a/src/map/imgmap.cpp +++ b/src/map/imgmap.cpp @@ -127,6 +127,7 @@ static QFont *font(Style::FontSize size, Style::FontSize defaultSize static QFont large = pixelSizeFont(16); static QFont normal = pixelSizeFont(14); static QFont small = pixelSizeFont(12); + static QFont extraSmall = pixelSizeFont(10); switch (size) { case Style::None: @@ -137,6 +138,8 @@ static QFont *font(Style::FontSize size, Style::FontSize defaultSize return &normal; case Style::Small: return &small; + case Style::ExtraSmall: + return &extraSmall; default: return font(defaultSize); }