From e8a11f69608486373ac3e44c36ff0983a4465716 Mon Sep 17 00:00:00 2001 From: Chris Cromer Date: Wed, 8 Nov 2017 16:25:49 -0300 Subject: [PATCH] fix window glitch for updater --- pamac.avprj | 16 ++++++++-------- po/pamac.pot | 2 +- src/CMakeLists.txt | 6 +++--- src/meson.build | 6 +++--- 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 | 4 ++-- src/pamac-manager/manager.vala | 2 ++ src/pamac-manager/manager_window.vala | 7 ++++--- src/pamac-manager/meson.build | 2 +- 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/pamacclassic.pc | 2 +- 19 files changed, 40 insertions(+), 37 deletions(-) diff --git a/pamac.avprj b/pamac.avprj index 3c44209..2a7dd05 100644 --- a/pamac.avprj +++ b/pamac.avprj @@ -1,7 +1,7 @@ ### AutoVala Project ### autovala_version: 27 project_name: pamac-classic -project_version: 6.5.1 +project_version: 6.5.2 vala_version: 0.38 custom: data/systemd/pamac-system.service /usr/lib/systemd/system @@ -27,7 +27,7 @@ define: KDE_TRAY vapidir: src/vapis vala_binary: src/pamac-clean-cache/pamac-clean-cache -*version: 6.5.1 +*version: 6.5.2 vala_local_package: pamacclassic vala_package: posix vala_check_package: gtk+-3.0 @@ -39,7 +39,7 @@ vala_check_package: json-glib-1.0 *vala_source: pamac_config.vala vala_binary: src/pamac-install/pamac-install -*version: 6.5.1 +*version: 6.5.2 use_gresource: pamac_installer_gresource_xml vala_local_package: pamacclassic vala_check_package: gtk+-3.0 @@ -51,7 +51,7 @@ vala_check_package: json-glib-1.0 *vala_source: progress_dialog.vala vala_binary: src/pamac-manager/pamac-manager -*version: 6.5.1 +*version: 6.5.2 alias: pamac-updater use_gresource: pamac_manager_gresource_xml vala_local_package: pamacclassic @@ -65,7 +65,7 @@ vala_check_package: json-glib-1.0 *vala_source: manager_window.vala vala_binary: src/pamac-system-daemon/pamac-system-daemon -*version: 6.5.1 +*version: 6.5.2 vala_local_package: pamacclassic vala_package: posix vala_check_package: gtk+-3.0 @@ -83,7 +83,7 @@ vala_check_package: polkit-gobject-1 *vala_source: system_daemon.vala vala_binary: src/pamac-tray/pamac-tray -*version: 6.5.1 +*version: 6.5.2 vala_local_package: pamacclassic vala_package: posix vala_check_package: json-glib-1.0 @@ -107,7 +107,7 @@ end *vala_source: tray.vala vala_binary: src/pamac-user-daemon/pamac-user-daemon -*version: 6.5.1 +*version: 6.5.2 vala_local_package: pamacclassic vala_package: posix vala_check_package: gtk+-3.0 @@ -122,7 +122,7 @@ vala_check_package: libsoup-2.4 vala_library: src/pamac-classic -*version: 6.5.1 +*version: 6.5.2 namespace: pamacclassic use_gresource: pamac_transaction_gresource_xml vala_package: posix diff --git a/po/pamac.pot b/po/pamac.pot index e3be7b7..a8aa893 100644 --- a/po/pamac.pot +++ b/po/pamac.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: Pamac\n" "Report-Msgid-Bugs-To: cromer@cromnix.org\n" -"POT-Creation-Date: 2017-11-06 22:26-0300\n" +"POT-Creation-Date: 2017-11-08 16:24-0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index f4cb63e..77150a0 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -7,7 +7,7 @@ set (GETTEXT_PACKAGE "pamac-classic") set (RELEASE_NAME "pamac-classic") set (CMAKE_C_FLAGS "") set (PREFIX ${CMAKE_INSTALL_PREFIX}) -set (VERSION "6.5.1") +set (VERSION "6.5.2") 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}/pamacclassic.pc ${CMAKE_CURRENT_BINARY_DIR}/pamacclassic.pc) configure_file (${CMAKE_CURRENT_SOURCE_DIR}/pamacclassic.deps ${CMAKE_CURRENT_BINARY_DIR}/pamacclassic.deps) -set (VERSION "6.5.1") +set (VERSION "6.5.2") add_definitions (${DEPS_CFLAGS}) link_libraries ( ${DEPS_LIBRARIES} ) link_directories ( ${DEPS_LIBRARY_DIRS} ) @@ -101,7 +101,7 @@ add_dependencies( pamacclassic ${pamacclassic_DEPENDENCIES} ) target_link_libraries( pamacclassic m ) set_target_properties( pamacclassic PROPERTIES VERSION - 6.5.1 + 6.5.2 SOVERSION 6 ) diff --git a/src/meson.build b/src/meson.build index c956ebb..ecfee03 100644 --- a/src/meson.build +++ b/src/meson.build @@ -4,7 +4,7 @@ cfg_pamac_classic.set('PKGDATADIR', join_paths(get_option('prefix'),get_option(' cfg_pamac_classic.set('GETTEXT_PACKAGE', 'pamac-classic') cfg_pamac_classic.set('RELEASE_NAME', 'pamac-classic') cfg_pamac_classic.set('PREFIX', get_option('prefix')) -cfg_pamac_classic.set('VERSION', '6.5.1') +cfg_pamac_classic.set('VERSION', '6.5.2') cfg_pamac_classic.set('TESTSRCDIR', meson.source_root()) cfgfile_1 = configure_file(input: 'Config.vala.base',output: 'Config.vala',configuration: cfg_pamac_classic) @@ -59,7 +59,7 @@ pamac_classic_deps += [meson.get_compiler('c').find_library('m', required : fals pamac_classic_vala_args += ['--gir=pamacclassic-6.0.gir'] -pamacclassic_library = shared_library('pamacclassic',pamac_classic_sources,dependencies: pamac_classic_deps,vala_args: pamac_classic_vala_args,c_args: pamac_classic_c_args,version: '6.5.1',soversion: '6',install: true) +pamacclassic_library = shared_library('pamacclassic',pamac_classic_sources,dependencies: pamac_classic_deps,vala_args: pamac_classic_vala_args,c_args: pamac_classic_c_args,version: '6.5.2',soversion: '6',install: true) pamac_classic_requires = [] pamac_classic_requires += ['gdk-3.0'] @@ -74,7 +74,7 @@ pamac_classic_requires += ['glib-2.0'] pamac_classic_requires += ['gobject-2.0'] pkg_mod = import('pkgconfig') pkg_mod.generate(libraries : pamacclassic_library, - version : '6.5.1', + version : '6.5.2', name : 'pamacclassic', filebase : 'pamacclassic', description : 'pamacclassic', diff --git a/src/pamac-clean-cache/CMakeLists.txt b/src/pamac-clean-cache/CMakeLists.txt index 85e6959..4f88fa6 100644 --- a/src/pamac-clean-cache/CMakeLists.txt +++ b/src/pamac-clean-cache/CMakeLists.txt @@ -7,13 +7,13 @@ set (GETTEXT_PACKAGE "pamac-classic") set (RELEASE_NAME "pamac-classic") set (CMAKE_C_FLAGS "") set (PREFIX ${CMAKE_INSTALL_PREFIX}) -set (VERSION "6.5.1") +set (VERSION "6.5.2") 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.5.1") +set (VERSION "6.5.2") add_definitions (${DEPS_CFLAGS}) include_directories ( ${CMAKE_BINARY_DIR}/src ) link_libraries ( ${DEPS_LIBRARIES} -lpamacclassic ) diff --git a/src/pamac-clean-cache/meson.build b/src/pamac-clean-cache/meson.build index 7c950db..a80b4aa 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-classic') cfg_pamac_clean_cache.set('RELEASE_NAME', 'pamac-classic') cfg_pamac_clean_cache.set('PREFIX', get_option('prefix')) -cfg_pamac_clean_cache.set('VERSION', '6.5.1') +cfg_pamac_clean_cache.set('VERSION', '6.5.2') cfg_pamac_clean_cache.set('TESTSRCDIR', meson.source_root()) cfgfile_4 = 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 fca809e..05b3157 100644 --- a/src/pamac-install/CMakeLists.txt +++ b/src/pamac-install/CMakeLists.txt @@ -7,13 +7,13 @@ set (GETTEXT_PACKAGE "pamac-classic") set (RELEASE_NAME "pamac-classic") set (CMAKE_C_FLAGS "") set (PREFIX ${CMAKE_INSTALL_PREFIX}) -set (VERSION "6.5.1") +set (VERSION "6.5.2") 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.5.1") +set (VERSION "6.5.2") add_definitions (${DEPS_CFLAGS}) include_directories ( ${CMAKE_BINARY_DIR}/src ) link_libraries ( ${DEPS_LIBRARIES} -lpamacclassic ) diff --git a/src/pamac-install/meson.build b/src/pamac-install/meson.build index 4cd3e87..0c9f281 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-classic') cfg_pamac_install.set('RELEASE_NAME', 'pamac-classic') cfg_pamac_install.set('PREFIX', get_option('prefix')) -cfg_pamac_install.set('VERSION', '6.5.1') +cfg_pamac_install.set('VERSION', '6.5.2') cfg_pamac_install.set('TESTSRCDIR', meson.source_root()) cfgfile_5 = 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 f19f6f0..88928b1 100644 --- a/src/pamac-manager/CMakeLists.txt +++ b/src/pamac-manager/CMakeLists.txt @@ -7,13 +7,13 @@ set (GETTEXT_PACKAGE "pamac-classic") set (RELEASE_NAME "pamac-classic") set (CMAKE_C_FLAGS "") set (PREFIX ${CMAKE_INSTALL_PREFIX}) -set (VERSION "6.5.1") +set (VERSION "6.5.2") 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.5.1") +set (VERSION "6.5.2") add_definitions (${DEPS_CFLAGS}) include_directories ( ${CMAKE_BINARY_DIR}/src ) link_libraries ( ${DEPS_LIBRARIES} -lpamacclassic ) diff --git a/src/pamac-manager/manager.vala b/src/pamac-manager/manager.vala index 54c777b..39bcef7 100644 --- a/src/pamac-manager/manager.vala +++ b/src/pamac-manager/manager.vala @@ -82,6 +82,8 @@ namespace Pamac { this.add_action (action); accels = {"F"}; this.set_accels_for_action ("app.search", accels); + + manager_window.present (); } } diff --git a/src/pamac-manager/manager_window.vala b/src/pamac-manager/manager_window.vala index 55dd3e3..5a99caa 100644 --- a/src/pamac-manager/manager_window.vala +++ b/src/pamac-manager/manager_window.vala @@ -184,14 +184,14 @@ namespace Pamac { var action = new SimpleAction ("refreshdb", null); action.activate.connect (on_refresh_button_clicked); this.add_action (action); - + action = new SimpleAction ("viewhistory", null); action.activate.connect (on_history_button_clicked); this.add_action (action); - + action = new SimpleAction ("installlocal", null); action.activate.connect (on_local_button_clicked); - this.add_action (action); + this.add_action (action); action = new SimpleAction ("preferences", null); action.activate.connect (on_preferences_button_clicked); @@ -511,6 +511,7 @@ namespace Pamac { } public void show_default_pkgs () { + this.get_window ().set_cursor (new Gdk.Cursor.for_display (Gdk.Display.get_default (), Gdk.CursorType.WATCH)); transaction.get_installed_pkgs.begin ((obj, res) => { populate_packages_list (transaction.get_installed_pkgs.end (res)); }); diff --git a/src/pamac-manager/meson.build b/src/pamac-manager/meson.build index 7d66f54..c73ccff 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-classic') cfg_pamac_manager.set('RELEASE_NAME', 'pamac-classic') cfg_pamac_manager.set('PREFIX', get_option('prefix')) -cfg_pamac_manager.set('VERSION', '6.5.1') +cfg_pamac_manager.set('VERSION', '6.5.2') cfg_pamac_manager.set('TESTSRCDIR', meson.source_root()) cfgfile_6 = configure_file(input: 'Config.vala.base',output: 'Config.vala',configuration: cfg_pamac_manager) diff --git a/src/pamac-system-daemon/CMakeLists.txt b/src/pamac-system-daemon/CMakeLists.txt index 909b858..7748058 100644 --- a/src/pamac-system-daemon/CMakeLists.txt +++ b/src/pamac-system-daemon/CMakeLists.txt @@ -7,13 +7,13 @@ set (GETTEXT_PACKAGE "pamac-classic") set (RELEASE_NAME "pamac-classic") set (CMAKE_C_FLAGS "") set (PREFIX ${CMAKE_INSTALL_PREFIX}) -set (VERSION "6.5.1") +set (VERSION "6.5.2") 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.5.1") +set (VERSION "6.5.2") add_definitions (${DEPS_CFLAGS}) include_directories ( ${CMAKE_BINARY_DIR}/src ) link_libraries ( ${DEPS_LIBRARIES} -lpamacclassic ) diff --git a/src/pamac-system-daemon/meson.build b/src/pamac-system-daemon/meson.build index 5258a91..0629101 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-classic') cfg_pamac_system_daemon.set('RELEASE_NAME', 'pamac-classic') cfg_pamac_system_daemon.set('PREFIX', get_option('prefix')) -cfg_pamac_system_daemon.set('VERSION', '6.5.1') +cfg_pamac_system_daemon.set('VERSION', '6.5.2') cfg_pamac_system_daemon.set('TESTSRCDIR', meson.source_root()) cfgfile_7 = 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 ce9d50a..eb5875a 100644 --- a/src/pamac-tray/CMakeLists.txt +++ b/src/pamac-tray/CMakeLists.txt @@ -7,13 +7,13 @@ set (GETTEXT_PACKAGE "pamac-classic") set (RELEASE_NAME "pamac-classic") set (CMAKE_C_FLAGS "") set (PREFIX ${CMAKE_INSTALL_PREFIX}) -set (VERSION "6.5.1") +set (VERSION "6.5.2") 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.5.1") +set (VERSION "6.5.2") add_definitions (${DEPS_CFLAGS}) include_directories ( ${CMAKE_BINARY_DIR}/src ) link_libraries ( ${DEPS_LIBRARIES} -lpamacclassic ) diff --git a/src/pamac-tray/meson.build b/src/pamac-tray/meson.build index d4b0b19..ecafe0b 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-classic') cfg_pamac_tray.set('RELEASE_NAME', 'pamac-classic') cfg_pamac_tray.set('PREFIX', get_option('prefix')) -cfg_pamac_tray.set('VERSION', '6.5.1') +cfg_pamac_tray.set('VERSION', '6.5.2') cfg_pamac_tray.set('TESTSRCDIR', meson.source_root()) cfgfile_3 = 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 3098ef7..43e3d0c 100644 --- a/src/pamac-user-daemon/CMakeLists.txt +++ b/src/pamac-user-daemon/CMakeLists.txt @@ -7,13 +7,13 @@ set (GETTEXT_PACKAGE "pamac-classic") set (RELEASE_NAME "pamac-classic") set (CMAKE_C_FLAGS "") set (PREFIX ${CMAKE_INSTALL_PREFIX}) -set (VERSION "6.5.1") +set (VERSION "6.5.2") 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.5.1") +set (VERSION "6.5.2") add_definitions (${DEPS_CFLAGS}) include_directories ( ${CMAKE_BINARY_DIR}/src ) link_libraries ( ${DEPS_LIBRARIES} -lpamacclassic ) diff --git a/src/pamac-user-daemon/meson.build b/src/pamac-user-daemon/meson.build index b60908c..4637bb6 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-classic') cfg_pamac_user_daemon.set('RELEASE_NAME', 'pamac-classic') cfg_pamac_user_daemon.set('PREFIX', get_option('prefix')) -cfg_pamac_user_daemon.set('VERSION', '6.5.1') +cfg_pamac_user_daemon.set('VERSION', '6.5.2') cfg_pamac_user_daemon.set('TESTSRCDIR', meson.source_root()) cfgfile_2 = configure_file(input: 'Config.vala.base',output: 'Config.vala',configuration: cfg_pamac_user_daemon) diff --git a/src/pamacclassic.pc b/src/pamacclassic.pc index bc648ee..eeec2de 100644 --- a/src/pamacclassic.pc +++ b/src/pamacclassic.pc @@ -4,7 +4,7 @@ includedir=@DOLLAR@{prefix}/${CMAKE_INSTALL_INCLUDEDIR} Name: pamacclassic Description: pamacclassic -Version: 6.5.1 +Version: 6.5.2 Libs: -L@DOLLAR@{libdir} -lpamacclassic Cflags: -I@DOLLAR@{includedir} Requires: gdk-3.0 gtk+-3.0 json-glib-1.0 libalpm libnotify libsoup-2.4 vte-2.91 gio-2.0 glib-2.0 gobject-2.0