Changeset 619

Timestamp:

06/18/08 10:14:27 (5 months ago)

Author:

free

Message:

* New gconf defaults for netbook applets
* Exclude wine from menus
* Added Makefile

Location:

trinity/trunk

Files:

• Makefile (added)
• debian/changelog (modified) (1 diff)
• debian/postinst (modified) (1 diff)
• debian/trinity.gconf-defaults (modified) (4 diffs)
• session/trinity-session (modified) (1 diff)

trinity/trunk/debian/changelog

@@ +1 @@
+trinity (0.5.11) UNRELEASED; urgency=low
+
+  * New gconf defaults for netbook applets
+  * Exclude wine from menus
+  * Added Makefile
+
+ -- Trinity <trinity@trinity>  Wed, 18 Jun 2008 11:12:06 +0200
+
 trinity (0.5.10) 64studio; urgency=low
 

trinity/trunk/debian/postinst

@@ -26 +26 @@
         cdd-config touchscreen
         cdd-config asoundrc
+        cdd-config menu wine
 
         # Configure dpsyco users

trinity/trunk/debian/trinity.gconf-defaults

@@ -1 @@
-/apps/panel/general/toplevel_id_list [bottom_panel]
-/apps/panel/toplevels/bottom_panel/size 24
-/apps/panel/toplevels/bottom_panel/orientation bottom
-/apps/panel/toplevels/bottom_panel/expand true
-/apps/panel/general/object_id_list [menu]
-/apps/panel/objects/menu/locked true
-/apps/panel/objects/menu/menu_path applications:/
-/apps/panel/objects/menu/object_type menu-object
-/apps/panel/objects/menu/position 0
-/apps/panel/objects/menu/toplevel_id bottom_panel
-/apps/panel/general/applet_id_list [windows,clock,brightness,mixer,tray,workspaces,trash]
-/apps/panel/applets/trash/bonobo_iid OAFIID:GNOME_Panel_TrashApplet
-/apps/panel/applets/trash/object_type bonobo-applet
-/apps/panel/applets/trash/panel_right_stick true
-/apps/panel/applets/trash/position 110
-/apps/panel/applets/trash/toplevel_id bottom_panel
-/apps/panel/applets/trash/locked true
-/apps/panel/applets/workspaces/bonobo_iid OAFIID:GNOME_WorkspaceSwitcherApplet
-/apps/panel/applets/workspaces/object_type bonobo-applet
-/apps/panel/applets/workspaces/panel_right_stick true
-/apps/panel/applets/workspaces/position 130
-/apps/panel/applets/workspaces/toplevel_id bottom_panel
-/apps/panel/applets/workspaces/locked true
+/apps/panel/general/toplevel_id_list [top_panel]
+/apps/panel/toplevels/top_panel/size 24
+/apps/panel/toplevels/top_panel/orientation top
+/apps/panel/toplevels/top_panel/expand true
+/apps/panel/general/object_id_list []
+/apps/panel/general/applet_id_list [home,windows,clock,brightness,mixer,tray]
+/apps/panel/applets/home/bonobo_iid OAFIID:GNOME_GoHome
+/apps/panel/applets/home/object_type bonobo-applet
+/apps/panel/applets/home/panel_right_stick false
+/apps/panel/applets/home/position 0
+/apps/panel/applets/home/toplevel_id top_panel
+/apps/panel/applets/home/locked true
 /apps/panel/applets/tray/bonobo_iid OAFIID:GNOME_NotificationAreaApplet
 /apps/panel/applets/tray/object_type bonobo-applet
 /apps/panel/applets/tray/panel_right_stick true
-/apps/panel/applets/tray/position 150
-/apps/panel/applets/tray/toplevel_id bottom_panel
+/apps/panel/applets/tray/position 0
+/apps/panel/applets/tray/toplevel_id top_panel
 /apps/panel/applets/tray/locked true
 /apps/panel/applets/mixer/bonobo_iid OAFIID:GNOME_MixerApplet
 /apps/panel/applets/mixer/object_type bonobo-applet
 /apps/panel/applets/mixer/panel_right_stick true
-/apps/panel/applets/mixer/position 170
-/apps/panel/applets/mixer/toplevel_id bottom_panel
+/apps/panel/applets/mixer/position 20
+/apps/panel/applets/mixer/toplevel_id top_panel
 /apps/panel/applets/mixer/locked true
 /apps/panel/applets/brightness/bonobo_iid OAFIID:GNOME_BrightnessApplet
 /apps/panel/applets/brightness/object_type bonobo-applet
 /apps/panel/applets/brightness/panel_right_stick true
-/apps/panel/applets/brightness/position 190
-/apps/panel/applets/brightness/toplevel_id bottom_panel
+/apps/panel/applets/brightness/position 40
+/apps/panel/applets/brightness/toplevel_id top_panel
 /apps/panel/applets/brightness/locked true
 /apps/panel/applets/clock/bonobo_iid OAFIID:GNOME_ClockApplet
 /apps/panel/applets/clock/object_type bonobo-applet
 /apps/panel/applets/clock/panel_right_stick true
-/apps/panel/applets/clock/position 200
-/apps/panel/applets/clock/toplevel_id bottom_panel
+/apps/panel/applets/clock/position 60
+/apps/panel/applets/clock/toplevel_id top_panel
 /apps/panel/applets/clock/locked true
 /apps/panel/applets/clock/prefs/show_date false
 /apps/panel/applets/clock/prefs/format 24-hour
-/apps/panel/applets/windows/bonobo_iid OAFIID:GNOME_WindowListApplet
+/apps/panel/applets/windows/bonobo_iid OAFIID:GNOME_WindowPicker
 /apps/panel/applets/windows/object_type bonobo-applet
 /apps/panel/applets/windows/panel_right_stick false
-/apps/panel/applets/windows/position 24
-/apps/panel/applets/windows/toplevel_id bottom_panel
+/apps/panel/applets/windows/position 100
+/apps/panel/applets/windows/toplevel_id top_panel
 /apps/panel/applets/windows/locked true
 /desktop/gnome/sound/enable_esd false
@@ -58 +47 @@
 /desktop/gnome/background/picture_filename /usr/share/pixmaps/trinity/logo.png
 /desktop/gnome/interface/gtk_color_scheme selected_bg_color:#797c797c797c
-/desktop/gnome/interface/gtk_theme Mist
+/desktop/gnome/interface/gtk_theme Glider
 /desktop/gnome/interface/icon_theme yasis
 /desktop/gnome/interface/gtk_key_theme Default
@@ -65 +54 @@
 /desktop/gnome/applications/browser/exec epiphany
 /apps/metacity/global_keybindings/panel_main_menu 0xd9
-/apps/metacity/general/theme Metabox
-/apps/compiz/general/allscreens/options/active_plugins [regex,place,extrawm,winrules,neg,video,vpswitch,core,resize,png,resizeinfo,move,workardounds,text,svg,imgjpeg,dbus,session,decoration,snap,wall,animation,expo,fade,scale,scaleaddon,ezoom,switcher,scalefilter]
-/apps/compiz/plugins/winrules/screen0/options/no_maximize_match (class=Ardour| class=frame | class=Hydrogen | class=Idjcgui.py) & !(title=ardour: plugins | name=ardour_plugin_editor)
-/apps/compiz/plugins/winrules/screen0/options/no_move_match (class=Ardour | class=frame | class=Hydrogen) & !(title=ardour: plugins | name=ardour_plugin_editor)
-/apps/compiz/plugins/winrules/screen0/options/no_resize_match (class=Ardour | class=frame | class=Hydrogen) & !(title=ardour: plugins | name=ardour_plugin_editor)
-/apps/compiz/plugins/winrules/screen0/options/size_matches [(class=Ardour) & name=ardour_editor,class=frame,class=Hydrogen]
-/apps/compiz/plugins/wall/allscreens/options/prev_key <Control>Left
-/apps/compiz/plugins/wall/allscreens/options/next_key <Control>Right
+/apps/metacity/general/theme Mist
 /apps/metacity/global_keybindings/switch_windows <Control>Up
 /apps/metacity/global_keybindings/show_desktop <Control>Down
@@ -78 +60 @@
 /apps/gnome-volume-control/HDAIntelAlsamixerMic true
 /apps/gnome-volume-control/HDAIntelAlsamixerMicBoost true
+/apps/maximus/exclude_class [JACK Audio Connection Kit,pidgin,Pidgin,skype,Skype,gcalctool,gimp-2.4,Gimp-2.4,GNU Image Manipulation Program]

trinity/trunk/session/trinity-session

@@ -1 +1 @@
 #!/bin/sh
 
-gconftool-2 --list-type=int -s --type=list /apps/compiz/plugins/winrules/screen0/options/size_height_values "[547,547,547]"
-gconftool-2 --list-type=int -s --type=list /apps/compiz/plugins/winrules/screen0/options/size_width_values "[1022,1022,1022]"
+exec maximus