summaryrefslogtreecommitdiff
authorzecke <zecke>2004-11-15 15:49:06 (UTC)
committer zecke <zecke>2004-11-15 15:49:06 (UTC)
commit97fb9b69240d0daa5222fa9264587cde8b25c117 (patch) (unidiff)
tree87580f4ab843d8d80fa822fcfeecca37c1b9021f
parent4c2680a5cdfaa4ea2bd8881ffeee0f681ba34ead (diff)
downloadopie-97fb9b69240d0daa5222fa9264587cde8b25c117.zip
opie-97fb9b69240d0daa5222fa9264587cde8b25c117.tar.gz
opie-97fb9b69240d0daa5222fa9264587cde8b25c117.tar.bz2
Make Tonleiter QuickLaunchAble
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 @@
1/*************************************************************************** 1/***************************************************************************
2 * This program is free software; you can redistribute it and/or modify * 2 * This program is free software; you can redistribute it and/or modify *
3 * it under the terms of the GNU General Public License as published by * 3 * it under the terms of the GNU General Public License as published by *
4 * the Free Software Foundation; either version 2 of the License, or * 4 * the Free Software Foundation; either version 2 of the License, or *
5 * (at your option) any later version. * 5 * (at your option) any later version. *
6 ***************************************************************************/ 6 ***************************************************************************/
7 7
8#include "mainwidget.h" 8#include "mainwidget.h"
9#include <qpe/qpeapplication.h> 9#include <opie2/oapplicationfactory.h>
10
11int main(int argc, char* argv[])
12{
13 QPEApplication a(argc, argv);
14 MainWidget mw;
15 a.showMainWidget( &mw);
16 return a.exec();
17}
18 10
11OPIE_EXPORT_APP( Opie::Core::OApplicationFactory<MainWidget> )
19 12
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 @@
1#ifndef TONLEITER_MAINWIDGET_H 1#ifndef TONLEITER_MAINWIDGET_H
2#define TONLEITER_MAINWIDGET_H 2#define TONLEITER_MAINWIDGET_H
3 3
4#include <qmainwindow.h> 4#include <qmainwindow.h>
5 5
6#include "fretboard.h" 6#include "fretboard.h"
7#include "menuwidget.h" 7#include "menuwidget.h"
8#include "tonleiterdata.h" 8#include "tonleiterdata.h"
9 9
10class MainWidget : public QMainWindow 10class MainWidget : public QMainWindow
11{ 11{
12 Q_OBJECT 12 Q_OBJECT
13private: 13private:
14 Data::TonleiterData* data; 14 Data::TonleiterData* data;
15 Menu::MenuWidget* menuwidget; 15 Menu::MenuWidget* menuwidget;
16 Graph::FretBoard* fretboard; 16 Graph::FretBoard* fretboard;
17 bool showmenu; 17 bool showmenu;
18public: 18public:
19 MainWidget(QWidget* parent=0,const char* name="MainWidget",WFlags f=0); 19 MainWidget(QWidget* parent=0,const char* name="MainWidget",WFlags f=0);
20 virtual ~MainWidget(); 20 virtual ~MainWidget();
21 static QString appName() { return QString::fromLatin1( QUICKAPP_NAME ); }
22
21private slots: 23private slots:
22 void fretboardPressed(); 24 void fretboardPressed();
23}; 25};
24 26
25#endif //TONLEITER_MAINWIDGET_H 27#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 @@
1Package: tonleiter 1Package: tonleiter
2Files: bin/tonleiter pics/tonleiter apps/Applications/tonleiter.desktop 2Files: plugins/applications/libtonleiter.so* bin/tonleiter pics/tonleiter apps/Applications/tonleiter.desktop
3Priority: optional 3Priority: optional
4Section: opie/multimedia 4Section: opie/multimedia
5Maintainer: Ralf Waspe <rwaspe@web.de> 5Maintainer: Ralf Waspe <rwaspe@web.de>
6Architecture: arm 6Architecture: arm
7Depends: task-opie-minimal 7Depends: task-opie-minimal
8Description: Music scales for string instruments 8Description: Music scales for string instruments
9Version: $QPE_VERSION$EXTRAVERSION 9Version: $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 @@
1TEMPLATE = app 1CONFIG = qt quick-app
2CONFIG = qt warn_on
3HEADERS = mainwidget.h tonleiterdata.h tonleiterdatahelper.h fretboard.h menuwidget.h editinst.h editstringwidget.h editscale.h pianoscale.h 2HEADERS = mainwidget.h tonleiterdata.h tonleiterdatahelper.h fretboard.h menuwidget.h editinst.h editstringwidget.h editscale.h pianoscale.h
4SOURCES = mainwidget.cpp tonleiterdata.cpp tonleiterdatahelper.cpp fretboard.cpp menuwidget.cpp main.cpp editinst.cpp editstringwidget.cpp editscale.cpp pianoscale.cpp 3SOURCES = mainwidget.cpp tonleiterdata.cpp tonleiterdatahelper.cpp fretboard.cpp menuwidget.cpp main.cpp editinst.cpp editstringwidget.cpp editscale.cpp pianoscale.cpp
5INCLUDEPATH += $(OPIEDIR)/include 4INCLUDEPATH += $(OPIEDIR)/include
6DEPENDPATH += $(OPIEDIR)/include 5DEPENDPATH += $(OPIEDIR)/include
7LIBS += -lqpe -lopiecore2 6LIBS += -lqpe -lopiecore2
8TARGET = tonleiter 7TARGET = tonleiter
9DESTDIR = $(OPIEDIR)/bin
10 8
11include ( $(OPIEDIR)/include.pro ) 9include ( $(OPIEDIR)/include.pro )