diff --git a/CMakeLists.txt b/CMakeLists.txt
index fe624215..1f512bae 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -210,6 +210,6 @@ IF( CAN_BUILD_GVBAM )
INSTALL(PROGRAMS gvbam DESTINATION bin)
INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/gtk/vba.glade DESTINATION ${DATA_INSTALL_DIR})
- INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/gtk/icons/vba-m.png DESTINATION ${DATA_INSTALL_DIR}/icons)
+ INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/src/gtk/icons/gbadvance.svg DESTINATION ${DATA_INSTALL_DIR}/icons)
ENDIF( CAN_BUILD_GVBAM )
diff --git a/debian/gvbam.desktop b/debian/gvbam.desktop
index 41d7bda4..4caea54a 100644
--- a/debian/gvbam.desktop
+++ b/debian/gvbam.desktop
@@ -6,5 +6,5 @@ Name=VBA-M
GenericName=GameBoy Advance Emulator
Comment=Nindendo GameBoy Advance Emulator
Exec=gvbam
-Icon=vbam-icon.png
+Icon=vbam-icon.svg
Categories=Application;Game;Emulator;GTK
diff --git a/debian/rules b/debian/rules
index 7903d660..c7ce01e6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -51,7 +51,7 @@ install: build
# Add here commands to install the package into debian/vbam.
$(MAKE) DESTDIR=$(CURDIR)/debian/vbam install
install -c -m 644 -D debian/gvbam.desktop debian/vbam/usr/share/applications/gvbam.desktop
- install -c -m 644 -D src/gtk/icons/vba-m.png debian/vbam/usr/share/pixmaps/vbam-icon.png
+ install -c -m 644 -D src/gtk/icons/gbadvance.svg debian/vbam/usr/share/pixmaps/vbam-icon.svg
# Build architecture-independent files here.
binary-indep: build install
diff --git a/src/gtk/icons/gbadvance.svg b/src/gtk/icons/gbadvance.svg
new file mode 100644
index 00000000..764018e7
--- /dev/null
+++ b/src/gtk/icons/gbadvance.svg
@@ -0,0 +1,934 @@
+
+
+
diff --git a/src/gtk/icons/vba-m.png b/src/gtk/icons/vba-m.png
deleted file mode 100644
index b2d68afb..00000000
Binary files a/src/gtk/icons/vba-m.png and /dev/null differ
diff --git a/src/gtk/main.cpp b/src/gtk/main.cpp
index 3b1aeb1c..4104004a 100644
--- a/src/gtk/main.cpp
+++ b/src/gtk/main.cpp
@@ -29,12 +29,6 @@
using Gnome::Glade::Xml;
-static void vSetDefaultWindowIcon()
-{
- Glib::RefPtr pixBuf= Gdk::Pixbuf::create_from_file(PKGDATADIR "/icons/vba-m.png");
- Gtk::Window::set_default_icon(pixBuf);
-}
-
int main(int argc, char * argv[])
{
bool bShowVersion = false;
@@ -85,7 +79,7 @@ int main(int argc, char * argv[])
exit(0);
}
- vSetDefaultWindowIcon();
+ Gtk::Window::set_default_icon_from_file(PKGDATADIR "/icons/gbadvance.svg");
Glib::RefPtr poXml;
try
diff --git a/src/gtk/vba.glade b/src/gtk/vba.glade
index 41aa7e93..a965936d 100644
--- a/src/gtk/vba.glade
+++ b/src/gtk/vba.glade
@@ -1580,113 +1580,6 @@
-
- About VBA
- GTK_WIN_POS_CENTER_ON_PARENT
- True
- GDK_WINDOW_TYPE_HINT_DIALOG
-
-
- True
-
-
- True
- 0
- 0
-
-
-
-
-
- 2
-
-
-
-
- True
- True
- 5
- 5
- True
- GTK_JUSTIFY_CENTER
- True
-
-
- False
- 3
-
-
-
-
- True
- True
- 5
- 5
- An emulator for Gameboy(TM) and GameboyAdvance(TM).
- GTK_JUSTIFY_CENTER
- True
- True
-
-
- False
- 4
-
-
-
-
- True
- True
- 5
- 5
- <i>Special thanks to Yann Parmentier aka "kohai" for the icons.</i>
- True
- True
-
-
- False
- 5
-
-
-
-
- True
- True
- 5
- 5
- <small>Copyright (C) 2004 Forgotten and the VBA development team</small>
- True
- GTK_JUSTIFY_CENTER
- True
- True
-
-
- False
- 6
-
-
-
-
- True
- GTK_BUTTONBOX_END
-
-
- True
- True
- True
- gtk-close
- True
- -7
-
-
-
-
- False
- GTK_PACK_END
-
-
-
-
-
Throttle
GTK_WIN_POS_CENTER_ON_PARENT
@@ -1791,13 +1684,36 @@
5
4
-
+
+ True
+ 1
+ GBA roms :
+
+
+ GTK_FILL
+ GTK_EXPAND
+
+
+
+
+ True
+ True
+ *
+
+
+ 1
+ 2
+ GTK_EXPAND
+
+
+
+
True
True
GTK_RELIEF_NONE
0
-
+
True
gtk-cancel
@@ -1806,239 +1722,43 @@
2
3
+ GTK_FILL
+ GTK_EXPAND
+
+
+
+
+ True
+ True
+ GTK_RELIEF_NONE
+ 0
+
+
+ True
+ gtk-open
+
+
+
+
+ 3
+ 4
+ GTK_FILL
+ GTK_EXPAND
+
+
+
+
+ True
+ 1
+ GB roms :
+
+
1
2
GTK_FILL
GTK_EXPAND
-
-
- True
- True
- *
-
-
- 1
- 2
- 1
- 2
- GTK_EXPAND
-
-
-
-
- True
- True
- GTK_RELIEF_NONE
- 0
-
-
- True
- gtk-open
-
-
-
-
- 3
- 4
- 4
- 5
- GTK_FILL
- GTK_EXPAND
-
-
-
-
- True
- True
- GTK_RELIEF_NONE
- 0
-
-
- True
- gtk-cancel
-
-
-
-
- 2
- 3
- 4
- 5
- GTK_FILL
- GTK_EXPAND
-
-
-
-
- True
- True
- *
-
-
- 1
- 2
- 4
- 5
- GTK_EXPAND
-
-
-
-
- True
- 1
- Captures :
-
-
- 4
- 5
- GTK_FILL
- GTK_EXPAND
-
-
-
-
- True
- True
- GTK_RELIEF_NONE
- 0
-
-
- True
- gtk-open
-
-
-
-
- 3
- 4
- 3
- 4
- GTK_FILL
- GTK_EXPAND
-
-
-
-
- True
- True
- GTK_RELIEF_NONE
- 0
-
-
- True
- gtk-cancel
-
-
-
-
- 2
- 3
- 3
- 4
- GTK_FILL
- GTK_EXPAND
-
-
-
-
- True
- True
- *
-
-
- 1
- 2
- 3
- 4
- GTK_EXPAND
-
-
-
-
- True
- 1
- Saves :
-
-
- 3
- 4
- GTK_FILL
- GTK_EXPAND
-
-
-
-
- True
- True
- GTK_RELIEF_NONE
- 0
-
-
- True
- gtk-cancel
-
-
-
-
- 2
- 3
- 2
- 3
- GTK_FILL
- GTK_EXPAND
-
-
-
-
- True
- True
- GTK_RELIEF_NONE
- 0
-
-
- True
- gtk-open
-
-
-
-
- 3
- 4
- 2
- 3
- GTK_FILL
- GTK_EXPAND
-
-
-
-
- True
- True
- *
-
-
- 1
- 2
- 2
- 3
- GTK_EXPAND
-
-
-
-
- True
- 1
- Batteries :
-
-
- 2
- 3
- GTK_FILL
- GTK_EXPAND
-
-
True
@@ -2062,26 +1782,40 @@
-
+
True
1
- GB roms :
+ Batteries :
- 1
- 2
+ 2
+ 3
GTK_FILL
GTK_EXPAND
-
+
+ True
+ True
+ *
+
+
+ 1
+ 2
+ 2
+ 3
+ GTK_EXPAND
+
+
+
+
True
True
GTK_RELIEF_NONE
0
-
+
True
gtk-open
@@ -2090,18 +1824,20 @@
3
4
+ 2
+ 3
GTK_FILL
GTK_EXPAND
-
+
True
True
GTK_RELIEF_NONE
0
-
+
True
gtk-cancel
@@ -2110,12 +1846,27 @@
2
3
+ 2
+ 3
GTK_FILL
GTK_EXPAND
-
+
+ True
+ 1
+ Saves :
+
+
+ 3
+ 4
+ GTK_FILL
+ GTK_EXPAND
+
+
+
+
True
True
*
@@ -2123,16 +1874,158 @@
1
2
+ 3
+ 4
GTK_EXPAND
-
+
True
- 1
- GBA roms :
+ True
+ GTK_RELIEF_NONE
+ 0
+
+
+ True
+ gtk-cancel
+
+
+ 2
+ 3
+ 3
+ 4
+ GTK_FILL
+ GTK_EXPAND
+
+
+
+
+ True
+ True
+ GTK_RELIEF_NONE
+ 0
+
+
+ True
+ gtk-open
+
+
+
+
+ 3
+ 4
+ 3
+ 4
+ GTK_FILL
+ GTK_EXPAND
+
+
+
+
+ True
+ 1
+ Captures :
+
+
+ 4
+ 5
+ GTK_FILL
+ GTK_EXPAND
+
+
+
+
+ True
+ True
+ *
+
+
+ 1
+ 2
+ 4
+ 5
+ GTK_EXPAND
+
+
+
+
+ True
+ True
+ GTK_RELIEF_NONE
+ 0
+
+
+ True
+ gtk-cancel
+
+
+
+
+ 2
+ 3
+ 4
+ 5
+ GTK_FILL
+ GTK_EXPAND
+
+
+
+
+ True
+ True
+ GTK_RELIEF_NONE
+ 0
+
+
+ True
+ gtk-open
+
+
+
+
+ 3
+ 4
+ 4
+ 5
+ GTK_FILL
+ GTK_EXPAND
+
+
+
+
+ True
+ True
+ *
+
+
+ 1
+ 2
+ 1
+ 2
+ GTK_EXPAND
+
+
+
+
+ True
+ True
+ GTK_RELIEF_NONE
+ 0
+
+
+ True
+ gtk-cancel
+
+
+
+
+ 2
+ 3
+ 1
+ 2
GTK_FILL
GTK_EXPAND
@@ -2197,154 +2090,52 @@
2
5
-
+
+ True
+ True
+ False
+ *
+
+
+ 1
+ 2
+ GTK_FILL
+ GTK_EXPAND
+
+
+
+
True
1
- Up :
+ Down :
+ 1
+ 2
GTK_FILL
GTK_EXPAND
-
+
True
- True
- False
- *
+ 1
+ Left :
- 1
- 2
- 11
- 12
+ 2
+ 3
GTK_FILL
GTK_EXPAND
-
+
True
- True
- False
- *
+ 1
+ Right :
- 1
- 2
- 10
- 11
- GTK_FILL
- GTK_EXPAND
-
-
-
-
- True
- True
- False
- *
-
-
- 1
- 2
- 9
- 10
- GTK_FILL
- GTK_EXPAND
-
-
-
-
- True
- True
- False
- *
-
-
- 1
- 2
- 8
- 9
- GTK_FILL
- GTK_EXPAND
-
-
-
-
- True
- True
- False
- *
-
-
- 1
- 2
- 7
- 8
- GTK_FILL
- GTK_EXPAND
-
-
-
-
- True
- True
- False
- *
-
-
- 1
- 2
- 6
- 7
- GTK_FILL
- GTK_EXPAND
-
-
-
-
- True
- True
- False
- *
-
-
- 1
- 2
- 5
- 6
- GTK_FILL
- GTK_EXPAND
-
-
-
-
- True
- True
- False
- *
-
-
- 1
- 2
- 4
- 5
- GTK_FILL
- GTK_EXPAND
-
-
-
-
- True
- True
- False
- *
-
-
- 1
- 2
3
4
GTK_FILL
@@ -2352,17 +2143,105 @@
-
+
True
- True
- False
- *
+ 1
+ Button A :
- 1
- 2
- 2
- 3
+ 4
+ 5
+ GTK_FILL
+ GTK_EXPAND
+
+
+
+
+ True
+ 1
+ Button B :
+
+
+ 5
+ 6
+ GTK_FILL
+ GTK_EXPAND
+
+
+
+
+ True
+ 1
+ Button L :
+
+
+ 6
+ 7
+ GTK_FILL
+ GTK_EXPAND
+
+
+
+
+ True
+ 1
+ Button R :
+
+
+ 7
+ 8
+ GTK_FILL
+ GTK_EXPAND
+
+
+
+
+ True
+ 1
+ Select :
+
+
+ 8
+ 9
+ GTK_FILL
+ GTK_EXPAND
+
+
+
+
+ True
+ 1
+ Start :
+
+
+ 9
+ 10
+ GTK_FILL
+ GTK_EXPAND
+
+
+
+
+ True
+ 1
+ Speed :
+
+
+ 10
+ 11
+ GTK_FILL
+ GTK_EXPAND
+
+
+
+
+ True
+ 1
+ Capture :
+
+
+ 11
+ 12
GTK_FILL
GTK_EXPAND
@@ -2384,150 +2263,7 @@
-
- True
- 1
- Capture :
-
-
- 11
- 12
- GTK_FILL
- GTK_EXPAND
-
-
-
-
- True
- 1
- Speed :
-
-
- 10
- 11
- GTK_FILL
- GTK_EXPAND
-
-
-
-
- True
- 1
- Start :
-
-
- 9
- 10
- GTK_FILL
- GTK_EXPAND
-
-
-
-
- True
- 1
- Select :
-
-
- 8
- 9
- GTK_FILL
- GTK_EXPAND
-
-
-
-
- True
- 1
- Button R :
-
-
- 7
- 8
- GTK_FILL
- GTK_EXPAND
-
-
-
-
- True
- 1
- Button L :
-
-
- 6
- 7
- GTK_FILL
- GTK_EXPAND
-
-
-
-
- True
- 1
- Button B :
-
-
- 5
- 6
- GTK_FILL
- GTK_EXPAND
-
-
-
-
- True
- 1
- Button A :
-
-
- 4
- 5
- GTK_FILL
- GTK_EXPAND
-
-
-
-
- True
- 1
- Right :
-
-
- 3
- 4
- GTK_FILL
- GTK_EXPAND
-
-
-
-
- True
- 1
- Left :
-
-
- 2
- 3
- GTK_FILL
- GTK_EXPAND
-
-
-
-
- True
- 1
- Down :
-
-
- 1
- 2
- GTK_FILL
- GTK_EXPAND
-
-
-
-
+
True
True
False
@@ -2536,6 +2272,163 @@
1
2
+ 2
+ 3
+ GTK_FILL
+ GTK_EXPAND
+
+
+
+
+ True
+ True
+ False
+ *
+
+
+ 1
+ 2
+ 3
+ 4
+ GTK_FILL
+ GTK_EXPAND
+
+
+
+
+ True
+ True
+ False
+ *
+
+
+ 1
+ 2
+ 4
+ 5
+ GTK_FILL
+ GTK_EXPAND
+
+
+
+
+ True
+ True
+ False
+ *
+
+
+ 1
+ 2
+ 5
+ 6
+ GTK_FILL
+ GTK_EXPAND
+
+
+
+
+ True
+ True
+ False
+ *
+
+
+ 1
+ 2
+ 6
+ 7
+ GTK_FILL
+ GTK_EXPAND
+
+
+
+
+ True
+ True
+ False
+ *
+
+
+ 1
+ 2
+ 7
+ 8
+ GTK_FILL
+ GTK_EXPAND
+
+
+
+
+ True
+ True
+ False
+ *
+
+
+ 1
+ 2
+ 8
+ 9
+ GTK_FILL
+ GTK_EXPAND
+
+
+
+
+ True
+ True
+ False
+ *
+
+
+ 1
+ 2
+ 9
+ 10
+ GTK_FILL
+ GTK_EXPAND
+
+
+
+
+ True
+ True
+ False
+ *
+
+
+ 1
+ 2
+ 10
+ 11
+ GTK_FILL
+ GTK_EXPAND
+
+
+
+
+ True
+ True
+ False
+ *
+
+
+ 1
+ 2
+ 11
+ 12
+ GTK_FILL
+ GTK_EXPAND
+
+
+
+
+ True
+ 1
+ Up :
+
+
GTK_FILL
GTK_EXPAND
diff --git a/src/gtk/windowcallbacks.cpp b/src/gtk/windowcallbacks.cpp
index e12addeb..2896cf48 100644
--- a/src/gtk/windowcallbacks.cpp
+++ b/src/gtk/windowcallbacks.cpp
@@ -1226,22 +1226,33 @@ void Window::vOnGDBDisconnect()
void Window::vOnHelpAbout()
{
- Glib::RefPtr poXml;
- poXml = Xml::create(PKGDATADIR "/vba.glade", "AboutDialog");
+ Gtk::AboutDialog oAboutDialog;
+
+ oAboutDialog.set_transient_for(*this);
- Gtk::Dialog * poDialog = dynamic_cast(poXml->get_widget("AboutDialog"));
- poDialog->set_transient_for(*this);
+ oAboutDialog.set_name("VBA-M");
+ oAboutDialog.set_version(VERSION);
+ oAboutDialog.set_comments(_("Nintendo GameBoy Advance emulator."));
+ oAboutDialog.set_license("GPL");
- Gtk::Image oIcon(PKGDATADIR "/vba-64.png");
- oIcon.show();
- Gtk::Container * poIconContainer = dynamic_cast(poXml->get_widget("AboutIconContainer"));
- poIconContainer->add(oIcon);
+ oAboutDialog.set_website("http://vba-m.ngemu.com");
- Gtk::Label * poLabel = dynamic_cast(poXml->get_widget("VersionLabel"));
- poLabel->set_markup("" PACKAGE " " VERSION "");
-
- poDialog->run();
- delete poDialog;
+ std::list list_authors;
+ list_authors.push_back("Forgotten");
+ list_authors.push_back("kxu");
+ list_authors.push_back("Pokemonhacker");
+ list_authors.push_back("Spacy51");
+ list_authors.push_back("mudlord");
+ list_authors.push_back("Nach");
+ list_authors.push_back("jbo_85");
+ list_authors.push_back("bgK");
+ oAboutDialog.set_authors(list_authors);
+
+ std::list list_artists;
+ list_artists.push_back("Matteo Drera");
+ oAboutDialog.set_artists(list_artists);
+
+ oAboutDialog.run();
}
bool Window::bOnEmuIdle()