added QMap<QString(1),QString(2)>val to replace every QString(1) by

QString(2)

diff --git a/main.cpp b/main.cpp
index 35bfe7c4e42f489e28af88bb494f16ca4c12f964..1b10c3e4c6301e984a6e2b2f57a67c156b63e47d 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -36,7 +36,7 @@ int main(int argc, char *argv[])
     translator.load(QString("diary-mobile_") + locale);
     app.installTranslator(&translator);
     MainWindow w;
-    w.show();
+    w.showMaximized();
 
     return app.exec();
 }

diff --git a/mainwindow.cpp b/mainwindow.cpp
index 5052598bcd58f8b76fa7b7aa98f0cf48059eea9f..79f7463ae6cad418825ba0263e3394d732ef2556 100644 (file)
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -60,6 +60,7 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent)
     grid=new QGridLayout(screen);
     grid->setSizeConstraint(QLayout::SetMinAndMaxSize);
     signalmap=new QSignalMapper(this);
+    val=new QHash<QString, QString>;
     qDebug()<<"1' connect : "<<connect(signalmap, SIGNAL(mapped(const QString &)), this, SLOT(action(const QString &)));
     qDebug()<<"2' connect : "<<connect(this, SIGNAL(datafilled()), this, SLOT(start()));
     label=new QLabel;
@@ -85,6 +86,8 @@ void MainWindow::start(){
     QString b=way.last();
     qDebug()<<"a="<<a<<" b="<<b;
     get(a, b);
+    lastprint=b;
+
 }
 MainWindow::~MainWindow()
 {
@@ -158,13 +161,16 @@ int unsigned MainWindow::addWidget(const QString &key, const CLabel *a){
     if(key.contains(QString("idem"))){
         key.replace(QString("idem"), a->text());
     }
+    for(QMap<QString, QString>::iterator a=val->begin;a!=val->end;a++){
+        if(key.contains(a.key()))key.replace(a.key(), a.value());
+    }
     int c=grid->count(), maxc=conf->value(QString("maxcolumn")).toInt(), maxl=conf->value(QString("maxline")).toInt();
     grid->addWidget(a, c/maxc, c%maxc, 1, 1, Qt::AlignJustify| Qt::AlignVCenter | Qt::AlignHCenter);
     QObject::connect(a, SIGNAL(released()), signalmap, SLOT(map()));
     signalmap->setMapping(a, key);
-    if(c==(maxc*maxl)-1)return 1;
+    //if(c==(maxc*maxl)-1)return 1;
 
-    //p*(ml*mc)+c nombre de boutons en tout osef,
+    //(p-1)*(ml*mc)+c nombre de boutons en tout osef,
 /*    if((c==((maxc*maxl)-1))&&(!np)){
         np=1;
         CLabel * next=new CLabel(QString("Next page"), *conf);
@@ -658,7 +664,7 @@ void MainWindow::addDB(const QString & tmp){
     if ((c=="")||(ok==0))return;
     b=QInputDialog::getText(this, trUtf8("keyword", "Title of box where ask for new keyword"), trUtf8("Enter they keyword (no limit !)"), QLineEdit::Normal, cur, &ok);
     if ((b=="")||(ok==0))return;
-    a=QInputDialog::getText(this, trUtf8("action", "Title of box where ask for new action"), trUtf8("Enter his action"), QLineEdit::Normal, c, &ok);
+    a=QInputDialog::getText(this, trUtf8("action", "Title of box where ask for new action"), trUtf8("Enter his action"), QLineEdit::Normal, QString("new idem"), &ok);
     if ((a=="")||(ok==0))return;
     insert(tmp, b, c, a);
     return;
@@ -785,21 +791,23 @@ void MainWindow::back(){
 }
 void MainWindow::keyReleaseEvent(QKeyEvent *event)
 {
-    //static bool accepted=true;
-    event->accept();
+    static bool accepted=true;
+    event->setAccepted(accepted);
     int k=event->key();
     qDebug()<<"key pressed="<<k;
+    
     if (k==Qt::Key_Menu){
         action(conf->value(QString("actionmenu")).toString());
+        accepted==false;
         }
     else if(k==Qt::Key_Back){
-        back();
+        action(conf->value(QString("menuback")).toString());
+        accepted==false;
         }
     else if(k==Qt::Key_VolumeDown){
         qDebug()<<"keyvolumdown";
         const QString a=conf->value(QString("volumdown")).toString();
         action(a);
-
         }
     else if(k==Qt::Key_VolumeUp){
         action(conf->value(QString("volumup")).toString());

diff --git a/mainwindow.h b/mainwindow.h
index a58849056fe8e43d59ef1895ee03230cc60ab757..5feb4c2068c8d030e733d0e6c131d2843848866d 100644 (file)
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -219,6 +219,7 @@ private:
     unsigned short int deb;
     unsigned int page;
     QVideoWidget * videoWidget;
+    QHash * val;
 };