Changeset 7361ce1


Ignore:
Timestamp:
12/09/14 07:42:41 (5 months ago)
Author:
Ken Moore <ken@…>
Branches:
master, releng/10.1.1, releng/10.1.2
Children:
0183a22
Parents:
ec5d047 (diff), e7995cc (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:
18 edited

Legend:

Unmodified
Added
Removed
  • src-qt4/pc-xgui/resources/cardDetect/xorg.conf.virtualbox

    rd0b124c re7995cc  
    77    InputDevice    "Keyboard0" "CoreKeyboard" 
    88    Option         "Clone" "off" 
    9     Option         "AIGLX" "false" 
     9EndSection 
     10 
     11Section "ServerFlags" 
     12    Option "AIGLX" "false" 
    1013EndSection 
    1114 
     
    1417    Load           "dbe" 
    1518    Load           "dri" 
    16     Load           "dri2" 
    1719    Load           "extmod" 
    1820    Load           "glx" 
  • src-qt5/pc-xgui/resources/cardDetect/xorg.conf.virtualbox

    r3667cdb re7995cc  
    77    InputDevice    "Keyboard0" "CoreKeyboard" 
    88    Option         "Clone" "off" 
    9     Option         "AIGLX" "false" 
     9EndSection 
     10 
     11Section "ServerFlags" 
     12    Option "AIGLX" "false" 
    1013EndSection 
    1114 
     
    1417    Load           "dbe" 
    1518    Load           "dri" 
    16     Load           "dri2" 
    1719    Load           "extmod" 
    1820    Load           "glx" 
  • src-qt5/pc-zmanager/dialogfsprop.cpp

    r3667cdb rd79d6c0  
    1818 
    1919    ui->propList->setIconSize(QSize(32,32)); 
    20     ui->propList->header()->setResizeMode(1,QHeaderView::Stretch); 
    21     ui->propList->header()->setResizeMode(0,QHeaderView::ResizeToContents); 
    22     ui->propList->header()->setResizeMode(2,QHeaderView::ResizeToContents); 
     20    ui->propList->header()->setSectionResizeMode(1,QHeaderView::Stretch); 
     21    ui->propList->header()->setSectionResizeMode(0,QHeaderView::ResizeToContents); 
     22    ui->propList->header()->setSectionResizeMode(2,QHeaderView::ResizeToContents); 
    2323    ui->propList->sortByColumn(0,Qt::AscendingOrder); 
    2424    InitAllProperties(); 
  • src-qt5/pc-zmanager/dialognewpool.cpp

    r3667cdb rd79d6c0  
    1414    ui->vdevList->setIconSize(QSize(48,48)); 
    1515    ui->vdevList->header()->setStretchLastSection(false); 
    16     ui->vdevList->header()->setResizeMode(0,QHeaderView::Stretch); 
    17     ui->vdevList->header()->setResizeMode(1,QHeaderView::ResizeToContents); 
     16    ui->vdevList->header()->setSectionResizeMode(0,QHeaderView::Stretch); 
     17    ui->vdevList->header()->setSectionResizeMode(1,QHeaderView::ResizeToContents); 
    1818 
    1919    ui->vdevList->clear(); 
  • src-qt5/pc-zmanager/dialogpartition.cpp

    r3667cdb rd79d6c0  
    1818 
    1919    ui->devLayout->header()->setStretchLastSection(false); 
    20     ui->devLayout->header()->setResizeMode(0,QHeaderView::Stretch); 
    21     ui->devLayout->header()->setResizeMode(1,QHeaderView::ResizeToContents); 
    22     ui->devLayout->header()->setResizeMode(2,QHeaderView::ResizeToContents); 
    23     ui->devLayout->header()->setResizeMode(3,QHeaderView::ResizeToContents); 
    24     ui->devLayout->header()->setResizeMode(4,QHeaderView::ResizeToContents); 
     20    ui->devLayout->header()->setSectionResizeMode(0,QHeaderView::Stretch); 
     21    ui->devLayout->header()->setSectionResizeMode(1,QHeaderView::ResizeToContents); 
     22    ui->devLayout->header()->setSectionResizeMode(2,QHeaderView::ResizeToContents); 
     23    ui->devLayout->header()->setSectionResizeMode(3,QHeaderView::ResizeToContents); 
     24    ui->devLayout->header()->setSectionResizeMode(4,QHeaderView::ResizeToContents); 
    2525    ui->devLayout->setIconSize(QSize(22,22)); 
    2626    ui->devLayout->setSelectionMode(QAbstractItemView::SingleSelection); 
  • src-qt5/pc-zmanager/dialogprop.cpp

    r3667cdb rd79d6c0  
    1313    ui->setupUi(this); 
    1414    ui->propList->setIconSize(QSize(32,32)); 
    15     ui->propList->header()->setResizeMode(1,QHeaderView::Stretch); 
    16     ui->propList->header()->setResizeMode(0,QHeaderView::ResizeToContents); 
     15    ui->propList->header()->setSectionResizeMode(1,QHeaderView::Stretch); 
     16    ui->propList->header()->setSectionResizeMode(0,QHeaderView::ResizeToContents); 
    1717    InitAllProperties(); 
    1818 
  • src-qt5/pc-zmanager/main.cpp

    r3667cdb rd79d6c0  
    55#include <qtranslator.h> 
    66#include <qlocale.h> 
    7 #include <qtsingleapplication.h> 
     7#include <pcbsd-SingleApplication.h> 
    88 
    99#include <unistd.h> 
     
    2222    } 
    2323 
    24     QtSingleApplication a("Disk Manager",argc, argv); 
    25     if ( a.isRunning() ) 
    26       return !(a.sendMessage("show")); 
     24   PCSingleApplication a(argc, argv); 
     25    if ( !a.isPrimaryProcess() ){ return 0; } 
    2726 
    2827    QTranslator translator; 
     
    4241    w.show(); 
    4342 
    44     QObject::connect(&a, SIGNAL(messageReceived(const QString&)), &w, SLOT(slotSingleInstance()) ); 
     43    QObject::connect(&a, SIGNAL(InputsAvailable(QStringList)), &w, SLOT(slotSingleInstance()) ); 
    4544//    a.connect( &a, SIGNAL( lastWindowClosed() ), &a, SLOT( quit() ) ); 
    4645    return a.exec(); 
  • src-qt5/pc-zmanager/pc-zmanager.pro

    r3667cdb rd79d6c0  
    55#------------------------------------------------- 
    66 
    7 QT       += core gui svg 
     7QT       += core gui widgets network svg 
    88 
    99CONFIG += qt warn_on 
    1010 
    11 greaterThan(QT_MAJOR_VERSION, 4): QT += widgets 
    12  
    13 LIBS    += -L../libpcbsd -lQtSolutions_SingleApplication-head -lpcbsd-utils 
    14 INCLUDEPATH+= ../libpcbsd/utils/ 
     11LIBS    += -L../libpcbsd -L/usr/local/lib -lpcbsd-ui -lpcbsd-utils 
     12INCLUDEPATH+= ../libpcbsd/utils ../libpcbsd/ui /usr/local/include 
    1513 
    1614TARGET = pc-zmanager 
     
    116114 
    117115dotrans.path=/usr/local/share/pcbsd/i18n/ 
    118 dotrans.extra=cd i18n && lrelease-qt4 -nounfinished *.ts && cp *.qm $(INSTALL_ROOT)/usr/local/share/pcbsd/i18n/ 
     116dotrans.extra=cd i18n && /usr/local/lib/qt5/bin/lrelease -nounfinished *.ts && cp *.qm $(INSTALL_ROOT)/usr/local/share/pcbsd/i18n/ 
    119117 
    120118icons.path=/usr/local/share/pcbsd/icons 
  • src-qt5/pc-zmanager/zmanagerwindow.cpp

    r3667cdb rd79d6c0  
    3434    ui->zpoolList->setIconSize(QSize(48,48)); 
    3535    ui->zpoolList->header()->setStretchLastSection(true); 
    36     ui->zpoolList->header()->setResizeMode(0,QHeaderView::Interactive); 
    37     ui->zpoolList->header()->setResizeMode(1,QHeaderView::Stretch); 
     36    ui->zpoolList->header()->setSectionResizeMode(QHeaderView::Interactive); 
    3837    ui->zpoolList->header()->resizeSection(0,ui->deviceList->width()*2/3); 
    3938 
    4039    ui->deviceList->setIconSize(QSize(48,48)); 
    4140    ui->deviceList->header()->setStretchLastSection(true); 
    42     ui->deviceList->header()->setResizeMode(0,QHeaderView::Interactive); 
    43     ui->deviceList->header()->setResizeMode(1,QHeaderView::Stretch); 
     41    ui->deviceList->header()->setSectionResizeMode(QHeaderView::Interactive); 
    4442    ui->deviceList->header()->resizeSection(0,ui->deviceList->width()*2/3); 
    4543 
     
    5755    ui->fsList->setIconSize(QSize(48,48)); 
    5856    ui->fsList->header()->setStretchLastSection(true); 
    59     ui->fsList->header()->setResizeMode(0,QHeaderView::Interactive); 
    60     ui->fsList->header()->setResizeMode(1,QHeaderView::Stretch); 
     57    ui->fsList->header()->setSectionResizeMode(QHeaderView::Interactive); 
    6158    ui->fsList->header()->resizeSection(0,ui->deviceList->width()*2/3); 
    6259 
  • src-qt5/qsudo/main.cpp

    r3667cdb raa1f3b9a  
    1313    QApplication a(argc, argv); 
    1414 
    15     if ( qApp->argc() <= 1 ) { 
     15    if ( argc <= 1 ) { 
    1616       qDebug() << "Error: Need to specify argument to run!"; 
    1717       exit(1); 
  • src-qt5/qsudo/mainwindow.cpp

    r3667cdb raa1f3b9a  
    4545  // Set command text 
    4646  commandLabel->setVisible(false); 
    47   QString commText; 
    48   for ( int i = 1; i< qApp->argc() ; i++) 
     47  QString commText = qApp->arguments().join(" "); 
     48  /*for ( int i = 1; i< qApp->argc() ; i++) 
    4949  { 
    5050      commText+=qApp->argv()[i]; 
    51   } 
     51  }*/ 
    5252  commandLabel->setText(commText); 
    5353  //Initialize the settings file for this user 
     
    123123  QStringList arguments; 
    124124  arguments << "-S"; 
    125   for ( int i = 1; i< qApp->argc() ; i++) 
    126     arguments << qApp->argv()[i]; 
     125  arguments << qApp->arguments(); 
     126  /*for ( int i = 1; i< qApp->argc() ; i++) 
     127    arguments << qApp->argv()[i];*/ 
    127128 
    128129  sudoProc = new QProcess(this); 
  • src-qt5/qsudo/qsudo.pro

    r3667cdb raa1f3b9a  
    77#------------------------------------------------- 
    88 
    9 QT       += core gui 
     9QT       += core gui widgets 
    1010 
    1111TARGET = qsudo 
     
    9090 
    9191dotrans.path=/usr/local/share/pcbsd/i18n/ 
    92 dotrans.extra=cd i18n && lrelease-qt4 -nounfinished *.ts && cp *.qm $(INSTALL_ROOT)/usr/local/share/pcbsd/i18n/ 
     92dotrans.extra=cd i18n && /usr/local/lib/qt5/bin/lrelease -nounfinished *.ts && cp *.qm $(INSTALL_ROOT)/usr/local/share/pcbsd/i18n/ 
    9393 
    9494INSTALLS += target dotrans 
  • src-qt5/warden-gui/dialogTemplates.cpp

    r3667cdb rec5d047  
    7575   dialogOutput = new dialogDisplayOutput(); 
    7676   dialogOutput->setModal(true); 
    77    dialogOutput->programInit(FALSE); 
     77   dialogOutput->programInit(false); 
    7878   dialogOutput->setDialogCaption("Creating Template:"); 
    7979   dialogOutput->setDialogText(""); 
     
    107107     dialogOutput->appendDialogText(m.readLine().simplified() + "\n"); 
    108108   } 
    109    dialogOutput->setCloseHide(FALSE); 
     109   dialogOutput->setCloseHide(false); 
    110110   loadTemps(); 
    111111 
     
    119119   dialogOutput = new dialogDisplayOutput(); 
    120120   dialogOutput->setModal(true); 
    121    dialogOutput->programInit(FALSE); 
     121   dialogOutput->programInit(false); 
    122122   dialogOutput->setDialogCaption("Removing Template: " + listTemps->currentItem()->text(0)); 
    123123   dialogOutput->setDialogText(""); 
     
    141141     dialogOutput->appendDialogText(m.readLine().simplified() + "\n"); 
    142142   } 
    143    dialogOutput->setCloseHide(FALSE); 
     143   dialogOutput->setCloseHide(false); 
    144144   loadTemps(); 
    145145} 
  • src-qt5/warden-gui/dialogdisplayoutput.cpp

    r3667cdb rec5d047  
    1818    if(! buttonOn) 
    1919    { 
    20         pushClose->setHidden(TRUE); 
     20        pushClose->setHidden(true); 
    2121    } else { 
    22         pushClose->setHidden(FALSE); 
     22        pushClose->setHidden(false); 
    2323    } 
    2424     
     
    4949{ 
    5050    if(status) { 
    51         pushClose->setHidden(TRUE); 
     51        pushClose->setHidden(true); 
    5252    } else { 
    53         pushClose->setHidden(FALSE); 
     53        pushClose->setHidden(false); 
    5454    } 
    5555     
  • src-qt5/warden-gui/dialogimport.cpp

    r3667cdb rec5d047  
    4848void dialogImport::checkLineText( const QString &text ) 
    4949{ 
    50     pushOk->setEnabled(TRUE); 
     50    pushOk->setEnabled(true); 
    5151 
    5252    // Check that we have a valid IP / Host and enable / disable the creation button 
     
    5959    // Check the jail name 
    6060    if ( JailName.simplified().isEmpty() ) 
    61         pushOk->setEnabled(FALSE); 
     61        pushOk->setEnabled(false); 
    6262 
    6363     
    6464    // Check to make sure we don't have any missing IP fields 
    6565    if ( groupIP->isChecked() && (IP.indexOf("..") != -1 || IP.lastIndexOf(".") == (IP.length() - 1)) ) 
    66         pushOk->setEnabled(FALSE); 
     66        pushOk->setEnabled(false); 
    6767     
    6868    // Check to make sure the host isn't empty 
    6969    if ( groupHostname->isChecked() && Host.isEmpty() ) 
    70         pushOk->setEnabled(FALSE); 
     70        pushOk->setEnabled(false); 
    7171     
    7272} 
  • src-qt5/warden-gui/dialogwarden.cpp

    r3667cdb rec5d047  
    4747   // Setup our listview options 
    4848   listJails->setSelectionMode(QAbstractItemView::SingleSelection); 
    49    listJails->setAllColumnsShowFocus(TRUE); 
     49   listJails->setAllColumnsShowFocus(true); 
    5050 
    5151   // Run this a single time, just to be sure we did any jail import / migration 
     
    753753    dialogOutput = new dialogDisplayOutput(); 
    754754    dialogOutput->setModal(true); 
    755     dialogOutput->programInit(FALSE); 
     755    dialogOutput->programInit(false); 
    756756    dialogOutput->setDialogCaption(tr("Exporting Jail:") + " " + popupip); 
    757757    dialogOutput->setDialogText(""); 
     
    787787    dialogOutput = new dialogDisplayOutput(); 
    788788    dialogOutput->setModal(true); 
    789     dialogOutput->programInit(TRUE); 
     789    dialogOutput->programInit(true); 
    790790    dialogOutput->setDialogCaption("Jail Packages: " + popupip); 
    791791    dialogOutput->setDialogText(""); 
     
    928928      dialogOutput = new dialogDisplayOutput(); 
    929929      dialogOutput->setModal(false); 
    930       dialogOutput->programInit(FALSE); 
     930      dialogOutput->programInit(false); 
    931931      dialogOutput->setDialogCaption("Creating Jail: " + IP); 
    932932      dialogOutput->setDialogText(""); 
     
    10321032     
    10331033    // Unhide the close button 
    1034     dialogOutput->setCloseHide(FALSE); 
     1034    dialogOutput->setCloseHide(false); 
    10351035 
    10361036    // Refresh our jail list 
     
    10671067      dialogOutput = new dialogDisplayOutput(); 
    10681068      dialogOutput->setModal(false); 
    1069       dialogOutput->programInit(FALSE); 
     1069      dialogOutput->programInit(false); 
    10701070      dialogOutput->setDialogCaption("Importing Jail"); 
    10711071      dialogOutput->setDialogText(""); 
     
    11071107     
    11081108    // Unhide the close button 
    1109     dialogOutput->setCloseHide(FALSE); 
     1109    dialogOutput->setCloseHide(false); 
    11101110     
    11111111       // Refresh our jail list 
     
    15061506   dialogOutput = new dialogDisplayOutput(); 
    15071507   dialogOutput->setModal(true); 
    1508    dialogOutput->programInit(FALSE); 
     1508   dialogOutput->programInit(false); 
    15091509   dialogOutput->setDialogCaption(tr("Reverting snapshot")); 
    15101510   dialogOutput->setDialogText(tr("Reverting to snapshot:") + " " + getSnapDateReadable(snapshotList.at(sliderSnaps->value() ) )); 
     
    15731573{ 
    15741574    // Unhide the close button 
    1575     dialogOutput->setCloseHide(FALSE); 
     1575    dialogOutput->setCloseHide(false); 
    15761576} 
    15771577 
  • src-qt5/warden-gui/main.cpp

    r3667cdb rec5d047  
    33#include <QTranslator> 
    44#include <pcbsd-ui.h> 
     5#include <pcbsd-SingleApplication.h> 
    56#include <err.h> 
    67#include "dialogwarden.h" 
     
    89int main( int argc, char ** argv ) 
    910{ 
    10     QtSingleApplication a(argc, argv); 
    11     if ( a.isRunning() ) 
    12       return !(a.sendMessage("show")); 
     11    PCSingleApplication a(argc, argv); 
     12    if ( !a.isPrimaryProcess() ){ return 0; } 
    1313 
    1414    QTranslator translator; 
     
    2525    w->programInit(); 
    2626    w->show(); 
    27     QObject::connect(&a, SIGNAL(messageReceived(const QString&)), w, SLOT(slotSingleInstance()) ); 
     27    QObject::connect(&a, SIGNAL(InputsAvailable(QStringList)), w, SLOT(slotSingleInstance()) ); 
    2828    a.connect( &a, SIGNAL( lastWindowClosed() ), &a, SLOT( quit() ) ); 
    2929    return a.exec(); 
  • src-qt5/warden-gui/warden-gui.pro

    r3667cdb rec5d047  
    11TEMPLATE        = app 
    22LANGUAGE        = C++ 
    3  
     3QT += core gui widgets network 
    44CONFIG  += qt warn_on release 
    55 
    6 LIBS    +=-L../libpcbsd -lpcbsd-ui -lpcbsd-utils -lQtSolutions_SingleApplication-head 
     6LIBS    +=-L../libpcbsd -L/usr/local/lib -lpcbsd-ui -lpcbsd-utils 
    77INCLUDEPATH+= ../libpcbsd/ui ../libpcbsd/utils /usr/local/include 
    88 
     
    112112 
    113113dotrans.path=/usr/local/share/warden/i18n/ 
    114 dotrans.extra=cd i18n && lrelease-qt4 -nounfinished *.ts && cp *.qm $(INSTALL_ROOT)/usr/local/share/warden/i18n/ 
     114dotrans.extra=cd i18n && /usr/local/lib/qt5/bin/lrelease -nounfinished *.ts && cp *.qm $(INSTALL_ROOT)/usr/local/share/warden/i18n/ 
    115115 
    116116desktop.path=/usr/local/share/applications/ 
Note: See TracChangeset for help on using the changeset viewer.