diff -Nru /tmp/eYOcAbyvnk/kde-nightly-kdeplasma-addons-20091006+svn1032120/applets/bubblemon/src/bubble.cpp /tmp/sKugikI23I/kde-nightly-kdeplasma-addons-20091009+svn1033340/applets/bubblemon/src/bubble.cpp --- kde-nightly-kdeplasma-addons-20091006+svn1032120/applets/bubblemon/src/bubble.cpp 2009-10-06 23:29:19.000000000 +0100 +++ kde-nightly-kdeplasma-addons-20091009+svn1033340/applets/bubblemon/src/bubble.cpp 2009-10-09 23:33:51.000000000 +0100 @@ -159,6 +159,12 @@ if (constraints & Plasma::FormFactorConstraint) { setBackgroundHints(NoBackground); } + + if (formFactor() == Plasma::Planar || formFactor() == Plasma::MediaCenter) { + setMinimumSize(30,30); + } else { + setMinimumSize(0,0); + } } void @@ -207,7 +213,12 @@ void Bubble::paintInterface(QPainter *painter, const QStyleOptionGraphicsItem *option, const QRect &contentsRect) { + if (configurationRequired()) { + return; + } + m_svg->paint(painter, m_svg->elementRect("background"), "background"); + if (m_max>0 && m_val>0) { QRect clipRect(contentsRect); float drawValue; diff -Nru /tmp/eYOcAbyvnk/kde-nightly-kdeplasma-addons-20091006+svn1032120/applets/comic/comic.cpp /tmp/sKugikI23I/kde-nightly-kdeplasma-addons-20091009+svn1033340/applets/comic/comic.cpp --- kde-nightly-kdeplasma-addons-20091006+svn1032120/applets/comic/comic.cpp 2009-10-06 23:29:19.000000000 +0100 +++ kde-nightly-kdeplasma-addons-20091009+svn1033340/applets/comic/comic.cpp 2009-10-09 23:33:50.000000000 +0100 @@ -926,7 +926,7 @@ mZoomButton = new Plasma::PushButton( mFrame ); mZoomButton->nativeWidget()->setIcon( KIcon( "zoom-original" ) ); - mZoomButton->nativeWidget()->setToolTip( i18n( "Actual size in a different view. Press Middle-Mouse-Button on the comic alternatively." ) ); + mZoomButton->nativeWidget()->setToolTip( i18n( "Show at actual size in a different view. Alternatively, click with the middle mouse button on the comic." ) ); mZoomButton->setSizePolicy( QSizePolicy::Minimum, QSizePolicy::Minimum ); mZoomButton->setMaximumSize( IconSize( KIconLoader::MainToolbar ), IconSize( KIconLoader::MainToolbar ) ); connect( mZoomButton, SIGNAL( clicked() ), this, SLOT( fullView() ) ); diff -Nru /tmp/eYOcAbyvnk/kde-nightly-kdeplasma-addons-20091006+svn1032120/applets/frame/picture.cpp /tmp/sKugikI23I/kde-nightly-kdeplasma-addons-20091009+svn1033340/applets/frame/picture.cpp --- kde-nightly-kdeplasma-addons-20091006+svn1032120/applets/frame/picture.cpp 2009-10-06 23:29:19.000000000 +0100 +++ kde-nightly-kdeplasma-addons-20091009+svn1033340/applets/frame/picture.cpp 2009-10-09 23:33:50.000000000 +0100 @@ -79,7 +79,7 @@ m_job = KIO::storedGet( currentUrl, KIO::NoReload, KIO::DefaultFlags ); connect(m_job, SIGNAL(finished(KJob*)), this, SLOT(slotFinished(KJob*))); image = QPixmap(m_defaultImage); - m_message = i18n("Loading image ..."); + m_message = i18n("Loading image..."); } else { if (currentUrl.isEmpty()) { image = QPixmap(m_defaultImage); diff -Nru /tmp/eYOcAbyvnk/kde-nightly-kdeplasma-addons-20091006+svn1032120/applets/leavenote/leavenote.cpp /tmp/sKugikI23I/kde-nightly-kdeplasma-addons-20091009+svn1033340/applets/leavenote/leavenote.cpp --- kde-nightly-kdeplasma-addons-20091006+svn1032120/applets/leavenote/leavenote.cpp 2009-10-06 23:29:20.000000000 +0100 +++ kde-nightly-kdeplasma-addons-20091009+svn1033340/applets/leavenote/leavenote.cpp 2009-10-09 23:33:51.000000000 +0100 @@ -203,7 +203,7 @@ } if (KStandardDirs::findExe("knotes").isEmpty()) { - KMessageBox::error( 0, i18n( "knotes can not find. Please install it to be able to send it" ) ); + KMessageBox::error( 0, i18n( "knotes cannot be found. Please install it to be able to send a note." ) ); } else { diff -Nru /tmp/eYOcAbyvnk/kde-nightly-kdeplasma-addons-20091006+svn1032120/applets/microblog/microblog.cpp /tmp/sKugikI23I/kde-nightly-kdeplasma-addons-20091009+svn1033340/applets/microblog/microblog.cpp --- kde-nightly-kdeplasma-addons-20091006+svn1032120/applets/microblog/microblog.cpp 2009-10-06 23:29:20.000000000 +0100 +++ kde-nightly-kdeplasma-addons-20091009+svn1033340/applets/microblog/microblog.cpp 2009-10-09 23:33:51.000000000 +0100 @@ -244,9 +244,9 @@ m_headerLayout->addItem( statusEditFrame ); m_tabBar = new Plasma::TabBar(this); - m_tabBar->addTab("Timeline"); - m_tabBar->addTab("Replies"); - m_tabBar->addTab("Messages"); + m_tabBar->addTab(i18n("Timeline")); + m_tabBar->addTab(i18n("Replies")); + m_tabBar->addTab(i18n("Messages")); m_layout->addItem(m_tabBar); connect(m_tabBar, SIGNAL(currentChanged(int)), this, SLOT(modeChanged())); diff -Nru /tmp/eYOcAbyvnk/kde-nightly-kdeplasma-addons-20091006+svn1032120/applets/pastebin/pastebin.cpp /tmp/sKugikI23I/kde-nightly-kdeplasma-addons-20091009+svn1033340/applets/pastebin/pastebin.cpp --- kde-nightly-kdeplasma-addons-20091006+svn1032120/applets/pastebin/pastebin.cpp 2009-10-06 23:29:19.000000000 +0100 +++ kde-nightly-kdeplasma-addons-20091009+svn1033340/applets/pastebin/pastebin.cpp 2009-10-09 23:33:50.000000000 +0100 @@ -424,6 +424,7 @@ uiConfig.setupUi(general); connect(parent, SIGNAL(okClicked()), this, SLOT(configAccepted())); + connect(parent, SIGNAL(cancelClicked()), this, SLOT(closeServerDialog())); parent->addPage(general, i18n("General"), Applet::icon()); uiConfig.textServer->setCurrentIndex(m_textBackend); @@ -449,8 +450,8 @@ m_servers = new QWidget(); uiServers.setupUi(m_servers); m_servers->show(); - connect(uiServers.saveButton, SIGNAL(clicked()), this, SLOT(saveTextServer())); - + connect(uiServers.buttonBox, SIGNAL(accepted()), this, SLOT(saveTextServer())); + connect(uiServers.buttonBox, SIGNAL(rejected()), this, SLOT(closeServerDialog())); QString serverAddress; switch(uiConfig.textServer->currentIndex()) { case Pastebin::PASTEBINCA: @@ -479,6 +480,11 @@ break; } + closeServerDialog(); +} + +void Pastebin::closeServerDialog() +{ delete m_servers; m_servers = 0; } @@ -494,8 +500,8 @@ m_servers = new QWidget(); uiServers.setupUi(m_servers); m_servers->show(); - connect(uiServers.saveButton, SIGNAL(clicked()), this, SLOT(saveImageServer())); - + connect(uiServers.buttonBox, SIGNAL(accepted()), this, SLOT(saveImageServer())); + connect( uiServers.buttonBox, SIGNAL( rejected() ), this, SLOT( closeServerDialog() ) ); QString serverAddress; switch(uiConfig.imageServer->currentIndex()) { case Pastebin::IMAGEBINCA: @@ -532,9 +538,7 @@ cg.writeEntry("simplestimagehosting", uiServers.server->text()); break; } - - delete m_servers; - m_servers = 0; + closeServerDialog(); } void Pastebin::configAccepted() @@ -552,6 +556,7 @@ cg.writeEntry("imagePrivacy", m_imagePrivacy); cg.writeEntry("HistorySize", historySize); + closeServerDialog(); emit configNeedsSaving(); } diff -Nru /tmp/eYOcAbyvnk/kde-nightly-kdeplasma-addons-20091006+svn1032120/applets/pastebin/pastebin.h /tmp/sKugikI23I/kde-nightly-kdeplasma-addons-20091009+svn1033340/applets/pastebin/pastebin.h --- kde-nightly-kdeplasma-addons-20091006+svn1032120/applets/pastebin/pastebin.h 2009-10-06 23:29:19.000000000 +0100 +++ kde-nightly-kdeplasma-addons-20091009+svn1033340/applets/pastebin/pastebin.h 2009-10-09 23:33:50.000000000 +0100 @@ -107,7 +107,7 @@ void saveTextServer(); void editImageServer(); void saveImageServer(); - + void closeServerDialog(); private: int iconSize(); void showOverlay(bool show); diff -Nru /tmp/eYOcAbyvnk/kde-nightly-kdeplasma-addons-20091006+svn1032120/applets/pastebin/pastebinServersConfig.ui /tmp/sKugikI23I/kde-nightly-kdeplasma-addons-20091009+svn1033340/applets/pastebin/pastebinServersConfig.ui --- kde-nightly-kdeplasma-addons-20091006+svn1032120/applets/pastebin/pastebinServersConfig.ui 2009-10-06 23:29:19.000000000 +0100 +++ kde-nightly-kdeplasma-addons-20091009+svn1033340/applets/pastebin/pastebinServersConfig.ui 2009-10-09 23:33:50.000000000 +0100 @@ -13,50 +13,32 @@ Pastebin Server Config Dialog - - - - 115 - 5 - 148 - 30 - - - - - - - 10 - 10 - 111 - 18 - - - - Server address: - - - - - - 100 - 40 - 81 - 27 - - - - &OK - - + + + + + + + Server address: + + + + + + + + + + + + QDialogButtonBox::Cancel|QDialogButtonBox::Ok + + + + - KPushButton - QPushButton -
kpushbutton.h
- - KLineEdit QLineEdit
klineedit.h
diff -Nru /tmp/eYOcAbyvnk/kde-nightly-kdeplasma-addons-20091006+svn1032120/applets/plasmaboard/PanelIcon.cpp /tmp/sKugikI23I/kde-nightly-kdeplasma-addons-20091009+svn1033340/applets/plasmaboard/PanelIcon.cpp --- kde-nightly-kdeplasma-addons-20091006+svn1032120/applets/plasmaboard/PanelIcon.cpp 2009-10-06 23:29:19.000000000 +0100 +++ kde-nightly-kdeplasma-addons-20091009+svn1033340/applets/plasmaboard/PanelIcon.cpp 2009-10-09 23:33:50.000000000 +0100 @@ -69,7 +69,7 @@ m_plasmaboard->resetKeyboard(); if (extendedMode) { m_plasmaboard->initExtendedKeyboard(); - m_plasmaboard->switcher->setText("color(Plasma::Theme::TextColor).name()+";\">"+i18n("Less Keys")+""); + m_plasmaboard->switcher->setText("color(Plasma::Theme::TextColor).name()+";\">"+i18n("Fewer Keys")+""); } else{ m_plasmaboard->switcher->setText("color(Plasma::Theme::TextColor).name()+";\">"+i18n("More Keys")+""); diff -Nru /tmp/eYOcAbyvnk/kde-nightly-kdeplasma-addons-20091006+svn1032120/applets/qalculate/plasma-applet-qalculate.desktop /tmp/sKugikI23I/kde-nightly-kdeplasma-addons-20091009+svn1033340/applets/qalculate/plasma-applet-qalculate.desktop --- kde-nightly-kdeplasma-addons-20091006+svn1032120/applets/qalculate/plasma-applet-qalculate.desktop 2009-10-06 23:29:20.000000000 +0100 +++ kde-nightly-kdeplasma-addons-20091009+svn1033340/applets/qalculate/plasma-applet-qalculate.desktop 2009-10-09 23:33:51.000000000 +0100 @@ -1,6 +1,14 @@ [Desktop Entry] Name=Qalculate! +Name[pt]=Qalculate! +Name[pt_BR]=Qalculate! +Name[uk]=Qalculate! +Name[x-test]=xxQalculate!xx Comment=A powerful mathematical equation solver +Comment[pt]=Um sistema de resolução de equações matemáticas poderoso +Comment[pt_BR]=Um sistema poderoso de resolução de equações matemáticas +Comment[uk]=Потужний інструмент розв’язання рівнянь +Comment[x-test]=xxA powerful mathematical equation solverxx Icon=qalculate-applet Type=Service diff -Nru /tmp/eYOcAbyvnk/kde-nightly-kdeplasma-addons-20091006+svn1032120/dataengines/pastebin/CMakeLists.txt /tmp/sKugikI23I/kde-nightly-kdeplasma-addons-20091009+svn1033340/dataengines/pastebin/CMakeLists.txt --- kde-nightly-kdeplasma-addons-20091006+svn1032120/dataengines/pastebin/CMakeLists.txt 2009-10-06 23:29:20.000000000 +0100 +++ kde-nightly-kdeplasma-addons-20091009+svn1033340/dataengines/pastebin/CMakeLists.txt 2009-10-09 23:33:52.000000000 +0100 @@ -1,16 +1,5 @@ project(pastebinengine) -# Find the required Libaries -find_package(KDE4 REQUIRED) -include(KDE4Defaults) - -add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS}) -include_directories( - ${CMAKE_SOURCE_DIR} - ${CMAKE_BINARY_DIR} - ${KDE4_INCLUDES} - ) - set(pastebin_engine_SRCS backends/server.cpp backends/pastebinca.cpp diff -Nru /tmp/eYOcAbyvnk/kde-nightly-kdeplasma-addons-20091006+svn1032120/dataengines/pastebin/Messages.sh /tmp/sKugikI23I/kde-nightly-kdeplasma-addons-20091009+svn1033340/dataengines/pastebin/Messages.sh --- kde-nightly-kdeplasma-addons-20091006+svn1032120/dataengines/pastebin/Messages.sh 1970-01-01 01:00:00.000000000 +0100 +++ kde-nightly-kdeplasma-addons-20091009+svn1033340/dataengines/pastebin/Messages.sh 2009-10-09 23:33:52.000000000 +0100 @@ -0,0 +1,2 @@ +#! /usr/bin/env bash +$XGETTEXT *.cpp -o $podir/plasma_engine_pastebin.pot diff -Nru /tmp/eYOcAbyvnk/kde-nightly-kdeplasma-addons-20091006+svn1032120/dataengines/pastebin/pastebinservice.cpp /tmp/sKugikI23I/kde-nightly-kdeplasma-addons-20091009+svn1033340/dataengines/pastebin/pastebinservice.cpp --- kde-nightly-kdeplasma-addons-20091006+svn1032120/dataengines/pastebin/pastebinservice.cpp 2009-10-06 23:29:20.000000000 +0100 +++ kde-nightly-kdeplasma-addons-20091009+svn1033340/dataengines/pastebin/pastebinservice.cpp 2009-10-09 23:33:52.000000000 +0100 @@ -35,9 +35,7 @@ // it's a text if (operation == "text") { - if (m_textServer) { - delete m_textServer; - } + delete m_textServer; int backend = parameters["backend"].toInt(); switch(backend) { @@ -57,9 +55,7 @@ postText(parameters); } else { - if (m_imageServer) { - delete m_imageServer; - } + delete m_imageServer; int backend = parameters["backend"].toInt(); switch(backend) { diff -Nru /tmp/eYOcAbyvnk/kde-nightly-kdeplasma-addons-20091006+svn1032120/dataengines/rememberthemilk/rtmengine.cpp /tmp/sKugikI23I/kde-nightly-kdeplasma-addons-20091009+svn1033340/dataengines/rememberthemilk/rtmengine.cpp --- kde-nightly-kdeplasma-addons-20091006+svn1032120/dataengines/rememberthemilk/rtmengine.cpp 2009-10-06 23:29:20.000000000 +0100 +++ kde-nightly-kdeplasma-addons-20091009+svn1033340/dataengines/rememberthemilk/rtmengine.cpp 2009-10-09 23:33:52.000000000 +0100 @@ -117,23 +117,23 @@ return true; } else if (source.startsWith("Lists")) { - ListsSource *listssoruce = dynamic_cast(containerForSource(source)); + ListsSource *listssoruce = static_cast(containerForSource(source)); listssoruce->refresh(); return true; } else if (source.startsWith("Tasks")) { - TasksSource *taskssource = dynamic_cast(containerForSource(source)); + TasksSource *taskssource = static_cast(containerForSource(source)); taskssource->refresh(); return true; } else if (source.startsWith("List:")) { - ListSource *listsource = dynamic_cast(containerForSource(source)); + ListSource *listsource = static_cast(containerForSource(source)); if (listsource) listsource->update(); return true; } else if (source.startsWith("Task:")) { - TaskSource *tasksource = dynamic_cast(containerForSource(source)); + TaskSource *tasksource = static_cast(containerForSource(source)); if (tasksource) tasksource->update(); return true; diff -Nru /tmp/eYOcAbyvnk/kde-nightly-kdeplasma-addons-20091006+svn1032120/debian/changelog /tmp/sKugikI23I/kde-nightly-kdeplasma-addons-20091009+svn1033340/debian/changelog --- kde-nightly-kdeplasma-addons-20091006+svn1032120/debian/changelog 2009-10-07 05:13:15.000000000 +0100 +++ kde-nightly-kdeplasma-addons-20091009+svn1033340/debian/changelog 2009-10-10 08:03:56.000000000 +0100 @@ -1,8 +1,8 @@ -kde-nightly-kdeplasma-addons (20091006+svn1032120-0neon1) jaunty; urgency=low +kde-nightly-kdeplasma-addons (20091009+svn1033340-0neon1) jaunty; urgency=low * Nightly Build - -- Project Neon Wed, 07 Oct 2009 00:13:15 -0400 + -- Project Neon Sat, 10 Oct 2009 03:03:56 -0400 kde-nightly-kdeplasma-addons (20080303-0amarok1) gutsy; urgency=low diff -Nru /tmp/eYOcAbyvnk/kde-nightly-kdeplasma-addons-20091006+svn1032120/libs/rtm/auth.cpp /tmp/sKugikI23I/kde-nightly-kdeplasma-addons-20091009+svn1033340/libs/rtm/auth.cpp --- kde-nightly-kdeplasma-addons-20091006+svn1032120/libs/rtm/auth.cpp 2009-10-06 23:29:19.000000000 +0100 +++ kde-nightly-kdeplasma-addons-20091009+svn1033340/libs/rtm/auth.cpp 2009-10-09 23:33:50.000000000 +0100 @@ -30,6 +30,7 @@ #include #include #include +#include RTM::Auth::Auth(RTM::Permissions permissions, const QString& apiKey, const QString& sharedSecret) : frobRequest(0), @@ -74,7 +75,7 @@ QPushButton *button = new QPushButton(authWidget); QWebView *authPage = new QWebView(authWidget); - button->setText("Click here after you've logged in and authorized the applet"); + button->setText(i18n("Click here after you've logged in and authorized the applet")); authPage->setUrl(getAuthUrl()); diff -Nru /tmp/eYOcAbyvnk/kde-nightly-kdeplasma-addons-20091006+svn1032120/libs/rtm/Messages.sh /tmp/sKugikI23I/kde-nightly-kdeplasma-addons-20091009+svn1033340/libs/rtm/Messages.sh --- kde-nightly-kdeplasma-addons-20091006+svn1032120/libs/rtm/Messages.sh 1970-01-01 01:00:00.000000000 +0100 +++ kde-nightly-kdeplasma-addons-20091009+svn1033340/libs/rtm/Messages.sh 2009-10-09 23:33:50.000000000 +0100 @@ -0,0 +1,2 @@ +#! /usr/bin/env bash +$XGETTEXT *.cpp -o $podir/librtm.pot diff -Nru /tmp/eYOcAbyvnk/kde-nightly-kdeplasma-addons-20091006+svn1032120/runners/converter/converterrunner.cpp /tmp/sKugikI23I/kde-nightly-kdeplasma-addons-20091009+svn1033340/runners/converter/converterrunner.cpp --- kde-nightly-kdeplasma-addons-20091006+svn1032120/runners/converter/converterrunner.cpp 2009-10-06 23:29:19.000000000 +0100 +++ kde-nightly-kdeplasma-addons-20091009+svn1033340/runners/converter/converterrunner.cpp 2009-10-09 23:33:50.000000000 +0100 @@ -135,7 +135,7 @@ Plasma::RunnerContext::NetworkLocation); QString description = i18n("Converts the value of :q: when :q: is made up of " - "\"value unit [>, to, as, in] value\". You can use " + "\"value unit [>, to, as, in] value\". You can use the " "Unit converter applet to find all available units."); addSyntax(Plasma::RunnerSyntax("=:q:", description)); } diff -Nru /tmp/eYOcAbyvnk/kde-nightly-kdeplasma-addons-20091006+svn1032120/wallpapers/pattern/patterns/flowers.desktop /tmp/sKugikI23I/kde-nightly-kdeplasma-addons-20091009+svn1033340/wallpapers/pattern/patterns/flowers.desktop --- kde-nightly-kdeplasma-addons-20091006+svn1032120/wallpapers/pattern/patterns/flowers.desktop 2009-10-06 23:29:19.000000000 +0100 +++ kde-nightly-kdeplasma-addons-20091009+svn1033340/wallpapers/pattern/patterns/flowers.desktop 2009-10-09 23:33:50.000000000 +0100 @@ -13,6 +13,7 @@ Comment[is]=Blóm Comment[it]=Fiori Comment[km]=ផ្កា +Comment[lt]=Gėlės Comment[lv]=Ziedi Comment[nb]=Blomster Comment[nds]=Blomen diff -Nru /tmp/eYOcAbyvnk/kde-nightly-kdeplasma-addons-20091006+svn1032120/wallpapers/pattern/patterns/triangles.desktop /tmp/sKugikI23I/kde-nightly-kdeplasma-addons-20091009+svn1033340/wallpapers/pattern/patterns/triangles.desktop --- kde-nightly-kdeplasma-addons-20091006+svn1032120/wallpapers/pattern/patterns/triangles.desktop 2009-10-06 23:29:19.000000000 +0100 +++ kde-nightly-kdeplasma-addons-20091009+svn1033340/wallpapers/pattern/patterns/triangles.desktop 2009-10-09 23:33:50.000000000 +0100 @@ -13,6 +13,7 @@ Comment[is]=Þríhyrningar Comment[it]=Triangoli Comment[km]=ត្រីកោណ +Comment[lt]=Trikampiai Comment[lv]=Trīsstūri Comment[nb]=Trekanter Comment[nds]=Dre'ecks diff -Nru /tmp/eYOcAbyvnk/kde-nightly-kdeplasma-addons-20091006+svn1032120/wallpapers/virus/alife.cpp /tmp/sKugikI23I/kde-nightly-kdeplasma-addons-20091009+svn1033340/wallpapers/virus/alife.cpp --- kde-nightly-kdeplasma-addons-20091006+svn1032120/wallpapers/virus/alife.cpp 2009-10-06 23:29:19.000000000 +0100 +++ kde-nightly-kdeplasma-addons-20091009+svn1033340/wallpapers/virus/alife.cpp 2009-10-09 23:33:50.000000000 +0100 @@ -197,6 +197,7 @@ if(moveCell(id, facing)){ if(pixelBackup != pixel) { m_image.setPixel(cell->x, cell->y, pixel ); + updateAffectedArea(cell->x, cell->y); } cell = m_livingCells.at(id); pixel = m_image.pixel(cell->x, cell->y); @@ -360,6 +361,7 @@ if(pixelBackup != pixel) { m_image.setPixel(cell->x, cell->y, pixel ); + updateAffectedArea(cell->x, cell->y); } if(cell->energy <= 0) { @@ -528,6 +530,9 @@ //performance critical void Alife::virusMove() { + m_tl = QPoint(m_width, m_height); + m_br = QPoint(0,0); + m_current_eat = qMax(MAX_EAT, (int)(((double)m_livingCells.size()/ (double) (m_maxViruses / 4.0)) * MAX_EAT)); m_current_eat_best = qMax(MIN_EAT, (int)(((double)m_livingCells.size()/ (double) (m_maxViruses / 4.0)) * (MIN_EAT * 2))); //kDebug() << m_current_eat_best << m_current_eat << m_livingCells.size() << m_maxViruses; @@ -587,6 +592,7 @@ for(int i = 0; i < size; i++) { struct cell* cell = m_livingCells.at(i); newImage.setPixel(cell->x,cell->y,qRgb(cell->r,cell->g,cell->b)); + updateAffectedArea(cell->x,cell->y); } m_current = newImage; @@ -594,3 +600,22 @@ m_current = m_image; } } + +void Alife::updateAffectedArea(int x, int y) +{ + if (m_tl.x() > x) { + m_tl.setX(x); + }else if (m_br.x() < x) { + m_br.setX(x); + } + + if (m_tl.y() > y) { + m_tl.setY(y); + } else if(m_br.y() < y) { + m_br.setY(y); + } +} + +QRect Alife::updatedArea(){ + return QRect(m_tl, m_br); +} diff -Nru /tmp/eYOcAbyvnk/kde-nightly-kdeplasma-addons-20091006+svn1032120/wallpapers/virus/alife.h /tmp/sKugikI23I/kde-nightly-kdeplasma-addons-20091009+svn1033340/wallpapers/virus/alife.h --- kde-nightly-kdeplasma-addons-20091006+svn1032120/wallpapers/virus/alife.h 2009-10-06 23:29:19.000000000 +0100 +++ kde-nightly-kdeplasma-addons-20091009+svn1033340/wallpapers/virus/alife.h 2009-10-09 23:33:50.000000000 +0100 @@ -85,8 +85,13 @@ void setImage(QImage image); void createViruses(int amount); + + QRect updatedArea(); protected: + + void updateAffectedArea(int x, int y); + struct cell ** m_cells; QListm_livingCells; @@ -107,6 +112,8 @@ int m_current_eat; int m_current_eat_best; QMutex mutex; + + QPoint m_tl, m_br; }; #endif diff -Nru /tmp/eYOcAbyvnk/kde-nightly-kdeplasma-addons-20091006+svn1032120/wallpapers/virus/virusconfig.ui /tmp/sKugikI23I/kde-nightly-kdeplasma-addons-20091009+svn1033340/wallpapers/virus/virusconfig.ui --- kde-nightly-kdeplasma-addons-20091006+svn1032120/wallpapers/virus/virusconfig.ui 2009-10-06 23:29:19.000000000 +0100 +++ kde-nightly-kdeplasma-addons-20091009+svn1033340/wallpapers/virus/virusconfig.ui 2009-10-09 23:33:50.000000000 +0100 @@ -7,7 +7,7 @@ 0 0 592 - 400 + 500 diff -Nru /tmp/eYOcAbyvnk/kde-nightly-kdeplasma-addons-20091006+svn1032120/wallpapers/virus/virus.cpp /tmp/sKugikI23I/kde-nightly-kdeplasma-addons-20091009+svn1033340/wallpapers/virus/virus.cpp --- kde-nightly-kdeplasma-addons-20091006+svn1032120/wallpapers/virus/virus.cpp 2009-10-06 23:29:19.000000000 +0100 +++ kde-nightly-kdeplasma-addons-20091009+svn1033340/wallpapers/virus/virus.cpp 2009-10-09 23:33:50.000000000 +0100 @@ -91,7 +91,7 @@ void Virus::virusUpdated() { m_pixmap = QPixmap::fromImage(alife.currentImage()); - emit update(boundingRect()); + emit update(alife.updatedArea()); m_timer.start(alife.getUpdateInterval()); } @@ -174,6 +174,8 @@ connect(this, SIGNAL(settingsChanged(bool)), parent, SLOT(settingsChanged(bool))); + connect(m_uiVirus.m_view, SIGNAL(clicked(const QModelIndex &)), this, SLOT(modified())); + return m_configWidget; }