Changeset cfe82cd


Ignore:
Timestamp:
07/11/14 10:27:30 (11 months ago)
Author:
Josh <joshms@…>
Branches:
master, enter/10, releng/10.0.3, releng/10.1, releng/10.1.1, releng/10.1.2
Children:
19bab26
Parents:
584ec2cc (diff), 23f86ea (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' of git://github.com/pcbsd/pcbsd

Files:
19 edited

Legend:

Unmodified
Added
Removed
  • lumina/lumina-desktop/panel-plugins/LTBWidget.h

    r4d64bb8 r0e77750  
    3939          //this->setStyleSheet( this->styleSheet()+" LTBWidget::menu-indicator{image: none;}"); 
    4040          cstate = Lumina::NONE; 
     41                 
    4142          this->setPopupMode(QToolButton::InstantPopup); 
    4243          this->setAutoRaise(true); 
  • lumina/lumina-desktop/panel-plugins/battery/LBattery.cpp

    rf912f51 r0e77750  
    1616  //Setup the timer 
    1717  timer = new QTimer(); 
    18   timer->setInterval(5000); //update every 3 seconds 
     18  timer->setInterval(5000); //update every 5 seconds 
    1919  connect(timer,SIGNAL(timeout()), this, SLOT(updateBattery()) ); 
    20   updateBattery(); 
    2120  timer->start(); 
     21  QTimer::singleShot(0,this,SLOT(OrientationChange()) ); //update the sizing/icon 
    2222} 
    2323 
     
    2727} 
    2828 
    29 void LBattery::updateBattery(){ 
     29void LBattery::updateBattery(bool force){ 
    3030  // Get current state of charge 
    3131  //QStringList result = LUtils::getCmdOutput("/usr/sbin/apm", QStringList() << "-al"); 
     
    4040  if(SYSTEM::batteryIsCharging()){ icon = icon+10; } 
    4141  //icon = icon + result.at(0).toInt() * 10; 
    42   if (icon != iconOld) { 
     42  if (icon != iconOld || force) { 
    4343    switch (icon) { 
    4444      case 0: 
  • lumina/lumina-desktop/panel-plugins/battery/LBattery.h

    rf912f51 r0e77750  
    3232         
    3333private slots: 
    34         void updateBattery(); 
     34        void updateBattery(bool force = false); 
    3535        QString getRemainingTime(); 
    36          
     36 
     37public slots: 
     38        void OrientationChange(){ 
     39          if(this->layout()->direction()==QBoxLayout::LeftToRight){ 
     40            label->setFixedSize( QSize(this->height(), this->height()) ); 
     41          }else{ 
     42            label->setFixedSize( QSize(this->width(), this->width()) ); 
     43          } 
     44          updateBattery(true); //force icon refresh 
     45        } 
    3746}; 
    3847 
  • lumina/lumina-desktop/panel-plugins/desktopbar/LDeskBar.cpp

    rf912f51 r0e77750  
    88 
    99LDeskBarPlugin::LDeskBarPlugin(QWidget *parent, QString id, bool horizontal) : LPPlugin(parent, id, horizontal){ 
     10  this->layout()->setContentsMargins(0,0,0,0); 
     11  this->setStyleSheet( "QToolButton::menu-indicator{ image: none; } QToolButton{ padding: 0px; }"); 
    1012  //Find the path to the desktop folder 
    1113  if(QFile::exists(QDir::homePath()+"/Desktop")){ desktopPath = QDir::homePath()+"/Desktop"; } 
     
    2628  connect(watcher, SIGNAL(directoryChanged(QString)), this, SLOT(desktopChanged()) ); 
    2729  QTimer::singleShot(1,this, SLOT(desktopChanged()) ); //make sure to load it the first time 
    28   
     30  QTimer::singleShot(0,this, SLOT(OrientationChange()) ); //adjust sizes/layout 
    2931} 
    3032 
     
    4345void LDeskBarPlugin::initializeDesktop(){ 
    4446  //Applications on the desktop 
    45   appB = new LTBWidget(this); 
     47  appB = new QToolButton(this); 
    4648    appB->setIcon( LXDG::findIcon("favorites", "") ); 
     49    appB->setToolButtonStyle(Qt::ToolButtonIconOnly); 
     50    appB->setAutoRaise(true); 
     51    appB->setPopupMode(QToolButton::InstantPopup); 
    4752  appM = new QMenu(this); 
    4853    appB->setMenu(appM); 
     
    5055    connect(appM,SIGNAL(triggered(QAction*)),this,SLOT(ActionTriggered(QAction*)) ); 
    5156  //Directories on the desktop 
    52   dirB = new LTBWidget(this); 
     57  dirB = new QToolButton(this); 
    5358    dirB->setIcon( LXDG::findIcon("folder", "") ); 
     59    dirB->setToolButtonStyle(Qt::ToolButtonIconOnly); 
     60    dirB->setAutoRaise(true); 
     61    dirB->setPopupMode(QToolButton::InstantPopup); 
    5462  dirM = new QMenu(this); 
    5563    dirB->setMenu(dirM); 
     
    7684    docM->setIcon( LXDG::findIcon("x-office-document","") ); 
    7785  //All Files Button 
    78   fileB = new LTBWidget(this); 
     86  fileB = new QToolButton(this); 
    7987    fileB->setIcon( LXDG::findIcon("user-desktop", "") ); 
     88    fileB->setToolButtonStyle(Qt::ToolButtonIconOnly); 
     89    fileB->setAutoRaise(true); 
     90    fileB->setPopupMode(QToolButton::InstantPopup); 
    8091  fileM = new QMenu(this); 
    8192    fileB->setMenu(fileM); 
     
    149160        else{ 
    150161          //Create a new LTBWidget for this app 
    151           LTBWidget *it = new LTBWidget(this); 
     162          QToolButton *it = new QToolButton(this); 
    152163                it->setWhatsThis(exeList[i].filePath); 
    153164                it->setToolTip(exeList[i].name); 
    154165                it->setIcon( LXDG::findIcon(exeList[i].icon, "") ); 
     166                it->setToolButtonStyle(Qt::ToolButtonIconOnly); 
     167                it->setAutoRaise(true); 
     168                it->setPopupMode(QToolButton::InstantPopup); 
    155169                if(it->icon().isNull()){ it->setIcon( LXDG::findIcon("application-x-executable","") ); } 
    156170                connect(it, SIGNAL(triggered(QAction*)), this , SLOT(ActionTriggered(QAction*)) ); 
  • lumina/lumina-desktop/panel-plugins/desktopbar/LDeskBar.h

    rf912f51 r0e77750  
    2121#include <QHBoxLayout> 
    2222#include <QIcon> 
    23 #include <QToolBar> 
     23#include <QToolButton> 
    2424#include <QDebug> 
    2525 
     
    2828 
    2929// local includes 
    30 #include "../LTBWidget.h" 
     30//#include "../LTBWidget.h" 
    3131#include "../LPPlugin.h" 
    3232 
     
    4242        QFileSystemWatcher *watcher; 
    4343        //Special toolbuttons and menus 
    44         LTBWidget *appB, *fileB, *dirB; 
     44        QToolButton *appB, *fileB, *dirB; 
    4545        QMenu *appM, *dirM, *audioM, *videoM, *pictureM, *fileM, *otherM, *docM; 
    4646        QStringList audioFilter, videoFilter, pictureFilter, docsFilter; 
    4747        QFileInfoList totals; 
    48         QList<LTBWidget*> APPLIST; 
     48        QList<QToolButton*> APPLIST; 
    4949         
    5050        void initializeDesktop(); 
     
    6161        void desktopChanged(); 
    6262         
     63public slots: 
     64        void OrientationChange(){ 
     65          QSize sz; 
     66          if(this->layout()->direction()==QBoxLayout::LeftToRight){ 
     67            this->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::MinimumExpanding); 
     68            sz = QSize(this->height(), this->height()); 
     69          }else{ 
     70            this->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Preferred); 
     71            sz = QSize(this->width(), this->width()); 
     72          } 
     73          appB->setIconSize(sz); 
     74          fileB->setIconSize(sz); 
     75          dirB->setIconSize(sz); 
     76          for(int i=0; i<APPLIST.length(); i++){ 
     77            APPLIST[i]->setIconSize(sz); 
     78          } 
     79          this->layout()->update(); 
     80        } 
    6381}; 
    6482 
  • lumina/lumina-desktop/panel-plugins/desktopswitcher/LDesktopSwitcher.cpp

    rf912f51 r0e77750  
    99LDesktopSwitcher::LDesktopSwitcher(QWidget *parent, QString id, bool horizontal) : LPPlugin(parent, id, horizontal) { 
    1010  iconOld = -1; 
    11  
     11  this->setStyleSheet( "QToolButton::menu-indicator{ image: none; } QToolButton{padding: 0px;}"); 
    1212  //Setup the widget 
    13   label = new LTBWidget(this); 
     13  label = new QToolButton(this); 
     14  label->setPopupMode(QToolButton::InstantPopup); 
     15  label->setAutoRaise(true); 
     16  label->setToolButtonStyle(Qt::ToolButtonIconOnly); 
    1417  label->setIcon( LXDG::findIcon("preferences-desktop-display-color", "") ); 
    1518  label->setToolTip(QString("Workspace 1")); 
     
    2326 
    2427  QTimer::singleShot(500, this, SLOT(createMenu()) ); //needs a delay to make sure it works right the first time 
     28  QTimer::singleShot(0,this, SLOT(OrientationChange()) ); //adjust icon size 
    2529} 
    2630 
  • lumina/lumina-desktop/panel-plugins/desktopswitcher/LDesktopSwitcher.h

    rf912f51 r0e77750  
    1313//#include <QX11Info> 
    1414#include <QMenu> 
     15#include <QToolButton> 
    1516 
    1617#include <LuminaUtils.h> 
     
    1819#include <LuminaX11.h> 
    1920 
    20 #include "../LTBWidget.h" 
     21//#include "../LTBWidget.h" 
    2122#include "../LPPlugin.h" 
    2223 
     
    4849        void createMenu(); 
    4950        void menuActionTriggered(QAction*); 
     51 
     52public slots: 
     53        void OrientationChange(){ 
     54          QSize sz; 
     55          if(this->layout()->direction()==QBoxLayout::LeftToRight){ 
     56            this->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::MinimumExpanding); 
     57            sz = QSize(this->height(), this->height()); 
     58          }else{ 
     59            this->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Preferred); 
     60            sz = QSize(this->width(), this->width()); 
     61          } 
     62          label->setIconSize(sz); 
     63          this->layout()->update(); 
     64        } 
    5065}; 
    5166 
  • lumina/lumina-desktop/panel-plugins/spacer/LSpacer.h

    rf912f51 r0e77750  
    2020        } 
    2121        ~LSpacerPlugin(){} 
     22                 
     23public slots: 
     24        void OrientationChange(){ 
     25          if(this->layout()->direction()==QBoxLayout::LeftToRight){ //horizontal 
     26            this->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred); 
     27          }else{ //vertical 
     28            this->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Expanding); 
     29          } 
     30        } 
    2231}; 
    2332 
  • lumina/lumina-desktop/panel-plugins/systemtray/LSysTray.h

    rc78ef7c r0e77750  
    4545           LI->setDirection( this->layout()->direction() ); 
    4646           //Re-adjust the maximum widget size 
     47          int sz; 
    4748          if(this->layout()->direction()==QBoxLayout::LeftToRight){ 
    4849            this->setMaximumSize( trayIcons.length()*this->height(), 10000); 
     50            sz = this->height()-2*frame->frameWidth(); 
    4951          }else{ 
    5052            this->setMaximumSize(10000, trayIcons.length()*this->width()); 
     53            sz = this->width()-2*frame->frameWidth(); 
     54          } 
     55          for(int i=0; i<trayIcons.length(); i++){ 
     56            trayIcons[i]->setSizeSquare(sz); 
     57            trayIcons[i]->updateIcon(); 
    5158          } 
    5259        } 
  • lumina/lumina-desktop/panel-plugins/systemtray/TrayIcon.h

    rbc4f0662 r0e77750  
    3636public slots: 
    3737        void detachApp(); 
     38        void updateIcon(); 
    3839 
    3940private: 
     
    4243private slots: 
    4344        void slotAttach(); //so that the attachment can be done in a new thread 
    44         void updateIcon(); 
     45         
    4546 
    4647protected: 
  • lumina/lumina-desktop/panel-plugins/taskmanager/LTaskButton.cpp

    rb6c1838 r0e77750  
    8282      //Update the button visuals from the first window 
    8383      this->setIcon(WINLIST[i].icon()); 
    84       cname = WINLIST[i].Class();    
    85       this->setText(cname); 
     84      cname = WINLIST[i].Class(); 
     85      this->setToolTip(cname); 
     86      if(this->icon().isNull()){ 
     87        this->setIcon( LXDG::findIcon("preferences-system-windows","") ); 
     88        noicon=true; 
     89      }else{ 
     90        noicon = false; 
     91      } 
    8692    } 
    8793    winMenu->addAction( WINLIST[i].icon(), WINLIST[i].text() ); 
     
    101107    this->setPopupMode(QToolButton::DelayedPopup); 
    102108    this->setMenu(actMenu); 
    103     this->setText( this->fontMetrics().elidedText(WINLIST[0].text(), Qt::ElideRight ,80) ); 
     109    if(noicon){ this->setText( this->fontMetrics().elidedText(cname, Qt::ElideRight ,80) ); } 
     110    else{ this->setText(""); } 
    104111  }else if(WINLIST.length() > 1){ 
    105112    //multiple windows 
    106113    this->setPopupMode(QToolButton::InstantPopup); 
    107114    this->setMenu(winMenu); 
    108     this->setText( this->fontMetrics().elidedText(cname, Qt::ElideRight ,80) +" ("+QString::number(WINLIST.length())+")" ); 
     115    if(noicon){ this->setText( this->fontMetrics().elidedText(cname, Qt::ElideRight ,80) +" ("+QString::number(WINLIST.length())+")" ); } 
     116    else{ this->setText("("+QString::number(WINLIST.length())+")"); } 
    109117  } 
    110118  this->setState(showstate); //Make sure this is after the button setup so that it properly sets the margins/etc 
  • lumina/lumina-desktop/panel-plugins/taskmanager/LTaskButton.h

    re6e5ccdf r0e77750  
    4646        LWinInfo cWin; 
    4747        QString cname; //class name for the entire button 
     48        bool noicon; 
    4849 
    4950        LWinInfo currentWindow(); //For getting the currently-active window 
  • lumina/lumina-desktop/panel-plugins/taskmanager/LTaskManagerPlugin.cpp

    rf912f51 r0e77750  
    1414        connect(timer, SIGNAL(timeout()), this, SLOT(UpdateButtons()) );  
    1515  connect(LSession::instance(), SIGNAL(WindowListEvent()), this, SLOT(checkWindows()) ); 
    16   this->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred); 
    17   this->layout()->setAlignment(Qt::AlignLeft); 
     16  this->layout()->setContentsMargins(0,0,0,0); 
    1817  QTimer::singleShot(0,this, SLOT(UpdateButtons()) ); //perform an initial sync 
     18  QTimer::singleShot(0,this, SLOT(OrientationUpdate()) ); //setup horizontal/vertical settings 
    1919} 
    2020 
     
    8484      LTaskButton *but = new LTaskButton(this); 
    8585        but->addWindow( LWinInfo(winlist[i]) ); 
     86        if(this->layout()->direction()==QBoxLayout::LeftToRight){ 
     87            but->setIconSize(QSize(this->height(), this->height())); 
     88        }else{ 
     89            but->setIconSize(QSize(this->width(), this->width())); 
     90        } 
    8691      this->layout()->addWidget(but); 
    8792      BUTTONS << but; 
  • lumina/lumina-desktop/panel-plugins/taskmanager/LTaskManagerPlugin.h

    rf912f51 r0e77750  
    4747          UpdateButtons(); 
    4848        } 
    49  
     49        void OrientationChange(){ 
     50          if(this->layout()->direction()==QBoxLayout::LeftToRight){ //horizontal 
     51            this->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred); 
     52            this->layout()->setAlignment(Qt::AlignLeft); 
     53            QSize sz(this->height(), this->height()); 
     54            for(int i=0; i<BUTTONS.length(); i++){ 
     55              BUTTONS[i]->setToolButtonStyle(Qt::ToolButtonTextBesideIcon); 
     56              BUTTONS[i]->setIconSize(sz); 
     57            } 
     58          }else{ //vertical 
     59            this->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Expanding); 
     60            this->layout()->setAlignment(Qt::AlignTop); 
     61            QSize sz(this->width(), this->width()); 
     62            for(int i=0; i<BUTTONS.length(); i++){ 
     63              BUTTONS[i]->setToolButtonStyle(Qt::ToolButtonTextUnderIcon); 
     64              BUTTONS[i]->setIconSize(sz); 
     65            } 
     66          } 
     67        } 
    5068}; 
    5169#endif 
  • lumina/lumina-desktop/panel-plugins/taskmanager/LWinInfo.h

    re6e5ccdf r0e77750  
    5353          QIcon ico = LX11::WindowIcon(window); 
    5454          //Check for a null icon, and supply one if necessary 
    55           if(ico.isNull()){ ico = LXDG::findIcon("preferences-system-windows",""); } 
     55          //if(ico.isNull()){ ico = LXDG::findIcon("preferences-system-windows",""); } 
    5656          return ico; 
    5757        } 
  • lumina/lumina-desktop/panel-plugins/userbutton/LUserButton.cpp

    r307712c r0e77750  
    77#include "LUserButton.h" 
    88 
    9 LUserButton::LUserButton(QWidget *parent) : LTBWidget(parent){ 
     9LUserButton::LUserButton(QWidget *parent) : QToolButton(parent){ 
    1010  //Initialize the submenu's 
    1111  //Initialize the main menu 
     
    2121  this->setIcon( LXDG::findIcon("user-identity", ":/images/default-user.png") ); 
    2222  this->setText( SYSTEM::user() ); 
    23   this->setToolButtonStyle(Qt::ToolButtonTextBesideIcon); 
    24   //this->setMenu(mainMenu); 
    2523         
    2624  //Setup the signals/slots 
  • lumina/lumina-desktop/panel-plugins/userbutton/LUserButton.h

    rf912f51 r0e77750  
    1717#include <QSettings> 
    1818#include <QCoreApplication> 
     19#include <QToolButton> 
    1920 
    2021// Lumina-desktop includes 
    2122#include "../../Globals.h" 
    2223#include "../LPPlugin.h" //main plugin widget 
    23 #include "../LTBWidget.h" //visual plugin button 
     24//#include "../LTBWidget.h" //visual plugin button 
    2425#include "../../LSession.h" 
    2526 
     
    2728#include "LuminaXDG.h" 
    2829 
    29 class LUserButton : public LTBWidget{ 
     30class LUserButton : public QToolButton{ 
    3031        Q_OBJECT 
    3132public: 
     
    5657         
    5758        void Logout(); 
    58         //void Restart(); 
    59         //void Shutdown(); 
    6059}; 
    6160 
     
    6867public: 
    6968        LUserButtonPlugin(QWidget *parent = 0, QString id = "userbutton", bool horizontal=true) : LPPlugin(parent, id, horizontal){ 
     69          this->setStyleSheet( "QToolButton::menu-indicator{ image: none; } QToolButton{padding: 0px;}"); 
    7070          button = new LUserButton(parent); 
     71          button->setAutoRaise(true); 
     72          button->setPopupMode(QToolButton::InstantPopup); 
     73          this->layout()->setContentsMargins(0,0,0,0); 
    7174          this->layout()->addWidget(button); 
     75          QTimer::singleShot(0,this, SLOT(OrientationChange())); 
    7276        } 
    7377        ~LUserButtonPlugin(){ 
     
    7781          button->UpdateMenu(); 
    7882        } 
     83         
    7984        void ThemeChange(){ 
    8085          button->UpdateMenu(); 
     86        } 
     87         
     88        void OrientationChange(){ 
     89          QSize sz; 
     90          if(this->layout()->direction()==QBoxLayout::LeftToRight){ 
     91            this->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::MinimumExpanding); 
     92            button->setToolButtonStyle(Qt::ToolButtonTextBesideIcon); 
     93            sz = QSize(this->height(), this->height()); 
     94          }else{ 
     95            this->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Preferred); 
     96            button->setToolButtonStyle(Qt::ToolButtonTextUnderIcon); 
     97            sz = QSize(this->width(), this->width()); 
     98          } 
     99          button->setIconSize(sz); 
     100          this->layout()->update(); 
    81101        } 
    82102}; 
  • src-qt4/pc-softwaremanager/mainUI.cpp

    r84b0c07 re83d84a  
    12591259  QStringList txt = ui->tool_app_cScreen->text().split("/"); 
    12601260  if(txt.length()!=2){ return; } //invalid text for some reason 
    1261   if(txt[0]!="1"){ ui->tool_app_nextScreen->setEnabled(true); } 
    1262   if(txt[0] != txt[1]){ ui->tool_app_prevScreen->setEnabled(true); } 
     1261  if(txt[0]!="1"){ ui->tool_app_prevScreen->setEnabled(true); } 
     1262  if(txt[0].toInt() < txt[1].toInt()){ ui->tool_app_nextScreen->setEnabled(true); } 
    12631263} 
    12641264 
  • pbi-modules/AppCafe-index

    ra92fbd6 r584ec2cc  
    66# Highlight=<origin>:::: 
    77# Recommended=<origin>:::: 
    8 New=emulators/i386-wine-devel:::: 
    9 New=x11/lumina:::: 
    10 New=emulators/virtualbox-ose:::: 
    11 New=devel/qdevelop:::: 
    12 New=x11/gnome3:::: 
    13 Highlight=deskutils/calibre:::: 
     8New=emulators/databases/grass/:::: 
     9New=cad/librecad:::: 
     10New=cad/leocad:::: 
     11New=biology/linux-foldingathome/:::: 
     12New=biology/emboss:::: 
     13Highlight=astronomy/celestia:::: 
    1414Highlight=audio/amarok-kde4:::: 
    1515Highlight=emulators/i386-wine-devel:::: 
Note: See TracChangeset for help on using the changeset viewer.