diff options
Diffstat (limited to 'src/note.cpp')
| -rw-r--r-- | src/note.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/note.cpp b/src/note.cpp index 94eab87..436441d 100644 --- a/src/note.cpp +++ b/src/note.cpp @@ -73,7 +73,7 @@ Note::Note(Basket *parent) m_x(0), m_y(-1), m_width(-1), m_height(-1), m_groupWidth(250), m_isFolded(false), m_firstChild(0L), m_parentNote(0), - m_basket(parent), m_content(0), m_addedDate(TQDateTime::tqcurrentDateTime()), m_lastModificationDate(TQDateTime::tqcurrentDateTime()), + m_basket(parent), m_content(0), m_addedDate(TQDateTime::currentDateTime()), m_lastModificationDate(TQDateTime::currentDateTime()), m_computedAreas(false), m_onTop(false), m_deltaX(0), m_deltaY(0), m_deltaHeight(0), m_collapseFinished(true), m_expandingFinished(true), m_hovered(false), m_hoveredZone(Note::None), m_focused(false), m_selected(false), m_wasInLastSelectionRect(false), @@ -1284,7 +1284,7 @@ void Note::drawExpander(TQPainter *painter, int x, int y, const TQColor &backgro // If the current style is a KStyle, use it to draw the expander (plus or minus): if (dynamic_cast<KStyle*>(&(kapp->tqstyle())) != NULL) { // Set the 4 rounded corners background to background color: - TQColorGroup cg(basket->tqcolorGroup()); + TQColorGroup cg(basket->colorGroup()); cg.setColor(TQColorGroup::Base, background); // Fill the inside of the expander in white, typically: @@ -1304,7 +1304,7 @@ void Note::drawExpander(TQPainter *painter, int x, int y, const TQColor &backgro } else { int width = EXPANDER_WIDTH; int height = EXPANDER_HEIGHT; - const TQColorGroup &cg = basket->tqcolorGroup(); + const TQColorGroup &cg = basket->colorGroup(); // Fill white area: painter->fillRect(x + 1, y + 1, width - 2, height - 2, cg.base()); @@ -1979,7 +1979,7 @@ void Note::draw(TQPainter *painter, const TQRect &clipRect) } // Determine the colors (for the richText drawing) and the text color (for the tags arrow too): - TQColorGroup cg(basket()->tqcolorGroup()); + TQColorGroup cg(basket()->colorGroup()); cg.setColor(TQColorGroup::Text, (m_computedState.textColor().isValid() ? m_computedState.textColor() : basket()->textColor()) ); cg.setColor(TQColorGroup::Background, bgColor); if (isSelected()) @@ -1990,14 +1990,14 @@ void Note::draw(TQPainter *painter, const TQRect &clipRect) TQColor textColor = cg.color(TQColorGroup::Text); TQColor light = Tools::mixColor(textColor, bgColor); TQColor mid = Tools::mixColor(textColor, light); - painter2.setPen(light);//TQPen(basket()->tqcolorGroup().dark().light(150))); + painter2.setPen(light);//TQPen(basket()->colorGroup().dark().light(150))); painter2.drawLine(xIcon, yIcon + 6, xIcon + 4, yIcon + 6); - painter2.setPen(mid);//TQPen(basket()->tqcolorGroup().dark())); + painter2.setPen(mid);//TQPen(basket()->colorGroup().dark())); painter2.drawLine(xIcon + 1, yIcon + 7, xIcon + 3, yIcon + 7); - painter2.setPen(textColor);//TQPen(basket()->tqcolorGroup().foreground())); + painter2.setPen(textColor);//TQPen(basket()->colorGroup().foreground())); painter2.drawPoint(xIcon + 2, yIcon + 8); } else if (m_haveInvisibleTags) { - painter2.setPen(cg.color(TQColorGroup::Text)/*TQPen(basket()->tqcolorGroup().foreground())*/); + painter2.setPen(cg.color(TQColorGroup::Text)/*TQPen(basket()->colorGroup().foreground())*/); painter2.drawPoint(xIcon, yIcon + 7); painter2.drawPoint(xIcon + 2, yIcon + 7); painter2.drawPoint(xIcon + 4, yIcon + 7); |