[Skencil-commits] r751 - in skencil/branches/skencil-0.6/src: Resources/Misc Sketch/Base Sketch/UI

[scm-commit@wald.intevation.org]

Author: igor_n
Date: 2010-10-09 00:31:56 +0200 (Sat, 09 Oct 2010)
New Revision: 751

Modified:
   skencil/branches/skencil-0.6/src/Resources/Misc/tkdefaults
   skencil/branches/skencil-0.6/src/Sketch/Base/gtkutils.py
   skencil/branches/skencil-0.6/src/Sketch/UI/mainwindow.py
Log:
main window redesign

Modified: skencil/branches/skencil-0.6/src/Resources/Misc/tkdefaults
===================================================================
--- skencil/branches/skencil-0.6/src/Resources/Misc/tkdefaults	2010-10-08 19:02:02 UTC (rev 750)
+++ skencil/branches/skencil-0.6/src/Resources/Misc/tkdefaults	2010-10-08 22:31:56 UTC (rev 751)
@@ -38,10 +38,12 @@
 *TBSeparator.borderWidth:	1
 *TBSeparator.width:		2
 
-*Ruler.relief:			raised
-*Ruler.borderWidth:		1
-*rulercorner.relief:		raised
-*rulercorner.borderWidth:	1
+*Ruler.relief:			flat
+*Ruler.borderWidth:		0
+*rulercorner.relief:		flat
+*rulercorner.borderWidth:	0
+*canvas_frame.highlightThickness:	1
+!*canvas_frame.takeFocus:	0
 
 *Entry.background:		white
 *Listbox.background:		white

Modified: skencil/branches/skencil-0.6/src/Sketch/Base/gtkutils.py
===================================================================
--- skencil/branches/skencil-0.6/src/Sketch/Base/gtkutils.py	2010-10-08 19:02:02 UTC (rev 750)
+++ skencil/branches/skencil-0.6/src/Sketch/Base/gtkutils.py	2010-10-08 22:31:56 UTC (rev 751)
@@ -294,9 +294,12 @@
     widget.tk.call('option', 'add', '*tooltips*background', '#F6F6B9', 'interactive')  
     widget.tk.call('option', 'add', '*tooltips.background', '#C2C24E', 'interactive')
     
-    widget.tk.call('option', 'add', '*Menu.background', color_scheme.menubordercolor, 'interactive')
+    widget.tk.call('option', 'add', '*Menu.background', color_scheme.menubackground, 'interactive')
     widget.tk.call('option', 'add', '*Menu*background', color_scheme.menubackground, 'interactive')
     widget.tk.call('option', 'add', '*Menu.highlightColor', color_scheme.menubordercolor, 'interactive')
+    
+    widget.tk.call('option', 'add', '*canvas_frame.highlightColor', color_scheme.normal_border, 'interactive')
+    widget.tk.call('option', 'add', '*canvas_frame.highlightBackground', color_scheme.normal_border, 'interactive')
          
 #module self testing
 if __name__ == '__main__':

Modified: skencil/branches/skencil-0.6/src/Sketch/UI/mainwindow.py
===================================================================
--- skencil/branches/skencil-0.6/src/Sketch/UI/mainwindow.py	2010-10-08 19:02:02 UTC (rev 750)
+++ skencil/branches/skencil-0.6/src/Sketch/UI/mainwindow.py	2010-10-08 22:31:56 UTC (rev 751)
@@ -574,9 +574,18 @@
         root = self.application.root
         self.mbar = Frame(root, name = 'menubar')
         self.mbar.pack(fill=X)
+        
+        line = Frame(root, height = 1, bg=Sketch.ui_colors.d3_dark)
+        line.pack(fill = X)
+        line = Frame(root, height = 1, bg=Sketch.ui_colors.d3_light)
+        line.pack(fill = X)
+        
         self.tbar = Frame(root, name = 'toolbar')
-        self.tbar.pack(fill=X)
-
+        self.tbar.pack(fill = X, pady = 3)
+        
+        line = Frame(root, height = 1, bg=Sketch.ui_colors.d3_dark)
+        line.pack(fill = X)
+        
         self.status_bar = Frame(root, name = 'statusbar')
         self.status_bar.pack(side = BOTTOM, fill=X)
 
@@ -584,7 +593,7 @@
         palette_frame.pack(side = BOTTOM, fill = X, pady = 3)
 
         frame = Frame(root, name = 'canvas_frame')
-        frame.pack(side = TOP, fill = BOTH, expand = 1)
+        frame.pack(side = TOP, fill = BOTH, expand = 1, padx = 4)
         vbar = Scrollbar(frame)
         vbar.grid(in_ = frame, column = 2, row = 1, sticky = 'ns')
         hbar = Scrollbar(frame, orient = HORIZONTAL)