-rw-r--r-- | korganizer/navigatorbar.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/korganizer/navigatorbar.cpp b/korganizer/navigatorbar.cpp index e4abbf7..1b4ee52 100644 --- a/korganizer/navigatorbar.cpp +++ b/korganizer/navigatorbar.cpp | |||
@@ -152,81 +152,84 @@ NavigatorBar::NavigatorBar( const QDate & date, QWidget *parent, const char *nam | |||
152 | mSelectMonth->setFocusPolicy(NoFocus); | 152 | mSelectMonth->setFocusPolicy(NoFocus); |
153 | setSizePolicy( QSizePolicy ( QSizePolicy::Expanding ,QSizePolicy::Fixed ) ); | 153 | setSizePolicy( QSizePolicy ( QSizePolicy::Expanding ,QSizePolicy::Fixed ) ); |
154 | 154 | ||
155 | } | 155 | } |
156 | 156 | ||
157 | NavigatorBar::~NavigatorBar() | 157 | NavigatorBar::~NavigatorBar() |
158 | { | 158 | { |
159 | } | 159 | } |
160 | QSize NavigatorBar::sizeHint() const | 160 | QSize NavigatorBar::sizeHint() const |
161 | { | 161 | { |
162 | int wid = mCurrentMinWid ; | 162 | int wid = mCurrentMinWid ; |
163 | if ( mPrevYear->isVisible() ) | 163 | if ( mPrevYear->isVisible() ) |
164 | wid += mCurrentButtonMinWid; | 164 | wid += mCurrentButtonMinWid; |
165 | if ( mPrevMonth->isVisible() ) | 165 | if ( mPrevMonth->isVisible() ) |
166 | wid += mCurrentButtonMinWid; | 166 | wid += mCurrentButtonMinWid; |
167 | if ( mPrevWeek->isVisible() ) | 167 | if ( mPrevWeek->isVisible() ) |
168 | wid += mCurrentButtonMinWid; | 168 | wid += mCurrentButtonMinWid; |
169 | if ( mNextMonth->isVisible() ) | 169 | if ( mNextMonth->isVisible() ) |
170 | wid += mCurrentButtonMinWid; | 170 | wid += mCurrentButtonMinWid; |
171 | if ( mNextWeek->isVisible() ) | 171 | if ( mNextWeek->isVisible() ) |
172 | wid += mCurrentButtonMinWid; | 172 | wid += mCurrentButtonMinWid; |
173 | if ( mNextYear->isVisible() ) | 173 | if ( mNextYear->isVisible() ) |
174 | wid += mCurrentButtonMinWid; | 174 | wid += mCurrentButtonMinWid; |
175 | //qDebug("ret %d %d ", wid, mCurrentHei); | 175 | //qDebug("ret %d %d ", wid, mCurrentHei); |
176 | int add = 2; | 176 | return QSize ( wid, mCurrentHei ); |
177 | return QSize ( wid+add, mCurrentHei+add ); | 177 | } |
178 | QSize NavigatorBar::sizeHintTwoButtons() const | ||
179 | { | ||
180 | return QSize ( mCurrentMinWid + 2 * mCurrentButtonMinWid , mCurrentHei ); | ||
178 | } | 181 | } |
179 | void NavigatorBar::resetFont ( QFont fo ) | 182 | void NavigatorBar::resetFont ( QFont fo ) |
180 | { | 183 | { |
181 | 184 | ||
182 | QFont tfont = fo; | 185 | QFont tfont = fo; |
183 | if ( QApplication::desktop()->width() >= 480 ) | 186 | if ( QApplication::desktop()->width() >= 480 ) |
184 | tfont.setPointSize(tfont.pointSize()+2); | 187 | tfont.setPointSize(tfont.pointSize()+2); |
185 | tfont.setBold(true); | 188 | tfont.setBold(true); |
186 | 189 | ||
187 | mSelectMonth->setFont( tfont ); | 190 | mSelectMonth->setFont( tfont ); |
188 | // Set minimum width to width of widest month name label | 191 | // Set minimum width to width of widest month name label |
189 | int i; | 192 | int i; |
190 | int maxwidth = 0; | 193 | int maxwidth = 0; |
191 | QFontMetrics fm ( mSelectMonth->font() ); | 194 | QFontMetrics fm ( mSelectMonth->font() ); |
192 | int width = fm.width("September '00" ); | 195 | int width = fm.width("September '00" ); |
193 | maxwidth = width+2; | 196 | maxwidth = width+2; |
194 | int size = fm.height()+2; | 197 | int size = fm.height()+2; |
195 | if ( QApplication::desktop()->width() >= 480 ) { | 198 | if ( QApplication::desktop()->width() >= 480 ) { |
196 | size += 6; | 199 | size += 6; |
197 | maxwidth+= 6; | 200 | maxwidth+= 6; |
198 | } | 201 | } |
199 | mSelectMonth->setMinimumWidth( maxwidth ); | 202 | mSelectMonth->setMinimumWidth( maxwidth ); |
200 | mSelectMonth->setFixedHeight( size ); | 203 | mSelectMonth->setFixedHeight( size ); |
201 | mPrevYear->setFixedHeight( size ); | 204 | mPrevYear->setFixedHeight( size ); |
202 | mPrevMonth->setFixedHeight( size ); | 205 | mPrevMonth->setFixedHeight( size ); |
203 | mPrevWeek->setFixedHeight( size ); | 206 | mPrevWeek->setFixedHeight( size ); |
204 | mNextMonth->setFixedHeight( size ); | 207 | mNextMonth->setFixedHeight( size ); |
205 | mNextWeek->setFixedHeight( size ); | 208 | mNextWeek->setFixedHeight( size ); |
206 | mNextYear->setFixedHeight ( size ); | 209 | mNextYear->setFixedHeight ( size ); |
207 | mCurrentHei = size; | 210 | mCurrentHei = size +2; |
208 | mCurrentMinWid = maxwidth; | 211 | mCurrentMinWid = maxwidth+2; |
209 | mCurrentButtonMinWid = mPrevYear->sizeHint().width()+2; | 212 | mCurrentButtonMinWid = mPrevYear->sizeHint().width()+2; |
210 | } | 213 | } |
211 | 214 | ||
212 | void NavigatorBar::showButtons( bool left, bool right ) | 215 | void NavigatorBar::showButtons( bool left, bool right ) |
213 | { | 216 | { |
214 | if ( left ) { | 217 | if ( left ) { |
215 | mPrevYear->show(); | 218 | mPrevYear->show(); |
216 | mPrevMonth->show(); | 219 | mPrevMonth->show(); |
217 | } else { | 220 | } else { |
218 | mPrevYear->hide(); | 221 | mPrevYear->hide(); |
219 | mPrevMonth->hide(); | 222 | mPrevMonth->hide(); |
220 | } | 223 | } |
221 | 224 | ||
222 | if ( right ) { | 225 | if ( right ) { |
223 | mNextYear->show(); | 226 | mNextYear->show(); |
224 | mNextMonth->show(); | 227 | mNextMonth->show(); |
225 | } else { | 228 | } else { |
226 | mNextYear->hide(); | 229 | mNextYear->hide(); |
227 | mNextMonth->hide(); | 230 | mNextMonth->hide(); |
228 | } | 231 | } |
229 | if ( !left && !right ) { | 232 | if ( !left && !right ) { |
230 | //mSelectMonth->setMaximumWidth( 1024 ); | 233 | //mSelectMonth->setMaximumWidth( 1024 ); |
231 | mSelectMonth->setSizePolicy( QSizePolicy ( QSizePolicy::Expanding ,QSizePolicy::Fixed ) ); | 234 | mSelectMonth->setSizePolicy( QSizePolicy ( QSizePolicy::Expanding ,QSizePolicy::Fixed ) ); |
232 | } | 235 | } |