-rw-r--r-- | noncore/settings/sysinfo/storage.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/noncore/settings/sysinfo/storage.cpp b/noncore/settings/sysinfo/storage.cpp index fc583e3..9f70fc5 100644 --- a/noncore/settings/sysinfo/storage.cpp +++ b/noncore/settings/sysinfo/storage.cpp | |||
@@ -61,48 +61,53 @@ FileSysInfo::FileSysInfo( QWidget *parent, const char *name ) | |||
61 | void FileSysInfo::timerEvent(QTimerEvent*) | 61 | void FileSysInfo::timerEvent(QTimerEvent*) |
62 | { | 62 | { |
63 | updateMounts(); | 63 | updateMounts(); |
64 | } | 64 | } |
65 | 65 | ||
66 | void FileSysInfo::updateMounts() | 66 | void FileSysInfo::updateMounts() |
67 | { | 67 | { |
68 | storage->update(); | 68 | storage->update(); |
69 | 69 | ||
70 | if ( rebuildDisks ) | 70 | if ( rebuildDisks ) |
71 | { | 71 | { |
72 | disks.clear(); | 72 | disks.clear(); |
73 | lines.clear(); | 73 | lines.clear(); |
74 | 74 | ||
75 | delete vb; | 75 | delete vb; |
76 | vb = new QVBoxLayout( container/*, n > 3 ? 1 : 5*/ ); | 76 | vb = new QVBoxLayout( container/*, n > 3 ? 1 : 5*/ ); |
77 | 77 | ||
78 | bool frst=TRUE; | 78 | bool frst=TRUE; |
79 | 79 | ||
80 | FileSystem *fs; | 80 | FileSystem *fs; |
81 | for ( QListIterator<FileSystem> it(storage->fileSystems()); it.current(); ++it ) | 81 | for ( QListIterator<FileSystem> it(storage->fileSystems()); it.current(); ++it ) |
82 | { | 82 | { |
83 | fs = it.current(); | 83 | fs = it.current(); |
84 | 84 | ||
85 | if(fs->disk().left(5) == "tmpfs") | ||
86 | { | ||
87 | continue; | ||
88 | } | ||
89 | |||
85 | if ( !frst ) | 90 | if ( !frst ) |
86 | { | 91 | { |
87 | QFrame *f = new QFrame( container ); | 92 | QFrame *f = new QFrame( container ); |
88 | vb->addWidget(f); | 93 | vb->addWidget(f); |
89 | f->setFrameStyle( QFrame::HLine | QFrame::Sunken ); | 94 | f->setFrameStyle( QFrame::HLine | QFrame::Sunken ); |
90 | lines.append(f); | 95 | lines.append(f); |
91 | f->show(); | 96 | f->show(); |
92 | } | 97 | } |
93 | frst = FALSE; | 98 | frst = FALSE; |
94 | 99 | ||
95 | MountInfo *mi = new MountInfo( fs, container ); | 100 | MountInfo *mi = new MountInfo( fs, container ); |
96 | vb->addWidget( mi ); | 101 | vb->addWidget( mi ); |
97 | disks.insert( fs->path(), mi ); | 102 | disks.insert( fs->path(), mi ); |
98 | mi->show(); | 103 | mi->show(); |
99 | QString tempstr = fs->name().left( 2 ); | 104 | QString tempstr = fs->name().left( 2 ); |
100 | if ( tempstr == tr( "CF" ) ) | 105 | if ( tempstr == tr( "CF" ) ) |
101 | QWhatsThis::add( mi, tr( "This graph represents how much memory is currently used on this Compact Flash memory card." ) ); | 106 | QWhatsThis::add( mi, tr( "This graph represents how much memory is currently used on this Compact Flash memory card." ) ); |
102 | else if ( tempstr == tr( "Ha" ) ) | 107 | else if ( tempstr == tr( "Ha" ) ) |
103 | QWhatsThis::add( mi, tr( "This graph represents how much storage is currently used on this hard drive." ) ); | 108 | QWhatsThis::add( mi, tr( "This graph represents how much storage is currently used on this hard drive." ) ); |
104 | else if ( tempstr == tr( "SD" ) ) | 109 | else if ( tempstr == tr( "SD" ) ) |
105 | QWhatsThis::add( mi, tr( "This graph represents how much memory is currently used on this Secure Digital memory card." ) ); | 110 | QWhatsThis::add( mi, tr( "This graph represents how much memory is currently used on this Secure Digital memory card." ) ); |
106 | else if ( tempstr == tr( "SC" ) ) | 111 | else if ( tempstr == tr( "SC" ) ) |
107 | QWhatsThis::add( mi, tr( "This graph represents how much storage is currently used on this hard drive." ) ); | 112 | QWhatsThis::add( mi, tr( "This graph represents how much storage is currently used on this hard drive." ) ); |
108 | else if ( tempstr == tr( "In" ) ) | 113 | else if ( tempstr == tr( "In" ) ) |
@@ -114,49 +119,49 @@ void FileSysInfo::updateMounts() | |||
114 | } | 119 | } |
115 | else | 120 | else |
116 | { | 121 | { |
117 | for (QDictIterator<MountInfo> i(disks); i.current(); ++i) | 122 | for (QDictIterator<MountInfo> i(disks); i.current(); ++i) |
118 | i.current()->updateData(); | 123 | i.current()->updateData(); |
119 | } | 124 | } |
120 | 125 | ||
121 | rebuildDisks = FALSE; | 126 | rebuildDisks = FALSE; |
122 | } | 127 | } |
123 | 128 | ||
124 | void FileSysInfo::disksChanged() | 129 | void FileSysInfo::disksChanged() |
125 | { | 130 | { |
126 | rebuildDisks = TRUE; | 131 | rebuildDisks = TRUE; |
127 | } | 132 | } |
128 | 133 | ||
129 | MountInfo::MountInfo( FileSystem *filesys, QWidget *parent, const char *name ) | 134 | MountInfo::MountInfo( FileSystem *filesys, QWidget *parent, const char *name ) |
130 | : QWidget( parent, name ) | 135 | : QWidget( parent, name ) |
131 | { | 136 | { |
132 | QVBoxLayout *vb = new QVBoxLayout( this, 3 ); | 137 | QVBoxLayout *vb = new QVBoxLayout( this, 3 ); |
133 | 138 | ||
134 | totalSize = new QLabel( this ); | 139 | totalSize = new QLabel( this ); |
135 | vb->addWidget( totalSize ); | 140 | vb->addWidget( totalSize ); |
136 | 141 | ||
137 | fs = filesys; | 142 | fs = filesys; |
138 | title = fs->name(); | 143 | title = fs->name() + "\t (" + fs->path() + ')'; |
139 | 144 | ||
140 | data = new GraphData(); | 145 | data = new GraphData(); |
141 | graph = new BarGraph( this ); | 146 | graph = new BarGraph( this ); |
142 | graph->setFrameStyle( QFrame::Panel | QFrame::Sunken ); | 147 | graph->setFrameStyle( QFrame::Panel | QFrame::Sunken ); |
143 | vb->addWidget( graph, 1 ); | 148 | vb->addWidget( graph, 1 ); |
144 | graph->setData( data ); | 149 | graph->setData( data ); |
145 | 150 | ||
146 | legend = new GraphLegend( this ); | 151 | legend = new GraphLegend( this ); |
147 | legend->setOrientation(Horizontal); | 152 | legend->setOrientation(Horizontal); |
148 | vb->addWidget( legend ); | 153 | vb->addWidget( legend ); |
149 | legend->setData( data ); | 154 | legend->setData( data ); |
150 | 155 | ||
151 | updateData(); | 156 | updateData(); |
152 | } | 157 | } |
153 | 158 | ||
154 | MountInfo::~MountInfo() | 159 | MountInfo::~MountInfo() |
155 | { | 160 | { |
156 | delete data; | 161 | delete data; |
157 | } | 162 | } |
158 | 163 | ||
159 | void MountInfo::updateData() | 164 | void MountInfo::updateData() |
160 | { | 165 | { |
161 | long mult = fs->blockSize() / 1024; | 166 | long mult = fs->blockSize() / 1024; |
162 | long div = 1024 / fs->blockSize(); | 167 | long div = 1024 / fs->blockSize(); |