now, maxline and maxcolumn is counstraining

diff --git a/mainwindow.cpp b/mainwindow.cpp
index dc7c49b839056ecfbf537a1e8c529b846b310830..2d80c930f97895ee932b6e8aa0bbf0f0cc51f03a 100644 (file)
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -124,10 +124,14 @@ void MainWindow::quit(){
 }
 CLabel* MainWindow::addWidget(const QString &key, const CLabel *a){
     qDebug()<<"addWidget("<<key<<")";
-    // I want to adjust the text size
     int maxc=conf->value(QString("maxcolumn")).toInt();
     int maxl=conf->value(QString("maxline")).toInt();
-    grid->addWidget(a, grid->count()/maxc, grid->count()%maxc, 1, 1, Qt::AlignJustify| Qt::AlignVCenter | Qt::AlignHCenter);
+    int c=grid->count();
+    if(c>=maxc*maxl){
+        QMessageBox::information(this, QString("lourd !"), QString("il y a trop de boutons sur cette page"));
+        return 0;
+    }
+    grid->addWidget(a, c/maxc, c%maxc, 1, 1, Qt::AlignJustify| Qt::AlignVCenter | Qt::AlignHCenter);
     //QObject::connect(a, SIGNAL(pressed()), signalmap, SLOT(map()));
     QObject::connect(a, SIGNAL(released()), signalmap, SLOT(map()));
     signalmap->setMapping(a, key);
@@ -191,7 +195,6 @@ void MainWindow::action(const QString &a){
     else if(b[0]==QString("sql")){
         exec(QList<QString> ({c}));
     }
-        
     else if(b[0]==QString("edit")){
         QString e;
         bool ok;
@@ -220,7 +223,7 @@ void MainWindow::createMenuBar(){
     EditMenu->addAction(trUtf8("A&dd buttons"), this, SLOT(addButtonDB()), QKeySequence(trUtf8("Ctrl+D", "Buttons|Add")));
     EditMenu->addAction(trUtf8("Sa&v buttons"), this, SLOT(savButtons()), QKeySequence(trUtf8("Ctrl+V", "Buttons|Save")));
     EditMenu->addAction(trUtf8("&Edit buttons"), this, SLOT(chooseButtonDB()), QKeySequence(trUtf8("Ctrl+E", "Buttons|&Edit")));
-    EditMenu->addAction(trUtf8("&Edit buttons by ID"), this, SLOT(editButtonById()), QKeySequence(trUtf8("Ctrl+I", "Buttons|Edit by &id")));
+    //EditMenu->addAction(trUtf8("&Edit buttons by ID"), this, SLOT(editButtonById()), QKeySequence(trUtf8("Ctrl+I", "Buttons|Edit by &id")));
     EditMenu->addAction(trUtf8("&View/Hide menu"), this, SLOT(toggleMenu()), QKeySequence(trUtf8("Ctrl+T", "Buttons|View menu")));
     menuBar()->addMenu(EditMenu);
     HelpMenu=new QMenu(QString("&Help"));
@@ -325,7 +328,7 @@ void MainWindow::firstrun(){
     conf->setValue(QString("deletebuttons"), QVariant("delete from ui where id=?"));
     conf->setValue(QString("testbuttons"), QVariant("select id,keyword from ui where label=? and action=?;"));
     conf->setValue(QString("volumdown"), QVariant("config"));
-    conf->setValue(QString("volumup"), QVariant("config"));
+    conf->setValue(QString("volumup"), QVariant("begin"));
     qDebug()<<"firstrun() finished";
 }
 QString &MainWindow::get(int row, int column){
@@ -356,16 +359,13 @@ void MainWindow::entry(const QString &a){
         context.append(" ");
     }
     context.append(way[way.size()-1]);
-    //qDebug()<<"context="<<context;
     if(a=="")label=context+" : ";
     else label=context+", "+a+" : ";
     entry=QInputDialog::getText(this, QString("nouvelle entrée"), label, QLineEdit::Normal, "", &ok);
     if(ok==0)return;
     QString c;
-    //qDebug()<<"c="<<c<<" context="<<context<<" entry="<<entry<<" a="<<a;
     if(a=="")c=context+" : "+entry;
     else c=context+", "+a+" : "+entry;
-    //qDebug()<<"c="<<c;
     QList<QString> d({"INSERT INTO raw (date, texte) VALUES (:date, :txt);", time, c});
     exec(d);
     QSqlError b=q->lastError();
@@ -421,12 +421,12 @@ void MainWindow::getButtons(const QString &b){
 }
 void MainWindow::chooseButtonDB(){
     const QString a=QInputDialog::getText(this, QString("chooseButtonDB"), QString("Entrez le mots-clé : "), QLineEdit::Normal, label->text());
+    //const QString a=label.text;
     chooseButtonDB(a);
 }
 void MainWindow::chooseButtonDB(const QString & a){
     flush();
     QString b="%"+a+"%";
-    //qDebug()<<"b="<<b;
     qDebug()<<"exec()="<<exec(QList<QString>({conf->value(QString("choosebuttons")).toString(), b}));
     while (q->next()) {
         const QString action="edit "+q->value(0).toString();
@@ -576,11 +576,11 @@ void MainWindow::readButtons(const QByteArray &in){
         QDomNode e = n.firstChild();
         //if((cmd.size()<1)&&(n.isText()))e.toText().nodeValue();
         qDebug()<<"n.nodeName()="<<n.nodeName()<<" e.nodevalue="<<qPrintable(e.nodeValue());
-        if(n.nodeName()=="sql"){
+        if(e.nodeName()=="sql"){
             cmd.insert(0, e.nodeValue());
             qDebug()<<"cmd[0]="<<cmd[0];
             }
-        else if(n.nodeName()=="b"){
+        else if(e.nodeName()=="b"){
             QDomNode f=e.firstChild();
             while(!f.isNull()){
                 qDebug()<<"f.nodeName()="<<f.nodeName()<<" e.nodeValue()="<<qPrintable(e.nodeValue())<<" e.nodeType()="<<e.nodeType();
@@ -676,7 +676,7 @@ void MainWindow::insertbutton(const QString & keyword, const QString & label, co
         key=key+" "+q->value(1).toString();
         q->next();
     }
-    if(count==0)exec(QList<QString>({conf->value(QString("addbuttons")).toString(), label, keyword, action}));
+    if(count==0)exec(QList<QString>({conf->value(QString("addbuttons")).toString(), label, key, action}));
     else{exec(QList<QString>({conf->value(QString("updatebuttons")).toString(), key, label, action, id}));
 
     }