Subject: KDE/kdepim/kmail (silent) - msg#09621

Previous Message by Date: click to view message preview

branches/KDE/4.3/kdepim/kalarm

SVN commit 1043157 by djarvie: Bug 211696: If dual screens, show alarm in other screen if active window is full screen M +8 -8 lib/desktop.cpp M +2 -2 lib/desktop.h M +10 -13 messagewin.cpp M +1 -1 messagewin.h --- branches/KDE/4.3/kdepim/kalarm/lib/desktop.cpp #1043156:1043157 @@ -1,7 +1,7 @@ /* * desktop.cpp - desktop functions * Program: kalarm - * Copyright  2008 by David Jarvie <djarvie@xxxxxxx> + * Copyright  2008,2009 by David Jarvie <djarvie@xxxxxxx> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -21,23 +21,23 @@ #include "desktop.h" #ifdef Q_WS_X11 #include <kwindowsystem.h> -#else +#endif #include <QApplication> #include <QDesktopWidget> -#endif namespace KAlarm { /****************************************************************************** -* Return the size of the usable area of the desktop. +* Return the size of the usable area of the desktop, optionally for a specific +* screen in a multi-head setup. */ -QRect desktopWorkArea() +QRect desktopWorkArea(int screen) { #ifdef Q_WS_X11 - return KWindowSystem::workArea(); -#else - return qApp->desktop()->availableGeometry(); + if (screen < 0) + return KWindowSystem::workArea(); #endif + return qApp->desktop()->availableGeometry(screen); } } // namespace KAlarm --- branches/KDE/4.3/kdepim/kalarm/lib/desktop.h #1043156:1043157 @@ -1,7 +1,7 @@ /* * desktop.h - desktop functions * Program: kalarm - * Copyright  2008 by David Jarvie <djarvie@xxxxxxx> + * Copyright  2008,2009 by David Jarvie <djarvie@xxxxxxx> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -25,7 +25,7 @@ namespace KAlarm { -QRect desktopWorkArea(); +QRect desktopWorkArea(int screen = -1); } // namespace KAlarm --- branches/KDE/4.3/kdepim/kalarm/messagewin.cpp #1043156:1043157 @@ -508,7 +508,7 @@ topLayout->addSpacing(vspace); topLayout->addStretch(); // Don't include any horizontal margins if message is 2/3 screen width - if (text->sizeHint().width() >= mDesktopArea.width()*2/3) + if (text->sizeHint().width() >= KAlarm::desktopWorkArea(mScreenNumber).width()*2/3) topLayout->addWidget(text, 1, Qt::AlignHCenter); else { @@ -1495,7 +1495,7 @@ } // Limit the size to fit inside the working area of the desktop - QSize desktop = KAlarm::desktopWorkArea().size(); + QSize desktop = KAlarm::desktopWorkArea(mScreenNumber).size(); QSize frameThickness = frameGeometry().size() - geometry().size(); // title bar & window frame return desired.boundedTo(desktop - frameThickness); } @@ -1529,7 +1529,7 @@ KAlarm::readConfigWindowSize("FileMessage", s); resize(s); - QRect desk = KAlarm::desktopWorkArea(); + QRect desk = KAlarm::desktopWorkArea(mScreenNumber); QRect frame = frameGeometry(); mButtonDelay = Preferences::messageButtonDelay() * 1000; @@ -1602,7 +1602,7 @@ void MessageWin::moveEvent(QMoveEvent* e) { MainWindowBase::moveEvent(e); - theApp()->setSpreadWindowsState(isSpread(KAlarm::desktopWorkArea().topLeft())); + theApp()->setSpreadWindowsState(isSpread(KAlarm::desktopWorkArea(mScreenNumber).topLeft())); if (mPositioning) { // The window has just been initially positioned @@ -1624,7 +1624,7 @@ if (width() > s.width() || height() > s.height()) resize(s); } - theApp()->setSpreadWindowsState(isSpread(KAlarm::desktopWorkArea().topLeft())); + theApp()->setSpreadWindowsState(isSpread(KAlarm::desktopWorkArea(mScreenNumber).topLeft())); } /****************************************************************************** @@ -1958,7 +1958,7 @@ */ bool MessageWin::getWorkAreaAndModal() { - mDesktopArea = KAlarm::desktopWorkArea(); + mScreenNumber = -1; bool modal = Preferences::modalMessages(); if (modal) { @@ -1975,26 +1975,23 @@ { // There are multiple screens QRect winRect = wi.frameGeometry(); - int screen = desktop->screenNumber(MainWindow::mainMainWindow()); // KAlarm's screen - if (!winRect.intersects(desktop->screenGeometry(screen))) + mScreenNumber = desktop->screenNumber(MainWindow::mainMainWindow()); // KAlarm's screen + if (!winRect.intersects(desktop->screenGeometry(mScreenNumber))) modal = true; // full screen window isn't on KAlarm's screen else { for (int s = 0; s < numScreens; ++s) { - if (s != screen + if (s != mScreenNumber && !winRect.intersects(desktop->screenGeometry(s))) { // The full screen window isn't on this screen - screen = s; + mScreenNumber = s; modal = true; break; } } - if (!modal) - return modal; } - mDesktopArea = desktop->availableGeometry(screen); } } } --- branches/KDE/4.3/kdepim/kalarm/messagewin.h #1043156:1043157 @@ -160,10 +160,10 @@ QCheckBox* mDontShowAgainCheck; DeferAlarmDlg* mDeferDlg; QDateTime mDeferLimit; // last time to which the message can currently be deferred - QRect mDesktopArea; // usable area of desktop (excluding panel etc.) int mFlags; // event flags int mLateCancel; int mButtonDelay; // delay (ms) after window is shown before buttons are enabled + int mScreenNumber; // screen to display on, or -1 for default bool mErrorWindow; // the window is simply an error message bool mNoPostAction; // don't execute any post-alarm action bool mRecreating; // window is about to be deleted and immediately recreated

Next Message by Date: click to view message preview

www/sites/www/announcements/changelogs

SVN commit 1043159 by djarvie: KAlarm change M +1 -2 changelog4_3_2to4_3_3.php M +0 -1 changelog_branch_4_3.xml --- trunk/www/sites/www/announcements/changelogs/changelog4_3_2to4_3_3.php #1043158:1043159 @@ -21,7 +21,7 @@ <div class="product" style="padding-left: 20px;"> <em>Bugfixes:</em> <ul> - <li class="bugfix ">Prevent conflict between New tab and Remove Tab on middle-click of mouse buttonn in Konqueror. Fixes bug <a href="http://bugs.kde.org/show_bug.cgi?id=188587">188587</a>. See SVN commit <a href="http://websvn.kde.org/?rev=1039102&amp;view=rev">1039102</a>. </li> + <li class="bugfix ">Prevent conflict between New tab and Remove Tab on middle-click of mouse button in Konqueror. Fixes bug <a href="http://bugs.kde.org/show_bug.cgi?id=188587">188587</a>. See SVN commit <a href="http://websvn.kde.org/?rev=1039102&amp;view=rev">1039102</a>. </li> </ul> </div> <h4><a name="kio">kio</a></h4> @@ -159,7 +159,6 @@ <li class="bugfix crash">Fix crash when calendar formats are updated at login, during session restoration. Fixes bug <a href="http://bugs.kde.org/show_bug.cgi?id=210552">210552</a>. See SVN commit <a href="http://websvn.kde.org/?rev=1035835&amp;view=rev">1035835</a>. </li> <li class="bugfix ">Update date-only alarm trigger times when user changes the start-of-day time. See SVN commit <a href="http://websvn.kde.org/?rev=1032499&amp;view=rev">1032499</a>. </li> <li class="bugfix ">Fix recurring date-only alarm triggering repeatedly and eating up CPU (depending on start of day time and time zone). See SVN commit <a href="http://websvn.kde.org/?rev=1032418&amp;view=rev">1032418</a>. </li> - <li class="bugfix ">In dual screen system, show alarm window in other screen if the active window is full screen. Fixes bug <a href="http://bugs.kde.org/show_bug.cgi?id=211696">211696</a>. See SVN commit <a href="http://websvn.kde.org/?rev=1042513&amp;view=rev">1042513</a>. </li> </ul> </div> </div> --- trunk/www/sites/www/announcements/changelogs/changelog_branch_4_3.xml #1043158:1043159 @@ -343,7 +343,6 @@ <bugfix rev="1035835" bugno="210552" class="crash">Fix crash when calendar formats are updated at login, during session restoration.</bugfix> <bugfix rev="1032499">Update date-only alarm trigger times when user changes the start-of-day time.</bugfix> <bugfix rev="1032418">Fix recurring date-only alarm triggering repeatedly and eating up CPU (depending on start of day time and time zone).</bugfix> - <bugfix rev="1042513" bugno="211696">In dual screen system, show alarm window in other screen if the active window is full screen.</bugfix> <improvement rev="1041425">Disable 'New Alarm from Template' option when no alarm templates exist.</improvement> <improvement rev="1036844">Improve error feedback when choosing a file to display.</improvement> </product>

Previous Message by Thread: click to view message preview

KDE/kdepim/kmail (silent)

SVN commit 1033267 by tmcguire: SVN_SILENT fix indentation M +34 -34 kmreaderwin.cpp --- trunk/KDE/kdepim/kmail/kmreaderwin.cpp #1033266:1033267 @@ -194,7 +194,7 @@ break; case DwMime::kSubtypeEncrypted: { if ( child ) - dataNode = child; + dataNode = child; } break; } @@ -271,45 +271,45 @@ } if ( bKeepPartAsIs ) { - resultingData += dataNode->encodedBody(); + resultingData += dataNode->encodedBody(); } else { - // B) Store the body of this part. - if( headers && bIsMultipart && dataNode->firstChild() ) { - kDebug() << "is valid Multipart, processing children:"; - QByteArray boundary = headers->ContentType().Boundary().c_str(); - curNode = dataNode->firstChild(); - // store children of multipart - while( curNode ) { - kDebug() << "--boundary"; - if( resultingData.size() && - ( '\n' != resultingData.at( resultingData.size()-1 ) ) ) + // B) Store the body of this part. + if( headers && bIsMultipart && dataNode->firstChild() ) { + kDebug() << "is valid Multipart, processing children:"; + QByteArray boundary = headers->ContentType().Boundary().c_str(); + curNode = dataNode->firstChild(); + // store children of multipart + while( curNode ) { + kDebug() << "--boundary"; + if( resultingData.size() && + ( '\n' != resultingData.at( resultingData.size()-1 ) ) ) + resultingData += '\n'; resultingData += '\n'; - resultingData += '\n'; - resultingData += "--"; + resultingData += "--"; + resultingData += boundary; + resultingData += '\n'; + // note: We are processing a harmless multipart that is *not* + // to be replaced by one of it's children, therefor + // we set their doStoreHeaders to true. + objectTreeToDecryptedMsg( curNode, + resultingData, + theMessage, + false, + recCount + 1 ); + curNode = curNode->nextSibling(); + } + kDebug() << "--boundary--"; + resultingData += "\n--"; resultingData += boundary; - resultingData += '\n'; - // note: We are processing a harmless multipart that is *not* - // to be replaced by one of it's children, therefor - // we set their doStoreHeaders to true. - objectTreeToDecryptedMsg( curNode, - resultingData, - theMessage, - false, - recCount + 1 ); - curNode = curNode->nextSibling(); + resultingData += "--\n\n"; + kDebug() << "Multipart processing children - DONE"; + } else if( part ){ + // store simple part + kDebug() << "is Simple part or invalid Multipart, storing body data .. DONE"; + resultingData += part->Body().AsString().c_str(); } - kDebug() << "--boundary--"; - resultingData += "\n--"; - resultingData += boundary; - resultingData += "--\n\n"; - kDebug() << "Multipart processing children - DONE"; - } else if( part ){ - // store simple part - kDebug() << "is Simple part or invalid Multipart, storing body data .. DONE"; - resultingData += part->Body().AsString().c_str(); } - } } else { kDebug() << "dataNode != curNode: Replace curNode by dataNode."; bool rootNodeReplaceFlag = weAreReplacingTheRootNode || !curNode->parentNode();

Next Message by Thread: click to view message preview

branches/work/akonadi-ports/kdepim (silent)

SVN commit 1032754 by vkrause: SVN_SILENT Blocked revisions 1032753 via svnmerge ........ r1032753 | vkrause | 2009-10-08 14:15:50 +0200 (Thu, 08 Oct 2009) | 2 lines SVN_SILENT oops, that wasn't supposed to get merged yet. ........ _M . (directory) ** branches/work/akonadi-ports/kdepim #property svnmerge-blocked + /trunk/KDE/kdepim:1032753