Commit 05f8b4f8 authored by Thomas Maass's avatar Thomas Maass

Imported Upstream version 0.34

parent 0671ada0
This diff is collapsed.
......@@ -10,7 +10,11 @@
#if QMC2_JOYSTICK == 1
#if defined(Q_WS_WIN)
#if defined(QMC2_MINGW)
#include <SDL/SDL.h>
#else
#include <SDL.h>
#endif
#else
#include <SDL/SDL.h>
#endif
......@@ -44,6 +48,10 @@ About::About(QWidget *parent)
widgetPosValid = FALSE;
ignoreResizeAndMove = TRUE;
#if defined(QMC2_EMUTYPE_MESS)
labelLogoPixmap->setPixmap(QString::fromUtf8(":/data/img/qmc2_mess_logo_big.png"));
#endif
adjustSize();
#if defined(Q_WS_MAC)
......@@ -109,10 +117,7 @@ void About::showEvent(QShowEvent *e)
"<p><font size=\"+1\"><b>QMC2 - M.E.S.S. Catalog / Launcher II</b></font><br>" +
#endif
tr("Qt 4 based multi-platform/multi-emulator front end") + "<br>" +
tr("Version ") + QString::number(MAJOR) + "." + QString::number(MINOR) +
#ifdef BETA
".b" + QString::number(BETA) +
#endif
tr("Version ") + QString(XSTR(QMC2_VERSION)) +
#if QMC2_SVN_REV > 0
" (" + tr("SVN r%1").arg(QMC2_SVN_REV) + ")" +
#endif
......
MAKE = gmake
OSNAME = FreeBSD
RSYNC = rsync -lr
SED = sed -E
......
Debian.cfg
\ No newline at end of file
Debian.cfg
\ No newline at end of file
MAKE = gmake
OSNAME = NetBSD
RSYNC = rsync -lr
SED = sed -E
......
MAKE = gmake
OSNAME = SunOS
COLRM = arch/SunOS/colrm
SED = sed
......
QMAKEFILE = Makefile.qmake
QMAKE = qmake
ifndef MAKE
MAKE = make
endif
MAKESILENT = $(MAKE) --silent
LUPDATE = lupdate
LRELEASE = lrelease
MKDIR = md
RM = del
RMDIR = rd
MV = ren
CD = cd
CP = copy /y
CAT = type
OSNAME = Windows
@echo off
for /f %%F in ("%1") do set dn=%%~dpF
echo %dn:\=/%
@echo off
echo IDI_ICON1 ICON DISCARDABLE "data\\img\\mess.ico" > qmc2-mess.rc
echo IDI_ICON1 ICON DISCARDABLE "data\\img\\mame.ico" > qmc2-mame.rc
\ No newline at end of file
@echo off
rem
rem Windows replacement for the UNIX command 'which' (well, similar)
rem
set OLD_PATH=%PATH%
set PATH=.;%PATH%
if "%1" == "" (
@echo Usage:
@echo.
@echo which 'cmd'
@echo.
@echo.if 'cmd' is not found, ERRORLEVEL is set to 1
@echo.
) else (
( @for %%f in (%1 %1.exe %1.cmd %1.bat %1.pif) do if not "%%~$PATH:f" == "" ( @echo %%~$PATH:f ) else @set ERRORLEVEL=1)
)
set PATH=%OLD_PATH%
\ No newline at end of file
......@@ -2,8 +2,10 @@ QMAKEFILE = Makefile.qmake
QMAKE = qmake
LUPDATE = lupdate
LRELEASE = lrelease
ifndef MAKE
MAKE = make
MAKESILENT = make --silent
endif
MAKESILENT = $(MAKE) --silent
MKDIR = mkdir -p
RM = rm -f
LN = ln
......@@ -12,6 +14,7 @@ MV = mv
TIME = time
CD = cd
CP = cp
CAT = cat
RSYNC = rsync -rlpt
DATE = date +%Y%m%d%H%M%S
COLRM = colrm
......
#include "macros.h"
#if QMC2_USE_PHONON_API == 1
#if QMC2_USE_PHONON_API
#include <QSettings>
#include "audioeffects.h"
......@@ -24,32 +24,47 @@ AudioEffectDialog::AudioEffectDialog(QWidget *parent)
effectDescriptions = Phonon::BackendCapabilities::availableAudioEffects();
foreach (Phonon::EffectDescription description, effectDescriptions) {
QString descriptionName = description.name();
QTreeWidgetItem *effectItem = new QTreeWidgetItem(treeWidgetAudioEffects);
effectItem->setText(QMC2_AUDIOEFFECT_COLUMN_NAME, description.name());
effectItem->setText(QMC2_AUDIOEFFECT_COLUMN_NAME, descriptionName);
effectItem->setText(QMC2_AUDIOEFFECT_COLUMN_DESC, description.description());
QCheckBox *effectEnabler = new QCheckBox(this);
checkBoxItemMap[effectEnabler] = effectItem;
effectEnablerMap[description.name()] = effectEnabler;
effectEnablerMap[descriptionName] = effectEnabler;
connect(effectEnabler, SIGNAL(toggled(bool)), this, SLOT(checkBoxToggled(bool)));
effectEnabler->setToolTip(tr("Enable effect '%1'").arg(description.name()));
effectEnabler->setToolTip(tr("Enable effect '%1'").arg(descriptionName));
treeWidgetAudioEffects->setItemWidget(effectItem, QMC2_AUDIOEFFECT_COLUMN_ENABLE, effectEnabler);
effectMap[description.name()] = new Phonon::Effect(description);
effectWidgetMap[description.name()] = new Phonon::EffectWidget(effectMap[description.name()]);
effectWidgetMap[description.name()]->setWindowFlags(Qt::Dialog);
if ( effectMap[description.name()]->parameters().count() > 0 ) {
Phonon::Effect *ef = new Phonon::Effect(description);
if ( !ef )
continue;
effectMap[descriptionName] = ef;
#if !defined(QMC2_NOEFFECTDIALOGS)
Phonon::EffectWidget *efw = new Phonon::EffectWidget(effectMap[descriptionName]);
if ( !efw )
continue;
effectWidgetMap[descriptionName] = efw;
effectWidgetMap[descriptionName]->setWindowFlags(Qt::Dialog);
if ( effectMap[descriptionName]->parameters().count() > 0 ) {
QToolButton *effectSetupButton = new QToolButton(this);
toolButtonItemMap[effectSetupButton] = effectItem;
effectSetupButtonMap[description.name()] = effectSetupButton;
connect(effectSetupButton, SIGNAL(clicked(bool)), this, SLOT(toolButtonClicked()));
effectSetupButton->setToolTip(tr("Setup effect '%1'").arg(description.name()));
effectSetupButton->setToolTip(tr("Setup effect '%1'").arg(descriptionName));
effectSetupButton->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
effectSetupButton->setIcon(QIcon(QString::fromUtf8(":/data/img/work.png")));
treeWidgetAudioEffects->setItemWidget(effectItem, QMC2_AUDIOEFFECT_COLUMN_SETUP, effectSetupButton);
}
#endif
}
treeWidgetAudioEffects->sortItems(QMC2_AUDIOEFFECT_COLUMN_NAME, Qt::AscendingOrder);
treeWidgetAudioEffects->resizeColumnToContents(QMC2_AUDIOEFFECT_COLUMN_NAME);
treeWidgetAudioEffects->resizeColumnToContents(QMC2_AUDIOEFFECT_COLUMN_DESC);
treeWidgetAudioEffects->resizeColumnToContents(QMC2_AUDIOEFFECT_COLUMN_ENABLE);
#if !defined(QMC2_NOEFFECTDIALOGS)
treeWidgetAudioEffects->resizeColumnToContents(QMC2_AUDIOEFFECT_COLUMN_SETUP);
#else
treeWidgetAudioEffects->setColumnHidden(QMC2_AUDIOEFFECT_COLUMN_SETUP, true);
#endif
QStringList enabledEffects = qmc2Config->value(QMC2_FRONTEND_PREFIX + "Layout/AudioEffectDialog/EnabledEffects").toStringList();
QStringList validatedEffects;
......@@ -64,6 +79,8 @@ AudioEffectDialog::AudioEffectDialog(QWidget *parent)
qmc2Config->setValue(QMC2_FRONTEND_PREFIX + "Layout/AudioEffectDialog/EnabledEffects", validatedEffects);
else
qmc2Config->remove(QMC2_FRONTEND_PREFIX + "Layout/AudioEffectDialog/EnabledEffects");
adjustIconSizes();
}
AudioEffectDialog::~AudioEffectDialog()
......@@ -77,12 +94,12 @@ AudioEffectDialog::~AudioEffectDialog()
foreach (Phonon::EffectWidget *widget, effectWidgetMap)
if ( widget ) {
widget->close();
delete widget;
widget->deleteLater();
}
foreach (Phonon::Effect *effect, effectMap)
if ( effect )
delete effect;
effect->deleteLater();
}
void AudioEffectDialog::saveEffectSettings()
......@@ -215,6 +232,10 @@ void AudioEffectDialog::showEvent(QShowEvent *e)
treeWidgetAudioEffects->header()->restoreState(qmc2Config->value(QMC2_FRONTEND_PREFIX + "Layout/AudioEffectDialog/EffectListHeaderState").toByteArray());
}
#if defined(QMC2_NOEFFECTDIALOGS)
treeWidgetAudioEffects->setColumnHidden(QMC2_AUDIOEFFECT_COLUMN_SETUP, true);
#endif
e->accept();
}
......
......@@ -2,8 +2,8 @@
#if QMC2_USE_PHONON_API == 1
#ifndef _AUDIOEFFECTS_H
#define _AUDIOEFFECTS_H
#ifndef _AUDIOEFFECTS_H_
#define _AUDIOEFFECTS_H_
#include <QMap>
#include <QString>
......
#include <QApplication>
#include <QLineEdit>
#include "comboeditwidget.h"
#ifdef QMC2_DEBUG
#include "qmc2main.h"
#include "macros.h"
extern MainWindow *qmc2MainWindow;
#endif
ComboBoxEditWidget::ComboBoxEditWidget(QStringList choices, QString curText, QWidget *parent)
: QWidget(parent)
{
#ifdef QMC2_DEBUG
qmc2MainWindow->log(QMC2_LOG_FRONTEND, QString("DEBUG: ComboBoxEditWidget::ComboBoxEditWidget(QStringList choices = ..., QString curText = %1, QWidget *parent = %2").arg(curText).arg((qulonglong) parent));
#endif
setupUi(this);
comboBoxValue->insertItems(0, choices);
connect(comboBoxValue, SIGNAL(editTextChanged(const QString &)), this, SLOT(lineEditValue_textChanged(const QString &)));
}
ComboBoxEditWidget::~ComboBoxEditWidget()
{
#ifdef QMC2_DEBUG
qmc2MainWindow->log(QMC2_LOG_FRONTEND, "DEBUG: ComboBoxEditWidget::~ComboBoxEditWidget()");
#endif
}
#ifndef _COMBOEDITWIDGET_H_
#define _COMBOEDITWIDGET_H_
#include "ui_comboeditwidget.h"
class ComboBoxEditWidget : public QWidget, public Ui::ComboBoxEditWidget
{
Q_OBJECT
public:
ComboBoxEditWidget(QStringList, QString, QWidget *parent = 0);
~ComboBoxEditWidget();
public slots:
void lineEditValue_textChanged(const QString &) { emit dataChanged(this); }
signals:
void dataChanged(QWidget *);
};
#endif
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<author>R, Reucher</author>
<class>ComboBoxEditWidget</class>
<widget class="QWidget" name="ComboBoxEditWidget">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>191</width>
<height>36</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout">
<property name="margin">
<number>0</number>
</property>
<item row="0" column="0">
<widget class="QComboBox" name="comboBoxValue">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Minimum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="editable">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</widget>
<layoutdefault spacing="6" margin="6"/>
<resources>
<include location="qmc2.qrc"/>
</resources>
<connections/>
</ui>
This diff is collapsed.
../us/changes.html
\ No newline at end of file
This diff is collapsed.
../us/copying.html
\ No newline at end of file
......@@ -5,7 +5,7 @@
<title>M.A.M.E./M.E.S.S. Catalog / Launcher II Dokumentation - CREDITS</title>
</head>
<body style="color: black; background-image:url(img/doc-bg.jpg);" dir="ltr" alink="#111111" link="#111111" vlink="#999999">
<h3>CREDITS - v0.2.b19, 03-APR-2011</h3>
<h3>CREDITS - v0.34, 15-NOV-2011</h3>
<p>Die folgenden Personen wirkten an der Entwicklung von QMC2 - M.A.M.E./M.E.S.S. Catalog / Launcher II - mit.</p>
<hr>
<p><a name="Rene"></a><img style="border: 0px; width: 76px; height: 80px;" src="img/rene.png" title="Ren&eacute; Reucher"><br>
......@@ -89,7 +89,7 @@ webmaster at arcadehits dot net<br>
</ul>
<hr>
<p><a name="Bill"></a><b>William Blake</b><br>
billb at ydl dot net<br>
wdblake at gmail dot com<br>
<a href="http://www.ps3bodega.com" target="_blank">http://www.ps3bodega.com</a></p>
<ul>
<li>Ideen</li>
......@@ -114,7 +114,7 @@ billb at ydl dot net<br>
vastheman at users dot sourceforge dot net<br>
<a href="http://www.vastheman.com" target="_blank">http://www.vastheman.com</a></p>
<ul>
<li>Verwalter des Mac OS X Ports</li>
<li>Ursprünglicher Verwalter des Mac OS X Ports (nun von <a href="#Rene">Ren&eacute; Reucher</a> verwaltet)</li>
<li>Erzeugung von Universal Binary Paketen f&uuml;r Mac OS X</li>
</ul>
<hr>
......@@ -124,6 +124,21 @@ mmbossoni at users dot sourceforge dot net<br>
<li>Portugiesische &Uuml;bersetzung</li>
<li>Bug-Reports und Feature-Anfragen</li>
<li>Erzeugung bin&auml;rer Pakete f&uuml;r Ubuntu / Debian GNU Linux</li>
<li>Programmierung (Java-basierter Editor f&uuml;r Emulator Templates)</li>
</ul>
<hr>
<p><a name="Dave"></a><b>David Ely</b><br>
eva001 at gmail dot com<br>
<ul>
<li>Erzeugung bin&auml;rer Pakete f&uuml;r Mac OS X</li>
</ul>
<hr>
<p><a name="Anna"></a><b>Anna Wu</b><br>
<ul>
<li>Beta-Tests, Bug-Reports, Feature-Anfragen</li>
<li>Erzeugung bin&auml;rer Pakete f&uuml;r Win32</li>
<li>Erzeugerin des neuen Logos der MESS-Variante(n)</li>
<li>End-Anwender Unterst&uuml;tzung</li>
</ul>
<hr>
<p><a name="Pets"></a>
......
This diff is collapsed.
../us/faq.html
\ No newline at end of file
../us/img
\ No newline at end of file
......@@ -23,7 +23,7 @@
<tr>
<td align="center" valign="center" nowrap>
<font size="+1"><b>Dokumentations-Index</b></font><br>
<font size="-2">INDEX - v0.2.b19, 03-APR-2011</font>
<font size="-2">INDEX - v0.34, 15-NOV-2011</font>
</td>
</tr>
</table>
......@@ -59,6 +59,20 @@
</tr>
</tbody>
</table>
<p>&nbsp;</p>
<table border="0" cellpadding="0" cellspacing="2">
<tr><td>
<a href="http://qmc2.arcadehits.net/wordpress" title="QMC2 Homepage besuchen">
<table cellpadding="0" cellspacing="0" border="0">
<tr>
<td width="120" align="right" background="img/gradient1.png" nowrap></td>
<td align="center" bgcolor="black"><img src="img/qmc2_mess_logo.png" width="240" border="0" nowrap></td>
<td width="120" align="left" background="img/gradient2.png" nowrap></td>
</tr>
</table>
</a>
</tr></td>
</table>
</center>
</body>
</html>
This diff is collapsed.
../us/readme.html
\ No newline at end of file
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
<head>
<meta content="text/html; charset=ISO-8859-1" http-equiv="content-type">
<title>M.A.M.E./M.E.S.S. Catalog / Launcher II Documentation - TODO</title>
</head>
<body style="color: black; background-image:url(img/doc-bg.jpg);" dir="ltr" alink="#111111" link="#111111" vlink="#999999">
<h3>TODO - v0.2.b19, 03-APR-2011</h3>
<p><b>Known bugs and restrictions</b></p>
<ul>
<li>Certain GUI styles may cause display problems for the emulator configuration widgets</li>
<li>The built-in joystick GUI control includes support for trackballs -- this is completely untested due to the lack of controllers with trackballs (it should basically work, but be prepared for bugs and unexpected behavior!)</li>
<li>The icon sizes of all menu actions are not adjusted to the actual font size -- this is a Qt restriction, and I have not yet found a way to work around this restriction... however, it's just a minor/cosmetic issue</li>
<li>On UNIX / X11 platforms, the QMC2 variant launcher will try to raise a probably already running <i>other</i> variant -- this feature is <b>very</b> dependent on the window manager which may decide to ignore XMapRaised()</li>
<li>Variant launching does not work on Windows yet</li>
<li>MAME/MESS output notifiers are not supported on Windows yet</li>
<li>The MiniWebBrowser -- used for the MAWS lookup and the documentation browser -- has a fairly restrictive set of features which is tailored to the uses of QMC2.