-
-
Notifications
You must be signed in to change notification settings - Fork 39
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
- Loading branch information
Showing
37 changed files
with
56 additions
and
84 deletions.
There are no files selected for viewing
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -35,8 +35,6 @@ | |
#include "dialogs.h" | ||
#include "oregano.h" | ||
|
||
#include "pixmaps/logo.xpm" | ||
|
||
void oregano_error (gchar *msg) { oregano_error_with_title (msg, NULL); } | ||
|
||
void oregano_error_with_title (gchar *title, gchar *desc) | ||
|
@@ -117,7 +115,8 @@ void dialog_about (void) | |
|
||
const char *docs[] = {"Ricardo Markiewicz <[email protected]> (es)", | ||
"Jordi Mallach <[email protected]> (ca)", | ||
"Marc Lorber <[email protected]> (en)", NULL}; | ||
"Marc Lorber <[email protected]> (en)", | ||
"Bernhard Schuster <[email protected]> (de,en,sv)", NULL}; | ||
|
||
const gchar *copy = _ ("(c) 2012-2013 Bernhard Schuster\n" | ||
"(c) 2009-2012 Marc Lorber\n" | ||
|
@@ -130,7 +129,6 @@ void dialog_about (void) | |
return; | ||
} | ||
|
||
logo = gdk_pixbuf_new_from_xpm_data ((const char **)logo_xpm); | ||
about = gtk_about_dialog_new (); | ||
gtk_about_dialog_set_program_name (GTK_ABOUT_DIALOG (about), "Oregano"); | ||
gtk_about_dialog_set_version (GTK_ABOUT_DIALOG (about), VERSION); | ||
|
@@ -141,8 +139,10 @@ void dialog_about (void) | |
gtk_about_dialog_set_website (GTK_ABOUT_DIALOG (about), "https://ahoi.io/project/oregano"); | ||
gtk_about_dialog_set_authors (GTK_ABOUT_DIALOG (about), authors); | ||
gtk_about_dialog_set_documenters (GTK_ABOUT_DIALOG (about), docs); | ||
gtk_about_dialog_set_logo (GTK_ABOUT_DIALOG (about), logo); | ||
gtk_about_dialog_set_logo (GTK_ABOUT_DIALOG (about), oregano_get_icon("oregano-logo")); | ||
|
||
gtk_dialog_run (GTK_DIALOG (about)); | ||
|
||
gtk_widget_destroy (about); | ||
about = NULL; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,42 @@ | ||
#ifndef OREGANO_ICONS_H | ||
#define OREGANO_ICONS_H | ||
|
||
#include <gtk/gtk.h> | ||
|
||
|
||
void oregano_icon_theme_changed(GtkIconTheme *iconteme, gpointer user_data) | ||
{ | ||
|
||
} | ||
|
||
void oregano_icon_init() | ||
{ | ||
GtkIconTheme* icon_theme = gtk_icon_theme_get_default(); | ||
g_assert (icon_theme != NULL); | ||
gtk_icon_theme_append_search_path (icon_theme, OREGANO_ICONDIR); | ||
g_signal_connect (icon_theme, "changed", G_CALLBACK(oregano_icon_theme_changed), NULL); | ||
} | ||
|
||
|
||
GdkPixbuf * oregano_get_icon(const gchar *icon_name) | ||
{ | ||
GtkIconTheme* icon_theme = gtk_icon_theme_get_default(); | ||
g_assert (icon_theme != NULL); | ||
GError *e = NULL; | ||
|
||
GtkIconInfo *icon_info = gtk_icon_theme_lookup_icon (icon_theme, | ||
icon_name, | ||
64, | ||
0); | ||
g_assert (icon_info); | ||
|
||
GdkPixbuf* pixbuf = gtk_icon_info_load_icon (icon_info, &e); | ||
if (e) { | ||
g_message("Failed to get %s %s %i", icon_name, e->message, e->code); | ||
g_clear_error(&e); | ||
return NULL; | ||
} | ||
return pixbuf; | ||
} | ||
|
||
#endif |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters