Skip to content
This repository was archived by the owner on Aug 26, 2020. It is now read-only.

Commit 9fddabd

Browse files
3vi13vi1
committed
v0.9.6
1 parent 01bb331 commit 9fddabd

File tree

13 files changed

+404
-33
lines changed

13 files changed

+404
-33
lines changed

‎docs/RELEASES

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
0.9.6 - Fixes following for users of the German-language client.
2+
3+
Fix KOS check bug for some corps where there are partial
4+
matches on the corp name.
5+
6+
Added the ability to set custom system graphics per theme.
7+
This requires specially formatted SVGs with specific shape
8+
group names. Documentation, plus some examples of how to
9+
create them will be added in a release in the near
10+
future. Opacity, scaling, and position attributes are
11+
also customizable.
12+
113
0.9.5 - If the map is autoscrolling its focus to a system and you
214
move it yourself, it will no longer fight you and jump
315
back to focusing on the first system.
@@ -375,14 +387,13 @@ Coming soon:
375387
- fix display of messages with backslashes.
376388
- better pilot cache/cleanup.
377389
- if at war, and going hisec, play a "bad idea" sound.
378-
- theme customization for system images
379390
- TTS support
380391
- Maybe an option to auto-change region?
381-
- Poll/repoll pilots option?
382-
- Bubble icons?
392+
- Bubble icons
383393
- Make mini militia faction count (RBL npc corps)?
384394
- Add some intelligence to handle dumb names like R3 Clear
385395
- Add option to autobuild jumpbridge list from dotlan instead of files.
386396
- Break follow transistion mode on screen reposition.
387397
- Don't cache every potential sound.
388-
398+
- Add queue-play option to queue sounds.
399+
- Reload internal list when rules updated.

‎src/asyncinfo.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -386,7 +386,10 @@ void AsyncInfo::gotKosCheckCorpReply()
386386
kosEntry.alliance.ticker = allianceObj["ticker"].toString();
387387

388388
if(kosEntry.corp.name.toLower() == checkNames.toLower())
389+
{
389390
found = true;
391+
break;
392+
}
390393
}
391394

392395
if(found)

‎src/imp.pro

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55
#-------------------------------------------------
66

77
QT += core gui multimedia #opengl
8-
QT += xml xmlpatterns svg
8+
QT += xml xmlpatterns svg widgets
99

10-
greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
10+
#greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
1111

1212
TARGET = imp
1313
TEMPLATE = app
1414

15-
VERSION = 0.9.5
15+
VERSION = 0.9.6
1616
QMAKE_TARGET_COMPANY = EternalDusk
1717
QMAKE_TARGET_DESCRIPTION = Eve Online Intelligence Management Program
1818
QMAKE_TARGET_COPYRIGHT = (c) Copyright 2016-2017 Jesse Litton

‎src/main.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ void messageHandler(QtMsgType, const QMessageLogContext &, const QString & msg)
4646

4747
ts << txt << endl;
4848
}
49-
std::cout << txt.toStdString() <<endl;
49+
std::cout << txt.toStdString() << endl;
5050
}
5151

5252
int main(int argc, char *argv[])

‎src/mainwindow.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ MainWindow::MainWindow(QWidget *parent) :
8585
initThemes();
8686

8787
ui->mapView->setFocus();
88-
ui->mapView->gotSystemShapesFile(":/graphics/systems.svg");
88+
// ui->mapView->gotSystemShapesFile(":/graphics/systems.svg");
8989

9090
QApplication::setWindowIcon(QIcon(":/graphics/impicon.png"));
9191
options.setAudio(&audio);

‎src/map.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -359,9 +359,9 @@ QString Map::getSystemByAbbreviation(const QString& word)
359359
}
360360

361361
// Still no match? Maybe they mispelled it, like people do with 9-F0B2 (9-fob)
362-
if(upperWord.contains('-') && upperWord.contains('0'))
362+
if(upperWord.contains('-') && upperWord.contains('O'))
363363
{
364-
upperWord.replace('0', 'O');
364+
upperWord.replace('O', '0');
365365
return getSystemByAbbreviation(upperWord);
366366
}
367367

‎src/meta.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ static const struct Version
2727
{
2828
Version(){}
2929

30-
QString release = "0.9.5"; //VERSION;
31-
QString name = "Tom Sawyer Edition";
30+
QString release = "0.9.6"; //VERSION;
31+
QString name = "Russian Cookie Monster";
3232

3333
QString styleHeader1 = "<span style=\" color:#0000ff;\">";
3434
QString styleFooter1 = "</span>";

‎src/parser.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ QList<MessageInfo> Parser::parseLine(const QString& line)
216216

217217

218218
// Is this a system message?
219-
if (sender == "EVE System")
219+
if (sender == "EVE System" or sender == "EVE-System")
220220
{
221221
MessageInfo messageInfo;
222222
messageInfo.originalLine = line;
@@ -228,6 +228,7 @@ QList<MessageInfo> Parser::parseLine(const QString& line)
228228
// Test to see if this is a system change message:
229229
// EVE System > Channel changed to Local : JEIV-E
230230
// EVE-System > Chatkanal geändert zu Lokal: JEIV-E*
231+
// EVE-System > Chatkanal geändert zu Lokal: O-Y5JQ
231232

232233
QRegExp sysMsgRegExp("^Ch.*Lo[ck]al ?: (.*)\\*?$");
233234
sysMsgRegExp.setMinimal(true);

‎src/svgmapview.cpp

Lines changed: 29 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,8 @@ SvgMapView::SvgMapView(QWidget *parent) : QGraphicsView(parent)
6969
timeFont = QFont("Arial", 6);
7070

7171
setStyleSheet("background-color: transparent;");
72+
73+
gotSystemShapesFile(":/graphics/systems.svg");
7274
}
7375

7476
SvgMapView::~SvgMapView()
@@ -429,13 +431,22 @@ void SvgMapView::gotSystemShapesFile(QString shapesFile)
429431
qDebug() << "SvgMapView::gotSystemShapesFile(" << shapesFile <<
430432
") - systemRenderer = " << systemRenderer;
431433

432-
if(systemRenderer != NULL)
434+
if(systemRenderer == NULL)
435+
{
436+
systemRenderer = new QSvgRenderer(shapesFile, this);
437+
}
438+
else
439+
{
440+
systemRenderer->load(shapesFile);
441+
}
442+
443+
/* if(systemRenderer != NULL)
433444
{
434445
systemRenderer->deleteLater();
435446
systemRenderer = NULL;
436447
}
437448
438-
systemRenderer = new QSvgRenderer(shapesFile, this);
449+
systemRenderer = new QSvgRenderer(shapesFile, this);*/
439450
}
440451

441452
void SvgMapView::handleShape(MapShape* shape, const QString& member, QVariant& data)
@@ -631,6 +642,22 @@ void SvgMapView::receiveThemeUpdate(ThemeStorage& ts)
631642
setTimeFont(QFont(fontAttributes[0], fontAttributes[1].toInt()));
632643
}
633644
}
645+
else if(ts.member == "graphic")
646+
{
647+
gotSystemShapesFile(ts.data.toString());
648+
}
649+
else
650+
{
651+
foreach(SystemShape* shape, systemShapes)
652+
{
653+
handleShape(shape, ts.member, ts.data);;
654+
}
655+
foreach(MapShape* shape, systemOutlines)
656+
{
657+
handleShape(shape, ts.member, ts.data);;
658+
}
659+
660+
}
634661
break;
635662
}
636663
}

‎src/theme.cpp

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,13 @@ const QMap<QString,QVariant> defaults = {
5858
{"pilotYOffset", 0},
5959
{"pilotZ", -0.5},
6060

61+
{"systemGraphic", ":/graphics/systems.svg"},
62+
{"systemOpacity", 1.0},
63+
{"systemScale", 1.0},
64+
{"systemXOffset", 0.0},
65+
{"systemYOffset", 0.0},
66+
{"systemZ", 0},
67+
6168
{"wormholeGraphic", ":/graphics/wormhole.svg"},
6269
{"wormholeOpacity", 0.8},
6370
{"wormholeScale", 0.05},
@@ -127,16 +134,22 @@ void Theme::load(const QString& name, ThemeType themeType)
127134
setAttribute("pilotYOffset", PILOT, "pilot", "yOffset", defaults["pilotYOffset"]);
128135
setAttribute("pilotZ", PILOT, "pilot", "z", defaults["pilotZ"]);
129136

137+
setAttribute("defaultNameFont", SYSTEM, "font", "name", defaults["defaultNameFont"] );
138+
setAttribute("defaultTimeFont", SYSTEM, "font", "time", defaults["defaultTimeFont"] );
139+
setAttribute("systemGraphic", SYSTEM, "system", "graphic", defaults["systemGraphic"]);
140+
setAttribute("systemOpacity", SYSTEM, "system", "opacity", defaults["systemOpacity"]);
141+
setAttribute("systemScale", SYSTEM, "system", "scale", defaults["systemScale"]);
142+
setAttribute("systemXOffset", SYSTEM, "system", "xOffset", defaults["systemXOffset"]);
143+
setAttribute("systemYOffset", SYSTEM, "system", "yOffset", defaults["systemYOffset"]);
144+
setAttribute("systemZ", SYSTEM, "system", "z", defaults["systemZ"]);
145+
130146
setAttribute("wormholeGraphic", WORMHOLES, "wormhole", "graphic", defaults["wormholeGraphic"]);
131147
setAttribute("wormholeOpacity", WORMHOLES, "wormhole", "opacity", defaults["wormholeOpacity"]);
132148
setAttribute("wormholeScale", WORMHOLES, "wormhole", "scale", defaults["wormholeScale"]);
133149
setAttribute("wormholeXOffset", WORMHOLES, "wormhole", "xOffset", defaults["wormholeXOffset"]);
134150
setAttribute("wormholeYOffset", WORMHOLES, "wormhole", "yOffset", defaults["wormholeYOffset"]);
135151
setAttribute("wormholeZ", WORMHOLES, "wormhole", "z", defaults["wormholeZ"]);
136152

137-
setAttribute("defaultNameFont", SYSTEM, "font", "name", defaults["defaultNameFont"] );
138-
setAttribute("defaultTimeFont", SYSTEM, "font", "time", defaults["defaultTimeFont"] );
139-
140153
if(m_name != "-Default-")
141154
{
142155
// Attempt to load theme...

0 commit comments

Comments
 (0)