kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ENH: remove status bar and move interrupt/progress next to configure/generate.

This commit is contained in:
Clinton Stimpson 2007-11-07 11:31:55 -05:00
parent 31d4280bf3
commit c05f8aa70e
3 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Source/QtDialog/CMakeSetupDialog.cxx
View File

@ -80,14 +80,9 @@ CMakeSetupDialog::CMakeSetupDialog()
this->Splitter->setStretchFactor(0, 2); this->Splitter->setStretchFactor(0, 2);
this->Splitter->setStretchFactor(1, 1); this->Splitter->setStretchFactor(1, 1);
this->setCentralWidget(cont); this->setCentralWidget(cont);
this->ProgressBar = new QProgressBar(); this->ProgressBar->reset();
this->ProgressBar->setRange(0,100);
this->InterruptButton = new QToolButton();
this->InterruptButton->setEnabled(false);
this->InterruptButton->setIcon( this->InterruptButton->setIcon(
this->style()->standardPixmap(QStyle::SP_DialogCancelButton)); this->style()->standardPixmap(QStyle::SP_DialogCancelButton));
this->statusBar()->addPermanentWidget(this->InterruptButton);
this->statusBar()->addPermanentWidget(this->ProgressBar);
QMenu* FileMenu = this->menuBar()->addMenu(tr("&File")); QMenu* FileMenu = this->menuBar()->addMenu(tr("&File"));
this->ReloadCacheAction = FileMenu->addAction(tr("&Reload Cache")); this->ReloadCacheAction = FileMenu->addAction(tr("&Reload Cache"));
@ -179,8 +174,6 @@ void CMakeSetupDialog::initialize()
this, SLOT(error(QString,QString,bool*)), this, SLOT(error(QString,QString,bool*)),
Qt::BlockingQueuedConnection); Qt::BlockingQueuedConnection);
QObject::connect(this->InterruptButton, SIGNAL(clicked(bool)),
this->CMakeThread->cmakeInstance(), SLOT(interrupt()));
QObject::connect(this->InterruptButton, SIGNAL(clicked(bool)), QObject::connect(this->InterruptButton, SIGNAL(clicked(bool)),
this, SLOT(doInterrupt())); this, SLOT(doInterrupt()));
@ -282,7 +275,6 @@ void CMakeSetupDialog::finishConfigure(int err)
this->InterruptButton->setEnabled(false); this->InterruptButton->setEnabled(false);
this->setEnabledState(true); this->setEnabledState(true);
this->ProgressBar->reset(); this->ProgressBar->reset();
this->statusBar()->showMessage(tr("Configure Done"), 2000);
if(err != 0) if(err != 0)
{ {
QMessageBox::critical(this, tr("Error"), QMessageBox::critical(this, tr("Error"),
@ -301,7 +293,6 @@ void CMakeSetupDialog::finishGenerate(int err)
this->setEnabledState(true); this->setEnabledState(true);
this->setGenerateEnabled(true); this->setGenerateEnabled(true);
this->ProgressBar->reset(); this->ProgressBar->reset();
this->statusBar()->showMessage(tr("Generate Done"));
if(err != 0) if(err != 0)
{ {
QMessageBox::critical(this, tr("Error"), QMessageBox::critical(this, tr("Error"),
@ -387,7 +378,8 @@ void CMakeSetupDialog::doHelp()
void CMakeSetupDialog::doInterrupt() void CMakeSetupDialog::doInterrupt()
{ {
this->InterruptButton->setEnabled(false); this->InterruptButton->setEnabled(false);
this->statusBar()->showMessage(tr("Interrupting...")); QMetaObject::invokeMethod(this->CMakeThread->cmakeInstance(),
"interrupt", Qt::QueuedConnection);
} }
void CMakeSetupDialog::doSourceBrowse() void CMakeSetupDialog::doSourceBrowse()
@ -442,9 +434,8 @@ void CMakeSetupDialog::setSourceDirectory(const QString& dir)
this->SourceDirectory->setText(dir); this->SourceDirectory->setText(dir);
} }
void CMakeSetupDialog::showProgress(const QString& msg, float percent) void CMakeSetupDialog::showProgress(const QString& /*msg*/, float percent)
{ {
this->statusBar()->showMessage(msg);
this->ProgressBar->setValue(qRound(percent * 100)); this->ProgressBar->setValue(qRound(percent * 100));
} }

2
Source/QtDialog/CMakeSetupDialog.h
View File

@ -75,8 +75,6 @@ protected:
void dropEvent(QDropEvent*); void dropEvent(QDropEvent*);
QCMakeThread* CMakeThread; QCMakeThread* CMakeThread;
QProgressBar* ProgressBar;
QToolButton* InterruptButton;
bool ExitAfterGenerate; bool ExitAfterGenerate;
QAction* ReloadCacheAction; QAction* ReloadCacheAction;
QAction* DeleteCacheAction; QAction* DeleteCacheAction;

20
Source/QtDialog/CMakeSetupDialog.ui
View File

@ -183,6 +183,26 @@
</property> </property>
</spacer> </spacer>
</item> </item>
<item>
<widget class="QToolButton" name="InterruptButton" >
<property name="enabled" >
<bool>false</bool>
</property>
<property name="text" >
<string>...</string>
</property>
</widget>
</item>
<item>
<widget class="QProgressBar" name="ProgressBar" >
<property name="value" >
<number>0</number>
</property>
<property name="textVisible" >
<bool>true</bool>
</property>
</widget>
</item>
</layout> </layout>
</item> </item>
</layout> </layout>