Merge pull request #15 from PauloCarvalhoRJ/HighDPIIcons

Icons for high DPI displays.
PauloCarvalhoRJ · Feb 25, 2017 · e2525f7 · e2525f7
2 parents 5d85ccb + 710834a
commit e2525f7
Show file tree

Hide file tree

Showing 85 changed files with 329 additions and 263 deletions.
diff --git a/GammaRay.pro b/GammaRay.pro
@@ -264,7 +264,7 @@ FORMS    += mainwindow.ui \
     gslib/gslibparams/widgets/widgetgslibparvmodel.ui
 
 # The application version
-VERSION = 1.0.1
+VERSION = 1.1.0
 
 # Define a preprocessor macro so we can get the application version in application code.
 DEFINES += APP_VERSION=\\\"$$VERSION\\\"
@@ -279,3 +279,6 @@ DEFINES += APP_NAME_VER=\\\"$$TARGET\\\040$$VERSION\\\"
 
 RESOURCES += \
     resources.qrc
+
+#set the Windows executable icon
+win32:RC_ICONS += art/exeicon.ico
diff --git a/GammaRay.pro.user b/GammaRay.pro.user
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 3.2.0, 2017-02-19T16:38:44. -->
+<!-- Written by QtCreator 3.2.0, 2017-02-25T10:35:02. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>

diff --git a/aboutdialog.cpp b/aboutdialog.cpp
@@ -1,5 +1,6 @@
 #include "aboutdialog.h"
 #include "ui_aboutdialog.h"
+#include "util.h"
 
 AboutDialog::AboutDialog(QWidget *parent) :
     QDialog(parent),
@@ -15,6 +16,12 @@ University of Alberta.\n\n").\
 GhostScript by Artifex Software Inc.\n\n").\
          append(APP_NAME).append(" by Paulo R. M. Carvalho ([email protected]) and the code contributors (see LICENSE.md file)\n\n").\
          append(APP_NAME).append(" is licensed under the Creative Commons BY-SA license v3.0."));
+
+    if( Util::getDisplayResolutionClass() == DisplayResolution::HIGH_DPI ){
+        ui->lblLicense->setPixmap(  QIcon(":icons32/ccbysa_sm32").pixmap(202, 70) );
+        ui->lblLogo->setPixmap(  QIcon(":icons32/logo64").pixmap(64, 64) );
+    }
+
      adjustSize();
 }
 

diff --git a/aboutdialog.ui b/aboutdialog.ui
@@ -15,7 +15,7 @@
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
-    <widget class="QLabel" name="label">
+    <widget class="QLabel" name="lblLogo">
      <property name="text">
       <string/>
      </property>
@@ -47,7 +47,7 @@
     </widget>
    </item>
    <item>
-    <widget class="QLabel" name="label_2">
+    <widget class="QLabel" name="lblLicense">
      <property name="text">
       <string/>
      </property>

diff --git a/art/exeicon.ico b/art/exeicon.ico
diff --git a/art/iconsHD/150dpi32.png b/art/iconsHD/150dpi32.png
diff --git a/art/iconsHD/300dpi32.png b/art/iconsHD/300dpi32.png
diff --git a/art/iconsHD/600dpi32.png b/art/iconsHD/600dpi32.png
diff --git a/art/iconsHD/80dpi32.png b/art/iconsHD/80dpi32.png
diff --git a/art/iconsHD/CCBYSA_small32.png b/art/iconsHD/CCBYSA_small32.png
diff --git a/art/iconsHD/bidist32.png b/art/iconsHD/bidist32.png
diff --git a/art/iconsHD/branchclosed32.png b/art/iconsHD/branchclosed32.png
diff --git a/art/iconsHD/branchend32.png b/art/iconsHD/branchend32.png
diff --git a/art/iconsHD/branchmore32.png b/art/iconsHD/branchmore32.png
diff --git a/art/iconsHD/branchopen32.png b/art/iconsHD/branchopen32.png
diff --git a/art/iconsHD/cartesiangrid32.png b/art/iconsHD/cartesiangrid32.png
diff --git a/art/iconsHD/cartesiangrid_3D_32.png b/art/iconsHD/cartesiangrid_3D_32.png
diff --git a/art/iconsHD/catpdf32.png b/art/iconsHD/catpdf32.png
diff --git a/art/iconsHD/crosshairs32.png b/art/iconsHD/crosshairs32.png
diff --git a/art/iconsHD/db32.png b/art/iconsHD/db32.png
diff --git a/art/iconsHD/distlogvalue32.png b/art/iconsHD/distlogvalue32.png
diff --git a/art/iconsHD/distprob32.png b/art/iconsHD/distprob32.png
diff --git a/art/iconsHD/distundef32.png b/art/iconsHD/distundef32.png
diff --git a/art/iconsHD/distvalue32.png b/art/iconsHD/distvalue32.png
diff --git a/art/iconsHD/gammabar32.png b/art/iconsHD/gammabar32.png
diff --git a/art/iconsHD/gs32.png b/art/iconsHD/gs32.png
diff --git a/art/iconsHD/histo32.png b/art/iconsHD/histo32.png
diff --git a/art/iconsHD/icon64.png b/art/iconsHD/icon64.png
diff --git a/art/iconsHD/locmap32.png b/art/iconsHD/locmap32.png
diff --git a/art/iconsHD/nscore32.png b/art/iconsHD/nscore32.png
diff --git a/art/iconsHD/play32.png b/art/iconsHD/play32.png
diff --git a/art/iconsHD/plot32.png b/art/iconsHD/plot32.png
diff --git a/art/iconsHD/pointset32.png b/art/iconsHD/pointset32.png
diff --git a/art/iconsHD/resources32.png b/art/iconsHD/resources32.png
diff --git a/art/iconsHD/save32.png b/art/iconsHD/save32.png
diff --git a/art/iconsHD/settings32.png b/art/iconsHD/settings32.png
diff --git a/art/iconsHD/snapshot32.png b/art/iconsHD/snapshot32.png
diff --git a/art/iconsHD/summary32.png b/art/iconsHD/summary32.png
diff --git a/art/iconsHD/thrcdf32.png b/art/iconsHD/thrcdf32.png
diff --git a/art/iconsHD/unidist32.png b/art/iconsHD/unidist32.png
diff --git a/art/iconsHD/variable32.png b/art/iconsHD/variable32.png
diff --git a/art/iconsHD/vario32.png b/art/iconsHD/vario32.png
diff --git a/art/iconsHD/vexp32.png b/art/iconsHD/vexp32.png
diff --git a/art/iconsHD/vline32.png b/art/iconsHD/vline32.png
diff --git a/art/iconsHD/vmodel32.png b/art/iconsHD/vmodel32.png
diff --git a/art/iconsHD/weight32.png b/art/iconsHD/weight32.png
diff --git a/art/iconsHD/xcoord32.png b/art/iconsHD/xcoord32.png
diff --git a/art/iconsHD/xplot32.png b/art/iconsHD/xplot32.png
diff --git a/art/iconsHD/ycoord32.png b/art/iconsHD/ycoord32.png
diff --git a/art/iconsHD/zcoord32.png b/art/iconsHD/zcoord32.png
diff --git a/art/iconsHD/zoomin32.png b/art/iconsHD/zoomin32.png
diff --git a/art/iconsHD/zoomout32.png b/art/iconsHD/zoomout32.png
diff --git a/art/logo.odp b/art/logo.odp
diff --git a/bidistributionmodelingdialog.cpp b/bidistributionmodelingdialog.cpp
@@ -46,6 +46,14 @@ BidistributionModelingDialog::BidistributionModelingDialog(Attribute *atX, Attri
     ui->widDistrVar1->layout()->addWidget( m_cmbXDist );
     ui->widDistrVar2->layout()->addWidget( m_cmbYDist );
 
+    if( Util::getDisplayResolutionClass() == DisplayResolution::HIGH_DPI ){
+        ui->btnParameters->setIcon( QIcon(":icons32/setting32") );
+        ui->btnPlot->setIcon( QIcon(":icons32/plot32") );
+        ui->btnSave->setIcon( QIcon(":icons32/save32") );
+        ui->btnSaveXDistr->setIcon( QIcon(":icons32/save32") );
+        ui->btnSaveYDistr->setIcon( QIcon(":icons32/save32") );
+    }
+
     adjustSize();
 }
 

diff --git a/creategriddialog.cpp b/creategriddialog.cpp
@@ -68,6 +68,10 @@ CreateGridDialog::CreateGridDialog(PointSet *pointSet, QWidget *parent) :
 
     connect( m_vModelList, SIGNAL(variogramClicked()), this, SLOT(onVariogramClicked()));
 
+    if( Util::getDisplayResolutionClass() == DisplayResolution::HIGH_DPI ){
+        ui->btnRunGammaBar->setIcon( QIcon(":icons32/gbar32") );
+    }
+
     adjustSize();
 }
 

diff --git a/declusteringdialog.cpp b/declusteringdialog.cpp
@@ -24,6 +24,16 @@ DeclusteringDialog::DeclusteringDialog(Attribute *attribute, QWidget *parent) :
     ui->setupUi(this);
     ui->lblTitle->setText("variable: <font color=\"red\"><b>" + m_attribute->getName() + "</b></color>" );
     this->setWindowTitle( QString("Declustering ").append( m_attribute->getContainingFile()->getName() ) );
+
+    if( Util::getDisplayResolutionClass() == DisplayResolution::HIGH_DPI ){
+        ui->btnParameters->setIcon( QIcon(":icons32/setting32") );
+        ui->btnHistogram->setIcon( QIcon(":icons32/histo32") );
+        ui->btnSave->setIcon( QIcon(":icons32/save32") );
+        ui->btnLocmap->setIcon( QIcon(":icons32/locmap32") );
+        ui->btnSummary->setIcon( QIcon(":icons32/summary32") );
+    }
+
+
     adjustSize();
 }
 

diff --git a/distributionmodelingdialog.cpp b/distributionmodelingdialog.cpp
@@ -30,6 +30,12 @@ DistributionModelingDialog::DistributionModelingDialog(Attribute *at, QWidget *p
 
     this->setWindowTitle("Model a distribution for " + at->getContainingFile()->getName() + ":" + at->getName());
 
+    if( Util::getDisplayResolutionClass() == DisplayResolution::HIGH_DPI ){
+        ui->btnParameters->setIcon( QIcon(":icons32/setting32") );
+        ui->btnPlot->setIcon( QIcon(":icons32/plot32") );
+        ui->btnSave->setIcon( QIcon(":icons32/save32") );
+    }
+
     adjustSize();
 }
 

diff --git a/domain/attribute.cpp b/domain/attribute.cpp
@@ -1,6 +1,7 @@
 #include "attribute.h"
 #include "file.h"
 #include "pointset.h"
+#include "util.h"
 
 Attribute::Attribute(QString name, int index_in_file)
 {
@@ -32,12 +33,24 @@ QIcon Attribute::getIcon()
         if( parent_file){
             if( parent_file->getFileType() == "POINTSET" ){
                 PointSet* ps = (PointSet*)parent_file;
-                if( this->_index ==  ps->getXindex() )
-                    return QIcon(":icons/xcoord16");
-                if( this->_index ==  ps->getYindex() )
-                    return QIcon(":icons/ycoord16");
-                if( this->_index ==  ps->getZindex() )
-                    return QIcon(":icons/zcoord16");
+                if( this->_index ==  ps->getXindex() ) {
+                    if( Util::getDisplayResolutionClass() == DisplayResolution::NORMAL_DPI )
+                        return QIcon(":icons/xcoord16");
+                    else
+                        return QIcon(":icons32/xcoord32");
+                }
+                if( this->_index ==  ps->getYindex() ){
+                    if( Util::getDisplayResolutionClass() == DisplayResolution::NORMAL_DPI )
+                        return QIcon(":icons/ycoord16");
+                    else
+                        return QIcon(":icons32/ycoord32");
+                }
+                if( this->_index ==  ps->getZindex() ){
+                    if( Util::getDisplayResolutionClass() == DisplayResolution::NORMAL_DPI )
+                        return QIcon(":icons/zcoord16");
+                    else
+                        return QIcon(":icons32/zcoord32");
+                }
             }
         }
     }

diff --git a/domain/bivariatedistribution.cpp b/domain/bivariatedistribution.cpp
@@ -1,11 +1,15 @@
 #include "bivariatedistribution.h"
+#include "util.h"
 
 BivariateDistribution::BivariateDistribution(const QString path) : Distribution( path )
 {
 }
 
 QIcon BivariateDistribution::getIcon()
 {
-    return QIcon(":icons/bidist16");
+    if( Util::getDisplayResolutionClass() == DisplayResolution::NORMAL_DPI )
+        return QIcon(":icons/bidist16");
+    else
+        return QIcon(":icons32/bidist32");
 }
 
diff --git a/domain/cartesiangrid.cpp b/domain/cartesiangrid.cpp
@@ -205,10 +205,17 @@ void CartesianGrid::updateMetaDataFile()
 
 QIcon CartesianGrid::getIcon()
 {
-    if(_nz == 1)
-        return QIcon(":icons/cartesiangrid16");
-    else
-        return QIcon(":icons/cg3D16");
+    if(_nz == 1){
+        if( Util::getDisplayResolutionClass() == DisplayResolution::NORMAL_DPI )
+            return QIcon(":icons/cartesiangrid16");
+        else
+            return QIcon(":icons32/cartesiangrid32");
+    }else{
+        if( Util::getDisplayResolutionClass() == DisplayResolution::NORMAL_DPI )
+            return QIcon(":icons/cg3D16");
+        else
+            return QIcon(":icons32/cg3D32");
+    }
 }
 
 void CartesianGrid::save(QTextStream *txt_stream)