GNOME.org
 

diary r64 - in trunk: . data data/icons/16x16 data/icons/22x22 data/icons/32x32 data/icons/48x48 po src

Author: pwithnall
Date: Tue Jul  8 19:36:13 2008
New Revision: 64
URL: http://svn.gnome.org/viewvc/diary?rev=64&view=rev

Log:
2008-07-08  Philip Withnall  <philip tecnocode co uk>

	* README:
	* configure.ac:
	* data/Makefile.am:
	* data/almanah.desktop.in:
	* data/almanah.ui:
	* data/diary.desktop.in:
	* data/diary.ui:
	* data/icons/16x16/Makefile.am:
	* data/icons/16x16/diary.svg:
	* data/icons/22x22/Makefile.am:
	* data/icons/22x22/diary.svg:
	* data/icons/32x32/Makefile.am:
	* data/icons/32x32/diary.svg:
	* data/icons/48x48/Makefile.am:
	* data/icons/48x48/diary.svg:
	* src/Makefile.am:
	* src/interface.c: (diary_create_interface):
	* src/main.c: (main): Changed the application name from "Diary" 
to
	"Almanah Diary", and the executable from "diary" to "almanah" to 
make
	it less generic. Some data files have moved around, orphaning 
the old
	ones, but the database is still in the same place and retains 
the old
	schema.
	* po/POTFILES.in: Updated to reflect new application name.
	* po/en_GB.po: Updated British English translation.



Added:
   trunk/data/almanah.desktop.in
      - copied, changed from r63, /trunk/data/diary.desktop.in
   trunk/data/almanah.ui
      - copied, changed from r63, /trunk/data/diary.ui
   trunk/data/icons/16x16/almanah.png
      - copied unchanged from r63, /trunk/data/icons/16x16/diary.png
   trunk/data/icons/16x16/almanah.svg
      - copied unchanged from r63, /trunk/data/icons/16x16/diary.svg
   trunk/data/icons/22x22/almanah.png
      - copied unchanged from r63, /trunk/data/icons/22x22/diary.png
   trunk/data/icons/22x22/almanah.svg
      - copied unchanged from r63, /trunk/data/icons/22x22/diary.svg
   trunk/data/icons/32x32/almanah.png
      - copied unchanged from r63, /trunk/data/icons/32x32/diary.png
   trunk/data/icons/32x32/almanah.svg
      - copied unchanged from r63, /trunk/data/icons/32x32/diary.svg
   trunk/data/icons/48x48/almanah.png
      - copied unchanged from r63, /trunk/data/icons/48x48/diary.png
   trunk/data/icons/48x48/almanah.svg
      - copied unchanged from r63, /trunk/data/icons/48x48/diary.svg
Removed:
   trunk/data/diary.desktop.in
   trunk/data/diary.ui
   trunk/data/icons/16x16/diary.png
   trunk/data/icons/16x16/diary.svg
   trunk/data/icons/22x22/diary.png
   trunk/data/icons/22x22/diary.svg
   trunk/data/icons/32x32/diary.png
   trunk/data/icons/32x32/diary.svg
   trunk/data/icons/48x48/diary.png
   trunk/data/icons/48x48/diary.svg
Modified:
   trunk/ChangeLog
   trunk/README
   trunk/configure.ac
   trunk/data/Makefile.am
   trunk/data/icons/16x16/Makefile.am
   trunk/data/icons/22x22/Makefile.am
   trunk/data/icons/32x32/Makefile.am
   trunk/data/icons/48x48/Makefile.am
   trunk/po/ChangeLog
   trunk/po/POTFILES.in
   trunk/po/en_GB.po
   trunk/src/Makefile.am
   trunk/src/interface.c
   trunk/src/main.c

Modified: trunk/README
==============================================================================
--- trunk/README	(original)
+++ trunk/README	Tue Jul  8 19:36:13 2008
@@ -1,7 +1,7 @@
-Diary
-=====
+Almanah
+=======
 
-Diary is a small GTK+ application to allow you to keep a diary of your life.
+Almanah is a small GTK+ application to allow you to keep a diary of your life.
 
 News
 ====
@@ -34,7 +34,7 @@
 http://bugzilla.gnome.org/enter_bug.cgi?product=diary
 
 To get a better debug output, run:
-# diary --debug
+# almanah --debug
 
 Contact
 =======

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Tue Jul  8 19:36:13 2008
@@ -1,4 +1,4 @@
-AC_INIT(diary, 0.3.1)
+AC_INIT(almanah, 0.3.1)
 
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
 AM_CONFIG_HEADER(config.h)
@@ -45,7 +45,7 @@
 dnl Internationalisation
 dnl ***************************************************************************
 
-GETTEXT_PACKAGE=diary
+GETTEXT_PACKAGE=almanah
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [GETTEXT package name])
 AM_GLIB_GNU_GETTEXT

Modified: trunk/data/Makefile.am
==============================================================================
--- trunk/data/Makefile.am	(original)
+++ trunk/data/Makefile.am	Tue Jul  8 19:36:13 2008
@@ -14,13 +14,13 @@
 	fi
 
 # UI file
-uidir = $(datadir)/diary
-ui_DATA = diary.ui
+uidir = $(datadir)/almanah
+ui_DATA = almanah.ui
 
 # Desktop file
 @INTLTOOL_DESKTOP_RULE@
 
-desktop_in_files = diary.desktop.in
+desktop_in_files = almanah.desktop.in
 desktopdir = $(datadir)/applications
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 

Copied: trunk/data/almanah.desktop.in (from r63, /trunk/data/diary.desktop.in)
==============================================================================
--- /trunk/data/diary.desktop.in	(original)
+++ trunk/data/almanah.desktop.in	Tue Jul  8 19:36:13 2008
@@ -1,7 +1,8 @@
 [Desktop Entry]
-_Name=Diary
+_Name=Almanah Diary
 _Comment=Keep a personal diary
-Exec=diary
+_GenericName=Diary
+Exec=almanah
 Icon=diary
 Terminal=false
 Type=Application

Copied: trunk/data/almanah.ui (from r63, /trunk/data/diary.ui)
==============================================================================
--- /trunk/data/diary.ui	(original)
+++ trunk/data/almanah.ui	Tue Jul  8 19:36:13 2008
@@ -146,7 +146,7 @@
 	</object>
 
 	<object class="GtkWindow" id="dry_main_window">
-		<property name="title" translatable="yes">Diary</property>
+		<property name="title" translatable="yes">Almanah Diary</property>
 		<signal name="delete-event" handler="mw_delete_event_cb"/>
 		<child>
 			<object class="GtkVBox" id="vbox1">

Modified: trunk/data/icons/16x16/Makefile.am
==============================================================================
--- trunk/data/icons/16x16/Makefile.am	(original)
+++ trunk/data/icons/16x16/Makefile.am	Tue Jul  8 19:36:13 2008
@@ -1,4 +1,4 @@
 icondir = $(datadir)/icons/hicolor/16x16/apps
-icon_DATA = diary.png
+icon_DATA = almanah.png
 
 EXTRA_DIST = $(icon_DATA)

Modified: trunk/data/icons/22x22/Makefile.am
==============================================================================
--- trunk/data/icons/22x22/Makefile.am	(original)
+++ trunk/data/icons/22x22/Makefile.am	Tue Jul  8 19:36:13 2008
@@ -1,4 +1,4 @@
 icondir = $(datadir)/icons/hicolor/22x22/apps
-icon_DATA = diary.png
+icon_DATA = almanah.png
 
 EXTRA_DIST = $(icon_DATA)

Modified: trunk/data/icons/32x32/Makefile.am
==============================================================================
--- trunk/data/icons/32x32/Makefile.am	(original)
+++ trunk/data/icons/32x32/Makefile.am	Tue Jul  8 19:36:13 2008
@@ -1,4 +1,4 @@
 icondir = $(datadir)/icons/hicolor/32x32/apps
-icon_DATA = diary.png
+icon_DATA = almanah.png
 
 EXTRA_DIST = $(icon_DATA)

Modified: trunk/data/icons/48x48/Makefile.am
==============================================================================
--- trunk/data/icons/48x48/Makefile.am	(original)
+++ trunk/data/icons/48x48/Makefile.am	Tue Jul  8 19:36:13 2008
@@ -1,4 +1,4 @@
 icondir = $(datadir)/icons/hicolor/48x48/apps
-icon_DATA = diary.png
+icon_DATA = almanah.png
 
 EXTRA_DIST = $(icon_DATA)

Modified: trunk/po/POTFILES.in
==============================================================================
--- trunk/po/POTFILES.in	(original)
+++ trunk/po/POTFILES.in	Tue Jul  8 19:36:13 2008
@@ -1,7 +1,7 @@
 # List of source files containing translatable strings.
 [encoding: UTF-8]
-data/diary.desktop.in
-[type: gettext/glade]data/diary.ui
+data/almanah.desktop.in
+[type: gettext/glade]data/almanah.ui
 src/interface.c
 src/link.c
 src/links/file.c

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Tue Jul  8 19:36:13 2008
@@ -15,9 +15,9 @@
 	-ftest-coverage
 endif
 
-bin_PROGRAMS = diary
+bin_PROGRAMS = almanah
 
-diary_SOURCES = \
+almanah_SOURCES = \
 	main.c			\
 	main.h			\
 	interface.c		\
@@ -38,7 +38,7 @@
 	links/file.c		\
 	links/note.c
 
-diary_LDFLAGS = 
-diary_LDADD = \
+almanah_LDFLAGS = 
+almanah_LDADD = \
 	$(STANDARD_LIBS)	\
 	$(ENCRYPTION_LIBS)

Modified: trunk/src/interface.c
==============================================================================
--- trunk/src/interface.c	(original)
+++ trunk/src/interface.c	Tue Jul  8 19:36:13 2008
@@ -35,14 +35,14 @@
 
 	builder = gtk_builder_new ();
 
-	if (gtk_builder_add_from_file (builder, PACKAGE_DATA_DIR"/diary/diary.ui", &error) == FALSE &&
-	    gtk_builder_add_from_file (builder, "./data/diary.ui", NULL) == FALSE) {
+	if (gtk_builder_add_from_file (builder, PACKAGE_DATA_DIR"/almanah/almanah.ui", &error) == FALSE &&
+	    gtk_builder_add_from_file (builder, "./data/almanah.ui", NULL) == FALSE) {
 		/* Show an error */
 		GtkWidget *dialog = gtk_message_dialog_new (NULL,
 				GTK_DIALOG_MODAL,
 				GTK_MESSAGE_ERROR,
 				GTK_BUTTONS_OK,
-				_("UI file \"%s/diary/diary.ui\" could not be loaded."), PACKAGE_DATA_DIR);
+				_("UI file \"%s/almanah/almanah.ui\" could not be loaded."), PACKAGE_DATA_DIR);
 		gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), error->message);
 		gtk_dialog_run (GTK_DIALOG (dialog));
 		gtk_widget_destroy (dialog);

Modified: trunk/src/main.c
==============================================================================
--- trunk/src/main.c	(original)
+++ trunk/src/main.c	Tue Jul  8 19:36:13 2008
@@ -79,8 +79,8 @@
 
 	gtk_set_locale ();
 	gtk_init (&argc, &argv);
-	g_set_application_name (_("Diary"));
-	gtk_window_set_default_icon_name ("diary");
+	g_set_application_name (_("Almanah Diary"));
+	gtk_window_set_default_icon_name ("almanah");
 
 	/* Options */
 	context = g_option_context_new (_("- Manage your diary"));
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]