mirror of
https://github.com/Serial-Studio/Serial-Studio.git
synced 2025-01-31 17:42:55 +08:00
Update to 1.0.14
This commit is contained in:
parent
d2e60c7544
commit
9da79dfde4
@ -87,6 +87,12 @@ Control {
|
||||
anchors.margins: app.spacing
|
||||
contentWidth: textArea.paintedWidth
|
||||
contentHeight: textArea.paintedHeight
|
||||
boundsMovement: Flickable.StopAtBounds
|
||||
boundsBehavior: Flickable.DragOverBounds
|
||||
|
||||
Keys.onUpPressed: scrollBar.decrease()
|
||||
Keys.onDownPressed: scrollBar.increase()
|
||||
ScrollBar.vertical: ScrollBar { id: scrollBar }
|
||||
|
||||
function ensureVisible(r)
|
||||
{
|
||||
|
@ -19,7 +19,7 @@
|
||||
<key>CFBundlePackageType</key>
|
||||
<string>APPL</string>
|
||||
<key>CFBundleShortVersionString</key>
|
||||
<string>1.0.13</string>
|
||||
<string>1.0.14</string>
|
||||
<key>LSHasLocalizedDisplayName</key>
|
||||
<true/>
|
||||
<key>NSPrincipalClass</key>
|
||||
|
@ -27,7 +27,7 @@
|
||||
#include <QString>
|
||||
|
||||
// clang-format off
|
||||
#define APP_VERSION "1.0.13"
|
||||
#define APP_VERSION "1.0.14"
|
||||
#define APP_DEVELOPER "Alex Spataru"
|
||||
#define APP_NAME "Serial Studio"
|
||||
#define APP_ICON ":/images/icon.png"
|
||||
|
@ -501,14 +501,20 @@ QString Console::plainTextStr(const QByteArray &data)
|
||||
*/
|
||||
QString Console::hexadecimalStr(const QByteArray &data)
|
||||
{
|
||||
// Convert to hex string with spaces between bytes
|
||||
QString str;
|
||||
QString hex = QString::fromUtf8(data.toHex());
|
||||
for (int i = 0; i < hex.length(); ++i)
|
||||
{
|
||||
str.append(hex.at(i));
|
||||
if ((i + 1) % 2 == 0)
|
||||
str.append(" ");
|
||||
str.append("");
|
||||
}
|
||||
|
||||
// Add new line & carriage returns
|
||||
str.replace("0a ", "0a\r");
|
||||
str.replace("0d ", "0d\n");
|
||||
|
||||
// Return string
|
||||
return str;
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user