From 21a47ec3b88a2212bf8ab2f474b95be9049264d6 Mon Sep 17 00:00:00 2001 From: Anna Schumaker Date: Thu, 18 Aug 2016 14:07:28 -0400 Subject: [PATCH] gui: Rename ocarina6.glade -> ocarina.ui The convention is for gtk builder files named with a ".ui" extension. Let's rename our file to match, and drop the 6 while we're at it. Signed-off-by: Anna Schumaker --- gui/ocarina.c | 2 +- share/ocarina/{ocarina6.glade => ocarina.ui} | 0 tests/gui/audio.c | 2 +- tests/gui/idle.c | 2 +- tests/gui/model.c | 2 +- tests/gui/playlist.c | 4 ++-- tests/gui/queue.c | 2 +- tests/gui/sidebar.c | 2 +- tests/gui/view.c | 2 +- tests/gui/window.c | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) rename share/ocarina/{ocarina6.glade => ocarina.ui} (100%) diff --git a/gui/ocarina.c b/gui/ocarina.c index 625a8be1..d38bce29 100644 --- a/gui/ocarina.c +++ b/gui/ocarina.c @@ -48,7 +48,7 @@ static void __ocarina_activate(GApplication *application, gpointer data) static void __ocarina_startup(GApplication *application, gpointer data) { - gchar *ui = find_file_path("ocarina6.glade"); + gchar *ui = find_file_path("ocarina.ui"); gchar *icon = find_file_path("ocarina.png"); gui_builder_init(ui); diff --git a/share/ocarina/ocarina6.glade b/share/ocarina/ocarina.ui similarity index 100% rename from share/ocarina/ocarina6.glade rename to share/ocarina/ocarina.ui diff --git a/tests/gui/audio.c b/tests/gui/audio.c index 54b1c218..044628e6 100644 --- a/tests/gui/audio.c +++ b/tests/gui/audio.c @@ -133,7 +133,7 @@ int main(int argc, char **argv) int ret; gtk_init(&argc, NULL); - gui_builder_init("share/ocarina/ocarina6.glade"); + gui_builder_init("share/ocarina/ocarina.ui"); gui_queue_model_init(); core_init(&argc, NULL, &init_data); playlist_new(PL_LIBRARY, "tests/Music/Hyrule Symphony"); diff --git a/tests/gui/idle.c b/tests/gui/idle.c index fc7db96a..f66b090f 100644 --- a/tests/gui/idle.c +++ b/tests/gui/idle.c @@ -65,7 +65,7 @@ int main(int argc, char **argv) gtk_init(&argc, NULL); core_init(&argc, NULL, &init_data); - gui_builder_init("share/ocarina/ocarina6.glade"); + gui_builder_init("share/ocarina/ocarina.ui"); gui_view_init(); while (idle_run_task()) {} diff --git a/tests/gui/model.c b/tests/gui/model.c index 65a2deea..5ae52acd 100644 --- a/tests/gui/model.c +++ b/tests/gui/model.c @@ -176,7 +176,7 @@ static void test_model() gtk_init(&argc, NULL); core_init(&argc, NULL, &init_data); - gui_builder_init("share/ocarina/ocarina6.glade"); + gui_builder_init("share/ocarina/ocarina.ui"); gui_queue_model_init(); while (idle_run_task() == true) {} diff --git a/tests/gui/playlist.c b/tests/gui/playlist.c index 98a1089d..436f8317 100644 --- a/tests/gui/playlist.c +++ b/tests/gui/playlist.c @@ -103,10 +103,10 @@ int main(int argc, char **argv) int ret; gtk_init(&argc, NULL); - gui_builder_init("share/ocarina/ocarina6.glade"); + gui_builder_init("share/ocarina/ocarina.ui"); + core_init(&argc, NULL, &init_data); gui_queue_model_init(); gui_view_init(); - core_init(&argc, NULL, &init_data); gui_playlist_init(); playlist_new(PL_LIBRARY, "tests/Music/Hyrule Symphony"); while (idle_run_task()) {} diff --git a/tests/gui/queue.c b/tests/gui/queue.c index 85246c83..99ee5b6d 100644 --- a/tests/gui/queue.c +++ b/tests/gui/queue.c @@ -137,7 +137,7 @@ int main(int argc, char **argv) int ret; gtk_init(&argc, NULL); - gui_builder_init("share/ocarina/ocarina6.glade"); + gui_builder_init("share/ocarina/ocarina.ui"); core_init(&argc, NULL, &init_data); gui_queue_model_init(); gui_view_init(); diff --git a/tests/gui/sidebar.c b/tests/gui/sidebar.c index 082a2bab..de49eb8a 100644 --- a/tests/gui/sidebar.c +++ b/tests/gui/sidebar.c @@ -28,7 +28,7 @@ int main(int argc, char **argv) gtk_init(&argc, NULL); settings_init(); - gui_builder_init("share/ocarina/ocarina6.glade"); + gui_builder_init("share/ocarina/ocarina.ui"); gui_sidebar_init(); g_test_init(&argc, &argv, NULL); diff --git a/tests/gui/view.c b/tests/gui/view.c index ce356e17..75f8ed9c 100644 --- a/tests/gui/view.c +++ b/tests/gui/view.c @@ -60,7 +60,7 @@ static void test_treeview() gtk_init(&argc, NULL); core_init(&argc, NULL, &init_data); - gui_builder_init("share/ocarina/ocarina6.glade"); + gui_builder_init("share/ocarina/ocarina.ui"); gui_queue_model_init(); gui_view_init(); while (idle_run_task() == true) {} diff --git a/tests/gui/window.c b/tests/gui/window.c index 628cc487..672b4f2e 100644 --- a/tests/gui/window.c +++ b/tests/gui/window.c @@ -48,7 +48,7 @@ int main(int argc, char **argv) gtk_init(&argc, NULL); settings_init(); - gui_builder_init("share/ocarina/ocarina6.glade"); + gui_builder_init("share/ocarina/ocarina.ui"); gui_view_init(); gui_window_init("share/ocarina/ocarina.png");