Commit bc884708 authored by Inge Wallin's avatar Inge Wallin
Browse files

Squashed commit of the following:

commit 203ee2ab0aad476b64073989e3c23bb00517fbc0
Author: Inge Wallin <inge@lysator.liu.se>
Date:   Sun Oct 26 07:00:06 2014 +0100

    fix typo

commit 8b4614e7
Author: Hrvoje Senjan <hrvoje.senjan@gmail.com>
Date:   Sun Oct 26 17:10:16 2014 +0100

    Fix build

    Remove useless QtPrintSupport includes

commit 27b46133
Author: Inge Wallin <inge@lysator.liu.se>
Date:   Sat Oct 25 11:10:29 2014 +0200

    Remove explicit inclusion of moc files

    This takes advantage of the KDE automoc feature. It also removes tons of notes
    (warnings) from the build.

commit 9dc9715c
Author: Inge Wallin <inge@lysator.liu.se>
Date:   Sat Oct 25 09:41:38 2014 +0200

    Fix the build.

    Port all instances of KRandomSequence to the framework KRandom.

    As a side note, this is not mentioned on the Frameworks porting page.

commit 30589867
Merge: db148165 60be42d1
Author: Inge Wallin <inge@lysator.liu.se>
Date:   Sat Oct 25 09:16:31 2014 +0200

    Merge branch 'master' into frameworks

    Conflicts:
    	src/CMakeLists.txt
    	src/collection/entryfilter.cpp
    	src/editor/editor.h
    	src/editor/summarywordwidget.cpp
    	src/editor/vocabularyview.h
    	src/parleymainwindow.h
    	src/vocabulary/leitnerview.cpp

commit db148165
Author: Andreas Xavier <andxav@zoho.com>
Date:   Mon Sep 15 07:04:24 2014 -0400

    Marked title not sticky as done in TODO file.

commit a51ff0d4
Merge: 62ab1375 827776ea
Author: Andreas Xavier <andxav@zoho.com>
Date:   Mon Sep 15 06:51:06 2014 -0400

    Merge branch 'master' into frameworks

    Conflicts:
    	autotests/CMakeLists.txt
    	src/CMakeLists.txt
    	src/dashboard/buttondelegate.cpp
    	src/dashboard/dashboard.cpp
    	src/dashboard/dashboard.h
    	src/editor/summarywordwidget.cpp
    	src/parleydocument.cpp
    	src/vocabulary/vocabularydelegate.cpp

commit 62ab1375
Merge: 889db8bd 82d2ba7d
Author: Andreas Xavier <andxav@zoho.com>
Date:   Wed Sep 3 15:22:46 2014 -0400

    Merge branch 'master' into frameworks

    Conflicts:
    	src/CMakeLists.txt
    	src/practice/abstractbackendmode.cpp

commit 889db8bd
Author: Andreas Xavier <andxav@zoho.com>
Date:   Wed Sep 3 14:14:20 2014 -0400

    Changed audio button default string from "..." to more meaningful "Play"

commit 1e8b02be
Author: Andreas Xavier <andxav@zoho.com>
Date:   Sat Aug 30 16:23:13 2014 -0400

    Clarify meaning of [*] in QWidget title bar for translators

commit 8086d579
Author: Andreas Xavier <andxav@zoho.com>
Date:   Mon Aug 25 16:57:36 2014 -0400

    Added "[*]" marker to window title so qt5 can indicate modified status

commit 73c10eeb
Author: Andreas Xavier <andxav@zoho.com>
Date:   Mon Aug 25 16:12:54 2014 -0400

    Removed unused variable

commit 0685f108
Merge: 965cd7c5 108b7f62
Author: Andreas Xavier <andxav@zoho.com>
Date:   Mon Aug 25 16:09:34 2014 -0400

    Merge branch 'master' into frameworks

commit 965cd7c5
Author: Andreas Xavier <andxav@zoho.com>
Date:   Mon Aug 25 16:06:45 2014 -0400

    Added missing setDefaultShortcut for KStandardActions

commit 3c90bc6e
Author: Andreas Xavier <andxav@zoho.com>
Date:   Mon Aug 25 13:53:00 2014 -0400

    Fixed bug actionExpandAll registered in place of actionCollapseAll

commit 7c69e0a1
Author: Andreas Xavier <andxav@zoho.com>
Date:   Mon Aug 25 13:18:21 2014 -0400

    Ported KCoreConfigSkeleton::readConfig() to KCoreConfigSkeleton::load()

commit aa773e7b
Author: Andreas Xavier <andxav@zoho.com>
Date:   Mon Aug 25 13:00:26 2014 -0400

    Removed <0 check on unsigned variables

commit 97afebe6
Author: Andreas Xavier <andxav@zoho.com>
Date:   Mon Aug 25 12:57:07 2014 -0400

    Ported KCoreConfigSkeleton::writeConfig() to KCoreConfigSkeleton::save()

commit cd04550b
Merge: de7b257c 2d8a6d43
Author: Andreas Xavier <andxav@zoho.com>
Date:   Sun Aug 24 14:47:29 2014 -0400

    Merge branch 'master' into frameworks

    Conflicts:
    	src/CMakeLists.txt
    	src/parleydocument.cpp
    	src/statistics/statisticslegendwidget.cpp
    	src/statistics/statisticslegendwidget.h
    	src/welcomescreen/collectionwidget.cpp
    	src/welcomescreen/welcomescreen.cpp
    	src/welcomescreen/welcomescreen.h

commit de7b257c
Author: Andreas Xavier <andxav@zoho.com>
Date:   Sun Aug 24 14:22:54 2014 -0400

    Merge master into frameworks

commit 3eeff3c7
Author: Jeremy Whiting <jpwhiting@kde.org>
Date:   Thu Aug 21 13:17:54 2014 -0600

    Make parley find and link to libkeduvocdocument rather than libkdeedu

commit 0a0a2b0c
Author: Andreas Xavier <andxav@zoho.com>
Date:   Sun Aug 10 14:52:12 2014 -0400

    Made columns movable in editor and statistics views

commit 7fc0e014
Author: Andreas Xavier <andxav@zoho.com>
Date:   Sun Aug 10 13:41:56 2014 -0400

    Remove KDELibs4Support

    Fixed stub unit test to work without KDELibs4Support

commit d5e286d2
Author: Andreas Xavier <andxav@zoho.com>
Date:   Sun Aug 10 13:21:42 2014 -0400

    Ported QHeaderView from Qt4 to Qt5

    Somewhere in KDELibs4Support there are headers for the old
    QHeaderView, which were uncovered when I removed KDELibs4Support
    from the build.

commit b6d53c77
Author: Andreas Xavier <andxav@zoho.com>
Date:   Sun Aug 10 12:24:47 2014 -0400

    Port KApplication::clipboard() to QApplication::clipboard()

commit 2a9e9932
Author: Andreas Xavier <andxav@zoho.com>
Date:   Sun Aug 10 12:14:42 2014 -0400

    Port KinputDialog to QInputDialog

commit 618150de
Author: Andreas Xavier <andxav@zoho.com>
Date:   Sun Aug 10 11:56:01 2014 -0400

    Port to KF5 version of KNotifications

commit fde20f23
Author: Andreas Xavier <andxav@zoho.com>
Date:   Sun Aug 10 11:38:01 2014 -0400

    Port KTempDir to QTemporaryDir

commit 4926abae
Author: Andreas Xavier <andxav@zoho.com>
Date:   Sun Aug 10 11:25:29 2014 -0400

    Port KStandardDirs to QStandardPaths

commit 7ec8c0d2
Author: Andreas Xavier <andxav@zoho.com>
Date:   Sun Aug 10 10:38:01 2014 -0400

    Ported KConfigDialog to the KF5 version

commit 31df3515
Author: Andreas Xavier <andxav@zoho.com>
Date:   Sun Aug 10 10:32:46 2014 -0400

    Port KMenuBar to QMenuBar

commit 610bebd6
Author: Andreas Xavier <andxav@zoho.com>
Date:   Sun Aug 10 10:28:20 2014 -0400

    Port KMimeType to QMimeType

commit 89133fd4
Author: Andreas Xavier <andxav@zoho.com>
Date:   Sun Aug 10 09:44:10 2014 -0400

    Port from KPushButton to QPushButton in welcomescreen.ui

commit 0cbf8132
Author: Andreas Xavier <andxav@zoho.com>
Date:   Sun Aug 10 09:43:16 2014 -0400

    Use KNewStuffAction from KF5 instead of from KDELibs4Support

commit 88254af7
Author: Andreas Xavier <andxav@zoho.com>
Date:   Sun Aug 10 09:24:57 2014 -0400

    Remove KSharedPtr which is from KDELibs4Support

commit 4581fbac
Author: Andreas Xavier <andxav@zoho.com>
Date:   Sun Aug 10 09:21:17 2014 -0400

    Remove KGlobalSettings which is from KDELibs4Support

    Port KGlobalSettings::generalFont()
    to QFontDatabase::systemFont(QFontDatabase::GeneralFont)

commit a7fb277d
Author: Andreas Xavier <andxav@zoho.com>
Date:   Sun Aug 10 08:48:42 2014 -0400

    Fixed KConfigDialogs not saving spin button options

    If you adjust the QDialogButtonBox after the constructor of the
    KConfigDialog has run it creates new buttons
    and removes the signal/slot connections to the base class buttons.

commit b9cb4c01
Author: Andreas Xavier <andxav@zoho.com>
Date:   Sat Aug 9 17:37:18 2014 -0400

    More KDELibs4Support removal: knuminput -> QSpinBox

commit 972d70db
Author: Andreas Xavier <andxav@zoho.com>
Date:   Sat Aug 9 17:18:37 2014 -0400

    Switched to frameworks version of doctools

commit 59ef751b
Author: Andreas Xavier <andxav@zoho.com>
Date:   Sat Aug 9 16:57:20 2014 -0400

    Removed use of macro_bool_to_01 which is from KDELibs4Support

commit 55d0ce67
Author: Andreas Xavier <andxav@zoho.com>
Date:   Sat Aug 9 16:45:16 2014 -0400

    Fixed identifying all strings as QUrls for pixmaps in FlashCardWidget

commit f5ba262b
Author: Andreas Xavier <andxav@zoho.com>
Date:   Sat Aug 9 16:29:12 2014 -0400

    Replaced KLocale with KLocalizedString

commit 08e376fa
Author: Andreas Xavier <andxav@zoho.com>
Date:   Sat Aug 9 16:18:08 2014 -0400

    Fixed audio by switching from Phonon->QMediaPlayer

commit fb2d445d
Author: Andreas Xavier <andxav@zoho.com>
Date:   Sat Aug 9 12:12:25 2014 -0400

    Clean up of CMakeLists.txt

    Fixed some issues in plasmoid includes.
    Removed some unused macros from kde4

commit ec6b3d18
Author: Andreas Xavier <andxav@zoho.com>
Date:   Wed Aug 6 09:06:43 2014 -0400

    Ported KNS3 download and upload actions

commit d3a1e678
Author: Andreas Xavier <andxav@zoho.com>
Date:   Wed Aug 6 08:13:24 2014 -0400

    Finished removing KGlobal

commit 0f718ffe
Author: Andreas Xavier <andxav@zoho.com>
Date:   Wed Aug 6 07:39:24 2014 -0400

    Fixed KGameThemeSelectorPrivate class

    Revert a8a6b7b3 "KGameThemeSelector constructor moved to header to allow compilation."

    This adds #include "moc_kgamethemeselector.cpp" to the end of the
    kgamethemeselector.cpp file so that the moc can see the definition
    of the private class and correctly instantiate the private slots
    in the public class.

commit c3460b4d
Author: Andreas Xavier <andxav@zoho.com>
Date:   Wed Aug 6 06:42:22 2014 -0400

    Revert 5bebc5d8 "ImageWidget moved constructor into header"

    Fixed by 20035c60

commit 80dead08
Author: Andreas Xavier <andxav@zoho.com>
Date:   Wed Aug 6 06:39:18 2014 -0400

    Revert 77ca11ad "SummaryBarWidget - moved constructor into header"

    Fixed by 20035c60

commit 27aa7e7e
Author: Andreas Xavier <andxav@zoho.com>
Date:   Wed Aug 6 06:26:22 2014 -0400

    Revert e8646d81 "Work around the QWidget inheritance problem in ..."

    The problems with inheritance were caused by the bad includes
    fixed in 20035c60

commit 4bf27c23
Author: Andreas Xavier <andxav@zoho.com>
Date:   Wed Aug 6 06:17:04 2014 -0400

    Revert c8c5d01c "Remove the BoxesWidget prior to frameworks transistion"

    The crashes fixed in the reverted commit were the result of the bad
    includes fixed in commit 20035c60

commit a900b4bc
Author: Andreas Xavier <andxav@zoho.com>
Date:   Wed Aug 6 06:08:51 2014 -0400

    Revert fa7b86c7 "Remove AudioButton which will cause crashes in ..."

    The problems causing the crashes were the includes fixed in the
    commit prior to this commit.

commit 20035c60
Author: Andreas Xavier <andxav@zoho.com>
Date:   Wed Aug 6 05:50:07 2014 -0400

    Fixed several incorrect includes of <QtGui> in place of <QtWidgets>

commit d1929cf4
Author: Andreas Xavier <andxav@zoho.com>
Date:   Mon Aug 4 17:49:55 2014 -0400

    Restored clear search to the searchline in the editor.

    Thank you Aleix Pol for pointing out that QEditLine had the missing
    functionality.

commit 95eb2141
Author: Andreas Xavier <andxav@zoho.com>
Date:   Mon Aug 4 17:41:58 2014 -0400

    Restored recentFiles action

    Thank you Aleix Pol for pointing out the location of KRecentFilesAction
    in the frameworks API.

commit 479d0e55
Author: Andreas Xavier <andxav@zoho.com>
Date:   Mon Aug 4 17:23:48 2014 -0400

    Restored building of stub unit test

commit 2330b7e6
Author: Andreas Xavier <andxav@zoho.com>
Date:   Mon Aug 4 16:17:00 2014 -0400

    Removed answervalidatorold unused since 2010

commit 0b6c65b7
Author: Andreas Xavier <andxav@zoho.com>
Date:   Mon Aug 4 13:37:40 2014 -0400

    Ported VocabularyColumnsDialog from KDialog to QDialogButtonBox

commit 7595860a
Author: Andreas Xavier <andxav@zoho.com>
Date:   Mon Aug 4 13:02:45 2014 -0400

    Ported document properties from KDialog to QDialogButtonBox

commit eb8c7baf
Author: Andreas Xavier <andxav@zoho.com>
Date:   Mon Aug 4 12:40:59 2014 -0400

    Ported scripts dialog from KDialog to QDialogButtonBox

    Added todo that scripts dialog is not finding any scripts

commit 0287086a
Author: Andreas Xavier <andxav@zoho.com>
Date:   Mon Aug 4 12:28:51 2014 -0400

    Ported newDocument, documentProperties from KDialog to QDialogButtonBox

commit 75bb5ad5
Author: Andreas Xavier <andxav@zoho.com>
Date:   Mon Aug 4 11:57:46 2014 -0400

    Ported exportdialog from KDialog to QDialogButtonBox

commit d39fa60c
Author: Andreas Xavier <andxav@zoho.com>
Date:   Mon Aug 4 11:53:34 2014 -0400

    Restored Export functionality

    Added XSLT and XML2 back in the CMakeLists.txt files

commit a01850b4
Author: Andreas Xavier <andxav@zoho.com>
Date:   Mon Aug 4 10:20:48 2014 -0400

    Ported inflectionwidget from KDialog to QDialogButtonBox

commit 6fdf7ee6
Author: Andreas Xavier <andxav@zoho.com>
Date:   Mon Aug 4 09:40:24 2014 -0400

    Ported editor away from KDialog

    The editor was using KDialog::spacingHint().  Switched to using the
    passed in style.

commit 4cd07015
Author: Andreas Xavier <andxav@zoho.com>
Date:   Mon Aug 4 09:21:29 2014 -0400

    Ported entryfilter from KDialog to QDialogButtonBox

commit 3012de81
Author: Andreas Xavier <andxav@zoho.com>
Date:   Mon Aug 4 08:04:19 2014 -0400

    Ported parleyprefs from KDialog to QDialogButtonBox

commit d49cdb36
Author: Andreas Xavier <andxav@zoho.com>
Date:   Sun Aug 3 17:26:59 2014 -0400

    Port ConfigurePracticeDialog from KDialog to QDialogButtonBox

commit f90e8310
Author: Andreas Xavier <andxav@zoho.com>
Date:   Sun Aug 3 15:11:03 2014 -0400

    Updated docbook schema for frameworks

commit d700dcf1
Author: Andreas Xavier <andxav@zoho.com>
Date:   Sun Aug 3 14:08:41 2014 -0400

    Ported KIcon to QIcon::fromTheme

    from KIcon(<iconname>) to QIcon::fromTheme(<iconname>)

    Note that fromTheme is less forgiving than KIcon in that:
    1. If an icon theme directory does not have a valid index.theme
       it will not take any icons from that directory
    2. Once it has taken 1 icon from a theme it takes all subsequent icons
       from that theme.

    The consequence of this is that if you install parley in a
    frameworks only root and expecting your complete KDE4.8 theme to
    fill in the gaps, QIcon will not.

commit c26edb66
Author: Andreas Xavier <andxav@zoho.com>
Date:   Sun Aug 3 11:03:06 2014 -0400

    Ported KGlobal::dir and KGlobal::locales() uses to Qt equivalents

commit be21fe8c
Author: Andreas Xavier <andxav@zoho.com>
Date:   Sat Aug 2 17:18:56 2014 -0400

    Port KApplication, K4AboutData and KCmdLineArgs to framework

    Created translation application domain "parley"

commit 61d0b112
Author: Andreas Xavier <andxav@zoho.com>
Date:   Sat Aug 2 16:00:00 2014 -0400

    Renamed all icons to conform with frameworks system

    All icons renamed
    ox<size>-<group>-<name>.<ext> to just <size>-<group>-<name>.<ext>
    CMakeLists altered to target correct themes and locations

commit 38d3d381
Author: Andreas Xavier <andxav@zoho.com>
Date:   Sat Aug 2 14:35:09 2014 -0400

    removed erroneously commented out lines

commit aa85f94c
Author: Andreas Xavier <andxav@zoho.com>
Date:   Sat Aug 2 11:18:39 2014 -0400

    Convert to frameworks.

    Convert all the CMakeLists to use KF5 and Qt5 libraries.  This
    generated further todos. The changes in this commit are just enough
    for Parley to work in KF5. Changes that require more work in the
    future are marked with @todo frameworks in the code.

    Some feature disabled for now in CMakeLists files are:
    unit tests - there were none anyway
    script tests
    plasmoid
    docs directory
    XLST support

    The following changes were required to compile and require more work:
    KDialog buttons commented out
    KAboutData partially ported
    KRecentFilesActions commented out, needs an alternative solution

    The following change doesn't require more work:
    use new mimeData member functions to determine if qurls are available

commit d8444ad1
Author: Andreas Xavier <andxav@zoho.com>
Date:   Sat Aug 2 08:14:58 2014 -0400

    Fix @todo so that they are visible in documentation

    todos that are outside of a class/namespace do not show up in the
    documentation.

commit 5bebc5d8
Author: Andreas Xavier <andxav@zoho.com>
Date:   Fri Aug 1 17:19:04 2014 -0400

    ImageWidget moved constructor into header

    Inlining the ImageWidget constructor prevents ImageWidget from
    crashing in the paintEvent in frameworks when it can't get a drawing
    device.

commit 77ca11ad
Author: Andreas Xavier <andxav@zoho.com>
Date:   Fri Aug 1 17:08:18 2014 -0400

    SummaryBarWidget - moved constructor into header

    After conversion to frameworks if the constructor is not inlined in the
    header then the summaryBarWidget crashes in the paint event
    because it can't get a draw context.

commit a8a6b7b3
Author: Andreas Xavier <andxav@zoho.com>
Date:   Fri Aug 1 17:02:00 2014 -0400

    KGameThemeSelector constructor moved to header to allow compilation.

    This is not necessary but might require other fixes after the
    conversion to frameworks.

commit fa7b86c7
Author: Andreas Xavier <andxav@zoho.com>
Date:   Fri Aug 1 16:50:45 2014 -0400

    Remove AudioButton which will cause crashes in frameworks on redraw

commit c8c5d01c
Author: Andreas Xavier <andxav@zoho.com>
Date:   Fri Aug 1 16:11:14 2014 -0400

    Remove the BoxesWidget prior to frameworks transistion

    The problems with ImageWidget cause BoxesWidget to crash.

commit 47e508d0
Author: Andreas Xavier <andxav@zoho.com>
Date:   Fri Aug 1 10:16:02 2014 -0400

    guard against multiplechoice with 0 choices

commit f88e2c43
Author: Andreas Xavier <andxav@zoho.com>
Date:   Fri Aug 1 10:04:42 2014 -0400

    More includes

commit e8646d81
Author: Andreas Xavier <andxav@zoho.com>
Date:   Fri Aug 1 09:42:36 2014 -0400

    Work around the QWidget inheritance problem in frameworks

    In frameworks the code shown below always calls virtual functions with
    an offset of 1 in the function index.  This patch changes from
    inheritance to aggregation to avoid the problem.

    class BoringWidget : public QWidget
    {
        Q_OBJECT
    public:
        explicit BoringWidget(QWidget* parent = 0);
        virtual ~BoringWidget(){};
        virtual void testExist(){qDebug() << " \n Never called\n\n ";}
        virtual void testExist2(){qDebug() << " \n Called when testExist is called  \n\n ";}
    };

commit a905f441
Author: Andreas Xavier <andxav@zoho.com>
Date:   Thu Jul 31 09:12:07 2014 -0400

    Added explicit #include <KLocalizedString>

    Also added some QDebug and QUrl includes

commit 1522c1e7
Author: Andreas Xavier <andxav@zoho.com>
Date:   Thu Jul 31 08:58:11 2014 -0400

    Updated .ui to not reference klineedit

commit 580c3e84
Author: Andreas Xavier <andxav@zoho.com>
Date:   Sat Jul 26 16:28:51 2014 -0400

    Update parleydocument to new saveAs syntax

commit 4c115702
Author: Andreas Xavier <andxav@zoho.com>
Date:   Sat Jul 26 16:12:29 2014 -0400

    Added explicit includes for KDialog

    //@todo frameworks KDialog -> QDialog
    to force use of kde4 support

commit dd7e0440
Author: Andreas Xavier <andxav@zoho.com>
Date:   Sat Jul 26 16:04:02 2014 -0400

    Explicitly added includes for KGlobal

    //@todo frameworks KGlobal
    forces the use of kde4support library

commit d4f801cf
Author: Andreas Xavier <andxav@zoho.com>
Date:   Sat Jul 26 15:42:44 2014 -0400

    Explicitly called include for KIcon

    like this:
    //@todo frameworks KIcon to QIcon

    The kde4support version will be called, until replaced with QIcon.

commit ad49990e
Author: Andreas Xavier <andxav@zoho.com>
Date:   Sat Jul 26 05:47:36 2014 -0400

    Changed KAction to QAction

commit 0b89ca90
Author: Andreas Xavier <andxav@zoho.com>
Date:   Sat Jul 26 05:29:01 2014 -0400

    Moved doc to docs in compliance with frameworks directory scheme

commit 585bb57c
Author: Andreas Xavier <andxav@zoho.com>
Date:   Fri Jul 25 02:57:42 2014 -0400

    Revert now unneeded patch of KEditLine deletion with stylesheet

    This reverts commit f382c4f9.

    Since we now use QEditLine, the patch of KEditLine is not needed.
    Double checked that the bug is gone.

commit f5ee583d
Author: Andreas Xavier <andxav@zoho.com>
Date:   Thu Jul 24 17:50:09 2014 -0400

    KLineEdit to QLineEdit

    One todo added re: cancel button which is not a feature of Qt 4.8

commit 272ccc40
Author: Andreas Xavier <andxav@zoho.com>
Date:   Thu Jul 24 16:15:55 2014 -0400

    KUrl -> QUrl and KFileDialog -> QFileDialog

    KFileDialog expects Kurls
    Added some todos where other components expected KUrls like kvocdoc

commit a6fcd31f
Author: Andreas Xavier <andxav@zoho.com>
Date:   Wed Jul 23 14:45:35 2014 -0400

    Changed <KDebug> to <QDebug>

commit 2139da35
Author: Andreas Xavier <andxav@zoho.com>
Date:   Wed Jul 23 14:32:47 2014 -0400

    quieted an unused variable in stub unit test

commit 5187347b
Author: Andreas Xavier <andxav@zoho.com>
Date:   Wed Jul 23 14:32:10 2014 -0400

    KTemporaryFile -> QTemporaryFile

commit 77f9c6ca
Author: Andreas Xavier <andxav@zoho.com>
Date:   Wed Jul 23 14:21:50 2014 -0400

    KComponentData -> QCoreApplication

commit 042bd1cb
Author: Andreas Xavier <andxav@zoho.com>
Date:   Wed Jul 23 14:14:23 2014 -0400

    Killed the only debug category with kDebug(11000) -> qDebug in kgametheme.cpp

commit bbaf04f3
Author: Andreas Xavier <andxav@zoho.com>
Date:   Wed Jul 23 14:09:18 2014 -0400

    kWarning to qWarning

commit 31a26307
Author: Andreas Xavier <andxav@zoho.com>
Date:   Wed Jul 23 14:06:22 2014 -0400

    kError to qCritical

commit 82fd7884
Author: Andreas Xavier <andxav@zoho.com>
Date:   Wed Jul 23 14:02:49 2014 -0400

    Starting port to KDE5 frameworks: kDebug() to qDebug()
parent 60be42d1
cmake_minimum_required(VERSION 2.8.12)
project(parley)
find_package(KDE4 REQUIRED)
include(KDE4Defaults)
include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES})
find_package(ECM 1.0.0 REQUIRED NO_MODULE)
set(CMAKE_MODULE_PATH ${parley_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH})
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
find_package(LibKdeEdu REQUIRED)
include(KDEInstallDirs)
include(KDECompilerSettings)
include(KDECMakeSettings)
include(FeatureSummary)
#Allows QString concatenation to use a single memory allocation per source line.
add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS)
macro_optional_find_package(LibXslt)
macro_optional_find_package(LibXml2)
find_package(LibAttica)
set(REQUIRED_QT_VERSION "5.2")
find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED
Core
Svg
Concurrent
Multimedia
Test
)
set(REQUIRED_KF5_VERSION "4.96.0")
find_package(KF5 ${REQUIRED_KF5_VERSION} MODULE REQUIRED COMPONENTS
DocTools #to produce the docbook
CoreAddons
Config
Crash
I18n
KIO
NewStuff
Kross
KHtml
Sonnet
KCMUtils
XmlGui
Notifications
#Plasma
)
find_package(LibKEduVocDocument)
set_package_properties(LibKEduVocDocument PROPERTIES
TYPE REQUIRED
PURPOSE "Required to manipulate the KDE word files."
)
find_package(LibXslt)
set_package_properties(LibXslt PROPERTIES
URL "http://xmlsoft.org/XSLT"
TYPE OPTIONAL
PURPOSE "Required to build HTML export for Parley."
)
macro_bool_to_01(LIBXSLT_FOUND AND LIBXML2_FOUND HAVE_LIBXSLT)
find_package(LibXml2)
set_package_properties(LibXml2 PROPERTIES
URL "http://xmlsoft.org"
TYPE OPTIONAL
PURPOSE "Required to build HTML export for Parley."
)
macro_log_feature(LIBXSLT_FOUND "LibXSLT" "A library to transform XMLfiles into other XML files" "http://xmlsoft.org/XSLT" FALSE "" "Required to build HTML export for Parley.")
macro_log_feature(LIBXML2_FOUND "LibXML2" "Libraries used to develop XML applications" "http://xmlsoft.org" FALSE "" "Required to build HTML export for Parley.")
macro_log_feature(LIBATTICA_FOUND "libattica" "A library to access Open Collaboration Service providers" "http://kde.org" FALSE "" "Required to access OCS providers in get hot new stuff.")
macro_bool_to_01(1 HAVE_XRENDER)
#@todo frameworks restore Xattica
# find_package(LibAttica)
# macro_log_feature(LIBATTICA_FOUND "libattica" "A library to access Open Collaboration Service providers" "http://kde.org" FALSE "" "Required to access OCS providers in get hot new stuff.")
# at the end, output the configuration
configure_file(
......@@ -29,56 +75,84 @@ configure_file(
)
# Define link libs for parley executable and unittests
set( parley_LINK_LIBS
${LIBKDEEDU_KEDUVOCDOCUMENT_LIBRARIES}
${KDE4_KHTML_LIBS}
${KDE4_KNEWSTUFF3_LIBS}
${KDE4_PHONON_LIBS}
${KDE4_KCMUTILS_LIBRARY} #for the KPluginSelector
${KDE4_KROSSCORE_LIBS} ${KDE4_KROSSUI_LIBS} #for Kross
${QT_QTCORE_LIBRARY}
LibKEduVocDocumentImport__KEduVocDocument
KF5::KHtml
KF5::KrossCore
# KF5::ConfigCore
Qt5::Core
# Qt5::Qml
Qt5::Svg
# KF5::I18n
KF5::NewStuff
KF5::SonnetCore
# KF5::SonnetUi
KF5::KCMUtils
KF5::XmlGui
KF5::Completion
KF5::ConfigWidgets
KF5::ConfigGui
KF5::WidgetsAddons
Qt5::Widgets
Qt5::Gui
Qt5::Concurrent
Qt5::Multimedia
KF5::Notifications
)
if(HAVE_LIBXSLT)
set( parley_LINK_LIBS ${parley_LINK_LIBS} ${LIBXML2_LIBRARIES} ${LIBXSLT_LIBRARIES})
endif(HAVE_LIBXSLT)
message(STATUS "cmake cflags ${CMAKE_C_FLAGS}")
message(STATUS "cmake link flags ${CMAKE_EXE_LINKER_FLAGS}")
if (X11_Xrender_FOUND)
if(${LIBXSLT_FOUND} AND ${LIBXML2_FOUND})
set(HAVE_LIBXSLT 1)
message(STATUS "XLST found")
set( parley_LINK_LIBS ${parley_LINK_LIBS} ${LIBXML2_LIBRARIES} ${LIBXSLT_LIBRARIES})
include_directories(${LIBXML2_INCLUDE_DIR} ${LIBXSLT_INCLUDE_DIR})
else(${LIBXSLT_FOUND} AND ${LIBXML2_FOUND})
set(HAVE_LIBXSLT 0)
message(STATUS "XSLT not found, but not required")
endif(${LIBXSLT_FOUND} AND ${LIBXML2_FOUND})
if(X11_Xrender_FOUND)
message(STATUS "X11 Xrender found")
set( parley_LINK_LIBS ${parley_LINK_LIBS} ${X11_LIBRARIES} ${X11_Xrender_LIB})
else(X11_Xrender_FOUND)
message(STATUS "X11 Xrender not found, but not required")
endif(X11_Xrender_FOUND)
#define the include libraries for both the parley executable and the autotests
set( parley_INCLUDE_DIRS
${LIBATTICA_INCLUDE_DIR}
# libkdeedu/keduvocdocument contains the library for reading and writing vocabulary files
${LIBKDEEDU_INCLUDE_DIR}
)
#### XSLT Support ####
# to transform the document xml to html or other
if(HAVE_LIBXSLT)
set( parley_INCLUDE_DIRS ${parley_INCLUDE_DIRS} ${LIBXML2_INCLUDE_DIR} ${LIBXSLT_INCLUDE_DIR} )
endif(HAVE_LIBXSLT)
#### End XSLT Support ####
# set( parley_INCLUDE_DIRS
# # ${LIBATTICA_INCLUDE_DIR}
# # libkdeedu/keduvocdocument contains the library for reading and writing vocabulary files
# ${LIBKDEEDU_INCLUDE_DIR}
# )
if(BUILD_TESTING)
add_subdirectory( autotests )
add_subdirectory( tests )
endif()
add_subdirectory( autotests )
add_subdirectory( doc )
add_subdirectory( scripts_test )
add_subdirectory( docs )
add_subdirectory( src )
add_subdirectory( icons )
add_subdirectory( plugins )
add_subdirectory( themes )
add_subdirectory( tipofday )
if(HAVE_LIBXSLT)
add_subdirectory( xslt )
endif(HAVE_LIBXSLT)
add_subdirectory(plasmoid)
#@todo unused This seems unused delete December 2014
#add_subdirectory( scripts_test )
#@todo frameworks restore/rewrite the plasmoid
#add_subdirectory(plasmoid)
install(FILES parley.appdata.xml DESTINATION ${SHARE_INSTALL_PREFIX}/appdata/)
# Parley
Parley is a vocabulary trainer.
## Introduction
arley is a vocabulary trainer. It helps you to memorize your vocabulary, for example when you are trying to learn a foreign language. It supports many language specific features, but can be used for other learning tasks as well. It uses the spaced repetition learning method, which makes learning optimal. Vocabulary collections can be downloaded by "Get Hot New Stuff" or created with the built-in editor.
## Links
- Home page: <http://edu.kde.org/parley>
- Mailing list: <https://mail.kde.org/mailman/listinfo/kde-edu>
- IRC channel: #kde-edu on Freenode
- Git repository: <https://projects.kde.org/projects/kde/kdeedu/parley/repository>
......@@ -23,7 +23,7 @@ NOTE: DO NOT CHANGE THESE IN MASTER.
+ Parley crash while adding choice in multiple ----
choice mode in editor (investigate)
https://bugs.kde.org/show_bug.cgi?id=255647
+ Scripts need to sandboxed or atleast check ----
+ Scripts need to sandboxed or atleast check ----
if data can be fetched and stop gracefully. Eg:
https://bugs.kde.org/show_bug.cgi?id=252696
+ Investigate - large list causes crash? ----
......@@ -33,7 +33,7 @@ NOTE: DO NOT CHANGE THESE IN MASTER.
+ ...
* Misfeatures
+ There seems to be no way to change the title. ----
+ There seems to be no way to change the title. DONE
It works in the editor but it is never saved.
Note: It can be changed in the menu, though.
......@@ -57,7 +57,7 @@ Before the 4.14 freeze (features). These are picked from the ones below.
* Practice
+ Dashboard ----
+ Dashboard ----
- wrapper class for a KEduVocDocument ----
- Make the words due work ----
- KEduVocDocument summary view widget Done
......@@ -69,7 +69,7 @@ Before the 4.15 freeze (features). These are picked from the ones below.
* Editor
+
+
* Practice
+ Sessions. For details, see below. ----
......@@ -93,7 +93,7 @@ Release work for 4.15
* Change the version number of Parley ----
* Create new versions in Bugzilla ----
* Add the new features to the feature plan ----
* Blog ----
* Blog ----
================================================================
......
include(ECMMarkAsTest)
include(ECMAddTests)
include(CTest)
find_package(Qt5 5.2.0 CONFIG REQUIRED Test)
# To add a new unittest
# 1. Add its name to parley_unittests
# 1. Add its name to parley_gui_unit_tests or parley_non_gui_unit_tests
# 2. Add any non-parley library helper cpp files to parley_unittest_helpers
set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
# set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
set( unittest_INCLUDE_DIRS
../src
......@@ -10,30 +17,39 @@ set( unittest_INCLUDE_DIRS
)
set(unittest_LINK_LIBS
${QT_QTTEST_LIBRARY}
)
set(parley_unittests
allpass1test
allpass2test
Qt5::Test
${parley_LINK_LIBS}
parley_LIB
)
set(parley_unittests_helpers
set(parley_unittest_helpers
parleyunittestutilities.cpp
)
macro(ADD_PARLEY_UNITTESTS)
foreach(_unittestname ${ARGN} )
macro(PARLEY_GUI_UNITTESTS)
foreach(_testname ${ARGN})
ecm_add_test( ${_testname} ${parley_unittest_helpers}
LINK_LIBRARIES ${unittest_LINK_LIBS}
TEST_NAME ${_testname}
GUI)
endforeach()
endmacro()
kde4_add_unit_test(${_unittestname} ${_unittestname}.cpp ${parley_unittests_helpers} )
macro(PARLEY_NON_GUI_UNITTESTS)
foreach(_testname ${ARGN})
ecm_add_test( ${_testname} ${parley_unittest_helpers}
LINK_LIBRARIES ${unittest_LINK_LIBS}
TEST_NAME ${_testname}
)
endforeach()
endmacro()
target_link_libraries( ${_unittestname} ${unittest_LINK_LIBS} parley_LIB ${parley_LINK_LIBS} )
endforeach(_unittestname ${argn} )
endmacro(ADD_PARLEY_UNITTESTS)
include_directories( ${unittest_INCLUDE_DIRS})
include_directories( ${unittest_INCLUDE_DIRS} ${parley_INCLUDE_DIRS} )
ADD_PARLEY_UNITTESTS( ${parley_unittests} )
parley_gui_unittests(
#todo restore dummy unit test when file locking is fixed
# allpass1test
allpass2test
)
......@@ -21,16 +21,14 @@
#include "parleydocument.h"
#include <QtTest>
#include <QtTest/QtTest>
using namespace UnitTestUtilities;
/** This class is a unittest stub with 2 tests that always pass
*/
class AllPass1Test
: public QObject
class AllPass1Test : public QObject
{
Q_OBJECT
......@@ -60,12 +58,11 @@ void AllPass1Test::testAlwaysPass2()
int docError = docWithLock->open(tempfile.fileName());
QCOMPARE( docError, int( KEduVocDocument::NoError ) );
KUrl kurl = KUrl::fromPath(tempfile.fileName() );
ParleyDocument *doc = new ParleyDocument(0);
QCOMPARE( true, true );
QVERIFY( doc != NULL );
}
QTEST_KDEMAIN_CORE( AllPass1Test )
QTEST_MAIN( AllPass1Test )
#include "allpass1test.moc"
......@@ -21,13 +21,12 @@
#include "parleydocument.h"
#include <QtTest>
#include <QtTest/QtTest>
/** This class is a unittest stub with 2 tests that always pass
*/
class AllPass2Test
: public QObject
class AllPass2Test : public QObject
{
Q_OBJECT
......@@ -52,6 +51,6 @@ void AllPass2Test::testAlwaysPass2()
QCOMPARE( true, true );
}
QTEST_KDEMAIN_CORE( AllPass2Test )
QTEST_APPLESS_MAIN( AllPass2Test )
#include "allpass2test.moc"
......@@ -26,8 +26,8 @@
using namespace UnitTestUtilities;
TemporaryVocDoc::TemporaryVocDoc()
:QTemporaryFile( "XXXXXX.kvtml" )
{
this->setSuffix(".kvtml");
this->open();
this->close();
}
......@@ -50,8 +50,8 @@ MinimalTempVocDoc::MinimalTempVocDoc()
KEduVocDocument *doc = new KEduVocDocument();
doc->setAuthor( author );
doc->appendIdentifier( lang0 );
KUrl filename = this->fileName();
doc->saveAs(filename, KEduVocDocument::Kvtml, generator);
doc->setGenerator(generator);
doc->saveAs(this->fileName(), KEduVocDocument::Kvtml);
delete doc;
}
......
......@@ -27,20 +27,18 @@
#include "parleydocument.h"
#include <KTemporaryFile>
#include <QTemporaryFile>
#include <KUrl>
#include <QUrl>
#include <qtest_kde.h>
#include <KDebug>
#include <QtTest>
#include <QtTest/QtTest>
#include <QDebug>
namespace UnitTestUtilities
{
/** Class to manage creation/destruction of a kvtml temp doc*/
class TemporaryVocDoc : public KTemporaryFile
class TemporaryVocDoc : public QTemporaryFile
{
public :
/** Create the file, fix the suffix and instantiate it.*/
......
add_subdirectory( parley )
......@@ -6,13 +6,13 @@
#
#convert-local:
# $(MEINPROC) $(srcdir)/index.docbook
#
#
## needs pngcrush which reduces files size about 20%
## brute-crush takes _very_ long time
#crush:
# mkdir -p crushed
# for i in *.png; do \
# pngcrush $$i crushed/$$i;\
# pngcrush $$i crushed/$$i;\
# done
# mv *.png /tmp
# mv crushed/*.png .
......@@ -21,9 +21,11 @@
#brute-crush:
# mkdir -p crushed
# for i in *.png; do \
# pngcrush -brute $$i crushed/$$i;\
# pngcrush -brute $$i crushed/$$i;\
# done
# mv *.png /tmp
# mv crushed/*.png .
# rm -r crushed
kde4_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR parley)
message(STATUS "kdoctools installing handbook in ${HTML_INSTALL_DIR}/en/parley")
kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/en SUBDIR parley)
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment