Skip to content

Commit

Permalink
Add subtitle support
Browse files Browse the repository at this point in the history
  • Loading branch information
3unjee committed Apr 19, 2019
1 parent 2e3d166 commit aaba5e7
Show file tree
Hide file tree
Showing 17 changed files with 701 additions and 183 deletions.
4 changes: 3 additions & 1 deletion MotionBox.pro
Expand Up @@ -87,7 +87,7 @@ OTHER_FILES += configure.sh \
content/PanelRelated.qml \ content/PanelRelated.qml \
content/PanelCover.qml \ content/PanelCover.qml \
content/PanelSettings.qml \ content/PanelSettings.qml \
content/PanelShare.qml \ content/PanelGet.qml \
content/PanelAdd.qml \ content/PanelAdd.qml \
content/PanelPreview.qml \ content/PanelPreview.qml \
content/BarWindowApplication.qml \ content/BarWindowApplication.qml \
Expand Down Expand Up @@ -117,6 +117,8 @@ OTHER_FILES += configure.sh \
content/PageAboutText.qml \ content/PageAboutText.qml \
content/PageAboutMessage.qml \ content/PageAboutMessage.qml \
content/PageAboutCredits.qml \ content/PageAboutCredits.qml \
content/PageSubtitles.qml \
content/PageSubtitlesSearch.qml \
dist/MotionBox.rc \ dist/MotionBox.rc \
dist/qrc.sh \ dist/qrc.sh \
dist/doc/readme.md \ dist/doc/readme.md \
Expand Down
4 changes: 2 additions & 2 deletions content/AreaContextualApplication.qml
Expand Up @@ -624,15 +624,15 @@ AreaContextual
{ {
listContextual.setCurrentId(0); listContextual.setCurrentId(0);


var path = core.openFile("Select File"); var path = core.openFile(qsTr("Select File"));


panelBrowse.browse(path); panelBrowse.browse(path);
} }
else if (id == 1) // Open Folder else if (id == 1) // Open Folder
{ {
listContextual.setCurrentId(1); listContextual.setCurrentId(1);


/* var */ path = core.openFolder("Select Folder"); /* var */ path = core.openFolder(qsTr("Select Folder"));


panelBrowse.browse(path); panelBrowse.browse(path);
} }
Expand Down
4 changes: 2 additions & 2 deletions content/BarControls.qml
Expand Up @@ -403,12 +403,12 @@ MouseArea
width: st.dp44 width: st.dp44


checkable: true checkable: true
checked : panelShare.isExposed checked : panelGet.isExposed


icon : st.icon24x24_share icon : st.icon24x24_share
iconSourceSize: st.size24x24 iconSourceSize: st.size24x24


onPressed: panelShare.toggleExpose() onPressed: panelGet.toggleExpose()
} }


ButtonPushIcon ButtonPushIcon
Expand Down
18 changes: 9 additions & 9 deletions content/Gui.qml
Expand Up @@ -882,9 +882,9 @@ Item


return; return;
} }
else if (panelShare.isExposed) else if (panelGet.isExposed)
{ {
panelShare.collapse(); panelGet.collapse();


return; return;
} }
Expand Down Expand Up @@ -1008,7 +1008,7 @@ Item
if (buttonAdd.checked || actionCue.tryPush(actionAddShow)) return; if (buttonAdd.checked || actionCue.tryPush(actionAddShow)) return;


panelSettings.collapse(); panelSettings.collapse();
panelShare .collapse(); panelGet .collapse();


playlistTemp.clearTracks(); playlistTemp.clearTracks();


Expand Down Expand Up @@ -1470,7 +1470,7 @@ Item
panelApplication.collapse(); panelApplication.collapse();


panelSettings.collapse(); panelSettings.collapse();
panelShare .collapse(); panelGet .collapse();


panelDiscover.collapse(); panelDiscover.collapse();


Expand Down Expand Up @@ -3145,9 +3145,9 @@ Item
{ {
panelSettings.collapse(); panelSettings.collapse();
} }
else if (panelShare.isExposed) else if (panelGet.isExposed)
{ {
panelShare.collapse(); panelGet.collapse();
} }
else if (panelDiscover.isExposed) else if (panelDiscover.isExposed)
{ {
Expand Down Expand Up @@ -3554,8 +3554,8 @@ Item
else if (id == actionSettingsExpose) panelSettings.expose (); else if (id == actionSettingsExpose) panelSettings.expose ();
else if (id == actionSettingsCollapse) panelSettings.collapse(); else if (id == actionSettingsCollapse) panelSettings.collapse();


else if (id == actionShareExpose) panelShare.expose (); else if (id == actionShareExpose) panelGet.expose ();
else if (id == actionShareCollapse) panelShare.collapse(); else if (id == actionShareCollapse) panelGet.collapse();


else if (id == actionSearchExpose) lineEditSearch.focus(); else if (id == actionSearchExpose) lineEditSearch.focus();


Expand Down Expand Up @@ -3645,7 +3645,7 @@ Item


PanelDiscover { id: panelDiscover } PanelDiscover { id: panelDiscover }


PanelShare { id: panelShare } PanelGet { id: panelGet }


PanelSettings { id: panelSettings } PanelSettings { id: panelSettings }


Expand Down

0 comments on commit aaba5e7

Please sign in to comment.