Merge pull request #2356 from phillc54/phillc54/gscreen

gscreen: assorted updates for python3 and gtk3

Author: phillc54

configs/sim/gscreen/gscreen_theme/gtk-3.0/gtk.css

@@ -0,0 +1,34 @@
+.background {
+    color: #ffffff;
+    background-color: #232323;
+}
+
+*:active {
+    color: #dadada;
+    background-color: #151515;
+}
+
+*:disabled {
+    color: #151515;
+    background-color: #303030;
+}
+
+*:hover {
+    color: #fcfcfc;
+    background-color: #003263;
+}
+
+*:checked {
+    color: #fcfcfc;
+    background-color: #002849;
+}
+
+button, notebook tab label {
+    border: 1px solid #808080;
+    margin:1px;
+}
+
+*button:active {
+    color: #dadada;
+    background-color: #151515;
+}

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

@@ -1,3 +1,9 @@
+***********************************
+old Gtk2 styling
+kept for obtaining original styling
+***********************************
+
+
 style "default"
 {
     GtkButton::default_border                    = {0, 0, 0, 0}
@@ -23,16 +29,16 @@ style "default"
     GtkScrollbar::min_slider_length              = 10
     GtkToolbar::shadow_type                      = out
     GtkWidget::focus-line-width                  = 1
-    GtkWidget::focus_padding                     = 1 
-    GtkWidget::interior_focus                    = 1 
-    GtkWidget::internal_padding                  = 2 
+    GtkWidget::focus_padding                     = 1
+    GtkWidget::interior_focus                    = 1
+    GtkWidget::internal_padding                  = 2
     GtkEntry::cursor_color                       = "#fcfcfc"
     GtkEntry::secondary_cursor_color             = "#fcfcfc"
     GtkTextView::cursor_color                    = "#fcfcfc"
     GtkTextView::secondary_cursor_color          = "#fcfcfc"
     GtkEntry::cursor_aspect_ratio                = 0.1
     GtkEntry::cursor_aspect_ratio                = 0.1
-    
+
     xthickness             = 1
     ythickness             = 1
 
@@ -81,7 +87,7 @@ style "button" = "default"
     xthickness = 2
     ythickness = 2
 
-    engine "xfce" 
+    engine "xfce"
     {
         smooth_edge = true
         grip_style = none
@@ -109,7 +115,7 @@ style "sbstyle" = "default"
 {
     xthickness = 2
     ythickness = 2
-    engine "xfce" 
+    engine "xfce"
     {
         smooth_edge = true
         grip_style = none
@@ -132,8 +138,8 @@ style "progress" = "default"
     xthickness = 2
     ythickness = 2
 }
-widget_class "*GtkProgress*"       style "progress" 
-class "*GtkProgress*"              style "progress" 
+widget_class "*GtkProgress*"       style "progress"
+class "*GtkProgress*"              style "progress"
 
 style "menuitem" = "default"
 {
@@ -152,7 +158,7 @@ style "flat" = "default"
 widget_class "*HandleBox"         style "flat"
 
 # This is for the window borders (xfwm4 & metacity)
-# 
+#
 style "titlebar"
 {
     bg[SELECTED]      = "#003263"
@@ -165,8 +171,8 @@ class "MetaFrames"                 style "titlebar"
 widget_class "MetaFrames"          style "titlebar"
 
 
-# These custom themed widget require the widget name 
-# to match in the glade file 
+# These custom themed widget require the widget name
+# to match in the glade file
 style "halsourceview" = "default"
 {
     base[SELECTED]    = "#FFFFFF" # highlight color

lib/python/gladevcp/offsetpage_widget.py

@@ -94,17 +94,9 @@ def __init__(self, filename = None, *a, **kw):
         self.display_follows_program = False # display units are chosen indepenadently of G20/G21
         self.font = "sans 12"
         self.editing_mode = False
-        # color = Gdk.RGBA()
-        # color.parse("lightblue")
-        # self.highlight_color = color
-        # color.parse("red")
-        # self.foreground_color = color
-        # color.parse("lightgray")
-        # self.unselectable_color = color
         self.highlight_color = self.color_parse("lightblue")
         self.foreground_color = self.color_parse("red")
         self.unselectable_color = self.color_parse("lightgray")
-
         self.hidejointslist = []
         self.hidecollist = []
         self.wTree = Gtk.Builder()