diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index f0f8f61..4368b0b 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,226 +1,227 @@
include(GenerateExportHeader)
include(ECMGenerateHeaders)
include(ECMGeneratePriFile)
include(CMakePackageConfigHelpers)
include(ECMSetupVersion)
include_directories(
${CMAKE_CURRENT_BINARY_DIR}
)
########### target alkimia-internal ###########
set(alkimia_INTERNAL_SRCS
alkdateformat.cpp
alkexception.cpp
alkonlinequoteprocess.cpp
alkquoteitem.cpp
alkquotereceiver.cpp
alkwebpage.cpp
)
set(alkimia_INTERNAL_HEADERS
alkdateformat.h
alkexception.h
alkonlinequoteprocess.h
alkquoteitem.h
alkquotereceiver.h
alkwebpage.h
)
set(alkimia_INTERNAL_UI
)
ki18n_wrap_ui(alkimia_INTERNAL_SRCS ${alkimia_INTERNAL_UI} )
add_library(alkimia-internal STATIC ${alkimia_INTERNAL_SRCS} ${alkimia_INTERNAL_HEADERS})
if(NOT BUILD_QT4)
set (ALKIMIA_INTERNAL_LIBS
PRIVATE
${QT_USE_LIBSPREFIX}WebKitWidgets
KF5::CoreAddons
KF5::KDELibs4Support
KF5::NewStuff
)
endif()
target_link_libraries(alkimia-internal PUBLIC ${QT_USE_LIBSPREFIX}Core ${ALKIMIA_INTERNAL_LIBS})
kde_target_enable_exceptions(alkimia-internal PUBLIC)
########### target alkimia ###########
set(ALKIMIA_LIB_VERSION ${alkimia_VERSION})
set(ALKIMIA_LIB_SOVERSION "${alkimia_VERSION_MAJOR}")
set(alkimia_LIB_SRCS
alkcompany.cpp
alkfinancequoteprocess.cpp
alkonlinequote.cpp
alkonlinequotesource.cpp
alkonlinequotesprofile.cpp
alkonlinequotesprofilemanager.cpp
alkonlinequoteswidget.cpp
alkvalue.cpp
)
set(alkimia_LIB_HEADERS
alkcompany.h
alkfinancequoteprocess.h
alkonlinequote.h
alkonlinequotesource.h
alkonlinequotesprofile.h
alkonlinequotesprofilemanager.h
alkonlinequoteswidget.h
)
set(alkimia_UI
alkonlinequoteswidget.ui
)
configure_file(
${CMAKE_CURRENT_SOURCE_DIR}/alkvalue.h.in
${CMAKE_CURRENT_BINARY_DIR}/alkimia/alkvalue.h
IMMEDIATE
)
foreach(header ${alkimia_LIB_HEADERS})
configure_file(
${CMAKE_CURRENT_SOURCE_DIR}/${header}
${CMAKE_CURRENT_BINARY_DIR}/alkimia/${header}
COPYONLY
)
endforeach()
add_definitions(-DKNSRC_DIR="${CMAKE_CURRENT_SOURCE_DIR}")
ki18n_wrap_ui(alkimia_LIB_SRCS ${alkimia_UI} )
add_library(alkimia SHARED ${alkimia_LIB_SRCS} ${alkimia_INTERNAL_SRCS} ${alkimia_LIB_HEADERS})
kde_target_enable_exceptions(alkimia PUBLIC)
if(BUILD_QT4)
set(ALKIMIA_LIBS
PRIVATE
${KDE_LIBRARIES}
${KDE4_KDEUI_LIBS}
${KDE4_KNEWSTUFF3_LIBS})
else()
set(ALKIMIA_LIBS
PRIVATE
${QT_USE_LIBSPREFIX}WebKitWidgets
KF5::KDELibs4Support
KF5::NewStuff
)
+ add_definitions(-DTRANSLATION_DOMAIN=\"alkimia\")
endif()
target_link_libraries(alkimia
PRIVATE
alkimia-internal
${QT_USE_LIBSPREFIX}Core
${ALKIMIA_LIBS}
${QT_USE_LIBSPREFIX}WebKit
${QT_USE_LIBSPREFIX}DBus
PUBLIC
${MP_LIBRARIES}
)
if(NOT BUILD_QT4 AND MSVC)
message(WARNING "Applying fix for broken Qt WebKit package (see https://phabricator.kde.org/T10146 for details)")
target_link_libraries(alkimia
PRIVATE
${QT_USE_LIBSPREFIX}Test
)
endif()
install(
DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/alkimia
DESTINATION ${INCLUDE_INSTALL_DIR}/alkimia/${ALKIMIA_INCLUDE_SUFFIX}
COMPONENT Devel
)
generate_export_header(alkimia BASE_NAME alk EXPORT_FILE_NAME alkimia/alk_export.h)
if(WIN32)
set_target_properties(alkimia PROPERTIES SUFFIX "-${ALKIMIA_LIB_SOVERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}")
else()
set_target_properties(alkimia PROPERTIES VERSION ${ALKIMIA_LIB_VERSION} SOVERSION ${ALKIMIA_LIB_SOVERSION})
endif()
set_target_properties(alkimia PROPERTIES OUTPUT_NAME alkimia${ALKIMIA_LIB_SUFFIX})
set(INCLUDE_INSTALL_DIR include/alkimia/${ALKIMIA_INCLUDE_SUFFIX})
install(TARGETS alkimia
EXPORT alkimiaTargets
${INSTALL_TARGETS_DEFAULT_ARGS}
)
if(BUILD_QT4)
set(KNSRC_INSTALL_DIR ${KDE4_CONFIG_INSTALL_DIR})
else()
set(KNSRC_INSTALL_DIR ${CONFIG_INSTALL_DIR})
endif()
install(FILES
alkimia-quotes.knsrc
kmymoney-quotes.knsrc
skrooge-quotes.knsrc
DESTINATION ${KNSRC_INSTALL_DIR}
)
install(FILES financequote.pl
DESTINATION ${DATA_INSTALL_DIR}/alkimia${ALKIMIA_PATH_SUFFIX}/misc
)
if (NOT WIN32)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libalkimia.pc.in ${CMAKE_CURRENT_BINARY_DIR}/libalkimia${ALKIMIA_PATH_SUFFIX}.pc IMMEDIATE @ONLY)
endif(NOT WIN32)
########### create package configuration file ###########
# create a Config.cmake and a ConfigVersion.cmake file and install them
set(CMAKECONFIG_INSTALL_DIR "${CMAKECONFIG_INSTALL_PREFIX}/LibAlkimia${ALKIMIA_PATH_SUFFIX}-${alkimia_VERSION_MAJOR}.${alkimia_VERSION_MINOR}")
ecm_setup_version(${alkimia_VERSION} VARIABLE_PREFIX ALKIMIA
PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/LibAlkimia${ALKIMIA_PATH_SUFFIX}ConfigVersion.cmake"
COMPATIBILITY SameMajorVersion
)
configure_package_config_file(
"${CMAKE_CURRENT_SOURCE_DIR}/LibAlkimiaConfig.cmake.in"
"${CMAKE_CURRENT_BINARY_DIR}/LibAlkimia${ALKIMIA_PATH_SUFFIX}Config.cmake"
INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR}
PATH_VARS INCLUDE_INSTALL_DIR
)
########### install files ###############
export(TARGETS alkimia
FILE "${CMAKE_CURRENT_BINARY_DIR}/LibAlkimia${ALKIMIA_PATH_SUFFIX}Targets.cmake"
NAMESPACE Alkimia::
)
install(EXPORT alkimiaTargets
FILE LibAlkimia${ALKIMIA_PATH_SUFFIX}Targets.cmake
NAMESPACE Alkimia::
DESTINATION ${CMAKECONFIG_INSTALL_DIR}
)
install(FILES
"${CMAKE_CURRENT_BINARY_DIR}/LibAlkimia${ALKIMIA_PATH_SUFFIX}Config.cmake"
"${CMAKE_CURRENT_BINARY_DIR}/LibAlkimia${ALKIMIA_PATH_SUFFIX}ConfigVersion.cmake"
"../cmake/modules/Find${MP_CMAKE_MODULE}.cmake"
DESTINATION "${CMAKECONFIG_INSTALL_DIR}"
COMPONENT Devel)
if (NOT WIN32)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libalkimia${ALKIMIA_PATH_SUFFIX}.pc
DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
endif(NOT WIN32)
########### documentation ###################
if(DOXYGEN_FOUND)
set(APIDOC_DIR ${CMAKE_CURRENT_BINARY_DIR}/apidocs)
make_directory(${APIDOC_DIR})
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libalkimia.doxygen.in ${CMAKE_CURRENT_BINARY_DIR}/libalkimia.doxygen IMMEDIATE)
add_custom_target(libalkimia_apidoc ${DOXYGEN} ${CMAKE_CURRENT_BINARY_DIR}/libalkimia.doxygen)
endif(DOXYGEN_FOUND)
diff --git a/src/alkonlinequoteswidget.cpp b/src/alkonlinequoteswidget.cpp
index 4c27aca..dc0d43b 100644
--- a/src/alkonlinequoteswidget.cpp
+++ b/src/alkonlinequoteswidget.cpp
@@ -1,672 +1,683 @@
/***************************************************************************
* Copyright 2004 Thomas Baumgart tbaumgart@kde.org *
* *
* This file is part of libalkimia. *
* *
* libalkimia is free software; you can redistribute it and/or *
* modify it under the terms of the GNU General Public License *
* as published by the Free Software Foundation; either version 2.1 of *
* the License or (at your option) version 3 or any later version. *
* *
* libalkimia is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License *
* along with this program. If not, see *
***************************************************************************/
#include "alkonlinequoteswidget.h"
#include "alkonlinequote.h"
#include "alkonlinequotesprofile.h"
#include "alkonlinequotesprofilemanager.h"
#include "alkonlinequotesource.h"
#include "alkwebpage.h"
#include
#include
#include
#include
#include
-#include
-#include
+#include
#include
#include
#include
#include
#include
#include
#include
class AlkOnlineQuotesWidget::Private : public QWidget, public Ui::AlkOnlineQuotesWidget
{
Q_OBJECT
public:
QString m_acceptLanguage;
QList m_resetList;
AlkOnlineQuoteSource m_currentItem;
bool m_quoteInEditing;
AlkOnlineQuotesProfile *m_profile;
bool m_showProfiles;
bool m_showUpload;
QPixmap m_emptyIcon;
QPixmap m_inWorkIcon;
QPixmap m_okIcon;
QPixmap m_failIcon;
QPixmap m_unknownIcon;
QDialog *m_webPageDialog;
Private(bool showProfiles, bool showUpload, QWidget *parent);
~Private();
public slots:
void slotNewProfile();
void slotDeleteProfile();
void slotSelectProfile();
void slotLoadProfile();
void slotDeleteEntry();
void slotDuplicateEntry();
void slotUpdateEntry();
void slotLoadWidgets();
void slotEntryChanged();
void slotNewEntry();
void slotCheckEntry();
void slotLogStatus(const QString &s);
void slotLogError(const QString &s);
void slotLogFailed(const QString &id, const QString &symbol);
void slotLogQuote(const QString &id, const QString &symbol, const QDate &date, double price);
void slotEntryRenamed(QListWidgetItem *item);
void slotStartRename(QListWidgetItem *item);
void slotInstallEntries();
void slotUploadEntry();
void slotShowButton();
public:
void loadProfiles();
void loadQuotesList(const bool updateResetList = false);
void clearIcons();
void initIcons();
void setupIcons(const AlkOnlineQuote::Errors &errors);
QString singleSymbol() const;
QStringList doubleSymbol() const;
QString expandedUrl() const;
};
AlkOnlineQuotesWidget::Private::Private(bool showProfiles, bool showUpload, QWidget *parent)
: QWidget(parent)
, m_quoteInEditing(false)
, m_profile(nullptr)
, m_showProfiles(showProfiles)
, m_showUpload(showUpload)
, m_inWorkIcon(BarIcon("view-refresh"))
, m_okIcon(BarIcon("dialog-ok-apply"))
, m_failIcon(BarIcon("dialog-cancel"))
, m_webPageDialog(nullptr)
{
setupUi(parent);
profilesGroupBox->setVisible(showProfiles);
profileDetailsBox->setVisible(showProfiles);
m_showButton->setVisible(!showProfiles && AlkOnlineQuotesProfileManager::instance().webPageEnabled());
m_ghnsSource->setEnabled(showProfiles);
m_uploadButton->setVisible(showUpload);
m_urlCheckLabel->setMinimumWidth(m_okIcon.width());
loadProfiles();
// TODO move to ui file
KGuiItem updateButtenItem(i18nc("Accepts the entered data and stores it", "&Accept"),
KIcon("dialog-ok"),
i18n("Accepts the entered data and stores it"),
i18n("Use this to accept the modified data."));
m_updateButton->setGuiItem(updateButtenItem);
KGuiItem deleteButtenItem(i18n("&Delete"),
KIcon("edit-delete"),
i18n("Delete the selected source entry"),
i18n("Use this to delete the selected online source entry"));
m_deleteButton->setGuiItem(deleteButtenItem);
KGuiItem checkButtonItem(i18nc("Check the selected source entry", "&Check Source"),
KIcon("document-edit-verify"),
i18n("Check the selected source entry"),
i18n("Use this to check the selected online source entry"));
m_checkButton->setGuiItem(checkButtonItem);
KGuiItem showButtonItem(i18nc("Show the selected source entry in a web browser", "&Show page"),
KIcon("applications-internet"),
i18n("Show the selected source entry in a web browser"),
i18n("Use this to show the selected online source entry"));
m_showButton->setGuiItem(showButtonItem);
KGuiItem newButtenItem(i18nc("Create a new source entry for online quotes", "&New..."),
KIcon("document-new"),
i18n("Create a new source entry for online quotes"),
i18n("Use this to create a new entry for online quotes"));
m_newButton->setGuiItem(newButtenItem);
connect(m_newProfile, SIGNAL(clicked()), this, SLOT(slotNewProfile()));
connect(m_deleteProfile, SIGNAL(clicked()), this, SLOT(slotDeleteProfile()));
connect(m_profileList, SIGNAL(itemSelectionChanged()), this, SLOT(slotLoadProfile()));
connect(m_updateButton, SIGNAL(clicked()), this, SLOT(slotUpdateEntry()));
connect(m_newButton, SIGNAL(clicked()), this, SLOT(slotNewEntry()));
connect(m_checkButton, SIGNAL(clicked()), this, SLOT(slotCheckEntry()));
connect(m_deleteButton, SIGNAL(clicked()), this, SLOT(slotDeleteEntry()));
connect(m_duplicateButton, SIGNAL(clicked()), this, SLOT(slotDuplicateEntry()));
connect(m_installButton, SIGNAL(clicked()), this, SLOT(slotInstallEntries()));
connect(m_uploadButton, SIGNAL(clicked()), this, SLOT(slotUploadEntry()));
connect(m_quoteSourceList, SIGNAL(itemSelectionChanged()), this, SLOT(slotLoadWidgets()));
connect(m_quoteSourceList, SIGNAL(itemChanged(QListWidgetItem *)), this,
SLOT(slotEntryRenamed(QListWidgetItem *)));
connect(m_quoteSourceList, SIGNAL(itemDoubleClicked(QListWidgetItem *)), this,
SLOT(slotStartRename(QListWidgetItem *)));
connect(m_editURL, SIGNAL(textChanged(QString)), this, SLOT(slotEntryChanged()));
connect(m_editSymbol, SIGNAL(textChanged(QString)), this, SLOT(slotEntryChanged()));
connect(m_editDate, SIGNAL(textChanged(QString)), this, SLOT(slotEntryChanged()));
connect(m_editDateFormat, SIGNAL(textChanged(QString)), this, SLOT(slotEntryChanged()));
connect(m_editPrice, SIGNAL(textChanged(QString)), this, SLOT(slotEntryChanged()));
connect(m_skipStripping, SIGNAL(toggled(bool)), this, SLOT(slotEntryChanged()));
connect(m_ghnsSource, SIGNAL(toggled(bool)), this, SLOT(slotEntryChanged()));
connect(m_showButton, SIGNAL(clicked()), this, SLOT(slotShowButton()));
m_checkSymbol->setText("ORCL");
m_checkSymbol2->setText("BTC GBP");
m_updateButton->setEnabled(false);
slotLoadProfile();
}
AlkOnlineQuotesWidget::Private::~Private()
{
m_webPageDialog->deleteLater();
}
void AlkOnlineQuotesWidget::Private::loadProfiles()
{
AlkOnlineQuotesProfileList list = AlkOnlineQuotesProfileManager::instance().profiles();
if (list.size() == 0)
return;
foreach (AlkOnlineQuotesProfile *profile, list) {
QListWidgetItem *item = new QListWidgetItem(dynamic_cast(m_profileList));
item->setText(profile->name());
item->setFlags(item->flags() | Qt::ItemIsEditable);
}
m_profileList->setCurrentRow(0);
m_profile = AlkOnlineQuotesProfileManager::instance().profiles().first();
loadQuotesList();
}
void AlkOnlineQuotesWidget::Private::loadQuotesList(const bool updateResetList)
{
m_quoteInEditing = false;
QStringList groups = m_profile->quoteSources();
if (updateResetList) {
m_resetList.clear();
}
m_quoteSourceList->blockSignals(true);
m_quoteSourceList->clear();
QStringList::Iterator it;
for (it = groups.begin(); it != groups.end(); ++it) {
AlkOnlineQuoteSource source(*it, m_profile);
if (!source.isValid()) {
continue;
}
QListWidgetItem *item = new QListWidgetItem(*it);
item->setFlags(Qt::ItemIsEditable | Qt::ItemIsSelectable | Qt::ItemIsEnabled);
m_quoteSourceList->addItem(item);
if (updateResetList) {
m_resetList += source;
}
}
m_quoteSourceList->sortItems();
QListWidgetItem *item = nullptr;
if (!m_currentItem.name().isEmpty()) {
QList items = m_quoteSourceList->findItems(m_currentItem.name(), Qt::MatchExactly);
if (items.size() > 0)
item = items.at(0);
if (item)
m_quoteSourceList->setCurrentItem(item);
}
if (!item) {
item = m_quoteSourceList->item(0);
if (item)
m_quoteSourceList->setCurrentItem(item);
}
m_quoteSourceList->blockSignals(false);
slotLoadWidgets();
slotEntryChanged();
}
void AlkOnlineQuotesWidget::Private::slotNewProfile()
{
QListWidgetItem *item = new QListWidgetItem(dynamic_cast(m_profileList));
item->setText(QLatin1String("new profile"));
item->setFlags(item->flags() | Qt::ItemIsEditable);
}
void AlkOnlineQuotesWidget::Private::slotDeleteProfile()
{
delete m_profileList->currentItem();
}
void AlkOnlineQuotesWidget::Private::slotSelectProfile()
{
slotLoadProfile();
}
void AlkOnlineQuotesWidget::Private::slotLoadProfile()
{
AlkOnlineQuotesProfileList list = AlkOnlineQuotesProfileManager::instance().profiles();
if (!m_showProfiles) {
AlkOnlineQuotesProfileList list = AlkOnlineQuotesProfileManager::instance().profiles();
if (list.size() == 0)
return;
m_profile = list.first();
loadQuotesList();
return;
}
foreach (AlkOnlineQuotesProfile *profile, list) {
if (m_profileList->currentItem()->text() == profile->name()) {
m_profile = profile;
loadQuotesList();
m_installButton->setVisible(profile->hasGHNSSupport());
}
}
bool visible = m_profile->type() != AlkOnlineQuotesProfile::Type::None;
m_configFilePath->setText(m_profile->kConfigFile());
m_configFilePath->setVisible(visible);
m_configLabel->setEnabled(visible);
visible = m_profile->hasGHNSSupport();
m_GHNSConfigFilePath->setText(m_profile->hotNewStuffConfigFile());
m_GHNSConfigFilePath->setVisible(visible);
m_GHNSConfigLabel->setEnabled(visible);
m_GHNSDataPath->setText(m_profile->hotNewStuffReadPath().join(" "));
m_GHNSDataPath->setVisible(visible);
m_GHNSDataLabel->setEnabled(visible);
}
void AlkOnlineQuotesWidget::Private::slotLoadWidgets()
{
m_quoteInEditing = false;
QListWidgetItem *item = m_quoteSourceList->currentItem();
m_editURL->setEnabled(item != nullptr);
m_editSymbol->setEnabled(item != nullptr);
m_editPrice->setEnabled(item != nullptr);
m_editDate->setEnabled(item != nullptr);
m_editDateFormat->setEnabled(item != nullptr);
m_skipStripping->setEnabled(item != nullptr);
m_editURL->clear();
m_editSymbol->clear();
m_editPrice->clear();
m_editDate->clear();
m_editDateFormat->clear();
if (item) {
m_currentItem = AlkOnlineQuoteSource(item->text(), m_profile);
m_editURL->setText(m_currentItem.url());
m_editSymbol->setText(m_currentItem.sym());
m_editPrice->setText(m_currentItem.price());
m_editDate->setText(m_currentItem.date());
m_editDateFormat->setText(m_currentItem.dateformat());
m_skipStripping->setChecked(m_currentItem.skipStripping());
m_ghnsSource->setChecked(m_currentItem.isGHNS());
}
m_updateButton->setEnabled(false);
}
void AlkOnlineQuotesWidget::Private::slotEntryChanged()
{
clearIcons();
bool modified = m_editURL->text() != m_currentItem.url()
|| m_editSymbol->text() != m_currentItem.sym()
|| m_editDate->text() != m_currentItem.date()
|| m_editDateFormat->text() != m_currentItem.dateformat()
|| m_editPrice->text() != m_currentItem.price()
|| m_skipStripping->isChecked() != m_currentItem.skipStripping()
|| m_ghnsSource->isChecked() != m_currentItem.isGHNS();
bool hasWriteSupport = m_profile->type() != AlkOnlineQuotesProfile::Type::None || m_profile->hasGHNSSupport();
bool noNewEntry = m_quoteSourceList->findItems(i18n("New Quote Source"), Qt::MatchExactly).count() == 0;
m_newButton->setEnabled(hasWriteSupport && noNewEntry);
m_duplicateButton->setEnabled(hasWriteSupport);
m_deleteButton->setEnabled(!m_currentItem.isReadOnly() && !m_currentItem.isGHNS());
m_uploadButton->setEnabled(m_profile->hasGHNSSupport() && m_currentItem.isGHNS());
m_updateButton->setEnabled(modified);
m_checkButton->setEnabled(!modified);
m_checkSymbol->setEnabled(!m_currentItem.url().contains("%2"));
m_checkSymbol2->setEnabled(m_currentItem.url().contains("%2"));
}
void AlkOnlineQuotesWidget::Private::slotDeleteEntry()
{
QList items = m_quoteSourceList->findItems(
m_currentItem.name(), Qt::MatchExactly);
if (items.size() == 0) {
return;
}
QListWidgetItem *item = items.at(0);
if (!item) {
return;
}
int ret = KMessageBox::warningContinueCancel(this,
i18n("Are you sure to delete this online quote ?"),
i18n("Delete online quote"),
KStandardGuiItem::cont(),
KStandardGuiItem::cancel(),
QString("DeletingOnlineQuote"));
if (ret == KMessageBox::Cancel) {
return;
}
// keep this order to avoid deleting the wrong current item
m_currentItem.remove();
delete item;
slotEntryChanged();
}
void AlkOnlineQuotesWidget::Private::slotDuplicateEntry()
{
QList items = m_quoteSourceList->findItems(
m_currentItem.name(), Qt::MatchExactly);
if (items.size() == 0) {
return;
}
QListWidgetItem *item = items.at(0);
if (!item) {
return;
}
AlkOnlineQuoteSource copy(m_currentItem);
copy.setName(copy.name() + i18n(".copy"));
copy.setGHNS(false);
copy.write();
m_currentItem = copy;
loadQuotesList();
}
void AlkOnlineQuotesWidget::Private::slotUpdateEntry()
{
m_currentItem.setUrl(m_editURL->text());
m_currentItem.setSym(m_editSymbol->text());
m_currentItem.setDate(m_editDate->text());
m_currentItem.setDateformat(m_editDateFormat->text());
m_currentItem.setPrice(m_editPrice->text());
m_currentItem.setSkipStripping(m_skipStripping->isChecked());
m_currentItem.setGHNS(m_ghnsSource->isChecked());
m_currentItem.write();
m_checkButton->setEnabled(true);
slotEntryChanged();
}
void AlkOnlineQuotesWidget::Private::slotNewEntry()
{
AlkOnlineQuoteSource newSource(i18n("New Quote Source"), m_profile);
newSource.write();
m_currentItem = newSource;
loadQuotesList();
}
void AlkOnlineQuotesWidget::Private::clearIcons()
{
m_urlCheckLabel->setPixmap(m_emptyIcon);
m_dateCheckLabel->setPixmap(m_emptyIcon);
m_priceCheckLabel->setPixmap(m_emptyIcon);
m_symbolCheckLabel->setPixmap(m_emptyIcon);
m_dateFormatCheckLabel->setPixmap(m_emptyIcon);
}
void AlkOnlineQuotesWidget::Private::initIcons()
{
m_urlCheckLabel->setPixmap(m_inWorkIcon);
m_dateCheckLabel->setPixmap(m_inWorkIcon);
m_priceCheckLabel->setPixmap(m_inWorkIcon);
m_symbolCheckLabel->setPixmap(m_inWorkIcon);
m_dateFormatCheckLabel->setPixmap(m_inWorkIcon);
}
void AlkOnlineQuotesWidget::Private::setupIcons(const AlkOnlineQuote::Errors &errors)
{
clearIcons();
if (errors & AlkOnlineQuote::Errors::URL) {
m_urlCheckLabel->setPixmap(m_failIcon);
} else {
m_urlCheckLabel->setPixmap(m_okIcon);
m_symbolCheckLabel->setPixmap(errors & AlkOnlineQuote::Errors::Symbol ? m_failIcon : m_okIcon);
m_priceCheckLabel->setPixmap(errors & AlkOnlineQuote::Errors::Price ? m_failIcon : m_okIcon);
if (errors & AlkOnlineQuote::Errors::Date) {
m_dateCheckLabel->setPixmap(m_failIcon);
} else {
m_dateCheckLabel->setPixmap(m_okIcon);
m_dateFormatCheckLabel->setPixmap(
errors & AlkOnlineQuote::Errors::DateFormat ? m_failIcon : m_okIcon);
}
}
}
void AlkOnlineQuotesWidget::Private::slotCheckEntry()
{
AlkOnlineQuote quote(m_profile);
m_logWindow->setVisible(true);
m_logWindow->clear();
clearIcons();
quote.setAcceptLanguage(m_acceptLanguage);
connect("e, SIGNAL(status(QString)), this, SLOT(slotLogStatus(QString)));
connect("e, SIGNAL(error(QString)), this, SLOT(slotLogError(QString)));
connect("e, SIGNAL(failed(QString,QString)), this, SLOT(slotLogFailed(QString,QString)));
connect("e, SIGNAL(quote(QString,QString,QDate,double)), this,
SLOT(slotLogQuote(QString,QString,QDate,double)));
initIcons();
if (m_currentItem.url().contains("%2")) {
quote.launch(m_checkSymbol2->text(), m_checkSymbol2->text(), m_currentItem.name());
} else {
quote.launch(m_checkSymbol->text(), m_checkSymbol->text(), m_currentItem.name());
}
setupIcons(quote.errors());
}
void AlkOnlineQuotesWidget::Private::slotLogStatus(const QString &s)
{
m_logWindow->append(s);
}
void AlkOnlineQuotesWidget::Private::slotLogError(const QString &s)
{
slotLogStatus(QString("") + s + QString(""));
}
void AlkOnlineQuotesWidget::Private::slotLogFailed(const QString &id, const QString &symbol)
{
slotLogStatus(QString("%1 %2").arg(id, symbol));
}
void AlkOnlineQuotesWidget::Private::slotLogQuote(const QString &id, const QString &symbol,
const QDate &date, double price)
{
slotLogStatus(QString("%1 %2 %3 %4").arg(id, symbol,
date.toString()).arg(
price));
}
void AlkOnlineQuotesWidget::Private::slotStartRename(QListWidgetItem *item)
{
m_quoteInEditing = true;
m_quoteSourceList->editItem(item);
}
void AlkOnlineQuotesWidget::Private::slotEntryRenamed(QListWidgetItem *item)
{
//if there is no current item selected, exit
if (m_quoteInEditing == false || !m_quoteSourceList->currentItem()
|| item != m_quoteSourceList->currentItem()) {
return;
}
m_quoteInEditing = false;
QString text = item->text();
int nameCount = 0;
for (int i = 0; i < m_quoteSourceList->count(); ++i) {
if (m_quoteSourceList->item(i)->text() == text) {
++nameCount;
}
}
// Make sure we get a non-empty and unique name
if (text.length() > 0 && nameCount == 1) {
m_currentItem.rename(text);
} else {
item->setText(m_currentItem.name());
}
m_quoteSourceList->sortItems();
m_newButton->setEnabled(m_quoteSourceList->findItems(i18n(
"New Quote Source"),
Qt::MatchExactly).count() == 0);
}
void AlkOnlineQuotesWidget::Private::slotInstallEntries()
{
QString configFile = m_profile->hotNewStuffConfigFile();
QPointer dialog = new KNS3::DownloadDialog(configFile, this);
dialog->exec();
delete dialog;
loadQuotesList();
}
void AlkOnlineQuotesWidget::Private::slotUploadEntry()
{
QString configFile = m_profile->hotNewStuffConfigFile();
QUrl url = QUrl::fromLocalFile(m_currentItem.ghnsWriteFileName());
qDebug() << "uploading file" << url;
QPointer dialog = new KNS3::UploadDialog(configFile, this);
dialog->setUploadName(m_currentItem.name());
dialog->setUploadFile(url);
dialog->exec();
delete dialog;
}
void AlkOnlineQuotesWidget::Private::slotShowButton()
{
if (!m_webPageDialog) {
m_webPageDialog = new QDialog;
m_webPageDialog->setWindowTitle(i18n("Online Quote HTML Result Window"));
QVBoxLayout *layout = new QVBoxLayout;
AlkWebPage *webPage = AlkOnlineQuotesProfileManager::instance().webPage();
webPage->setWebInspectorEnabled(true);
layout->addWidget(webPage);
m_webPageDialog->setLayout(layout);
}
m_webPageDialog->show();
}
QString AlkOnlineQuotesWidget::Private::expandedUrl() const
{
if (m_currentItem.url().contains("%2")) {
return m_currentItem.url().arg(m_checkSymbol2->text());
} else {
return m_currentItem.url().arg(m_checkSymbol->text());
}
}
AlkOnlineQuotesWidget::AlkOnlineQuotesWidget(bool showProfiles, bool showUpload, QWidget *parent)
: QWidget(parent)
, d(new Private(showProfiles, showUpload, this))
{
}
AlkOnlineQuotesWidget::~AlkOnlineQuotesWidget()
{
delete d;
}
QWidget *AlkOnlineQuotesWidget::profilesWidget()
{
QFrame *frame = new QFrame;
frame->setLayout(d->profilesGroupBox->layout());
return frame;
}
QWidget *AlkOnlineQuotesWidget::profileDetailsWidget()
{
QFrame *frame = new QFrame;
frame->setLayout(d->profileDetailsBox->layout());
return frame;
}
QWidget *AlkOnlineQuotesWidget::onlineQuotesWidget()
{
QFrame *frame = new QFrame;
frame->setLayout(d->onlineQuotesGroupBox->layout());
return frame;
}
QWidget *AlkOnlineQuotesWidget::quoteDetailsWidget()
{
QFrame *frame = new QFrame;
frame->setLayout(d->detailsGroupBox->layout());
return frame;
}
QWidget *AlkOnlineQuotesWidget::debugWidget()
{
QFrame *frame = new QFrame;
frame->setLayout(d->debugGroupBox->layout());
return frame;
}
void AlkOnlineQuotesWidget::readConfig()
{
}
void AlkOnlineQuotesWidget::writeConfig()
{
}
void AlkOnlineQuotesWidget::resetConfig()
{
QStringList::ConstIterator it;
QStringList groups = d->m_profile->quoteSources();
// delete all currently defined entries
for (it = groups.constBegin(); it != groups.constEnd(); ++it) {
AlkOnlineQuoteSource(*it, d->m_profile).remove();
}
// and write back the one's from the reset list
QList::iterator itr;
for (itr = d->m_resetList.begin(); itr != d->m_resetList.end(); ++itr) {
(*itr).write();
}
d->loadQuotesList();
}
QString AlkOnlineQuotesWidget::acceptLanguage() const
{
return d->m_acceptLanguage;
}
void AlkOnlineQuotesWidget::setAcceptLanguage(const QString &text)
{
d->m_acceptLanguage = text;
}
+#if QT_VERSION < QT_VERSION_CHECK(5,0,0)
+class InitCatalog {
+public:
+ InitCatalog()
+ {
+ KComponentData a("alkimia", "alkimia");
+ }
+};
+
+static InitCatalog init;
+#endif
+
#include "alkonlinequoteswidget.moc"
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 9af3eee..aaa92c6 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,23 +1,28 @@
add_definitions(-DCMAKE_CURRENT_SOURCE_DIR="${CMAKE_CURRENT_SOURCE_DIR}")
set(TEST_LIB
alkimia
alkimia-internal
${QT_USE_LIBSPREFIX}Core
${QT_USE_LIBSPREFIX}WebKit
)
if(BUILD_QT4)
list(APPEND TEST_LIB
${QT_USE_LIBSPREFIX}Declarative
${KDE_LIBRARIES}
)
else()
list(APPEND TEST_LIB
${QT_USE_LIBSPREFIX}Qml
${QT_USE_LIBSPREFIX}WebKitWidgets
)
endif()
add_executable(qmlalkonlinequotetest
qmlalkonlinequotetest.cpp
)
target_link_libraries(qmlalkonlinequotetest ${TEST_LIB})
+
+add_executable(alkonlinequoteswidgettest
+ alkonlinequoteswidgettest.cpp
+)
+target_link_libraries(alkonlinequoteswidgettest ${TEST_LIB})
diff --git a/tools/onlinequoteseditor/main.cpp b/tests/alkonlinequoteswidgettest.cpp
similarity index 56%
copy from tools/onlinequoteseditor/main.cpp
copy to tests/alkonlinequoteswidgettest.cpp
index 6299860..57d34c5 100644
--- a/tools/onlinequoteseditor/main.cpp
+++ b/tests/alkonlinequoteswidgettest.cpp
@@ -1,55 +1,60 @@
/***************************************************************************
- * Copyright 2018 Ralf Habacker *
+ * Copyright 2019 Ralf Habacker ralf.habacker@freenet.de *
* *
* This file is part of libalkimia. *
* *
* libalkimia is free software; you can redistribute it and/or *
- * modify it under the terms of the GNU General Public License *
+ * modify it under the terms of the GNU Lesser General Public License *
* as published by the Free Software Foundation; either version 2.1 of *
* the License or (at your option) version 3 or any later version. *
* *
* libalkimia is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License *
* along with this program. If not, see *
***************************************************************************/
-#include "mainwindow.h"
+#include "alkonlinequoteswidget.h"
+#include "alkonlinequotesprofile.h"
+#include "alkonlinequotesprofilemanager.h"
+
+#include
#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
-#define KABOUTDATA_H
-#include
-#define KAboutData K4AboutData
+#include
#else
-#include
+#include
+class QGuiApplication : public QApplication
+{
+public:
+ QGuiApplication(int &argc, char **argv) : QApplication(argc, argv) {}
+};
#endif
-#include
-#include
+#include
+#include
+
+class Dialog : public QDialog {
+public:
+ Dialog()
+ {
-int main(int argc, char **argv)
+ QGridLayout *layout = new QGridLayout;
+ layout->addWidget(new AlkOnlineQuotesWidget);
+ setLayout(layout);
+ }
+};
+
+int main(int argc, char *argv[])
{
- KAboutData about("onlinequoteseditor", 0,
- ki18n("onlinequoteseditor"),
- "1.0",
- ki18n("Editor for online price quotes used by finance applications"),
- KAboutData::License_GPL,
- ki18n("(C) 2018 Ralf Habacker"));
- KCmdLineArgs::init(argc, argv, &about);
-
- KApplication app(true);
- KCmdLineOptions options;
- KCmdLineArgs::addCmdLineOptions(options); // Add my own options.
-
- KComponentData a(&about);
-
- // Get application specific arguments
- KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
-
- MainWindow w;
- w.show();
- return app.exec();
+ QGuiApplication app(argc, argv);
+
+ AlkOnlineQuotesProfile profile("no-config-file", AlkOnlineQuotesProfile::Type::None);
+ AlkOnlineQuotesProfileManager::instance().addProfile(&profile);
+
+ Dialog dialog;
+ dialog.exec();
}
diff --git a/tools/onlinequoteseditor/CMakeLists.txt b/tools/onlinequoteseditor/CMakeLists.txt
index ba84948..ca0f5ec 100644
--- a/tools/onlinequoteseditor/CMakeLists.txt
+++ b/tools/onlinequoteseditor/CMakeLists.txt
@@ -1,36 +1,37 @@
include_directories(
${CMAKE_SOURCE_DIR}/src
${CMAKE_BINARY_DIR}/src
)
set(SOURCES
main.cpp
mainwindow.cpp
)
set(HEADERS
mainwindow.h
)
set(UI
mainwindow.ui
)
ki18n_wrap_ui(SOURCES ${UI} )
#kde4_add_app_icon(SOURCES "${KDE4_INSTALL_DIR}/share/icons/oxygen/*/actions/application-exit.png")
ecm_add_executable(onlinequoteseditor ${SOURCES} ${HEADERS})
if(BUILD_QT4)
set(LIBS ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${QT_USE_LIBSPREFIX}Core ${QT_USE_LIBSPREFIX}Network ${QT_USE_LIBSPREFIX}WebKit)
else()
set(LIBS Qt5::Widgets Qt5::WebKitWidgets KF5::KDELibs4Support)
+ add_definitions(-DTRANSLATION_DOMAIN=\"onlinequoteeditor\")
endif()
target_link_libraries(onlinequoteseditor
alkimia
alkimia-internal
${LIBS}
)
install(TARGETS onlinequoteseditor ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
diff --git a/tools/onlinequoteseditor/Messages.sh b/tools/onlinequoteseditor/Messages.sh
new file mode 100644
index 0000000..bdaa73c
--- /dev/null
+++ b/tools/onlinequoteseditor/Messages.sh
@@ -0,0 +1,11 @@
+#!bin/sh
+# invoke the extractrc script on all .ui, .rc, and .kcfg files in the sources
+# the results are stored in a pseudo .cpp file to be picked up by xgettext.
+$EXTRACTRC `find . -name \*.rc -o -name \*.ui -o -name \*.kcfg` >> rc.cpp
+
+# call xgettext on all source files. If your sources have other filename
+# extensions besides .cpp, and .h, just add them in the find call.
+$XGETTEXT `find . -name \*.cpp -o -name \*.h -o -name \*.qml` -o $podir/onlinequoteeditor.pot
+
+# Remove these two generated files again
+rm rc.cpp
diff --git a/tools/onlinequoteseditor/main.cpp b/tools/onlinequoteseditor/main.cpp
index 6299860..9d9945f 100644
--- a/tools/onlinequoteseditor/main.cpp
+++ b/tools/onlinequoteseditor/main.cpp
@@ -1,55 +1,54 @@
/***************************************************************************
* Copyright 2018 Ralf Habacker *
* *
* This file is part of libalkimia. *
* *
* libalkimia is free software; you can redistribute it and/or *
* modify it under the terms of the GNU General Public License *
* as published by the Free Software Foundation; either version 2.1 of *
* the License or (at your option) version 3 or any later version. *
* *
* libalkimia is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License *
* along with this program. If not, see *
***************************************************************************/
#include "mainwindow.h"
#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
#define KABOUTDATA_H
#include
#define KAboutData K4AboutData
#else
#include
#endif
#include
#include
int main(int argc, char **argv)
{
- KAboutData about("onlinequoteseditor", 0,
+ KAboutData about("onlinequoteseditor",
+ "onlinequoteeditor",
ki18n("onlinequoteseditor"),
"1.0",
ki18n("Editor for online price quotes used by finance applications"),
KAboutData::License_GPL,
ki18n("(C) 2018 Ralf Habacker"));
KCmdLineArgs::init(argc, argv, &about);
KApplication app(true);
KCmdLineOptions options;
KCmdLineArgs::addCmdLineOptions(options); // Add my own options.
- KComponentData a(&about);
-
// Get application specific arguments
KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
MainWindow w;
w.show();
return app.exec();
}