shitty mod ...

diff --git a/mainwindow.cpp b/mainwindow.cpp
index aa8ec4094316ae024306bebd10acac5699174354..291b3ff8b7dfde79781346fa05384470cbd24247 100644 (file)
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -53,6 +53,7 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent)
     };
     deb=0;
     page=0;
+    np=0;
     //currenttype=conf->value(QString("currenttype"), QString("buttons")).toString();
     screen=new QWidget(this);
     screen->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Maximum);
@@ -76,7 +77,8 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent)
     };
     statusBar()->addPermanentWidget(label);
     menuBar()->setVisible(conf->value(QString("menu")).toBool());
-    start();
+    //start(); 2' connect will start when data is come
+    orienta=0;
 }
 void MainWindow::start(){
     QString a=conf->value(QString("currenttype")).toString();
@@ -148,6 +150,7 @@ void MainWindow::showExpanded()
 }
 void MainWindow::quit(){
     qDebug()<<"quit() way.last()="<<way.last();
+    q->finish();
     this->~MainWindow();
 }
 int unsigned MainWindow::addWidget(const QString &key, const CLabel *a){
@@ -156,22 +159,20 @@ int unsigned MainWindow::addWidget(const QString &key, const CLabel *a){
         key.replace(QString("idem"), a->text());
     }
     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);
+
+
     //p*(ml*mc)+c nombre de boutons en tout osef,
-    if(grid->count()==((maxc*maxl)-1)){
-        CLabel next(trUtf8("Next page"), conf, this);
+/*    if((c==((maxc*maxl)-1))&&(!np)){
+        np=1;
+        CLabel * next=new CLabel(QString("Next page"), *conf);
         addWidget(QString("nextpage"), next);
         page++;
         return 1;
     }
-
-    /*if(c=(maxc*maxl)-1){
-        page++;
-        addWidget(QString("nextpage"), CLabel(trUtf8("Next page")));
-        return page;
-    }*/
-    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);
+*/
     return 0;
 }
 void MainWindow::action(const QString &a){
@@ -263,6 +264,18 @@ void MainWindow::action(const QString &a){
         }
         get(conf->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);
+
+    }
+    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);
+
+    }
     else if(b[0]==QString("setfile")){
         bool ok=0;
         QString d, e;
@@ -463,16 +476,16 @@ CLabel::CLabel( const QString& text, const QSettings & set, QWidget * parent ) :
     setLineWidth(5);
     setStyleSheet(m_style);
     setScaledContents(true);
-    setting=&set;
+    settings=&set;
 }
 CLabel::~CLabel()
 {
 }
 void CLabel::mousePressEvent (QMouseEvent * event )
 {
-    QString a=setting->value(QString("currenttype")).toString();
-    QString bb=setting->value(a+QString("before")).toString();
-    QString ba=setting->value(a+QString("after")).toString();
+    QString a=settings->value(QString("currenttype")).toString();
+    QString bb=settings->value(a+QString("before")).toString();
+    QString ba=settings->value(a+QString("after")).toString();
     switch(event->button()){
         case Qt::LeftButton:setStyleSheet(m_style.replace(bb, ba));emit pressed();break;
         //case Qt::LeftButton:setStyleSheet(m_style.replace(setting->value(setting->value(QString("currenttype")).toString()+"before").toString(), setting->value(QString("currenttype")).toString()+"after"));emit pressed();break;
@@ -480,9 +493,9 @@ void CLabel::mousePressEvent (QMouseEvent * event )
 }
 void CLabel::mouseReleaseEvent( QMouseEvent * event )
 {
-    QString a=setting->value(QString("currenttype")).toString();
-    QString bb=setting->value(a+QString("before")).toString();
-    QString ba=setting->value(a+QString("after")).toString();
+    QString a=settings->value(QString("currenttype")).toString();
+    QString bb=settings->value(a+QString("before")).toString();
+    QString ba=settings->value(a+QString("after")).toString();
     switch(event->button()){
         case Qt::LeftButton:setStyleSheet(m_style.replace(ba, bb));emit released();break;
         //case Qt::LeftButton:setStyleSheet(m_style.replace(setting->value(setting->value(QString("currenttype")).toString()+"after").toString(), setting->value(QString("currenttype")).toString()+"before"));emit released();break;
@@ -580,7 +593,7 @@ int MainWindow::exec(const QList<QString> & a){
     QSqlError b=q->lastError();
     db.commit();
     if (b.isValid())qDebug()<<"SQL error :"<<b.text();
-    if(q->isSelect())return q->size();
+    else if(q->isSelect())return q->size();
     else if (q->isValid()) return 0;
     else return -1;
 }
@@ -624,6 +637,7 @@ void MainWindow::entry(){
     entry(QString(""));
 }
 void MainWindow::addDB(const QString & tmp){
+    qDebug()<<"addDB";
     if(deb)QMessageBox::information(this, trUtf8("addDB", "box title to debug addDB"), "type : "+tmp);
     bool ok=0;
     QString cur=label->text();
@@ -646,7 +660,7 @@ void MainWindow::get(const QString & d, const QString &b){
     if(updatelocker.tryLock(60000))updatelocker.unlock();
     else{qDebug()<<"updatelocker is locked more than 1mn";}
     QString c="%"+a+"%", x=conf->value(QString("get")+d).toString();
-    qDebug()<<"x="<<x;
+    qDebug()<<"x="<<x<<" c="<<c;
     QList<QString> tmp({x, c});
     label->setText(a);
     exec(tmp);
@@ -654,13 +668,13 @@ void MainWindow::get(const QString & d, const QString &b){
     int actCol = 1;//r.indexOf("action");
     int i=0;
     qDebug()<<"bcl to add buttons";
-    int maxc=conf->value(QString("maxcolumn")).toInt(), maxl=conf->value(QString("maxline")).toInt();
-    if((page)&&(!grid->count())){
-        addWidget(QString("prevpage"), new CLabel(trUtf8("Previous page")));
+    if(page){
+        addWidget(QString("prevpage"), new CLabel(trUtf8("Prev."), *conf));
     }
     //grid->count()%(maxl*maxc)!=0) here
     while(q->next()){
-        if(!addWidget(q->value(actCol).toString(), new CLabel(q->value(labCol).toString(), *conf)))break;
+        int tmp=addWidget(q->value(actCol).toString(), new CLabel(q->value(labCol).toString(), *conf));
+        if(tmp==1)break;
         i++;
     };
     grid->update();
@@ -1091,3 +1105,6 @@ void MainWindow::reset(){
     QList<QString> b({"delete from buttons;"});
     exec(b);
 }
+bool MainWindow::printItem(const QString & key, const CLabel * a){
+
+}

diff --git a/mainwindow.h b/mainwindow.h
index 6518b703927b7632bf13660aad87378d635e4956..6002ec41006b41f402557091531108778baac4cd 100644 (file)
--- a/mainwindow.h
+++ b/mainwindow.h
@@ -101,7 +101,7 @@ public:
     explicit CLabel(const QString&, const QSettings &, QWidget * parent = 0 );
     ~CLabel();
     void SetTextToLabel(const QString &);
-    QSettings getSettings();
+    QSettings * getSettings();
 signals:
     void clicked();
     void pressed();
@@ -188,6 +188,7 @@ private slots:
     void download(const QString &);
     void download(const QString &,const QString &);
     void use(const QString &);
+    bool printItem(const QString &, const CLabel *);
 public slots:
 
 signals:
@@ -214,7 +215,7 @@ private:
     FileDownloader * m;
     QNetworkAccessManager *net;
     QNetworkReply * rep;
-    bool orienta;//0=portrait 1=paysage (size.width() > size.height())
+    bool np, orienta;//0=portrait 1=paysage (size.width() > size.height())
     unsigned short int deb;
     unsigned int page;
     QVideoWidget * videoWidget;