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

1 files changed, 5 insertions, 0 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
@@ -2777,769 +2777,774 @@ void QTReaderApp::search(const QString & arg)
   CBuffer test;
   size_t start = reader->pagelocate();
   bool haspopped = false;
   while (arg.left(ss->s.length()) != ss->s)
   {
       haspopped = true;
       start = ss->pos;
 //      reader->locate(start);
       searchStack->pop();
       delete ss;
   }
   if (haspopped) reader->locate(start);
 /*
   if (arg.length() < ss->len)
     {
       start = ss->pos;
       reader->locate(start);
       searchStack->pop();
       delete ss;
     }
 */
   else
     {
       start = reader->pagelocate();
       reader->jumpto(start);
       searchStack->push(new searchrecord(arg,start));
     }
     dosearch(start, test, arg);
 }
 #else
 void QTReaderApp::search()
 {
     findNext();
 }
 #endif
 
 void QTReaderApp::openFile( const QString &f, unsigned int loc )
 {
 //    qDebug("File:%s", (const char*)f);
 //    openFile(DocLnk(f));
 //}
 //
 //void QTReaderApp::openFile( const DocLnk &f )
 //{
   clear();
   QFileInfo fm(f);
   if ( fm.exists() )
     {
 //      QMessageBox::information(0, "Progress", "Calling fileNew()");
 #ifdef USEQPE
 	if (fm.extension( FALSE ) == "desktop")
 	{
 	    DocLnk d(f);
 	    QFileInfo fnew(d.file());
 	    fm = fnew;
 	    if (!fm.exists()) return;
 	}
 #endif
       clear();
       reader->setText(fm.baseName(), fm.absFilePath(), loc);
       m_loadedconfig = readconfig(APPDIR "/configs", reader->m_string, false);
       qDebug("Showing tools");
       showEditTools();
       qDebug("Shown tools");
       readbkmks();
       qDebug("read markss");
       m_savedpos = 0xffffffff;
     }
   else
     {
       QString msg = f;
        msg += "\nFile does not exist";
       QMessageBox::information(this, PROGNAME, msg);
       reader->m_lastfile = QString::null;
     }
 	
 }
 /*
 void QTReaderApp::resizeEvent(QResizeEvent* e)
 {
     if (m_fullscreen)
     {
 	showNormal();
 	showFullScreen();
     }
 }
 */
 void QTReaderApp::handlekey(QKeyEvent* e)
 {
 //    qDebug("Keypress event");
     timeb now;
     ftime(&now);
     unsigned long etime = (1000*(now.time - m_lastkeytime.time) + now.millitm)-m_lastkeytime.millitm;
     if (etime < m_debounce)
     {
 	return;
     }
     switch(e->key())
     {
 	case Key_Escape:
 	    qDebug("escape event");
 	    if (m_disableesckey)
 	    {
 		m_disableesckey = false;
 	    }
 	    else
 	    {
 		m_bcloseDisabled = true;
 		if (m_fullscreen)
 		{
 		    m_actFullscreen->setOn(false);
 		    e->accept();
 		}
 		else
 		{
 //		qDebug("escape action");
 		    doAction(e);
 		}
 	    }
 	    break;
 	    /*
 	case Key_Left:
 	{
 	    if (reader->m_autoScroll)
 	    {
 		reader->reduceScroll();
 	    }
 	    else
 	    {
 		doAction(e);
 	    }
 	}
 	break;
 	case Key_Right:
 	{
 	    if (reader->m_autoScroll)
 	    {
 		reader->increaseScroll();
 	    }
 	    else
 	    {
 		doAction(e);
 	    }
 	}
 	break;
 	case Key_Up:
 	{
 	    if (reader->m_autoScroll)
 	    {
 		reader->increaseScroll();
 	    }
 	    else
 	    {
 		doAction(e);
 	    }
 	}
 	break;
 	case Key_Down:
 	{
 	    if (reader->m_autoScroll)
 	    {
 		reader->reduceScroll();
 	    }
 	    else
 	    {
 		doAction(e);
 	    }
 	}
 	break;
 	    */
 	default:
 	{
 	  doAction(e);
 	}
 	
 /*
 	QString msg("Key press was:");
 	QString key;
 	msg += key.setNum(e->key());
 	QMessageBox::information(this, PROGNAME, msg);
 */
     }
     ftime(&m_lastkeytime);
 }
 
 #if defined(USEQPE) && defined(USENEWFULLSCREEN)
 void QTReaderApp::focusInEvent(QFocusEvent *)
 {
   if (m_usenewfullscreen && m_fullscreen && (editorStack->visibleWidget() == reader))
     {
       m_usenewfullscreen = false;
       reader->bDoUpdates = false;
       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)
       {
+	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();
     switch (m_nBkmkAction)
     {
 	case cOpenFile:
 	{
 //	    qApp->processEvents();
 	    if (!openfrombkmk((*pOpenlist)[ind]))
 	    {
 		pOpenlist->erase(ind);
 		QMessageBox::information(this, PROGNAME, "Can't find file");
 	    }
 	}
 	break;
 	case cGotoBkmk:
 	    reader->buffdoc.saveposn(reader->m_lastfile, reader->pagelocate());
 	    reader->locate((*pBkmklist)[ind]->value());
 	    break;
 	case cDelBkmk:
 ////	    qDebug("Deleting:%s\n",(*pBkmklist)[ind]->name());
 	    pBkmklist->erase(ind);
 	    m_fBkmksChanged = true;
 	    reader->refresh(true);
 //	    pBkmklist->sort();
 	    break;
 	case cRmBkmkFile:
 		{
 #ifndef USEQPE
 	    QDir d = QDir::home();                      // "/"
 		d.cd(APPDIR);
 		d.remove(bkmkselector->text(ind));
 #else /* USEQPE */
 		unlink((const char *)Global::applicationFileName(APPDIR,bkmkselector->text(ind)));
 #endif /* USEQPE */
 		}
 	    break;
 	case cLdConfig:
 	    readconfig(APPDIR "/configs", bkmkselector->text(ind), false);
 	    break;
 	case cLdTheme:
 	  m_themename = bkmkselector->text(ind);
 	  readconfig(QString(APPDIR "/Themes/")+m_themename , "config", false);
 	  setBackgroundBitmap();
 	    break;
 	case cRmConfig:
 		{
 #ifndef USEQPE
 	    QDir d = QDir::home();                      // "/"
 		d.cd(APPDIR "/configs");
 		d.remove(bkmkselector->text(ind));
 #else /* USEQPE */
 		unlink((const char *)Global::applicationFileName(APPDIR "/configs",bkmkselector->text(ind)));
 #endif /* USEQPE */
 		}
 	    break;
 	case cExportLinks:
 	{
 #ifndef USEQPE
 	    QDir d = QDir::home();                      // "/"
 	    d.cd(APPDIR "/urls");
 	    QFileInfo fi(d, bkmkselector->text(ind));
 	    if (fi.exists())
 	    {
 		QString outfile( QFileDialog::getSaveFileName( QString::null, QString::null, this ) );
 		if (!outfile.isEmpty())
 		{
 		    FILE* fout = fopen((const char *)outfile, "w");
 		    if (fout != NULL)
 		    {
 			FILE* fin = fopen((const char *)fi.absFilePath(), "r");
 			if (fin != NULL)
 			{
 			    fprintf(fout, "<html><body>\n");
 			    int ch = 0;
 			    while ((ch = fgetc(fin)) != EOF)
 			    {
 				fputc(ch, fout);
 			    }
 			    fclose(fin);
 			    fprintf(fout, "</html></body>\n");
 			    d.remove(bkmkselector->text(ind));
 			}
 			fclose(fout);
 		    }
 		    else
 			QMessageBox::information(this, PROGNAME, "Couldn't open output");
 		}
 	    }
 #else /* USEQPE */
 	    FILE* fin = fopen((const char *)Global::applicationFileName(APPDIR "/urls",bkmkselector->text(ind)), "r");
 	    if (fin != NULL)
 	    {
 		bool allok = false;
 #if defined(OPIE) && defined(OPIEFILEDIALOG)
 		QString outfile = OFileDialog::getSaveFileName(OFileSelector::EXTENDED_ALL, QString::null, QString::null, MimeTypes(), 0, "OpieReader");
 		if (!outfile.isEmpty())
 		{
 		    FILE* fout = fopen((const char *)outfile, "w");
 		    if (fout != NULL)
 		    {
 			fprintf(fout, "<html><body>\n");
 			int ch = 0;
 			while ((ch = fgetc(fin)) != EOF)
 			{
 			    fputc(ch, fout);
 			}
 			fprintf(fout, "</html></body>\n");
 			fclose(fout);
 			allok = true;
 		    }
 		    else
 			QMessageBox::information(this, PROGNAME, "Couldn't open output");
 		}
 		fclose(fin);
 		if (allok) unlink((const char *)Global::applicationFileName(APPDIR "/urls",bkmkselector->text(ind)));
 #else
 		fileBrowser* fb = new fileBrowser(true, this,"OpieReader",!m_bFloatingDialog, 0, "*", QString::null);
 		if (fb->exec())
 		{
 		    QString outfile = fb->getCurrentFile();
 		    FILE* fout = fopen((const char *)outfile, "w");
 		    if (fout != NULL)
 		    {
 			fprintf(fout, "<html><body>\n");
 			int ch = 0;
 			while ((ch = fgetc(fin)) != EOF)
 			{
 			    fputc(ch, fout);
 			}
 			fprintf(fout, "</html></body>\n");
 			fclose(fout);
 			allok = true;
 		    }
 		    else
 			QMessageBox::information(this, PROGNAME, "Couldn't open output");
 		}
 		delete fb;
 		fclose(fin);
 		if (allok) unlink((const char *)Global::applicationFileName(APPDIR "/urls",bkmkselector->text(ind)));
 #endif
 	    }
 	    else
 	    {
 		QMessageBox::information(this, PROGNAME, "Couldn't open input");
 	    }
 
 /*
 	    CFileSelector *f = new CFileSelector("text/html", this, NULL, !m_bFloatingDialog, TRUE, TRUE );
 	    int ret = f->exec();
 	    qDebug("Return:%d", ret);
 	    DocLnk* doc = f->getDoc();
 	    if (doc != NULL)
 	    {
 		FILE* fin = fopen((const char *)Global::applicationFileName(APPDIR "/urls",bkmkselector->text(ind)), "r");
 		QString rt;
 		rt = "<html><body>\n";
 		int ch = 0;
 		while ((ch = fgetc(fin)) != EOF)
 		{
 		    rt += (char)ch;
 		}
 		fclose(fin);
 		rt += "</html></body>\n";
 		if ( doc->name().isEmpty() )
 		{
 		    doc->setName(bkmkselector->text(ind));
 		}
 		FileManager fm;
 		fm.saveFile( *doc, rt );
 		qDebug("YES");
 	    }
 	    else
 	    {
 		qDebug("NO");
 	    }
 	    delete f;
 */
 
 #endif /* USEQPE */
 	}
 	break;
     }
 }
 
 void QTReaderApp::cancelbkmk()
 {
     if (m_nBkmkAction == cOpenFile)
     {
 	QString fn = usefilebrowser();
 	if (!fn.isEmpty() && QFileInfo(fn).isFile()) openFile(fn);
     }
   showEditTools();
 }