[yast-commit] r61143 - in /trunk/gtk: ./ src/pkg/

Author: rpmcruz Date: Thu Mar 4 01:07:44 2010 New Revision: 61143 URL: http://svn.opensuse.org/viewcvs/yast?rev=61143&view=rev Log: * src/pkg/ygtkpkgfilterview.cc: always show "Available" row for patches -- and select it by default. Modified: trunk/gtk/ChangeLog trunk/gtk/src/pkg/YGPackageSelector.cc trunk/gtk/src/pkg/ygtkpkgdetailview.cc trunk/gtk/src/pkg/ygtkpkgfilterview.cc trunk/gtk/src/pkg/ygtkpkgfilterview.h trunk/gtk/src/pkg/ygtkpkglanguageview.cc trunk/gtk/src/pkg/ygtkpkglistview.cc trunk/gtk/src/pkg/ygtkpkglistview.h trunk/gtk/src/pkg/ygtkpkgsearchentry.cc trunk/gtk/src/pkg/ygtkpkgundolist.cc trunk/gtk/src/pkg/yzyppwrapper.cc Modified: trunk/gtk/ChangeLog URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/ChangeLog?rev=61143&r1=61142&r2=61143&view=diff ============================================================================== --- trunk/gtk/ChangeLog (original) +++ trunk/gtk/ChangeLog Thu Mar 4 01:07:44 2010 @@ -6,6 +6,9 @@ * src/YGDialog.cc: bug fix: revert to normal cursor after running dialog-spy. + * src/pkg/ygtkpkgfilterview.cc: always show "Available" row + for patches -- and select it by default. + 2010-03-02 Ricardo Cruz * src/ygtkfindentry.h/c: removed. Modified: trunk/gtk/src/pkg/YGPackageSelector.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/YGPackageSelector.cc?rev=61143&r1=61142&r2=61143&view=diff ============================================================================== --- trunk/gtk/src/pkg/YGPackageSelector.cc (original) +++ trunk/gtk/src/pkg/YGPackageSelector.cc Thu Mar 4 01:07:44 2010 @@ -70,7 +70,7 @@ m_entry = new YGtkPkgSearchEntry(); m_queryWidgets.push_back (m_entry); - m_list = new YGtkPkgListView (false); + m_list = new YGtkPkgListView (false, Ypp::List::NAME_SORT, false, true); m_list->addCheckColumn (INSTALLED_CHECK_PROP); m_list->addTextColumn (_("Name"), NAME_SUMMARY_PROP, true, -1); m_list->addTextColumn (_("Version"), VERSION_PROP, true, 125); @@ -115,7 +115,7 @@ GtkWidget *vpaned = gtk_vpaned_new(); gtk_paned_pack1 (GTK_PANED (vpaned), m_list->getWidget(), TRUE, FALSE); gtk_paned_pack2 (GTK_PANED (vpaned), text, FALSE, TRUE); - gtk_paned_set_position (GTK_PANED (vpaned), 400); + gtk_paned_set_position (GTK_PANED (vpaned), 380); GtkWidget *vbox, *_vbox = gtk_vbox_new (FALSE, 0); gtk_box_pack_start (GTK_BOX (_vbox), hbox, FALSE, TRUE, 0); @@ -162,7 +162,7 @@ GtkWidget *vpaned = gtk_vpaned_new(); gtk_paned_pack1 (GTK_PANED (vpaned), m_combo->getWidget(), TRUE, FALSE); gtk_paned_pack2 (GTK_PANED (vpaned), status->getWidget(), FALSE, FALSE); - gtk_paned_set_position (GTK_PANED (vpaned), 500); + gtk_paned_set_position (GTK_PANED (vpaned), 490); return vpaned; } @@ -170,17 +170,19 @@ { Ypp::init(); m_undo = new YGtkPkgUndoList(); + m_status = 0; GtkWidget *hpaned = gtk_hpaned_new(); gtk_paned_pack1 (GTK_PANED (hpaned), createSidebar(), FALSE, TRUE); gtk_paned_pack2 (GTK_PANED (hpaned), createMainArea(), TRUE, FALSE); gtk_paned_set_position (GTK_PANED (hpaned), 200); - 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); - gtk_box_pack_start (GTK_BOX (m_widget), m_status->getWidget(), FALSE, TRUE, 0); + if (!YGPackageSelector::get()->onlineUpdateMode()) { + m_status = new YGtkPkgStatusBar (m_undo); + gtk_box_pack_start (GTK_BOX (m_widget), m_status->getWidget(), FALSE, TRUE, 0); + } gtk_widget_show_all (m_widget); gtk_widget_hide (m_toolbox); @@ -452,7 +454,7 @@ it != m_queryWidgets.end(); it++) { GtkWidget *toolbox = (*it)->createToolbox(); if (toolbox) { - gtk_box_pack_end (GTK_BOX (m_toolbox), toolbox, FALSE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (m_toolbox), toolbox, FALSE, TRUE, 0); empty = false; break; // only present one toolbox widget as they may be quite large } @@ -558,7 +560,7 @@ query.addCriteria (new UnsupportedMatch()); Ypp::List list (query); - YGtkPkgListView view = new YGtkPkgListView (true); + YGtkPkgListView view (true, Ypp::List::NAME_SORT, false, true); view.addCheckColumn (INSTALLED_CHECK_PROP); view.addTextColumn (_("Name"), NAME_SUMMARY_PROP, true, -1); view.addTextColumn (_("Supportability"), SUPPORT_PROP, true, 140); Modified: trunk/gtk/src/pkg/ygtkpkgdetailview.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/ygtkpkgdetailview.cc?rev=61143&r1=61142&r2=61143&view=diff ============================================================================== --- trunk/gtk/src/pkg/ygtkpkgdetailview.cc (original) +++ trunk/gtk/src/pkg/ygtkpkgdetailview.cc Thu Mar 4 01:07:44 2010 @@ -1067,7 +1067,7 @@ ContentsExpander() : DetailExpander (_("Applies to"), false) { - view = new YGtkPkgListView (true); + view = new YGtkPkgListView (true, Ypp::List::NAME_SORT, false, false); view->addCheckColumn (INSTALLED_CHECK_PROP); view->addTextColumn (_("Name"), NAME_SUMMARY_PROP, true, -1); view->addTextColumn (_("Version"), VERSION_PROP, true, 125); Modified: trunk/gtk/src/pkg/ygtkpkgfilterview.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/ygtkpkgfilterview.cc?rev=61143&r1=61142&r2=61143&view=diff ============================================================================== --- trunk/gtk/src/pkg/ygtkpkgfilterview.cc (original) +++ trunk/gtk/src/pkg/ygtkpkgfilterview.cc Thu Mar 4 01:07:44 2010 @@ -64,16 +64,22 @@ static gboolean update_list_cb (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpointer _data) { + gchar *text; UpdateData *data = (UpdateData *) _data; gpointer mdata; - gtk_tree_model_get (model, iter, YGtkPkgFilterModel::DATA_COLUMN, &mdata, -1); + gtk_tree_model_get (model, iter, YGtkPkgFilterModel::TEXT_ORI_COLUMN, &text, + YGtkPkgFilterModel::DATA_COLUMN, &mdata, -1); + + bool separator = !(*text); + g_free (text); + if (separator) return FALSE; int row = gtk_tree_path_get_indices (path)[0]; if ((row % 2) == 0) // let the UI breath if (YGPackageSelector::get()->breath()) return TRUE; - if (row == 0 && data->pThis->allAsFirstRow()) + if (row == 0 && data->pThis->firstRowIsAll()) data->pThis->setRowCount (0, data->list->size()); else data->pThis->updateRow (*data->list, row, mdata); @@ -93,7 +99,7 @@ gtk_tree_model_get (impl->filter, iter, DATA_COLUMN, &data, -1); int row = impl->convertlIterToStoreRow (iter); - if (row == 0 && allAsFirstRow()) + if (row == 0 && firstRowIsAll()) return false; return writeRowQuery (query, row, data); } @@ -124,7 +130,10 @@ if (pixbuf) g_object_unref (pixbuf); } -void YGtkPkgFilterModel::setRowCount (int row, int count) +void YGtkPkgFilterModel::addSeparator() +{ addRow (NULL, "", true, NULL); } + +void YGtkPkgFilterModel::setRowCount (int row, int count, bool hide_if_zero) { GtkListStore *store = GTK_LIST_STORE (impl->model); GtkTreeIter iter; @@ -134,7 +143,8 @@ gtk_tree_model_get (impl->model, &iter, TEXT_ORI_COLUMN, &ori_text, -1); gchar *text = g_strdup_printf ("%s <small>(%d)</small>", ori_text, count); - gtk_list_store_set (store, &iter, TEXT_COLUMN, text, VISIBLE_COLUMN, count > 0, -1); + gtk_list_store_set (store, &iter, TEXT_COLUMN, text, + VISIBLE_COLUMN, !hide_if_zero || count > 0, -1); g_free (ori_text); g_free (text); } @@ -143,7 +153,7 @@ struct YGtkPkgStatusModel::Impl : public Ypp::SelListener { Impl (YGtkPkgStatusModel *parent) - : parent (parent), selected (-1), list (0) + : parent (parent), list (0) { Ypp::addSelListener (this); } ~Impl() @@ -151,51 +161,70 @@ virtual void selectableModified() { // make sure to update the "Modified" row on packages change - parent->updateRow (list, 5, NULL); + parent->updateRow (list, modifiedRow(), NULL); } YGtkPkgStatusModel *parent; - int selected; Ypp::List list; + + static int modifiedRow() + { return YGPackageSelector::get()->onlineUpdateMode() ? 2 : 5; } }; +static Ypp::StatusMatch::Status rowToStatus (int row) +{ + if (YGPackageSelector::get()->onlineUpdateMode()) + switch (row) { + case 0: return Ypp::StatusMatch::NOT_INSTALLED; + case 1: return Ypp::StatusMatch::IS_INSTALLED; + case 2: return Ypp::StatusMatch::TO_MODIFY; + } + else + switch (row) { + case 1: return Ypp::StatusMatch::NOT_INSTALLED; + case 2: return Ypp::StatusMatch::IS_INSTALLED; + case 3: return Ypp::StatusMatch::HAS_UPGRADE; + case 4: return Ypp::StatusMatch::IS_LOCKED; + case 5: return Ypp::StatusMatch::TO_MODIFY; + } + return (Ypp::StatusMatch::Status) 0; +} + YGtkPkgStatusModel::YGtkPkgStatusModel() : impl (new Impl (this)) { - addRow (NULL, _("Any status"), true, 0); - addRow (NULL, _("Not installed"), true, 0); - addRow (NULL, _("Installed"), true, 0); - addRow (NULL, _("Upgradable"), true, 0); - addRow (NULL, _("Locked"), true, 0); - addRow (NULL, _("Modified"), true, 0); + if (YGPackageSelector::get()->onlineUpdateMode()) { + addRow (NULL, _("Available"), true, 0); + addRow (NULL, _("Installed"), true, 0); + addRow (NULL, _("Modified"), true, 0); + } + else { + addRow (NULL, _("Any status"), true, 0); + addRow (NULL, _("Not installed"), true, 0); + addRow (NULL, _("Installed"), true, 0); + addRow (NULL, _("Upgradable"), true, 0); + addRow (NULL, _("Locked"), true, 0); + addRow (NULL, _("Modified"), true, 0); + } } YGtkPkgStatusModel::~YGtkPkgStatusModel() { delete impl; } -static Ypp::StatusMatch statusType (int row) -{ - switch (row) { - case 1: return Ypp::StatusMatch::NOT_INSTALLED; - case 2: return Ypp::StatusMatch::IS_INSTALLED; - case 3: return Ypp::StatusMatch::HAS_UPGRADE; - case 4: return Ypp::StatusMatch::IS_LOCKED; - case 5: return Ypp::StatusMatch::TO_MODIFY; - } - return (Ypp::StatusMatch::Status) 0; -} +bool YGtkPkgStatusModel::firstRowIsAll() +{ return !YGPackageSelector::get()->onlineUpdateMode(); } void YGtkPkgStatusModel::updateRow (Ypp::List list, int row, gpointer data) { + bool hide_if_zero = row > 0; impl->list = list; - Ypp::StatusMatch match (statusType (row)); - setRowCount (row, list.count (&match)); + Ypp::StatusMatch match (rowToStatus (row)); + setRowCount (row, list.count (&match), hide_if_zero); } bool YGtkPkgStatusModel::writeRowQuery (Ypp::PoolQuery &query, int row, gpointer data) { - impl->selected = row; - query.addCriteria (new Ypp::StatusMatch (statusType (row))); + query.addCriteria (new Ypp::StatusMatch (rowToStatus (row))); return true; } @@ -212,7 +241,7 @@ GtkWidget *YGtkPkgStatusModel::createToolboxRow (int row) { // "Upgrade All" button - if (row == 3) { + if (row == 3 && !YGPackageSelector::get()->onlineUpdateMode()) { GtkWidget *button = gtk_button_new_with_label (_("Upgrade All")); GtkWidget *icon = gtk_image_new_from_stock (GTK_STOCK_GO_UP, GTK_ICON_SIZE_BUTTON); gtk_button_set_image (GTK_BUTTON (button), icon); @@ -257,18 +286,16 @@ if (i == YPKG_GROUP_RECENT) name += std::string ("\n<small>") + _("(uploaded last 7 days)") + "</small>"; addRow (icon, name.c_str(), true, GINT_TO_POINTER (i+1)); - if (i == YPKG_GROUP_UNKNOWN) // separator - addRow (NULL, "", true, 0); + if (i == YPKG_GROUP_UNKNOWN) + addSeparator(); } } void YGtkPkgPKGroupModel::updateRow (Ypp::List list, int row, gpointer data) { - if (data) { - YPkgGroupEnum id = (YPkgGroupEnum) (GPOINTER_TO_INT (data)-1); - Ypp::PKGroupMatch match (id); - setRowCount (row, list.count (&match)); - } + YPkgGroupEnum id = (YPkgGroupEnum) (GPOINTER_TO_INT (data)-1); + Ypp::PKGroupMatch match (id); + setRowCount (row, list.count (&match)); } bool YGtkPkgPKGroupModel::writeRowQuery (Ypp::PoolQuery &query, int row, gpointer data) @@ -315,7 +342,7 @@ } } - addRow ("gtk-missing-image", _("None"), true, GINT_TO_POINTER (1)); + addRow (GTK_STOCK_MISSING_IMAGE, _("None"), true, GINT_TO_POINTER (1)); } YGtkPkgRepositoryModel::~YGtkPkgRepositoryModel() @@ -598,25 +625,21 @@ { impl->model->updateList (list); - if (impl->model->allAsFirstRow()) { - GtkTreeSelection *selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (impl->view)); - GtkTreeModel *model; - if (!gtk_tree_selection_get_selected (selection, &model, NULL)) { - GtkTreeIter iter; - if (gtk_tree_model_get_iter_first (model, &iter)) { - g_signal_handlers_block_by_func (selection, (gpointer) selection_changed_cb, this); - gtk_tree_selection_select_iter (selection, &iter); - g_signal_handlers_unblock_by_func (selection, (gpointer) selection_changed_cb, this); - } + // always ensure some row is selected + GtkTreeSelection *selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (impl->view)); + GtkTreeModel *model; + if (!gtk_tree_selection_get_selected (selection, &model, NULL)) { + GtkTreeIter iter; + if (gtk_tree_model_get_iter_first (model, &iter)) { + g_signal_handlers_block_by_func (selection, (gpointer) selection_changed_cb, this); + gtk_tree_selection_select_iter (selection, &iter); + g_signal_handlers_unblock_by_func (selection, (gpointer) selection_changed_cb, this); } } } void YGtkPkgFilterView::clearSelection() -{ - int row = impl->model->allAsFirstRow() ? 0 : -1; - select (row); -} +{ select (0); /* select 1st row, so some row is selected */ } bool YGtkPkgFilterView::writeQuery (Ypp::PoolQuery &query) { Modified: trunk/gtk/src/pkg/ygtkpkgfilterview.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/ygtkpkgfilterview.h?rev=61143&r1=61142&r2=61143&view=diff ============================================================================== --- trunk/gtk/src/pkg/ygtkpkgfilterview.h (original) +++ trunk/gtk/src/pkg/ygtkpkgfilterview.h Thu Mar 4 01:07:44 2010 @@ -32,7 +32,7 @@ virtual GtkWidget *createToolbox (GtkTreeIter *iter); virtual bool hasIconCol() = 0; - virtual bool allAsFirstRow() = 0; + virtual bool firstRowIsAll() = 0; virtual bool begsUpdate() = 0; virtual void updateRow (Ypp::List list, int row, gpointer data) = 0; @@ -43,18 +43,21 @@ virtual GtkWidget *createInternalPopup() { return NULL; } void addRow (const char *icon, const char *text, bool enabled, gpointer data); - void setRowCount (int row, int count); + void addSeparator(); + void setRowCount (int row, int count, bool hide_if_zero = true); struct Impl; Impl *impl; }; +// implementations + struct YGtkPkgStatusModel : public YGtkPkgFilterModel { YGtkPkgStatusModel(); virtual ~YGtkPkgStatusModel(); virtual bool hasIconCol() { return false; } - virtual bool allAsFirstRow() { return true; } + virtual bool firstRowIsAll(); virtual bool begsUpdate() { return true; } virtual void updateRow (Ypp::List list, int row, gpointer data); virtual bool writeRowQuery (Ypp::PoolQuery &query, int row, gpointer data); @@ -68,7 +71,7 @@ { YGtkPkgPKGroupModel(); virtual bool hasIconCol() { return true; } - virtual bool allAsFirstRow() { return true; } + virtual bool firstRowIsAll() { return true; } virtual bool begsUpdate() { return true; } virtual void updateRow (Ypp::List list, int row, gpointer data); virtual bool writeRowQuery (Ypp::PoolQuery &query, int row, gpointer data); @@ -79,7 +82,7 @@ YGtkPkgRepositoryModel(); virtual ~YGtkPkgRepositoryModel(); virtual bool hasIconCol() { return true; } - virtual bool allAsFirstRow() { return true; } + virtual bool firstRowIsAll() { return true; } virtual bool begsUpdate() { return true; } virtual void updateRow (Ypp::List list, int row, gpointer data); virtual bool writeRowQuery (Ypp::PoolQuery &query, int row, gpointer data); @@ -95,7 +98,7 @@ { YGtkPkgSupportModel(); virtual bool hasIconCol() { return false; } - virtual bool allAsFirstRow() { return true; } + virtual bool firstRowIsAll() { return true; } virtual bool begsUpdate() { return true; } virtual void updateRow (Ypp::List list, int row, gpointer data); virtual bool writeRowQuery (Ypp::PoolQuery &query, int row, gpointer data); @@ -105,12 +108,14 @@ { YGtkPkgPriorityModel(); virtual bool hasIconCol() { return false; } - virtual bool allAsFirstRow() { return true; } + virtual bool firstRowIsAll() { return true; } virtual bool begsUpdate() { return true; } virtual void updateRow (Ypp::List list, int row, gpointer data); virtual bool writeRowQuery (Ypp::PoolQuery &query, int row, gpointer data); }; +// widget + struct YGtkPkgFilterView : public YGtkPkgQueryWidget { YGtkPkgFilterView (YGtkPkgFilterModel *model); Modified: trunk/gtk/src/pkg/ygtkpkglanguageview.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/ygtkpkglanguageview.cc?rev=61143&r1=61142&r2=61143&view=diff ============================================================================== --- trunk/gtk/src/pkg/ygtkpkglanguageview.cc (original) +++ trunk/gtk/src/pkg/ygtkpkglanguageview.cc Thu Mar 4 01:07:44 2010 @@ -11,7 +11,7 @@ #include YGtkPkgLanguageView::YGtkPkgLanguageView() -: YGtkPkgListView (true) +: YGtkPkgListView (true, Ypp::List::NAME_SORT, false, true) { addCheckColumn (INSTALLED_CHECK_PROP); addTextColumn (NULL, NAME_SUMMARY_PROP, true, -1); Modified: trunk/gtk/src/pkg/ygtkpkglistview.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/ygtkpkglistview.cc?rev=61143&r1=61142&r2=61143&view=diff ============================================================================== --- trunk/gtk/src/pkg/ygtkpkglistview.cc (original) +++ trunk/gtk/src/pkg/ygtkpkglistview.cc Thu Mar 4 01:07:44 2010 @@ -259,10 +259,12 @@ int sort_attrb, ascendent : 2; bool userModified; std::list std::string m_keywords; + bool identAuto, colorModified; - Impl (bool descriptiveTooltip, int default_sort_attrb) : listener (NULL), list (0), - descriptiveTooltip (descriptiveTooltip), sort_attrb (default_sort_attrb), - ascendent (true), userModified (false) {} + Impl (bool descriptiveTooltip, int default_sort_attrb, bool identAuto, bool colorModified) + : listener (NULL), list (0), descriptiveTooltip (descriptiveTooltip), + sort_attrb (default_sort_attrb), ascendent (true), userModified (false), + identAuto (identAuto), colorModified (colorModified) {} void setList (Ypp::List _list, int _attrb, bool _ascendent, bool userSorted, const std::list std::string &keywords) { @@ -559,8 +561,8 @@ G_CALLBACK (column_clicked_cb), pThis); } -YGtkPkgListView::YGtkPkgListView (bool descriptiveTooltip, int default_sort) -: impl (new Impl (descriptiveTooltip, default_sort)) +YGtkPkgListView::YGtkPkgListView (bool descriptiveTooltip, int default_sort, bool identAuto, bool colorModified) +: impl (new Impl (descriptiveTooltip, default_sort, identAuto, colorModified)) { impl->scroll = gtk_scrolled_window_new (NULL, NULL); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (impl->scroll), @@ -625,7 +627,7 @@ gtk_tree_view_scroll_to_point (GTK_TREE_VIEW (impl->view), -1, 0); } -void YGtkPkgListView::addTextColumn (const char *header, int property, bool visible, int size, bool identAuto) +void YGtkPkgListView::addTextColumn (const char *header, int property, bool visible, int size) { GtkTreeView *view = GTK_TREE_VIEW (impl->view); if (header) @@ -647,8 +649,12 @@ g_object_set (G_OBJECT (renderer), "ellipsize", ellipsize, NULL); GtkTreeViewColumn *column = gtk_tree_view_column_new_with_attributes ( - header, renderer, "markup", property, "sensitive", IS_LOCKED_PROP, - "cell-background", BACKGROUND_PROP, NULL); + header, renderer, "markup", property, "sensitive", IS_LOCKED_PROP, NULL); + if (impl->colorModified) + gtk_tree_view_column_add_attribute (column, renderer, + "cell-background", BACKGROUND_PROP); + if (impl->identAuto && (property == NAME_PROP || property == NAME_SUMMARY_PROP)) + gtk_tree_view_column_add_attribute (column, renderer, "xpad", XPAD_PROP); if (property == VERSION_PROP) { gtk_tree_view_column_add_attribute (column, renderer, "button-visible", HAS_UPGRADE_PROP); @@ -661,8 +667,6 @@ if (size != -1) // on several columns gtk_tree_view_set_rules_hint (view, TRUE); - if (identAuto) - gtk_tree_view_column_add_attribute (column, renderer, "xpad", XPAD_PROP); gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_FIXED); gtk_tree_view_column_set_resizable (column, TRUE); if (size >= 0) @@ -679,8 +683,10 @@ GtkTreeView *view = GTK_TREE_VIEW (impl->view); GtkCellRenderer *renderer = gtk_cell_renderer_toggle_new(); GtkTreeViewColumn *column = gtk_tree_view_column_new_with_attributes (NULL, - renderer, "active", property, "sensitive", IS_LOCKED_PROP, - "cell-background", BACKGROUND_PROP, NULL); + renderer, "active", property, "sensitive", IS_LOCKED_PROP, NULL); + if (impl->colorModified) + gtk_tree_view_column_add_attribute (column, renderer, + "cell-background", BACKGROUND_PROP); g_signal_connect (G_OBJECT (renderer), "toggled", G_CALLBACK (check_toggled_cb), this); @@ -691,13 +697,33 @@ gtk_tree_view_append_column (view, column); } +void YGtkPkgListView::addImageColumn (const char *header, int property) +{ + GtkTreeView *view = GTK_TREE_VIEW (impl->view); + GtkCellRenderer *renderer = gtk_cell_renderer_pixbuf_new(); + GtkTreeViewColumn *column = gtk_tree_view_column_new_with_attributes ( + header, renderer, "icon-name", property, NULL); + if (impl->colorModified) + gtk_tree_view_column_add_attribute (column, renderer, + "cell-background", BACKGROUND_PROP); + + gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_FIXED); + int height = MAX (32, YGUtils::getCharsHeight (impl->view, 1)); + gtk_cell_renderer_set_fixed_size (renderer, -1, height); + gtk_tree_view_column_set_fixed_width (column, 38); + gtk_tree_view_append_column (view, column); +} + void YGtkPkgListView::addUndoButtonColumn (const char *header) { GtkCellRenderer *renderer = ygtk_cell_renderer_button_new(); GtkTreeViewColumn *column = gtk_tree_view_column_new_with_attributes ( header, renderer, "sensitive", IS_LOCKED_PROP, - "cell-background", BACKGROUND_PROP, "visible", TO_MODIFY_PROP, NULL); + if (impl->colorModified) + gtk_tree_view_column_add_attribute (column, renderer, + "cell-background", BACKGROUND_PROP); + const char *text = _("Undo"); g_object_set (G_OBJECT (renderer), "text", text, NULL); gboolean show_icon; @@ -726,20 +752,6 @@ gtk_tree_view_append_column (GTK_TREE_VIEW (impl->view), column); } -void YGtkPkgListView::addImageColumn (const char *header, int property) -{ - GtkTreeView *view = GTK_TREE_VIEW (impl->view); - GtkCellRenderer *renderer = gtk_cell_renderer_pixbuf_new(); - GtkTreeViewColumn *column = gtk_tree_view_column_new_with_attributes ( - header, renderer, "icon-name", property, "cell-background", BACKGROUND_PROP, NULL); - - gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_FIXED); - int height = MAX (32, YGUtils::getCharsHeight (impl->view, 1)); - gtk_cell_renderer_set_fixed_size (renderer, -1, height); - gtk_tree_view_column_set_fixed_width (column, 38); - gtk_tree_view_append_column (view, column); -} - void YGtkPkgListView::setListener (YGtkPkgListView::Listener *listener) { impl->listener = listener; } Modified: trunk/gtk/src/pkg/ygtkpkglistview.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/ygtkpkglistview.h?rev=61143&r1=61142&r2=61143&view=diff ============================================================================== --- trunk/gtk/src/pkg/ygtkpkglistview.h (original) +++ trunk/gtk/src/pkg/ygtkpkglistview.h Thu Mar 4 01:07:44 2010 @@ -17,7 +17,8 @@ }; struct YGtkPkgListView { - YGtkPkgListView (bool descriptiveTooltip, int default_sort = Ypp::List::NAME_SORT); // -1 to disable + YGtkPkgListView (bool descriptiveTooltip, int default_sort /* -1 to disable */, + bool identAuto, bool colorModified); ~YGtkPkgListView(); GtkWidget *getWidget(); @@ -28,10 +29,9 @@ void setHighlight (const std::list std::string &keywords); - void addTextColumn (const char *header, int property, bool visible, int size, bool identAuto = false); + void addTextColumn (const char *header, int property, bool visible, int size); void addCheckColumn (int checkProperty); void addImageColumn (const char *header, int property); - void addUndoButtonColumn (const char *header); struct Listener { Modified: trunk/gtk/src/pkg/ygtkpkgsearchentry.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/ygtkpkgsearchentry.cc?rev=61143&r1=61142&r2=61143&view=diff ============================================================================== --- trunk/gtk/src/pkg/ygtkpkgsearchentry.cc (original) +++ trunk/gtk/src/pkg/ygtkpkgsearchentry.cc Thu Mar 4 01:07:44 2010 @@ -206,8 +206,6 @@ g_free (_text); gtk_label_set_use_markup (GTK_LABEL (label), TRUE); gtk_misc_set_alignment (GTK_MISC (label), 0, .5); - YGUtils::setWidgetFont (label, - PANGO_STYLE_ITALIC, PANGO_WEIGHT_NORMAL, PANGO_SCALE_MEDIUM); g_signal_connect (G_OBJECT (label), "activate-link", G_CALLBACK (patterns_link_cb), this); GtkWidget *icon = gtk_image_new_from_stock ( @@ -222,8 +220,6 @@ GtkWidget *label = gtk_label_new ( _("Search by file name only reliable for installed packages.")); gtk_misc_set_alignment (GTK_MISC (label), 0, .5); - YGUtils::setWidgetFont (label, - PANGO_STYLE_ITALIC, PANGO_WEIGHT_NORMAL, PANGO_SCALE_MEDIUM); GtkWidget *icon = gtk_image_new_from_stock ( GTK_STOCK_DIALOG_WARNING, GTK_ICON_SIZE_BUTTON); GtkWidget *hbox = gtk_hbox_new (FALSE, 4); Modified: trunk/gtk/src/pkg/ygtkpkgundolist.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/ygtkpkgundolist.cc?rev=61143&r1=61142&r2=61143&view=diff ============================================================================== --- trunk/gtk/src/pkg/ygtkpkgundolist.cc (original) +++ trunk/gtk/src/pkg/ygtkpkgundolist.cc Thu Mar 4 01:07:44 2010 @@ -242,9 +242,9 @@ gtk_window_set_resizable (GTK_WINDOW (dialog), TRUE); gtk_window_set_default_size (GTK_WINDOW (dialog), 600, 500); - YGtkPkgListView view (true, -1); + YGtkPkgListView view (true, -1, true, false); view.addImageColumn (_("Action"), STATUS_ICON_PROP); - view.addTextColumn (_("Name"), NAME_SUMMARY_PROP, true, -1, true); + view.addTextColumn (_("Name"), NAME_SUMMARY_PROP, true, -1); view.addTextColumn (_("Version"), VERSION_PROP, true, 125); view.addUndoButtonColumn (_("Revert?")); view.setList (impl->changes); Modified: trunk/gtk/src/pkg/yzyppwrapper.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/gtk/src/pkg/yzyppwrapper.cc?rev=61143&r1=61142&r2=61143&view=diff ============================================================================== --- trunk/gtk/src/pkg/yzyppwrapper.cc (original) +++ trunk/gtk/src/pkg/yzyppwrapper.cc Thu Mar 4 01:07:44 2010 @@ -428,7 +428,7 @@ { switch (m_type) { case PACKAGE: - case PATCH: + //case PATCH: return true; default: break; } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org