Differential D9148 Diff 23534 kmymoney/views/kmymoneyview.cpp

Changeset View

Standalone View

kmymoney/views/kmymoneyview.cpp

Context not available.
45	#include <KSharedConfig>	45		#include <KSharedConfig>
46	#include <KBackup>	46		#include <KBackup>
47	#include <KActionCollection>	47		#include <KActionCollection>
		48		#include <KIO/StoredTransferJob>
		49		#include <KJobWidgets>
48		50
49	#ifdef KF5Activities_FOUND	51		#ifdef KF5Activities_FOUND
50	#include <KActivities/ResourceInstance>	52		#include <KActivities/ResourceInstance>
Context not available.
450	void KMyMoneyView::slotAccountTreeViewChanged(const eAccountsModel::Column column, const bool show)	452		void KMyMoneyView::slotAccountTreeViewChanged(const eAccountsModel::Column column, const bool show)
451	{	453		{
452	QVector<AccountsViewProxyModel *> proxyModels {m_institutionsView->getProxyModel(), m_accountsView->getProxyModel(),	454		QVector<AccountsViewProxyModel *> proxyModels {m_institutionsView->getProxyModel(), m_accountsView->getProxyModel(),
453	m_categoriesView->getProxyModel(), m_budgetView->getProxyModel()};	455		m_categoriesView->getProxyModel(), m_budgetView->getProxyModel()};
454		456
455	for (auto i = proxyModels.count() - 1; i >= 0; --i) { // weed out unloaded views	457		for (auto i = proxyModels.count() - 1; i >= 0; --i) { // weed out unloaded views
456	if (!proxyModels.at(i))	458		if (!proxyModels.at(i))
Context not available.
801	bool KMyMoneyView::readFile(const QUrl &url)	803		bool KMyMoneyView::readFile(const QUrl &url)
802	{	804		{
803	QString filename;	805		QString filename;
804		806		bool downloadedFile = false;
805	m_fileOpen = false;	807		m_fileOpen = false;
806	bool isEncrypted = false;	808		bool isEncrypted = false;
807		809
Context not available.
830	if (url.isLocalFile()) {	832		if (url.isLocalFile()) {
831	filename = url.toLocalFile();	833		filename = url.toLocalFile();
832	} else {	834		} else {
833	// TODO: port to kf5 (NetAccess)	835		downloadedFile = true;
834	#if 0	836		KIO::StoredTransferJob *transferjob = KIO::storedGet (url);
835	if (!KIO::NetAccess::download(url, filename, 0)) {	837		KJobWidgets::setWindow(transferjob, this);
836	KMessageBox::detailedError(this,	838		if (! transferjob->exec()) {
		839		KMessageBox::detailedError(this,
837	i18n("Error while loading file '%1'.", url.url()),	840		i18n("Error while loading file '%1'.", url.url()),
838	KIO::NetAccess::lastErrorString(),	841		transferjob->errorString(),
839	i18n("File access error"));	842		i18n("File access error"));
840	return false;	843		return false;
841	}	844		}
842	#endif	845		QTemporaryFile file;
		846		file.setAutoRemove(false);
		847		file.open();
		848		file.write(transferjob->data());
		849		filename = file.fileName();
		850		file.close();
843	}	851		}
844		852
845	// let's glimps into the file to figure out, if it's one	853		// let's glimps into the file to figure out, if it's one
Context not available.
1018	} catch (const MyMoneyException &) {	1026		} catch (const MyMoneyException &) {
1019	}	1027		}
1020		1028
1021	// if a temporary file was constructed by NetAccess::download,	1029		// if a temporary file was downloaded, then it will be removed
1022	// then it will be removed with the next call. Otherwise, it	1030		// with the next call. Otherwise, it stays untouched on the local
1023	// stays untouched on the local filesystem	1031		// filesystem.
1024	// TODO: port to KF5 (NetAccess)	1032		if (downloadedFile) {
1025	//KIO::NetAccess::removeTempFile(filename);	1033		QFile::remove(filename);
		1034		}
		1035
1026	return initializeStorage();	1036		return initializeStorage();
1027	}	1037		}
1028		1038
			christiandUnsubmitted Done Is this line intended? christiand: Is this line intended?
Context not available.
1443	tmpfile.open(); // to obtain the name	1453		tmpfile.open(); // to obtain the name
1444	tmpfile.close();	1454		tmpfile.close();
1445	saveToLocalFile(tmpfile.fileName(), storageWriter.get(), plaintext, keyList);	1455		saveToLocalFile(tmpfile.fileName(), storageWriter.get(), plaintext, keyList);
1446	// TODO: port to kf5	1456
1447	//if (!KIO::NetAccess::upload(tmpfile.fileName(), url, 0))	1457		Q_CONSTEXPR int permission = -1;
1448	// throw MYMONEYEXCEPTION(i18n("Unable to upload to '%1'", url.toDisplayString()));	1458		QFile file(tmpfile.fileName());
			tbaumgartUnsubmitted Done Q_CONSTEXPR int permission = -1; tbaumgart: Q_CONSTEXPR int permission = -1;
		1459		file.open(QIODevice::ReadOnly);
		1460		KIO::StoredTransferJob *putjob = KIO::storedPut(file.readAll(), url, permission, KIO::JobFlag::Overwrite);
		1461		if (!putjob->exec()) {
		1462		throw MYMONEYEXCEPTION(i18n("Unable to upload to '%1'.<br />%2", url.toDisplayString(), putjob->errorString()));
		1463		}
		1464		file.close();
1449	}	1465		}
1450	m_fileType = KmmXML;	1466		m_fileType = KmmXML;
1451	} catch (const MyMoneyException &e) {	1467		} catch (const MyMoneyException &e) {
Context not available.