summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/tonleiter/main.cpp11
-rw-r--r--noncore/multimedia/tonleiter/mainwidget.h2
-rw-r--r--noncore/multimedia/tonleiter/tonleiter.control2
-rw-r--r--noncore/multimedia/tonleiter/tonleiter.pro4
4 files changed, 6 insertions, 13 deletions
diff --git a/noncore/multimedia/tonleiter/main.cpp b/noncore/multimedia/tonleiter/main.cpp
index 0eaa162..4b6a858 100644
--- a/noncore/multimedia/tonleiter/main.cpp
+++ b/noncore/multimedia/tonleiter/main.cpp
@@ -1,19 +1,12 @@
/***************************************************************************
* 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. *
***************************************************************************/
#include "mainwidget.h"
-#include <qpe/qpeapplication.h>
-
-int main(int argc, char* argv[])
-{
- QPEApplication a(argc, argv);
- MainWidget mw;
- a.showMainWidget( &mw);
- return a.exec();
-}
+#include <opie2/oapplicationfactory.h>
+OPIE_EXPORT_APP( Opie::Core::OApplicationFactory<MainWidget> )
diff --git a/noncore/multimedia/tonleiter/mainwidget.h b/noncore/multimedia/tonleiter/mainwidget.h
index 5c0a1f8..684b095 100644
--- a/noncore/multimedia/tonleiter/mainwidget.h
+++ b/noncore/multimedia/tonleiter/mainwidget.h
@@ -1,25 +1,27 @@
#ifndef TONLEITER_MAINWIDGET_H
#define TONLEITER_MAINWIDGET_H
#include <qmainwindow.h>
#include "fretboard.h"
#include "menuwidget.h"
#include "tonleiterdata.h"
class MainWidget : public QMainWindow
{
Q_OBJECT
private:
Data::TonleiterData* data;
Menu::MenuWidget* menuwidget;
Graph::FretBoard* fretboard;
bool showmenu;
public:
MainWidget(QWidget* parent=0,const char* name="MainWidget",WFlags f=0);
virtual ~MainWidget();
+ static QString appName() { return QString::fromLatin1( QUICKAPP_NAME ); }
+
private slots:
void fretboardPressed();
};
#endif //TONLEITER_MAINWIDGET_H
diff --git a/noncore/multimedia/tonleiter/tonleiter.control b/noncore/multimedia/tonleiter/tonleiter.control
index de0eee6..6adc1bc 100644
--- a/noncore/multimedia/tonleiter/tonleiter.control
+++ b/noncore/multimedia/tonleiter/tonleiter.control
@@ -1,9 +1,9 @@
Package: tonleiter
-Files: bin/tonleiter pics/tonleiter apps/Applications/tonleiter.desktop
+Files: plugins/applications/libtonleiter.so* bin/tonleiter pics/tonleiter apps/Applications/tonleiter.desktop
Priority: optional
Section: opie/multimedia
Maintainer: Ralf Waspe <rwaspe@web.de>
Architecture: arm
Depends: task-opie-minimal
Description: Music scales for string instruments
Version: $QPE_VERSION$EXTRAVERSION
diff --git a/noncore/multimedia/tonleiter/tonleiter.pro b/noncore/multimedia/tonleiter/tonleiter.pro
index 4be3bef..f7dfbef 100644
--- a/noncore/multimedia/tonleiter/tonleiter.pro
+++ b/noncore/multimedia/tonleiter/tonleiter.pro
@@ -1,11 +1,9 @@
-TEMPLATE = app
-CONFIG = qt warn_on
+CONFIG = qt quick-app
HEADERS = mainwidget.h tonleiterdata.h tonleiterdatahelper.h fretboard.h menuwidget.h editinst.h editstringwidget.h editscale.h pianoscale.h
SOURCES = mainwidget.cpp tonleiterdata.cpp tonleiterdatahelper.cpp fretboard.cpp menuwidget.cpp main.cpp editinst.cpp editstringwidget.cpp editscale.cpp pianoscale.cpp
INCLUDEPATH += $(OPIEDIR)/include
DEPENDPATH += $(OPIEDIR)/include
LIBS += -lqpe -lopiecore2
TARGET = tonleiter
-DESTDIR = $(OPIEDIR)/bin
include ( $(OPIEDIR)/include.pro )