Applications
/
pamac-classic
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

work on display sizes

Browse Source
pull/15/head
guinux 13 years ago
parent a2221d7605
commit b331df8394
4 changed files with 449 additions and 416 deletions
Show Stats Download Patch File Download Diff File

851
gui/manager.glade
View File

File diff suppressed because it is too large Load Diff

104
gui/updater.glade
Unescape View File

@ -13,7 +13,45 @@
<property name="hexpand">True</property> <property name="hexpand">True</property>
<property name="vexpand">True</property> <property name="vexpand">True</property>
<property name="orientation">vertical</property> <property name="orientation">vertical</property>
<property name="spacing">2</property> <property name="spacing">4</property>
<child>
<object class="GtkBox" id="box2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_left">7</property>
<property name="margin_right">7</property>
<property name="spacing">10</property>
<child>
<object class="GtkImage" id="image1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="pixbuf">/usr/share/pamac/icons/48x48/status/package-update.png</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="update_top_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">label</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">0</property>
</packing>
</child>
<child> <child>
<object class="GtkButtonBox" id="buttonbox1"> <object class="GtkButtonBox" id="buttonbox1">
<property name="can_focus">True</property> <property name="can_focus">True</property>
@ -77,48 +115,10 @@
<property name="position">0</property> <property name="position">0</property>
</packing> </packing>
</child> </child>
<child>
<object class="GtkBox" id="box2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_left">7</property>
<property name="margin_right">7</property>
<property name="spacing">10</property>
<child>
<object class="GtkImage" id="image1">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="pixbuf">/usr/share/pamac/icons/48x48/status/package-update.png</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="update_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">label</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="scrolledwindow1"> <object class="GtkScrolledWindow" id="scrolledwindow1">
<property name="width_request">400</property> <property name="width_request">400</property>
<property name="height_request">450</property> <property name="height_request">400</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="hexpand">True</property> <property name="hexpand">True</property>
@ -167,22 +167,34 @@
<property name="position">2</property> <property name="position">2</property>
</packing> </packing>
</child> </child>
<child>
<object class="GtkLabel" id="update_bottom_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">label</property>
</object> </object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">3</property>
</packing>
</child> </child>
</object> </object>
<object class="GtkListStore" id="transaction_add"> </child>
</object>
<object class="GtkListStore" id="update_list">
<columns> <columns>
<!-- column-name action --> <!-- column-name name -->
<column type="gchararray"/> <column type="gchararray"/>
<!-- column-name packages --> <!-- column-name size -->
<column type="gchararray"/> <column type="gchararray"/>
</columns> </columns>
</object> </object>
<object class="GtkListStore" id="update_list"> <object class="GtkListStore" id="transaction_add">
<columns> <columns>
<!-- column-name name --> <!-- column-name action -->
<column type="gchararray"/> <column type="gchararray"/>
<!-- column-name size --> <!-- column-name packages -->
<column type="gchararray"/> <column type="gchararray"/>
</columns> </columns>
</object> </object>

62
pamac/main.py
Unescape View File

@ -51,7 +51,8 @@ ProgressCancelButton = interface.get_object('ProgressCancelButton')
interface.add_from_file('/usr/share/pamac/gui/updater.glade') interface.add_from_file('/usr/share/pamac/gui/updater.glade')
UpdaterWindow = interface.get_object("UpdaterWindow") UpdaterWindow = interface.get_object("UpdaterWindow")
update_listore = interface.get_object('update_list') update_listore = interface.get_object('update_list')
update_label = interface.get_object('update_label') update_top_label = interface.get_object('update_top_label')
update_bottom_label = interface.get_object('update_bottom_label')
def action_signal_handler(action): def action_signal_handler(action):
if action: if action:
@ -79,9 +80,6 @@ bus.add_signal_receiver(icon_signal_handler, dbus_interface = "org.manjaro.pamac
bus.add_signal_receiver(target_signal_handler, dbus_interface = "org.manjaro.pamac", signal_name = "EmitTarget") bus.add_signal_receiver(target_signal_handler, dbus_interface = "org.manjaro.pamac", signal_name = "EmitTarget")
bus.add_signal_receiver(percent_signal_handler, dbus_interface = "org.manjaro.pamac", signal_name = "EmitPercent") bus.add_signal_receiver(percent_signal_handler, dbus_interface = "org.manjaro.pamac", signal_name = "EmitPercent")
installed_column.set_sort_column_id(1)
name_column.set_sort_column_id(0)
installed_icon = Pixbuf.new_from_file('/usr/share/pamac/icons/22x22/status/package-installed.png') installed_icon = Pixbuf.new_from_file('/usr/share/pamac/icons/22x22/status/package-installed.png')
uninstalled_icon = Pixbuf.new_from_file('/usr/share/pamac/icons/22x22/status/package-available.png') uninstalled_icon = Pixbuf.new_from_file('/usr/share/pamac/icons/22x22/status/package-available.png')
to_install_icon = Pixbuf.new_from_file('/usr/share/pamac/icons/22x22/status/package-add.png') to_install_icon = Pixbuf.new_from_file('/usr/share/pamac/icons/22x22/status/package-add.png')
@ -101,6 +99,7 @@ for state in states:
state_list.append([state]) state_list.append([state])
def get_groups(): def get_groups():
groups_list.clear()
tmp_list = [] tmp_list = []
for repo in transaction.handle.get_syncdbs(): for repo in transaction.handle.get_syncdbs():
for name, pkgs in repo.grpcache: for name, pkgs in repo.grpcache:
@ -111,6 +110,7 @@ def get_groups():
groups_list.append([name]) groups_list.append([name])
def get_repos(): def get_repos():
repos_list.clear()
for repo in transaction.handle.get_syncdbs(): for repo in transaction.handle.get_syncdbs():
repos_list.append([repo.name]) repos_list.append([repo.name])
repos_list.append(['local']) repos_list.append(['local'])
@ -276,33 +276,32 @@ def set_list_dict_repos(repo):
def refresh_packages_list(): def refresh_packages_list():
packages_list.clear() packages_list.clear()
if not pkg_name_list: if not pkg_name_list:
packages_list.append(["No package found", False, False, False, search_icon]) packages_list.append(["No package found", False, False, False, search_icon, '', 0])
else: else:
for name in pkg_name_list: for name in pkg_name_list:
if name in config.holdpkg: if name in config.holdpkg:
packages_list.append([name, True, False, True, locked_icon]) packages_list.append([name, True, False, True, locked_icon, '', 0])
elif transaction_type is "install": elif transaction_type is "install":
if pkg_installed_dict[name] is True: if transaction.localpkgs.__contains__(name):
packages_list.append([name, True, False, True, installed_icon]) packages_list.append([name, True, False, True, installed_icon, common.format_size(transaction.localpkgs[name].isize), transaction.localpkgs[name].isize])
elif name in transaction_dict.keys(): elif name in transaction_dict.keys():
packages_list.append([name, False, True, True, to_install_icon]) packages_list.append([name, False, True, True, to_install_icon, common.format_size(transaction.syncpkgs[name].size), transaction.syncpkgs[name].size])
else: else:
packages_list.append([name, False, True, False, uninstalled_icon]) packages_list.append([name, False, True, False, uninstalled_icon, common.format_size(transaction.syncpkgs[name].size), transaction.syncpkgs[name].size])
elif transaction_type is "remove": elif transaction_type is "remove":
if pkg_installed_dict[name] is False: if not transaction.localpkgs.__contains__(name):
packages_list.append([name, False, False, False, uninstalled_icon]) packages_list.append([name, False, False, False, uninstalled_icon, common.format_size(transaction.syncpkgs[name].size), transaction.syncpkgs[name].size])
elif name in transaction_dict.keys(): elif name in transaction_dict.keys():
packages_list.append([name, True, True, False, to_remove_icon]) packages_list.append([name, True, True, False, to_remove_icon, common.format_size(transaction.localpkgs[name].isize), transaction.localpkgs[name].isize])
else: else:
packages_list.append([name, True, True, True, installed_icon]) packages_list.append([name, True, True, True, installed_icon, common.format_size(transaction.localpkgs[name].isize), transaction.localpkgs[name].isize])
elif pkg_installed_dict[name] is True: elif transaction.localpkgs.__contains__(name):
packages_list.append([name, True, True, True, installed_icon]) packages_list.append([name, True, True, True, installed_icon, common.format_size(transaction.localpkgs[name].isize), transaction.localpkgs[name].isize])
else: else:
packages_list.append([name, False, True, False, uninstalled_icon]) packages_list.append([name, False, True, False, uninstalled_icon, common.format_size(transaction.syncpkgs[name].size), transaction.syncpkgs[name].size])
def set_packages_list(): def set_packages_list():
if current_filter[0] == 'search': if current_filter[0] == 'search':
print(current_filter[1])
set_list_dict_search(*current_filter[1]) set_list_dict_search(*current_filter[1])
if current_filter[0] == 'group': if current_filter[0] == 'group':
set_list_dict_group(current_filter[1]) set_list_dict_group(current_filter[1])
@ -412,8 +411,10 @@ def set_transaction_sum():
while i < len(transaction.to_update): while i < len(transaction.to_update):
transaction_sum.append([' ', transaction.to_update[i]]) transaction_sum.append([' ', transaction.to_update[i]])
i += 1 i += 1
sum_bottom_label.set_markup('') dsize = 0
#sum_bottom_label.set_markup('<b>Total Download size: </b>'+common.format_size(totaldlcb)) for name in transaction.to_add:
dsize += transaction.syncpkgs[name].download_size
sum_bottom_label.set_markup('<b>Total Download size: </b>'+common.format_size(dsize))
sum_top_label.set_markup('<big><b>Transaction Summary</b></big>') sum_top_label.set_markup('<big><b>Transaction Summary</b></big>')
def handle_error(error): def handle_error(error):
@ -493,16 +494,20 @@ def do_refresh():
def have_updates(): def have_updates():
do_syncfirst, updates = transaction.get_updates() do_syncfirst, updates = transaction.get_updates()
update_listore.clear() update_listore.clear()
update_label.set_justify(Gtk.Justification.CENTER) update_top_label.set_justify(Gtk.Justification.CENTER)
if not updates: if not updates:
update_listore.append(["", ""]) update_listore.append(['', ''])
update_label.set_markup("<big><b>No update available</b></big>") update_bottom_label.set_markup('')
update_top_label.set_markup('<big><b>No update available</b></big>')
return False return False
else: else:
dsize = 0
for pkg in updates: for pkg in updates:
pkgname = pkg.name+" "+pkg.version pkgname = pkg.name+" "+pkg.version
update_listore.append([pkgname, common.format_size(pkg.size)]) update_listore.append([pkgname, common.format_size(pkg.size)])
update_label.set_markup("<big><b>Available updates</b></big>") dsize += pkg.download_size
update_bottom_label.set_markup('<b>Total Download size: </b>'+common.format_size(dsize))
update_top_label.set_markup('<big><b>Available updates</b></big>')
return True return True
def do_sysupgrade(): def do_sysupgrade():
@ -907,12 +912,6 @@ class Handler:
current_filter = ('repo', repos_list[line][0]) current_filter = ('repo', repos_list[line][0])
set_packages_list() set_packages_list()
def on_installed_column_clicked(self, widget):
installed_column.set_sort_column_id(1)
def on_name_column_clicked(self, widget):
name_column.set_sort_column_id(0)
def on_cellrenderertoggle1_toggled(self, widget, line): def on_cellrenderertoggle1_toggled(self, widget, line):
global transaction_type global transaction_type
global transaction_dict global transaction_dict
@ -1013,7 +1012,8 @@ def main(_mode):
if mode == 'manager': if mode == 'manager':
ManagerWindow.show_all() ManagerWindow.show_all()
if mode == 'updater': if mode == 'updater':
update_label.set_markup("<big><b>Available updates</b></big>") update_top_label.set_markup('<big><b>Available updates</b></big>')
update_bottom_label.set_markup('')
UpdaterWindow.show_all() UpdaterWindow.show_all()
while Gtk.events_pending(): while Gtk.events_pending():
Gtk.main_iteration() Gtk.main_iteration()

4
setup.py
Unescape View File

@ -3,11 +3,11 @@
from distutils.core import setup from distutils.core import setup
setup(name='Pamac', setup(name='Pamac',
version='0.3', version='0.5',
description='A gtk3 frontend for pyalpm', description='A gtk3 frontend for pyalpm',
license='GPL', license='GPL',
author='Guillaume Benoit', author='Guillaume Benoit',
author_email='guillaume@manjaro.org', author_email='guillaume@manjaro.org',
url='https://git.manjaro.org/core/pamac', url='http://git.manjaro.org/core/pamac',
packages=['pamac'], packages=['pamac'],
) )

Write Preview
Loading…
Cancel
Save