Commit 2507658f authored by Alf Gaida's avatar Alf Gaida

Cherry-picking upstream version 2015.09.10.

parent 46194a55
......@@ -73,6 +73,8 @@ void ConnmanAgent::Release()
// error in a QMessageBox
void ConnmanAgent::ReportError(QDBusObjectPath path, QString s_error)
{
(void) path;
if ( QMessageBox::warning(qobject_cast<QWidget *> (parent()), tr("Connman Error"),
tr("Connman returned the following error:<b><center>%1</b><br>Would you like to retry?").arg(TranslateStrings::cmtr(s_error)),
QMessageBox::Yes | QMessageBox::No,
......@@ -82,11 +84,13 @@ void ConnmanAgent::ReportError(QDBusObjectPath path, QString s_error)
else return;
}
//ff
//
// Called when it is required to ask the user to open a website to proceed
// with login handling
void ConnmanAgent::RequestBrowser(QDBusObjectPath path, QString url)
{
(void) path;
// Send the url to the dialog to have the user the necessary information, return if canceled.
if (this->uiDialog->showPage1(url) == QDialog::Rejected) this->sendErrorReply(ERROR_CANCELED,"User cancelled the dialog");
......@@ -98,6 +102,8 @@ void ConnmanAgent::RequestBrowser(QDBusObjectPath path, QString url)
// A dialog is displayed with the required fields enabled (non-required fields are disabled).
QVariantMap ConnmanAgent::RequestInput(QDBusObjectPath path, QMap<QString,QVariant> dict)
{
(void) path;
// Take the dict returned by DBus and extract the information we are interested in and place in input_map.
this->createInputMap(dict);
......
......@@ -46,7 +46,9 @@ class ConnmanAgent : public QObject, protected QDBusContext
Q_CLASSINFO("D-Bus Interface", "net.connman.Agent")
public:
ConnmanAgent(QObject*);
ConnmanAgent(QObject*);
inline void setLogInputRequest(bool b) {b_loginputrequest = b;}
public Q_SLOTS:
void Release();
......@@ -64,9 +66,6 @@ class ConnmanAgent : public QObject, protected QDBusContext
public:
inline void setWhatsThisIcon(QIcon icon) {uiDialog->setWhatsThisIcon(icon);}
inline void setLogInputRequest(bool b) {b_loginputrequest = b;}
inline QString getBrowser() {return uiDialog->getBrowser();}
inline void setBrowser(const QString& b) {uiDialog->setBrowser(b);}
};
#endif
......@@ -246,12 +246,14 @@ void AgentDialog::showWhatsThis()
//
void AgentDialog::updateBrowserChoice(const QModelIndex & current, const QModelIndex & previous)
{
(void) previous;
ui.lineEdit_browser->setText(current.data().toString());
}
//
// Slot to clear selection in the browser list view
// Called when ui.lineEdit_browser textEdited() signal is emitted
void AgentDialog::enteringBrowser(const QString&)
void AgentDialog::enteringBrowser()
{
ui.listView_browsers->selectionModel()->clearSelection();
}
......
......@@ -34,7 +34,6 @@ DEALINGS IN THE SOFTWARE.
# include <QDialog>
# include <QString>
# include <QVariant>
# include <QStringList>
# include "ui_agent.h"
......@@ -66,14 +65,12 @@ class AgentDialog : public QDialog
void hidePassphrase(bool);
void useWPSPushButton(bool);
void showWhatsThis();
void launchBrowser();
void updateBrowserChoice(const QModelIndex&, const QModelIndex&);
void enteringBrowser(const QString&);
void enteringBrowser();
void launchBrowser();
public:
inline void setWhatsThisIcon(QIcon icon) {ui.toolButton_whatsthis->setIcon(icon);}
inline QString getBrowser() {return ui.lineEdit_browser->text();}
inline void setBrowser(const QString& b) {ui.lineEdit_browser->setText(b);}
};
......
......@@ -501,6 +501,7 @@ void ControlBox::moveButtonPressed(QAction* act)
// Slot to enable the movebefore and moveafter buttons, and to prepare the poupup menu
void ControlBox::enableMoveButtons(int row, int col)
{
(void)col;
// enable the buttons
ui.pushButton_movebefore->setEnabled(true);
ui.pushButton_moveafter->setEnabled(true);
......@@ -1792,10 +1793,6 @@ void ControlBox::writeSettings()
settings->setValue("desktop_mate", ui.radioButton_desktopmate->isChecked() );
settings->endGroup();
settings->beginGroup("LocalSystem");
settings->setValue("browser", agent->getBrowser());
settings->endGroup();
return;
}
......@@ -1835,11 +1832,7 @@ void ControlBox::readSettings()
ui.radioButton_desktopxfce->setChecked(settings->value("desktop_xfce").toBool() );
ui.radioButton_desktopmate->setChecked(settings->value("desktop_mate").toBool() );
settings->endGroup();
settings->beginGroup("LocalSystem");
agent->setBrowser(settings->value("browser").toString() );
settings->endGroup();
return;
}
......
......@@ -304,6 +304,8 @@ void NotifyClient::closeNotification(quint32 id)
// Slot called when a notification was closed
void NotifyClient::notificationClosed(quint32 id, quint32 reason)
{
(void) reason;
if (file_map.contains(id) ) {
file_map.value(id)->remove();
delete file_map.value(id);
......@@ -318,7 +320,9 @@ void NotifyClient::notificationClosed(quint32 id, quint32 reason)
// RIght now we don't do anything with the information
void NotifyClient::actionInvoked(quint32 id, QString action_key)
{
(void) id;
(void) action_key;
//qDebug() << "Action invoked signal received" << id << action_key;
return;
......
......@@ -35,7 +35,7 @@ DEALINGS IN THE SOFTWARE.
///////////////////////////////// Program Values ///////////////////////
//
// Program Info (may be visible, but don't mark for tranalation)
#define VERSION "15.08.16-1"
#define VERSION "2015.09.10-1"
#define RELEASE_DATE "1 March 2015"
#define COPYRIGHT_DATE "2013-2015"
......
......@@ -12,3 +12,5 @@ TRANSLATIONS += ./translations/cmst_zh_CN.ts
TRANSLATIONS += ./translations/cmst_de_DE.ts
TRANSLATIONS += ./translations/cmst_pl_PL.ts
TRANSLATIONS += ./translations/cmst_it_IT.ts
TRANSLATIONS += ./translations/cmst_es_ES.ts
TRANSLATIONS += ./translations/cmst_es_CO.ts
cmst (15.08.16+20150907-1) unstable; urgency=medium
cmst (2015.09.10-1) unstable; urgency=medium
* Initial release. Closes: #751104
-- Alf Gaida <agaida@siduction.org> Mon, 07 Sep 2015 22:11:58 +0200
-- Alf Gaida <agaida@siduction.org> Fri, 11 Sep 2015 17:39:20 +0200
......@@ -5,7 +5,7 @@ Name=Connman UI Setup
GenericName=Network Configuration
Comment=QT GUI frontend for connman
Categories=Settings;System;Qt;Network
Icon=cmst
Icon=preferences-system-network
Exec=cmst
Terminal=false
StartupNotify=false
......
......@@ -5,7 +5,7 @@ Name=Connman UI Setup
GenericName=Network Configuration
Comment=QT GUI frontend for connman
Categories=Settings;System;Qt;Network
Icon=cmst
Icon=preferences-system-network
Terminal=false
Exec=cmst
StartupNotify=false
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment