Skip to content

Commit 70d8325

Browse files
noverbynoverby
committed
midiogre: fix resource loading
1 parent 7d5e214 commit 70d8325

File tree

6 files changed

+20
-41
lines changed

6 files changed

+20
-41
lines changed

‎res/ui/songbox.ui

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
<property name="visible">True</property>
7272
<property name="can_focus">False</property>
7373
<property name="pixel_size">32</property>
74-
<property name="resource">/org/prozum/midiogre/media-playback-start-symbolic.symbolic.png</property>
74+
<property name="resource">/org/prozum/midiogre/icons/media-playback-start-symbolic.symbolic.png</property>
7575
</object>
7676
</child>
7777
</object>
@@ -92,7 +92,7 @@
9292
<property name="visible">True</property>
9393
<property name="can_focus">False</property>
9494
<property name="pixel_size">32</property>
95-
<property name="resource">/org/prozum/midiogre/edit-delete-symbolic.symbolic.png</property>
95+
<property name="resource">/org/prozum/midiogre/icons/edit-delete-symbolic.symbolic.png</property>
9696
</object>
9797
</child>
9898
</object>
@@ -113,7 +113,7 @@
113113
<property name="visible">True</property>
114114
<property name="can_focus">False</property>
115115
<property name="pixel_size">32</property>
116-
<property name="resource">/org/prozum/midiogre/star-new-symbolic.symbolic.png</property>
116+
<property name="resource">/org/prozum/midiogre/icons/star-new-symbolic.symbolic.png</property>
117117
</object>
118118
</child>
119119
</object>

‎src/lib/list/list.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/** @list.h contains functions used to manipulate lists */
1+
/** @file list.h contains functions used to manipulate lists */
22

33
#ifndef _LIST_H_
44
#define _LIST_H_

‎src/meson.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ subdir('lib')
22

33
if main_enabled
44
midiogre_res = gnome.compile_resources('midiogre-res', 'midiogre.gresource.xml',
5-
source_dir: '..')
5+
source_dir: join_paths(meson.source_root(), 'res'))
66
midiogre_exe = executable('midiogre',
77
'midiogre-main.c', 'midiogre-app.c', 'midiogre-import.c',
88
'midiogre-song.c', 'midiogre-search.c', midiogre_res,

‎src/midiogre-app.c

Lines changed: 2 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,9 @@ MidiogreApp *midiogre_app_init(void)
4343
gtk_header_bar_set_title (GTK_HEADER_BAR(header), "Midiogre");
4444
gtk_window_set_titlebar(app->window, header);
4545

46-
#if GTK_MINOR_VERSION >= 12
4746
/* Setup close button */
4847
button = gtk_button_new();
49-
gtk_container_add (GTK_CONTAINER(button), gtk_image_new_from_resource("/org/prozum/midiogre/window-close-symbolic.symbolic.png"));
48+
gtk_container_add (GTK_CONTAINER(button), gtk_image_new_from_resource("/org/prozum/midiogre/icons/window-close-symbolic.symbolic.png"));
5049
gtk_header_bar_pack_end(GTK_HEADER_BAR(header), button);
5150
g_signal_connect_swapped(button, "clicked", G_CALLBACK(gtk_main_quit), app->window);
5251

@@ -58,28 +57,9 @@ MidiogreApp *midiogre_app_init(void)
5857

5958
/* Setup folder button */
6059
button = gtk_button_new();
61-
gtk_container_add (GTK_CONTAINER(button), gtk_image_new_from_resource("/org/prozum/midiogre/document-open-symbolic.symbolic.png"));
60+
gtk_container_add (GTK_CONTAINER(button), gtk_image_new_from_resource("/org/prozum/midiogre/icons/document-open-symbolic.symbolic.png"));
6261
gtk_header_bar_pack_end(GTK_HEADER_BAR(header), button);
6362
g_signal_connect_swapped(button, "clicked", G_CALLBACK(folder_chooser), app->window);
64-
#else
65-
/* Setup folder button */
66-
button = gtk_button_new();
67-
gtk_container_add (GTK_CONTAINER(button), gtk_image_new_from_resource("/org/prozum/midiogre/document-open-symbolic.symbolic.png"));
68-
gtk_header_bar_pack_end(GTK_HEADER_BAR(header), button);
69-
g_signal_connect_swapped(button, "clicked", G_CALLBACK(folder_chooser), app->window);
70-
71-
72-
/* Add seperator */
73-
separator = gtk_separator_new(GTK_ORIENTATION_VERTICAL);
74-
gtk_header_bar_pack_end(GTK_HEADER_BAR(header), separator);
75-
76-
77-
/* Setup close button */
78-
button = gtk_button_new();
79-
gtk_container_add (GTK_CONTAINER(button), gtk_image_new_from_resource("/org/prozum/midiogre/window-close-symbolic.symbolic.png"));
80-
gtk_header_bar_pack_end(GTK_HEADER_BAR(header), button);
81-
g_signal_connect_swapped(button, "clicked", G_CALLBACK(gtk_widget_destroy), app->window);
82-
#endif
8363

8464
/* Global horizontal box */
8565
app->win_box = GTK_BOX(gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0));

‎src/midiogre-song.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,8 @@ void play_clicked(SongRow *row, GtkButton *button)
2121
SongRowPrivate *priv = row->priv;
2222

2323
#ifdef WIN32
24-
spawnl( P_NOWAIT, "C:/Program Files/Windows Media Player/wmplayer.exe",
25-
"wmplayer.exe", priv->song->addr, NULL );
26-
24+
spawnl(P_NOWAIT, "C:/Program Files/Windows Media Player/wmplayer.exe",
25+
"wmplayer.exe", priv->song->addr, NULL);
2726
#else
2827

2928
tmp = g_strdup_printf("file://%s",priv->song->addr);

‎src/midiogre.gresource.xml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<gresources>
33
<gresource prefix="/org/prozum/midiogre">
4-
<file preprocess="xml-stripblanks">res/ui/songbox.ui</file>
5-
<file alias="midiogre_logo.png" preprocess="to-pixdata">res/icons/midiogre_logo.png</file>
6-
<file alias="window-close-symbolic.symbolic.png" preprocess="to-pixdata">res/icons/window-close-symbolic.symbolic.png</file>
7-
<file alias="document-open-symbolic.symbolic.png" preprocess="to-pixdata">res/icons/document-open-symbolic.symbolic.png</file>
8-
<file alias="list-add-symbolic.symbolic.png" preprocess="to-pixdata">res/icons/list-add-symbolic.symbolic.png</file>
9-
<file alias="media-playback-start-symbolic.symbolic.png" preprocess="to-pixdata">res/icons/media-playback-start-symbolic.symbolic.png</file>
10-
<file alias="media-playback-pause-symbolic.symbolic.png" preprocess="to-pixdata">res/icons/media-playback-pause-symbolic.symbolic.png</file>
11-
<file alias="media-skip-backward-symbolic.symbolic.png" preprocess="to-pixdata">res/icons/media-skip-backward-symbolic.symbolic.png</file>
12-
<file alias="media-skip-forward-symbolic.symbolic.png" preprocess="to-pixdata">res/icons/media-skip-forward-symbolic.symbolic.png</file>
13-
<file alias="star-new-symbolic.symbolic.png" preprocess="to-pixdata">res/icons/star-new-symbolic.symbolic.png</file>
14-
<file alias="edit-delete-symbolic.symbolic.png" preprocess="to-pixdata">res/icons/edit-delete-symbolic.symbolic.png</file>
4+
<file preprocess="xml-stripblanks">ui/songbox.ui</file>
5+
<file alias="midiogre_logo.png" preprocess="to-pixdata">icons/midiogre_logo.png</file>
6+
<file>icons/window-close-symbolic.symbolic.png</file>
7+
<file>icons/document-open-symbolic.symbolic.png</file>
8+
<file>icons/list-add-symbolic.symbolic.png</file>
9+
<file>icons/media-playback-start-symbolic.symbolic.png</file>
10+
<file>icons/media-playback-pause-symbolic.symbolic.png</file>
11+
<file>icons/media-skip-backward-symbolic.symbolic.png</file>
12+
<file>icons/media-skip-forward-symbolic.symbolic.png</file>
13+
<file>icons/star-new-symbolic.symbolic.png</file>
14+
<file>icons/edit-delete-symbolic.symbolic.png</file>
1515
</gresource>
1616
</gresources>

0 commit comments

Comments
 (0)