From ed0c78bec64ee0e17e8459c345831d6732f70d51 Mon Sep 17 00:00:00 2001 From: Mahyuddin Idram Ahamd Date: Tue, 5 Feb 2013 12:02:43 +0700 Subject: [PATCH 1/3] Implementation blankon-session & manokwari-applications.menu --- Makefile.am | 5 +- configure.ac | 33 ++- files/bin/Makefile.am | 9 + files/bin/gnome-session-blankon | 3 + files/bin/gnome-session-blankon-fallback | 3 + files/menus/Makefile.am | 9 + files/menus/manokwari-applications.menu | 347 +++++++++++++++++++++++ files/sessions/Makefile.am | 9 + files/sessions/blankon-fallback.session | 4 + files/sessions/blankon.session | 7 + files/xsessions/Makefile.am | 9 + files/xsessions/blankon-fallback.desktop | 8 + files/xsessions/blankon.desktop | 8 + 13 files changed, 451 insertions(+), 3 deletions(-) create mode 100644 files/bin/Makefile.am create mode 100755 files/bin/gnome-session-blankon create mode 100755 files/bin/gnome-session-blankon-fallback create mode 100644 files/menus/Makefile.am create mode 100644 files/menus/manokwari-applications.menu create mode 100644 files/sessions/Makefile.am create mode 100644 files/sessions/blankon-fallback.session create mode 100644 files/sessions/blankon.session create mode 100644 files/xsessions/Makefile.am create mode 100644 files/xsessions/blankon-fallback.desktop create mode 100644 files/xsessions/blankon.desktop diff --git a/Makefile.am b/Makefile.am index d91f289..8d5b6a7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -7,7 +7,10 @@ SUBDIRS = \ src \ system \ po \ - tests \ + files/bin \ + files/sessions \ + files/xsessions \ + files/menus \ $(NULL) manokwaridocdir = ${prefix}/doc/manokwari diff --git a/configure.ac b/configure.ac index b909000..45a6b2d 100644 --- a/configure.ac +++ b/configure.ac @@ -20,6 +20,32 @@ AC_DEFINE(SYSTEM_PATH, "/usr/lib/manokwari/system", [Location of the JS scripts] AC_SUBST(SYSTEM_PATH) fi +AC_ARG_ENABLE([devel], AC_HELP_STRING([--enable-devel],[Enable development mode with sessions dir in current directory]), USE_DEVEL="$enableval", USE_DEVEL="no") +if test $USE_DEVEL = yes ; then +AC_DEFINE_UNQUOTED(SESSIONS_PATH, "$PWD/files/sessions", [Location of the Sessions scripts]) +AC_SUBST(SESSIONS_PATH) +else +AC_DEFINE(SESSIONS_PATH, "/usr/share/gnome-session/sessions", [Location of the Sessions scripts]) +AC_SUBST(SESSIONS_PATH) +fi + +AC_ARG_ENABLE([devel], AC_HELP_STRING([--enable-devel],[Enable development mode with xsessions dir in current directory]), USE_DEVEL="$enableval", USE_DEVEL="no") +if test $USE_DEVEL = yes ; then +AC_DEFINE_UNQUOTED(XSESSIONS_PATH, "$PWD/files/xsessions", [Location of the Xsessions scripts]) +AC_SUBST(XSESSIONS_PATH) +else +AC_DEFINE(XSESSIONS_PATH, "/usr/share/xsessions", [Location of the Xsessions scripts]) +AC_SUBST(XSESSIONS_PATH) +fi + +AC_ARG_ENABLE([devel], AC_HELP_STRING([--enable-devel],[Enable development mode with bin dir in current directory]), USE_DEVEL="$enableval", USE_DEVEL="no") +if test $USE_DEVEL = yes ; then +AC_DEFINE_UNQUOTED(BIN_PATH, "$PWD/files/bin", [Location of the Session scripts]) +AC_SUBST(BIN_PATH) +else +AC_DEFINE(BIN_PATH, "/usr/bin", [Location of the Session scripts]) +AC_SUBST(BIN_PATH) +fi AH_TEMPLATE([GETTEXT_PACKAGE], [Package name for gettext]) GETTEXT_PACKAGE=manokwari @@ -62,7 +88,10 @@ AC_CONFIG_FILES([Makefile data/manokwari.desktop src/Makefile system/Makefile - tests/Makefile - po/Makefile.in]) + po/Makefile.in + files/bin/Makefile + files/sessions/Makefile + files/xsessions/Makefile + files/menus/Makefile]) AC_OUTPUT diff --git a/files/bin/Makefile.am b/files/bin/Makefile.am new file mode 100644 index 0000000..8967373 --- /dev/null +++ b/files/bin/Makefile.am @@ -0,0 +1,9 @@ +sessiondir = $(bindir) + +session_DATA = \ + gnome-session-blankon \ + gnome-session-blankon-fallback \ + $(NULL) + +CLEANFILES = \ + $(sessiondir_DATA) diff --git a/files/bin/gnome-session-blankon b/files/bin/gnome-session-blankon new file mode 100755 index 0000000..963ad84 --- /dev/null +++ b/files/bin/gnome-session-blankon @@ -0,0 +1,3 @@ +#! /bin/sh +exec gnome-session --session blankon "$@" + diff --git a/files/bin/gnome-session-blankon-fallback b/files/bin/gnome-session-blankon-fallback new file mode 100755 index 0000000..473334e --- /dev/null +++ b/files/bin/gnome-session-blankon-fallback @@ -0,0 +1,3 @@ +#! /bin/sh +exec gnome-session --session blankon2d "$@" + diff --git a/files/menus/Makefile.am b/files/menus/Makefile.am new file mode 100644 index 0000000..3a484ed --- /dev/null +++ b/files/menus/Makefile.am @@ -0,0 +1,9 @@ +prefix = / +menusdir = $(sysconfdir)/xdg/menus + +menus_DATA = \ + manokwari-applications.menu \ + $(NULL) + +CLEANFILES = \ + $(menusdir_DATA) diff --git a/files/menus/manokwari-applications.menu b/files/menus/manokwari-applications.menu new file mode 100644 index 0000000..6f68f3c --- /dev/null +++ b/files/menus/manokwari-applications.menu @@ -0,0 +1,347 @@ + + + + + Applications + X-GNOME-Menu-Applications.directory + + + /etc/X11/applnk + /usr/share/gnome/apps + + + + + + + + + + + Accessories + Utility.directory + + + Utility + + Accessibility + System + + + + + + + Universal + Utility-Accessibility.directory + + + Accessibility + Settings + + + + + + + Development + Development.directory + + + Development + + emacs.desktop + + + + + + Education + Education.directory + + + Education + Science + + + + + + + Science + GnomeScience.directory + + + Education + Science + + + + + + + Games + Game.directory + + + Game + ActionGame + AdventureGame + ArcadeGame + BoardGame + BlocksGame + CardGame + KidsGame + LogicGame + Simulation + SportsGame + StrategyGame + + + + + + + + Action + ActionGames.directory + + ActionGame + + + + Adventure + AdventureGames.directory + + AdventureGame + + + + Arcade + ArcadeGames.directory + + ArcadeGame + + + + Board + BoardGames.directory + + BoardGame + + + + Blocks + BlocksGames.directory + + BlocksGame + + + + Cards + CardGames.directory + + CardGame + + + + Kids + KidsGames.directory + + KidsGame + + + + Logic + LogicGames.directory + + LogicGame + + + + Role Playing + RolePlayingGames.directory + + RolePlaying + + + + Simulation + SimulationGames.directory + + Simulation + + + + Sports + SportsGames.directory + + SportsGame + + + + Strategy + StrategyGames.directory + + StrategyGame + + + + + + + Graphics + Graphics.directory + + + Graphics + + + + + + + Internet + Network.directory + + + Network + + + + + + + Islamic-Software + Islamic-Software.directory + + + X-Islamic-Software + X-Quran + + + + + + + + Quran + Quran.directory + + X-Quran + + + + + + + Multimedia + AudioVideo.directory + + + AudioVideo + + + + + + + Office + Office.directory + + + Office + + + + + + + System + System-Tools.directory + + + System + Settings + Game + + + + + + Preferences + Settings.directory + + + Settings + + + System + X-GNOME-Settings-Panel + + + + + + + + Administration + Settings-System.directory + + + Settings + System + + X-GNOME-Settings-Panel + + + + + + + + Other + X-GNOME-Other.directory + + + + Core + Screensaver + X-GNOME-Settings-Panel + + + + + + + Accessories + Debian + Education + Games + Graphics + Internet + Islamic-Software + Office + Other + Development + Multimedia + Science + System + Preferences + Administration + Universal + + + + + + Debian + debian-menu.menu + Debian.directory + + + diff --git a/files/sessions/Makefile.am b/files/sessions/Makefile.am new file mode 100644 index 0000000..0367cfc --- /dev/null +++ b/files/sessions/Makefile.am @@ -0,0 +1,9 @@ +sessionsdir = $(datadir)/gnome-session/sessions + +sessions_DATA = \ + blankon.session \ + blankon-fallback.session \ + $(NULL) + +CLEANFILES = \ + $(sessionsdir_DATA) diff --git a/files/sessions/blankon-fallback.session b/files/sessions/blankon-fallback.session new file mode 100644 index 0000000..3913a76 --- /dev/null +++ b/files/sessions/blankon-fallback.session @@ -0,0 +1,4 @@ +[GNOME Session] +Name=BlankOn fallback (Safe Mode) +RequiredComponents=manokwari;gnome-wm; +DesktopName=GNOME diff --git a/files/sessions/blankon.session b/files/sessions/blankon.session new file mode 100644 index 0000000..89abcff --- /dev/null +++ b/files/sessions/blankon.session @@ -0,0 +1,7 @@ +[GNOME Session] +Name=BlankOn +RequiredComponents=gnome-wm;manokwari; +IsRunnableHelper=/usr/lib/gnome-session/gnome-session-check-accelerated +FallbackSession=blankon-fallback +DesktopName=GNOME + diff --git a/files/xsessions/Makefile.am b/files/xsessions/Makefile.am new file mode 100644 index 0000000..94cdbe4 --- /dev/null +++ b/files/xsessions/Makefile.am @@ -0,0 +1,9 @@ +xsessionsdir = $(datadir)/xsessions + +xsessions_DATA = \ + blankon.desktop \ + blankon-fallback.desktop \ + $(NULL) + +CLEANFILES = \ + $(xsessionsdir_DATA) diff --git a/files/xsessions/blankon-fallback.desktop b/files/xsessions/blankon-fallback.desktop new file mode 100644 index 0000000..3d5af4c --- /dev/null +++ b/files/xsessions/blankon-fallback.desktop @@ -0,0 +1,8 @@ +[Desktop Entry] +Name=BlankOn Fallback +Comment=This session logs you into GNOME with the traditional panel without any +graphical effect. +Exec=blankon-session-fallback +TryExec=blankon-session-fallback +Icon= +Type=Application diff --git a/files/xsessions/blankon.desktop b/files/xsessions/blankon.desktop new file mode 100644 index 0000000..7843ef0 --- /dev/null +++ b/files/xsessions/blankon.desktop @@ -0,0 +1,8 @@ +[Desktop Entry] +Name=BlankOn +Comment=This session logs you into BlankOn +Exec=gnome-session-blankon +TryExec=/usr/bin/manokwari +Icon= +Type=Application + From 6cd558841927884157161e7070b12d483e382113 Mon Sep 17 00:00:00 2001 From: Mahyuddin Idram Ahamd Date: Tue, 5 Feb 2013 13:41:27 +0700 Subject: [PATCH 2/3] Implementation blankon-session & manokwari-applications.menu --- system/menu.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/menu.js b/system/menu.js index 3fa9774..b2d64e3 100644 --- a/system/menu.js +++ b/system/menu.js @@ -379,7 +379,7 @@ var menu = (function() { - var dataApplications = new XdgData("applications.menu"); + var dataApplications = new XdgData("manokwari-applications.menu"); dataApplications.backend.updateCallback("menu.update()"); var dataPlaces = new PlacesData(); From ba2ffee41fa4cbb73dc7c47f478e0e0e428375c9 Mon Sep 17 00:00:00 2001 From: Mahyuddin Idram Ahamd Date: Tue, 5 Feb 2013 13:44:44 +0700 Subject: [PATCH 3/3] Implementation blankon-session & manokwari-applications.menu --- files/bin/gnome-session-blankon-fallback | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/files/bin/gnome-session-blankon-fallback b/files/bin/gnome-session-blankon-fallback index 473334e..e241203 100755 --- a/files/bin/gnome-session-blankon-fallback +++ b/files/bin/gnome-session-blankon-fallback @@ -1,3 +1,3 @@ #! /bin/sh -exec gnome-session --session blankon2d "$@" +exec gnome-session --session blankon-fallback "$@"