← Back to branch summary

~ubuntu-branches/ubuntu/quantal/cairo-dock-plug-ins/quantal-201208191523

« back to all changes in this revision

Viewing changes to System-Monitor/src/applet-struct.h

  • Committer: Bazaar Package Importer
  • Author(s): Matthieu Baerts (matttbe)
  • Date: 2011-04-20 20:46:51 UTC
  • mfrom: (1.1.9 upstream)
  • Revision ID: james.westby@ubuntu.com-20110420204651-ftnpzesj6uc7qeul
Tags: 2.3.0~1-0ubuntu1
https://launchpad.net/bugs/723995
* New Upstream Version (LP: #723995)
* Upstream short ChangeLog (since 2.3.0~0rc1):
 - Updated translations
 - Updated the integration of the new versions of kwin and compiz
    (Switcher, ShowDesktop, etc.)
 - Removed a lot of useless g_print
 - Updated a few plug-ins to fit with the new version of the API (gldit)
 - Fixed a few bugs
 - Updated MeMenu, MessagingMenu and Status-Notifier to works
    with the latest version of dbusmenu, etc.
* Switch to dpkg-source 3.0 (quilt) format
* debian/cairo-dock-plug-ins.install:
 - Added new files (interfaces for python, ruby, vala and mono)
* debian/control:
 - Added new dependences for new applets (sensors and zeitgeist)
    and new interfaces (python, valac, ruby and mono)
 - Updated the version of cairo-dock build-dependences
* debian/rules:
 - Added a new CMake flag to install python interface in debian/tmp
* Updated debian/watch

Show diffs side-by-side

added added

removed removed

Lines of Context:
System-Monitor/src/applet-struct.h
48
48
        gdouble fSmoothFactor;
49
49
        gboolean bShowCpu;
50
50
        gboolean bShowRam;
 
51
        gboolean bShowSwap;
51
52
        gboolean bShowNvidia;
52
 
        gboolean bShowSwap;
 
53
        gboolean bShowCpuTemp;
 
54
        gboolean bShowFanSpeed;
53
55
        gboolean bShowFreeMemory;
54
56
        
55
57
        CairoDockInfoDisplay iInfoDisplay;
89
91
        gdouble fLastCheckTime;
90
92
        } CDProcess;
91
93
 
 
94
typedef struct {
 
95
        GHashTable *pProcessTable;
 
96
        CDProcess **pTopList;
 
97
        GTimer *pTopClock;
 
98
        gboolean bSortTopByRam;
 
99
        gint iNbDisplayedProcesses;
 
100
        gdouble fUserHZ;
 
101
        gulong iMemPageSize;
 
102
        gint iNbCPU;
 
103
        CairoDockModuleInstance *pApplet;
 
104
        } CDTopSharedMemory;
 
105
        
92
106
struct _AppletData {
93
107
        // infos, constantes.
94
108
        gint iNbCPU;
108
122
        unsigned long long ramTotal, ramFree, ramUsed, ramBuffers, ramCached;
109
123
        unsigned long long swapTotal, swapFree, swapUsed;
110
124
        gint iGPUTemp;
 
125
        gint iCPUTemp;
 
126
        gint iFanSpeed;
111
127
        gdouble fCpuPercent;
112
128
        gdouble fPrevCpuPercent;
113
129
        gdouble fRamPercent,fSwapPercent;
118
134
        gdouble fPrevCpuTempPercent;
119
135
        gdouble fFanSpeedPercent;
120
136
        gdouble fPrevFanSpeedPercent;
 
137
        gdouble fMaxFanSpeed;
121
138
        gboolean bNeedsUpdate;
122
139
        gint iTimerCount;
 
140
        gboolean bCpuTempAlarm;
 
141
        gboolean bFanAlarm;
 
142
        gint iCPUTempMin, iCPUTempMax;
123
143
        // end of shared memory.
124
144
        gboolean bAlerted;
 
145
        gboolean bCPUAlerted;
 
146
        gboolean bFanAlerted;
125
147
        gint iCount;  // pour sous-echantilloner les acquisitions de valeurs moins variables.
126
148
        
127
 
        guint iNbProcesses;
 
149
        // 'top' variables.
 
150
        guint iNbProcesses;  // last total number of processes.
 
151
        gboolean bSortTopByRam;  // current state of the cpu/ram button on the dialog.
128
152
        CairoDialog *pTopDialog;
129
 
        cairo_surface_t *pTopSurface;
130
153
        CairoDockTask *pTopTask;
131
 
        // shared memory for the "top" thread.
132
 
        GHashTable *pProcessTable;
133
 
        CDProcess **pTopList;
134
 
        GTimer *pTopClock;
135
 
        gboolean bSortTopByRam;
136
 
        // end of shared memory.
137
154
} ;
138
155
 
139
156