[maemo-commits] [maemo-commits] r13657 - in projects/haf/trunk/hildon-desktop: . data debian debian/config
From: subversion at stage.maemo.org subversion at stage.maemo.orgDate: Fri Sep 7 11:18:22 EEST 2007
- Previous message: [maemo-commits] r13655 - projects/haf/trunk/hildon-input-method-plugins-example
- Next message: [maemo-commits] r13658 - projects/haf/trunk/gconf2/debian
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Author: jobi Date: 2007-09-07 11:18:18 +0300 (Fri, 07 Sep 2007) New Revision: 13657 Added: projects/haf/trunk/hildon-desktop/data/bottom-panel.conf.in projects/haf/trunk/hildon-desktop/data/top-panel.conf.in projects/haf/trunk/hildon-desktop/debian/config/ projects/haf/trunk/hildon-desktop/debian/config/applications.menu projects/haf/trunk/hildon-desktop/debian/config/desktop.conf projects/haf/trunk/hildon-desktop/debian/config/home-layout.conf projects/haf/trunk/hildon-desktop/debian/config/home.conf projects/haf/trunk/hildon-desktop/debian/config/notification-groups.conf projects/haf/trunk/hildon-desktop/debian/config/statusbar.conf projects/haf/trunk/hildon-desktop/debian/config/tasknavigator.conf Removed: projects/haf/trunk/hildon-desktop/data/statusbar.conf.in projects/haf/trunk/hildon-desktop/data/tasknavigator.conf.in Modified: projects/haf/trunk/hildon-desktop/ChangeLog projects/haf/trunk/hildon-desktop/configure.ac projects/haf/trunk/hildon-desktop/data/Makefile.am projects/haf/trunk/hildon-desktop/data/applications.menu projects/haf/trunk/hildon-desktop/data/desktop.conf.in projects/haf/trunk/hildon-desktop/data/home.conf.in projects/haf/trunk/hildon-desktop/debian/changelog projects/haf/trunk/hildon-desktop/debian/conffiles projects/haf/trunk/hildon-desktop/debian/rules Log: 2007-09-07 Johan Bilien <johan.bilien at nokia.com> * data/top-panel.conf.in, data/bottom-panel.conf.in: added default panel configurations for hildon-desktop * data/desktop.conf.in: change default layout to 2 panels, bottom and top * data/home.conf.in: removed maemo-specific plugins * data/tasknavigator.conf.in, data/statusbar.conf.in: removed maemo-specific panels * data/applications.menu: Removed maemo-specific applications hildon-desktop (1:0.0.34-2) sardine; urgency=low * debian/config/*: added maemo-specific configuration * debian/rules: install maemo-specific configuration -- Johan Bilien <johan.bilien at nokia.com> Fri, 7 Sep 2007 11:14:36 +0300 Modified: projects/haf/trunk/hildon-desktop/ChangeLog =================================================================== --- projects/haf/trunk/hildon-desktop/ChangeLog 2007-09-07 08:13:17 UTC (rev 13656) +++ projects/haf/trunk/hildon-desktop/ChangeLog 2007-09-07 08:18:18 UTC (rev 13657) @@ -1,3 +1,14 @@ +2007-09-07 Johan Bilien <johan.bilien at nokia.com> + + * data/top-panel.conf.in, data/bottom-panel.conf.in: added + default panel configurations for hildon-desktop + * data/desktop.conf.in: change default layout to 2 panels, + bottom and top + * data/home.conf.in: removed maemo-specific plugins + * data/tasknavigator.conf.in, data/statusbar.conf.in: removed + maemo-specific panels + * data/applications.menu: Removed maemo-specific applications + 2007-09-06 Johan Bilien <johan.bilien at nokia.com> * libhildondesktop/hildon-desktop-popup-menu.c: do not paint Modified: projects/haf/trunk/hildon-desktop/configure.ac =================================================================== --- projects/haf/trunk/hildon-desktop/configure.ac 2007-09-07 08:13:17 UTC (rev 13656) +++ projects/haf/trunk/hildon-desktop/configure.ac 2007-09-07 08:18:18 UTC (rev 13657) @@ -279,8 +279,8 @@ background-manager/background-manager-dbus.h data/Makefile data/desktop.conf -data/tasknavigator.conf -data/statusbar.conf +data/top-panel.conf +data/bottom-panel.conf data/home.conf data/app-switcher.desktop data/others-button.desktop Modified: projects/haf/trunk/hildon-desktop/data/Makefile.am =================================================================== --- projects/haf/trunk/hildon-desktop/data/Makefile.am 2007-09-07 08:13:17 UTC (rev 13656) +++ projects/haf/trunk/hildon-desktop/data/Makefile.am 2007-09-07 08:18:18 UTC (rev 13657) @@ -1,10 +1,7 @@ hildondesktopconf_DATA = \ desktop.conf \ - tasknavigator.conf \ - statusbar.conf \ - home.conf \ - home-layout.conf \ - notification-groups.conf + top-panel.conf \ + bottom-panel.conf hildonnavigatordesktopentry_DATA = \ app-switcher.desktop \ Modified: projects/haf/trunk/hildon-desktop/data/applications.menu =================================================================== --- projects/haf/trunk/hildon-desktop/data/applications.menu 2007-09-07 08:13:17 UTC (rev 13656) +++ projects/haf/trunk/hildon-desktop/data/applications.menu 2007-09-07 08:18:18 UTC (rev 13657) @@ -9,27 +9,18 @@ <!-- Search the default locations --> <DefaultAppDirs/> <DefaultDirectoryDirs/> - - // My selection submenu + + // My selection submenu <Menu> <Name>tana_fi_my_selection</Name> <Include> - <Filename>navicore.desktop</Filename> - <Filename>skype.desktop</Filename> - <Filename>rhapsody.desktop</Filename> - <Filename>mp_ui.desktop</Filename> - <Filename>image-viewer.desktop</Filename> - <Filename>osso_help.desktop</Filename> </Include> </Menu> - // Internet submenu + // Internet submenu <Menu> <Name>tana_fi_internet</Name> <Include> - <Filename>browser.desktop</Filename> - <Filename>bookmark.desktop</Filename> - <Filename>osso_rss_feed_reader.desktop</Filename> </Include> </Menu> @@ -37,23 +28,13 @@ <Menu> <Name>tana_fi_communication</Name> <Include> - <Filename>osso-addressbook.desktop</Filename> - <Filename>email-engine.desktop</Filename> - <Filename>voip-ui.desktop</Filename> - <Filename>chat-ui.desktop</Filename> </Include> </Menu> - // Utilities submenu + // Utilities submenu <Menu> <Name>tana_fi_utilities</Name> <Include> - <Filename>filemanager.desktop</Filename> - <Filename>osso_calculator.desktop</Filename> - <Filename>osso_worldclock.desktop</Filename> - <Filename>osso_notes.desktop</Filename> - <Filename>osso_pdfviewer.desktop</Filename> - <Filename>osso_sketch.desktop</Filename> </Include> </Menu> @@ -63,21 +44,15 @@ <Include> <Filename>hildon-control-panel.desktop</Filename> <Filename>hildon-application-manager.desktop</Filename> - <Filename>osso-backup.desktop</Filename> - <Filename>osso-connectivity-ui-connmgr.desktop</Filename> <Filename>hwr-teacher.desktop</Filename> </Include> </Menu> - // Extras submenu + // Extras submenu <Menu> <Name>tana_fi_extras</Name> <All/> <Include> - <Filename>chess_startup.desktop</Filename> - <Filename>maemoblocks.desktop</Filename> - <Filename>mahjong_startup.desktop</Filename> - <Filename>osso_lmarbles.desktop</Filename> </Include> </Menu> Added: projects/haf/trunk/hildon-desktop/data/bottom-panel.conf.in =================================================================== --- projects/haf/trunk/hildon-desktop/data/bottom-panel.conf.in 2007-09-07 08:13:17 UTC (rev 13656) +++ projects/haf/trunk/hildon-desktop/data/bottom-panel.conf.in 2007-09-07 08:18:18 UTC (rev 13657) @@ -0,0 +1 @@ +[@hildonnavigatordesktopentrydir@/switcher-menu.desktop] Modified: projects/haf/trunk/hildon-desktop/data/desktop.conf.in =================================================================== --- projects/haf/trunk/hildon-desktop/data/desktop.conf.in 2007-09-07 08:13:17 UTC (rev 13656) +++ projects/haf/trunk/hildon-desktop/data/desktop.conf.in 2007-09-07 08:18:18 UTC (rev 13657) @@ -1,13 +1,13 @@ -[Tasknavigator] +[Top panel] X-Type=panel_box X-Position-X=0 X-Position-Y=0 -X-Size-Width=480 +X-Size-Width=800 X-Size-Height=80 -X-Orientation=left -X-UI-Policy=libtasknavigatorpolicy.so +X-Orientation=top +# X-UI-Policy=libpanelpolicy.so X-Is-Ordered=1 -X-Config-File=tasknavigator.conf +X-Config-File=top-panel.conf X-Plugin-Dir=@hildonnavigatordesktopentrydir@ [Home] @@ -21,14 +21,14 @@ X-Config-File=home.conf X-Plugin-Dir=@hildonhomedesktopentrydir@ -[Statusbar] -X-Type=panel_expandable -X-Position-X=423 -X-Position-Y=0 -X-Size-Width=282 -X-Size-Height=50 -X-Orientation=top +[Bottom panel] +X-Type=panel_box +X-Position-X=0 +X-Position-Y=400 +X-Size-Width=800 +X-Size-Height=80 +X-Orientation=bottom +# X-UI-Policy=libpanelpolicy.so X-Is-Ordered=1 -X-Load-New-Plugins=1 -X-Config-File=statusbar.conf +X-Config-File=bottom-panel.conf X-Plugin-Dir=@hildonstatusbardesktopentrydir@ Modified: projects/haf/trunk/hildon-desktop/data/home.conf.in =================================================================== --- projects/haf/trunk/hildon-desktop/data/home.conf.in 2007-09-07 08:13:17 UTC (rev 13656) +++ projects/haf/trunk/hildon-desktop/data/home.conf.in 2007-09-07 08:18:18 UTC (rev 13657) @@ -1,3 +1 @@ -[@hildonhomedesktopentrydir@/isearch-applet.desktop] -[@hildonhomedesktopentrydir@/promo-plugin.desktop] -[@hildonhomedesktopentrydir@/tutorial-home.desktop] +[@hildonhomedesktopentrydir@/hildon-home-webshortcut.desktop] Deleted: projects/haf/trunk/hildon-desktop/data/statusbar.conf.in =================================================================== --- projects/haf/trunk/hildon-desktop/data/statusbar.conf.in 2007-09-07 08:13:17 UTC (rev 13656) +++ projects/haf/trunk/hildon-desktop/data/statusbar.conf.in 2007-09-07 08:18:18 UTC (rev 13657) @@ -1,10 +0,0 @@ -[@hildonstatusbardesktopentrydir@/hildon-status-bar-battery.desktop] -[@hildonstatusbardesktopentrydir@/hildon-status-bar-internet.desktop] -[@hildonstatusbardesktopentrydir@/sound.desktop] -[@hildonstatusbardesktopentrydir@/hildon-status-bar-display.desktop] -[@hildonstatusbardesktopentrydir@/presence.desktop] -[@hildonstatusbardesktopentrydir@/contact.desktop] -[@hildonstatusbardesktopentrydir@/hildon-status-bar-bluetooth.desktop] -[@hildonstatusbardesktopentrydir@/location.desktop] -[@hildonstatusbardesktopentrydir@/hildon-status-bar-alarm.desktop] -[@hildonstatusbardesktopentrydir@/hildon-status-bar-usb.desktop] Deleted: projects/haf/trunk/hildon-desktop/data/tasknavigator.conf.in =================================================================== --- projects/haf/trunk/hildon-desktop/data/tasknavigator.conf.in 2007-09-07 08:13:17 UTC (rev 13656) +++ projects/haf/trunk/hildon-desktop/data/tasknavigator.conf.in 2007-09-07 08:18:18 UTC (rev 13657) @@ -1,5 +0,0 @@ -[@hildonnavigatordesktopentrydir@/hildon-task-navigator-bookmarks.desktop] -[@hildonnavigatordesktopentrydir@/osso-contact-plugin.desktop] -[@hildonnavigatordesktopentrydir@/applications-menu.desktop] -[@hildonnavigatordesktopentrydir@/app-switcher.desktop] -[@hildonnavigatordesktopentrydir@/switcher-menu.desktop] Added: projects/haf/trunk/hildon-desktop/data/top-panel.conf.in =================================================================== --- projects/haf/trunk/hildon-desktop/data/top-panel.conf.in 2007-09-07 08:13:17 UTC (rev 13656) +++ projects/haf/trunk/hildon-desktop/data/top-panel.conf.in 2007-09-07 08:18:18 UTC (rev 13657) @@ -0,0 +1 @@ +[@hildonnavigatordesktopentrydir@/applications-menu.desktop] Modified: projects/haf/trunk/hildon-desktop/debian/changelog =================================================================== --- projects/haf/trunk/hildon-desktop/debian/changelog 2007-09-07 08:13:17 UTC (rev 13656) +++ projects/haf/trunk/hildon-desktop/debian/changelog 2007-09-07 08:18:18 UTC (rev 13657) @@ -1,3 +1,10 @@ +hildon-desktop (1:0.0.34-2) sardine; urgency=low + + * debian/config/*: added maemo-specific configuration + * debian/rules: install maemo-specific configuration + + -- Johan Bilien <johan.bilien at nokia.com> Fri, 7 Sep 2007 11:14:36 +0300 + hildon-desktop (1:0.0.34-1) sardine; urgency=low * src/hd-panel-window-dialog.c, Modified: projects/haf/trunk/hildon-desktop/debian/conffiles =================================================================== --- projects/haf/trunk/hildon-desktop/debian/conffiles 2007-09-07 08:13:17 UTC (rev 13656) +++ projects/haf/trunk/hildon-desktop/debian/conffiles 2007-09-07 08:18:18 UTC (rev 13657) @@ -5,4 +5,4 @@ /etc/osso-af-init/hildon-desktop.sh /etc/xdg/menus/applications.menu /etc/init.d/hildon-desktop -/etc/osso-backup/restore.d/restore-menu.sh +/etc/osso-backup/restore.d/always/restore-menu.sh Added: projects/haf/trunk/hildon-desktop/debian/config/applications.menu =================================================================== --- projects/haf/trunk/hildon-desktop/debian/config/applications.menu 2007-09-07 08:13:17 UTC (rev 13656) +++ projects/haf/trunk/hildon-desktop/debian/config/applications.menu 2007-09-07 08:18:18 UTC (rev 13657) @@ -0,0 +1,84 @@ +<!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN" + "http://www.freedesktop.org/standards/menu-spec/menu-1.0.dtd"> + +<Menu> + + <!-- This is actually not needed --> + <Name>Others Menu</Name> + + <!-- Search the default locations --> + <DefaultAppDirs/> + <DefaultDirectoryDirs/> + + // My selection submenu + <Menu> + <Name>tana_fi_my_selection</Name> + <Include> + <Filename>navicore.desktop</Filename> + <Filename>skype.desktop</Filename> + <Filename>rhapsody.desktop</Filename> + <Filename>mp_ui.desktop</Filename> + <Filename>image-viewer.desktop</Filename> + <Filename>osso_help.desktop</Filename> + </Include> + </Menu> + + // Internet submenu + <Menu> + <Name>tana_fi_internet</Name> + <Include> + <Filename>browser.desktop</Filename> + <Filename>bookmark.desktop</Filename> + <Filename>osso_rss_feed_reader.desktop</Filename> + </Include> + </Menu> + + // Communication submenu + <Menu> + <Name>tana_fi_communication</Name> + <Include> + <Filename>osso-addressbook.desktop</Filename> + <Filename>email-engine.desktop</Filename> + <Filename>voip-ui.desktop</Filename> + <Filename>chat-ui.desktop</Filename> + </Include> + </Menu> + + // Utilities submenu + <Menu> + <Name>tana_fi_utilities</Name> + <Include> + <Filename>filemanager.desktop</Filename> + <Filename>osso_calculator.desktop</Filename> + <Filename>osso_worldclock.desktop</Filename> + <Filename>osso_notes.desktop</Filename> + <Filename>osso_pdfviewer.desktop</Filename> + <Filename>osso_sketch.desktop</Filename> + </Include> + </Menu> + + // Settings submenu + <Menu> + <Name>tana_fi_settings</Name> + <Include> + <Filename>hildon-control-panel.desktop</Filename> + <Filename>hildon-application-manager.desktop</Filename> + <Filename>osso-backup.desktop</Filename> + <Filename>osso-connectivity-ui-connmgr.desktop</Filename> + <Filename>hwr-teacher.desktop</Filename> + </Include> + </Menu> + + // Extras submenu + <Menu> + <Name>tana_fi_extras</Name> + <All/> + <Include> + <Filename>chess_startup.desktop</Filename> + <Filename>maemoblocks.desktop</Filename> + <Filename>mahjong_startup.desktop</Filename> + <Filename>osso_lmarbles.desktop</Filename> + </Include> + </Menu> + +</Menu> Added: projects/haf/trunk/hildon-desktop/debian/config/desktop.conf =================================================================== --- projects/haf/trunk/hildon-desktop/debian/config/desktop.conf 2007-09-07 08:13:17 UTC (rev 13656) +++ projects/haf/trunk/hildon-desktop/debian/config/desktop.conf 2007-09-07 08:18:18 UTC (rev 13657) @@ -0,0 +1,34 @@ +[Tasknavigator] +X-Type=panel_box +X-Position-X=0 +X-Position-Y=0 +X-Size-Width=480 +X-Size-Height=80 +X-Orientation=left +X-UI-Policy=libtasknavigatorpolicy.so +X-Is-Ordered=1 +X-Config-File=tasknavigator.conf +X-Plugin-Dir=/usr/share/applications/hildon-navigator + +[Home] +X-Type=home +X-Padding-Left=10 +X-Padding-Right=10 +X-Padding-Top=10 +X-Padding-Bottom=10 +X-Is-Ordered=0 +X-Load-New-Plugins=1 +X-Config-File=home.conf +X-Plugin-Dir=/usr/share/applications/hildon-home + +[Statusbar] +X-Type=panel_expandable +X-Position-X=423 +X-Position-Y=0 +X-Size-Width=282 +X-Size-Height=50 +X-Orientation=top +X-Is-Ordered=1 +X-Load-New-Plugins=1 +X-Config-File=statusbar.conf +X-Plugin-Dir=/usr/share/applications/hildon-status-bar Added: projects/haf/trunk/hildon-desktop/debian/config/home-layout.conf =================================================================== --- projects/haf/trunk/hildon-desktop/debian/config/home-layout.conf 2007-09-07 08:13:17 UTC (rev 13656) +++ projects/haf/trunk/hildon-desktop/debian/config/home-layout.conf 2007-09-07 08:18:18 UTC (rev 13657) @@ -0,0 +1,11 @@ +[/usr/share/applications/hildon-home/isearch-applet.desktop] +X=0 +Y=0 + +[/usr/share/applications/hildon-home/promo-plugin.desktop] +X=400 +Y=150 + +[/usr/share/applications/hildon-home/tutorial-home.desktop] +X=400 +Y=280 Added: projects/haf/trunk/hildon-desktop/debian/config/home.conf =================================================================== --- projects/haf/trunk/hildon-desktop/debian/config/home.conf 2007-09-07 08:13:17 UTC (rev 13656) +++ projects/haf/trunk/hildon-desktop/debian/config/home.conf 2007-09-07 08:18:18 UTC (rev 13657) @@ -0,0 +1,3 @@ +[/usr/share/applications/hildon-home/isearch-applet.desktop] +[/usr/share/applications/hildon-home/promo-plugin.desktop] +[/usr/share/applications/hildon-home/tutorial-home.desktop] Added: projects/haf/trunk/hildon-desktop/debian/config/notification-groups.conf =================================================================== --- projects/haf/trunk/hildon-desktop/debian/config/notification-groups.conf 2007-09-07 08:13:17 UTC (rev 13656) +++ projects/haf/trunk/hildon-desktop/debian/config/notification-groups.conf 2007-09-07 08:18:18 UTC (rev 13657) @@ -0,0 +1,5 @@ +[E-mail] +Icon=qgn_list_gene_mail +Category=email.arrive +Label=tana_fi_more_messages +DBus-Call=com.nokia.controlpanel /com/nokia/controlpanel com.nokia.controlpanel top_application Added: projects/haf/trunk/hildon-desktop/debian/config/statusbar.conf =================================================================== --- projects/haf/trunk/hildon-desktop/debian/config/statusbar.conf 2007-09-07 08:13:17 UTC (rev 13656) +++ projects/haf/trunk/hildon-desktop/debian/config/statusbar.conf 2007-09-07 08:18:18 UTC (rev 13657) @@ -0,0 +1,10 @@ +[/usr/share/applications/hildon-status-bar/hildon-status-bar-battery.desktop] +[/usr/share/applications/hildon-status-bar/hildon-status-bar-internet.desktop] +[/usr/share/applications/hildon-status-bar/sound.desktop] +[/usr/share/applications/hildon-status-bar/hildon-status-bar-display.desktop] +[/usr/share/applications/hildon-status-bar/presence.desktop] +[/usr/share/applications/hildon-status-bar/contact.desktop] +[/usr/share/applications/hildon-status-bar/hildon-status-bar-bluetooth.desktop] +[/usr/share/applications/hildon-status-bar/location.desktop] +[/usr/share/applications/hildon-status-bar/hildon-status-bar-alarm.desktop] +[/usr/share/applications/hildon-status-bar/hildon-status-bar-usb.desktop] Added: projects/haf/trunk/hildon-desktop/debian/config/tasknavigator.conf =================================================================== --- projects/haf/trunk/hildon-desktop/debian/config/tasknavigator.conf 2007-09-07 08:13:17 UTC (rev 13656) +++ projects/haf/trunk/hildon-desktop/debian/config/tasknavigator.conf 2007-09-07 08:18:18 UTC (rev 13657) @@ -0,0 +1,5 @@ +[/usr/share/applications/hildon-navigator/hildon-task-navigator-bookmarks.desktop] +[/usr/share/applications/hildon-navigator/osso-contact-plugin.desktop] +[/usr/share/applications/hildon-navigator/applications-menu.desktop] +[/usr/share/applications/hildon-navigator/app-switcher.desktop] +[/usr/share/applications/hildon-navigator/switcher-menu.desktop] Modified: projects/haf/trunk/hildon-desktop/debian/rules =================================================================== --- projects/haf/trunk/hildon-desktop/debian/rules 2007-09-07 08:13:17 UTC (rev 13656) +++ projects/haf/trunk/hildon-desktop/debian/rules 2007-09-07 08:18:18 UTC (rev 13657) @@ -89,6 +89,9 @@ # Add here commands to install the package into debian/build $(MAKE) install DESTDIR=$(CURDIR)/debian/build + install -m644 $(CURDIR)/debian/config/*.conf $(CURDIR)/debian/build/etc/hildon-desktop + install -m644 $(CURDIR)/debian/config/*.menu $(CURDIR)/debian/build/etc/xdg/menus + ifeq "$(strip $(LAUNCHER))" "yes" mv debian/build/usr/bin/hildon-desktop debian/build/usr/bin/hildon-desktop.launch ln -s maemo-invoker debian/build/usr/bin/hildon-desktop
- Previous message: [maemo-commits] r13655 - projects/haf/trunk/hildon-input-method-plugins-example
- Next message: [maemo-commits] r13658 - projects/haf/trunk/gconf2/debian
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]