summaryrefslogtreecommitdiffabout
authorzautrix <zautrix>2005-04-01 19:24:18 (UTC)
committer zautrix <zautrix>2005-04-01 19:24:18 (UTC)
commitb1e3bf53b1c4cc46ef0a2ded04338bc38a640161 (patch) (side-by-side diff)
tree7f6aecc33d464e28d18e07b0663450e917ea594b
parent1022d8763a5185c74d1fb1fba9857d6e3afd9ff5 (diff)
downloadkdepimpi-b1e3bf53b1c4cc46ef0a2ded04338bc38a640161.zip
kdepimpi-b1e3bf53b1c4cc46ef0a2ded04338bc38a640161.tar.gz
kdepimpi-b1e3bf53b1c4cc46ef0a2ded04338bc38a640161.tar.bz2
fix
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/koagendaview.cpp16
-rw-r--r--microkde/KDGanttMinimizeSplitter.cpp7
2 files changed, 16 insertions, 7 deletions
diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp
index 99f547a..667ff2a 100644
--- a/korganizer/koagendaview.cpp
+++ b/korganizer/koagendaview.cpp
@@ -145,25 +145,25 @@ void TimeLabels::drawContents(QPainter *p,int cx, int cy, int cw, int ch)
break;
-- pointS;
}
fm = QFontMetrics( nFont );
timeHeight = fm.ascent();
}
//timeHeight -= (timeHeight/4-2);
QFont sFont = nFont;
sFont.setPointSize( sFont.pointSize()/2 );
QFontMetrics fmS( sFont );
int sHei = fmS.ascent() ;
//sHei -= (sHei/4-2);
- int startW = this->width() - 2*frameWidth()-1;
+ int startW = this->width() - frameWidth()-2;
int tw2 = fmS.width(suffix);
while (y < cy + ch) {
p->drawLine(cx,y,cw,y);
hour.setNum(cell);
// handle 24h and am/pm time formats
if (KGlobal::locale()->use12Clock()) {
if (cell > 11) suffix = "pm";
else
suffix = "am";
if (cell == 0) hour.setNum(12);
if (cell > 12) hour.setNum(cell - 12);
@@ -198,28 +198,36 @@ int TimeLabels::minimumWidth() const
{
return mMiniWidth;
}
/** updates widget's internal state */
void TimeLabels::updateConfig()
{
mRedrawNeeded = true;
// set the font
// config->setGroup("Fonts");
// QFont font = config->readFontEntry("TimeBar Font");
setFont(KOPrefs::instance()->mTimeBarFont);
- QString test = "20oo";
+ QString test = "20";
if (KGlobal::locale()->use12Clock())
- test = "12mi";
- mMiniWidth = fontMetrics().width(test) + frameWidth()*2 +1 ;
+ test = "12";
+ mMiniWidth = fontMetrics().width(test);
+ if (KGlobal::locale()->use12Clock())
+ test = "pm";
+ else
+ test = "00";
+ QFont sFont = font();
+ sFont.setPointSize( sFont.pointSize()/2 );
+ QFontMetrics fmS( sFont );
+ mMiniWidth += fmS.width( test ) + frameWidth()*2 +4 ;
// update geometry restrictions based on new settings
setFixedWidth( mMiniWidth );
// update HourSize
mCellHeight = KOPrefs::instance()->mHourSize*4;
resizeContents(50,mRows * mCellHeight);
}
/** update time label positions */
void TimeLabels::positionChanged()
{
int adjustment = mAgenda->contentsY();
diff --git a/microkde/KDGanttMinimizeSplitter.cpp b/microkde/KDGanttMinimizeSplitter.cpp
index d675517..6cb1f31 100644
--- a/microkde/KDGanttMinimizeSplitter.cpp
+++ b/microkde/KDGanttMinimizeSplitter.cpp
@@ -669,33 +669,34 @@ void KDGanttMinimizeSplitter::setRubberband( int p )
} else {
if ( opaqueOldPos >= 0 )
paint.drawRect( r.x(), opaqueOldPos + sw/2 - rBord,
r.width(), 2*rBord );
if ( p >= 0 )
paint.drawRect( r.x(), p + sw/2 - rBord, r.width(), 2*rBord );
}
opaqueOldPos = p;
#else
if ( !mRubberBand ) {
mRubberBand = new QFrame( 0, "rubber", WStyle_NoBorder | WStyle_Customize | WStyle_StaysOnTop);
mRubberBand->setFrameStyle( Box | Raised );
- mRubberBand->setPalette( QPalette ( Qt::red.light(),Qt::red.dark() ) );
+ //mRubberBand->setPalette( QPalette ( Qt::red.light(),Qt::red.dark() ) );
+ mRubberBand->setPalette( QPalette ( QColor( 178,18,188), QColor( 242,27,255 ) ));
}
QRect r = contentsRect();
static int rBord = 0; //Themable????
if ( !rBord ) {
if (QApplication::desktop()->width() <= 320 )
- rBord = 4;
+ rBord = 3;
else
- rBord = 5;
+ rBord = 4;
}
int sw = style().splitterWidth();
if ( orient == Horizontal ) {
if ( p >= 0 ) {
QPoint geo = mapToGlobal (QPoint ( p + sw/2 - rBord, r.y()));
mRubberBand->setGeometry( geo.x(), geo.y(), 2*rBord, r.height() );
}
} else {
if ( p >= 0 ) {
QPoint geo = mapToGlobal (QPoint ( r.x(), p + sw/2 - rBord));
mRubberBand->setGeometry( geo.x(), geo.y(), r.width(), 2*rBord);
}