Author: rpmcruz
Date: Sat Dec 15 06:59:55 2007
New Revision: 43102
URL: http://svn.opensuse.org/viewcvs/yast?rev=43102&view=rev
Log:
* src/yzyppwrapper.cc: got rid of package ids. Pointers serve as ids fine.
* src/YGPackageSelector.cc: small touch up on the Changes pane.
Modified:
trunk/gtk/unstable-libyui/ChangeLog
trunk/gtk/unstable-libyui/src/YGPackageSelector.cc
trunk/gtk/unstable-libyui/src/ygtkfindentry.c
trunk/gtk/unstable-libyui/src/yzyppwrapper.cc
Modified: trunk/gtk/unstable-libyui/ChangeLog
URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/unstable-libyui/ChangeLog?rev=43102&r1=43101&r2=43102&view=diff
==============================================================================
--- trunk/gtk/unstable-libyui/ChangeLog (original)
+++ trunk/gtk/unstable-libyui/ChangeLog Sat Dec 15 06:59:55 2007
@@ -17,6 +17,10 @@
* configure.in.in: changed the libyui test to a file test, since I'm not
sure the yast2-core version has changed as a result of the new libyui.
+ * src/yzyppwrapper.cc: got rid of package ids. Pointers serve as ids fine.
+
+ * src/YGPackageSelector.cc: small touch up on the Changes pane.
+
2007-12-09 Ricardo Cruz
* src/YGUI.h.cc: fixed package selector issue. We weren't implementing
Modified: trunk/gtk/unstable-libyui/src/YGPackageSelector.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/unstable-libyui/src/YGPackageSelector.cc?rev=43102&r1=43101&r2=43102&view=diff
==============================================================================
--- trunk/gtk/unstable-libyui/src/YGPackageSelector.cc (original)
+++ trunk/gtk/unstable-libyui/src/YGPackageSelector.cc Sat Dec 15 06:59:55 2007
@@ -352,22 +352,22 @@
G_CALLBACK (Entry::style_set_cb), NULL);
m_entries_box = gtk_vbox_new (FALSE, 4);
- GtkWidget *vbox = gtk_vbox_new (FALSE, 6);
- gtk_container_set_border_width (GTK_CONTAINER (vbox), 4);
- gtk_box_pack_start (GTK_BOX (vbox), heading, FALSE, TRUE, 0);
- gtk_box_pack_start (GTK_BOX (vbox), m_entries_box, FALSE, TRUE, 0);
-
GtkWidget *port = gtk_viewport_new (NULL, NULL);
gtk_viewport_set_shadow_type (GTK_VIEWPORT (port), GTK_SHADOW_NONE);
- gtk_container_add (GTK_CONTAINER (port), vbox);
+ gtk_container_add (GTK_CONTAINER (port), m_entries_box);
GtkWidget *scroll = gtk_scrolled_window_new (NULL, NULL);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scroll),
GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
gtk_container_add (GTK_CONTAINER (scroll), port);
+ GtkWidget *vbox = gtk_vbox_new (FALSE, 6);
+ gtk_container_set_border_width (GTK_CONTAINER (vbox), 4);
+ gtk_box_pack_start (GTK_BOX (vbox), heading, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), scroll, TRUE, TRUE, 0);
+
m_box = gtk_event_box_new();
- gtk_container_add (GTK_CONTAINER (m_box), scroll);
+ gtk_container_add (GTK_CONTAINER (m_box), vbox);
g_signal_connect_after (G_OBJECT (m_box), "style-set",
G_CALLBACK (style_set_cb), NULL);
g_signal_connect_after (G_OBJECT (scroll), "style-set",
@@ -398,7 +398,7 @@
virtual void entryInserted (Ypp::Pool::Iter iter, Ypp::Package *package)
{
Entry *entry = new Entry (package);
- gtk_container_add (GTK_CONTAINER (m_entries_box), entry->getWidget());
+ gtk_box_pack_start (GTK_BOX (m_entries_box), entry->getWidget(), FALSE, TRUE, 0);
int index = m_pool->getIndex (iter);
m_entries = g_list_insert (m_entries, entry, index);
gtk_widget_show (m_container);
@@ -816,8 +816,8 @@
m_statuses = new StatusButtons (this);
m_name = ygtk_find_entry_new();
- g_signal_connect_after (G_OBJECT (m_name), "changed",
- G_CALLBACK (entry_changed_cb), this);
+ g_signal_connect (G_OBJECT (m_name), "changed",
+ G_CALLBACK (entry_changed_cb), this);
m_repos = gtk_combo_box_new_text();
gtk_combo_box_append_text (GTK_COMBO_BOX (m_repos), _("All Repositories"));
Modified: trunk/gtk/unstable-libyui/src/ygtkfindentry.c
URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/unstable-libyui/src/ygtkfindentry.c?rev=43102&r1=43101&r2=43102&view=diff
==============================================================================
--- trunk/gtk/unstable-libyui/src/ygtkfindentry.c (original)
+++ trunk/gtk/unstable-libyui/src/ygtkfindentry.c Sat Dec 15 06:59:55 2007
@@ -349,12 +349,13 @@
gdk_window_set_cursor (eentry->left_window, cursor);
gdk_window_set_cursor (eentry->right_window, cursor);
gdk_cursor_unref (cursor);
+ gdk_window_hide (eentry->right_window); // show when text is inserted
}
static void ygtk_find_entry_map (GtkWidget *widget)
{
- if (GTK_WIDGET_REALIZED (widget) && !GTK_WIDGET_MAPPED (widget)) {
- GTK_WIDGET_CLASS (ygtk_find_entry_parent_class)->map (widget);
+ GTK_WIDGET_CLASS (ygtk_find_entry_parent_class)->map (widget);
+ if (GTK_WIDGET_REALIZED (widget)) {
// only show clear icon when the entry has text
GdkWindow *clear_win = YGTK_EXT_ENTRY (widget)->right_window;
if (clear_win)
@@ -470,14 +471,9 @@
(ygtk_find_entry_parent_class, GTK_TYPE_EDITABLE);
parent_editable_iface->delete_text (editable, start_pos, end_pos);
- int has_text = strlen (gtk_entry_get_text (GTK_ENTRY (editable)));
- if (!has_text) {
- /* Set or delete text may be called while the widget has not yet been
- realized. */
- GdkWindow *clear_win = YGTK_EXT_ENTRY (editable)->right_window;
- if (clear_win)
- gdk_window_hide (clear_win);
- }
+ GdkWindow *clear_win = YGTK_EXT_ENTRY (editable)->right_window;
+ if (clear_win)
+ gdk_window_hide (clear_win);
}
void ygtk_find_entry_attach_menu (YGtkFindEntry *entry, GtkMenu *menu)
Modified: trunk/gtk/unstable-libyui/src/yzyppwrapper.cc
URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/unstable-libyui/src/yzyppwrapper.cc?rev=43102&r1=43101&r2=43102&view=diff
==============================================================================
--- trunk/gtk/unstable-libyui/src/yzyppwrapper.cc (original)
+++ trunk/gtk/unstable-libyui/src/yzyppwrapper.cc Sat Dec 15 06:59:55 2007
@@ -178,7 +178,7 @@
struct Ypp::Package::Impl
{
Impl (ZyppSelectable sel)
- : zyppSel (sel), index (-1), availableVersions (NULL), installedVersion (NULL)
+ : zyppSel (sel), availableVersions (NULL), installedVersion (NULL)
{
// don't use getAvailableVersion(0) for hasUpgrade() has its inneficient.
// let's just cache candidate() at start, which should point to the newest version.
@@ -205,7 +205,6 @@
std::string name, summary;
ZyppSelectable zyppSel;
- int index; // used for Pools syncing
Type type;
Ypp::Node *category;
GSList *availableVersions;
@@ -834,16 +833,12 @@
void packageModified (Package *package)
{
bool match = query->impl->match (package);
- int cmp = 1;
GSList *i;
for (i = packages; i; i = i->next) {
- Package *pkg = (Package *) i->data;
- if (pkg->impl->index == package->impl->index)
- cmp = 0;
- if (pkg->impl->index >= package->impl->index)
+ if (package == i->data)
break;
}
- if (cmp == 0) {
+ if (i) { // is on pool
if (match) { // modified
if (listener)
listener->entryChanged ((Iter) i, package);
@@ -854,7 +849,7 @@
packages = g_slist_delete_link (packages, i);
}
}
- else {
+ else { // not on pool
if (match) { // inserted
if (i == NULL) {
packages = g_slist_append (packages, (gpointer) package);
@@ -879,13 +874,10 @@
if (!query->impl->type.is ((Ypp::Package::Type) t))
continue;
GSList *entire_pool = ypp->impl->getPackages ((Ypp::Package::Type) t);
- int index = 0;
for (GSList *i = entire_pool; i; i = i->next) {
Package *pkg = (Package *) i->data;
if (query->impl->match (pkg))
pool = g_slist_append (pool, i->data);
- if (pkg->impl->index == -1)
- pkg->impl->index = index++;
}
}
return pool;
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
