comparison view/View.cpp @ 1360:e848ea0850fe zoom

Merge from default branch

     pb->setMaximum(0);
     pb->setFixedWidth(80);
     pb->setTextVisible(false);
 
     QPushButton *cancel = new QPushButton(this);
-    cancel->setIcon(IconLoader().load("fileclose"));
+    cancel->setIcon(IconLoader().load("cancel"));
     cancel->setFlat(true);
-    cancel->setFixedSize(QSize(20, 20));
+    int scaled20 = ViewManager::scalePixelSize(20);
+    cancel->setFixedSize(QSize(scaled20, scaled20));
     connect(cancel, SIGNAL(clicked()), this, SLOT(cancelClicked()));
     
     ProgressBarRec pbr;
     pbr.cancel = cancel;
     pbr.bar = pb;

                     i->second.lastCheck = 0;
                     timer->setInterval(2000);
                     timer->start();
                 }
 
-                cancel->move(0, ph - pb->height()/2 - 10);
+                int scaled20 = ViewManager::scalePixelSize(20);
+
+                cancel->move(0, ph - pb->height()/2 - scaled20/2);
                 cancel->show();
 
                 pb->setValue(completion);
-                pb->move(20, ph - pb->height());
+                pb->move(scaled20, ph - pb->height());
 
                 pb->show();
                 pb->update();
 
                 ph -= pb->height();