Changeset ad79832


Ignore:
Timestamp:
06/25/14 05:48:45 (11 months ago)
Author:
Ken Moore <ken@…>
Branches:
master, enter/10, releng/10.0.3, releng/10.1, releng/10.1.1, releng/10.1.2
Children:
48743e0
Parents:
9df8b13
Message:

Clean up the icons for the desktop bar plugins as well. Now it should use a generic application icon if the *.desktop file does not provide one (or the icon does not exist).

File:
1 edited

Legend:

Unmodified
Added
Removed
  • lumina/lumina-desktop/panel-plugins/desktopbar/LDeskBar.cpp

    r64ba4c0 rad79832  
    4444  //Applications on the desktop 
    4545  appB = new LTBWidget(this); 
    46     appB->setIcon( LXDG::findIcon("favorites", ":/images/default-favorite.png") ); 
     46    appB->setIcon( LXDG::findIcon("favorites", "") ); 
    4747  appM = new QMenu(this); 
    4848    appB->setMenu(appM); 
     
    5151  //Directories on the desktop 
    5252  dirB = new LTBWidget(this); 
    53     dirB->setIcon( LXDG::findIcon("folder", ":/images/default-dir.png") ); 
     53    dirB->setIcon( LXDG::findIcon("folder", "") ); 
    5454  dirM = new QMenu(this); 
    5555    dirB->setMenu(dirM); 
     
    5959  audioM = new QMenu(tr("Audio"), this); 
    6060    connect(audioM,SIGNAL(triggered(QAction*)),this,SLOT(ActionTriggered(QAction*)) ); 
    61     audioM->setIcon( LXDG::findIcon("audio-x-generic",":/images/default-audiofile.png") ); 
     61    audioM->setIcon( LXDG::findIcon("audio-x-generic","") ); 
    6262  //Video Files on the desktop 
    6363  videoM = new QMenu(tr("Video"), this); 
    6464    connect(videoM,SIGNAL(triggered(QAction*)),this,SLOT(ActionTriggered(QAction*)) ); 
    65     videoM->setIcon( LXDG::findIcon("video-x-generic",":/images/default-video.png") ); 
     65    videoM->setIcon( LXDG::findIcon("video-x-generic","") ); 
    6666  //Picture Files on the desktop 
    6767  pictureM = new QMenu(tr("Pictures"), this); 
    6868    connect(pictureM,SIGNAL(triggered(QAction*)),this,SLOT(ActionTriggered(QAction*)) ); 
    69     pictureM->setIcon( LXDG::findIcon("image-x-generic",":/images/default-graphicsfile.png") ); 
     69    pictureM->setIcon( LXDG::findIcon("image-x-generic","") ); 
    7070  //Other Files on the desktop 
    7171  otherM = new QMenu(tr("Other Files"), this); 
    7272    connect(otherM,SIGNAL(triggered(QAction*)),this,SLOT(ActionTriggered(QAction*)) ); 
    73     otherM->setIcon( LXDG::findIcon("unknown",":/images/default-file.png") ); 
     73    otherM->setIcon( LXDG::findIcon("unknown","") ); 
    7474  docM = new QMenu(tr("Documents"), this); 
    7575    connect(docM,SIGNAL(triggered(QAction*)), this,SLOT(ActionTriggered(QAction*)) ); 
     
    7777  //All Files Button 
    7878  fileB = new LTBWidget(this); 
    79     fileB->setIcon( LXDG::findIcon("user-desktop", ":/images/default-file.png") ); 
     79    fileB->setIcon( LXDG::findIcon("user-desktop", "") ); 
    8080  fileM = new QMenu(this); 
    8181    fileB->setMenu(fileM); 
     
    152152                it->setWhatsThis(exeList[i].filePath); 
    153153                it->setToolTip(exeList[i].name); 
    154                 it->setIcon( LXDG::findIcon(exeList[i].icon, ":/images/default-application.png") ); 
     154                it->setIcon( LXDG::findIcon(exeList[i].icon, "") ); 
     155                if(it->icon().isNull()){ it->setIcon( LXDG::findIcon("application-x-executable","") ); } 
    155156                connect(it, SIGNAL(triggered(QAction*)), this , SLOT(ActionTriggered(QAction*)) ); 
    156157          APPLIST << it; 
Note: See TracChangeset for help on using the changeset viewer.