rename: Replace all machines with devices

LANDrop/discoveryservice.cpp

@@ -49,7 +49,7 @@ void DiscoveryService::start(quint16 serverPort)
     this->serverPort = serverPort;
     if (!socket.bind(QHostAddress::Any, DISCOVERY_PORT)) {
         QMessageBox::warning(nullptr, QApplication::applicationName(),
-                             tr("Unable to bind to port %1.\nYour machine won't be discoverable.")
+                             tr("Unable to bind to port %1.\nYour device won't be discoverable.")
                              .arg(DISCOVERY_PORT));
     }
     foreach (const QHostAddress &addr, broadcastAddresses()) {
@@ -73,8 +73,8 @@ void DiscoveryService::sendInfo(const QHostAddress &addr, quint16 port)
         return;
     QJsonObject obj;
     obj.insert("request", false);
-    obj.insert("machine_name", Settings::machineName());
-    obj.insert("machine_type", QSysInfo::productType());
+    obj.insert("device_name", Settings::deviceName());
+    obj.insert("device_type", QSysInfo::productType());
     obj.insert("port", serverPort);
     socket.writeDatagram(QJsonDocument(obj).toJson(QJsonDocument::Compact), addr, port);
 }
@@ -125,12 +125,12 @@ void DiscoveryService::socketReadyRead()
             sendInfo(addr, port);
             continue;
         }
-        QJsonValue machineName = obj.value("machine_name");
+        QJsonValue deviceName = obj.value("device_name");
         QJsonValue remotePort = obj.value("port");
-        if (!machineName.isString() || !remotePort.isDouble())
+        if (!deviceName.isString() || !remotePort.isDouble())
             continue;
-        QString machineNameStr = machineName.toString();
+        QString deviceNameStr = deviceName.toString();
         quint16 remotePortInt = remotePort.toInt();
-        emit newHost(machineNameStr, addr, remotePortInt);
+        emit newHost(deviceNameStr, addr, remotePortInt);
     }
 }

LANDrop/discoveryservice.h

@@ -54,5 +54,5 @@ public slots:
 private slots:
     void socketReadyRead();
 signals:
-    void newHost(const QString &machineName, const QHostAddress &addr, quint16 port);
+    void newHost(const QString &deviceName, const QHostAddress &addr, quint16 port);
 };

LANDrop/filetransferdialog.cpp

@@ -86,7 +86,7 @@ void FileTransferDialog::sessionErrorOccurred(const QString &msg)
 
 void FileTransferDialog::sessionFileMetadataReady(const QList<FileTransferSession::FileMetadata> &metadata,
                                                   quint64 totalSize,
-                                                  const QString &machineName,
+                                                  const QString &deviceName,
                                                   const QString &sessionKeyDigest)
 {
     show();
@@ -95,10 +95,10 @@ void FileTransferDialog::sessionFileMetadataReady(const QList<FileTransferSessio
     QString msg;
     if (metadata.size() == 1) {
         msg = tr("%1 would like to share a file \"%2\" of size %3.")
-                .arg(machineName, metadata.first().filename, totalSizeStr);
+                .arg(deviceName, metadata.first().filename, totalSizeStr);
     } else {
         msg = tr("%1 would like to share %2 files of total size %3.")
-                .arg(machineName).arg(metadata.size()).arg(totalSizeStr);
+                .arg(deviceName).arg(metadata.size()).arg(totalSizeStr);
     }
     msg += tr("\nConfirm that the code \"%1\" is shown on the sending device.").arg(sessionKeyDigest);
     msg += tr("\nWould you like to receive it?");

LANDrop/filetransferdialog.h

@@ -58,5 +58,5 @@ private slots:
     void sessionUpdateProgress(double progress);
     void sessionErrorOccurred(const QString &msg);
     void sessionFileMetadataReady(const QList<FileTransferSession::FileMetadata> &metadata, quint64 totalSize,
-                                  const QString &machineName, const QString &sessionKeyDigest);
+                                  const QString &deviceName, const QString &sessionKeyDigest);
 };

LANDrop/filetransferreceiver.cpp

@@ -76,8 +76,8 @@ void FileTransferReceiver::processReceivedData(const QByteArray &data)
         }
 
         QJsonObject obj = json.object();
-        QJsonValue machineName = obj.value("machine_name");
-        if (!machineName.isString()) {
+        QJsonValue deviceName = obj.value("device_name");
+        if (!deviceName.isString()) {
             emit ended();
             return;
         }
@@ -118,7 +118,7 @@ void FileTransferReceiver::processReceivedData(const QByteArray &data)
             transferQ.append({filename.toString(), sizeInt});
         }
 
-        emit fileMetadataReady(transferQ, totalSize, machineName.toString(),
+        emit fileMetadataReady(transferQ, totalSize, deviceName.toString(),
                                crypto.sessionKeyDigest());
     } else if (state == TRANSFERRING) {
         transferredSize += data.size();

LANDrop/filetransfersender.cpp

@@ -63,8 +63,8 @@ void FileTransferSender::handshake1Finished()
     }
 
     QJsonObject obj;
-    obj.insert("machine_name", Settings::machineName());
-    obj.insert("machine_type", QSysInfo::productType());
+    obj.insert("device_name", Settings::deviceName());
+    obj.insert("device_type", QSysInfo::productType());
     obj.insert("files", jsonFiles);
     encryptAndSend(QJsonDocument(obj).toJson(QJsonDocument::Compact));
 }

LANDrop/filetransfersession.h

@@ -71,6 +71,6 @@ private slots:
     void updateProgress(double progress);
     void errorOccurred(const QString &msg);
     void fileMetadataReady(const QList<FileTransferSession::FileMetadata> &metadata, quint64 totalSize,
-                           const QString &machineName, const QString &sessionKeyDigest);
+                           const QString &deviceName, const QString &sessionKeyDigest);
     void ended();
 };

LANDrop/locales/LANDrop.zh_CN.ts

@@ -94,9 +94,9 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../discoveryservice.cpp" line="52"/>
         <source>Unable to bind to port %1.
-Your machine won&apos;t be discoverable.</source>
+Your device won&apos;t be discoverable.</source>
         <translation>无法绑定端口 %1。
-你的机器将无法被发现。</translation>
+你的设备将无法被发现。</translation>
     </message>
 </context>
 <context>
@@ -259,8 +259,8 @@ Would you like to receive it?</source>
     </message>
     <message>
         <location filename="../settingsdialog.ui" line="22"/>
-        <source>Machine Name</source>
-        <translation>机器名</translation>
+        <source>Device Name</source>
+        <translation>设备名</translation>
     </message>
     <message>
         <location filename="../settingsdialog.ui" line="36"/>

LANDrop/sendtodialog.cpp

@@ -63,21 +63,21 @@ SendToDialog::~SendToDialog()
     delete ui;
 }
 
-void SendToDialog::newHost(const QString &machineName, const QHostAddress &addr, quint16 port)
+void SendToDialog::newHost(const QString &deviceName, const QHostAddress &addr, quint16 port)
 {
     QStringList l = hostsStringListModel.stringList();
     for (int i = 0; i < endpoints.size(); ++i) {
         if (endpoints[i].addr.isEqual(addr)) {
-            if (l.at(i) != machineName) {
-                l.replace(i, machineName);
+            if (l.at(i) != deviceName) {
+                l.replace(i, deviceName);
                 hostsStringListModel.setStringList(l);
             }
             endpoints[i].port = port;
             return;
         }
     }
     endpoints.append({addr, port});
-    l.append(machineName);
+    l.append(deviceName);
     hostsStringListModel.setStringList(l);
 }
 

LANDrop/sendtodialog.h

@@ -63,7 +63,7 @@ class SendToDialog : public QDialog {
     QTcpSocket *socket;
     QTimer socketTimeoutTimer;
 private slots:
-    void newHost(const QString &machineName, const QHostAddress &addr, quint16 port);
+    void newHost(const QString &deviceName, const QHostAddress &addr, quint16 port);
     void hostsListViewClicked(const QModelIndex &index);
     void accept();
     void socketConnected();

LANDrop/settings.cpp

@@ -38,10 +38,10 @@
 #include <QSettings>
 #include <QStandardPaths>
 
-QString Settings::machineName()
+QString Settings::deviceName()
 {
     QString d = QHostInfo::localHostName();
-    return QSettings().value("machineName", d).toString();
+    return QSettings().value("deviceName", d).toString();
 }
 
 QString Settings::downloadPath()
@@ -56,9 +56,9 @@ bool Settings::discoverable()
     return QSettings().value("discoverable", true).toBool();
 }
 
-void Settings::setMachineName(const QString &machineName)
+void Settings::setDeviceName(const QString &deviceName)
 {
-    QSettings().setValue("machineName", machineName);
+    QSettings().setValue("deviceName", deviceName);
 }
 
 void Settings::setDownloadPath(const QString &downloadPath)

LANDrop/settings.h

@@ -36,10 +36,10 @@
 
 class Settings {
 public:
-    static QString machineName();
+    static QString deviceName();
     static QString downloadPath();
     static bool discoverable();
-    static void setMachineName(const QString &machineName);
+    static void setDeviceName(const QString &deviceName);
     static void setDownloadPath(const QString &downloadPath);
     static void setDiscoverable(bool discoverable);
 };

LANDrop/settingsdialog.cpp

@@ -50,7 +50,7 @@ SettingsDialog::~SettingsDialog()
 
 void SettingsDialog::accept()
 {
-    Settings::setMachineName(ui->machineNameLineEdit->text());
+    Settings::setDeviceName(ui->deviceNameLineEdit->text());
     Settings::setDownloadPath(ui->downloadPathLineEdit->text());
     Settings::setDiscoverable(ui->discoverableCheckBox->isChecked());
     done(Accepted);
@@ -67,8 +67,8 @@ void SettingsDialog::downloadPathSelectButtonClicked()
 void SettingsDialog::showEvent(QShowEvent *e)
 {
     QDialog::showEvent(e);
-    ui->machineNameLineEdit->setText(Settings::machineName());
+    ui->deviceNameLineEdit->setText(Settings::deviceName());
     ui->downloadPathLineEdit->setText(Settings::downloadPath());
     ui->discoverableCheckBox->setChecked(Settings::discoverable());
-    ui->machineNameLineEdit->setFocus();
+    ui->deviceNameLineEdit->setFocus();
 }

LANDrop/settingsdialog.ui

@@ -17,14 +17,14 @@
    <item>
     <layout class="QFormLayout" name="formLayout">
      <item row="0" column="0">
-      <widget class="QLabel" name="machineNameLabel">
+      <widget class="QLabel" name="deviceNameLabel">
        <property name="text">
-        <string>Machine Name</string>
+        <string>Device Name</string>
        </property>
       </widget>
      </item>
      <item row="0" column="1">
-      <widget class="QLineEdit" name="machineNameLineEdit">
+      <widget class="QLineEdit" name="deviceNameLineEdit">
        <property name="maxLength">
         <number>64</number>
        </property>