Changeset dc2ff91


Ignore:
Timestamp:
11/22/13 06:28:52 (21 months ago)
Author:
yurkis <yurkis@…>
Branches:
master, enter/10, releng/10.0, releng/10.0.1, releng/10.0.2, releng/10.0.3, releng/10.1, releng/10.1.1, releng/10.1.2
Children:
f769034
Parents:
26afaf0
Message:

BETA banner for UI

Location:
src-qt4/pc-updatecenter
Files:
1 added
5 edited

Legend:

Unmodified
Added
Removed
  • src-qt4/pc-updatecenter/mainwindow.cpp

    r24cc885e rdc2ff91  
    77#include <QFile> 
    88#include <QPalette> 
     9#include <QMessageBox> 
    910 
    1011#include "pcbsd-utils.h" 
     
    460461        mPBIController.updateAll(); 
    461462} 
     463 
     464void MainWindow::on_pushButton_clicked() 
     465{ 
     466    QMessageBox::information(this, "Early beta","<b>This is early beta only for testing</b><br><br>Missed functionality:<br> <b>1.System updates installation</b><br><2.Warden support<br>2.Some error handling<br>3.Last update log view<br><br>Please report bugs at http://trac.pcbsd.org<br> or on testing@mile list"); 
     467} 
  • src-qt4/pc-updatecenter/mainwindow.h

    r6a72edb rdc2ff91  
    4949    void on_sysUpdatesList_itemSelectionChanged(); 
    5050    void on_updateAllButton_clicked(); 
     51    void on_pushButton_clicked(); 
    5152}; 
    5253 
  • src-qt4/pc-updatecenter/mainwindow.ui

    r24cc885e rdc2ff91  
    2121   <layout class="QVBoxLayout" name="verticalLayout"> 
    2222    <item> 
     23     <widget class="QGroupBox" name="groupBox_4"> 
     24      <property name="title"> 
     25       <string/> 
     26      </property> 
     27      <layout class="QHBoxLayout" name="horizontalLayout_13"> 
     28       <item> 
     29        <widget class="QLabel" name="label_13"> 
     30         <property name="text"> 
     31          <string/> 
     32         </property> 
     33         <property name="pixmap"> 
     34          <pixmap resource="res.qrc">:/images/beta.png</pixmap> 
     35         </property> 
     36        </widget> 
     37       </item> 
     38       <item> 
     39        <widget class="QLabel" name="label_14"> 
     40         <property name="text"> 
     41          <string>This is early beta not full featured software for testing only!</string> 
     42         </property> 
     43        </widget> 
     44       </item> 
     45       <item> 
     46        <spacer name="horizontalSpacer_10"> 
     47         <property name="orientation"> 
     48          <enum>Qt::Horizontal</enum> 
     49         </property> 
     50         <property name="sizeHint" stdset="0"> 
     51          <size> 
     52           <width>40</width> 
     53           <height>20</height> 
     54          </size> 
     55         </property> 
     56        </spacer> 
     57       </item> 
     58       <item> 
     59        <widget class="QPushButton" name="pushButton"> 
     60         <property name="text"> 
     61          <string>More details...</string> 
     62         </property> 
     63        </widget> 
     64       </item> 
     65      </layout> 
     66     </widget> 
     67    </item> 
     68    <item> 
    2369     <widget class="QTabWidget" name="mainTab"> 
    2470      <property name="styleSheet"> 
     
    2672      </property> 
    2773      <property name="currentIndex"> 
    28        <number>1</number> 
     74       <number>0</number> 
    2975      </property> 
    3076      <property name="documentMode"> 
  • src-qt4/pc-updatecenter/res.qrc

    r06ea16c rdc2ff91  
    2828        <file>images/sysupdates-patch.png</file> 
    2929        <file>images/sysupdates-upgrade.png</file> 
     30        <file>images/beta.png</file> 
    3031    </qresource> 
    3132</RCC> 
  • src-qt4/pc-updatecenter/syscontroller.cpp

    r24cc885e rdc2ff91  
    44 
    55_STRING_CONSTANT PC_UPDATE_COMMAND = "pc-updatemanager"; 
    6 _STRING_CONSTANT FBSD_UPDATE_COMMAND = "pc-fbsdupdatecheck"; 
    7 //_STRING_CONSTANT FBSD_UPDATE_COMMAND = "cat"; 
    8 _STRING_CONSTANT FBSD_UPDATE_COMMAND = "pc-fbsdupdatecheck"; 
     6_STRING_CONSTANT FBSD_UPDATE_COMMAND = "cat"; 
     7//_STRING_CONSTANT FBSD_UPDATE_COMMAND = "pc-fbsdupdatecheck"; 
    98static const QStringList PC_UPDATE_ARGS(QStringList()<<"check"); 
    10 static const QStringList FBSD_UPDATE_ARGS (QStringList()<<"update"); 
    11 //static const QStringList FBSD_UPDATE_ARGS (QStringList()<<"/home/yurkis/_sysbasesys_check.txt"); 
     9//static const QStringList FBSD_UPDATE_ARGS (QStringList()<<"update"); 
     10static const QStringList FBSD_UPDATE_ARGS (QStringList()<<"/home/yurkis/_sysbasesys_check.txt"); 
    1211 
    1312_STRING_CONSTANT NAME_TAG = "NAME:"; 
     
    8483    else 
    8584    {         
    86         if (mFilesLocallyModifyed.size() || mFilesToRemove.size() || mFilesToUpdate.size()) 
     85        if (mFilesToRemove.size() || mFilesToUpdate.size()) 
    8786        { 
    8887            SSystemUpdate entry; 
Note: See TracChangeset for help on using the changeset viewer.