Changeset 718bbf7


Ignore:
Timestamp:
05/12/14 10:16:25 (16 months ago)
Author:
Ken Moore <ken@…>
Branches:
master, enter/10, releng/10.0.2, releng/10.0.3, releng/10.1, releng/10.1.1, releng/10.1.2, releng/10.2
Children:
ec43d72
Parents:
7c92c88 (diff), f3aa4ee (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:
2 added
18 edited

Legend:

Unmodified
Added
Removed
  • src-qt4/about-gui/mainwindow.cpp

    rad3a427 r4e975c8  
    5555    {"e17", "enlightenment"}, 
    5656    {"Awesome", "awesome"}, 
    57     {"FVWM", "fvwm2"} 
     57    {"FVWM", "fvwm2"}, 
     58    {"Lumina", "lumina"} 
    5859}; 
    5960 
     
    141142        { 
    142143            outVer = out[i]; 
    143             outVer.replace("Version        : ",""); 
    144             qDebug()<<out[i]; 
     144            outVer.replace("Version        : ","");             
    145145            break; 
    146146        } 
  • src-qt4/about-gui/mainwindow.ui

    r695798b r4e975c8  
    77    <x>0</x> 
    88    <y>0</y> 
    9     <width>320</width> 
    10     <height>496</height> 
     9    <width>318</width> 
     10    <height>494</height> 
    1111   </rect> 
    1212  </property> 
     
    377377       <item> 
    378378        <widget class="QTreeWidget" name="DEList"> 
     379         <property name="sortingEnabled"> 
     380          <bool>false</bool> 
     381         </property> 
    379382         <column> 
    380383          <property name="text"> 
  • src-qt4/pc-controlpanel/controlpanel.qrc

    rfc611ee r4e975c8  
    1616        <file>images/config.png</file> 
    1717        <file>images/system_only.png</file> 
     18        <file>images/lumina.png</file> 
    1819    </qresource> 
    1920</RCC> 
  • src-qt4/pc-controlpanel/mainwnd.cpp

    r04c0316 r4e975c8  
    256256    DEChoiseMenu->addAction(ui->actionLXDE); 
    257257    DEChoiseMenu->addAction(ui->actionEnlightenment); 
     258    DEChoiseMenu->addAction(ui->actionLumina); 
    258259    DEChoiseMenu->addAction(ui->actionUnsupported); 
    259260 
     
    283284    SETUP_ACTION( actionEnlightenment, "Enlightenment" ); 
    284285    SETUP_ACTION( actionMate, "Mate" ); 
    285     SETUP_ACTION( actionCinnamon, "Cinnamon" );     
     286    SETUP_ACTION( actionCinnamon, "Cinnamon" ); 
     287    SETUP_ACTION( actionLumina, "Lumina" ); 
    286288 
    287289#undef SETUP_ACTION 
     
    456458    mvEnabledDE.clear(); 
    457459    mvEnabledDE.push_back("XFCE"); 
     460 
     461    misDisplayDEName = false; 
     462 
     463    settings.setValue(HIDE_DE_ITEMS_SETTING, QVariant(false)); 
     464 
     465    //refresh 
     466    on_toolButton_2_clicked(); 
     467} 
     468 
     469/////////////////////////////////////////////////////////////////////////////// 
     470void MainWnd::on_actionLumina_triggered() 
     471{ 
     472    ui->DEChooserButton->setIcon(ui->actionXFCE->icon()); 
     473    if (mCurrentDE.Name.trimmed().compare("Lumina", Qt::CaseInsensitive)) 
     474        ui->DEGBox->setTitle(DETEXT + " " + tr ("(Lumina)")); 
     475    else 
     476        ui->DEGBox->setTitle(DETEXT); 
     477 
     478    mvEnabledDE.clear(); 
     479    mvEnabledDE.push_back("Lumina"); 
    458480 
    459481    misDisplayDEName = false; 
     
    622644    on_toolButton_2_clicked(); 
    623645} 
     646 
  • src-qt4/pc-controlpanel/mainwnd.h

    r04c0316 r4e975c8  
    103103        void on_deLaunchConfigApp_clicked(); 
    104104        void on_actionSystemOnly_triggered(); 
     105        void on_actionLumina_triggered(); 
    105106}; 
    106107 
  • src-qt4/pc-controlpanel/mainwnd.ui

    rfc611ee r4e975c8  
    77    <x>0</x> 
    88    <y>0</y> 
    9     <width>595</width> 
    10     <height>428</height> 
     9    <width>593</width> 
     10    <height>426</height> 
    1111   </rect> 
    1212  </property> 
     
    125125         <x>0</x> 
    126126         <y>0</y> 
    127          <width>579</width> 
    128          <height>332</height> 
     127         <width>577</width> 
     128         <height>330</height> 
    129129        </rect> 
    130130       </property> 
     
    282282     <x>0</x> 
    283283     <y>0</y> 
    284      <width>595</width> 
     284     <width>593</width> 
    285285     <height>21</height> 
    286286    </rect> 
     
    387387   <property name="toolTip"> 
    388388    <string>Hide all desktop items</string> 
     389   </property> 
     390  </action> 
     391  <action name="actionLumina"> 
     392   <property name="icon"> 
     393    <iconset resource="controlpanel.qrc"> 
     394     <normaloff>:/images/images/lumina.png</normaloff>:/images/images/lumina.png</iconset> 
     395   </property> 
     396   <property name="text"> 
     397    <string>Lumina</string> 
     398   </property> 
     399   <property name="toolTip"> 
     400    <string>Lumina desktop</string> 
    389401   </property> 
    390402  </action> 
  • src-qt4/pc-installgui/installer.cpp

    r0a68a6a r8dc88d5  
    287287    // Add the main zfs pool with standard partitions 
    288288    fsType= "ZFS"; 
    289     fileSystem << targetDisk << targetSlice << "/(compress=lz4),/tmp(compress=lz4|exec=off|suid=off),/usr(canmount=off),/usr/home(compress=lz4),/usr/jails(compress=lz4),/usr/obj(compress=lz4),/usr/pbi(compress=lz4),/usr/ports(compress=lz4),/usr/ports/distfiles(compress=off),/usr/src(compress=lz4),/var(canmount=off),/var/audit(compress=lz4),/var/log(compress=lz4|exec=off|suid=off),/var/tmp(compress=lz4|exec=off|suid=off)" << fsType << tmp.setNum(totalSize) << "" << ""; 
     289    fileSystem << targetDisk << targetSlice << "/(compress=lz4),/tmp(compress=lz4|exec=off|setuid=off),/usr(canmount=off),/usr/home(compress=lz4),/usr/jails(compress=lz4),/usr/obj(compress=lz4),/usr/pbi(compress=lz4),/usr/ports(compress=lz4),/usr/ports/distfiles(compress=off),/usr/src(compress=lz4),/var(canmount=off),/var/audit(compress=lz4),/var/log(compress=lz4|exec=off|setuid=off),/var/tmp(compress=lz4|exec=off|setuid=off)" << fsType << tmp.setNum(totalSize) << "" << ""; 
    290290    sysFinalDiskLayout << fileSystem; 
    291291    fileSystem.clear(); 
  • src-qt4/pc-installgui/wizardDisk.cpp

    r37284b29 r8dc88d5  
    426426 
    427427     // This lets the user do nifty stuff like a mirror/raid post-install with a single zpool command 
    428     fileSystem << targetDisk << targetSlice << "/" + rootOpts + ",/tmp(compress=lz4|suid=off|exec=off),/usr(canmount=off),/usr/home(compress=lz4),/usr/jails(compress=lz4),/usr/obj(compress=lz4),/usr/pbi(compress=lz4),/usr/ports(compress=lz4),/usr/ports/distfiles(compress=lz4),/usr/src(compress=lz4),/var(canmount=off),/var/audit(compress=lz4),/var/log(compress=lz4|exec=off|suid=off),/var/tmp(compress=lz4|exec=off|suid=off)" << fsType << tmp.setNum(totalSize) << "" << tmpPass; 
     428    fileSystem << targetDisk << targetSlice << "/" + rootOpts + ",/tmp(compress=lz4|setuid=off|exec=off),/usr(canmount=off),/usr/home(compress=lz4),/usr/jails(compress=lz4),/usr/obj(compress=lz4),/usr/pbi(compress=lz4),/usr/ports(compress=lz4),/usr/ports/distfiles(compress=lz4),/usr/src(compress=lz4),/var(canmount=off),/var/audit(compress=lz4),/var/log(compress=lz4|exec=off|setuid=off),/var/tmp(compress=lz4|exec=off|setuid=off)" << fsType << tmp.setNum(totalSize) << "" << tmpPass; 
    429429    sysFinalDiskLayout << fileSystem; 
    430430    fileSystem.clear(); 
     
    708708  popupNE->addAction( "off", this, SLOT(slotZEXOFF())); 
    709709 
    710   // Add suid sub-menu 
    711   popupNE = popup->addMenu("suid"); 
     710  // Add setuid sub-menu 
     711  popupNE = popup->addMenu("setuid"); 
    712712  popupNE->addAction( "on", this, SLOT(slotZSUIDON())); 
    713713  popupNE->addAction( "off", this, SLOT(slotZSUIDOFF())); 
     
    819819void wizardDisk::slotZSUIDOFF() 
    820820{ 
    821   toggleZFSOpt(QString("suid=off")); 
     821  toggleZFSOpt(QString("setuid=off")); 
    822822} 
    823823 
    824824void wizardDisk::slotZSUIDON() 
    825825{ 
    826   toggleZFSOpt(QString("suid=on")); 
     826  toggleZFSOpt(QString("setuid=on")); 
    827827} 
    828828 
  • src-sh/about/about

    r4ec8d04 r4e975c8  
    8787display_pkg_version "       Awesome:......" "awesome" 
    8888display_pkg_version "       FVWM:........." "fvwm2" 
     89display_pkg_version "       Lumina:......." "lumina" 
    8990fi 
    9091echo "" 
  • src-sh/de-info/de-info

    r3f6d079 rf3aa4ee  
    4949      echo "Configuration app: $DE_CONFIG_APP" 
    5050      fi 
     51      if [ -n "$DE_LOGOFF_COMMAND" ] ; then 
     52      echo "Logout command: ${DE_LOGOFF_COMMAND}" 
     53      fi 
    5154      echo "Sudo command: $DE_SU"   
    5255      echo "File manager: $DE_FILEMAN" 
     
    6164  if [ -n "$DE_METAPACKAGE" ] 
    6265  then 
    63     pc-metapkgmanager status $DE_METAPACKAGE | grep "is installed" >/dev/null 
     66#    pc-metapkgmanager status $DE_METAPACKAGE | grep "is installed" >/dev/null 
     67    pkg info | grep $DE_METAPACKAGE >/dev/null 
    6468    if [ $? -eq 0 ] ; then 
    6569      DE_INSTALLED=1 
     
    102106  XDG="" 
    103107  DE_CONFIG_APP="" 
     108  DE_LOGOFF_COMMAND="" 
    104109  DE_METAPACKAGE="" 
    105110  DE_INSTALL_FILE="" 
     
    136141  XDG="" 
    137142  DE_CONFIG_APP="" 
     143  DE_LOGOFF_COMMAND="" 
    138144  DE_METAPACKAGE="" 
    139145  DE_INSTALL_FILE="" 
  • src-sh/de-info/de-profiles/cinnamon.profile

    r7588e04 rf3aa4ee  
    5656DE_CONFIG_APP="cinnamon-settings" 
    5757 
     58DE_LOGOFF_COMMAND="cinnamon-session-quit" 
     59 
    5860DE_SU="pc-su %s" 
    5961DE_FILEMAN="nautilus %s" 
  • src-sh/de-info/de-profiles/gnome.profile

    r7588e04 rf3aa4ee  
    5656DE_CONFIG_APP="gnome-control-center --overview" 
    5757 
     58DE_LOGOFF_COMMAND="gnome-session-quit" 
     59 
    5860DE_SU="gksu %s" 
    5961DE_FILEMAN="nautilus %s" 
  • src-sh/de-info/de-profiles/kde.profile

    r7588e04 rf3aa4ee  
    5656DE_CONFIG_APP="systemsettings" 
    5757 
     58DE_LOGOFF_COMMAND="qdbus org.kde.ksmserver /KSMServer logout 0 0 0" 
     59 
    5860DE_SU="kdesu %s" 
    5961DE_TERMINAL="konsole" 
  • src-sh/de-info/de-profiles/xfce.profile

    r7588e04 rf3aa4ee  
    5656DE_CONFIG_APP="xfce4-settings-manager" 
    5757 
     58DE_LOGOFF_COMMAND="xfce4-session-logout" 
     59 
    5860XDG="YES" 
    5961DE_SU="pc-su %s" 
  • src-qt4/pc-softwaremanager/mainUI.cpp

    r12aa30c r7c92c88  
    200200    else{ 
    201201      //re-check for updates 
    202       PBI->syncLocalPackages(); 
    203       slotRefreshInstallTab(); 
     202      this->setEnabled(false); 
     203      QTimer::singleShot(0, PBI, SLOT(UpdateIndexFiles()) ); 
    204204    } 
    205205  }else{ 
  • src-qt4/pc-softwaremanager/updateDialog.cpp

    racb0f00 r7c92c88  
    1212 
    1313  //Initial UI setup 
    14   ui->text_log->setVisible(false); 
    15   ui->check_viewlog->setChecked(false); 
    16   ui->frame->setVisible(false); 
     14  //ui->text_log->setVisible(false); 
     15  //ui->check_viewlog->setChecked(false); 
     16  //ui->frame->setVisible(false); 
     17  ui->progressBar->setVisible(false); 
    1718         
    1819  //Connect the signals/slots 
     
    2223  connect(ui->push_done, SIGNAL(clicked()), this, SLOT(closeDialog()) ); 
    2324  connect(ui->push_reboot, SIGNAL(clicked()), this, SLOT(rebootsystem()) ); 
    24   connect(ui->check_viewlog, SIGNAL(clicked()), this, SLOT(logview()) ); 
     25  //connect(ui->check_viewlog, SIGNAL(clicked()), this, SLOT(logview()) ); 
    2526  //Hide the close buttons 
    2627  ui->push_done->setVisible(false); 
     
    4041 
    4142void UpdateDialog::procMessage(QString msg){ 
    42   ui->frame->setVisible(true); 
     43  //ui->frame->setVisible(true); 
    4344  ui->text_log->append(msg); 
    4445  //Do some quick parsing of the message for better messages 
     
    5152      ui->progressBar->setValue( (int) percent ); 
    5253      ui->progressBar->setVisible(true); 
    53   }else{ 
    54     ui->progressBar->setVisible(false); 
    5554  } 
    5655} 
    5756 
    5857void UpdateDialog::procUpdate(QString percent, QString fsize, QString fname){ 
    59   ui->frame->setVisible(true); 
     58  //ui->frame->setVisible(true); 
    6059  ui->label_progress->setText( QString(tr("Downloading %1 (%2)")).arg(fname, fsize) ); 
    6160  ui->progressBar->setValue( percent.toInt() ); 
     
    6463 
    6564void UpdateDialog::procFinished(int ret, QProcess::ExitStatus stat){ 
    66   ui->frame->setVisible(false); 
     65  //ui->frame->setVisible(false); 
    6766  if(ret !=0 || stat!=QProcess::NormalExit){ 
    6867    //Error 
     
    8079} 
    8180 
    82 void UpdateDialog::logview(){ 
     81/*void UpdateDialog::logview(){ 
    8382  ui->text_log->setVisible(ui->check_viewlog->isChecked()); 
    84 } 
     83}*/ 
    8584 
    8685void UpdateDialog::rebootsystem(){ 
  • src-qt4/pc-softwaremanager/updateDialog.h

    racb0f00 r7c92c88  
    2828        void procUpdate(QString, QString, QString); 
    2929        void procFinished(int, QProcess::ExitStatus); 
    30         void logview(); 
     30        //void logview(); 
    3131        void rebootsystem(); 
    3232        void closeDialog(); 
  • src-qt4/pc-softwaremanager/updateDialog.ui

    r0381f41 r7c92c88  
    77    <x>0</x> 
    88    <y>0</y> 
    9     <width>400</width> 
    10     <height>220</height> 
     9    <width>376</width> 
     10    <height>219</height> 
    1111   </rect> 
    1212  </property> 
     
    4242   </item> 
    4343   <item> 
    44     <widget class="QFrame" name="frame"> 
    45      <property name="frameShape"> 
    46       <enum>QFrame::StyledPanel</enum> 
     44    <widget class="QTabWidget" name="tabWidget"> 
     45     <property name="currentIndex"> 
     46      <number>0</number> 
    4747     </property> 
    48      <property name="frameShadow"> 
    49       <enum>QFrame::Raised</enum> 
    50      </property> 
    51      <layout class="QVBoxLayout" name="verticalLayout_10"> 
    52       <item> 
    53        <widget class="QLabel" name="label_progress"> 
    54         <property name="text"> 
    55          <string/> 
    56         </property> 
    57         <property name="alignment"> 
    58          <set>Qt::AlignCenter</set> 
    59         </property> 
    60         <property name="wordWrap"> 
    61          <bool>true</bool> 
    62         </property> 
    63        </widget> 
    64       </item> 
    65       <item> 
    66        <widget class="QProgressBar" name="progressBar"> 
    67         <property name="value"> 
    68          <number>0</number> 
    69         </property> 
    70        </widget> 
    71       </item> 
    72      </layout> 
     48     <widget class="QWidget" name="tab"> 
     49      <attribute name="title"> 
     50       <string>Status</string> 
     51      </attribute> 
     52      <layout class="QVBoxLayout" name="verticalLayout_3"> 
     53       <item> 
     54        <widget class="QLabel" name="label_progress"> 
     55         <property name="text"> 
     56          <string/> 
     57         </property> 
     58         <property name="alignment"> 
     59          <set>Qt::AlignCenter</set> 
     60         </property> 
     61         <property name="wordWrap"> 
     62          <bool>true</bool> 
     63         </property> 
     64        </widget> 
     65       </item> 
     66       <item> 
     67        <widget class="QProgressBar" name="progressBar"> 
     68         <property name="value"> 
     69          <number>0</number> 
     70         </property> 
     71        </widget> 
     72       </item> 
     73       <item> 
     74        <spacer name="verticalSpacer_2"> 
     75         <property name="orientation"> 
     76          <enum>Qt::Vertical</enum> 
     77         </property> 
     78         <property name="sizeHint" stdset="0"> 
     79          <size> 
     80           <width>20</width> 
     81           <height>40</height> 
     82          </size> 
     83         </property> 
     84        </spacer> 
     85       </item> 
     86      </layout> 
     87     </widget> 
     88     <widget class="QWidget" name="tab_2"> 
     89      <attribute name="title"> 
     90       <string>Update Log</string> 
     91      </attribute> 
     92      <layout class="QVBoxLayout" name="verticalLayout_2"> 
     93       <item> 
     94        <widget class="QTextEdit" name="text_log"/> 
     95       </item> 
     96      </layout> 
     97     </widget> 
    7398    </widget> 
    74    </item> 
    75    <item> 
    76     <widget class="QCheckBox" name="check_viewlog"> 
    77      <property name="text"> 
    78       <string>View Log</string> 
    79      </property> 
    80     </widget> 
    81    </item> 
    82    <item> 
    83     <widget class="QTextEdit" name="text_log"/> 
    8499   </item> 
    85100   <item> 
Note: See TracChangeset for help on using the changeset viewer.