summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/powerchord/fretboard.cpp16
-rw-r--r--noncore/multimedia/powerchord/powerchordbase.cpp17
2 files changed, 16 insertions, 17 deletions
diff --git a/noncore/multimedia/powerchord/fretboard.cpp b/noncore/multimedia/powerchord/fretboard.cpp
index bf78e4c..2e48f26 100644
--- a/noncore/multimedia/powerchord/fretboard.cpp
+++ b/noncore/multimedia/powerchord/fretboard.cpp
@@ -1,176 +1,174 @@
//
// FretBoard class to display interface for chord finder application
//
// Copyright (c) 2001 Camilo Mesias
// camilo@mesias.co.uk
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
// of the License, or (at your option) any later version.
//
// 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 General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-//#include <FL/Fl.H>
-//#include <FL/Fl_Widget.H>
-//#include <FL/fl_draw.H>
-#include <stdio.h>
-#include <qpe/resource.h>
#include "fretboard.h"
+
+#include <opie2/oresource.h>
+
#include <qpainter.h>
void FretBoard::refresh(){
ce.calculate();
emit nameChanged(QString(ce.label()));
for (int i=0;i<6;i++){
Finger(i, ce.finger(i));
// yuk
switch (i) {
case 0:
emit s1nameChanged(QString(ce.name(i)));
break;
case 1:
emit s2nameChanged(QString(ce.name(i)));
break;
case 2:
emit s3nameChanged(QString(ce.name(i)));
break;
case 3:
emit s4nameChanged(QString(ce.name(i)));
break;
case 4:
emit s5nameChanged(QString(ce.name(i)));
break;
case 5:
emit s6nameChanged(QString(ce.name(i)));
break;
}
}
update();
}
FretBoard::FretBoard(QWidget *parent, const char *name )
: QWidget( parent, name ), ce()
{
ce.base(9);
ce.chord(0);
ce.fret(0);
ce.span(1);
ce.vary(7);
ce.tune(0);
refresh();
// setPalette( QPalette( QColor( 250, 250, 200) ) );
- stringtop_pix = Resource::loadPixmap( "powerchord/stringtop_s");
- string_pix = Resource::loadPixmap( "powerchord/string_s");
- finger_pix = Resource::loadPixmap( "powerchord/justfing_s");
- mute_pix = Resource::loadPixmap( "powerchord/muted_s");
+ stringtop_pix = Opie::Core::OResource::loadPixmap( "powerchord/stringtop_s");
+ string_pix = Opie::Core::OResource::loadPixmap( "powerchord/string_s");
+ finger_pix = Opie::Core::OResource::loadPixmap( "powerchord/justfing_s");
+ mute_pix = Opie::Core::OResource::loadPixmap( "powerchord/muted_s");
// box(FL_NO_BOX);
// finger[0] = OPEN;
// finger[1] = OPEN;
// finger[2] = OPEN;
// finger[3] = OPEN;
// finger[4] = OPEN;
// finger[5] = OPEN;
initial_fret = 0;
// label(FL_NORMAL_LABEL, "Chord");
}
// int FretBoard::Finger(int f){
// if (f < 0 || f > 5){
// fprintf(stderr, "Error - finger value was %d\n", f);
// return 0;
// }
// return finger[f];
// }
void FretBoard::Finger(int f, int position){
if (f < 0 || f > 5){
fprintf(stderr, "Error - finger2 value was %d\n", f);
return;
}
finger[f] = position;
}
// void FretBoard::draw(void) {
// draw_box();
// draw_label();
// }
// void FretBoard::draw_label(void) {
// align(FL_ALIGN_CENTER | FL_ALIGN_TOP | FL_ALIGN_WRAP);
// this->Fl_Widget::draw_label();
// }
//void FretBoard::draw_box(void) {
void FretBoard::paintEvent(QPaintEvent *){
// fl_color(FL_WHITE);
// Fl_Widget::draw_box();
// fl_color(FL_BLACK);
QPainter p( this );
p.setBrush(black);
p.translate(0, 0);
// draw each string
for (int f=0; f<=5; f++){
// draw a string starting from the highest visible fret
for (int pp=0; pp<=6; pp++){
int this_fret = initial_fret + pp;
int cx = /* x() + */ 28*f;
int cy = /* y() + */ pp*30;
// fl_color(FL_WHITE);
// fl_rectf(cx, cy, 24, 24);
// p.setBrush(white);
// p.setPen(NoPen);
// p.drawRect( QRect(cx, cy, 24, 24) );
// fl_color(FL_BLACK);
// p.setBrush(black);
// p.setPen(black);
// draw the string unless at top
if (this_fret!=0){
// fl_line(cx+12, cy, cx+12, cy+23);
// p.drawLine(cx+12, cy, cx+12, cy+23);
}
// draw mutes if at top
if (pp == 0 &&
finger[f] == MUTED){
p.drawPixmap(cx,cy,mute_pix);
// fl_line(cx+4, cy+19, cx+19, cy+4);
// p.drawLine(cx+4, cy+19, cx+19, cy+4);
// fl_line(cx+5, cy+19, cx+20, cy+4);
// p.drawLine(cx+5, cy+19, cx+20, cy+4);
// fl_line(cx+4, cy+4, cx+19, cy+19);
// p.drawLine(cx+4, cy+4, cx+19, cy+19);
// fl_line(cx+5, cy+4, cx+20, cy+19);
// p.drawLine(cx+5, cy+4, cx+20, cy+19);
diff --git a/noncore/multimedia/powerchord/powerchordbase.cpp b/noncore/multimedia/powerchord/powerchordbase.cpp
index f0d1487..0efc4bd 100644
--- a/noncore/multimedia/powerchord/powerchordbase.cpp
+++ b/noncore/multimedia/powerchord/powerchordbase.cpp
@@ -1,143 +1,144 @@
/****************************************************************************
** Form implementation generated from reading ui file 'powerchordbase.ui'
**
** Created: Sun Jan 13 23:05:11 2002
** by: The User Interface Compiler (uic)
**
** WARNING! All changes made in this file will be lost!
****************************************************************************/
#include "powerchordbase.h"
#include "fretboard.h"
#include "vumeter.h"
/* OPIE */
#include <opie2/odebug.h>
-#include <qpe/resource.h>
+#include <opie2/oresource.h>
using namespace Opie::Core;
/* QT */
+#include <qbitmap.h>
#include <qcombobox.h>
#include <qlabel.h>
#include <qlistbox.h>
#include <qpushbutton.h>
#include <qspinbox.h>
#include <qtabwidget.h>
#include <qlayout.h>
#include <qtooltip.h>
/*
* Constructs a PowerchordBase which is a child of 'parent', with the
* name 'name' and widget flags set to 'f'
*/
PowerchordBase::PowerchordBase( QWidget* parent, const char* name, WFlags fl )
: QWidget( parent, name, fl )
{
simulation_timer = 0;
audio_timer = 0;
// setPalette( QPalette( QColor( 232, 227, 215) ) );
// QPixmap image0(QString("/opt/Qtopia/pics/powerchord/image0"));
- QPixmap image1 = Resource::loadPixmap( "powerchord/image1");
- QPixmap image2 = Resource::loadPixmap( "powerchord/image2");
- QPixmap image3 = Resource::loadPixmap( "powerchord/image3");
- QPixmap image4 = Resource::loadPixmap( "powerchord/image4");
- QPixmap image5 = Resource::loadPixmap( "powerchord/image5");
- image6 = Resource::loadPixmap( "powerchord/image6");
- image_open = Resource::loadPixmap( "powerchord/image_open");
+ QPixmap image1 = Opie::Core::OResource::loadPixmap( "powerchord/image1");
+ QPixmap image2 = Opie::Core::OResource::loadPixmap( "powerchord/image2");
+ QPixmap image3 = Opie::Core::OResource::loadPixmap( "powerchord/image3");
+ QPixmap image4 = Opie::Core::OResource::loadPixmap( "powerchord/image4");
+ QPixmap image5 = Opie::Core::OResource::loadPixmap( "powerchord/image5");
+ image6 = Opie::Core::OResource::loadPixmap( "powerchord/image6");
+ image_open = Opie::Core::OResource::loadPixmap( "powerchord/image_open");
// image0.setMask(image0.createHeuristicMask());
image1.setMask(image1.createHeuristicMask());
// image2.setMask(image2.createHeuristicMask());
// image3.setMask(image3.createHeuristicMask());
// image4.setMask(image4.createHeuristicMask());
// image5.setMask(image5.createHeuristicMask());
// image6->setMask(image6->createHeuristicMask());
// image_open->setMask(image_open->createHeuristicMask());
if ( !name )
setName( "PowerchordBase" );
resize( 240, 284 );
setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5, (QSizePolicy::SizeType)5, sizePolicy().hasHeightForWidth() ) );
setMinimumSize( QSize( 240, 284 ) );
setMaximumSize( QSize( 240, 284 ) );
setCaption( tr( "Powerchord" ) );
tabs = new QTabWidget( this, "tabs" );
tabs->setEnabled( TRUE );
tabs->setGeometry( QRect( 0, 0, 240, 286 ) );
tabs->setTabPosition( QTabWidget::Bottom );
tab = new QWidget( tabs, "tab" );
chordkey = new QComboBox( FALSE, tab, "chordkey" );
chordkey->insertItem( tr( "maj" ) );
chordkey->insertItem( tr( "min" ) );
chordkey->insertItem( tr( "7th" ) );
chordkey->insertItem( tr( "m7" ) );
chordkey->insertItem( tr( "maj7" ) );
chordkey->insertItem( tr( "6th" ) );
chordkey->insertItem( tr( "m6th" ) );
chordkey->insertItem( tr( "aug" ) );
chordkey->insertItem( tr( "dim" ) );
chordkey->insertItem( tr( "sus4" ) );
chordkey->insertItem( tr( "7sus4" ) );
chordkey->insertItem( tr( "9th" ) );
chordkey->insertItem( tr( "add9" ) );
chordkey->insertItem( tr( "m9th" ) );
chordkey->insertItem( tr( "maj9" ) );
chordkey->insertItem( tr( "sus2" ) );
chordkey->insertItem( tr( "7sus2" ) );
chordkey->insertItem( tr( "11th" ) );
chordkey->insertItem( tr( "m11th" ) );
chordkey->insertItem( tr( "13th" ) );
chordkey->insertItem( tr( "m13th" ) );
chordkey->insertItem( tr( "maj13" ) );
chordkey->insertItem( tr( "6/9" ) );
chordkey->insertItem( tr( "flat5" ) );
chordkey->insertItem( tr( "7#9" ) );
chordkey->insertItem( tr( QString::fromUtf8( "ø7" ) ) );
chordkey->insertItem( tr( "5" ) );
chordkey->setGeometry( QRect( 40, 0, 51, 21 ) );
chordfret = new QComboBox( FALSE, tab, "chordfret" );
chordfret->insertItem( tr( "open" ) );
chordfret->insertItem( tr( "1st" ) );
chordfret->insertItem( tr( "2nd" ) );
chordfret->insertItem( tr( "3rd" ) );
chordfret->insertItem( tr( "4th" ) );
chordfret->insertItem( tr( "5th" ) );
chordfret->insertItem( tr( "6th" ) );
chordfret->insertItem( tr( "7th" ) );
chordfret->insertItem( tr( "8th" ) );
chordfret->insertItem( tr( "9th" ) );
chordfret->insertItem( tr( "10th" ) );
chordfret->insertItem( tr( "11th" ) );
chordfret->insertItem( tr( "12th" ) );
chordfret->insertItem( tr( "13th" ) );
chordfret->insertItem( tr( "14th" ) );
chordfret->insertItem( tr( "15th" ) );
chordfret->insertItem( tr( "16th" ) );
chordfret->setGeometry( QRect( 90, 0, 55, 21 ) ); //cxm less 5 width
chordnote = new QComboBox( FALSE, tab, "chordnote" );
chordnote->insertItem( tr( "C" ) );
chordnote->insertItem( tr( "C#" ) );
chordnote->insertItem( tr( "D" ) );
chordnote->insertItem( tr( "Eb" ) );
chordnote->insertItem( tr( "E" ) );
chordnote->insertItem( tr( "F" ) );
chordnote->insertItem( tr( "F#" ) );
chordnote->insertItem( tr( "G" ) );
chordnote->insertItem( tr( "G#" ) );
chordnote->insertItem( tr( "A" ) );
chordnote->insertItem( tr( "Bb" ) );
chordnote->insertItem( tr( "B" ) );
chordnote->setGeometry( QRect( 0, 0, 40, 21 ) );
chordnote->setCurrentItem( 9 );
QWidget* privateLayoutWidget = new QWidget( tab, "Layout1" );
privateLayoutWidget->setGeometry( QRect( 5, 232, 160, 20 ) );
Layout1 = new QHBoxLayout( privateLayoutWidget );
Layout1->setSpacing( 6 );
Layout1->setMargin( 0 );