Merge branch 'development' of ssh://vc.netcitadel.com:2222/var/git/fwbuilder into development

This commit is contained in:
Vadim Kurland
2011-07-06 14:37:24 -07:00
2 changed files with 9 additions and 20 deletions
@@ -47,21 +47,15 @@ FileNamePage::FileNamePage(QWidget *parent) : QWizardPage(parent)
void FileNamePage::selectAddressListFile()
{
QString dir;
dir = st->getWDir();
if (dir.isEmpty()) dir = st->getOpenFileDir();
if (dir.isEmpty()) dir = "~";
QString s = QFileDialog::getOpenFileName(
this,
"Choose a file",
dir,
st->getOpenFileDir(),
"All files (*)");
if (s.isEmpty()) return;
st->setOpenFileDir(s);
if (!s.isEmpty())
{
m_dialog->fileName->setText(s);
}
m_dialog->fileName->setText(s);
}
bool FileNamePage::validatePage()
@@ -44,21 +44,16 @@ IC_FileNamePage::IC_FileNamePage(QWidget *parent) : QWizardPage(parent)
void IC_FileNamePage::selectFile()
{
QString dir;
dir = st->getWDir();
if (dir.isEmpty()) dir = st->getOpenFileDir();
if (dir.isEmpty()) dir = "~";
QString s = QFileDialog::getOpenFileName(
this,
"Choose file",
dir,
st->getOpenFileDir(),
"All files (*)");
if (!s.isEmpty())
{
m_dialog->fileName->setText(s);
}
if (s.isEmpty()) return;
st->setOpenFileDir(s);
m_dialog->fileName->setText(s);
}
bool IC_FileNamePage::validatePage()