diff -ur cpuinfo/src/cpuinfo.cpp cpuinfo.new/src/cpuinfo.cpp
--- cpuinfo/src/cpuinfo.cpp 2006-06-21 03:30:27.000000000 +0200
+++ cpuinfo.new/src/cpuinfo.cpp 2006-06-21 03:28:23.000000000 +0200
@@ -157,6 +157,8 @@
if(cpuFreqLabel->text() != value)
cpuFreqLabel->setText( value );
+ updateWidths();
+
// make the kicker relayout the panel and requery widthForHeight() or heightForWidth()
//emit updateLayout();
}
@@ -198,11 +200,32 @@
connect(prefs->temperatureComboBox, SIGNAL(activated(int)), this, SLOT(setTempDescription(int)));
connect(prefs->frequencyComboBox, SIGNAL(activated(int)), this, SLOT(setFreqDescription(int)));
+ //alignment boxes
+ const char* alignments[] = { "Left", "Center", "Right", 0 };
+ prefs->tempAlignBox->clear();
+ prefs->tempAlignBox->insertStrList(alignments);
+ prefs->freqAlignBox->clear();
+ prefs->freqAlignBox->insertStrList(alignments);
+
//set the current appearance prefs
prefs->tempColorButton->setColor(cpuTempLabel->foregroundColor());
prefs->tempFontRequester->setFont(cpuTempLabel->font());
+ if(cpuTempLabel->alignment() == Qt::AlignLeft)
+ prefs->tempAlignBox->setCurrentItem(0);
+ if(cpuTempLabel->alignment() == Qt::AlignRight)
+ prefs->tempAlignBox->setCurrentItem(2);
+ else
+ prefs->tempAlignBox->setCurrentItem(1);
+
prefs->freqColorButton->setColor(cpuFreqLabel->foregroundColor());
prefs->freqFontRequester->setFont(cpuFreqLabel->font());
+ if(cpuFreqLabel->alignment() == Qt::AlignLeft)
+ prefs->freqAlignBox->setCurrentItem(0);
+ if(cpuFreqLabel->alignment() == Qt::AlignRight)
+ prefs->freqAlignBox->setCurrentItem(2);
+ else
+ prefs->freqAlignBox->setCurrentItem(1);
+
prefs->spinBoxSampleRate->setValue(sampleRate);
}
@@ -249,12 +272,24 @@
cpuTempLabel->setPaletteForegroundColor(tempColor);
ksConfig->writeEntry( "tempColor", tempColor );
}
- //temperatur font
+ //temperature font
QFont tempFont = prefs->tempFontRequester->font();
if(cpuTempLabel->font() != tempFont){
cpuTempLabel->setFont(tempFont);
ksConfig->writeEntry( "tempFont", tempFont );
}
+ //temperature alignment
+ int tempAlignId = prefs->tempAlignBox->currentItem();
+ Qt::AlignmentFlags tempAlign = Qt::AlignHCenter;
+ if(tempAlignId == 0){
+ tempAlign = Qt::AlignLeft;
+ }else if(tempAlignId == 2){
+ tempAlign = Qt::AlignRight;
+ }
+ if(cpuTempLabel->alignment() != tempAlign){
+ cpuTempLabel->setAlignment(tempAlign);
+ ksConfig->writeEntry( "tempAlign", tempAlign );
+ }
//frequency color
QColor freqColor = prefs->freqColorButton->color();
if(cpuFreqLabel->foregroundColor() != freqColor ){
@@ -267,6 +302,18 @@
cpuFreqLabel->setFont(freqFont);
ksConfig->writeEntry( "freqFont", freqFont );
}
+ //frequency alignment
+ int freqAlignId = prefs->freqAlignBox->currentItem();
+ Qt::AlignmentFlags freqAlign = Qt::AlignHCenter;
+ if(freqAlignId == 0){
+ freqAlign = Qt::AlignLeft;
+ }else if(freqAlignId == 2){
+ freqAlign = Qt::AlignRight;
+ }
+ if(cpuFreqLabel->alignment() != freqAlign){
+ cpuFreqLabel->setAlignment(freqAlign);
+ ksConfig->writeEntry( "freqAlign", freqAlign );
+ }
//sample rate
if(sampleRate != prefs->spinBoxSampleRate->value()){
sampleRate = prefs->spinBoxSampleRate->value();
@@ -282,23 +329,28 @@
setFrequencySource(prefs->frequencyComboBox->currentItem());
ksConfig->writeEntry( "frequencyItem", frequencyItem );
}
-
+
ksConfig->sync();
+ updateWidths();
+
// reset cached witdh for height
cachedWFH = 0;
}
void CPUInfo::loadPreferences(){
+
int tmp = ksConfig->readNumEntry( "sampleRate" );
if(tmp != 0) //check whether the entry is set or not
sampleRate = tmp;
-
+
cpuTempLabel->setFont(ksConfig->readFontEntry("tempFont"));
cpuTempLabel->setPaletteForegroundColor(ksConfig->readColorEntry("tempColor"));
+ cpuTempLabel->setAlignment(ksConfig->readNumEntry("tempAlign", 4));
cpuFreqLabel->setFont(ksConfig->readFontEntry("freqFont"));
cpuFreqLabel->setPaletteForegroundColor(ksConfig->readColorEntry("freqColor"));
+ cpuFreqLabel->setAlignment(ksConfig->readNumEntry("freqAlign", 4));
if(ksConfig->readNumEntry("thermalItem") < cpudata.getThermalSources().size())
setThermalSource(ksConfig->readNumEntry("thermalItem"));
@@ -385,3 +437,11 @@
text.append("");
tip(rect(), text);
}
+
+void CPUInfo::updateWidths(){
+ #define max(a,b) (((a)>(b))?(a):(b))
+ int w = max(cpuFreqLabel->sizeHint().width(), cpuTempLabel->sizeHint().width());
+ #undef max
+ cpuTempLabel->setFixedWidth(w);
+ cpuFreqLabel->setFixedWidth(w);
+}
diff -ur cpuinfo/src/cpuinfo.h cpuinfo.new/src/cpuinfo.h
--- cpuinfo/src/cpuinfo.h 2006-06-21 03:30:27.000000000 +0200
+++ cpuinfo.new/src/cpuinfo.h 2006-06-21 02:39:55.000000000 +0200
@@ -147,8 +147,9 @@
protected:
void mousePressEvent( QMouseEvent* e );
- void maybeTip( const QPoint& pos);
+ void maybeTip( const QPoint& pos);
private:
+ void updateWidths();
KConfig* ksConfig;
FlowLayout* layout;
mutable int cachedWFH;
diff -ur cpuinfo/src/prefs.ui cpuinfo.new/src/prefs.ui
--- cpuinfo/src/prefs.ui 2006-06-21 03:30:27.000000000 +0200
+++ cpuinfo.new/src/prefs.ui 2006-06-21 00:18:55.000000000 +0200
@@ -125,15 +125,39 @@
Horizontal
- Expanding
+ Fixed
- 350
+ 20
20
+
+
+ tempAligntextLabel
+
+
+ Alignment:
+
+
+
+
+ tempAlignBox
+
+
+
+
+ spacer2
+
+
+ Horizontal
+
+
+ Expanding
+
+
@@ -273,21 +297,45 @@
- spacer2
+ spacer3
Horizontal
- Expanding
+ Fixed
- 360
+ 20
20
+
+
+ freqAligntextLabel
+
+
+ Alignment:
+
+
+
+
+ freqAlignBox
+
+
+
+
+ spacer4
+
+
+ Horizontal
+
+
+ Expanding
+
+