author | pohly <pohly> | 2005-05-08 16:13:24 (UTC) |
---|---|---|
committer | pohly <pohly> | 2005-05-08 16:13:24 (UTC) |
commit | ea889d21f3b5bf846ff20a6fad9a756108a28ad7 (patch) (unidiff) | |
tree | 3d0462ccf147fb95886657d8bb610caa168e01ea | |
parent | 2ccb0ad8b77eb3c62914f5df5b1bba3becb83617 (diff) | |
download | opie-ea889d21f3b5bf846ff20a6fad9a756108a28ad7.zip opie-ea889d21f3b5bf846ff20a6fad9a756108a28ad7.tar.gz opie-ea889d21f3b5bf846ff20a6fad9a756108a28ad7.tar.bz2 |
code change by tim: ask the user to confirm the remapping of the ESC key
-rw-r--r-- | noncore/apps/opie-reader/QTReaderApp.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/noncore/apps/opie-reader/QTReaderApp.cpp b/noncore/apps/opie-reader/QTReaderApp.cpp index 6753698..8ef0674 100644 --- a/noncore/apps/opie-reader/QTReaderApp.cpp +++ b/noncore/apps/opie-reader/QTReaderApp.cpp | |||
@@ -3137,49 +3137,54 @@ void QTReaderApp::updateCaption() | |||
3137 | //if ( s.isEmpty() ) | 3137 | //if ( s.isEmpty() ) |
3138 | // s = tr( "Unnamed" ); | 3138 | // s = tr( "Unnamed" ); |
3139 | setCaption( reader->m_string + " - " + tr(SHORTPROGNAME) ); | 3139 | setCaption( reader->m_string + " - " + tr(SHORTPROGNAME) ); |
3140 | // } | 3140 | // } |
3141 | } | 3141 | } |
3142 | 3142 | ||
3143 | void QTReaderApp::setDocument(const QString& fileref) | 3143 | void QTReaderApp::setDocument(const QString& fileref) |
3144 | { | 3144 | { |
3145 | //QMessageBox::information(0, "setDocument", fileref); | 3145 | //QMessageBox::information(0, "setDocument", fileref); |
3146 | openFile(fileref); | 3146 | openFile(fileref); |
3147 | // showEditTools(); | 3147 | // showEditTools(); |
3148 | } | 3148 | } |
3149 | 3149 | ||
3150 | void QTReaderApp::closeEvent( QCloseEvent *e ) | 3150 | void QTReaderApp::closeEvent( QCloseEvent *e ) |
3151 | { | 3151 | { |
3152 | // qDebug("Close event"); | 3152 | // qDebug("Close event"); |
3153 | if (m_fullscreen) | 3153 | if (m_fullscreen) |
3154 | { | 3154 | { |
3155 | m_fullscreen = false; | 3155 | m_fullscreen = false; |
3156 | showEditTools(); | 3156 | showEditTools(); |
3157 | e->ignore(); | 3157 | e->ignore(); |
3158 | } | 3158 | } |
3159 | else if (editorStack->visibleWidget() == m_buttonprefs) | 3159 | else if (editorStack->visibleWidget() == m_buttonprefs) |
3160 | { | 3160 | { |
3161 | m_buttonprefs->mapkey(Qt::NoButton, Key_Escape); | 3161 | int ret = QMessageBox::warning(this, PROGNAME, |
3162 | tr("Do you wish to map this key?\n\nIf you proceed you will map\nthe escape key and you will\nneed to press the close box\ntwice to exit this program\n\nContinue?"), tr("Yes"), tr("No"), QString::null, 0, 1); | ||
3163 | if (ret == 0) | ||
3164 | { | ||
3165 | m_buttonprefs->mapkey(Qt::NoButton, Key_Escape); | ||
3166 | } | ||
3162 | e->ignore(); | 3167 | e->ignore(); |
3163 | } | 3168 | } |
3164 | else if (m_dontSave) | 3169 | else if (m_dontSave) |
3165 | { | 3170 | { |
3166 | e->accept(); | 3171 | e->accept(); |
3167 | } | 3172 | } |
3168 | else | 3173 | else |
3169 | { | 3174 | { |
3170 | if (editorStack->visibleWidget() == reader) | 3175 | if (editorStack->visibleWidget() == reader) |
3171 | { | 3176 | { |
3172 | if ((kmap.find(orKey(Qt::NoButton,Key_Escape,false)) != kmap.end()) && m_bcloseDisabled) | 3177 | if ((kmap.find(orKey(Qt::NoButton,Key_Escape,false)) != kmap.end()) && m_bcloseDisabled) |
3173 | { | 3178 | { |
3174 | //qDebug("Close disabled"); | 3179 | //qDebug("Close disabled"); |
3175 | m_bcloseDisabled = false; | 3180 | m_bcloseDisabled = false; |
3176 | e->ignore(); | 3181 | e->ignore(); |
3177 | } | 3182 | } |
3178 | else | 3183 | else |
3179 | { | 3184 | { |
3180 | if (m_fontVisible) | 3185 | if (m_fontVisible) |
3181 | { | 3186 | { |
3182 | m_fontBar->hide(); | 3187 | m_fontBar->hide(); |
3183 | m_fontVisible = false; | 3188 | m_fontVisible = false; |
3184 | e->ignore(); | 3189 | e->ignore(); |
3185 | return; | 3190 | return; |