author | alwin <alwin> | 2005-03-05 17:46:46 (UTC) |
---|---|---|
committer | alwin <alwin> | 2005-03-05 17:46:46 (UTC) |
commit | a287cf7aad0660d4c7a573ff4da8ef35c78bb712 (patch) (unidiff) | |
tree | df6b26dca01f4b41710197b1653225c52b4b287b /noncore/net | |
parent | c017febf6f4092bb968d12df5a30a0af30066048 (diff) | |
download | opie-a287cf7aad0660d4c7a573ff4da8ef35c78bb712.zip opie-a287cf7aad0660d4c7a573ff4da8ef35c78bb712.tar.gz opie-a287cf7aad0660d4c7a573ff4da8ef35c78bb712.tar.bz2 |
change the layoutdirection of main window when display is rotating
(LeftToRight when 0 rotation, TopToButtom when 90)
-rw-r--r-- | noncore/net/mail/mainwindow.cpp | 22 | ||||
-rw-r--r-- | noncore/net/mail/mainwindow.h | 4 |
2 files changed, 24 insertions, 2 deletions
diff --git a/noncore/net/mail/mainwindow.cpp b/noncore/net/mail/mainwindow.cpp index c115b32..93d80d9 100644 --- a/noncore/net/mail/mainwindow.cpp +++ b/noncore/net/mail/mainwindow.cpp | |||
@@ -1,20 +1,21 @@ | |||
1 | #include <qlabel.h> | 1 | #include <qlabel.h> |
2 | #include <qvbox.h> | 2 | #include <qvbox.h> |
3 | #include <qheader.h> | 3 | #include <qheader.h> |
4 | #include <qtimer.h> | 4 | #include <qtimer.h> |
5 | #include <qlayout.h> | 5 | #include <qlayout.h> |
6 | 6 | ||
7 | #include <opie2/odebug.h> | 7 | #include <opie2/odebug.h> |
8 | #include <qpe/qpeapplication.h> | 8 | #include <qpe/qpeapplication.h> |
9 | #include <qpe/qcopenvelope_qws.h> | ||
9 | 10 | ||
10 | #include "defines.h" | 11 | #include "defines.h" |
11 | #include "mainwindow.h" | 12 | #include "mainwindow.h" |
12 | 13 | ||
13 | using namespace Opie::Core; | 14 | using namespace Opie::Core; |
14 | 15 | ||
15 | MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags ) | 16 | MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags ) |
16 | : QMainWindow( parent, name, flags ) | 17 | : QMainWindow( parent, name, flags ) |
17 | { | 18 | { |
18 | 19 | ||
19 | setCaption( tr( "Mail" ) ); | 20 | setCaption( tr( "Mail" ) ); |
20 | setToolBarsMovable( false ); | 21 | setToolBarsMovable( false ); |
@@ -77,25 +78,24 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags ) | |||
77 | connect( editSettings, SIGNAL( activated() ), | 78 | connect( editSettings, SIGNAL( activated() ), |
78 | SLOT( slotEditSettings() ) ); | 79 | SLOT( slotEditSettings() ) ); |
79 | editAccounts = new QAction( tr( "Configure accounts" ), QIconSet( Resource::loadPixmap("mail/editaccounts") ) , | 80 | editAccounts = new QAction( tr( "Configure accounts" ), QIconSet( Resource::loadPixmap("mail/editaccounts") ) , |
80 | 0, 0, this ); | 81 | 0, 0, this ); |
81 | editAccounts->addTo( settingsMenu ); | 82 | editAccounts->addTo( settingsMenu ); |
82 | 83 | ||
83 | //setCentralWidget( view ); | 84 | //setCentralWidget( view ); |
84 | 85 | ||
85 | QVBox* wrapperBox = new QVBox( this ); | 86 | QVBox* wrapperBox = new QVBox( this ); |
86 | setCentralWidget( wrapperBox ); | 87 | setCentralWidget( wrapperBox ); |
87 | 88 | ||
88 | QWidget *view = new QWidget( wrapperBox ); | 89 | QWidget *view = new QWidget( wrapperBox ); |
89 | |||
90 | layout = new QBoxLayout ( view, QBoxLayout::LeftToRight ); | 90 | layout = new QBoxLayout ( view, QBoxLayout::LeftToRight ); |
91 | 91 | ||
92 | folderView = new AccountView( view ); | 92 | folderView = new AccountView( view ); |
93 | folderView->header()->hide(); | 93 | folderView->header()->hide(); |
94 | folderView->setRootIsDecorated( true ); | 94 | folderView->setRootIsDecorated( true ); |
95 | folderView->addColumn( tr( "Mailbox" ) ); | 95 | folderView->addColumn( tr( "Mailbox" ) ); |
96 | 96 | ||
97 | layout->addWidget( folderView ); | 97 | layout->addWidget( folderView ); |
98 | 98 | ||
99 | mailView = new QListView( view ); | 99 | mailView = new QListView( view ); |
100 | mailView->addColumn( "" ); | 100 | mailView->addColumn( "" ); |
101 | mailView->addColumn( tr( "Subject" ),QListView::Manual ); | 101 | mailView->addColumn( tr( "Subject" ),QListView::Manual ); |
@@ -104,62 +104,80 @@ MainWindow::MainWindow( QWidget *parent, const char *name, WFlags flags ) | |||
104 | mailView->addColumn( tr( "Date" )); | 104 | mailView->addColumn( tr( "Date" )); |
105 | mailView->setAllColumnsShowFocus(true); | 105 | mailView->setAllColumnsShowFocus(true); |
106 | mailView->setShowSortIndicator(true); | 106 | mailView->setShowSortIndicator(true); |
107 | mailView->setSorting(4,false); | 107 | mailView->setSorting(4,false); |
108 | 108 | ||
109 | statusWidget = new StatusWidget( wrapperBox ); | 109 | statusWidget = new StatusWidget( wrapperBox ); |
110 | statusWidget->hide(); | 110 | statusWidget->hide(); |
111 | 111 | ||
112 | layout->addWidget( mailView ); | 112 | layout->addWidget( mailView ); |
113 | layout->setStretchFactor( folderView, 1 ); | 113 | layout->setStretchFactor( folderView, 1 ); |
114 | layout->setStretchFactor( mailView, 2 ); | 114 | layout->setStretchFactor( mailView, 2 ); |
115 | 115 | ||
116 | m_Rotate = (QApplication::desktop()->width() > QApplication::desktop()->height()?0:90); | ||
117 | |||
116 | slotAdjustLayout(); | 118 | slotAdjustLayout(); |
117 | 119 | ||
118 | QPEApplication::setStylusOperation( mailView->viewport(),QPEApplication::RightOnHold); | 120 | QPEApplication::setStylusOperation( mailView->viewport(),QPEApplication::RightOnHold); |
119 | QPEApplication::setStylusOperation( folderView->viewport(),QPEApplication::RightOnHold); | 121 | QPEApplication::setStylusOperation( folderView->viewport(),QPEApplication::RightOnHold); |
120 | 122 | ||
121 | connect( mailView, SIGNAL( mouseButtonClicked(int,QListViewItem*,const QPoint&,int) ),this, | 123 | connect( mailView, SIGNAL( mouseButtonClicked(int,QListViewItem*,const QPoint&,int) ),this, |
122 | SLOT( mailLeftClicked(int,QListViewItem*,const QPoint&,int) ) ); | 124 | SLOT( mailLeftClicked(int,QListViewItem*,const QPoint&,int) ) ); |
123 | connect( mailView, SIGNAL( mouseButtonPressed(int,QListViewItem*,const QPoint&,int) ),this, | 125 | connect( mailView, SIGNAL( mouseButtonPressed(int,QListViewItem*,const QPoint&,int) ),this, |
124 | SLOT( mailHold(int,QListViewItem*,const QPoint&,int) ) ); | 126 | SLOT( mailHold(int,QListViewItem*,const QPoint&,int) ) ); |
125 | connect(folderView, SIGNAL(refreshMailview(const QValueList<RecMailP>&)), | 127 | connect(folderView, SIGNAL(refreshMailview(const QValueList<RecMailP>&)), |
126 | this,SLOT(refreshMailView(const QValueList<RecMailP>&))); | 128 | this,SLOT(refreshMailView(const QValueList<RecMailP>&))); |
127 | connect( composeMail, SIGNAL( activated() ), SLOT( slotComposeMail() ) ); | 129 | connect( composeMail, SIGNAL( activated() ), SLOT( slotComposeMail() ) ); |
128 | connect( sendQueued, SIGNAL( activated() ), SLOT( slotSendQueued() ) ); | 130 | connect( sendQueued, SIGNAL( activated() ), SLOT( slotSendQueued() ) ); |
129 | // connect( searchMails, SIGNAL( activated() ), SLOT( slotSearchMails() ) ); | 131 | // connect( searchMails, SIGNAL( activated() ), SLOT( slotSearchMails() ) ); |
130 | connect( editAccounts, SIGNAL( activated() ), SLOT( slotEditAccounts() ) ); | 132 | connect( editAccounts, SIGNAL( activated() ), SLOT( slotEditAccounts() ) ); |
131 | // Added by Stefan Eilers to allow starting by addressbook.. | 133 | // Added by Stefan Eilers to allow starting by addressbook.. |
132 | // copied from old mail2 | 134 | // copied from old mail2 |
133 | #if !defined(QT_NO_COP) | 135 | #if !defined(QT_NO_COP) |
134 | connect( qApp, SIGNAL( appMessage(const QCString&,const QByteArray&) ), | 136 | connect( qApp, SIGNAL( appMessage(const QCString&,const QByteArray&) ), |
135 | this, SLOT( appMessage(const QCString&,const QByteArray&) ) ); | 137 | this, SLOT( appMessage(const QCString&,const QByteArray&) ) ); |
138 | m_sysChannel = new QCopChannel( "QPE/System", this ); | ||
139 | connect( m_sysChannel, SIGNAL( received(const QCString&,const QByteArray&) ), | ||
140 | this, SLOT( systemMessage(const QCString&,const QByteArray&) ) ); | ||
136 | #endif | 141 | #endif |
137 | 142 | ||
138 | QTimer::singleShot( 1000, this, SLOT( slotAdjustColumns() ) ); | 143 | QTimer::singleShot( 1000, this, SLOT( slotAdjustColumns() ) ); |
139 | } | 144 | } |
140 | 145 | ||
141 | MainWindow::~MainWindow() | 146 | MainWindow::~MainWindow() |
142 | { | 147 | { |
143 | } | 148 | } |
144 | 149 | ||
150 | void MainWindow::systemMessage( const QCString& msg, const QByteArray& data ) | ||
151 | { | ||
152 | int _newrotation; | ||
153 | QDataStream stream( data, IO_ReadOnly ); | ||
154 | if ( msg == "setCurrentRotation(int)" ) | ||
155 | { | ||
156 | stream >> _newrotation; | ||
157 | if (m_Rotate != _newrotation) { | ||
158 | slotAdjustLayout(); | ||
159 | m_Rotate = _newrotation; | ||
160 | } | ||
161 | } | ||
162 | } | ||
163 | |||
145 | void MainWindow::appMessage(const QCString &, const QByteArray &) | 164 | void MainWindow::appMessage(const QCString &, const QByteArray &) |
146 | { | 165 | { |
147 | odebug << "appMessage not reached" << oendl; | 166 | odebug << "appMessage not reached" << oendl; |
148 | } | 167 | } |
149 | 168 | ||
150 | void MainWindow::slotAdjustLayout() { | 169 | void MainWindow::slotAdjustLayout() { |
151 | 170 | ||
152 | QWidget *d = QApplication::desktop(); | 171 | QWidget *d = QApplication::desktop(); |
153 | |||
154 | if ( d->width() < d->height() ) { | 172 | if ( d->width() < d->height() ) { |
155 | layout->setDirection( QBoxLayout::TopToBottom ); | 173 | layout->setDirection( QBoxLayout::TopToBottom ); |
156 | } else { | 174 | } else { |
157 | layout->setDirection( QBoxLayout::LeftToRight ); | 175 | layout->setDirection( QBoxLayout::LeftToRight ); |
158 | } | 176 | } |
159 | } | 177 | } |
160 | 178 | ||
161 | void MainWindow::slotAdjustColumns() | 179 | void MainWindow::slotAdjustColumns() |
162 | { | 180 | { |
163 | bool hidden = folderView->isHidden(); | 181 | bool hidden = folderView->isHidden(); |
164 | if ( hidden ) folderView->show(); | 182 | if ( hidden ) folderView->show(); |
165 | folderView->setColumnWidth( 0, folderView->visibleWidth() ); | 183 | folderView->setColumnWidth( 0, folderView->visibleWidth() ); |
diff --git a/noncore/net/mail/mainwindow.h b/noncore/net/mail/mainwindow.h index 8d004c6..8cec888 100644 --- a/noncore/net/mail/mainwindow.h +++ b/noncore/net/mail/mainwindow.h | |||
@@ -6,51 +6,55 @@ | |||
6 | #include <qaction.h> | 6 | #include <qaction.h> |
7 | 7 | ||
8 | #include <qtoolbar.h> | 8 | #include <qtoolbar.h> |
9 | #include <qmenubar.h> | 9 | #include <qmenubar.h> |
10 | 10 | ||
11 | #include "accountview.h" | 11 | #include "accountview.h" |
12 | #include "statuswidget.h" | 12 | #include "statuswidget.h" |
13 | 13 | ||
14 | #include <libmailwrapper/mailtypes.h> | 14 | #include <libmailwrapper/mailtypes.h> |
15 | #include <opie2/osmartpointer.h> | 15 | #include <opie2/osmartpointer.h> |
16 | 16 | ||
17 | class RecMail; | 17 | class RecMail; |
18 | class QCopChannel; | ||
18 | 19 | ||
19 | class MainWindow : public QMainWindow | 20 | class MainWindow : public QMainWindow |
20 | { | 21 | { |
21 | Q_OBJECT | 22 | Q_OBJECT |
22 | 23 | ||
23 | public: | 24 | public: |
24 | MainWindow( QWidget *parent = 0, const char *name = 0, WFlags flags = 0 ); | 25 | MainWindow( QWidget *parent = 0, const char *name = 0, WFlags flags = 0 ); |
25 | virtual ~MainWindow(); | 26 | virtual ~MainWindow(); |
26 | 27 | ||
27 | public slots: | 28 | public slots: |
28 | virtual void slotAdjustColumns(); | 29 | virtual void slotAdjustColumns(); |
29 | virtual void appMessage(const QCString &msg, const QByteArray &data); | 30 | virtual void appMessage(const QCString &msg, const QByteArray &data); |
30 | virtual void slotComposeMail(); | 31 | virtual void slotComposeMail(); |
32 | virtual void systemMessage( const QCString&, const QByteArray& ); | ||
31 | 33 | ||
32 | protected slots: | 34 | protected slots: |
33 | virtual void slotSendQueued(); | 35 | virtual void slotSendQueued(); |
34 | virtual void slotEditAccounts(); | 36 | virtual void slotEditAccounts(); |
35 | virtual void slotShowFolders( bool show ); | 37 | virtual void slotShowFolders( bool show ); |
36 | virtual void refreshMailView(const QValueList<RecMailP>&); | 38 | virtual void refreshMailView(const QValueList<RecMailP>&); |
37 | virtual void displayMail(); | 39 | virtual void displayMail(); |
38 | virtual void slotDeleteMail(); | 40 | virtual void slotDeleteMail(); |
39 | virtual void mailHold(int, QListViewItem *,const QPoint&,int); | 41 | virtual void mailHold(int, QListViewItem *,const QPoint&,int); |
40 | virtual void slotAdjustLayout(); | 42 | virtual void slotAdjustLayout(); |
41 | virtual void slotEditSettings(); | 43 | virtual void slotEditSettings(); |
42 | virtual void mailLeftClicked( int, QListViewItem *,const QPoint&,int ); | 44 | virtual void mailLeftClicked( int, QListViewItem *,const QPoint&,int ); |
43 | 45 | ||
44 | protected: | 46 | protected: |
45 | QToolBar *toolBar; | 47 | QToolBar *toolBar; |
46 | StatusWidget *statusWidget; | 48 | StatusWidget *statusWidget; |
47 | QMenuBar *menuBar; | 49 | QMenuBar *menuBar; |
48 | QPopupMenu *mailMenu, *settingsMenu; | 50 | QPopupMenu *mailMenu, *settingsMenu; |
49 | QAction *composeMail, *sendQueued, *showFolders, *searchMails, *deleteMails, | 51 | QAction *composeMail, *sendQueued, *showFolders, *searchMails, *deleteMails, |
50 | *editSettings, *editAccounts, *syncFolders; | 52 | *editSettings, *editAccounts, *syncFolders; |
51 | AccountView *folderView; | 53 | AccountView *folderView; |
52 | QListView *mailView; | 54 | QListView *mailView; |
53 | QBoxLayout *layout; | 55 | QBoxLayout *layout; |
56 | int m_Rotate; | ||
57 | QCopChannel* m_sysChannel; | ||
54 | }; | 58 | }; |
55 | 59 | ||
56 | #endif | 60 | #endif |