[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [ring-kde] src: ux: Update default GUI settings to match other clients
From: Emmanuel Lepage Vallee <emmanuel.lepage () savoirfairelinux ! com>
Date: 2015-04-30 17:49:09
Message-ID: E1YnsaD-0000Dz-Fr () scm ! kde ! org
[Download RAW message or body]
Git commit 6d44de92c04dfc977091fa52ecfd5e6616135384 by Emmanuel Lepage Vallee.
Committed on 30/04/2015 at 17:47.
Pushed by lepagevalleeemmanuel into branch 'master'.
ux: Update default GUI settings to match other clients
Refs #71995
M +3 -0 src/CMakeLists.txt
M +4 -0 src/actioncollection.cpp
M +2 -2 src/klib/ring-kde.kcfg
M +18 -6 src/ring.cpp
M +2 -2 src/view.cpp
M +6 -3 src/widgets/autocompletion.cpp
http://commits.kde.org/ring-kde/6d44de92c04dfc977091fa52ecfd5e6616135384
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 5b9258d..ce192c6 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -365,6 +365,9 @@ INSTALL( FILES icons/transfertarrow.svg DESTINATION \
${DATA_INSTALL_DIR INSTALL( FILES icons/confBlackWhite.svg DESTINATION \
${DATA_INSTALL_DIR}/ring-kde ) INSTALL( FILES icons/overlay_right_corner.svg \
DESTINATION ${DATA_INSTALL_DIR}/ring-kde ) INSTALL( FILES \
icons/overlay_left_corner.svg DESTINATION ${DATA_INSTALL_DIR}/ring-kde ) \
+INSTALL( FILES icons/call.svg DESTINATION \
${DATA_INSTALL_DIR}/ring-kde ) +INSTALL( FILES icons/hold.svg \
DESTINATION ${DATA_INSTALL_DIR}/ring-kde ) +INSTALL( FILES icons/transfert.svg \
DESTINATION ${DATA_INSTALL_DIR}/ring-kde ) INSTALL( FILES \
icons/confBlackWhite.png DESTINATION ${DATA_INSTALL_DIR}/ring-kde ) \
INSTALL( FILES icons/voicemail.png DESTINATION \
${DATA_INSTALL_DIR}/ring-kde ) INSTALL( FILES icons/presence-icon.png \
DESTINATION ${DATA_INSTALL_DIR}/ring-kde )
diff --git a/src/actioncollection.cpp b/src/actioncollection.cpp
index 8f5a5cb..0f5f560 100644
--- a/src/actioncollection.cpp
+++ b/src/actioncollection.cpp
@@ -86,6 +86,10 @@ action_editToolBar(nullptr), action_addPerson(nullptr), \
action_screen(nullptr), 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_new_call->setIcon(QIcon(QStandardPaths::locate(QStandardPaths::GenericDataLocation, \
"ring-kde/call.svg" ))); + \
action_hold->setIcon(QIcon(QStandardPaths::locate(QStandardPaths::GenericDataLocation, \
"ring-kde/hold.svg" ))); + \
action_transfer->setIcon(QIcon(QStandardPaths::locate(QStandardPaths::GenericDataLocation, \
"ring-kde/transfert.svg" ))); +
action_transfer->setText ( i18n( "Transfer" ) );
action_record ->setText ( i18n( "Record" ) );
action_hold ->setText ( i18n( "Hold" ) );
diff --git a/src/klib/ring-kde.kcfg b/src/klib/ring-kde.kcfg
index 86a7cfb..68d4989 100644
--- a/src/klib/ring-kde.kcfg
+++ b/src/klib/ring-kde.kcfg
@@ -86,7 +86,7 @@
</entry>
<entry name="displayDialpad" type="Bool">
<label>Defines whether the dialpad is being shown by default</label>
- <default>true</default>
+ <default>false</default>
</entry>
<entry name="displayAccountBox" type="Bool">
<label>Defines whether the statusbar account combobox is being shown by \
default</label> @@ -122,7 +122,7 @@
</entry>
<entry name="autoCompletionHeight" type="Int">
<label>The auto completion popup height</label>
- <default>125</default>
+ <default>225</default>
</entry>
<!-- Video Settings -->
diff --git a/src/ring.cpp b/src/ring.cpp
index 87ce1b7..7180ac3 100644
--- a/src/ring.cpp
+++ b/src/ring.cpp
@@ -217,14 +217,23 @@ Ring::Ring(QWidget* parent)
//System tray
m_pTrayIcon = new SysTray ( this->windowIcon(), this );
+ addDockWidget( Qt::BottomDockWidgetArea, m_pContactCD ,Qt::Horizontal);
+ addDockWidget( Qt::BottomDockWidgetArea, m_pHistoryDW ,Qt::Horizontal);
+ addDockWidget( Qt::BottomDockWidgetArea, m_pBookmarkDW ,Qt::Horizontal);
+
addDockWidget( Qt::BottomDockWidgetArea, m_pCentralDW );
- addDockWidget( Qt::BottomDockWidgetArea, m_pContactCD );
- addDockWidget( Qt::BottomDockWidgetArea, m_pHistoryDW );
- addDockWidget( Qt::BottomDockWidgetArea, m_pBookmarkDW );
- tabifyDockWidget(m_pCentralDW,m_pHistoryDW );
- tabifyDockWidget(m_pCentralDW,m_pContactCD );
- tabifyDockWidget(m_pCentralDW,m_pBookmarkDW);
+ tabifyDockWidget(m_pBookmarkDW,m_pContactCD );
+ tabifyDockWidget(m_pBookmarkDW,m_pHistoryDW );
+
+ //Force the dock widget aspect ratio, doing this is an hack
+ m_pHistoryDW ->setMinimumSize(350,0);
+ m_pContactCD ->setMinimumSize(350,0);
+ m_pBookmarkDW->setMinimumSize(350,0);
+
+ m_pHistoryDW ->setMaximumSize(350,999999);
+ m_pContactCD ->setMaximumSize(350,999999);
+ m_pBookmarkDW->setMaximumSize(350,999999);
m_pCentralDW->setObjectName( "callDock" );
@@ -347,6 +356,9 @@ Ring::Ring(QWidget* parent)
show();
else
close();
+
+ //setupGui + default size doesn't really, use this for now
+ resize(QSize(1024,768));
} //Ring
///Destructor
diff --git a/src/view.cpp b/src/view.cpp
index d78e95c..25c79e8 100644
--- a/src/view.cpp
+++ b/src/view.cpp
@@ -181,10 +181,10 @@ View::View(QWidget *parent)
d2->show();
});
- if (ConfigurationSkeleton::enableWizard() == true) {
+ if (ConfigurationSkeleton::enableWizard() == true && \
!AccountModel::instance()->isRingSupported()) { new Wizard(this);
- ConfigurationSkeleton::setEnableWizard(false);
}
+ ConfigurationSkeleton::setEnableWizard(false);
setFocus(Qt::OtherFocusReason);
}
diff --git a/src/widgets/autocompletion.cpp b/src/widgets/autocompletion.cpp
index a780d44..35ad1bd 100644
--- a/src/widgets/autocompletion.cpp
+++ b/src/widgets/autocompletion.cpp
@@ -132,7 +132,7 @@ AutoCompletion::AutoCompletion(QTreeView* parent) : \
QWidget(parent),m_Height(125 \
connect(m_pView,SIGNAL(doubleClicked(QModelIndex)),this,SLOT(slotDoubleClicked(QModelIndex)));
if (parent) {
- connect(parent->selectionModel(),SIGNAL(currentChanged(QModelIndex,QModelIndex)),this,SLOT(selectionChanged(QModelIndex)));
+ connect(CallModel::instance()->selectionModel(),SIGNAL(currentChanged(QModelIndex,QModelIndex)),this,SLOT(selectionChanged(QModelIndex)));
parent->installEventFilter(this);
QResizeEvent r(size(),size());
eventFilter(nullptr,&r);
@@ -193,15 +193,18 @@ void AutoCompletion::selectionChanged(const QModelIndex& idx)
}
Call* call = CallModel::instance()->getCall(idx);
- if (call && call->lifeCycleState() == Call::LifeCycleState::CREATION)
+ if (call && call->lifeCycleState() == Call::LifeCycleState::CREATION) {
setCall(call);
- else
+ }
+ else {
setCall(nullptr);
+ }
}
void AutoCompletion::setCall(Call* call)
{
m_pModel->setCall(call);
+ setVisible(call && call->lifeCycleState() == Call::LifeCycleState::CREATION);
}
Call* AutoCompletion::call() const
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic