--- cairo-dock-plug-ins-3.4.1/System-Monitor/data/CMakeLists.txt.arm 2018-01-26 06:18:56.000000000 +0000 +++ cairo-dock-plug-ins-3.4.1/System-Monitor/data/CMakeLists.txt 2018-02-16 10:32:49.000000000 +0000 @@ -7,7 +7,3 @@ install (FILES ${CMAKE_CURRENT_BINARY_DI button-cpu.svg button-ram.svg DESTINATION ${system_monitordatadir}) - -install (FILES nvidia-config - DESTINATION ${system_monitordatadir} - PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) --- cairo-dock-plug-ins-3.4.1/System-Monitor/src/CMakeLists.txt.arm 2018-01-26 06:18:56.000000000 +0000 +++ cairo-dock-plug-ins-3.4.1/System-Monitor/src/CMakeLists.txt 2018-02-16 10:32:40.000000000 +0000 @@ -6,7 +6,6 @@ SET (cd-System-Monitor_LIB_SRCS applet-config.c applet-config.h applet-cpusage.c applet-cpusage.h applet-rame.c applet-rame.h - applet-nvidia.c applet-nvidia.h applet-top.c applet-top.h applet-monitor.c applet-monitor.h applet-notifications.c applet-notifications.h --- cairo-dock-plug-ins-3.4.1/Doncky/data/CMakeLists.txt.arm 2018-01-26 06:18:56.000000000 +0000 +++ cairo-dock-plug-ins-3.4.1/Doncky/data/CMakeLists.txt 2018-02-16 10:54:50.000000000 +0000 @@ -7,7 +7,3 @@ install (FILES ${CMAKE_CURRENT_BINARY_DI documentation.txt default.xml DESTINATION ${donckydatadir}) - -install (FILES nvidia-config - DESTINATION ${donckydatadir} - PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) --- cairo-dock-plug-ins-3.4.1/Doncky/src/CMakeLists.txt.arm 2018-01-26 06:18:56.000000000 +0000 +++ cairo-dock-plug-ins-3.4.1/Doncky/src/CMakeLists.txt 2018-02-16 10:55:26.000000000 +0000 @@ -9,7 +9,6 @@ SET(cd-Doncky_LIB_SRCS applet-xml.c applet-xml.h applet-cpusage.c applet-cpusage.h applet-rame.c applet-rame.h - applet-nvidia.c applet-nvidia.h applet-disk-usage.c applet-disk-usage.h applet-struct.h ) @@ -68,8 +67,6 @@ install(TARGETS ${PACKAGE_DONCKY} DESTINATION ${pluginsdir}) # applet-monitor.h # applet-rame.c # applet-rame.h -# applet-nvidia.c -# applet-nvidia.h # applet-top.c # applet-top.h # applet-disk-usage.c diff --git a/cairo-dock-plug-ins/Doncky/src/applet-draw.c b/cairo-dock-plug-ins/Doncky/src/applet-draw.c index de48b94..aa7d6e7 100755 --- cairo-dock-plug-ins-3.4.1/Doncky/src/applet-draw.c +++ cairo-dock-plug-ins-3.4.1/Doncky/src/applet-draw.c @@ -24,7 +24,6 @@ #include "applet-struct.h" #include "applet-draw.h" #include "applet-xml.h" -#include "applet-nvidia.h" #include "applet-cpusage.h" #include "applet-disk-usage.h" #include "applet-rame.h" @@ -219,11 +218,6 @@ void cd_launch_command (GldiModuleInstance *myApplet) cd_sysmonitor_get_cpu_data (myApplet); if (myConfig.bShowRam || myConfig.bShowSwap) cd_sysmonitor_get_ram_data (myApplet); - if (myConfig.bShowNvidia) - { - if ((myData.iTimerCount % 3) == 0) // la temperature ne varie pas tres vite et le script nvidia-settings est lourd, on decide donc de ne mettre a jour qu'une fois sur 3. - cd_sysmonitor_get_nvidia_data (myApplet); - } if (! myData.bInitialized) { cd_sysmonitor_get_cpu_info (myApplet); @@ -384,33 +378,6 @@ void cd_launch_command (GldiModuleInstance *myApplet) pTextZone->cResult = g_strdup_printf ("%.2f", _Ko_to_Go(myApplet, myData.swapTotal)); } - else if (strcmp (pTextZone->cCommand, "nvtemp") == 0) - { - myConfig.bShowNvidia = TRUE; - pTextZone->cResult = g_strdup_printf ("%i", myData.iGPUTemp); - } - - else if (strcmp (pTextZone->cCommand, "nvname") == 0) - { - myConfig.bShowNvidia = TRUE; - cd_sysmonitor_get_nvidia_info (myApplet); - pTextZone->cResult = g_strdup (myData.cGPUName); - } - - else if (strcmp (pTextZone->cCommand, "nvdriver") == 0) - { - myConfig.bShowNvidia = TRUE; - cd_sysmonitor_get_nvidia_info (myApplet); - pTextZone->cResult = g_strdup (myData.cDriverVersion); - } - - else if (strcmp (pTextZone->cCommand, "nvram") == 0) - { - myConfig.bShowNvidia = TRUE; - cd_sysmonitor_get_nvidia_info (myApplet); - pTextZone->cResult = g_strdup_printf ("%i", myData.iVideoRam); - } - else if (strcmp (pTextZone->cCommand, "uptime") == 0) { gchar *cUpTime = NULL, *cActivityTime = NULL; diff --git a/cairo-dock-plug-ins/Doncky/src/applet-nvidia.c b/cairo-dock-plug-ins/Doncky/src/applet-nvidia.c index d65d5f0..dfe9a14 100755 --- cairo-dock-plug-ins-3.4.1/Doncky/src/applet-nvidia.c +++ cairo-dock-plug-ins-3.4.1/Doncky/src/applet-nvidia.c @@ -27,7 +27,6 @@ #include #include "applet-struct.h" -#include "applet-nvidia.h" void cd_sysmonitor_get_nvidia_data (GldiModuleInstance *myApplet) { --- cairo-dock-plug-ins/System-Monitor/src/applet-monitor.c +++ cairo-dock-plug-ins/System-Monitor/src/applet-monitor.c @@ -48,11 +48,6 @@ void cd_sysmonitor_get_data (GldiModuleInstance *myApplet) { cd_sysmonitor_get_ram_data (myApplet); } - if (myConfig.bShowNvidia) - { - if ((myData.iTimerCount % 3) == 0) // la temperature ne varie pas tres vite et le script nvidia-settings est lourd, on decide donc de ne mettre a jour qu'une fois sur 3. - cd_sysmonitor_get_nvidia_data (myApplet); - } #ifdef HAVE_SENSORS if (myConfig.bShowCpuTemp || myConfig.bShowFanSpeed) { @@ -127,13 +122,6 @@ gboolean cd_sysmonitor_update_from_data (GldiModuleInstance *myApplet) myData.fSwapPercent, (bOneLine ? " - " : "\n")); } - if (myConfig.bShowNvidia) - { - g_string_append_printf (sInfo, "%s%d°C%s", - (myDesklet || bOneLine ? "GPU:" : ""), - myData.iGPUTemp, - (bOneLine ? " - " : "\n")); - } if (myConfig.bShowCpuTemp) { g_string_append_printf (sInfo, "%s%d°C%s", @@ -171,15 +159,6 @@ gboolean cd_sysmonitor_update_from_data (GldiModuleInstance *myApplet) { s_fValues[i++] = myData.fSwapPercent / 100.; } - if (myConfig.bShowNvidia) - { - s_fValues[i++] = myData.fGpuTempPercent / 100.; - if (myData.bAlerted && myData.iGPUTemp < myConfig.iAlertLimit) - myData.bAlerted = FALSE; //On reinitialise l'alerte quand la temperature descend en dessous de la limite. - - if (!myData.bAlerted && myData.iGPUTemp >= myConfig.iAlertLimit) - cd_nvidia_alert (myApplet); - } #ifdef HAVE_SENSORS if (myConfig.bShowCpuTemp) { @@ -242,16 +221,6 @@ void cd_sysmonitor_format_value (CairoDataRenderer *pRenderer, int iNumValue, gc return ; } } - if (myConfig.bShowNvidia) - { - i ++; - if (i == iNumValue) - { - double fTemp = myConfig.iLowerLimit + fValue * (myConfig.iUpperLimit - myConfig.iLowerLimit); - snprintf (cFormatBuffer, iBufferLength, fTemp < 100. ? " %.0f°" : "%.0f°", fTemp); - return ; - } - } if (myConfig.bShowCpuTemp) { i ++; --- cairo-dock-plug-ins-3.4.1/System-Monitor/src/applet-notifications.c +++ cairo-dock-plug-ins-3.4.1/System-Monitor/src/applet-notifications.c @@ -59,9 +59,6 @@ static void _pop_up_dialog_info (GldiModuleInstance *myApplet) // RAM cd_sysmonitor_get_ram_info (myApplet, pInfo); - // CG - cd_sysmonitor_get_nivdia_info (myApplet, pInfo); - // sensors cd_sysmonitor_get_sensors_info (myApplet, pInfo);