Skip to content

Commit

Permalink
Current version of Psi+ is 1.5.1702
Browse files Browse the repository at this point in the history
It is based on:
* psi: a33fdd7a
* plugins: 3134d80
* psimedia: 9fd3307
* resources: 2ef1865
  • Loading branch information
tehnick committed Mar 19, 2024
1 parent 6d337c3 commit fc22887
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
9 changes: 5 additions & 4 deletions src/accountmanagedlg.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ public slots:

private slots:
void remove();
void bg_clicked(int);
void bg_clicked(QAbstractButton *btn);

void client_handshaken();
void client_error();
Expand Down Expand Up @@ -112,9 +112,9 @@ AccountRemoveDlg::AccountRemoveDlg(const UserAccount &acc, QWidget *parent) : QD
d->bg = new QButtonGroup(this);
d->bg->addButton(rb_remove, 0);
d->bg->addButton(rb_removeAndUnreg, 1);
connect(d->bg, SIGNAL(buttonClicked(int)), SLOT(bg_clicked(int)));
connect(d->bg, &QButtonGroup::buttonClicked, this, &AccountRemoveDlg::bg_clicked);
rb_remove->setChecked(true);
bg_clicked(0);
bg_clicked(rb_remove);

client = new MiniClient(this);
connect(client, SIGNAL(handshaken()), SLOT(client_handshaken()));
Expand Down Expand Up @@ -146,8 +146,9 @@ void AccountRemoveDlg::done(int r)
QDialog::done(r);
}

void AccountRemoveDlg::bg_clicked(int x)
void AccountRemoveDlg::bg_clicked(QAbstractButton *btn)
{
auto x = d->bg->id(btn);
if (x == 0) {
lb_pass->setEnabled(false);
le_pass->setEnabled(false);
Expand Down
7 changes: 3 additions & 4 deletions src/activitydlg.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,9 @@ ActivityDlg::ActivityDlg(QList<PsiAccount *> list) : QDialog(nullptr), pa_(list)
setWindowIcon(IconsetFactory::icon("activities/other").icon());
setModal(false);

connect(ui_.cb_general_type, SIGNAL(currentIndexChanged(const QString &)),
SLOT(loadSpecificActivities(const QString &)));
connect(ui_.pb_cancel, SIGNAL(clicked()), SLOT(close()));
connect(ui_.pb_ok, SIGNAL(clicked()), SLOT(setActivity()));
connect(ui_.cb_general_type, &QComboBox::currentTextChanged, this, &ActivityDlg::loadSpecificActivities);
connect(ui_.pb_cancel, &QPushButton::clicked, this, &ActivityDlg::close);
connect(ui_.pb_ok, &QPushButton::clicked, this, &ActivityDlg::setActivity);

ui_.cb_general_type->addItem(tr("<unset>"));
PsiAccount *pa = pa_.first();
Expand Down
2 changes: 1 addition & 1 deletion version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.5.1700 (2024-03-18, 33c6541f)
1.5.1702 (2024-03-19, a33fdd7a)

0 comments on commit fc22887

Please sign in to comment.