author | zecke <zecke> | 2003-02-11 18:42:42 (UTC) |
---|---|---|
committer | zecke <zecke> | 2003-02-11 18:42:42 (UTC) |
commit | 986afbabdd7c291f2fcbecd865e8c7075623bbf8 (patch) (unidiff) | |
tree | 7b00ad1e26a47666c05b7040d2218d134f698007 | |
parent | cb85b004afe2750733cef1663961539f6a3968e6 (diff) | |
download | opie-986afbabdd7c291f2fcbecd865e8c7075623bbf8.zip opie-986afbabdd7c291f2fcbecd865e8c7075623bbf8.tar.gz opie-986afbabdd7c291f2fcbecd865e8c7075623bbf8.tar.bz2 |
Add switching the views with the ActionKey..
-rw-r--r-- | core/pim/todo/mainwindow.cpp | 5 | ||||
-rw-r--r-- | core/pim/todo/mainwindow.h | 2 | ||||
-rw-r--r-- | core/pim/todo/tableview.cpp | 13 | ||||
-rw-r--r-- | core/pim/todo/tableview.h | 1 | ||||
-rw-r--r-- | core/pim/todo/textviewshow.cpp | 17 | ||||
-rw-r--r-- | core/pim/todo/textviewshow.h | 5 | ||||
-rw-r--r-- | core/pim/todo/todoshow.cpp | 9 | ||||
-rw-r--r-- | core/pim/todo/todoshow.h | 7 |
8 files changed, 52 insertions, 7 deletions
diff --git a/core/pim/todo/mainwindow.cpp b/core/pim/todo/mainwindow.cpp index c90166b..d328558 100644 --- a/core/pim/todo/mainwindow.cpp +++ b/core/pim/todo/mainwindow.cpp | |||
@@ -253,3 +253,3 @@ void MainWindow::initEditor() { | |||
253 | void MainWindow::initShow() { | 253 | void MainWindow::initShow() { |
254 | m_curShow = new TextViewShow(this); | 254 | m_curShow = new TextViewShow(this, this); |
255 | m_stack->addWidget( m_curShow->widget() , m_counter++ ); | 255 | m_stack->addWidget( m_curShow->widget() , m_counter++ ); |
@@ -815 +815,4 @@ void MainWindow::add( const OPimRecord& rec) { | |||
815 | } | 815 | } |
816 | void MainWindow::slotReturnFromView() { | ||
817 | raiseCurrentView(); | ||
818 | } | ||
diff --git a/core/pim/todo/mainwindow.h b/core/pim/todo/mainwindow.h index d756d64..f880505 100644 --- a/core/pim/todo/mainwindow.h +++ b/core/pim/todo/mainwindow.h | |||
@@ -62,2 +62,3 @@ namespace Todo { | |||
62 | friend class TodoView; // avoid QObject here.... | 62 | friend class TodoView; // avoid QObject here.... |
63 | friend class TodoShow; // avoid QObject | ||
63 | public: | 64 | public: |
@@ -185,2 +186,3 @@ private slots: | |||
185 | void slotShowDue( bool ); | 186 | void slotShowDue( bool ); |
187 | void slotReturnFromView(); // for TodoShow... | ||
186 | /* reimplementation from opimmainwindow */ | 188 | /* reimplementation from opimmainwindow */ |
diff --git a/core/pim/todo/tableview.cpp b/core/pim/todo/tableview.cpp index 61d1edd..cec8b5e 100644 --- a/core/pim/todo/tableview.cpp +++ b/core/pim/todo/tableview.cpp | |||
@@ -471,3 +471,3 @@ void TableView::slotPriority() { | |||
471 | */ | 471 | */ |
472 | void TableView::timerEvent( QTimerEvent* ev ) { | 472 | void TableView::timerEvent( QTimerEvent* ) { |
473 | // qWarning("sorted %d", sorted().count() ); | 473 | // qWarning("sorted %d", sorted().count() ); |
@@ -532 +532,12 @@ void TableView::contentsMouseMoveEvent( QMouseEvent* e ) { | |||
532 | } | 532 | } |
533 | void TableView::keyPressEvent( QKeyEvent* event) { | ||
534 | switch( event->key() ) { | ||
535 | case Qt::Key_F33: | ||
536 | case Qt::Key_Enter: | ||
537 | case Qt::Key_Return: | ||
538 | showTodo( sorted().uidAt( currentRow() ) ); | ||
539 | break; | ||
540 | default: | ||
541 | QTable::keyPressEvent( event ); | ||
542 | } | ||
543 | } | ||
diff --git a/core/pim/todo/tableview.h b/core/pim/todo/tableview.h index 2b6ea2b..689c496 100644 --- a/core/pim/todo/tableview.h +++ b/core/pim/todo/tableview.h | |||
@@ -87,2 +87,3 @@ namespace Todo { | |||
87 | protected: | 87 | protected: |
88 | void keyPressEvent( QKeyEvent* ); | ||
88 | void contentsMouseReleaseEvent( QMouseEvent* ); | 89 | void contentsMouseReleaseEvent( QMouseEvent* ); |
diff --git a/core/pim/todo/textviewshow.cpp b/core/pim/todo/textviewshow.cpp index 24c8c0e..fe8a9c8 100644 --- a/core/pim/todo/textviewshow.cpp +++ b/core/pim/todo/textviewshow.cpp | |||
@@ -1 +1,2 @@ | |||
1 | #include "mainwindow.h" | ||
1 | #include "textviewshow.h" | 2 | #include "textviewshow.h" |
@@ -4,4 +5,4 @@ using namespace Todo; | |||
4 | 5 | ||
5 | TextViewShow::TextViewShow( QWidget* parent) | 6 | TextViewShow::TextViewShow( QWidget* parent, MainWindow* win) |
6 | : QTextView( parent ), TodoShow() { | 7 | : QTextView( parent ), TodoShow(win) { |
7 | 8 | ||
@@ -19 +20,13 @@ QWidget* TextViewShow::widget() { | |||
19 | } | 20 | } |
21 | void TextViewShow::keyPressEvent( QKeyEvent* event ) { | ||
22 | switch( event->key() ) { | ||
23 | case Qt::Key_F33: | ||
24 | case Qt::Key_Enter: | ||
25 | case Qt::Key_Return: | ||
26 | escapeView(); | ||
27 | break; | ||
28 | default: | ||
29 | QTextView::keyPressEvent( event ); | ||
30 | break; | ||
31 | } | ||
32 | } | ||
diff --git a/core/pim/todo/textviewshow.h b/core/pim/todo/textviewshow.h index f58026b..498de81 100644 --- a/core/pim/todo/textviewshow.h +++ b/core/pim/todo/textviewshow.h | |||
@@ -8,3 +8,3 @@ namespace Todo { | |||
8 | public: | 8 | public: |
9 | TextViewShow( QWidget* parent ); | 9 | TextViewShow( QWidget* parent, MainWindow* ); |
10 | ~TextViewShow(); | 10 | ~TextViewShow(); |
@@ -15,2 +15,5 @@ namespace Todo { | |||
15 | 15 | ||
16 | protected: | ||
17 | void keyPressEvent( QKeyEvent* ); | ||
18 | |||
16 | }; | 19 | }; |
diff --git a/core/pim/todo/todoshow.cpp b/core/pim/todo/todoshow.cpp index c84a08f..4dbc9aa 100644 --- a/core/pim/todo/todoshow.cpp +++ b/core/pim/todo/todoshow.cpp | |||
@@ -1 +1,3 @@ | |||
1 | |||
2 | #include "mainwindow.h" | ||
1 | #include "todoshow.h" | 3 | #include "todoshow.h" |
@@ -4,3 +6,4 @@ using namespace Todo; | |||
4 | 6 | ||
5 | TodoShow::TodoShow() { | 7 | TodoShow::TodoShow(MainWindow* win) { |
8 | m_win = win; | ||
6 | } | 9 | } |
@@ -8,2 +11,6 @@ TodoShow::~TodoShow() { | |||
8 | } | 11 | } |
12 | void TodoShow::escapeView() { | ||
13 | if (m_win ) | ||
14 | m_win->slotReturnFromView(); | ||
15 | } | ||
9 | 16 | ||
diff --git a/core/pim/todo/todoshow.h b/core/pim/todo/todoshow.h index 198e9ae..7267b13 100644 --- a/core/pim/todo/todoshow.h +++ b/core/pim/todo/todoshow.h | |||
@@ -36,2 +36,3 @@ | |||
36 | namespace Todo { | 36 | namespace Todo { |
37 | class MainWindow; | ||
37 | /** | 38 | /** |
@@ -44,3 +45,3 @@ namespace Todo { | |||
44 | public: | 45 | public: |
45 | TodoShow(); | 46 | TodoShow( MainWindow* win); |
46 | virtual ~TodoShow(); | 47 | virtual ~TodoShow(); |
@@ -49,2 +50,6 @@ namespace Todo { | |||
49 | virtual QWidget* widget() = 0; | 50 | virtual QWidget* widget() = 0; |
51 | protected: | ||
52 | void escapeView(); | ||
53 | private: | ||
54 | MainWindow *m_win; | ||
50 | }; | 55 | }; |