r3398 - in trunk/src/target/OM-2007.2/libraries/moko-gtk-engine: . data data/gtk-2.0
thomas at sita.openmoko.org
thomas at sita.openmoko.org
Mon Nov 12 17:18:36 CET 2007
Author: thomas
Date: 2007-11-12 17:18:32 +0100 (Mon, 12 Nov 2007)
New Revision: 3398
Added:
trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/data/gtk-2.0/
trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/data/gtk-2.0/gtkrc
trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/data/gtk-2.0/matchboxpanel
trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/data/gtk-2.0/openmoko-calculator
trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/data/gtk-2.0/openmoko-contacts
trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/data/gtk-2.0/openmoko-dialer
trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/data/gtk-2.0/openmoko-panel-plugins
Removed:
trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/data/gtkrc
trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/data/matchboxpanel
trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/data/openmoko-calculator
trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/data/openmoko-contacts
trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/data/openmoko-dialer
trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/data/openmoko-panel-plugins
Modified:
trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/ChangeLog
trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/Makefile.am
trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/data/
Log:
* Makefile.am:
* data/gtk-2.0/*:
* data/matchbox/*:
- Move the GTK+ theme to it's own directory
- Include matchbox box theme via svn:externals
Modified: trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/ChangeLog
===================================================================
--- trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/ChangeLog 2007-11-12 15:42:11 UTC (rev 3397)
+++ trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/ChangeLog 2007-11-12 16:18:32 UTC (rev 3398)
@@ -1,3 +1,12 @@
+2007-11-12 Thomas Wood <thomas at openedhand.com>
+
+ * Makefile.am:
+ * data/gtk-2.0/*:
+ * data/matchbox/*:
+
+ - Move the GTK+ theme to it's own directory
+ - Include matchbox box theme via svn:externals
+
2007-10-22 Thomas Wood <thomas at openedhand.com>
* data/gtkrc: Button style tweaks
Modified: trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/Makefile.am
===================================================================
--- trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/Makefile.am 2007-11-12 15:42:11 UTC (rev 3397)
+++ trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/Makefile.am 2007-11-12 16:18:32 UTC (rev 3398)
@@ -18,9 +18,17 @@
gtkthemedir = $(datadir)/themes/Moko/gtk-2.0
dist_gtktheme_DATA = \
- data/gtkrc \
- data/matchboxpanel \
- data/openmoko-calculator \
- data/openmoko-contacts \
- data/openmoko-dialer \
- data/openmoko-panel-plugins
+ data/gtk-2.0/gtkrc \
+ data/gtk-2.0/matchboxpanel \
+ data/gtk-2.0/openmoko-calculator \
+ data/gtk-2.0/openmoko-contacts \
+ data/gtk-2.0/openmoko-dialer \
+ data/gtk-2.0/openmoko-panel-plugins
+
+matchboxthemedir = $(datadir)/themes/Moko/matchbox
+dist_matchboxtheme_DATA = \
+ data/matchbox/closebutton.xpm \
+ data/matchbox/menubutton.xpm \
+ data/matchbox/theme.desktop \
+ data/matchbox/theme.xml
+
Property changes on: trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/data
___________________________________________________________________
Name: svn:externals
+ matchbox http://svn.openmoko.org/trunk/src/target/OM-2007.2/artwork/themes/openmoko-standard-2/matchbox
Copied: trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/data/gtk-2.0/gtkrc (from rev 3397, trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/data/gtkrc)
Copied: trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/data/gtk-2.0/matchboxpanel (from rev 3397, trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/data/matchboxpanel)
Copied: trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/data/gtk-2.0/openmoko-calculator (from rev 3397, trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/data/openmoko-calculator)
Copied: trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/data/gtk-2.0/openmoko-contacts (from rev 3397, trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/data/openmoko-contacts)
Copied: trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/data/gtk-2.0/openmoko-dialer (from rev 3397, trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/data/openmoko-dialer)
Copied: trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/data/gtk-2.0/openmoko-panel-plugins (from rev 3397, trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/data/openmoko-panel-plugins)
Deleted: trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/data/gtkrc
===================================================================
--- trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/data/gtkrc 2007-11-12 15:42:11 UTC (rev 3397)
+++ trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/data/gtkrc 2007-11-12 16:18:32 UTC (rev 3398)
@@ -1,251 +0,0 @@
-# Moko GTK+ theme
-#
-# Copyright 2007 OpenedHand Ltd <info at openedhand.com>
-# Taken from OpenedHand's Sato GTK+ Theme
-
-
-# black: #333333
-# orange: #ff7d00
-
-gtk-button-images = 0
-gtk-menu-images = 0
-gtk-icon-sizes = "gtk-button=32,32:gtk-small-toolbar=48,48:gtk-large-toolbar=48,48"
-
-# Set the default gtk-color-scheme property
-gtk_color_scheme = "fg_color:#333;bg_color:#ccc;base_color:#ccc;text_color:#000;selected_bg_color:#ff7d00;selected_fg_color:#000"
-
-style "default"
-{
-
- xthickness = 2
- ythickness = 2
-
- GtkWidget::focus_line_width = 2
- GtkWidget::focus_padding = 0
-
- GtkButton::default_border = {0, 0, 0, 0}
-
- GtkCheckButton::indicator_size = 18
- GtkCheckMenuItem::indicator_size = 18
-
- GtkButton::focus-line-width = 0
- GtkCheckButton::indicator-size = 35
- GtkCheckButton::indicator-spacing = 5
- GtkPaned::handle-size = 16
- GtkCheckButton::indicator-size = 35
- GtkCheckButton::indicator-spacing = 5
- GtkFrame::shadow_type = GTK_SHADOW_NONE
- GtkRange::trough_border = 0
- GtkRange::slider-width = 28
- GtkScale::slider-length = 56
- GtkScrollbar::slider_width = 30
- GtkScrollbar::stepper_size = 26
- GtkScrollbar::stepper_spacing = 0
- GtkScrollbar::has_backward_stepper = 1
- GtkScrollbar::has_secondary_forward_stepper = 1
- GtkScrollbar::has_forward_stepper = 1
- GtkScrollbar::has_secondary_backward_stepper = 1
- GtkSpinButton::shadow_type = GTK_SHADOW_NONE
- GtkTreeView::allow_rules = 1
- GtkTreeView::vertical_separator = 6
- GtkTreeView::even_row_color = "#f7f7f7"
- GtkTreeView::odd_row_color = "#e7e7e7"
- GtkButton::focus-line-width = 0
- GtkButton::focus-line-width = 0
- GtkButton::focus-line-width = 0
- GtkEntry::inner_border = {10, 10, 2, 2}
- GtkButton::focus-line-width = 0
- MokoDialerTextview::small_font = 10
- MokoDialerTextview::medium_font = 15
- MokoDialerTextview::large_font = 20
- MokoDialerTextview::medium_font = 15
-
-
-
- fg [NORMAL] = @fg_color
- fg [PRELIGHT] = @fg_color
- fg [ACTIVE] = @selected_fg_color
- fg [INSENSITIVE] = @fg_color
- fg [SELECTED] = @selected_fg_color
-
- bg [NORMAL] = @bg_color
- bg [PRELIGHT] = @bg_color
- bg [ACTIVE] = @selected_bg_color
- bg [INSENSITIVE] = lighter (@bg_color)
- bg [SELECTED] = @selected_bg_color
-
- text [NORMAL] = @text_color
- text [PRELIGHT] = @text_color
- text [SELECTED] = @text_color
- text [ACTIVE] = @text_color
-
- base [NORMAL] = @base_color
- base [SELECTED] = @selected_bg_color
- base [ACTIVE] = @base_color
-
- engine "moko-engine" {}
-}
-
-class "GtkWidget" style "default"
-
-style "reversed"
-{
- bg[NORMAL] = @fg_color
- fg[NORMAL] = @bg_color
-
- bg[PRELIGHT] = @fg_color
- fg[PRELIGHT] = @bg_color
-}
-widget_class "*GtkButton*" style "reversed"
-
-style "button"
-{
- # inner-border was added in GTK+ 2.10
- GtkButton::inner_border = {15, 15, 10, 10}
- engine "moko-engine" {
- border = TRUE
- gradient = TRUE
- }
-}
-class "GtkButton" style "button"
-
-style "button-colors" {
- bg[NORMAL] = "#333"
- fg[NORMAL] = "#fff"
-
- bg[PRELIGHT] = "#333"
- fg[PRELIGHT] = "#fff"
-}
-widget_class "GtkButton*" style "button-colors"
-
-style "treeview-header" {
-
- # inner-border was added in GTK+ 2.10
- GtkButton::inner_border = {0, 0, 0, 0}
-
- bg[NORMAL] = "#eee"
- fg[NORMAL] = "#000"
-
- bg[PRELIGHT] = "#eee"
- fg[PRELIGHT] = "#000"
-
- engine "moko-engine" {
- border = FALSE
- gradient = TRUE
- }
-}
-widget_class "*GtkTreeView.GtkButton*" style "treeview-header"
-
-style "combo" {
- bg[NORMAL] = @selected_bg_color
- text[NORMAL] = @selected_fg_color
-
- bg[PRELIGHT] = @selected_bg_color
- text[PRELIGHT] = @selected_fg_color
-
- engine "moko-engine" {
- gradient = TRUE
- }
-}
-widget_class "*Combo*" style "combo"
-
-style "toolbar"
-{
- GtkToolbar::internal_padding = 0
- xthickness = 0
- ythickness = 0
-
- engine "moko-engine" {
- gradient = TRUE
- border = FALSE
- }
-}
-class "GtkToolbar" style "toolbar"
-class "GtkToolbar" style "reversed"
-
-style "toolitem"
-{
- xthickness = 12
- ythickness = 12
-
- bg[NORMAL] = @selected_bg_color
- fg[NORMAL] = @selected_fg_color
-
- # toolbar colours are reversed
- bg[PRELIGHT] = @fg_color
- fg[PRELIGHT] = @bg_color
-
- engine "moko-engine" {
- gradient = TRUE
- border = FALSE
- }
-}
-widget_class "*Tool*GtkToggleButton" style "toolitem"
-widget_class "*Tool*GtkButton" style "toolitem"
-
-style "notebook"
-{
- xthickness = 0
- ythickness = 0
-
- # For notebookes, NORMAL is used for the active tab and ACTIVE is used for
- # ther other tabs
-
- # inactive tabs are in "reversed" colours
- bg[ACTIVE] = @fg_color
-
- bg[NORMAL] = @selected_bg_color
- fg[NORMAL] = @selected_fg_color
-}
-class "GtkNotebook" style "notebook"
-
-style "menu"
-{
- engine "moko-engine" {
- gradient = FALSE
- border = TRUE
- }
-}
-class "GtkMenu" style "menu"
-
-style "menubar"
-{
- engine "moko-engine" {
- gradient = TRUE
- }
-}
-class "GtkMenuBar" style "menubar"
-widget_class "*GtkMenuBar*" style "reversed"
-
-style "menuitem"
-{
- xthickness = 8
- ythickness = 8
-
- bg[PRELIGHT] = @selected_bg_color
- fg[PRELIGHT] = @selected_fg_color
-
- engine "moko-engine" {
- gradient = TRUE
- }
-}
-widget_class "*MenuItem*" style "menuitem"
-
-style "scrollbar"
-{
- bg[NORMAL] = @selected_bg_color
- bg[PRELIGHT] = @selected_bg_color
-
- engine "moko-engine" {
- border = TRUE
- }
-}
-class "GtkScrollbar" style "scrollbar"
-
-include "matchboxpanel"
-include "openmoko-calculator"
-include "openmoko-contacts"
-include "openmoko-dialer"
-include "openmoko-panel-plugins"
-
-
Deleted: trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/data/matchboxpanel
===================================================================
--- trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/data/matchboxpanel 2007-11-12 15:42:11 UTC (rev 3397)
+++ trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/data/matchboxpanel 2007-11-12 16:18:32 UTC (rev 3398)
@@ -1,5 +0,0 @@
-style "matchboxpanel" {
- bg[NORMAL] = "#000000"
-}
-widget "MatchboxPanel" style "matchboxpanel"
-
Deleted: trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/data/openmoko-calculator
===================================================================
--- trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/data/openmoko-calculator 2007-11-12 15:42:11 UTC (rev 3397)
+++ trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/data/openmoko-calculator 2007-11-12 16:18:32 UTC (rev 3398)
@@ -1,22 +0,0 @@
-style "calc-window"
-{
- xthickness = 10
- ythickness = 10
-}
-widget "*calculator-frame" style "calc-window"
-
-style "calc-display-bg"
-{
- # display works in reverse colours
- bg[NORMAL] = @selected_fg_color
- fg[NORMAL] = @selected_bg_color
- font_name = "Sans 20"
- xthickness = 10
- ythickness = 10
-}
-widget "*calculator-display-background*" style "calc-display-bg"
-
-style "calculator-button-label" {
- font_name = "Sans 12"
-}
-widget "*calculator-table.GtkButton.*" style "calculator-button-label"
Deleted: trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/data/openmoko-contacts
===================================================================
--- trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/data/openmoko-contacts 2007-11-12 15:42:11 UTC (rev 3397)
+++ trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/data/openmoko-contacts 2007-11-12 16:18:32 UTC (rev 3398)
@@ -1,55 +0,0 @@
-style "mokocontactsadddetail" {
- xthickness = 0
- ythickness = 5
- GtkButton::focus-line-width = 0
-}
-
-
-widget "*moko-contacts-add-detail-button" style "mokocontactsadddetail"
-
-# History view
-style "mokohistorylabel" {
- fg[PRELIGHT] = "#666"
-}
-widget "*.mokohistorylabel" style "mokohistorylabel"
-
-style "mokohistorycall-in" {
- text[PRELIGHT] = "#666"
- base[PRELIGHT] = "#000"
- bg[PRELIGHT] = "#E7FFE6"
- fg[PRELIGHT] = "#00FF00"
-}
-widget "*.mokohistorycall-in" style "mokohistorycall-in"
-
-style "mokohistorycall-out" {
- text[PRELIGHT] = "#666"
- base[PRELIGHT] = "#000"
- bg[PRELIGHT] = "#FFF7E6"
- fg[PRELIGHT] = "#00FF00"
-}
-widget "*.mokohistorycall-out" style "mokohistorycall-out"
-
-style "mokohistorycall-missed" {
- text[PRELIGHT] = "#666"
- base[PRELIGHT] = "#000"
- bg[PRELIGHT] = "#FAD7D2"
- fg[PRELIGHT] = "#00FF00"
-}
-widget "*.mokohistorycall-missed" style "mokohistorycall-missed"
-
-style "mokohistoryemail" {
- text[PRELIGHT] = "#666"
- base[PRELIGHT] = "#000"
- bg[PRELIGHT] = "#FFF"
- fg[PRELIGHT] = "#00FF00"
-}
-widget "*.mokohistoryemail" style "mokohistoryemail"
-
-style "mokohistorysms" {
- text[PRELIGHT] = "#666"
- base[PRELIGHT] = "#000"
- bg[PRELIGHT] = "#E6F9FF"
- fg[PRELIGHT] = "#00FF00"
-}
-widget "*.mokohistorysms" style "mokohistorysms"
-
Deleted: trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/data/openmoko-dialer
===================================================================
--- trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/data/openmoko-dialer 2007-11-12 15:42:11 UTC (rev 3397)
+++ trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/data/openmoko-dialer 2007-11-12 16:18:32 UTC (rev 3398)
@@ -1,22 +0,0 @@
-style "mokodialertextview" {
- # display works in reverse colours
- fg[NORMAL] = @selected_bg_color
- text[NORMAL] = @selected_bg_color
- bg[NORMAL] = @selected_fg_color
- base[NORMAL] = @selected_fg_color
-
- MokoDialerTextview::small_font = 10
- MokoDialerTextview::medium_font = 15
- MokoDialerTextview::large_font = 20
-}
-widget "*.MokoDialerTextview" style "mokodialertextview"
-widget "*.MokoTips*" style "mokodialertextview"
-
-style "keypad" {
- fg[NORMAL] = @fg_color
- bg[NORMAL] = @bg_color
-
- fg[PRELIGHT] = @selected_bg_color
- bg[PRELIGHT] = @selected_fg_color
-}
-widget_class "*.MokoKeypad.*" style "keypad"
Deleted: trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/data/openmoko-panel-plugins
===================================================================
--- trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/data/openmoko-panel-plugins 2007-11-12 15:42:11 UTC (rev 3397)
+++ trunk/src/target/OM-2007.2/libraries/moko-gtk-engine/data/openmoko-panel-plugins 2007-11-12 16:18:32 UTC (rev 3398)
@@ -1,10 +0,0 @@
-style "openmoko-panel-clock" {
- fg[NORMAL] = "#e2e2e2"
- fg[PRELIGHT] = "#e2e2e2"
- fg[ACTIVE] = "#e2e2e2"
-}
-widget "*.MatchboxPanelClock" style "openmoko-panel-clock"
-
-# add styling for other panel plugins here...
-
-
More information about the commitlog
mailing list