Skip to content

Commit efa40e5

Browse files
committed
gscreen: multiple squashed commits
switch audio play to python3 gstreamer switch notifications to gst notifications switch terminal to spawn_async rather than fork remove some trailing whitespace fix some typos rework some print statements comment out some debug print statements python3 updates silence deprecation messages at startup use markup for dro colors quieten gtk dont know color warnings fix hide-show pointer fix some dialog deprecations utilise the QtVCP logging library use theme from preferences file make glade file gtk3 compliant make a start for gtk3 stylesheet play nicely if audio file is incorrect or missing
1 parent a33ed9f commit efa40e5

5 files changed

Lines changed: 4185 additions & 3809 deletions

File tree

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
.background {
2+
color: #ffffff;
3+
background-color: #232323;
4+
}
5+
6+
*:active {
7+
color: #dadada;
8+
background-color: #151515;
9+
}
10+
11+
*:disabled {
12+
color: #151515;
13+
background-color: #303030;
14+
}
15+
16+
*:hover {
17+
color: #fcfcfc;
18+
background-color: #003263;
19+
}
20+
21+
*:checked {
22+
color: #fcfcfc;
23+
background-color: #002849;
24+
}
25+
26+
button, notebook tab label {
27+
border: 1px solid #808080;
28+
margin:1px;
29+
}
30+
31+
*button:active {
32+
color: #dadada;
33+
background-color: #151515;
34+
}

configs/sim/gscreen/gscreen_theme/gtk-2.0/gtkrc renamed to configs/sim/gscreen/gscreen_theme/gtk-3.0/gtkrc

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
***********************************
2+
old Gtk2 styling
3+
kept for obtaining original styling
4+
***********************************
5+
6+
17
style "default"
28
{
39
GtkButton::default_border = {0, 0, 0, 0}
@@ -23,16 +29,16 @@ style "default"
2329
GtkScrollbar::min_slider_length = 10
2430
GtkToolbar::shadow_type = out
2531
GtkWidget::focus-line-width = 1
26-
GtkWidget::focus_padding = 1
27-
GtkWidget::interior_focus = 1
28-
GtkWidget::internal_padding = 2
32+
GtkWidget::focus_padding = 1
33+
GtkWidget::interior_focus = 1
34+
GtkWidget::internal_padding = 2
2935
GtkEntry::cursor_color = "#fcfcfc"
3036
GtkEntry::secondary_cursor_color = "#fcfcfc"
3137
GtkTextView::cursor_color = "#fcfcfc"
3238
GtkTextView::secondary_cursor_color = "#fcfcfc"
3339
GtkEntry::cursor_aspect_ratio = 0.1
3440
GtkEntry::cursor_aspect_ratio = 0.1
35-
41+
3642
xthickness = 1
3743
ythickness = 1
3844

@@ -81,7 +87,7 @@ style "button" = "default"
8187
xthickness = 2
8288
ythickness = 2
8389

84-
engine "xfce"
90+
engine "xfce"
8591
{
8692
smooth_edge = true
8793
grip_style = none
@@ -109,7 +115,7 @@ style "sbstyle" = "default"
109115
{
110116
xthickness = 2
111117
ythickness = 2
112-
engine "xfce"
118+
engine "xfce"
113119
{
114120
smooth_edge = true
115121
grip_style = none
@@ -132,8 +138,8 @@ style "progress" = "default"
132138
xthickness = 2
133139
ythickness = 2
134140
}
135-
widget_class "*GtkProgress*" style "progress"
136-
class "*GtkProgress*" style "progress"
141+
widget_class "*GtkProgress*" style "progress"
142+
class "*GtkProgress*" style "progress"
137143

138144
style "menuitem" = "default"
139145
{
@@ -152,7 +158,7 @@ style "flat" = "default"
152158
widget_class "*HandleBox" style "flat"
153159

154160
# This is for the window borders (xfwm4 & metacity)
155-
#
161+
#
156162
style "titlebar"
157163
{
158164
bg[SELECTED] = "#003263"
@@ -165,8 +171,8 @@ class "MetaFrames" style "titlebar"
165171
widget_class "MetaFrames" style "titlebar"
166172

167173

168-
# These custom themed widget require the widget name
169-
# to match in the glade file
174+
# These custom themed widget require the widget name
175+
# to match in the glade file
170176
style "halsourceview" = "default"
171177
{
172178
base[SELECTED] = "#FFFFFF" # highlight color

lib/python/gladevcp/offsetpage_widget.py

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -94,17 +94,9 @@ def __init__(self, filename = None, *a, **kw):
9494
self.display_follows_program = False # display units are chosen indepenadently of G20/G21
9595
self.font = "sans 12"
9696
self.editing_mode = False
97-
# color = Gdk.RGBA()
98-
# color.parse("lightblue")
99-
# self.highlight_color = color
100-
# color.parse("red")
101-
# self.foreground_color = color
102-
# color.parse("lightgray")
103-
# self.unselectable_color = color
10497
self.highlight_color = self.color_parse("lightblue")
10598
self.foreground_color = self.color_parse("red")
10699
self.unselectable_color = self.color_parse("lightgray")
107-
108100
self.hidejointslist = []
109101
self.hidecollist = []
110102
self.wTree = Gtk.Builder()

0 commit comments

Comments
 (0)