From 0fe449eb1cfb5eb6252b59fc96dea980ddea96bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?D=C3=ADaz=20Urbaneja=20V=C3=ADctor=20Diego=20Alejandro=20?= =?UTF-8?q?=28Sodomon=29?= Date: Tue, 21 Nov 2023 03:33:46 -0400 Subject: [PATCH] Bump v3.0 fixed toolbar(next, prev) buttons --- components/SODPlayer-toolbar.lua | 4 +- data/player.ui | 637 +++++++++++++++---------------- meson.build | 4 +- 3 files changed, 315 insertions(+), 330 deletions(-) diff --git a/components/SODPlayer-toolbar.lua b/components/SODPlayer-toolbar.lua index cccfa26..cf180c1 100644 --- a/components/SODPlayer-toolbar.lua +++ b/components/SODPlayer-toolbar.lua @@ -30,11 +30,11 @@ function ui.btn_toolbar_preferences:on_clicked() end function ui.btn_toolbar_next:on_clicked() - next_state() + next_state(15) end function ui.btn_toolbar_prev:on_clicked() - prev_state() + prev_state(15) end function ui.btn_toolbar_close:on_clicked() diff --git a/data/player.ui b/data/player.ui index 34f07a6..2216f1d 100644 --- a/data/player.ui +++ b/data/player.ui @@ -1,17 +1,17 @@ - + - False - dialog - SODPlayer - 2.0 + False + dialog + SODPlayer + 3.0 Copyright © 2020-2021 Diaz Urbaneja Victor Diego Alejandro (Sodomon) A lua-based video playing software made with GTK and GStreamer https://github.com/sodomon2/SODPlayer - Github + Github zlib License /* zlib.h -- interface of the 'zlib' general purpose compression library @@ -41,18 +41,15 @@ */ Díaz Urbaneja Víctor Diego Alejandro(Sodomon) <sodomon2@gmail.com> images/sodplayer.svg - - - - False + False vertical 2 - False - end + False + end False @@ -67,28 +64,25 @@ - False + False Clear Recents False - dialog - - - + dialog - False + False vertical 2 - False - end + False + end Delete True - True - True + True + True True @@ -100,8 +94,8 @@ Cancel True - True - True + True + True True @@ -119,14 +113,14 @@ True - False + False vertical - 100 - 80 + 100 + 80 True - False + False ¿Clear Recents? @@ -142,8 +136,8 @@ True - False - 3 + False + 3 Delete the list of recent files? @@ -163,29 +157,26 @@ - False + False SODPlayer - Enter URL False - center - dialog - - - + center + dialog - False + False vertical 2 - False - end + False + end Ok True - True - True + True + True True @@ -197,8 +188,8 @@ Cancel True - True - True + True + True True @@ -216,15 +207,15 @@ True - False + False True - False - 5 - 5 - 5 - 5 + False + 5 + 5 + 5 + 5 gtk-connect @@ -235,12 +226,12 @@ - 100 + 100 True - False - 5 - 5 - 5 + False + 5 + 5 + 5 URL: @@ -251,13 +242,13 @@ - 300 + 300 True - True - 5 - 5 - 5 - 5 + True + 5 + 5 + 5 + 5 False @@ -277,17 +268,17 @@ True - False + False gtk-about True - False + False gtk-open True - False + False gtk-preferences @@ -308,51 +299,48 @@ 100 - 1 - 10 + 1 + 10 100 100 - 1 - 10 + 1 + 10 - False + False SODPlayer - center + center images/sodplayer.svg center - - - True - False + False vertical True - False + False True - False + False _File - True + True True - False + False _File True - False - True + False + True img_file - False + False @@ -362,21 +350,21 @@ True - False + False _Subtitles - True + True True - False + False gtk-open True - False - True - True - True + False + True + True + True @@ -386,29 +374,29 @@ True - False + False Options - True + True True - False + False Preferences True - False + False img_preferences - False - True + False + True True - False + False _Show icon in system tray - True + True @@ -418,21 +406,21 @@ True - False + False Hel_p - True + True True - False + False _About SODPlayer True - False - True + False + True img_about - False + False @@ -449,16 +437,16 @@ True - False - False + False + False True - True - Open File + True + Open File Open - True - gtk-open + True + gtk-open @@ -469,11 +457,11 @@ True - True - Open From URL + True + Open From URL URL... - True - gtk-connect + True + gtk-connect @@ -484,11 +472,11 @@ True - True - Preferences + True + Preferences Preferences - True - gtk-preferences + True + gtk-preferences @@ -499,11 +487,11 @@ True - True - Prev + True + Prev Prev - True - media-skip-backward + True + media-skip-backward False @@ -513,11 +501,11 @@ True - True - Next + True + Next Next - True - media-skip-forward + True + media-skip-forward False @@ -527,11 +515,11 @@ True - True - Quit SODPlayer + True + Quit SODPlayer Quit SODPlayer - True - gtk-quit + True + gtk-quit @@ -549,7 +537,7 @@ True - False + False True @@ -560,108 +548,35 @@ True - False - none - True + False + none + True True - False - - - btnPrev - True - False - True - none - - - True - False - media-skip-backward - - - - - - - btnPlay - True - False - True - none - - - True - False - media-playback-start - - - - - 1 - - - - - btnStop - True - False - True - none - - - True - False - media-playback-stop - - - - - 2 - - - - - btnNext - True - False - True - none - - - True - False - media-skip-forward - - - - - 3 - - + False True - False + False baseline - 10 - 10 - 10 - 10 + 10 + 10 + 10 + 10 True False vertical True - False - 5 + False + 5 10 True - False + False 0:00 @@ -673,12 +588,12 @@ True - False + False media_player_control - False - 100 + False + 100 0 - False + False True @@ -689,7 +604,7 @@ True - False + False 0:00 @@ -710,32 +625,105 @@ -1 + + + btnPrev + True + False + True + none + + + True + False + media-skip-backward + + + + + + + btnPlay + True + False + True + none + + + True + False + media-playback-start + + + + + 1 + + + + + btnStop + True + False + True + none + + + True + False + media-playback-stop + + + + + 2 + + + + + btnNext + True + False + True + none + + + True + False + media-skip-forward + + + + + 3 + + btnNext True - True - True + True + True none True - False - gtk-fullscreen + False + gtk-fullscreen - end + end 4 True - False - False - True + False + False + True none vertical media_volume_control @@ -745,8 +733,8 @@ audio-volume-low-symbolic audio-volume-medium-symbolic - True - True + True + True center center none @@ -754,8 +742,8 @@ audio-volume-medium-symbolic - True - True + True + True center center none @@ -763,7 +751,7 @@ audio-volume-medium-symbolic - end + end 5 @@ -781,42 +769,39 @@ audio-volume-medium-symbolic 100 - 1 - 10 + 1 + 10 images/sodplayer.svg False - SODPlayer + SODPlayer SODPlayer 50 - 1 - 10 + 1 + 10 - False + False SODPlayer - Preferences - dialog - - - + dialog - False + False vertical 2 - False - end + False + end Apply True - True - True + True + True False @@ -828,8 +813,8 @@ audio-volume-medium-symbolic Ok True - True - True + True + True False @@ -841,8 +826,8 @@ audio-volume-medium-symbolic Cancel True - True - True + True + True False @@ -860,17 +845,17 @@ audio-volume-medium-symbolic True - True + True - 200 + 200 True - False + False vertical True - False + False stack_preferences @@ -888,19 +873,19 @@ audio-volume-medium-symbolic True - False - slide-left-right + False + slide-left-right True - False + False Confirm delete of recent True - True - False - True + True + False + True 5 @@ -916,37 +901,37 @@ audio-volume-medium-symbolic True - True + True True - False + False vertical True - False - 0 - out + False + 0 + out True - False - 12 + False + 12 True - False + False True - False + False True - False - 5 - 3 + False + 5 + 3 Language : @@ -958,7 +943,7 @@ audio-volume-medium-symbolic True - False + False <System Languaje> spanish @@ -981,10 +966,10 @@ audio-volume-medium-symbolic Show toolbar True - True - False - False - True + True + False + False + True 3 @@ -995,10 +980,10 @@ audio-volume-medium-symbolic Paused When Minimized True - True - False - False - True + True + False + False + True 3 @@ -1008,7 +993,7 @@ audio-volume-medium-symbolic True - False + False 3 @@ -1022,7 +1007,7 @@ audio-volume-medium-symbolic True - False + False main window : @@ -1038,45 +1023,45 @@ audio-volume-medium-symbolic True - False + False Interface - False + False True - False + False vertical True - False - 0 - out + False + 0 + out True - False - 12 + False + 12 True - False + False vertical True - False + False True True - False - 3 - 3 + False + 3 + 3 Max. Items @@ -1088,9 +1073,9 @@ audio-volume-medium-symbolic True - True - 3 - 0 + True + 3 + 0 0 recents_spin_control @@ -1114,7 +1099,7 @@ audio-volume-medium-symbolic True - False + False Recents : @@ -1128,30 +1113,30 @@ audio-volume-medium-symbolic True - False - 0 - out + False + 0 + out True - False - 12 + False + 12 True - False + False vertical True - False + False True True - False - 3 - 3 + False + 3 + 3 Max. Items @@ -1163,9 +1148,9 @@ audio-volume-medium-symbolic True - True - 3 - 0 + True + 3 + 0 0 url_spin_control @@ -1189,7 +1174,7 @@ audio-volume-medium-symbolic True - False + False URL : @@ -1204,13 +1189,13 @@ audio-volume-medium-symbolic Delete Recents True - True - True + True + True start - 3 - 3 - 3 - 3 + 3 + 3 + 3 + 3 False @@ -1226,18 +1211,18 @@ audio-volume-medium-symbolic True - False + False Recents 1 - False + False True - False + False @TODO @@ -1247,12 +1232,12 @@ audio-volume-medium-symbolic True - False + False @TODO 2 - False + False @@ -1265,7 +1250,7 @@ audio-volume-medium-symbolic True - False + False es-es diff --git a/meson.build b/meson.build index 601f049..4092726 100644 --- a/meson.build +++ b/meson.build @@ -1,4 +1,4 @@ -project('SODPlayer', 'c' , version: '2.0') +project('SODPlayer', 'c' , version: '3.0') add_project_arguments( '-DGETTEXT_PACKAGE="@0@"'.format(meson.project_name()), @@ -36,4 +36,4 @@ configure_file ( subdir('components') subdir('lib') subdir('po') -subdir('data') \ No newline at end of file +subdir('data')