[kde-doc-english] [parley/frameworks] /: Merge branch 'master' into frameworks
Inge Wallin
inge at lysator.liu.se
Sun Oct 26 01:08:02 UTC 2014
Git commit 30589867a756240a3c2547b4864f7d3ae17202e9 by Inge Wallin.
Committed on 25/10/2014 at 07:16.
Pushed by ingwa into branch 'frameworks'.
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
R +1 -1 docs/parley/index.docbook
M +20 -14 src/CMakeLists.txt
M +0 -1 src/collection/containermodel.cpp
M +1 -3 src/collection/containermodel.h
M +3 -1 src/collection/containerview.cpp
M +8 -8 src/collection/entryfilter.cpp
M +1 -3 src/collection/entryfilter.h
M +0 -1 src/collection/readonlycontainermodel.cpp
M +0 -1 src/collection/vocabularymodel.cpp
M +7 -7 src/editor/editor.cpp
M +7 -4 src/editor/editor.h
M +1 -1 src/editor/latexwidget.cpp
M +2 -1 src/editor/latexwidget.h
M +0 -0 src/editor/lessonview.cpp
M +3 -3 src/editor/summarywordwidget.cpp
M +3 -2 src/editor/summarywordwidget.h
M +0 -0 src/editor/vocabularycolumnsdialog.cpp
M +0 -0 src/editor/vocabularycolumnsdialog.h
M +0 -0 src/editor/vocabularydelegate.cpp
M +0 -0 src/editor/vocabularyheaderview.cpp
M +0 -0 src/editor/vocabularyview.cpp
M +12 -5 src/editor/vocabularyview.h
M +0 -0 src/editor/wordtypeview.cpp
M +0 -0 src/editor/wordtypeview.h
M +0 -0 src/exportdialog.cpp
M +0 -0 src/exportdialog.h
M +2 -2 src/parleydocument.cpp
M +3 -22 src/parleymainwindow.h
M +1 -1 src/scripts/scripting/parley.cpp
M +1 -4 src/statistics/lessonstatistics.cpp
M +1 -1 src/statistics/statisticsmainwindow.cpp
M +0 -1 src/statistics/statisticsmodel.h
http://commits.kde.org/parley/30589867a756240a3c2547b4864f7d3ae17202e9
diff --cc src/CMakeLists.txt
index 5ad3ee7,a1a9887..efdff94
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@@ -153,8 -154,13 +154,13 @@@ qt5_add_dbus_adaptor(parley_LIB_SRCS ed
#### XSLT Support ####
# to transform the document xml to html or other
if(HAVE_LIBXSLT)
- set(parley_LIB_SRCS ${parley_LIB_SRCS} export/exportdialog.cpp)
- qt5_wrap_ui(parley_LIB_SRCS export/exportdialog.ui)
+ set(parley_LIB_SRCS ${parley_LIB_SRCS}
+ exportdialog.cpp
+ )
+
- kde4_add_ui_files(parley_LIB_SRCS
++ qt5_wrap_ui(parley_LIB_SRCS
+ exportdialog.ui
+ )
endif(HAVE_LIBXSLT)
#### End XSLT Support ####
diff --cc src/collection/entryfilter.cpp
index f525e39,4668e6f..89f3d9f
--- a/src/collection/entryfilter.cpp
+++ b/src/collection/entryfilter.cpp
@@@ -13,6 -13,13 +13,13 @@@
#include "entryfilter.h"
++#include <QPushButton>
++#include <QDebug>
+
-#include <krandom.h>
-
-#include <KDebug>
-#include <KDialog>
+ #include <KMessageBox>
++#include <KLocalizedString>
++#include <krandom.h>
+
#include <keduvocdocument.h>
#include <keduvocwordtype.h>
#include <keduvocexpression.h>
@@@ -20,15 -27,6 +27,8 @@@
#include "documentsettings.h"
#include "testentry.h"
- #include <KMessageBox>
- #include <KLocalizedString>
- #include <krandom.h>
-
- #include <QPushButton>
- #include <QDebug>
-
- using namespace Practice;
++//using namespace Practice;
+
// Blocking times for pregrade levels.
//
diff --cc src/collection/entryfilter.h
index bca0485,72cf026..7a29da9
--- a/src/collection/entryfilter.h
+++ b/src/collection/entryfilter.h
@@@ -24,11 -24,9 +24,9 @@@ class KEduVocText
class KEduVocTranslation;
class KEduVocExpression;
class KEduVocDocument;
-class KDialog;
+class QDialogButtonBox;
class TestEntry;
- namespace Practice
- {
class EntryFilter
: public QObject
@@@ -105,10 -103,10 +103,10 @@@ private
// The tenses selected by the user for practice
QStringList m_tenses;
- KDialog *m_dialog;
+ QDialog *m_dialog; ///<Dialog to determine words to be added to practice
+ QDialogButtonBox *m_button_dialog; ///<ok/cancel buttons
QSet<KEduVocExpression*> m_currentSelection[2];
};
- }
+
#endif
-
diff --cc src/collection/vocabularymodel.cpp
index 71c0e50,62ee347..29608af
--- a/src/collection/vocabularymodel.cpp
+++ b/src/collection/vocabularymodel.cpp
@@@ -24,13 -24,12 +24,12 @@@
#include "vocabularymimedata.h"
#include <keduvocexpression.h>
-#include <KIcon>
#include <KLocalizedString>
-#include <KDebug>
+#include <QDebug>
#include <KMessageBox>
#include <QPixmap>
+#include <QTextStream>
- using namespace Editor;
VocabularyModel::VocabularyModel(QObject *parent)
: QAbstractTableModel(parent),
diff --cc src/editor/editor.h
index b7f344f,836cb3b..cc260a3
--- a/src/editor/editor.h
+++ b/src/editor/editor.h
@@@ -28,7 -28,12 +28,14 @@@ class QLineEdit
class KActionMenu;
class ScriptManager;
+///@brief contains objects for the editor main window
++
+ // Models around the Collection / KEduVocDocument
+ class LessonModel;
+ class VocabularyModel;
+ class VocabularyFilter;
+ class WordClassModel;
+
namespace Editor
{
class VocabularyView;
diff --cc src/editor/summarywordwidget.cpp
index eaec20e,2574fea..f65987b
--- a/src/editor/summarywordwidget.cpp
+++ b/src/editor/summarywordwidget.cpp
@@@ -30,7 -30,11 +30,7 @@@
#include <QLabel>
#include <QTreeView>
--// KDE imports
-#include <KIcon>
-#include <KLocale>
-
+ // KEduVocDocument
#include <keduvoccontainer.h>
#include <keduvocdocument.h>
#include <keduvocexpression.h>
diff --cc src/editor/vocabularyview.h
index d0aab3d,328e351..3b2be50
--- a/src/editor/vocabularyview.h
+++ b/src/editor/vocabularyview.h
@@@ -22,15 -23,21 +23,21 @@@
#include <QTableView>
#include <QMap>
- class KEduVocExpression;
- class KEduVocDocument;
-
+ // KDE
class KActionMenu;
-class KAction;
-class KUrl;
+class QAction;
+class QUrl;
+ // KEduVocDocument
+ class KEduVocExpression;
+ class KEduVocDocument;
+
+ // parley / collection
+ class VocabularyFilter;
+
class Translator;
+
namespace Editor
{
class EditorWindow;
@@@ -104,14 -111,14 +111,14 @@@ private
virtual void setModel(QAbstractItemModel *model) {
Q_UNUSED(model)
}
-
+ #endif
- KAction* m_appendEntryAction;
- KAction* m_deleteEntriesAction;
- KAction* m_copyAction;
- KAction* m_cutAction;
- KAction* m_pasteAction;
- KAction* m_selectAllAction;
- KAction* m_clearSelectionAction;
+ QAction* m_appendEntryAction;
+ QAction* m_deleteEntriesAction;
+ QAction* m_copyAction;
+ QAction* m_cutAction;
+ QAction* m_pasteAction;
+ QAction* m_selectAllAction;
+ QAction* m_clearSelectionAction;
VocabularyFilter* m_model;
VocabularyDelegate* m_vocabularyDelegate;
diff --cc src/parleydocument.cpp
index 9a20b1b,520799d..a9509de
--- a/src/parleydocument.cpp
+++ b/src/parleydocument.cpp
@@@ -39,16 -38,14 +39,16 @@@
#include <KEMailSettings>
#include <KMessageBox>
#include <KProcess>
-#include <KTempDir>
+#include <QTemporaryDir>
+#include <QDialog>
+#include <QDialogButtonBox>
#include <QTimer>
-#include <QtGui/QPrinter>
-#include <QtGui/QPrintDialog>
+#include <QtPrintSupport/QPrinter>
+#include <QtPrintSupport/QPrintDialog>
#ifdef HAVE_LIBXSLT
- #include "export/exportdialog.h"
+ #include "exportdialog.h"
#include <libxml/parser.h>
#include <libxml/tree.h>
#include <libxslt/xslt.h>
diff --cc src/parleymainwindow.h
index b32a307,ae81427..97c7af3
--- a/src/parleymainwindow.h
+++ b/src/parleymainwindow.h
@@@ -34,39 -34,9 +34,20 @@@
#include <QPointer>
- namespace Practice
- {
- class GuiFrontend;
- class DefaultBackend;
- class PracticeSummaryComponent;
- }
-
- namespace Editor
- {
- class VocabularyView;
- class VocabularyModel;
- class VocabularyFilter;
- class LessonView;
- class WordTypeView;
- class LeitnerView;
- class LessonModel;
- class WordTypeModel;
- class LeitnerModel;
- class ConjugationWidget;
- class SummaryWordWidget;
- class EditorWindow;
- }
class KRecentFilesAction;
++#if 0
+class KActionMenu;
+class QAction;
+class QLabel;
+class QDockWidget;
+
+class Dashboard;
+class StatisticsMainWindow;
+class ScriptManager;
+class ParleyPracticeMainWindow;
++#endif
+
class ParleyMainWindow : public KXmlGuiWindow
{
More information about the kde-doc-english
mailing list