Skip to content
GitLab
Explorer
Connexion
Navigation principale
Rechercher ou aller à…
Projet
Vivy
Gestion
Activité
Membres
Labels
Programmation
Tickets
Tableaux des tickets
Jalons
Wiki
Wiki externe
Code
Requêtes de fusion
Dépôt
Branches
Validations
Étiquettes
Graphe du dépôt
Comparer les révisions
Compilation
Pipelines
Jobs
Planifications de pipeline
Artéfacts
Aide
Aide
Support
Documentation de GitLab
Comparer les forfaits GitLab
Forum de la communauté
Contribuer à GitLab
Donner votre avis
Raccourcis clavier
?
Extraits de code
Groupes
Projets
Afficher davantage de fils d'Ariane
Elliu
Vivy
Validations
be66180b
Vérifiée
Valider
be66180b
rédigé
3 years ago
par
Kubat
Parcourir les fichiers
Options
Téléchargements
Correctifs
Plain Diff
UI: Avoid memory leaks on reload of sub documents
parent
c5dcabdd
Aucune branche associée trouvée
Branches contenant la validation
Aucune étiquette associée trouvée
1 requête de fusion
!18
Implement the VivyDocument specification
Modifications
3
Masquer les modifications d'espaces
En ligne
Côte à côte
Affichage de
3 fichiers modifiés
src/UI/Utils.cc
+13
-0
13 ajouts, 0 suppression
src/UI/Utils.cc
src/UI/Utils.hh
+3
-0
3 ajouts, 0 suppression
src/UI/Utils.hh
src/UI/VivyDocumentView.cc
+54
-55
54 ajouts, 55 suppressions
src/UI/VivyDocumentView.cc
avec
70 ajouts
et
55 suppressions
src/UI/Utils.cc
+
13
−
0
Voir le fichier @
be66180b
...
...
@@ -9,3 +9,16 @@ Utils::setTransparentBackgroundForWidget(QWidget *const w) noexcept
w
->
setAttribute
(
Qt
::
WA_TranslucentBackground
);
w
->
setAttribute
(
Qt
::
WA_TransparentForMouseEvents
);
}
const
QString
Utils
::
untouchedTabIndicator
=
QStringLiteral
(
"(*)"
);
const
QString
Utils
::
unsavedTabIndicator
=
QStringLiteral
(
"(+)"
);
void
Utils
::
deleteInternalWidget
(
QDockWidget
*
const
dock
)
noexcept
{
QWidget
*
widget
=
dock
->
widget
();
if
(
widget
!=
nullptr
)
{
delete
widget
;
dock
->
setWidget
(
nullptr
);
}
}
Ce diff est replié.
Cliquez pour l'agrandir.
src/UI/Utils.hh
+
3
−
0
Voir le fichier @
be66180b
...
...
@@ -11,4 +11,7 @@ class QWidget;
namespace
Vivy
::
Utils
{
void
setTransparentBackgroundForWidget
(
QWidget
*
const
)
noexcept
;
void
deleteInternalWidget
(
QDockWidget
*
const
)
noexcept
;
extern
const
QString
untouchedTabIndicator
;
extern
const
QString
unsavedTabIndicator
;
}
Ce diff est replié.
Cliquez pour l'agrandir.
src/UI/VivyDocumentView.cc
+
54
−
55
Voir le fichier @
be66180b
...
...
@@ -52,9 +52,9 @@ VivyDocumentView::getDocument() const noexcept
QString
VivyDocumentView
::
getDocumentTabName
()
const
noexcept
{
return
QString
::
fromUtf8
(
document
->
checkDocumentOption
(
VivyDocument
::
U
ntouched
ByDefault
)
?
"(*) "
:
""
)
+
Utils
::
getBaseName
(
document
->
getName
());
return
document
->
checkDocumentOption
(
VivyDocument
::
UntouchedByDefault
)
?
(
Utils
::
u
ntouched
TabIndicator
+
" "
)
:
QString
::
fromUtf8
(
""
)
+
Utils
::
getBaseName
(
document
->
getName
());
}
QString
...
...
@@ -74,73 +74,70 @@ VivyDocumentView::getDocumentTabToolTip() const noexcept
void
VivyDocumentView
::
loadVideoView
()
noexcept
{
if
(
document
->
checkDocumentCapabilities
(
VivyDocument
::
Capabilities
::
VideoAble
))
{
if
(
!
videoView
)
{
videoView
=
new
UnclosableDockWidget
(
"Video View"
,
this
);
videoView
->
setAllowedAreas
(
Qt
::
AllDockWidgetAreas
);
videoView
->
setFeatures
(
allDockFeatures
);
addDockWidget
(
Qt
::
BottomDockWidgetArea
,
videoView
,
Qt
::
Vertical
);
}
// Kubat: because the dock is "closable", when closed the widget itself
// is not deleted, it will be hidden and the content will be deleted.
// TODO: Check if it works on more platforms.
videoView
->
setWidget
(
new
VideoView
(
videoView
));
qobject_cast
<
VideoView
*>
(
videoView
->
widget
())
->
loadFile
(
document
->
getVideoSubDocument
()
->
getFilePath
());
if
(
!
document
->
checkDocumentCapabilities
(
VivyDocument
::
Capabilities
::
VideoAble
))
return
;
if
(
!
videoView
)
{
videoView
=
new
UnclosableDockWidget
(
"Video View"
,
this
);
videoView
->
setAllowedAreas
(
Qt
::
AllDockWidgetAreas
);
videoView
->
setFeatures
(
allDockFeatures
);
addDockWidget
(
Qt
::
BottomDockWidgetArea
,
videoView
,
Qt
::
Vertical
);
}
Utils
::
deleteInternalWidget
(
videoView
);
videoView
->
setWidget
(
new
VideoView
(
videoView
));
qobject_cast
<
VideoView
*>
(
videoView
->
widget
())
->
loadFile
(
document
->
getVideoSubDocument
()
->
getFilePath
());
}
void
VivyDocumentView
::
loadAssView
()
noexcept
{
if
(
document
->
checkDocumentCapabilities
(
VivyDocument
::
Capabilities
::
AssAble
))
{
if
(
!
assLines
)
{
assLines
=
new
UnclosableDockWidget
(
"ASS Lines"
,
this
);
assLines
->
setFeatures
(
onlyClosableDockFeatures
);
assLines
->
setAllowedAreas
(
Qt
::
LeftDockWidgetArea
|
Qt
::
RightDockWidgetArea
|
Qt
::
BottomDockWidgetArea
);
addDockWidget
(
Qt
::
BottomDockWidgetArea
,
assLines
,
Qt
::
Vertical
);
}
assModel
.
reset
(
new
AssLinesModel
(
document
->
getAssSubDocument
()
->
getLines
()));
assLines
->
setWidget
(
new
AssLinesView
(
assModel
.
get
(),
assLines
));
if
(
!
document
->
checkDocumentCapabilities
(
VivyDocument
::
Capabilities
::
AssAble
))
return
;
if
(
!
assLines
)
{
assLines
=
new
UnclosableDockWidget
(
"ASS Lines"
,
this
);
assLines
->
setFeatures
(
onlyClosableDockFeatures
);
assLines
->
setAllowedAreas
(
Qt
::
LeftDockWidgetArea
|
Qt
::
RightDockWidgetArea
|
Qt
::
BottomDockWidgetArea
);
addDockWidget
(
Qt
::
BottomDockWidgetArea
,
assLines
,
Qt
::
Vertical
);
}
assModel
.
reset
(
new
AssLinesModel
(
document
->
getAssSubDocument
()
->
getLines
()));
Utils
::
deleteInternalWidget
(
assLines
);
assLines
->
setWidget
(
new
AssLinesView
(
assModel
.
get
(),
assLines
));
}
void
VivyDocumentView
::
loadAudioView
()
noexcept
{
if
(
document
->
checkDocumentCapabilities
(
VivyDocument
::
AudioAble
))
{
std
::
shared_ptr
<
AudioSubDocument
>
audioDocument
=
document
->
getAudioSubDocument
();
qDebug
()
<<
"Create an audio vizualizer for the audio sub document"
<<
audioDocument
->
getFilePath
();
AudioContext
::
StreamPtr
stream
=
audioDocument
->
getDefaultStream
();
if
(
stream
==
nullptr
)
{
qCritical
()
<<
"Failed to get default audio stream"
;
return
;
}
if
(
!
visualizer
)
{
visualizer
=
new
UnclosableDockWidget
(
"Visualizer"
,
this
);
visualizer
->
setSizePolicy
(
QSizePolicy
::
Ignored
,
QSizePolicy
::
Minimum
);
visualizer
->
setAllowedAreas
(
Qt
::
LeftDockWidgetArea
|
Qt
::
TopDockWidgetArea
|
Qt
::
BottomDockWidgetArea
);
visualizer
->
setFeatures
(
onlyClosableDockFeatures
);
addDockWidget
(
Qt
::
LeftDockWidgetArea
,
visualizer
,
Qt
::
Horizontal
);
}
// Kubat: don't check, may throw an error but don't think we can
// recover from it.
AudioVisualizer
*
visualizerInner
=
new
AudioVisualizer
(
stream
,
visualizer
);
visualizer
->
setWidget
(
visualizerInner
);
visualizer
->
layout
()
->
setAlignment
(
visualizerInner
,
Qt
::
AlignTop
);
if
(
!
document
->
checkDocumentCapabilities
(
VivyDocument
::
AudioAble
))
return
;
std
::
shared_ptr
<
AudioSubDocument
>
audioDocument
=
document
->
getAudioSubDocument
();
AudioContext
::
StreamPtr
stream
=
audioDocument
->
getDefaultStream
();
if
(
stream
==
nullptr
)
{
qCritical
()
<<
"Failed to get default audio stream"
;
return
;
}
else
{
qDebug
()
<<
"The document"
<<
document
->
getName
()
<<
"is not AudioAble"
;
if
(
!
visualizer
)
{
visualizer
=
new
UnclosableDockWidget
(
"Visualizer"
,
this
);
visualizer
->
setSizePolicy
(
QSizePolicy
::
Ignored
,
QSizePolicy
::
Minimum
);
visualizer
->
setAllowedAreas
(
Qt
::
LeftDockWidgetArea
|
Qt
::
TopDockWidgetArea
|
Qt
::
BottomDockWidgetArea
);
visualizer
->
setFeatures
(
onlyClosableDockFeatures
);
addDockWidget
(
Qt
::
LeftDockWidgetArea
,
visualizer
,
Qt
::
Horizontal
);
}
// Kubat: don't check, may throw an error but don't think we can
// recover from it.
AudioVisualizer
*
visualizerInner
=
new
AudioVisualizer
(
stream
,
visualizer
);
Utils
::
deleteInternalWidget
(
visualizer
);
visualizer
->
setWidget
(
visualizerInner
);
visualizer
->
layout
()
->
setAlignment
(
visualizerInner
,
Qt
::
AlignTop
);
}
void
...
...
@@ -150,6 +147,8 @@ VivyDocumentView::closeDocument() noexcept
<<
document
.
use_count
()
<<
")"
;
vivyApp
->
documentStore
.
closeDocument
(
document
->
getUuid
());
TODO
(
Force
close
all
floating
docks
)
// Kubat: the visualizer pointer should have been deleted by the
// deleteAllContent() call if it was created.
deleteAllContent
();
...
...
Ce diff est replié.
Cliquez pour l'agrandir.
Aperçu
0%
Chargement en cours
Veuillez réessayer
ou
joindre un nouveau fichier
.
Annuler
You are about to add
0
people
to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Enregistrer le commentaire
Annuler
Veuillez vous
inscrire
ou vous
se connecter
pour commenter