From fd4ad95ab171d544442aaeff5428a9f1a49fd8e5 Mon Sep 17 00:00:00 2001 From: localhorst Date: Sat, 21 Jun 2025 20:25:32 +0200 Subject: [PATCH] display connection type --- include/tui.h | 2 +- src/tui.cpp | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/include/tui.h b/include/tui.h index 4ae017a..b1b3416 100644 --- a/include/tui.h +++ b/include/tui.h @@ -67,7 +67,7 @@ private: static WINDOW *createOverViewWindow(int iXSize, int iYSize); static WINDOW *createDetailViewWindow(int iXSize, int iYSize, int iXStart, Drive drive); static WINDOW *overwriteDetailViewWindow(int iXSize, int iYSize, int iXStart); - static WINDOW *createEntryWindow(int iXSize, int iYSize, int iXStart, int iYStart, int iListIndex, string sModelFamily, string sSerial, string sCapacity, string sState, string sTime, string sSpeed, string sTemp, bool bSelected); + static WINDOW *createEntryWindow(int iXSize, int iYSize, int iXStart, int iYStart, int iListIndex, string sModelFamily, string sSerial, string sCapacity, string sState, string sTime, string sSpeed, string sTemp, string sConnection, bool bSelected); static WINDOW *createSystemStats(int iXSize, int iYSize, int iXStart, int iYStart); static WINDOW *createMenuView(int iXSize, int iYSize, int iXStart, int iYStart, struct MenuState menustate); static WINDOW *createDialog(int iXSize, int iYSize, int iXStart, int iYStart, string selectedTask, string optionA, string optionB); diff --git a/src/tui.cpp b/src/tui.cpp index edb3532..3ba05c7 100644 --- a/src/tui.cpp +++ b/src/tui.cpp @@ -93,6 +93,9 @@ void TUI::updateTUI(list *plistDrives, uint8_t u8SelectedEntry) string sSpeed = " "; string sTime = " "; string sTemp = it->sTemperatureToText(); + string sConnection = (it->connectionType == Drive::USB ? "USB" : it->connectionType == Drive::SATA ? "SATA" + : it->connectionType == Drive::NVME ? "NVME" + : "UNKNOWN"); bool bSelectedEntry = false; @@ -182,7 +185,7 @@ void TUI::updateTUI(list *plistDrives, uint8_t u8SelectedEntry) uint16_t u16StartOffsetY = (2 * (u8Index)); - WINDOW *tmp = createEntryWindow((int)(u16StdscrX * (float)(3.0 / 7.0) - 2), 2, 3, u16StartOffsetY + 2, (distance(plistDrives->begin(), it) + 1), sModelFamily, sSerial, sCapacity, sState, sTime, sSpeed, sTemp, bSelectedEntry); + WINDOW *tmp = createEntryWindow((int)(u16StdscrX * (float)(3.0 / 7.0) - 2), 2, 3, u16StartOffsetY + 2, (distance(plistDrives->begin(), it) + 1), sModelFamily, sSerial, sCapacity, sState, sTime, sSpeed, sTemp, sConnection, bSelectedEntry); wrefresh(tmp); u8Index++; } // end loop though drives @@ -345,7 +348,7 @@ WINDOW *TUI::overwriteDetailViewWindow(int iXSize, int iYSize, int iXStart) return newWindow; } -WINDOW *TUI::createEntryWindow(int iXSize, int iYSize, int iXStart, int iYStart, int iListIndex, string sModelFamily, string sSerial, string sCapacity, string sState, string sTime, string sSpeed, string sTemp, bool bSelected) +WINDOW *TUI::createEntryWindow(int iXSize, int iYSize, int iXStart, int iYStart, int iListIndex, string sModelFamily, string sSerial, string sCapacity, string sState, string sTime, string sSpeed, string sTemp, string sConnection, bool bSelected) { WINDOW *newWindow; newWindow = newwin(iYSize, iXSize, iYStart, iXStart); @@ -390,6 +393,7 @@ WINDOW *TUI::createEntryWindow(int iXSize, int iYSize, int iXStart, int iYStart, 37-43: Capacity 44: space 47-49: Temp + 57-60: Connection Type line:02 0-2: space @@ -406,6 +410,7 @@ WINDOW *TUI::createEntryWindow(int iXSize, int iYSize, int iXStart, int iYStart, mvwaddstr(newWindow, 0, 3, sModelFamily.c_str()); mvwaddstr(newWindow, 0, 37, sCapacity.c_str()); mvwaddstr(newWindow, 0, 47, sTemp.c_str()); + mvwaddstr(newWindow, 0, 57, sConnection.c_str()); vTruncateText(&sSerial, 28); mvwaddstr(newWindow, 1, 3, sSerial.c_str());