[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [ring-kde] /: ux: Disable broken features for 2.0.2
From: Emmanuel Lepage Vallee <emmanuel.lepage () savoirfairelinux ! com>
Date: 2015-04-30 17:49:09
Message-ID: E1YnsaD-0000Dz-4e () scm ! kde ! org
[Download RAW message or body]
Git commit 50b5e7e4e37cf3d1c49ea2deb15ff938926c0cab by Emmanuel Lepage Vallee.
Committed on 30/04/2015 at 16:12.
Pushed by lepagevalleeemmanuel into branch 'master'.
ux: Disable broken features for 2.0.2
Refs #71995
M +1 -1 data/ring-kdeui.rc
M +13 -1 src/actioncollection.cpp
M +2 -0 src/actioncollection.h
M +5 -4 src/conf/configurationdialog.cpp
M +1 -0 src/conf/dlgaccounts.cpp
M +14 -2 src/conf/dlgaccountsbase.ui
M +1 -0 src/conf/dlgdht.cpp
M +0 -5 src/conf/dlgdht.ui
M +1 -1 src/ring.cpp
http://commits.kde.org/ring-kde/50b5e7e4e37cf3d1c49ea2deb15ff938926c0cab
diff --git a/data/ring-kdeui.rc b/data/ring-kdeui.rc
index d11b24d..32b8f55 100644
--- a/data/ring-kdeui.rc
+++ b/data/ring-kdeui.rc
@@ -35,7 +35,7 @@
</Menu>
</MenuBar>
<ToolBar name="mainToolBar" iconText="textbesideicon" position="Top" noMerge="1" \
fullWidth="false" newline="true" >
- <Action name="action_accept" />
+ <Action name="action_new_call" />
<Action name="action_mailBox" />
<!-- <Action name="action_refuse" /> -->
<!-- <Action name="action_hold" /> -->
diff --git a/src/actioncollection.cpp b/src/actioncollection.cpp
index 5b2f600..8f5a5cb 100644
--- a/src/actioncollection.cpp
+++ b/src/actioncollection.cpp
@@ -67,9 +67,10 @@ action_mailBox(nullptr), action_close(nullptr), \
action_quit(nullptr), action_dis action_displayDialpad(nullptr), \
action_displayAccountCbb(nullptr),action_displayMessageBox(nullptr), \
action_configureRing(nullptr), action_configureShortcut(nullptr), \
action_pastenumber(nullptr), action_showContactDock(nullptr), \
action_showHistoryDock(nullptr), action_showBookmarkDock(nullptr),
-action_editToolBar(nullptr), action_addPerson(nullptr), action_screen(nullptr)
+action_editToolBar(nullptr), action_addPerson(nullptr), action_screen(nullptr), \
action_new_call(nullptr) {
action_accept = new ExtendedAction(this);
+ action_new_call = new ExtendedAction(this);
action_hold = new ExtendedAction(this);
action_transfer = new ExtendedAction(this);
action_record = new ExtendedAction(this);
@@ -83,6 +84,7 @@ action_editToolBar(nullptr), action_addPerson(nullptr), \
action_screen(nullptr) action_mute_capture \
->setAltIcon(QStandardPaths::locate(QStandardPaths::GenericDataLocation, \
"ring-kde/light/mic.svg" )); action_hangup \
->setAltIcon(QStandardPaths::locate(QStandardPaths::GenericDataLocation, \
"ring-kde/light/refuse.svg" )); action_accept \
->setAltIcon(QStandardPaths::locate(QStandardPaths::GenericDataLocation, \
"ring-kde/light/accept.svg" )); + \
action_new_call->setAltIcon(QStandardPaths::locate(QStandardPaths::GenericDataLocation, \
"ring-kde/light/call.svg" ));
action_transfer->setText ( i18n( "Transfer" ) );
action_record ->setText ( i18n( "Record" ) );
@@ -91,6 +93,7 @@ action_editToolBar(nullptr), action_addPerson(nullptr), \
action_screen(nullptr) action_mute_capture ->setText ( i18nc("Mute the current \
audio capture device", "Mute" ) ); action_mute_playback ->setText ( \
i18nc("Mute the current audio playback device", "Mute Playback" ) ); \
action_accept ->setText ( i18n("Dial" ) ); + action_new_call ->setText ( \
i18n("New Call" ) );
#ifdef ENABLE_VIDEO
action_video_rotate_left = new ExtendedAction(this);
@@ -138,6 +141,7 @@ action_editToolBar(nullptr), action_addPerson(nullptr), \
action_screen(nullptr) ActionCollection::~ActionCollection()
{
delete action_accept ;
+ delete action_new_call ;
delete action_hold ;
delete action_transfer ;
delete action_record ;
@@ -168,6 +172,7 @@ void ActionCollection::setupAction()
action_mailBox = new QAction(Ring::app());
action_accept->setShortcut ( Qt::CTRL + Qt::Key_A );
+ action_new_call->setShortcut ( Qt::CTRL + Qt::Key_N );
action_hold->setShortcut ( Qt::CTRL + Qt::Key_H );
action_transfer->setShortcut ( Qt::CTRL + Qt::Key_T );
action_record->setShortcut ( Qt::CTRL + Qt::Key_R );
@@ -231,6 +236,7 @@ void ActionCollection::setupAction()
UserActionModel* uam = CallModel::instance()->userActionModel();
QHash<int, ExtendedAction*> actionHash;
actionHash[ (int)UserActionModel::Action::ACCEPT ] = action_accept;
+ actionHash[ (int)UserActionModel::Action::ADD_NEW ] = action_new_call;
actionHash[ (int)UserActionModel::Action::HOLD ] = action_hold;
actionHash[ (int)UserActionModel::Action::MUTE_AUDIO ] = \
action_mute_capture; actionHash[ (int)UserActionModel::Action::SERVER_TRANSFER ] = \
action_transfer; @@ -275,6 +281,7 @@ void ActionCollection::setupAction()
// Ring::app()->actionCollection()->setConfigGlobal(true);
Ring::app()->actionCollection()->addAction("action_accept" , \
action_accept ); + \
Ring::app()->actionCollection()->addAction("action_new_call" , \
action_new_call ); \
Ring::app()->actionCollection()->addAction("action_hold" , \
action_hold ); \
Ring::app()->actionCollection()->addAction("action_transfer" , \
action_transfer ); \
Ring::app()->actionCollection()->addAction("action_record" , \
action_record ); @@ -529,6 +536,11 @@ ExtendedAction* \
ActionCollection::acceptAction () return action_accept;
}
+ExtendedAction* ActionCollection::newCallAction ()
+{
+ return action_new_call;
+}
+
QAction * ActionCollection::displayVolumeControlsAction()
{
return action_displayVolumeControls;
diff --git a/src/actioncollection.h b/src/actioncollection.h
index b9b263d..28322b2 100644
--- a/src/actioncollection.h
+++ b/src/actioncollection.h
@@ -48,6 +48,7 @@ public:
ExtendedAction* hangupAction ();
ExtendedAction* transferAction ();
ExtendedAction* acceptAction ();
+ ExtendedAction* newCallAction ();
QAction * displayVolumeControlsAction();
QAction * displayDialpadAction ();
QAction * displayAccountCbbAction ();
@@ -75,6 +76,7 @@ private:
//Toolbar actions
ExtendedAction* action_accept ;
+ ExtendedAction* action_new_call ;
ExtendedAction* action_hold ;
ExtendedAction* action_transfer ;
ExtendedAction* action_record ;
diff --git a/src/conf/configurationdialog.cpp b/src/conf/configurationdialog.cpp
index 7b0d6ac..bad5f78 100644
--- a/src/conf/configurationdialog.cpp
+++ b/src/conf/configurationdialog.cpp
@@ -173,7 +173,7 @@ ConfigurationDialog::ConfigurationDialog(View *parent)
#endif
//Presence
- dlgHolder[ConfigurationDialog::Page::Presence] = new \
PlaceHolderWidget(Page::Presence,this,[](ConfigurationDialog* dialog)->QWidget*{ + \
/*dlgHolder[ConfigurationDialog::Page::Presence] = new \
PlaceHolderWidget(Page::Presence,this,[](ConfigurationDialog* dialog)->QWidget*{ \
dialog->dlgPresence = new DlgPresence(dialog); \
dialog->m_pManager->addWidget(dialog->dlgPresence); return dialog->dlgPresence;
@@ -181,7 +181,7 @@ ConfigurationDialog::ConfigurationDialog(View *parent)
m_pPresPage = addPage( dlgHolder[ConfigurationDialog::Page::Presence] , \
i18nc("SIP Presence","Presence") , \
QStandardPaths::locate(QStandardPaths::GenericDataLocation, \
"ring-kde/presence-icon.svg")); \
m_pPresPage->setProperty("id",ConfigurationDialog::Page::Presence); \
m_pPresPage->setEnabled(AccountModel::instance()->isPresencePublishSupported() && \
AccountModel::instance()->isPresenceEnabled());
- connect(AccountModel::instance(),SIGNAL(presenceEnabledChanged(bool)),this,SLOT(slotPresenceEnabled(bool)));
+ connect(AccountModel::instance(),SIGNAL(presenceEnabledChanged(bool)),this,SLOT(slotPresenceEnabled(bool)));*/
//Connect everything
for(int i=0;i<=ConfigurationDialog::Page::Presence;i++)
@@ -192,7 +192,7 @@ ConfigurationDialog::ConfigurationDialog(View *parent)
connect(buttonBox()->button(QDialogButtonBox::Ok), SIGNAL(clicked()) , this, \
SLOT(applyCustomSettings())); connect(buttonBox()->button(QDialogButtonBox::Cancel), \
SIGNAL(clicked()), this, SLOT(cancelSettings()) );
- setMinimumSize(1024,600);
+ setMinimumSize(1024,700);
} //ConfigurationDialog
@@ -302,7 +302,8 @@ void ConfigurationDialog::reload()
void ConfigurationDialog::slotPresenceEnabled(bool state)
{
- m_pPresPage->setEnabled(state && \
AccountModel::instance()->isPresencePublishSupported()); + Q_UNUSED(state)
+// m_pPresPage->setEnabled(state && \
AccountModel::instance()->isPresencePublishSupported()); }
#undef GUARD
diff --git a/src/conf/dlgaccounts.cpp b/src/conf/dlgaccounts.cpp
index f7523ba..2e3070e 100644
--- a/src/conf/dlgaccounts.cpp
+++ b/src/conf/dlgaccounts.cpp
@@ -117,6 +117,7 @@ DlgAccounts::DlgAccounts(KConfigDialog* parent)
file_tls_endpoint->lineEdit()->setClearButtonEnabled(false);
file_tls_private_key->lineEdit()->setClearButtonEnabled(false);
+ m_pSecurityIssues->setVisible(false);
//Authority
m_pAuthorityII = new IssuesIcon(file_tls_authority->lineEdit());
m_pAuthorityII->setupForLineEdit(file_tls_authority->lineEdit());
diff --git a/src/conf/dlgaccountsbase.ui b/src/conf/dlgaccountsbase.ui
index 5242d4c..08afa69 100644
--- a/src/conf/dlgaccountsbase.ui
+++ b/src/conf/dlgaccountsbase.ui
@@ -234,7 +234,7 @@
</size>
</property>
<property name="currentIndex">
- <number>2</number>
+ <number>6</number>
</property>
<widget class="QWidget" name="tab_basic">
<attribute name="title">
@@ -1253,7 +1253,7 @@
<property name="geometry">
<rect>
<x>0</x>
- <y>-258</y>
+ <y>0</y>
<width>537</width>
<height>900</height>
</rect>
@@ -1280,6 +1280,9 @@
</item>
<item>
<widget class="QCheckBox" name="checkbox_ZTRP_send_hello">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
<property name="text">
<string>Send Hello Hash in SDP</string>
</property>
@@ -1287,6 +1290,9 @@
</item>
<item>
<widget class="QCheckBox" name="checkbox_ZRTP_warn_supported">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
<property name="text">
<string>Ask user to confirm SAS</string>
</property>
@@ -1294,6 +1300,9 @@
</item>
<item>
<widget class="QCheckBox" name="checkbox_ZRTP_Ask_user">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
<property name="text">
<string>Warn if ZRTP is not supported</string>
</property>
@@ -1301,6 +1310,9 @@
</item>
<item>
<widget class="QCheckBox" name="checkbox_ZRTP_display_SAS">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
<property name="text">
<string>Display SAS once for hold events</string>
</property>
diff --git a/src/conf/dlgdht.cpp b/src/conf/dlgdht.cpp
index 01a1f8c..48401ab 100644
--- a/src/conf/dlgdht.cpp
+++ b/src/conf/dlgdht.cpp
@@ -32,6 +32,7 @@ DlgDht::DlgDht(QWidget* parent) : \
QWidget(parent),m_pAccount(nullptr) v->show();
connect(v,&QDialog::finished,[v](int) { delete v; });
});
+ groupBox->setVisible(false);
}
void DlgDht::setAccount(Account* a)
diff --git a/src/conf/dlgdht.ui b/src/conf/dlgdht.ui
index df47e23..38db596 100644
--- a/src/conf/dlgdht.ui
+++ b/src/conf/dlgdht.ui
@@ -118,11 +118,6 @@
</item>
</layout>
</widget>
- <widget class="QWidget" name="tab_2">
- <attribute name="title">
- <string>Blacklist</string>
- </attribute>
- </widget>
</widget>
</item>
</layout>
diff --git a/src/ring.cpp b/src/ring.cpp
index f7af47d..87ce1b7 100644
--- a/src/ring.cpp
+++ b/src/ring.cpp
@@ -293,7 +293,7 @@ Ring::Ring(QWidget* parent)
m_pPresent->setAutoRaise(true);
m_pPresent->setText(i18nc("The presence state is \"Online\"","Online"));
m_pPresent->setCheckable(true);
- m_pPresent->setVisible(AccountModel::instance()->isPresenceEnabled() && \
AccountModel::instance()->isPresencePublishSupported()); + \
m_pPresent->setVisible(false/*AccountModel::instance()->isPresenceEnabled() && \
AccountModel::instance()->isPresencePublishSupported()*/); // \
m_pPresent->setStyleSheet("background-color:red;"); bar->addWidget(m_pPresent);
connect(PresenceStatusModel::instance(),SIGNAL(currentNameChanged(QString)),this,SLOT(updatePresence(QString)));
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic