Changeset 77386e3


Ignore:
Timestamp:
02/12/15 08:20:16 (6 months ago)
Author:
Ken Moore <ken@…>
Branches:
master, enter/10, releng/10.1.2
Children:
9e95a2e
Parents:
95ada60 (diff), 478d1dd (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:
3 edited

Legend:

Unmodified
Added
Removed
  • src-qt5/pc-softweb/MainUI.cpp

    r4cf6796 r291696ec  
    160160  if(!AUTHCOMPLETE){ 
    161161    //Only perform the authorization if necessary 
    162     QString authkey = pcbsd::Utils::runShellCommand("pc-su /usr/local/share/appcafe/dispatcher-localauth 2>/dev/null").join("").simplified(); 
     162    QString authkey = pcbsd::Utils::getLineFromCommandOutput("pc-su /usr/local/share/appcafe/dispatcher-localauth 2>/dev/null").simplified(); 
    163163    AUTHCOMPLETE = !authkey.isEmpty(); 
    164164    if ( authkey.indexOf(":") != -1 ) 
  • src-webui/appweb/share/html/pages/appinfo.php

    rf6c8c7d r478d1dd  
    588588      ?> 
    589589    </td> 
    590     <td align=left style="width: <? if($hasIcons){ print("100%"); } else { print("100%"); }?>"> 
     590    <td align=left style=""> 
    591591      <img align="left" height=64 width=64 src="images/pbiicon.php?i=<? echo "$pbicdir"; ?>/icon.png"> 
    592592       <a href="<? echo "$pbiweb"; ?>" target="_new"><? echo "$pbiauth"; ?></a>  
  • src-qt5/PCDM/src/pcdm-logindelay.cpp

    r3667cdb r95ada60  
    11#include "pcdm-logindelay.h" 
    22#include "ui_pcdm-logindelay.h" 
     3 
     4#include <QPoint> 
     5#include <QDesktopWidget> 
    36 
    47loginDelay::loginDelay(int seconds, QString username) : QDialog(), ui(new Ui::loginDelay){ 
     
    1619  connect(ui->pushCancel, SIGNAL(clicked()), this, SLOT(cancelLogin()) ); 
    1720  connect(ui->pushContinue, SIGNAL(clicked()), this, SLOT(startLogin()) ); 
     21  //Center the dialog on the screen 
     22  QPoint center = QApplication::desktop()->availableGeometry().center(); 
     23  this->move(center.x()-(this->width()/2), center.y()-(this->height()/2)); 
    1824} 
    1925 
Note: See TracChangeset for help on using the changeset viewer.