diff --git a/veejay-current/veejay-client/share/gveejay.reloaded.glade b/veejay-current/veejay-client/share/gveejay.reloaded.glade index 74086e39..c95196ff 100644 --- a/veejay-current/veejay-client/share/gveejay.reloaded.glade +++ b/veejay-current/veejay-client/share/gveejay.reloaded.glade @@ -4121,354 +4121,367 @@ - + True - 0 - 0.5 - GTK_SHADOW_NONE + False + 0 - + True - 0.5 - 0.5 - 1 - 1 - 0 - 0 - 0 - 0 + 0 + 0.5 + GTK_SHADOW_NONE - + True - False - 0 + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 0 + 0 - + True False 0 - + True False 0 - + True - True - GTK_RELIEF_NORMAL - True - + False + 0 - + True - button_gotostart.png - 0.5 - 0.5 - 0 - 0 + True + GTK_RELIEF_NORMAL + True + + + + + True + button_gotostart.png + 0.5 + 0.5 + 0 + 0 + + + + 0 + False + False + + + + + + True + True + GTK_RELIEF_NORMAL + True + + + + + True + button_reverse.png + 0.5 + 0.5 + 0 + 0 + + + + + 0 + False + False + + + + + + True + True + GTK_RELIEF_NORMAL + True + + + + + True + button_pause.png + 0.5 + 0.5 + 0 + 0 + + + + + 0 + False + False + + + + + + True + True + GTK_RELIEF_NORMAL + True + + + + + True + button_play.png + 0.5 + 0.5 + 0 + 0 + + + + + 0 + False + False + + + + + + True + True + GTK_RELIEF_NORMAL + True + + + + + True + button_skip.png + 0.5 + 0.5 + 0 + 0 + + + + + 0 + False + False + 0 False - False + True - + True - True - GTK_RELIEF_NORMAL - True - + False + 0 - + True - button_reverse.png - 0.5 - 0.5 - 0 - 0 + True + GTK_RELIEF_NORMAL + True + + + + + True + button_gotoend.png + 0.5 + 0.5 + 0 + 0 + + + + 0 + False + False + + + + + + True + True + GTK_RELIEF_NORMAL + True + + + + + True + button_dec.png + 0.5 + 0.5 + 0 + 0 + + + + + 0 + False + False + + + + + + True + True + GTK_RELIEF_NORMAL + True + + + + + True + button_inc.png + 0.5 + 0.5 + 0 + 0 + + + + + 0 + False + False + + + + + + True + True + GTK_RELIEF_NORMAL + True + + + + + True + button_prev.png + 0.5 + 0.5 + 0 + 0 + + + + + 0 + False + False + 0 False - False - - - - - - True - True - GTK_RELIEF_NORMAL - True - - - - - True - button_pause.png - 0.5 - 0.5 - 0 - 0 - - - - - 0 - False - False - - - - - - True - True - GTK_RELIEF_NORMAL - True - - - - - True - button_play.png - 0.5 - 0.5 - 0 - 0 - - - - - 0 - False - False - - - - - - True - True - GTK_RELIEF_NORMAL - True - - - - - True - button_skip.png - 0.5 - 0.5 - 0 - 0 - - - - - 0 - False - False + True 0 - False - True - - - - - - True - False - 0 - - - - True - True - GTK_RELIEF_NORMAL - True - - - - - True - button_gotoend.png - 0.5 - 0.5 - 0 - 0 - - - - - 0 - False - False - - - - - - True - True - GTK_RELIEF_NORMAL - True - - - - - True - button_dec.png - 0.5 - 0.5 - 0 - 0 - - - - - 0 - False - False - - - - - - True - True - GTK_RELIEF_NORMAL - True - - - - - True - button_inc.png - 0.5 - 0.5 - 0 - 0 - - - - - 0 - False - False - - - - - - True - True - GTK_RELIEF_NORMAL - True - - - - - True - button_prev.png - 0.5 - 0.5 - 0 - 0 - - - - - 0 - False - False - - - - - 0 - False + True True - - 0 - True - True - - - - - - True - sync start! - True - GTK_RELIEF_NORMAL - True - - - - - True - sync.png - 0.5 - 0.5 - 0 - 0 - - - - - 0 - False - False - + + + + True + <b>Sync controls</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + label_item + + + + 0 + True + True + - + True - <b>Sync controls</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 + sync start! + True + GTK_RELIEF_NORMAL + True + + + + + True + sync.png + 0.5 + 0.5 + 0 + 0 + + - label_item + 0 + False + False @@ -4529,367 +4542,367 @@ 0 - + True - 0 - 0.5 - GTK_SHADOW_NONE + False + 0 - + True - False - 0 + 0 + 0.5 + GTK_SHADOW_NONE - + True - 0.5 - 0.5 - 1 - 1 - 0 - 0 - 12 - 0 + False + 0 - - True - False - 0 - - - - True - New SRT Sequence - True - GTK_RELIEF_NORMAL - True - - - - - True - 0.5 - 0.5 - 0 - 0 - 0 - 0 - 0 - 0 - - - - True - False - 2 - - - - True - button_text.png - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - True - - True - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - - - - 0 - False - False - - - - - - 25 - True - 1 -2 -3 -4 -5 - False - True - True - - - - 0 - True - True - - - - - - - 0 - True - True - - - - - - True - 0 - 0.5 - GTK_SHADOW_NONE - - - + True 0.5 0.5 1 1 - 6 + 0 0 12 0 - + True False 0 - + True - True - 0 + New SRT Sequence + True + GTK_RELIEF_NORMAL + True + - + True - Delete this SRT Sequence - True - GTK_RELIEF_NORMAL - True - + 0.5 + 0.5 + 0 + 0 + 0 + 0 + 0 + 0 - + True - button_skull.png - 0.5 - 0.5 - 0 - 0 - - - - - 0 - True - True - - - - - - True - Apply Text and Start/End position - True - GTK_RELIEF_NORMAL - True - - - - - True - icon_apply.png - 0.5 - 0.5 - 0 - 0 - - - - - 0 - True - True - - - - - - True - Load SRT file - True - GTK_RELIEF_NORMAL - True - - - - - True - 0.5 - 0.5 - 0 - 0 - 0 - 0 - 0 - 0 + False + 2 - + True - False - 2 - - - - True - icon_open.png - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - + button_text.png + 0.5 + 0.5 + 0 + 0 + + 0 + False + False + + + + + + True + + True + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + - - 0 - True - True - - - - - - True - Save SRT file - True - GTK_RELIEF_NORMAL - True - - - - - True - icon_save.png - 0.5 - 0.5 - 0 - 0 - - - - - 0 - True - True - 0 False + False + + + + + + 25 + True + 1 +2 +3 +4 +5 + False + True + True + + + + 0 + True True + + 0 + True + True + + + + + + True + 0 + 0.5 + GTK_SHADOW_NONE + + + + True + 0.5 + 0.5 + 1 + 1 + 6 + 0 + 12 + 0 + + + + True + False + 0 + + + + True + True + 0 + + + + True + Delete this SRT Sequence + True + GTK_RELIEF_NORMAL + True + + + + + True + button_skull.png + 0.5 + 0.5 + 0 + 0 + + + + + 0 + True + True + + + + + + True + Apply Text and Start/End position + True + GTK_RELIEF_NORMAL + True + + + + + True + icon_apply.png + 0.5 + 0.5 + 0 + 0 + + + + + 0 + True + True + + + + + + True + Load SRT file + True + GTK_RELIEF_NORMAL + True + + + + + True + 0.5 + 0.5 + 0 + 0 + 0 + 0 + 0 + 0 + + + + True + False + 2 + + + + True + icon_open.png + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + + + + 0 + True + True + + + + + + True + Save SRT file + True + GTK_RELIEF_NORMAL + True + + + + + True + icon_save.png + 0.5 + 0.5 + 0 + 0 + + + + + 0 + True + True + + + + + 0 + False + True + + + + + + + + + 0 + False + False + GTK_PACK_END + + + + + + True + Select a SRT sequence or create new + False + True + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + - 0 - False - False - GTK_PACK_END + label_item - - - - - True - Select a SRT sequence or create new - False - True - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - label_item + 0 + True + True - - - 18 - False - True - - - - - - True - False - 0 @@ -5229,7 +5242,7 @@ - 0 + 5 False True @@ -5550,7 +5563,7 @@ - 0 + 5 False True @@ -5577,7 +5590,7 @@ 0.5 1 1 - 0 + 5 0 12 0 @@ -14372,11 +14385,11 @@ MLZO - GVeejay Reloaded - Preferences + Preferences GTK_WINDOW_TOPLEVEL GTK_WIN_POS_CENTER_ON_PARENT - True - True + False + False False True False @@ -14448,164 +14461,178 @@ MLZO 0 - + True - 2 - 4 - False - 2 - 5 + 0.5 + 0.5 + 1 + 1 + 2 + 20 + 0 + 0 - + True - Width - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 0 - 1 - fill - - - + 2 + 4 + True + 2 + 5 - - - True - Image format - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 2 - 1 - 2 - fill - - - + + + True + Width + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 0 + 1 + fill + + + - - - True - Height - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 2 - 3 - 0 - 1 - - - - + + + True + Image format + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 2 + 1 + 2 + fill + + + - - - True - True - 1 - 0 - False - GTK_UPDATE_ALWAYS - False - False - 0 0 4096 1 10 10 - - - 1 - 2 - 0 - 1 - fill - - - + + + True + Height + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 2 + 3 + 0 + 1 + + + + - - - True - True - 1 - 0 - False - GTK_UPDATE_ALWAYS - False - False - 0 0 4096 1 10 10 - - - 3 - 4 - 0 - 1 - fill - - - + + + True + True + 1 + 0 + False + GTK_UPDATE_ALWAYS + False + False + 0 0 4096 1 10 10 + + + 1 + 2 + 0 + 1 + fill + + + - - - True - Type extension to select image format (jpeg, png, ...) - True - True - True - 12 - jpeg - True - * - False - 5 + + + True + True + 1 + 0 + False + GTK_UPDATE_ALWAYS + False + False + 0 0 4096 1 10 10 + + + 3 + 4 + 0 + 1 + fill + + + + + + + True + Type extension to select image format (jpeg, png, ...) + True + True + True + 12 + jpeg + True + * + False + 5 + + + 2 + 4 + 1 + 2 + fill + + + - - 2 - 4 - 1 - 2 - fill - - @@ -14622,7 +14649,7 @@ MLZO True - <b>Screenshot</b> + <b>Screenshot Dimensions</b> False True GTK_JUSTIFY_LEFT @@ -14664,7 +14691,7 @@ MLZO 1 1 0 - 0 + 20 12 0 @@ -14673,7 +14700,7 @@ MLZO True 3 4 - False + True 2 5 @@ -14987,7 +15014,7 @@ MLZO - True + False 0 0.5 GTK_SHADOW_NONE @@ -15094,7 +15121,7 @@ MLZO 1 1 0 - 0 + 20 12 0 @@ -15109,7 +15136,7 @@ MLZO True 2 4 - False + True 2 5 @@ -15316,7 +15343,7 @@ MLZO - 0 + 8 True True @@ -15335,9 +15362,9 @@ MLZO True - 0 - False - False + 2 + True + True @@ -15355,9 +15382,9 @@ MLZO - 0 - False - False + 2 + True + True @@ -15489,7 +15516,7 @@ MLZO True - Close + Close SDL True False GTK_JUSTIFY_LEFT diff --git a/veejay-current/veejay-client/share/gveejay.reloaded.glade.bak b/veejay-current/veejay-client/share/gveejay.reloaded.glade.bak index 74086e39..934064ad 100644 --- a/veejay-current/veejay-client/share/gveejay.reloaded.glade.bak +++ b/veejay-current/veejay-client/share/gveejay.reloaded.glade.bak @@ -4121,354 +4121,367 @@ - + True - 0 - 0.5 - GTK_SHADOW_NONE + False + 0 - + True - 0.5 - 0.5 - 1 - 1 - 0 - 0 - 0 - 0 + 0 + 0.5 + GTK_SHADOW_NONE - + True - False - 0 + 0.5 + 0.5 + 1 + 1 + 0 + 0 + 0 + 0 - + True False 0 - + True False 0 - + True - True - GTK_RELIEF_NORMAL - True - + False + 0 - + True - button_gotostart.png - 0.5 - 0.5 - 0 - 0 + True + GTK_RELIEF_NORMAL + True + + + + + True + button_gotostart.png + 0.5 + 0.5 + 0 + 0 + + + + 0 + False + False + + + + + + True + True + GTK_RELIEF_NORMAL + True + + + + + True + button_reverse.png + 0.5 + 0.5 + 0 + 0 + + + + + 0 + False + False + + + + + + True + True + GTK_RELIEF_NORMAL + True + + + + + True + button_pause.png + 0.5 + 0.5 + 0 + 0 + + + + + 0 + False + False + + + + + + True + True + GTK_RELIEF_NORMAL + True + + + + + True + button_play.png + 0.5 + 0.5 + 0 + 0 + + + + + 0 + False + False + + + + + + True + True + GTK_RELIEF_NORMAL + True + + + + + True + button_skip.png + 0.5 + 0.5 + 0 + 0 + + + + + 0 + False + False + 0 False - False + True - + True - True - GTK_RELIEF_NORMAL - True - + False + 0 - + True - button_reverse.png - 0.5 - 0.5 - 0 - 0 + True + GTK_RELIEF_NORMAL + True + + + + + True + button_gotoend.png + 0.5 + 0.5 + 0 + 0 + + + + 0 + False + False + + + + + + True + True + GTK_RELIEF_NORMAL + True + + + + + True + button_dec.png + 0.5 + 0.5 + 0 + 0 + + + + + 0 + False + False + + + + + + True + True + GTK_RELIEF_NORMAL + True + + + + + True + button_inc.png + 0.5 + 0.5 + 0 + 0 + + + + + 0 + False + False + + + + + + True + True + GTK_RELIEF_NORMAL + True + + + + + True + button_prev.png + 0.5 + 0.5 + 0 + 0 + + + + + 0 + False + False + 0 False - False - - - - - - True - True - GTK_RELIEF_NORMAL - True - - - - - True - button_pause.png - 0.5 - 0.5 - 0 - 0 - - - - - 0 - False - False - - - - - - True - True - GTK_RELIEF_NORMAL - True - - - - - True - button_play.png - 0.5 - 0.5 - 0 - 0 - - - - - 0 - False - False - - - - - - True - True - GTK_RELIEF_NORMAL - True - - - - - True - button_skip.png - 0.5 - 0.5 - 0 - 0 - - - - - 0 - False - False + True 0 - False - True - - - - - - True - False - 0 - - - - True - True - GTK_RELIEF_NORMAL - True - - - - - True - button_gotoend.png - 0.5 - 0.5 - 0 - 0 - - - - - 0 - False - False - - - - - - True - True - GTK_RELIEF_NORMAL - True - - - - - True - button_dec.png - 0.5 - 0.5 - 0 - 0 - - - - - 0 - False - False - - - - - - True - True - GTK_RELIEF_NORMAL - True - - - - - True - button_inc.png - 0.5 - 0.5 - 0 - 0 - - - - - 0 - False - False - - - - - - True - True - GTK_RELIEF_NORMAL - True - - - - - True - button_prev.png - 0.5 - 0.5 - 0 - 0 - - - - - 0 - False - False - - - - - 0 - False + True True - - 0 - True - True - - - - - - True - sync start! - True - GTK_RELIEF_NORMAL - True - - - - - True - sync.png - 0.5 - 0.5 - 0 - 0 - - - - - 0 - False - False - + + + + True + <b>Sync controls</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + label_item + + + + 0 + True + True + - + True - <b>Sync controls</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 + sync start! + True + GTK_RELIEF_NORMAL + True + + + + + True + sync.png + 0.5 + 0.5 + 0 + 0 + + - label_item + 0 + False + False @@ -5229,7 +5242,7 @@ - 0 + 5 False True @@ -5550,7 +5563,7 @@ - 0 + 5 False True @@ -5577,7 +5590,7 @@ 0.5 1 1 - 0 + 5 0 12 0 @@ -14372,11 +14385,11 @@ MLZO - GVeejay Reloaded - Preferences + Preferences GTK_WINDOW_TOPLEVEL GTK_WIN_POS_CENTER_ON_PARENT - True - True + False + False False True False @@ -14448,164 +14461,178 @@ MLZO 0 - + True - 2 - 4 - False - 2 - 5 + 0.5 + 0.5 + 1 + 1 + 2 + 20 + 0 + 0 - + True - Width - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 0 - 1 - fill - - - + 2 + 4 + True + 2 + 5 - - - True - Image format - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 2 - 1 - 2 - fill - - - + + + True + Width + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 1 + 0 + 1 + fill + + + - - - True - Height - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 2 - 3 - 0 - 1 - - - - + + + True + Image format + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + 2 + 1 + 2 + fill + + + - - - True - True - 1 - 0 - False - GTK_UPDATE_ALWAYS - False - False - 0 0 4096 1 10 10 - - - 1 - 2 - 0 - 1 - fill - - - + + + True + Height + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 2 + 3 + 0 + 1 + + + + - - - True - True - 1 - 0 - False - GTK_UPDATE_ALWAYS - False - False - 0 0 4096 1 10 10 - - - 3 - 4 - 0 - 1 - fill - - - + + + True + True + 1 + 0 + False + GTK_UPDATE_ALWAYS + False + False + 0 0 4096 1 10 10 + + + 1 + 2 + 0 + 1 + fill + + + - - - True - Type extension to select image format (jpeg, png, ...) - True - True - True - 12 - jpeg - True - * - False - 5 + + + True + True + 1 + 0 + False + GTK_UPDATE_ALWAYS + False + False + 0 0 4096 1 10 10 + + + 3 + 4 + 0 + 1 + fill + + + + + + + True + Type extension to select image format (jpeg, png, ...) + True + True + True + 12 + jpeg + True + * + False + 5 + + + 2 + 4 + 1 + 2 + fill + + + - - 2 - 4 - 1 - 2 - fill - - @@ -14622,7 +14649,7 @@ MLZO True - <b>Screenshot</b> + <b>Screenshot Dimensions</b> False True GTK_JUSTIFY_LEFT @@ -14664,7 +14691,7 @@ MLZO 1 1 0 - 0 + 20 12 0 @@ -14673,7 +14700,7 @@ MLZO True 3 4 - False + True 2 5 @@ -14987,7 +15014,7 @@ MLZO - True + False 0 0.5 GTK_SHADOW_NONE @@ -15094,7 +15121,7 @@ MLZO 1 1 0 - 0 + 20 12 0 @@ -15109,7 +15136,7 @@ MLZO True 2 4 - False + True 2 5 @@ -15316,7 +15343,7 @@ MLZO - 0 + 8 True True @@ -15335,9 +15362,9 @@ MLZO True - 0 - False - False + 2 + True + True @@ -15355,9 +15382,9 @@ MLZO - 0 - False - False + 2 + True + True @@ -15489,7 +15516,7 @@ MLZO True - Close + Close SDL True False GTK_JUSTIFY_LEFT diff --git a/veejay-current/veejay-client/src/callback.c b/veejay-current/veejay-client/src/callback.c index c0b2bdfb..d7b9c82c 100644 --- a/veejay-current/veejay-client/src/callback.c +++ b/veejay-current/veejay-client/src/callback.c @@ -3586,24 +3586,21 @@ void on_bq_button_clicked( GtkWidget *w, gpointer data ) { info->quality = 2; multitrack_set_quality( info->mt, 2 ); - if(!is_button_toggled( "previewtoggle" )) - set_toggle_button( "previewtoggle", 1 ); + set_toggle_button( "previewtoggle", 1 ); } void on_hqbutton_clicked( GtkWidget *w, gpointer data ) { info->quality = 1; multitrack_set_quality( info->mt, 1 ); - if(!is_button_toggled( "previewtoggle" )) - set_toggle_button( "previewtoggle", 1 ); + set_toggle_button( "previewtoggle", 1 ); } void on_lqbutton_clicked( GtkWidget *w, gpointer data ) { info->quality = 0; multitrack_set_quality( info->mt, 0 ); - if(!is_button_toggled( "previewtoggle" )) - set_toggle_button( "previewtoggle", 1 ); + set_toggle_button( "previewtoggle", 1 ); } void on_uq_button_clicked( GtkWidget *w, gpointer data ) diff --git a/veejay-current/veejay-client/src/multitrack.c b/veejay-current/veejay-client/src/multitrack.c index 3654181a..334623d5 100644 --- a/veejay-current/veejay-client/src/multitrack.c +++ b/veejay-current/veejay-client/src/multitrack.c @@ -351,7 +351,6 @@ static void add_buttons( sequence_view_t *p, sequence_view_t *seqv , GtkWidget * seqv->icons[i] = gtk_image_new_from_file( path ); seqv->buttons[i] = gtk_button_new_with_label(" "); gtk_widget_set_size_request_( seqv->icons[i],24,20 ); - gtk_button_set_image( GTK_BUTTON(seqv->buttons[i]), seqv->icons[i] ); gtk_widget_set_size_request_( seqv->buttons[i],24,20 ); gtk_box_pack_start( GTK_BOX(w), seqv->buttons[i], TRUE,TRUE, 0 ); @@ -394,7 +393,7 @@ static void playmode_sensitivity( sequence_view_t *p, gint pm ) #endif if( pm == MODE_STREAM || MODE_PLAIN || MODE_SAMPLE ) { - if(p->toggle) + if(p->num > 0) gtk_widget_set_sensitive_( GTK_WIDGET( p->toggle ), TRUE ); gtk_widget_set_sensitive_( GTK_WIDGET( p->panel ), TRUE ); @@ -570,10 +569,9 @@ static sequence_view_t *new_sequence_view( void *vp, int num ) gtk_widget_set_size_request_( seqv->area, 176,176 ); seqv->panel = gtk_frame_new(NULL); - if( num > 0 ) - { - seqv->toggle = gtk_toggle_button_new_with_label( "preview" ); + seqv->toggle = gtk_toggle_button_new_with_label( "preview" ); + if(num>0) { gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(seqv->toggle), FALSE ); g_signal_connect( G_OBJECT( seqv->toggle ), "toggled", G_CALLBACK(sequence_preview_cb), @@ -583,6 +581,10 @@ static sequence_view_t *new_sequence_view( void *vp, int num ) gtk_widget_set_sensitive_( GTK_WIDGET( seqv->toggle ), FALSE ); gtk_widget_show( seqv->toggle ); + } else { + gtk_box_pack_start( GTK_BOX(seqv->main_vbox), seqv->toggle,FALSE,FALSE, 0 ); + gtk_widget_show( seqv->toggle ); + gtk_widget_set_sensitive_( GTK_WIDGET( seqv->toggle ), FALSE ); } GtkWidget *vvbox = gtk_vbox_new(FALSE, 0); @@ -603,7 +605,7 @@ static sequence_view_t *new_sequence_view( void *vp, int num ) GtkWidget *box = gtk_vbox_new(FALSE,0); seqv->timeline_ = gtk_hscale_new_with_range( 0.0,1.0,0.1 ); gtk_scale_set_draw_value( GTK_SCALE(seqv->timeline_), FALSE ); - gtk_widget_set_size_request_( seqv->panel,180 ,180); + //gtk_widget_set_size_request_( seqv->panel,180 ,180); gtk_adjustment_set_value( GTK_ADJUSTMENT(GTK_RANGE(seqv->timeline_)->adjustment), 0.0 ); gtk_widget_show( seqv->panel ); @@ -784,7 +786,10 @@ void *multitrack_new( int threads) { multitracker_t *mt = NULL; - +#ifdef STRICT_CHECKING + assert( max_w > 0 ); + assert( max_h > 0 ); +#endif mt = (multitracker_t*) vj_calloc(sizeof(multitracker_t)); mt->view = (sequence_view_t**) vj_calloc(sizeof(sequence_view_t*) * MAX_TRACKS ); mt->preview = NULL; @@ -794,13 +799,12 @@ void *multitrack_new( mt->logo = load_logo_image(vj_get_preview_box_w(), vj_get_preview_box_h()); mt->preview_toggle = preview_toggle; mt->scroll = gtk_scrolled_window_new(NULL,NULL); - gtk_widget_set_size_request(mt->scroll,50+max_w*2, max_h); +// gtk_widget_set_size_request(mt->scroll,50+max_w*2, max_h); gtk_container_set_border_width(GTK_CONTAINER(mt->scroll),1); - gtk_scrolled_window_set_policy( GTK_SCROLLED_WINDOW(mt->scroll),GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS ); + gtk_scrolled_window_set_policy( GTK_SCROLLED_WINDOW(mt->scroll),GTK_POLICY_AUTOMATIC, GTK_POLICY_NEVER); GtkWidget *table = gtk_table_new( 1, MAX_TRACKS, FALSE ); gtk_box_pack_start( GTK_BOX( mt->main_box ), mt->scroll , TRUE,TRUE, 0 ); gtk_widget_show(mt->scroll); - int c = 0; for( c = 0; c < MAX_TRACKS; c ++ ) { diff --git a/veejay-current/veejay-client/src/vj-api.c b/veejay-current/veejay-client/src/vj-api.c index 89f6c67c..7e9fdd8e 100644 --- a/veejay-current/veejay-client/src/vj-api.c +++ b/veejay-current/veejay-client/src/vj-api.c @@ -94,7 +94,7 @@ static struct {"Mouse left: Set in point, Mouse right: Set out point, Double click: Clear selected, Mouse middle: Drag selection"}, {"Mouse left/right: Play slot, Shift + Mouse left: Put sample in slot"}, {"Mouse left click: Select slot (sample in slot), Mouse double click: Play sample in slot"}, - NULL, + {NULL}, }; enum { @@ -1865,12 +1865,12 @@ gboolean gveejay_quit( GtkWidget *widget, gpointer user_data) if( info->watch.state == STATE_PLAYING) { - if( prompt_dialog("Quit gveejay", "Are you sure?" ) == GTK_RESPONSE_REJECT) + if( prompt_dialog("Quit Reloaded", "Are you sure?" ) == GTK_RESPONSE_REJECT) return TRUE; } running_g_ = 0; - info->watch.state == STATE_QUIT; + info->watch.state = STATE_QUIT; return FALSE; } @@ -2167,6 +2167,7 @@ static void update_curve_widget(const char *name) char but[25]; sprintf(but, "kf_p%d", p); set_toggle_button( but, 1 ); + info->uc.selected_parameter_id = p; switch( curve_type ) { @@ -5361,7 +5362,7 @@ int veejay_update_multitrack( void *data ) GtkWidget *maintrack = glade_xml_get_widget( info->main_window, "imageA"); int i; - GtkWidget *ww = glade_xml_get_widget_( info->main_window, "vjdeck" ); + GtkWidget *ww = glade_xml_get_widget_( info->main_window, "notebook18" ); int deckpage = gtk_notebook_get_current_page(GTK_NOTEBOOK(ww)); #ifdef STRICT_CHECKING @@ -5445,7 +5446,7 @@ int veejay_update_multitrack( void *data ) }*/ // vj_img_cb( s->img_list[i] ); - if(deckpage == 2) + if(deckpage == 3) multitrack_update_sequence_image( gui->mt, i, s->img_list[i] ); gdk_pixbuf_unref( s->img_list[i] ); @@ -5797,7 +5798,6 @@ static void process_reload_hints(int *history, int pm) gchar *tt1 = _utf8str(_effect_get_param_description(entry_tokens[ENTRY_FXID],i)); gtk_widget_set_tooltip_text( glade_xml_get_widget_(info->main_window, slider_name), tt1 ); - g_free(tt1); enable_widget( button_name ); gint min,max,value; value = entry_tokens[3 + i]; @@ -5807,6 +5807,8 @@ static void process_reload_hints(int *history, int pm) } sprintf(button_name, "kf_p%d", i ); enable_widget( button_name ); + set_tooltip( button_name, tt1 ); + g_free(tt1); } } @@ -5823,6 +5825,7 @@ static void process_reload_hints(int *history, int pm) sprintf( button_name, "dec_p%d", i); disable_widget( button_name ); sprintf( button_name, "kf_p%d", i ); + set_tooltip( button_name, NULL ); disable_widget( button_name ); gtk_widget_set_tooltip_text( glade_xml_get_widget_(info->main_window, slider_name), NULL ); } @@ -6754,7 +6757,6 @@ void vj_gui_enable() enable_widget( uiwidgets[i].name ); i++; } - info->sensitive = 1; }