[atomix: 9/9] Merge branch 'wip/gtk3-port'
- From: Robert Roth <robertroth src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [atomix: 9/9] Merge branch 'wip/gtk3-port'
- Date: Sat, 26 Dec 2015 02:23:26 +0000 (UTC)
commit 4a822e38d510f88783b328d332a9ebb69e6a8e36
Merge: f0890f6 a5f6c95
Author: Robert Roth <robert roth off gmail com>
Date: Sat Dec 26 04:23:02 2015 +0200
Merge branch 'wip/gtk3-port'
data/Makefile.am | 4 +-
data/atomix-icon.png | Bin 4295 -> 0 bytes
data/atomix.desktop.in | 2 +-
data/atomix.svg | 168 ++++++++++++++++++++++++++++++++++++++++++++++
data/ui/interface.ui | 1 +
src/Makefile.am | 1 +
src/atomix-application.h | 62 +++++++++++++++++
src/main.c | 67 ++++++++----------
src/main.h | 38 +----------
9 files changed, 265 insertions(+), 78 deletions(-)
---
diff --cc data/atomix.desktop.in
index 3511f4e,afc6e87..fa4204d
--- a/data/atomix.desktop.in
+++ b/data/atomix.desktop.in
@@@ -1,9 -1,8 +1,9 @@@
[Desktop Entry]
_Name=Atomix
-_Comment=Molecule puzzle game
+_GenericName=Molecule puzzle game
+_Comment=A puzzle game about atoms and molecules
Exec=atomix
- Icon=atomix-icon
+ Icon=atomix
Terminal=false
Type=Application
Categories=GNOME;GTK;Game;LogicGame;
diff --cc src/main.c
index 5b90401,b788de6..4c98a64
--- a/src/main.c
+++ b/src/main.c
@@@ -123,15 -125,18 +123,17 @@@ static void verb_HelpAbout_cb (GtkMenuI
NULL
};
- dlg = gtk_about_dialog_new ();
- g_signal_connect (dlg, "response", G_CALLBACK (gtk_widget_destroy), NULL);
- gtk_about_dialog_set_program_name (GTK_ABOUT_DIALOG(dlg), _("Atomix"));
- gtk_about_dialog_set_logo_icon_name (GTK_ABOUT_DIALOG(dlg), "atomix");
- gtk_about_dialog_set_version (GTK_ABOUT_DIALOG(dlg), VERSION);
- gtk_about_dialog_set_comments (GTK_ABOUT_DIALOG(dlg), _("A puzzle game about atoms and molecules"));
- gtk_about_dialog_set_website (GTK_ABOUT_DIALOG(dlg), "http://wiki.gnome.org/Apps/Atomix");
- gtk_about_dialog_set_authors (GTK_ABOUT_DIALOG(dlg), authors);
- gtk_about_dialog_set_artists (GTK_ABOUT_DIALOG(dlg), artists);
- gtk_about_dialog_set_translator_credits (GTK_ABOUT_DIALOG(dlg), _("translator-credits"));
- gtk_window_set_transient_for (GTK_WINDOW (dlg), GTK_WINDOW (app->mainwin));
- gtk_widget_show (dlg);
++
+ gtk_show_about_dialog(GTK_WINDOW(app->mainwin),
+ "program-name", _("Atomix"),
++ "logo-icon-name", "atomix",
+ "version", VERSION,
+ "comments", _("A puzzle game about atoms and molecules"),
+ "website", "https://github.com/GNOME/atomix",
+ "authors", authors,
+ "artists", artists,
+ "translator_credits", _("translator-credits"),
+ NULL);
}
static gboolean on_app_destroy_event (GtkWidget *widget, GdkEvent *event,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]