Menu
▾
▴
[Alsamodular-commits] ams/src aboutdialog.cpp, NONE, 1.1 aboutdialog.h, NONE, 1.1 Makefile.am, 1.16, 1.17 mainwindow.cpp, 1.22, 1.23 mainwindow.h, 1.9, 1.10 modularsynth.cpp, 1.38, 1.39 modularsynth.h, 1.18, 1.19
Update of /cvsroot/alsamodular/ams/src
In directory vz-cvs-4.sog:/tmp/cvs-serv19548/src
Modified Files:
Makefile.am mainwindow.cpp mainwindow.h modularsynth.cpp
modularsynth.h
Added Files:
aboutdialog.cpp aboutdialog.h
Log Message:
Add new about dialog.
Index: modularsynth.h
===================================================================
RCS file: /cvsroot/alsamodular/ams/src/modularsynth.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** modularsynth.h 14 Feb 2012 21:14:04 -0000 1.18
--- modularsynth.h 19 Feb 2012 17:18:41 -0000 1.19
***************
*** 140,144 ****
public slots:
- void displayAbout();
void displayMidiController();
void displayParameterView();
--- 140,143 ----
Index: mainwindow.h
===================================================================
RCS file: /cvsroot/alsamodular/ams/src/mainwindow.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** mainwindow.h 11 Feb 2012 09:55:39 -0000 1.9
--- mainwindow.h 19 Feb 2012 17:18:41 -0000 1.10
***************
*** 50,53 ****
--- 50,54 ----
void fileSaveAs();
void updateWindowTitle();
+ void helpAboutAms();
void helpAboutQt();
void recentFileActivated(QAction*);
--- NEW FILE: aboutdialog.cpp ---
/*
About ams dialog
Copyright (C) 2012 Guido Scholz <gui...@ba...>
This file is part of ams.
ams is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License version 2 as
published by the Free Software Foundation.
ams 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 ams. If not, see <http://www.gnu.org/licenses/>.
*/
#include <qfont.h>
#include <QDialogButtonBox>
#include <qlayout.h>
#include <qlabel.h>
#include <qpixmap.h>
#include <QString>
#include <QTabWidget>
#include <QTextEdit>
#include "config.h"
#include "aboutdialog.h"
/* application icon */
#include "../pixmaps/ams_32.xpm"
static const char LICENSE_TEXT[] =
"This program is free software; you can redistribute it and/or\n"
"modify it under the terms of the GNU General Public License\n"
"Version 2 as published by the Free Software Foundation.\n\n"
"This program is distributed in the hope that it will be useful,\n"
"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n"
"GNU General Public License for more details.\n";
AboutDialog::AboutDialog(QWidget* parent): QDialog(parent)
{
setModal(true);
setObjectName("AboutDialog");
setWindowTitle(tr("About %1").arg(PACKAGE));
QVBoxLayout* baseLayout = new QVBoxLayout(this);
baseLayout->setSpacing(10);
setLayout(baseLayout);
QLabel* label;
// first line: pixmap, program name, version
QHBoxLayout* pixmapLayout = new QHBoxLayout();
label = new QLabel(this);
pixmapLayout->addWidget(label);
label->setPixmap(QPixmap(ams_32_xpm));
label = new QLabel(PACKAGE_STRING, this);
pixmapLayout->addWidget(label);
QFont font;
font.setPointSize(18);
font.setWeight(QFont::Bold);
label->setFont(font);
pixmapLayout->addStretch();
baseLayout->addLayout(pixmapLayout);
// second line: description
label = new QLabel(tr(
"AlsaModularSynth (ams) is a realtime modular sythesizer\n"
"and effect processor."
), this);
baseLayout->addWidget(label);
// third line: web link
label = new QLabel("http://alsamodular.sourceforge.net/", this);
baseLayout->addWidget(label);
QTabWidget* tab = new QTabWidget(this);
/*Authors tab*/
QWidget* authors = new QWidget(this);
QVBoxLayout* authorsLayout = new QVBoxLayout(authors);
QTextEdit* authorslist = new QTextEdit();
authorslist->setReadOnly(true);
authorslist->setText(
"Matthias Nagorni and Fons Adriaensen\n"
"(C) 2002-2003 SuSE AG Nuremberg\n"
"(C) 2003 Fons Adriaensen\n"
"(C) 2007 Malte Steiner\n"
"(C) 2007-2011 Karsten Wiese\n"
"(C) 2008-2012 Guido Scholz\n"
);
authorsLayout->addWidget(authorslist);
tab->addTab(authors, tr("&Authors"));
/*Contributors tab*/
QWidget* contributors = new QWidget(this);
QVBoxLayout* contributorsLayout = new QVBoxLayout(contributors);
QTextEdit* contributorslist = new QTextEdit();
contributorslist->setReadOnly(true);
contributorslist->setText(QString::fromUtf8(
"Atte Andre Jensen\n"
"Bill Allen\n"
"Bill Yerazunis\n"
"Christoph Eckert\n"
"Frank Kober\n"
"Frank Neumann\n"
"Jörg Anders\n"
"Sebastien Alaiwan\n"
"Steve Harris\n"
));
contributorsLayout->addWidget(contributorslist);
tab->addTab(contributors, tr("&Contributors"));
/*Thanks tab*/
QWidget* thanks = new QWidget(this);
QVBoxLayout* thanksLayout = new QVBoxLayout(thanks);
QTextEdit* thankslist = new QTextEdit();
thankslist->setReadOnly(true);
thankslist->setLineWrapMode(QTextEdit::NoWrap);
thankslist->setText(QString::fromUtf8(
"The VCF Module uses the resonant low-pass filter by Paul Kellett and\n"
"the Cookbook formulae for audio EQ biquad filter coefficients by\n"
"Robert Bristow-Johnson. The experimental 24 dB Lowpass filters have\n"
"been taken from http://musicdsp.org/. They are based on the CSound\n"
"source code, the paper by Stilson/Smith and modifications by Paul\n"
"Kellett and Timo Tossavainen. The pink noise conversion formula is by\n"
"Paul Kellett and has been taken from http://musicdsp.org/ as well.\n\n"
"The author is grateful to Takashi Iwai for instructions about ALSA.\n"
"Klaas Freitag, Helmut Herold, Stefan Hundhammer and Arvin Schnell\n"
"answered many questions about Qt. Thanks to Jörg Arndt for valuable\n"
"hints regarding speed optimization. Torsten Rahn has helped to\n"
"improve the color scheme of the program. Thanks to Bernhard Kaindl\n"
"for helpful discussion.\n"
));
thanksLayout->addWidget(thankslist);
tab->addTab(thanks, tr("&Thanks"));
/*License tab*/
QWidget* license = new QWidget(this);
QVBoxLayout* licenseLayout = new QVBoxLayout(license);
QTextEdit* licenselist = new QTextEdit();
licenselist->setReadOnly(true);
licenselist->setLineWrapMode(QTextEdit::NoWrap);
licenselist->setText(LICENSE_TEXT);
licenseLayout->addWidget(licenselist);
tab->addTab(license, tr("&License"));
baseLayout->addWidget(tab);
/*OK Button*/
QDialogButtonBox* buttonBox = new QDialogButtonBox(
QDialogButtonBox::Ok);
connect(buttonBox, SIGNAL(accepted()), this, SLOT(accept()));
baseLayout->addWidget(buttonBox);
}
--- NEW FILE: aboutdialog.h ---
/*
About ams dialog
Copyright (C) 2012 Guido Scholz <gui...@ba...>
This file is part of ams.
ams is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License version 2 as
published by the Free Software Foundation.
ams 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 ams. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef ABOUTDIALOG_H
#define ABOUTDIALOG_H
#include <qdialog.h>
class AboutDialog: public QDialog {
Q_OBJECT
public:
AboutDialog(QWidget* parent = 0);
};
#endif //ABOUTDIALOG_H
Index: Makefile.am
===================================================================
RCS file: /cvsroot/alsamodular/ams/src/Makefile.am,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** Makefile.am 14 Feb 2012 21:14:04 -0000 1.16
--- Makefile.am 19 Feb 2012 17:18:41 -0000 1.17
***************
*** 5,8 ****
--- 5,9 ----
# list of all generated (and not distributed) sources
nodist_ams_SOURCES = \
+ aboutdialog_moc.cpp \
box_moc.cpp \
canvas_moc.cpp \
***************
*** 81,84 ****
--- 82,86 ----
# list of all c++ source files
ams_SOURCES = \
+ aboutdialog.cpp \
box.cpp \
canvas.cpp \
***************
*** 164,167 ****
--- 166,170 ----
# list of all header files
noinst_HEADERS = \
+ aboutdialog.h \
box.h \
canvas.h \
Index: mainwindow.cpp
===================================================================
RCS file: /cvsroot/alsamodular/ams/src/mainwindow.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** mainwindow.cpp 18 Feb 2012 21:15:22 -0000 1.22
--- mainwindow.cpp 19 Feb 2012 17:18:41 -0000 1.23
***************
*** 4,7 ****
--- 4,8 ----
#include <QScrollArea>
+ #include "aboutdialog.h"
#include "mainwindow.h"
#include "synthdata.h"
***************
*** 266,271 ****
SLOT(displayPreferences()));
! helpMenu->addAction(tr("&About AlsaModularSynth..."), modularSynth,
! SLOT(displayAbout()));
helpMenu->addAction(tr("About &Qt..."), this,
SLOT(helpAboutQt()));
--- 267,272 ----
SLOT(displayPreferences()));
! helpMenu->addAction(tr("&About AlsaModularSynth..."), this,
! SLOT(helpAboutAms()));
helpMenu->addAction(tr("About &Qt..."), this,
SLOT(helpAboutQt()));
***************
*** 782,783 ****
--- 783,796 ----
modularSynth->refreshColors();
}
+
+ /*show about ams dialog*/
+ void MainWindow::helpAboutAms()
+ {
+ AboutDialog* ad = new AboutDialog(this);
+ if (ad == NULL)
+ return;
+
+ ad->exec();
+ delete ad;
+
+ }
Index: modularsynth.cpp
===================================================================
RCS file: /cvsroot/alsamodular/ams/src/modularsynth.cpp,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** modularsynth.cpp 17 Feb 2012 20:05:58 -0000 1.38
--- modularsynth.cpp 19 Feb 2012 17:18:41 -0000 1.39
***************
*** 342,377 ****
}
- void ModularSynth::displayAbout() {
-
- aboutWidget->about(this, tr("About ") + AMS_LONGNAME,
- AMS_LONGNAME " " VERSION
- "\nby Matthias Nagorni and Fons Adriaensen\n"
- "(c)2002-2003 SuSE AG Nuremberg\n"
- "(c)2003 Fons Adriaensen\n"
- "(c)2007 Malte Steiner\n"
- "(c)2007-2011 Karsten Wiese\n"
- "(c)2008-2012 Guido Scholz\n\n"
- "Documentation and examples can be found in\n"
- "/usr/share/ams\n\n"
- "More presets and updates are available from\n"
- "http://alsamodular.sourceforge.net/"
- "\n\nAcknowledgements\n"
- "----------------------\n\n"
- "The VCF Module uses the resonant low-pass filter by Paul Kellett and\n"
- "the Cookbook formulae for audio EQ biquad filter coefficients by\n"
- "Robert Bristow-Johnson. The experimental 24 dB Lowpass filters have\n"
- "been taken from http://musicdsp.org/. They are based on the CSound source\n"
- "code, the paper by Stilson/Smith and modifications by Paul Kellett\n"
- "and Timo Tossavainen. The pink noise conversion formula is by Paul\n"
- "Kellett and has been taken from http://musicdsp.org/ as well.\n\n"
- "The author is grateful to Takashi Iwai for instructions about ALSA.\n"
- "Klaas Freitag, Helmut Herold, Stefan Hundhammer and Arvin Schnell\n"
- "answered many questions about Qt. Thanks to Jörg Arndt for valuable\n"
- "hints regarding speed optimization. Torsten Rahn has helped to\n"
- "improve the color scheme of the program. Thanks to Bernhard Kaindl\n"
- "for helpful discussion.\n");
- aboutWidget->raise();
- }
-
void ModularSynth::displayMidiController()
{
--- 342,345 ----
|