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

- improved equo search output formatting

Browse Source 
- improved spritz stability and eye-candiness

git-svn-id: http://svn.sabayonlinux.org/projects/entropy/trunk@1270 cd1c1023-2f26-0410-ae45-c471fc1f0318
This commit is contained in:
(no author)
2008-02-21 15:02:15 +00:00
parent dd691b9eb3
commit 6e2d4773be
9 changed files with 392 additions and 438 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TODO
+1 -1
View File
@@ -13,13 +13,13 @@ TODO list:
- find a way to better handle real smartapps deps (need split PDEPEND?)
Spritz:
- debug (*) (speed on selecting stuff for the first time)
- if a package has a non OSS License, show it (*) IMPLEMENT
- remove package info widgets and write from scratch (*)
- add masking menu
- use availability bool to show masked packages and connect the masking menu
- Popularity feature
- GLSA interface
- Skip Mirror buttons
Project Status:
client/text_query.py
+29 -1
View File
@@ -911,6 +911,7 @@ def printPackageInfo(idpackage, dbconn, clientSearch = False, strictOutput = Fal
pkgtag = dbconn.retrieveVersionTag(idpackage)
pkgrev = dbconn.retrieveRevision(idpackage)
pkgdesc = dbconn.retrieveDescription(idpackage)
pkguseflags = dbconn.retrieveUseflags(idpackage)
pkgbranch = dbconn.retrieveBranch(idpackage)
if (not pkgtag):
pkgtag = "NoTag"
@@ -964,7 +965,13 @@ def printPackageInfo(idpackage, dbconn, clientSearch = False, strictOutput = Fal
for conflict in pkgconflicts:
print_info(darkred(" ## \t\t\t")+brown(conflict))
print_info(darkgreen(" Homepage:\t\t")+red(pkghome))
print_info(darkgreen(" Description:\t\t")+pkgdesc)
if (not strictOutput):
# print description
_my_formatted_print(pkgdesc,darkgreen(" Description:\t\t"),"\t\t\t\t")
# print use flags
_my_formatted_print(pkguseflags,darkgreen(" USE flags:\t\t"),"\t\t\t\t", color = red)
if (not strictOutput):
if (extended):
print_info(darkgreen(" CHOST:\t\t")+blue(pkgflags[0]))
@@ -984,3 +991,24 @@ def printPackageInfo(idpackage, dbconn, clientSearch = False, strictOutput = Fal
print_info(darkgreen(" Keywords:\t\t")+red(' '.join(pkgkeywords)))
print_info(darkgreen(" Created:\t\t")+pkgcreatedate)
print_info(darkgreen(" License:\t\t")+red(pkglic))
def _my_formatted_print(data,header,reset_columns, min_chars = 25, color = None):
if type(data) is set:
mydata = list(data)
elif type(data) is not list:
mydata = data.split()
else:
mydata = data
fcount = 0
desc_text = header
for x in mydata:
fcount += len(x)
if color:
desc_text += color(x)+" "
else:
desc_text += x+" "
if fcount > min_chars:
fcount = 0
print_info(desc_text)
desc_text = reset_columns
if fcount > 0: print_info(desc_text)
spritz/gfx/sabayon-console-background.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 144 B

spritz/src/dialogs.py
+2 -2
View File
@@ -28,7 +28,7 @@ except:
from ConfigParser import ConfigParser,SafeConfigParser
from misc import const,cleanMarkupSting,YumexConf,unicode2htmlentities
from misc import const,cleanMarkupSting,SpritzConf,unicode2htmlentities
from i18n import _
class ConfimationDialog:
@@ -358,7 +358,7 @@ def okDialog(parent, msg):
dlg = gtk.MessageDialog(parent=parent,
type=gtk.MESSAGE_INFO,
buttons=gtk.BUTTONS_OK)
dlg.set_markup(cleanMarkupSting(msg))
dlg.set_markup(msg)
dlg.set_title( _("Attention") )
rc = dlg.run()
dlg.destroy()
spritz/src/etpgui/widgets.py
+15 -3
View File
@@ -17,22 +17,34 @@
# Authors:
# Tim Lauridsen <tla@rasmil.dk>
import gtk.glade
import gtk.glade,gtk.gdk
import pango
import etpgui
import gobject
import types
import sys
import sys, os
from misc import const
import vte
class SpritzConsole(vte.Terminal):
def __init__(self, default_style = None):
def __init__(self, settings):
vte.Terminal.__init__(self)
self.settings = settings
self.myfontcolor = gtk.gdk.color_parse(self.settings.color_console_font)
self._dosettings()
def _dosettings(self):
imgpath = os.path.join(const.PIXMAPS_PATH,'sabayon-console-background.png')
if os.path.isfile(imgpath):
self.set_background_image_file(imgpath)
self.set_background_saturation(0.4)
self.set_opacity(65535)
self.set_color_foreground(self.myfontcolor)
def reset (self):
vte.Terminal.reset(self, True, True)
self._dosettings()
class TextViewConsole:
spritz/src/gui.py
+3 -3
View File
@@ -18,7 +18,7 @@
# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
from etpgui import *
from misc import SpritzQueue,YumexConf,const,cleanMarkupSting
from misc import SpritzQueue, SpritzConf, const, cleanMarkupSting
from views import *
from etpgui.widgets import TextViewConsole, SpritzConsole
from i18n import _
@@ -185,7 +185,7 @@ class YumexProgress:
class SpritzGUI:
''' This class contains GUI related methods '''
def __init__(self, EquoConnection, etpbase):
self.settings = YumexConf()
self.settings = SpritzConf()
# Package & Queue Views
self.Entropy = EquoConnection
self.etpbase = etpbase
@@ -227,7 +227,7 @@ class SpritzGUI:
self.setPage(self.activePage)
# put self.console in place
self.console = SpritzConsole()
self.console = SpritzConsole(self.settings)
self.console.set_scrollback_lines(1024)
self.console.set_scroll_on_output(True)
self.console.connect("button-press-event", self.on_console_click)
spritz/src/misc.py
+3 -82
View File
@@ -52,7 +52,6 @@ class const:
"RPM Groups",
"Age"]
YUM_PID_FILE = '/var/run/equo.pid'
DAY_IN_SECONDS = 86400
# Page -> Notebook page numbers
PAGE_REPOS = 0
@@ -81,33 +80,6 @@ class const:
0.2, # Updates
0.1, # Group
0.3) # get package Lists
PACKAGE_CATEGORY_NO = 5
# Package Category Control Dict.
PACKAGE_CATEGORY_DICT = {
#
# [1] [2] [3] [4] [5] [6]
#-------------------------------------------------------------------------
1 : ( _( 'RPM Groups' ), 'getByAttr', 'group', True, True),
2 : ( _( 'Repositories' ), 'getByProperty', 'repoid', True, False ),
3 : ( _( 'Architecture' ), 'getByProperty', 'arch', True, False ),
4 : ( _( 'Sizes' ), 'getBySizes', '', False, False ),
5 : ( _( 'Age' ), 'getByAge', '', False, False )}
# [1] : Order in Category Combo
# [2] : Text in Combo
# [3] : Method to get the package by category
# [4] : Parameter to [3].
# [5] : Sort flag
# [6] : Split Categoties and make a tree, insted of a list
GROUP_PACKAGE_TYPE = {
'm' : _('Mandatory'),
'd' : _('Default'),
'o' : _('Optional'),
'c' : _('Conditional')
}
CREDITS = (
(('Spritz Package Manager - %s' % __spritz_version__),
@@ -467,7 +439,7 @@ class SpritzQueue:
return action
return None
class YumexConf:
class SpritzConf:
""" Yum Extender Config Setting"""
autorefresh = True
recentdays = 14
@@ -477,7 +449,8 @@ class YumexConf:
proxy = ""
font_console = 'Monospace 8'
font_pkgdesc = 'Monospace 8'
color_console = '#68228B'
color_console_background = '#FFFFFF'
color_console_font = '#000000'
color_pkgdesc = '#68228B'
color_install = 'darkgreen'
color_update = 'red'
@@ -528,58 +501,6 @@ class YumexConf:
return default
class SpritzOptions:
def __init__(self):
self.logger = logging.getLogger('yumex.YumexOptions')
self._optparser = OptionParser()
self.setupParser()
def parseCmdOptions(self):
self.getCmdlineOptions()
def getYumexConfig(self,configfile='/etc/spritz.conf', sec='spritz' ):
conf = YumexConf()
parser = ConfigParser()
parser.read( configfile )
conf.populate( parser, sec )
return conf
def reload(self):
self.settings = self.getYumexConfig()
def getArgs(self):
return self.cmd_args
def setupParser(self):
parser = self._optparser
parser.add_option( "-d", "--debug",
action="store_true", dest="debug", default=False,
help="Debug mode" )
self.parserInit = True
def getCmdlineOptions( self ):
""" Handle commmand line options """
parser = self._optparser
( options, args ) = parser.parse_args()
self.cmd_options = options
self.cmd_args = args
def dump(self):
self.logger.info( _( "Current Settings :" ) )
settings = str( self.settings ).split( '\n' )
for s in settings:
if not s.startswith( '[' ):
self.logger.info(" %s" % s )
def check_option( self, option ):
""" Check options in settings or command line"""
rc = False
if option == "debug":
if self.settings.debug or self.cmd_options.debug:
rc = True
return rc
def cleanMarkupSting(msg):
msg = str(msg) # make sure it is a string
msg = gobject.markup_escape_text(msg)
spritz/src/spritz.glade
+322 -322
View File
@@ -3,12 +3,12 @@
<!--*- mode: xml -*-->
<glade-interface>
<widget class="GtkWindow" id="main">
<property name="height_request">570</property>
<property name="height_request">420</property>
<property name="visible">True</property>
<property name="title" translatable="yes">Spritz Package Manager</property>
<property name="window_position">GTK_WIN_POS_CENTER</property>
<property name="default_width">800</property>
<property name="default_height">550</property>
<property name="default_height">450</property>
<property name="icon_name">spritz-icon</property>
<child>
<widget class="GtkVBox" id="vbox1">
@@ -1014,7 +1014,7 @@
<child>
<widget class="GtkLabel" id="progressMainLabel">
<property name="visible">True</property>
<property name="xalign">0.05000000074505806</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
<property name="label" translatable="yes">&lt;span size="large"&gt;&lt;b&gt;Action&lt;/b&gt;&lt;/span&gt;
</property>
@@ -1031,7 +1031,7 @@
<child>
<widget class="GtkLabel" id="progressSubLabel">
<property name="visible">True</property>
<property name="xalign">0.039999999105930328</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">&lt;b&gt;SUBACTION&lt;/b&gt;
</property>
<property name="use_markup">True</property>
@@ -1094,7 +1094,7 @@
<child>
<widget class="GtkLabel" id="progressExtraLabel">
<property name="visible">True</property>
<property name="xalign">0.039999999105930328</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Extra</property>
</widget>
<packing>
@@ -2478,103 +2478,18 @@
<property name="column_spacing">10</property>
<property name="row_spacing">3</property>
<child>
<widget class="GtkLabel" id="label177">
<widget class="GtkComboBox" id="repodbcformatEntry">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Identifier</property>
</widget>
<packing>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="label178">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Description</property>
</widget>
<packing>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="label179">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Download mirrors</property>
</widget>
<packing>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="label180">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Database URL</property>
</widget>
<packing>
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
<widget class="GtkEntry" id="repoidEntry">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="items">bz2
gz</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="y_options"></property>
</packing>
</child>
<child>
<widget class="GtkEntry" id="repoDescEntry">
<property name="visible">True</property>
<property name="can_focus">True</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="y_options"></property>
</packing>
</child>
<child>
<widget class="GtkEntry" id="repodbEntry">
<property name="visible">True</property>
<property name="can_focus">True</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
<property name="y_options"></property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="label186">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Database compression</property>
</widget>
<packing>
<property name="top_attach">4</property>
<property name="bottom_attach">5</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
<property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
@@ -2715,18 +2630,103 @@
</packing>
</child>
<child>
<widget class="GtkComboBox" id="repodbcformatEntry">
<widget class="GtkLabel" id="label186">
<property name="visible">True</property>
<property name="items">bz2
gz</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Database compression</property>
</widget>
<packing>
<property name="top_attach">4</property>
<property name="bottom_attach">5</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
<widget class="GtkEntry" id="repodbEntry">
<property name="visible">True</property>
<property name="can_focus">True</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">4</property>
<property name="bottom_attach">5</property>
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
<property name="y_options"></property>
</packing>
</child>
<child>
<widget class="GtkEntry" id="repoDescEntry">
<property name="visible">True</property>
<property name="can_focus">True</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="y_options"></property>
</packing>
</child>
<child>
<widget class="GtkEntry" id="repoidEntry">
<property name="visible">True</property>
<property name="can_focus">True</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="y_options"></property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="label180">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Database URL</property>
</widget>
<packing>
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="label179">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Download mirrors</property>
</widget>
<packing>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="label178">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Description</property>
</widget>
<packing>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="label177">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Identifier</property>
</widget>
<packing>
<property name="x_options">GTK_FILL</property>
<property name="y_options"></property>
</packing>
</child>
</widget>
@@ -3101,199 +3101,49 @@ gz</property>
<placeholder/>
</child>
<child>
<widget class="GtkLabel" id="catLabel">
<widget class="GtkVBox" id="vboxinstalled">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">0.89999997615814209</property>
<property name="label" translatable="yes">&lt;b&gt;Category&lt;/b&gt;</property>
<property name="use_markup">True</property>
<property name="single_line_mode">True</property>
</widget>
</child>
<child>
<widget class="GtkLabel" id="nameLabel">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">0.89999997615814209</property>
<property name="label" translatable="yes">&lt;b&gt;Name&lt;/b&gt;</property>
<property name="use_markup">True</property>
<property name="single_line_mode">True</property>
</widget>
<packing>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="availLabel">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">0.89999997615814209</property>
<property name="label" translatable="yes">&lt;b&gt;Available&lt;/b&gt;</property>
<property name="use_markup">True</property>
<property name="single_line_mode">True</property>
</widget>
<packing>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="availLabel2">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">0.89999997615814209</property>
<property name="label" translatable="yes">&lt;b&gt;Installed&lt;/b&gt;</property>
<property name="use_markup">True</property>
<property name="single_line_mode">True</property>
<child>
<widget class="GtkLabel" id="iversion">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Version: 123</property>
<property name="use_markup">True</property>
</widget>
</child>
<child>
<widget class="GtkLabel" id="itag">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Tag: None</property>
<property name="use_markup">True</property>
</widget>
<packing>
<property name="position">1</property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="irevision">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Revision: 0</property>
<property name="use_markup">True</property>
</widget>
<packing>
<property name="position">2</property>
</packing>
</child>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="slotLabel">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">0.89999997615814209</property>
<property name="label" translatable="yes">&lt;b&gt;Slot&lt;/b&gt;</property>
<property name="use_markup">True</property>
<property name="single_line_mode">True</property>
</widget>
<packing>
<property name="top_attach">4</property>
<property name="bottom_attach">5</property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="sizeLabel">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">0.89999997615814209</property>
<property name="label" translatable="yes">&lt;b&gt;Size&lt;/b&gt;</property>
<property name="use_markup">True</property>
<property name="single_line_mode">True</property>
</widget>
<packing>
<property name="top_attach">5</property>
<property name="bottom_attach">6</property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="downLabel">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">0.89999997615814209</property>
<property name="label" translatable="yes">&lt;b&gt;Path&lt;/b&gt;</property>
<property name="use_markup">True</property>
<property name="single_line_mode">True</property>
</widget>
<packing>
<property name="top_attach">6</property>
<property name="bottom_attach">7</property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="checksumLabel">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">0.89999997615814209</property>
<property name="label" translatable="yes">&lt;b&gt;Checksum&lt;/b&gt;</property>
<property name="use_markup">True</property>
<property name="single_line_mode">True</property>
</widget>
<packing>
<property name="top_attach">7</property>
<property name="bottom_attach">8</property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="category">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">&lt;small&gt;media-lxnay&lt;/small&gt;</property>
<property name="use_markup">True</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="name">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">foo</property>
<property name="use_markup">True</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="slot">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">0</property>
<property name="use_markup">True</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">4</property>
<property name="bottom_attach">5</property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="download">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">packages/blah/blah/foo.tbz2</property>
<property name="use_markup">True</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">6</property>
<property name="bottom_attach">7</property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="size">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">200MB</property>
<property name="use_markup">True</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">5</property>
<property name="bottom_attach">6</property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="checksum">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">7fdcb5686a246b73b4c347f45e4d44a1</property>
<property name="use_markup">True</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">7</property>
<property name="bottom_attach">8</property>
<property name="y_padding">2</property>
</packing>
</child>
<child>
@@ -3343,51 +3193,201 @@ gz</property>
</packing>
</child>
<child>
<widget class="GtkVBox" id="vboxinstalled">
<widget class="GtkLabel" id="checksum">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<child>
<widget class="GtkLabel" id="iversion">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Version: 123</property>
<property name="use_markup">True</property>
</widget>
</child>
<child>
<widget class="GtkLabel" id="itag">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Tag: None</property>
<property name="use_markup">True</property>
</widget>
<packing>
<property name="position">1</property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="irevision">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Revision: 0</property>
<property name="use_markup">True</property>
</widget>
<packing>
<property name="position">2</property>
</packing>
</child>
<property name="xalign">0</property>
<property name="label" translatable="yes">7fdcb5686a246b73b4c347f45e4d44a1</property>
<property name="use_markup">True</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">7</property>
<property name="bottom_attach">8</property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="size">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">200MB</property>
<property name="use_markup">True</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">5</property>
<property name="bottom_attach">6</property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="download">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">packages/blah/blah/foo.tbz2</property>
<property name="use_markup">True</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">6</property>
<property name="bottom_attach">7</property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="slot">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">0</property>
<property name="use_markup">True</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">4</property>
<property name="bottom_attach">5</property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="name">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">foo</property>
<property name="use_markup">True</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="category">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">&lt;small&gt;media-lxnay&lt;/small&gt;</property>
<property name="use_markup">True</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="checksumLabel">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">0.89999997615814209</property>
<property name="label" translatable="yes">&lt;b&gt;Checksum&lt;/b&gt;</property>
<property name="use_markup">True</property>
<property name="single_line_mode">True</property>
</widget>
<packing>
<property name="top_attach">7</property>
<property name="bottom_attach">8</property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="downLabel">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">0.89999997615814209</property>
<property name="label" translatable="yes">&lt;b&gt;Path&lt;/b&gt;</property>
<property name="use_markup">True</property>
<property name="single_line_mode">True</property>
</widget>
<packing>
<property name="top_attach">6</property>
<property name="bottom_attach">7</property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="sizeLabel">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">0.89999997615814209</property>
<property name="label" translatable="yes">&lt;b&gt;Size&lt;/b&gt;</property>
<property name="use_markup">True</property>
<property name="single_line_mode">True</property>
</widget>
<packing>
<property name="top_attach">5</property>
<property name="bottom_attach">6</property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="slotLabel">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">0.89999997615814209</property>
<property name="label" translatable="yes">&lt;b&gt;Slot&lt;/b&gt;</property>
<property name="use_markup">True</property>
<property name="single_line_mode">True</property>
</widget>
<packing>
<property name="top_attach">4</property>
<property name="bottom_attach">5</property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="availLabel2">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">0.89999997615814209</property>
<property name="label" translatable="yes">&lt;b&gt;Installed&lt;/b&gt;</property>
<property name="use_markup">True</property>
<property name="single_line_mode">True</property>
</widget>
<packing>
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
<property name="y_padding">2</property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="availLabel">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">0.89999997615814209</property>
<property name="label" translatable="yes">&lt;b&gt;Available&lt;/b&gt;</property>
<property name="use_markup">True</property>
<property name="single_line_mode">True</property>
</widget>
<packing>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="nameLabel">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">0.89999997615814209</property>
<property name="label" translatable="yes">&lt;b&gt;Name&lt;/b&gt;</property>
<property name="use_markup">True</property>
<property name="single_line_mode">True</property>
</widget>
<packing>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
</packing>
</child>
<child>
<widget class="GtkLabel" id="catLabel">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
<property name="xalign">0.89999997615814209</property>
<property name="label" translatable="yes">&lt;b&gt;Category&lt;/b&gt;</property>
<property name="use_markup">True</property>
<property name="single_line_mode">True</property>
</widget>
</child>
</widget>
<packing>
<property name="position">1</property>
spritz/src/spritz.py
+17 -24
View File
@@ -46,7 +46,7 @@ from etpgui import *
import filters
from gui import SpritzGUI
from dialogs import *
from misc import const, SpritzOptions, fakeoutfile, fakeinfile
from misc import const, fakeoutfile, fakeinfile
from i18n import _
import time
@@ -415,21 +415,6 @@ class SpritzController(Controller):
else:
self.pkgView.store.clear()
def on_Category_changed(self,widget):
''' Category Type Change Handler'''
ndx = self.ui.cbCategory.get_active()
if ndx == 0: # None
self.categoryOn = False
self.ui.swCategory.hide()
self.addPackages()
else:
self.categoryOn = True
self.ui.swCategory.show()
tub = const.PACKAGE_CATEGORY_DICT[ndx]
(label,fn,attr,sortcat,splitcat) = tub
self.addCategories(fn,attr,sortcat,splitcat)
def on_pkgFilter_toggled(self,rb,action):
''' Package Type Selection Handler'''
if rb.get_active(): # Only act on select, not deselect.
@@ -749,12 +734,20 @@ class SpritzController(Controller):
class SpritzApplication(SpritzController,SpritzGUI):
def __init__(self):
# check if another instance is running
cr = EquoConnection.entropyTools.applicationLockCheck("Spritz Loader", gentle = True)
if cr:
# warn the user
okDialog( None, _("<big><b>Sorry to tell you</b></big>\t\t\nAnother instance of Entropy <b>is running</b>. <u>Close</u> it or <u>remove</u>: %s") % (etpConst['pidfile'],) )
sys.exit()
SpritzController.__init__( self )
self.spritzOptions = SpritzOptions()
self.spritzOptions.parseCmdOptions()
self.Equo = EquoConnection
SpritzGUI.__init__(self, self.Equo, self.etpbase)
self.logger = logging.getLogger("yumex.main")
# init flags
self.skipMirror = False
self.skipMirrorNow = False
@@ -762,11 +755,7 @@ class SpritzApplication(SpritzController,SpritzGUI):
self.categoryOn = False
self.quitNow = False
self.isWorking = False
if self.settings.debug:
self.spritzOptions.dump()
print self.spritzOptions.getArgs()
self.logger.info(_('Entropy Config Setup'))
self.spritzOptions.parseCmdOptions()
self.catsView.etpbase = self.etpbase
self.lastPkgPB = "updates"
self.etpbase.setFilter(filters.yumexFilter.processFilters)
@@ -785,7 +774,7 @@ class SpritzApplication(SpritzController,SpritzGUI):
self.setupSpritz()
self.console.set_pty(self.pty[0])
# setup pty
self.resetProgressText()
def setupEditor(self):
@@ -921,6 +910,10 @@ class SpritzApplication(SpritzController,SpritzGUI):
self.setupRepoView()
self.endWorking()
def resetProgressText(self):
self.progress.set_mainLabel(_('Nothing to do. I am idle.'))
self.progress.set_subLabel(_('Really, don\'t waste your time here. This is just a placeholder'))
self.progress.set_extraLabel(_('I am still alive and kickin\''))
def setupRepoView(self):
self.repoView.populate()
@@ -988,7 +981,7 @@ class SpritzApplication(SpritzController,SpritzGUI):
self.unsetBusy()
# reset labels
self.progress.set_mainLabel('')
self.resetProgressText()
def addCategoryPackages(self,cat = None):
msg = _('Package View Population')