Ignore:
Timestamp:
01/08/14 08:31:54 (20 months ago)
Author:
Ken Moore <ken@…>
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, releng/10.2, stable/10
Children:
531a3df0
Parents:
a469e71
Message:

Clean up a lot of the built-up kruft in the main system manager UI from the very old days.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src-qt4/pc-sysmanager/pbsystemtab.h

    r8f95077 r1c0e4984  
    66#include <QMenu> 
    77#include <QMessageBox> 
    8 #include <QNetworkAccessManager> 
    9 #include <QNetworkReply> 
     8//#include <QNetworkAccessManager> 
     9//#include <QNetworkReply> 
    1010#include <QProcess> 
    1111#include <QProgressDialog> 
     
    1616#include <pcbsd-utils.h> 
    1717#include <pcbsd-ui.h> 
    18 #include "updaterDialog.h" 
    1918#include "ui_pbsystemtab.h" 
    2019#include "cmdDialog.h" 
    2120#include "../config.h" 
    2221 
     22 
    2323/* Change this to switch the default patch tmpdir */ 
    24 const QString PATCHTMPDIR_DEFAULT( PREFIX + "/tmp" ); 
    25 #define SYSTRIGGER "/tmp/.sysupdatetraytrigger" 
     24//const QString PATCHTMPDIR_DEFAULT( PREFIX + "/tmp" ); 
     25//#define SYSTRIGGER "/tmp/.sysupdatetraytrigger" 
    2626 
    2727/* The Update STATUS Flags */ 
    28 #define SYSTEM_UP2DATE 0 
    29 #define SYSTEM_UPDATE_AVAIL 1 
    30 #define SYSTEM_CHECKING4UPDATES 4 
    31 #define SYSTEM_UPDATING 5 
    32 #define CHECK_FAILED 6 
     28//#define SYSTEM_UP2DATE 0 
     29//#define SYSTEM_UPDATE_AVAIL 1 
     30//#define SYSTEM_CHECKING4UPDATES 4 
     31//#define SYSTEM_UPDATING 5 
     32//#define CHECK_FAILED 6 
    3333 
    3434// Set our defines for the type of mirror the user is running 
    35 #define AUTOMIRROR      0 
    36 #define SELECTMIRROR    1 
    37 #define CUSTOMMIRROR    2 
     35//#define AUTOMIRROR      0 
     36//#define SELECTMIRROR    1 
     37//#define CUSTOMMIRROR    2 
    3838 
    3939 
     
    5454public slots: 
    5555    void ProgramInit(); 
    56     void saveKernScreen(); 
    5756    void changeOpenTab(int tab); 
    5857 
    5958private slots: 
    60     void ReadUname(); 
     59 
    6160    void startGenerateSheet(); 
    6261    void finishedSheet(); 
    6362    void fetchSourcePressed(); 
    6463    void fetchPortsPressed(); 
    65     void loadBootData(); 
     64    void loadMiscData(); 
    6665    void slotMiscSave(); 
    6766    void slotClose(); 
    6867     
    6968private: 
    70     QString KernDescr[50]; 
    71     QString KernDefaultTag; 
    72     QString KernTag[50]; 
    73     QString KernFileName[50]; 
     69    //Diagnostic Sheet generation 
    7470    QProcess *SheetGenScript; 
    7571    QString SheetFileName; 
    76     QProcess *GetPBVer; 
    77     QProcess *GetUname; 
     72 
     73    //Ports/Source fetching 
    7874    CMDDialog *cmdDlg; 
    79     QString username; 
    80     bool miscChanged; 
    81     bool kernelChanged; 
     75 
     76    //Internal variables 
     77    QString username, Version, Arch; 
     78 
     79 
    8280    void CheckUname(); 
    8381    void CheckPBVer(); 
    8482    void CreateSheetFile(); 
    8583    void showRebootRequired(); 
    86     //void LoadKernSettings(); 
    87     QString getLineFromCommandOutput(QString cmd); 
    88     bool sanityCheckSettings(); 
    89  
    90     QString mirrorNames[900]; 
    91     QString mirrorURLs[900]; 
    92     QString mirrorJobBuf; 
    93     QNetworkAccessManager *mirrorJob; 
    94     QNetworkReply *mirrorReply; 
    95     void checkProxy(); 
    96  
    97     updaterStatus *UpdaterStatusDialog; 
    98      
    99     QMenu *popup; 
    100     QNetworkAccessManager *sysFetchJob; 
    101     QNetworkReply *sysFetchReply; 
    102     QNetworkAccessManager *sysCopyJob; 
    103     QNetworkReply *sysCopyReply; 
    104  
    105     int mirrorType; 
    106     QString mirrorURL; 
    107     QString customTmpDir; 
    108     QString Version; 
    109     QString Arch; 
    110     QString Lang; 
    111     int programstatus; 
    112     int currentSysWorkingItem; 
    113     QStringList workingSysUpdates; 
    114     int workingPopupItem; 
    115     long totalSeconds; 
    116     long downloadSize; 
    117     int totalSteps; 
    118     int attemptedRedownload; 
    119     int firstInstall; 
    120     int firstDownload; 
    121     int requiresSysReboot; 
    122     QString sysPatchsetTmpFile; 
    123     QProcess *getUpdatesDir; 
    124     QProcess *readSysUpdates; 
    125     QProcess *listingProc; 
    126     QProcess *checksumProc; 
    127     QProcess *extractProc; 
    128     QProcess *installProc; 
    129     QProcess *getFreeSpaceProc; 
    130     QString SysUpdateName[500]; 
    131     QString SysUpdateIgnore[500]; 
    132     QString SysUpdatePatchFile[500]; 
    133     QString SysUpdateDate[500]; 
    134     QString SysUpdateMD5[500]; 
    135     QString SysUpdateSize[500]; 
    136     QString SysUpdateURL[500]; 
    137     QString SysUpdateAlone[500]; 
    138     QString SysUpdateReboot[500]; 
    139     QString SysUpdateDetailsURL[500]; 
    140     QString SysUpdatesShown[501]; 
    141     metaWidget *pkgWidget; 
    14284 
    14385protected: 
Note: See TracChangeset for help on using the changeset viewer.