@@ -12,18 +12,19 @@
class QMessageBox;
class QPushButton;
-class CertificateErrorDialog
+class CertificateErrorDialog : public QObject
{
- public:
+ Q_OBJECT
+public:
CertificateErrorDialog(const QString& title, const QString& host, const QCA::Certificate& cert, int result, QCA::Validity validity, const QString &domainOverride, QString &tlsOverrideDomain, QByteArray &tlsOverrideCert);
-
- QMessageBox* getMessageBox() {
- return messageBox_;
- }
+ ~CertificateErrorDialog();
int exec();
-
- private:
+
+public slots:
+ void reject();
+
+private:
QMessageBox* messageBox_;
QPushButton* detailsButton_;
QPushButton* continueButton_;
src/Certificates/CertificateErrorDialog.h
@@ -186,8 +186,8 @@ bool CertificateHelpers::checkCertificate(QCA::TLS* tls, XMPP::QCATLSHandler *tl
result, tls->peerCertificateValidity(),
hostnameOverrideable, tlsOverrideDomain, tlsOverrideCert);
if (canceler) {
- QObject::connect(canceler, SIGNAL(disconnected()), errorDialog.getMessageBox(), SLOT(reject()), Qt::AutoConnection);
- QObject::connect(canceler, SIGNAL(reconnecting()), errorDialog.getMessageBox(), SLOT(reject()), Qt::AutoConnection);
+ QObject::connect(canceler, SIGNAL(disconnected()), &errorDialog, SLOT(reject()), Qt::AutoConnection);
+ QObject::connect(canceler, SIGNAL(reconnecting()), &errorDialog, SLOT(reject()), Qt::AutoConnection);
}
if (errorDialog.exec() == QDialog::Accepted) {
return true;
src/Certificates/CertificateHelpers.cpp
@@ -528,14 +528,28 @@ void AccountModifyDlg::save()
acc.proxyID = pc->currentItem();
- if(pa && pa->isActive()) {
- QMessageBox::information(this, tr("Warning"), tr("This account is currently active, so certain changes may not take effect until the next login."));
- }
-
- if (pa)
+ if (pa) {
pa->setUserAccount(acc);
- else
+
+ if (pa->isActive()) {
+ QMessageBox messageBox(QMessageBox::Information, tr("Warning"),
+ tr("This account is currently active, so certain changes may not take effect until the next login."),
+ QMessageBox::NoButton, this);
+ QPushButton* cancel = messageBox.addButton(tr("Reconnect &Later"), QMessageBox::RejectRole);
+ QPushButton* reconnect = messageBox.addButton(tr("Reconnect &Now"), QMessageBox::AcceptRole);
+ messageBox.setDefaultButton(reconnect);
+ messageBox.exec();
+ Q_UNUSED(cancel);
+ if (messageBox.clickedButton() == reconnect) {
+ XMPP::Status status = pa->status();
+ pa->setStatus(XMPP::Status::Offline);
+ pa->setStatus(status);
+ }
+ }
+ }
+ else {
psi->contactList()->createAccount(acc);
+ }
accept();
}
src/accountmodifydlg.cpp
@@ -186,9 +186,9 @@ ProfileManageDlg::ProfileManageDlg(const QString &choose, QWidget *parent)
// setup signals
connect(pb_new, SIGNAL(clicked()), SLOT(slotProfileNew()));
- // connect(pb_rename, SIGNAL(clicked()), SLOT(slotProfileRename()));
+ connect(pb_rename, SIGNAL(clicked()), SLOT(slotProfileRename()));
connect(pb_delete, SIGNAL(clicked()), SLOT(slotProfileDelete()));
- connect(lbx_profiles, SIGNAL(highlighted(int)), SLOT(updateSelection()));
+ connect(lbx_profiles, SIGNAL(currentRowChanged(int)), SLOT(updateSelection()));
// load the listing
QStringList list = getProfilesList();
src/profiledlg.cpp
@@ -1,145 +1,121 @@
-<ui version="4.0" stdsetdef="1" >
- <author></author>
- <comment></comment>
- <exportmacro></exportmacro>
- <class>ProfileManage</class>
- <widget class="QDialog" name="ProfileManage" >
- <property name="geometry" >
- <rect>
- <x>0</x>
- <y>0</y>
- <width>330</width>
- <height>254</height>
- </rect>
- </property>
- <property name="windowTitle" >
- <string>Manage Profiles</string>
- </property>
- <layout class="QVBoxLayout" >
- <property name="margin" >
- <number>11</number>
- </property>
- <property name="spacing" >
- <number>6</number>
- </property>
- <item>
- <layout class="QHBoxLayout" >
- <property name="margin" >
- <number>0</number>
- </property>
- <item>
- <widget class="QListWidget" name="lbx_profiles" />
- </item>
- <item>
- <layout class="QVBoxLayout" >
- <property name="margin" >
- <number>0</number>
- </property>
- <item>
- <widget class="IconButton" name="pb_new" >
- <property name="text" >
- <string>&New</string>
- </property>
- <property name="psiIconName" stdset="0" >
- <string>psi/addContact</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="IconButton" name="pb_rename" >
- <property name="text" >
- <string>&Rename</string>
- </property>
- </widget>
- </item>
- <item>
- <spacer name="Spacer1" >
- <property name="sizeHint" >
- <size>
- <width>20</width>
- <height>48</height>
- </size>
- </property>
- <property name="sizeType" >
- <enum>Expanding</enum>
- </property>
- <property name="orientation" >
- <enum>Vertical</enum>
- </property>
- </spacer>
- </item>
- <item>
- <widget class="IconButton" name="pb_delete" >
- <property name="text" >
- <string>&Delete</string>
- </property>
- <property name="psiIconName" stdset="0" >
- <string>psi/remove</string>
- </property>
- </widget>
- </item>
- <item>
- <spacer name="Spacer3" >
- <property name="sizeHint" >
- <size>
- <width>20</width>
- <height>47</height>
- </size>
- </property>
- <property name="sizeType" >
- <enum>Expanding</enum>
- </property>
- <property name="orientation" >
- <enum>Vertical</enum>
- </property>
- </spacer>
- </item>
- </layout>
- </item>
- </layout>
- </item>
- <item>
- <widget class="Line" name="Line1" >
- <property name="frameShape" >
- <enum>QFrame::HLine</enum>
- </property>
- <property name="frameShadow" >
- <enum>QFrame::Sunken</enum>
- </property>
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>ProfileManage</class>
+ <widget class="QDialog" name="ProfileManage">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>330</width>
+ <height>254</height>
+ </rect>
+ </property>
+ <property name="windowTitle">
+ <string>Manage Profiles</string>
+ </property>
+ <layout class="QVBoxLayout">
+ <property name="margin">
+ <number>11</number>
+ </property>
+ <item>
+ <layout class="QHBoxLayout">
+ <item>
+ <widget class="QListWidget" name="lbx_profiles"/>
+ </item>
+ <item>
+ <layout class="QVBoxLayout">
+ <item>
+ <widget class="IconButton" name="pb_new" native="true">
+ <property name="text" stdset="0">
+ <string>&Add</string>
+ </property>
+ <property name="psiIconName" stdset="0">
+ <string>psi/addContact</string>
+ </property>
</widget>
- </item>
- <item>
- <layout class="QHBoxLayout" >
- <property name="margin" >
- <number>0</number>
- </property>
- <item>
- <spacer name="Spacer2" >
- <property name="sizeHint" >
- <size>
- <width>244</width>
- <height>20</height>
- </size>
- </property>
- <property name="sizeType" >
- <enum>Expanding</enum>
- </property>
- <property name="orientation" >
- <enum>Horizontal</enum>
- </property>
- </spacer>
- </item>
- <item>
- <widget class="IconButton" name="pb_close" >
- <property name="text" >
- <string>&Close</string>
- </property>
- </widget>
- </item>
- </layout>
- </item>
+ </item>
+ <item>
+ <widget class="IconButton" name="pb_rename" native="true">
+ <property name="text" stdset="0">
+ <string>&Rename</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="IconButton" name="pb_delete" native="true">
+ <property name="text" stdset="0">
+ <string>Rem&ove</string>
+ </property>
+ <property name="psiIconName" stdset="0">
+ <string>psi/remove</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="Spacer3">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeType">
+ <enum>QSizePolicy::Expanding</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>47</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </item>
</layout>
- </widget>
- <layoutdefault spacing="6" margin="11" />
- <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ </item>
+ <item>
+ <widget class="Line" name="Line1">
+ <property name="frameShape">
+ <enum>QFrame::HLine</enum>
+ </property>
+ <property name="frameShadow">
+ <enum>QFrame::Sunken</enum>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QDialogButtonBox" name="buttonBox">
+ <property name="standardButtons">
+ <set>QDialogButtonBox::Close</set>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ <layoutdefault spacing="6" margin="11"/>
+ <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <customwidgets>
+ <customwidget>
+ <class>IconButton</class>
+ <extends>QWidget</extends>
+ <header>iconbutton.h</header>
+ </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections>
+ <connection>
+ <sender>buttonBox</sender>
+ <signal>rejected()</signal>
+ <receiver>ProfileManage</receiver>
+ <slot>reject()</slot>
+ <hints>
+ <hint type="sourcelabel">
+ <x>286</x>
+ <y>229</y>
+ </hint>
+ <hint type="destinationlabel">
+ <x>229</x>
+ <y>211</y>
+ </hint>
+ </hints>
+ </connection>
+ </connections>
</ui>
src/profilemanage.ui
@@ -701,8 +701,15 @@ void PsiCon::changeProfile()
{
ActiveProfiles::instance()->unsetThisProfile();
if(d->contactList->haveActiveAccounts()) {
- QMessageBox::information(0, CAP(tr("Error")), tr("Please disconnect before changing the profile."));
- return;
+ QMessageBox messageBox(QMessageBox::Information, CAP(tr("Error")), tr("Please disconnect before changing the profile."));
+ QPushButton* cancel = messageBox.addButton(QMessageBox::Cancel);
+ QPushButton* disconnect = messageBox.addButton(tr("&Disconnect"), QMessageBox::AcceptRole);
+ messageBox.setDefaultButton(disconnect);
+ messageBox.exec();
+ if (messageBox.clickedButton() == cancel)
+ return;
+
+ setStatusFromDialog(XMPP::Status::Offline, false);
}
quit(QuitProfile);
src/psicon.cpp
909af08fe0fd826d9f1d6412d8c27c04ab2f40ed
e60bd8f3260108f80560aff4728ad2994542e5d4
Maciek Niedzielski
machekku@psi-im.org
http://github.com/mblsha/psi/commit/107faf0433a0ad8ecbfc91e28046613a752d0d31
107faf0433a0ad8ecbfc91e28046613a752d0d31
2009-10-25T05:41:41-07:00
2009-10-25T05:41:41-07:00
Merge branch 'master' of dev.psi-im.org:/home/psi/git/psi
0c74e70cc4bbbadb14625d01a48b21549e568997
Maciek Niedzielski
machekku@psi-im.org