Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
J
jami-client-windows
Manage
Activity
Members
Plan
Wiki
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Analyze
Contributor analytics
Repository analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
savoirfairelinux
jami-client-windows
Commits
f66deea3
Commit
f66deea3
authored
Feb 24, 2020
by
Ming Rui Zhang
Browse files
Options
Downloads
Patches
Plain Diff
callwidget: add splitter view and remove useless widgets
Change-Id: I456aceffa3a04e52a5b7f8d36856378d4214df7a
parent
ec0a166d
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/callwidget.cpp
+2
-2
2 additions, 2 deletions
src/callwidget.cpp
src/callwidget.ui
+1905
-1957
1905 additions, 1957 deletions
src/callwidget.ui
with
1907 additions
and
1959 deletions
src/callwidget.cpp
+
2
−
2
View file @
f66deea3
...
@@ -241,7 +241,7 @@ CallWidget::CallWidget(QWidget* parent) :
...
@@ -241,7 +241,7 @@ CallWidget::CallWidget(QWidget* parent) :
// hide the call stack
// hide the call stack
setCallPanelVisibility
(
false
);
setCallPanelVisibility
(
false
);
ui
->
containerWidget
->
setVisible
(
false
);
setVisible
(
false
);
ui
->
sipCallerBestIdLabel
->
setVisible
(
false
);
ui
->
sipCallerBestIdLabel
->
setVisible
(
false
);
}
}
...
@@ -254,7 +254,7 @@ CallWidget::~CallWidget()
...
@@ -254,7 +254,7 @@ CallWidget::~CallWidget()
void
void
CallWidget
::
navigated
(
bool
to
)
CallWidget
::
navigated
(
bool
to
)
{
{
ui
->
containerWidget
->
setVisible
(
to
);
setVisible
(
to
);
if
(
to
)
{
if
(
to
)
{
updateSmartList
();
updateSmartList
();
connectConversationModel
();
connectConversationModel
();
...
...
This diff is collapsed.
Click to expand it.
src/callwidget.ui
+
1905
−
1957
View file @
f66deea3
...
@@ -6,8 +6,8 @@
...
@@ -6,8 +6,8 @@
<rect>
<rect>
<x>
0
</x>
<x>
0
</x>
<y>
0
</y>
<y>
0
</y>
<width>
1
440
</width>
<width>
1
091
</width>
<height>
66
4
</height>
<height>
66
5
</height>
</rect>
</rect>
</property>
</property>
<property
name=
"sizePolicy"
>
<property
name=
"sizePolicy"
>
...
@@ -19,25 +19,10 @@
...
@@ -19,25 +19,10 @@
<property
name=
"windowTitle"
>
<property
name=
"windowTitle"
>
<string/>
<string/>
</property>
</property>
<layout
class=
"QGridLayout"
name=
"gridLayout"
>
<layout
class=
"QHBoxLayout"
name=
"horizontalLayout_6"
>
<property
name=
"leftMargin"
>
<number>
0
</number>
</property>
<property
name=
"topMargin"
>
<number>
0
</number>
</property>
<property
name=
"rightMargin"
>
<number>
0
</number>
</property>
<property
name=
"bottomMargin"
>
<number>
0
</number>
</property>
<property
name=
"spacing"
>
<property
name=
"spacing"
>
<number>
0
</number>
<number>
0
</number>
</property>
</property>
<item
row=
"0"
column=
"0"
>
<widget
class=
"QWidget"
name=
"containerWidget"
native=
"true"
>
<layout
class=
"QGridLayout"
name=
"gridLayout_2"
>
<property
name=
"leftMargin"
>
<property
name=
"leftMargin"
>
<number>
0
</number>
<number>
0
</number>
</property>
</property>
...
@@ -50,24 +35,17 @@
...
@@ -50,24 +35,17 @@
<property
name=
"bottomMargin"
>
<property
name=
"bottomMargin"
>
<number>
0
</number>
<number>
0
</number>
</property>
</property>
<property
name=
"spacing"
>
<item>
<number>
0
</number>
<widget
class=
"QSplitter"
name=
"splitter"
>
</property>
<property
name=
"orientation"
>
<item
row=
"0"
column=
"0"
>
<enum>
Qt::Horizontal
</enum>
<layout
class=
"QHBoxLayout"
name=
"horizontalLayout_6"
stretch=
"5,16"
>
<property
name=
"spacing"
>
<number>
0
</number>
</property>
<property
name=
"topMargin"
>
<number>
0
</number>
</property>
</property>
<property
name=
"
rightMargin
"
>
<property
name=
"
handleWidth
"
>
<number>
0
</number>
<number>
1
</number>
</property>
</property>
<item>
<widget
class=
"QWidget"
name=
"sidePanelLayoutWidget"
native=
"true"
>
<widget
class=
"QWidget"
name=
"sidePanelLayoutWidget"
native=
"true"
>
<property
name=
"sizePolicy"
>
<property
name=
"sizePolicy"
>
<sizepolicy
hsizetype=
"
Fixed
"
vsizetype=
"Preferred"
>
<sizepolicy
hsizetype=
"
MinimumExpanding
"
vsizetype=
"Preferred"
>
<horstretch>
0
</horstretch>
<horstretch>
0
</horstretch>
<verstretch>
0
</verstretch>
<verstretch>
0
</verstretch>
</sizepolicy>
</sizepolicy>
...
@@ -80,7 +58,7 @@
...
@@ -80,7 +58,7 @@
</property>
</property>
<property
name=
"maximumSize"
>
<property
name=
"maximumSize"
>
<size>
<size>
<width>
380
</width>
<width>
16777215
</width>
<height>
16777215
</height>
<height>
16777215
</height>
</size>
</size>
</property>
</property>
...
@@ -461,35 +439,6 @@
...
@@ -461,35 +439,6 @@
</item>
</item>
</layout>
</layout>
</widget>
</widget>
</item>
<item>
<widget
class=
"QWidget"
name=
"mainLayoutWidget"
native=
"true"
>
<property
name=
"sizePolicy"
>
<sizepolicy
hsizetype=
"MinimumExpanding"
vsizetype=
"MinimumExpanding"
>
<horstretch>
0
</horstretch>
<verstretch>
0
</verstretch>
</sizepolicy>
</property>
<layout
class=
"QVBoxLayout"
name=
"mainLayout"
>
<property
name=
"spacing"
>
<number>
0
</number>
</property>
<property
name=
"sizeConstraint"
>
<enum>
QLayout::SetMaximumSize
</enum>
</property>
<property
name=
"leftMargin"
>
<number>
0
</number>
</property>
<property
name=
"topMargin"
>
<number>
0
</number>
</property>
<property
name=
"rightMargin"
>
<number>
0
</number>
</property>
<property
name=
"bottomMargin"
>
<number>
0
</number>
</property>
<item>
<widget
class=
"QStackedWidget"
name=
"stackedWidget"
>
<widget
class=
"QStackedWidget"
name=
"stackedWidget"
>
<property
name=
"sizePolicy"
>
<property
name=
"sizePolicy"
>
<sizepolicy
hsizetype=
"MinimumExpanding"
vsizetype=
"MinimumExpanding"
>
<sizepolicy
hsizetype=
"MinimumExpanding"
vsizetype=
"MinimumExpanding"
>
...
@@ -497,11 +446,17 @@
...
@@ -497,11 +446,17 @@
<verstretch>
0
</verstretch>
<verstretch>
0
</verstretch>
</sizepolicy>
</sizepolicy>
</property>
</property>
<property
name=
"minimumSize"
>
<size>
<width>
580
</width>
<height>
0
</height>
</size>
</property>
<property
name=
"toolTip"
>
<property
name=
"toolTip"
>
<string/>
<string/>
</property>
</property>
<property
name=
"currentIndex"
>
<property
name=
"currentIndex"
>
<number>
0
</number>
<number>
1
</number>
</property>
</property>
<widget
class=
"QWidget"
name=
"welcomePage"
>
<widget
class=
"QWidget"
name=
"welcomePage"
>
<property
name=
"sizePolicy"
>
<property
name=
"sizePolicy"
>
...
@@ -2184,7 +2139,7 @@ Copy and share it with your friends!
...
@@ -2184,7 +2139,7 @@ Copy and share it with your friends!
</spacer>
</spacer>
</item>
</item>
<item>
<item>
<widget
class=
"MessageWebView"
name=
"messageView"
>
<widget
class=
"MessageWebView"
name=
"messageView"
native=
"true"
>
<property
name=
"sizePolicy"
>
<property
name=
"sizePolicy"
>
<sizepolicy
hsizetype=
"MinimumExpanding"
vsizetype=
"MinimumExpanding"
>
<sizepolicy
hsizetype=
"MinimumExpanding"
vsizetype=
"MinimumExpanding"
>
<horstretch>
0
</horstretch>
<horstretch>
0
</horstretch>
...
@@ -2228,13 +2183,6 @@ Copy and share it with your friends!
...
@@ -2228,13 +2183,6 @@ Copy and share it with your friends!
</layout>
</layout>
</widget>
</widget>
</widget>
</widget>
</item>
</layout>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
</widget>
</item>
</item>
</layout>
</layout>
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment