From 515ba433d9d58175cf55176001a7b494c01579af Mon Sep 17 00:00:00 2001 From: Norbert Moutarde Date: Tue, 16 Jun 2015 19:33:08 +0200 Subject: [PATCH] action("nextpage") work but not action("prevpage") --- mainwindow.cpp | 59 +++++++++++++++++++++++++++++--------------------- 1 file changed, 34 insertions(+), 25 deletions(-) diff --git a/mainwindow.cpp b/mainwindow.cpp index 2ba9746..4a7ec41 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -68,7 +68,7 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent) setCentralWidget(screen); createMenuBar(); connectDB(); - showFullScreen(); + showExpanded(); if((conf->value(QString("first")).toInt()==1)){ qDebug()<<"second"; bool ok; @@ -79,7 +79,6 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent) }; statusBar()->addPermanentWidget(label); menuBar()->setVisible(conf->value(QString("menu")).toBool()); - //d.lock(); start(); } @@ -87,6 +86,7 @@ void MainWindow::start(){ QString a=conf->value(QString("currenttype"), QString("buttons")).toString(); way=conf->value(QString("start"), conf->value(QString("startdefault"))).toStringList(); QString b=way.last(); + way.removeLast(); qDebug()<<"a="<quit(); + } void MainWindow::setOrientation(ScreenOrientation orientation) @@ -158,7 +154,11 @@ void MainWindow::quit(){ qDebug()<<"quit() way.last()="<finish(); qq->finish(); - this->~MainWindow(); + if(way.size())conf->setValue(QString("start"), way); + //savButtons(); + db.commit(); + db.close(); + qApp->quit(); } int unsigned MainWindow::addWidget(const QString &key, const CLabel *a){ qDebug()<<"addWidget("<text()<<", "<value(QString("currenttype")).toString(), way.takeLast()); } else if(b[0]==QString("prevpage")){ - page--; - int maxc=conf->value(QString("maxcolumn")).toInt(), maxl=conf->value(QString("maxline")).toInt(); - q->seek(0-(maxc*maxl),1); + qDebug()<<"page="<<--page; + bool tmp; + //int u=page-1; + + int t=grid->count(); + flush(); + //int max=conf->value(QString("maxcolumn")).toInt()*conf->value(QString("maxline")).toInt(); + if(!page)tmp=q->seek(0); + else tmp=q->seek(-t,true); + if(deb)QMessageBox::information(this, trUtf8("result", "box title to debug prevpage"), int(tmp)); printItem(); } else if(b[0]==QString("nextpage")){ page++; - int maxc=conf->value(QString("maxcolumn")).toInt(), maxl=conf->value(QString("maxline")).toInt(); - q->seek(maxc*maxl,1); + flush(); printItem(); } else if(b[0]==QString("setfile")){ @@ -426,17 +432,20 @@ void MainWindow::action(const QString &a){ system(d.toStdString().c_str()); } else if(b[0]==QString("val")){ - for(int a=0;a<((bs-1)/2); a++){ - valeur->insert(b[(2*a)+1], b[(2*a)+2]); - if(deb)QMessageBox::information(this, QString("val"), QString("val("+b[(2*a)+1]+")=="+b[(2*a)+2])); - } - if(deb)QMessageBox::information(this, QString("val"), QString("val.size()=="+valeur->size())); + if(bs!=1){ + for(int a=0;a<((bs-1)/2); a++){ + valeur->insert(b[(2*a)+1], b[(2*a)+2]); + if(deb)QMessageBox::information(this, QString("val"), QString("val("+b[(2*a)+1]+")=="+b[(2*a)+2])); + } + }else{ + valeur->clear(); + if(deb)QMessageBox::information(this, QString("val"), QString("val cleared")); + } + if(deb)QMessageBox::information(this, QString("val"), QString("val.size()=="+valeur->size())); } - - else { + else{ get(conf->value(QString("currenttype")).toString(),a); //a=""; - } } void MainWindow::createMenuBar(){ @@ -1157,14 +1166,14 @@ bool MainWindow::printItem(){ int i=0; qDebug()<<"printItem()"; if(page){ - addWidget(QString("prevpage"), new CLabel(trUtf8("Prev."), *conf)); + addWidget(QString("prevpage"), new CLabel(trUtf8("Prev"), *conf)); }; while(q->next()){ int tmp=addWidget(q->value(actCol).toString(), new CLabel(q->value(labCol).toString(), *conf)); if(tmp==1){ - addWidget(QString("nextpage"), new CLabel(trUtf8("Next."), *conf)); - break; + addWidget(QString("nextpage"), new CLabel(trUtf8("Next"), *conf)); + return 1; }; i++; }; @@ -1173,5 +1182,5 @@ bool MainWindow::printItem(){ //screen->updateGeometry(); qDebug()<<"end printItem : "<