-
Inge Wallin authored
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()
bc884708