← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/cairo-dock-plug-ins/oneiric-updates

« back to all changes in this revision

Viewing changes to System-Monitor/src/applet-monitor.c

  • Committer: Kees Cook
  • Date: 2011-08-11 23:17:39 UTC
  • mfrom: (20.1.1 cairo-dock-plug-ins)
  • Revision ID: kees@outflux.net-20110811231739-cteedan51tmdg77v
Tags: 2.4.0~0beta2-0ubuntu1
releasing version 2.4.0~0beta2-0ubuntu1

Show diffs side-by-side

added added

removed removed

Lines of Context:
System-Monitor/src/applet-monitor.c
102
102
                                if (myConfig.bShowCpu)
103
103
                                {
104
104
                                        g_string_printf (sInfo, (myData.fCpuPercent < 10 ? "%s%.1f%%%s" : "%s%.0f%%%s"),
105
 
                                                (myDesklet ? "CPU:" : ""),
 
105
                                                (myDesklet || bOneLine ? "CPU:" : ""),
106
106
                                                myData.fCpuPercent,
107
107
                                                (bOneLine ? " - " : "\n"));
108
108
                                }
109
109
                                if (myConfig.bShowRam)
110
110
                                {
111
111
                                        g_string_append_printf (sInfo, (myData.fRamPercent < 10 ? "%s%.1f%%%s" : "%s%.0f%%%s"),
112
 
                                                (myDesklet ? "RAM:" : ""),
 
112
                                                (myDesklet || bOneLine ? "RAM:" : ""),
113
113
                                                myData.fRamPercent,
114
114
                                                (bOneLine ? " - " : "\n"));
115
115
                                }
116
116
                                if (myConfig.bShowSwap)
117
117
                                {
118
118
                                        g_string_append_printf (sInfo, (myData.fSwapPercent < 10 ? "%s%.1f%%%s" : "%s%.0f%%%s"),
119
 
                                                (myDesklet ? "SWAP:" : ""),
 
119
                                                (myDesklet || bOneLine ? "SWAP:" : ""),
120
120
                                                myData.fSwapPercent,
121
121
                                                (bOneLine ? " - " : "\n"));
122
122
                                }
123
123
                                if (myConfig.bShowNvidia)
124
124
                                {
125
125
                                        g_string_append_printf (sInfo, "%s%d°C%s",
126
 
                                                (myDesklet ? "GPU:" : ""),
 
126
                                                (myDesklet || bOneLine ? "GPU:" : ""),
127
127
                                                myData.iGPUTemp,
128
128
                                                (bOneLine ? " - " : "\n"));
129
129
                                }
130
130
                                if (myConfig.bShowCpuTemp)
131
131
                                {
132
132
                                        g_string_append_printf (sInfo, "%s%d°C%s",
133
 
                                                (myDesklet ? "CPU:" : ""),
 
133
                                                (myDesklet || bOneLine ? "CPU:" : ""),
134
134
                                                myData.iCPUTemp,
135
135
                                                (bOneLine ? " - " : "\n"));
136
136
                                }
137
137
                                if (myConfig.bShowFanSpeed)
138
138
                                {
139
139
                                        g_string_append_printf (sInfo, "%s%drpm%s",
140
 
                                                (myDesklet ? "FAN:" : ""),
 
140
                                                (myDesklet || bOneLine ? "FAN:" : ""),
141
141
                                                myData.iFanSpeed,
142
142
                                                (bOneLine ? " - " : "\n"));
143
143
                                }