From 90ffcb5fd3609b1c89b7bb8965603a9611fe0e6e Mon Sep 17 00:00:00 2001 From: Chris Cromer Date: Wed, 1 Nov 2017 20:02:27 -0300 Subject: [PATCH] add global menu --- .configure-custom.sh | 3 +- CMakeLists.txt | 1 + README.md | 6 +- data/interface/manager_window.ui | 125 ++++++++++++++++++++++++- meson.build | 1 + meson_options.txt | 1 + pamac.avprj | 17 ++-- po/af.po | 6 +- po/ar.po | 6 +- po/ast.po | 6 +- po/az_AZ.po | 6 +- po/be.po | 6 +- po/bg.po | 6 +- po/bn.po | 6 +- po/bs.po | 6 +- po/bs_BA.po | 6 +- po/ca.po | 6 +- po/ca_ES.po | 6 +- po/cs.po | 6 +- po/cs_CZ.po | 6 +- po/cy.po | 6 +- po/da.po | 6 +- po/de.po | 6 +- po/de_CH.po | 6 +- po/de_DE.po | 6 +- po/el.po | 6 +- po/el_GR.po | 6 +- po/en_GB.po | 6 +- po/eo.po | 6 +- po/es.po | 6 +- po/es_419.po | 6 +- po/es_AR.po | 6 +- po/es_ES.po | 6 +- po/es_MX.po | 6 +- po/es_SV.po | 6 +- po/et.po | 6 +- po/eu.po | 6 +- po/fa.po | 6 +- po/fa_IR.po | 6 +- po/fi.po | 6 +- po/fo.po | 6 +- po/fr.po | 6 +- po/gl.po | 6 +- po/he.po | 6 +- po/hi.po | 6 +- po/hi_IN.po | 6 +- po/hr.po | 6 +- po/hr_HR.po | 6 +- po/hu.po | 6 +- po/id.po | 6 +- po/is.po | 6 +- po/is_IS.po | 6 +- po/it.po | 6 +- po/it_IT.po | 6 +- po/ja.po | 6 +- po/ka.po | 6 +- po/ko.po | 6 +- po/lt.po | 6 +- po/ml.po | 6 +- po/ms.po | 6 +- po/nb.po | 6 +- po/nl.po | 6 +- po/nl_BE.po | 6 +- po/nl_NL.po | 6 +- po/nn.po | 6 +- po/pamac.pot | 6 +- po/pl.po | 6 +- po/pl_PL.po | 6 +- po/pt.po | 6 +- po/pt_BR.po | 6 +- po/pt_PT.po | 6 +- po/ro.po | 6 +- po/ru.po | 6 +- po/si.po | 6 +- po/sk.po | 6 +- po/sl.po | 6 +- po/sl_SI.po | 6 +- po/sr.po | 6 +- po/sr@latin.po | 6 +- po/sr_RS.po | 6 +- po/sr_RS@latin.po | 6 +- po/sv.po | 6 +- po/tr.po | 6 +- po/uk.po | 6 +- po/ur_PK.po | 6 +- po/uz.po | 6 +- po/vi.po | 6 +- po/zh.po | 6 +- po/zh_CN.po | 6 +- po/zh_TW.po | 6 +- src/CMakeLists.txt | 11 ++- src/meson.build | 10 +- src/pamac-clean-cache/CMakeLists.txt | 9 +- src/pamac-clean-cache/meson.build | 6 +- src/pamac-install/CMakeLists.txt | 9 +- src/pamac-install/meson.build | 6 +- src/pamac-manager/CMakeLists.txt | 9 +- src/pamac-manager/manager_window.vala | 38 +++++++- src/pamac-manager/meson.build | 6 +- src/pamac-system-daemon/CMakeLists.txt | 9 +- src/pamac-system-daemon/meson.build | 6 +- src/pamac-tray/CMakeLists.txt | 9 +- src/pamac-tray/meson.build | 6 +- src/pamac-user-daemon/CMakeLists.txt | 9 +- src/pamac-user-daemon/meson.build | 6 +- src/pamacclassic.pc | 2 +- 106 files changed, 681 insertions(+), 122 deletions(-) diff --git a/.configure-custom.sh b/.configure-custom.sh index 7804029..8854d95 100644 --- a/.configure-custom.sh +++ b/.configure-custom.sh @@ -1,8 +1,9 @@ #!/bin/bash -ENABLE_VARS="kde-tray|ON|KDE_TRAY update-desktop|ON|ENABLE_UPDATE_ICON" +ENABLE_VARS="kde-tray|ON|KDE_TRAY update-desktop|ON|ENABLE_UPDATE_ICON hamburger|ON|ENABLE_HAMBURGER" ENABLE_KDE_TRAY_DOC="build with kde tray and appindicator instead of gtk3 tray" ENABLE_ENABLE_UPDATE_ICON_DOC="install the update desktop entry" +ENABLE_ENABLE_HAMBURGER_DOC="build with the classic hamburger menu" DISABLE_VARS="aur|ON|DISABLE_AUR icon-update|OFF|ICON_UPDATE" DISABLE_DISABLE_AUR_DOC="disable the AUR in pamac" DISABLE_ICON_UPDATE_DOC="disable the update of the icon cache after installing" diff --git a/CMakeLists.txt b/CMakeLists.txt index 6ab42a1..ff8991a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,6 +10,7 @@ option(ICON_UPDATE "Update the icon cache after installing" ON) option(BUILD_VALADOC "Build API documentation if Valadoc is available" OFF) option(DISABLE_AUR "DISABLE_AUR" OFF) option(ENABLE_UPDATE_ICON "ENABLE_UPDATE_ICON" OFF) +option(ENABLE_HAMBURGER "ENABLE_HAMBURGER" OFF) option(KDE_TRAY "KDE_TRAY" OFF) if( NOT CMAKE_BUILD_TYPE ) diff --git a/README.md b/README.md index 0b2f058..55a0d45 100644 --- a/README.md +++ b/README.md @@ -52,6 +52,7 @@ make install - -DKDE_TRAY=ON (to build kde tray icon instead of gtk tray icon) - -DENABLE_UPDATE_ICON=ON (to install the update desktop entry) - -DICON_UPDATE=OFF (to disable updating the icon cache) +- -DENABLE_HAMBURGER=ON (to build with the classic hamburger menu) ## Using CMake with Ninja @@ -72,6 +73,7 @@ ninja install - -DKDE_TRAY=ON (to build kde tray icon instead of gtk tray icon) - -DENABLE_UPDATE_ICON=ON (to install the update desktop entry) - -DICON_UPDATE=OFF (to disable updating the icon cache) +- -DENABLE_HAMBURGER=ON (to build with the classic hamburger menu) ## Using Meson with Ninja @@ -90,6 +92,7 @@ ninja install - -DKDE_TRAY=ON (to build kde tray icon instead of gtk tray icon) - -DENABLE_UPDATE_ICON=ON (to install the update desktop entry) - -DICON_UPDATE=OFF (to disable updating the icon cache) +- -DENABLE_HAMBURGER=ON (to build with the classic hamburger menu) ## Using configure wrapper @@ -108,4 +111,5 @@ make install - --disable-aur (to disable Aur in Pamac) - --enable-kde-tray (to build kde tray icon instead of gtk tray icon) - --enable-update-desktop (to install the update desktop entry) -- --disable-icon-update (to disable updating the icon cache) \ No newline at end of file +- --disable-icon-update (to disable updating the icon cache) +- --enable-hamburger (to build with the classic hamburger menu) \ No newline at end of file diff --git a/data/interface/manager_window.ui b/data/interface/manager_window.ui index d143e63..e3d34c3 100644 --- a/data/interface/manager_window.ui +++ b/data/interface/manager_window.ui @@ -88,6 +88,106 @@ + + False + + + True + False + 6 + vertical + 6 + + + True + True + True + Refresh databases + + + + False + True + 0 + + + + + True + True + True + View History + + + + False + True + 1 + + + + + True + True + True + Install Local Packages + + + + False + True + 2 + + + + + True + True + True + Preferences + + + + False + True + 3 + + + + + True + True + True + About + + + + False + True + 4 + + + + + True + True + True + Quit + + + + False + True + 5 + + + + + main + 1 + + +