cromer/pamac-classic
Archived
2
0
Fork 2
Code Issues Pull Requests 1 Releases 13 Wiki Activity

add font selection for terminal

Browse Source 
fix manager to work better when compiling without aur
This commit is contained in:
Chris Cromer
2017-10-17 12:40:27 -03:00
parent a5a947d1cc
commit 6d72231ba1
38 changed files with 262 additions and 1952 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/pamac-manager/CMakeLists.txt
View File

@@ -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

15
src/pamac-manager/manager_window.vala
View File

@@ -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;

10
src/pamac-manager/meson.build
View File

@@ -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