From 405dda5144f075d0fd427aee6827b2c57f4ec9fd Mon Sep 17 00:00:00 2001 From: arcan1s Date: Tue, 1 Apr 2014 09:59:44 +0400 Subject: [PATCH] start work on V.1.7.0 edited ui --- sources/ptm/contents/ui/configwindow.ui | 704 ++++++++++++++++++------ 1 file changed, 548 insertions(+), 156 deletions(-) diff --git a/sources/ptm/contents/ui/configwindow.ui b/sources/ptm/contents/ui/configwindow.ui index d9b73c2..c0a5449 100644 --- a/sources/ptm/contents/ui/configwindow.ui +++ b/sources/ptm/contents/ui/configwindow.ui @@ -7,7 +7,7 @@ 0 0 575 - 588 + 538 @@ -77,12 +77,7 @@ $isotime - time in ISO format $shorttime - time in short format $longtime - time in log format -$custom: $dddd - long weekday; $ddd - short weekday; $dd - day; $d day w\o zero; - $MMMM - long month; $MMM - short month; $MM - month; $M - month w\o zero; - $yyyy - year; $yy short year; - $hh - hours (24 only); $h - hours w\o zero (24 only); - $mm - minutes; $m - minutes w\o zero; - $ss - seconds; $s - seconds w\o zero +$custom - custom time format Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -101,7 +96,7 @@ $custom: $dddd - long weekday; $ddd - short weekday; $dd - day; $d day w\o zero; 1 - 14 + 15 1 @@ -138,7 +133,7 @@ $custom: $dddd - long weekday; $ddd - short weekday; $dd - day; $d day w\o zero; $uptime - system uptime -$custom: $ds - uptime days; $hs - uptime hours; $ms - uptime minutes +$custom - custom format Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -157,7 +152,7 @@ $custom: $ds - uptime days; $hs - uptime hours; $ms - uptime minutes 1 - 14 + 15 1 @@ -197,7 +192,9 @@ $custom: $ds - uptime days; $hs - uptime hours; $ms - uptime minutes $cpu - total load CPU, % -$ccpu - load CPU for each core, % +$cpu0 - load CPU for core 0, % +... +$cpu7 - load CPU for core 7, % Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -216,7 +213,7 @@ $ccpu - load CPU for each core, % 1 - 14 + 15 1 @@ -256,7 +253,9 @@ $ccpu - load CPU for each core, % $cpucl - average CPU clock, MHz -$ccpucl - CPU clock for each core, MHz +$cpucl0 - CPU clock for core 0, MHz +... +$cpucl7 - CPU clock for core 7, MHz Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -275,7 +274,7 @@ $ccpucl - CPU clock for each core, MHz 1 - 14 + 15 1 @@ -311,19 +310,6 @@ $ccpucl - CPU clock for each core, MHz - - - - - 150 - 16777215 - - - - true - - - @@ -346,7 +332,7 @@ $ccpucl - CPU clock for each core, MHz 1 - 14 + 15 1 @@ -404,7 +390,7 @@ $ccpucl - CPU clock for each core, MHz 1 - 14 + 15 1 @@ -462,7 +448,7 @@ $ccpucl - CPU clock for each core, MHz 1 - 14 + 15 1 @@ -521,7 +507,7 @@ $memmb - RAM usage, MB 1 - 14 + 15 1 @@ -580,7 +566,7 @@ $swapmb - swap usage, MB 1 - 14 + 15 1 @@ -619,7 +605,7 @@ $swapmb - swap usage, MB - @@/;@@ - mount point usage, % + $hddN - usage for mount point N, %. Example: $hdd0 Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -638,7 +624,7 @@ $swapmb - swap usage, MB 1 - 14 + 15 1 @@ -677,7 +663,7 @@ $swapmb - swap usage, MB - @@/dev/sda@@ - physical temperature on /dev/sda + $hddtempN - physical temperature on device N. Example: $hddtemp0 Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -696,7 +682,7 @@ $swapmb - swap usage, MB 1 - 14 + 15 1 @@ -736,8 +722,7 @@ $swapmb - swap usage, MB $net - network speed, down/up, KB/s -$netdev - current network device -@@eth0@@ - disable auto select device and set specified device +$netdev - current network device Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter @@ -756,7 +741,7 @@ $netdev - current network device 1 - 14 + 15 1 @@ -815,7 +800,7 @@ $ac - AC status 1 - 14 + 15 1 @@ -833,92 +818,6 @@ $ac - AC status - - - - - - Qt::Horizontal - - - QSizePolicy::Preferred - - - - 120 - 20 - - - - - - - - - 120 - 0 - - - - Battery device - - - - - - - "/sys/class/power_supply/BAT0/capacity" by default - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - - - - Qt::Horizontal - - - QSizePolicy::Preferred - - - - 120 - 20 - - - - - - - - - 120 - 0 - - - - AC device - - - - - - - "/sys/class/power_supply/AC/online" by default - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - @@ -937,31 +836,6 @@ $ac - AC status - - - - - 100 - 0 - - - - - amarok - - - - - mpd - - - - - qmmp - - - - @@ -988,7 +862,7 @@ $title - song title 1 - 14 + 15 1 @@ -1006,6 +880,64 @@ $title - song title + + + + + + + 120 + 0 + + + + Custom + + + true + + + + + + + $custom - get output from custom command + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + 120 + 16777215 + + + + 1 + + + 15 + + + 1 + + + 15 + + + Qt::Horizontal + + + QSlider::TicksAbove + + + + + @@ -1021,6 +953,449 @@ $title - song title + + + Advanced + + + + + + + + + 120 + 0 + + + + Custom time format + + + + + + + $dddd - long weekday +$ddd - short weekday +$dd - day +$d - day w\o zero +$MMMM - long month +$MMM - short month +$MM - month +$M - month w\o zero +$yyyy - year +$yy - short year +$hh - hours (24 only) +$h - hours w\o zero (24 only) +$mm - minutes +$m - minutes w\o zero +$ss - seconds +$s - seconds w\o zero + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + + + + + 120 + 0 + + + + Custom uptime format + + + + + + + $ds - uptime days +$hs - uptime hours +$ms - uptime minutes + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + + + + + + + 120 + 0 + + + + Temperature devices + + + + + + + + 0 + 0 + + + + true + + + + + + + + 100 + 0 + + + + Add + + + + + + + + + Editable +del - remove item + + + true + + + + + + + + + + + + + + 120 + 0 + + + + Mount points + + + + + + + + 0 + 0 + + + + true + + + + + + + + 100 + 0 + + + + Add + + + + + + + + + Editable +del - remove item + + + true + + + + + + + + + + + + + + 120 + 0 + + + + HDD devices + + + + + + + + 0 + 0 + + + + true + + + + + + + + 100 + 0 + + + + Add + + + + + + + + + Editable +del - remove item + + + true + + + + + + + + + + + + 120 + 0 + + + + Network directory + + + + + + + "/sys/class/net" by default + + + + + + + + + + + + 120 + 0 + + + + Disable auto select device and set specified device + + + Set network device + + + + + + + + 0 + 0 + + + + true + + + + + + + + + + + + 120 + 0 + + + + Battery device + + + + + + + "/sys/class/power_supply/BAT0/capacity" by default + + + + + + + + + + + + 120 + 0 + + + + AC device + + + + + + + "/sys/class/power_supply/AC/online" by default + + + + + + + + + + + + 120 + 0 + + + + Music player + + + + + + + + 0 + 0 + + + + + 100 + 0 + + + + + amarok + + + + + mpd + + + + + qmmp + + + + + + + + + + + + + 120 + 0 + + + + Custom command + + + + + + + Command to run, example: +wget -qO- http://ifconfig.me/ip - get external IP + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + Appearance @@ -1362,7 +1737,6 @@ $title - song title lineEdit_cpuclock slider_cpuclock checkBox_temp - comboBox_temp lineEdit_temp slider_temp checkBox_gpu @@ -1389,12 +1763,30 @@ $title - song title checkBox_bat lineEdit_bat slider_bat - lineEdit_batdev - lineEdit_acdev checkBox_player - comboBox_player lineEdit_player slider_player + checkBox_custom + lineEdit_custom + slider_custom + lineEdit_timeFormat + lineEdit_uptimeFormat + comboBox_tempDevice + pushButton_tempDevice + listWidget_tempDevice + comboBox_mount + pushButton_mount + listWidget_mount + comboBox_hddDevice + pushButton_hddDevice + listWidget_hddDevice + lineEdit_netdir + checkBox_netdev + comboBox_netdev + lineEdit_batdev + lineEdit_acdev + comboBox_playerSelect + lineEdit_customCommand spinBox_interval fontComboBox spinBox_fontSize