make choosing a name for new tox profiles possible

src/CMakeLists.txt

@@ -52,14 +52,14 @@ add_executable(tomato
 	./sdl_clipboard_utils.hpp
 	./sdl_clipboard_utils.cpp
 
-	./file_selector.hpp
-	./file_selector.cpp
+	./chat_gui/file_selector.hpp
+	./chat_gui/file_selector.cpp
 
-	./send_image_popup.hpp
-	./send_image_popup.cpp
+	./chat_gui/send_image_popup.hpp
+	./chat_gui/send_image_popup.cpp
 
-	./settings_window.hpp
-	./settings_window.cpp
+	./chat_gui/settings_window.hpp
+	./chat_gui/settings_window.cpp
 
 	./tox_ui_utils.hpp
 	./tox_ui_utils.cpp

src/chat_gui/send_image_popup.cpp

@@ -1,10 +1,10 @@
 #include "./send_image_popup.hpp"
 
-#include "./image_loader_sdl_bmp.hpp"
-#include "./image_loader_stb.hpp"
-#include "./image_loader_webp.hpp"
-#include "./image_loader_qoi.hpp"
-#include "./image_loader_sdl_image.hpp"
+#include "../image_loader_sdl_bmp.hpp"
+#include "../image_loader_stb.hpp"
+#include "../image_loader_webp.hpp"
+#include "../image_loader_qoi.hpp"
+#include "../image_loader_sdl_image.hpp"
 
 #include <imgui/imgui.h>
 

src/chat_gui/send_image_popup.hpp

@@ -5,8 +5,8 @@
 #include <memory>
 #include <vector>
 
-#include "./image_loader.hpp"
-#include "./texture_cache.hpp"
+#include "../image_loader.hpp"
+#include "../texture_cache.hpp"
 
 struct SendImagePopup {
 	TextureUploaderI& _tu;

src/chat_gui4.cpp

@@ -1,7 +1,5 @@
 #include "./chat_gui4.hpp"
 
-#include "./file_selector.hpp"
-
 #include <solanaceae/message3/components.hpp>
 #include <solanaceae/tox_messages/components.hpp>
 #include <solanaceae/contact/components.hpp>
@@ -457,11 +455,11 @@ float ChatGui4::render(float time_delta) {
 							if (ImGui::TableNextColumn()) {
 								// TODO: theming for hardcoded values
 
-								if (!msg_reg.all_of<Message::Components::Remote::TimestampReceived>(e)) {
+								if (!msg_reg.all_of<Message::Components::ReceivedBy>(e)) {
 									// TODO: dedup?
 									ImGui::TextDisabled("_");
 								} else {
-									const auto list = msg_reg.get<Message::Components::Remote::TimestampReceived>(e).ts;
+									const auto list = msg_reg.get<Message::Components::ReceivedBy>(e).ts;
 									// wrongly assumes contacts never get removed from a group
 									if (sub_contacts != nullptr && list.size() < sub_contacts->size()) {
 										// if partically delivered
@@ -503,8 +501,8 @@ float ChatGui4::render(float time_delta) {
 								ImGui::SameLine();
 
 								// TODO: dedup
-								if (msg_reg.all_of<Message::Components::Remote::TimestampRead>(e)) {
-									const auto list = msg_reg.get<Message::Components::Remote::TimestampRead>(e).ts;
+								if (msg_reg.all_of<Message::Components::ReadBy>(e)) {
+									const auto list = msg_reg.get<Message::Components::ReadBy>(e).ts;
 									// wrongly assumes contacts never get removed from a group
 									if (sub_contacts != nullptr && list.size() < sub_contacts->size()) {
 										// if partially read
@@ -1053,11 +1051,11 @@ void ChatGui4::renderMessageExtra(Message3Registry& reg, const Message3 e) {
 	}
 
 	// TODO: remove?
-	if (reg.all_of<Message::Components::Remote::TimestampReceived>(e)) {
+	if (reg.all_of<Message::Components::ReceivedBy>(e)) {
 		std::string synced_by_text {"receivedBy:"};
 		const int64_t now_ts_s = int64_t(Message::getTimeMS() / 1000u);
 
-		for (const auto& [c, syned_ts] : reg.get<Message::Components::Remote::TimestampReceived>(e).ts) {
+		for (const auto& [c, syned_ts] : reg.get<Message::Components::ReceivedBy>(e).ts) {
 			if (_cr.all_of<Contact::Components::TagSelfStrong>(c)) {
 				synced_by_text += "\n sself"; // required (except when synced externally)
 			} else if (_cr.all_of<Contact::Components::TagSelfWeak>(c)) {

src/chat_gui4.hpp

@@ -7,8 +7,8 @@
 #include "./texture_cache.hpp"
 #include "./tox_avatar_loader.hpp"
 #include "./message_image_loader.hpp"
-#include "./file_selector.hpp"
-#include "./send_image_popup.hpp"
+#include "./chat_gui/file_selector.hpp"
+#include "./chat_gui/send_image_popup.hpp"
 
 #include <entt/container/dense_map.hpp>
 

src/main_screen.cpp

@@ -12,7 +12,7 @@
 #include <memory>
 #include <cmath>
 
-MainScreen::MainScreen(SDL_Renderer* renderer_, std::string save_path, std::string save_password, std::vector<std::string> plugins) :
+MainScreen::MainScreen(SDL_Renderer* renderer_, std::string save_path, std::string save_password, std::string new_username, std::vector<std::string> plugins) :
 	renderer(renderer_),
 	rmm(cr),
 	msnj{cr, {}, {}},
@@ -44,9 +44,10 @@ MainScreen::MainScreen(SDL_Renderer* renderer_, std::string save_path, std::stri
 	conf.set("tox", "save_file_path", save_path);
 
 	{ // name stuff
+		// a new profile will not have this set
 		auto name = tc.toxSelfGetName();
 		if (name.empty()) {
-			name = "tomato";
+			name = new_username;
 		}
 		conf.set("tox", "name", name);
 		tc.setSelfName(name); // TODO: this is ugly

src/main_screen.hpp

@@ -28,7 +28,7 @@
 #include "./message_image_loader.hpp"
 
 #include "./chat_gui4.hpp"
-#include "./settings_window.hpp"
+#include "./chat_gui/settings_window.hpp"
 #include "./tox_ui_utils.hpp"
 #include "./tox_dht_cap_histo.hpp"
 #include "./tox_friend_faux_offline_messaging.hpp"
@@ -89,7 +89,7 @@ struct MainScreen final : public Screen {
 	uint64_t _window_hidden_ts {0};
 	float _time_since_event {0.f};
 
-	MainScreen(SDL_Renderer* renderer_, std::string save_path, std::string save_password, std::vector<std::string> plugins);
+	MainScreen(SDL_Renderer* renderer_, std::string save_path, std::string save_password, std::string new_username, std::vector<std::string> plugins);
 	~MainScreen(void);
 
 	bool handleEvent(SDL_Event& e) override;

src/start_screen.cpp

@@ -5,6 +5,7 @@
 #include <imgui/imgui.h>
 #include <imgui/misc/cpp/imgui_stdlib.h>
 
+#include <cctype>
 #include <memory>
 #include <filesystem>
 
@@ -33,13 +34,13 @@ Screen* StartScreen::render(float, bool&) {
 				_fss.requestFile(
 					[](const auto& path) -> bool { return std::filesystem::is_regular_file(path); },
 					[this](const auto& path) {
-						tox_profile_path = path.string();
+						_tox_profile_path = path.string();
 					},
 					[](){}
 				);
 			}
 			ImGui::SameLine();
-			ImGui::TextUnformatted(tox_profile_path.c_str());
+			ImGui::TextUnformatted(_tox_profile_path.c_str());
 
 			ImGui::TextUnformatted("password:");
 			ImGui::SameLine();
@@ -56,8 +57,22 @@ Screen* StartScreen::render(float, bool&) {
 		if (ImGui::BeginTabItem("create profile")) {
 			_new_save = true;
 
-			ImGui::TextUnformatted("TODO: profile path");
-			ImGui::TextUnformatted("TODO: profile name");
+			ImGui::TextUnformatted("username:");
+			ImGui::SameLine();
+			if (ImGui::InputText("##user_name", &_user_name)) {
+				std::string tmp_copy = _user_name;
+				for (auto& c : tmp_copy) {
+					if (!std::isalnum(static_cast<unsigned char>(c)) && c != '-' && c != '.') {
+						c = '_';
+					}
+				}
+
+				if (tmp_copy.empty()) {
+					tmp_copy = "unnamed-tomato";
+				}
+
+				_tox_profile_path = tmp_copy + ".tox";
+			}
 
 			ImGui::TextUnformatted("password:");
 			ImGui::SameLine();
@@ -69,6 +84,8 @@ Screen* StartScreen::render(float, bool&) {
 			ImGui::SameLine();
 			ImGui::Checkbox("show password", &_show_password);
 
+			ImGui::TextUnformatted("TODO: profile path (current path for now)");
+
 			ImGui::EndTabItem();
 		}
 		if (ImGui::BeginTabItem("plugins")) {
@@ -81,7 +98,6 @@ Screen* StartScreen::render(float, bool&) {
 					continue;
 				}
 				ImGui::SameLine();
-
 				ImGui::TextUnformatted(it->c_str());
 
 				ImGui::PopID();
@@ -105,7 +121,7 @@ Screen* StartScreen::render(float, bool&) {
 
 	ImGui::Separator();
 
-	if (!_new_save && !std::filesystem::is_regular_file(tox_profile_path)) {
+	if (!_new_save && !std::filesystem::is_regular_file(_tox_profile_path)) {
 		// load but file missing
 
 		ImGui::BeginDisabled();
@@ -115,7 +131,7 @@ Screen* StartScreen::render(float, bool&) {
 		if (ImGui::IsItemHovered(ImGuiHoveredFlags_ForTooltip | ImGuiHoveredFlags_AllowWhenDisabled)) {
 			ImGui::SetTooltip("file does not exist");
 		}
-	} else if (_new_save && std::filesystem::exists(tox_profile_path)) {
+	} else if (_new_save && std::filesystem::exists(_tox_profile_path)) {
 		// new but file exists
 
 		ImGui::BeginDisabled();
@@ -127,7 +143,7 @@ Screen* StartScreen::render(float, bool&) {
 		}
 	} else {
 		if (ImGui::Button("load", {60, 25})) {
-			auto new_screen = std::make_unique<MainScreen>(_renderer, tox_profile_path, _password, queued_plugin_paths);
+			auto new_screen = std::make_unique<MainScreen>(_renderer, _tox_profile_path, _password, _user_name, queued_plugin_paths);
 			return new_screen.release();
 		}
 	}

src/start_screen.hpp

@@ -2,7 +2,7 @@
 
 #include "./screen.hpp"
 
-#include "./file_selector.hpp"
+#include "./chat_gui/file_selector.hpp"
 
 #include <vector>
 #include <string>
@@ -17,11 +17,12 @@ struct StartScreen final : public Screen {
 	FileSelector _fss;
 
 	bool _new_save {false};
+	std::string _user_name {"unnamed-tomato"};
 
 	bool _show_password {false};
 	std::string _password;
 
-	std::string tox_profile_path {"tomato.tox"};
+	std::string _tox_profile_path {"unnamed-tomato.tox"};
 	std::vector<std::string> queued_plugin_paths;
 
 	StartScreen(void) = delete;

src/tox_friend_faux_offline_messaging.cpp

@@ -134,7 +134,7 @@ ToxFriendFauxOfflineMessaging::dfmc_Ret ToxFriendFauxOfflineMessaging::doFriendM
 		}
 
 		if (!mr->any_of<
-				Message::Components::Remote::TimestampReceived
+				Message::Components::ReceivedBy
 			>(msg)
 		) {
 			continue; // skip
@@ -144,7 +144,7 @@ ToxFriendFauxOfflineMessaging::dfmc_Ret ToxFriendFauxOfflineMessaging::doFriendM
 			continue; // not outbound (in private)
 		}
 
-		const auto& ts_received = mr->get<Message::Components::Remote::TimestampReceived>(msg).ts;
+		const auto& ts_received = mr->get<Message::Components::ReceivedBy>(msg).ts;
 		// not target
 		if (ts_received.contains(c)) {
 			continue;