Changeset 9115ecb


Ignore:
Timestamp:
09/03/14 05:17:10 (7 weeks ago)
Author:
Ken Moore <ken@…>
Branches:
releng/10.0.3
Children:
32d26c5
Parents:
e74dbd3
git-author:
Ken Moore <ken@…> (09/02/14 11:04:25)
git-committer:
Ken Moore <ken@…> (09/03/14 05:17:10)
Message:

A couple more bugfixes for Lumina:
1) Try to use the window name/class to find an icon file before using the generic icon.
2) Return the system tray usage to the hard-coded 0. Apparently the numbers do not correspond to screens, but instead are order of importance (lower is better).This is in contrast to the documentation.
3) Add the special multimedia volume up/down keybindings to lumina-config

Location:
lumina
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • lumina/lumina-config/mainUI.cpp

    r57c164d r9115ecb  
    296296  in.replace("Backspace", "BackSpace"); 
    297297  in.replace("Ins","Insert"); 
     298  in.replace("Volume Up", "XF86AudioRaiseVolume"); //multimedia key 
     299  in.replace("Volume Down", "XF86AudioLowerVolume"); //multimedia key 
    298300  return in; 
    299301} 
     
    309311  in.replace("BackSpace", "Backspace"); 
    310312  //in.replace("Insert", "Ins"); //the "Insert" is better looking 
     313  in.replace("XF86AudioRaiseVolume", "Volume Up"); //multimedia key 
     314  in.replace("XF86AudioLowerVolume", "Volume Down"); //multimedia key 
    311315  return in;     
    312316} 
  • lumina/lumina-desktop/panel-plugins/systemtray/LSysTray.cpp

    re74dbd3 r9115ecb  
    4747void LSysTray::start(){ 
    4848  if(TrayID!=0){ return; } //already running 
    49   TrayID = LX11::startSystemTray(LSession::desktop()->screenNumber(this)); 
     49  TrayID = LX11::startSystemTray(0); //LSession::desktop()->screenNumber(this)); 
    5050  if(TrayID!=0){ 
    5151    XSelectInput(QX11Info::display(), TrayID, InputOutput); //make sure TrayID events get forwarded here 
  • lumina/lumina-desktop/panel-plugins/taskmanager/LTaskButton.cpp

    re74dbd3 r9115ecb  
    9090      this->setToolTip(cname); 
    9191      if(this->icon().isNull()){ 
    92         this->setIcon( LXDG::findIcon("preferences-system-windows","") ); 
    93         noicon=true; 
     92        this->setIcon( LXDG::findIcon(cname.toLower(),"") ); 
     93        if(this->icon().isNull()){ 
     94          this->setIcon( LXDG::findIcon("preferences-system-windows","") ); 
     95          noicon=true; 
     96        } 
    9497      }else{ 
    9598        noicon = false; 
Note: See TracChangeset for help on using the changeset viewer.