sharpetronics/glade
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glade.git synced 2025-09-08 00:02:20 -04:00
Code Issues Projects Releases Wiki Activity

Glade now installs theme friendly icons (GNOME Goal #2)

Browse Source 
2006-04-28  Vincent Geddes <vgeddes@metroweb.co.za>

	* Glade now installs theme friendly icons (GNOME Goal #2)

2006-04-30  Yevgen Muntyan <muntyan@tamu.edu>

	* src/glade-project-window.c: fixed bug 339855
	  (recent project ordering) and bug 339249.


2006-04-30  Tristan Van Berkom <tvb@gnome.org>

	* src/glade-editor.c: Beautified the editor (added alignments and
	  a gtk-clear icon for the reset button
This commit is contained in:
Vincent Geddes 2006-04-30 07:48:21 +00:00 committed by Tristan Van Berkom
parent 9a9a9fe0d1
commit 45bcece3b7
5 changed files with 77 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ChangeLog
View File

@ -1,3 +1,12 @@
2006-04-28 Vincent Geddes <vgeddes@metroweb.co.za>
* Glade now installs theme friendly icons (GNOME Goal #2)
2006-04-30 Yevgen Muntyan <muntyan@tamu.edu>
* src/glade-project-window.c: fixed bug 339855
(recent project ordering) and bug 339249.
2006-04-30 Tristan Van Berkom <tvb@gnome.org>
* configure.in, src/Makefile.am, src/glade-paths.sh.in:
@ -16,7 +25,10 @@
with the project view
o Added an option to completely hide the devhelp window (but it comes
back in full window if a devhelp button is pressed.
* src/glade-editor.c: Beautified the editor (added alignments and
a gtk-clear icon for the reset button
2006-04-28 Tristan Van Berkom <tvb@gnome.org>
* src/glade-editor.c:

14
Makefile.am
View File

@ -10,9 +10,21 @@ DESKTOP_FILES =$(DESKTOP_IN_FILES:.desktop.in=.desktop)
desktopdir = $(datadir)/applications
desktop_DATA = $(DESKTOP_FILES)
appicondir = $(datadir)/pixmaps
appicondir = $(datadir)/icons/hicolor/48x48/apps
appicon_DATA = glade-3.png
gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
install-data-hook:
@-if test -z "$(DESTDIR)"; then \
echo "Updating Gtk icon cache."; \
$(gtk_update_icon_cache); \
else \
echo "*** Icon cache not updated. After install, run this:"; \
echo "*** $(gtk_update_icon_cache)"; \
fi
EXTRA_DIST = \
glade-3.desktop.in \
glade-3.png \

55
src/glade-editor.c
View File

@ -258,7 +258,7 @@ glade_editor_on_docs_click (GtkButton *button,
static GtkWidget *
glade_editor_create_info_button (void)
{
GtkWidget *image, *button;
GtkWidget *image, *button, *align;
GtkWidget *hbox, *label;
gchar *path;
@ -268,18 +268,49 @@ glade_editor_create_info_button (void)
hbox = gtk_hbox_new (FALSE, 0);
label = gtk_label_new_with_mnemonic ("_Documentation");
image = gtk_image_new_from_file (path);
align = gtk_alignment_new (0.5, 0.5, 0, 0);
gtk_box_pack_start (GTK_BOX (hbox), image, TRUE, FALSE, 0);
gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 0);
gtk_widget_show_all (hbox);
gtk_container_add (GTK_CONTAINER (align), hbox);
gtk_container_add (GTK_CONTAINER (button), hbox);
gtk_widget_show_all (align);
gtk_container_add (GTK_CONTAINER (button), align);
g_free (path);
return button;
}
static GtkWidget *
glade_editor_create_reset_button (void)
{
GtkWidget *image, *button, *align;
GtkWidget *hbox, *label;
button = gtk_button_new ();
hbox = gtk_hbox_new (FALSE, 0);
align = gtk_alignment_new (0.5, 0.5, 0, 0);
label = gtk_label_new_with_mnemonic (_("_Reset..."));
image = gtk_image_new_from_stock ("gtk-clear", GTK_ICON_SIZE_BUTTON);
gtk_container_set_border_width (GTK_CONTAINER (button),
GLADE_GENERIC_BORDER_WIDTH);
gtk_box_pack_start (GTK_BOX (hbox), image, TRUE, FALSE, 0);
gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 0);
gtk_container_add (GTK_CONTAINER (align), hbox);
gtk_widget_show_all (align);
gtk_container_add (GTK_CONTAINER (button), align);
return button;
}
static void
glade_editor_init (GladeEditor *editor)
{
@ -319,16 +350,6 @@ glade_editor_init (GladeEditor *editor)
g_signal_connect (G_OBJECT (editor->launch_button), "clicked",
G_CALLBACK (glade_editor_on_launch_click), editor);
/* Reset button
*/
button = gtk_button_new_with_mnemonic (_("_Reset..."));
gtk_container_set_border_width (GTK_CONTAINER (button),
GLADE_GENERIC_BORDER_WIDTH);
gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, TRUE, 0);
g_signal_connect (G_OBJECT (button), "clicked",
G_CALLBACK (glade_editor_on_reset_click), editor);
/* Documentation button
*/
editor->info_button = glade_editor_create_info_button ();
@ -338,6 +359,14 @@ glade_editor_init (GladeEditor *editor)
g_signal_connect (G_OBJECT (editor->info_button), "clicked",
G_CALLBACK (glade_editor_on_docs_click), editor);
/* Reset button
*/
button = glade_editor_create_reset_button ();
gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, TRUE, 0);
g_signal_connect (G_OBJECT (button), "clicked",
G_CALLBACK (glade_editor_on_reset_click), editor);
gtk_widget_show_all (GTK_WIDGET (editor));
if (editor->show_info)
gtk_widget_show (editor->info_button);

17
src/glade-project-window.c
View File

@ -141,8 +141,9 @@ gpw_recent_project_add (GladeProjectWindow *gpw, const gchar *project_path)
guint merge_id;
/* Need to check if it's already loaded */
if (g_queue_find_custom(gpw->priv->recent_projects, project_path, gpw_rp_cmp))
return;
if ((action = g_queue_find_custom (gpw->priv->recent_projects,
project_path, gpw_rp_cmp)))
gpw_recent_project_delete (action, gpw);
label = glade_util_duplicate_underscores (project_path);
if (!label) return;
@ -590,9 +591,9 @@ gpw_save_as (GladeProjectWindow *gpw, const gchar *dialog_title)
if (!path)
return;
ch = strrchr (path, '/');
if (!strchr (ch, '.'))
ch = strrchr (path, '.');
if (!ch || strchr (ch, G_DIR_SEPARATOR))
real_path = g_strconcat (path, ".glade", NULL);
else
real_path = g_strdup (path);
@ -1316,6 +1317,7 @@ static void gpw_about_cb (GtkAction *action, GladeProjectWindow *gpw)
gtk_show_about_dialog (GTK_WINDOW (gpw->priv->window),
"name", PACKAGE_NAME,
"logo-icon-name", "glade-3",
"authors", authors,
"translator-credits", translators,
"comments", comments,
@ -1655,14 +1657,11 @@ glade_project_window_create (GladeProjectWindow *gpw)
GtkWidget *toolbar;
GtkWidget *project_view;
GtkWidget *statusbar;
gchar *filename;
app = gtk_window_new (GTK_WINDOW_TOPLEVEL);
gtk_window_move (GTK_WINDOW (app), 0, 0);
gtk_window_set_default_size (GTK_WINDOW (app), 300, 450);
filename = g_build_filename (glade_icon_dir, "glade-3.png", NULL);
gtk_window_set_default_icon_from_file (filename, NULL);
g_free (filename);
gpw->priv->window = app;
vbox = gtk_vbox_new (FALSE, 0);

1
src/main.c
View File

@ -117,6 +117,7 @@ main (int argc, char *argv[])
g_set_application_name (_("Glade-3 GUI Builder"));
gtk_window_set_default_icon_name ("glade-3");
glade_setup_log_handlers ();