r215 - in trunk/src/target/OM-2007/applications/openmoko-chordmaster: . data src

mickey at gta01.hmw-consulting.de mickey at gta01.hmw-consulting.de
Sun Nov 12 15:50:48 CET 2006


Author: mickey
Date: 2006-11-12 14:50:46 +0000 (Sun, 12 Nov 2006)
New Revision: 215

Added:
   trunk/src/target/OM-2007/applications/openmoko-chordmaster/data/
   trunk/src/target/OM-2007/applications/openmoko-chordmaster/data/accords.chords
   trunk/src/target/OM-2007/applications/openmoko-chordmaster/data/ball.png
   trunk/src/target/OM-2007/applications/openmoko-chordmaster/data/wood.png
   trunk/src/target/OM-2007/applications/openmoko-chordmaster/src/
   trunk/src/target/OM-2007/applications/openmoko-chordmaster/src/callbacks.c
   trunk/src/target/OM-2007/applications/openmoko-chordmaster/src/callbacks.h
   trunk/src/target/OM-2007/applications/openmoko-chordmaster/src/chordsdb.c
   trunk/src/target/OM-2007/applications/openmoko-chordmaster/src/chordsdb.h
   trunk/src/target/OM-2007/applications/openmoko-chordmaster/src/fretboard-widget.c
   trunk/src/target/OM-2007/applications/openmoko-chordmaster/src/fretboard-widget.h
   trunk/src/target/OM-2007/applications/openmoko-chordmaster/src/main.c
   trunk/src/target/OM-2007/applications/openmoko-chordmaster/src/main.h
Removed:
   trunk/src/target/OM-2007/applications/openmoko-chordmaster/accords.chords
   trunk/src/target/OM-2007/applications/openmoko-chordmaster/ball.png
   trunk/src/target/OM-2007/applications/openmoko-chordmaster/callbacks.c
   trunk/src/target/OM-2007/applications/openmoko-chordmaster/callbacks.h
   trunk/src/target/OM-2007/applications/openmoko-chordmaster/chordsdb.c
   trunk/src/target/OM-2007/applications/openmoko-chordmaster/chordsdb.h
   trunk/src/target/OM-2007/applications/openmoko-chordmaster/fretboard-widget.c
   trunk/src/target/OM-2007/applications/openmoko-chordmaster/fretboard-widget.h
   trunk/src/target/OM-2007/applications/openmoko-chordmaster/main.c
   trunk/src/target/OM-2007/applications/openmoko-chordmaster/main.h
   trunk/src/target/OM-2007/applications/openmoko-chordmaster/wood.png
Modified:
   trunk/src/target/OM-2007/applications/openmoko-chordmaster/openmoko-chordmaster.pro
Log:
chordmaster: add datadir and srcdir


Deleted: trunk/src/target/OM-2007/applications/openmoko-chordmaster/accords.chords
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-chordmaster/accords.chords	2006-11-12 14:32:14 UTC (rev 214)
+++ trunk/src/target/OM-2007/applications/openmoko-chordmaster/accords.chords	2006-11-12 14:50:46 UTC (rev 215)
@@ -1,896 +0,0 @@
-CATEGORY=A
-A=002220
-A=577655
-A=x02220
-A#5=x03221
-A#5=x0x221
-A/Ab=x02120
-A/B=002420
-A/B=x07600
-A/D=x00220
-A/D=xx0220
-A/D=xx0655
-A/G=3x2220
-A/G=x02020
-A/G=x02223
-A/Gb=002222
-A/Gb=0x4220
-A/Gb=2x2220
-A/Gb=x04220
-A/Gb=xx2222
-A5=577xx5
-A9=x022x0
-A5=577xx0
-A6=002222
-A6=0x4220
-A6=2x2220
-A6=x04220
-A6=xx2222
-A6/7=002022
-A6/7sus4=554030
-A6/7sus4=x02032
-A7=3x2220
-A7=x02020
-A7=x02223
-A7(#5)=103021
-A7/add11=x00020
-A7sus4=x02030
-A7sus4=x02033
-A7sus4=x02233
-A7sus4=5x0030
-A7sus4=x000x0
-Aadd9=002420
-Aadd9=x07600
-Aaug/D=xx0221
-Aaug/G=103021
-Ab=466544
-Ab#5=x32110
-Ab/A=xx1214
-Ab/F=x81089
-Ab/F=xx1111
-Ab/Gb=xx1112
-Ab/Gb=xx4544
-Ab5=466xx4
-Ab6=xx1111
-Ab7=xx1112
-Ab7=xx4544
-Abdim/E=020100
-Abdim/E=022130
-Abdim/E=x20130
-Abdim/E=xx0100
-Abdim/Eb=xx0444
-Abdim/F=x20101
-Abdim/F=xx0101
-Abdim/F=xx3434
-Abdim7=x20101
-Abdim7=xx0101
-Abdim7=xx3434
-Abm=xx6444
-Abm/D=xx0444
-Abm/E=021100
-Abm/E=0x6440
-Abm/E=xx1100
-Abm/Gb=xx4444
-Abm7=xx4444
-Absus4=xx6644
-Absus2/F=x13141
-Adim/Ab=xx1214
-Adim/E=03x240
-Adim/F=xx1211
-Adim/F=xx3545
-Adim/G=xx1213
-Adim/Gb=xx1212
-Adim7=xx1212
-Am=x02210
-Am=x07555
-Am=x32210
-Am/B=007500
-Am/B=x32200
-Am/D=xx0210
-Am/D=xx0555
-Am/Eb=03x240
-Am/F=003210
-Am/F=133210
-Am/F=1x2210
-Am/F=xx2211
-Am/F=xx3210
-Am/G=002013
-Am/G=x02010
-Am/G=x02213
-Am/G=x05558
-Am/Gb=x02212
-Am/Gb=xx2212
-Am6=x02212
-Am6=xx2212
-Am7=002013
-Am7=x02010
-Am7=x02213
-Am7=x05558
-Am7(b5)=xx1213
-Am7/add11=x57580
-Amaj7=x02120
-Amin/maj9=x06557
-Asus4=002230
-Asus4=x02230
-Asus4=5577x0
-Asus4=x00230
-Asus2=002200
-Asus2=002400
-Asus2=022200
-Asus2=x02200
-Asus2=xx2200
-Asus2/Ab=x02100
-Asus2/C=007500
-Asus2/C=x32200
-Asus2/D=020200
-Asus2/D=x20230
-Asus2/Db=002420
-Asus2/Db=x07600
-Asus2/Eb=x21200
-Asus2/F=003200
-Asus2/G=3x2200
-Asus2/G=x02000
-Asus2/G=x05450
-Asus2/Gb=x04400
-Asus2/Gb=x24252
-Asus4/Ab=4x0230
-Asus4/B=020200
-Asus4/Bb=01x230
-Asus4/C=xx0210
-Asus4/C=xx0555
-Asus4/Db=x00220
-Asus4/Db=xx0220
-Asus4/Db=xx0655
-Asus4/F=xx7760
-Asus4/G=x02030
-Asus4/G=x02033
-Asus4/G=x02233
-Asus4/G=x000x0
-Asus4/Gb=000232
-Asus4/Gb=004230
-Asus4/Gb=2x0230
-Asus4/Gb=x02232
-Asus4/Gb=xx2232
-Asus4/Gb=x54230
-Asus4/Gb=x977x0
-CATEGORY=B
-B=224442
-B=799877
-B#5=321003
-B#5=3x1003
-B/A=2x1202
-B/A=x01202
-B/A=x21202
-B/A=x24242
-B/Ab=xx4444
-B/E=x22442
-B/E=xx4440
-B5=799xx2
-B5=x244x2
-B6=xx4444
-B7=2x1202
-B7=x01202
-B7=x21202
-B7=x24242
-B7/add11=004440
-B7/add11=021202
-B7sus4=x04400
-B7sus4=x24252
-Baug/E=3x1000
-Baug/E=xx1000
-Bb=113331
-Bb=x13331
-Bb=xx0331
-Bb#5=xx0332
-Bbb5=xx03x0
-Bb/A=113231
-Bb/Ab=x13131
-Bb/Ab=xx3334
-Bb/Db=xx0666
-Bb/E=x13330
-Bb/G=353333
-Bb/G=xx3333
-Bb5=688xx6
-Bb5=x133x6
-Bb6=353333
-Bb6=xx3333
-Bb6/add9=x33333
-Bb7=x13131
-Bb7=xx3334
-Bb7sus4=x13141
-Bbadd#11=x13330
-Bbaug/E=2x4330
-Bbdim/C=x3x320
-Bbdim/D=xx0320
-Bbdim/G=x12020
-Bbdim/G=xx2323
-Bbdim/Gb=242322
-Bbdim/Gb=xx4320
-Bbdim7=x12020
-Bbdim7=xx2323
-Bbm=113321
-Bbm/Ab=x13121
-Bbm/D=xx0666
-Bbm/Gb=xx3322
-Bbm7=x13121
-Bbmaj7=113231
-Bbmaj9=x33335
-Bbsus2=xx3311
-Bbsus2/G=x35363
-Bbsus4/Ab=x13141
-Bdim/A=x20201
-Bdim/A=xx0201
-Bdim/Ab=x20101
-Bdim/Ab=xx0101
-Bdim/Ab=xx3434
-Bdim/G=1x0003
-Bdim/G=320001
-Bdim/G=xx0001
-Bdim7=x20101
-Bdim7=xx0101
-Bdim7=xx3434
-Bm=224432
-Bm=x24432
-Bm=xx0432
-Bm/A=x04432
-Bm/A=x20202
-Bm/A=x20232
-Bm/A=x24232
-Bm/A=xx0202
-Bm/G=220003
-Bm/G=220033
-Bm/G=320002
-Bm/G=xx4433
-Bm7=x04432
-Bm7=x20202
-Bm7=x20232
-Bm7=x24232
-Bm7=xx0202
-Bm7(b5)=123231
-Bm7(b5)=x20201
-Bm7(b5)=xx0201
-Bm7/add11=002432
-Bm7/add11=020202
-Bmaj7/#11=x23342
-Bsus4=799xx0
-Bsus4=x244x0
-Bsus2=x444x2
-Bsus2=xx4422
-Bsus2/E=x444x0
-Bsus4/A=x04400
-Bsus4/A=x24252
-Bsus4/Ab=022102
-Bsus4/Ab=0x4100
-Bsus4/Ab=222100
-Bsus4/Db=x444x0
-Bsus4/Eb=x22442
-Bsus4/Eb=xx4440
-Bsus4/G=022002
-Bsus4/G=024000
-Bsus4/G=0x4000
-Bsus4/G=222000
-CATEGORY=C
-C=032010
-C=035553
-C=332010
-C=3x2010
-C=x32010
-C=x35550
-C#5=x32110
-Cb5=xx45x0
-C/A=002013
-C/A=x02010
-C/A=x02213
-C/A=x05558
-C/B=032000
-C/B=x22010
-C/B=x35453
-C/Bb=x35353
-C/D=3x0010
-C/D=x30010
-C/D=x32030
-C/D=x32033
-C/D=xx0010
-C/D=xx0553
-C/D=x10121
-C/D=x555x0
-C/F=x33010
-C/F=xx3010
-C5=x355x3
-C6=002013
-C6=x02010
-C6=x02213
-C6=x05558
-C6/add9=x57580
-C7=x35353
-C7sus4=x35363
-C9(b5)=03x332
-Cadd9=3x0010
-Cadd9=x30010
-Cadd9=x32030
-Cadd9=x32033
-Cadd9=xx0010
-Cadd9=xx0553
-Cadd9=x32030
-Cadd9=x555x0
-Cdim/A=xx1212
-Cdim/Ab=xx1112
-Cdim/Ab=xx4544
-Cdim/D=x54542
-Cdim7=xx1212
-Cm=x35543
-Cm=xx5543
-Cm/A=xx1213
-Cm/Bb=x35343
-Cm6=xx1213
-Cm7=x35343
-Cmaj7=032000
-Cmaj7=x22010
-Cmaj7=x35453
-Cmaj9=x30000
-Csus4=x33011
-Csus4=xx3011
-Csus2=x555x3
-Csus2=x30033
-Csus2=x35533
-Csus2/A=x57583
-Csus2/A=xx0213
-Csus2/B=330003
-Csus2/B=x30003
-Csus2/E=3x0010
-Csus2/E=x30010
-Csus2/E=x32030
-Csus2/E=x32033
-Csus2/E=xx0010
-Csus2/E=xx0553
-Csus2/E=x555x0
-Csus2/F=330011
-Csus4/A=3x3211
-Csus4/A=xx3213
-Csus4/B=x33003
-Csus4/Bb=x35363
-Csus4/D=330011
-Csus4/E=x33010
-Csus4/E=xx3010
-CATEGORY=D
-D=x54232
-D=x977x2
-D=200232
-D=x00232
-D=x04232
-D#5=xx0332
-D/B=x04432
-D/B=x20202
-D/B=x20232
-D/B=x24232
-D/B=xx0202
-D/C=x57572
-D/C=x00212
-D/C=x3x232
-D/C=x57575
-D/Db=xx0144
-D/Db=xx0222
-D/E=000232
-D/E=004230
-D/E=2x0230
-D/E=x02232
-D/E=xx2232
-D/E=x54230
-D/E=x977x0
-D/G=5x4035
-D/G=3x0232
-D5=5577x5
-D5=x00235
-D6=x04432
-D6=x20202
-D6=x20232
-D6=x24232
-D6=xx0202
-D6/add9=002432
-D6/add9=020202
-D7=x57572
-D7=x00212
-D7=x3x232
-D7=x57575
-D7sus4=x57583
-D7sus4=xx0213
-D9=000212
-D9=2x0210
-D9=x57570
-D9(#5)=03x332
-Dadd9=000232
-Dadd9=004230
-Dadd9=2x0230
-Dadd9=x02232
-Dadd9=xx2232
-Dadd9=x54230
-Dadd9=x977x0
-Daug/E=2x4330
-Db=446664
-Db=x43121
-Db=x46664
-Db=xx3121
-Db=xx6664
-Dbaug=x03221
-Dbaug=x0x221
-Dbaug=xx3021
-Db/B=x43404
-Db/Bb=x13121
-Db/C=x33121
-Db/C=x46564
-Db5=x466x4
-Db6=x13121
-Db7=x43404
-Dbaug/D=xx0221
-Dbaug/G=103021
-Dbdim/A=3x2220
-Dbdim/A=x02020
-Dbdim/A=x02223
-Dbdim/B=022020
-Dbdim/Bb=x12020
-Dbdim/Bb=xx2323
-Dbdim/D=3x0020
-Dbdim/D=xx0020
-Dbdim7=x12020
-Dbdim7=xx2323
-Dbm=x46654
-Dbm=xx2120
-Dbm=x466x0
-Dbm/A=x02120
-Dbm/B=022120
-Dbm/B=x46454
-Dbm7=022120
-Dbm7=x46454
-Dbm7(b5)=022020
-Dbmaj7=x33121
-Dbmaj7=x46564
-Dbsus2=xx6644
-Dbsus4/Bb=xx4324
-Ddim/B=x20101
-Ddim/B=xx0101
-Ddim/B=xx3434
-Ddim/Bb=x13131
-Ddim/Bb=xx3334
-Ddim/C=xx0111
-Ddim7=x20101
-Ddim7=xx0101
-Ddim7=xx3434
-Dm=x00231
-Dm/B=123231
-Dm/B=x20201
-Dm/B=xx0201
-Dm/Bb=113231
-Dm/C=x57565
-Dm/C=xx0211
-Dm/C=xx0565
-Dm/Db=xx0221
-Dm/E=xx7760
-Dm6=123231
-Dm6=x20201
-Dm6=xx0201
-Dm7=x57565
-Dm7=xx0211
-Dm7=xx0565
-Dm7(b5)=xx0111
-Dm7/add11=3x0211
-Dmaj7=xx0222
-Dmin/maj7=xx0221
-Dsus4=5x0035
-Dsus4=300033
-Dsus4=x00033
-Dsus4=xx0233
-Dsus2=5577x0
-Dsus2=x00230
-Dsus2=002230
-Dsus2=x02230
-Dsus2=xx0230
-Dsus2/Ab=4x0230
-Dsus2/B=020200
-Dsus2/B=x20230
-Dsus2/Bb=01x230
-Dsus2/C=xx0210
-Dsus2/C=xx0555
-Dsus2/Db=x00220
-Dsus2/Db=xx0220
-Dsus2/Db=xx0655
-Dsus2/Db=xx0910
-Dsus2/F=xx7760
-Dsus2/G=x02030
-Dsus2/G=x02033
-Dsus2/G=x02233
-Dsus2/G=5x0030
-Dsus2/G=x000x0
-Dsus2/Gb=000232
-Dsus2/Gb=004230
-Dsus2/Gb=2x0230
-Dsus2/Gb=x02232
-Dsus2/Gb=xx2232
-Dsus2/Gb=x54230
-Dsus2/Gb=x977x0
-Dsus4/B=300003
-Dsus4/B=320203
-Dsus4/C=x57583
-Dsus4/C=xx0213
-Dsus4/E=x02030
-Dsus4/E=5x0030
-Dsus4/E=x000x0
-Dsus4/Gb=5x4035
-Dsus4/Gb=3x0232
-CATEGORY=E
-E=022100
-E=x76450
-E#5=x32110
-E/A=x02100
-E/D=020100
-E/D=022130
-E/D=x20130
-E/D=xx0100
-E/Db=022120
-E/Db=x46454
-E/Eb=021100
-E/Eb=0x6440
-E/Eb=xx1100
-E/Gb=022102
-E/Gb=0x4100
-E/Gb=222100
-E11/b9=003434
-E5=02xxx0
-E5=002100
-E5=x799x0
-E6=022120
-E6=x46454
-E7=020100
-E7=022130
-E7=x20130
-E7=xx0100
-E7/add11=x00100
-E7/b9(b5)=013131
-E7sus4=020200
-E9=020102
-E9=220100
-Eadd9=022102
-Eadd9=0x4100
-Eadd9=222100
-Eb=x11343
-Eb=xx1343
-Eb=xx5343
-Ebaug=321003
-Ebaug=3x1003
-Eb/C=x35343
-Eb/D=x68786
-Eb/Db=x11323
-Eb/Db=x68686
-Eb/Db=xx1323
-Eb/E=xx5340
-Eb5=x688x6
-Eb6=x35343
-Eb7=x11323
-Eb7=x68686
-Eb7=xx1323
-Ebaug/E=3x1000
-Ebaug/E=xx1000
-Ebdim/B=2x1202
-Ebdim/B=x01202
-Ebdim/B=x21202
-Ebdim/B=x24242
-Ebdim/C=xx1212
-Ebdim7=xx1212
-Ebm=xx4342
-Ebm/Db=xx1322
-Ebm7=xx1322
-Ebmaj7=x68786
-Ebsus2/Ab=x13141
-Ebsus4/F=x13141
-Edim/C=x35353
-Edim/D=3x0330
-Edim/Db=x12020
-Edim/Db=xx2323
-Edim/Eb=xx5340
-Edim7=x12020
-Edim7=xx2323
-Em=022000
-Em=3x2000
-Em=x25xx0
-Em/A=3x2200
-Em/A=x02000
-Em/A=x05450
-Em/C=032000
-Em/C=x22010
-Em/C=x35453
-Em/D=020000
-Em/D=020030
-Em/D=022030
-Em/D=022033
-Em/D=xx0121
-Em/D=xx0987
-Em/D=xx2433
-Em/D=0x0000
-Em/D=x10121
-Em/Db=022020
-Em/Eb=3x1000
-Em/Eb=xx1000
-Em/Gb=022002
-Em/Gb=024000
-Em/Gb=0x4000
-Em/Gb=222000
-Em6=022020
-Em7=020000
-Em7=020030
-Em7=022030
-Em7=022033
-Em7=xx0000
-Em7=xx0121
-Em7=xx0987
-Em7=xx2433
-Em7=0x0000
-Em7=x10121
-Em7(b5)=3x0330
-Em7/add11=000000
-Em7/add11=000003
-Em7/add11=3x0200
-Em9=020002
-Em9=020032
-Em9=220000
-Emaj7=021100
-Emaj7=0x6440
-Emaj7=xx1100
-Emaj9=021102
-Emaj9=4x4440
-Emin/maj7=3x1000
-Emin/maj7=xx1000
-Emin/maj9=064000
-Esus4=002200
-Esus4=002400
-Esus4=022200
-Esus4=x02200
-Esus4=xx2200
-Esus2=799xx0
-Esus2=x244x0
-Esus2/A=x04400
-Esus2/A=x24252
-Esus2/Ab=022102
-Esus2/Ab=0x4100
-Esus2/Ab=222100
-Esus2/Db=x444x0
-Esus2/Eb=x22442
-Esus2/Eb=xx4440
-Esus2/G=022002
-Esus2/G=024000
-Esus2/G=0x4000
-Esus2/G=222000
-Esus4/Ab=x02100
-Esus4/C=007500
-Esus4/C=x32200
-Esus4/D=020200
-Esus4/D=x20230
-Esus4/Db=002420
-Esus4/Db=x07600
-Esus4/Eb=x21200
-Esus4/F=003200
-Esus4/G=3x2200
-Esus4/G=x02000
-Esus4/G=x05450
-Esus4/Gb=x04400
-Esus4/Gb=x24252
-CATEGORY=F
-F=133211
-F=x03210
-F=x33211
-F=xx3211
-F#5=x03221
-F#=244322
-F/D=x57565
-F/D=xx0211
-F/D=xx0565
-F/E=003210
-F/E=133210
-F/E=1x2210
-F/E=xx2211
-F/E=xx3210
-F/Eb=xx1211
-F/Eb=xx3545
-F/G=3x3211
-F/G=xx3213
-F5=133xx1
-F6=x57565
-F6=xx0211
-F6=xx0565
-F6/add9=3x0211
-F7=xx1211
-F7=xx3545
-Fadd9=3x3211
-Fadd9=xx3213
-Faug/D=xx0221
-Faug/G=103021
-Fdim/D=x20101
-Fdim/D=xx0101
-Fdim/D=xx3434
-Fdim/Db=x43404
-Fdim7=x20101
-Fdim7=xx0101
-Fdim7=xx3434
-Fm=x33111
-Fm=xx3111
-Fm/D=xx0111
-Fm/Db=x33121
-Fm/Db=x46564
-Fm/Eb=x81089
-Fm/Eb=xx1111
-Fm6=xx0111
-Fm7=xx1111
-Fmaj7=003210
-Fmaj7=133210
-Fmaj7=1x2210
-Fmaj7=xx2211
-Fmaj7=xx3210
-Fmaj7/#11=023210
-Fmaj7/#11=133200
-Fmaj9=003013
-Fsus4=xx3311
-Fsus2=x33011
-Fsus2=xx3011
-Fsus2/A=3x3211
-Fsus2/A=xx3213
-Fsus2/B=x33003
-Fsus2/Bb=x35363
-Fsus2/D=330011
-Fsus2/E=x33010
-Fsus2/E=xx3010
-Fsus4/G=x35363
-F#m=244222
-F#m7=242222
-CATEGORY=G
-G=320003
-G/B=320033
-G=355433
-G=3x0003
-G=x55433
-G#5=321003
-G#=466544
-G#m=466444
-G/A=300003
-G/A=320203
-G/C=330003
-G/C=x30003
-G/E=020000
-G/E=020030
-G/E=022030
-G/E=022033
-G/E=xx0121
-G/E=xx0987
-G/E=xx2433
-G/E=0x0000
-G/E=x10121
-G/F=1x0003
-G/F=320001
-G/F=xx0001
-G/Gb=220003
-G/Gb=220033
-G/Gb=320002
-G/Gb=xx4433
-G5=355xx3
-G5=3x0033
-G6=020000
-G6=320000
-G6=022030
-G6=022033
-G6=xx0121
-G6=xx0987
-G6=xx2433
-G6=0x0000
-G6=x10121
-G6/add9=000000
-G6/add9=000003
-G6/add9=3x0200
-G7=1x0003
-G7=320001
-G7=xx0001
-G7/add11=x30001
-G7sus4=330011
-G9=x00001
-G9=x23233
-Gadd9=300003
-Gadd9=320203
-Gaug/E=3x1000
-Gaug/E=xx1000
-Gb=244322
-Gb=x44322
-Gb=xx4322
-Gb#5=xx0332
-Gb/Ab=xx4324
-Gb/E=242322
-Gb/E=xx4320
-Gb/Eb=xx1322
-Gb/F=xx3322
-Gb6=xx1322
-Gb7=242322
-Gb7=xx4320
-Gb7(#5)=2x4330
-Gb7/#9=x04320
-Gb7sus4=x444x0
-Gbadd9=xx4324
-Gbaug/E=2x4330
-Gbdim/D=x57572
-Gbdim/D=x00212
-Gbdim/D=x3x232
-Gbdim/D=x57575
-Gbdim/E=x02212
-Gbdim/E=xx2212
-Gbdim/Eb=xx1212
-Gbdim7=xx1212
-Gbm=244222
-Gbm=x44222
-Gbm=xx4222
-Gbm/D=xx0141
-Gbm/D=xx0222
-Gbm/E=002222
-Gbm/E=0x4220
-Gbm/E=2x2220
-Gbm/E=x04220
-Gbm/E=xx2222
-Gbm7=002222
-Gbm7=0x4220
-Gbm7=2x2220
-Gbm7=x04220
-Gbm7=xx2222
-Gbm7(b5)=x02212
-Gbm7(b5)=xx2212
-Gbm7/b9=002022
-Gbmaj7=xx3322
-Gbsus4=x44422
-Gbsus2/Bb=xx4324
-Gbsus4/E=x444x0
-Gdim/E=x12020
-Gdim/E=xx2323
-Gdim/Eb=x11323
-Gdim/Eb=x68686
-Gdim/Eb=xx1323
-Gdim7=x12020
-Gdim7=xx2323
-Gm=355333
-Gm=xx0333
-Gm/E=3x0330
-Gm/Eb=x68786
-Gm/F=353333
-Gm/F=xx3333
-Gm13=003333
-Gm6=3x0330
-Gm7=353333
-Gm7=xx3333
-Gm7/add11=x33333
-Gm9=353335
-Gmaj7=220003
-Gmaj7=220033
-Gmaj7=320002
-Gmaj7=xx4433
-Gsus4=x10121
-Gsus4=x30033
-Gsus4=x35533
-Gsus4=x55533
-Gsus2=5x0035
-Gadd9=300033
-Gsus2=x00033
-Gsus2=xx0233
-Gsus2/B=300003
-Gsus2/B=320203
-Gsus2/C=x57583
-Gsus2/C=xx0213
-Gsus2/E=x02030
-Gsus2/E=x02033
-Gsus2/E=x02233
-Gsus2/E=500030
-Gsus2/Gb=5x4035
-Gsus2/Gb=3x0232
-Gsus4/A=x57583
-Gsus4/A=xx0213
-Gsus4/B=330003
-Gsus4/B=x30003
-Gsus4/E=3x0010
-Gsus4/E=x30010
-Gsus4/E=x32030
-Gsus4/E=x32033
-Gsus4/E=xx0010
-Gsus4/E=xx0553
-Gsus4/E=x10121
-Gsus4/E=x555x0
-Gsus4/F=330011

Deleted: trunk/src/target/OM-2007/applications/openmoko-chordmaster/ball.png
===================================================================
(Binary files differ)

Deleted: trunk/src/target/OM-2007/applications/openmoko-chordmaster/callbacks.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-chordmaster/callbacks.c	2006-11-12 14:32:14 UTC (rev 214)
+++ trunk/src/target/OM-2007/applications/openmoko-chordmaster/callbacks.c	2006-11-12 14:50:46 UTC (rev 215)
@@ -1,97 +0,0 @@
-#include "callbacks.h"
-
-#include "main.h"
-#include "chordsdb.h"
-#include "fretboard-widget.h"
-
-#include <gtk/gtkwidget.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtktreeselection.h>
-#include <gtk/gtktreeview.h>
-#include <gtk/gtktreemodel.h>
-
-gboolean cb_entry_completion_completed(GtkEntryCompletion *widget, GtkTreeModel *model, GtkTreeIter *iter, ChordMasterData* d)
-{
-    g_debug( "openmoko-chordmaster: entry completion completed" );
-    gchar* name = NULL;
-    gtk_tree_model_get( GTK_TREE_MODEL(model), iter, COLUMN_NAME, &name, -1 );
-    g_debug( "-- selected entry = '%s'", name );
-    GtkTreeIter myiter;
-    gtk_tree_model_filter_convert_iter_to_child_iter( model, &myiter, iter );
-    //GtkTreeSelection* selection = gtk_tree_view_get_selection( d->view );
-    //gtk_tree_selection_select_iter( selection, &myiter );
-    GtkTreePath* path = gtk_tree_model_get_path( d->liststore, &myiter );
-    gtk_tree_view_set_cursor( d->view, path, COLUMN_NAME, FALSE );
-    //gtk_tree_view_scroll_to_cell( d->view, path, NULL, FALSE, 0.5, 0.5 );
-    gtk_tree_path_free( path );
-    return FALSE;
-}
-
-gboolean cb_filter_changed(GtkWidget* widget, gchar* text, ChordMasterData* d)
-{
-    g_debug( "openmoko-chordmaster: filter changed" );
-    g_assert( d->chordsdb );
-    g_assert( d->liststore );
-    gtk_list_store_clear( d->liststore );
-    GtkTreeIter iter;
-    GSList* chords = chordsdb_get_chords( d->chordsdb );
-    for ( ; chords; chords = g_slist_next( chords ) )
-    {
-        Chord* chord = chords->data;
-        if ( strcmp( text, "All") == 0 || text[0] == chord->name[0] )
-        {
-            g_debug( "chordmaster: adding chord '%s' = '%s'", chord->name, chord->frets );
-            gtk_list_store_append( d->liststore, &iter );
-            gtk_list_store_set( d->liststore, &iter, COLUMN_NAME, chord->name, COLUMN_FRETS, chord->frets, -1 );
-        }
-    }
-
-    //g_assert( FALSE );
-    return FALSE;
-}
-
-void cb_button1_clicked(GtkButton *button, ChordMasterData* d)
-{
-    g_debug( "openmoko-chordmaster: button1 clicked" );
-}
-
-void cb_button2_clicked(GtkButton *button, ChordMasterData* d)
-{
-    g_debug( "openmoko-chordmaster: button2 clicked" );
-}
-
-void cb_button3_clicked(GtkButton *button, ChordMasterData* d)
-{
-    g_debug( "openmoko-chordmaster: button3 clicked" );
-}
-
-void cb_button4_clicked(GtkButton *button, ChordMasterData* d)
-{
-    g_debug( "openmoko-chordmaster: button4 clicked" );
-}
-
-void cb_search_visible(MokoToolBox* toolbox, ChordMasterData* d)
-{
-    g_debug( "openmoko-chordmaster: searchbox visible" );
-}
-
-void cb_search_invisible(MokoToolBox* toolbox, ChordMasterData* d)
-{
-    g_debug( "openmoko-chordmaster: searchbox INvisible" );
-}
-
-void cb_cursor_changed(GtkTreeSelection* selection, ChordMasterData* d)
-{
-    g_debug( "openmoko-chordmaster: selection changed" );
-    GtkTreeView* view = gtk_tree_selection_get_tree_view( selection );
-    GtkTreeModel* model;
-    GtkTreeIter iter;
-    gboolean has_selection = gtk_tree_selection_get_selected( selection, &model, &iter );
-
-    gchar* frets = NULL;
-    if ( has_selection )
-        gtk_tree_model_get( model, &iter, COLUMN_FRETS, &frets, -1 );
-
-    fretboard_widget_set_frets( d->fretboard, frets );
-    gtk_widget_queue_draw( GTK_WIDGET(d->fretboard) );
-}

Deleted: trunk/src/target/OM-2007/applications/openmoko-chordmaster/callbacks.h
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-chordmaster/callbacks.h	2006-11-12 14:32:14 UTC (rev 214)
+++ trunk/src/target/OM-2007/applications/openmoko-chordmaster/callbacks.h	2006-11-12 14:50:46 UTC (rev 215)
@@ -1,23 +0,0 @@
-#ifndef _CALLBACKS_H_
-#define _CALLBACKS_H_
-
-#include "main.h"
-
-#include <libmokoui/moko-tool-box.h>
-
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkwidget.h>
-#include <gtk/gtktreeview.h>
-
-#include <glib.h>
-
-gboolean cb_entry_completion_completed(GtkEntryCompletion *widget, GtkTreeModel *model, GtkTreeIter *iter, ChordMasterData* d);
-gboolean cb_filter_changed(GtkWidget* widget, gchar* text, ChordMasterData* d);
-void cb_button1_clicked(GtkButton *button, ChordMasterData* d);
-void cb_button2_clicked(GtkButton *button, ChordMasterData* d);
-void cb_button3_clicked(GtkButton *button, ChordMasterData* d);
-void cb_button4_clicked(GtkButton *button, ChordMasterData* d);
-void cb_cursor_changed(GtkTreeSelection* selection, ChordMasterData* d);
-void cb_search_visible(MokoToolBox* toolbox, ChordMasterData* d);
-void cb_search_invisible(MokoToolBox* toolbox, ChordMasterData* d);
-#endif

Deleted: trunk/src/target/OM-2007/applications/openmoko-chordmaster/chordsdb.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-chordmaster/chordsdb.c	2006-11-12 14:32:14 UTC (rev 214)
+++ trunk/src/target/OM-2007/applications/openmoko-chordmaster/chordsdb.c	2006-11-12 14:50:46 UTC (rev 215)
@@ -1,118 +0,0 @@
-/*  chordsdb.c
- *
- *  Authored By Michael 'Mickey' Lauer <mlauer at vanille-media.de>
- *
- *  Copyright (C) 2006 Vanille-Media
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU Public License as published by
- *  the Free Software Foundation; version 2.1 of the license.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Public License for more details.
- *
- *  Current Version: $Rev$ ($Date: 2006/10/05 17:38:14 $) [$Author: mickey $]
- */
-
-#include "chordsdb.h"
-
-#include <stdio.h>
-
-G_DEFINE_TYPE (ChordsDB, chordsdb, G_TYPE_OBJECT);
-
-#define CHORDSDB_PRIVATE(o)     (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_CHORDSDB, ChordsDBPrivate))
-
-typedef struct _ChordsDBPrivate
-{
-} ChordsDBPrivate;
-
-/* forward declarations */
-Chord* chord_new( gchar* name, gchar* frets )
-{
-    g_debug( "chord_new: adding new chord '%s' = '%s'", name, frets );
-    Chord* chord = g_new( Chord, 1 );
-    chord->name = g_strdup( name );
-    chord->frets = g_strdup( frets );
-    return chord;
-}
-
-static void
-chordsdb_dispose (GObject *object)
-{
-    if (G_OBJECT_CLASS (chordsdb_parent_class)->dispose)
-        G_OBJECT_CLASS (chordsdb_parent_class)->dispose (object);
-}
-
-static void
-chordsdb_finalize (GObject *object)
-{
-    G_OBJECT_CLASS (chordsdb_parent_class)->finalize (object);
-}
-
-static void
-chordsdb_class_init (ChordsDBClass *klass)
-{
-    g_debug( "chordsdb_class_init" );
-    GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
-    /* register private data */
-    g_type_class_add_private (klass, sizeof (ChordsDBPrivate));
-
-    /* hook virtual methods */
-    /* ... */
-
-    /* install properties */
-    /* ... */
-
-    object_class->dispose = chordsdb_dispose;
-    object_class->finalize = chordsdb_finalize;
-
-    FILE* file = g_fopen( RESOURCE_PATH "accords.chords", "r" );
-    g_assert( file ); //FIXME error handling, if chord file is not present
-    gchar line[256];
-    gchar category[2] = { 0, 0 };
-    while( fgets(&line, sizeof(line), file) ) {
-        g_debug( "read line '%s'", &line );
-        if ( strncmp( "CATEGORY=", &line, 8 ) == 0 )
-        {
-            g_debug( "adding category %c", line[9] );
-            category[0] = line[9];
-            klass->categories = g_slist_append( klass->categories, strdup(&category) );
-        }
-        else
-        {
-            gchar* key = strtok( &line, "=\n" );
-            g_assert( key );
-            gchar* val = strtok( NULL, "=\n" );
-            g_assert( val );
-            g_debug( "adding chord '%s' = '%s'", key, val );
-            klass->chords = g_slist_append( klass->chords, chord_new( strdup(key), strdup(val) ) );
-        }
-    }
-    fclose( file );
-}
-
-static void
-chordsdb_init (ChordsDB *self)
-{
-}
-
-ChordsDB*
-chordsdb_new (void)
-{
-    return g_object_new (TYPE_CHORDSDB, NULL);
-}
-
-GSList* chordsdb_get_categories(ChordsDB* self)
-{
-    ChordsDBClass* klass = CHORDSDB_GET_CLASS(self);
-    return klass->categories;
-}
-
-GSList* chordsdb_get_chords(ChordsDB* self )
-{
-    ChordsDBClass* klass = CHORDSDB_GET_CLASS(self);
-    return klass->chords;
-}

Deleted: trunk/src/target/OM-2007/applications/openmoko-chordmaster/chordsdb.h
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-chordmaster/chordsdb.h	2006-11-12 14:32:14 UTC (rev 214)
+++ trunk/src/target/OM-2007/applications/openmoko-chordmaster/chordsdb.h	2006-11-12 14:50:46 UTC (rev 215)
@@ -1,56 +0,0 @@
-/*  chordsdb.h
- *
- *  Authored By Michael 'Mickey' Lauer <mlauer at vanille-media.de>
- *
- *  Copyright (C) 2006 Vanille-Media
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU Public License as published by
- *  the Free Software Foundation; version 2.1 of the license.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Public License for more details.
- *
- *  Current Version: $Rev$ ($Date: 2006/10/05 17:38:14 $) [$Author: mickey $]
- */
-
-#ifndef __CHORDSDB_H_
-#define __CHORDSDB_H_
-
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
-#define TYPE_CHORDSDB chordsdb_get_type()
-#define CHORDSDB(obj)     (G_TYPE_CHECK_INSTANCE_CAST ((obj),     TYPE_CHORDSDB, ChordsDB))
-#define CHORDSDB_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass),     TYPE_CHORDSDB, ChordsDBClass))
-#define IS_CHORDSDB(obj)     (G_TYPE_CHECK_INSTANCE_TYPE ((obj),     TYPE_CHORDSDB))
-#define IS_CHORDSDB_CLASS(klass)     (G_TYPE_CHECK_CLASS_TYPE ((klass),     TYPE_CHORDSDB))
-#define CHORDSDB_GET_CLASS(obj)     (G_TYPE_INSTANCE_GET_CLASS ((obj),     TYPE_CHORDSDB, ChordsDBClass))
-
-typedef struct {
-    gchar* name;
-    gchar* frets;
-} Chord;
-
-typedef struct {
-    GObject parent;
-} ChordsDB;
-
-typedef struct {
-    GObjectClass parent_class;
-    GSList* categories;
-    GSList* chords;
-} ChordsDBClass;
-
-GType chordsdb_get_type (void);
-ChordsDB* chordsdb_new (void);
-GSList* chordsdb_get_categories(ChordsDB* self);
-GSList* chordsdb_get_chords(ChordsDB* self );
-
-G_END_DECLS
-
-#endif // __CHORDSDB_H_
-

Copied: trunk/src/target/OM-2007/applications/openmoko-chordmaster/data/accords.chords (from rev 214, trunk/src/target/OM-2007/applications/openmoko-chordmaster/accords.chords)

Copied: trunk/src/target/OM-2007/applications/openmoko-chordmaster/data/ball.png (from rev 214, trunk/src/target/OM-2007/applications/openmoko-chordmaster/ball.png)

Copied: trunk/src/target/OM-2007/applications/openmoko-chordmaster/data/wood.png (from rev 214, trunk/src/target/OM-2007/applications/openmoko-chordmaster/wood.png)

Deleted: trunk/src/target/OM-2007/applications/openmoko-chordmaster/fretboard-widget.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-chordmaster/fretboard-widget.c	2006-11-12 14:32:14 UTC (rev 214)
+++ trunk/src/target/OM-2007/applications/openmoko-chordmaster/fretboard-widget.c	2006-11-12 14:50:46 UTC (rev 215)
@@ -1,214 +0,0 @@
-/*  fretboard-widget.c
- *
- *  Authored By Michael 'Mickey' Lauer <mlauer at vanille-media.de>
- *
- *  Copyright (C) 2006 Vanille-Media
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU Public License as published by
- *  the Free Software Foundation; version 2.1 of the license.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Public License for more details.
- *
- *  Current Version: $Rev$ ($Date: 2006/10/05 17:38:14 $) [$Author: mickey $]
- */
-
-#include "fretboard-widget.h"
-
-#include <pango/pango.h>
-
-G_DEFINE_TYPE (FretboardWidget, fretboard_widget, GTK_TYPE_DRAWING_AREA);
-
-#define FRETBOARD_PRIVATE(o)     (G_TYPE_INSTANCE_GET_PRIVATE ((o), CHORD_TYPE_FRETBOARD, FretboardWidgetPrivate))
-
-typedef struct _FretboardWidgetPrivate
-{
-} FretboardWidgetPrivate;
-
-/* forward declarations */
-gboolean
-_expose_event_callback(GtkWidget *widget, GdkEventExpose *event, gpointer data)
-{
-    g_debug( "expose event callback" );
-    GError* error = NULL;
-
-    GdkGC* gc = gdk_gc_new( widget->window );
-
-    gchar* frets = NULL;
-    if ( CHORD_FRETBOARD(widget)->frets )
-        frets = g_strdup( CHORD_FRETBOARD(widget)->frets );
-
-    gdk_gc_set_line_attributes(gc, 2, GDK_LINE_SOLID, GDK_CAP_ROUND, GDK_JOIN_MITER );
-
-    // background
-    gdk_draw_pixbuf( widget->window, gc,
-            CHORD_FRETBOARD(widget)->texture,
-            0,
-            0,
-            30,
-            0,
-            -1,
-            -1,
-            GDK_RGB_DITHER_MAX,
-            0,
-            0);
-
-    // frets
-    for ( int i = 0; i < 6; ++i )
-    {
-        GdkColor fretcolor1 = { 0, 0xff <<8, 0xfb <<8, 0xf7 <<8 };
-        GdkColor fretcolor2 = { 0, 0xc6 <<8, 0xb7 <<8, 0xcd <<8 };
-        GdkColor fretcolor3 = { 0, 0x90 <<8, 0x81 <<8, 0x80 <<8 };
-
-        gdk_gc_set_rgb_fg_color( gc, &fretcolor1 );
-        gdk_draw_line( widget->window, gc, 30 + i*80, 0, 30 + i*80, 256 );
-        gdk_gc_set_rgb_fg_color( gc, &fretcolor2 );
-        gdk_draw_line( widget->window, gc, 32 + i*80, 0, 32 + i*80, 256 );
-        gdk_gc_set_rgb_fg_color( gc, &fretcolor3 );
-        gdk_draw_line( widget->window, gc, 34 + i*80, 0, 34 + i*80, 256 );
-    }
-
-    if ( !frets) return TRUE;
-
-    const gchar strings[] = "EBGDAE";
-
-    PangoContext* context = gtk_widget_get_pango_context( widget );
-    PangoLayout* layout = pango_layout_new( context );
-
-    // strings
-    for ( int i = 0; i < 6; ++i )
-    {
-        GdkColor labeloffcolor = { 0, 0xee <<8, 0xee <<8, 0xee <<8 };
-        GdkColor labeloncolor = { 0, 0x44 <<8, 0x44 <<8, 0x44 <<8 };
-        GdkColor stringcolor1 = { 0, 0xff <<8, 0xfb <<8, 0xa7 <<8 };
-        GdkColor stringcolor2 = { 0, 0xe6 <<8, 0xb7 <<8, 0x2d <<8 };
-        GdkColor stringcolor3 = { 0, 0x90 <<8, 0x41 <<8, 0x00 <<8 };
-
-        if ( frets[5-i] == 'x' || frets[5-i] == 'X' )
-        {
-            gdk_gc_set_rgb_fg_color( gc, &labeloffcolor );
-            pango_layout_set_text( layout, "x", 1 );
-            gdk_gc_set_line_attributes(gc, 2, GDK_LINE_ON_OFF_DASH, GDK_CAP_ROUND, GDK_JOIN_MITER );
-        }
-        else
-        {
-            gdk_gc_set_rgb_fg_color( gc, &labeloncolor );
-            pango_layout_set_text( layout, &strings[i], 1 );
-            gdk_gc_set_line_attributes(gc, 2, GDK_LINE_SOLID, GDK_CAP_ROUND, GDK_JOIN_MITER );
-        }
-        //FIXME take font size into account
-        gdk_draw_layout( widget->window, gc, 0, 20 + 40*i, layout );
-
-        gdk_gc_set_rgb_fg_color( gc, &stringcolor1 );
-        gdk_draw_line( widget->window, gc, 30, 30 + i*40, 470, 30 + i*40 );
-        gdk_gc_set_rgb_fg_color( gc, &stringcolor2 );
-        gdk_draw_line( widget->window, gc, 30, 32 + i*40, 470, 32 + i*40 );
-        gdk_gc_set_rgb_fg_color( gc, &stringcolor3 );
-        gdk_draw_line( widget->window, gc, 30, 34 + i*40, 470, 34 + i*40 );
-    }
-
-    // barree
-    gint maxfinger = 0;
-    gint minfinger = 10;
-
-    for ( int i = 0; i < 6; ++i )
-    {
-        if ( frets[i] == 'x' || frets[i] == 'X' || frets[i] == '0' ) continue;
-        gint position = frets[i] - 0x30;
-        if ( position > maxfinger ) maxfinger = position;
-        if ( position < minfinger ) minfinger = position;
-    }
-    if ( maxfinger > 5 )
-    {
-        for ( int i = 0; i < 6; ++i )
-        {
-            if ( frets[i] == 'x' || frets[i] == 'X' || frets[i] == '0' ) continue;
-            frets[i] = ( frets[i]-= minfinger);
-        }
-        gchar barree = 0x30 + minfinger;
-        GdkColor barreecolor = { 0, 0xee <<8, 0x22 <<8, 0x44 <<8 };
-        pango_layout_set_text( layout, &barree, 1 );
-        gdk_gc_set_rgb_fg_color( gc, &barreecolor );
-        //FIXME take font size into account
-        gdk_draw_layout( widget->window, gc, 13, 0, layout );
-    }
-
-    // finger positions
-    for ( int i = 0; i < 6; ++i )
-    {
-        if ( frets[5-i] == 'x' || frets[5-i] == 'X' ) continue;
-        gint position = ( frets[5-i] - 0x30 );
-
-        g_debug( "finger position '%d' = '%d'", i, position );
-
-        if ( position )
-            gdk_draw_pixbuf( widget->window, gc, CHORD_FRETBOARD(widget)->fingerpoint,
-                0, 0,
-                50 + 80*(position-1), 10+40*i,
-                -1, -1,
-                GDK_RGB_DITHER_MAX, 0, 0);
-    }
-    g_free( frets );
-    return TRUE;
-}
-
-static void
-fretboard_widget_dispose (GObject *object)
-{
-    if (G_OBJECT_CLASS (fretboard_widget_parent_class)->dispose)
-        G_OBJECT_CLASS (fretboard_widget_parent_class)->dispose (object);
-}
-
-static void
-fretboard_widget_finalize (GObject *object)
-{
-    G_OBJECT_CLASS (fretboard_widget_parent_class)->finalize (object);
-}
-
-static void
-fretboard_widget_class_init (FretboardWidgetClass *klass)
-{
-    GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
-    /* register private data */
-    g_type_class_add_private (klass, sizeof (FretboardWidgetPrivate));
-
-    /* hook virtual methods */
-    /* ... */
-
-    /* install properties */
-    /* ... */
-
-    object_class->dispose = fretboard_widget_dispose;
-    object_class->finalize = fretboard_widget_finalize;
-}
-
-static void
-fretboard_widget_init (FretboardWidget *self)
-{
-    GError* error = NULL;
-    self->texture = gdk_pixbuf_new_from_file( RESOURCE_PATH "wood.png", &error );
-    self->fingerpoint = gdk_pixbuf_new_from_file( RESOURCE_PATH "ball.png", &error );
-
-    gtk_widget_set_size_request(self, 450, 270);
-    g_signal_connect (G_OBJECT(self), "expose_event",
-                      G_CALLBACK(_expose_event_callback), NULL);
-
-    //FIXME find out how to make the background of the GdkDrawingArea transparent...
-    gtk_widget_set_name( GTK_WIDGET(self), "mokopanedwindow-lower-enclosing" );
-}
-
-FretboardWidget*
-fretboard_widget_new (void)
-{
-    return g_object_new (CHORD_TYPE_FRETBOARD, NULL);
-}
-
-void fretboard_widget_set_frets(FretboardWidget* self, const gchar* frets)
-{
-    //g_free( self->frets ); self->frets = g_strdup( frets );
-    self->frets = frets;
-}

Deleted: trunk/src/target/OM-2007/applications/openmoko-chordmaster/fretboard-widget.h
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-chordmaster/fretboard-widget.h	2006-11-12 14:32:14 UTC (rev 214)
+++ trunk/src/target/OM-2007/applications/openmoko-chordmaster/fretboard-widget.h	2006-11-12 14:50:46 UTC (rev 215)
@@ -1,55 +0,0 @@
-/*  fretboard-widget.h
- *
- *  Authored By Michael 'Mickey' Lauer <mlauer at vanille-media.de>
- *
- *  Copyright (C) 2006 Vanille-Media
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU Public License as published by
- *  the Free Software Foundation; version 2.1 of the license.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Public License for more details.
- *
- *  Current Version: $Rev$ ($Date: 2006/10/05 17:38:14 $) [$Author: mickey $]
- */
-
-#ifndef _CHORD_FRETBOARD_H_
-#define _CHORD_FRETBOARD_H_
-
-#include <gtk/gtkdrawingarea.h>
-
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
-#define CHORD_TYPE_FRETBOARD fretboard_widget_get_type()
-#define CHORD_FRETBOARD(obj)     (G_TYPE_CHECK_INSTANCE_CAST ((obj),     CHORD_TYPE_FRETBOARD, FretboardWidget))
-#define CHORD_FRETBOARD_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass),     CHORD_TYPE_FRETBOARD, FretboardWidgetClass))
-#define CHORD_IS_FRETBOARD(obj)     (G_TYPE_CHECK_INSTANCE_TYPE ((obj),     CHORD_TYPE_FRETBOARD))
-#define CHORD_IS_FRETBOARD_CLASS(klass)     (G_TYPE_CHECK_CLASS_TYPE ((klass),     CHORD_TYPE_FRETBOARD))
-#define CHORD_FRETBOARD_GET_CLASS(obj)     (G_TYPE_INSTANCE_GET_CLASS ((obj),     CHORD_TYPE_FRETBOARD, FretboardWidgetClass))
-
-typedef struct {
-    GtkDrawingArea parent;
-    GdkPixbuf* texture;
-    GdkPixbuf* fingerpoint;
-    gchar* frets;
-} FretboardWidget;
-
-typedef struct {
-    GtkDrawingAreaClass parent_class;
-} FretboardWidgetClass;
-
-GType fretboard_widget_get_type (void);
-
-FretboardWidget* fretboard_widget_new (void);
-
-void fretboard_widget_set_frets(FretboardWidget* self, const gchar* frets);
-
-G_END_DECLS
-
-#endif // _CHORD_FRETBOARD_H_
-

Deleted: trunk/src/target/OM-2007/applications/openmoko-chordmaster/main.c
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-chordmaster/main.c	2006-11-12 14:32:14 UTC (rev 214)
+++ trunk/src/target/OM-2007/applications/openmoko-chordmaster/main.c	2006-11-12 14:50:46 UTC (rev 215)
@@ -1,168 +0,0 @@
-/*
- *  ChordMaster -- A Chord Application for the OpenMoko Framework
- *
- *  Authored By Michael 'Mickey' Lauer <mlauer at vanille-media.de>
- *
- *  Copyright (C) 2006 Vanille-Media
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU Public License as published by
- *  the Free Software Foundation; version 2.1 of the license.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Public License for more details.
- *
- *  Current Version: $Rev$ ($Date$) [$Author$]
- */
-
-#include "callbacks.h"
-#include "chordsdb.h"
-#include "fretboard-widget.h"
-#include "main.h"
-
-#include <libmokoui/moko-application.h>
-#include <libmokoui/moko-paned-window.h>
-#include <libmokoui/moko-tool-box.h>
-#include <libmokoui/moko-tree-view.h>
-
-#include <gtk/gtkbutton.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkliststore.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkscrolledwindow.h>
-
-int main( int argc, char** argv )
-{
-    g_debug( "openmoko-chordmaster starting up" );
-    /* Initialize GTK+ */
-    gtk_init( &argc, &argv );
-
-    /* application data object */
-    ChordMasterData* d = g_new( ChordMasterData, 1 );
-    d->chordsdb = chordsdb_new();
-
-    /* application object */
-    d->app = MOKO_APPLICATION(moko_application_get_instance());
-    g_set_application_name( "ChordMaster" );
-
-    /* ui */
-    setup_ui( d );
-
-    /* show everything and run main loop */
-    gtk_widget_show_all( GTK_WIDGET(d->window) );
-    gtk_main();
-
-    return 0;
-}
-
-void setup_ui( ChordMasterData* d )
-{
-    /* main window */
-    d->window = MOKO_PANED_WINDOW(moko_paned_window_new());
-
-    /* application menu */
-    d->menu = gtk_menu_new();
-    GtkMenuItem* closeitem = GTK_MENU_ITEM(gtk_menu_item_new_with_label( "Close" ));
-    g_signal_connect( G_OBJECT(closeitem), "activate", G_CALLBACK(gtk_main_quit), NULL );
-    gtk_menu_shell_append( GTK_MENU_SHELL(d->menu), GTK_WIDGET(closeitem) );
-    moko_paned_window_set_application_menu( d->window, GTK_MENU(d->menu) );
-
-    /* filter menu */
-    GtkMenu* filtmenu = GTK_MENU(gtk_menu_new());
-    for (GSList* c = chordsdb_get_categories( d->chordsdb ); c; c = g_slist_next(c) )
-    {
-        gchar* category = (gchar*) c->data;
-        g_debug( "adding category '%s'", category );
-        gtk_menu_shell_append( filtmenu, gtk_menu_item_new_with_label( category ) );
-    }
-    gtk_menu_shell_append( filtmenu, gtk_separator_menu_item_new() );
-    gtk_menu_shell_append( filtmenu, gtk_menu_item_new_with_label( "All" ) );
-
-    moko_paned_window_set_filter_menu( d->window, filtmenu );
-    MokoMenuBox* menubox = moko_paned_window_get_menubox( d->window );
-    g_signal_connect( G_OBJECT(menubox), "filter_changed", G_CALLBACK(cb_filter_changed), d );
-
-    /* connect close event */
-    g_signal_connect( G_OBJECT(d->window), "delete_event", G_CALLBACK( gtk_main_quit ), NULL );
-
-    /* toolboox */
-    GtkButton* button1;
-    GtkButton* button2;
-    GtkButton* button3;
-    GtkButton* button4;
-
-    /* tool bar */
-    d->toolbox = MOKO_TOOL_BOX(moko_tool_box_new_with_search());
-    gtk_widget_grab_focus( GTK_WIDGET(d->toolbox) );
-    g_signal_connect( G_OBJECT(d->toolbox), "searchbox_visible", G_CALLBACK(cb_search_visible), d );
-    g_signal_connect( G_OBJECT(d->toolbox), "searchbox_invisible", G_CALLBACK(cb_search_invisible), d );
-
-    button1 = moko_tool_box_add_action_button( d->toolbox );
-    gtk_button_set_label( button1, "Add" );
-    button2 = moko_tool_box_add_action_button( d->toolbox );
-    gtk_button_set_label( button2, "Remove" );
-    button3 = moko_tool_box_add_action_button( d->toolbox );
-    gtk_button_set_label( button3, "ActMenu" );
-    button4 = moko_tool_box_add_action_button( d->toolbox );
-    gtk_button_set_label( button4, "Action 4" );
-    moko_paned_window_add_toolbox( d->window, d->toolbox );
-
-    g_signal_connect( G_OBJECT(button1), "clicked", G_CALLBACK(cb_button1_clicked), d );
-    g_signal_connect( G_OBJECT(button2), "clicked", G_CALLBACK(cb_button2_clicked), d );
-    g_signal_connect( G_OBJECT(button3), "clicked", G_CALLBACK(cb_button3_clicked), d );
-    g_signal_connect( G_OBJECT(button4), "clicked", G_CALLBACK(cb_button4_clicked), d );
-
-    GtkMenu* actionmenu = GTK_MENU(gtk_menu_new());
-    GtkMenuItem* fooitem = GTK_MENU_ITEM(gtk_menu_item_new_with_label( "Foo" ));
-    GtkMenuItem* baritem = GTK_MENU_ITEM(gtk_menu_item_new_with_label( "Bar" ));
-    gtk_widget_show( GTK_WIDGET(fooitem) );
-    gtk_widget_show( GTK_WIDGET(baritem) );
-    gtk_menu_shell_append( GTK_MENU_SHELL(actionmenu), GTK_WIDGET(fooitem) );
-    gtk_menu_shell_append( GTK_MENU_SHELL(actionmenu), GTK_WIDGET(baritem) );
-    moko_pixmap_button_set_menu( MOKO_PIXMAP_BUTTON(button3), actionmenu );
-    gtk_widget_show_all( actionmenu );
-
-    populate_navigation_area( d );
-    populate_details_area( d );
-
-    moko_menu_box_set_active_filter( menubox, "All" );
-}
-
-void populate_navigation_area( ChordMasterData* d )
-{
-    d->liststore = gtk_list_store_new( NUM_COLS, G_TYPE_STRING, G_TYPE_STRING );
-    d->view = moko_tree_view_new_with_model( d->liststore );
-
-    GtkTreeViewColumn* col = moko_tree_view_append_column_new_with_name( d->view, "Chordname" );
-    GtkCellRenderer* ren = gtk_cell_renderer_text_new();
-    gtk_tree_view_column_pack_start( col, ren, TRUE );
-    gtk_tree_view_column_add_attribute( col, ren, "text", COLUMN_NAME );
-
-    col = moko_tree_view_append_column_new_with_name( d->view, "Fretboard" );
-    ren = gtk_cell_renderer_text_new();
-    gtk_tree_view_column_pack_start( col, ren, TRUE );
-    gtk_tree_view_column_add_attribute( col, ren, "text", COLUMN_FRETS );
-
-    moko_paned_window_set_upper_pane( d->window, GTK_WIDGET(moko_tree_view_put_into_scrolled_window(d->view)) );
-
-    GtkTreeSelection* selection = gtk_tree_view_get_selection( d->view );
-    g_signal_connect( G_OBJECT(selection), "changed", G_CALLBACK(cb_cursor_changed), d );
-
-    GtkEntryCompletion* ec = gtk_entry_completion_new();
-    gtk_entry_completion_set_model( ec, d->liststore );
-    gtk_entry_completion_set_text_column( ec, COLUMN_NAME );
-    GtkEntry* entry = moko_tool_box_get_entry( d->toolbox );
-    //FIXME what happens in case the toolbox has no entry?
-    gtk_entry_set_completion( entry, ec );
-    g_signal_connect( G_OBJECT(ec), "match-selected", G_CALLBACK(cb_entry_completion_completed), d );
-}
-
-void populate_details_area( ChordMasterData* d )
-{
-    d->fretboard = fretboard_widget_new();
-    moko_paned_window_set_lower_pane( d->window, GTK_WIDGET(d->fretboard) );
-}

Deleted: trunk/src/target/OM-2007/applications/openmoko-chordmaster/main.h
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-chordmaster/main.h	2006-11-12 14:32:14 UTC (rev 214)
+++ trunk/src/target/OM-2007/applications/openmoko-chordmaster/main.h	2006-11-12 14:50:46 UTC (rev 215)
@@ -1,53 +0,0 @@
-/*
- *  ChordMaster -- A Chord Application for the OpenMoko Framework
- *
- *  Authored By Michael 'Mickey' Lauer <mlauer at vanille-media.de>
- *
- *  Copyright (C) 2006 Vanille-Media
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU Public License as published by
- *  the Free Software Foundation; version 2.1 of the license.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU Public License for more details.
- *
- *  Current Version: $Rev$ ($Date$) [$Author$]
- */
-
-#ifndef __MAIN__H_
-#define __MAIN__H_
-
-#include "chordsdb.h"
-#include "fretboard-widget.h"
-
-#include <libmokoui/moko-application.h>
-#include <libmokoui/moko-paned-window.h>
-#include <libmokoui/moko-tool-box.h>
-#include <libmokoui/moko-tree-view.h>
-#include <gtk/gtkliststore.h>
-
-typedef struct _ChordMasterData {
-    MokoApplication* app;
-    MokoPanedWindow* window;
-    GtkMenu* menu;
-    MokoToolBox* toolbox;
-    ChordsDB* chordsdb;
-    FretboardWidget* fretboard;
-    GtkListStore* liststore;
-    MokoTreeView* view;
-} ChordMasterData;
-
-enum {
-    COLUMN_NAME,
-    COLUMN_FRETS,
-    NUM_COLS,
-};
-
-void setup_ui( ChordMasterData* );
-void populate_navigation_area( ChordMasterData* d );
-void populate_details_area( ChordMasterData* d );
-
-#endif

Modified: trunk/src/target/OM-2007/applications/openmoko-chordmaster/openmoko-chordmaster.pro
===================================================================
--- trunk/src/target/OM-2007/applications/openmoko-chordmaster/openmoko-chordmaster.pro	2006-11-12 14:32:14 UTC (rev 214)
+++ trunk/src/target/OM-2007/applications/openmoko-chordmaster/openmoko-chordmaster.pro	2006-11-12 14:50:46 UTC (rev 215)
@@ -1,6 +1,6 @@
 MOKOCONFIG = mokoui
 
-HEADERS = callbacks.h chordsdb.h fretboard-widget.h main.h
-SOURCES = callbacks.c chordsdb.c fretboard-widget.c main.c
+HEADERS = src/callbacks.h src/chordsdb.h src/fretboard-widget.h src/main.h
+SOURCES = src/callbacks.c src/chordsdb.c src/fretboard-widget.c src/main.c
 
 include ( $(OPENMOKODIR)/devel/qmake/openmoko-include.pro )

Copied: trunk/src/target/OM-2007/applications/openmoko-chordmaster/src/callbacks.c (from rev 214, trunk/src/target/OM-2007/applications/openmoko-chordmaster/callbacks.c)

Copied: trunk/src/target/OM-2007/applications/openmoko-chordmaster/src/callbacks.h (from rev 214, trunk/src/target/OM-2007/applications/openmoko-chordmaster/callbacks.h)

Copied: trunk/src/target/OM-2007/applications/openmoko-chordmaster/src/chordsdb.c (from rev 214, trunk/src/target/OM-2007/applications/openmoko-chordmaster/chordsdb.c)

Copied: trunk/src/target/OM-2007/applications/openmoko-chordmaster/src/chordsdb.h (from rev 214, trunk/src/target/OM-2007/applications/openmoko-chordmaster/chordsdb.h)

Copied: trunk/src/target/OM-2007/applications/openmoko-chordmaster/src/fretboard-widget.c (from rev 214, trunk/src/target/OM-2007/applications/openmoko-chordmaster/fretboard-widget.c)

Copied: trunk/src/target/OM-2007/applications/openmoko-chordmaster/src/fretboard-widget.h (from rev 214, trunk/src/target/OM-2007/applications/openmoko-chordmaster/fretboard-widget.h)

Copied: trunk/src/target/OM-2007/applications/openmoko-chordmaster/src/main.c (from rev 214, trunk/src/target/OM-2007/applications/openmoko-chordmaster/main.c)

Copied: trunk/src/target/OM-2007/applications/openmoko-chordmaster/src/main.h (from rev 214, trunk/src/target/OM-2007/applications/openmoko-chordmaster/main.h)

Deleted: trunk/src/target/OM-2007/applications/openmoko-chordmaster/wood.png
===================================================================
(Binary files differ)





More information about the commitlog mailing list