changeset 112:1c638a8e9897

bye bye from silo114

--- a/widgets/CriteriaDialog.cpp	Mon Sep 17 16:19:27 2007 +0000
+++ b/widgets/CriteriaDialog.cpp	Wed Sep 19 15:54:32 2007 +0000
@@ -3,6 +3,7 @@
 #include <QFrame>
 #include <QVector>
 #include <QString>
+#include <iostream>
 
 #include "CriteriaDialog.h"
 
@@ -50,6 +51,7 @@
 	
 	setLayout(mainLayout);
 
+
  }
 
  void CriteriaDialog::setLocation(int x, int y){
@@ -64,6 +66,8 @@
  void CriteriaDialog::addCriteria(QString name){
 	QCheckBox *criteriaCheckBox = new QCheckBox(name);
 	m_layoutForCheckBoxs->addWidget(criteriaCheckBox);
+	this->adjustSize();
+
  }
 
  QVector<QString> CriteriaDialog::result(){

--- a/widgets/ListResultGeneralItemWidget.cpp	Mon Sep 17 16:19:27 2007 +0000
+++ b/widgets/ListResultGeneralItemWidget.cpp	Wed Sep 19 15:54:32 2007 +0000
@@ -16,6 +16,9 @@
 
 #include "CriteriaDialog.h"
 #include <QPixmap>
+#include <QDesktopWidget>
+#include <QSize>
+#include <iostream>
 
 ListResultGeneralItemWidget::ListResultGeneralItemWidget(QWidget *parent):QWidget(parent){
 	vLayout1 = new QVBoxLayout(); 
@@ -31,8 +34,8 @@
 	label4 = new QLabel("4");
 	label5 = new QLabel("le super mega truc des options que même que c'est trop bien");
 
-	m_buttonPrev = new QPushButton("prev");
-	m_buttonSimilar = new QPushButton("similar");
+	m_buttonPrev = new QPushButton();
+	m_buttonSimilar = new QPushButton();
 
 	m_confidenceListWidget= new ConfidenceListWidget();
 	m_confidenceListWidget->setMaximumWidth(180);
@@ -50,10 +53,25 @@
 	m_labelRank->setAlignment(Qt::AlignCenter);
 	m_labelIcon->setAlignment(Qt::AlignCenter);
 
-	m_buttonPrev->setMaximumWidth(60);
-	//m_buttonPrev->setMaximumHeight(40);
-	m_buttonSimilar->setMaximumWidth(60);
-	//m_buttonSimilar->setMaximumHeight(40);
+	m_buttonPrev->setMaximumSize(68,34);
+	m_buttonPrev->setMinimumSize(68,34);
+	m_buttonSimilar->setMaximumSize(64,34);
+	m_buttonSimilar->setMinimumSize(64,34);
+	QSize similarIconSize;
+	QSize prevIconSize;
+	similarIconSize.setHeight(34);
+	similarIconSize.setWidth(64);
+	prevIconSize.setHeight(34);
+	prevIconSize.setWidth(68);
+
+	m_buttonSimilar->setIconSize(similarIconSize);
+	m_buttonPrev->setIconSize(prevIconSize);
+
+
+	m_buttonPrev->setIcon(QIcon(":icons/prev.png"));
+	m_buttonPrev->setFlat(true);
+	m_buttonSimilar->setIcon(QIcon(":icons/similar.png"));
+	m_buttonSimilar->setFlat(true);
 
 	//////////////
 	/*QFrame *vLine = new QFrame();
@@ -178,10 +196,39 @@
 	m_criteriaDialog->addCriteria("criteria 1");
 	m_criteriaDialog->addCriteria("criteria 2");
 	m_criteriaDialog->addCriteria("criteria 3");
-	m_criteriaDialog->setLocation(1000,200);
+
+	QDesktopWidget screen;
+	
+	int wscreen = screen.screenGeometry().width();
+	int hscreen = screen.screenGeometry().height();
+	int wcursor = QCursor::pos().x();
+	int hcursor = QCursor::pos().y();
+	int wdialog = m_criteriaDialog->width();
+	int hdialog = m_criteriaDialog->height();
+	
+	int posx = wcursor;
+	int posy = hcursor;
+
+	if(wcursor+wdialog > wscreen){
+		posx = wscreen - wdialog;
+	}
+	if(hcursor+(hdialog+40) > hscreen){
+		posy = hscreen - (hdialog+40);
+	}
+
+
+	std::cerr << "wscreen:"<< wscreen
+				<<" hscreen:"<<hscreen
+				<<" wdialog:"<<wdialog
+				<<" hdialog:"<<hdialog		
+				<< std::endl;
+
+	m_criteriaDialog->setLocation(posx,posy);
 	m_criteriaDialog->setOpacity(0.9);
 	if(m_criteriaDialog->exec()){
 		 m_waitingWidget->setAnimation(true);
+	}else{
+		 m_waitingWidget->setAnimation(false);
 	}
 	delete m_criteriaDialog;
 }

--- a/widgets/ListResultGeneralItemWidget.h	Mon Sep 17 16:19:27 2007 +0000
+++ b/widgets/ListResultGeneralItemWidget.h	Wed Sep 19 15:54:32 2007 +0000
@@ -59,8 +59,6 @@
 private slots:
 	void displayCriteria();
 
-
-
 };
 
 

--- a/widgets/WaitingWidget.cpp	Mon Sep 17 16:19:27 2007 +0000
+++ b/widgets/WaitingWidget.cpp	Wed Sep 19 15:54:32 2007 +0000
@@ -34,8 +34,21 @@
 void WaitingWidget::draw(QPainter *painter){
 	QColor color1(QRgb(0xffdbf756));
 	QColor color2 = color1;
-	color2.setAlpha(50);
-	QLinearGradient rectRadian(0,0,this->width(),0);
+	color1.setAlpha(80);
+	painter->setPen(QPen(palette().foreground(),1,Qt::NoPen,Qt::RoundCap));
+
+	int rectsize = this->width()/20;
+	for(int i=0;i<=20;i++){
+		if((i+m_ind)%2){
+			painter->setBrush(QBrush(color1, Qt::SolidPattern));
+		}
+		else{
+			painter->setBrush(QBrush(Qt::white, Qt::SolidPattern));	
+		}
+		painter->drawRect(i*rectsize,0,this->width(), this->height());
+	}
+
+	/*QLinearGradient rectRadian(0,0,this->width(),0);
 
 	for(int i=0;i<10;i++){
 		if((i+m_ind)%2){
@@ -47,7 +60,7 @@
 	}
 	painter->setPen(QPen(palette().foreground(),1,Qt::NoPen,Qt::RoundCap));
 	painter->setBrush(rectRadian);
-	painter->drawRect(0,0,this->width(), this->height());
+	painter->drawRect(0,0,this->width(), this->height());*/
 }