[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [ring-kde] src: ux: Fix the auto completion 'enter' behavior
From:       Emmanuel Lepage Vallee <emmanuel.lepage () savoirfairelinux ! com>
Date:       2015-04-30 19:09:22
Message-ID: E1Yntpq-00074t-2n () scm ! kde ! org
[Download RAW message or body]

Git commit ce9dfa5a665a72fa9edc1d76cf808310d03b2ccf by Emmanuel Lepage Vallee.
Committed on 30/04/2015 at 19:08.
Pushed by lepagevalleeemmanuel into branch 'master'.

ux: Fix the auto completion 'enter' behavior

Refs #71995

M  +12   -0    src/conf/dlgdht.ui
M  +1    -1    src/eventmanager.cpp
M  +3    -2    src/widgets/wizard.cpp

http://commits.kde.org/ring-kde/ce9dfa5a665a72fa9edc1d76cf808310d03b2ccf

diff --git a/src/conf/dlgdht.ui b/src/conf/dlgdht.ui
index 38db596..1de7b2a 100644
--- a/src/conf/dlgdht.ui
+++ b/src/conf/dlgdht.ui
@@ -91,6 +91,9 @@
                <property name="text">
                 <string>...</string>
                </property>
+               <property name="icon">
+                <iconset theme="go-up"/>
+               </property>
               </widget>
              </item>
              <item>
@@ -98,6 +101,9 @@
                <property name="text">
                 <string>...</string>
                </property>
+               <property name="icon">
+                <iconset theme="go-down"/>
+               </property>
               </widget>
              </item>
              <item>
@@ -105,6 +111,9 @@
                <property name="text">
                 <string>...</string>
                </property>
+               <property name="icon">
+                <iconset theme="list-add"/>
+               </property>
               </widget>
              </item>
              <item>
@@ -112,6 +121,9 @@
                <property name="text">
                 <string>...</string>
                </property>
+               <property name="icon">
+                <iconset theme="list-remove"/>
+               </property>
               </widget>
              </item>
             </layout>
diff --git a/src/eventmanager.cpp b/src/eventmanager.cpp
index 811b102..e957aea 100644
--- a/src/eventmanager.cpp
+++ b/src/eventmanager.cpp
@@ -306,7 +306,7 @@ bool EventManager::viewKeyEvent(QKeyEvent* event)
          if (m_pParent->m_pAutoCompletion && m_pParent->m_pAutoCompletion->selection()) {
             ContactMethod* n = m_pParent->m_pAutoCompletion->selection();
             Call* call = m_pParent->currentCall();
-            if (call->state() == Call::State::DIALING) {
+            if (call->state() == Call::State::DIALING || call->state() == Call::State::NEW) {
                call->setDialNumber(n->uri());
                if (PhoneDirectoryModel::instance()->callWithAccount()
                 && n->account() && n->account()->id() != "IP2IP") //FIXME do not hardcode this
diff --git a/src/widgets/wizard.cpp b/src/widgets/wizard.cpp
index 75e7817..e4edcb7 100644
--- a/src/widgets/wizard.cpp
+++ b/src/widgets/wizard.cpp
@@ -57,11 +57,12 @@ Wizard::Wizard(QWidget* parent) : QWidget(parent)
    w->m_pName->selectAll();
    connect(w->m_pNext, &QPushButton::clicked,this,&Wizard::slotNext);
    connect(w->m_pName, &QLineEdit::returnPressed,this,&Wizard::slotNext);
+   setStyleSheet("QLabel{color:white;}");
 }
 
 Wizard::~Wizard()
 {
-   
+
 }
 
 void Wizard::slotNext()
@@ -147,6 +148,6 @@ bool Wizard::eventFilter(QObject *obj, QEvent *event)
 void Wizard::paintEvent(QPaintEvent* event) {
    Q_UNUSED(event)
    QPainter customPainter(this);
-   static QColor black(0,0,0,100);
+   static QColor black(0,0,0,200);
    customPainter.fillRect(rect(),black);
 }
[prev in list] [next in list] [prev in thread] [next in thread]