Skip to content

Commit

Permalink
修改demo代码
Browse files Browse the repository at this point in the history
  • Loading branch information
yiminyangguang520 committed Dec 8, 2015
1 parent 2803556 commit 0d36704
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 8 deletions.
4 changes: 0 additions & 4 deletions GCR/trunk/Glodon/demos/GLDMaskDemo/CustomDialog.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -78,12 +78,9 @@ void Dialog::initUI()
btn->setPalette(palette);
btn->setFlat(true);

// m_pMask = GLDMaskBox::createMaskFor(m_btn1, btn, exePath() + "/images/Msg/login.png", exePath() + "/images/Msg/know.png");
m_pMask = GLDMaskBox::createMaskFor(m_btn1, btn, exePath() + "/images/Msg/login.png", exePath() + "/images/Msg/know.png", exePath() + "config.ini");

connect(btn, &QPushButton::clicked, this, &Dialog::showMask);
// connect(m_btn1, &QPushButton::clicked, m_pMask, &GLDMaskBox::customClicked);
// connect(m_pMask, &GLDMaskBox::customClicked, this, &Dialog::showMask);
}

void Dialog::showPosition()
Expand All @@ -93,6 +90,5 @@ void Dialog::showPosition()

void Dialog::showMask()
{
// disconnect(m_pMask, &GLDMaskBox::customClicked, this, &Dialog::showMask);
GLDMaskBox::createMaskFor(m_textEdt, nullptr, exePath() + "/images/Msg/login.png", exePath() + "/images/Msg/know.png", exePath() + "config.ini");
}
4 changes: 0 additions & 4 deletions GCR/trunk/Glodon/demos/GLDMaskDemo/LogoinWidget.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -64,12 +64,10 @@ LogoinWidget::LogoinWidget(QWidget *parent)
pIKnow->setFlat(true);

pMask = GLDMaskBox::createMaskFor(m_logoin, pIKnow, exePath() + "/images/Msg/login.png", "", exePath() + "/config/config.ini");
//connect(btn, &QPushButton::clicked, this, &LogoinWidget::showDialog);

pMask->setArrowColor(QColor(Qt::red));
pMask->setArrowLineWidth(2);
connect(m_logoin, &QPushButton::clicked, this, &LogoinWidget::showDialog);
//connect(pMask, &GLDMaskBox::customClicked, this, &LogoinWidget::showDialog);
}

LogoinWidget::~LogoinWidget()
Expand All @@ -79,8 +77,6 @@ LogoinWidget::~LogoinWidget()

void LogoinWidget::showDialog()
{
//disconnect(pMask, &GLDMaskBox::customClicked, this, &LogoinWidget::showDialog);
//pMask->close();
m_dialog = new Dialog(this);
m_dialog->show();
}

0 comments on commit 0d36704

Please sign in to comment.