From 6d72231ba1f76a4a9e963bde5d291d2f208fe1e9 Mon Sep 17 00:00:00 2001 From: Chris Cromer Date: Tue, 17 Oct 2017 12:40:27 -0300 Subject: [PATCH] add font selection for terminal fix manager to work better when compiling without aur --- .gitignore | 3 +- data/CMakeLists.txt | 29 - data/config/noaur/pamac.conf | 3 + data/config/pamac.conf | 3 + data/interface/CMakeLists.txt | 15 - data/interface/manager_window.ui | 53 +- data/interface/manager_window_no_aur.ui | 935 -------------------- data/interface/preferences_dialog.ui | 178 ++-- data/interface/preferences_dialog_no_aur.ui | 716 --------------- data/pamac.manager_no_aur.gresource.xml | 15 - data/pamac.transaction_no_aur.gresource.xml | 13 - data/pixmaps/CMakeLists.txt | 8 - meson.build | 42 +- pamac.avprj | 55 +- po/LINGUAS | 2 +- po/meson.build | 2 +- src/CMakeLists.txt | 7 +- src/Pamac.pc | 2 +- src/aur/AUR.pc | 2 +- src/aur/CMakeLists.txt | 6 +- src/aur/meson.build | 6 +- src/meson.build | 14 +- src/pamac-clean-cache/CMakeLists.txt | 4 +- src/pamac-clean-cache/meson.build | 2 +- src/pamac-install/CMakeLists.txt | 4 +- src/pamac-install/meson.build | 2 +- src/pamac-manager/CMakeLists.txt | 5 +- src/pamac-manager/manager_window.vala | 15 +- src/pamac-manager/meson.build | 10 +- src/pamac-system-daemon/CMakeLists.txt | 4 +- src/pamac-system-daemon/meson.build | 2 +- src/pamac-tray/CMakeLists.txt | 4 +- src/pamac-tray/meson.build | 2 +- src/pamac-user-daemon/CMakeLists.txt | 4 +- src/pamac-user-daemon/meson.build | 2 +- src/pamac_config.vala | 15 + src/preferences_dialog.vala | 22 +- src/transaction.vala | 8 + 38 files changed, 262 insertions(+), 1952 deletions(-) delete mode 100644 data/interface/manager_window_no_aur.ui delete mode 100644 data/interface/preferences_dialog_no_aur.ui delete mode 100644 data/pamac.manager_no_aur.gresource.xml delete mode 100644 data/pamac.transaction_no_aur.gresource.xml diff --git a/.gitignore b/.gitignore index 206352c..bd4c19e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,8 +1,9 @@ po/*.mo po/*~ po/locale +data/interface/*~ +data/interface/#*# PKGBUILD *.pkg.tar.xz *.pkg.tar.xz.sig /build -src/interface/*~ diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt index 624c1b7..55c25cf 100644 --- a/data/CMakeLists.txt +++ b/data/CMakeLists.txt @@ -14,34 +14,6 @@ ADD_CUSTOM_COMMAND ( add_custom_target(pamac_installer_gresource_xml DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/pamac.installer.gresource.xml.c) SET (pamac_installer_gresource_xml_C_FILE ${CMAKE_CURRENT_BINARY_DIR}/pamac.installer.gresource.xml.c PARENT_SCOPE) SET (pamac_installer_gresource_xml_H_FILE ${CMAKE_CURRENT_BINARY_DIR}/pamac.installer.gresource.xml.h PARENT_SCOPE) -if (DISABLE_AUR) - EXECUTE_PROCESS( COMMAND glib-compile-resources --sourcedir=${CMAKE_CURRENT_SOURCE_DIR} --generate-source --target=${CMAKE_CURRENT_BINARY_DIR}/pamac.manager_no_aur.gresource.xml.c ${CMAKE_CURRENT_SOURCE_DIR}/pamac.manager_no_aur.gresource.xml) -EXECUTE_PROCESS( COMMAND glib-compile-resources --sourcedir=${CMAKE_CURRENT_SOURCE_DIR} --generate-header --target=${CMAKE_CURRENT_BINARY_DIR}/pamac.manager_no_aur.gresource.xml.h ${CMAKE_CURRENT_SOURCE_DIR}/pamac.manager_no_aur.gresource.xml) -ADD_CUSTOM_COMMAND ( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/pamac.manager_no_aur.gresource.xml.c - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/pamac.manager_no_aur.gresource.xml ${CMAKE_CURRENT_SOURCE_DIR}/interface/manager_window_no_aur.ui ${CMAKE_CURRENT_SOURCE_DIR}/interface/history_dialog.ui ${CMAKE_CURRENT_SOURCE_DIR}/pixmaps/package-available.png ${CMAKE_CURRENT_SOURCE_DIR}/pixmaps/package-available-locked.png ${CMAKE_CURRENT_SOURCE_DIR}/pixmaps/package-install.png ${CMAKE_CURRENT_SOURCE_DIR}/pixmaps/package-installed-locked.png ${CMAKE_CURRENT_SOURCE_DIR}/pixmaps/package-installed-updated.png ${CMAKE_CURRENT_SOURCE_DIR}/pixmaps/package-reinstall.png ${CMAKE_CURRENT_SOURCE_DIR}/pixmaps/package-remove.png ${CMAKE_CURRENT_SOURCE_DIR}/pixmaps/package-upgrade.png - COMMAND glib-compile-resources --sourcedir=${CMAKE_CURRENT_SOURCE_DIR} --generate-source --target=${CMAKE_CURRENT_BINARY_DIR}/pamac.manager_no_aur.gresource.xml.c ${CMAKE_CURRENT_SOURCE_DIR}/pamac.manager_no_aur.gresource.xml - - COMMAND glib-compile-resources --sourcedir=${CMAKE_CURRENT_SOURCE_DIR} --generate-header --target=${CMAKE_CURRENT_BINARY_DIR}/pamac.manager_no_aur.gresource.xml.h ${CMAKE_CURRENT_SOURCE_DIR}/pamac.manager_no_aur.gresource.xml -) - -add_custom_target(pamac_manager_gresource_xml DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/pamac.manager_no_aur.gresource.xml.c) -SET (pamac_manager_gresource_xml_C_FILE ${CMAKE_CURRENT_BINARY_DIR}/pamac.manager_no_aur.gresource.xml.c PARENT_SCOPE) -SET (pamac_manager_gresource_xml_H_FILE ${CMAKE_CURRENT_BINARY_DIR}/pamac.manager_no_aur.gresource.xml.h PARENT_SCOPE) -EXECUTE_PROCESS( COMMAND glib-compile-resources --sourcedir=${CMAKE_CURRENT_SOURCE_DIR} --generate-source --target=${CMAKE_CURRENT_BINARY_DIR}/pamac.transaction_no_aur.gresource.xml.c ${CMAKE_CURRENT_SOURCE_DIR}/pamac.transaction_no_aur.gresource.xml) -EXECUTE_PROCESS( COMMAND glib-compile-resources --sourcedir=${CMAKE_CURRENT_SOURCE_DIR} --generate-header --target=${CMAKE_CURRENT_BINARY_DIR}/pamac.transaction_no_aur.gresource.xml.h ${CMAKE_CURRENT_SOURCE_DIR}/pamac.transaction_no_aur.gresource.xml) -ADD_CUSTOM_COMMAND ( - OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/pamac.transaction_no_aur.gresource.xml.c - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/pamac.transaction_no_aur.gresource.xml ${CMAKE_CURRENT_SOURCE_DIR}/interface/progress_dialog.ui ${CMAKE_CURRENT_SOURCE_DIR}/interface/progress_box.ui ${CMAKE_CURRENT_SOURCE_DIR}/interface/choose_provider_dialog.ui ${CMAKE_CURRENT_SOURCE_DIR}/interface/transaction_sum_dialog.ui ${CMAKE_CURRENT_SOURCE_DIR}/interface/preferences_dialog_no_aur.ui ${CMAKE_CURRENT_SOURCE_DIR}/interface/choose_ignorepkgs_dialog.ui - COMMAND glib-compile-resources --sourcedir=${CMAKE_CURRENT_SOURCE_DIR} --generate-source --target=${CMAKE_CURRENT_BINARY_DIR}/pamac.transaction_no_aur.gresource.xml.c ${CMAKE_CURRENT_SOURCE_DIR}/pamac.transaction_no_aur.gresource.xml - - COMMAND glib-compile-resources --sourcedir=${CMAKE_CURRENT_SOURCE_DIR} --generate-header --target=${CMAKE_CURRENT_BINARY_DIR}/pamac.transaction_no_aur.gresource.xml.h ${CMAKE_CURRENT_SOURCE_DIR}/pamac.transaction_no_aur.gresource.xml -) - -add_custom_target(pamac_transaction_gresource_xml DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/pamac.transaction_no_aur.gresource.xml.c) -SET (pamac_transaction_gresource_xml_C_FILE ${CMAKE_CURRENT_BINARY_DIR}/pamac.transaction_no_aur.gresource.xml.c PARENT_SCOPE) -SET (pamac_transaction_gresource_xml_H_FILE ${CMAKE_CURRENT_BINARY_DIR}/pamac.transaction_no_aur.gresource.xml.h PARENT_SCOPE) -else () EXECUTE_PROCESS( COMMAND glib-compile-resources --sourcedir=${CMAKE_CURRENT_SOURCE_DIR} --generate-source --target=${CMAKE_CURRENT_BINARY_DIR}/pamac.manager.gresource.xml.c ${CMAKE_CURRENT_SOURCE_DIR}/pamac.manager.gresource.xml) EXECUTE_PROCESS( COMMAND glib-compile-resources --sourcedir=${CMAKE_CURRENT_SOURCE_DIR} --generate-header --target=${CMAKE_CURRENT_BINARY_DIR}/pamac.manager.gresource.xml.h ${CMAKE_CURRENT_SOURCE_DIR}/pamac.manager.gresource.xml) ADD_CUSTOM_COMMAND ( @@ -68,7 +40,6 @@ ADD_CUSTOM_COMMAND ( add_custom_target(pamac_transaction_gresource_xml DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/pamac.transaction.gresource.xml.c) SET (pamac_transaction_gresource_xml_C_FILE ${CMAKE_CURRENT_BINARY_DIR}/pamac.transaction.gresource.xml.c PARENT_SCOPE) SET (pamac_transaction_gresource_xml_H_FILE ${CMAKE_CURRENT_BINARY_DIR}/pamac.transaction.gresource.xml.h PARENT_SCOPE) -endif () install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/pamac-install.desktop DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications/ ) install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/pamac-manager.desktop DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/applications/ ) if (KDE_TRAY) diff --git a/data/config/noaur/pamac.conf b/data/config/noaur/pamac.conf index 2f970c0..7ae75ca 100644 --- a/data/config/noaur/pamac.conf +++ b/data/config/noaur/pamac.conf @@ -21,3 +21,6 @@ BackgroundColor = rgb(0,0,0) ## Terminal foreground color ForegroundColor = rgb(255,255,255) + +## The font used in the terminal +TerminalFont = Monospace Regular 12 diff --git a/data/config/pamac.conf b/data/config/pamac.conf index 935b5d3..7e58b6b 100644 --- a/data/config/pamac.conf +++ b/data/config/pamac.conf @@ -36,3 +36,6 @@ BackgroundColor = rgb(0,0,0) ## Terminal foreground color ForegroundColor = rgb(255,255,255) + +## The font used in the terminal +TerminalFont = Monospace Regular 12 diff --git a/data/interface/CMakeLists.txt b/data/interface/CMakeLists.txt index 00dba60..b099c9c 100644 --- a/data/interface/CMakeLists.txt +++ b/data/interface/CMakeLists.txt @@ -1,18 +1,3 @@ ### CMakeLists automatically created with AutoVala ### Do not edit -if (DISABLE_AUR) - else () -endif () -install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/choose_ignorepkgs_dialog.ui DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/pamac/ ) -install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/choose_provider_dialog.ui DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/pamac/ ) -install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/history_dialog.ui DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/pamac/ ) -install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/progress_box.ui DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/pamac/ ) -install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/transaction_sum_dialog.ui DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/pamac/ ) -if (DISABLE_AUR) - install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/manager_window_no_aur.ui DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/pamac/ ) -install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/preferences_dialog_no_aur.ui DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/pamac/ ) -else () -install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/manager_window.ui DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/pamac/ ) -install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/preferences_dialog.ui DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/pamac/ ) -endif () diff --git a/data/interface/manager_window.ui b/data/interface/manager_window.ui index a3f294a..d143e63 100644 --- a/data/interface/manager_window.ui +++ b/data/interface/manager_window.ui @@ -1,5 +1,5 @@ - + @@ -477,9 +477,6 @@ True False True - - - multiple @@ -802,6 +799,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -831,6 +852,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/data/interface/manager_window_no_aur.ui b/data/interface/manager_window_no_aur.ui deleted file mode 100644 index e641351..0000000 --- a/data/interface/manager_window_no_aur.ui +++ /dev/null @@ -1,935 +0,0 @@ - - - - - - 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 - - - - - main - 1 - - - - - diff --git a/data/interface/preferences_dialog.ui b/data/interface/preferences_dialog.ui index 221faca..e67f9be 100644 --- a/data/interface/preferences_dialog.ui +++ b/data/interface/preferences_dialog.ui @@ -388,58 +388,33 @@ vertical 6 - + True False - 6 - 6 + + + True + False + Background color: + + + False + True + 0 + + True True True - Select a background color rgb(0,0,0) - 1 - 0 - - - - - True - True - True - Select a text color - rgb(255,255,255) - - - 1 - 1 - - - - - True - False - Background: - - - 0 - 0 - - - - - True - False - start - Text: - - - 0 - 1 + False + True + end + 1 @@ -450,19 +425,80 @@ - + + True + False + + + True + False + start + Text color: + + + False + True + 0 + + + + + True + True + True + rgb(255,255,255) + + + False + True + end + 1 + + + + + False + True + 1 + - - - - - - - - - - + + True + False + + + True + False + Font: + + + False + True + 0 + + + + + True + True + True + Sans 12 + + + + False + True + end + 1 + + + + + False + True + 2 + @@ -716,24 +752,6 @@ All AUR users should be familiar with the build process. 2 - - - Check for updates from AUR - True - True - False - start - 24 - 24 - True - True - - - False - True - 3 - - True @@ -776,6 +794,24 @@ All AUR users should be familiar with the build process. 3 + + + Check for updates from AUR + True + True + False + start + 24 + 24 + True + True + + + False + True + 3 + + aur diff --git a/data/interface/preferences_dialog_no_aur.ui b/data/interface/preferences_dialog_no_aur.ui deleted file mode 100644 index 57e24b8..0000000 --- a/data/interface/preferences_dialog_no_aur.ui +++ /dev/null @@ -1,716 +0,0 @@ - - - - - - 10 - 3 - 1 - 10 - - - 1 - 1000 - 6 - 1 - 10 - - - diff --git a/data/pamac.manager_no_aur.gresource.xml b/data/pamac.manager_no_aur.gresource.xml deleted file mode 100644 index dc0c512..0000000 --- a/data/pamac.manager_no_aur.gresource.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - interface/manager_window_no_aur.ui - interface/history_dialog.ui - pixmaps/package-available.png - pixmaps/package-available-locked.png - pixmaps/package-install.png - pixmaps/package-installed-locked.png - pixmaps/package-installed-updated.png - pixmaps/package-reinstall.png - pixmaps/package-remove.png - pixmaps/package-upgrade.png - - diff --git a/data/pamac.transaction_no_aur.gresource.xml b/data/pamac.transaction_no_aur.gresource.xml deleted file mode 100644 index 69edc1c..0000000 --- a/data/pamac.transaction_no_aur.gresource.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - interface/progress_dialog.ui - interface/progress_box.ui - interface/choose_provider_dialog.ui - interface/transaction_sum_dialog.ui - - - interface/preferences_dialog_no_aur.ui - interface/choose_ignorepkgs_dialog.ui - - diff --git a/data/pixmaps/CMakeLists.txt b/data/pixmaps/CMakeLists.txt index 9fa2564..1abdbcb 100644 --- a/data/pixmaps/CMakeLists.txt +++ b/data/pixmaps/CMakeLists.txt @@ -1,12 +1,4 @@ ### CMakeLists automatically created with AutoVala ### Do not edit -install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/package-available-locked.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/pamac/ ) -install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/package-available.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/pamac/ ) install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/package-generic.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/pamac/ ) -install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/package-install.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/pamac/ ) -install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/package-installed-locked.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/pamac/ ) -install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/package-installed-updated.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/pamac/ ) -install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/package-reinstall.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/pamac/ ) -install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/package-remove.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/pamac/ ) -install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/package-upgrade.png DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/pamac/ ) diff --git a/meson.build b/meson.build index f52f072..64b5adb 100644 --- a/meson.build +++ b/meson.build @@ -53,31 +53,17 @@ pamac_installer_gresource_xml_generator = generator(find_program('glib-compile-r pamac_installer_gresource_xml_file_c = pamac_installer_gresource_xml_generator.process(['data/pamac.installer.gresource.xml']) -if DISABLE_AUR - pamac_manager_no_aur_gresource_xml_generator = generator(find_program('glib-compile-resources'), arguments: [ '--sourcedir=@SOURCE_DIR@/data' , '--generate-source', '--target=@BUILD_DIR@/pamac.manager_no_aur.gresource.xml.c', '@INPUT@'], output: '@PLAINNAME@.c') +pamac_manager_gresource_xml_generator = generator(find_program('glib-compile-resources'), arguments: [ '--sourcedir=@SOURCE_DIR@/data' , '--generate-source', '--target=@BUILD_DIR@/pamac.manager.gresource.xml.c', '@INPUT@'], output: '@PLAINNAME@.c') - pamac_manager_no_aur_gresource_xml_file_c = pamac_manager_no_aur_gresource_xml_generator.process(['data/pamac.manager_no_aur.gresource.xml']) +pamac_manager_gresource_xml_file_c = pamac_manager_gresource_xml_generator.process(['data/pamac.manager.gresource.xml']) - pamac_transaction_no_aur_gresource_xml_generator = generator(find_program('glib-compile-resources'), arguments: [ '--sourcedir=@SOURCE_DIR@/data' , '--generate-source', '--target=@BUILD_DIR@/pamac.transaction_no_aur.gresource.xml.c', '@INPUT@'], output: '@PLAINNAME@.c') +pamac_transaction_gresource_xml_generator = generator(find_program('glib-compile-resources'), arguments: [ '--sourcedir=@SOURCE_DIR@/data' , '--generate-source', '--target=@BUILD_DIR@/pamac.transaction.gresource.xml.c', '@INPUT@'], output: '@PLAINNAME@.c') - pamac_transaction_no_aur_gresource_xml_file_c = pamac_transaction_no_aur_gresource_xml_generator.process(['data/pamac.transaction_no_aur.gresource.xml']) +pamac_transaction_gresource_xml_file_c = pamac_transaction_gresource_xml_generator.process(['data/pamac.transaction.gresource.xml']) -else - pamac_manager_gresource_xml_generator = generator(find_program('glib-compile-resources'), arguments: [ '--sourcedir=@SOURCE_DIR@/data' , '--generate-source', '--target=@BUILD_DIR@/pamac.manager.gresource.xml.c', '@INPUT@'], output: '@PLAINNAME@.c') - - pamac_manager_gresource_xml_file_c = pamac_manager_gresource_xml_generator.process(['data/pamac.manager.gresource.xml']) - - pamac_transaction_gresource_xml_generator = generator(find_program('glib-compile-resources'), arguments: [ '--sourcedir=@SOURCE_DIR@/data' , '--generate-source', '--target=@BUILD_DIR@/pamac.transaction.gresource.xml.c', '@INPUT@'], output: '@PLAINNAME@.c') - - pamac_transaction_gresource_xml_file_c = pamac_transaction_gresource_xml_generator.process(['data/pamac.transaction.gresource.xml']) - -endif if KDE_TRAY else endif -if DISABLE_AUR -else -endif meson.add_install_script(join_paths(meson.current_source_dir(),'meson_scripts','install_data.sh'),join_paths(get_option('prefix'),get_option('datadir'),'doc'),join_paths(meson.current_source_dir(),'doc','','*')) install_data('data/pamac-install.desktop',install_dir:join_paths(get_option('prefix'),get_option('datadir'),'applications')) @@ -94,32 +80,12 @@ else else install_data('data/pamac-tray.desktop',install_dir: '/etc/xdg/autostart') endif -endif - install_data('data/interface/choose_ignorepkgs_dialog.ui', install_dir: join_paths(get_option('prefix'),get_option('datadir'),'pamac')) - install_data('data/interface/choose_provider_dialog.ui', install_dir: join_paths(get_option('prefix'),get_option('datadir'),'pamac')) - install_data('data/interface/history_dialog.ui', install_dir: join_paths(get_option('prefix'),get_option('datadir'),'pamac')) - install_data('data/interface/progress_box.ui', install_dir: join_paths(get_option('prefix'),get_option('datadir'),'pamac')) - install_data('data/interface/transaction_sum_dialog.ui', install_dir: join_paths(get_option('prefix'),get_option('datadir'),'pamac')) -if DISABLE_AUR - install_data('data/interface/manager_window_no_aur.ui', install_dir: join_paths(get_option('prefix'),get_option('datadir'),'pamac')) - install_data('data/interface/preferences_dialog_no_aur.ui', install_dir: join_paths(get_option('prefix'),get_option('datadir'),'pamac')) -else - install_data('data/interface/manager_window.ui', install_dir: join_paths(get_option('prefix'),get_option('datadir'),'pamac')) - install_data('data/interface/preferences_dialog.ui', install_dir: join_paths(get_option('prefix'),get_option('datadir'),'pamac')) endif install_data('data/icons/16x16/apps/system-software-install.png',install_dir: join_paths(get_option('prefix'),get_option('datadir'),'icons','hicolor/16x16/apps')) install_data('data/icons/24x24/status/pamac-tray-no-update.png',install_dir: join_paths(get_option('prefix'),get_option('datadir'),'icons','hicolor/24x24/apps')) install_data('data/icons/24x24/status/pamac-tray-update.png',install_dir: join_paths(get_option('prefix'),get_option('datadir'),'icons','hicolor/24x24/apps')) install_data('data/icons/32x32/apps/system-software-install.png',install_dir: join_paths(get_option('prefix'),get_option('datadir'),'icons','hicolor/32x32/apps')) -install_data('data/pixmaps/package-available-locked.png',install_dir: join_paths(get_option('prefix'),get_option('datadir'),'pamac')) -install_data('data/pixmaps/package-available.png',install_dir: join_paths(get_option('prefix'),get_option('datadir'),'pamac')) install_data('data/pixmaps/package-generic.png',install_dir: join_paths(get_option('prefix'),get_option('datadir'),'pamac')) -install_data('data/pixmaps/package-install.png',install_dir: join_paths(get_option('prefix'),get_option('datadir'),'pamac')) -install_data('data/pixmaps/package-installed-locked.png',install_dir: join_paths(get_option('prefix'),get_option('datadir'),'pamac')) -install_data('data/pixmaps/package-installed-updated.png',install_dir: join_paths(get_option('prefix'),get_option('datadir'),'pamac')) -install_data('data/pixmaps/package-reinstall.png',install_dir: join_paths(get_option('prefix'),get_option('datadir'),'pamac')) -install_data('data/pixmaps/package-remove.png',install_dir: join_paths(get_option('prefix'),get_option('datadir'),'pamac')) -install_data('data/pixmaps/package-upgrade.png',install_dir: join_paths(get_option('prefix'),get_option('datadir'),'pamac')) subdir('src') subdir('src/aur') subdir('src/pamac-user-daemon') diff --git a/pamac.avprj b/pamac.avprj index 48e071d..fa86687 100644 --- a/pamac.avprj +++ b/pamac.avprj @@ -23,18 +23,13 @@ define: KDE_TRAY *define: DISABLE_AUR *gresource: pamac_installer_gresource_xml data/pamac.installer.gresource.xml -if DISABLE_AUR -gresource: pamac_manager_gresource_xml data/pamac.manager_no_aur.gresource.xml -gresource: pamac_transaction_gresource_xml data/pamac.transaction_no_aur.gresource.xml -else -gresource: pamac_manager_gresource_xml data/pamac.manager.gresource.xml -gresource: pamac_transaction_gresource_xml data/pamac.transaction.gresource.xml -end +*gresource: pamac_manager_gresource_xml data/pamac.manager.gresource.xml +*gresource: pamac_transaction_gresource_xml data/pamac.transaction.gresource.xml vapidir: src/vapis vala_binary: src/pamac-clean-cache/pamac-clean-cache -version: 6.2.1 +version: 6.3.0 vala_local_package: Pamac vala_package: posix vala_check_package: gtk+-3.0 @@ -45,7 +40,7 @@ vala_check_package: gtk+-3.0 *vala_source: pamac_config.vala vala_binary: src/pamac-install/pamac-install -version: 6.2.1 +version: 6.3.0 use_gresource: pamac_installer_gresource_xml vala_local_package: Pamac vala_check_package: gtk+-3.0 @@ -56,7 +51,7 @@ vala_check_package: gtk+-3.0 *vala_source: progress_dialog.vala vala_binary: src/pamac-manager/pamac-manager -version: 6.2.1 +version: 6.3.0 use_gresource: pamac_manager_gresource_xml vala_local_package: Pamac vala_check_package: gtk+-3.0 @@ -68,7 +63,7 @@ vala_check_package: gtk+-3.0 *vala_source: manager_window.vala vala_binary: src/pamac-system-daemon/pamac-system-daemon -version: 6.2.1 +version: 6.3.0 vala_local_package: Pamac if NOT DISABLE_AUR vala_local_package: AUR @@ -89,7 +84,7 @@ vala_check_package: polkit-gobject-1 *vala_source: system_daemon.vala vala_binary: src/pamac-tray/pamac-tray -version: 6.2.1 +version: 6.3.0 vala_local_package: Pamac if NOT DISABLE_AUR vala_local_package: AUR @@ -115,7 +110,7 @@ end *vala_source: user_daemon.vala vala_binary: src/pamac-user-daemon/pamac-user-daemon -version: 6.2.1 +version: 6.3.0 vala_local_package: Pamac if NOT DISABLE_AUR vala_local_package: AUR @@ -133,7 +128,7 @@ vala_check_package: libsoup-2.4 vala_library: src/pamac -version: 6.2.1 +version: 6.3.0 *namespace: Pamac use_gresource: pamac_transaction_gresource_xml vala_package: posix @@ -159,7 +154,7 @@ vala_check_package: vte-2.91 *vala_source: transaction_sum_dialog.vala vala_library: src/aur/aur -version: 6.2.1 +version: 6.3.0 *namespace: AUR vala_check_package: json-glib-1.0 vala_check_package: libsoup-2.4 @@ -172,6 +167,8 @@ vala_check_package: libsoup-2.4 *translate: glade data/interface/choose_ignorepkgs_dialog.ui *translate: glade data/interface/choose_provider_dialog.ui *translate: glade data/interface/history_dialog.ui +*translate: glade data/interface/manager_window.ui +*translate: glade data/interface/preferences_dialog.ui *translate: glade data/interface/progress_box.ui *translate: glade data/interface/progress_dialog.ui *translate: glade data/interface/transaction_sum_dialog.ui @@ -203,13 +200,6 @@ vala_check_package: libsoup-2.4 *translate: vala src/progress_box.vala *translate: vala src/transaction.vala *translate: vala src/transaction_sum_dialog.vala -if DISABLE_AUR -translate: glade data/interface/manager_window_no_aur.ui -translate: glade data/interface/preferences_dialog_no_aur.ui -else -translate: glade data/interface/manager_window.ui -translate: glade data/interface/preferences_dialog.ui -end if KDE_TRAY translate: vala src/pamac-tray/tray-appindicator.vala else @@ -227,33 +217,12 @@ else autostart: data/pamac-tray.desktop end -*glade: data/interface/choose_ignorepkgs_dialog.ui -*glade: data/interface/choose_provider_dialog.ui -*glade: data/interface/history_dialog.ui -*glade: data/interface/progress_box.ui -*glade: data/interface/transaction_sum_dialog.ui -if DISABLE_AUR -glade: data/interface/manager_window_no_aur.ui -glade: data/interface/preferences_dialog_no_aur.ui -else -glade: data/interface/manager_window.ui -glade: data/interface/preferences_dialog.ui -end - *full_icon: Hicolor Applications data/icons/16x16/apps/system-software-install.png *full_icon: Hicolor Applications data/icons/24x24/status/pamac-tray-no-update.png *full_icon: Hicolor Applications data/icons/24x24/status/pamac-tray-update.png *full_icon: Hicolor Applications data/icons/32x32/apps/system-software-install.png -*pixmap: data/pixmaps/package-available-locked.png -*pixmap: data/pixmaps/package-available.png *pixmap: data/pixmaps/package-generic.png -*pixmap: data/pixmaps/package-install.png -*pixmap: data/pixmaps/package-installed-locked.png -*pixmap: data/pixmaps/package-installed-updated.png -*pixmap: data/pixmaps/package-reinstall.png -*pixmap: data/pixmaps/package-remove.png -*pixmap: data/pixmaps/package-upgrade.png # These depends are needed to enable parallel builds include: src/CMakeSymlinks.txt diff --git a/po/LINGUAS b/po/LINGUAS index b8ee1cb..e14069b 100644 --- a/po/LINGUAS +++ b/po/LINGUAS @@ -1 +1 @@ -af ar es_ES nn sl_SI cs_CZ is gl be sr_RS zh_TW pl_PL uz fi is_IS sr_RS@latin sl sr@latin fr ro sr el eu ml ur_PK ko el_GR de_DE cs bs si zh da ca_ES sv it_IT vi eo es_AR zh_CN pl hi pt en_GB es es_MX fa nl hu bn hr_HR nb ja pt_BR pt_PT nl_BE ca tr he hi_IN et lt fo it fa_IR es_419 de_CH de ka bs_BA ru ms sk bg ast uk hr es_SV nl_NL cy id az_AZ +af ar es_ES nn sl_SI cs_CZ is gl be sr_RS zh_TW pl_PL uz fi is_IS sr_RS@latin sl es sr@latin fr ro sr el eu ml ur_PK ko el_GR de_DE cs bs si zh da ca_ES sv it_IT vi eo es_AR zh_CN pl hi pt en_GB es_419 es_MX fa nl hu bn hr_HR nb ja pt_BR pt_PT nl_BE ca tr he hi_IN et lt fo it fa_IR de_CH de ka bs_BA ru ms sk bg ast uk hr es_SV nl_NL cy id az_AZ diff --git a/po/meson.build b/po/meson.build index 7c723a0..3fe769a 100644 --- a/po/meson.build +++ b/po/meson.build @@ -1,2 +1,2 @@ i18n = import('i18n') -i18n.gettext('pamac', languages: ['af', 'ar', 'es_ES', 'nn', 'sl_SI', 'cs_CZ', 'is', 'gl', 'be', 'sr_RS', 'zh_TW', 'pl_PL', 'uz', 'fi', 'is_IS', 'sr_RS@latin', 'sl', 'sr@latin', 'fr', 'ro', 'sr', 'el', 'eu', 'ml', 'ur_PK', 'ko', 'el_GR', 'de_DE', 'cs', 'bs', 'si', 'zh', 'da', 'ca_ES', 'sv', 'it_IT', 'vi', 'eo', 'es_AR', 'zh_CN', 'pl', 'hi', 'pt', 'en_GB', 'es', 'es_MX', 'fa', 'nl', 'hu', 'bn', 'hr_HR', 'nb', 'ja', 'pt_BR', 'pt_PT', 'nl_BE', 'ca', 'tr', 'he', 'hi_IN', 'et', 'lt', 'fo', 'it', 'fa_IR', 'es_419', 'de_CH', 'de', 'ka', 'bs_BA', 'ru', 'ms', 'sk', 'bg', 'ast', 'uk', 'hr', 'es_SV', 'nl_NL', 'cy', 'id', 'az_AZ']) +i18n.gettext('pamac', languages: ['af', 'ar', 'es_ES', 'nn', 'sl_SI', 'cs_CZ', 'is', 'gl', 'be', 'sr_RS', 'zh_TW', 'pl_PL', 'uz', 'fi', 'is_IS', 'sr_RS@latin', 'sl', 'es', 'sr@latin', 'fr', 'ro', 'sr', 'el', 'eu', 'ml', 'ur_PK', 'ko', 'el_GR', 'de_DE', 'cs', 'bs', 'si', 'zh', 'da', 'ca_ES', 'sv', 'it_IT', 'vi', 'eo', 'es_AR', 'zh_CN', 'pl', 'hi', 'pt', 'en_GB', 'es_419', 'es_MX', 'fa', 'nl', 'hu', 'bn', 'hr_HR', 'nb', 'ja', 'pt_BR', 'pt_PT', 'nl_BE', 'ca', 'tr', 'he', 'hi_IN', 'et', 'lt', 'fo', 'it', 'fa_IR', 'de_CH', 'de', 'ka', 'bs_BA', 'ru', 'ms', 'sk', 'bg', 'ast', 'uk', 'hr', 'es_SV', 'nl_NL', 'cy', 'id', 'az_AZ']) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index b35a01f..614af96 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -7,7 +7,7 @@ set (GETTEXT_PACKAGE "pamac") set (RELEASE_NAME "pamac") set (CMAKE_C_FLAGS "") set (PREFIX ${CMAKE_INSTALL_PREFIX}) -set (VERSION "6.2.1") +set (VERSION "6.3.0") set (TESTSRCDIR "${CMAKE_SOURCE_DIR}") set (DOLLAR "$") @@ -15,7 +15,7 @@ configure_file (${CMAKE_SOURCE_DIR}/src/Config.vala.base ${CMAKE_BINARY_DIR}/src add_definitions(-DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\") configure_file (${CMAKE_CURRENT_SOURCE_DIR}/Pamac.pc ${CMAKE_CURRENT_BINARY_DIR}/Pamac.pc) configure_file (${CMAKE_CURRENT_SOURCE_DIR}/Pamac.deps ${CMAKE_CURRENT_BINARY_DIR}/Pamac.deps) -set (VERSION "6.2.1") +set (VERSION "6.3.0") add_definitions (${DEPS_CFLAGS}) link_libraries ( ${DEPS_LIBRARIES} ) link_directories ( ${DEPS_LIBRARY_DIRS} ) @@ -64,7 +64,6 @@ if ((${CMAKE_BUILD_TYPE} STREQUAL "Debug") OR (${CMAKE_BUILD_TYPE} STREQUAL "Rel endif() set (COMPILE_OPTIONS ${COMPILE_OPTIONS} --library=Pamac --gir Pamac-6.0.gir ) -set (COMPILE_OPTIONS ${COMPILE_OPTIONS} --gresources=${CMAKE_SOURCE_DIR}/data/pamac.transaction_no_aur.gresource.xml ) set (COMPILE_OPTIONS ${COMPILE_OPTIONS} --gresources=${CMAKE_SOURCE_DIR}/data/pamac.transaction.gresource.xml ) vala_precompile(VALA_C Pamac @@ -87,7 +86,7 @@ add_dependencies( Pamac ${Pamac_DEPENDENCIES} ) target_link_libraries( Pamac m ) set_target_properties( Pamac PROPERTIES VERSION - 6.2.1 + 6.3.0 SOVERSION 6 ) diff --git a/src/Pamac.pc b/src/Pamac.pc index 0f70f21..3cf51bb 100644 --- a/src/Pamac.pc +++ b/src/Pamac.pc @@ -6,7 +6,7 @@ includedir=@DOLLAR@{exec_prefix}/${CMAKE_INSTALL_INCLUDEDIR} Name: Pamac Description: Pamac -Version: 6.2.1 +Version: 6.3.0 Libs: -L@DOLLAR@{libdir} -lPamac Cflags: -I@DOLLAR@{includedir} Requires: gdk-3.0 gtk+-3.0 libalpm libnotify vte-2.91 gio-2.0 glib-2.0 gobject-2.0 diff --git a/src/aur/AUR.pc b/src/aur/AUR.pc index 7639048..d17ed8e 100644 --- a/src/aur/AUR.pc +++ b/src/aur/AUR.pc @@ -6,7 +6,7 @@ includedir=@DOLLAR@{exec_prefix}/${CMAKE_INSTALL_INCLUDEDIR} Name: AUR Description: AUR -Version: 6.2.1 +Version: 6.3.0 Libs: -L@DOLLAR@{libdir} -lAUR Cflags: -I@DOLLAR@{includedir} Requires: json-glib-1.0 libsoup-2.4 glib-2.0 diff --git a/src/aur/CMakeLists.txt b/src/aur/CMakeLists.txt index 30465c0..687a2ed 100644 --- a/src/aur/CMakeLists.txt +++ b/src/aur/CMakeLists.txt @@ -7,7 +7,7 @@ set (GETTEXT_PACKAGE "pamac") set (RELEASE_NAME "pamac") set (CMAKE_C_FLAGS "") set (PREFIX ${CMAKE_INSTALL_PREFIX}) -set (VERSION "6.2.1") +set (VERSION "6.3.0") set (TESTSRCDIR "${CMAKE_SOURCE_DIR}") set (DOLLAR "$") @@ -15,7 +15,7 @@ configure_file (${CMAKE_SOURCE_DIR}/src/aur/Config.vala.base ${CMAKE_BINARY_DIR} add_definitions(-DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\") configure_file (${CMAKE_CURRENT_SOURCE_DIR}/AUR.pc ${CMAKE_CURRENT_BINARY_DIR}/AUR.pc) configure_file (${CMAKE_CURRENT_SOURCE_DIR}/AUR.deps ${CMAKE_CURRENT_BINARY_DIR}/AUR.deps) -set (VERSION "6.2.1") +set (VERSION "6.3.0") add_definitions (${DEPS_CFLAGS}) link_libraries ( ${DEPS_LIBRARIES} ) link_directories ( ${DEPS_LIBRARY_DIRS} ) @@ -65,7 +65,7 @@ add_library(AUR SHARED ${VALA_C}) set_target_properties( AUR PROPERTIES VERSION - 6.2.1 + 6.3.0 SOVERSION 6 ) diff --git a/src/aur/meson.build b/src/aur/meson.build index c154cf2..2d5ee30 100644 --- a/src/aur/meson.build +++ b/src/aur/meson.build @@ -4,7 +4,7 @@ cfg_aur.set('PKGDATADIR', join_paths(get_option('prefix'),get_option('datadir'), cfg_aur.set('GETTEXT_PACKAGE', 'pamac') cfg_aur.set('RELEASE_NAME', 'pamac') cfg_aur.set('PREFIX', get_option('prefix')) -cfg_aur.set('VERSION', '6.2.1') +cfg_aur.set('VERSION', '6.3.0') cfg_aur.set('TESTSRCDIR', meson.source_root()) cfgfile_2 = configure_file(input: 'Config.vala.base',output: 'Config.vala',configuration: cfg_aur) @@ -27,7 +27,7 @@ endif aur_vala_args += ['--gir=AUR-6.0.gir'] -AUR_library = shared_library('AUR',aur_sources,dependencies: aur_deps,vala_args: aur_vala_args,c_args: aur_c_args,version: '6.2.1',soversion: '6',install: true) +AUR_library = shared_library('AUR',aur_sources,dependencies: aur_deps,vala_args: aur_vala_args,c_args: aur_c_args,version: '6.3.0',soversion: '6',install: true) aur_requires = [] aur_requires += ['json-glib-1.0'] @@ -35,7 +35,7 @@ aur_requires += ['libsoup-2.4'] aur_requires += ['glib-2.0'] pkg_mod = import('pkgconfig') pkg_mod.generate(libraries : AUR_library, - version : '6.2.1', + version : '6.3.0', name : 'AUR', filebase : 'AUR', description : 'AUR', diff --git a/src/meson.build b/src/meson.build index 1498081..e2d799c 100644 --- a/src/meson.build +++ b/src/meson.build @@ -4,7 +4,7 @@ cfg_pamac.set('PKGDATADIR', join_paths(get_option('prefix'),get_option('datadir' cfg_pamac.set('GETTEXT_PACKAGE', 'pamac') cfg_pamac.set('RELEASE_NAME', 'pamac') cfg_pamac.set('PREFIX', get_option('prefix')) -cfg_pamac.set('VERSION', '6.2.1') +cfg_pamac.set('VERSION', '6.3.0') cfg_pamac.set('TESTSRCDIR', meson.source_root()) cfgfile_1 = configure_file(input: 'Config.vala.base',output: 'Config.vala',configuration: cfg_pamac) @@ -29,18 +29,10 @@ pamac_sources += ['preferences_dialog.vala'] pamac_sources += ['progress_box.vala'] pamac_sources += ['transaction.vala'] pamac_sources += ['transaction_sum_dialog.vala'] -if DISABLE_AUR -pamac_sources += [pamac_transaction_no_aur_gresource_xml_file_c] -else pamac_sources += [pamac_transaction_gresource_xml_file_c] -endif pamac_vala_args = ['--pkg','posix'] pamac_vala_args += ['--vapidir='+join_paths(meson.source_root(),'src/vapis')] -if DISABLE_AUR -pamac_vala_args += ['--gresources='+join_paths(meson.source_root(),'data/pamac.transaction_no_aur.gresource.xml')] -else pamac_vala_args += ['--gresources='+join_paths(meson.source_root(),'data/pamac.transaction.gresource.xml')] -endif pamac_c_args = [] if DISABLE_AUR pamac_vala_args += ['-D', 'DISABLE_AUR'] @@ -54,7 +46,7 @@ pamac_deps += [meson.get_compiler('c').find_library('m', required : false)] pamac_vala_args += ['--gir=Pamac-6.0.gir'] -Pamac_library = shared_library('Pamac',pamac_sources,dependencies: pamac_deps,vala_args: pamac_vala_args,c_args: pamac_c_args,version: '6.2.1',soversion: '6',install: true) +Pamac_library = shared_library('Pamac',pamac_sources,dependencies: pamac_deps,vala_args: pamac_vala_args,c_args: pamac_c_args,version: '6.3.0',soversion: '6',install: true) pamac_requires = [] pamac_requires += ['gdk-3.0'] @@ -67,7 +59,7 @@ pamac_requires += ['glib-2.0'] pamac_requires += ['gobject-2.0'] pkg_mod = import('pkgconfig') pkg_mod.generate(libraries : Pamac_library, - version : '6.2.1', + version : '6.3.0', name : 'Pamac', filebase : 'Pamac', description : 'Pamac', diff --git a/src/pamac-clean-cache/CMakeLists.txt b/src/pamac-clean-cache/CMakeLists.txt index 6dedd3b..2b6f69a 100644 --- a/src/pamac-clean-cache/CMakeLists.txt +++ b/src/pamac-clean-cache/CMakeLists.txt @@ -7,13 +7,13 @@ set (GETTEXT_PACKAGE "pamac") set (RELEASE_NAME "pamac") set (CMAKE_C_FLAGS "") set (PREFIX ${CMAKE_INSTALL_PREFIX}) -set (VERSION "6.2.1") +set (VERSION "6.3.0") set (TESTSRCDIR "${CMAKE_SOURCE_DIR}") set (DOLLAR "$") configure_file (${CMAKE_SOURCE_DIR}/src/pamac-clean-cache/Config.vala.base ${CMAKE_BINARY_DIR}/src/pamac-clean-cache/Config.vala) add_definitions(-DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\") -set (VERSION "6.2.1") +set (VERSION "6.3.0") add_definitions (${DEPS_CFLAGS}) include_directories ( ${CMAKE_BINARY_DIR}/src ) link_libraries ( ${DEPS_LIBRARIES} -lPamac ) diff --git a/src/pamac-clean-cache/meson.build b/src/pamac-clean-cache/meson.build index b3961d9..61ca9ad 100644 --- a/src/pamac-clean-cache/meson.build +++ b/src/pamac-clean-cache/meson.build @@ -4,7 +4,7 @@ cfg_pamac_clean_cache.set('PKGDATADIR', join_paths(get_option('prefix'),get_opti cfg_pamac_clean_cache.set('GETTEXT_PACKAGE', 'pamac') cfg_pamac_clean_cache.set('RELEASE_NAME', 'pamac') cfg_pamac_clean_cache.set('PREFIX', get_option('prefix')) -cfg_pamac_clean_cache.set('VERSION', '6.2.1') +cfg_pamac_clean_cache.set('VERSION', '6.3.0') cfg_pamac_clean_cache.set('TESTSRCDIR', meson.source_root()) cfgfile_5 = configure_file(input: 'Config.vala.base',output: 'Config.vala',configuration: cfg_pamac_clean_cache) diff --git a/src/pamac-install/CMakeLists.txt b/src/pamac-install/CMakeLists.txt index a204e58..a184f5b 100644 --- a/src/pamac-install/CMakeLists.txt +++ b/src/pamac-install/CMakeLists.txt @@ -7,13 +7,13 @@ set (GETTEXT_PACKAGE "pamac") set (RELEASE_NAME "pamac") set (CMAKE_C_FLAGS "") set (PREFIX ${CMAKE_INSTALL_PREFIX}) -set (VERSION "6.2.1") +set (VERSION "6.3.0") set (TESTSRCDIR "${CMAKE_SOURCE_DIR}") set (DOLLAR "$") configure_file (${CMAKE_SOURCE_DIR}/src/pamac-install/Config.vala.base ${CMAKE_BINARY_DIR}/src/pamac-install/Config.vala) add_definitions(-DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\") -set (VERSION "6.2.1") +set (VERSION "6.3.0") add_definitions (${DEPS_CFLAGS}) include_directories ( ${CMAKE_BINARY_DIR}/src ) link_libraries ( ${DEPS_LIBRARIES} -lPamac ) diff --git a/src/pamac-install/meson.build b/src/pamac-install/meson.build index 4f17104..39678af 100644 --- a/src/pamac-install/meson.build +++ b/src/pamac-install/meson.build @@ -4,7 +4,7 @@ cfg_pamac_install.set('PKGDATADIR', join_paths(get_option('prefix'),get_option(' cfg_pamac_install.set('GETTEXT_PACKAGE', 'pamac') cfg_pamac_install.set('RELEASE_NAME', 'pamac') cfg_pamac_install.set('PREFIX', get_option('prefix')) -cfg_pamac_install.set('VERSION', '6.2.1') +cfg_pamac_install.set('VERSION', '6.3.0') cfg_pamac_install.set('TESTSRCDIR', meson.source_root()) cfgfile_6 = configure_file(input: 'Config.vala.base',output: 'Config.vala',configuration: cfg_pamac_install) diff --git a/src/pamac-manager/CMakeLists.txt b/src/pamac-manager/CMakeLists.txt index b789872..95743c7 100644 --- a/src/pamac-manager/CMakeLists.txt +++ b/src/pamac-manager/CMakeLists.txt @@ -7,13 +7,13 @@ set (GETTEXT_PACKAGE "pamac") set (RELEASE_NAME "pamac") set (CMAKE_C_FLAGS "") set (PREFIX ${CMAKE_INSTALL_PREFIX}) -set (VERSION "6.2.1") +set (VERSION "6.3.0") set (TESTSRCDIR "${CMAKE_SOURCE_DIR}") set (DOLLAR "$") configure_file (${CMAKE_SOURCE_DIR}/src/pamac-manager/Config.vala.base ${CMAKE_BINARY_DIR}/src/pamac-manager/Config.vala) add_definitions(-DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\") -set (VERSION "6.2.1") +set (VERSION "6.3.0") add_definitions (${DEPS_CFLAGS}) include_directories ( ${CMAKE_BINARY_DIR}/src ) link_libraries ( ${DEPS_LIBRARIES} -lPamac ) @@ -51,7 +51,6 @@ if ((${CMAKE_BUILD_TYPE} STREQUAL "Debug") OR (${CMAKE_BUILD_TYPE} STREQUAL "Rel set(COMPILE_OPTIONS ${COMPILE_OPTIONS} "-g") endif() -set (COMPILE_OPTIONS ${COMPILE_OPTIONS} --gresources=${CMAKE_SOURCE_DIR}/data/pamac.manager_no_aur.gresource.xml ) set (COMPILE_OPTIONS ${COMPILE_OPTIONS} --gresources=${CMAKE_SOURCE_DIR}/data/pamac.manager.gresource.xml ) vala_precompile(VALA_C pamac-manager diff --git a/src/pamac-manager/manager_window.vala b/src/pamac-manager/manager_window.vala index 2ea16b0..b988958 100644 --- a/src/pamac-manager/manager_window.vala +++ b/src/pamac-manager/manager_window.vala @@ -39,11 +39,8 @@ namespace Pamac { } } -#if DISABLE_AUR - [GtkTemplate (ui = "/org/pamac/manager/interface/manager_window_no_aur.ui")] -#else + [GtkTemplate (ui = "/org/pamac/manager/interface/manager_window.ui")] -#endif class ManagerWindow : Gtk.ApplicationWindow { // icons Gdk.Pixbuf? installed_icon; @@ -67,6 +64,8 @@ namespace Pamac { [GtkChild] Gtk.TreeViewColumn packages_state_column; #if DISABLE_AUR + [GtkChild] + Gtk.ScrolledWindow aur_scrolledwindow; #else [GtkChild] Gtk.TreeView aur_treeview; @@ -172,8 +171,13 @@ namespace Pamac { Object (application: application); #if DISABLE_AUR + packages_stack.remove (aur_scrolledwindow); + packages_stackswitcher.visible = false; #else support_aur (false); + aur_treeview.row_activated.connect (on_aur_treeview_row_activated); + aur_treeview.button_press_event.connect (on_aur_treeview_button_press_event); + aur_treeview.query_tooltip.connect (on_aur_treeview_query_tooltip); #endif button_back.visible = false; transaction_infobox.visible = false; @@ -1208,7 +1212,6 @@ namespace Pamac { #if DISABLE_AUR #else - [GtkCallback] void on_aur_treeview_row_activated (Gtk.TreeView treeview, Gtk.TreePath path, Gtk.TreeViewColumn column) { if (column.title == dgettext (null, "Name")) { main_stack.visible_child_name = "details"; @@ -1508,7 +1511,6 @@ namespace Pamac { #if DISABLE_AUR #else - [GtkCallback] bool on_aur_treeview_button_press_event (Gdk.EventButton event) { aur_treeview.grab_focus (); // Check if right mouse button was clicked @@ -1568,7 +1570,6 @@ namespace Pamac { return false; } - [GtkCallback] bool on_aur_treeview_query_tooltip (int x, int y, bool keyboard_tooltip, Gtk.Tooltip tooltip) { Gtk.TreePath path; Gtk.TreeIter iter; diff --git a/src/pamac-manager/meson.build b/src/pamac-manager/meson.build index 0b74ab1..06402aa 100644 --- a/src/pamac-manager/meson.build +++ b/src/pamac-manager/meson.build @@ -4,7 +4,7 @@ cfg_pamac_manager.set('PKGDATADIR', join_paths(get_option('prefix'),get_option(' cfg_pamac_manager.set('GETTEXT_PACKAGE', 'pamac') cfg_pamac_manager.set('RELEASE_NAME', 'pamac') cfg_pamac_manager.set('PREFIX', get_option('prefix')) -cfg_pamac_manager.set('VERSION', '6.2.1') +cfg_pamac_manager.set('VERSION', '6.3.0') cfg_pamac_manager.set('TESTSRCDIR', meson.source_root()) cfgfile_7 = configure_file(input: 'Config.vala.base',output: 'Config.vala',configuration: cfg_pamac_manager) @@ -17,17 +17,9 @@ pamac_manager_sources = [cfgfile_7] pamac_manager_sources += ['history_dialog.vala'] pamac_manager_sources += ['manager.vala'] pamac_manager_sources += ['manager_window.vala'] -if DISABLE_AUR -pamac_manager_sources += [pamac_manager_no_aur_gresource_xml_file_c] -else pamac_manager_sources += [pamac_manager_gresource_xml_file_c] -endif pamac_manager_vala_args = ['--vapidir='+join_paths(meson.source_root(),'src/vapis')] -if DISABLE_AUR -pamac_manager_vala_args += ['--gresources='+join_paths(meson.source_root(),'data/pamac.manager_no_aur.gresource.xml')] -else pamac_manager_vala_args += ['--gresources='+join_paths(meson.source_root(),'data/pamac.manager.gresource.xml')] -endif pamac_manager_dependencies = [Pamac_library] pamac_manager_c_args = [] if DISABLE_AUR diff --git a/src/pamac-system-daemon/CMakeLists.txt b/src/pamac-system-daemon/CMakeLists.txt index a949ca0..2bfd26b 100644 --- a/src/pamac-system-daemon/CMakeLists.txt +++ b/src/pamac-system-daemon/CMakeLists.txt @@ -7,13 +7,13 @@ set (GETTEXT_PACKAGE "pamac") set (RELEASE_NAME "pamac") set (CMAKE_C_FLAGS "") set (PREFIX ${CMAKE_INSTALL_PREFIX}) -set (VERSION "6.2.1") +set (VERSION "6.3.0") set (TESTSRCDIR "${CMAKE_SOURCE_DIR}") set (DOLLAR "$") configure_file (${CMAKE_SOURCE_DIR}/src/pamac-system-daemon/Config.vala.base ${CMAKE_BINARY_DIR}/src/pamac-system-daemon/Config.vala) add_definitions(-DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\") -set (VERSION "6.2.1") +set (VERSION "6.3.0") add_definitions (${DEPS_CFLAGS}) include_directories ( ${CMAKE_BINARY_DIR}/src ${CMAKE_BINARY_DIR}/src/aur ) link_libraries ( ${DEPS_LIBRARIES} -lPamac -lAUR ) diff --git a/src/pamac-system-daemon/meson.build b/src/pamac-system-daemon/meson.build index 8e35707..35ba89e 100644 --- a/src/pamac-system-daemon/meson.build +++ b/src/pamac-system-daemon/meson.build @@ -4,7 +4,7 @@ cfg_pamac_system_daemon.set('PKGDATADIR', join_paths(get_option('prefix'),get_op cfg_pamac_system_daemon.set('GETTEXT_PACKAGE', 'pamac') cfg_pamac_system_daemon.set('RELEASE_NAME', 'pamac') cfg_pamac_system_daemon.set('PREFIX', get_option('prefix')) -cfg_pamac_system_daemon.set('VERSION', '6.2.1') +cfg_pamac_system_daemon.set('VERSION', '6.3.0') cfg_pamac_system_daemon.set('TESTSRCDIR', meson.source_root()) cfgfile_8 = configure_file(input: 'Config.vala.base',output: 'Config.vala',configuration: cfg_pamac_system_daemon) diff --git a/src/pamac-tray/CMakeLists.txt b/src/pamac-tray/CMakeLists.txt index 24d0d44..d63e444 100644 --- a/src/pamac-tray/CMakeLists.txt +++ b/src/pamac-tray/CMakeLists.txt @@ -7,13 +7,13 @@ set (GETTEXT_PACKAGE "pamac") set (RELEASE_NAME "pamac") set (CMAKE_C_FLAGS "") set (PREFIX ${CMAKE_INSTALL_PREFIX}) -set (VERSION "6.2.1") +set (VERSION "6.3.0") set (TESTSRCDIR "${CMAKE_SOURCE_DIR}") set (DOLLAR "$") configure_file (${CMAKE_SOURCE_DIR}/src/pamac-tray/Config.vala.base ${CMAKE_BINARY_DIR}/src/pamac-tray/Config.vala) add_definitions(-DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\") -set (VERSION "6.2.1") +set (VERSION "6.3.0") add_definitions (${DEPS_CFLAGS}) include_directories ( ${CMAKE_BINARY_DIR}/src ${CMAKE_BINARY_DIR}/src/aur ) link_libraries ( ${DEPS_LIBRARIES} -lPamac -lAUR ) diff --git a/src/pamac-tray/meson.build b/src/pamac-tray/meson.build index eb2eed8..63d790b 100644 --- a/src/pamac-tray/meson.build +++ b/src/pamac-tray/meson.build @@ -4,7 +4,7 @@ cfg_pamac_tray.set('PKGDATADIR', join_paths(get_option('prefix'),get_option('dat cfg_pamac_tray.set('GETTEXT_PACKAGE', 'pamac') cfg_pamac_tray.set('RELEASE_NAME', 'pamac') cfg_pamac_tray.set('PREFIX', get_option('prefix')) -cfg_pamac_tray.set('VERSION', '6.2.1') +cfg_pamac_tray.set('VERSION', '6.3.0') cfg_pamac_tray.set('TESTSRCDIR', meson.source_root()) cfgfile_4 = configure_file(input: 'Config.vala.base',output: 'Config.vala',configuration: cfg_pamac_tray) diff --git a/src/pamac-user-daemon/CMakeLists.txt b/src/pamac-user-daemon/CMakeLists.txt index 55956a0..baec7e9 100644 --- a/src/pamac-user-daemon/CMakeLists.txt +++ b/src/pamac-user-daemon/CMakeLists.txt @@ -7,13 +7,13 @@ set (GETTEXT_PACKAGE "pamac") set (RELEASE_NAME "pamac") set (CMAKE_C_FLAGS "") set (PREFIX ${CMAKE_INSTALL_PREFIX}) -set (VERSION "6.2.1") +set (VERSION "6.3.0") set (TESTSRCDIR "${CMAKE_SOURCE_DIR}") set (DOLLAR "$") configure_file (${CMAKE_SOURCE_DIR}/src/pamac-user-daemon/Config.vala.base ${CMAKE_BINARY_DIR}/src/pamac-user-daemon/Config.vala) add_definitions(-DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\") -set (VERSION "6.2.1") +set (VERSION "6.3.0") add_definitions (${DEPS_CFLAGS}) include_directories ( ${CMAKE_BINARY_DIR}/src ${CMAKE_BINARY_DIR}/src/aur ) link_libraries ( ${DEPS_LIBRARIES} -lPamac -lAUR ) diff --git a/src/pamac-user-daemon/meson.build b/src/pamac-user-daemon/meson.build index a14b89e..33d5198 100644 --- a/src/pamac-user-daemon/meson.build +++ b/src/pamac-user-daemon/meson.build @@ -4,7 +4,7 @@ cfg_pamac_user_daemon.set('PKGDATADIR', join_paths(get_option('prefix'),get_opti cfg_pamac_user_daemon.set('GETTEXT_PACKAGE', 'pamac') cfg_pamac_user_daemon.set('RELEASE_NAME', 'pamac') cfg_pamac_user_daemon.set('PREFIX', get_option('prefix')) -cfg_pamac_user_daemon.set('VERSION', '6.2.1') +cfg_pamac_user_daemon.set('VERSION', '6.3.0') cfg_pamac_user_daemon.set('TESTSRCDIR', meson.source_root()) cfgfile_3 = configure_file(input: 'Config.vala.base',output: 'Config.vala',configuration: cfg_pamac_user_daemon) diff --git a/src/pamac_config.vala b/src/pamac_config.vala index 14cdc4f..ff83f65 100644 --- a/src/pamac_config.vala +++ b/src/pamac_config.vala @@ -37,6 +37,7 @@ namespace Pamac { public bool rm_only_uninstalled { get; private set; } public string terminal_background { get; private set; } public string terminal_foreground { get; private set; } + public string terminal_font { get; private set; } public unowned HashTable environment_variables { get { return _environment_variables; @@ -89,6 +90,7 @@ namespace Pamac { rm_only_uninstalled = false; terminal_background = "rgb(0,0,0)"; terminal_foreground = "rgb(255,255,255)"; + terminal_font = "Sans Regular 12"; parse_file (conf_path); } @@ -150,6 +152,10 @@ namespace Pamac { if (splitted.length == 2) { terminal_foreground = splitted[1]._strip (); } + } else if (key == "TerminalFont") { + if (splitted.length == 2) { + terminal_font = splitted[1]._strip (); + } } } } catch (GLib.Error e) { @@ -279,6 +285,13 @@ namespace Pamac { } else { data.append (line + "\n"); } + } else if (line.contains ("TerminalFont")) { + if (new_conf.lookup_extended ("TerminalFont", null, out variant)) { + data.append ("TerminalFont = %s\n".printf (variant.get_string ())); + new_conf.remove ("TerminalFont"); + } else { + data.append (line + "\n"); + } } else { data.append (line + "\n"); } @@ -347,6 +360,8 @@ namespace Pamac { data.append ("BackgroundColor = %s\n".printf (val.get_string ())); } else if (key == "ForegroundColor") { data.append ("ForegroundCOlor = %s\n".printf (val.get_string ())); + } else if (key == "TerminalFont") { + data.append ("TerminalFont = %s\n".printf (val.get_string ())); } } } diff --git a/src/preferences_dialog.vala b/src/preferences_dialog.vala index 514c114..c51fd3a 100644 --- a/src/preferences_dialog.vala +++ b/src/preferences_dialog.vala @@ -20,11 +20,7 @@ namespace Pamac { -#if DISABLE_AUR - [GtkTemplate (ui = "/org/pamac/preferences/interface/preferences_dialog_no_aur.ui")] -#else [GtkTemplate (ui = "/org/pamac/preferences/interface/preferences_dialog.ui")] -#endif class PreferencesDialog : Gtk.Dialog { [GtkChild] @@ -52,6 +48,10 @@ namespace Pamac { [GtkChild] Gtk.Button generate_mirrors_list_button; #if DISABLE_AUR + [GtkChild] + Gtk.Stack stack; + [GtkChild] + Gtk.Box aur_config_box; #else [GtkChild] Gtk.Switch enable_aur_button; @@ -74,6 +74,8 @@ namespace Pamac { Gtk.ColorButton terminal_background; [GtkChild] Gtk.ColorButton terminal_foreground; + [GtkChild] + Gtk.FontButton terminal_font; Gtk.ListStore ignorepkgs_liststore; Transaction transaction; @@ -87,6 +89,7 @@ namespace Pamac { refresh_period_label.set_markup (dgettext (null, "How often to check for updates, value in hours") +":"); cache_keep_nb_label.set_markup (dgettext (null, "Number of versions of each package to keep in the cache") +":"); #if DISABLE_AUR + stack.remove (aur_config_box); #else aur_build_dir_label.set_markup (dgettext (null, "Build directory") +":"); #endif @@ -110,7 +113,7 @@ namespace Pamac { cache_keep_nb_spin_button.value = transaction.keep_num_pkgs; cache_only_uninstalled_checkbutton.active = transaction.rm_only_uninstalled; - // Set up terminal colors + // Set up terminal terminal_background.set_use_alpha (false); terminal_foreground.set_use_alpha (false); Gdk.RGBA rgba = Gdk.RGBA (); @@ -118,6 +121,7 @@ namespace Pamac { terminal_background.rgba = rgba; tmp = rgba.parse (transaction.terminal_foreground); terminal_foreground.rgba = rgba; + terminal_font.set_font(transaction.terminal_font); // populate ignorepkgs_liststore ignorepkgs_liststore = new Gtk.ListStore (1, typeof (string)); @@ -136,6 +140,7 @@ namespace Pamac { transaction.write_pamac_config_finished.connect (on_write_pamac_config_finished); terminal_background.color_set.connect (on_select_background); terminal_foreground.color_set.connect (on_select_foreground); + terminal_font.font_set.connect (on_select_font); AlpmPackage pkg = transaction.find_installed_satisfier ("pacman-mirrors"); if (pkg.name == "") { @@ -249,6 +254,13 @@ namespace Pamac { transaction.update_terminal_foreground (terminal_foreground.rgba.to_string ()); } + void on_select_font () { + var new_pamac_conf = new HashTable (str_hash, str_equal); + new_pamac_conf.insert ("TerminalFont", new Variant.string (terminal_font.get_font_name ())); + transaction.start_write_pamac_config (new_pamac_conf); + transaction.update_terminal_font (terminal_font.get_font_name ()); + } + #if DISABLE_AUR #else bool on_enable_aur_button_state_set (bool new_state) { diff --git a/src/transaction.vala b/src/transaction.vala index 8ce2145..39d1e64 100644 --- a/src/transaction.vala +++ b/src/transaction.vala @@ -148,6 +148,7 @@ namespace Pamac { public bool rm_only_uninstalled { get { return pamac_config.rm_only_uninstalled; } } public string terminal_background { get { return pamac_config.terminal_background; } } public string terminal_foreground { get { return pamac_config.terminal_foreground; } } + public string terminal_font { get { return pamac_config.terminal_font; } } public unowned GLib.HashTable environment_variables { get {return pamac_config.environment_variables; } } public bool no_update_hide_icon { get { return pamac_config.no_update_hide_icon; } } public bool recurse { get { return pamac_config.recurse; } } @@ -198,6 +199,7 @@ namespace Pamac { //dialogs TransactionSumDialog transaction_sum_dialog; public ProgressBox progress_box; + //Pango.FontDescription pfd; Vte.Terminal term; Vte.Pty pty; #if DISABLE_AUR @@ -270,6 +272,8 @@ namespace Pamac { term.set_color_background (tmp); tmp.parse (terminal_foreground); term.set_color_foreground (tmp); + stdout.printf("Terminal font: %s\n", terminal_font); + term.set_font (Pango.FontDescription.from_string (terminal_font)); term.button_press_event.connect (on_term_button_press_event); term.key_press_event.connect (on_term_key_press_event); // creating pty for term @@ -316,6 +320,10 @@ namespace Pamac { term.set_color_foreground (tmp); } + public void update_terminal_font (string font) { + term.set_font (Pango.FontDescription.from_string (terminal_font)); + } + public void run_preferences_dialog () { check_authorization.begin ((obj, res) => { bool authorized = check_authorization.end (res);