0.9.5 fixes and updates

3vi1 · Aug 22, 2017 · 01bb331 · 01bb331
1 parent 98c50a4
commit 01bb331
Show file tree

Hide file tree

Showing 15 changed files with 312 additions and 99 deletions.
diff --git a/docs/RELEASES b/docs/RELEASES
@@ -1,3 +1,17 @@
+0.9.5 - If the map is autoscrolling its focus to a system and you
+        move it yourself, it will no longer fight you and jump
+        back to focusing on the first system.
+
+        Fix red-by-last check to not misreport partial matches.
+
+        Fix kos checks now that CVA uses https.
+
+        Improve parsing of messages that are responses to system
+        status queries.  (i.e. one player says "KBP status?",
+        and another responds with only "clr".
+
+        Added test message dialog to debug menu.
+
 0.9.4.2 - Fixed crash when map was left in invalid state after failed
           load.
 
@@ -356,7 +370,7 @@
 
 Coming soon:
 
-- fix heimatar loading &Heimatar
+- right-click to copy system name.
 - kos msg for red by last should show person and corp.
 - fix display of messages with backslashes.
 - better pilot cache/cleanup.
@@ -371,3 +385,4 @@ Coming soon:
 - Add option to autobuild jumpbridge list from dotlan instead of files.
 - Break follow transistion mode on screen reposition.
 - Don't cache every potential sound.
+
diff --git a/src/asyncinfo.cpp b/src/asyncinfo.cpp
@@ -156,7 +156,7 @@ void AsyncInfo::kosCheck(const QString &reqNames,
     names.replace('\n',',');
     qDebug() << "* kosCheck requested for " << names;
 
-    QUrl url("http://kos.cva-eve.org/api/");
+    QUrl url("https://kos.cva-eve.org/api/");
     QUrlQuery query;
     query.addQueryItem("c", "json");
     query.addQueryItem("type", queryType);
@@ -362,6 +362,7 @@ void AsyncInfo::gotKosCheckCorpReply()
         QJsonObject jsonObject = jsonResponse.object();
         QJsonArray jsonArray = jsonObject["results"].toArray();
 
+        bool found = false;
         if(jsonArray.count() > 0)
         {
             KosEntry kosEntry;
@@ -383,11 +384,18 @@ void AsyncInfo::gotKosCheckCorpReply()
                 kosEntry.alliance.kos = allianceObj["kos"].toBool();
                 kosEntry.alliance.name = allianceObj["label"].toString();
                 kosEntry.alliance.ticker = allianceObj["ticker"].toString();
+
+                if(kosEntry.corp.name.toLower() == checkNames.toLower())
+                    found = true;
             }
 
-            emit rblResultReady(checkNames, kosEntry.corp.kos | kosEntry.alliance.kos, m_corpNum);
+            if(found)
+            {
+                emit rblResultReady(checkNames, kosEntry.corp.kos | kosEntry.alliance.kos, m_corpNum);
+            }
         }
-        else
+
+        if(found == false)
         {
             emit rblResultReady(checkNames, false);
         }

diff --git a/src/debugmessage.cpp b/src/debugmessage.cpp
@@ -0,0 +1,26 @@
+#include "debugmessage.h"
+#include "ui_debugmessage.h"
+
+#include <QDateTime>
+
+DebugMessage::DebugMessage(QWidget *parent) :
+    QDialog(parent),
+    ui(new Ui::DebugMessage)
+{
+    ui->setupUi(this);
+}
+
+DebugMessage::~DebugMessage()
+{
+    delete ui;
+}
+
+void DebugMessage::on_pushButton_clicked()
+{
+    QString pilot = ui->lineEdit_pilot->text();
+    QString message = ui->lineEdit_message->text();
+
+    // [ 2016.07.24 16:27:15 ]
+    QString date = QDateTime::currentDateTimeUtc().toString("[ yyyy.MM.dd HH:mm:ss ] ");
+    emit testMessage(date + pilot + " > " + message);
+}
diff --git a/src/debugmessage.h b/src/debugmessage.h
@@ -0,0 +1,28 @@
+#ifndef DEBUGMESSAGE_H
+#define DEBUGMESSAGE_H
+
+#include <QDialog>
+
+namespace Ui {
+class DebugMessage;
+}
+
+class DebugMessage : public QDialog
+{
+    Q_OBJECT
+
+public:
+    explicit DebugMessage(QWidget *parent = 0);
+    ~DebugMessage();
+
+signals:
+    void testMessage(const QString& line);
+
+private slots:
+    void on_pushButton_clicked();
+
+private:
+    Ui::DebugMessage *ui;
+};
+
+#endif // DEBUGMESSAGE_H
diff --git a/src/debugmessage.ui b/src/debugmessage.ui
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>DebugMessage</class>
+ <widget class="QDialog" name="DebugMessage">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>470</width>
+    <height>101</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Debugging</string>
+  </property>
+  <layout class="QGridLayout" name="gridLayout">
+   <item row="0" column="0">
+    <widget class="QLabel" name="label_2">
+     <property name="text">
+      <string>Test Message:</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="0">
+    <widget class="QLineEdit" name="lineEdit_pilot">
+     <property name="text">
+      <string>Test Pilot Name</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="1">
+    <widget class="QLabel" name="label">
+     <property name="text">
+      <string>&gt;</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="2" colspan="2">
+    <widget class="QLineEdit" name="lineEdit_message">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+       <horstretch>2</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="text">
+      <string>Test message here</string>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="2">
+    <spacer name="horizontalSpacer">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>193</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="2" column="3">
+    <widget class="QPushButton" name="pushButton">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="text">
+      <string>&amp;Inject</string>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/src/imp.pro b/src/imp.pro
@@ -12,7 +12,7 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 TARGET = imp
 TEMPLATE = app
 
-VERSION = 0.9.4.2
+VERSION = 0.9.5
 QMAKE_TARGET_COMPANY = EternalDusk
 QMAKE_TARGET_DESCRIPTION = Eve Online Intelligence Management Program
 QMAKE_TARGET_COPYRIGHT = (c) Copyright 2016-2017 Jesse Litton
@@ -52,7 +52,8 @@ SOURCES += \
     alarmmodel.cpp \
     combodelegate.cpp \
     volumedelegate.cpp \
-    playdelegate.cpp
+    playdelegate.cpp \
+    debugmessage.cpp
 
 HEADERS  += \
     mainwindow.h \
@@ -84,7 +85,8 @@ HEADERS  += \
     alarmmodel.h \
     combodelegate.h \
     volumedelegate.h \
-    playdelegate.h
+    playdelegate.h \
+    debugmessage.h
 
 FORMS    += \
     mainwindow.ui \
@@ -93,7 +95,8 @@ FORMS    += \
     info.ui \
     themedialog.ui \
     findmessagesdialog.ui \
-    themecustomizer.ui
+    themecustomizer.ui \
+    debugmessage.ui
 
 DISTFILES += \
     ../data/dictionaries/clear \