Changeset 7961fef


Ignore:
Timestamp:
02/12/15 11:42:52 (3 months ago)
Author:
Ken Moore <ken@…>
Branches:
master, enter/10, releng/10.1.2
Children:
b3df0a4
Parents:
05828f6 (diff), ec3a71e (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

Conflicts:

src-qt5/pc-firstbootgui/firstboot.ui

Files:
9 added
9 edited

Legend:

Unmodified
Added
Removed
  • build-files/conf/essential-packages

    r6231389 r144b4d9  
    4040misc/pcbsd-toolchain 
    4141misc/trueos-base 
     42multimedia/plexhometheater 
     43multimedia/xbmc 
    4244sysutils/pcbsd-util* 
    4345sysutils/pcbsd-appweb 
  • build-files/conf/iso-packages

    r2bcde2f r144b4d9  
    4242misc/trueos-base 
    4343misc/kde4-l10n 
     44multimedia/plexhometheater 
     45multimedia/xbmc 
    4446net/krdc 
    4547net-im/pidgin 
  • src-qt5/pc-firstbootgui/firstboot.ui

    r05828f6 r7961fef  
    1010    <height>482</height> 
    1111   </rect> 
     12  </property> 
     13  <property name="minimumSize"> 
     14   <size> 
     15    <width>800</width> 
     16    <height>600</height> 
     17   </size> 
    1218  </property> 
    1319  <property name="windowTitle"> 
  • src-qt5/pc-firstbootgui/main.cpp

    r517d390 r4ae6210  
    5555    int wid = dimensions.width();     // returns desktop width 
    5656    int hig = dimensions.height();    // returns desktop height 
    57     w.setGeometry((wid/2) - (650/2), (hig/2) - (435/2), 650, 435); 
     57    QRect wizDimensions = w.geometry(); 
     58    int wizWid = wizDimensions.width(); // Wizard width 
     59    int wizHig = wizDimensions.height(); // Wizard height 
     60    qDebug() << "WizWid" << wizWid; 
     61    qDebug() << "WizHig" << wizHig; 
     62    w.setGeometry((wid/2) - (wizWid/2), (hig/2) - (wizHig/2), wizWid, wizHig); 
    5863 
    5964    // Start the init 
  • src-qt5/pc-installgui/installer.ui

    r1bce0cb rbc4d6d3  
    77    <x>0</x> 
    88    <y>0</y> 
    9     <width>650</width> 
    10     <height>542</height> 
     9    <width>914</width> 
     10    <height>724</height> 
    1111   </rect> 
     12  </property> 
     13  <property name="minimumSize"> 
     14   <size> 
     15    <width>800</width> 
     16    <height>600</height> 
     17   </size> 
    1218  </property> 
    1319  <property name="windowTitle"> 
     
    2531   </property> 
    2632   <layout class="QGridLayout" name="gridLayout"> 
    27     <property name="margin"> 
     33    <property name="leftMargin"> 
     34     <number>0</number> 
     35    </property> 
     36    <property name="topMargin"> 
     37     <number>0</number> 
     38    </property> 
     39    <property name="rightMargin"> 
     40     <number>0</number> 
     41    </property> 
     42    <property name="bottomMargin"> 
    2843     <number>0</number> 
    2944    </property> 
  • src-qt5/pc-installgui/main.cpp

    r517d390 rbc4d6d3  
    6969    Installer w; 
    7070 
    71  
    7271    // Center the installer 
    7372    QRect dimensions = QApplication::desktop()->screenGeometry(); 
    7473    int wid = dimensions.width();     // returns desktop width 
    7574    int hig = dimensions.height();    // returns desktop height 
    76     w.setGeometry((wid/2) - (650/2), (hig/2) - (435/2), 650, 435); 
     75    QRect wizDimensions = w.geometry(); 
     76    int wizWid = wizDimensions.width(); // Wizard width 
     77    int wizHig = wizDimensions.height(); // Wizard height 
     78    qDebug() << "WizWid" << wizWid; 
     79    qDebug() << "WizHig" << wizHig; 
     80    w.setGeometry((wid/2) - (wizWid/2), (hig/2) - (wizHig/2), wizWid, wizHig); 
    7781 
    7882    // Start the init 
  • src-qt5/pc-installgui/wizardDisk.ui

    r1e77bb0 rbc4d6d3  
    77    <x>0</x> 
    88    <y>0</y> 
    9     <width>668</width> 
    10     <height>489</height> 
     9    <width>685</width> 
     10    <height>494</height> 
    1111   </rect> 
    1212  </property> 
  • src-qt5/pc-installgui/wizardFreeBSD.ui

    r1d6eaf5 rbc4d6d3  
    77    <x>0</x> 
    88    <y>0</y> 
    9     <width>536</width> 
    10     <height>383</height> 
     9    <width>607</width> 
     10    <height>404</height> 
    1111   </rect> 
    1212  </property> 
  • src-sh/pcbsd-utils/pc-extractoverlay/pc-extractoverlay

    r77ff4df rec3a71e  
    171171    grep -q "openntpd" /etc/rc.conf.pcbsd 
    172172    if [ $? -ne 0 ] ; then 
    173        echo "# Enable OpenNTPD" >> /etc/rc.conf 
    174        echo "ntpd_enable=\"NO\"" >> /etc/rc.conf 
    175        echo "openntpd_enable=\"YES\"" >> /etc/rc.conf 
     173       grep -q "openntpd" /etc/rc.conf 
     174       if [ $? -ne 0 ] ; then 
     175         echo "# Enable OpenNTPD" >> /etc/rc.conf 
     176         echo "ntpd_enable=\"NO\"" >> /etc/rc.conf 
     177         echo "openntpd_enable=\"YES\"" >> /etc/rc.conf 
     178       fi 
    176179    fi 
    177180    if [ ! -e "/usr/local/etc/ntpd.conf" ] ; then 
Note: See TracChangeset for help on using the changeset viewer.