Skip to content

gtk: load status icons as pixbufs again #273

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mvo5 merged 1 commit into from
Sep 1, 2026
Merged

gtk: load status icons as pixbufs again #273

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 5 additions & 7 deletions gtk/gtkpkglist.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,8 +229,8 @@ static void gtk_pkg_list_init(GtkPkgList *pkg_list)
{
// cout << "list_init()" << endl;
pkg_list->n_columns = N_COLUMNS;
pkg_list->column_headers[0] = G_TYPE_STRING;
pkg_list->column_headers[1] = G_TYPE_STRING;
pkg_list->column_headers[0] = GDK_TYPE_PIXBUF;
pkg_list->column_headers[1] = GDK_TYPE_PIXBUF;
pkg_list->column_headers[2] = G_TYPE_STRING;
pkg_list->column_headers[3] = G_TYPE_STRING;
pkg_list->column_headers[4] = G_TYPE_STRING;
Expand Down Expand Up @@ -461,14 +461,12 @@ static void gtk_pkg_list_get_value(GtkTreeModel *tree_model,
case SUPPORTED_COLUMN: {
if (pkg == NULL)
return;
const char *icon_name =
RGPackageStatus::pkgStatus.getSupportedIconName(pkg);
g_value_set_string(value, icon_name);
g_value_set_object(value,
RGPackageStatus::pkgStatus.getSupportedPix(pkg));
break;
}
case PIXMAP_COLUMN: {
const char *icon_name = RGPackageStatus::pkgStatus.getIconName(pkg);
g_value_set_string(value, icon_name);
g_value_set_object(value, RGPackageStatus::pkgStatus.getPixbuf(pkg));
break;
}
}
Expand Down
4 changes: 2 additions & 2 deletions gtk/rggtkbuilderwindow.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,14 +203,14 @@ bool RGGtkBuilderWindow::setTextView(const char *widget_name,
return true;
}

bool RGGtkBuilderWindow::setPixmap(const char *widget_name, const char *value)
bool RGGtkBuilderWindow::setPixmap(const char *widget_name, GdkPixbuf *value)
{
GtkWidget *pix = GTK_WIDGET(gtk_builder_get_object(_builder, widget_name));
if (pix == NULL) {
cout << "textview == NULL with: " << widget_name << endl;
return false;
}
gtk_image_set_from_icon_name(GTK_IMAGE(pix), value, GTK_ICON_SIZE_BUTTON);
gtk_image_set_from_pixbuf(GTK_IMAGE(pix), value);

return true;
}
Expand Down
2 changes: 1 addition & 1 deletion gtk/rggtkbuilderwindow.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ class RGGtkBuilderWindow : public RGWindow
bool setTextView(const char *widget_name,
const char *value,
bool useHeadline = false);
bool setPixmap(const char *widget_name, const char *value);
bool setPixmap(const char *widget_name, GdkPixbuf *value);
bool setTreeList(const char *widget_name,
std::vector<std::string> values,
bool useMarkup = false);
Expand Down
5 changes: 2 additions & 3 deletions gtk/rgiconlegend.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,7 @@ RGIconLegendPanel::RGIconLegendPanel(RGWindow *parent)
for (int i = 0; i < RGPackageStatus::N_STATUS_COUNT; i++) {
hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 12);

pix = gtk_image_new_from_icon_name(
RGPackageStatus::pkgStatus.getIconName(i), GTK_ICON_SIZE_BUTTON);
pix = gtk_image_new_from_pixbuf(RGPackageStatus::pkgStatus.getPixbuf(i));
gtk_box_pack_start(GTK_BOX(hbox), pix, FALSE, FALSE, 0);

label = gtk_label_new(RGPackageStatus::pkgStatus.getLongStatusString(i));
Expand All @@ -76,7 +75,7 @@ RGIconLegendPanel::RGIconLegendPanel(RGWindow *parent)
// package support status
hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 12);
pix =
gtk_image_new_from_icon_name("package-supported", GTK_ICON_SIZE_BUTTON);
gtk_image_new_from_pixbuf(RGPackageStatus::pkgStatus.getSupportedPix());
gtk_box_pack_start(GTK_BOX(hbox), pix, FALSE, FALSE, 0);
label = gtk_label_new(
_config->Find("Synaptic::supported-text", _("Package is supported"))
Expand Down
38 changes: 31 additions & 7 deletions gtk/rgpackagestatus.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,32 @@ void RGPackageStatus::initColorsAndIcons()
&StatusColors[i]);
g_free(config_string);

StatusIcons[i] = std::string("package-") + PackageStatusShortString[i];
gchar *icon_name =
g_strdup_printf("package-%s", PackageStatusShortString[i]);
StatusPixbuf[i] = loadStatusIcon(icon_name);
g_free(icon_name);
}
supportedPix = loadStatusIcon("package-supported");
}

// Exact-name lookup only: GTK's GENERIC_FALLBACK (always used by
// icon-name renderers) tries every theme in the chain with the fallback
// names too, so a theme shipping a generic "package" icon (e.g. Tango)
// would shadow the "package-*" icons.
GdkPixbuf *RGPackageStatus::loadStatusIcon(const char *icon_name)
{
const int statusPixbufSize = 16;
GError *error = NULL;
GdkPixbuf *pix = gtk_icon_theme_load_icon(gtk_icon_theme_get_default(),
icon_name,
statusPixbufSize,
GTK_ICON_LOOKUP_FORCE_SIZE,
&error);
if (pix == NULL) {
g_warning("failed to load icon %s: %s", icon_name, error->message);
g_error_free(error);
}
return pix;
}

// class that finds out what do display to get user
Expand All @@ -82,23 +106,23 @@ GdkRGBA *RGPackageStatus::getBgColor(RPackage *pkg)
return StatusColors[getStatus(pkg)];
}

const char *RGPackageStatus::getSupportedIconName(RPackage *pkg)
GdkPixbuf *RGPackageStatus::getSupportedPix(RPackage *pkg)
{
if (isSupported(pkg))
return "package-supported";
return supportedPix;
else
return NULL;
}

const char *RGPackageStatus::getIconName(RPackage *pkg)
GdkPixbuf *RGPackageStatus::getPixbuf(RPackage *pkg)
{
return getIconName(getStatus(pkg));
return getPixbuf(getStatus(pkg));
}

const char *RGPackageStatus::getIconName(int i)
GdkPixbuf *RGPackageStatus::getPixbuf(int i)
{
assert(0 <= i && i < N_STATUS_COUNT);
return StatusIcons[i].c_str();
return StatusPixbuf[i];
}

void RGPackageStatus::setColor(int i, GdkRGBA *new_color)
Expand Down
14 changes: 10 additions & 4 deletions gtk/rgpackagestatus.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,11 @@ class RGPackageStatus : public RPackageStatus
{
protected:
GdkRGBA *StatusColors[N_STATUS_COUNT];
std::string StatusIcons[N_STATUS_COUNT];
GdkPixbuf *StatusPixbuf[N_STATUS_COUNT];
GdkPixbuf *supportedPix;

void initColorsAndIcons();
static GdkPixbuf *loadStatusIcon(const char *icon_name);

public:
// this static object is used for all access
Expand All @@ -46,9 +48,13 @@ class RGPackageStatus : public RPackageStatus

// this is what the package listers use
GdkRGBA *getBgColor(RPackage *pkg);
const char *getSupportedIconName(RPackage *pkg);
const char *getIconName(RPackage *pkg);
const char *getIconName(int i);
GdkPixbuf *getSupportedPix(RPackage *pkg);
GdkPixbuf *getSupportedPix()
{
return supportedPix;
}
GdkPixbuf *getPixbuf(RPackage *pkg);
GdkPixbuf *getPixbuf(int i);

// this is for the configuration of the colors
void setColor(int i, GdkRGBA *new_color);
Expand Down
9 changes: 4 additions & 5 deletions gtk/rgpkgdetails.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ void RGPkgDetailsWindow::fillInValues(RGGtkBuilderWindow *me,
me->setLabel("label_maintainer", pkg->maintainer());
}

me->setPixmap("image_state", RGPackageStatus::pkgStatus.getIconName(pkg));
me->setPixmap("image_state", RGPackageStatus::pkgStatus.getPixbuf(pkg));
me->setLabel("label_state",
RGPackageStatus::pkgStatus.getLongStatusString(pkg));
me->setLabel("label_priority", pkg->priority());
Expand Down Expand Up @@ -309,13 +309,12 @@ void RGPkgDetailsWindow::fillInValues(RGGtkBuilderWindow *me,
gtk_text_buffer_get_start_iter(buf, &start);
gtk_text_buffer_apply_tag_by_name(buf, "bold", &start, &it);
// set emblems
const char *icon_name = RGPackageStatus::pkgStatus.getSupportedIconName(pkg);
if (icon_name != NULL) {
GdkPixbuf *supported = RGPackageStatus::pkgStatus.getSupportedPix(pkg);
if (supported != NULL) {
// insert space
gtk_text_buffer_insert(buf, &it, " ", 1);
// make image
emblem = gtk_image_new_from_icon_name(icon_name, GTK_ICON_SIZE_BUTTON);
gtk_image_set_pixel_size(GTK_IMAGE(emblem), 16);
emblem = gtk_image_new_from_pixbuf(supported);
// set eventbox and tooltip
GtkWidget *event = gtk_event_box_new();
gtk_container_add(GTK_CONTAINER(event), emblem);
Expand Down
4 changes: 2 additions & 2 deletions gtk/rgpkgtreeview.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ void setupTreeView(GtkWidget *treeview)
renderer = gtk_cell_renderer_pixbuf_new();
// TRANSLATORS: Column header for the column "Status" in the package list
column = gtk_tree_view_column_new_with_attributes(
_("S"), renderer, "icon-name", PIXMAP_COLUMN, NULL);
_("S"), renderer, "pixbuf", PIXMAP_COLUMN, NULL);
gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_FIXED);
gtk_tree_view_column_set_fixed_width(column, 20);
// gtk_tree_view_insert_column(GTK_TREE_VIEW(treeview), column, pos);
Expand All @@ -67,7 +67,7 @@ void setupTreeView(GtkWidget *treeview)
if (visible) {
renderer = gtk_cell_renderer_pixbuf_new();
column = gtk_tree_view_column_new_with_attributes(
" ", renderer, "icon-name", SUPPORTED_COLUMN, NULL);
" ", renderer, "pixbuf", SUPPORTED_COLUMN, NULL);
gtk_tree_view_column_set_sizing(column, GTK_TREE_VIEW_COLUMN_FIXED);
gtk_tree_view_column_set_fixed_width(column, 20);
// gtk_tree_view_insert_column(GTK_TREE_VIEW(treeview), column, pos);
Expand Down