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
2d03da46
Commit
2d03da46
authored
Jul 15, 2015
by
Edric Milaret
Browse files
Options
Downloads
Patches
Plain Diff
lrc: adapt to api changes
Refs #77567 Change-Id: I806d589e3f663f6587173b42833e7c170d98b655
parent
485d908f
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
accountdetails.cpp
+2
-13
2 additions, 13 deletions
accountdetails.cpp
accountdetails.h
+0
-1
0 additions, 1 deletion
accountdetails.h
with
2 additions
and
14 deletions
accountdetails.cpp
+
2
−
13
View file @
2d03da46
...
@@ -33,8 +33,7 @@ AccountDetails::AccountDetails(QWidget *parent) :
...
@@ -33,8 +33,7 @@ AccountDetails::AccountDetails(QWidget *parent) :
QWidget
(
parent
),
QWidget
(
parent
),
ui
(
new
Ui
::
AccountDetails
),
ui
(
new
Ui
::
AccountDetails
),
codecModel_
(
nullptr
),
codecModel_
(
nullptr
),
currentAccount_
(
nullptr
),
currentAccount_
(
nullptr
)
codecModelModified
(
false
)
{
{
ui
->
setupUi
(
this
);
ui
->
setupUi
(
this
);
...
@@ -150,9 +149,6 @@ AccountDetails::setAccount(Account* currentAccount) {
...
@@ -150,9 +149,6 @@ AccountDetails::setAccount(Account* currentAccount) {
currentAccount_
=
currentAccount
;
currentAccount_
=
currentAccount
;
if
(
codecModel_
&&
codecModelModified
)
codecModel_
->
save
();
codecModel_
=
currentAccount
->
codecModel
();
codecModel_
=
currentAccount
->
codecModel
();
ui
->
typeValueLabel
->
setText
(
currentAccount_
->
protocolModel
()
->
ui
->
typeValueLabel
->
setText
(
currentAccount_
->
protocolModel
()
->
...
@@ -238,7 +234,6 @@ AccountDetails::audio_codec_checked(int row, int column) {
...
@@ -238,7 +234,6 @@ AccountDetails::audio_codec_checked(int row, int column) {
auto
idx
=
codecModel_
->
audioCodecs
()
->
index
(
row
,
0
);
auto
idx
=
codecModel_
->
audioCodecs
()
->
index
(
row
,
0
);
codecModel_
->
audioCodecs
()
->
setData
(
idx
,
item
->
checkState
(),
codecModel_
->
audioCodecs
()
->
setData
(
idx
,
item
->
checkState
(),
Qt
::
CheckStateRole
);
Qt
::
CheckStateRole
);
codecModelModified
=
true
;
}
}
void
void
...
@@ -249,7 +244,6 @@ AccountDetails::video_codec_checked(int row, int column) {
...
@@ -249,7 +244,6 @@ AccountDetails::video_codec_checked(int row, int column) {
auto
idx
=
codecModel_
->
videoCodecs
()
->
index
(
row
,
0
);
auto
idx
=
codecModel_
->
videoCodecs
()
->
index
(
row
,
0
);
codecModel_
->
videoCodecs
()
->
setData
(
idx
,
item
->
checkState
(),
codecModel_
->
videoCodecs
()
->
setData
(
idx
,
item
->
checkState
(),
Qt
::
CheckStateRole
);
Qt
::
CheckStateRole
);
codecModelModified
=
true
;
}
}
void
void
...
@@ -257,7 +251,6 @@ AccountDetails::on_upAudioButton_clicked()
...
@@ -257,7 +251,6 @@ AccountDetails::on_upAudioButton_clicked()
{
{
codecModel_
->
moveUp
();
codecModel_
->
moveUp
();
reloadCodec
(
CodecType
::
AUDIO
);
reloadCodec
(
CodecType
::
AUDIO
);
codecModelModified
=
true
;
}
}
void
void
...
@@ -265,7 +258,6 @@ AccountDetails::on_downAudioButton_clicked()
...
@@ -265,7 +258,6 @@ AccountDetails::on_downAudioButton_clicked()
{
{
codecModel_
->
moveDown
();
codecModel_
->
moveDown
();
reloadCodec
(
CodecType
::
AUDIO
);
reloadCodec
(
CodecType
::
AUDIO
);
codecModelModified
=
true
;
}
}
void
void
...
@@ -273,7 +265,6 @@ AccountDetails::on_upVideoButton_clicked()
...
@@ -273,7 +265,6 @@ AccountDetails::on_upVideoButton_clicked()
{
{
codecModel_
->
moveUp
();
codecModel_
->
moveUp
();
reloadCodec
(
CodecType
::
VIDEO
);
reloadCodec
(
CodecType
::
VIDEO
);
codecModelModified
=
true
;
}
}
void
void
...
@@ -281,7 +272,6 @@ AccountDetails::on_downVideoButton_clicked()
...
@@ -281,7 +272,6 @@ AccountDetails::on_downVideoButton_clicked()
{
{
codecModel_
->
moveDown
();
codecModel_
->
moveDown
();
reloadCodec
(
CodecType
::
VIDEO
);
reloadCodec
(
CodecType
::
VIDEO
);
codecModelModified
=
true
;
}
}
void
void
...
@@ -306,8 +296,7 @@ AccountDetails::on_videoCodecView_itemSelectionChanged()
...
@@ -306,8 +296,7 @@ AccountDetails::on_videoCodecView_itemSelectionChanged()
void
void
AccountDetails
::
save
()
{
AccountDetails
::
save
()
{
if
(
codecModelModified
)
codecModel_
->
performAction
(
CodecModel
::
EditAction
::
SAVE
);
codecModel_
->
save
();
}
}
void
void
...
...
This diff is collapsed.
Click to expand it.
accountdetails.h
+
0
−
1
View file @
2d03da46
...
@@ -67,7 +67,6 @@ private:
...
@@ -67,7 +67,6 @@ private:
Ui
::
AccountDetails
*
ui
;
Ui
::
AccountDetails
*
ui
;
CodecModel
*
codecModel_
;
CodecModel
*
codecModel_
;
Account
*
currentAccount_
;
Account
*
currentAccount_
;
bool
codecModelModified
;
typedef
void
(
Account
::*
ACC_PTR
)(
const
QString
&
);
typedef
void
(
Account
::*
ACC_PTR
)(
const
QString
&
);
QMap
<
QString
,
ACC_PTR
>
certMap_
;
QMap
<
QString
,
ACC_PTR
>
certMap_
;
...
...
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