Changeset 998ceca


Ignore:
Timestamp:
02/12/14 05:38:54 (6 months ago)
Author:
Kris Moore <kris@…>
Branches:
master, releng/10.0.1, releng/10.0.2
Children:
4f9718b, 6ccc124
Parents:
138f3fe (diff), d4fb974 (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 github.com:pcbsd/pcbsd

Files:
1 added
19 edited

Legend:

Unmodified
Added
Removed
  • src-qt4/libpcbsd/utils/pcbsd-utils.h

    r7c7f02c r3f6d079  
    5151    bool    isActive;      ///< True if DE is active now 
    5252    bool    isXDG;         ///< True if DE is XDG compatible 
     53    QString ConfigurationApplication; 
    5354    QString TerminalCommand; 
    5455    QString TerminalTitleKey; 
  • src-qt4/libpcbsd/utils/utils.cpp

    re3174a0a r3f6d079  
    837837    static const char* const DE_FILE_MANAGER = "File manager:"; 
    838838    static const char* const DE_TERMINAL = "Terminal:"; 
     839    static const char* const DE_CONFIG_APP = "Configuration app:"; 
    839840 
    840841    retVal.clear(); 
     
    871872        TRY_GET_VALUE_STR(DE_FILE_MANAGER, FileManager); 
    872873        TRY_GET_VALUE_STR(DE_TERMINAL, TerminalCommand); 
     874        TRY_GET_VALUE_STR(DE_CONFIG_APP, ConfigurationApplication); 
    873875        //TODO: another fields 
    874876    }//while process output reading 
  • src-qt4/pc-controlpanel/controlpanel.qrc

    rd2b761b r1c61936  
    11<RCC> 
    2   <qresource prefix="/images"> 
    3     <file>images/cinnamon.png</file> 
    4     <file>images/mate.png</file> 
    5     <file>icon.png</file> 
    6     <file>images/refresh.png</file> 
    7     <file>images/e16.png</file> 
    8     <file>images/gnome.png</file> 
    9     <file>images/kde.png</file> 
    10     <file>images/lxde.png</file> 
    11     <file>images/xfce.png</file> 
    12     <file>images/all_desktops.png</file> 
    13     <file>images/unsupported_de.png</file> 
    14     <file>images/security-medium.png</file> 
    15     <file>images/object-locked.png</file> 
    16   </qresource> 
     2    <qresource prefix="/images"> 
     3        <file>images/cinnamon.png</file> 
     4        <file>images/mate.png</file> 
     5        <file>icon.png</file> 
     6        <file>images/refresh.png</file> 
     7        <file>images/e16.png</file> 
     8        <file>images/gnome.png</file> 
     9        <file>images/kde.png</file> 
     10        <file>images/lxde.png</file> 
     11        <file>images/xfce.png</file> 
     12        <file>images/all_desktops.png</file> 
     13        <file>images/unsupported_de.png</file> 
     14        <file>images/security-medium.png</file> 
     15        <file>images/object-locked.png</file> 
     16        <file>images/config.png</file> 
     17    </qresource> 
    1718</RCC> 
  • src-qt4/pc-controlpanel/deinfo.cpp

    r11d9290 r1c61936  
    11/************************************************************************** 
    2 *   Copyright (C) 2011 by Yuri Momotyuk                                   * 
    3 *   yurkis@gmail.com                                                      * 
     2*   Copyright (C) 2011-2014 by Yuri Momotyuk                              * 
     3*   yurkis@pcbsd.org                                                      * 
    44*                                                                         * 
    55*   Permission is hereby granted, free of charge, to any person obtaining * 
     
    2424 
    2525#include "deinfo.h" 
    26 #include <QProcess> 
    27 #include <QStringList> 
    28  
    29 static const char* const DE_NAME = "DE name:"; 
    30 static const char* const DE_ACTIVE = "Current DE:"; 
    31 static const char* const DE_XDG = "XDG compatible:"; 
    32 static const char* const DE_INSTALLED = "Installed:"; 
    33 static const char* const DE_SUDO = "Sudo command:"; 
    3426 
    3527/////////////////////////////////////////////////////////////////////////////// 
    36 #define TRY_GET_VALUE_STR(val_name, field)\ 
    37 if (Str.contains(val_name)){\ 
    38                             Entry.field = Str.replace(val_name,"").trimmed();\ 
    39                                           continue;}\ 
    40  
    41 #define TRY_GET_VALUE_BOOL(val_name, field, true_val)\ 
    42 if (Str.contains(val_name)){\ 
    43                             Entry.field = Str.replace(val_name,"").trimmed().toLower() == QString(true_val).toLower();\ 
    44                                           continue;}\ 
    45  
    46 int CDEList::refresh(bool isAll) 
     28int CDEList::refresh(/*bool isAll*/) 
    4729{ 
    4830    mvDE.clear(); 
    4931 
    50     QStringList flags; 
    51     if (isAll) 
    52         flags<<"-a"; 
    53     else 
    54         flags<<"-i"; 
    55  
    56     QProcess* deinfo = new QProcess(); 
    57     deinfo->setProcessChannelMode(QProcess::MergedChannels); 
    58     deinfo->start(QString("/usr/local/bin/de-info"), flags); 
    59     deinfo->waitForFinished(-1); 
    60     CDEInfo Entry; 
    61     QString Str; 
    62  
    63     while ( deinfo->canReadLine() ) 
    64     { 
    65         Str = deinfo->readLine().simplified(); 
    66         //qDebug() << "de-info line:" << Str; 
    67         if (Str.contains(DE_NAME)) 
    68         { 
    69             if (Entry.mName.length()) 
    70             { 
    71                 mvDE.push_back(Entry); 
    72                 Entry = CDEInfo(); 
    73             } 
    74             Entry.mName = Str.replace(DE_NAME,"").trimmed(); 
    75             continue; 
    76         }//if found 'DE name' 
    77  
    78         TRY_GET_VALUE_BOOL(DE_ACTIVE, misActive, "yes"); 
    79         TRY_GET_VALUE_BOOL(DE_INSTALLED, misInstalled, "yes"); 
    80         TRY_GET_VALUE_STR(DE_SUDO, mSudoCommand); 
    81     }//while process output reading 
    82  
    83     if (Entry.mName.length()) 
    84         mvDE.push_back(Entry); 
     32    mvDE = pcbsd::Utils::installedDesktops(); 
    8533 
    8634    return mvDE.size(); 
     
    8836 
    8937/////////////////////////////////////////////////////////////////////////////// 
    90 CDEInfo* CDEList::active() 
     38pcbsd::DesktopEnvironmentInfo* CDEList::active() 
    9139{ 
    9240    for(int i =0; i<mvDE.size(); i++) 
    9341    { 
    94         if (mvDE[i].misActive) 
     42        if (mvDE[i].isActive) 
    9543            return &mvDE[i]; 
    9644    } 
     
    9947 
    10048/////////////////////////////////////////////////////////////////////////////// 
    101 CDEInfo* CDEList::byName(QString Name) 
     49pcbsd::DesktopEnvironmentInfo* CDEList::byName(QString Name) 
    10250{ 
    10351    for (int i =0; i<mvDE.size(); i++) 
    10452    { 
    105         if (!mvDE[i].mName.compare(Name.trimmed(), Qt::CaseInsensitive)) 
     53        if (!mvDE[i].Name.compare(Name.trimmed(), Qt::CaseInsensitive)) 
    10654            return &mvDE[i]; 
    10755    } 
  • src-qt4/pc-controlpanel/deinfo.h

    r11d9290 r1c61936  
    11/************************************************************************** 
    2 *   Copyright (C) 2011 by Yuri Momotyuk                                   * 
    3 *   yurkis@gmail.com                                                      * 
     2*   Copyright (C) 2011-2014 by Yuri Momotyuk                              * 
     3*   yurkis@pcbsd.org                                                      * 
    44*                                                                         * 
    55*   Permission is hereby granted, free of charge, to any person obtaining * 
     
    2929#include <QVector> 
    3030#include <QDebug> 
    31  
    32 //! Class that holds info about DE 
    33 struct CDEInfo 
    34 { 
    35 public: 
    36     QString mName;          ///< De name 'Gnome', 'KDE', etc 
    37     QString mSudoCommand;   ///< native sudo command 'gtksu %s' for example 
    38     bool    misInstalled;   ///< True if DE installed 
    39     bool    misActive;      ///< True if DE is active now 
    40     bool    misXDG;         ///< True if DE is XDG compatible 
    41  
    42     CDEInfo(){ 
    43         misInstalled=false; 
    44         misActive=false; 
    45         misXDG=false; 
    46     } 
    47 }; 
     31#include "pcbsd-utils.h" 
    4832 
    4933//! Class that holds list of desktop environments 
     
    5741                     it fills by installed DEs 
    5842    */ 
    59     int refresh(bool isAll=false); 
     43    int refresh(/*bool isAll=false*/); 
    6044 
    6145    /** 
     
    6751        } 
    6852 
    69     CDEInfo& operator[](int idx) 
     53    pcbsd::DesktopEnvironmentInfo& operator[](int idx) 
    7054        { 
    7155            return mvDE[idx]; 
     
    7761      @return Pointer to description of active DE or NULL if active DE unknown 
    7862    */ 
    79     CDEInfo* active(); 
     63    pcbsd::DesktopEnvironmentInfo* active(); 
    8064 
    8165    /** 
     
    8670      @return Pointer to DE description. NULL if not found 
    8771    */ 
    88     CDEInfo* byName(QString Name); 
     72    pcbsd::DesktopEnvironmentInfo* byName(QString Name); 
    8973 
    9074protected: 
    91     QVector <CDEInfo> mvDE; 
     75    QVector <pcbsd::DesktopEnvironmentInfo> mvDE; 
    9276}; 
    9377 
  • src-qt4/pc-controlpanel/item.cpp

    r5e46078 rffbf59c  
    6969    misUseXDG = false; 
    7070    if (InstalledDEList.active()) 
    71         misUseXDG = InstalledDEList.active()->misXDG; 
     71        misUseXDG = InstalledDEList.active()->isXDG; 
    7272 
    7373    misXDGLaunch = false; 
  • src-qt4/pc-controlpanel/mainwnd.cpp

    re845994 r1c61936  
    2525#include <QDebug> 
    2626#include <QToolTip> 
     27#include <QPainter> 
     28 
    2729#include "mainwnd.h" 
    2830#include "ui_mainwnd.h" 
     
    4547#define PBI_INSTALLED_DIRECTORY "/var/db/pbi/installed" 
    4648 
     49#define DE_CONFIG_APP_MARK ":/images/images/config.png" 
     50 
    4751static QString DETEXT; 
    4852 
     
    6367    { 
    6468        mCurrentDE = *InstalledDEList.active(); 
    65         mvEnabledDE.push_back(mCurrentDE.mName); 
    66         qDebug() << "Current DE: " << mCurrentDE.mName; 
     69        mvEnabledDE.push_back(mCurrentDE.Name); 
    6770    }     
    6871 
     
    7275    setupDEChooser(); 
    7376    fillGroups(); 
     77 
     78    refreshDEConfigureApp(); 
    7479 
    7580    QPalette tP; 
     
    101106void MainWnd::setupGroups() 
    102107{ 
    103  
    104     //qDebug() << "Running setup groups"; 
    105108    setupGroup(&SoftwareList, ui->SoftwareGBox); 
    106109    setupGroup(&SystemList, ui->SystemGBox); 
     
    118121        layout->addWidget(*List); 
    119122        Parrent->setLayout(layout);  
    120         //qDebug() << "SetupGroup"; 
    121123    QObject::connect(*List, SIGNAL(itemActivated(QListWidgetItem*)), this, SLOT(on_itemActivated(QListWidgetItem*))); 
    122124} 
     
    125127void MainWnd::fillGroups() 
    126128{ 
    127         //qDebug() << "Running fillGroups"; 
    128129    mRefreshMutex.lock(); 
    129130 
     
    179180          DEList->update(); 
    180181          NetworkingList->update(); 
    181           //qDebug() << NetworkingList->sizeHintForRow(0); 
    182           //qDebug() << NetworkingList->sizeHintForColumn(0); 
    183182    } 
    184183 
     
    238237{ 
    239238        fillGroups(); 
     239    //InstalledDEList.active()-> 
    240240        on_lineEdit_textChanged(ui->lineEdit->text()); 
    241241} 
     
    263263    {\ 
    264264        ui->action_name->setVisible(true);\ 
    265         if (InstalledDEList.byName(DEName)->misActive){\ 
     265        if (InstalledDEList.byName(DEName)->isActive){\ 
    266266            ui->action_name->setText(QString(DEName) + Current);\ 
    267267            ui->DEChooserButton->setIcon(ui->action_name->icon());}\ 
     
    270270        }else{ui->action_name->setVisible(false);} 
    271271 
    272 SETUP_ACTION( actionKDE, "KDE" ); 
    273 SETUP_ACTION( actionGnome, "Gnome" ); 
    274 SETUP_ACTION( actionXFCE, "XFCE" ); 
    275 SETUP_ACTION( actionLXDE, "LXDE" ); 
    276 SETUP_ACTION( actionEnlightenment, "Enlightenment" ); 
    277 SETUP_ACTION( actionMate, "Mate" ); 
    278 SETUP_ACTION( actionCinnamon, "Cinnamon" ); 
     272    SETUP_ACTION( actionKDE, "KDE" ); 
     273    SETUP_ACTION( actionGnome, "Gnome" ); 
     274    SETUP_ACTION( actionXFCE, "XFCE" ); 
     275    SETUP_ACTION( actionLXDE, "LXDE" ); 
     276    SETUP_ACTION( actionEnlightenment, "Enlightenment" ); 
     277    SETUP_ACTION( actionMate, "Mate" ); 
     278    SETUP_ACTION( actionCinnamon, "Cinnamon" ); 
    279279 
    280280#undef SETUP_ACTION 
    281281 
    282         if (!InstalledDEList.active()) 
     282    if (!InstalledDEList.active()) 
    283283        { 
    284                 qDebug() << "Unsupported DE"; 
    285284                ui->actionUnsupported->setText(Unsupported + Current); 
    286285                ui->DEChooserButton->setIcon(ui->actionUnsupported->icon()); 
    287286                ui->actionUnsupported->setVisible(true); 
    288         }else{ 
    289                 qDebug() << "Supported DE"; 
    290                 ui->actionUnsupported->setVisible(false); 
     287    }else{ 
     288        ui->actionUnsupported->setVisible(false); 
    291289        } 
    292290 
    293         ui->DEChooserButton->setVisible(InstalledDEList.size()>1); 
     291    ui->DEChooserButton->setVisible(InstalledDEList.size()>1); 
    294292 
    295293} 
     
    303301    for (int i=0; i<InstalledDEList.size(); i++) 
    304302    { 
    305         mvEnabledDE.push_back(InstalledDEList[i].mName); 
     303        mvEnabledDE.push_back(InstalledDEList[i].Name); 
    306304    } 
    307305 
     
    318316{ 
    319317    ui->DEChooserButton->setIcon(ui->actionKDE->icon()); 
    320     if (mCurrentDE.mName.trimmed().compare("KDE", Qt::CaseInsensitive)) 
     318    if (mCurrentDE.Name.trimmed().compare("KDE", Qt::CaseInsensitive)) 
    321319        ui->DEGBox->setTitle(DETEXT + " " + tr ("(KDE)")); 
    322320    else 
     
    328326    misDisplayDEName = false; 
    329327 
     328 
    330329    //refresh 
    331330    on_toolButton_2_clicked(); 
     
    336335{ 
    337336    ui->DEChooserButton->setIcon(ui->actionLXDE->icon()); 
    338     if (mCurrentDE.mName.trimmed().compare("LXDE", Qt::CaseInsensitive)) 
     337    if (mCurrentDE.Name.trimmed().compare("LXDE", Qt::CaseInsensitive)) 
    339338        ui->DEGBox->setTitle(DETEXT + " " + tr ("(LXDE)")); 
    340339    else 
     
    354353{ 
    355354    ui->DEChooserButton->setIcon(ui->actionGnome->icon()); 
    356     if (mCurrentDE.mName.trimmed().compare("gnome", Qt::CaseInsensitive)) 
     355    if (mCurrentDE.Name.trimmed().compare("gnome", Qt::CaseInsensitive)) 
    357356        ui->DEGBox->setTitle(DETEXT + " " + tr ("(Gnome)")); 
    358357    else 
     
    372371{ 
    373372    ui->DEChooserButton->setIcon(ui->actionEnlightenment->icon()); 
    374     if (mCurrentDE.mName.trimmed().compare("Enlightenment", Qt::CaseInsensitive)) 
     373    if (mCurrentDE.Name.trimmed().compare("Enlightenment", Qt::CaseInsensitive)) 
    375374        ui->DEGBox->setTitle(DETEXT + " " + tr ("(Enlightenment)")); 
    376375    else 
     
    391390{ 
    392391    ui->DEChooserButton->setIcon(ui->actionMate->icon()); 
    393     if (mCurrentDE.mName.trimmed().compare("Mate", Qt::CaseInsensitive)) 
     392    if (mCurrentDE.Name.trimmed().compare("Mate", Qt::CaseInsensitive)) 
    394393        ui->DEGBox->setTitle(DETEXT + " " + tr ("(Mate)")); 
    395394    else 
     
    409408{ 
    410409    ui->DEChooserButton->setIcon(ui->actionCinnamon->icon()); 
    411     if (mCurrentDE.mName.trimmed().compare("Cinnamon", Qt::CaseInsensitive)) 
     410    if (mCurrentDE.Name.trimmed().compare("Cinnamon", Qt::CaseInsensitive)) 
    412411        ui->DEGBox->setTitle(DETEXT + " " + tr ("(Cinnamon)")); 
    413412    else 
     
    427426{ 
    428427    ui->DEChooserButton->setIcon(ui->actionXFCE->icon()); 
    429     if (mCurrentDE.mName.trimmed().compare("XFCE", Qt::CaseInsensitive)) 
     428    if (mCurrentDE.Name.trimmed().compare("XFCE", Qt::CaseInsensitive)) 
    430429        ui->DEGBox->setTitle(DETEXT + " " + tr ("(XFCE)")); 
    431430    else 
     
    447446        misDisplayDEName = false; 
    448447        //refresh 
    449         on_toolButton_2_clicked(); 
     448        on_toolButton_2_clicked();     
    450449} 
    451450 
     
    499498   return false; 
    500499} 
     500 
     501/////////////////////////////////////////////////////////////////////////////// 
     502void MainWnd::refreshDEConfigureApp() 
     503{ 
     504    //ui->deLaunchConfigApp->setIcon( ui->DEChooserButton->icon() ); 
     505    if (mvEnabledDE.size() != 1) 
     506    { 
     507        ui->deLaunchConfigApp->setVisible(false); 
     508        return; 
     509    } 
     510 
     511    pcbsd::DesktopEnvironmentInfo* de = InstalledDEList.byName(mvEnabledDE[0]); 
     512    if (!de) 
     513    { 
     514        ui->deLaunchConfigApp->setVisible(false); 
     515        return; 
     516    } 
     517 
     518 
     519 
     520    if (!de->ConfigurationApplication.length()) 
     521    { 
     522        ui->deLaunchConfigApp->setVisible(false); 
     523        return; 
     524    } 
     525 
     526    //make icon 
     527    QPixmap orig(ui->deLaunchConfigApp->iconSize()); 
     528 
     529    int sx = ui->deLaunchConfigApp->iconSize().width(); 
     530    int sy = ui->deLaunchConfigApp->iconSize().height(); 
     531 
     532    QPixmap pix; 
     533    orig.fill(Qt::transparent); 
     534    QPainter painter(&orig); 
     535    painter.drawPixmap(0, 0, sx, sy, ui->DEChooserButton->icon().pixmap(sx, sy)); 
     536    pix.load(DE_CONFIG_APP_MARK); 
     537    painter.drawPixmap(orig.width() - pix.width(), orig.height() - pix.height() , pix); 
     538    ui->deLaunchConfigApp->setIcon(QIcon(orig)); 
     539 
     540    ui->deLaunchConfigApp->setVisible(true); 
     541} 
     542 
     543/////////////////////////////////////////////////////////////////////////////// 
     544void MainWnd::on_DEChooserButton_triggered(QAction *arg1) 
     545{ 
     546    Q_UNUSED(arg1); 
     547    refreshDEConfigureApp(); 
     548} 
     549 
     550/////////////////////////////////////////////////////////////////////////////// 
     551void MainWnd::on_deLaunchConfigApp_clicked() 
     552{ 
     553    if (mvEnabledDE.size() != 1) 
     554    { 
     555        ui->deLaunchConfigApp->setVisible(false); 
     556        return; 
     557    } 
     558 
     559    pcbsd::DesktopEnvironmentInfo* de = InstalledDEList.byName(mvEnabledDE[0]); 
     560    if (!de) 
     561    { 
     562        return; 
     563    } 
     564 
     565    if (!de->ConfigurationApplication.length()) 
     566    { 
     567        return; 
     568    } 
     569 
     570    QProcess process; 
     571 
     572    //TODO: smarter args parsing (including quotes) 
     573    QStringList proc_args = de->ConfigurationApplication.split(" ",QString::SkipEmptyParts); 
     574 
     575    QString proc = proc_args[0]; 
     576    proc_args.pop_front(); 
     577    process.startDetached(proc, proc_args); 
     578} 
  • src-qt4/pc-controlpanel/mainwnd.h

    r9ad5c1d r1c61936  
    6565        void setupGroup(QGroupList** List, QWidget* Parrent); 
    6666        void fillGroups(); 
    67         void setupDEChooser(); 
     67    void setupDEChooser(); 
    6868 
    69         bool checkUserGroup(QString groupName); 
     69    bool checkUserGroup(QString groupName); 
     70 
     71    void refreshDEConfigureApp(); 
    7072 
    7173        //CDEList mDEList; 
    72         QMenu* DEChoiseMenu; 
     74    QMenu* DEChoiseMenu; 
    7375 
    74         QVector<QString> mvEnabledDE; 
    75         CDEInfo          mCurrentDE; 
    76         bool             misDisplayDEName; 
     76    QVector<QString> mvEnabledDE; 
     77    pcbsd::DesktopEnvironmentInfo   mCurrentDE; 
     78    bool             misDisplayDEName; 
    7779 
    78         bool             misWheelGroup; 
    79         bool             misOperatorGroup; 
     80    bool             misWheelGroup; 
     81    bool             misOperatorGroup; 
    8082 
    81         QMutex          mRefreshMutex; 
     83    QMutex          mRefreshMutex; 
    8284 
    8385private slots: 
     
    9698 
    9799        void onDirectoryChanged(const QString & path); 
    98     }; 
     100        void on_DEChooserButton_triggered(QAction *arg1); 
     101        void on_deLaunchConfigApp_clicked(); 
     102}; 
    99103 
    100104#endif // MAINWND_H 
  • src-qt4/pc-controlpanel/mainwnd.ui

    rd2b761b r1c61936  
    77    <x>0</x> 
    88    <y>0</y> 
    9     <width>601</width> 
    10     <height>434</height> 
     9    <width>597</width> 
     10    <height>430</height> 
    1111   </rect> 
    1212  </property> 
     
    6868        <property name="arrowType"> 
    6969         <enum>Qt::NoArrow</enum> 
     70        </property> 
     71       </widget> 
     72      </item> 
     73      <item> 
     74       <widget class="QToolButton" name="deLaunchConfigApp"> 
     75        <property name="text"> 
     76         <string/> 
     77        </property> 
     78        <property name="iconSize"> 
     79         <size> 
     80          <width>24</width> 
     81          <height>24</height> 
     82         </size> 
     83        </property> 
     84        <property name="autoRaise"> 
     85         <bool>true</bool> 
    7086        </property> 
    7187       </widget> 
     
    109125         <x>0</x> 
    110126         <y>0</y> 
    111          <width>585</width> 
    112          <height>336</height> 
     127         <width>581</width> 
     128         <height>334</height> 
    113129        </rect> 
    114130       </property> 
     
    266282     <x>0</x> 
    267283     <y>0</y> 
    268      <width>601</width> 
    269      <height>22</height> 
     284     <width>597</width> 
     285     <height>21</height> 
    270286    </rect> 
    271287   </property> 
  • src-qt4/pc-controlpanel/pc-controlpanel.pro

    r1b89eeb rffbf59c  
    66 
    77QT       += core gui 
    8 LIBS     += -lQtSolutions_SingleApplication-head 
     8LIBS     += -L../libpcbsd -L/usr/local/lib -lpcbsd-ui -lpcbsd-utils -lQtSolutions_SingleApplication-head 
     9INCLUDEPATH     += ../libpcbsd/utils ../libpcbsd/ui /usr/local/include 
    910 
    1011TARGET = pc-controlpanel 
  • src-sh/de-info/de-info

    r1620346 r3f6d079  
    4545    fi 
    4646      echo "XDG compatible: $XDG" 
     47       
     48      if [ -n "$DE_CONFIG_APP" ] ; then 
     49      echo "Configuration app: $DE_CONFIG_APP" 
     50      fi 
    4751      echo "Sudo command: $DE_SU"   
    4852      echo "File manager: $DE_FILEMAN" 
     
    5357} 
    5458 
     59check_instaled() 
     60{ 
     61  if [ -n "$DE_METAPACKAGE" ] 
     62  then 
     63    pc-metapkgmanager status $DE_METAPACKAGE | grep "is installed" >/dev/null 
     64    if [ $? -eq 0 ] ; then 
     65      DE_INSTALLED=1 
     66    fi 
     67  fi 
     68  if [ -n "$DE_INSTALL_FILE"  ] 
     69  then 
     70    for I_FILE in $DE_INSTALL_FILE 
     71    do 
     72      which $I_FILE >/dev/null 2>/dev/null 
     73      if [ $? -eq 0 ] ; then 
     74        DE_INSTALLED=1  
     75      fi 
     76    done 
     77  fi  
     78   
     79  if [ -n "$DE_METAPACKAGE" ] && [ -n "$DE_INSTALL_FILE" ] 
     80  then       
     81    installed 
     82  fi 
     83} 
     84 
     85check_active() 
     86{ 
     87  if [ -n "$DE_SESSION_NAME" ] 
     88  then 
     89    if [ "$DE_SESSION_NAME" == "$PCDM_SESSION" ] ; then 
     90      DE_ACTIVE=1 
     91  fi 
     92  else 
     93    active   
     94  fi 
     95} 
     96 
    5597parse_all() 
    5698{ 
     
    59101  DE_NAME="" 
    60102  XDG="" 
     103  DE_CONFIG_APP="" 
     104  DE_METAPACKAGE="" 
     105  DE_INSTALL_FILE="" 
     106  DE_SESSION_NAME="" 
    61107  DE_SU=$DEFAULT_SUDO 
    62108  DE_FILEMAN="" 
     
    68114  DE_ACTIVE=0 
    69115 
    70   . $PROF 
    71  
    72   active 
    73   installed 
    74  
     116  . $PROF   
     117 
     118  check_instaled 
     119  check_active 
     120   
    75121  if  [ $DE_ACTIVE -eq 1 ] ||  ( [ $DE_INSTALLED -eq 1 ] && [ $SHOW_INSTALLED -eq 1 ] ) || [ $SHOW_ALL -eq 1 ] 
    76122  then 
     
    89135  DE_NAME="" 
    90136  XDG="" 
     137  DE_CONFIG_APP="" 
     138  DE_METAPACKAGE="" 
     139  DE_INSTALL_FILE="" 
     140  DE_SESSION_NAME="" 
    91141  DE_TERMINAL=$DEFAULT_TERMINAL 
    92142  DE_FILEMAN="" 
     
    101151  . $PROF 
    102152 
    103   active 
     153  check_active 
    104154 
    105155  if [ $DE_ACTIVE -eq 1 ] ; then 
     
    120170 
    121171 
     172 
    122173if [ "$1" = "-help" ] || [ "$1" = "--help" ] || [ "$1" = "-?" ]  
    123174then 
  • src-sh/de-info/de-profiles/cinnamon.profile

    r04d2faf r7588e04  
     1############################################################################################# 
     2#  This is Desktop environment profile for de-info script 
     3# To add new desktop environment you should define at least those variables: 
     4# 
     5# $DE_NAME - desktop environment name to display 
     6#  
     7#      --Detection of desktop environment installation-- 
     8#  You may define one or all of those variables: 
     9# $DE_METAPACKAGE - name of desktop environment meta package 
     10# $DE_INSTALL_FILE - list of executable files related to desktop environment separated by space 
     11#    -or- 
     12# if $DE_METAPACKAGE and $DE_INSTALL_FILE are undefined or empty you should implement installed() 
     13# function that set DE_INSTALLED to 1 if desktop environment is installed 
     14# For example: 
     15# 
     16# installed() { 
     17#   pc-metapkgmanager status Cinnamon | grep "is installed" >/dev/null 
     18#   if [ $? -eq 0 ] ; then 
     19#     DE_INSTALLED=1 
     20#   fi 
     21# } 
     22# 
     23#      --Current desktop environment detection-- 
     24# PCDM writes to $PCDM_SESSION environment variable name of current desktop environment. 
     25# You may define this for checking is defined desktop environment current: 
     26# $DE_SESSION_NAME - name of desktop environment PCDM session 
     27#    -or- 
     28# If $DE_SESSION_NAME undefined or empty you should implement current() function that 
     29# should set DE_ACTIVE to 1 if desktop environment is active now 
     30# For example: 
     31# 
     32# active() { 
     33# if [ "$PCDM_SESSION" = "$DE_SESSION_NAME" ]; then 
     34#   DE_ACTIVE=1 
     35# fi   
     36# } 
     37#  
     38#      --Another fields--- 
     39# $XDG - set to "YES" if desktop environment is fully compatible with xdg-open script 
     40# $DE_CONFIG_APP - name of desktop environment main configuration application (if present) 
     41# Other fields are deprocated 
     42# 
     43#      --Notes--- 
     44# DE profile is an processes as shell script, so you may use shell scripting techniques. 
     45# For example: 
     46# DE_CONFIG_APP=de_configapp --user `whoami` 
     47############################################################################################# 
     48 
    149DE_NAME="Cinnamon" 
    250XDG="YES" 
     51 
     52DE_SESSION_NAME="CINNAMON" 
     53DE_METAPACKAGE="Cinnamon" 
     54DE_INSTALL_FILE="gnome-session-cinnamon" 
     55 
     56DE_CONFIG_APP="cinnamon-settings" 
     57 
    358DE_SU="pc-su %s" 
    459DE_FILEMAN="nautilus %s" 
     
    661DE_TERMINAL_TITLE="-t" 
    762DE_TERMINAL_COMMAND="-e" 
    8 DE_SESSION_NAME="CINNAMON" 
    963 
    10 active() { 
    11 #if [ "$DESKTOP_SESSION" = "cinnamon" ] || [ "$DESKTOP_SESSION" = "32Cinnamon" ] || [ "$DESKTOP_SESSION" = "openbox-cinnamon"  ] || [ ! -z $CINNAMON_VERSION ]; then 
    12 if [ "$PCDM_SESSION" = "$DE_SESSION_NAME" ]; then 
    13 DE_ACTIVE=1 
    14 fi   
    1564 
    16 } 
    17  
    18 installed() { 
    19 # Check via pc-metapkgmanager if it exists 
    20 which pc-metapkgmanager >/dev/null 2>/dev/null 
    21 if [ $? -eq 0 ] ; then 
    22   pc-metapkgmanager status Cinnamon | grep "is installed" >/dev/null 
    23   if [ $? -eq 0 ] ; then 
    24     DE_INSTALLED=1 
    25   fi 
    26 else 
    27   which gnome-session-cinnamon >/dev/null 2>/dev/null 
    28   if [ $? -eq 0 ] ; then 
    29     DE_INSTALLED=1 
    30   fi 
    31 fi 
    32  
    33 } 
  • src-sh/de-info/de-profiles/gnome.profile

    r5e46078 r7588e04  
     1############################################################################################# 
     2#  This is Desktop environment profile for de-info script 
     3# To add new desktop environment you should define at least those variables: 
     4# 
     5# $DE_NAME - desktop environment name to display 
     6#  
     7#      --Detection of desktop environment installation-- 
     8#  You may define one or all of those variables: 
     9# $DE_METAPACKAGE - name of desktop environment meta package 
     10# $DE_INSTALL_FILE - list of executable files related to desktop environment separated by space 
     11#    -or- 
     12# if $DE_METAPACKAGE and $DE_INSTALL_FILE are undefined or empty you should implement installed() 
     13# function that set DE_INSTALLED to 1 if desktop environment is installed 
     14# For example: 
     15# 
     16# installed() { 
     17#   pc-metapkgmanager status Cinnamon | grep "is installed" >/dev/null 
     18#   if [ $? -eq 0 ] ; then 
     19#     DE_INSTALLED=1 
     20#   fi 
     21# } 
     22# 
     23#      --Current desktop environment detection-- 
     24# PCDM writes to $PCDM_SESSION environment variable name of current desktop environment. 
     25# You may define this for checking is defined desktop environment current: 
     26# $DE_SESSION_NAME - name of desktop environment PCDM session 
     27#    -or- 
     28# If $DE_SESSION_NAME undefined or empty you should implement current() function that 
     29# should set DE_ACTIVE to 1 if desktop environment is active now 
     30# For example: 
     31# 
     32# active() { 
     33# if [ "$PCDM_SESSION" = "$DE_SESSION_NAME" ]; then 
     34#   DE_ACTIVE=1 
     35# fi   
     36# } 
     37#  
     38#      --Another fields--- 
     39# $XDG - set to "YES" if desktop environment is fully compatible with xdg-open script 
     40# $DE_CONFIG_APP - name of desktop environment main configuration application (if present) 
     41# Other fields are deprocated 
     42# 
     43#      --Notes--- 
     44# DE profile is an processes as shell script, so you may use shell scripting techniques. 
     45# For example: 
     46# DE_CONFIG_APP=de_configapp --user `whoami` 
     47############################################################################################# 
     48 
    149DE_NAME="Gnome" 
    250XDG="NO" 
     51 
     52DE_SESSION_NAME="GNOME" 
     53DE_METAPACKAGE="KDE" 
     54DE_INSTALL_FILE="gnome-session" 
     55 
     56DE_CONFIG_APP="gnome-control-center --overview" 
     57 
    358DE_SU="gksu %s" 
    459DE_FILEMAN="nautilus %s" 
     
    661DE_TERMINAL_TITLE="-t" 
    762DE_TERMINAL_COMMAND="-e" 
    8 DE_SESSION_NAME="GNOME" 
    963 
    10 active() { 
    11 if [ "$PCDM_SESSION" = "$DE_SESSION_NAME" ]; then 
    12 DE_ACTIVE=1 
    13 fi   
    14  
    15 } 
    16  
    17 installed() { 
    18 # Check via pc-metapkgmanager if it exists 
    19 which pc-metapkgmanager >/dev/null 2>/dev/null 
    20 if [ $? -eq 0 ] ; then 
    21   pc-metapkgmanager status GNOME | grep "is installed" >/dev/null 
    22   if [ $? -eq 0 ] ; then 
    23     DE_INSTALLED=1 
    24   fi 
    25 else 
    26   which gnome-session >/dev/null 2>/dev/null 
    27   if [ $? -eq 0 ] ; then 
    28     DE_INSTALLED=1 
    29   fi 
    30 fi 
    31  
    32 } 
  • src-sh/de-info/de-profiles/kde.profile

    r04d2faf r7588e04  
     1############################################################################################# 
     2#  This is Desktop environment profile for de-info script 
     3# To add new desktop environment you should define at least those variables: 
     4# 
     5# $DE_NAME - desktop environment name to display 
     6#  
     7#      --Detection of desktop environment installation-- 
     8#  You may define one or all of those variables: 
     9# $DE_METAPACKAGE - name of desktop environment meta package 
     10# $DE_INSTALL_FILE - list of executable files related to desktop environment separated by space 
     11#    -or- 
     12# if $DE_METAPACKAGE and $DE_INSTALL_FILE are undefined or empty you should implement installed() 
     13# function that set DE_INSTALLED to 1 if desktop environment is installed 
     14# For example: 
     15# 
     16# installed() { 
     17#   pc-metapkgmanager status Cinnamon | grep "is installed" >/dev/null 
     18#   if [ $? -eq 0 ] ; then 
     19#     DE_INSTALLED=1 
     20#   fi 
     21# } 
     22# 
     23#      --Current desktop environment detection-- 
     24# PCDM writes to $PCDM_SESSION environment variable name of current desktop environment. 
     25# You may define this for checking is defined desktop environment current: 
     26# $DE_SESSION_NAME - name of desktop environment PCDM session 
     27#    -or- 
     28# If $DE_SESSION_NAME undefined or empty you should implement current() function that 
     29# should set DE_ACTIVE to 1 if desktop environment is active now 
     30# For example: 
     31# 
     32# active() { 
     33# if [ "$PCDM_SESSION" = "$DE_SESSION_NAME" ]; then 
     34#   DE_ACTIVE=1 
     35# fi   
     36# } 
     37#  
     38#      --Another fields--- 
     39# $XDG - set to "YES" if desktop environment is fully compatible with xdg-open script 
     40# $DE_CONFIG_APP - name of desktop environment main configuration application (if present) 
     41# Other fields are deprocated 
     42# 
     43#      --Notes--- 
     44# DE profile is an processes as shell script, so you may use shell scripting techniques. 
     45# For example: 
     46# DE_CONFIG_APP=de_configapp --user `whoami` 
     47############################################################################################# 
     48 
    149DE_NAME="KDE" 
    250XDG="YES" 
     51 
     52DE_SESSION_NAME="KDE" 
     53DE_METAPACKAGE="KDE" 
     54DE_INSTALL_FILE="_startkde4  _startkde" 
     55 
     56DE_CONFIG_APP="systemsettings" 
    357 
    458DE_SU="kdesu %s" 
     
    862DE_TERMINAL_SEPARATE_ARGS="YES" 
    963DE_FILEMAN="dolphin %s" 
    10 DE_SESSION_NAME="KDE" 
    1164 
    12 active() { 
    13  
    14  if [ -n "$KDE_SESSION_UID" ] || [ "${XDG_CURRENT_DESKTOP}" == "KDE" ] || [ "$DE_SESSION_NAME" == "$PCDM_SESSION" ] ; then 
    15     DE_ACTIVE=1 
    16  fi 
    17  
    18 } 
    19  
    20  
    21 installed() 
    22 { 
    23 # Check via pc-metapkgmanager if it exists 
    24 which pc-metapkgmanager >/dev/null 2>/dev/null 
    25 if [ $? -eq 0 ] ; then 
    26   pc-metapkgmanager status KDE | grep "is installed" >/dev/null 
    27   if [ $? -eq 0 ] ; then 
    28     DE_INSTALLED=1 
    29   fi 
    30 else 
    31   which startkde4 >/dev/null 2>/dev/null 
    32   if [ $? -eq 0 ] ; then 
    33     DE_INSTALLED=1 
    34   fi 
    35   which startkde >/dev/null 2>/dev/null 
    36   if [ $? -eq 0 ] ; then 
    37     DE_INSTALLED=1 
    38   fi 
    39 fi 
    40  
    41 } 
  • src-sh/de-info/de-profiles/lxde.profile

    r04d2faf r7588e04  
    11#!/bin/sh 
     2############################################################################################# 
     3#  This is Desktop environment profile for de-info script 
     4# To add new desktop environment you should define at least those variables: 
     5# 
     6# $DE_NAME - desktop environment name to display 
     7#  
     8#      --Detection of desktop environment installation-- 
     9#  You may define one or all of those variables: 
     10# $DE_METAPACKAGE - name of desktop environment meta package 
     11# $DE_INSTALL_FILE - list of executable files related to desktop environment separated by space 
     12#    -or- 
     13# if $DE_METAPACKAGE and $DE_INSTALL_FILE are undefined or empty you should implement installed() 
     14# function that set DE_INSTALLED to 1 if desktop environment is installed 
     15# For example: 
     16# 
     17# installed() { 
     18#   pc-metapkgmanager status Cinnamon | grep "is installed" >/dev/null 
     19#   if [ $? -eq 0 ] ; then 
     20#     DE_INSTALLED=1 
     21#   fi 
     22# } 
     23# 
     24#      --Current desktop environment detection-- 
     25# PCDM writes to $PCDM_SESSION environment variable name of current desktop environment. 
     26# You may define this for checking is defined desktop environment current: 
     27# $DE_SESSION_NAME - name of desktop environment PCDM session 
     28#    -or- 
     29# If $DE_SESSION_NAME undefined or empty you should implement current() function that 
     30# should set DE_ACTIVE to 1 if desktop environment is active now 
     31# For example: 
     32# 
     33# active() { 
     34# if [ "$PCDM_SESSION" = "$DE_SESSION_NAME" ]; then 
     35#   DE_ACTIVE=1 
     36# fi   
     37# } 
     38#  
     39#      --Another fields--- 
     40# $XDG - set to "YES" if desktop environment is fully compatible with xdg-open script 
     41# $DE_CONFIG_APP - name of desktop environment main configuration application (if present) 
     42# Other fields are deprocated 
     43# 
     44#      --Notes--- 
     45# DE profile is an processes as shell script, so you may use shell scripting techniques. 
     46# For example: 
     47# DE_CONFIG_APP=de_configapp --user `whoami` 
     48############################################################################################# 
     49 
    250DE_NAME="LXDE" 
    351XDG="YES" 
     52 
     53DE_SESSION_NAME="LXDE" 
     54DE_METAPACKAGE="LXDE" 
     55DE_INSTALL_FILE="startlxde" 
     56 
    457DE_FILEMAN="pcmanfm %s" 
    558DE_TERMINAL="lxterminal" 
    659DE_TERMINAL_TITLE="-T" 
    760DE_TERMINAL_COMMAND="-e" 
    8 DE_SESSION_NAME="LXDE" 
    961 
    10 active() 
    11 { 
    12 if [ "$DESKTOP_SESSION" = "LXDE" ] || [ "$PCDM_SESSION" = "$DE_SESSION_NAME" ]; then 
    13 DE_ACTIVE=1 
    14 fi 
    15 } 
    16  
    17 installed() 
    18 { 
    19 # Check via pc-metapkgmanager if it exists 
    20 which pc-metapkgmanager >/dev/null 2>/dev/null 
    21 if [ $? -eq 0 ] ; then 
    22   pc-metapkgmanager status LXDE | grep "is installed" >/dev/null 
    23   if [ $? -eq 0 ] ; then 
    24     DE_INSTALLED=1 
    25   fi 
    26 else 
    27   which startlxde >/dev/null 2>/dev/null 
    28   if [ $? -eq 0 ] ; then 
    29     DE_INSTALLED=1 
    30   fi 
    31 fi 
    32 } 
  • src-sh/de-info/de-profiles/mate.profile

    r04d2faf r7588e04  
     1############################################################################################# 
     2#  This is Desktop environment profile for de-info script 
     3# To add new desktop environment you should define at least those variables: 
     4# 
     5# $DE_NAME - desktop environment name to display 
     6#  
     7#      --Detection of desktop environment installation-- 
     8#  You may define one or all of those variables: 
     9# $DE_METAPACKAGE - name of desktop environment meta package 
     10# $DE_INSTALL_FILE - list of executable files related to desktop environment separated by space 
     11#    -or- 
     12# if $DE_METAPACKAGE and $DE_INSTALL_FILE are undefined or empty you should implement installed() 
     13# function that set DE_INSTALLED to 1 if desktop environment is installed 
     14# For example: 
     15# 
     16# installed() { 
     17#   pc-metapkgmanager status Cinnamon | grep "is installed" >/dev/null 
     18#   if [ $? -eq 0 ] ; then 
     19#     DE_INSTALLED=1 
     20#   fi 
     21# } 
     22# 
     23#      --Current desktop environment detection-- 
     24# PCDM writes to $PCDM_SESSION environment variable name of current desktop environment. 
     25# You may define this for checking is defined desktop environment current: 
     26# $DE_SESSION_NAME - name of desktop environment PCDM session 
     27#    -or- 
     28# If $DE_SESSION_NAME undefined or empty you should implement current() function that 
     29# should set DE_ACTIVE to 1 if desktop environment is active now 
     30# For example: 
     31# 
     32# active() { 
     33# if [ "$PCDM_SESSION" = "$DE_SESSION_NAME" ]; then 
     34#   DE_ACTIVE=1 
     35# fi   
     36# } 
     37#  
     38#      --Another fields--- 
     39# $XDG - set to "YES" if desktop environment is fully compatible with xdg-open script 
     40# $DE_CONFIG_APP - name of desktop environment main configuration application (if present) 
     41# Other fields are deprocated 
     42# 
     43#      --Notes--- 
     44# DE profile is an processes as shell script, so you may use shell scripting techniques. 
     45# For example: 
     46# DE_CONFIG_APP=de_configapp --user `whoami` 
     47############################################################################################# 
     48 
    149DE_NAME="Mate" 
    250XDG="YES" 
     51 
     52DE_SESSION_NAME="MATE" 
     53DE_METAPACKAGE="Mate" 
     54DE_INSTALL_FILE="mate-session" 
     55 
    356DE_SU="pc-su %s" 
    457DE_FILEMAN="nautilus %s" 
     
    659DE_TERMINAL_TITLE="-t" 
    760DE_TERMINAL_COMMAND="-e" 
    8 DE_SESSION_NAME="MATE" 
    961 
    10 active() { 
    11 if [ "$PCDM_SESSION" = "$DE_SESSION_NAME" ]; then 
    12 DE_ACTIVE=1 
    13 fi   
    1462 
    15 } 
    16  
    17 installed() { 
    18 # Check via pc-metapkgmanager if it exists 
    19 which pc-metapkgmanager >/dev/null 2>/dev/null 
    20 if [ $? -eq 0 ] ; then 
    21   pc-metapkgmanager status Mate | grep "is installed" >/dev/null 
    22   if [ $? -eq 0 ] ; then 
    23     DE_INSTALLED=1 
    24   fi 
    25 else 
    26   which mate-session >/dev/null 2>/dev/null 
    27   if [ $? -eq 0 ] ; then 
    28     DE_INSTALLED=1 
    29   fi 
    30 fi 
    31  
    32 } 
  • src-sh/de-info/de-profiles/xfce.profile

    r04d2faf r7588e04  
    11#!/bin/sh 
     2############################################################################################# 
     3#  This is Desktop environment profile for de-info script 
     4# To add new desktop environment you should define at least those variables: 
     5# 
     6# $DE_NAME - desktop environment name to display 
     7#  
     8#      --Detection of desktop environment installation-- 
     9#  You may define one or all of those variables: 
     10# $DE_METAPACKAGE - name of desktop environment meta package 
     11# $DE_INSTALL_FILE - list of executable files related to desktop environment separated by space 
     12#    -or- 
     13# if $DE_METAPACKAGE and $DE_INSTALL_FILE are undefined or empty you should implement installed() 
     14# function that set DE_INSTALLED to 1 if desktop environment is installed 
     15# For example: 
     16# 
     17# installed() { 
     18#   pc-metapkgmanager status Cinnamon | grep "is installed" >/dev/null 
     19#   if [ $? -eq 0 ] ; then 
     20#     DE_INSTALLED=1 
     21#   fi 
     22# } 
     23# 
     24#      --Current desktop environment detection-- 
     25# PCDM writes to $PCDM_SESSION environment variable name of current desktop environment. 
     26# You may define this for checking is defined desktop environment current: 
     27# $DE_SESSION_NAME - name of desktop environment PCDM session 
     28#    -or- 
     29# If $DE_SESSION_NAME undefined or empty you should implement current() function that 
     30# should set DE_ACTIVE to 1 if desktop environment is active now 
     31# For example: 
     32# 
     33# active() { 
     34# if [ "$PCDM_SESSION" = "$DE_SESSION_NAME" ]; then 
     35#   DE_ACTIVE=1 
     36# fi   
     37# } 
     38#  
     39#      --Another fields--- 
     40# $XDG - set to "YES" if desktop environment is fully compatible with xdg-open script 
     41# $DE_CONFIG_APP - name of desktop environment main configuration application (if present) 
     42# Other fields are deprocated 
     43# 
     44#      --Notes--- 
     45# DE profile is an processes as shell script, so you may use shell scripting techniques. 
     46# For example: 
     47# DE_CONFIG_APP=de_configapp --user `whoami` 
     48############################################################################################# 
     49 
    250DE_NAME="XFCE" 
     51 
     52DE_SESSION_NAME="XFCE" 
     53DE_METAPACKAGE="XFCE" 
     54DE_INSTALL_FILE="startxfce4 startxfce" 
     55 
     56DE_CONFIG_APP="xfce4-settings-manager" 
     57 
    358XDG="YES" 
    459DE_SU="pc-su %s" 
     
    762DE_TERMINAL_TITLE="-T" 
    863DE_TERMINAL_COMMAND="-e" 
    9 DE_SESSION_NAME="XFCE" 
    10  
    11 active() { 
    12 if [ "$PCDM_SESSION" = "$DE_SESSION_NAME" ]; then 
    13 DE_ACTIVE=1 
    14 fi   
    15  
    16 } 
    17  
    18 installed() 
    19 { 
    20 # Check via pc-metapkgmanager if it exists 
    21 which pc-metapkgmanager >/dev/null 2>/dev/null 
    22 if [ $? -eq 0 ] ; then 
    23   pc-metapkgmanager status XFCE | grep "is installed">/dev/null 
    24   if [ $? -eq 0 ] ; then 
    25     DE_INSTALLED=1 
    26   fi 
    27 else 
    28   which startxfce4 >/dev/null 2>/dev/null 
    29   if [ $? -eq 0 ] ; then 
    30     DE_INSTALLED=1 
    31   fi 
    32   which startxfce >/dev/null 2>/dev/null 
    33   if [ $? -eq 0 ] ; then 
    34     DE_INSTALLED=1 
    35   fi 
    36 fi 
    37 } 
  • build-files/ports-overlay/misc/pcbsd-meta-lxde/Makefile

    rb2c18fc r138f3fe  
    1919                leafpad>=0:${PORTSDIR}/editors/leafpad \ 
    2020                lxappearance>=0:${PORTSDIR}/x11-themes/lxappearance \ 
    21                 lxmenu-data>=0:${PORTSDIR}/x11/lxmenu-data 
     21                lxmenu-data>=0:${PORTSDIR}/x11/lxmenu-data \ 
     22                xscreensaver:${PORTSDIR}/x11/xscreensaver 
    2223 
    2324NO_BUILD=       yes 
  • build-files/ports-overlay/misc/pcbsd-meta-xfce/Makefile

    rf18d2b4 r138f3fe  
    2222                xfce4-battery-plugin>=0:${PORTSDIR}/sysutils/xfce4-battery-plugin \ 
    2323                thunar-archive-plugin>=0:${PORTSDIR}/archivers/thunar-archive-plugin \ 
     24                xscreensaver:${PORTSDIR}/x11/xscreensaver 
    2425 
    2526NO_BUILD=       yes 
Note: See TracChangeset for help on using the changeset viewer.