sablink/entropy
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[rigo] add more interactions on the UI, consolidate current code (not complete yet)

Browse Source
This commit is contained in:
Fabio Erculiani
2012-02-12 13:26:21 +01:00
parent f148ca0694
commit f59d04baa9
6 changed files with 205 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/TODO
+2 -5
View File
@@ -6,16 +6,13 @@ Backlog (raw)
- requires pygobject[cairo]
- uniform license header
- who clears the vote cache (and document cache) at some point?
- redesign entropy locking: use readers/writer file lock
- update equo, sulfur, magneto, eit code to use it
- eit remote (for handling repos in server.conf)
- rework client/ code, as done with eit
- ditch etpUi
- fine grained locking support
(acquire entropy resources lock only when really needed
[eit add vs eit graph --> needed? pkg_id no more avail])
kill the Big Entropy Lock :-)
- conditional deps support, implement in entropy.spm,
class is there (add unit test)
rigo/data/ui/gtk3/art/rigo.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.5 KiB

rigo/data/ui/gtk3/art/rigo.svg
+77
View File
@@ -0,0 +1,77 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="160"
height="100"
id="svg2"
version="1.1"
inkscape:version="0.48.2 r9819"
sodipodi:docname="rigo.svg"
inkscape:export-filename="/home/fabio/repos/entropy/rigo/data/ui/gtk3/art/rigo.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90">
<defs
id="defs4" />
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="1.4"
inkscape:cx="185.8283"
inkscape:cy="116.43666"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="false"
inkscape:window-width="1280"
inkscape:window-height="744"
inkscape:window-x="0"
inkscape:window-y="26"
inkscape:window-maximized="1" />
<metadata
id="metadata7">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:label="Livello 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(0,-952.36218)">
<text
xml:space="preserve"
style="font-size:123.68544768999998951px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Bitstream Vera Sans;stroke-width:2.7;stroke-miterlimit:4;stroke-dasharray:none"
x="5.214663"
y="1023.5474"
id="text2985"
sodipodi:linespacing="125%"><tspan
sodipodi:role="line"
id="tspan2987"
x="5.214663"
y="1023.5474"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-family:Asenine;-inkscape-font-specification:Asenine;stroke-width:2.7;stroke-miterlimit:4;stroke-dasharray:none"><tspan
id="tspan3777"
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#007fa0;fill-opacity:1;font-family:Asenine;-inkscape-font-specification:Asenine;stroke-width:2.7;stroke-miterlimit:4;stroke-dasharray:none">r</tspan>i<tspan
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#12a000;fill-opacity:1;font-family:Asenine;-inkscape-font-specification:Asenine;stroke-width:2.7;stroke-miterlimit:4;stroke-dasharray:none"
id="tspan3769">g</tspan><tspan
style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;fill:#ff0000;fill-opacity:1;font-family:Asenine;-inkscape-font-specification:Asenine;stroke:#ff0000;stroke-opacity:1;stroke-width:2.7;stroke-miterlimit:4;stroke-dasharray:none"
id="tspan2989">o</tspan></tspan></text>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 3.2 KiB

rigo/data/ui/gtk3/rigo.ui
+13 -1
View File
@@ -48,7 +48,6 @@
<property name="can_focus">False</property>
<child>
<object class="GtkScrolledWindow" id="scrolledView">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hscrollbar_policy">never</property>
<property name="vscrollbar_policy">automatic</property>
@@ -70,6 +69,19 @@
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkVBox" id="staticViewVbox">
<property name="can_focus">False</property>
<child>
<placeholder/>
</child>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
</object>
<packing>
<property name="expand">True</property>
rigo/rigo/models/application.py
+5 -4
View File
@@ -333,7 +333,10 @@ class Application(object):
def name(self):
"""Show user visible name"""
repo = self._entropy.open_repository(self._repo_id)
return repo.retrieveName(self._pkg_id)
name = repo.retrieveName(self._pkg_id)
if name is None:
return _("N/A")
return name.capitalize()
def is_installed(self):
inst_repo = self._entropy.installed_repository()
@@ -351,9 +354,7 @@ class Application(object):
def get_markup(self):
repo = self._entropy.open_repository(self._repo_id)
name = repo.retrieveName(self._pkg_id)
if name is None:
name = "N/A"
name = self.name
version = repo.retrieveVersion(self._pkg_id)
if version is None:
version = "N/A"
rigo/rigo_app.py
+108 -6
View File
@@ -9,6 +9,9 @@ sys.path.insert(3, "/usr/lib/entropy/lib")
sys.path.insert(4, "/usr/lib/entropy/client")
sys.path.insert(5, "/usr/lib/entropy/rigo")
from threading import Lock
from gi.repository import Gtk, Gdk, Gio, GLib, GObject
from rigo.paths import DATA_DIR
@@ -176,13 +179,28 @@ class AppListStore(Gtk.ListStore):
class PackagesViewController(object):
def __init__(self, entropy_client, icons, entropy_ws, search_entry, view):
def __init__(self, entropy_client, icons, entropy_ws, rigo_sm,
search_entry, view):
self._entropy = entropy_client
self._icons = icons
self._rigo_sm = rigo_sm
self._entropy_ws = entropy_ws
self._search_entry = search_entry
self._view = view
def _search_icon_release(self, search_entry, icon_pos, _other):
"""
Event associated to the Search bar icon click.
Here we catch secondary icon click to reset the search entry text.
"""
if search_entry is not self._search_entry:
return
if icon_pos != Gtk.EntryIconPosition.SECONDARY:
return
search_entry.set_text("")
self.clear()
search_entry.emit("changed")
def _search_changed(self, search_entry):
GLib.timeout_add(700, self._search, search_entry.get_text())
@@ -208,34 +226,63 @@ class PackagesViewController(object):
def setup(self):
self._store = AppListStore(self._entropy, self._view,
self._icons)
#Gtk.ListStore(GObject.TYPE_PYOBJECT)
self._view.set_model(self._store)
# setup searchEntry event
self._search_entry.connect(
"changed", self._search_changed)
# connect icon click event
self._search_entry.connect("icon-release",
self._search_icon_release)
self._view.show()
def clear(self):
self._rigo_sm.change_view_state(
Rigo.STATIC_VIEW_STATE)
self._store.clear()
ApplicationMetadata.discard()
def append(self, opaque):
self._store.append([opaque])
self._rigo_sm.change_view_state(
Rigo.BROWSER_VIEW_STATE)
def append_many(self, opaque_list):
for opaque in opaque_list:
self._store.append([opaque])
self._rigo_sm.change_view_state(
Rigo.BROWSER_VIEW_STATE)
def clear_safe(self):
ApplicationMetadata.discard()
self._rigo_sm.change_view_state_safe(
Rigo.STATIC_VIEW_STATE)
GLib.idle_add(self._store.clear)
def append_safe(self, opaque):
GLib.idle_add(self.append, opaque)
self._rigo_sm.change_view_state_safe(
Rigo.BROWSER_VIEW_STATE)
def append_many_safe(self, opaque_list):
GLib.idle_add(self.append_many, opaque_list)
self._rigo_sm.change_view_state_safe(
Rigo.BROWSER_VIEW_STATE)
class WelcomeBox(Gtk.VBox):
def __init__(self):
Gtk.VBox.__init__(self)
self._image_path = os.path.join(DATA_DIR, "ui/gtk3/art/rigo.png")
def render(self):
image = Gtk.Image.new_from_file(self._image_path)
label = Gtk.Label()
label.set_markup(_("<i>Browse <b>Applications</b> with ease</i>"))
self.pack_start(image, False, False, False)
self.pack_start(label, False, False, 0)
label.show()
image.show()
class NotificationBox(Gtk.VBox):
@@ -247,7 +294,7 @@ class NotificationBox(Gtk.VBox):
def render(self):
label = Gtk.Label()
label.set_markup(self._message)
self.pack_start(label, False, False, False)
self.pack_start(label, False, False, 0)
label.show()
@@ -291,7 +338,6 @@ class Rigo(Gtk.Application):
def onDeleteWindow(self, *args):
Gtk.main_quit(*args)
def __init__(self):
self._builder = Gtk.Builder()
self._builder.add_from_file(os.path.join(DATA_DIR, "ui/gtk3/rigo.ui"))
@@ -300,10 +346,13 @@ class Rigo(Gtk.Application):
self._app_vbox = self._builder.get_object("appVbox")
self._search_entry = self._builder.get_object("searchEntry")
self._scrolled_view = self._builder.get_object("scrolledView")
self._static_view = self._builder.get_object("staticViewVbox")
icons = get_sc_icon_theme(DATA_DIR)
self._view = AppTreeView(self._app_vbox, icons, True, store=None)
self._scrolled_view.add(self._view)
self._notification = self._builder.get_object("notificationBox")
self._welcome_box = WelcomeBox()
settings = Gtk.Settings.get_default()
settings.set_property("gtk-error-bell", False)
@@ -320,17 +369,70 @@ class Rigo(Gtk.Application):
self._entropy_ws = EntropyWebService(self._entropy)
# Setup Packages View Controller class
self._state_mutex = Lock()
self._current_state = Rigo.STATIC_VIEW_STATE
self._pvc = PackagesViewController(
self._entropy, icons, self._entropy_ws,
self._search_entry, self._view)
self, self._search_entry, self._view)
self._nc = NotificationController(
self._entropy, self._notification)
BROWSER_VIEW_STATE = 1
STATIC_VIEW_STATE = 2
def change_view_state(self, state, child_widget=None):
"""
Change Rigo Application UI state.
You can pass a custom widget that will be shown in case
of static view state.
"""
with self._state_mutex:
if state == Rigo.BROWSER_VIEW_STATE:
self._static_view.set_visible(False)
# release all the childrens of static_view
for child in self._static_view.get_children():
self._static_view.remove(child)
self._scrolled_view.set_visible(True)
self._scrolled_view.show()
elif state == Rigo.STATIC_VIEW_STATE:
self._scrolled_view.set_visible(False)
if child_widget is not None:
for child in self._static_view.get_children():
self._static_view.remove(child)
self._static_view.pack_start(child_widget,
False, False, 0)
child_widget.show()
else:
# keep the current widget if any, or add the
# welcome widget
if not self._static_view.get_children():
self._welcome_box.show()
self._static_view.pack_start(self._welcome_box,
False, False, 0)
self._static_view.set_visible(True)
self._static_view.show()
else:
raise AttributeError("wrong view state")
self._current_state = state
def change_view_state_safe(self, state, child_widget=None):
"""
Thread-safe version of change_view_state().
"""
def _do_change():
return self.change_view_state(state, child_widget=child_widget)
GLib.idle_add(_do_change)
def _on_style_updated(self, widget, init_css_callback, *args):
init_css_callback(widget, *args)
def run(self):
self._welcome_box.render()
self.change_view_state(self._current_state)
self._pvc.setup()
self._nc.setup()
self._window.show()