Fix about dialog again. Update readme with more complete deps

This commit is contained in:
Cassowary 2023-12-07 13:07:58 -08:00
parent d472f6348d
commit 63b2780499
4 changed files with 3 additions and 50 deletions

2
README
View File

@ -45,7 +45,7 @@ libgexiv2-dev libglib2.0-dev libgs-dev libgtk-3-dev libgudev-1.0-dev libharfbuzz
libjson-glib-dev liblcms2-dev libmng-dev libmypaint-dev libopenexr-dev libopenjp2-7-dev libpango1.0-dev libpng-dev libjson-glib-dev liblcms2-dev libmng-dev libmypaint-dev libopenexr-dev libopenjp2-7-dev libpango1.0-dev libpng-dev
libpoppler-dev libpoppler-glib-dev librsvg2-dev libtiff-dev libunwind-dev libwebp-dev libwmf-dev libx11-dev libpoppler-dev libpoppler-glib-dev librsvg2-dev libtiff-dev libunwind-dev libwebp-dev libwmf-dev libx11-dev
libxcursor-dev libxext-dev libxfixes-dev libxmu-dev libxpm-dev libzstd-dev luajit meson mypaint-brushes ninja-build libxcursor-dev libxext-dev libxfixes-dev libxmu-dev libxpm-dev libzstd-dev luajit meson mypaint-brushes ninja-build
pappler-data python3-gi-dev xmllint xsltproc poppler-data python3-gi libxml2-utils xsltproc gobject-introspection libgirepository1.0-dev libbz2-dev gettext
Seems like a lot! But many of these are for format support. This is for the maximal setup we've tested. Seems like a lot! But many of these are for format support. This is for the maximal setup we've tested.

View File

@ -40,20 +40,12 @@
#include "git-version.h" #include "git-version.h"
#include "about-dialog.h" #include "about-dialog.h"
#include "authors.h"
#include "pika-update.h" #include "pika-update.h"
#include "pika-version.h" #include "pika-version.h"
#include "pika-intl.h" #include "pika-intl.h"
/* The first authors are the creators and maintainers, don't shuffle
* them
*/
#define START_INDEX (G_N_ELEMENTS (creators) - 1 /*NULL*/ + \
G_N_ELEMENTS (maintainers) - 1 /*NULL*/)
typedef struct typedef struct
{ {
GtkWidget *dialog; GtkWidget *dialog;
@ -66,9 +58,6 @@ typedef struct
GtkWidget *anim_area; GtkWidget *anim_area;
PangoLayout *layout; PangoLayout *layout;
gint n_authors;
gint shuffle[G_N_ELEMENTS (authors) - 1]; /* NULL terminated */
guint timer; guint timer;
gint index; gint index;
@ -122,7 +111,6 @@ about_dialog_create (Pika *pika,
gchar *version; gchar *version;
dialog.pika = pika; dialog.pika = pika;
dialog.n_authors = G_N_ELEMENTS (authors) - 1;
dialog.config = config; dialog.config = config;
pixbuf = about_dialog_load_logo (); pixbuf = about_dialog_load_logo ();
@ -151,12 +139,6 @@ about_dialog_create (Pika *pika,
"logo", pixbuf, "logo", pixbuf,
"website", "https://heckin.technology/AlderconeStudio/PIKApp/", "website", "https://heckin.technology/AlderconeStudio/PIKApp/",
"website-label", _("Visit the PIKA website"), "website-label", _("Visit the PIKA website"),
"authors", authors,
"artists", artists,
"documenters", documenters,
/* Translators: insert your names here,
separated by newline */
"translator-credits", _("translator-credits"),
NULL); NULL);
if (pixbuf) if (pixbuf)
@ -490,27 +472,6 @@ about_dialog_add_update (PikaAboutDialog *dialog,
static void static void
about_dialog_reshuffle (PikaAboutDialog *dialog) about_dialog_reshuffle (PikaAboutDialog *dialog)
{ {
GRand *gr = g_rand_new ();
gint i;
for (i = 0; i < dialog->n_authors; i++)
dialog->shuffle[i] = i;
for (i = START_INDEX; i < dialog->n_authors; i++)
{
gint j = g_rand_int_range (gr, START_INDEX, dialog->n_authors);
if (i != j)
{
gint t;
t = dialog->shuffle[j];
dialog->shuffle[j] = dialog->shuffle[i];
dialog->shuffle[i] = t;
}
}
g_rand_free (gr);
} }
static gboolean static gboolean
@ -691,14 +652,6 @@ about_dialog_timer (gpointer data)
dialog->state += 1; dialog->state += 1;
break; break;
case 2:
if (! (dialog->index < dialog->n_authors))
dialog->index = 0;
text = insert_spacers (authors[dialog->shuffle[dialog->index]]);
dialog->index += 1;
break;
default: default:
g_return_val_if_reached (TRUE); g_return_val_if_reached (TRUE);
break; break;

View File

@ -5101,7 +5101,7 @@ register_image_procs (PikaPDB *pdb)
"pika-image-get-imported-file"); "pika-image-get-imported-file");
pika_procedure_set_static_help (procedure, pika_procedure_set_static_help (procedure,
"Returns the imported file for the specified image.", "Returns the imported file for the specified image.",
"This procedure returns the file associated with the specified image if the image was imported from a non-native Pika format. If the image was not imported, or has since been saved in the native Pika format, this procedure returns %NULL.", "This procedure returns the file associated with the specified image if the image was imported from a non-native Pika format. If the image was not imported, or has since been saved in the native Gimp format, this procedure returns %NULL.",
NULL); NULL);
pika_procedure_set_static_attribution (procedure, pika_procedure_set_static_attribution (procedure,
"Eric Grivel <pika@lumenssolutions.com>", "Eric Grivel <pika@lumenssolutions.com>",

View File

@ -47,7 +47,6 @@
#include <libpika/pikafont_pdb.h> #include <libpika/pikafont_pdb.h>
#include <libpika/pikafonts_pdb.h> #include <libpika/pikafonts_pdb.h>
#include <libpika/pikafontselect_pdb.h> #include <libpika/pikafontselect_pdb.h>
#include <libpika/pikapikarc_pdb.h>
#include <libpika/pikagradient_pdb.h> #include <libpika/pikagradient_pdb.h>
#include <libpika/pikagradients_pdb.h> #include <libpika/pikagradients_pdb.h>
#include <libpika/pikagradientselect_pdb.h> #include <libpika/pikagradientselect_pdb.h>
@ -72,6 +71,7 @@
#include <libpika/pikapattern_pdb.h> #include <libpika/pikapattern_pdb.h>
#include <libpika/pikapatterns_pdb.h> #include <libpika/pikapatterns_pdb.h>
#include <libpika/pikapatternselect_pdb.h> #include <libpika/pikapatternselect_pdb.h>
#include <libpika/pikapikarc_pdb.h>
#include <libpika/pikaprogress_pdb.h> #include <libpika/pikaprogress_pdb.h>
#include <libpika/pikaresource_pdb.h> #include <libpika/pikaresource_pdb.h>
#include <libpika/pikaselection_pdb.h> #include <libpika/pikaselection_pdb.h>