Changeset 51dc66f


Ignore:
Timestamp:
05/16/14 12:11:42 (11 months ago)
Author:
Ken Moore <ken@…>
Branches:
master, releng/10.0.2, releng/10.0.3, releng/10.1, releng/10.1.1
Children:
539665c
Parents:
4d64bb8
Message:

Make the final changes so that the fluxbox toolbar is now disabled by default.
1) The fluxbox init file was renamed to "~/.lumina/fluxbox-init" to ensure that people transition to the new defaults for fluxbox (otherwise you get conflicts between system trays).
2) Enable the taskmanager and systemtray panel plugins by default. The system tray plugin is still a bit rough, but it works well enough to enable it for now (even though it is not pretty yet)
3) Make sure that the task manager only displays the window on the current virtual desktop (caught that during my final checks)

Location:
lumina
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • lumina/libLumina/LuminaX11.cpp

    rb6c1838 r51dc66f  
    1414   
    1515  //Validate windows 
     16  int desk = LX11::GetCurrentDesktop(); 
    1617  for(int i=0; i<output.length(); i++){ 
    1718    bool remove=false; 
    1819    QString name = LX11::WindowClass(output[i]); 
    1920    if(output[i] == 0){ remove=true; } 
     21    else if( desk >= 0 && LX11::WindowDesktop(output[i]) != desk){ remove = true; } 
    2022    else if( name.startsWith("Lumina-DE") || name.isEmpty() ){  
    2123        //qDebug() << "Trim Window:" << name; 
     
    388390} 
    389391 
     392// ===== GetNumberOfDesktops() ===== 
     393int LX11::WindowDesktop(WId win){ 
     394  int number = -1; 
     395  Atom a = XInternAtom(QX11Info::display(), "_NET_WM_DESKTOP", true); 
     396  Atom realType; 
     397  int format; 
     398  unsigned long num, bytes; 
     399  unsigned char *data = 0; 
     400  int status = XGetWindowProperty(QX11Info::display(), win, a, 0L, (~0L), 
     401             false, AnyPropertyType, &realType, &format, &num, &bytes, &data); 
     402  if( (status >= Success) && (num > 0) ){ 
     403    number = *data; 
     404    XFree(data); 
     405  } 
     406  return number; 
     407} 
    390408 
    391409// ===== GetWindowState() ===== 
  • lumina/libLumina/LuminaX11.h

    re6e5ccdf r51dc66f  
    7474        static QString WindowIconName(WId);     // short name (untranslated) 
    7575        static QString WindowVisibleIconName(WId); // short name (translated) 
    76         static QIcon WindowIcon(WId);           // Icon for the window 
     76        static QIcon WindowIcon(WId);                   // Icon for the window 
     77        static int WindowDesktop(WId);                  // Which virtual desktop the window is on 
    7778        static WINDOWSTATE GetWindowState(WId win); //State of activity 
    7879        static WId leaderWindow(WId);                   //Get the main window if this one is a redirect 
  • lumina/lumina-config/mainUI.cpp

    r4d64bb8 r51dc66f  
    249249  // - plugins 
    250250  QStringList plugs = settings->value(pprefix+"pluginlist",QStringList()).toStringList(); 
    251   if(plugs.isEmpty() && defaultpanel){ plugs << "userbutton" << "desktopbar" << "desktopswitcher" << "spacer" << "clock"; } 
     251  if(plugs.isEmpty() && defaultpanel){ plugs << "userbutton" << "desktopbar" << "desktopswitcher" << "taskmanager" << "spacer" << "systemtray" << "clock"; } 
    252252  ui->list_tb_plugins->clear(); 
    253253  for(int i=0; i<plugs.length(); i++){ 
  • lumina/lumina-desktop/LPanel.cpp

    r4d64bb8 r51dc66f  
    8181  QStringList plugins = settings->value(PPREFIX+"pluginlist", QStringList()).toStringList(); 
    8282  if(defaultpanel && plugins.isEmpty()){ 
    83     plugins << "userbutton" << "desktopbar" << "desktopswitcher" << "spacer" << "clock"; 
     83    plugins << "userbutton" << "desktopbar" << "desktopswitcher" << "taskmanager" << "spacer" << "systemtray" << "clock"; 
    8484    if(SYSTEM::hasBattery()){ plugins << "battery"; } 
    8585  }else if(defaultpanel && !plugins.contains("userbutton") ){ 
  • lumina/lumina-desktop/WMProcess.cpp

    r9e67ef75 r51dc66f  
    6666    //if(QFile::exists(confDir+"/rc.xml")){ QFile::rename(confDir+"/rc.xml",confDir+"/openbox-rc.xml"); } 
    6767    //QFile::copy(confDir+"/lumina-rc.xml",confDir+"/rc.xml"); 
    68     #ifdef __linux 
    69     cmd = "/usr/bin/openbox --debug --sm-disable --config-file "+confDir+"/lumina-rc.xml"; 
    70     #else 
    71     cmd = "/usr/local/bin/openbox --debug --sm-disable --config-file "+confDir+"/lumina-rc.xml"; 
    72     #endif 
     68    cmd = "openbox --debug --sm-disable --config-file "+confDir+"/lumina-rc.xml"; 
    7369  }else if(WM=="fluxbox"){ 
    7470    QString confDir = QDir::homePath()+"/.lumina"; 
    7571    if(!QFile::exists(confDir)){ QDir dir(confDir); dir.mkpath(confDir); } 
    76     if(!QFile::exists(confDir+"/fluxbox-init-rc")){ 
    77       QFile::copy(":/fluxboxconf/fluxbox-init-rc",confDir+"/fluxbox-init-rc"); 
    78       QFile::setPermissions(confDir+"/fluxbox-init-rc", QFile::ReadOwner | QFile::WriteOwner | QFile::ReadUser | QFile::ReadOther | QFile::ReadGroup); 
     72    if(!QFile::exists(confDir+"/fluxbox-init")){ 
     73      QFile::copy(":/fluxboxconf/fluxbox-init-rc",confDir+"/fluxbox-init"); 
     74      QFile::setPermissions(confDir+"/fluxbox-init", QFile::ReadOwner | QFile::WriteOwner | QFile::ReadUser | QFile::ReadOther | QFile::ReadGroup); 
    7975    } 
    8076    /*if(!QFile::exists(confDir+"lumina-menu.xml")){ 
     
    8278      QFile::setPermissions(confDir+"/lumina-menu.xml", QFile::ReadOwner | QFile::WriteOwner | QFile::ReadUser | QFile::ReadOther | QFile::ReadGroup); 
    8379    }*/ 
    84     #ifdef __linux 
    85     cmd = "/usr/bin/fluxbox -rc "+confDir+"/fluxbox-init-rc"; 
    86     #else 
    87     cmd = "/usr/local/bin/fluxbox -rc "+confDir+"/fluxbox-init-rc"; 
    88     #endif 
     80    cmd = "fluxbox -rc "+confDir+"/fluxbox-init"; 
    8981  } 
    9082  return cmd; 
  • lumina/lumina-desktop/fluxboxconf/fluxbox-init-rc

    r77631c2 r51dc66f  
    1212session.screen0.toolbar.placement:      BottomCenter 
    1313session.screen0.toolbar.alpha:  150 
    14 session.screen0.toolbar.visible:        true 
     14session.screen0.toolbar.visible:        false 
    1515session.screen0.toolbar.layer:  Dock 
    1616session.screen0.toolbar.height: 0 
    17 session.screen0.toolbar.tools:  iconbar, systemtray 
     17session.screen0.toolbar.tools: 
    1818session.screen0.iconbar.iconWidth:      128 
    1919session.screen0.iconbar.alignment:      Left 
    2020session.screen0.iconbar.usePixmap:      true 
    2121session.screen0.iconbar.iconTextPadding:        10 
    22 session.screen0.iconbar.mode:   {static groups} (workspace) 
     22session.screen0.iconbar.mode:   workspace 
    2323session.screen0.slit.direction: Vertical 
    2424session.screen0.slit.onTop:     False 
     
    4646session.screen0.fullMaximization:       false 
    4747session.screen0.defaultDeco:    NORMAL 
    48 session.screen0.workspaceNames: one,two,three,four, 
     48session.screen0.workspaceNames: one,two 
    4949session.screen0.maxIgnoreIncrement:     true 
    5050session.screen0.edgeSnapThreshold:      10 
    51 session.screen0.workspaces:     4 
     51session.screen0.workspaces:     2 
    5252session.screen0.noFocusWhileTypingDelay:        0 
    5353session.screen0.focusNewWindows:        true 
     
    6969session.styleFile:      /usr/local/share/fluxbox/styles/slim_blue 
    7070session.doubleClickInterval:    250 
    71 session.iconbar:        true 
     71session.iconbar:        false 
    7272session.cacheLife:      5 
    7373session.ignoreBorder:   false 
Note: See TracChangeset for help on using the changeset viewer.