osdir.com
mailing list archive

Subject: extragear/graphics/kipi-plugins/acquireimages - msg#04806

List: kde-commits

Date: Prev Next Index Thread: Prev Next Index
SVN commit 1048717 by sars:

slotClose() is not needed as closeEvent() is called in any case.

M +1 -10 scandialog.cpp
M +0 -1 scandialog.h


--- trunk/extragear/graphics/kipi-plugins/acquireimages/scandialog.cpp
#1048716:1048717
@@ -116,9 +116,6 @@

// ------------------------------------------------------------------------

- connect(this, SIGNAL(closeClicked()),
- this, SLOT(slotClose()));
-
connect(d->saneWidget, SIGNAL(imageReady(QByteArray&, int, int, int, int)),
this, SLOT(slotSaveImage(QByteArray&, int, int, int, int)));

@@ -147,15 +144,9 @@
config.sync();
}

-void ScanDialog::slotClose()
-{
- saveSettings();
- done(Close);
-}
-
void ScanDialog::closeEvent(QCloseEvent *e)
{
- d->saneWidget->scanCancel();
+ d->saneWidget->closeDevice();
saveSettings();
e->accept();
}
--- trunk/extragear/graphics/kipi-plugins/acquireimages/scandialog.h
#1048716:1048717
@@ -66,7 +66,6 @@
private Q_SLOTS:

void slotSaveImage(QByteArray&, int, int, int, int);
- void slotClose();
void slotHelp();
void slotThreadDone(const KUrl&, bool);


Find Programming Jobs at git.net
(osdir sister site)

Thread at a glance:

Previous Message by Date: (click to view message preview)

l10n-kde4/x-test/messages

SVN commit 1048716 by lueck: updating language x-test M +26 -33 extragear-multimedia/amarok.po M +2 -2 extragear-multimedia/amarokcollectionscanner_qt.po M +4 -10 extragear-multimedia/kaffeine.po M +6 -10 extragear-network/ktorrent.po M +10 -47 kdebase/dolphin.po M +4 -10 kdebase/kwin_effects.po M +5 -5 kdebase/plasma_applet_quicklaunch.po M +4 -4 kdeedu/desktop_kdeedu.po M +2 -2 kdeedu/rocs.po M +32 -69 kdelibs/kdelibs4.po M +2 -4 kdelibs/kio4.po M +5 -13 kdenetwork/kget.po M +3 -15 kdenetwork/krfb.po M +1 -4 kdepim/kalarm.po M +3 -4 kdepimlibs/kabc.po M +1 -3 kdeplasma-addons/plasma_applet_knowledgebase.po M +11 -23 kdereview/desktop_kdereview.po A kdereview/plasma_applet_webslice.po M +2 -2 kdereview/plasma_runner_mediawiki.po M +9 -21 koffice/krita.po M +1 -33 playground-base/desktop_playground-base.po M +4 -10 playground-base/khtml_nepomuk_task_linker.po M +2 -5 playground-base/knetworkmanager.po M +2 -4 playground-base/kustodian_applet.po M +87 -278 playground-base/libknetworkmanager.po M +5 -13 playground-base/nepomuktasks.po M +4 -10 playground-base/plasma_applet_clock_hybrid.po M +3 -8 playground-devtools/kdevexecutebrowser.po M +2 -4 playground-devtools/kdevexecutescript.po M +129 -136 playground-multimedia/kmid2.po http://websvn.kde.org/?view=rev&revision=1048716

Next Message by Date: click to view message preview

branches/work/akonadi-ports/kdepim/messagecomposer/tests

SVN commit 1048718 by lfranchi: add unittests for sign, encrypt, and both jobs. currently needs to be run in the sourcedir to find the test gnupg homedir M +6 -1 CMakeLists.txt A encryptjobtest.cpp [License: LGPL (v2+)] A encryptjobtest.h [License: LGPL (v2+)] A gnupg_home (directory) A gnupg_home/gpg.conf A gnupg_home/private-keys-v1.d (directory) AM gnupg_home/pubring.gpg AM gnupg_home/random_seed AM gnupg_home/secring.gpg AM gnupg_home/trustdb.gpg A signencrypttest.cpp [License: LGPL (v2+)] A signencrypttest.h [License: LGPL (v2+)] A signjobtest.cpp [License: LGPL (v2+)] A signjobtest.h [License: LGPL (v2+)] M +2 -1 singlepartjobtest.h --- branches/work/akonadi-ports/kdepim/messagecomposer/tests/CMakeLists.txt #1048717:1048718 @@ -10,7 +10,7 @@ set( _test ${_source} ) get_filename_component( _name ${_source} NAME_WE ) kde4_add_unit_test( ${_name} TESTNAME messagecomposer-${_name} ${_test} ) - target_link_libraries( ${_name} ${KDE4_KMIME_LIBRARY} messagecomposer ${QT_QTTEST_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTCORE_LIBRARY} ${KDE4_KDEUI_LIBS} ) + target_link_libraries( ${_name} ${KDE4_KMIME_LIBRARY} messagecomposer messageviewer ${QT_QTTEST_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTCORE_LIBRARY} ${KDE4_KDEUI_LIBS} ) endmacro( add_messagecomposer_test ) @@ -35,3 +35,8 @@ # Composer. add_messagecomposer_test( composertest.cpp ) + +# Crypto +add_messagecomposer_test( signjobtest.cpp ) +add_messagecomposer_test( encryptjobtest.cpp ) +add_messagecomposer_test( signencrypttest.cpp ) ** branches/work/akonadi-ports/kdepim/messagecomposer/tests/gnupg_home/pubring.gpg #property svn:mime-type + application/octet-stream ** branches/work/akonadi-ports/kdepim/messagecomposer/tests/gnupg_home/random_seed #property svn:mime-type + application/octet-stream ** branches/work/akonadi-ports/kdepim/messagecomposer/tests/gnupg_home/secring.gpg #property svn:mime-type + application/octet-stream ** branches/work/akonadi-ports/kdepim/messagecomposer/tests/gnupg_home/trustdb.gpg #property svn:mime-type + application/octet-stream --- branches/work/akonadi-ports/kdepim/messagecomposer/tests/singlepartjobtest.h #1048717:1048718 @@ -1,5 +1,6 @@ /* - Copyright (c) 2009 Constantin Berzan <exit3219@xxxxxxxxx> + Copyright (C) 2009 Klaralvdalens Datakonsult AB, a KDAB Group company, info@xxxxxxxx + Copyright (c) 2009 Leo Franchi <lfranchi@xxxxxxx> This library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as published by

Previous Message by Thread: click to view message preview

extragear/graphics/kipi-plugins/acquireimages

SVN commit 1046528 by sengels: it must be path() only in case of a remote file, not for local files M +10 -4 saveimgthread.cpp --- trunk/extragear/graphics/kipi-plugins/acquireimages/saveimgthread.cpp #1046527:1046528 @@ -149,21 +149,27 @@ bool ret = false; + QString path; + if(d->newUrl.isLocalFile()) + path = d->newUrl.toLocalFile(); + else + path = d->newUrl.path(); + if (d->format == QString("JPEG")) { - ret = wImageIface.write2JPEG(d->newUrl.path()); + ret = wImageIface.write2JPEG(path); } else if (d->format == QString("PNG")) { - ret = wImageIface.write2PNG(d->newUrl.path()); + ret = wImageIface.write2PNG(path); } else if (d->format == QString("TIFF")) { - ret = wImageIface.write2TIFF(d->newUrl.path()); + ret = wImageIface.write2TIFF(path); } else { - ret = d->img.save(d->newUrl.path(), d->format.toAscii().data()); + ret = d->img.save(path, d->format.toAscii().data()); } emit signalComplete(d->newUrl, ret);

Next Message by Thread: click to view message preview

extragear/graphics/kipi-plugins/acquireimages

SVN commit 1048775 by sengels: path to localFile M +1 -1 scandialog.cpp --- trunk/extragear/graphics/kipi-plugins/acquireimages/scandialog.cpp #1048774:1048775 @@ -191,7 +191,7 @@ return; KUrl newURL = imageFileSaveDialog->selectedUrl(); - QFileInfo fi(newURL.path()); + QFileInfo fi(newURL.toLocalFile()); // Check if target image format have been selected from Combo List of dialog.

Web Hosting Reviews from OSDir.com Sister Site iBizWebHosting.com

Home | News | Patents | Sitemap | FAQ | advertise | OSDir is an Inevitable website. GBiz & git.net are too!

Advertising by