changed the way the json parser worked to allow for all of the languages included in utf-8.

Author: GoldenDragonJD

.qtcreator/project.json

@@ -0,0 +1,6 @@
+{
+    "$schema": "https://download.qt.io/official_releases/qtcreator/latest/installer_source/jsonschemas/project.json",
+    "files.exclude": [
+        ".qtcreator/project.json.user"
+    ]
+}

.qtcreator/project.json.user

@@ -6,13 +6,25 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>581</width>
+    <width>594</width>
     <height>119</height>
    </rect>
   </property>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
+  <property name="minimumSize">
+   <size>
+    <width>594</width>
+    <height>0</height>
+   </size>
+  </property>
   <property name="maximumSize">
    <size>
-    <width>99999</width>
+    <width>594</width>
     <height>99999</height>
    </size>
   </property>
@@ -22,6 +34,12 @@
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
     <widget class="QLabel" name="fileName">
+     <property name="maximumSize">
+      <size>
+       <width>576</width>
+       <height>16777215</height>
+      </size>
+     </property>
      <property name="text">
       <string>Empty file.txt</string>
      </property>
@@ -61,6 +79,9 @@
       </item>
       <item row="1" column="1">
        <widget class="QProgressBar" name="transferProgressBar">
+        <property name="layoutDirection">
+         <enum>Qt::LayoutDirection::LeftToRight</enum>
+        </property>
         <property name="value">
          <number>50</number>
         </property>

filemessage.ui

@@ -14,18 +14,18 @@
 #include <QTimer>
 #include <QFileInfo>
 
-QString get_data_string(QTcpSocket* socket)
+QByteArray get_data_string(QTcpSocket* socket)
 {
     int deadEndCounter = 0;
-    QString output = "";
+    QByteArray output;
 
     while(deadEndCounter < 4096)
     {
         QByteArray data = socket->read(1);
         char c = reinterpret_cast<char>(data[0]);
         if (c == '\n') break;
 
-        output += c;
+        output += data[0];
 
         deadEndCounter++;
     }
@@ -49,10 +49,10 @@ QString formatByteSpeed(qint64 bytes)
     qint64 megaSize = 1047576;
     qint64 kilaSize = 1024;
 
-    if (bytes > terraSize) {speed = bytes / terraSize; byteIndex = 4;}
-    else if (bytes > gigaSize) {speed = bytes / gigaSize; byteIndex = 3;}
-    else if (bytes > megaSize) {speed = bytes / megaSize; byteIndex = 2;}
-    else if (bytes > kilaSize) {speed = bytes / kilaSize; byteIndex = 1;}
+    if (bytes > terraSize) {speed = (double)bytes / (double)terraSize; byteIndex = 4;}
+    else if (bytes > gigaSize) {speed = (double)bytes / (double)gigaSize; byteIndex = 3;}
+    else if (bytes > megaSize) {speed = (double)bytes / (double)megaSize; byteIndex = 2;}
+    else if (bytes > kilaSize) {speed = (double)bytes / (double)kilaSize; byteIndex = 1;}
 
     return QString::number(speed, 'f', 2) + " " + byteFormats[byteIndex];
 }
@@ -64,6 +64,10 @@ MainWindow::MainWindow(QWidget *parent)
     ui->setupUi(this);
     ui->RemoveFileButton->setVisible(false);
     socket = new QTcpSocket(this);
+    connect(ui->MessageInput, &QLineEdit::returnPressed, ui->sendButton, &QPushButton::click);
+    connect(ui->PairIDInput, &QLineEdit::returnPressed, ui->pairButton, &QPushButton::click);
+    ui->MessageList->setWordWrap(true);   // allow wrapping
+    ui->MessageList->setResizeMode(QListView::Adjust);  // items adjust width
 
     updateTimer = new QTimer(this);
     connect(updateTimer, &QTimer::timeout, this, [this]() {
@@ -94,7 +98,7 @@ MainWindow::MainWindow(QWidget *parent)
         }
         case 1:{
             QJsonParseError parseError;
-            QJsonDocument doc = QJsonDocument::fromJson(get_data_string(socket).toUtf8(), &parseError);
+            QJsonDocument doc = QJsonDocument::fromJson(get_data_string(socket), &parseError);
 
             if (parseError.error != QJsonParseError::NoError)
             {
@@ -189,6 +193,7 @@ MainWindow::MainWindow(QWidget *parent)
                 newMessage->setText(obj["message"].toString());
 
                 item->setSizeHint(newMessage->sizeHint());
+
                 ui->MessageList->addItem(item);
                 ui->MessageList->setItemWidget(item, newMessage);
             }
@@ -315,6 +320,8 @@ MainWindow::MainWindow(QWidget *parent)
 
         ui->MessageList->clear();
 
+        sendingFile= false;
+
         if (current_file) {
             if (current_file->isOpen())
                 current_file->close();
@@ -417,74 +424,94 @@ void MainWindow::sendFile()
 {
     QFileInfo info(selectedFilePath);
 
+    // 1. Send metadata first
     QJsonObject jsonMessage;
     jsonMessage["type"] = "file_metadata";
     jsonMessage["file_name"] = info.fileName();
     jsonMessage["file_size"] = info.size();
     jsonMessage["to"] = pairPartnerId;
 
     QJsonDocument doc(jsonMessage);
-    QString jsonString = doc.toJson(QJsonDocument::Compact) + "\n";
+    QString jsonString = doc.toJson(QJsonDocument::Compact) + '\n';
     socket->write(jsonString.toUtf8());
 
+    // 2. Setup state
     current_file_size = 0;
     current_total_file_size = info.size();
 
     QListWidgetItem *item = new QListWidgetItem(ui->MessageList);
     currentFileMessage = new fileMessage;
-
     currentFileMessage->setFileName(info.fileName());
     currentFileMessage->setToAndFromClient(QString::number(myId), QString::number(pairPartnerId));
-    currentFileMessage->setStatus("Transfering");
+    currentFileMessage->setStatus("Transferring");
     currentFileMessage->setProgress(0);
 
     item->setSizeHint(currentFileMessage->sizeHint());
     ui->MessageList->addItem(item);
     ui->MessageList->setItemWidget(item, currentFileMessage);
 
-    current_file = new QFile;
-    current_file->setFileName(selectedFilePath);
-
+    current_file = new QFile(selectedFilePath);
     if (!current_file->open(QIODevice::ReadOnly)) {
-        QMessageBox::warning(this, "Error", "Could not open file for writing!");
+        QMessageBox::warning(this, "Error", "Could not open file for reading!");
+        delete current_file;
+        current_file = nullptr;
         return;
     }
 
     updateTimer->start(1000);
+    sendingFile = true;
 
-    while (!current_file->atEnd()) {
-        QByteArray bytes = current_file->read(1024);
-        current_file_size += bytes.size();
+    // 3. Connect socket signal → chunk sender
+    uploadConn = connect(socket, &QTcpSocket::bytesWritten,
+                         this, &MainWindow::sendFileChunk);
 
-        qint64 written = socket->write(bytes);
-        if (written == -1) {
-            QMessageBox::warning(this, "Error", "Failed to write to socket!");
-            break;
-        }
+    // 4. Kick off first chunk immediately
+    sendFileChunk();
+}
 
-        // Block until the OS actually flushes this chunk
-        if (!socket->waitForBytesWritten(-1)) {
-            QMessageBox::warning(this, "Error", "Failed to send data chunk!");
-            break;
-        }
+void MainWindow::sendFileChunk()
+{
+    if (!sendingFile || !current_file) return;
 
-        double progress = (double)current_file_size / (double)current_total_file_size * 100.0;
-        static int lastProgress = -1;
-        int intProgress = static_cast<int>(progress);
+    const int chunkSize = 1024;
+    QByteArray bytes = current_file->read(chunkSize);
 
-        if (intProgress != lastProgress) {
-            currentFileMessage->setProgress(intProgress);
-            lastProgress = intProgress;
-        }
-    }
-
-    updateTimer->stop();
+    if (bytes.isEmpty()) {
+        // === Finished ===
+        sendingFile = false;
+        updateTimer->stop();
 
-    if (current_file) {
         if (current_file->isOpen())
             current_file->close();
         delete current_file;
         current_file = nullptr;
+
+        // Disconnect so no future writes trigger us
+        disconnect(uploadConn);
+
+        currentFileMessage->setStatus("File Transferred");
+        currentFileMessage->setProgress(100);
+        return;
+    }
+
+    // Write chunk
+    qint64 written = socket->write(bytes);
+    if (written == -1) {
+        QMessageBox::warning(this, "Error", "Failed to write to socket!");
+        return;
+    }
+
+    current_file_size += bytes.size();
+    bytesReceivedThisSecond += bytes.size();
+
+    // Update progress
+    double progress = (double)current_file_size / (double)current_total_file_size * 100.0;
+    static int lastProgress = -1;
+    int intProgress = static_cast<int>(progress);
+
+    if (intProgress != lastProgress) {
+        currentFileMessage->setProgress(intProgress);
+        lastProgress = intProgress;
     }
 }
 
@@ -496,7 +523,7 @@ void MainWindow::sendMessage(const QString messageToSend)
     jsonMessage["to"] = pairPartnerId;
 
     QJsonDocument doc(jsonMessage);
-    QString jsonString = doc.toJson(QJsonDocument::Compact) + "\n";
+    QString jsonString = doc.toJson(QJsonDocument::Compact) + '\n';
     socket->write(jsonString.toUtf8());
 
     QListWidgetItem *item = new QListWidgetItem(ui->MessageList);

mainwindow.cpp

@@ -44,6 +44,9 @@ class MainWindow : public QMainWindow
 
     int flushIndex = 0;
 
+    bool sendingFile = false;
+    QMetaObject::Connection uploadConn;
+
 private slots:
     void on_fileDialogButton_clicked();
     void on_connectButton_clicked();
@@ -52,6 +55,7 @@ private slots:
     void on_sendButton_clicked();
     void sendFile();
     void sendMessage(const QString messageToSend);
+    void sendFileChunk();
 
 };
 #endif // MAINWINDOW_H

mainwindow.h

@@ -80,6 +80,9 @@
     <property name="text">
      <string>Select File</string>
     </property>
+    <property name="icon">
+     <iconset theme="QIcon::ThemeIcon::DocumentOpen"/>
+    </property>
    </widget>
    <widget class="QLabel" name="ClientID">
     <property name="geometry">
@@ -155,9 +158,15 @@
       <height>31</height>
      </rect>
     </property>
+    <property name="locale">
+     <locale language="English" country="UnitedStates"/>
+    </property>
     <property name="text">
      <string>Send</string>
     </property>
+    <property name="icon">
+     <iconset theme="QIcon::ThemeIcon::DocumentSend"/>
+    </property>
     <property name="autoDefault">
      <bool>true</bool>
     </property>
@@ -174,9 +183,24 @@
       <height>471</height>
      </rect>
     </property>
+    <property name="focusPolicy">
+     <enum>Qt::FocusPolicy::NoFocus</enum>
+    </property>
+    <property name="verticalScrollBarPolicy">
+     <enum>Qt::ScrollBarPolicy::ScrollBarAsNeeded</enum>
+    </property>
+    <property name="horizontalScrollBarPolicy">
+     <enum>Qt::ScrollBarPolicy::ScrollBarAlwaysOff</enum>
+    </property>
+    <property name="sizeAdjustPolicy">
+     <enum>QAbstractScrollArea::SizeAdjustPolicy::AdjustIgnored</enum>
+    </property>
     <property name="selectionMode">
      <enum>QAbstractItemView::SelectionMode::NoSelection</enum>
     </property>
+    <property name="resizeMode">
+     <enum>QListView::ResizeMode::Adjust</enum>
+    </property>
     <property name="wordWrap">
      <bool>true</bool>
     </property>

mainwindow.ui

@@ -7,12 +7,12 @@
     <x>0</x>
     <y>0</y>
     <width>637</width>
-    <height>93</height>
+    <height>60</height>
    </rect>
   </property>
   <property name="minimumSize">
    <size>
-    <width>637</width>
+    <width>0</width>
     <height>0</height>
    </size>
   </property>
@@ -24,7 +24,7 @@
     <widget class="QLabel" name="ClientID">
      <property name="minimumSize">
       <size>
-       <width>619</width>
+       <width>0</width>
        <height>0</height>
       </size>
      </property>