1 Index: kcontrol/background/bgrender.cpp
2 ===================================================================
3 --- kcontrol/background/bgrender.cpp (.../tags/KDE/3.5.10/kdebase) (revision 1021033)
4 +++ kcontrol/background/bgrender.cpp (.../branches/KDE/3.5/kdebase) (revision 1021033)
6 m_pPixmap = new QPixmap(m_size);
7 m_pPixmap->fill(Qt::black);
10 - for (unsigned i=0; i<m_numRenderers; ++i)
11 - m_renderer[i]->desktopResized();
17 Index: kcontrol/info/opengl.cpp
18 ===================================================================
19 --- kcontrol/info/opengl.cpp (.../tags/KDE/3.5.10/kdebase) (revision 1021033)
20 +++ kcontrol/info/opengl.cpp (.../branches/KDE/3.5/kdebase) (revision 1021033)
24 kdDebug() << "Error: glXMakeCurrent failed\n";
25 - glXDestroyContext(dpy, ctx);
28 glXDestroyContext(dpy, ctx);
29 Index: kcontrol/arts/arts.cpp
30 ===================================================================
31 --- kcontrol/arts/arts.cpp (.../tags/KDE/3.5.10/kdebase) (revision 1021033)
32 +++ kcontrol/arts/arts.cpp (.../branches/KDE/3.5/kdebase) (revision 1021033)
34 config = new KConfig("kcmartsrc");
37 - suspendTime->setRange( 0, 999, 1, true );
38 + suspendTime->setRange( 1, 999, 1, true );
40 connect(startServer,SIGNAL(clicked()),this,SLOT(slotChanged()));
41 connect(networkTransparent,SIGNAL(clicked()),this,SLOT(slotChanged()));
42 Index: kcontrol/kfontinst/kfontinst/Fontmap.cpp
43 ===================================================================
44 --- kcontrol/kfontinst/kfontinst/Fontmap.cpp (.../tags/KDE/3.5.10/kdebase) (revision 1021033)
45 +++ kcontrol/kfontinst/kfontinst/Fontmap.cpp (.../branches/KDE/3.5/kdebase) (revision 1021033)
50 -static char * findSpace(char *str)
51 +static const char * findSpace(const char *str)
53 while(str && *str!=' ' && *str!='\t')
56 char a[constMaxLen+1],
59 - char *slash1=strchr(line, '/'),
60 + const char *slash1=strchr(line, '/'),
61 *space1=slash1 ? findSpace(slash1) : NULL, //strchr(slash1, ' ') : NULL,
62 *ob=slash1 ? strchr(slash1, '(') : NULL,
63 *cb=ob ? strchr(ob, ')') : NULL,
64 Index: kicker/taskbar/taskcontainer.cpp
65 ===================================================================
66 --- kicker/taskbar/taskcontainer.cpp (.../tags/KDE/3.5.10/kdebase) (revision 1021033)
67 +++ kicker/taskbar/taskcontainer.cpp (.../branches/KDE/3.5/kdebase) (revision 1021033)
73 + KickerTip::Client::updateKickerTip();
74 QToolButton::update();
77 @@ -1524,89 +1526,93 @@
81 - if (TaskBarSettings::showThumbnails() &&
82 - m_filteredTasks.count() == 1)
86 + if (m_filteredTasks.count() > 0)
88 - Task::Ptr t = m_filteredTasks.first();
90 - pixmap = t->thumbnail(TaskBarSettings::thumbnailMaxDimension());
93 - if (pixmap.isNull() && tasks.last())
95 - // try to load icon via net_wm
96 - pixmap = KWin::icon(tasks.last()->window(),
102 - // Collect all desktops the tasks are on. Sort naturally.
103 - QMap<int, QString> desktopMap;
104 - bool demandsAttention = false;
105 - bool modified = false;
106 - bool allDesktops = false;
107 - Task::List::const_iterator itEnd = m_filteredTasks.constEnd();
108 - for (Task::List::const_iterator it = m_filteredTasks.constBegin(); it != itEnd; ++it)
111 - if (t->demandsAttention())
112 + if (TaskBarSettings::showThumbnails() &&
113 + m_filteredTasks.count() == 1)
115 - demandsAttention = true;
116 + Task::Ptr t = m_filteredTasks.first();
118 + pixmap = t->thumbnail(TaskBarSettings::thumbnailMaxDimension());
121 - if (t->isModified())
123 + if (pixmap.isNull() && tasks.count())
126 + // try to load icon via net_wm
127 + pixmap = KWin::icon(tasks.last()->window(),
133 - if (t->isOnAllDesktops())
135 + // Collect all desktops the tasks are on. Sort naturally.
136 + QMap<int, QString> desktopMap;
137 + bool demandsAttention = false;
138 + bool modified = false;
139 + bool allDesktops = false;
140 + Task::List::const_iterator itEnd = m_filteredTasks.constEnd();
141 + for (Task::List::const_iterator it = m_filteredTasks.constBegin(); it != itEnd; ++it)
143 - allDesktops = true;
144 - desktopMap.clear();
146 + if (t->demandsAttention())
148 + demandsAttention = true;
151 + if (t->isModified())
156 + if (t->isOnAllDesktops())
158 + allDesktops = true;
159 + desktopMap.clear();
161 + else if (!allDesktops)
163 + desktopMap.insert(t->desktop(),
164 + TaskManager::the()->desktopName(t->desktop()));
167 - else if (!allDesktops)
169 + if (TaskBarSettings::showAllWindows() && KWin::numberOfDesktops() > 1)
171 - desktopMap.insert(t->desktop(),
172 - TaskManager::the()->desktopName(t->desktop()));
173 + if (desktopMap.isEmpty())
175 + details.append(i18n("On all desktops"));
179 + QStringList desktopNames = desktopMap.values();
180 + details.append(i18n("On %1").arg(QStyleSheet::escape(desktopNames.join(", "))) + "<br>");
187 - if (TaskBarSettings::showAllWindows() && KWin::numberOfDesktops() > 1)
189 - if (desktopMap.isEmpty())
191 + if (demandsAttention)
193 - details.append(i18n("On all desktops"));
194 + details.append(i18n("Requesting attention") + "<br>");
198 + name = this->name();
201 - QStringList desktopNames = desktopMap.values();
202 - details.append(i18n("On %1").arg(QStyleSheet::escape(desktopNames.join(", "))) + "<br>");
203 + details.append(i18n("Has unsaved changes"));
205 + static QString modStr = "[" + i18n( "modified" ) + "]";
206 + int modStrPos = name.find(modStr);
208 + if (modStrPos >= 0)
210 + // +1 because we include a space after the closing brace.
211 + name.remove(modStrPos, modStr.length() + 1);
216 - if (demandsAttention)
218 - details.append(i18n("Requesting attention") + "<br>");
221 - QString name = this->name();
224 - details.append(i18n("Has unsaved changes"));
226 - static QString modStr = "[" + i18n( "modified" ) + "]";
227 - int modStrPos = name.find(modStr);
229 - if (modStrPos >= 0)
231 - // +1 because we include a space after the closing brace.
232 - name.remove(modStrPos, modStr.length() + 1);
236 data.message = QStyleSheet::escape(name);
237 data.subtext = details;
239 Index: kicker/taskbar/taskbar.cpp
240 ===================================================================
241 --- kicker/taskbar/taskbar.cpp (.../tags/KDE/3.5.10/kdebase) (revision 1021033)
242 +++ kicker/taskbar/taskbar.cpp (.../branches/KDE/3.5/kdebase) (revision 1021033)
244 m_textShadowEngine(0),
245 m_ignoreUpdates(false)
247 - setFrameStyle( NoFrame );
249 arrowType = LeftArrow;
253 connect(&m_relayoutTimer, SIGNAL(timeout()),
254 this, SLOT(reLayout()));
256 + connect(this, SIGNAL(contentsMoving(int, int)), SLOT(setBackground()));
259 connect(TaskManager::the(), SIGNAL(taskAdded(Task::Ptr)),
260 this, SLOT(add(Task::Ptr)));
263 Panner::resizeEvent(e);
264 reLayoutEventually();
265 + setViewportBackground();
268 void TaskBar::add(Task::Ptr task)
271 if (!blocklayout && !m_ignoreUpdates)
273 - m_relayoutTimer.start(100, true);
274 + m_relayoutTimer.start(25, true);
278 @@ -814,24 +815,16 @@
279 QTimer::singleShot(100, this, SLOT(publishIconGeometry()));
282 -void TaskBar::viewportResizeEvent( QResizeEvent* e )
284 - Panner::viewportResizeEvent(e);
285 - setViewportBackground();
288 void TaskBar::setViewportBackground()
290 const QPixmap *bg = parentWidget()->backgroundPixmap();
292 - viewport()->unsetPalette();
296 QPixmap pm(parentWidget()->size());
297 pm.fill(parentWidget(), pos() + viewport()->pos());
298 viewport()->setPaletteBackgroundPixmap(pm);
299 - viewport()->setBackgroundOrigin( WidgetOrigin );
300 + viewport()->setBackgroundOrigin(WidgetOrigin);
303 viewport()->setPaletteBackgroundColor(paletteBackgroundColor());
304 Index: kicker/taskbar/taskbar.h
305 ===================================================================
306 --- kicker/taskbar/taskbar.h (.../tags/KDE/3.5.10/kdebase) (revision 1021033)
307 +++ kicker/taskbar/taskbar.h (.../branches/KDE/3.5/kdebase) (revision 1021033)
310 QImage* blendGradient(const QSize& size);
312 - void setBackground();
314 KTextShadowEngine *textShadowEngine();
318 + void setBackground();
321 void containerCountChanged();
323 void viewportMouseReleaseEvent( QMouseEvent* );
324 void viewportMouseDoubleClickEvent( QMouseEvent* );
325 void viewportMouseMoveEvent( QMouseEvent* );
326 - void viewportResizeEvent( QResizeEvent * );
327 void wheelEvent(QWheelEvent*);
328 void propagateMouseEvent( QMouseEvent* );
329 void resizeEvent( QResizeEvent* );
330 Index: kicker/extensions/taskbar/taskbarextension.cpp
331 ===================================================================
332 --- kicker/extensions/taskbar/taskbarextension.cpp (.../tags/KDE/3.5.10/kdebase) (revision 1021033)
333 +++ kicker/extensions/taskbar/taskbarextension.cpp (.../branches/KDE/3.5/kdebase) (revision 1021033)
338 - m_container->unsetPalette();
340 if (KickerSettings::useBackgroundTheme())
342 @@ -215,17 +214,17 @@
343 KickerLib::colorize(bgImage);
345 setPaletteBackgroundPixmap(bgImage);
346 - m_container->setPaletteBackgroundPixmap(bgImage);
350 + m_container->setBackground();
353 void TaskBarExtension::updateBackground(const QPixmap& bgImage)
356 setPaletteBackgroundPixmap(bgImage);
357 - m_container->unsetPalette();
358 - m_container->setPaletteBackgroundPixmap(bgImage);
359 + m_container->setBackground();
362 void TaskBarExtension::resizeEvent(QResizeEvent *e)
363 Index: kicker/libkicker/panner.cpp
364 ===================================================================
365 --- kicker/libkicker/panner.cpp (.../tags/KDE/3.5.10/kdebase) (revision 1021033)
366 +++ kicker/libkicker/panner.cpp (.../branches/KDE/3.5/kdebase) (revision 1021033)
369 #include "panner.moc"
372 Panner::Panner( QWidget* parent, const char* name )
373 - : QScrollView( parent, name ),
374 + : QWidget( parent, name ),
378 + _cwidth(0), _cheight(0),
381 KGlobal::locale()->insertCatalogue("libkicker");
382 setBackgroundOrigin( AncestorOrigin );
384 _updateScrollButtonsTimer = new QTimer(this);
385 connect(_updateScrollButtonsTimer, SIGNAL(timeout()), this, SLOT(reallyUpdateScrollButtons()));
387 + _clipper = new QWidget(this);
388 + _clipper->setBackgroundOrigin(AncestorOrigin);
389 + _clipper->installEventFilter( this );
390 + _viewport = new QWidget(_clipper);
391 + _viewport->setBackgroundOrigin(AncestorOrigin);
393 - setResizePolicy(Manual);
394 - setVScrollBarMode( QScrollView::AlwaysOff );
395 - setHScrollBarMode( QScrollView::AlwaysOff );
397 - viewport()->setBackgroundMode( PaletteBackground );
398 - viewport()->setBackgroundOrigin( AncestorOrigin );
401 _layout = new QBoxLayout(this, QBoxLayout::LeftToRight);
402 - _layout->addWidget(viewport(), 1);
403 + _layout->addWidget(_clipper, 1);
404 setOrientation(Horizontal);
411 +void Panner::createScrollButtons()
418 + // left/up scroll button
419 + _luSB = new SimpleArrowButton(this);
420 + _luSB->installEventFilter(this);
421 + //_luSB->setAutoRepeat(true);
422 + _luSB->setMinimumSize(12, 12);
424 + _layout->addWidget(_luSB);
425 + connect(_luSB, SIGNAL(pressed()), SLOT(startScrollLeftUp()));
426 + connect(_luSB, SIGNAL(released()), SLOT(stopScroll()));
428 + // right/down scroll button
429 + _rdSB = new SimpleArrowButton(this);
430 + _rdSB->installEventFilter(this);
431 + //_rdSB->setAutoRepeat(true);
432 + _rdSB->setMinimumSize(12, 12);
434 + _layout->addWidget(_rdSB);
435 + connect(_rdSB, SIGNAL(pressed()), SLOT(startScrollRightDown()));
436 + connect(_rdSB, SIGNAL(released()), SLOT(stopScroll()));
438 + // set up the buttons
442 void Panner::setupButtons()
444 if (orientation() == Horizontal)
445 @@ -110,55 +141,54 @@
446 reallyUpdateScrollButtons();
449 -void Panner::resizeEvent( QResizeEvent* e )
450 +void Panner::resizeEvent( QResizeEvent* )
452 - QScrollView::resizeEvent( e );
453 - updateScrollButtons();
454 + //QScrollView::resizeEvent( e );
455 + //updateScrollButtons();
458 void Panner::scrollRightDown()
460 if(orientation() == Horizontal) // scroll right
462 + scrollBy( _step, 0 );
465 + scrollBy( 0, _step );
470 void Panner::scrollLeftUp()
472 if(orientation() == Horizontal) // scroll left
473 - scrollBy( -40, 0 );
474 + scrollBy( -_step, 0 );
476 - scrollBy( 0, -40 );
477 + scrollBy( 0, -_step );
482 -void Panner::createScrollButtons()
483 +void Panner::startScrollRightDown()
489 + _scrollTimer = new QTimer(this);
490 + connect(_scrollTimer, SIGNAL(timeout()), SLOT(scrollRightDown()));
491 + _scrollTimer->start(50);
496 - // left/up scroll button
497 - _luSB = new SimpleArrowButton(this);
498 - _luSB->installEventFilter(this);
499 - _luSB->setAutoRepeat(true);
500 - _luSB->setMinimumSize(12, 12);
502 - _layout->addWidget(_luSB);
503 - connect(_luSB, SIGNAL(clicked()), SLOT(scrollLeftUp()));
504 +void Panner::startScrollLeftUp()
506 + _scrollTimer = new QTimer(this);
507 + connect(_scrollTimer, SIGNAL(timeout()), SLOT(scrollLeftUp()));
508 + _scrollTimer->start(50);
513 - // right/down scroll button
514 - _rdSB = new SimpleArrowButton(this);
515 - _rdSB->installEventFilter(this);
516 - _rdSB->setAutoRepeat(true);
517 - _rdSB->setMinimumSize(12, 12);
519 - _layout->addWidget(_rdSB);
520 - connect(_rdSB, SIGNAL(clicked()), SLOT(scrollRightDown()));
522 - // set up the buttons
524 +void Panner::stopScroll()
526 + delete _scrollTimer;
530 void Panner::reallyUpdateScrollButtons()
532 delta = contentsHeight() - height();
538 createScrollButtons();
540 @@ -184,21 +214,11 @@
541 // we need to do this every single time
545 - if (orientation() == Horizontal)
547 - setMargins(0, 0, _luSB->width() + _rdSB->width(), 0);
551 - setMargins(0, 0, 0, _luSB->height() + _rdSB->height());
554 else if (_luSB && _luSB->isVisibleTo(this))
558 - setMargins(0, 0, 0, 0);
562 @@ -207,8 +227,170 @@
563 _updateScrollButtonsTimer->start(200, true);
566 +void Panner::setContentsPos(int x, int y)
570 + else if (x > (contentsWidth() - visibleWidth()))
571 + x = contentsWidth() - visibleWidth();
575 + else if (y > (contentsHeight() - visibleHeight()))
576 + y = contentsHeight() - visibleHeight();
578 + if (x == contentsX() && y == contentsY())
581 + _viewport->move(-x, -y);
582 + emit contentsMoving(x, y);
585 +void Panner::scrollBy(int dx, int dy)
587 + setContentsPos(contentsX() + dx, contentsY() + dy);
590 void Panner::resizeContents( int w, int h )
592 - QScrollView::resizeContents( w, h );
593 + _viewport->resize(w, h);
594 + setContentsPos(contentsX(), contentsY());
595 updateScrollButtons();
598 +QPoint Panner::contentsToViewport( const QPoint& p ) const
600 + return QPoint(p.x() - contentsX() - _clipper->x(), p.y() - contentsY() - _clipper->y());
603 +QPoint Panner::viewportToContents( const QPoint& vp ) const
605 + return QPoint(vp.x() + contentsX() + _clipper->x(), vp.y() + contentsY() + _clipper->y());
608 +void Panner::contentsToViewport( int x, int y, int& vx, int& vy ) const
610 + const QPoint v = contentsToViewport(QPoint(x,y));
615 +void Panner::viewportToContents( int vx, int vy, int& x, int& y ) const
617 + const QPoint c = viewportToContents(QPoint(vx,vy));
622 +void Panner::ensureVisible( int x, int y )
624 + ensureVisible(x, y, 50, 50);
627 +void Panner::ensureVisible( int x, int y, int xmargin, int ymargin )
629 + int pw=visibleWidth();
630 + int ph=visibleHeight();
632 + int cx=-contentsX();
633 + int cy=-contentsY();
634 + int cw=contentsWidth();
635 + int ch=contentsHeight();
637 + if ( pw < xmargin*2 )
639 + if ( ph < ymargin*2 )
651 + if ( x < -cx+xmargin )
653 + else if ( x >= -cx+pw-xmargin )
654 + cx = -x+pw-xmargin;
656 + if ( y < -cy+ymargin )
658 + else if ( y >= -cy+ph-ymargin )
659 + cy = -y+ph-ymargin;
663 + else if ( cx < pw-cw && cw>pw )
668 + else if ( cy < ph-ch && ch>ph )
671 + setContentsPos( -cx, -cy );
674 +bool Panner::eventFilter( QObject *obj, QEvent *e )
676 + if ( obj == _viewport || obj == _clipper )
678 + switch ( e->type() )
680 + case QEvent::Resize:
681 + viewportResizeEvent((QResizeEvent *)e);
683 + case QEvent::MouseButtonPress:
684 + viewportMousePressEvent( (QMouseEvent*)e );
685 + if ( ((QMouseEvent*)e)->isAccepted() )
688 + case QEvent::MouseButtonRelease:
689 + viewportMouseReleaseEvent( (QMouseEvent*)e );
690 + if ( ((QMouseEvent*)e)->isAccepted() )
693 + case QEvent::MouseButtonDblClick:
694 + viewportMouseDoubleClickEvent( (QMouseEvent*)e );
695 + if ( ((QMouseEvent*)e)->isAccepted() )
698 + case QEvent::MouseMove:
699 + viewportMouseMoveEvent( (QMouseEvent*)e );
700 + if ( ((QMouseEvent*)e)->isAccepted() )
708 + return QWidget::eventFilter( obj, e ); // always continue with standard event processing
711 +void Panner::viewportResizeEvent( QResizeEvent* )
715 +void Panner::viewportMousePressEvent( QMouseEvent* e)
720 +void Panner::viewportMouseReleaseEvent( QMouseEvent* e )
725 +void Panner::viewportMouseDoubleClickEvent( QMouseEvent* e )
730 +void Panner::viewportMouseMoveEvent( QMouseEvent* e )
734 Index: kicker/libkicker/simplebutton.cpp
735 ===================================================================
736 --- kicker/libkicker/simplebutton.cpp (.../tags/KDE/3.5.10/kdebase) (revision 1021033)
737 +++ kicker/libkicker/simplebutton.cpp (.../branches/KDE/3.5/kdebase) (revision 1021033)
740 #include <kstandarddirs.h>
742 +#define BUTTON_MARGIN KDialog::spacingHint()
744 SimpleButton::SimpleButton(QWidget *parent, const char *name)
745 : QButton(parent, name),
749 return QButton::sizeHint();
751 - return QSize(pm->width() + KDialog::spacingHint(), pm->height() + KDialog::spacingHint());
752 + return QSize(pm->width() + BUTTON_MARGIN, pm->height() + BUTTON_MARGIN);
755 QSize SimpleButton::minimumSizeHint() const
758 int ph = pix.height();
759 int pw = pix.width();
760 - int margin = KDialog::spacingHint();
761 + int margin = BUTTON_MARGIN;
762 QPoint origin(margin / 2, margin / 2);
764 if (ph < (h - margin))
765 Index: kicker/libkicker/kickertip.cpp
766 ===================================================================
767 --- kicker/libkicker/kickertip.cpp (.../tags/KDE/3.5.10/kdebase) (revision 1021033)
768 +++ kicker/libkicker/kickertip.cpp (.../branches/KDE/3.5/kdebase) (revision 1021033)
770 // Tickle the information out of the bastard.
771 client->updateKickerTip(data);
773 + // Hide the tip if there is nothing to show
774 if (data.message.isEmpty() && data.subtext.isEmpty() && data.icon.isNull())
781 m_richText = new QSimpleRichText("<qt><h3>" + data.message + "</h3><p>" +
782 data.subtext + "</p></qt>", font(), QString::null, 0,
784 - m_richText->setWidth(400);
785 + m_richText->setWidth(640);
786 m_direction = data.direction;
788 if (KickerSettings::mouseOversShowIcon())
789 @@ -193,11 +195,81 @@
790 void KickerTip::mousePressEvent(QMouseEvent * /*e*/)
792 QToolTip::setGloballyEnabled(m_toolTipsEnabled);
794 - m_frameTimer.stop();
798 +static void drawRoundRect(QPainter &p, const QRect &r)
800 + static int line[8] = { 1, 3, 4, 5, 6, 7, 7, 8 };
801 + static int border[8] = { 1, 2, 1, 1, 1, 1, 1, 1 };
802 + int xl, xr, y1, y2;
803 + QPen pen = p.pen();
804 + bool drawBorder = pen.style() != QPen::NoPen;
806 + if (r.width() < 16 || r.height() < 16)
812 + p.fillRect(r.x(), r.y() + 8, r.width(), r.height() - 16, p.brush());
813 + p.fillRect(r.x() + 8, r.y(), r.width() - 16, r.height(), p.brush());
815 + p.setPen(p.brush().color());
817 + for (int i = 0; i < 8; i++)
820 + xr = r.width() - i - 1;
822 + y2 = 7 - (line[i] - 1);
824 + p.drawLine(xl, y1, xl, y2);
825 + p.drawLine(xr, y1, xr, y2);
827 + y1 = r.height() - y1 - 1;
828 + y2 = r.height() - y2 - 1;
830 + p.drawLine(xl, y1, xl, y2);
831 + p.drawLine(xr, y1, xr, y2);
839 + if (r.height() > 16)
841 + p.drawLine(r.x(), r.y() + 8, r.x(), r.y() + r.height() - 9);
842 + p.drawLine(r.x() + r.width() - 1, r.y() + 8, r.x() + r.width() - 1, r.y() + r.height() - 9);
844 + if (r.width() > 16)
846 + p.drawLine(r.x() + 8, r.y(), r.x() + r.width() - 9, r.y());
847 + p.drawLine(r.x() + 8, r.y() + r.height() - 1, r.x() + r.width() - 9, r.y() + r.height() - 1);
850 + for (int i = 0; i < 8; i++)
853 + xr = r.width() - i - 1;
854 + y2 = 7 - (line[i] - 1);
855 + y1 = y2 + (border[i] - 1);
857 + p.drawLine(xl, y1, xl, y2);
858 + p.drawLine(xr, y1, xr, y2);
860 + y1 = r.height() - y1 - 1;
861 + y2 = r.height() - y2 - 1;
863 + p.drawLine(xl, y1, xl, y2);
864 + p.drawLine(xr, y1, xr, y2);
870 void KickerTip::plainMask()
872 QPainter maskPainter(&m_mask);
874 m_mask.fill(Qt::black);
876 maskPainter.setBrush(Qt::white);
877 - maskPainter.setPen(Qt::white);
878 - maskPainter.drawRoundRect(m_mask.rect(), 1600 / m_mask.rect().width(),
879 - 1600 / m_mask.rect().height());
880 + maskPainter.setPen(Qt::NoPen);
881 + //maskPainter.drawRoundRect(m_mask.rect(), 1600 / m_mask.rect().width(), 1600 / m_mask.rect().height());
882 + drawRoundRect(maskPainter, m_mask.rect());
887 m_mask.fill(Qt::black);
889 maskPainter.setBrush(Qt::white);
890 - maskPainter.setPen(Qt::white);
891 - maskPainter.drawRoundRect(m_mask.rect(), 1600 / m_mask.rect().width(),
892 - 1600 / m_mask.rect().height());
893 + maskPainter.setPen(Qt::NoPen);
894 + //maskPainter.drawRoundRect(m_mask.rect(), 1600 / m_mask.rect().width(), 1600 / m_mask.rect().height());
895 + drawRoundRect(maskPainter, m_mask.rect());
897 m_dissolveSize += m_dissolveDelta;
900 for (y = 0; y < height() + size; y += size)
903 - s = m_dissolveSize * x / 128;
904 + s = 4 * m_dissolveSize * x / 128;
905 for (; x > -size; x -= size, s -= 2)
908 @@ -311,10 +383,10 @@
911 QPainter bufferPainter(&m_pixmap);
912 - bufferPainter.setPen(Qt::black);
913 + bufferPainter.setPen(colorGroup().foreground());
914 bufferPainter.setBrush(colorGroup().background());
915 - bufferPainter.drawRoundRect(0, 0, width, height,
916 - 1600 / width, 1600 / height);
917 + //bufferPainter.drawRoundRect(0, 0, width, height, 1600 / width, 1600 / height);
918 + drawRoundRect(bufferPainter, QRect(0, 0, width, height));
920 // draw icon if present
921 if (!m_icon.isNull())
922 @@ -331,11 +403,11 @@
923 QColorGroup cg = colorGroup();
924 cg.setColor(QColorGroup::Text, cg.background().dark(115));
925 int shadowOffset = QApplication::reverseLayout() ? -1 : 1;
926 - m_richText->draw(&bufferPainter, 5 + textX + shadowOffset, textY + 1, QRect(), cg);
927 + m_richText->draw(&bufferPainter, textX + shadowOffset, textY + 1, QRect(), cg);
931 - m_richText->draw(&bufferPainter, 5 + textX, textY, rect(), cg);
932 + m_richText->draw(&bufferPainter, textX, textY, rect(), cg);
937 void KickerTip::untipFor(const QWidget* w)
947 bool KickerTip::isTippingFor(const QWidget* w) const
950 void KickerTip::hide()
960 case QEvent::MouseButtonPress:
961 QToolTip::setGloballyEnabled(m_toolTipsEnabled);
963 - m_frameTimer.stop();
967 Index: kicker/libkicker/panner.h
968 ===================================================================
969 --- kicker/libkicker/panner.h (.../tags/KDE/3.5.10/kdebase) (revision 1021033)
970 +++ kicker/libkicker/panner.h (.../branches/KDE/3.5/kdebase) (revision 1021033)
975 -#include <qscrollview.h>
976 +#include <qwidget.h>
978 #include "simplebutton.h"
983 -class KDE_EXPORT Panner : public QScrollView
984 +class KDE_EXPORT Panner : public QWidget
990 Qt::Orientation orientation() const { return _orient; }
991 virtual void setOrientation(Orientation orientation);
993 + QWidget *viewport() const { return _viewport; }
995 + QRect contentsRect() const { return QRect(0, 0, width(), height()); }
997 + int contentsX() const { return _viewport ? -_viewport->x() : 0; }
998 + int contentsY() const { return _viewport ? -_viewport->y() : 0; }
999 + int contentsWidth() const { return _viewport ? _viewport->width() : 0; }
1000 + int contentsHeight() const { return _viewport ? _viewport->height() : 0; }
1001 + void setContentsPos(int x, int y);
1003 + int visibleWidth() const { return _clipper->width(); }
1004 + int visibleHeight() const { return _clipper->height(); }
1006 + void contentsToViewport( int x, int y, int& vx, int& vy ) const;
1007 + void viewportToContents( int vx, int vy, int& x, int& y ) const;
1008 + QPoint contentsToViewport( const QPoint& ) const;
1009 + QPoint viewportToContents( const QPoint& ) const;
1011 + void addChild(QWidget *child) { child->show(); }
1012 + void removeChild(QWidget *child) { child->hide(); }
1013 + int childX(QWidget *child) const { return child->x(); }
1014 + int childY(QWidget *child) const { return child->y(); }
1015 + void moveChild(QWidget *child, int x, int y) { child->move(x, y); }
1017 + void ensureVisible( int x, int y );
1018 + void ensureVisible( int x, int y, int xmargin, int ymargin );
1021 virtual void resizeContents( int w, int h );
1022 + void startScrollRightDown();
1023 + void startScrollLeftUp();
1024 + void stopScroll();
1025 void scrollRightDown();
1026 void scrollLeftUp();
1027 void reallyUpdateScrollButtons();
1028 + void scrollBy(int dx, int dy);
1031 + void contentsMoving(int x, int y);
1034 - void resizeEvent(QResizeEvent *ev);
1035 - void contentsWheelEvent(QWheelEvent *){;}
1036 - void viewportWheelEvent(QWheelEvent *){;}
1037 + virtual bool eventFilter( QObject *obj, QEvent *e );
1038 + virtual void resizeEvent(QResizeEvent *ev);
1039 + virtual void viewportResizeEvent( QResizeEvent* );
1040 + virtual void viewportMousePressEvent( QMouseEvent* );
1041 + virtual void viewportMouseReleaseEvent( QMouseEvent* );
1042 + virtual void viewportMouseDoubleClickEvent( QMouseEvent* );
1043 + virtual void viewportMouseMoveEvent( QMouseEvent* );
1046 void setupButtons();
1048 SimpleArrowButton *_luSB; // Left Scroll Button
1049 SimpleArrowButton *_rdSB; // Right Scroll Button
1050 QTimer *_updateScrollButtonsTimer;
1051 + QTimer *_scrollTimer;
1053 + QWidget *_clipper;
1054 + QWidget *_viewport;
1055 + int _cwidth, _cheight;
1061 Index: kicker/applets/systemtray/systemtrayapplet.h
1062 ===================================================================
1063 --- kicker/applets/systemtray/systemtrayapplet.h (.../tags/KDE/3.5.10/kdebase) (revision 1021033)
1064 +++ kicker/applets/systemtray/systemtrayapplet.h (.../branches/KDE/3.5/kdebase) (revision 1021033)
1066 TrayEmbed( bool kdeTray, QWidget* parent = NULL );
1067 bool kdeTray() const { return kde_tray; }
1068 void setBackground();
1069 + void getIconSize(int defaultIconSize);
1073 Index: kicker/applets/systemtray/systemtrayapplet.cpp
1074 ===================================================================
1075 --- kicker/applets/systemtray/systemtrayapplet.cpp (.../tags/KDE/3.5.10/kdebase) (revision 1021033)
1076 +++ kicker/applets/systemtray/systemtrayapplet.cpp (.../branches/KDE/3.5/kdebase) (revision 1021033)
1079 #include <X11/Xlib.h>
1081 +#define ICON_MARGIN 1
1085 KDE_EXPORT KPanelApplet* init(QWidget *parent, const QString& configFile)
1092 connect(emb, SIGNAL(embeddedWindowDestroyed()), SLOT(updateTrayWindows()));
1093 - emb->setMinimumSize(m_iconSize, m_iconSize);
1094 + emb->getIconSize(m_iconSize);
1104 emb->setBackground();
1106 m_shownWins.append(emb);
1109 for (; emb != lastEmb; ++emb)
1113 (*emb)->setBackground();
1119 int currentHeight = height();
1120 - int minHeight = m_iconSize + 4;
1121 - if (currentHeight != h && currentHeight != minHeight)
1122 + if (currentHeight != h)
1124 SystemTrayApplet* me = const_cast<SystemTrayApplet*>(this);
1125 me->setMinimumSize(0, 0);
1129 int currentWidth = width();
1130 - int minSize = m_iconSize + 4;
1131 - if (currentWidth != w && currentWidth != minSize)
1132 + if (currentWidth != w)
1134 SystemTrayApplet* me = const_cast<SystemTrayApplet*>(this);
1135 me->setMinimumSize(0, 0);
1136 @@ -782,10 +782,8 @@
1140 -void SystemTrayApplet::resizeEvent( QResizeEvent* e )
1141 +void SystemTrayApplet::resizeEvent( QResizeEvent* )
1143 - KPanelApplet::resizeEvent(e);
1146 // we need to give ourselves a chance to adjust our size before calling this
1147 QTimer::singleShot(0, this, SIGNAL(updateLayout()));
1149 int i = 0, line, nbrOfLines, heightWidth;
1150 bool showExpandButton = m_expandButton && m_expandButton->isVisibleTo(this);
1152 - m_layout = new QGridLayout(this, 1, 1, 2, 2);
1153 + m_layout = new QGridLayout(this, 1, 1, ICON_MARGIN, ICON_MARGIN);
1157 @@ -828,18 +826,18 @@
1160 // The margin and spacing specified in the layout implies that:
1161 - // [-- 2 pixels --] [-- first icon --] [-- 2 pixels --] ... [-- 2 pixels --] [-- last icon --] [-- 2 pixels --]
1162 + // [-- ICON_MARGIN pixels --] [-- first icon --] [-- ICON_MARGIN pixels --] ... [-- ICON_MARGIN pixels --] [-- last icon --] [-- ICON_MARGIN pixels --]
1164 - // So, if we say that iconWidth is the icon width plus the 2 pixels spacing, then the available width for the icons
1165 - // is the widget width minus 2 pixels margin. Forgetting these 2 pixels broke the layout algorithm in KDE <= 3.5.9.
1166 + // So, if we say that iconWidth is the icon width plus the ICON_MARGIN pixels spacing, then the available width for the icons
1167 + // is the widget width minus ICON_MARGIN pixels margin. Forgetting these ICON_MARGIN pixels broke the layout algorithm in KDE <= 3.5.9.
1169 - // This fix makes the workaround in the heightForWidth() and widthForHeight() methods unneeded.
1170 + // This fix makes the workarounds in the heightForWidth() and widthForHeight() methods unneeded.
1173 if (orientation() == Vertical)
1175 - int iconWidth = maxIconWidth() + 2; // +2 for the margins that implied by the layout
1176 - heightWidth = width() - 2;
1177 + int iconWidth = maxIconWidth() + ICON_MARGIN; // +2 for the margins that implied by the layout
1178 + heightWidth = width() - ICON_MARGIN;
1179 // to avoid nbrOfLines=0 we ensure heightWidth >= iconWidth!
1180 heightWidth = heightWidth < iconWidth ? iconWidth : heightWidth;
1181 nbrOfLines = heightWidth / iconWidth;
1182 @@ -860,12 +858,12 @@
1183 emb != lastEmb; ++emb)
1185 line = i % nbrOfLines;
1189 m_layout->addWidget(*emb, col, line,
1190 Qt::AlignHCenter | Qt::AlignVCenter);
1192 - if (line + 1 == nbrOfLines)
1193 + if ((line + 1) == nbrOfLines)
1197 @@ -879,12 +877,12 @@
1198 emb != lastEmb; ++emb)
1200 line = i % nbrOfLines;
1204 m_layout->addWidget(*emb, col, line,
1205 Qt::AlignHCenter | Qt::AlignVCenter);
1207 - if (line + 1 == nbrOfLines)
1208 + if ((line + 1) == nbrOfLines)
1216 - int iconHeight = maxIconHeight() + 2; // +2 for the margins that implied by the layout
1217 - heightWidth = height() - 2;
1218 + int iconHeight = maxIconHeight() + ICON_MARGIN; // +2 for the margins that implied by the layout
1219 + heightWidth = height() - ICON_MARGIN;
1220 heightWidth = heightWidth < iconHeight ? iconHeight : heightWidth; // to avoid nbrOfLines=0
1221 nbrOfLines = heightWidth / iconHeight;
1223 @@ -914,12 +912,12 @@
1224 for (TrayEmbedList::const_iterator emb = m_hiddenWins.begin(); emb != lastEmb; ++emb)
1226 line = i % nbrOfLines;
1230 m_layout->addWidget(*emb, line, col,
1231 Qt::AlignHCenter | Qt::AlignVCenter);
1233 - if (line + 1 == nbrOfLines)
1234 + if ((line + 1) == nbrOfLines)
1238 @@ -933,12 +931,12 @@
1239 emb != lastEmb; ++emb)
1241 line = i % nbrOfLines;
1245 m_layout->addWidget(*emb, line, col,
1246 Qt::AlignHCenter | Qt::AlignVCenter);
1248 - if (line + 1 == nbrOfLines)
1249 + if ((line + 1) == nbrOfLines)
1253 @@ -975,6 +973,21 @@
1254 : QXEmbed( parent ), kde_tray( kdeTray )
1259 +void TrayEmbed::getIconSize(int defaultIconSize)
1261 + QSize minSize = minimumSizeHint();
1263 + int width = minSize.width();
1264 + int height = minSize.height();
1266 + if (width < 1 || width > defaultIconSize)
1267 + width = defaultIconSize;
1268 + if (height < 1 || height > defaultIconSize)
1269 + height = defaultIconSize;
1271 + setFixedSize(width, height);
1275 @@ -994,9 +1007,7 @@
1281 + XClearArea(x11Display(), embeddedWinId(), 0, 0, 0, 0, True);
1283 - //XClearArea(x11Display(), embeddedWinId(), 0, 0, 0, 0, True);
1286 Index: kicker/applets/clock/clock.h
1287 ===================================================================
1288 --- kicker/applets/clock/clock.h (.../tags/KDE/3.5.10/kdebase) (revision 1021033)
1289 +++ kicker/applets/clock/clock.h (.../branches/KDE/3.5/kdebase) (revision 1021033)
1292 #include <kickertip.h>
1293 #include "settings.h"
1294 +#include "kshadowengine.h"
1299 bool showDayOfWeek();
1302 + void paintEvent(QPaintEvent *e);
1303 + void drawContents(QPainter *p);
1309 QDate clockGetDate();
1311 virtual void updateKickerTip(KickerTip::Data&);
1313 + KTextShadowEngine *shadowEngine();
1318 QStringList _remotezonelist;
1320 ClockAppletToolTip m_tooltip;
1321 + KTextShadowEngine *m_shadowEngine;
1325 Index: kicker/applets/clock/Makefile.am
1326 ===================================================================
1327 --- kicker/applets/clock/Makefile.am (.../tags/KDE/3.5.10/kdebase) (revision 1021033)
1328 +++ kicker/applets/clock/Makefile.am (.../branches/KDE/3.5/kdebase) (revision 1021033)
1331 picdir = $(kde_datadir)/clockapplet/pics
1333 -INCLUDES = -I$(top_srcdir)/kicker/libkicker $(all_includes)
1334 +INCLUDES = -I$(top_srcdir)/kicker/libkicker -I../../libkicker $(all_includes)
1336 kde_module_LTLIBRARIES = clock_panelapplet.la
1338 Index: kicker/applets/clock/clock.cpp
1339 ===================================================================
1340 --- kicker/applets/clock/clock.cpp (.../tags/KDE/3.5.10/kdebase) (revision 1021033)
1341 +++ kicker/applets/clock/clock.cpp (.../branches/KDE/3.5/kdebase) (revision 1021033)
1344 #include <global.h> // libkickermain
1346 +#include "kickerSettings.h"
1348 #include "datepicker.h"
1351 PlainClock::PlainClock(ClockApplet *applet, Prefs *prefs, QWidget *parent, const char *name)
1352 : QLabel(parent, name), ClockWidget(applet, prefs)
1354 + setWFlags(WNoAutoErase);
1355 setBackgroundOrigin(AncestorOrigin);
1359 int PlainClock::preferedWidthForHeight(int ) const
1361 QString maxLengthTime = KGlobal::locale()->formatTime( QTime( 23, 59 ), _prefs->plainShowSeconds());
1362 - return fontMetrics().width( maxLengthTime+2 );
1363 + return fontMetrics().width( maxLengthTime ) + 8;
1369 if (_force || newStr != _timeStr) {
1371 - setText(_timeStr);
1376 @@ -266,6 +268,32 @@
1377 return _prefs->plainShowDayOfWeek();
1380 +void PlainClock::paintEvent(QPaintEvent *)
1383 + QPixmap buf(size());
1384 + buf.fill(this, 0, 0);
1386 + p.setFont(font());
1387 + p.setPen(paletteForegroundColor());
1392 + p.drawPixmap(0, 0, buf);
1396 +void PlainClock::drawContents(QPainter *p)
1398 + QRect tr(0, 0, width(), height());
1400 + if (!KickerSettings::transparent())
1401 + p->drawText(tr, AlignCenter, _timeStr);
1403 + _applet->shadowEngine()->drawText(*p, tr, AlignCenter, _timeStr, size());
1406 //************************************************************
1409 @@ -834,12 +862,22 @@
1411 p->setFont(_prefs->fuzzyFont());
1412 p->setPen(_prefs->fuzzyForegroundColor());
1413 - if (_applet->getOrientation() == Vertical) {
1417 + if (_applet->getOrientation() == Vertical)
1420 - p->drawText(4, -2, height() - 8, -(width()) + 2, AlignCenter, _timeStr);
1422 - p->drawText(4, 2, width() - 8, height() - 4, AlignCenter, _timeStr);
1423 + tr = QRect(4, -2, height() - 8, -(width()) + 2);
1426 + tr = QRect(4, 2, width() - 8, height() - 4);
1428 + if (!KickerSettings::transparent())
1429 + p->drawText(tr, AlignCenter, _timeStr);
1431 + _applet->shadowEngine()->drawText(*p, tr, AlignCenter, _timeStr, size());
1433 alreadyDrawing = false;
1437 _prefs(new Prefs(sharedConfig())),
1438 zone(new Zone(config())),
1444 DCOPObject::setObjId("ClockApplet");
1445 _prefs->readConfig();
1448 ClockApplet::~ClockApplet()
1450 + delete m_shadowEngine;
1451 //reverse for the moment
1452 KGlobal::locale()->removeCatalogue("clockapplet");
1453 KGlobal::locale()->removeCatalogue("timezones"); // For time zone translations
1454 @@ -929,6 +969,16 @@
1459 +KTextShadowEngine *ClockApplet::shadowEngine()
1461 + if (!m_shadowEngine)
1462 + m_shadowEngine = new KTextShadowEngine();
1464 + return m_shadowEngine;
1468 int ClockApplet::widthForHeight(int h) const
1470 if (orientation() == Qt::Vertical)
1471 Index: kicker/kicker/core/container_extension.cpp
1472 ===================================================================
1473 --- kicker/kicker/core/container_extension.cpp (.../tags/KDE/3.5.10/kdebase) (revision 1021033)
1474 +++ kicker/kicker/core/container_extension.cpp (.../branches/KDE/3.5/kdebase) (revision 1021033)
1476 connect(Kicker::the()->kwinModule(), SIGNAL(currentDesktopChanged(int)),
1477 this, SLOT( currentDesktopChanged(int)));
1479 + setBackgroundOrigin(AncestorOrigin);
1480 setFrameStyle(NoFrame);
1485 _userHidden = static_cast<UserHidden>(tmp);
1491 // if we have an extension, we need to grab the extension-specific
1492 Index: kicker/kicker/core/containerarea.cpp
1493 ===================================================================
1494 --- kicker/kicker/core/containerarea.cpp (.../tags/KDE/3.5.10/kdebase) (revision 1021033)
1495 +++ kicker/kicker/core/containerarea.cpp (.../branches/KDE/3.5/kdebase) (revision 1021033)
1497 m_addAppletDialog(0)
1499 setBackgroundOrigin( WidgetOrigin );
1500 - viewport()->setBackgroundOrigin( AncestorOrigin );
1502 - m_contents = new QWidget(viewport());
1503 - m_contents->setBackgroundOrigin(AncestorOrigin);
1504 + m_contents = viewport();
1506 m_layout = new ContainerAreaLayout(m_contents);
1508 - // Install an event filter to propagate layout hints coming from
1510 + // Install an event filter to propagate layout hints coming from m_contents.
1511 m_contents->installEventFilter(this);
1514 Index: kicker/kicker/core/panelextension.cpp
1515 ===================================================================
1516 --- kicker/kicker/core/panelextension.cpp (.../tags/KDE/3.5.10/kdebase) (revision 1021033)
1517 +++ kicker/kicker/core/panelextension.cpp (.../branches/KDE/3.5/kdebase) (revision 1021033)
1519 connect(_containerArea, SIGNAL(maintainFocus(bool)), this, SIGNAL(maintainFocus(bool)));
1520 _layout->addWidget(_containerArea);
1522 - _containerArea->setFrameStyle(QFrame::NoFrame);
1523 _containerArea->viewport()->installEventFilter(this);
1524 _containerArea->configure();
1526 Index: kioslave/media/mediamanager/halbackend.cpp
1527 ===================================================================
1528 --- kioslave/media/mediamanager/halbackend.cpp (.../tags/KDE/3.5.10/kdebase) (revision 1021033)
1529 +++ kioslave/media/mediamanager/halbackend.cpp (.../branches/KDE/3.5/kdebase) (revision 1021033)
1530 @@ -851,13 +851,6 @@
1534 - if ( valids.contains("locale") )
1536 - value = config.readBoolEntry( "locale", true );
1537 - tmp = QString( "locale=%1" ).arg( value ? "true" : "false" );
1541 if (valids.contains("utf8"))
1543 value = config.readBoolEntry("utf8", true);
1544 @@ -878,6 +871,17 @@
1545 result << "shortname=lower";
1548 + // pass our locale to the ntfs-3g driver so it can translate local characters
1549 + if (valids.contains("locale") && fstype == "ntfs-3g")
1551 + // have to obtain LC_CTYPE as returned by the `locale` command
1552 + // check in the same order as `locale` does
1554 + if ( (cType = getenv("LC_ALL")) || (cType = getenv("LC_CTYPE")) || (cType = getenv("LANG")) ) {
1555 + result << QString("locale=%1").arg(cType);
1559 if (valids.contains("sync"))
1561 value = config.readBoolEntry("sync", ( valids.contains("flush") && !fstype.endsWith("fat") ) && removable);
1564 QMap<QString,QString> valids = MediaManagerUtils::splitOptions(options);
1566 - const char *names[] = { "ro", "quiet", "atime", "uid", "utf8", "flush", "sync", "locale", 0 };
1567 + const char *names[] = { "ro", "quiet", "atime", "uid", "utf8", "flush", "sync", 0 };
1568 for (int index = 0; names[index]; ++index)
1569 if (valids.contains(names[index]))
1570 config.writeEntry(names[index], valids[names[index]] == "true");
1571 @@ -951,10 +955,6 @@
1572 config.writeEntry("automount", valids["automount"]);
1575 - if (valids.contains("locale") ) {
1576 - config.writeEntry("locale", valids["locale"]);
1582 @@ -1153,11 +1153,6 @@
1583 soptions << QString("uid=%1").arg(getuid());
1586 - if (valids["locale"] == "true")
1588 - soptions << QString("locale=%1").arg( KGlobal::locale()->language() );
1591 if (valids["ro"] == "true")
1594 @@ -1182,6 +1177,11 @@
1595 soptions << QString("shortname=%1").arg(valids["shortname"]);
1598 + if (valids.contains("locale"))
1600 + soptions << QString("locale=%1").arg(valids["locale"]);
1603 if (valids.contains("journaling"))
1605 QString option = valids["journaling"];
1606 Index: kioslave/fish/fish.cpp
1607 ===================================================================
1608 --- kioslave/fish/fish.cpp (.../tags/KDE/3.5.10/kdebase) (revision 1021033)
1609 +++ kioslave/fish/fish.cpp (.../branches/KDE/3.5/kdebase) (revision 1021033)
1611 fish.cpp - a FISH kioslave
1613 begin : Thu Oct 4 17:09:14 CEST 2001
1614 - copyright : (C) 2001-2003 by Jörg Walter
1615 + copyright : (C) 2001-2003 by J�rg Walter
1616 email : jwalt-kde@garni.ch
1617 ***************************************************************************/
1619 @@ -1430,7 +1430,7 @@
1623 - if (FD_ISSET(childFd,&rfds)) {
1624 + else if (FD_ISSET(childFd,&rfds)) {
1625 rc = read(childFd,buf+offset,32768-offset);
1626 //myDebug( << "read " << rc << " bytes" << endl);
1628 Index: nsplugins/nspluginloader.cpp
1629 ===================================================================
1630 --- nsplugins/nspluginloader.cpp (.../tags/KDE/3.5.10/kdebase) (revision 1021033)
1631 +++ nsplugins/nspluginloader.cpp (.../branches/KDE/3.5/kdebase) (revision 1021033)
1633 if (cfg.readBoolEntry("demandLoad", false)) {
1634 _button = new QPushButton(i18n("Start Plugin"), dynamic_cast<EMBEDCLASS*>(this));
1635 _layout->addWidget(_button, 0, 0);
1636 - connect(_button, SIGNAL(clicked()), this, SLOT(doLoadPlugin()));
1637 + connect(_button, SIGNAL(clicked()), this, SLOT(loadPlugin()));
1645 +void NSPluginInstance::loadPlugin()
1652 void NSPluginInstance::doLoadPlugin() {
1656 + if (!inited && !_button) {
1657 _loader = NSPluginLoader::instance();
1658 setBackgroundMode(QWidget::NoBackground);
1659 WId winid = stub->winId();
1660 Index: nsplugins/nspluginloader.h
1661 ===================================================================
1662 --- nsplugins/nspluginloader.h (.../tags/KDE/3.5.10/kdebase) (revision 1021033)
1663 +++ nsplugins/nspluginloader.h (.../branches/KDE/3.5/kdebase) (revision 1021033)
1665 void javascriptResult( int id, QString result ) { stub->javascriptResult( id, result ); }
1668 + void loadPlugin();
1669 void doLoadPlugin();
1672 Index: knetattach/knetattach.ui
1673 ===================================================================
1674 --- knetattach/knetattach.ui (.../tags/KDE/3.5.10/kdebase) (revision 1021033)
1675 +++ knetattach/knetattach.ui (.../branches/KDE/3.5/kdebase) (revision 1021033)
1679 <property name="maxValue">
1680 - <number>32768</number>
1681 + <number>65535</number>
1683 <property name="minValue">
1685 Index: kwin/atoms.cpp
1686 ===================================================================
1687 --- kwin/atoms.cpp (.../tags/KDE/3.5.10/kdebase) (revision 1021033)
1688 +++ kwin/atoms.cpp (.../branches/KDE/3.5/kdebase) (revision 1021033)
1692 names[n++] = (char *) "_DT_SM_WINDOW_INFO";
1694 + names[n++] = (char *) "_MOTIF_WM_INFO"; // #172028
1696 atoms[n] = &xdnd_aware;
1697 names[n++] = (char*) "XdndAware";
1698 Index: l10n/tr/entry.desktop
1699 ===================================================================
1700 --- l10n/tr/entry.desktop (.../tags/KDE/3.5.10/kdebase) (revision 1021033)
1701 +++ l10n/tr/entry.desktop (.../branches/KDE/3.5/kdebase) (revision 1021033)
1705 ThousandsSeparator=.
1708 MonetaryDecimalSymbol=,
1709 MonetaryThousandsSeparator=.
1711 Index: l10n/ec/entry.desktop
1712 ===================================================================
1713 --- l10n/ec/entry.desktop (.../tags/KDE/3.5.10/kdebase) (revision 1021033)
1714 +++ l10n/ec/entry.desktop (.../branches/KDE/3.5/kdebase) (revision 1021033)
1722 Index: l10n/es/entry.desktop
1723 ===================================================================
1724 --- l10n/es/entry.desktop (.../tags/KDE/3.5.10/kdebase) (revision 1021033)
1725 +++ l10n/es/entry.desktop (.../branches/KDE/3.5/kdebase) (revision 1021033)
1727 NegativeMonetarySignPosition=1
1728 DateFormat[es]=%A, %e de %B de %Y
1729 DateFormat[eu]=%a, %Yeko %bren %da
1730 -DareFormat[gl]=%A, %e de %B de %Y
1731 +DateFormat[gl]=%A, %e de %B de %Y
1732 +DateFormat[ca]=%A, %e %B %Y
1733 DateFormat[eo]=%A, la %ea de %B %Y
1734 DateFormatShort=%d-%m-%y
1737 Property changes on: .
1738 ___________________________________________________________________
1739 Deleted: svn:mergeinfo
1740 Added: svn:externals
1741 + admin https://svn.kde.org/home/kde/branches/KDE/3.5/kde-common/admin