diff --git a/lang/german.ts b/lang/german.ts index d26b443b..60a1b481 100644 --- a/lang/german.ts +++ b/lang/german.ts @@ -61,97 +61,97 @@ MainWnd - + VBA-M - + &File &Datei - + &Settings &Einstellungen - + &Tools &Werkzeuge - + &Help &Hilfe - + About &OpenGL... Über &OpenGL... - + About &VBA-M... Über &VBA-M... - + About &Qt... Über &Qt... - + This program is licensed under terms of the GNU General Public License. Dieses Programm ist unter den Bedingungen der GNU General Public License lizenziert. - + OpenGL version 2.1 is present. OpenGL Version 2.1 ist verfügbar. - + OpenGL version 2.0 is present. OpenGL Version 2.0 ist verfügbar. - + OpenGL version 1.5 is present. OpenGL Version 1.5 ist verfügbar. - + OpenGL version 1.4 is present. OpenGL Version 1.4 ist verfügbar. - + OpenGL version 1.3 is present. OpenGL Version 1.3 ist verfügbar. - + OpenGL version 1.2 is present. OpenGL Version 1.2 ist verfügbar. - + OpenGL version 1.1 is present. OpenGL Version 1.1 ist verfügbar. - + OpenGL is NOT available! OpenGL ist NICHT verfügbar! - + About VBA-M Über VBA-M - + About OpenGL Über OpenGL @@ -171,44 +171,74 @@ Übersetzungsdateien (*.qm) - + .qm - + Exit Beenden - + Select language... Sprache auswählen... - + Select language Sprache auswählen - + Language files (*.qm) Sprachdateien (*.qm) - + Error! Fehler! - + Language file can not be loaded! Sprachdatei kann nicht geladen werden! - + Enable translation Übersetzung aktivieren + + + +No language file loaded. + +Deutsche Übersetzung von spacy. + + + + Cheats + + + + + sidewidget_cheats + + + Enable + Aktivieren + + + + Search... + Suchen... + + + + Cheats + + diff --git a/lang/spanish.ts b/lang/spanish.ts index ee0e3bd0..2b91b9d7 100644 --- a/lang/spanish.ts +++ b/lang/spanish.ts @@ -3,22 +3,22 @@ MainWnd - + VBA-M VBA-M - + &File &Archivo - + Exit Salir - + &Settings &Ajustes @@ -28,27 +28,27 @@ Seleccione traducción... - + &Tools &Herramientas - + &Help &Ayuda - + About &VBA-M... Sobre &VBA-M... - + About &OpenGL... Sobre &OpenGL... - + About &Qt... Sobre &Qt... @@ -63,94 +63,123 @@ Archivos de traducción (*.qm) - + .qm .qm - + About VBA-M Sobre VBA-M - + This program is licensed under terms of the GNU General Public License. Este programa se licencia bajo los términos de la Licencia Pública General GNU. - + OpenGL version 2.1 is present. OpenGL versión 2.1 está presente. - + OpenGL version 2.0 is present. OpenGL versión 2.0 está presente. - + OpenGL version 1.5 is present. OpenGL versión 1.5 está presente. - + OpenGL version 1.4 is present. OpenGL versión 1.4 está presente. - + OpenGL version 1.3 is present. OpenGL versión 1.3 está presente. - + OpenGL version 1.2 is present. OpenGL versión 1.2 está presente. - + OpenGL version 1.1 is present. OpenGL versión 1.1 está presente. - + OpenGL is NOT available! ¡OpenGL no está disponible! - + About OpenGL Sobre OpenGL - + Select language... Seleccione traducción... - + Select language Seleccione traducción - + Language files (*.qm) Archivos de traducción (*.qm) - + Error! - + Language file can not be loaded! - + Enable translation + + + +No language file loaded. + + + + + Cheats + + + + + sidewidget_cheats + + + Enable + + + + + Search... + + + + + Cheats + + diff --git a/project/qmake/vba-m.pro b/project/qmake/vba-m.pro index dc1a28c5..13a00c10 100644 --- a/project/qmake/vba-m.pro +++ b/project/qmake/vba-m.pro @@ -3,6 +3,9 @@ CONFIG += qt release QT += opengl TARGET = VisualBoyAdvance +TRANSLATIONS += ../../lang/german.ts +TRANSLATIONS += ../../lang/spanish.ts + PRECOMPILED_HEADER = ../../src/qt/precompile.h HEADERS += ../../src/qt/main.h @@ -14,5 +17,6 @@ SOURCES += ../../src/qt/MainWnd.cpp HEADERS += ../../src/qt/glwidget.h SOURCES += ../../src/qt/glwidget.cpp -TRANSLATIONS += ../../lang/german.ts -TRANSLATIONS += ../../lang/spanish.ts +FORMS += ../../src/qt/sidewidget_cheats.ui +HEADERS += ../../src/qt/sidewidget_cheats.h +SOURCES += ../../src/qt/sidewidget_cheats.cpp diff --git a/project/vc2008/vba-m.vcproj b/project/vc2008/vba-m.vcproj index c271ea83..0bdc85a4 100644 --- a/project/vc2008/vba-m.vcproj +++ b/project/vc2008/vba-m.vcproj @@ -29,7 +29,7 @@ CleanCommandLine="nmake distclean rmdir /S /Q debug rmdir /S /Q release" Output="$(OutDir)\VisualBoyAdvance.exe" PreprocessorDefinitions="WIN32;_DEBUG" - IncludeSearchPath="" + IncludeSearchPath=""$(ProjectDir)"" ForcedIncludes="" AssemblySearchPath="" ForcedUsingAssemblies="" @@ -49,7 +49,7 @@ CleanCommandLine="nmake distclean rmdir /S /Q debug rmdir /S /Q release" Output="$(OutDir)\VisualBoyAdvance.exe" PreprocessorDefinitions="WIN32;NDEBUG" - IncludeSearchPath="" + IncludeSearchPath=""$(ProjectDir)"" ForcedIncludes="" AssemblySearchPath="" ForcedUsingAssemblies="" @@ -88,6 +88,26 @@ > + + + + + + + + + + addAction( tr( "About &Qt..." ), this, SLOT( showAboutQt() ) ); } +void MainWnd::createDockWidgets() +{ + if( dockWidget_cheats != 0 ) { + delete dockWidget_cheats; + dockWidget_cheats = 0; + } + + // Cheat Widget + dockWidget_cheats = new QDockWidget( tr( "Cheats" ), this ); + SideWidget_Cheats *sw_cheats = new SideWidget_Cheats( dockWidget_cheats ); + dockWidget_cheats->setAllowedAreas( Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea ); + dockWidget_cheats->setWidget( sw_cheats ); + addDockWidget( Qt::LeftDockWidgetArea, dockWidget_cheats ); +} + bool MainWnd::createDisplay() { if( !QGLFormat::hasOpenGL() ) return false; @@ -182,13 +200,19 @@ bool MainWnd::enableTranslation( bool enable ) // the user might have to restart the application to apply changes completely createActions(); createMenus(); + createDockWidgets(); return true; } void MainWnd::showAbout() { - QMessageBox::about( this, tr( "About VBA-M" ), - tr( "This program is licensed under terms of the GNU General Public License." ) ); + QString info; + info += tr ( "This program is licensed under terms of the GNU General Public License." ); + + // translators may use this string to give informations about the language file + info += tr ( "\nNo language file loaded." ); + + QMessageBox::about( this, tr( "About VBA-M" ), info ); } void MainWnd::showAboutQt() diff --git a/src/qt/MainWnd.h b/src/qt/MainWnd.h index 6573c36c..c1afb8b7 100644 --- a/src/qt/MainWnd.h +++ b/src/qt/MainWnd.h @@ -35,6 +35,7 @@ public slots: private: void createActions(); void createMenus(); + void createDockWidgets(); bool createDisplay(); QApplication *theApp; @@ -44,6 +45,7 @@ private: QAction *enableTranslationAct; QMenu *toolsMenu; QMenu *helpMenu; + QDockWidget *dockWidget_cheats; private slots: bool selectLanguage(); diff --git a/src/qt/sidewidget_cheats.cpp b/src/qt/sidewidget_cheats.cpp new file mode 100644 index 00000000..e16c04f2 --- /dev/null +++ b/src/qt/sidewidget_cheats.cpp @@ -0,0 +1,24 @@ +// VBA-M, A Nintendo Handheld Console Emulator +// Copyright (C) 2008 VBA-M development team +// +// 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, 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 "sidewidget_cheats.h" + +SideWidget_Cheats::SideWidget_Cheats( QWidget *parent ) + : QWidget( parent ) +{ + ui.setupUi( this ); +} diff --git a/src/qt/sidewidget_cheats.h b/src/qt/sidewidget_cheats.h new file mode 100644 index 00000000..2b48911a --- /dev/null +++ b/src/qt/sidewidget_cheats.h @@ -0,0 +1,36 @@ +// VBA-M, A Nintendo Handheld Console Emulator +// Copyright (C) 2008 VBA-M development team +// +// 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, 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. + +#ifndef SIDEWIDGET_CHEAT_H +#define SIDEWIDGET_CHEAT_H + +#include "precompile.h" + +#include "ui_sidewidget_cheats.h" + +class SideWidget_Cheats : public QWidget +{ + Q_OBJECT + +public: + SideWidget_Cheats( QWidget *parent = 0 ); + +private: + Ui::sidewidget_cheats ui; +}; + +#endif // #ifndef SIDEWIDGET_CHEAT_H diff --git a/src/qt/sidewidget_cheats.ui b/src/qt/sidewidget_cheats.ui new file mode 100644 index 00000000..858fdfdf --- /dev/null +++ b/src/qt/sidewidget_cheats.ui @@ -0,0 +1,40 @@ + + sidewidget_cheats + + + + 0 + 0 + 143 + 126 + + + + + 96 + 0 + + + + Cheats + + + + + + Enable + + + + + + + Search... + + + + + + + +