From c4d991848b2d18895ab763f1628289806943551c Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Thu, 6 Sep 2018 18:15:10 -0300 Subject: Get rid of obsolete Gtk3 widgets On Gtk3, several Widgets got obsoleted, being replaced by a different wigdet. The only exception is the GtkImageMenu item, that were simply removed, without any replacement. It seems that now it is not possible anymore (or at least it is not trivial) to associate a MenuItem with an image. Anyway, as those widgets don't exist anymore on Gtk4, we'll need to replace them anyway. The new camorama-gtk3.ui now validates with Glade 3.22. It should not work with gtk2, so, at least while we keep backport compatibility, let's have both schemas. Signed-off-by: Mauro Carvalho Chehab --- data/camorama-gtk3.ui | 2650 ++++++++++++++++++++++++------------------------- 1 file changed, 1300 insertions(+), 1350 deletions(-) (limited to 'data') diff --git a/data/camorama-gtk3.ui b/data/camorama-gtk3.ui index 8a19cbe..2d88de9 100644 --- a/data/camorama-gtk3.ui +++ b/data/camorama-gtk3.ui @@ -1,7 +1,7 @@ + - - + 255 @@ -23,35 +23,177 @@ 255 1 - - 1 - 360 - 1 - 1 - 10 - - + + True False - Preferences - False - dialog - - + Camorama-libglade + + + + + + True False - - + vertical + + True False - end - - gtk-help + True - True - True - False - True + False + _File + True + + + False + + + True + False + _Take Picture + True + + + + + + True + False + + + + + True + False + _Quit + True + + + + + + + + + True + False + _Edit + True + + + False + + + True + False + _Preferences + True + + + + + + + + + True + False + _View + True + + + False + + + True + False + Show Adjustments + True + + + + + + + True + False + Show Effects + True + + + + + + + True + False + + + + + True + False + Small + True + + + + + + + + + + True + False + _Help + True + + + False + + + True + False + _About + True + + + + + + + + + False + True + 0 + + + + + True + False + 6 + 6 + + + True + False + 0 + in + + + 320 + 240 + True + False + + + False @@ -60,18 +202,24 @@ - - gtk-close + True True - True - False - True - + never + in + + + True + True + + + + + - False - False + True + True 1 @@ -79,70 +227,52 @@ False True - end - 0 + 1 - + True - True - 5 + False + + + False + True + 2 + + + + + True + False + 6 + 6 - + True False - 12 - 18 - + True - False - 6 - - - True - False - 0 - <span weight="bold">General</span> - True - - - False - False - 0 - - + True + False + - + True False + 0 + 0 - - True - False - - - - False - False - 0 - - - - + True False - 6 + 2 - - Automatic Capture + True - True - False - True - True - + False + gtk-select-color False @@ -151,171 +281,57 @@ - + True False - - - True - False - - - - False - False - 0 - - - - - True - False - 6 - - - True - False - 6 - - - True - False - Capture Interval (in minutes): - - - False - False - 0 - - - - - True - True - False - False - True - True - adjustment6 - 1 - - - - False - True - 1 - - - - - False - False - 0 - - - - - True - True - 1 - - + Show Adjustments + True - True - True + False + False 1 - - True - True - 1 - - - True - True - 1 - - - False - True - 0 - - - - - True - False - General - - False + False + False + 0 - + True False - 12 - 18 - + True - False - 6 - - - True - False - 0 - <span weight="bold">Local Capture</span> - True - - - False - False - 0 - - + True + False + - + True False + 0 + 0 - - True - False - - - - False - False - 0 - - - - + True False - 6 + 2 - - _Enable local capture + True - True - False - True - True - True - + False + snap-icon-small.xpm False @@ -324,235 +340,11 @@ - + True False - - - True - False - - - - False - False - 0 - - - - - True - False - 7 - - - True - False - 2 - 2 - 6 - 6 - - - True - False - 0 - _Directory for captured pics: - True - - - GTK_FILL - - - - - - True - False - 0 - _Filename for pictures: - True - entry2 - - - 1 - 2 - GTK_FILL - - - - - - True - True - webcam-capture - False - False - True - True - - - 1 - 2 - 1 - 2 - - - - - - True - False - select-folder - Select a Directory - - - 1 - 2 - - - - - - False - False - 0 - - - - - Append time to filename - True - True - False - True - True - True - - - - False - False - 1 - - - - - Add a timestamp to captured images - True - True - False - True - True - - - - False - False - 2 - - - - - True - True - 1 - - - - - True - True - 1 - - - - - True - True - 1 - - - - - True - True - 1 - - - - - False - True - 0 - - - - - True - False - 6 - - - True - False - 0 - <span weight="bold">Image Type</span> - True - - - False - False - 0 - - - - - True - False - - - True - False - - - - False - False - 0 - - - - - True - False - - - Save files in jpeg format - True - True - False - True - True - True - - - - False - False - 0 - - - - - Save files in png format - True - True - False + Take Picture True - True - jpgb - False @@ -561,332 +353,331 @@ - - True - True - 1 - - - True - True - 1 - - - True - True - 1 - + False + False + end 1 - - + + + False + True + 3 + + + + + True + False + 3 + + + True + True + True + adjustment1 + 0 + left + + + + 2 + 1 + + + + + True + True + True + adjustment3 + 0 + left + + + + 2 + 2 + + + + + True + True + True + adjustment4 + 0 + left + + + + 2 + 3 + + + + + True + True + True + adjustment5 + 0 + left + + + + 2 + 4 + + + + True False - Local Capture + Contrast: + 0 - 1 - False + 1 + 0 - + True False - 12 - 18 - - - True - False - 6 - - - True - False - 0 - <span weight="bold">Remote Capture</span> - True - - - False - False - 0 - - - - - True - False - - - True - False - - - - False - False - 0 - - - - - True - False - 6 - - - _Enable remote capture - True - True - False - True - True - - - - False - False - 0 - - - - - True - False - - - True - False - - - - False - False - 0 - - - - - True - False - 7 - - - True - False - 4 - 2 - 6 - 6 - - - True - False - 0 - Server: - - - GTK_FILL - - - - - - True - False - 0 - Type: - - - 1 - 2 - - - - - True - False - 0 - Save directory: - - - 2 - 3 - - - - - True - False - 0 - Filename: - - - 3 - 4 - GTK_FILL - - - - - - True - True - ftp.yourdomain.org - False - False - True - True - - - 1 - 2 - - - - - - True - False - - - 1 - 2 - 1 - 2 - - - - - True - True - ● - False - False - True - True - - - 1 - 2 - 2 - 3 - - - - - True - True - webcamshot - False - False - True - True - - - 1 - 2 - 3 - 4 - - - - - - False - False - 0 - - - - - Append time to filename - True - True - False - True - True - - - - False - False - 1 - - - - - Add a timestamp to captured images - True - True - False - True - True - - - - False - False - 2 - - - - - True - True - 1 - - - - - True - True - 1 - - - - - True - True - 1 - - - - - True - True - 1 - - - - - False - True - 0 - - + Brightness: + 0 + + + 1 + 1 + + + + + True + False + Color: + 0 + + + 1 + 2 + + + + + True + False + Hue: + 0 + + + 1 + 3 + + + + + True + False + White Balance: + 0 + + + 1 + 4 + + + + + True + False + contrast.png + + + 0 + 0 + + + + + True + False + brightness.png + + + 0 + 1 + + + + + True + False + colourness.png + + + 0 + 2 + + + + + True + False + stock-tool-hue-saturation-16.png + + + 0 + 3 + + + + + True + False + whiteness.png + + + 0 + 4 + + + + + True + True + True + adjustment2 + 0 + 0 + left + + + 2 + 0 + + + + + False + True + 4 + + + + + True + False + 4 + + + False + True + 5 + + + + + + + + + + 1 + 360 + 1 + 1 + 10 + + + False + Preferences + False + dialog + + + True + False + vertical + + + True + False + end + + + _Help + True + True + True + False + True + + + False + False + 0 + + + + + _Close + True + True + True + False + True + + + + False + False + 1 + + + + + False + True + end + 0 + + + + + True + True + 5 + + + True + False + 12 + vertical - + True False + vertical 6 - + True False - 0 - <span weight="bold">Image Type</span> + <span weight="bold">General</span> True + 0 False @@ -895,14 +686,14 @@ - + True False - + True False - + False @@ -911,19 +702,20 @@ - + True False + vertical + 6 - - Save files in jpeg format + + Automatic Capture True True False True - True True - + False @@ -932,19 +724,78 @@ - - Save files in png format + True - True - False - True - True - fjpgb - + False + + + True + False + + + + False + False + 0 + + + + + True + False + vertical + 6 + + + True + False + 6 + + + True + False + Capture Interval (in minutes): + + + False + False + 0 + + + + + True + True + False + False + adjustment6 + 1 + + + + False + True + 1 + + + + + False + False + 0 + + + + + True + True + 1 + + - False - False + True + True 1 @@ -957,52 +808,52 @@ - False + True True 1 - True + False True - 1 + 0 - - 2 - - + True False - Remote Capture + General - 2 False - + True False 12 - 18 + vertical - + True False + baseline + True + False + vertical 6 - + True False - 0 - <span weight="bold">Timestamp</span> + <span weight="bold">Local Capture</span> True + 0 False @@ -1011,11 +862,11 @@ - + True False - + True False @@ -1027,19 +878,21 @@ - + True False + vertical 6 - - Use custom string + + _Enable local capture True True False True + True True - + False @@ -1048,11 +901,11 @@ - + True False - + True False @@ -1064,47 +917,109 @@ - + True False - 6 + vertical + 7 - + True False - 6 + 6 + 6 - + True False - String: + _Directory for captured pics: + True + 0 - False - False - 0 + 0 + 0 - + + True + False + _Filename for pictures: + True + entry2 + 0 + + + 0 + 1 + + + + + True + False + True + select-folder + Select a Directory + + + 1 + 0 + + + + True True + True + webcam-capture False False - True - True - False - True - 1 + 1 + 1 False False - 0 + 0 + + + + + Append time to filename + True + True + False + True + True + True + + + + False + False + 1 + + + + + Add a timestamp to captured images + True + True + False + True + True + + + + False + False + 2 @@ -1121,22 +1036,6 @@ 1 - - - Draw date and time - True - True - False - True - True - - - - False - False - 2 - - True @@ -1153,304 +1052,444 @@ - False + True True 0 - - - 3 - - - - - True - False - Timestamp - - - 3 - False - - - - - True - True - 1 - - - - - - helpbutton1 - okbutton1 - - - - True - False - snap-icon-small.xpm - - - True - False - Camorama-libglade - - - - - - - True - False - - - True - False - - - True - False - _File - True - - - False - - - Take Picture - True - False - True - image21 - False - - - - - - - True - False - - - - - gtk-quit - True - False - True - True - accelgroup1 - - - - - - - - - - True - False - _Edit - True - - - False - - - gtk-preferences - True - False - True - True - accelgroup1 - - - - - - - - - - True - False - _View - True - - + + + True False + vertical + 6 - - True - False - Show Adjustments - True - - - - - - - True - False - Show Effects - True - - - - - - - True - False - - - - + True False - Small - True - + <span weight="bold">Image Type</span> + True + 0 + + False + False + 0 + - - - - - - - True - False - _Help - True - - - False - - gtk-about + True False - True - True - accelgroup1 - + + + True + False + + + + False + False + 0 + + + + + True + False + vertical + + + Save files in jpeg format + True + True + False + True + True + True + + + + False + False + 0 + + + + + Save files in png format + True + True + False + True + True + jpgb + + + + False + False + 1 + + + + + True + True + 1 + + + + True + True + 1 + + + True + True + 1 + + + 1 + - - - False - True - 0 - - - - - True - False - 6 - 6 - - + + True False - 0 - in - - - 320 - 240 - True - False - - - + Local Capture - False - False - 0 + 1 + False - + True - True - never - in + False + 12 + vertical + 18 - + True - True + False + vertical + 6 + + + True + False + <span weight="bold">Remote Capture</span> + True + 0 + + + False + False + 0 + + + + + True + False + + + True + False + + + + False + False + 0 + + + + + True + False + vertical + 6 + + + _Enable remote capture + True + True + False + True + True + + + + False + False + 0 + + + + + True + False + + + True + False + + + + False + False + 0 + + + + + True + False + vertical + 7 + + + True + False + baseline + True + 6 + 6 + + + True + False + Server: + 0 + + + 0 + 0 + + + + + True + False + Type: + 0 + + + 0 + 1 + + + + + True + False + Save directory: + 0 + + + 0 + 2 + + + + + True + False + Filename: + 0 + + + 0 + 3 + + + + + True + True + True + ftp.yourdomain.org + False + False + + + 1 + 0 + + + + + True + False + True + + + 1 + 1 + + + + + True + True + True + ● + False + False + + + 1 + 2 + + + + + True + True + True + webcamshot + False + False + + + 1 + 3 + + + + + False + False + 0 + + + + + Append time to filename + True + True + False + True + True + + + + False + False + 1 + + + + + Add a timestamp to captured images + True + True + False + True + True + + + + False + False + 2 + + + + + True + True + 1 + + + + + True + True + 1 + + + + + True + True + 1 + + + + + True + True + 1 + + + + False + True + 0 + - - - True - True - 1 - - - - - False - True - 1 - - - - - True - False - - - False - True - 2 - - - - - True - False - 6 - 6 - - - True - False - + True - True - False - + False + vertical + 6 - + + True + False + <span weight="bold">Image Type</span> + True + 0 + + + False + False + 0 + + + + True False - 0 - 0 - + True False - 2 + + + + False + False + 0 + + + + + True + False + vertical - + + Save files in jpeg format True - False - gtk-select-color + True + False + True + True + True + False @@ -1459,11 +1498,15 @@ - + + Save files in png format True - False - Show Adjustments + True + False True + True + fjpgb + False @@ -1472,342 +1515,249 @@ + + True + True + 1 + + + False + True + 1 + + + True + True + 1 + - False - False - 0 + 2 + + + + + True + False + Remote Capture + + + 2 + False - + True False + 12 + vertical + 18 - + True - True - False - + False + vertical + 6 - + + True + False + <span weight="bold">Timestamp</span> + True + 0 + + + False + False + 0 + + + + True False - 0 - 0 - + True False - 2 + + + + False + False + 0 + + + + + True + False + vertical + 6 - + + Use custom string + True + True + False + True + True + + + + False + False + 0 + + + + True False - snap-icon-small.xpm + + + True + False + + + + False + False + 0 + + + + + True + False + vertical + 6 + + + True + False + 6 + + + True + False + String: + + + False + False + 0 + + + + + True + True + True + False + False + + + False + True + 1 + + + + + False + False + 0 + + + + + True + True + 1 + + - False - False - 0 + True + True + 1 - + + Draw date and time True - False - Take Picture + True + False True + True + False False - 1 + 2 + + True + True + 1 + + + True + True + 1 + + + False + True + 0 + - False - False - end - 1 - - - - - False - True - 3 - - - - - True - False - 12 - 5 - 3 - 6 - 6 - - - True - True - adjustment1 - 0 - left - - - - 2 - 3 - GTK_FILL - - - - - True - True - adjustment2 - 0 - left - - - - 2 - 3 - 1 - 2 - GTK_FILL - GTK_FILL - - - - - True - True - adjustment3 - 0 - left - - - - 2 - 3 - 2 - 3 - GTK_FILL - GTK_FILL - - - - - True - True - adjustment4 - 0 - left - - - - 2 - 3 - 3 - 4 - GTK_FILL - GTK_FILL - - - - - True - True - adjustment5 - 0 - left - - - - 2 - 3 - 4 - 5 - GTK_FILL - GTK_FILL - - - - - True - False - 0 - Contrast: - - - 1 - 2 - GTK_FILL - - - - - - True - False - 0 - Brightness: - - - 1 - 2 - 1 - 2 - GTK_FILL - - - - - - True - False - 0 - Color: - - - 1 - 2 - 2 - 3 - GTK_FILL - - - - - - True - False - 0 - Hue: - - - 1 - 2 - 3 - 4 - GTK_FILL - - - - - - True - False - 0 - White Balance: - - - 1 - 2 - 4 - 5 - GTK_FILL - - - - - - True - False - brightness.png - - - 1 - 2 - GTK_FILL - GTK_FILL - - - - - True - False - colourness.png - - - 2 - 3 - GTK_FILL - GTK_FILL - - - - - True - False - stock-tool-hue-saturation-16.png - - - 3 - 4 - GTK_FILL - GTK_FILL - - - - - True - False - whiteness.png - - - 4 - 5 - GTK_FILL - GTK_FILL + 3 - - + + True False - contrast.png + Timestamp - GTK_FILL - GTK_FILL + 3 + False - False - True - 4 - - - - - True - False - 4 - - - False + True True - 5 + 1 + + helpbutton1 + okbutton1 + + + + -- cgit v1.2.1