Author: rpmcruz
Date: Fri Feb 19 19:11:23 2010
New Revision: 60886
URL: http://svn.opensuse.org/viewcvs/yast?rev=60886&view=rev
Log:
* src/pkg/ygtkpkgstatusbar.cc: got rid of "To install:"
and other statistical info.
* src/ygtkpkgfilterview.cc: moved orphaned to from
pkg-groups to repositories.
Modified:
trunk/gtk/ChangeLog
trunk/gtk/package/yast2-gtk.changes
trunk/gtk/src/pkg/YGPackageSelector.cc
trunk/gtk/src/pkg/ygtkcellrenderersidebutton.c
trunk/gtk/src/pkg/ygtkpkgdetailview.cc
trunk/gtk/src/pkg/ygtkpkgfilterview.cc
trunk/gtk/src/pkg/ygtkpkgpatternview.cc
trunk/gtk/src/pkg/ygtkpkgstatusbar.cc
trunk/gtk/src/pkg/ygtkpkgstatusbar.h
trunk/gtk/src/pkg/ygtkpkgundolist.cc
Modified: trunk/gtk/ChangeLog
URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/ChangeLog?rev=60886&r1=60885&r2=60886&view=diff
==============================================================================
--- trunk/gtk/ChangeLog (original)
+++ trunk/gtk/ChangeLog Fri Feb 19 19:11:23 2010
@@ -1,3 +1,11 @@
+2010-02-19 Ricardo Cruz
+
+ * src/pkg/ygtkpkgstatusbar.cc: got rid of "To install:"
+ and other statistical info.
+
+ * src/ygtkpkgfilterview.cc: moved orphaned to from
+ pkg-groups to repositories.
+
2010-02-18 Ricardo Cruz
* src/pkg/ygtkpkglistview.h/cc: partial reversal on the
Modified: trunk/gtk/package/yast2-gtk.changes
URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/package/yast2-gtk.changes?rev=60886&r1=60885&r2=60886&view=diff
==============================================================================
--- trunk/gtk/package/yast2-gtk.changes (original)
+++ trunk/gtk/package/yast2-gtk.changes Fri Feb 19 19:11:23 2010
@@ -1,4 +1,14 @@
-------------------------------------------------------------------
+Fri Feb 19 16:51:03 WET 2010 - rpmcruz@alunos.dcc.fc.up.pt
+
+- 2.21.0
+- Many UI fixes and improvements to the software manager and
+online update.
+- software manager code now resides in its own library, linked
+only when needed.
+- several bug fixes.
+
+-------------------------------------------------------------------
Tue Oct 27 05:23:28 UTC 2009 - coolo@novell.com
- cherry pick gcc 4.4 issues
Modified: trunk/gtk/src/pkg/YGPackageSelector.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/YGPackageSelector.cc?rev=60886&r1=60885&r2=60886&view=diff
==============================================================================
--- trunk/gtk/src/pkg/YGPackageSelector.cc (original)
+++ trunk/gtk/src/pkg/YGPackageSelector.cc Fri Feb 19 19:11:23 2010
@@ -176,7 +176,7 @@
gtk_paned_pack2 (GTK_PANED (hpaned), createMainArea(), TRUE, FALSE);
gtk_paned_set_position (GTK_PANED (hpaned), 200);
- m_status = new YGtkPkgStatusBar (m_undo, false);
+ m_status = new YGtkPkgStatusBar (m_undo);
m_widget = gtk_vbox_new (FALSE, 6);
gtk_box_pack_start (GTK_BOX (m_widget), hpaned, TRUE, TRUE, 0);
@@ -627,11 +627,6 @@
impl->m_menu = new YGtkPkgMenuBar();
ygtk_wizard_set_custom_menu (wizard, impl->m_menu->getWidget(), FALSE);
-/*
- impl->m_status = new YGtkPkgStatusBar (impl->m_undo, true);
- ygtk_wizard_set_status_bar (wizard, impl->m_status->getWidget());
-*/
-
std::string str;
str.reserve (6820);
for (int i = 0; help[i]; i++)
Modified: trunk/gtk/src/pkg/ygtkcellrenderersidebutton.c
URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/ygtkcellrenderersidebutton.c?rev=60886&r1=60885&r2=60886&view=diff
==============================================================================
--- trunk/gtk/src/pkg/ygtkcellrenderersidebutton.c (original)
+++ trunk/gtk/src/pkg/ygtkcellrenderersidebutton.c Fri Feb 19 19:11:23 2010
@@ -167,14 +167,11 @@
GtkCellRenderer *cell, GdkEvent *event, GtkWidget *widget, const gchar *path,
GdkRectangle *background_area, GdkRectangle *cell_area, GtkCellRendererState flags)
{
-// FIXME: only emit signal if the button (and not the text) has been pressed
-fprintf (stderr, "cell_area->x: %d\n", cell_area->x);
YGtkCellRendererSideButton *bcell = YGTK_CELL_RENDERER_SIDE_BUTTON (cell);
if (bcell->button_visible) {
GdkEventButton *_event = (GdkEventButton *) event;
gint icon_width, icon_height;
gtk_icon_size_lookup (GTK_ICON_SIZE_BUTTON, &icon_width, &icon_height);
-fprintf (stderr, "button pressed at: %f\n", _event->x);
int icon_x, x = _event->x - cell_area->x;
if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL)
icon_x = 2;
Modified: trunk/gtk/src/pkg/ygtkpkgdetailview.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/ygtkpkgdetailview.cc?rev=60886&r1=60885&r2=60886&view=diff
==============================================================================
--- trunk/gtk/src/pkg/ygtkpkgdetailview.cc (original)
+++ trunk/gtk/src/pkg/ygtkpkgdetailview.cc Fri Feb 19 19:11:23 2010
@@ -144,7 +144,6 @@
}
}
ygtk_rich_text_set_text (YGTK_RICH_TEXT (text), str.c_str());
-fprintf (stderr, "description text: %s\n\n\n", str.c_str());
}
static void link_clicked_cb (YGtkRichText *text, const gchar *link, DetailDescription *pThis)
@@ -801,8 +800,6 @@
if (dep == 0 || dep == 2)
ret += "</a>";
}
-if (!ret.empty())
-fprintf (stderr, "dep (%d) text: %s\n\n\n", dep, ret.c_str());
return ret;
}
@@ -923,7 +920,6 @@
inner::traverse (tree.root(), text);
}
-fprintf (stderr, "filelist: %s\n\n\n", text.c_str());
return text;
}
};
@@ -970,7 +966,6 @@
text += date + " (" + author + "):<br><blockquote>" + changes + "</blockquote>";
}
}
-fprintf (stderr, "changelog: %s\n\n\n", text.c_str());
return text;
}
};
@@ -1054,7 +1049,6 @@
}
}
}
-fprintf (stderr, "authors: %s\n\n\n", text.c_str());
return text;
}
};
Modified: trunk/gtk/src/pkg/ygtkpkgfilterview.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/ygtkpkgfilterview.cc?rev=60886&r1=60885&r2=60886&view=diff
==============================================================================
--- trunk/gtk/src/pkg/ygtkpkgfilterview.cc (original)
+++ trunk/gtk/src/pkg/ygtkpkgfilterview.cc Fri Feb 19 19:11:23 2010
@@ -251,6 +251,7 @@
for (int i = YPKG_GROUP_UNKNOWN; i < YPKG_GROUP_TOTAL; i++) {
if (i == YPKG_GROUP_MULTIVERSION /* && zypp::sat::Pool::instance().multiversionEmpty() */)
continue;
+ if (i == YPKG_GROUP_ORPHANED) continue;
std::string name = zypp_tag_group_enum_to_localised_text ((YPkgGroupEnum) i);
const char *icon = zypp_tag_enum_to_icon ((YPkgGroupEnum) i);
if (i == YPKG_GROUP_RECENT)
@@ -313,6 +314,8 @@
addRow (icon, label.c_str(), false, GINT_TO_POINTER (0));
}
}
+
+ addRow ("gtk-missing-image", _("None"), true, GINT_TO_POINTER (1));
}
YGtkPkgRepositoryModel::~YGtkPkgRepositoryModel()
@@ -320,7 +323,11 @@
void YGtkPkgRepositoryModel::updateRow (Ypp::List list, int row, gpointer data)
{
- if (data) {
+ if (GPOINTER_TO_INT (data) == 1) { // 'none'
+ Ypp::PKGroupMatch match (YPKG_GROUP_ORPHANED);
+ setRowCount (row, list.count (&match));
+ }
+ else if (data) {
Ypp::Repository &repo = impl->repos[row-1];
bool isSystem = repo.isSystem();
int count = 0;
@@ -338,16 +345,20 @@
}
}
}
-
setRowCount (row, count);
}
+ // else - disabled repos
}
bool YGtkPkgRepositoryModel::writeRowQuery (Ypp::PoolQuery &query, int row, gpointer data)
{
- Ypp::Repository &repo = impl->repos[row-1];
- query.addRepository (repo);
- impl->selected = &repo;
+ if (data) {
+ Ypp::Repository &repo = impl->repos[row-1];
+ query.addRepository (repo);
+ impl->selected = &repo;
+ }
+ else // 'none'
+ query.addCriteria (new Ypp::PKGroupMatch (YPKG_GROUP_ORPHANED));
return true;
}
Modified: trunk/gtk/src/pkg/ygtkpkgpatternview.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/ygtkpkgpatternview.cc?rev=60886&r1=60885&r2=60886&view=diff
==============================================================================
--- trunk/gtk/src/pkg/ygtkpkgpatternview.cc (original)
+++ trunk/gtk/src/pkg/ygtkpkgpatternview.cc Fri Feb 19 19:11:23 2010
@@ -450,7 +450,6 @@
if (gtk_tree_selection_get_selected (selection, &model, &iter)) {
Ypp::Selectable sel (get_iter_selectable (model, &iter));
Ypp::Collection collection (sel);
-fprintf (stderr, "add criteria match: %s\n", sel.name().c_str());
query.addCriteria (new Ypp::CollectionMatch (collection));
return true;
}
Modified: trunk/gtk/src/pkg/ygtkpkgstatusbar.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/ygtkpkgstatusbar.cc?rev=60886&r1=60885&r2=60886&view=diff
==============================================================================
--- trunk/gtk/src/pkg/ygtkpkgstatusbar.cc (original)
+++ trunk/gtk/src/pkg/ygtkpkgstatusbar.cc Fri Feb 19 19:11:23 2010
@@ -64,11 +64,12 @@
LastChange()
{
+#if 0
icon = gtk_image_new();
gtk_widget_set_size_request (icon, 16, 16);
+#endif
text = gtk_label_new ("");
gtk_misc_set_alignment (GTK_MISC (text), 0, .5);
- gtk_label_set_ellipsize (GTK_LABEL (text), PANGO_ELLIPSIZE_END);
undo_button = create_small_button (GTK_STOCK_UNDO, _("Undo"));
g_signal_connect (G_OBJECT (undo_button), "clicked",
G_CALLBACK (undo_clicked_cb), this);
@@ -81,7 +82,9 @@
G_CALLBACK (more_link_cb), this);
hbox = gtk_hbox_new (FALSE, 6);
+#if 0
gtk_box_pack_start (GTK_BOX (hbox), icon, FALSE, TRUE, 0);
+#endif
gtk_box_pack_start (GTK_BOX (hbox), text, TRUE, TRUE, 0);
gtk_box_pack_start (GTK_BOX (hbox), undo_button, FALSE, TRUE, 0);
gtk_box_pack_start (GTK_BOX (hbox), more, FALSE, TRUE, 0);
@@ -92,13 +95,14 @@
int auto_count;
Ypp::Selectable *sel = list->front (&auto_count);
if (sel) {
+#if 0
const char *stock = getStatusStockIcon (*sel);
GdkPixbuf *pixbuf = gtk_icon_theme_load_icon (gtk_icon_theme_get_default(),
stock, 16, GtkIconLookupFlags (0), NULL);
- GdkPixbuf *_pixbuf = YGUtils::setGray (pixbuf);
- gtk_image_set_from_pixbuf (GTK_IMAGE (icon), _pixbuf);
+ //GdkPixbuf *_pixbuf = YGUtils::setGray (pixbuf);
+ gtk_image_set_from_pixbuf (GTK_IMAGE (icon), pixbuf);
g_object_unref (G_OBJECT (pixbuf));
- g_object_unref (G_OBJECT (_pixbuf));
+#endif
const char *action;
if (sel->toInstall()) {
@@ -128,18 +132,17 @@
else
format = "<b>%s</b> %s";
gchar *str = g_strdup_printf (format, action, sel->name().c_str(), auto_count);
- gtk_label_set_text (GTK_LABEL (text), str);
- gtk_widget_set_sensitive (text, TRUE);
+ gtk_label_set_markup (GTK_LABEL (text), str);
gtk_widget_set_sensitive (undo_button, TRUE);
g_free (str);
}
else {
+#if 0
gtk_image_clear (GTK_IMAGE (icon));
- gtk_label_set_text (GTK_LABEL (text), _("<i>No changes to perform</i>"));
- gtk_widget_set_sensitive (text, FALSE);
+#endif
+ gtk_label_set_markup (GTK_LABEL (text), _("<i>No changes to perform</i>"));
gtk_widget_set_sensitive (undo_button, FALSE);
}
- gtk_label_set_use_markup (GTK_LABEL (text), TRUE);
}
static gboolean more_link_cb (GtkLabel *label, gchar *uri, LastChange *pThis)
@@ -152,6 +155,7 @@
}
};
+#if 0
struct StatChange {
GtkWidget *hbox, *to_install, *to_upgrade, *to_remove;
@@ -205,6 +209,7 @@
g_free (str);
}
};
+#endif
#define MIN_FREE_MB_WARN 400
#define MIN_PERCENT_WARN 90
@@ -214,7 +219,7 @@
GtkWidget *getWidget() { return hbox; }
- DiskChange (bool small)
+ DiskChange()
{
GtkListStore *store = gtk_list_store_new (1, G_TYPE_STRING);
std::vector std::string partitions = Ypp::getPartitionList();
@@ -237,8 +242,6 @@
gtk_widget_set_name (combo, "small-widget");
gtk_combo_box_set_focus_on_click (GTK_COMBO_BOX (combo), FALSE);
GtkCellRenderer *renderer = gtk_cell_renderer_text_new();
- if (small)
- g_object_set (G_OBJECT (renderer), "scale", .70, NULL);
gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo), renderer, TRUE);
gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (combo), renderer, "text", 0, NULL);
gtk_combo_box_set_active (GTK_COMBO_BOX (combo), active);
@@ -284,38 +287,19 @@
struct YGtkPkgStatusBar::Impl : public YGtkPkgUndoList::Listener {
GtkWidget *box;
LastChange *last;
- StatChange *stat;
DiskChange *disk;
GtkWidget *getWidget() { return box; }
- Impl (YGtkPkgUndoList *undo, bool real_bar)
+ Impl (YGtkPkgUndoList *undo)
{
last = new LastChange();
- stat = new StatChange();
- disk = new DiskChange (real_bar);
+ disk = new DiskChange();
GtkWidget *hbox = gtk_hbox_new (FALSE, 6);
- gtk_box_pack_start (GTK_BOX (hbox), last->getWidget(), TRUE, TRUE, 0);
- gtk_box_pack_start (GTK_BOX (hbox), gtk_vseparator_new(), FALSE, TRUE, 0);
- gtk_box_pack_start (GTK_BOX (hbox), stat->getWidget(), FALSE, TRUE, 0);
- gtk_box_pack_start (GTK_BOX (hbox), gtk_vseparator_new(), FALSE, TRUE, 0);
- gtk_box_pack_start (GTK_BOX (hbox), disk->getWidget(), FALSE, TRUE, 0);
-
- if (real_bar) {
- GtkWidget *status = gtk_statusbar_new();
- gtk_box_pack_start (GTK_BOX (hbox), status, FALSE, TRUE, 0);
- gtk_widget_set_size_request (status, 25, -1);
- gtk_widget_set_size_request (last->getWidget(), -1, 0);
- gtk_widget_set_size_request (stat->getWidget(), -1, 0);
- gtk_widget_set_size_request (disk->getWidget(), -1, 0);
-
- box = gtk_vbox_new (FALSE, 1);
- gtk_box_pack_start (GTK_BOX (box), gtk_hseparator_new(), FALSE, TRUE, 0);
- gtk_box_pack_start (GTK_BOX (box), hbox, TRUE, TRUE, 0);
- }
- else
- box = hbox;
+ gtk_box_pack_start (GTK_BOX (hbox), last->getWidget(), FALSE, TRUE, 0);
+ gtk_box_pack_end (GTK_BOX (hbox), disk->getWidget(), FALSE, TRUE, 0);
+ box = hbox;
gtk_widget_show_all (box);
undoChanged (undo);
@@ -325,7 +309,6 @@
~Impl()
{
delete last;
- delete stat;
delete disk;
YGPackageSelector::get()->undoList()->removeListener (this);
}
@@ -333,13 +316,12 @@
virtual void undoChanged (YGtkPkgUndoList *list)
{
last->undoChanged (list);
- stat->undoChanged (list);
disk->undoChanged (list);
}
};
-YGtkPkgStatusBar::YGtkPkgStatusBar (YGtkPkgUndoList *undo, bool real_bar)
-: impl (new Impl (undo, real_bar))
+YGtkPkgStatusBar::YGtkPkgStatusBar (YGtkPkgUndoList *undo)
+: impl (new Impl (undo))
{}
YGtkPkgStatusBar::~YGtkPkgStatusBar()
Modified: trunk/gtk/src/pkg/ygtkpkgstatusbar.h
URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/ygtkpkgstatusbar.h?rev=60886&r1=60885&r2=60886&view=diff
==============================================================================
--- trunk/gtk/src/pkg/ygtkpkgstatusbar.h (original)
+++ trunk/gtk/src/pkg/ygtkpkgstatusbar.h Fri Feb 19 19:11:23 2010
@@ -14,7 +14,7 @@
struct YGtkPkgStatusBar
{
- YGtkPkgStatusBar (YGtkPkgUndoList *undo, bool realStatusBar);
+ YGtkPkgStatusBar (YGtkPkgUndoList *undo);
~YGtkPkgStatusBar();
GtkWidget *getWidget();
Modified: trunk/gtk/src/pkg/ygtkpkgundolist.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/ygtkpkgundolist.cc?rev=60886&r1=60885&r2=60886&view=diff
==============================================================================
--- trunk/gtk/src/pkg/ygtkpkgundolist.cc (original)
+++ trunk/gtk/src/pkg/ygtkpkgundolist.cc Fri Feb 19 19:11:23 2010
@@ -243,7 +243,7 @@
gtk_window_set_default_size (GTK_WINDOW (dialog), 600, 500);
YGtkPkgListView view (true, -1);
- view.addImageColumn (_("Status"), STATUS_ICON_PROP);
+ view.addImageColumn (_("Action"), STATUS_ICON_PROP);
view.addTextColumn (_("Name"), NAME_SUMMARY_PROP, true, -1, true);
view.addTextColumn (_("Version"), VERSION_PROP, true, 125);
view.addUndoButtonColumn (_("Revert?"));
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org