Menu override

.gitignore

@@ -46,5 +46,4 @@ docs/reference/unity-gtk-module/unity-gtk-module.prerequisites
 docs/reference/unity-gtk-module/unity-gtk-module.signals
 libtool
 data/appmenu.desktop.plugin.in
-data/*.desktop.in
 CMakeLists.txt.user

.gitlab-ci.yml

@@ -11,9 +11,10 @@ cache:
     - _ccache/
 
 build-applet-main:
-  image: pritunl/archlinux
+  image: archlinux/base
   stage: build
   script:
+   - pacman -Sy
    - pacman -S --noconfirm libwnck3 gtk3 vala cmake git base-devel clang ninja xfce4-panel mate-panel budgie-desktop gobject-introspection bamf
    - git clone https://gitlab.com/vala-panel-project/cmake-vala.git
    - cd cmake-vala && cmake . -DCMAKE_INSTALL_PREFIX=/usr -GNinja && ninja install && cd .. && rm -rf cmake-vala
@@ -30,9 +31,10 @@ build-applet-main:
 
 
 build-gtk-module-main:
-  image: pritunl/archlinux
+  image: archlinux/base
   stage: build
   script:
+   - pacman -Sy
    - pacman -S --noconfirm gtk3 gtk2 cmake base-devel ninja git
    - git clone https://gitlab.com/vala-panel-project/cmake-vala.git
    - cd cmake-vala && cmake . -DCMAKE_INSTALL_PREFIX=/usr -GNinja && ninja install && cd .. && rm -rf cmake-vala
@@ -48,9 +50,10 @@ build-gtk-module-main:
 
 
 build-registrar-main:
-  image: pritunl/archlinux
+  image: archlinux/base
   stage: build
   script:
+   - pacman -Sy
    - pacman -S --noconfirm glib2 cmake base-devel ninja python git
    - git clone https://gitlab.com/vala-panel-project/cmake-vala.git
    - cd cmake-vala && cmake . -DCMAKE_INSTALL_PREFIX=/usr -GNinja && ninja install && cd .. && rm -rf cmake-vala
@@ -66,9 +69,10 @@ build-registrar-main:
 
 
 build-jayatana-main:
-  image: pritunl/archlinux
+  image: archlinux/base
   stage: build
   script:
+   - pacman -Sy
    - pacman -S --noconfirm glib2 libdbusmenu-glib cmake base-devel ninja libxkbcommon jdk8-openjdk git
    - git clone https://gitlab.com/vala-panel-project/cmake-vala.git
    - cd cmake-vala && cmake . -DCMAKE_INSTALL_PREFIX=/usr -GNinja && ninja install && cd .. && rm -rf cmake-vala
@@ -84,10 +88,10 @@ build-jayatana-main:
 
 
 release-main:
-  image: pritunl/archlinux
+  image: alpine:edge
   stage: release
   script:
-    - pacman -S --noconfirm python3 python-pip
+    - apk add --no-cache python3
     - pip3 install gitlab_release
     - python3 -m gitlab_release ${PRIVATE_TOKEN} build/vala-panel*.tar.xz subprojects/jayatana/build/jayatana*.tar.xz subprojects/registrar/build/appmenu-registrar*.tar.xz subprojects/appmenu-gtk-module/build/appmenu-gtk-module*.tar.xz
   only:

CMakeLists.txt

@@ -77,6 +77,10 @@ set(CORE_PACKAGES
   libbamf3
   posix)
 
+if(${VALA_VERSION} VERSION_LESS "0.43.91")
+    set(ADDONS_PACKAGE gio-addons-2.0)
+endif()
+
 #set requred variables
 set(TARGET_GLIB ${GLIB_VERSION_MAJOR}.${GLIB_VERSION_MINOR})
 include(CMakeDependentOption)
@@ -102,26 +106,20 @@ cmake_dependent_option(ENABLE_MATE "Enable mate-panel Integration" ON
 add_feature_info(MATE ENABLE_MATE "MATE Panel Integration")
 
 find_package(PEAS 1.14 COMPONENTS PEAS)
-pkg_check_modules(VALAPANEL vala-panel IMPORTED_TARGET)
-pkg_check_modules(VP_NEW vala-panel>=0.4.50 QUIET)
+pkg_check_modules(VALAPANEL vala-panel>=0.4.50 IMPORTED_TARGET)
 pkg_check_modules(BUDGIE budgie-1.0 IMPORTED_TARGET)
 
 cmake_dependent_option(ENABLE_VALAPANEL "Enable Vala Panel Integration" ON
     "VALAPANEL_FOUND" OFF)
-if (VP_NEW_FOUND)
-    add_feature_info(ValaPanel ENABLE_VALAPANEL "Vala Panel Integration - 0.5.x")
-    set(NEW_DEFINE -D NEW)
-    set(NEW_IFACE ON)
-else()
-    add_feature_info(ValaPanel ENABLE_VALAPANEL "Vala Panel Integration - 0.4.x")
-endif()
+add_feature_info(ValaPanel ENABLE_VALAPANEL "Vala Panel Integration - 0.5.x")
 
 cmake_dependent_option(ENABLE_BUDGIE "Enable budgie-desktop plugin" ON
     "BUDGIE_FOUND; PEAS_FOUND" OFF)
 add_feature_info(Budgie ENABLE_BUDGIE "Budgie Desktop Integration")
 
 add_subdirectory(subprojects)
 ADD_SUBDIRECTORY(lib)
+ADD_SUBDIRECTORY(applets)
 add_subdirectory(data)
 add_subdirectory(po)
 

README.md

@@ -10,12 +10,13 @@ Vala Panel Application Menu is a Global Menu applet for use with Vala Panel, xfc
  * GTK+ (>= 3.22.0)
  * valac (>= 0.24.0)
  * libbamf (>=0.5.0)
-    
+
 ---
-Compilation Instructions
+Compilation Instructions (Non-Distribution-Specific)
 ---
+  * Install all the required dependencies listed above. These packages may have different names depending on your distribution. Please see [below](#dependency-packages) for the package names on some specific distributions (i.e. Ubuntu).
   * Clone this repository to your `home` directory by typing:
-  `git clone https://github.com/rilian-la-te/vala-panel-appmenu.git` then `cd` into the directory.
+  `git clone https://gitlab.com/vala-panel-project/vala-panel-appmenu.git` then `cd` into the directory.
   * type `git submodule init && git submodule update` to download the submodules (this will download the cmake and dbus-menu submodules you see in the repository, above)
   * type `mkdir build && cd build` (to keep things tidy)
   * You're **almost** ready to run `cmake`. First, review the following flags:
@@ -104,6 +105,21 @@ export _JAVA_OPTIONS="${_JAVA_OPTIONS} -javaagent:/usr/share/java/jayatanaag.jar
 export JAYATANA_FORCE=1
 ```
 
+---
+Dependency Packages
+---
+**Ubuntu 18.04**
+
+*All variants require:* `git build-essential cmake bamfdaemon libdbusmenu-glib-dev libgtk2.0-dev gobject-introspection libbamf3-dev libdbus-glib-1-dev libffi-dev libgirepository1.0-dev libpeas-dev libstartup-notification0-dev libwnck-3-dev libwnck-common libwnck22 libxml2-utils libxres-dev libvala-0.40-0 valac valac-0.40-vapi`
+
+*Ubuntu Budgie also needs:* `budgie-core-dev gir1.2-budgie-1.0 libbudgie-plugin0 libbudgietheme0 libraven0`
+
+*Ubuntu MATE also needs:* `libmate-panel-applet-dev`
+
+*Xubuntu also needs:* `exo-utils libexo-1-0 libexo-2-0 libexo-common libexo-helpers libgarcon-1-0 libgarcon-common libxfce4panel-2.0-4 libxfce4panel-2.0-dev libxfce4ui-1-0 libxfce4ui-2-0 libxfce4ui-common libxfce4util7 libxfce4util-common libxfce4util-dev libxfconf-0-2 libxfconf-0-dev xfce4-panel xfce4-panel-dev xfconf`
+
+*Vala Panel also needs:* `libvalapanel0 libvalapanel-dev`
+
 Author
 ===
  * Athor <ria.freelander@gmail.com>

applets/CMakeLists.txt

@@ -0,0 +1,131 @@
+include_directories(${CMAKE_BINARY_DIR}/lib)
+set(PLUGIN_VALA_FILES
+    valapanel-plugin-appmenu.vala
+    xfce4-plugin-appmenu.vala
+    mate-plugin-appmenu.vala
+    budgie-plugin-appmenu.vala
+    )
+add_custom_target(plugin-files-ide SOURCES ${PLUGIN_VALA_FILES})
+glib_compile_resources(RESOURCES
+    source
+        ../lib/libappmenu.gresource.xml
+)
+
+##########
+# XFCE Part
+##########
+if (ENABLE_XFCE)
+    vala_precompile(VALA_C_XFCE appmenu-xfce
+        xfce4-plugin-appmenu.vala
+    PACKAGES
+        ${CORE_PACKAGES}
+        vala-panel-appmenu
+        ${WNCK_PACKAGES}
+        libxfce4panel-2.0
+        libxfconf-0
+    OPTIONS
+        --vapidir=${CMAKE_BINARY_DIR}/lib
+        --vapidir=${CMAKE_SOURCE_DIR}/vapi
+        --vapidir=${CMAKE_CURRENT_BINARY_DIR}
+        --target-glib=2.50
+        --gresources=${CMAKE_CURRENT_SOURCE_DIR}/libappmenu.gresource.xml
+        ${WNCK_DEFINE}
+    )
+    add_library (appmenu-xfce MODULE
+        ${VALA_C_XFCE}
+        ${RESOURCES}
+    )
+    target_link_libraries (appmenu-xfce appmenu-core PkgConfig::XFCE)
+    # Install plugin stuffs
+    install(TARGETS appmenu-xfce DESTINATION ${CMAKE_INSTALL_LIBDIR}/xfce4/panel/plugins)
+endif()
+##########
+# ValaPanel Part
+##########
+if(ENABLE_VALAPANEL)
+    vala_precompile(VALA_C_VALAPANEL appmenu-valapanel
+        valapanel-plugin-appmenu.vala
+    PACKAGES
+        ${CORE_PACKAGES}
+        vala-panel-appmenu
+        ${WNCK_PACKAGES}
+        vala-panel
+        libpeas-1.0
+    OPTIONS
+        --vapidir=${CMAKE_BINARY_DIR}/lib
+        --vapidir=${CMAKE_SOURCE_DIR}/vapi
+        --vapidir=${CMAKE_CURRENT_BINARY_DIR}
+        --vapidir=${CMAKE_BINARY_DIR}/dbusmenu
+        --target-glib=2.50
+        --gresources=${CMAKE_CURRENT_SOURCE_DIR}/libappmenu.gresource.xml
+        ${WNCK_DEFINE}
+    )
+
+    # Build library for plugins and application
+    add_library (appmenu-valapanel MODULE
+        ${VALA_C_VALAPANEL}
+        ${RESOURCES}
+    )
+    set_target_properties(appmenu-valapanel PROPERTIES
+        OUTPUT_NAME appmenu)
+    target_link_libraries (appmenu-valapanel appmenu-core PkgConfig::VALAPANEL)
+    # Install plugin stuffs
+    install(TARGETS appmenu-valapanel DESTINATION ${CMAKE_INSTALL_LIBDIR}/vala-panel/applets)
+endif()
+##########
+# Budgie Panel Part
+##########
+if(ENABLE_BUDGIE)
+    vala_precompile(VALA_C_BUDGIE appmenu-budgie
+        budgie-plugin-appmenu.vala
+    PACKAGES
+        ${CORE_PACKAGES}
+        vala-panel-appmenu
+        ${WNCK_PACKAGES}
+        budgie-1.0
+        libpeas-1.0
+    OPTIONS
+        --vapidir=${CMAKE_BINARY_DIR}/lib
+        --vapidir=${CMAKE_SOURCE_DIR}/vapi
+        --vapidir=${CMAKE_CURRENT_BINARY_DIR}
+        --target-glib=2.50
+        --gresources=${CMAKE_CURRENT_SOURCE_DIR}/libappmenu.gresource.xml
+        ${WNCK_DEFINE}
+    )
+
+    # Build library for plugins and application
+    add_library (appmenu-budgie MODULE
+        ${VALA_C_BUDGIE}
+        ${RESOURCES}
+    )
+    target_link_libraries (appmenu-budgie appmenu-core PEAS::PEAS PkgConfig::BUDGIE)
+    # Install plugin stuffs
+    install(TARGETS appmenu-budgie DESTINATION ${CMAKE_INSTALL_LIBDIR}/budgie-desktop/plugins/budgie-vala-panel-appmenu-plugin)
+endif()
+##########
+# MATE Part
+##########
+if (ENABLE_MATE)
+    vala_precompile(VALA_C_MATE appmenu-mate
+        mate-plugin-appmenu.vala
+    PACKAGES
+        ${CORE_PACKAGES}
+        vala-panel-appmenu
+        ${WNCK_PACKAGES}
+        libmatepanelapplet-4.0
+    OPTIONS
+        --vapidir=${CMAKE_BINARY_DIR}/lib
+        --vapidir=${CMAKE_SOURCE_DIR}/vapi
+        --vapidir=${CMAKE_CURRENT_BINARY_DIR}
+        --target-glib=2.50
+        --gresources=${CMAKE_CURRENT_SOURCE_DIR}/libappmenu.gresource.xml
+        ${WNCK_DEFINE}
+    )
+    add_library (appmenu-mate MODULE
+                ${VALA_C_MATE}
+                ${RESOURCES}
+    )
+    target_link_libraries (appmenu-mate appmenu-core PkgConfig::MATE)
+    # Install plugin stuffs
+    install(TARGETS appmenu-mate DESTINATION ${CMAKE_INSTALL_LIBDIR}/mate-panel)
+endif()

lib/budgie-plugin-appmenu.vala → applets/budgie-plugin-appmenu.vala

@@ -48,10 +48,10 @@ public class GlobalMenuApplet: Applet
     public override Widget? get_settings_ui()
     {
         var dlg = new Gtk.Box(Gtk.Orientation.VERTICAL,0);
-        var entry = new CheckButton.with_label(_("Use Compact mode (all menus in application menu)"));
+        var entry = new CheckButton.with_label(dgettext(Config.GETTEXT_PACKAGE,"Use Compact mode (all menus in application menu)"));
         this.settings.bind(Key.COMPACT_MODE,entry,"active",SettingsBindFlags.DEFAULT);
         dlg.pack_start(entry,false,false,2);
-        entry = new CheckButton.with_label(_("Use bold application name"));
+        entry = new CheckButton.with_label(dgettext(Config.GETTEXT_PACKAGE,"Use bold application name"));
         this.settings.bind(Key.BOLD_APPLICATION_NAME,entry,"active",SettingsBindFlags.DEFAULT);
         dlg.pack_start(entry,false,false,2);
         dlg.show();

lib/mate-plugin-appmenu.vala → applets/mate-plugin-appmenu.vala

@@ -37,15 +37,15 @@ private bool factory_callback(MatePanel.Applet applet, string iid)
     Gtk.Action a = new Gtk.Action("AppMenuAppletPreferences",N_("_Preferences"),null,Gtk.Stock.PREFERENCES);
     a.activate.connect(()=>
     {
-        var dlg = new Gtk.Dialog.with_buttons( _("Configure AppMenu"), layout.get_toplevel() as Window,
+        var dlg = new Gtk.Dialog.with_buttons( dgettext(Config.GETTEXT_PACKAGE,"Configure AppMenu"), layout.get_toplevel() as Window,
                                               DialogFlags.DESTROY_WITH_PARENT,
                                               null );
         Gtk.Box dlg_vbox = dlg.get_content_area() as Gtk.Box;
-        var entry = new CheckButton.with_label(_("Use Compact mode (all menus in application menu)"));
+        var entry = new CheckButton.with_label(dgettext(Config.GETTEXT_PACKAGE,"Use Compact mode (all menus in application menu)"));
         settings.bind(Key.COMPACT_MODE,entry,"active",SettingsBindFlags.DEFAULT);
         dlg_vbox.pack_start(entry,false,false,2);
         entry.show();
-        entry = new CheckButton.with_label(_("Use bold application name"));
+        entry = new CheckButton.with_label(dgettext(Config.GETTEXT_PACKAGE,"Use bold application name"));
         settings.bind(Key.BOLD_APPLICATION_NAME,entry,"active",SettingsBindFlags.DEFAULT);
         dlg_vbox.pack_start(entry,false,false,2);
         entry.show();

applets/meson.build

@@ -0,0 +1,39 @@
+if vala_panel_found
+    vp_applets_libdir = vp.get_pkgconfig_variable('applets_dir')
+    vp_sources = files('valapanel-plugin-appmenu.vala')
+    vpp = shared_module('appmenu', vp_sources, libres,
+                    dependencies: [appmenu_dep, vp],
+                    install: true,
+                    install_dir: vp_applets_libdir
+                  )
+endif
+
+if mate_found
+    mate_applet_libdir = join_paths(mp.get_pkgconfig_variable('libdir'),'mate-panel')
+    mp_sources = files('mate-plugin-appmenu.vala')
+    mpp = shared_module('appmenu-mate', mp_sources, libres,
+                    dependencies: [appmenu_dep, mp],
+                    install: true,
+                    install_dir: mate_applet_libdir
+                  )
+endif
+
+if xfce_found
+    xfce_applet_libdir = join_paths(xp.get_pkgconfig_variable('libdir'),'xfce4','panel','plugins')
+    xp_sources = files('xfce4-plugin-appmenu.vala')
+    xpp = shared_module('appmenu-xfce', xp_sources, libres,
+                    dependencies: [appmenu_dep, xc,xp],
+                    install: true,
+                    install_dir: xfce_applet_libdir
+                  )
+endif
+
+if budgie_found
+    budgie_applet_libdir = join_paths(bp.get_pkgconfig_variable('libdir'),'budgie-desktop','plugins','budgie-genmon-plugin')
+    bp_sources = files('budgie-plugin-appmenu.vala')
+    bpp = shared_module('appmenu-budgie', bp_sources, libres,
+                    dependencies: [appmenu_dep, bp],
+                    install: true,
+                    install_dir: budgie_applet_libdir
+                  )
+endif