[PC-BSD Commits] r4252 - in pbibuild/pbi-source: PBIsource PBItext
svn at pcbsd.org
svn at pcbsd.org
Thu Jul 16 10:40:54 PDT 2009
Author: kris
Date: 2009-07-16 10:40:54 -0700 (Thu, 16 Jul 2009)
New Revision: 4252
Modified:
pbibuild/pbi-source/PBIsource/PBI.pro
pbibuild/pbi-source/PBIsource/main.cpp
pbibuild/pbi-source/PBIsource/pbi.cpp
pbibuild/pbi-source/PBIsource/pbi.h
pbibuild/pbi-source/PBIsource/pbi.ui
pbibuild/pbi-source/PBItext/main.cpp
Log:
Updated PBI installers to QT 4.5, removed all legacy QT 3.x crud,
and fixed to use new lzmautils binary. Still needs some formatting fixes
Modified: pbibuild/pbi-source/PBIsource/PBI.pro
===================================================================
--- pbibuild/pbi-source/PBIsource/PBI.pro 2009-07-16 16:57:58 UTC (rev 4251)
+++ pbibuild/pbi-source/PBIsource/PBI.pro 2009-07-16 17:40:54 UTC (rev 4252)
@@ -23,6 +23,4 @@
OBJECTS_DIR = .obj
}
-QT += qt3support
-
QMAKE_LIBDIR = /PCBSD/local/kde4/lib /PCBSD/local/lib/qt4 /PCBSD/local/lib /usr/local/kde4/lib /usr/local/lib/qt4 /usr/local/lib
Modified: pbibuild/pbi-source/PBIsource/main.cpp
===================================================================
--- pbibuild/pbi-source/PBIsource/main.cpp 2009-07-16 16:57:58 UTC (rev 4251)
+++ pbibuild/pbi-source/PBIsource/main.cpp 2009-07-16 17:40:54 UTC (rev 4252)
@@ -2,7 +2,7 @@
#include <kapplication.h>
#include <kcmdlineargs.h>
#include <qtranslator.h>
-#include <qtextcodec.h>
+#include <qlocale.h>
#include <kaboutdata.h>
#include "pbi.h"
@@ -36,7 +36,8 @@
QTranslator translator( 0 );
- translator.load( QString("PBI_") + QTextCodec::locale(), "." );
+ QLocale mylocale;
+ translator.load( QString("PBI_") + QLocale::languageToString(mylocale.language()), "." );
a.installTranslator( &translator );
PBI w;
Modified: pbibuild/pbi-source/PBIsource/pbi.cpp
===================================================================
--- pbibuild/pbi-source/PBIsource/pbi.cpp 2009-07-16 16:57:58 UTC (rev 4251)
+++ pbibuild/pbi-source/PBIsource/pbi.cpp 2009-07-16 17:40:54 UTC (rev 4252)
@@ -35,32 +35,27 @@
// Lets the app know if the file-extraction has begun
ExtractStarted = 0;
- // Tell the app we are in GUI mode
- CLImode = 0;
-
// Set our flag that we have not created any Mime files yet
createdMimeFiles = 0;
gridLayout->setMargin(0);
gridLayout->setSpacing(0);
- gridLayout2->setMargin(0);
- gridLayout2->setSpacing(2);
- gridLayout3->setMargin(0);
- gridLayout4->setSpacing(2);
- gridLayout4->setMargin(0);
- gridLayout4->setSpacing(2);
- gridLayout5->setMargin(0);
- gridLayout5->setSpacing(2);
- gridLayout6->setMargin(0);
- gridLayout6->setSpacing(2);
+ gridLayout_2->setMargin(0);
+ gridLayout_2->setSpacing(2);
+ gridLayout_3->setMargin(0);
+ gridLayout_4->setSpacing(2);
+ gridLayout_4->setMargin(0);
+ gridLayout_4->setSpacing(2);
+ gridLayout_5->setMargin(0);
+ gridLayout_5->setSpacing(2);
+ gridLayout_6->setMargin(0);
+ gridLayout_6->setSpacing(2);
+
ProgramDir = ProgDir;
OverWrote = 0;
- setHelpEnabled(currentPage(), FALSE);
- //helpButton()->setHidden(TRUE);
-
CheckRoot = new QProcess(this);
QString program = "whoami";
connect(CheckRoot, SIGNAL( readyReadStandardOutput() ), this, SLOT(CheckRootSlot() ) );
@@ -71,7 +66,7 @@
setMaximumWidth(490);
// Connect the page changed slot to proper signal
- connect( this, SIGNAL(selected( const QString &)), this, SLOT(PageChanged(const QString &)) );
+ connect( this, SIGNAL(currentIdChanged(int)), this, SLOT(PageChanged(int)) );
connect( LicenseCheckBox, SIGNAL( clicked() ), this, SLOT(AgreeButtonSlot() ) );
@@ -103,7 +98,7 @@
bool foundProgram = false;
QFile file2( "/Programs/.config/ProgList" );
- if ( file2.open( IO_ReadOnly ) ) {
+ if ( file2.open( QIODevice::ReadOnly ) ) {
QTextStream stream2( &file2 );
while ( !stream2.atEnd() ) {
line = stream2.readLine(); // line of text excluding '\n'
@@ -134,27 +129,35 @@
}
}
-void PBI::PageChanged( const QString &PageName )
+void PBI::PageChanged( int pageId )
{
- setHelpEnabled(currentPage(), FALSE);
- helpButton()->setHidden(TRUE);
-
+ // If no page, don't process
+ if ( pageId == -1 )
+ {
+ return;
+ }
+ //setHelpEnabled(currentPage(), FALSE);
+ //helpButton()->setHidden(TRUE);
+
+ QString PageName;
+ PageName = page(pageId)->subTitle();
+
if (PageName == tr("Welcome Screen") )
{
- setNextEnabled(currentPage(), TRUE);
+ button(QWizard::NextButton)->setEnabled(TRUE);
}
if (PageName == tr("License Agreement") )
{
- setNextEnabled(currentPage(), FALSE);
+ button(QWizard::NextButton)->setEnabled(FALSE);
AgreeButtonSlot();
}
if ( PageName == tr("Install Directory") )
{
- setBackEnabled(currentPage(), TRUE);
- setNextEnabled(currentPage(), FALSE);
+ button(QWizard::BackButton)->setEnabled(TRUE);
+ button(QWizard::NextButton)->setEnabled(FALSE);
// Check the lineInstallLocation and populate it if empty
if ( lineInstallLocation->text().isEmpty() )
@@ -182,9 +185,9 @@
if ( PageName == tr("Install Software") )
{
- setBackEnabled(currentPage(), FALSE);
- setFinishEnabled(currentPage(),FALSE);
- setNextEnabled(currentPage(), FALSE);
+ button(QWizard::BackButton)->setEnabled(FALSE);
+ button(QWizard::NextButton)->setEnabled(FALSE);
+ button(QWizard::FinishButton)->setEnabled(FALSE);
if ( ChecksumFinished == 0 )
{
@@ -199,9 +202,9 @@
if ( PageName == tr("Install Finished") )
{
- setBackEnabled(currentPage(), FALSE);
- setFinishEnabled(currentPage(),TRUE);
- cancelButton()->hide();
+ button(QWizard::BackButton)->setEnabled(FALSE);
+ button(QWizard::FinishButton)->setEnabled(TRUE);
+ button(QWizard::CancelButton)->setHidden(TRUE);
}
}
@@ -214,7 +217,7 @@
// Open our config file, and read in the data
QFile file( "PkgConfig" );
- if ( file.open( IO_ReadOnly ) ) {
+ if ( file.open( QIODevice::ReadOnly ) ) {
QTextStream stream( &file );
QString line;
int i = -1;
@@ -341,7 +344,7 @@
line = line.replace("TarLines: ", "");
TotalLinesTar = line.toInt();
StepsTarFile = TotalLinesTar;
- installProgress->setTotalSteps(TotalLinesTar + 2);
+ installProgress->setMaximum(TotalLinesTar + 2);
TotalLinesTar = 0;
}
@@ -369,7 +372,7 @@
ProgramLabel->setFont(font);
AuthorLabel->setText(ProgramAuthor);
WebsiteLabel->setText(ProgramWeb);
- setCaption("PBI: " + ProgramName + " " + ProgramVer );
+ setWindowTitle("PBI: " + ProgramName + " " + ProgramVer );
tmp = ProgramName;
tmp.replace(" ", "");
@@ -383,7 +386,7 @@
// If we have a package with no desktop icons, remove the page
if (NoMenuCheck == 1)
{
- removePage(page(3));
+ removePage(3);
}
if ( NoTaskbarCheck == 1)
@@ -395,24 +398,24 @@
QFile LicFile( "LICENSE" );
if ( ! LicFile.exists() )
{
- removePage(page(1));
+ removePage(1);
} else {
- if ( LicFile.open( IO_ReadOnly ) ) {
+ if ( LicFile.open( QIODevice::ReadOnly ) ) {
QTextStream stream2( &LicFile );
while ( !stream2.atEnd() ) {
LicenseTextEdit->append(stream2.readLine() + "\n" );
}
}
- LicenseTextEdit->setCursorPosition(0, 0);
+ LicenseTextEdit->moveCursor(QTextCursor::Start);
}
// Loads the username
QFile whoami( "whoami" );
- if ( whoami.open( IO_ReadOnly ) ) {
+ if ( whoami.open( QIODevice::ReadOnly ) ) {
QTextStream stream3( &whoami );
while ( !stream3.atEnd() ) {
RealUserName = stream3.readLine();
@@ -427,9 +430,9 @@
{
if ( LicenseCheckBox->isChecked() )
{
- setNextEnabled(currentPage(), TRUE);
+ button(QWizard::NextButton)->setEnabled(TRUE);
} else {
- setNextEnabled(currentPage(), FALSE);
+ button(QWizard::NextButton)->setEnabled(FALSE);
}
}
@@ -444,7 +447,7 @@
{
QTimer::singleShot( 60*500, this, SLOT(SetupLibSlot()) );
} else {
- cancelButton()->setEnabled(FALSE);
+ button(QWizard::CancelButton)->setEnabled(FALSE);
CreateConfigSlot();
}
@@ -468,7 +471,7 @@
QString line2;
QFile file2( "/Programs/.config/ProgList" );
- if ( file2.open( IO_ReadOnly ) ) {
+ if ( file2.open( QIODevice::ReadOnly ) ) {
QTextStream stream2( &file2 );
while ( !stream2.atEnd() ) {
line = stream2.readLine(); // line of text excluding '\n'
@@ -516,7 +519,7 @@
}
// Now save the new config file
QFile file3( "/Programs/.config/ProgList" );
- if ( file3.open( IO_WriteOnly ) ) {
+ if ( file3.open( QIODevice::WriteOnly ) ) {
QTextStream stream3( &file3 );
stream3 << SavedFile;
file3.close();
@@ -532,11 +535,11 @@
StatusLabel->setText(tr("Registering Install...") );
// Increment the progress bar by 1
- installProgress->setProgress(installProgress->progress() + 1);
+ installProgress->setValue(installProgress->value() + 1);
// Adds the program to the Program Manager list
QFile file( "/Programs/.config/ProgList" );
- if ( file.open( IO_WriteOnly | IO_Append ) ) {
+ if ( file.open( QIODevice::WriteOnly | QIODevice::Append ) ) {
QTextStream stream( &file );
stream << "\n[ Program Entry ]\n";
stream << "ProgName: " << ProgramName << "\n";
@@ -568,7 +571,7 @@
// Now save the new config file
QString sizestring;
QFile sizefile( "/Programs/" + ProgDirName + "/.progsize" );
- if ( sizefile.open( IO_WriteOnly ) ) {
+ if ( sizefile.open( QIODevice::WriteOnly ) ) {
QTextStream sizestream( &sizefile );
sizestream << "PROGSIZE: ";
sizestream << sizestring.setNum(ProgSize);
@@ -614,7 +617,7 @@
}
QFile file2( "/Programs/" + ProgDirName + "/.sbin/" + Binary );
- if ( file2.open( IO_WriteOnly ) ) {
+ if ( file2.open( QIODevice::WriteOnly ) ) {
QTextStream stream2( &file2 );
stream2 << "#!/bin/sh\n";
stream2 << "# Auto-Generated by PC-BSD\n";
@@ -1207,7 +1210,7 @@
QFile file3( "dcop.sh");
- if ( file3.open( IO_WriteOnly) ) {
+ if ( file3.open( QIODevice::WriteOnly) ) {
QTextStream stream3( &file3 );
stream3 << "#!/bin/sh\n";
stream3 << "dcop --user " + RealUserName + " kicker Panel addNonKDEAppButton \"" + ExeDescr[exenum] + "\" \"" + ExeDescr[exenum] + "\" \"/Programs/" + ProgDirName + "/.sbin/" + Binary + "\" \"" + Icon + "\" \"\" " + ShellOption + "\n";
@@ -1245,16 +1248,10 @@
Chmod2->start(program2, arguments2);
}
- if ( CLImode == 0)
- {
- installProgress->setProgress(installProgress->totalSteps());
- StatusLabel->setText(tr("Installation Finished!"));
- progressTextDialog->setText("");
- next();
- } else {
- printf("\nInstallation Finished!\n");
- exit(0);
- }
+ installProgress->setValue(installProgress->maximum());
+ StatusLabel->setText(tr("Installation Finished!"));
+ progressTextDialog->setText("");
+ next();
}
@@ -1264,16 +1261,10 @@
if (tmp.simplified() != "root")
{
- if ( CLImode == 0)
- {
QMessageBox::information( this, tr("Error!"), tr("The installer must be run as root. Please try again, and enter your root password. ") );
exit(1);
- } else {
- printf("\nError: The installer must be run as root!\n");
- exit(1);
- }
- }
+ }
}
@@ -1288,7 +1279,7 @@
// Write out the wrapper script
QFile file( ".PBIwrapper.sh" );
- if ( file.open( IO_WriteOnly ) ) {
+ if ( file.open( QIODevice::WriteOnly ) ) {
QTextStream stream( &file );
stream << "#!/bin/sh\n";
stream << "PROGDIR=\"" + ProgDirName + "\"; export PROGDIR\n";
@@ -1345,7 +1336,7 @@
progressTextDialog->setText(value);
// Set the steps +1
- installProgress->setProgress(installProgress->progress() + 1);
+ installProgress->setValue(installProgress->value() + 1);
}
}
@@ -1429,7 +1420,7 @@
void PBI::runCommand( QString Command )
{
- FILE *file = popen(Command,"r");
+ FILE *file = popen(Command.toLatin1(),"r");
fclose(file);
}
@@ -1443,8 +1434,8 @@
QDir NewDir;
NewDir.setPath("/Programs/" + ProgDirName);
- installProgress->setTotalSteps(StepsTarFile);
- installProgress->setProgress(0);
+ installProgress->setMaximum(StepsTarFile);
+ installProgress->setValue(0);
// Check if we need to remove an old directory
if (NewDir.exists())
@@ -1461,7 +1452,7 @@
NewDir.mkpath(InstallDirPath);
if ( InstallDirPath != RegularPath )
{
- system("ln -s '" + InstallDirPath + "' " + "/Programs/" + ProgDirName);
+ system("ln -s '" + InstallDirPath.toLatin1() + "' " + "/Programs/" + ProgDirName.toLatin1());
}
// If we have update URL, create the file here
@@ -1469,7 +1460,7 @@
{
// Now save the new config file
QFile file3( "/Programs/" + ProgDirName + "/PBI.UpdateURL.sh" );
- if ( file3.open( IO_WriteOnly ) ) {
+ if ( file3.open( QIODevice::WriteOnly ) ) {
QTextStream stream3( &file3 );
stream3 << "#!/bin/sh\n\nPBIUpdateURL=\"" << ProgUpdateURL << "\" ; export PBIUpdateURL";
file3.close();
@@ -1479,9 +1470,9 @@
// Make the install script now
QFile file4( "extract.sh" );
- if ( file4.open( IO_WriteOnly ) ) {
+ if ( file4.open( QIODevice::WriteOnly ) ) {
QTextStream stream4( &file4 );
- stream4 << "#!/bin/sh\nSKIP=`cat pbiskip`\ntail +${SKIP} pbilink | ./lzma d -si -so | tar xpov -C \"${1}\" -f -";
+ stream4 << "#!/bin/sh\nSKIP=`cat pbiskip`\ntail +${SKIP} pbilink | ./lzma -d -c - | tar xpov -C \"${1}\" -f -";
file4.close();
}
@@ -1539,13 +1530,13 @@
if ( tmp.indexOf("TOTALSTEPS:" ) == 0)
{
value = tmp.replace("TOTALSTEPS: ", "");
- installProgress->setTotalSteps(value.toInt());
+ installProgress->setMaximum(value.toInt());
}
if ( tmp.indexOf("SETSTEPS:" ) == 0)
{
value = tmp.replace("SETSTEPS: ", "");
- installProgress->setProgress(value.toInt());
+ installProgress->setValue(value.toInt());
}
if ( tmp.indexOf("MSG:" ) == 0)
@@ -1663,13 +1654,13 @@
if (tmp.indexOf("TOTALSTEPS:" ) == 0)
{
value = tmp.replace("TOTALSTEPS: ", "");
- installProgress->setTotalSteps(value.toInt());
+ installProgress->setMaximum(value.toInt());
}
if ( tmp.indexOf("SETSTEPS:" ) == 0)
{
value = tmp.replace("SETSTEPS: ", "");
- installProgress->setProgress(value.toInt());
+ installProgress->setValue(value.toInt());
}
if ( tmp.indexOf("MSG:" ) == 0)
@@ -1777,86 +1768,6 @@
-void PBI::layOutTitleRow( QHBoxLayout * layout, const QString & title )
-{
-
- QLabel *aTitle = (QLabel*)child("title label", "QLabel");
- QVBoxLayout *aLayout = (QVBoxLayout*)child("top-level layout", "QVBoxLayout");
-
- aLayout->setMargin( 0 );
- aLayout->setSpacing( 0 );
-
-
-
- aTitle->hide();
-
- Q3Wizard::layOutTitleRow(layout, title);
-
-
-
-}
-
-
-void PBI::layOutButtonRow( QHBoxLayout *layout )
-{
- QBoxLayout * h = new QBoxLayout( QBoxLayout::LeftToRight );
- layout->addLayout( h );
-
- h->addStretch( 42 );
-
- QFrame *aHBar = (QFrame*)child("<hr>", "QFrame");
- aHBar->setFrameStyle(QFrame::NoFrame);
- aHBar->hide();
- aHBar->setName("<hr>");
-
- QObjectList l = topLevelWidget()->queryList( "QFrame", "<hr>" );
- QList<QObject *> it( l );
- QObject *obj;
-
- for (int i = 0; i < it.size(); ++i)
- {
- obj = it.at(i);
- // for each found object...
- ((QFrame*)obj)->setContentsMargins(0, 0, 0, 0);
- ((QFrame*)obj)->setLineWidth(1);
- ((QFrame*)obj)->setFixedHeight(2);
- }
-
- //delete l; // delete the list, not the objects
-
-
- layout->addSpacing( 6 );
-
-
- QBoxLayout * lay = new QHBoxLayout( layout , 1);
-
- lay->addWidget( backButton() );
- lay->addWidget( nextButton() );
- lay->addSpacing(5);
-
- lay->addWidget( cancelButton() );
-
- lay->addWidget( finishButton() );
-
- if (title(currentPage() ) == tr("Install Finished") )
- {
- backButton()->hide();
- nextButton()->hide();
- finishButton()->show();
- } else {
- finishButton()->hide();
- }
-
-
-// lay->setMargin(5);
-
-
-
- repaint();
-
-}
-
-
void PBI::checkCustomGraphics()
{
@@ -1883,7 +1794,7 @@
if ( QFile::exists( "icon.png" ) ) {
QPixmap pixmap3;
pixmap3.load("icon.png");
- setIcon(pixmap3);
+ setWindowIcon(pixmap3);
}
}
@@ -1960,9 +1871,9 @@
// Make the install script now
QFile file4( "extract.sh" );
- if ( file4.open( IO_WriteOnly ) ) {
+ if ( file4.open( QIODevice::WriteOnly ) ) {
QTextStream stream4( &file4 );
- stream4 << "#!/bin/sh\nSKIP=`cat pbiskip`\ntail +${SKIP} pbilink | ./lzma d -si -so | tar xpov -C \"${1}\" -f -";
+ stream4 << "#!/bin/sh\nSKIP=`cat pbiskip`\ntail +${SKIP} pbilink | ./lzma -d -c - | tar xpov -C \"${1}\" -f -";
file4.close();
}
@@ -1986,7 +1897,7 @@
cout << "Extracted to: /home/" + RealUserName.toStdString() + "/" + ProgDirName.toStdString() + "\n";
QFile CfgFile( "/home/" + RealUserName + "/" + ProgDirName + ".pbc" );
- if ( CfgFile.open( IO_WriteOnly ) ) {
+ if ( CfgFile.open( QIODevice::WriteOnly ) ) {
QTextStream stream( &CfgFile );
// Save the software name and info
stream << "[ PBC 1.0 ]" << "\n";
@@ -2055,7 +1966,7 @@
if ( LicFile.exists() )
{
stream << "License: YES\n" ;
- if ( LicFile.open( IO_ReadOnly ) ) {
+ if ( LicFile.open( QIODevice::ReadOnly ) ) {
QTextStream stream2( &LicFile );
while ( !stream2.atEnd() ) {
stream << stream2.readLine() + "\n" ;
@@ -2080,7 +1991,7 @@
void PBI::accept()
{
QFile file( "postClose.sh" );
- if ( file.open( IO_WriteOnly ) ) {
+ if ( file.open( QIODevice::WriteOnly ) ) {
QTextStream stream( &file );
stream << "#!/bin/sh\n";
@@ -2113,9 +2024,9 @@
// Check if we have enough free disk space in this partition
if ( checkSpaceRequirements())
{
- setNextEnabled(currentPage(), TRUE);
+ button(QWizard::NextButton)->setEnabled(TRUE);
} else {
- setNextEnabled(currentPage(), FALSE);
+ button(QWizard::NextButton)->setEnabled(FALSE);
}
}
@@ -2130,11 +2041,11 @@
// Open our df file, and read it line-by-line
QFile file( ".dfoutput" );
- if ( file.open( IO_ReadOnly ) ) {
+ if ( file.open( QIODevice::ReadOnly ) ) {
QTextStream stream( &file );
while ( !stream.atEnd() ) {
tmp = stream.readLine(); // line of text excluding '\n'
- CheckDFParts[i] = tmp.simplifyWhiteSpace();
+ CheckDFParts[i] = tmp.simplified();
// QMessageBox::critical( this, tr("DF"), "Read Line:" + CheckDFParts[i]);
i++;
@@ -2205,14 +2116,11 @@
void PBI::slotChangeInstallLocation()
{
-
+ QString startdir = "/home";
// Ask the user where they want to install
- QString newDir = QFileDialog::getExistingDirectory(
- "/home",
- this,
+ QString newDir = QFileDialog::getExistingDirectory( this,
tr("Select install directory"),
- tr("Select install directory"),
- TRUE );
+ startdir);
// Check if the user just hit cancel
if ( newDir.isEmpty() )
@@ -2230,7 +2138,7 @@
// Check if the selected directory is even writable
QFile file( newDir + "/.writecheck" );
- if ( file.open( IO_WriteOnly ) ) {
+ if ( file.open( QIODevice::WriteOnly ) ) {
file.close();
file.remove();
} else {
@@ -2252,7 +2160,7 @@
QString PBI::getLineFromCommandOutput( QString command )
{
- FILE *file = popen(command,"r");
+ FILE *file = popen(command.toLatin1(),"r");
char buffer[100];
@@ -2278,11 +2186,11 @@
// Setup our custom removal script
if ( QFile::exists( "/Programs/" + ProgDirName + "/PBI.RemoveScript.sh" ) )
{
- system("mv /Programs/" + ProgDirName + "/PBI.RemoveScript.sh /Programs/" + ProgDirName + "/PBI.RemoveScript2.sh");
+ system("mv /Programs/" + ProgDirName.toLatin1() + "/PBI.RemoveScript.sh /Programs/" + ProgDirName.toLatin1() + "/PBI.RemoveScript2.sh");
}
QFile file( "/Programs/" + ProgDirName + "/PBI.RemoveScript.sh" );
- if ( file.open( IO_WriteOnly ) ) {
+ if ( file.open( QIODevice::WriteOnly ) ) {
QTextStream stream( &file );
stream << "#!/bin/sh\n";
@@ -2357,7 +2265,7 @@
file.close();
}
- system("chmod 755 /Programs/" + ProgDirName + "/PBI.RemoveScript.sh" );
+ system("chmod 755 /Programs/" + ProgDirName.toLatin1() + "/PBI.RemoveScript.sh" );
FinishedInstallSlot();
}
@@ -2369,7 +2277,7 @@
// Make the checksum.sh script now
QFile file4( "checksum.sh" );
- if ( file4.open( IO_WriteOnly ) ) {
+ if ( file4.open( QIODevice::WriteOnly ) ) {
QTextStream stream4( &file4 );
stream4 << "#!/bin/sh\nSKIP=`cat pbiskip`\ntail +${SKIP} pbilink | md5 >&1";
file4.close();
@@ -2448,7 +2356,7 @@
// Write out the wrapper script
QFile file( ".PBIwrapper.sh" );
- if ( file.open( IO_WriteOnly ) ) {
+ if ( file.open( QIODevice::WriteOnly ) ) {
QTextStream stream( &file );
stream << "#!/bin/sh\n";
stream << "PROGDIR=\"" + ProgDirName + "\"; export PROGDIR\n";
Modified: pbibuild/pbi-source/PBIsource/pbi.h
===================================================================
--- pbibuild/pbi-source/PBIsource/pbi.h 2009-07-16 16:57:58 UTC (rev 4251)
+++ pbibuild/pbi-source/PBIsource/pbi.h 2009-07-16 17:40:54 UTC (rev 4252)
@@ -11,16 +11,15 @@
#include <qtimer.h>
#include <qfiledialog.h>
-class PBI : public Q3Wizard, private Ui::PBI
+class PBI : public QWizard, private Ui::PBI
{
Q_OBJECT
public:
- PBI() : Q3Wizard()
+ PBI() : QWizard()
{
setupUi(this);
}
- void layOutButtonRow( QHBoxLayout * layout );
void checkCustomGraphics();
void uninstall();
void extractOnly();
@@ -29,7 +28,7 @@
public slots:
void ProgramInit( QString ProgDir );
- void PageChanged( const QString &PageName );
+ void PageChanged( int pageId );
void readSettingsSlot();
void AgreeButtonSlot();
void SetupLibSlot();
@@ -45,7 +44,6 @@
void startInstallFirstRunCheck();
void readyReadScriptOutput();
void readyReadScriptOutput2();
- void layOutTitleRow( QHBoxLayout * layout, const QString &title );
void reject();
void extractOnlyFinished();
void accept();
@@ -112,7 +110,6 @@
QLayout *mylayout;
int ExeOwndir[100];
QString ExeKdeCat[100];
- int CLImode;
QPixmap *hrline;
int SafeCancel;
int ExtractStarted;
Modified: pbibuild/pbi-source/PBIsource/pbi.ui
===================================================================
--- pbibuild/pbi-source/PBIsource/pbi.ui 2009-07-16 16:57:58 UTC (rev 4251)
+++ pbibuild/pbi-source/PBIsource/pbi.ui 2009-07-16 17:40:54 UTC (rev 4252)
@@ -1,1012 +1,580 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
<class>PBI</class>
- <widget class="Q3Wizard" name="PBI" >
- <property name="geometry" >
+ <widget class="QWizard" name="PBI">
+ <property name="geometry">
<rect>
<x>0</x>
<y>0</y>
- <width>515</width>
- <height>404</height>
+ <width>575</width>
+ <height>365</height>
</rect>
</property>
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
+ <property name="windowTitle">
+ <string>PBI Installer</string>
</property>
- <property name="minimumSize" >
- <size>
- <width>0</width>
- <height>0</height>
- </size>
+ <property name="options">
+ <set>QWizard::IgnoreSubTitles</set>
</property>
- <property name="maximumSize" >
- <size>
- <width>515</width>
- <height>500</height>
- </size>
- </property>
- <property name="sizeIncrement" >
- <size>
- <width>0</width>
- <height>0</height>
- </size>
- </property>
- <property name="baseSize" >
- <size>
- <width>0</width>
- <height>0</height>
- </size>
- </property>
- <property name="font" >
- <font/>
- </property>
- <property name="windowTitle" >
- <string>PC-BSD Software Installer</string>
- </property>
- <property name="windowIcon" >
- <iconset resource="PBI.qrc" >
- <normaloff>:/application.png</normaloff>:/application.png</iconset>
- </property>
- <property name="sizeGripEnabled" >
- <bool>false</bool>
- </property>
- <property name="modal" >
- <bool>false</bool>
- </property>
- <widget class="QWidget" name="WizardPage" >
- <attribute name="title" >
+ <widget class="QWizardPage" name="wizardPage1">
+ <property name="title">
+ <string/>
+ </property>
+ <property name="subTitle">
<string>Welcome Screen</string>
- </attribute>
- <layout class="QGridLayout" >
- <item row="0" column="0" >
- <widget class="Q3Frame" name="frame3" >
- <property name="palette" >
- <palette>
- <active>
- <colorrole role="WindowText" >
- <brush brushstyle="SolidPattern" >
- <color alpha="255" >
- <red>0</red>
- <green>0</green>
- <blue>0</blue>
- </color>
- </brush>
- </colorrole>
- <colorrole role="Button" >
- <brush brushstyle="SolidPattern" >
- <color alpha="255" >
- <red>221</red>
- <green>223</green>
- <blue>228</blue>
- </color>
- </brush>
- </colorrole>
- <colorrole role="Light" >
- <brush brushstyle="SolidPattern" >
- <color alpha="255" >
- <red>255</red>
- <green>255</green>
- <blue>255</blue>
- </color>
- </brush>
- </colorrole>
- <colorrole role="Midlight" >
- <brush brushstyle="SolidPattern" >
- <color alpha="255" >
- <red>238</red>
- <green>239</green>
- <blue>241</blue>
- </color>
- </brush>
- </colorrole>
- <colorrole role="Dark" >
- <brush brushstyle="SolidPattern" >
- <color alpha="255" >
- <red>110</red>
- <green>111</green>
- <blue>114</blue>
- </color>
- </brush>
- </colorrole>
- <colorrole role="Mid" >
- <brush brushstyle="SolidPattern" >
- <color alpha="255" >
- <red>147</red>
- <green>149</green>
- <blue>152</blue>
- </color>
- </brush>
- </colorrole>
- <colorrole role="Text" >
- <brush brushstyle="SolidPattern" >
- <color alpha="255" >
- <red>0</red>
- <green>0</green>
- <blue>0</blue>
- </color>
- </brush>
- </colorrole>
- <colorrole role="BrightText" >
- <brush brushstyle="SolidPattern" >
- <color alpha="255" >
- <red>255</red>
- <green>255</green>
- <blue>255</blue>
- </color>
- </brush>
- </colorrole>
- <colorrole role="ButtonText" >
- <brush brushstyle="SolidPattern" >
- <color alpha="255" >
- <red>0</red>
- <green>0</green>
- <blue>0</blue>
- </color>
- </brush>
- </colorrole>
- <colorrole role="Base" >
- <brush brushstyle="SolidPattern" >
- <color alpha="255" >
- <red>255</red>
- <green>255</green>
- <blue>255</blue>
- </color>
- </brush>
- </colorrole>
- <colorrole role="Window" >
- <brush brushstyle="SolidPattern" >
- <color alpha="255" >
- <red>255</red>
- <green>255</green>
- <blue>255</blue>
- </color>
- </brush>
- </colorrole>
- <colorrole role="Shadow" >
- <brush brushstyle="SolidPattern" >
- <color alpha="255" >
- <red>0</red>
- <green>0</green>
- <blue>0</blue>
- </color>
- </brush>
- </colorrole>
- <colorrole role="Highlight" >
- <brush brushstyle="SolidPattern" >
- <color alpha="255" >
- <red>0</red>
- <green>0</green>
- <blue>128</blue>
- </color>
- </brush>
- </colorrole>
- <colorrole role="HighlightedText" >
- <brush brushstyle="SolidPattern" >
- <color alpha="255" >
- <red>255</red>
- <green>255</green>
- <blue>255</blue>
- </color>
- </brush>
- </colorrole>
- <colorrole role="Link" >
- <brush brushstyle="SolidPattern" >
- <color alpha="255" >
- <red>0</red>
- <green>0</green>
- <blue>0</blue>
- </color>
- </brush>
- </colorrole>
- <colorrole role="LinkVisited" >
- <brush brushstyle="SolidPattern" >
- <color alpha="255" >
- <red>0</red>
- <green>0</green>
- <blue>0</blue>
- </color>
- </brush>
- </colorrole>
- </active>
- <inactive>
- <colorrole role="WindowText" >
- <brush brushstyle="SolidPattern" >
- <color alpha="255" >
- <red>0</red>
- <green>0</green>
- <blue>0</blue>
- </color>
- </brush>
- </colorrole>
- <colorrole role="Button" >
- <brush brushstyle="SolidPattern" >
- <color alpha="255" >
- <red>221</red>
- <green>223</green>
- <blue>228</blue>
- </color>
- </brush>
- </colorrole>
- <colorrole role="Light" >
- <brush brushstyle="SolidPattern" >
- <color alpha="255" >
- <red>255</red>
- <green>255</green>
- <blue>255</blue>
- </color>
- </brush>
- </colorrole>
- <colorrole role="Midlight" >
- <brush brushstyle="SolidPattern" >
- <color alpha="255" >
- <red>254</red>
- <green>254</green>
- <blue>255</blue>
- </color>
- </brush>
- </colorrole>
- <colorrole role="Dark" >
- <brush brushstyle="SolidPattern" >
- <color alpha="255" >
- <red>110</red>
- <green>111</green>
- <blue>114</blue>
- </color>
- </brush>
- </colorrole>
- <colorrole role="Mid" >
- <brush brushstyle="SolidPattern" >
- <color alpha="255" >
- <red>147</red>
- <green>149</green>
- <blue>152</blue>
- </color>
- </brush>
- </colorrole>
- <colorrole role="Text" >
- <brush brushstyle="SolidPattern" >
- <color alpha="255" >
- <red>0</red>
- <green>0</green>
- <blue>0</blue>
- </color>
- </brush>
- </colorrole>
- <colorrole role="BrightText" >
- <brush brushstyle="SolidPattern" >
- <color alpha="255" >
- <red>255</red>
- <green>255</green>
- <blue>255</blue>
- </color>
- </brush>
- </colorrole>
- <colorrole role="ButtonText" >
- <brush brushstyle="SolidPattern" >
- <color alpha="255" >
- <red>0</red>
- <green>0</green>
- <blue>0</blue>
- </color>
- </brush>
- </colorrole>
- <colorrole role="Base" >
- <brush brushstyle="SolidPattern" >
- <color alpha="255" >
- <red>255</red>
- <green>255</green>
- <blue>255</blue>
- </color>
- </brush>
- </colorrole>
- <colorrole role="Window" >
- <brush brushstyle="SolidPattern" >
- <color alpha="255" >
- <red>255</red>
- <green>255</green>
- <blue>255</blue>
- </color>
- </brush>
- </colorrole>
- <colorrole role="Shadow" >
- <brush brushstyle="SolidPattern" >
- <color alpha="255" >
- <red>0</red>
- <green>0</green>
- <blue>0</blue>
- </color>
- </brush>
- </colorrole>
- <colorrole role="Highlight" >
- <brush brushstyle="SolidPattern" >
- <color alpha="255" >
- <red>0</red>
- <green>0</green>
- <blue>128</blue>
- </color>
- </brush>
- </colorrole>
- <colorrole role="HighlightedText" >
- <brush brushstyle="SolidPattern" >
- <color alpha="255" >
- <red>255</red>
- <green>255</green>
- <blue>255</blue>
- </color>
- </brush>
- </colorrole>
- <colorrole role="Link" >
- <brush brushstyle="SolidPattern" >
- <color alpha="255" >
- <red>0</red>
- <green>0</green>
- <blue>238</blue>
- </color>
- </brush>
- </colorrole>
- <colorrole role="LinkVisited" >
- <brush brushstyle="SolidPattern" >
- <color alpha="255" >
- <red>82</red>
- <green>24</green>
- <blue>139</blue>
- </color>
- </brush>
- </colorrole>
- </inactive>
- <disabled>
- <colorrole role="WindowText" >
- <brush brushstyle="SolidPattern" >
- <color alpha="255" >
- <red>128</red>
- <green>128</green>
- <blue>128</blue>
- </color>
- </brush>
- </colorrole>
- <colorrole role="Button" >
- <brush brushstyle="SolidPattern" >
- <color alpha="255" >
- <red>221</red>
- <green>223</green>
- <blue>228</blue>
- </color>
- </brush>
- </colorrole>
- <colorrole role="Light" >
- <brush brushstyle="SolidPattern" >
- <color alpha="255" >
- <red>255</red>
- <green>255</green>
- <blue>255</blue>
- </color>
- </brush>
- </colorrole>
- <colorrole role="Midlight" >
- <brush brushstyle="SolidPattern" >
- <color alpha="255" >
- <red>254</red>
- <green>254</green>
- <blue>255</blue>
- </color>
- </brush>
- </colorrole>
- <colorrole role="Dark" >
- <brush brushstyle="SolidPattern" >
- <color alpha="255" >
- <red>110</red>
- <green>111</green>
- <blue>114</blue>
- </color>
- </brush>
- </colorrole>
- <colorrole role="Mid" >
- <brush brushstyle="SolidPattern" >
- <color alpha="255" >
- <red>147</red>
- <green>149</green>
- <blue>152</blue>
- </color>
- </brush>
- </colorrole>
- <colorrole role="Text" >
- <brush brushstyle="SolidPattern" >
- <color alpha="255" >
- <red>128</red>
- <green>128</green>
- <blue>128</blue>
- </color>
- </brush>
- </colorrole>
- <colorrole role="BrightText" >
- <brush brushstyle="SolidPattern" >
- <color alpha="255" >
- <red>255</red>
- <green>255</green>
- <blue>255</blue>
- </color>
- </brush>
- </colorrole>
- <colorrole role="ButtonText" >
- <brush brushstyle="SolidPattern" >
- <color alpha="255" >
- <red>128</red>
- <green>128</green>
- <blue>128</blue>
- </color>
- </brush>
- </colorrole>
- <colorrole role="Base" >
- <brush brushstyle="SolidPattern" >
- <color alpha="255" >
- <red>255</red>
- <green>255</green>
- <blue>255</blue>
- </color>
- </brush>
- </colorrole>
- <colorrole role="Window" >
- <brush brushstyle="SolidPattern" >
- <color alpha="255" >
- <red>255</red>
- <green>255</green>
- <blue>255</blue>
- </color>
- </brush>
- </colorrole>
- <colorrole role="Shadow" >
- <brush brushstyle="SolidPattern" >
- <color alpha="255" >
- <red>0</red>
- <green>0</green>
- <blue>0</blue>
- </color>
- </brush>
- </colorrole>
- <colorrole role="Highlight" >
- <brush brushstyle="SolidPattern" >
- <color alpha="255" >
- <red>0</red>
- <green>0</green>
- <blue>128</blue>
- </color>
- </brush>
- </colorrole>
- <colorrole role="HighlightedText" >
- <brush brushstyle="SolidPattern" >
- <color alpha="255" >
- <red>255</red>
- <green>255</green>
- <blue>255</blue>
- </color>
- </brush>
- </colorrole>
- <colorrole role="Link" >
- <brush brushstyle="SolidPattern" >
- <color alpha="255" >
- <red>0</red>
- <green>0</green>
- <blue>238</blue>
- </color>
- </brush>
- </colorrole>
- <colorrole role="LinkVisited" >
- <brush brushstyle="SolidPattern" >
- <color alpha="255" >
- <red>82</red>
- <green>24</green>
- <blue>139</blue>
- </color>
- </brush>
- </colorrole>
- </disabled>
- </palette>
- </property>
- <property name="frameShape" >
- <enum>QFrame::NoFrame</enum>
- </property>
- <property name="frameShadow" >
- <enum>QFrame::Raised</enum>
- </property>
- <layout class="QGridLayout" >
- <property name="margin" >
- <number>0</number>
- </property>
- <property name="spacing" >
- <number>0</number>
- </property>
- <item row="0" column="2" colspan="2" >
- <spacer name="spacer23" >
- <property name="orientation" >
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeType" >
- <enum>QSizePolicy::Maximum</enum>
- </property>
- <property name="sizeHint" stdset="0" >
- <size>
- <width>140</width>
- <height>21</height>
- </size>
- </property>
- </spacer>
- </item>
- <item rowspan="7" row="1" column="1" >
- <spacer name="spacer26" >
- <property name="orientation" >
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeType" >
- <enum>QSizePolicy::Fixed</enum>
- </property>
- <property name="sizeHint" stdset="0" >
- <size>
- <width>21</width>
- <height>250</height>
- </size>
- </property>
- </spacer>
- </item>
- <item rowspan="8" row="0" column="0" >
- <widget class="QLabel" name="leftBarPixmap" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="pixmap" >
- <pixmap resource="PBI.qrc" >:/leftside.png</pixmap>
- </property>
- <property name="scaledContents" >
- <bool>true</bool>
- </property>
- <property name="alignment" >
- <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
- </property>
- <property name="wordWrap" >
- <bool>false</bool>
- </property>
- </widget>
- </item>
- <item row="0" column="6" >
- <spacer name="spacer24" >
- <property name="orientation" >
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeType" >
- <enum>QSizePolicy::Fixed</enum>
- </property>
- <property name="sizeHint" stdset="0" >
- <size>
- <width>141</width>
- <height>31</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="0" column="5" >
- <spacer name="spacer22" >
- <property name="orientation" >
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeType" >
- <enum>QSizePolicy::Fixed</enum>
- </property>
- <property name="sizeHint" stdset="0" >
- <size>
- <width>20</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="2" column="4" >
- <spacer name="spacer25" >
- <property name="orientation" >
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeType" >
- <enum>QSizePolicy::Fixed</enum>
- </property>
- <property name="sizeHint" stdset="0" >
- <size>
- <width>21</width>
- <height>15</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="4" column="4" >
- <spacer name="spacer77" >
- <property name="orientation" >
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeType" >
- <enum>QSizePolicy::Fixed</enum>
- </property>
- <property name="sizeHint" stdset="0" >
- <size>
- <width>20</width>
- <height>31</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="5" column="3" colspan="4" >
- <widget class="QLabel" name="AuthorLabel" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text" >
- <string><Author></string>
- </property>
- <property name="alignment" >
- <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
- </property>
- <property name="wordWrap" >
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item row="6" column="3" colspan="4" >
- <widget class="QLabel" name="WebsiteLabel" >
- <property name="enabled" >
- <bool>true</bool>
- </property>
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text" >
- <string><Web></string>
- </property>
- <property name="alignment" >
- <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
- </property>
- <property name="wordWrap" >
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item row="7" column="2" colspan="5" >
- <spacer name="spacer27" >
- <property name="orientation" >
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeType" >
- <enum>QSizePolicy::Fixed</enum>
- </property>
- <property name="sizeHint" stdset="0" >
- <size>
- <width>320</width>
- <height>60</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="1" column="2" colspan="5" >
- <widget class="QLabel" name="ProgramLabel" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Minimum" hsizetype="Preferred" >
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="frameShape" >
- <enum>QFrame::NoFrame</enum>
- </property>
- <property name="frameShadow" >
- <enum>QFrame::Plain</enum>
- </property>
- <property name="text" >
- <string><h1>Program Name</h1></string>
- </property>
- <property name="alignment" >
- <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
- </property>
- <property name="wordWrap" >
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item row="3" column="2" colspan="5" >
- <widget class="QLabel" name="WelcomeLabel" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="maximumSize" >
- <size>
- <width>32767</width>
- <height>40</height>
- </size>
- </property>
- <property name="text" >
- <string>Preparing to install PROGNAME</string>
- </property>
- <property name="alignment" >
- <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
- </property>
- <property name="wordWrap" >
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item row="5" column="2" >
- <widget class="QLabel" name="textLabel2_2_2" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text" >
- <string>Vendor:</string>
- </property>
- <property name="alignment" >
- <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
- </property>
- <property name="wordWrap" >
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item row="6" column="2" >
- <widget class="QLabel" name="textLabel2_2_3" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="frameShape" >
- <enum>QFrame::NoFrame</enum>
- </property>
- <property name="frameShadow" >
- <enum>QFrame::Plain</enum>
- </property>
- <property name="text" >
- <string>URL:</string>
- </property>
- <property name="alignment" >
- <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
- </property>
- <property name="wordWrap" >
- <bool>true</bool>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- </item>
- </layout>
- </widget>
- <widget class="QWidget" name="WizardPage" >
- <property name="geometry" >
- <rect>
- <x>6</x>
- <y>36</y>
- <width>503</width>
- <height>321</height>
- </rect>
</property>
- <attribute name="title" >
- <string>License Agreement</string>
- </attribute>
- <layout class="QGridLayout" name="gridLayout_2" >
- <item row="0" column="0" colspan="3" >
- <widget class="QLabel" name="headerPixmap" >
- <property name="pixmap" >
- <pixmap resource="PBI.qrc" >:/header.png</pixmap>
+ <layout class="QGridLayout" name="gridLayout">
+ <item row="0" column="0" rowspan="5">
+ <widget class="QLabel" name="leftBarPixmap">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
</property>
- <property name="scaledContents" >
+ <property name="pixmap">
+ <pixmap resource="PBI.qrc">:/leftside.png</pixmap>
+ </property>
+ <property name="scaledContents">
<bool>true</bool>
</property>
- <property name="wordWrap" >
+ <property name="alignment">
+ <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+ </property>
+ <property name="wordWrap">
<bool>false</bool>
</property>
</widget>
</item>
- <item row="1" column="1" >
- <spacer name="spacer31_3" >
- <property name="orientation" >
- <enum>Qt::Vertical</enum>
+ <item row="0" column="1" rowspan="5">
+ <spacer name="spacer26">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
</property>
- <property name="sizeType" >
+ <property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
- <property name="sizeHint" stdset="0" >
+ <property name="sizeHint" stdset="0">
<size>
- <width>20</width>
- <height>16</height>
+ <width>13</width>
+ <height>250</height>
</size>
</property>
</spacer>
</item>
- <item row="2" column="0" colspan="3" >
- <layout class="QHBoxLayout" name="horizontalLayout_3" >
- <property name="sizeConstraint" >
- <enum>QLayout::SetMaximumSize</enum>
- </property>
+ <item row="0" column="2">
+ <layout class="QHBoxLayout" name="horizontalLayout">
<item>
- <spacer name="spacer31_2" >
- <property name="orientation" >
+ <spacer name="spacer23">
+ <property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeType" >
+ <property name="sizeType">
+ <enum>QSizePolicy::Maximum</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>140</width>
+ <height>21</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <spacer name="spacer22">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
- <property name="sizeHint" stdset="0" >
+ <property name="sizeHint" stdset="0">
<size>
- <width>15</width>
+ <width>20</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
- <widget class="Q3TextEdit" name="LicenseTextEdit" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
+ <spacer name="spacer24">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeType">
+ <enum>QSizePolicy::Fixed</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>141</width>
+ <height>31</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </item>
+ <item row="1" column="2">
+ <layout class="QVBoxLayout" name="verticalLayout">
+ <item>
+ <widget class="QLabel" name="ProgramLabel">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Minimum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="minimumSize" >
+ <property name="frameShape">
+ <enum>QFrame::NoFrame</enum>
+ </property>
+ <property name="frameShadow">
+ <enum>QFrame::Plain</enum>
+ </property>
+ <property name="text">
+ <string><h1>Program Name</h1></string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+ </property>
+ <property name="wordWrap">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="spacer25">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeType">
+ <enum>QSizePolicy::Fixed</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
<size>
- <width>0</width>
- <height>0</height>
+ <width>328</width>
+ <height>13</height>
</size>
</property>
- <property name="text" >
- <string/>
+ </spacer>
+ </item>
+ <item>
+ <widget class="QLabel" name="WelcomeLabel">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
</property>
- <property name="wordWrap" >
- <enum>Q3TextEdit::WidgetWidth</enum>
+ <property name="maximumSize">
+ <size>
+ <width>32767</width>
+ <height>40</height>
+ </size>
</property>
- <property name="readOnly" >
+ <property name="text">
+ <string>Preparing to install PROGNAME</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+ </property>
+ <property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
<item>
- <spacer name="spacer31" >
- <property name="orientation" >
- <enum>Qt::Horizontal</enum>
+ <spacer name="spacer77">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
</property>
- <property name="sizeType" >
+ <property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
- <property name="sizeHint" stdset="0" >
+ <property name="sizeHint" stdset="0">
<size>
- <width>15</width>
- <height>20</height>
+ <width>20</width>
+ <height>31</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
- <item row="3" column="0" >
- <spacer name="spacer28" >
- <property name="orientation" >
- <enum>Qt::Horizontal</enum>
+ <item row="2" column="2">
+ <layout class="QHBoxLayout" name="horizontalLayout_2">
+ <item>
+ <widget class="QLabel" name="textLabel2_2_2">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string>Vendor:</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+ </property>
+ <property name="wordWrap">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="AuthorLabel">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string><Author></string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+ </property>
+ <property name="wordWrap">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item row="3" column="2">
+ <layout class="QHBoxLayout" name="horizontalLayout_3">
+ <item>
+ <widget class="QLabel" name="textLabel2_2_3">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="frameShape">
+ <enum>QFrame::NoFrame</enum>
+ </property>
+ <property name="frameShadow">
+ <enum>QFrame::Plain</enum>
+ </property>
+ <property name="text">
+ <string>URL:</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+ </property>
+ <property name="wordWrap">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="WebsiteLabel">
+ <property name="enabled">
+ <bool>true</bool>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string><Web></string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+ </property>
+ <property name="wordWrap">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item row="4" column="2">
+ <spacer name="spacer27">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
</property>
- <property name="sizeType" >
- <enum>QSizePolicy::Expanding</enum>
+ <property name="sizeType">
+ <enum>QSizePolicy::Fixed</enum>
</property>
- <property name="sizeHint" stdset="0" >
+ <property name="sizeHint" stdset="0">
<size>
- <width>220</width>
- <height>31</height>
+ <width>308</width>
+ <height>38</height>
</size>
</property>
</spacer>
</item>
- <item row="3" column="1" >
- <widget class="QCheckBox" name="LicenseCheckBox" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
+ </layout>
+ </widget>
+ <widget class="QWizardPage" name="wizardPage">
+ <property name="subTitle">
+ <string>License Agreement</string>
+ </property>
+ <layout class="QGridLayout" name="gridLayout_2">
+ <item row="0" column="0">
+ <widget class="QLabel" name="headerPixmap">
+ <property name="pixmap">
+ <pixmap resource="PBI.qrc">:/header.png</pixmap>
</property>
- <property name="text" >
- <string>I Agree</string>
+ <property name="scaledContents">
+ <bool>true</bool>
</property>
+ <property name="wordWrap">
+ <bool>false</bool>
+ </property>
</widget>
</item>
- <item row="3" column="2" >
- <spacer name="spacer29" >
- <property name="orientation" >
- <enum>Qt::Horizontal</enum>
+ <item row="1" column="0">
+ <spacer name="spacer31_3">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
</property>
- <property name="sizeType" >
- <enum>QSizePolicy::Expanding</enum>
+ <property name="sizeType">
+ <enum>QSizePolicy::Fixed</enum>
</property>
- <property name="sizeHint" stdset="0" >
+ <property name="sizeHint" stdset="0">
<size>
- <width>190</width>
- <height>21</height>
+ <width>20</width>
+ <height>16</height>
</size>
</property>
</spacer>
</item>
+ <item row="2" column="0">
+ <layout class="QHBoxLayout" name="horizontalLayout_4">
+ <property name="sizeConstraint">
+ <enum>QLayout::SetMaximumSize</enum>
+ </property>
+ <item>
+ <spacer name="spacer31_2">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeType">
+ <enum>QSizePolicy::Fixed</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>15</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <widget class="QTextEdit" name="LicenseTextEdit">
+ <property name="readOnly">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="spacer31">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeType">
+ <enum>QSizePolicy::Fixed</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>15</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </item>
+ <item row="3" column="0">
+ <layout class="QHBoxLayout" name="horizontalLayout_5">
+ <item>
+ <spacer name="spacer28">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeType">
+ <enum>QSizePolicy::Expanding</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>220</width>
+ <height>31</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <widget class="QCheckBox" name="LicenseCheckBox">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string>I Agree</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="spacer29">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeType">
+ <enum>QSizePolicy::Expanding</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>190</width>
+ <height>21</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </item>
</layout>
</widget>
- <widget class="QWidget" name="WizardPage" >
- <property name="geometry" >
- <rect>
- <x>0</x>
- <y>0</y>
- <width>100</width>
- <height>30</height>
- </rect>
- </property>
- <attribute name="title" >
+ <widget class="QWizardPage" name="wizardPage_2">
+ <property name="subTitle">
<string>Install Directory</string>
- </attribute>
- <layout class="QGridLayout" >
- <item row="2" column="0" >
- <layout class="QGridLayout" >
- <item row="0" column="1" >
- <widget class="QLabel" name="textDesktopLinks_2" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
+ </property>
+ <layout class="QGridLayout" name="gridLayout_3">
+ <item row="0" column="0">
+ <widget class="QLabel" name="headerPixmap5">
+ <property name="pixmap">
+ <pixmap resource="PBI.qrc">:/header.png</pixmap>
+ </property>
+ <property name="scaledContents">
+ <bool>true</bool>
+ </property>
+ <property name="wordWrap">
+ <bool>false</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0">
+ <layout class="QGridLayout" name="_3">
+ <item row="1" column="1">
+ <widget class="QLabel" name="textLabel1">
+ <property name="text">
+ <string>Please select where you wish this application to be installed. The suggested directory below is often the best location.</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignTop</set>
+ </property>
+ <property name="wordWrap">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0">
+ <spacer name="spacer33">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeType">
+ <enum>QSizePolicy::Expanding</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>16</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item row="0" column="1">
+ <spacer name="spacer35">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeType">
+ <enum>QSizePolicy::Expanding</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>16</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item row="1" column="2">
+ <spacer name="spacer33_2">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeType">
+ <enum>QSizePolicy::Expanding</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>16</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </item>
+ <item row="2" column="0">
+ <layout class="QGridLayout" name="_2">
+ <item row="0" column="1">
+ <widget class="QLabel" name="textDesktopLinks_2">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="text" >
- <string><b>Installation Directory</b></string>
+ <property name="text">
+ <string><b>Installation Directory</b></string>
</property>
- <property name="alignment" >
+ <property name="alignment">
<set>Qt::AlignHCenter|Qt::AlignTop</set>
</property>
- <property name="wordWrap" >
+ <property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
- <item row="1" column="1" >
- <widget class="QLineEdit" name="lineInstallLocation" >
- <property name="readOnly" >
+ <item row="1" column="1">
+ <widget class="QLineEdit" name="lineInstallLocation">
+ <property name="readOnly">
<bool>true</bool>
</property>
</widget>
</item>
- <item row="1" column="3" >
- <widget class="QPushButton" name="pushChangeLocation" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+ <item row="1" column="3">
+ <widget class="QPushButton" name="pushChangeLocation">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="maximumSize" >
+ <property name="maximumSize">
<size>
<width>34</width>
<height>34</height>
</size>
</property>
- <property name="text" >
+ <property name="text">
<string/>
</property>
- <property name="icon" >
- <iconset resource="PBI.qrc" >
+ <property name="icon">
+ <iconset resource="PBI.qrc">
<normaloff>:/folder-blue.png</normaloff>:/folder-blue.png</iconset>
</property>
- <property name="iconSize" >
+ <property name="iconSize">
<size>
<width>22</width>
<height>22</height>
@@ -1014,15 +582,15 @@
</property>
</widget>
</item>
- <item row="0" column="3" colspan="2" >
- <spacer name="spacer37" >
- <property name="orientation" >
+ <item row="0" column="3" colspan="2">
+ <spacer name="spacer37">
+ <property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeType" >
+ <property name="sizeType">
<enum>QSizePolicy::Minimum</enum>
</property>
- <property name="sizeHint" stdset="0" >
+ <property name="sizeHint" stdset="0">
<size>
<width>71</width>
<height>20</height>
@@ -1030,15 +598,15 @@
</property>
</spacer>
</item>
- <item rowspan="2" row="0" column="2" >
- <spacer name="spacer39" >
- <property name="orientation" >
+ <item row="0" column="2" rowspan="2">
+ <spacer name="spacer39">
+ <property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeType" >
+ <property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
- <property name="sizeHint" stdset="0" >
+ <property name="sizeHint" stdset="0">
<size>
<width>3</width>
<height>60</height>
@@ -1046,15 +614,15 @@
</property>
</spacer>
</item>
- <item rowspan="2" row="0" column="0" >
- <spacer name="spacer36" >
- <property name="orientation" >
+ <item row="0" column="0" rowspan="2">
+ <spacer name="spacer36">
+ <property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeType" >
+ <property name="sizeType">
<enum>QSizePolicy::Minimum</enum>
</property>
- <property name="sizeHint" stdset="0" >
+ <property name="sizeHint" stdset="0">
<size>
<width>61</width>
<height>50</height>
@@ -1062,15 +630,15 @@
</property>
</spacer>
</item>
- <item row="1" column="4" >
- <spacer name="spacer38" >
- <property name="orientation" >
+ <item row="1" column="4">
+ <spacer name="spacer38">
+ <property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeType" >
+ <property name="sizeType">
<enum>QSizePolicy::Minimum</enum>
</property>
- <property name="sizeHint" stdset="0" >
+ <property name="sizeHint" stdset="0">
<size>
<width>30</width>
<height>21</height>
@@ -1080,518 +648,418 @@
</item>
</layout>
</item>
- <item row="4" column="0" >
- <layout class="QVBoxLayout" >
+ <item row="3" column="0">
+ <spacer name="spacer46">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeType">
+ <enum>QSizePolicy::Fixed</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>568</width>
+ <height>17</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item row="4" column="0">
+ <layout class="QVBoxLayout" name="_4">
<item>
- <widget class="QLabel" name="textDirectoryMessage" >
- <property name="text" >
+ <widget class="QLabel" name="textDirectoryMessage">
+ <property name="text">
<string/>
</property>
- <property name="alignment" >
+ <property name="alignment">
<set>Qt::AlignCenter</set>
</property>
- <property name="wordWrap" >
+ <property name="wordWrap">
<bool>false</bool>
</property>
</widget>
</item>
<item>
- <widget class="Line" name="line1" >
- <property name="frameShape" >
+ <widget class="Line" name="line1">
+ <property name="frameShape">
<enum>QFrame::HLine</enum>
</property>
- <property name="frameShadow" >
+ <property name="frameShadow">
<enum>QFrame::Sunken</enum>
</property>
</widget>
</item>
</layout>
</item>
- <item row="5" column="0" >
- <layout class="QGridLayout" >
- <item row="1" column="2" >
- <widget class="QLabel" name="textRemainSpace" >
- <property name="text" >
+ <item row="5" column="0">
+ <layout class="QGridLayout" name="_5">
+ <item row="1" column="2">
+ <widget class="QLabel" name="textRemainSpace">
+ <property name="text">
<string>XXMB</string>
</property>
- <property name="alignment" >
+ <property name="alignment">
<set>Qt::AlignCenter</set>
</property>
- <property name="wordWrap" >
+ <property name="wordWrap">
<bool>false</bool>
</property>
</widget>
</item>
- <item row="0" column="1" >
- <widget class="QLabel" name="textLabel2_2" >
- <property name="text" >
+ <item row="0" column="1">
+ <widget class="QLabel" name="textLabel2_2">
+ <property name="text">
<string>Available Space</string>
</property>
- <property name="alignment" >
+ <property name="alignment">
<set>Qt::AlignCenter</set>
</property>
- <property name="wordWrap" >
+ <property name="wordWrap">
<bool>false</bool>
</property>
</widget>
</item>
- <item row="1" column="0" >
- <widget class="QLabel" name="textReqSpace" >
- <property name="text" >
+ <item row="1" column="0">
+ <widget class="QLabel" name="textReqSpace">
+ <property name="text">
<string>XXMB</string>
</property>
- <property name="alignment" >
+ <property name="alignment">
<set>Qt::AlignCenter</set>
</property>
- <property name="wordWrap" >
+ <property name="wordWrap">
<bool>false</bool>
</property>
</widget>
</item>
- <item row="0" column="0" >
- <widget class="QLabel" name="textLabel2" >
- <property name="text" >
+ <item row="0" column="0">
+ <widget class="QLabel" name="textLabel2">
+ <property name="text">
<string>Required Space</string>
</property>
- <property name="alignment" >
+ <property name="alignment">
<set>Qt::AlignCenter</set>
</property>
- <property name="wordWrap" >
+ <property name="wordWrap">
<bool>false</bool>
</property>
</widget>
</item>
- <item row="1" column="1" >
- <widget class="QLabel" name="textAvailSpace" >
- <property name="text" >
+ <item row="1" column="1">
+ <widget class="QLabel" name="textAvailSpace">
+ <property name="text">
<string>XXMB</string>
</property>
- <property name="alignment" >
+ <property name="alignment">
<set>Qt::AlignCenter</set>
</property>
- <property name="wordWrap" >
+ <property name="wordWrap">
<bool>false</bool>
</property>
</widget>
</item>
- <item row="0" column="2" >
- <widget class="QLabel" name="textLabel2_2_4" >
- <property name="text" >
+ <item row="0" column="2">
+ <widget class="QLabel" name="textLabel2_2_4">
+ <property name="text">
<string>Remaining Space</string>
</property>
- <property name="alignment" >
+ <property name="alignment">
<set>Qt::AlignCenter</set>
</property>
- <property name="wordWrap" >
+ <property name="wordWrap">
<bool>false</bool>
</property>
</widget>
</item>
</layout>
</item>
- <item row="6" column="0" >
- <spacer name="spacer46" >
- <property name="orientation" >
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeType" >
- <enum>QSizePolicy::Fixed</enum>
- </property>
- <property name="sizeHint" stdset="0" >
- <size>
- <width>20</width>
- <height>16</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="1" column="0" >
- <layout class="QGridLayout" >
- <item row="1" column="1" >
- <widget class="QLabel" name="textLabel1" >
- <property name="text" >
- <string>Please select where you wish this application to be installed. The suggested directory below is often the best location.</string>
+ </layout>
+ </widget>
+ <widget class="QWizardPage" name="wizardPage_3">
+ <property name="subTitle">
+ <string>Icon Selection</string>
+ </property>
+ <layout class="QGridLayout" name="gridLayout_4">
+ <item row="0" column="0" colspan="3">
+ <layout class="QVBoxLayout" name="verticalLayout_3">
+ <item>
+ <widget class="QLabel" name="headerPixmap2">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
</property>
- <property name="alignment" >
- <set>Qt::AlignTop</set>
+ <property name="pixmap">
+ <pixmap resource="PBI.qrc">:/header.png</pixmap>
</property>
- <property name="wordWrap" >
+ <property name="scaledContents">
<bool>true</bool>
</property>
+ <property name="wordWrap">
+ <bool>false</bool>
+ </property>
</widget>
</item>
- <item row="1" column="0" >
- <spacer name="spacer33" >
- <property name="orientation" >
- <enum>Qt::Horizontal</enum>
+ <item>
+ <spacer name="spacer18">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
</property>
- <property name="sizeType" >
- <enum>QSizePolicy::Expanding</enum>
+ <property name="sizeType">
+ <enum>QSizePolicy::Fixed</enum>
</property>
- <property name="sizeHint" stdset="0" >
+ <property name="sizeHint" stdset="0">
<size>
- <width>16</width>
- <height>20</height>
+ <width>238</width>
+ <height>21</height>
</size>
</property>
</spacer>
</item>
- <item row="0" column="1" >
- <spacer name="spacer35" >
- <property name="orientation" >
- <enum>Qt::Vertical</enum>
+ </layout>
+ </item>
+ <item row="1" column="0" colspan="3">
+ <layout class="QHBoxLayout" name="horizontalLayout_6">
+ <item>
+ <spacer name="spacer19">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
</property>
- <property name="sizeType" >
- <enum>QSizePolicy::Expanding</enum>
+ <property name="sizeType">
+ <enum>QSizePolicy::Fixed</enum>
</property>
- <property name="sizeHint" stdset="0" >
+ <property name="sizeHint" stdset="0">
<size>
<width>20</width>
- <height>16</height>
+ <height>21</height>
</size>
</property>
</spacer>
</item>
- <item row="1" column="2" >
- <spacer name="spacer33_2" >
- <property name="orientation" >
+ <item>
+ <widget class="QLabel" name="textDesktopLinks">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Minimum" vsizetype="Expanding">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string>The installer can create desktop and launch menu icons for this package. If you do not wish these icons, uncheck the boxes below, and click "Next".</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignTop</set>
+ </property>
+ <property name="wordWrap">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="spacer17">
+ <property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeType" >
- <enum>QSizePolicy::Expanding</enum>
+ <property name="sizeType">
+ <enum>QSizePolicy::Fixed</enum>
</property>
- <property name="sizeHint" stdset="0" >
+ <property name="sizeHint" stdset="0">
<size>
- <width>16</width>
- <height>20</height>
+ <width>20</width>
+ <height>21</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
- <item row="3" column="0" >
- <spacer name="spacer44" >
- <property name="orientation" >
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeType" >
- <enum>QSizePolicy::Expanding</enum>
- </property>
- <property name="sizeHint" stdset="0" >
- <size>
- <width>20</width>
- <height>16</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="0" column="0" >
- <widget class="QLabel" name="headerPixmap5" >
- <property name="pixmap" >
- <pixmap resource="PBI.qrc" >:/header.png</pixmap>
- </property>
- <property name="scaledContents" >
- <bool>true</bool>
- </property>
- <property name="wordWrap" >
- <bool>false</bool>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- <widget class="QWidget" name="WizardPage" >
- <property name="geometry" >
- <rect>
- <x>6</x>
- <y>36</y>
- <width>503</width>
- <height>321</height>
- </rect>
- </property>
- <attribute name="title" >
- <string>Desktop Links</string>
- </attribute>
- <layout class="QGridLayout" >
- <item row="3" column="2" >
- <widget class="QCheckBox" name="LaunchCheckBox" >
- <property name="text" >
- <string>Start Menu Icons</string>
- </property>
- <property name="checked" >
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item row="4" column="2" >
- <widget class="QCheckBox" name="DesktopCheckBox" >
- <property name="text" >
- <string>Desktop Icons</string>
- </property>
- <property name="checked" >
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item row="5" column="2" >
- <widget class="QCheckBox" name="TaskbarCheckBox" >
- <property name="text" >
- <string>Taskbar Icon</string>
- </property>
- <property name="checked" >
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item row="3" column="3" colspan="2" >
- <spacer name="spacer12" >
- <property name="orientation" >
+ <item row="2" column="0" rowspan="2">
+ <spacer name="spacer16">
+ <property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeType" >
+ <property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
- <property name="sizeHint" stdset="0" >
+ <property name="sizeHint" stdset="0">
<size>
- <width>61</width>
- <height>20</height>
+ <width>210</width>
+ <height>158</height>
</size>
</property>
</spacer>
</item>
- <item row="5" column="3" colspan="2" >
- <spacer name="spacer14" >
- <property name="orientation" >
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeType" >
- <enum>QSizePolicy::Expanding</enum>
- </property>
- <property name="sizeHint" stdset="0" >
- <size>
- <width>61</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
+ <item row="2" column="1">
+ <layout class="QVBoxLayout" name="verticalLayout_2">
+ <item>
+ <widget class="QCheckBox" name="LaunchCheckBox">
+ <property name="text">
+ <string>Start Menu Icons</string>
+ </property>
+ <property name="checked">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QCheckBox" name="DesktopCheckBox">
+ <property name="text">
+ <string>Desktop Icons</string>
+ </property>
+ <property name="checked">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QCheckBox" name="TaskbarCheckBox">
+ <property name="text">
+ <string>Taskbar Icon</string>
+ </property>
+ <property name="checked">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ </layout>
</item>
- <item row="4" column="3" colspan="2" >
- <spacer name="spacer13" >
- <property name="orientation" >
+ <item row="2" column="2" rowspan="2">
+ <spacer name="spacer14">
+ <property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeType" >
+ <property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
- <property name="sizeHint" stdset="0" >
+ <property name="sizeHint" stdset="0">
<size>
- <width>60</width>
- <height>21</height>
+ <width>209</width>
+ <height>138</height>
</size>
</property>
</spacer>
</item>
- <item row="6" column="2" >
- <spacer name="spacer15" >
- <property name="orientation" >
+ <item row="3" column="1">
+ <spacer name="spacer15">
+ <property name="orientation">
<enum>Qt::Vertical</enum>
</property>
- <property name="sizeType" >
+ <property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
- <property name="sizeHint" stdset="0" >
+ <property name="sizeHint" stdset="0">
<size>
- <width>21</width>
- <height>91</height>
+ <width>128</width>
+ <height>75</height>
</size>
</property>
</spacer>
</item>
- <item row="0" column="0" colspan="5" >
- <widget class="QLabel" name="headerPixmap2" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="pixmap" >
- <pixmap resource="PBI.qrc" >:/header.png</pixmap>
- </property>
- <property name="scaledContents" >
- <bool>true</bool>
- </property>
- <property name="wordWrap" >
- <bool>false</bool>
- </property>
- </widget>
- </item>
- <item row="2" column="0" >
- <spacer name="spacer19" >
- <property name="orientation" >
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeType" >
- <enum>QSizePolicy::Fixed</enum>
- </property>
- <property name="sizeHint" stdset="0" >
- <size>
- <width>20</width>
- <height>21</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="2" column="1" colspan="3" >
- <widget class="QLabel" name="textDesktopLinks" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Expanding" hsizetype="Minimum" >
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text" >
- <string>The installer can create desktop and launch menu icons for this package. If you do not wish these icons, uncheck the boxes below, and click "Next".</string>
- </property>
- <property name="alignment" >
- <set>Qt::AlignTop</set>
- </property>
- <property name="wordWrap" >
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item row="2" column="4" >
- <spacer name="spacer17" >
- <property name="orientation" >
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeType" >
- <enum>QSizePolicy::Fixed</enum>
- </property>
- <property name="sizeHint" stdset="0" >
- <size>
- <width>20</width>
- <height>21</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="1" column="2" >
- <spacer name="spacer18" >
- <property name="orientation" >
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeType" >
- <enum>QSizePolicy::Fixed</enum>
- </property>
- <property name="sizeHint" stdset="0" >
- <size>
- <width>20</width>
- <height>21</height>
- </size>
- </property>
- </spacer>
- </item>
- <item rowspan="4" row="3" column="0" colspan="2" >
- <spacer name="spacer16" >
- <property name="orientation" >
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeType" >
- <enum>QSizePolicy::Expanding</enum>
- </property>
- <property name="sizeHint" stdset="0" >
- <size>
- <width>120</width>
- <height>80</height>
- </size>
- </property>
- </spacer>
- </item>
</layout>
</widget>
- <widget class="QWidget" name="WizardPage" >
- <property name="geometry" >
- <rect>
- <x>6</x>
- <y>36</y>
- <width>503</width>
- <height>321</height>
- </rect>
- </property>
- <attribute name="title" >
+ <widget class="QWizardPage" name="wizardPage_4">
+ <property name="subTitle">
<string>Install Software</string>
- </attribute>
- <layout class="QGridLayout" >
- <item row="6" column="2" >
- <spacer name="spacer22_2" >
- <property name="orientation" >
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeType" >
- <enum>QSizePolicy::Fixed</enum>
- </property>
- <property name="sizeHint" stdset="0" >
- <size>
- <width>21</width>
- <height>31</height>
- </size>
- </property>
- </spacer>
+ </property>
+ <layout class="QGridLayout" name="gridLayout_5">
+ <item row="0" column="0" colspan="3">
+ <layout class="QVBoxLayout" name="verticalLayout_4">
+ <item>
+ <widget class="QLabel" name="headerPixmap3">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="pixmap">
+ <pixmap resource="PBI.qrc">:/header.png</pixmap>
+ </property>
+ <property name="scaledContents">
+ <bool>true</bool>
+ </property>
+ <property name="wordWrap">
+ <bool>false</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="spacer23_2">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeType">
+ <enum>QSizePolicy::Fixed</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>368</width>
+ <height>16</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
</item>
- <item row="1" column="2" >
- <spacer name="spacer23_2" >
- <property name="orientation" >
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeType" >
- <enum>QSizePolicy::Fixed</enum>
- </property>
- <property name="sizeHint" stdset="0" >
- <size>
- <width>20</width>
- <height>16</height>
- </size>
- </property>
- </spacer>
+ <item row="1" column="0" colspan="3">
+ <layout class="QHBoxLayout" name="horizontalLayout_7">
+ <item>
+ <spacer name="spacer25_2">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeType">
+ <enum>QSizePolicy::Fixed</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>21</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <widget class="QLabel" name="textLabel5">
+ <property name="text">
+ <string>The program is now being installed. This may take a few moments.</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignVCenter</set>
+ </property>
+ <property name="wordWrap">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="spacer24_2">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeType">
+ <enum>QSizePolicy::Fixed</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
</item>
- <item row="3" column="2" >
- <widget class="QLabel" name="StatusLabel" >
- <property name="text" >
- <string><Status></string>
- </property>
- <property name="alignment" >
- <set>Qt::AlignHCenter|Qt::AlignTop</set>
- </property>
- <property name="wordWrap" >
- <bool>false</bool>
- </property>
- </widget>
- </item>
- <item row="4" column="2" >
- <widget class="QLabel" name="progressTextDialog" >
- <property name="text" >
- <string><progress></string>
- </property>
- <property name="wordWrap" >
- <bool>false</bool>
- </property>
- </widget>
- </item>
- <item row="5" column="2" >
- <widget class="Q3ProgressBar" name="installProgress" />
- </item>
- <item rowspan="4" row="3" column="0" colspan="2" >
- <spacer name="spacer21" >
- <property name="orientation" >
+ <item row="2" column="0">
+ <spacer name="spacer21">
+ <property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeType" >
+ <property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
- <property name="sizeHint" stdset="0" >
+ <property name="sizeHint" stdset="0">
<size>
<width>71</width>
<height>160</height>
@@ -1599,15 +1067,65 @@
</property>
</spacer>
</item>
- <item rowspan="4" row="3" column="3" colspan="2" >
- <spacer name="spacer20" >
- <property name="orientation" >
+ <item row="2" column="1">
+ <layout class="QVBoxLayout" name="verticalLayout_5">
+ <item>
+ <widget class="QLabel" name="StatusLabel">
+ <property name="text">
+ <string><Status></string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignHCenter|Qt::AlignTop</set>
+ </property>
+ <property name="wordWrap">
+ <bool>false</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="progressTextDialog">
+ <property name="text">
+ <string><progress></string>
+ </property>
+ <property name="wordWrap">
+ <bool>false</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QProgressBar" name="installProgress">
+ <property name="value">
+ <number>24</number>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="spacer22_2">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeType">
+ <enum>QSizePolicy::Fixed</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>348</width>
+ <height>31</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </item>
+ <item row="2" column="2">
+ <spacer name="spacer20">
+ <property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeType" >
+ <property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
- <property name="sizeHint" stdset="0" >
+ <property name="sizeHint" stdset="0">
<size>
<width>61</width>
<height>150</height>
@@ -1615,115 +1133,63 @@
</property>
</spacer>
</item>
- <item row="2" column="1" colspan="3" >
- <widget class="QLabel" name="textLabel5" >
- <property name="text" >
- <string>The program is now being installed. This may take a few moments.</string>
- </property>
- <property name="alignment" >
- <set>Qt::AlignVCenter</set>
- </property>
- <property name="wordWrap" >
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item row="2" column="0" >
- <spacer name="spacer25_2" >
- <property name="orientation" >
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeType" >
- <enum>QSizePolicy::Fixed</enum>
- </property>
- <property name="sizeHint" stdset="0" >
- <size>
- <width>21</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="2" column="4" >
- <spacer name="spacer24_2" >
- <property name="orientation" >
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeType" >
- <enum>QSizePolicy::Fixed</enum>
- </property>
- <property name="sizeHint" stdset="0" >
- <size>
- <width>20</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="0" column="0" colspan="5" >
- <widget class="QLabel" name="headerPixmap3" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="pixmap" >
- <pixmap resource="PBI.qrc" >:/header.png</pixmap>
- </property>
- <property name="scaledContents" >
- <bool>true</bool>
- </property>
- <property name="wordWrap" >
- <bool>false</bool>
- </property>
- </widget>
- </item>
</layout>
</widget>
- <widget class="QWidget" name="WizardPage" >
- <property name="geometry" >
- <rect>
- <x>6</x>
- <y>36</y>
- <width>503</width>
- <height>321</height>
- </rect>
- </property>
- <attribute name="title" >
+ <widget class="QWizardPage" name="wizardPage2">
+ <property name="subTitle">
<string>Install Finished</string>
- </attribute>
- <layout class="QGridLayout" name="gridLayout" >
- <item row="0" column="0" colspan="2" >
- <widget class="QLabel" name="headerPixmap4" >
- <property name="sizePolicy" >
- <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="pixmap" >
- <pixmap resource="PBI.qrc" >:/header.png</pixmap>
- </property>
- <property name="scaledContents" >
- <bool>true</bool>
- </property>
- <property name="wordWrap" >
- <bool>false</bool>
- </property>
- </widget>
+ </property>
+ <layout class="QGridLayout" name="gridLayout_6">
+ <item row="0" column="0">
+ <layout class="QVBoxLayout" name="verticalLayout_6">
+ <item>
+ <widget class="QLabel" name="headerPixmap4">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="pixmap">
+ <pixmap resource="PBI.qrc">:/header.png</pixmap>
+ </property>
+ <property name="scaledContents">
+ <bool>true</bool>
+ </property>
+ <property name="wordWrap">
+ <bool>false</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="spacer29_2">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeType">
+ <enum>QSizePolicy::Expanding</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>478</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
</item>
- <item row="1" column="0" colspan="2" >
- <layout class="QHBoxLayout" name="horizontalLayout" >
+ <item row="1" column="0">
+ <layout class="QHBoxLayout" name="horizontalLayout_9">
<item>
- <spacer name="spacer25_3" >
- <property name="orientation" >
+ <spacer name="spacer25_3">
+ <property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeType" >
+ <property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
- <property name="sizeHint" stdset="0" >
+ <property name="sizeHint" stdset="0">
<size>
<width>41</width>
<height>21</height>
@@ -1732,33 +1198,33 @@
</spacer>
</item>
<item>
- <widget class="QLabel" name="textLabel5_2" >
- <property name="frameShape" >
+ <widget class="QLabel" name="textLabel5_2">
+ <property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
- <property name="frameShadow" >
+ <property name="frameShadow">
<enum>QFrame::Plain</enum>
</property>
- <property name="text" >
- <string><b><font size="+1">Installation complete! </font></b><br><br>Click "Finish" to exit.</string>
+ <property name="text">
+ <string><b><font size="+1">Installation complete! </font></b><br><br>Click "Finish" to exit.</string>
</property>
- <property name="alignment" >
+ <property name="alignment">
<set>Qt::AlignHCenter|Qt::AlignTop</set>
</property>
- <property name="wordWrap" >
+ <property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
<item>
- <spacer name="spacer24_3" >
- <property name="orientation" >
+ <spacer name="spacer24_3">
+ <property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeType" >
+ <property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
- <property name="sizeHint" stdset="0" >
+ <property name="sizeHint" stdset="0">
<size>
<width>41</width>
<height>21</height>
@@ -1768,33 +1234,33 @@
</item>
</layout>
</item>
- <item row="2" column="1" >
- <spacer name="spacer29_2" >
- <property name="orientation" >
+ <item row="2" column="0">
+ <spacer name="spacer30">
+ <property name="orientation">
<enum>Qt::Vertical</enum>
</property>
- <property name="sizeType" >
- <enum>QSizePolicy::Expanding</enum>
+ <property name="sizeType">
+ <enum>QSizePolicy::Fixed</enum>
</property>
- <property name="sizeHint" stdset="0" >
+ <property name="sizeHint" stdset="0">
<size>
- <width>21</width>
- <height>20</height>
+ <width>20</width>
+ <height>148</height>
</size>
</property>
</spacer>
</item>
- <item row="3" column="0" colspan="2" >
- <layout class="QHBoxLayout" name="horizontalLayout_2" >
+ <item row="3" column="0">
+ <layout class="QHBoxLayout" name="horizontalLayout_8">
<item>
- <spacer name="spacer31_4" >
- <property name="orientation" >
+ <spacer name="spacer31_4">
+ <property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeType" >
+ <property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
- <property name="sizeHint" stdset="0" >
+ <property name="sizeHint" stdset="0">
<size>
<width>131</width>
<height>20</height>
@@ -1803,21 +1269,21 @@
</spacer>
</item>
<item>
- <widget class="QCheckBox" name="checkLaunch" >
- <property name="text" >
- <string>Start application when I click "Finish"</string>
+ <widget class="QCheckBox" name="checkLaunch">
+ <property name="text">
+ <string>Start application when I click "Finish"</string>
</property>
</widget>
</item>
<item>
- <spacer name="spacer32" >
- <property name="orientation" >
+ <spacer name="spacer32">
+ <property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
- <property name="sizeType" >
+ <property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
- <property name="sizeHint" stdset="0" >
+ <property name="sizeHint" stdset="0">
<size>
<width>151</width>
<height>21</height>
@@ -1827,72 +1293,11 @@
</item>
</layout>
</item>
- <item row="4" column="0" >
- <spacer name="spacer30" >
- <property name="orientation" >
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeType" >
- <enum>QSizePolicy::Fixed</enum>
- </property>
- <property name="sizeHint" stdset="0" >
- <size>
- <width>20</width>
- <height>41</height>
- </size>
- </property>
- </spacer>
- </item>
</layout>
</widget>
</widget>
- <layoutdefault spacing="6" margin="11" />
- <customwidgets>
- <customwidget>
- <class>Q3Frame</class>
- <extends>QFrame</extends>
- <header>Qt3Support/Q3Frame</header>
- <container>1</container>
- </customwidget>
- <customwidget>
- <class>Q3Wizard</class>
- <extends>QDialog</extends>
- <header>q3wizard.h</header>
- <container>1</container>
- </customwidget>
- <customwidget>
- <class>Q3TextEdit</class>
- <extends>Q3Frame</extends>
- <header>q3textedit.h</header>
- </customwidget>
- <customwidget>
- <class>Q3ProgressBar</class>
- <extends>QFrame</extends>
- <header>Qt3Support/Q3ProgressBar</header>
- </customwidget>
- </customwidgets>
- <includes>
- <include location="local" >q3process.h</include>
- </includes>
<resources>
- <include location="PBI.qrc" />
+ <include location="PBI.qrc"/>
</resources>
- <connections>
- <connection>
- <sender>pushChangeLocation</sender>
- <signal>clicked()</signal>
- <receiver>PBI</receiver>
- <slot>slotChangeInstallLocation()</slot>
- <hints>
- <hint type="sourcelabel" >
- <x>20</x>
- <y>20</y>
- </hint>
- <hint type="destinationlabel" >
- <x>20</x>
- <y>20</y>
- </hint>
- </hints>
- </connection>
- </connections>
+ <connections/>
</ui>
Modified: pbibuild/pbi-source/PBItext/main.cpp
===================================================================
--- pbibuild/pbi-source/PBItext/main.cpp 2009-07-16 16:57:58 UTC (rev 4251)
+++ pbibuild/pbi-source/PBItext/main.cpp 2009-07-16 17:40:54 UTC (rev 4252)
@@ -215,7 +215,7 @@
QFile file4( "extract.sh" );
if ( file4.open( QIODevice::WriteOnly ) ) {
QTextStream stream4( &file4 );
- stream4 << "#!/bin/sh\nSKIP=`cat pbiskip`\ntail +${SKIP} pbilink | ./lzma d -si -so 2>/dev/null | tar xpov -C \"${1}\" -f - >/dev/null 2>/dev/null";
+ stream4 << "#!/bin/sh\nSKIP=`cat pbiskip`\ntail +${SKIP} pbilink | ./lzma -d -c - 2>/dev/null | tar xpov -C \"${1}\" -f - >/dev/null 2>/dev/null";
file4.close();
}
More information about the Commits
mailing list