code change by tim: ask the user to confirm the remapping of the ESC key

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
@@ -2969,385 +2969,390 @@ void QTReaderApp::focusInEvent(QFocusEvent *)
       showEditTools();
       reader->bDoUpdates = true;
       reader->update();
       m_usenewfullscreen = true;
     }
 }
 
 void QTReaderApp::resizeEvent(QResizeEvent *)
 {
   if (m_usenewfullscreen && m_fullscreen && (editorStack->visibleWidget() == reader))
     {
       m_usenewfullscreen = false;
       reader->bDoUpdates = false;
       showEditTools();
       reader->bDoUpdates = true;
       reader->update();
       m_usenewfullscreen = true;
     }
 }
 #endif
 
 void QTReaderApp::showEditTools()
 {
 //    if ( !doc )
 //	close();
     if (m_fullscreen)
     {
 #if defined(USEQPE)
 	if (menubar != NULL) menubar->hide();
 #endif
 	if (fileBar != NULL) fileBar->hide();
 	if (viewBar != NULL) viewBar->hide();
 	if (navBar != NULL) navBar->hide();
 	if (markBar != NULL) markBar->hide();
 	if (m_prog != NULL) 
 	  {
 	    //	    qDebug("Hiding status");
 	    m_prog->hide();
 	  }
 	searchBar->hide();
 	regBar->hide();
 #ifdef USEQPE
 	Global::hideInputMethod();
 #endif
 	if (m_scrollbar != NULL) m_scrollbar->hide();
 	m_fontBar->hide();
 //	showNormal();
 	showFullScreen();
   }
     else
     {
 //	qDebug("him");
 #ifdef USEQPE
 	Global::hideInputMethod();
 #endif
 //	qDebug("eb");
 	if (m_scrollbar != NULL)
 	  {
 	    if (m_scrollishidden)
 	      {
 		m_scrollbar->hide();
 	      }
 	    else
 	      {
 		m_scrollbar->show();
 	      }
 	  }
 	if (!m_hidebars)
 	  {
 #if defined(USEQPE)
 	    menubar->show();
 #endif
 	    if (fileBar != NULL) fileBar->show();
 	    if (viewBar != NULL) viewBar->show();
 	    if (navBar != NULL) navBar->show();
 	    if (markBar != NULL) markBar->show();
 	    if (m_prog != NULL && !m_statusishidden) 
 	      {
 		//		qDebug("Showing status");
 		m_prog->show();
 		//		qDebug("Shown status");
 	      }
 	    //	    qDebug("Showing mb");
 	    mb->show();
 	  }
 	if ( searchVisible )
 	{
 #ifdef USEQPE
 	    Global::showInputMethod();
 #endif
 		searchBar->show();
 	}
 	if ( regVisible )
 	{
 #ifdef USEQPE
 	    Global::showInputMethod();
 #endif
 		regBar->show();
 	}
 	if (m_fontVisible) m_fontBar->show();
 //	qDebug("sn");
 	showNormal();
 //	qDebug("sm");
 #if defined(USEQPE) && !defined(SIMPAD) 
 	showMaximized();
 #endif
 //	setCentralWidget(reader);
     }
 
     //    qDebug("uc");
     updateCaption();
     //    qDebug("rw");
     editorStack->raiseWidget( reader );
     //    qDebug("sf");
     reader->setFocus();
     //    qDebug("ref");
     //reader->refresh(true);
     //    qDebug("done");
 }
 /*
 void QTReaderApp::save()
 {
     if ( !doc )
 	return;
     if ( !editor->edited() )
 	return;
 
     QString rt = editor->text();
     QString pt = rt;
 
     if ( doc->name().isEmpty() ) {
 	unsigned ispace = pt.find( ' ' );
 	unsigned ienter = pt.find( '\n' );
 	int i = (ispace < ienter) ? ispace : ienter;
 	QString docname;
 	if ( i == -1 ) {
 	    if ( pt.isEmpty() )
 		docname = "Empty Text";
 	    else
 		docname = pt;
 	} else {
 	    docname = pt.left( i );
 	}
 	doc->setName(docname);
     }
     FileManager fm;
     fm.saveFile( *doc, rt );
 }
 */
 
 void QTReaderApp::clear()
 {
 //    if (doc != 0)
 //      {
 //  QMessageBox::information(this, PROGNAME, "Deleting doc", 1);
 //	delete doc;
 //  QMessageBox::information(this, PROGNAME, "Deleted doc", 1);
 //	doc = 0;
     //     }
     reader->clear();
 }
 
 void QTReaderApp::updateCaption()
 {
 //    if ( !doc )
 //	setCaption( tr("QTReader") );
 //    else {
 //	QString s = doc->name();
 //	if ( s.isEmpty() )
 //	    s = tr( "Unnamed" );
 	setCaption( reader->m_string + " - " + tr(SHORTPROGNAME) );
 //    }
 }
 
 void QTReaderApp::setDocument(const QString& fileref)
 {
 //QMessageBox::information(0, "setDocument", fileref);
     openFile(fileref);
 //    showEditTools();
 }
 
 void QTReaderApp::closeEvent( QCloseEvent *e )
 {
 //    qDebug("Close event");
     if (m_fullscreen)
     {
 	m_fullscreen = false;
 	showEditTools();
 	e->ignore();
     }
     else if (editorStack->visibleWidget() == m_buttonprefs)
       {
-	m_buttonprefs->mapkey(Qt::NoButton, Key_Escape);
+	int ret = QMessageBox::warning(this, PROGNAME,
+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);
+	if (ret == 0)
+	  {
+	    m_buttonprefs->mapkey(Qt::NoButton, Key_Escape);
+	  }
 	e->ignore();
       }
     else if (m_dontSave)
     {
 	e->accept();
     }
     else
     {
 	if (editorStack->visibleWidget() == reader)
 	{
 	    if ((kmap.find(orKey(Qt::NoButton,Key_Escape,false)) != kmap.end()) && m_bcloseDisabled)
 	    {
 //	qDebug("Close disabled");
 		m_bcloseDisabled = false;
 		e->ignore();
 	    }
 	    else
 	    {
 		if (m_fontVisible)
 		{
 		    m_fontBar->hide();
 		    m_fontVisible = false;
 		    e->ignore();
 		    return;
 		}
 		if (regVisible)
 		{
 		    regBar->hide();
 #ifdef USEQPE
 		    Global::hideInputMethod();
 #endif
 		    regVisible = false;
 		    e->ignore();
 		    return;
 		}
 		if (searchVisible)
 		{
 		    searchBar->hide();
 #ifdef USEQPE
 		    Global::hideInputMethod();
 #endif
 		    searchVisible = false;
 		    e->ignore();
 		    return;
 		}
 		if (m_fBkmksChanged && pBkmklist != NULL)
 		{
 		    if (QMessageBox::warning(this, PROGNAME, "Save bookmarks?", "Save", "Don't bother") == 0)
 			savebkmks();
 		    delete pBkmklist;
 		    reader->pBkmklist = pBkmklist = NULL;
 		    m_fBkmksChanged = false;
 		}
 		updatefileinfo();
 		saveprefs();
 		e->accept();
 	    }
 	}
 	else
 	{
 	    showEditTools();
 	    m_disableesckey = true;
 	}
     }
 }
 
 void QTReaderApp::do_gotomark()
 {
     m_nBkmkAction = cGotoBkmk;
     if (!listbkmk(pBkmklist))
 	QMessageBox::information(this, PROGNAME, "No bookmarks in memory");
 }
 
 void QTReaderApp::do_delmark()
 {
     m_nBkmkAction = cDelBkmk;
     if (!listbkmk(pBkmklist))
 	QMessageBox::information(this, PROGNAME, "No bookmarks in memory");
 }
 
 bool QTReaderApp::listbkmk(CList<Bkmk>* plist, const QString& _lab, bool presel)
 {
     bkmkselector->clear();
     if (_lab.isEmpty())
 	bkmkselector->setText("Cancel");
     else
 	bkmkselector->setText(_lab);
     int cnt = 0;
     int slt = -1;
     if (plist != NULL)
       {
 	for (CList<Bkmk>::iterator i = plist->begin(); i != plist->end(); i++)
 	  {
 	    if (presel)
 	      {
 		Bkmk* p = i.pContent();
 		if (toQString(CFiledata(p->anno()).name()) == reader->m_lastfile)
 		  {
 		    slt = cnt;
 		  }
 	      }
 #ifdef _UNICODE
 //	      qDebug("Item:%s", (const char*)toQString(i->name()));
 	    bkmkselector->insertItem(toQString(i->name()), cnt++);
 #else
 	    bkmkselector->insertItem(i->name(), cnt++);
 #endif
 
 	  }
       }
     if (cnt > 0)
       {
 	  hidetoolbars();
         editorStack->raiseWidget( bkmkselector );
 	if (slt != -1) bkmkselector->setCurrentItem(slt);
 	return true;
       }
     else
 	return false;
 }
 
 void QTReaderApp::do_autogen()
 {
   m_nRegAction = cAutoGen;
   regEdit->setText(m_autogenstr);
   do_regedit();
 }
 
 void QTReaderApp::do_regedit()
 {
 //    fileBar->hide();
     reader->bDoUpdates = false;
 //    qDebug("Showing regbar");
   regBar->show();
 //    qDebug("Showing kbd");
 #ifdef USEQPE
   Global::showInputMethod();
 #endif
   regVisible = true;
   regEdit->setFocus();
 //  qApp->processEvents();
     reader->bDoUpdates = true;
     reader->update();
 }
 
 bool QTReaderApp::openfrombkmk(Bkmk* bk)
 {
     QString fn = toQString(
 	CFiledata(bk->anno()).name()
 	);
 //	qDebug("fileinfo");
     if (!fn.isEmpty() && QFileInfo(fn).isFile())
     {
 //	qDebug("Opening");
 	struct stat fnstat;
 	stat((const char *)fn, &fnstat);
 	
 	if (CFiledata(bk->anno()).date()
 	    != fnstat.st_mtime)
 	{
 	    CFiledata fd(bk->anno());
 	    fd.setdate(fnstat.st_mtime);
 	    bk->value(0);
 	    reader->m_lastposn = 0;
 	    openFile(fn);
 	}
 	else
 	{
 	    unsigned short svlen = bk->filedatalen();
 	    unsigned char* svdata = bk->filedata();
 	    openFile(fn, bk->value());
 	    reader->putSaveData(svdata, svlen);
 //	    setstate(svdata, svlen);
 	    if (svlen != 0)
 	    {
 		QMessageBox::warning(this, PROGNAME, "Not all file data used\nNew version?");
 	    }
 //	    qDebug("updating");
 //	    showEditTools();
 	}
 	return true;
     }
     else
     {
 	return false;
     }
 }
 
 void QTReaderApp::gotobkmk(int ind)
 {
   qDebug("gbkmk");
     showEditTools();