[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: KDE/kdeedu/ktouch/src
From: Andreas Nicolai <Andreas.Nicolai () gmx ! net>
Date: 2006-11-26 0:33:44
Message-ID: 1164501224.483063.13383.nullmailer () svn ! kde ! org
[Download RAW message or body]
SVN commit 607864 by ghorwin:
Ported several ui files to Qt4, so that Qt3 compatibility classes
are no longer needed. Fixed several bugs and layout problems. Created
directory ui for all ui files that use Qt4 exclusively (eventually
all ui files should end up there).
M +24 -22 CMakeLists.txt
M +25 -54 ktouch.cpp
M +2 -2 ktouch.h
D ktouchcoloreditor.cpp
D ktouchcoloreditor.h
D ktouchcoloreditor_dlg.ui
A ktouchcoloreditordialog.cpp [License: GPL (v2+)]
A ktouchcoloreditordialog.h [License: GPL (v2+)]
M +1 -1 ktouchlecture.h
D ktouchlectureeditor.cpp
D ktouchlectureeditor.h
D ktouchlectureeditor_dlg.ui
A ktouchlectureeditordialog.cpp [License: GPL (v2+)]
A ktouchlectureeditordialog.h [License: GPL (v2+)]
M +1 -1 ktouchleveldata.h
D ktouchopenrequest.cpp
D ktouchopenrequest.h
D ktouchopenrequest_dlg.ui
A ktouchopenrequestdialog.cpp [License: GPL (v2+)]
A ktouchopenrequestdialog.h [License: GPL (v2+)]
M +2 -2 ktouchprefgeneral.h
D ktouchprefgenerallayout.ui
D ktouchstatus.cpp
D ktouchstatus.h
D ktouchstatuslayout.ui
A ktouchstatuswidget.cpp [License: GPL (v2+)]
A ktouchstatuswidget.h [License: GPL (v2+)]
M +2 -2 ktouchtrainer.cpp
M +3 -3 ktouchtrainer.h
--- trunk/KDE/kdeedu/ktouch/src/CMakeLists.txt #607863:607864
@@ -1,12 +1,28 @@
+# CMakeList.txt for the KTouch source directory
-include_directories( ${CMAKE_SOURCE_DIR}/libkdeedu/kdeeduplot/ )
+# set include directories
+include_directories( ${CMAKE_SOURCE_DIR}/libkdeedu/kdeeduplot/ )
+# add ui files, all files in directory ui are Qt4 only
+kde4_add_ui_files(ktouch_UIS
+ ui/ktouchcoloreditordialog.ui
+ ui/ktouchopenrequestdialog.ui
+ ui/ktouchprefgeneralpage.ui
+ ui/ktouchstatuswidget.ui
+ ui/ktouchlectureeditordialog.ui
+ ktouchprefcolorslayout.ui
+ ktouchprefkeyboardlayout.ui
+ ktouchpreftraininglayout.ui
+ ktouchstatistics_dlg.ui
+ ktouchusersetup_dlg.ui
+)
-########### next target ###############
-
+# set the source code files from which KTouch is compiled
set(ktouch_SRCS
+ ktouchcoloreditordialog.cpp
+ ktouchopenrequestdialog.cpp
+ ktouchlectureeditordialog.cpp
ktouchchartwidget.cpp
- ktouchcoloreditor.cpp
ktouchcolorscheme.cpp
ktouchdefaults.cpp
ktouchkeyboardwidget.cpp
@@ -14,13 +30,11 @@
ktouchkey.cpp
ktouchkeys.cpp
ktouchlecture.cpp
- ktouchlectureeditor.cpp
ktouchleveldata.cpp
- ktouchopenrequest.cpp
ktouchslideline.cpp
ktouchstatistics.cpp
ktouchstatisticsdata.cpp
- ktouchstatus.cpp
+ ktouchstatuswidget.cpp
ktouchtrainer.cpp
ktouchusersetup.cpp
ktouchutils.cpp
@@ -28,24 +42,12 @@
main.cpp
)
-kde4_automoc(${ktouch_SRCS})
+# create moc files automatically, requires that moc files are included into the cpp \
files +kde4_automoc( ${ktouch_UIS} ${ktouch_SRCS} )
-kde4_add_ui_files(ktouch_SRCS
- ktouchcoloreditor_dlg.ui
- ktouchlectureeditor_dlg.ui
- ktouchopenrequest_dlg.ui
- ktouchprefcolorslayout.ui
- ktouchprefgenerallayout.ui
- ktouchprefkeyboardlayout.ui
- ktouchpreftraininglayout.ui
- ktouchstatistics_dlg.ui
- ktouchstatuslayout.ui
- ktouchusersetup_dlg.ui
-)
-
kde4_add_kcfg_files(ktouch_SRCS prefs.kcfgc )
-kde4_add_executable(ktouch ${ktouch_SRCS})
+kde4_add_executable(ktouch ${ktouch_UIS} ${ktouch_SRCS})
target_link_libraries(ktouch ${KDE4_KIO_LIBS} kdeeduplot \
${KDE4_PHONONCORE_LIBRARY})
--- trunk/KDE/kdeedu/ktouch/src/ktouch.cpp #607863:607864
@@ -16,13 +16,8 @@
// Standard files
#include <algorithm>
-// QT Header
-#include <QVBoxLayout>
-#include <QSignalMapper>
-#include <QCheckBox>
-#include <QLabel>
-#include <QKeyEvent>
-#include <QResizeEvent>
+// Qt Header
+#include <QtGui>
// KDE Header
#include <kselectaction.h>
@@ -43,17 +38,19 @@
#include <kicon.h>
#include <kio/netaccess.h>
-// Own header files
+// KTouch Header
#include "ktouchlecture.h"
-#include "ktouchlectureeditor.h"
-#include "ktouchstatus.h"
+#include "ktouchtrainer.h"
+
+#include "ktouchstatuswidget.h"
#include "ktouchslideline.h"
#include "ktouchkeyboardwidget.h"
-#include "ktouchcoloreditor.h"
-#include "ktouchtrainer.h"
-#include "ktouchstatistics.h"
-#include "ktouchprefgeneral.h"
+#include "ktouchlectureeditordialog.h"
+#include "ktouchcoloreditordialog.h"
+//#include "ktouchstatistics.h"
+
+#include "ktouchprefgeneral.h"
#include "ktouchpreftraining.h"
#include "ktouchprefkeyboard.h"
#include "ktouchprefcolors.h"
@@ -81,9 +78,9 @@
KUrl stat_file = KGlobal::dirs()->findResource("data", "ktouch/statistics.xml");
m_userStats.clear(); // make sure our mapping contains the "default" user
// read previous stats from file
- // FIXME: find the source code for this function or reimplement it
- // KTouchStatisticsData::readUserStats(this, stat_file, m_userStats);
+ KTouchStatisticsData::readUserStats(this, stat_file, m_userStats);
// kDebug() << "[KTouch::KTouch] users = " << m_userStats.count() << endl;
+
// Setup our actions and connections
setupActions();
// create the GUI reading the ui.rc file
@@ -347,7 +344,7 @@
trainingPause();
m_trainer->storeTrainingStatistics();
// Create and execute editor
- KTouchLectureEditor dlg(this);
+ KTouchLectureEditorDialog dlg(this);
dlg.startEditor( Prefs::currentLectureFile() );
// Reload lecture in case it was modified
m_lecture.loadXML(this, Prefs::currentLectureFile() );
@@ -373,7 +370,7 @@
else ++default_schemes;
}
- KTouchColorEditor dlg(this); // Create editor
+ KTouchColorEditorDialog dlg(this); // Create editor
// start editor
int selected;
dlg.startEditor( tmp_list, Prefs::currentColorScheme() - default_schemes, \
selected); @@ -441,7 +438,7 @@
void KTouch::trainingStatistics() {
trainingPause();
- KTouchStatistics dlg(this);
+ //KTouchStatistics dlg(this);
// TODO : this is somewhat messy: we have to get the words in the
// current line (since they are not stored in the current
// level and session stats, because the student may delete
@@ -455,7 +452,7 @@
// data for the current lecture present for the dialog to function
// properly
getCurrentLectureStats();
- dlg.run(Prefs::currentLectureFile(), m_userStats[Prefs::currentUserName()], kls, \
kss); + //dlg.run(Prefs::currentLectureFile(), \
m_userStats[Prefs::currentUserName()], kls, kss); }
// ----------------------------------------------------------------------------
@@ -523,7 +520,8 @@
// ----------------------------------------------------------------------------
void KTouch::changeStatusbarMessage(const QString& text) {
- statusBar()->message(text);
+ // FIXME
+ //statusBar()->message(text);
}
// ----------------------------------------------------------------------------
@@ -747,10 +745,10 @@
// of QSizePolicy)
QWidget *main = new QWidget();
- QVBoxLayout * layout = new QVBoxLayout( this );
+ QVBoxLayout * layout = new QVBoxLayout(main);
main->setLayout(layout);
- m_statusWidget = new KTouchStatus( this );
+ m_statusWidget = new KTouchStatusWidget( this );
m_slideLineWidget = new KTouchSlideLine( this );
m_slideLineWidget->setSizePolicy( QSizePolicy(QSizePolicy::Preferred, \
QSizePolicy::Expanding, 0, 1) ); m_keyboardWidget = new KTouchKeyboardWidget( this \
); @@ -773,12 +771,15 @@
statusBar()->insertPermanentItem("Level", 1, 0);
statusBar()->insertPermanentItem("Session", 2, 0);
- this->setCentralWidget(main);
+ this->setCentralWidget(main);
}
// ----------------------------------------------------------------------------
// Creates the (standard) actions and entries in the menu.
void KTouch::setupActions() {
+ // here we create actions for the menu and toolbar
+ // the placement is defined in the ktouchui.rc file
+
// *** File menu ***
KAction *action = new KAction(KIcon("open_plaintext"), i18n("&Open plain text \
file..."), actionCollection(), "file_opentext"); connect(action, \
SIGNAL(triggered(bool)), SLOT(fileOpenText())); @@ -982,33 +983,3 @@
m_currentUserAction->setCurrentItem(index);
}
// ----------------------------------------------------------------------------
-
-/*
-void KTouch::imStartEvent(QIMEvent *e) {
- kDebug() << "[KTouch::imStartEvent] text = '" << e->text() << "'" << endl;
- e->accept();
-}
-// ----------------------------------------------------------------------------
-
-void KTouch::imComposeEvent(QIMEvent *e) {
- kDebug() << "[KTouch::imComposeEvent] text = '" << e->text() << "'" << endl;
- e->accept();
-}
-// ----------------------------------------------------------------------------
-
-void KTouch::imEndEvent(QIMEvent *e) {
- kDebug() << "[KTouch::imEndEvent] text = '" << e->text() << "'" << endl;
- if (!e->text().isEmpty()) {
- if (e->text() == "^") {
- QKeyEvent *ev = new QKeyEvent (QEvent::KeyPress,
- Qt::Key_AsciiCircum, '^', 0,
- QString("^"));
- keyPressEvent(ev);
- delete ev;
- }
- }
- e->accept();
-}
-// ----------------------------------------------------------------------------
-*/
-
--- trunk/KDE/kdeedu/ktouch/src/ktouch.h #607863:607864
@@ -27,7 +27,7 @@
class KActionMenu;
class KSelectAction;
-class KTouchStatus;
+class KTouchStatusWidget;
class KTouchSlideLine;
class KTouchKeyboardWidget;
class KTouchTrainer;
@@ -157,7 +157,7 @@
KSelectAction *m_defaultLectureAction;
KSelectAction *m_currentUserAction;
- KTouchStatus *m_statusWidget; ///< Pointer to the status \
widget on top of the main widget. + KTouchStatusWidget *m_statusWidget; \
///< Pointer to the status widget on top of the main widget.
KTouchSlideLine *m_slideLineWidget; ///< Pointer to the sliding line \
widget.
KTouchKeyboardWidget *m_keyboardWidget; ///< Pointer to the keyboard \
widget.
KTouchTrainer *m_trainer; ///< The training 'master' (runs \
the training).
--- trunk/KDE/kdeedu/ktouch/src/ktouchlecture.h #607863:607864
@@ -74,7 +74,7 @@
/// The editor should be able to handle the internal lecture data (it's for \
convenience actually).
- friend class KTouchLectureEditor;
+ friend class KTouchLectureEditorDialog;
};
#endif // KTOUCHLECTURE_H
--- trunk/KDE/kdeedu/ktouch/src/ktouchleveldata.h #607863:607864
@@ -69,7 +69,7 @@
// so I don't have to allow access to read/write function to everybody :-)
friend class KTouchLecture;
- friend class KTouchLectureEditor;
+ friend class KTouchLectureEditorDialog;
};
#endif // KTOUCHLEVELDATA_H
--- trunk/KDE/kdeedu/ktouch/src/ktouchprefgeneral.h #607863:607864
@@ -14,7 +14,7 @@
#include <QWidget>
-#include "ui_ktouchprefgenerallayout.h"
+#include "ui_ktouchprefgeneralpage.h"
class KTouchPrefGeneral : public QWidget {
@@ -25,7 +25,7 @@
ui.setupUi(this);
};
- Ui_KTouchPrefGeneralLayout ui;
+ Ui_KTouchPrefGeneralPage ui;
};
#endif
--- trunk/KDE/kdeedu/ktouch/src/ktouchtrainer.cpp #607863:607864
@@ -22,7 +22,7 @@
#include <kstandarddirs.h>
#include "ktouch.h"
-#include "ktouchstatus.h"
+#include "ktouchstatuswidget.h"
#include "ktouchslideline.h"
#include "ktouchkeyboardwidget.h"
#include "ktouchlecture.h"
@@ -31,7 +31,7 @@
#include <phonon/audioplayer.h>
-KTouchTrainer::KTouchTrainer(KTouchStatus *status, KTouchSlideLine *slideLine, \
KTouchKeyboardWidget *keyboard, KTouchLecture *lecture) \
+KTouchTrainer::KTouchTrainer(KTouchStatusWidget *status, KTouchSlideLine *slideLine, \
KTouchKeyboardWidget *keyboard, KTouchLecture *lecture) : QObject(),
m_trainingTimer(new QTimer),
m_statusWidget(status),
--- trunk/KDE/kdeedu/ktouch/src/ktouchtrainer.h #607863:607864
@@ -19,7 +19,7 @@
class QTimer;
-class KTouchStatus;
+class KTouchStatusWidget;
class KTouchSlideLine;
class KTouchKeyboardWidget;
class KTouchLecture;
@@ -62,7 +62,7 @@
Q_OBJECT
public:
/// Constructor.
- KTouchTrainer(KTouchStatus *status, KTouchSlideLine *slideLine, \
KTouchKeyboardWidget *keyboard, KTouchLecture *lecture); + \
KTouchTrainer(KTouchStatusWidget *status, KTouchSlideLine *slideLine, \
KTouchKeyboardWidget *keyboard, KTouchLecture *lecture); /// Destructor
virtual ~KTouchTrainer();
/// Jumps to the first line in the current level (m_level) (Note: has no effect \
on the training statistics). @@ -150,7 +150,7 @@
/// right before a new level and new line is started).
void statsChangeLevel();
- KTouchStatus *m_statusWidget; ///< Pointer to the status \
widget on top of the main window. + KTouchStatusWidget *m_statusWidget; \
///< Pointer to the status widget on top of the main window.
KTouchSlideLine *m_slideLineWidget; ///< Pointer to the sliding line \
widget.
KTouchKeyboardWidget *m_keyboardWidget; ///< Pointer to the keyboard \
widget.
KTouchLecture *m_lecture; ///< Pointer to the lecture \
data.
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic