Skip to content

Commit

Permalink
Merge pull request #288 from allywarner/bringtofront
Browse files Browse the repository at this point in the history
Bringtofront
  • Loading branch information
jessdtate authored Jul 12, 2018
2 parents d8e79dc + 328dfc5 commit b06e34c
Show file tree
Hide file tree
Showing 4 changed files with 208 additions and 68 deletions.
21 changes: 10 additions & 11 deletions src/Interface/Application/ProjectWizard.cc
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ ProjectInfoPage::ProjectInfoPage( QWidget *parent )
this->setSubTitle( "Specify basic information about the project which you "
"want to create." );

this->project_name_label_ = new QLabel( "Project name:" );
this->project_name_label_ = new QLabel( "Project Name:" );


QString default_name_count;
Expand All @@ -124,7 +124,7 @@ ProjectInfoPage::ProjectInfoPage( QWidget *parent )
}

this->project_path_label_ = new QLabel( "Project Path:" );
this->project_path_lineedit_ = new QLineEdit;
this->project_path_lineedit_ = new QLineEdit();

this->project_path_change_button_ = new QPushButton( "Choose Alternative Location" );
connect( this->project_path_change_button_, SIGNAL( clicked() ), this, SLOT( set_path() ) );
Expand Down Expand Up @@ -176,17 +176,16 @@ void ProjectInfoPage::set_path()

void ProjectInfoPage::set_name(const QString& name)
{
if(!name.isEmpty())
{
QDir project_directory_ = QDir(name);
if(!name.isEmpty())
{
QDir project_directory_ = QDir(name);

if( project_directory_.exists() )
{
this->project_path_lineedit_->setText( project_directory_.canonicalPath() );
this->most_recent_path_ = &project_directory_;
}
if( project_directory_.exists() )
{
this->project_path_lineedit_->setText( project_directory_.canonicalPath() );
this->most_recent_path_ = &project_directory_;
}
}
}

bool ProjectInfoPage::validatePage()
Expand Down
3 changes: 0 additions & 3 deletions src/Interface/Application/ProjectWizard.h
Original file line number Diff line number Diff line change
Expand Up @@ -80,9 +80,6 @@ Q_OBJECT
protected:
void initializePage();

/// VALIDATEPAGE:
/// function that is called right after the next button is clicked and used to process
/// the entered data so it can be passed to the next page
virtual bool validatePage();

private:
Expand Down
Loading

0 comments on commit b06e34c

Please sign in to comment.