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

remove no more need search_aur_button

Browse Source
This commit is contained in:
guinux 2017-01-28 16:15:48 +01:00
parent 07243e8d77
commit 971b765ed8
2 changed files with 6 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
resources/manager_window.ui
View File

@ -140,46 +140,6 @@
<property name="position">0</property> <property name="position">0</property>
</packing> </packing>
</child> </child>
<child>
<object class="GtkBox" id="search_aur_box">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
<object class="GtkLabel" id="search_aur_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_left">6</property>
<property name="margin_start">6</property>
<property name="hexpand">True</property>
<property name="label" translatable="yes">Search in AUR</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkSwitch" id="search_aur_button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="tooltip_text" translatable="yes">Search in AUR</property>
<property name="halign">end</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child> <child>
<object class="GtkScrolledWindow" id="scrolledwindow3"> <object class="GtkScrolledWindow" id="scrolledwindow3">
<property name="visible">True</property> <property name="visible">True</property>

22
src/manager_window.vala
View File

@ -103,10 +103,6 @@ namespace Pamac {
[GtkChild] [GtkChild]
Gtk.TextView files_textview; Gtk.TextView files_textview;
[GtkChild] [GtkChild]
Gtk.Box search_aur_box;
[GtkChild]
Gtk.Switch search_aur_button;
[GtkChild]
Gtk.Box transaction_infobox; Gtk.Box transaction_infobox;
[GtkChild] [GtkChild]
Gtk.Button details_button; Gtk.Button details_button;
@ -147,7 +143,7 @@ namespace Pamac {
public ManagerWindow (Gtk.Application application) { public ManagerWindow (Gtk.Application application) {
Object (application: application); Object (application: application);
support_aur (false, false); support_aur (false);
button_back.visible = false; button_back.visible = false;
transaction_infobox.visible = false; transaction_infobox.visible = false;
refreshing = false; refreshing = false;
@ -293,7 +289,7 @@ namespace Pamac {
AlpmPackage pkg = transaction.find_installed_satisfier ("yaourt"); AlpmPackage pkg = transaction.find_installed_satisfier ("yaourt");
if (pkg.name != "") { if (pkg.name != "") {
support_aur (transaction.enable_aur, transaction.search_aur); support_aur (transaction.enable_aur);
} }
display_package_queue = new Queue<string> (); display_package_queue = new Queue<string> ();
@ -313,7 +309,7 @@ namespace Pamac {
bool enable_aur, bool search_aur) { bool enable_aur, bool search_aur) {
AlpmPackage pkg = transaction.find_installed_satisfier ("yaourt"); AlpmPackage pkg = transaction.find_installed_satisfier ("yaourt");
if (pkg.name != "") { if (pkg.name != "") {
support_aur (enable_aur, search_aur); support_aur (enable_aur);
} }
} }
@ -324,16 +320,12 @@ namespace Pamac {
} }
} }
void support_aur (bool enable_aur, bool search_aur) { void support_aur (bool enable_aur) {
if (enable_aur) { if (enable_aur) {
search_aur_button.active = search_aur;
search_aur_box.visible = true;
if (filters_stack.visible_child_name == "search") { if (filters_stack.visible_child_name == "search") {
packages_stackswitcher.visible = true; packages_stackswitcher.visible = true;
} }
} else { } else {
search_aur_button.active = false;
search_aur_box.visible = false;
packages_stackswitcher.visible = false; packages_stackswitcher.visible = false;
} }
} }
@ -834,9 +826,7 @@ namespace Pamac {
void refresh_packages_list () { void refresh_packages_list () {
switch (filters_stack.visible_child_name) { switch (filters_stack.visible_child_name) {
case "search": case "search":
if (search_aur_box.visible) { packages_stackswitcher.visible = transaction.enable_aur;
packages_stackswitcher.visible = true;
}
Gtk.TreeSelection selection = search_treeview.get_selection (); Gtk.TreeSelection selection = search_treeview.get_selection ();
if (selection.get_selected (null, null)) { if (selection.get_selected (null, null)) {
on_search_treeview_selection_changed (); on_search_treeview_selection_changed ();
@ -1350,7 +1340,7 @@ namespace Pamac {
// get custom sort by relevance // get custom sort by relevance
packages_list.set_sort_column_id (Gtk.TREE_SORTABLE_UNSORTED_SORT_COLUMN_ID, 0); packages_list.set_sort_column_id (Gtk.TREE_SORTABLE_UNSORTED_SORT_COLUMN_ID, 0);
populate_packages_list (pkgs); populate_packages_list (pkgs);
if (search_aur_button.get_active ()) { if (transaction.search_aur) {
if (pkgs.length == 0) { if (pkgs.length == 0) {
transaction.search_in_aur.begin (search_string, (obj, res) => { transaction.search_in_aur.begin (search_string, (obj, res) => {
if (transaction.search_in_aur.end (res).length != 0) { if (transaction.search_in_aur.end (res).length != 0) {