summaryrefslogtreecommitdiff
authoreilers <eilers>2002-10-22 12:34:54 (UTC)
committer eilers <eilers>2002-10-22 12:34:54 (UTC)
commit78152b3adbe3ae4626c8f53e3edd0babcaf6fb72 (patch) (side-by-side diff)
tree89b0b4ffea2fa1efd4eb7dc50545661d3ceeb65d
parent486280adc2ab5dc383a56d8516c36727eb382812 (diff)
downloadopie-78152b3adbe3ae4626c8f53e3edd0babcaf6fb72.zip
opie-78152b3adbe3ae4626c8f53e3edd0babcaf6fb72.tar.gz
opie-78152b3adbe3ae4626c8f53e3edd0babcaf6fb72.tar.bz2
Find bugfix. Tried to make the letterpicker more visible due to
undelign does not work on my Z.. :( Added use of alternative mail-application (opie-mail instead of QT-Mail)
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/pim/addressbook/TODO7
-rw-r--r--core/pim/addressbook/abtable.cpp76
-rw-r--r--core/pim/addressbook/addressbook.cpp47
-rw-r--r--core/pim/addressbook/addressbook.h3
-rw-r--r--core/pim/addressbook/configdlg.cpp16
-rw-r--r--core/pim/addressbook/configdlg.h4
-rw-r--r--core/pim/addressbook/configdlg_base.ui105
-rw-r--r--core/pim/addressbook/opie-addressbook.control2
-rw-r--r--core/pim/addressbook/picker.cpp12
9 files changed, 227 insertions, 45 deletions
diff --git a/core/pim/addressbook/TODO b/core/pim/addressbook/TODO
index 796dc49..80ec2d9 100644
--- a/core/pim/addressbook/TODO
+++ b/core/pim/addressbook/TODO
@@ -2,2 +2,4 @@ Stuff todo until OPIE 1.0 :
+Pending bugfixes from previous work:
+
Urgent:
@@ -8,2 +10,3 @@ Important:
+- Overview window cleanup needed..
- Cursor keys should work in detail-view (ablabel)
@@ -11,4 +14,2 @@ Important:
- Store last settings of combo-boxes
-- Mail-Icon is missing
-- Overview window cleanup needed..
- Finishing of new View functions (List, Phonebook...)
@@ -36 +37,3 @@ Fixed:
- Advanced handling of cursor keys (search..)
+- Mail-Icon is missing
+- Use opie-mail insted of qt-mail if possible.
diff --git a/core/pim/addressbook/abtable.cpp b/core/pim/addressbook/abtable.cpp
index 97b26db..4feadeb 100644
--- a/core/pim/addressbook/abtable.cpp
+++ b/core/pim/addressbook/abtable.cpp
@@ -688,37 +688,49 @@ void AbTable::slotDoFind( const QString &findString, bool caseSensitive, bool us
static bool wrapAround = true;
+ bool try_again = false;
- if ( !backwards ) {
- for ( row = currFindRow + 1; row < rows; row++ ) {
- ati = static_cast<AbTableItem*>( item(row, 0) );
- if ( contactCompare( contactList[ati], r, category ) )
- break;
+ // We will loop until we found an entry or found nothing.
+ do {
+ if ( !backwards ) {
+ for ( row = currFindRow + 1; row < rows; row++ ) {
+ ati = static_cast<AbTableItem*>( item(row, 0) );
+ if ( contactCompare( contactList[ati], r, category ) ){
+ try_again = false;
+ break;
+ }
+ }
+ } else {
+ for ( row = currFindRow - 1; row > -1; row-- ) {
+ ati = static_cast<AbTableItem*>( item(row, 0) );
+ if ( contactCompare( contactList[ati], r, category ) ){
+ try_again = false;
+ break;
+ }
+ }
}
- } else {
- for ( row = currFindRow - 1; row > -1; row-- ) {
- ati = static_cast<AbTableItem*>( item(row, 0) );
- if ( contactCompare( contactList[ati], r, category ) )
- break;
+ if ( row >= rows || row < 0 ) {
+ if ( row < 0 )
+ currFindRow = rows;
+ else
+ currFindRow = -1;
+
+ if ( wrapAround ){
+ emit signalWrapAround();
+ try_again = true;
+ }else{
+ emit signalNotFound();
+ try_again = false;
+ }
+
+ wrapAround = !wrapAround;
+ } else {
+ currFindRow = row;
+ QTableSelection foundSelection;
+ foundSelection.init( currFindRow, 0 );
+ foundSelection.expandTo( currFindRow, numCols() - 1 );
+ addSelection( foundSelection );
+ setCurrentCell( currFindRow, 0 /* numCols() - 1 */ );
+ wrapAround = true;
+ try_again = false;
}
- }
- if ( row >= rows || row < 0 ) {
- if ( row < 0 )
- currFindRow = rows;
- else
- currFindRow = -1;
-
- if ( wrapAround )
- emit signalWrapAround();
- else
- emit signalNotFound();
-
- wrapAround = !wrapAround;
- } else {
- currFindRow = row;
- QTableSelection foundSelection;
- foundSelection.init( currFindRow, 0 );
- foundSelection.expandTo( currFindRow, numCols() - 1 );
- addSelection( foundSelection );
- setCurrentCell( currFindRow, 0 /* numCols() - 1 */ );
- wrapAround = true;
- }
+ } while ( try_again );
}
diff --git a/core/pim/addressbook/addressbook.cpp b/core/pim/addressbook/addressbook.cpp
index 3466801..39d8321 100644
--- a/core/pim/addressbook/addressbook.cpp
+++ b/core/pim/addressbook/addressbook.cpp
@@ -82,2 +82,4 @@ AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name,
caseSensitive(false),
+ m_useQtMail(true),
+ m_useOpieMail(false),
bAbEditFirstTime(TRUE),
@@ -93,2 +95,6 @@ AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name,
doNotifyWrapAround = cfg.readBoolEntry( "doNotifyWrapAround" );
+ cfg.setGroup("Mail");
+ m_useQtMail = cfg.readBoolEntry( "useQtMail" );
+ m_useOpieMail=cfg.readBoolEntry( "useOpieMail" );
+
@@ -171,3 +177,3 @@ AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name,
- a = new QAction( tr( "Write Mail To" ), Resource::loadPixmap( "qtmail/reply" ),
+ a = new QAction( tr( "Write Mail To" ), Resource::loadPixmap( "mail/sendmail" ),
QString::null, 0, this, 0 );
@@ -284,2 +290,4 @@ void AddressbookWindow::slotConfig()
dlg -> setSignalWrapAround( doNotifyWrapAround );
+ dlg -> setQtMail ( m_useQtMail );
+ dlg -> setOpieMail ( m_useOpieMail );
dlg -> showMaximized();
@@ -290,2 +298,4 @@ void AddressbookWindow::slotConfig()
doNotifyWrapAround = dlg -> signalWrapAround();
+ m_useQtMail = dlg -> useQtMail();
+ m_useOpieMail= dlg -> useOpieMail();
}
@@ -382,2 +392,5 @@ AddressbookWindow::~AddressbookWindow()
cfg.writeEntry("doNotifyWrapAround", doNotifyWrapAround);
+ cfg.setGroup("Mail");
+ cfg.writeEntry( "useQtMail", m_useQtMail );
+ cfg.writeEntry( "useOpieMail", m_useOpieMail);
}
@@ -496,4 +509,32 @@ void AddressbookWindow::writeMail()
QString email = c.defaultEmail();
- QCopEnvelope e("QPE/Application/qtmail", "writeMail(QString,QString)");
- e << name << email;
+
+ // I prefer the OPIE-Environment variable before the
+ // QPE-one..
+ QString basepath = QString::fromLatin1( getenv("OPIEDIR") );
+ if ( basepath.isEmpty() )
+ basepath = QString::fromLatin1( getenv("QPEDIR") );
+
+ // Try to access the preferred. If not possible, try to
+ // switch to the other one..
+ if ( m_useQtMail ){
+ qWarning ("Accessing: %s", (basepath + "/bin/qtmail").latin1());
+ if ( QFile::exists( basepath + "/bin/qtmail" ) ){
+ qWarning ("QCop");
+ QCopEnvelope e("QPE/Application/qtmail", "writeMail(QString,QString)");
+ e << name << email;
+ return;
+ } else
+ m_useOpieMail = true;
+ }
+ if ( m_useOpieMail ){
+ qWarning ("Accessing: %s", (basepath + "/bin/mail").latin1());
+ if ( QFile::exists( basepath + "/bin/mail" ) ){
+ qWarning ("QCop");
+ QCopEnvelope e("QPE/Application/mail", "writeMail(QString,QString)");
+ e << name << email;
+ return;
+ } else
+ m_useQtMail = true;
+ }
+
}
diff --git a/core/pim/addressbook/addressbook.h b/core/pim/addressbook/addressbook.h
index 299ed70..8027ccf 100644
--- a/core/pim/addressbook/addressbook.h
+++ b/core/pim/addressbook/addressbook.h
@@ -120,2 +120,5 @@ private:
+ bool m_useQtMail;
+ bool m_useOpieMail;
+
QAction *actionNew, *actionEdit, *actionTrash, *actionFind, *actionBeam, *actionPersonal, *actionMail;
diff --git a/core/pim/addressbook/configdlg.cpp b/core/pim/addressbook/configdlg.cpp
index b7c3b77..c0195d1 100644
--- a/core/pim/addressbook/configdlg.cpp
+++ b/core/pim/addressbook/configdlg.cpp
@@ -17,2 +17,10 @@ bool ConfigDlg::useWildCards() const
}
+bool ConfigDlg::useQtMail() const
+{
+ return m_useQtMail->isOn();
+}
+bool ConfigDlg::useOpieMail() const
+{
+ return m_useOpieMail->isOn();
+}
bool ConfigDlg::beCaseSensitive() const
@@ -41,2 +49,10 @@ void ConfigDlg::setSignalWrapAround( bool v )
}
+void ConfigDlg::setQtMail( bool v )
+{
+ m_useQtMail->setChecked( v );
+}
+void ConfigDlg::setOpieMail( bool v )
+{
+ m_useOpieMail->setChecked( v );
+}
diff --git a/core/pim/addressbook/configdlg.h b/core/pim/addressbook/configdlg.h
index 8be469b..34e9718 100644
--- a/core/pim/addressbook/configdlg.h
+++ b/core/pim/addressbook/configdlg.h
@@ -16,2 +16,4 @@ public:
bool signalWrapAround() const;
+ bool useQtMail() const;
+ bool useOpieMail() const;
@@ -21,2 +23,4 @@ public:
void setSignalWrapAround( bool v );
+ void setQtMail( bool v );
+ void setOpieMail( bool v );
};
diff --git a/core/pim/addressbook/configdlg_base.ui b/core/pim/addressbook/configdlg_base.ui
index e082702..d3ea12e 100644
--- a/core/pim/addressbook/configdlg_base.ui
+++ b/core/pim/addressbook/configdlg_base.ui
@@ -14,3 +14,3 @@
<y>0</y>
- <width>227</width>
+ <width>217</width>
<height>287</height>
@@ -155,2 +155,105 @@
</widget>
+ <widget>
+ <class>QWidget</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>tab</cstring>
+ </property>
+ <attribute>
+ <name>title</name>
+ <string>Mail</string>
+ </attribute>
+ <vbox>
+ <property stdset="1">
+ <name>margin</name>
+ <number>5</number>
+ </property>
+ <property stdset="1">
+ <name>spacing</name>
+ <number>6</number>
+ </property>
+ <widget>
+ <class>QButtonGroup</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>ButtonGroup2</cstring>
+ </property>
+ <property stdset="1">
+ <name>title</name>
+ <string>Mail</string>
+ </property>
+ <vbox>
+ <property stdset="1">
+ <name>margin</name>
+ <number>11</number>
+ </property>
+ <property stdset="1">
+ <name>spacing</name>
+ <number>6</number>
+ </property>
+ <widget>
+ <class>QRadioButton</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>m_useQtMail</cstring>
+ </property>
+ <property stdset="1">
+ <name>text</name>
+ <string>Prefer QT-Mail </string>
+ </property>
+ <property stdset="1">
+ <name>checked</name>
+ <bool>true</bool>
+ </property>
+ </widget>
+ <widget>
+ <class>QRadioButton</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>m_useOpieMail</cstring>
+ </property>
+ <property stdset="1">
+ <name>text</name>
+ <string>Prefer Opie-Mail</string>
+ </property>
+ </widget>
+ <widget>
+ <class>QLabel</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>TextLabel1</cstring>
+ </property>
+ <property stdset="1">
+ <name>text</name>
+ <string>Notice: QT-Mail is just
+provided in the SHARP
+default ROM. Opie-Mail
+is provided free !</string>
+ </property>
+ </widget>
+ </vbox>
+ </widget>
+ <spacer>
+ <property>
+ <name>name</name>
+ <cstring>Spacer2</cstring>
+ </property>
+ <property stdset="1">
+ <name>orientation</name>
+ <enum>Vertical</enum>
+ </property>
+ <property stdset="1">
+ <name>sizeType</name>
+ <enum>Expanding</enum>
+ </property>
+ <property>
+ <name>sizeHint</name>
+ <size>
+ <width>20</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </vbox>
+ </widget>
</widget>
diff --git a/core/pim/addressbook/opie-addressbook.control b/core/pim/addressbook/opie-addressbook.control
index 14b0770..0a04ee6 100644
--- a/core/pim/addressbook/opie-addressbook.control
+++ b/core/pim/addressbook/opie-addressbook.control
@@ -3,3 +3,3 @@ Priority: optional
Section: opie/applications
-Maintainer: Warwick Allison <warwick@trolltech.com>
+Maintainer: Stefan Eilers <eilers.stefan@epost.de>
Architecture: arm
diff --git a/core/pim/addressbook/picker.cpp b/core/pim/addressbook/picker.cpp
index 7f4acb0..2c7dd71 100644
--- a/core/pim/addressbook/picker.cpp
+++ b/core/pim/addressbook/picker.cpp
@@ -95,5 +95,5 @@ void PickerLabel::mouseReleaseEvent( QMouseEvent* /* e */ )
case 0:
- tmpStr = "<qt><u><font color=\"#7F0000\">";
+ tmpStr = "<qt><u><b><font color=\"#FF00FF\">";
tmpStr += letter1;
- tmpStr += "</font></u>";
+ tmpStr += "</font></b></u>";
tmpStr += letter2;
@@ -112,5 +112,5 @@ void PickerLabel::mouseReleaseEvent( QMouseEvent* /* e */ )
tmpStr += letter1;
- tmpStr += "<u><font color=\"#7F0000\">";
+ tmpStr += "<u><b><font color=\"#FF00FF\">";
tmpStr += letter2;
- tmpStr += "</font></u>";
+ tmpStr += "</font></b></u>";
tmpStr += letter3;
@@ -129,5 +129,5 @@ void PickerLabel::mouseReleaseEvent( QMouseEvent* /* e */ )
tmpStr += letter2;
- tmpStr += "<u><font color=\"#7F0000\">";
+ tmpStr += "<u><b><font color=\"#FF00FF\">";
tmpStr += letter3;
- tmpStr += "</font></u></qt>";
+ tmpStr += "</font></b></u></qt>";