Ensure that all Lumina tools/utilities are setup with high-DPI icons.

11 files changed, 15 insertions, 6 deletions

diff --git a/src-qt5/core-utils/lumina-config/main.cpp b/src-qt5/core-utils/lumina-config/main.cpp
index e2c757a3..90e7cbbf 100644
--- a/src-qt5/core-utils/lumina-config/main.cpp
+++ b/src-qt5/core-utils/lumina-config/main.cpp
@@ -18,8 +18,7 @@ int main(int argc, char ** argv)
 {
     LTHEME::LoadCustomEnvSettings();
     LSingleApplication a(argc, argv, "lumina-config"); //loads translations inside constructor
-    if(!a.isPrimaryProcess()){ return 0; }
-    
+    if(!a.isPrimaryProcess()){ return 0; } 
     //LuminaThemeEngine theme(&a);
     QStringList args;
     for(int i=1; i<argc; i++){ args << QString(argv[i]); }
diff --git a/src-qt5/core-utils/lumina-search/main.cpp b/src-qt5/core-utils/lumina-search/main.cpp
index 5e71e99c..a3a7bb2e 100644
--- a/src-qt5/core-utils/lumina-search/main.cpp
+++ b/src-qt5/core-utils/lumina-search/main.cpp
@@ -23,6 +23,7 @@ int main(int argc, char ** argv)
     //LuminaThemeEngine theme(&a);
     //qDebug() << "Load Translations...";
     a.setApplicationName("Search for...");
+    a.setAttribute(Qt::AA_UseHighDpiPixmaps);   
     LUtils::LoadTranslation(&a, "lumina-search");
 
     MainUI w;
diff --git a/src-qt5/core/libLumina/LuminaSingleApplication.cpp b/src-qt5/core/libLumina/LuminaSingleApplication.cpp
index 30507b5e..e3816add 100644
--- a/src-qt5/core/libLumina/LuminaSingleApplication.cpp
+++ b/src-qt5/core/libLumina/LuminaSingleApplication.cpp
@@ -15,6 +15,7 @@
 
 LSingleApplication::LSingleApplication(int &argc, char **argv, QString appname) : QApplication(argc, argv){
   //Load the proper translation systems
+  this->setAttribute(Qt::AA_UseHighDpiPixmaps); 
   if(appname!="lumina-desktop"){ cTrans = LUtils::LoadTranslation(this, appname); }//save the translator for later
   //Initialize a couple convenience internal variables
   cfile = QDir::tempPath()+"/.LSingleApp-%1-%2-%3";
@@ -134,4 +135,4 @@ void LSingleApplication::newInputsAvailable(){
     //qDebug() << " - New Inputs Detected:" << inputs;
     emit InputsAvailable(inputs);
   }
-}
\ No newline at end of file
+}
diff --git a/src-qt5/core/lumina-desktop-unified/LSession.cpp b/src-qt5/core/lumina-desktop-unified/LSession.cpp
index 1c8d3c45..e511d7ad 100644
--- a/src-qt5/core/lumina-desktop-unified/LSession.cpp
+++ b/src-qt5/core/lumina-desktop-unified/LSession.cpp
@@ -39,7 +39,7 @@ LSession::LSession(int &argc, char ** argv) : LSingleApplication(argc, argv, "lu
   this->setEffectEnabled( Qt::UI_AnimateCombo, true);
   this->setEffectEnabled( Qt::UI_AnimateTooltip, true);
   //this->setAttribute(Qt::AA_UseDesktopOpenGL);
-  //this->setAttribute(Qt::AA_UseHighDpiPixmaps); //allow pixmaps to be scaled up as well as down
+  this->setAttribute(Qt::AA_UseHighDpiPixmaps); //allow pixmaps to be scaled up as well as down
 
   //Now initialize the global objects (but do not start them yet)
   Lumina::EFILTER = new EventFilter(); //Need the XCB Event filter first
diff --git a/src-qt5/core/lumina-desktop/LSession.cpp b/src-qt5/core/lumina-desktop/LSession.cpp
index bdc4f4d3..2203a76c 100644
--- a/src-qt5/core/lumina-desktop/LSession.cpp
+++ b/src-qt5/core/lumina-desktop/LSession.cpp
@@ -38,7 +38,7 @@ LSession::LSession(int &argc, char ** argv) : LSingleApplication(argc, argv, "lu
   this->setEffectEnabled( Qt::UI_AnimateCombo, true);
   this->setEffectEnabled( Qt::UI_AnimateTooltip, true);
   //this->setAttribute(Qt::AA_UseDesktopOpenGL);
-  //this->setAttribute(Qt::AA_UseHighDpiPixmaps); //allow pixmaps to be scaled up as well as down
+  this->setAttribute(Qt::AA_UseHighDpiPixmaps); //allow pixmaps to be scaled up as well as down
   //this->setStyle( new MenuProxyStyle); //QMenu icon size override
   SystemTrayID = 0; VisualTrayID = 0;
   sysWindow = 0;
diff --git a/src-qt5/core/lumina-open/main.cpp b/src-qt5/core/lumina-open/main.cpp
index 7434b6c2..d421b5b6 100644
--- a/src-qt5/core/lumina-open/main.cpp
+++ b/src-qt5/core/lumina-open/main.cpp
@@ -47,6 +47,7 @@ void printUsageInfo(){
 void ShowErrorDialog(int argc, char **argv, QString message){
     //Setup the application
     QApplication App(argc, argv);
+        App.setAttribute(Qt::AA_UseHighDpiPixmaps);
     LuminaThemeEngine theme(&App);
 	LUtils::LoadTranslation(&App,"lumina-open");
     QMessageBox dlg(QMessageBox::Critical, QObject::tr("File Error"), message );
@@ -58,7 +59,7 @@ void showOSD(int argc, char **argv, QString message){
   //Setup the application
   QApplication App(argc, argv);
     LUtils::LoadTranslation(&App,"lumina-open");
-
+    App.setAttribute(Qt::AA_UseHighDpiPixmaps);
   //Display the OSD
   QPixmap pix(":/icons/OSD.png");
   QLabel splash(0, Qt::Window | Qt::WindowStaysOnTopHint | Qt::X11BypassWindowManagerHint);
@@ -137,6 +138,7 @@ QString cmdFromUser(int argc, char **argv, QString inFile, QString extension, QS
     //No default set -- Start up the application selection dialog
     LTHEME::LoadCustomEnvSettings();
     QApplication App(argc, argv);
+    App.setAttribute(Qt::AA_UseHighDpiPixmaps);
     LuminaThemeEngine theme(&App);
       LUtils::LoadTranslation(&App,"lumina-open");
 
@@ -412,6 +414,7 @@ int main(int argc, char **argv){
       qDebug() << "[lumina-open] Application Error:" << retcode;
         //Setup the application
         QApplication App(argc, argv);
+        App.setAttribute(Qt::AA_UseHighDpiPixmaps);
         LuminaThemeEngine theme(&App);
 	  LUtils::LoadTranslation(&App,"lumina-open");
 	//App.setApplicationName("LuminaOpen");
diff --git a/src-qt5/desktop-utils/lumina-archiver/main.cpp b/src-qt5/desktop-utils/lumina-archiver/main.cpp
index 4f9a4bc5..40cd7967 100644
--- a/src-qt5/desktop-utils/lumina-archiver/main.cpp
+++ b/src-qt5/desktop-utils/lumina-archiver/main.cpp
@@ -15,6 +15,7 @@
 int  main(int argc, char *argv[]) {
    LTHEME::LoadCustomEnvSettings();
    QApplication a(argc, argv);
+    a.setAttribute(Qt::AA_UseHighDpiPixmaps);   
    LUtils::LoadTranslation(&a, "l-archiver");
    //Now go ahead and setup the app
    QStringList args;
diff --git a/src-qt5/desktop-utils/lumina-calculator/main.cpp b/src-qt5/desktop-utils/lumina-calculator/main.cpp
index 222ee8b4..f9a3e177 100644
--- a/src-qt5/desktop-utils/lumina-calculator/main.cpp
+++ b/src-qt5/desktop-utils/lumina-calculator/main.cpp
@@ -15,6 +15,7 @@
 int  main(int argc, char *argv[]) {
    LTHEME::LoadCustomEnvSettings();
    QApplication a(argc, argv);
+    a.setAttribute(Qt::AA_UseHighDpiPixmaps);   
    LUtils::LoadTranslation(&a, "l-calc");
    //Now go ahead and setup the app
    //LuminaThemeEngine theme(&a);
diff --git a/src-qt5/desktop-utils/lumina-fileinfo/main.cpp b/src-qt5/desktop-utils/lumina-fileinfo/main.cpp
index 4b048487..a602f290 100644
--- a/src-qt5/desktop-utils/lumina-fileinfo/main.cpp
+++ b/src-qt5/desktop-utils/lumina-fileinfo/main.cpp
@@ -11,6 +11,7 @@ int main(int argc, char ** argv)
 {
   LTHEME::LoadCustomEnvSettings();
   QApplication a(argc, argv);
+    a.setAttribute(Qt::AA_UseHighDpiPixmaps);   
   LUtils::LoadTranslation(&a, "l-fileinfo");
   //LuminaThemeEngine theme(&a);
 
diff --git a/src-qt5/desktop-utils/lumina-notify/main.cpp b/src-qt5/desktop-utils/lumina-notify/main.cpp
index c0e3bd05..23f30b95 100644
--- a/src-qt5/desktop-utils/lumina-notify/main.cpp
+++ b/src-qt5/desktop-utils/lumina-notify/main.cpp
@@ -12,6 +12,7 @@
 int main(int argc, char *argv[])
 {
     QApplication a(argc, argv);
+    a.setAttribute(Qt::AA_UseHighDpiPixmaps);   
     int answer;
     QMessageBox *messageBox = new QMessageBox;
         messageBox->setText(argv[1]);
diff --git a/src-qt5/desktop-utils/lumina-textedit/main.cpp b/src-qt5/desktop-utils/lumina-textedit/main.cpp
index 61f6672e..7c1619b0 100644
--- a/src-qt5/desktop-utils/lumina-textedit/main.cpp
+++ b/src-qt5/desktop-utils/lumina-textedit/main.cpp
@@ -15,6 +15,7 @@
 int  main(int argc, char *argv[]) {
    LTHEME::LoadCustomEnvSettings();
    QApplication a(argc, argv);
+    a.setAttribute(Qt::AA_UseHighDpiPixmaps);   
    LUtils::LoadTranslation(&a, "l-te");
    //Now go ahead and setup the app
    //LuminaThemeEngine theme(&a);