Release 0.2.0

Author: cx0onl

DataService.cpp

@@ -106,6 +106,19 @@ void DataService::Init()
 	if (m_oid == 0)
 		m_oid = 1000; // 1000 = Anonymous
 
+	// Get QTH
+	rc = sqlite3_prepare(m_database, "SELECT value1 FROM config WHERE key = 'QTH';", -1, &statement, 0);
+	if (rc == SQLITE_OK)
+	{
+		rc = sqlite3_step(statement);
+		if (rc == SQLITE_ROW)
+		{
+			if (sqlite3_column_bytes(statement, 0) > 0)
+				m_qth = std::string(reinterpret_cast<const char*>(sqlite3_column_text(statement, 0)));
+		}
+		sqlite3_finalize(statement);
+	}
+
 	m_typeSettings[0].hex_color(getConfig("ColorUnknown"), 0xd94545);
 	m_typeSettings[1].hex_color(getConfig("ColorTimesignal"), 0xcccccc);
 	m_typeSettings[2].hex_color(getConfig("ColorMorse"), 0xb12eb3);
@@ -585,4 +598,24 @@ void DataService::SetVfoOffset(int offset) {
 
 bool DataService::UpdateAvailable() {
 	return version::version != m_remoteAdapter.GetNewestVersion();
-}
+}
+
+std::string DataService::GetQTH()
+{
+	return m_qth;
+}
+
+void DataService::SetQTH(std::string qth)
+{
+	m_qth = util::uppercase(qth);
+	sqlite3_stmt* statement;
+	int rc = sqlite3_prepare(m_database, "INSERT OR REPLACE INTO config (key, value1) VALUES ('QTH', ?);", -1, &statement, 0);
+	if (rc == SQLITE_OK)
+	{
+
+		sqlite3_bind_text(statement, 1, m_qth.c_str(), m_qth.size(), NULL);
+		sqlite3_step(statement);
+		sqlite3_finalize(statement);
+	}
+}
+

DataService.h

@@ -41,11 +41,15 @@ class DataService
 	int GetVfoOffset();
 	void SetVfoOffset(int offset);
 
+	std::string GetQTH();
+	void SetQTH(std::string qth);
+
 	bool UpdateAvailable();
 
 private:
 	int m_oid;
 	int m_vfoOffset;
+	std::string m_qth;
 	marker::marker_t m_selectedMarker;
 	settings::types_t m_typeSettings;
 	std::function<void()> m_dataChangedCallback;

SDRunoPlugin_CloudMarkers.vcxproj

@@ -173,6 +173,7 @@
     <ClCompile Include="Ui\EditWindow.cpp" />
     <ClCompile Include="Ui\sdrbutton.cpp" />
     <ClCompile Include="Ui\sdrwindow.cpp" />
+    <ClCompile Include="Ui\CountryWindow.cpp" />
     <ClCompile Include="Ui\SettingsWindow.cpp" />
     <ClCompile Include="Ui\SyncWindow.cpp" />
     <ClCompile Include="Ui\MainWindow.cpp" />
@@ -183,6 +184,7 @@
   <ItemGroup>
     <ClInclude Include="AnnotatorService.h" />
     <ClInclude Include="common.h" />
+    <ClInclude Include="countries.h" />
     <ClInclude Include="remote_dev.h" />
     <ClInclude Include="remote_prod.h" />
     <ClInclude Include="Plugin.h" />
@@ -192,6 +194,7 @@
     <ClInclude Include="Ui\EditWindow.h" />
     <ClInclude Include="Ui\sdrbutton.h" />
     <ClInclude Include="Ui\sdrwindow.h" />
+    <ClInclude Include="Ui\CountryWindow.h" />
     <ClInclude Include="Ui\SettingsWindow.h" />
     <ClInclude Include="Ui\SyncWindow.h" />
     <ClInclude Include="Ui\MainWindow.h" />

SDRunoPlugin_CloudMarkers.vcxproj.filters

@@ -72,6 +72,9 @@
     <ClCompile Include="Ui\MainWindow.cpp">
       <Filter>Quelldateien\Ui</Filter>
     </ClCompile>
+    <ClCompile Include="Ui\CountryWindow.cpp">
+      <Filter>Quelldateien\Ui</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="Plugin.h">
@@ -128,6 +131,12 @@
     <ClInclude Include="Ui\MainWindow.h">
       <Filter>Headerdateien\Ui</Filter>
     </ClInclude>
+    <ClInclude Include="Ui\CountryWindow.h">
+      <Filter>Headerdateien\Ui</Filter>
+    </ClInclude>
+    <ClInclude Include="countries.h">
+      <Filter>Headerdateien</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="Resource.rc">

Ui/CountryWindow.cpp

@@ -0,0 +1,106 @@
+#include "CountryWindow.h"
+#include "../countries.h";
+
+#define WIDTH (400)
+#define HEIGHT (300)
+
+#define TEXTHEIGHT (24)
+#define FULLWIDTH (WIDTH - 40)
+#define LEFT (20)
+#define ROW(x) (40 + ((x - 1) * 45))
+#define TEXTROW(x) (52 + ((x - 1) * 45))
+
+CountryWindow::CountryWindow(nana::form* parent, DataService& dataService, std::string current) :
+	sdrwindow(parent, "COUNTRIES", WIDTH, HEIGHT, dataService),
+	m_ituCode(current)
+{
+}
+
+nana::listbox::oresolver& operator<<(nana::listbox::oresolver& ores, const staticdata::country_t& country)
+{
+	return ores << country.code << country.name;
+}
+
+bool findSearchTextInCountry(const std::string& searchText, const staticdata::country_t country)
+{	
+	if (searchText.empty())
+		return true;
+
+	auto it = std::search(
+		country.name.begin(), country.name.end(),
+		searchText.begin(), searchText.end(),
+		[](char ch1, char ch2) { return std::toupper(ch1) == std::toupper(ch2); }
+	);
+	return (it != country.name.end());
+}
+
+void CountryWindow::createWidgets()
+{
+	// Search
+	m_lblSearchC = makeLabelTitle(LEFT, ROW(1), FULLWIDTH, "COUNTRY NAME");
+	m_txtSearch = makeTextbox(LEFT, TEXTROW(1), FULLWIDTH, TEXTHEIGHT, false, "Start typing country name ...");
+
+	// Results
+	m_lblResultsC = makeLabelTitle(LEFT, ROW(2), FULLWIDTH, "RESULTS");
+	m_lstResults = makeListbox(LEFT, TEXTROW(2), FULLWIDTH, 150);
+	m_lstResults->append_header("ITU", 60);
+	m_lstResults->append_header("NAME", 260);
+
+	// Buttons
+	m_btnOk = makeButton(20, 260, "OK", "Accept selected country");
+	if (m_ituCode.empty())
+		m_btnOk->enabled(false);
+
+	m_btnCancel = makeButton(84, 260, "CANCEL", "Cancel selection");
+
+	// Events
+	m_lstResults->events().selected([&](const nana::arg_listbox& arg) {
+		if (arg.item.selected()) {
+			m_ituCode = arg.item.text(0);
+			m_btnOk->enabled(true);
+		}
+		else
+		{
+			m_ituCode = "";
+			m_btnOk->enabled(false);
+		}
+	});
+
+	m_lstResults->events().dbl_click([&] {
+		if (!m_ituCode.empty())
+			Close();
+	});
+
+	m_btnOk->events().click([&] {
+		Close();
+	});
+
+	m_btnCancel->events().click([&] {
+		m_ituCode = "";
+		Close();
+	});
+
+	m_txtSearch->events().text_changed([&] {
+		updateList(m_txtSearch->caption());
+	});
+
+	updateList("");
+}
+
+std::string CountryWindow::GetITUCode()
+{
+	return m_ituCode;
+}
+
+void CountryWindow::updateList(std::string searchText)
+{
+	m_lstResults->clear();
+	auto list = m_lstResults->at(0);
+	for (auto country : staticdata::countries) {
+		if (findSearchTextInCountry(searchText, country)) {
+			auto item = list.append(country);
+			if (country.code == m_ituCode)
+				item.select(true, true);
+		}
+	}
+}

Ui/CountryWindow.h

@@ -0,0 +1,29 @@
+#pragma once
+
+#include <nana/gui.hpp>
+#include <nana/gui/widgets/label.hpp>
+#include <nana/gui/widgets/textbox.hpp>
+#include <nana/gui/widgets/listbox.hpp>
+
+#include "sdrwindow.h"
+
+class CountryWindow : public sdrwindow
+{
+public:
+	CountryWindow(nana::form* parent, DataService& dataService, std::string current);
+	std::string GetITUCode();
+
+private:
+	std::string m_ituCode;
+
+	void createWidgets();
+	void updateList(std::string searchText);
+
+	std::unique_ptr<nana::label> m_lblSearchC;
+	std::unique_ptr<nana::textbox> m_txtSearch;
+	std::unique_ptr<nana::label> m_lblResultsC;
+	std::unique_ptr<nana::listbox> m_lstResults;
+	std::unique_ptr<nana::sdrbutton> m_btnOk;
+	std::unique_ptr<nana::sdrbutton> m_btnCancel;
+};
+