Menu
▾
▴
[vba-commit] VisualBoyAdvance/src/gtk Makefile.am,1.6,1.7 Makefile.in,1.6,1.7 joypadconfig.cpp,1.1,1.2 main.cpp,1.4,1.5 vba.glade,1.13,1.14 window.cpp,1.20,1.21 windowcallbacks.cpp,1.9,1.10
|
From: S?bastien G. <kx...@us...> - 2004-05-12 01:07:47
|
Update of /cvsroot/vba/VisualBoyAdvance/src/gtk In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23509/src/gtk Modified Files: Makefile.am Makefile.in joypadconfig.cpp main.cpp vba.glade window.cpp windowcallbacks.cpp Log Message: Added icon. More improvements before the first GTK+ interfaced release. Index: main.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/gtk/main.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** main.cpp 5 May 2004 16:01:12 -0000 1.4 --- main.cpp 12 May 2004 01:07:06 -0000 1.5 *************** *** 17,24 **** --- 17,29 ---- // Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + #include <list> + #include <libglademm.h> #include <gtkmm/main.h> + #include <gtkmm/window.h> #include <gtkmm/messagedialog.h> + #include "images/vba-wm-pixbufs.h" + #include "window.h" #include "intl.h" *************** *** 26,29 **** --- 31,54 ---- using Gnome::Glade::Xml; + static void vSetDefaultWindowIcon() + { + const guint8 * apuiInlinePixbuf[] = + { + stock_vba_wm_16, + stock_vba_wm_32, + stock_vba_wm_48, + stock_vba_wm_64 + }; + + std::list<Glib::RefPtr<Gdk::Pixbuf> > listPixbuf; + for (guint i = 0; i < G_N_ELEMENTS(apuiInlinePixbuf); i++) + { + listPixbuf.push_back( + Gdk::Pixbuf::create_from_inline(-1, apuiInlinePixbuf[i])); + } + + Gtk::Window::set_default_icon_list(listPixbuf); + } + int main(int argc, char * argv[]) { *************** *** 37,40 **** --- 62,67 ---- Gtk::Main oKit(argc, argv); + vSetDefaultWindowIcon(); + Glib::RefPtr<Xml> poXml; try Index: Makefile.am =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/gtk/Makefile.am,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Makefile.am 10 May 2004 14:59:43 -0000 1.6 --- Makefile.am 12 May 2004 01:07:06 -0000 1.7 *************** *** 1,2 **** --- 1,4 ---- + SUBDIRS = images + bin_PROGRAMS = gvba Index: window.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/gtk/window.cpp,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** window.cpp 11 May 2004 03:07:30 -0000 1.20 --- window.cpp 12 May 2004 01:07:06 -0000 1.21 *************** *** 264,268 **** iDefaultFrameskip = m_poCoreConfig->oGetKey<int>("frameskip"); } ! for (guint i = 0; i < sizeof(astFrameskip) / sizeof(astFrameskip[0]); i++) { poCMI = dynamic_cast<Gtk::CheckMenuItem *>(_poXml->get_widget(astFrameskip[i].m_csName)); --- 264,268 ---- iDefaultFrameskip = m_poCoreConfig->oGetKey<int>("frameskip"); } ! for (guint i = 0; i < G_N_ELEMENTS(astFrameskip); i++) { poCMI = dynamic_cast<Gtk::CheckMenuItem *>(_poXml->get_widget(astFrameskip[i].m_csName)); *************** *** 300,304 **** int iDefaultThrottle = m_poCoreConfig->oGetKey<int>("throttle"); ! for (guint i = 0; i < sizeof(astThrottle) / sizeof(astThrottle[0]); i++) { poCMI = dynamic_cast<Gtk::CheckMenuItem *>(_poXml->get_widget(astThrottle[i].m_csName)); --- 300,304 ---- int iDefaultThrottle = m_poCoreConfig->oGetKey<int>("throttle"); ! for (guint i = 0; i < G_N_ELEMENTS(astThrottle); i++) { poCMI = dynamic_cast<Gtk::CheckMenuItem *>(_poXml->get_widget(astThrottle[i].m_csName)); *************** *** 330,334 **** }; int iDefaultScale = m_poDisplayConfig->oGetKey<int>("scale"); ! for (guint i = 0; i < sizeof(astVideoScale) / sizeof(astVideoScale[0]); i++) { poCMI = dynamic_cast<Gtk::CheckMenuItem *>(_poXml->get_widget(astVideoScale[i].m_csName)); --- 330,334 ---- }; int iDefaultScale = m_poDisplayConfig->oGetKey<int>("scale"); ! for (guint i = 0; i < G_N_ELEMENTS(astVideoScale); i++) { poCMI = dynamic_cast<Gtk::CheckMenuItem *>(_poXml->get_widget(astVideoScale[i].m_csName)); *************** *** 348,369 **** { const char * m_csName; const int m_iLayer; - const bool m_bChecked; } astLayer[] = { ! { "LayersBg0", 0, m_poCoreConfig->oGetKey<bool>("layer_bg0") }, ! { "LayersBg1", 1, m_poCoreConfig->oGetKey<bool>("layer_bg1") }, ! { "LayersBg2", 2, m_poCoreConfig->oGetKey<bool>("layer_bg2") }, ! { "LayersBg3", 3, m_poCoreConfig->oGetKey<bool>("layer_bg3") }, ! { "LayersObj", 4, m_poCoreConfig->oGetKey<bool>("layer_obj") }, ! { "LayersWin0", 5, m_poCoreConfig->oGetKey<bool>("layer_win0") }, ! { "LayersWin1", 6, m_poCoreConfig->oGetKey<bool>("layer_win1") }, ! { "LayersObjWin", 7, m_poCoreConfig->oGetKey<bool>("layer_objwin") } }; ! for (guint i = 0; i < sizeof(astLayer) / sizeof(astLayer[0]); i++) { poCMI = dynamic_cast<Gtk::CheckMenuItem *>(_poXml->get_widget(astLayer[i].m_csName)); ! poCMI->set_active(astLayer[i].m_bChecked); vOnLayerToggled(poCMI, astLayer[i].m_iLayer); poCMI->signal_toggled().connect(SigC::bind<Gtk::CheckMenuItem *, int>( --- 348,369 ---- { const char * m_csName; + const char * m_csKey; const int m_iLayer; } astLayer[] = { ! { "LayersBg0", "layer_bg0", 0 }, ! { "LayersBg1", "layer_bg1", 1 }, ! { "LayersBg2", "layer_bg2", 2 }, ! { "LayersBg3", "layer_bg3", 3 }, ! { "LayersObj", "layer_obj", 4 }, ! { "LayersWin0", "layer_win0", 5 }, ! { "LayersWin1", "layer_win1", 6 }, ! { "LayersObjWin", "layer_objwin", 7 } }; ! for (guint i = 0; i < G_N_ELEMENTS(astLayer); i++) { poCMI = dynamic_cast<Gtk::CheckMenuItem *>(_poXml->get_widget(astLayer[i].m_csName)); ! poCMI->set_active(m_poCoreConfig->oGetKey<bool>(astLayer[i].m_csKey)); vOnLayerToggled(poCMI, astLayer[i].m_iLayer); poCMI->signal_toggled().connect(SigC::bind<Gtk::CheckMenuItem *, int>( *************** *** 411,415 **** }; EShowSpeed eDefaultShowSpeed = (EShowSpeed)m_poDisplayConfig->oGetKey<int>("show_speed"); ! for (guint i = 0; i < sizeof(astShowSpeed) / sizeof(astShowSpeed[0]); i++) { poCMI = dynamic_cast<Gtk::CheckMenuItem *>(_poXml->get_widget(astShowSpeed[i].m_csName)); --- 411,415 ---- }; EShowSpeed eDefaultShowSpeed = (EShowSpeed)m_poDisplayConfig->oGetKey<int>("show_speed"); ! for (guint i = 0; i < G_N_ELEMENTS(astShowSpeed); i++) { poCMI = dynamic_cast<Gtk::CheckMenuItem *>(_poXml->get_widget(astShowSpeed[i].m_csName)); *************** *** 441,445 **** }; ESaveType eDefaultSaveType = (ESaveType)m_poCoreConfig->oGetKey<int>("save_type"); ! for (guint i = 0; i < sizeof(astSaveType) / sizeof(astSaveType[0]); i++) { poCMI = dynamic_cast<Gtk::CheckMenuItem *>(_poXml->get_widget(astSaveType[i].m_csName)); --- 441,445 ---- }; ESaveType eDefaultSaveType = (ESaveType)m_poCoreConfig->oGetKey<int>("save_type"); ! for (guint i = 0; i < G_N_ELEMENTS(astSaveType); i++) { poCMI = dynamic_cast<Gtk::CheckMenuItem *>(_poXml->get_widget(astSaveType[i].m_csName)); *************** *** 467,471 **** }; int iDefaultFlashSize = m_poCoreConfig->oGetKey<int>("flash_size"); ! for (guint i = 0; i < sizeof(astFlashSize) / sizeof(astFlashSize[0]); i++) { poCMI = dynamic_cast<Gtk::CheckMenuItem *>(_poXml->get_widget(astFlashSize[i].m_csName)); --- 467,471 ---- }; int iDefaultFlashSize = m_poCoreConfig->oGetKey<int>("flash_size"); ! for (guint i = 0; i < G_N_ELEMENTS(astFlashSize); i++) { poCMI = dynamic_cast<Gtk::CheckMenuItem *>(_poXml->get_widget(astFlashSize[i].m_csName)); *************** *** 493,497 **** }; std::string sDefaultScreenshotFormat = m_poCoreConfig->sGetKey("screenshot_format"); ! for (guint i = 0; i < sizeof(astScreenshotFormat) / sizeof(astScreenshotFormat[0]); i++) { poCMI = dynamic_cast<Gtk::CheckMenuItem *>(_poXml->get_widget(astScreenshotFormat[i].m_csName)); --- 493,497 ---- }; std::string sDefaultScreenshotFormat = m_poCoreConfig->sGetKey("screenshot_format"); ! for (guint i = 0; i < G_N_ELEMENTS(astScreenshotFormat); i++) { poCMI = dynamic_cast<Gtk::CheckMenuItem *>(_poXml->get_widget(astScreenshotFormat[i].m_csName)); *************** *** 565,584 **** { const char * m_csName; const int m_iSoundChannel; - const bool m_bChecked; } astSoundChannel[] = { ! { "SoundChannel1", 0, m_poSoundConfig->oGetKey<bool>("channel_1") }, ! { "SoundChannel2", 1, m_poSoundConfig->oGetKey<bool>("channel_2") }, ! { "SoundChannel3", 2, m_poSoundConfig->oGetKey<bool>("channel_3") }, ! { "SoundChannel4", 3, m_poSoundConfig->oGetKey<bool>("channel_4") }, ! { "SoundChannelA", 4, m_poSoundConfig->oGetKey<bool>("channel_A") }, ! { "SoundChannelB", 5, m_poSoundConfig->oGetKey<bool>("channel_B") } }; ! for (guint i = 0; i < sizeof(astSoundChannel) / sizeof(astSoundChannel[0]); i++) { poCMI = dynamic_cast<Gtk::CheckMenuItem *>(_poXml->get_widget(astSoundChannel[i].m_csName)); ! poCMI->set_active(astSoundChannel[i].m_bChecked); vOnSoundChannelToggled(poCMI, astSoundChannel[i].m_iSoundChannel); poCMI->signal_toggled().connect(SigC::bind<Gtk::CheckMenuItem *, int>( --- 565,584 ---- { const char * m_csName; + const char * m_csKey; const int m_iSoundChannel; } astSoundChannel[] = { ! { "SoundChannel1", "channel_1", 0 }, ! { "SoundChannel2", "channel_2", 1 }, ! { "SoundChannel3", "channel_3", 2 }, ! { "SoundChannel4", "channel_4", 3 }, ! { "SoundChannelA", "channel_A", 4 }, ! { "SoundChannelB", "channel_B", 5 } }; ! for (guint i = 0; i < G_N_ELEMENTS(astSoundChannel); i++) { poCMI = dynamic_cast<Gtk::CheckMenuItem *>(_poXml->get_widget(astSoundChannel[i].m_csName)); ! poCMI->set_active(m_poSoundConfig->oGetKey<bool>(astSoundChannel[i].m_csKey)); vOnSoundChannelToggled(poCMI, astSoundChannel[i].m_iSoundChannel); poCMI->signal_toggled().connect(SigC::bind<Gtk::CheckMenuItem *, int>( *************** *** 599,603 **** }; ESoundQuality eDefaultSoundQuality = (ESoundQuality)m_poSoundConfig->oGetKey<int>("quality"); ! for (guint i = 0; i < sizeof(astSoundQuality) / sizeof(astSoundQuality[0]); i++) { poCMI = dynamic_cast<Gtk::CheckMenuItem *>(_poXml->get_widget(astSoundQuality[i].m_csName)); --- 599,603 ---- }; ESoundQuality eDefaultSoundQuality = (ESoundQuality)m_poSoundConfig->oGetKey<int>("quality"); ! for (guint i = 0; i < G_N_ELEMENTS(astSoundQuality); i++) { poCMI = dynamic_cast<Gtk::CheckMenuItem *>(_poXml->get_widget(astSoundQuality[i].m_csName)); *************** *** 629,633 **** }; ESoundVolume eDefaultSoundVolume = (ESoundVolume)m_poSoundConfig->oGetKey<int>("volume"); ! for (guint i = 0; i < sizeof(astSoundVolume) / sizeof(astSoundVolume[0]); i++) { poCMI = dynamic_cast<Gtk::CheckMenuItem *>(_poXml->get_widget(astSoundVolume[i].m_csName)); --- 629,633 ---- }; ESoundVolume eDefaultSoundVolume = (ESoundVolume)m_poSoundConfig->oGetKey<int>("volume"); ! for (guint i = 0; i < G_N_ELEMENTS(astSoundVolume); i++) { poCMI = dynamic_cast<Gtk::CheckMenuItem *>(_poXml->get_widget(astSoundVolume[i].m_csName)); *************** *** 673,677 **** }; EEmulatorType eDefaultEmulatorType = (EEmulatorType)m_poCoreConfig->oGetKey<int>("emulator_type"); ! for (guint i = 0; i < sizeof(astEmulatorType) / sizeof(astEmulatorType[0]); i++) { poCMI = dynamic_cast<Gtk::CheckMenuItem *>(_poXml->get_widget(astEmulatorType[i].m_csName)); --- 673,677 ---- }; EEmulatorType eDefaultEmulatorType = (EEmulatorType)m_poCoreConfig->oGetKey<int>("emulator_type"); ! for (guint i = 0; i < G_N_ELEMENTS(astEmulatorType); i++) { poCMI = dynamic_cast<Gtk::CheckMenuItem *>(_poXml->get_widget(astEmulatorType[i].m_csName)); *************** *** 711,715 **** }; EFilter2x eDefaultFilter2x = (EFilter2x)m_poDisplayConfig->oGetKey<int>("filter2x"); ! for (guint i = 0; i < sizeof(astFilter2x) / sizeof(astFilter2x[0]); i++) { poCMI = dynamic_cast<Gtk::CheckMenuItem *>(_poXml->get_widget(astFilter2x[i].m_csName)); --- 711,715 ---- }; EFilter2x eDefaultFilter2x = (EFilter2x)m_poDisplayConfig->oGetKey<int>("filter2x"); ! for (guint i = 0; i < G_N_ELEMENTS(astFilter2x); i++) { poCMI = dynamic_cast<Gtk::CheckMenuItem *>(_poXml->get_widget(astFilter2x[i].m_csName)); *************** *** 750,754 **** }; EFilterIB eDefaultFilterIB = (EFilterIB)m_poDisplayConfig->oGetKey<int>("filterIB"); ! for (guint i = 0; i < sizeof(astFilterIB) / sizeof(astFilterIB[0]); i++) { poCMI = dynamic_cast<Gtk::CheckMenuItem *>(_poXml->get_widget(astFilterIB[i].m_csName)); --- 750,754 ---- }; EFilterIB eDefaultFilterIB = (EFilterIB)m_poDisplayConfig->oGetKey<int>("filterIB"); ! for (guint i = 0; i < G_N_ELEMENTS(astFilterIB); i++) { poCMI = dynamic_cast<Gtk::CheckMenuItem *>(_poXml->get_widget(astFilterIB[i].m_csName)); *************** *** 802,817 **** struct { - const char * m_csKey; const char * m_csName; const EKeyFlag m_eKeyFlag; } astAutofire[] = { ! { "autofire_A", "AutofireA", KeyFlagA }, ! { "autofire_B", "AutofireB", KeyFlagB }, ! { "autofire_L", "AutofireL", KeyFlagL }, ! { "autofire_R", "AutofireR", KeyFlagR } }; ! for (guint i = 0; i < sizeof(astAutofire) / sizeof(astAutofire[0]); i++) { poCMI = dynamic_cast<Gtk::CheckMenuItem *>(_poXml->get_widget(astAutofire[i].m_csName)); --- 802,817 ---- struct { const char * m_csName; + const char * m_csKey; const EKeyFlag m_eKeyFlag; } astAutofire[] = { ! { "AutofireA", "autofire_A", KeyFlagA }, ! { "AutofireB", "autofire_B", KeyFlagB }, ! { "AutofireL", "autofire_L", KeyFlagL }, ! { "AutofireR", "autofire_R", KeyFlagR } }; ! for (guint i = 0; i < G_N_ELEMENTS(astAutofire); i++) { poCMI = dynamic_cast<Gtk::CheckMenuItem *>(_poXml->get_widget(astAutofire[i].m_csName)); *************** *** 1661,1665 **** Gtk::FileFilter oAllGBAFilter; oAllGBAFilter.set_name(_("All Gameboy Advance files")); ! for (guint i = 0; i < sizeof(acsPattern) / sizeof(acsPattern[0]); i++) { oAllGBAFilter.add_pattern(acsPattern[i]); --- 1661,1665 ---- Gtk::FileFilter oAllGBAFilter; oAllGBAFilter.set_name(_("All Gameboy Advance files")); ! for (guint i = 0; i < G_N_ELEMENTS(acsPattern); i++) { oAllGBAFilter.add_pattern(acsPattern[i]); *************** *** 1855,1859 **** { "Throttle200", 200 } }; ! for (guint i = 0; i < sizeof(astThrottle) / sizeof(astThrottle[0]); i++) { Gtk::CheckMenuItem * poCMI; --- 1855,1859 ---- { "Throttle200", 200 } }; ! for (guint i = 0; i < G_N_ELEMENTS(astThrottle); i++) { Gtk::CheckMenuItem * poCMI; Index: Makefile.in =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/gtk/Makefile.in,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Makefile.in 10 May 2004 14:59:43 -0000 1.6 --- Makefile.in 12 May 2004 01:07:06 -0000 1.7 *************** *** 107,110 **** --- 107,111 ---- VBA_EXTRA = @VBA_EXTRA@ VBA_LIBS = @VBA_LIBS@ + VBA_SRC_EXTRA = @VBA_SRC_EXTRA@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ *************** *** 152,155 **** --- 153,158 ---- target_os = @target_os@ target_vendor = @target_vendor@ + SUBDIRS = images + bin_PROGRAMS = gvba *************** *** 360,367 **** DATA = $(dist_pkgdata_DATA) DIST_COMMON = $(dist_pkgdata_DATA) $(srcdir)/Makefile.in Makefile.am SOURCES = $(libgba_a_SOURCES) $(gvba_SOURCES) ! all: all-am .SUFFIXES: --- 363,377 ---- DATA = $(dist_pkgdata_DATA) + + RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \ + ps-recursive install-info-recursive uninstall-info-recursive \ + all-recursive install-data-recursive install-exec-recursive \ + installdirs-recursive install-recursive uninstall-recursive \ + check-recursive installcheck-recursive DIST_COMMON = $(dist_pkgdata_DATA) $(srcdir)/Makefile.in Makefile.am + DIST_SUBDIRS = $(SUBDIRS) SOURCES = $(libgba_a_SOURCES) $(gvba_SOURCES) ! all: all-recursive .SUFFIXES: *************** *** 1514,1517 **** --- 1524,1586 ---- done + # This directory's subdirectories are mostly independent; you can cd + # into them and run `make' without going through this Makefile. + # To change the values of `make' variables: instead of editing Makefiles, + # (1) if the variable is set in `config.status', edit `config.status' + # (which will cause the Makefiles to be regenerated when you run `make'); + # (2) otherwise, pass the desired values on the `make' command line. + $(RECURSIVE_TARGETS): + @set fnord $$MAKEFLAGS; amf=$$2; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + echo "Making $$target in $$subdir"; \ + if test "$$subdir" = "."; then \ + dot_seen=yes; \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + + mostlyclean-recursive clean-recursive distclean-recursive \ + maintainer-clean-recursive: + @set fnord $$MAKEFLAGS; amf=$$2; \ + dot_seen=no; \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + rev=''; for subdir in $$list; do \ + if test "$$subdir" = "."; then :; else \ + rev="$$subdir $$rev"; \ + fi; \ + done; \ + rev="$$rev ."; \ + target=`echo $@ | sed s/-recursive//`; \ + for subdir in $$rev; do \ + echo "Making $$target in $$subdir"; \ + if test "$$subdir" = "."; then \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + done && test -z "$$fail" + tags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ + done + ctags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ + done + ETAGS = etags ETAGSFLAGS = *************** *** 1531,1538 **** mkid -fID $$unique ! TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ here=`pwd`; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ --- 1600,1618 ---- mkid -fID $$unique ! TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ here=`pwd`; \ + if (etags --etags-include --version) >/dev/null 2>&1; then \ + include_option=--etags-include; \ + else \ + include_option=--include; \ + fi; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test -f $$subdir/TAGS && \ + tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \ + fi; \ + done; \ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ *************** *** 1546,1550 **** ctags: CTAGS ! CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ --- 1626,1630 ---- ctags: CTAGS ! CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ *************** *** 1599,1617 **** fi; \ done check-am: all-am ! check: check-am all-am: Makefile $(LIBRARIES) $(PROGRAMS) $(DATA) ! ! installdirs: $(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(pkgdatadir) ! install: install-am ! install-exec: install-exec-am ! install-data: install-data-am ! uninstall: uninstall-am install-am: all-am @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am ! installcheck: installcheck-am install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ --- 1679,1711 ---- fi; \ done + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test -d $(distdir)/$$subdir \ + || mkdir $(distdir)/$$subdir \ + || exit 1; \ + (cd $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$(top_distdir)" \ + distdir=../$(distdir)/$$subdir \ + distdir) \ + || exit 1; \ + fi; \ + done check-am: all-am ! check: check-recursive all-am: Makefile $(LIBRARIES) $(PROGRAMS) $(DATA) ! installdirs: installdirs-recursive ! installdirs-am: $(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(pkgdatadir) ! ! install: install-recursive ! install-exec: install-exec-recursive ! install-data: install-data-recursive ! uninstall: uninstall-recursive install-am: all-am @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am ! installcheck: installcheck-recursive install-strip: $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ *************** *** 1629,1638 **** @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." ! clean: clean-am clean-am: clean-binPROGRAMS clean-generic clean-noinstLIBRARIES \ mostlyclean-am ! distclean: distclean-am -rm -rf ./$(DEPDIR) -rm -f Makefile --- 1723,1732 ---- @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." ! clean: clean-recursive clean-am: clean-binPROGRAMS clean-generic clean-noinstLIBRARIES \ mostlyclean-am ! distclean: distclean-recursive -rm -rf ./$(DEPDIR) -rm -f Makefile *************** *** 1640,1648 **** distclean-tags ! dvi: dvi-am dvi-am: ! info: info-am info-am: --- 1734,1742 ---- distclean-tags ! dvi: dvi-recursive dvi-am: ! info: info-recursive info-am: *************** *** 1652,1656 **** install-exec-am: install-binPROGRAMS ! install-info: install-info-am install-man: --- 1746,1750 ---- install-exec-am: install-binPROGRAMS ! install-info: install-info-recursive install-man: *************** *** 1658,1675 **** installcheck-am: ! maintainer-clean: maintainer-clean-am -rm -rf ./$(DEPDIR) -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic ! mostlyclean: mostlyclean-am mostlyclean-am: mostlyclean-compile mostlyclean-generic ! pdf: pdf-am pdf-am: ! ps: ps-am ps-am: --- 1752,1769 ---- installcheck-am: ! maintainer-clean: maintainer-clean-recursive -rm -rf ./$(DEPDIR) -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic ! mostlyclean: mostlyclean-recursive mostlyclean-am: mostlyclean-compile mostlyclean-generic ! pdf: pdf-recursive pdf-am: ! ps: ps-recursive ps-am: *************** *** 1678,1692 **** uninstall-info-am ! .PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ ! clean-generic clean-noinstLIBRARIES ctags distclean \ ! distclean-compile distclean-generic distclean-tags distdir dvi \ ! dvi-am info info-am install install-am install-binPROGRAMS \ ! install-data install-data-am install-dist_pkgdataDATA \ ! install-exec install-exec-am install-info install-info-am \ ! install-man install-strip installcheck installcheck-am \ ! installdirs maintainer-clean maintainer-clean-generic \ ! mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \ ! ps ps-am tags uninstall uninstall-am uninstall-binPROGRAMS \ ! uninstall-dist_pkgdataDATA uninstall-info-am # Tell versions [3.59,3.63) of GNU make to not export all variables. --- 1772,1795 ---- uninstall-info-am ! uninstall-info: uninstall-info-recursive ! ! .PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \ ! clean-binPROGRAMS clean-generic clean-noinstLIBRARIES \ ! clean-recursive ctags ctags-recursive distclean \ ! distclean-compile distclean-generic distclean-recursive \ ! distclean-tags distdir dvi dvi-am dvi-recursive info info-am \ ! info-recursive install install-am install-binPROGRAMS \ ! install-data install-data-am install-data-recursive \ ! install-dist_pkgdataDATA install-exec install-exec-am \ ! install-exec-recursive install-info install-info-am \ ! install-info-recursive install-man install-recursive \ ! install-strip installcheck installcheck-am installdirs \ ! installdirs-am installdirs-recursive maintainer-clean \ ! maintainer-clean-generic maintainer-clean-recursive mostlyclean \ ! mostlyclean-compile mostlyclean-generic mostlyclean-recursive \ ! pdf pdf-am pdf-recursive ps ps-am ps-recursive tags \ ! tags-recursive uninstall uninstall-am uninstall-binPROGRAMS \ ! uninstall-dist_pkgdataDATA uninstall-info-am \ ! uninstall-info-recursive uninstall-recursive # Tell versions [3.59,3.63) of GNU make to not export all variables. Index: joypadconfig.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/gtk/joypadconfig.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** joypadconfig.cpp 10 May 2004 15:00:35 -0000 1.1 --- joypadconfig.cpp 12 May 2004 01:07:06 -0000 1.2 *************** *** 98,102 **** }; ! for (guint i = 0; i < sizeof(auiKeyval) / sizeof(auiKeyval[0]); i++) { GdkKeymapKey * pstKeys; --- 98,102 ---- }; ! for (guint i = 0; i < G_N_ELEMENTS(auiKeyval); i++) { GdkKeymapKey * pstKeys; Index: vba.glade =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/gtk/vba.glade,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** vba.glade 10 May 2004 22:54:51 -0000 1.13 --- vba.glade 12 May 2004 01:07:06 -0000 1.14 *************** *** 2017,2020 **** --- 2017,2043 ---- <child> + <widget class="GtkAlignment" id="AboutIconContainer"> + <property name="visible">True</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xscale">0</property> + <property name="yscale">0</property> + <property name="top_padding">0</property> + <property name="bottom_padding">0</property> + <property name="left_padding">0</property> + <property name="right_padding">0</property> + + <child> + <placeholder/> + </child> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">True</property> + </packing> + </child> + + <child> <widget class="GtkLabel" id="VersionLabel"> <property name="visible">True</property> *************** *** 2061,2064 **** --- 2084,2109 ---- <child> + <widget class="GtkLabel" id="label24"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="label" translatable="yes"><i>Special thanks to Yann Parmentier aka "kohai" for the icons.</i></property> + <property name="use_underline">False</property> + <property name="use_markup">True</property> + <property name="justify">GTK_JUSTIFY_LEFT</property> + <property name="wrap">False</property> + <property name="selectable">True</property> + <property name="xalign">0.5</property> + <property name="yalign">0.5</property> + <property name="xpad">5</property> + <property name="ypad">5</property> + </widget> + <packing> + <property name="padding">0</property> + <property name="expand">True</property> + <property name="fill">False</property> + </packing> + </child> + + <child> <widget class="GtkLabel" id="label3"> <property name="visible">True</property> Index: windowcallbacks.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/gtk/windowcallbacks.cpp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** windowcallbacks.cpp 11 May 2004 03:07:30 -0000 1.9 --- windowcallbacks.cpp 12 May 2004 01:07:06 -0000 1.10 *************** *** 774,778 **** }; ! for (guint i = 0; i < sizeof(astRow) / sizeof(astRow[0]); i++) { Gtk::Entry * poEntry = dynamic_cast<Gtk::Entry *>(poXml->get_widget(astRow[i].m_csEntry)); --- 774,778 ---- }; ! for (guint i = 0; i < G_N_ELEMENTS(astRow); i++) { Gtk::Entry * poEntry = dynamic_cast<Gtk::Entry *>(poXml->get_widget(astRow[i].m_csEntry)); *************** *** 795,799 **** if (poDialog->run() == Gtk::RESPONSE_OK) { ! for (guint i = 0; i < sizeof(astRow) / sizeof(astRow[0]); i++) { Gtk::Entry * poEntry = dynamic_cast<Gtk::Entry *>(poXml->get_widget(astRow[i].m_csEntry)); --- 795,799 ---- if (poDialog->run() == Gtk::RESPONSE_OK) { ! for (guint i = 0; i < G_N_ELEMENTS(astRow); i++) { Gtk::Entry * poEntry = dynamic_cast<Gtk::Entry *>(poXml->get_widget(astRow[i].m_csEntry)); *************** *** 901,905 **** Gtk::FileFilter oBiosFilter; oBiosFilter.set_name(_("Gameboy Advance BIOS")); ! for (guint i = 0; i < sizeof(acsPattern) / sizeof(acsPattern[0]); i++) { oBiosFilter.add_pattern(acsPattern[i]); --- 901,905 ---- Gtk::FileFilter oBiosFilter; oBiosFilter.set_name(_("Gameboy Advance BIOS")); ! for (guint i = 0; i < G_N_ELEMENTS(acsPattern); i++) { oBiosFilter.add_pattern(acsPattern[i]); *************** *** 1401,1408 **** Gtk::Dialog * poDialog = dynamic_cast<Gtk::Dialog *>(poXml->get_widget("AboutDialog")); - Gtk::Label * poLabel = dynamic_cast<Gtk::Label *>(poXml->get_widget("VersionLabel")); - poDialog->set_transient_for(*this); poLabel->set_markup("<b><big>" PACKAGE " " VERSION "</big></b>"); poDialog->run(); delete poDialog; --- 1401,1414 ---- Gtk::Dialog * poDialog = dynamic_cast<Gtk::Dialog *>(poXml->get_widget("AboutDialog")); poDialog->set_transient_for(*this); + + Gtk::Image oIcon(PKGDATADIR "/vba-64.png"); + oIcon.show(); + Gtk::Container * poIconContainer = dynamic_cast<Gtk::Container *>(poXml->get_widget("AboutIconContainer")); + poIconContainer->add(oIcon); + + Gtk::Label * poLabel = dynamic_cast<Gtk::Label *>(poXml->get_widget("VersionLabel")); poLabel->set_markup("<b><big>" PACKAGE " " VERSION "</big></b>"); + poDialog->run(); delete poDialog; |
