Skip to content

Commit 21d90a7

Browse files
dotblankEli Woods
dotblank
authored and
Eli Woods
committed
Update to reflect api changes and small patch for alternate audio
backends
1 parent eda4383 commit 21d90a7

16 files changed

+447
-141
lines changed

‎Groove.pro

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,16 @@ TARGET = groove
1111
#CONFIG += build_all
1212
DEPENDPATH += .
1313
INCLUDEPATH += .
14-
INCLUDEPATH += /usr/include/qjson
14+
INCLUDEPATH += /usr/include/qjson /usr/include
1515
#INCLUDEPATH += ../qjson/src/
1616
#INCLUDEPATH += ./src/
1717
#LIBS += -L/usr/lib -lqjson ##Desktop Target
18-
LIBS += -L/usr/local/lib -lqjson ##Armel Target
18+
LIBS += -L/usr/local/lib -lqjson -lmpg123 -lpulse-simple##Armel Target
1919
#LIBS += -L~/NokiaQtSDK/Maemo/4.6.2/sysroots/fremantle-arm-sysroot-1014-slim/usr/lib -lqjson ##Armel Target SDK
2020
#LIBS += -L../qjson/lib -lqjson ##X86 maemo
2121
QT += network
2222
QT += phonon
23-
QT += dbus
23+
2424
# Input
2525
SOURCES += main.cpp \
2626
groove.cpp \
@@ -33,7 +33,8 @@ SOURCES += main.cpp \
3333
topbar.cpp \
3434
bottombar.cpp \
3535
vkb.cpp \
36-
searchresults.cpp
36+
searchresults.cpp \
37+
mpgplayer.cpp
3738

3839
HEADERS += \
3940
groove.h \
@@ -46,11 +47,13 @@ HEADERS += \
4647
topbar.h \
4748
bottombar.h \
4849
vkb.h \
49-
searchresults.h
50+
searchresults.h \
51+
mpgplayer.h
5052

5153
maemo5 {
5254
SOURCES += qmaemo5rotator.cpp
5355
HEADERS += qmaemo5rotator.h
56+
QT += dbus
5457
}
5558
OTHER_FILES += \
5659
icon.svg \

‎Groove.pro.user

Lines changed: 89 additions & 42 deletions
Large diffs are not rendered by default.

‎Makefile

Lines changed: 61 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
#############################################################################
22
# Makefile for building: groove
3-
# Generated by qmake (2.01a) (Qt 4.6.2) on: Tue Jul 20 16:35:58 2010
3+
# Generated by qmake (2.01a) (Qt 4.7.0) on: Sun Dec 5 22:41:24 2010
44
# Project: Groove.pro
55
# Template: app
6-
# Command: /usr/bin/qmake -spec /usr/share/qt4/mkspecs/linux-g++ -unix CONFIG+=debug -o Makefile Groove.pro
6+
# Command: /usr/bin/qmake -o Makefile Groove.pro
77
#############################################################################
88

99
####### Compiler, tools and options
1010

1111
CC = gcc
1212
CXX = g++
13-
DEFINES = -DDATADIR="/usr/share" -DPKGDATADIR="" -DQT_PHONON_LIB -DQT_DBUS_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_SHARED
14-
CFLAGS = -pipe -g -Wall -W -D_REENTRANT $(DEFINES)
15-
CXXFLAGS = -pipe -g -Wall -W -D_REENTRANT $(DEFINES)
16-
INCPATH = -I/usr/share/qt4/mkspecs/linux-g++ -I. -I/usr/include/qt4/QtCore -I/usr/include/qt4/QtNetwork -I/usr/include/qt4/QtGui -I/usr/include/qt4/QtDBus -I/usr/include/qt4/phonon -I/usr/include/qt4 -I. -I/usr/include/qjson -I/usr/include/qt4/phonon_compat -I. -I.
13+
DEFINES = -DDATADIR="/usr/share" -DPKGDATADIR="" -DQT_NO_DEBUG -DQT_PHONON_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_SHARED
14+
CFLAGS = -pipe -O2 -Wall -W -D_REENTRANT $(DEFINES)
15+
CXXFLAGS = -pipe -O2 -Wall -W -D_REENTRANT $(DEFINES)
16+
INCPATH = -I/usr/share/qt4/mkspecs/linux-g++ -I. -I/usr/include/qt4/QtCore -I/usr/include/qt4/QtNetwork -I/usr/include/qt4/QtGui -I/usr/include/phonon -I/usr/include/qt4 -I. -I/usr/include/qjson -I/usr/include -I/usr/include/qt4/phonon_compat -I. -I.
1717
LINK = g++
18-
LFLAGS =
19-
LIBS = $(SUBLIBS) -L/usr/lib -L/usr/local/lib -lqjson -lphonon -lQtDBus -lQtGui -lQtNetwork -lQtCore -lpthread
18+
LFLAGS = -Wl,-O1
19+
LIBS = $(SUBLIBS) -L/usr/lib -L/usr/local/lib -lqjson -lmpg123 -lpulse-simple -lphonon -lQtGui -lQtNetwork -lQtCore -lpthread
2020
AR = ar cqs
2121
RANLIB =
2222
QMAKE = /usr/bin/qmake
@@ -54,7 +54,8 @@ SOURCES = main.cpp \
5454
topbar.cpp \
5555
bottombar.cpp \
5656
vkb.cpp \
57-
searchresults.cpp moc_groove.cpp \
57+
searchresults.cpp \
58+
mpgplayer.cpp moc_groove.cpp \
5859
moc_gscom.cpp \
5960
moc_splayer.cpp \
6061
moc_streamio.cpp \
@@ -65,6 +66,7 @@ SOURCES = main.cpp \
6566
moc_bottombar.cpp \
6667
moc_vkb.cpp \
6768
moc_searchresults.cpp \
69+
moc_mpgplayer.cpp \
6870
qrc_res.cpp
6971
OBJECTS = main.o \
7072
groove.o \
@@ -78,6 +80,7 @@ OBJECTS = main.o \
7880
bottombar.o \
7981
vkb.o \
8082
searchresults.o \
83+
mpgplayer.o \
8184
moc_groove.o \
8285
moc_gscom.o \
8386
moc_splayer.o \
@@ -89,23 +92,23 @@ OBJECTS = main.o \
8992
moc_bottombar.o \
9093
moc_vkb.o \
9194
moc_searchresults.o \
95+
moc_mpgplayer.o \
9296
qrc_res.o
9397
DIST = /usr/share/qt4/mkspecs/common/g++.conf \
9498
/usr/share/qt4/mkspecs/common/unix.conf \
9599
/usr/share/qt4/mkspecs/common/linux.conf \
96100
/usr/share/qt4/mkspecs/qconfig.pri \
101+
/usr/share/qt4/mkspecs/modules/qt_webkit_version.pri \
97102
/usr/share/qt4/mkspecs/features/qt_functions.prf \
98103
/usr/share/qt4/mkspecs/features/qt_config.prf \
99104
/usr/share/qt4/mkspecs/features/exclusive_builds.prf \
100105
/usr/share/qt4/mkspecs/features/default_pre.prf \
101-
/usr/share/qt4/mkspecs/features/debug.prf \
106+
/usr/share/qt4/mkspecs/features/release.prf \
102107
/usr/share/qt4/mkspecs/features/default_post.prf \
103108
/usr/share/qt4/mkspecs/features/warn_on.prf \
104109
/usr/share/qt4/mkspecs/features/qt.prf \
105-
/usr/share/qt4/mkspecs/features/moc.prf \
106-
/usr/share/qt4/mkspecs/features/dbusinterfaces.prf \
107-
/usr/share/qt4/mkspecs/features/dbusadaptors.prf \
108110
/usr/share/qt4/mkspecs/features/unix/thread.prf \
111+
/usr/share/qt4/mkspecs/features/moc.prf \
109112
/usr/share/qt4/mkspecs/features/resources.prf \
110113
/usr/share/qt4/mkspecs/features/uic.prf \
111114
/usr/share/qt4/mkspecs/features/yacc.prf \
@@ -147,61 +150,55 @@ Makefile: Groove.pro /usr/share/qt4/mkspecs/linux-g++/qmake.conf /usr/share/qt4
147150
/usr/share/qt4/mkspecs/common/unix.conf \
148151
/usr/share/qt4/mkspecs/common/linux.conf \
149152
/usr/share/qt4/mkspecs/qconfig.pri \
153+
/usr/share/qt4/mkspecs/modules/qt_webkit_version.pri \
150154
/usr/share/qt4/mkspecs/features/qt_functions.prf \
151155
/usr/share/qt4/mkspecs/features/qt_config.prf \
152156
/usr/share/qt4/mkspecs/features/exclusive_builds.prf \
153157
/usr/share/qt4/mkspecs/features/default_pre.prf \
154-
/usr/share/qt4/mkspecs/features/debug.prf \
158+
/usr/share/qt4/mkspecs/features/release.prf \
155159
/usr/share/qt4/mkspecs/features/default_post.prf \
156160
/usr/share/qt4/mkspecs/features/warn_on.prf \
157161
/usr/share/qt4/mkspecs/features/qt.prf \
158-
/usr/share/qt4/mkspecs/features/moc.prf \
159-
/usr/share/qt4/mkspecs/features/dbusinterfaces.prf \
160-
/usr/share/qt4/mkspecs/features/dbusadaptors.prf \
161162
/usr/share/qt4/mkspecs/features/unix/thread.prf \
163+
/usr/share/qt4/mkspecs/features/moc.prf \
162164
/usr/share/qt4/mkspecs/features/resources.prf \
163165
/usr/share/qt4/mkspecs/features/uic.prf \
164166
/usr/share/qt4/mkspecs/features/yacc.prf \
165167
/usr/share/qt4/mkspecs/features/lex.prf \
166168
/usr/share/qt4/mkspecs/features/include_source_dir.prf \
167-
/usr/lib/libphonon.prl \
168-
/usr/lib/libQtDBus.prl \
169169
/usr/lib/libQtGui.prl \
170170
/usr/lib/libQtNetwork.prl \
171171
/usr/lib/libQtCore.prl
172-
$(QMAKE) -spec /usr/share/qt4/mkspecs/linux-g++ -unix CONFIG+=debug -o Makefile Groove.pro
172+
$(QMAKE) -o Makefile Groove.pro
173173
/usr/share/qt4/mkspecs/common/g++.conf:
174174
/usr/share/qt4/mkspecs/common/unix.conf:
175175
/usr/share/qt4/mkspecs/common/linux.conf:
176176
/usr/share/qt4/mkspecs/qconfig.pri:
177+
/usr/share/qt4/mkspecs/modules/qt_webkit_version.pri:
177178
/usr/share/qt4/mkspecs/features/qt_functions.prf:
178179
/usr/share/qt4/mkspecs/features/qt_config.prf:
179180
/usr/share/qt4/mkspecs/features/exclusive_builds.prf:
180181
/usr/share/qt4/mkspecs/features/default_pre.prf:
181-
/usr/share/qt4/mkspecs/features/debug.prf:
182+
/usr/share/qt4/mkspecs/features/release.prf:
182183
/usr/share/qt4/mkspecs/features/default_post.prf:
183184
/usr/share/qt4/mkspecs/features/warn_on.prf:
184185
/usr/share/qt4/mkspecs/features/qt.prf:
185-
/usr/share/qt4/mkspecs/features/moc.prf:
186-
/usr/share/qt4/mkspecs/features/dbusinterfaces.prf:
187-
/usr/share/qt4/mkspecs/features/dbusadaptors.prf:
188186
/usr/share/qt4/mkspecs/features/unix/thread.prf:
187+
/usr/share/qt4/mkspecs/features/moc.prf:
189188
/usr/share/qt4/mkspecs/features/resources.prf:
190189
/usr/share/qt4/mkspecs/features/uic.prf:
191190
/usr/share/qt4/mkspecs/features/yacc.prf:
192191
/usr/share/qt4/mkspecs/features/lex.prf:
193192
/usr/share/qt4/mkspecs/features/include_source_dir.prf:
194-
/usr/lib/libphonon.prl:
195-
/usr/lib/libQtDBus.prl:
196193
/usr/lib/libQtGui.prl:
197194
/usr/lib/libQtNetwork.prl:
198195
/usr/lib/libQtCore.prl:
199196
qmake: FORCE
200-
@$(QMAKE) -spec /usr/share/qt4/mkspecs/linux-g++ -unix CONFIG+=debug -o Makefile Groove.pro
197+
@$(QMAKE) -o Makefile Groove.pro
201198

202199
dist:
203200
@$(CHK_DIR_EXISTS) .tmp/groove1.0.0 || $(MKDIR) .tmp/groove1.0.0
204-
$(COPY_FILE) --parents $(SOURCES) $(DIST) .tmp/groove1.0.0/ && $(COPY_FILE) --parents groove.h gscom.h splayer.h streamio.h playlist.h downloadmanager.h grooveprogressbar.h topbar.h bottombar.h vkb.h searchresults.h .tmp/groove1.0.0/ && $(COPY_FILE) --parents res.qrc .tmp/groove1.0.0/ && $(COPY_FILE) --parents main.cpp groove.cpp gscom.cpp splayer.cpp streamio.cpp playlist.cpp downloadmanager.cpp grooveprogressbar.cpp topbar.cpp bottombar.cpp vkb.cpp searchresults.cpp .tmp/groove1.0.0/ && $(COPY_FILE) --parents topbar.ui bottombar.ui vkb.ui searchresults.ui .tmp/groove1.0.0/ && (cd `dirname .tmp/groove1.0.0` && $(TAR) groove1.0.0.tar groove1.0.0 && $(COMPRESS) groove1.0.0.tar) && $(MOVE) `dirname .tmp/groove1.0.0`/groove1.0.0.tar.gz . && $(DEL_FILE) -r .tmp/groove1.0.0
201+
$(COPY_FILE) --parents $(SOURCES) $(DIST) .tmp/groove1.0.0/ && $(COPY_FILE) --parents groove.h gscom.h splayer.h streamio.h playlist.h downloadmanager.h grooveprogressbar.h topbar.h bottombar.h vkb.h searchresults.h mpgplayer.h .tmp/groove1.0.0/ && $(COPY_FILE) --parents res.qrc .tmp/groove1.0.0/ && $(COPY_FILE) --parents main.cpp groove.cpp gscom.cpp splayer.cpp streamio.cpp playlist.cpp downloadmanager.cpp grooveprogressbar.cpp topbar.cpp bottombar.cpp vkb.cpp searchresults.cpp mpgplayer.cpp .tmp/groove1.0.0/ && $(COPY_FILE) --parents topbar.ui bottombar.ui vkb.ui searchresults.ui .tmp/groove1.0.0/ && (cd `dirname .tmp/groove1.0.0` && $(TAR) groove1.0.0.tar groove1.0.0 && $(COMPRESS) groove1.0.0.tar) && $(MOVE) `dirname .tmp/groove1.0.0`/groove1.0.0.tar.gz . && $(DEL_FILE) -r .tmp/groove1.0.0
205202

206203

207204
clean:compiler_clean
@@ -216,13 +213,15 @@ distclean: clean
216213
-$(DEL_FILE) Makefile
217214

218215

216+
check: first
217+
219218
mocclean: compiler_moc_header_clean compiler_moc_source_clean
220219

221220
mocables: compiler_moc_header_make_all compiler_moc_source_make_all
222221

223-
compiler_moc_header_make_all: moc_groove.cpp moc_gscom.cpp moc_splayer.cpp moc_streamio.cpp moc_playlist.cpp moc_downloadmanager.cpp moc_grooveprogressbar.cpp moc_topbar.cpp moc_bottombar.cpp moc_vkb.cpp moc_searchresults.cpp
222+
compiler_moc_header_make_all: moc_groove.cpp moc_gscom.cpp moc_splayer.cpp moc_streamio.cpp moc_playlist.cpp moc_downloadmanager.cpp moc_grooveprogressbar.cpp moc_topbar.cpp moc_bottombar.cpp moc_vkb.cpp moc_searchresults.cpp moc_mpgplayer.cpp
224223
compiler_moc_header_clean:
225-
-$(DEL_FILE) moc_groove.cpp moc_gscom.cpp moc_splayer.cpp moc_streamio.cpp moc_playlist.cpp moc_downloadmanager.cpp moc_grooveprogressbar.cpp moc_topbar.cpp moc_bottombar.cpp moc_vkb.cpp moc_searchresults.cpp
224+
-$(DEL_FILE) moc_groove.cpp moc_gscom.cpp moc_splayer.cpp moc_streamio.cpp moc_playlist.cpp moc_downloadmanager.cpp moc_grooveprogressbar.cpp moc_topbar.cpp moc_bottombar.cpp moc_vkb.cpp moc_searchresults.cpp moc_mpgplayer.cpp
226225
moc_groove.cpp: gscom.h \
227226
splayer.h \
228227
streamio.h \
@@ -231,6 +230,7 @@ moc_groove.cpp: gscom.h \
231230
playlist.h \
232231
topbar.h \
233232
vkb.h \
233+
bottombar.h \
234234
groove.h
235235
/usr/bin/moc-qt4 $(DEFINES) $(INCPATH) groove.h -o moc_groove.cpp
236236

@@ -279,10 +279,15 @@ moc_vkb.cpp: vkb.h
279279
moc_searchresults.cpp: searchresults.h
280280
/usr/bin/moc-qt4 $(DEFINES) $(INCPATH) searchresults.h -o moc_searchresults.cpp
281281

282-
compiler_dbus_interface_source_make_all:
283-
compiler_dbus_interface_source_clean:
284-
compiler_dbus_adaptor_source_make_all:
285-
compiler_dbus_adaptor_source_clean:
282+
moc_mpgplayer.cpp: streamio.h \
283+
splayer.h \
284+
grooveprogressbar.h \
285+
qmaemo5rotator.h \
286+
playlist.h \
287+
gscom.h \
288+
mpgplayer.h
289+
/usr/bin/moc-qt4 $(DEFINES) $(INCPATH) mpgplayer.h -o moc_mpgplayer.cpp
290+
286291
compiler_rcc_make_all: qrc_res.cpp
287292
compiler_rcc_clean:
288293
-$(DEL_FILE) qrc_res.cpp
@@ -309,14 +314,6 @@ compiler_image_collection_clean:
309314
-$(DEL_FILE) qmake_image_collection.cpp
310315
compiler_moc_source_make_all:
311316
compiler_moc_source_clean:
312-
compiler_dbus_interface_header_make_all:
313-
compiler_dbus_interface_header_clean:
314-
compiler_dbus_interface_moc_make_all:
315-
compiler_dbus_interface_moc_clean:
316-
compiler_dbus_adaptor_header_make_all:
317-
compiler_dbus_adaptor_header_clean:
318-
compiler_dbus_adaptor_moc_make_all:
319-
compiler_dbus_adaptor_moc_clean:
320317
compiler_uic_make_all: ui_topbar.h ui_bottombar.h ui_vkb.h ui_searchresults.h
321318
compiler_uic_clean:
322319
-$(DEL_FILE) ui_topbar.h ui_bottombar.h ui_vkb.h ui_searchresults.h
@@ -350,7 +347,8 @@ main.o: main.cpp groove.h \
350347
qmaemo5rotator.h \
351348
playlist.h \
352349
topbar.h \
353-
vkb.h
350+
vkb.h \
351+
bottombar.h
354352
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o main.o main.cpp
355353

356354
groove.o: groove.cpp groove.h \
@@ -362,14 +360,16 @@ groove.o: groove.cpp groove.h \
362360
playlist.h \
363361
topbar.h \
364362
vkb.h \
365-
bottombar.h
363+
bottombar.h \
364+
mpgplayer.h
366365
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o groove.o groove.cpp
367366

368367
gscom.o: gscom.cpp gscom.h
369368
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o gscom.o gscom.cpp
370369

371-
splayer.o: splayer.cpp splayer.h \
370+
splayer.o: splayer.cpp mpgplayer.h \
372371
streamio.h \
372+
splayer.h \
373373
grooveprogressbar.h \
374374
qmaemo5rotator.h \
375375
playlist.h \
@@ -412,6 +412,15 @@ searchresults.o: searchresults.cpp searchresults.h \
412412
ui_searchresults.h
413413
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o searchresults.o searchresults.cpp
414414

415+
mpgplayer.o: mpgplayer.cpp mpgplayer.h \
416+
streamio.h \
417+
splayer.h \
418+
grooveprogressbar.h \
419+
qmaemo5rotator.h \
420+
playlist.h \
421+
gscom.h
422+
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o mpgplayer.o mpgplayer.cpp
423+
415424
moc_groove.o: moc_groove.cpp
416425
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_groove.o moc_groove.cpp
417426

@@ -445,6 +454,9 @@ moc_vkb.o: moc_vkb.cpp
445454
moc_searchresults.o: moc_searchresults.cpp
446455
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_searchresults.o moc_searchresults.cpp
447456

457+
moc_mpgplayer.o: moc_mpgplayer.cpp
458+
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_mpgplayer.o moc_mpgplayer.cpp
459+
448460
qrc_res.o: qrc_res.cpp
449461
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o qrc_res.o qrc_res.cpp
450462

@@ -453,35 +465,26 @@ qrc_res.o: qrc_res.cpp
453465
install_target: first FORCE
454466
@$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/bin/ || $(MKDIR) $(INSTALL_ROOT)/usr/bin/
455467
-$(INSTALL_PROGRAM) "$(QMAKE_TARGET)" "$(INSTALL_ROOT)/usr/bin/$(QMAKE_TARGET)"
468+
-$(STRIP) "$(INSTALL_ROOT)/usr/bin/$(QMAKE_TARGET)"
456469

457470
uninstall_target: FORCE
458471
-$(DEL_FILE) "$(INSTALL_ROOT)/usr/bin/$(QMAKE_TARGET)"
459472
-$(DEL_DIR) $(INSTALL_ROOT)/usr/bin/
460473

461474

462-
install_desktop: first FORCE
463-
@$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/share/applications/hildon/ || $(MKDIR) $(INSTALL_ROOT)/usr/share/applications/hildon/
464-
-$(INSTALL_FILE) /scratchbox/users/eli/home/eli/qt4/Groove/groove.desktop $(INSTALL_ROOT)/usr/share/applications/hildon/
465-
466-
467-
uninstall_desktop: FORCE
468-
-$(DEL_FILE) -r $(INSTALL_ROOT)/usr/share/applications/hildon/groove.desktop
469-
-$(DEL_DIR) $(INSTALL_ROOT)/usr/share/applications/hildon/
470-
471-
472475
install_icon64: first FORCE
473476
@$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/share/icons/hicolor/64x64/apps/ || $(MKDIR) $(INSTALL_ROOT)/usr/share/icons/hicolor/64x64/apps/
474-
-$(INSTALL_FILE) /scratchbox/users/eli/home/eli/qt4/Groove/groove.png $(INSTALL_ROOT)/usr/share/icons/hicolor/64x64/apps/
477+
-$(INSTALL_FILE) /home/eli/Projects/groove/groove.png $(INSTALL_ROOT)/usr/share/icons/hicolor/64x64/apps/
475478

476479

477480
uninstall_icon64: FORCE
478481
-$(DEL_FILE) -r $(INSTALL_ROOT)/usr/share/icons/hicolor/64x64/apps/groove.png
479482
-$(DEL_DIR) $(INSTALL_ROOT)/usr/share/icons/hicolor/64x64/apps/
480483

481484

482-
install: install_target install_desktop install_icon64 FORCE
485+
install: install_target install_icon64 FORCE
483486

484-
uninstall: uninstall_target uninstall_desktop uninstall_icon64 FORCE
487+
uninstall: uninstall_target uninstall_icon64 FORCE
485488

486489
FORCE:
487490

‎bottombar.cpp

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,14 @@ bottomBar::bottomBar(QWidget *parent) :
1515
main->setBackgroundBrush(this->palette().window());
1616
main->setSceneRect(0,0,screenGeometry.width(),15);
1717
this->playbackProgress = main->addRect(0,0,screenGeometry.width()/2,15,QPen(Qt::white),QBrush(Qt::white));
18+
#ifndef Q_WS_MAEMO_5
19+
ui->stopButton->setIcon(QIcon::fromTheme("media-playback-stop"));
20+
ui->pauseB->setIcon(QIcon::fromTheme("media-playback-pause"));
21+
ui->nextB->setIcon(QIcon::fromTheme("media-skip-forward"));
22+
ui->backB->setIcon(QIcon::fromTheme("media-skip-backward"));
23+
ui->settingsB->setIcon(QIcon::fromTheme("document-properties"));
24+
25+
#endif
1826
}
1927

2028
bottomBar::~bottomBar()

‎bottombar.ui

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@
9191
</widget>
9292
</item>
9393
<item>
94-
<widget class="QPushButton" name="pushButton_5">
94+
<widget class="QPushButton" name="stopButton">
9595
<property name="text">
9696
<string/>
9797
</property>
@@ -133,7 +133,7 @@
133133
</widget>
134134
</item>
135135
<item>
136-
<widget class="QPushButton" name="pushButton_2">
136+
<widget class="QPushButton" name="settingsB">
137137
<property name="text">
138138
<string/>
139139
</property>

0 commit comments

Comments
 (0)