summaryrefslogtreecommitdiffabout
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--korganizer/koagendaview.cpp2
-rw-r--r--korganizer/koagendaview.h1
2 files changed, 3 insertions, 0 deletions
diff --git a/korganizer/koagendaview.cpp b/korganizer/koagendaview.cpp
index b5596d9..05216a7 100644
--- a/korganizer/koagendaview.cpp
+++ b/korganizer/koagendaview.cpp
@@ -176,82 +176,84 @@ int TimeLabels::minimumWidth() const
176/** updates widget's internal state */ 176/** updates widget's internal state */
177void TimeLabels::updateConfig() 177void TimeLabels::updateConfig()
178{ 178{
179 // set the font 179 // set the font
180 // config->setGroup("Fonts"); 180 // config->setGroup("Fonts");
181 // QFont font = config->readFontEntry("TimeBar Font"); 181 // QFont font = config->readFontEntry("TimeBar Font");
182 setFont(KOPrefs::instance()->mTimeBarFont); 182 setFont(KOPrefs::instance()->mTimeBarFont);
183 183
184 // update geometry restrictions based on new settings 184 // update geometry restrictions based on new settings
185 setFixedWidth(minimumWidth()); 185 setFixedWidth(minimumWidth());
186 186
187 // update HourSize 187 // update HourSize
188 mCellHeight = KOPrefs::instance()->mHourSize*4; 188 mCellHeight = KOPrefs::instance()->mHourSize*4;
189 resizeContents(50,mRows * mCellHeight); 189 resizeContents(50,mRows * mCellHeight);
190} 190}
191 191
192/** update time label positions */ 192/** update time label positions */
193void TimeLabels::positionChanged() 193void TimeLabels::positionChanged()
194{ 194{
195 int adjustment = mAgenda->contentsY(); 195 int adjustment = mAgenda->contentsY();
196 setContentsPos(0, adjustment); 196 setContentsPos(0, adjustment);
197} 197}
198 198
199/** */ 199/** */
200void TimeLabels::setAgenda(KOAgenda* agenda) 200void TimeLabels::setAgenda(KOAgenda* agenda)
201{ 201{
202 mAgenda = agenda; 202 mAgenda = agenda;
203} 203}
204 204
205void TimeLabels::contentsMousePressEvent ( QMouseEvent * e) 205void TimeLabels::contentsMousePressEvent ( QMouseEvent * e)
206{ 206{
207 mMouseDownY = e->pos().y(); 207 mMouseDownY = e->pos().y();
208 mOrgCap = topLevelWidget()->caption();
208} 209}
209 210
210void TimeLabels::contentsMouseMoveEvent ( QMouseEvent * e ) 211void TimeLabels::contentsMouseMoveEvent ( QMouseEvent * e )
211{ 212{
212 int diff = mMouseDownY - e->pos().y(); 213 int diff = mMouseDownY - e->pos().y();
213 if ( diff < 10 && diff > -10 ) 214 if ( diff < 10 && diff > -10 )
214 return; 215 return;
215 int tSize = KOPrefs::instance()->mHourSize + (diff/10) ; 216 int tSize = KOPrefs::instance()->mHourSize + (diff/10) ;
216 if ( tSize < 4 ) 217 if ( tSize < 4 )
217 tSize = 4; 218 tSize = 4;
218 if ( tSize > 18 ) 219 if ( tSize > 18 )
219 tSize = 18; 220 tSize = 18;
220 tSize = (tSize-2)/2; 221 tSize = (tSize-2)/2;
221 topLevelWidget()->setCaption(i18n("New Agendasize: %1").arg(tSize)); 222 topLevelWidget()->setCaption(i18n("New Agendasize: %1").arg(tSize));
222 223
223} 224}
224void TimeLabels::contentsMouseReleaseEvent ( QMouseEvent * e ) 225void TimeLabels::contentsMouseReleaseEvent ( QMouseEvent * e )
225{ 226{
227 topLevelWidget()->setCaption( mOrgCap );
226 int diff = mMouseDownY - e->pos().y(); 228 int diff = mMouseDownY - e->pos().y();
227 if ( diff < 10 && diff > -10 ) 229 if ( diff < 10 && diff > -10 )
228 return; 230 return;
229 int tSize = KOPrefs::instance()->mHourSize + (diff/10); 231 int tSize = KOPrefs::instance()->mHourSize + (diff/10);
230 if ( tSize < 4 ) 232 if ( tSize < 4 )
231 tSize = 4; 233 tSize = 4;
232 if ( tSize > 18 ) 234 if ( tSize > 18 )
233 tSize = 18; 235 tSize = 18;
234 tSize = (tSize/2)*2; 236 tSize = (tSize/2)*2;
235 if ( tSize == KOPrefs::instance()->mHourSize ) 237 if ( tSize == KOPrefs::instance()->mHourSize )
236 return; 238 return;
237 KOPrefs::instance()->mHourSize = tSize; 239 KOPrefs::instance()->mHourSize = tSize;
238 emit scaleChanged(); 240 emit scaleChanged();
239} 241}
240 242
241/** This is called in response to repaint() */ 243/** This is called in response to repaint() */
242void TimeLabels::paintEvent(QPaintEvent*) 244void TimeLabels::paintEvent(QPaintEvent*)
243{ 245{
244 246
245 // kdDebug() << "paintevent..." << endl; 247 // kdDebug() << "paintevent..." << endl;
246 // this is another hack! 248 // this is another hack!
247 // QPainter painter(this); 249 // QPainter painter(this);
248 //QString c 250 //QString c
249 repaintContents(contentsX(), contentsY(), visibleWidth(), visibleHeight()); 251 repaintContents(contentsX(), contentsY(), visibleWidth(), visibleHeight());
250} 252}
251 253
252//////////////////////////////////////////////////////////////////////////// 254////////////////////////////////////////////////////////////////////////////
253 255
254EventIndicator::EventIndicator(Location loc,QWidget *parent,const char *name) 256EventIndicator::EventIndicator(Location loc,QWidget *parent,const char *name)
255 : QFrame(parent,name) 257 : QFrame(parent,name)
256{ 258{
257 mColumns = 1; 259 mColumns = 1;
diff --git a/korganizer/koagendaview.h b/korganizer/koagendaview.h
index 221b0ea..3cf938f 100644
--- a/korganizer/koagendaview.h
+++ b/korganizer/koagendaview.h
@@ -48,64 +48,65 @@ class KDGanttMinimizeSplitter;
48class TimeLabels : public QScrollView { 48class TimeLabels : public QScrollView {
49 Q_OBJECT 49 Q_OBJECT
50 public: 50 public:
51 TimeLabels(int rows,QWidget *parent=0,const char *name=0,WFlags f=0); 51 TimeLabels(int rows,QWidget *parent=0,const char *name=0,WFlags f=0);
52 52
53 void setCellHeight(int height); 53 void setCellHeight(int height);
54 54
55 /** Calculates the minimum width */ 55 /** Calculates the minimum width */
56 virtual int minimumWidth() const; 56 virtual int minimumWidth() const;
57 57
58 /** updates widget's internal state */ 58 /** updates widget's internal state */
59 void updateConfig(); 59 void updateConfig();
60 60
61 /** */ 61 /** */
62 void setAgenda(KOAgenda* agenda); 62 void setAgenda(KOAgenda* agenda);
63 63
64 /** */ 64 /** */
65 virtual void paintEvent(QPaintEvent* e); 65 virtual void paintEvent(QPaintEvent* e);
66 void contentsMousePressEvent ( QMouseEvent * ) ; 66 void contentsMousePressEvent ( QMouseEvent * ) ;
67 void contentsMouseReleaseEvent ( QMouseEvent * ); 67 void contentsMouseReleaseEvent ( QMouseEvent * );
68 void contentsMouseMoveEvent ( QMouseEvent * ); 68 void contentsMouseMoveEvent ( QMouseEvent * );
69 69
70 public slots: 70 public slots:
71 /** update time label positions */ 71 /** update time label positions */
72 void positionChanged(); 72 void positionChanged();
73 signals: 73 signals:
74 void scaleChanged(); 74 void scaleChanged();
75 protected: 75 protected:
76 void drawContents(QPainter *p,int cx, int cy, int cw, int ch); 76 void drawContents(QPainter *p,int cx, int cy, int cw, int ch);
77 77
78 private: 78 private:
79 int mMouseDownY; 79 int mMouseDownY;
80 QString mOrgCap;
80 int mRows; 81 int mRows;
81 int mCellHeight; 82 int mCellHeight;
82 83
83 /** */ 84 /** */
84 KOAgenda* mAgenda; 85 KOAgenda* mAgenda;
85}; 86};
86 87
87class EventIndicator : public QFrame { 88class EventIndicator : public QFrame {
88 Q_OBJECT 89 Q_OBJECT
89 public: 90 public:
90 enum Location { Top, Bottom }; 91 enum Location { Top, Bottom };
91 EventIndicator(Location loc=Top,QWidget *parent=0,const char *name=0); 92 EventIndicator(Location loc=Top,QWidget *parent=0,const char *name=0);
92 virtual ~EventIndicator(); 93 virtual ~EventIndicator();
93 94
94 void changeColumns(int columns); 95 void changeColumns(int columns);
95 void setPaintWidget( KDGanttMinimizeSplitter* ); 96 void setPaintWidget( KDGanttMinimizeSplitter* );
96 void setXOffset( int ); 97 void setXOffset( int );
97 void enableColumn(int column, bool enable); 98 void enableColumn(int column, bool enable);
98 99
99 protected: 100 protected:
100 void drawContents(QPainter *); 101 void drawContents(QPainter *);
101 102
102 private: 103 private:
103 int mXOffset; 104 int mXOffset;
104 KDGanttMinimizeSplitter* mPaintWidget; 105 KDGanttMinimizeSplitter* mPaintWidget;
105 int mColumns; 106 int mColumns;
106 QHBox *mTopBox; 107 QHBox *mTopBox;
107 QBoxLayout *mTopLayout; 108 QBoxLayout *mTopLayout;
108 Location mLocation; 109 Location mLocation;
109 QPixmap mPixmap; 110 QPixmap mPixmap;
110 QMemArray<bool> mEnabled; 111 QMemArray<bool> mEnabled;
111}; 112};