anna
/
ocarina
1
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity

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 <Anna@NoWheyCreamery.com>
This commit is contained in:
Anna Schumaker 2016-08-18 14:07:28 -04:00
parent b39c4c9ba4
commit 21a47ec3b8
10 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gui/ocarina.c
View File

@ -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);

0
share/ocarina/ocarina6.glade → share/ocarina/ocarina.ui
View File

2
tests/gui/audio.c
View File

@ -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");

2
tests/gui/idle.c
View File

@ -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()) {}

2
tests/gui/model.c
View File

@ -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) {}

4
tests/gui/playlist.c
View File

@ -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()) {}

2
tests/gui/queue.c
View File

@ -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();

2
tests/gui/sidebar.c
View File

@ -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);

2
tests/gui/view.c
View File

@ -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) {}

2
tests/gui/window.c
View File

@ -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");