Author: rpmcruz
Date: Wed Feb 17 12:35:58 2010
New Revision: 60843
URL: http://svn.opensuse.org/viewcvs/yast?rev=60843&view=rev
Log:
* src/pkg/YGPackageSelector.cc & src/pkg/ygtkpkglistview.h/cc:
experimented with highlight; touched up a bit.
* src/pkg/ygtkpkgdetailview.cc: version expander not working
as expected when candidate chosen.
Modified:
trunk/gtk/ChangeLog
trunk/gtk/src/pkg/YGPackageSelector.cc
trunk/gtk/src/pkg/ygtkpkgdetailview.cc
trunk/gtk/src/pkg/ygtkpkglistview.cc
trunk/gtk/src/pkg/ygtkpkglistview.h
trunk/gtk/src/pkg/ygtkpkgstatusbar.cc
Modified: trunk/gtk/ChangeLog
URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/ChangeLog?rev=60843&r1=60842&r2=60843&view=diff
==============================================================================
--- trunk/gtk/ChangeLog (original)
+++ trunk/gtk/ChangeLog Wed Feb 17 12:35:58 2010
@@ -1,3 +1,11 @@
+2010-02-17 Ricardo Cruz
+
+ * src/pkg/YGPackageSelector.cc & src/pkg/ygtkpkglistview.h/cc:
+ experimented with highlight; touched up a bit.
+
+ * src/pkg/ygtkpkgdetailview.cc: version expander not working
+ as expected when candidate chosen.
+
2010-02-16 Ricardo Cruz
* src/ygtkpkglistview.h/cc: added tags as parameters to
Modified: trunk/gtk/src/pkg/YGPackageSelector.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/YGPackageSelector.cc?rev=60843&r1=60842&r2=60843&view=diff
==============================================================================
--- trunk/gtk/src/pkg/YGPackageSelector.cc (original)
+++ trunk/gtk/src/pkg/YGPackageSelector.cc Wed Feb 17 12:35:58 2010
@@ -143,7 +143,7 @@
m_combo->add (_("Support"));
m_combo->add ("");
m_combo->add (_("Patterns"));
- m_combo->add (_("Language"));
+ m_combo->add (_("Languages"));
int active = 5;
if (YGPackageSelector::get()->repoMode())
@@ -474,14 +474,11 @@
Ypp::List list (query);
m_list->setList (list);
- YGUI::ui()->normalCursor();
if (YGPackageSelector::get()->breath()) return;
-
- m_list->setHighlight (keywords);
- refreshToolbox();
+ m_list->setList (list, keywords);
if (YGPackageSelector::get()->breath()) return;
-
+ refreshToolbox();
refreshFilters (list);
}
Modified: trunk/gtk/src/pkg/ygtkpkgdetailview.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/ygtkpkgdetailview.cc?rev=60843&r1=60842&r2=60843&view=diff
==============================================================================
--- trunk/gtk/src/pkg/ygtkpkgdetailview.cc (original)
+++ trunk/gtk/src/pkg/ygtkpkgdetailview.cc Wed Feb 17 12:35:58 2010
@@ -130,8 +130,9 @@
if (sel.type() == Ypp::Selectable::PACKAGE) {
std::string url (Ypp::Package (sel).url());
- str += std::string ("<p><b>") + _("Web site:") + "</b> " + url + "</a></p>";
+ if (!url.empty())
+ str += std::string ("<p><b>") + _("Web site:") + "</b> " + url + "</a></p>";
}
}
else {
@@ -266,8 +267,10 @@
virtual void refreshList (Ypp::List list)
{
- dirty = true;
- updateList();
+ if (gtk_expander_get_expanded (GTK_EXPANDER (expander)))
+ showRefreshList (list);
+ else
+ dirty = true;
}
static void expanded_cb (GObject *object, GParamSpec *param_spec, DetailExpander *pThis)
@@ -278,6 +281,7 @@
// use this method to only request data when/if necessary; so to speed up expander children
virtual void showList (Ypp::List list) = 0;
+ virtual void showRefreshList (Ypp::List list) = 0;
virtual bool onlySingleList() = 0; // show only when list.size()==1
};
@@ -314,6 +318,8 @@
zsel->candidateObj()->buildtime().form ("%x");
ygtk_rich_text_set_text (YGTK_RICH_TEXT (text), str.c_str());
}
+
+ virtual void showRefreshList (Ypp::List list) {}
};
typedef zypp::ResPoolProxy::const_iterator ZyppPoolIterator;
@@ -349,8 +355,8 @@
versions_box = gtk_vbox_new (FALSE, 2);
GtkWidget *button_box = gtk_hbox_new (FALSE, 6);
- gtk_box_pack_end (GTK_BOX (button_box), button, FALSE, TRUE, 0);
gtk_box_pack_end (GTK_BOX (button_box), undo_button, FALSE, TRUE, 0);
+ gtk_box_pack_end (GTK_BOX (button_box), button, FALSE, TRUE, 0);
box = gtk_vbox_new (FALSE, 6);
gtk_box_pack_start (GTK_BOX (box), versions_box, TRUE, TRUE, 0);
@@ -539,6 +545,9 @@
updateButton();
}
+ virtual void showRefreshList (Ypp::List list)
+ { updateButton(); }
+
static void button_clicked_cb (GtkButton *button, VersionExpander *pThis)
{
if (pThis->list.size() == 1) {
@@ -554,7 +563,6 @@
sel.setCandidate (version);
sel.install();
}
- Ypp::notifySelModified();
}
else {
Ypp::ListProps props (pThis->list);
@@ -716,6 +724,9 @@
gtk_widget_show_all (vbox);
}
+ virtual void showRefreshList (Ypp::List list)
+ { showList (list); }
+
struct VersionDependencies {
VersionDependencies (Ypp::Version version)
: m_version (version) {}
@@ -819,6 +830,8 @@
ygtk_rich_text_set_text (YGTK_RICH_TEXT (text), onlyInstalledMsg);
}
+ virtual void showRefreshList (Ypp::List list) {}
+
static void dirname_pressed_cb (GtkWidget *text, const gchar *link, FilelistExpander *pThis)
{
gchar *cmd = g_strdup_printf (GNOME_OPEN_BIN " %s &", link);
@@ -933,6 +946,8 @@
ygtk_rich_text_set_text (YGTK_RICH_TEXT (text), onlyInstalledMsg);
}
+ virtual void showRefreshList (Ypp::List list) {}
+
static std::string changelog (Ypp::Selectable &sel)
{
std::string text;
@@ -979,6 +994,8 @@
ygtk_rich_text_set_text (YGTK_RICH_TEXT (text), str.c_str());
}
+ virtual void showRefreshList (Ypp::List list) {}
+
static std::string authors (Ypp::Selectable &sel)
{
std::string text;
@@ -1071,6 +1088,8 @@
query.addCriteria (new Ypp::CollectionMatch (col));
view->setQuery (query);
}
+
+ virtual void showRefreshList (Ypp::List list) {}
};
struct YGtkPkgDetailView::Impl : public Ypp::SelListener
Modified: trunk/gtk/src/pkg/ygtkpkglistview.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/ygtkpkglistview.cc?rev=60843&r1=60842&r2=60843&view=diff
==============================================================================
--- trunk/gtk/src/pkg/ygtkpkglistview.cc (original)
+++ trunk/gtk/src/pkg/ygtkpkglistview.cc Wed Feb 17 12:35:58 2010
@@ -175,7 +175,6 @@
str += sel.installed().number();
str += "</small>";
}
-fprintf (stderr, "version: %s\n", str.c_str());
g_value_set_string (value, str.c_str());
break;
}
@@ -266,7 +265,7 @@
descriptiveTooltip (descriptiveTooltip), sort_attrb (default_sort_attrb),
ascendent (true), userModified (false) {}
- void setList (Ypp::List _list, int _attrb, bool _ascendent, bool userSorted)
+ void setList (Ypp::List _list, int _attrb, bool _ascendent, bool userSorted, const std::list std::string &keywords)
{
if (userSorted) userModified = true;
if (_list != list || sort_attrb != _attrb || ascendent != _ascendent) {
@@ -281,10 +280,10 @@
ascendent = _ascendent;
}
- GtkTreeModel *model = ygtk_zypp_model_new (list.clone(), m_keywords);
+ GtkTreeModel *model = ygtk_zypp_model_new (list.clone(), keywords);
gtk_tree_view_set_model (GTK_TREE_VIEW (view), model);
g_object_unref (G_OBJECT (model));
- setHighlight (m_keywords);
+ m_keywords = keywords;
if (userModified) {
GList *columns = gtk_tree_view_get_columns (GTK_TREE_VIEW (view));
@@ -303,6 +302,7 @@
gtk_tree_view_set_search_column (GTK_TREE_VIEW (view), NAME_PROP);
}
+#if 0
void setHighlight (const std::list std::string &keywords)
{
if (m_keywords.empty() && keywords.empty())
@@ -313,6 +313,7 @@
zmodel->setHighlight (keywords);
gtk_widget_queue_draw (view);
}
+#endif
};
static void right_click_cb (YGtkTreeView *view, gboolean outreach, YGtkPkgListView *pThis)
@@ -541,7 +542,7 @@
bool ascendent = true;
if (gtk_tree_view_column_get_sort_indicator (column))
ascendent = gtk_tree_view_column_get_sort_order (column) == GTK_SORT_DESCENDING;
- pThis->impl->setList (pThis->impl->list, attrb, ascendent, true);
+ pThis->impl->setList (pThis->impl->list, attrb, ascendent, true, pThis->impl->m_keywords);
}
static void set_sort_column (YGtkPkgListView *pThis, GtkTreeViewColumn *column, int property)
@@ -604,14 +605,16 @@
void YGtkPkgListView::setQuery (Ypp::Query &query)
{ setList (Ypp::List (query)); }
-void YGtkPkgListView::setList (Ypp::List query)
+void YGtkPkgListView::setList (Ypp::List list)
{
- Ypp::List list (query);
- impl->setList (list, impl->sort_attrb, impl->ascendent, false);
+ std::list std::string keywords;
+ impl->setList (list, impl->sort_attrb, impl->ascendent, false, keywords);
}
-void YGtkPkgListView::setHighlight (const std::list std::string &keywords)
+void YGtkPkgListView::setList (Ypp::List list, const std::list std::string &keywords)
{
+ impl->setList (list, impl->sort_attrb, impl->ascendent, false, keywords);
+
int index = keywords.size() == 1 ? impl->list.find (keywords.front()) : -1;
if (index != -1) {
GtkTreeView *view = GTK_TREE_VIEW (impl->view);
@@ -624,8 +627,6 @@
}
else if (GTK_WIDGET_REALIZED (impl->view))
gtk_tree_view_scroll_to_point (GTK_TREE_VIEW (impl->view), -1, 0);
-
- impl->setHighlight (keywords);
}
void YGtkPkgListView::addTextColumn (const char *header, int property, bool visible, int size, bool identAuto)
Modified: trunk/gtk/src/pkg/ygtkpkglistview.h
URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/ygtkpkglistview.h?rev=60843&r1=60842&r2=60843&view=diff
==============================================================================
--- trunk/gtk/src/pkg/ygtkpkglistview.h (original)
+++ trunk/gtk/src/pkg/ygtkpkglistview.h Wed Feb 17 12:35:58 2010
@@ -25,7 +25,7 @@
void setQuery (Ypp::Query &query);
void setList (Ypp::List list);
- void setHighlight (const std::list std::string &keywords);
+ void setList (Ypp::List list, const std::list std::string &keywords);
void addTextColumn (const char *header, int property, bool visible, int size, bool identAuto = false);
void addCheckColumn (int checkProperty);
Modified: trunk/gtk/src/pkg/ygtkpkgstatusbar.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/ygtkpkgstatusbar.cc?rev=60843&r1=60842&r2=60843&view=diff
==============================================================================
--- trunk/gtk/src/pkg/ygtkpkgstatusbar.cc (original)
+++ trunk/gtk/src/pkg/ygtkpkgstatusbar.cc Wed Feb 17 12:35:58 2010
@@ -279,7 +279,7 @@
gtk_label_set_selectable (GTK_LABEL (text), TRUE);
hbox = gtk_hbox_new (FALSE, 4);
- gtk_box_pack_start (GTK_BOX (hbox), gtk_label_new (_("Size available:")), FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), gtk_label_new (_("Space available:")), FALSE, TRUE, 0);
gtk_box_pack_start (GTK_BOX (hbox), combo, FALSE, TRUE, 0);
gtk_box_pack_start (GTK_BOX (hbox), text, FALSE, TRUE, 0);
}
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
