[MPlayer-cvslog] r35620 - in trunk: Makefile gui/dialog gui/dialog/about.c gui/dialog/about.h gui/dialog/equalizer.c gui/dialog/equalizer.h gui/dialog/fileselect.c gui/dialog/fileselect.h gui/dialog/menu.c gui/dial...
ib
subversion at mplayerhq.hu
Thu Dec 6 15:23:28 CET 2012
Author: ib
Date: Thu Dec 6 15:23:28 2012
New Revision: 35620
Log:
Rebuild GUI directory structure.
Create new directory dialog/ and
move ui/gtk/* and ui/pixmaps/ to dialog/.
Added:
trunk/gui/dialog/
trunk/gui/dialog/about.c
- copied, changed from r35619, trunk/gui/ui/gtk/about.c
trunk/gui/dialog/about.h
- copied unchanged from r35618, trunk/gui/ui/gtk/about.h
trunk/gui/dialog/equalizer.c
- copied unchanged from r35619, trunk/gui/ui/gtk/equalizer.c
trunk/gui/dialog/equalizer.h
- copied unchanged from r35618, trunk/gui/ui/gtk/equalizer.h
trunk/gui/dialog/fileselect.c
- copied, changed from r35619, trunk/gui/ui/gtk/fileselect.c
trunk/gui/dialog/fileselect.h
- copied unchanged from r35618, trunk/gui/ui/gtk/fileselect.h
trunk/gui/dialog/menu.c
- copied, changed from r35619, trunk/gui/ui/gtk/menu.c
trunk/gui/dialog/menu.h
- copied unchanged from r35618, trunk/gui/ui/gtk/menu.h
trunk/gui/dialog/msgbox.c
- copied, changed from r35619, trunk/gui/ui/gtk/msgbox.c
trunk/gui/dialog/msgbox.h
- copied unchanged from r35618, trunk/gui/ui/gtk/msgbox.h
trunk/gui/dialog/pixmaps/
- copied from r35618, trunk/gui/ui/pixmaps/
trunk/gui/dialog/playlist.c
- copied, changed from r35619, trunk/gui/ui/gtk/playlist.c
trunk/gui/dialog/playlist.h
- copied unchanged from r35618, trunk/gui/ui/gtk/playlist.h
trunk/gui/dialog/preferences.c
- copied unchanged from r35619, trunk/gui/ui/gtk/preferences.c
trunk/gui/dialog/preferences.h
- copied unchanged from r35618, trunk/gui/ui/gtk/preferences.h
trunk/gui/dialog/skinbrowser.c
- copied unchanged from r35619, trunk/gui/ui/gtk/skinbrowser.c
trunk/gui/dialog/skinbrowser.h
- copied unchanged from r35618, trunk/gui/ui/gtk/skinbrowser.h
trunk/gui/dialog/tools.c
- copied unchanged from r35618, trunk/gui/ui/gtk/tools.c
trunk/gui/dialog/tools.h
- copied unchanged from r35618, trunk/gui/ui/gtk/tools.h
trunk/gui/dialog/url.c
- copied unchanged from r35619, trunk/gui/ui/gtk/url.c
trunk/gui/dialog/url.h
- copied unchanged from r35618, trunk/gui/ui/gtk/url.h
Deleted:
trunk/gui/ui/gtk/about.c
trunk/gui/ui/gtk/about.h
trunk/gui/ui/gtk/equalizer.c
trunk/gui/ui/gtk/equalizer.h
trunk/gui/ui/gtk/fileselect.c
trunk/gui/ui/gtk/fileselect.h
trunk/gui/ui/gtk/menu.c
trunk/gui/ui/gtk/menu.h
trunk/gui/ui/gtk/msgbox.c
trunk/gui/ui/gtk/msgbox.h
trunk/gui/ui/gtk/playlist.c
trunk/gui/ui/gtk/playlist.h
trunk/gui/ui/gtk/preferences.c
trunk/gui/ui/gtk/preferences.h
trunk/gui/ui/gtk/skinbrowser.c
trunk/gui/ui/gtk/skinbrowser.h
trunk/gui/ui/gtk/tools.c
trunk/gui/ui/gtk/tools.h
trunk/gui/ui/gtk/url.c
trunk/gui/ui/gtk/url.h
trunk/gui/ui/pixmaps/
Modified:
trunk/Makefile
trunk/gui/ui/widgets.c
Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile Thu Dec 6 14:47:47 2012 (r35619)
+++ trunk/Makefile Thu Dec 6 15:23:28 2012 (r35620)
@@ -499,20 +499,20 @@ SRCS_MPLAYER-$(GUI) += gui/util
gui/util/string.c
SRCS_MPLAYER-$(GUI_GTK) += gui/app/app.c \
gui/app/cfg.c \
+ gui/dialog/about.c \
+ gui/dialog/equalizer.c \
+ gui/dialog/fileselect.c \
+ gui/dialog/menu.c \
+ gui/dialog/msgbox.c \
+ gui/dialog/playlist.c \
+ gui/dialog/preferences.c \
+ gui/dialog/skinbrowser.c \
+ gui/dialog/tools.c \
+ gui/dialog/url.c \
gui/interface.c \
gui/skin/font.c \
gui/skin/skin.c \
gui/ui/actions.c \
- gui/ui/gtk/about.c \
- gui/ui/gtk/equalizer.c \
- gui/ui/gtk/fileselect.c \
- gui/ui/gtk/menu.c \
- gui/ui/gtk/msgbox.c \
- gui/ui/gtk/playlist.c \
- gui/ui/gtk/preferences.c \
- gui/ui/gtk/skinbrowser.c \
- gui/ui/gtk/tools.c \
- gui/ui/gtk/url.c \
gui/ui/main.c \
gui/ui/menu.c \
gui/ui/playbar.c \
@@ -690,9 +690,9 @@ INSTALL_TARGETS-$(MPLAYER) += install-m
DIRS = . \
gui \
gui/app \
+ gui/dialog \
gui/skin \
gui/ui \
- gui/ui/gtk \
gui/util \
gui/win32 \
gui/wm \
@@ -841,7 +841,7 @@ $(foreach lang, $(DOC_LANG_ALL),$(eval $
# Make sure all generated header files are created.
codec-cfg.o: codecs.conf.h
$(DEP_FILES) $(MENCODER_DEPS) $(MPLAYER_DEPS): help_mp.h
-mpcommon.o osdep/mplayer-rc.o gui/ui/gtk/about.o gui/win32/gui.o: version.h
+mpcommon.o osdep/mplayer-rc.o gui/dialog/about.o gui/win32/gui.o: version.h
osdep/mplayer-rc.o: osdep/mplayer.exe.manifest
Copied and modified: trunk/gui/dialog/about.c (from r35619, trunk/gui/ui/gtk/about.c)
==============================================================================
--- trunk/gui/ui/gtk/about.c Thu Dec 6 14:47:47 2012 (r35619, copy source)
+++ trunk/gui/dialog/about.c Thu Dec 6 15:23:28 2012 (r35620)
@@ -21,7 +21,7 @@
#include "help_mp.h"
#include "version.h"
-#include "gui/ui/pixmaps/emblem.xpm"
+#include "pixmaps/emblem.xpm"
#include "gui/ui/widgets.h"
#include "about.h"
#include "tools.h"
Copied and modified: trunk/gui/dialog/fileselect.c (from r35619, trunk/gui/ui/gtk/fileselect.c)
==============================================================================
--- trunk/gui/ui/gtk/fileselect.c Thu Dec 6 14:47:47 2012 (r35619, copy source)
+++ trunk/gui/dialog/fileselect.c Thu Dec 6 15:23:28 2012 (r35620)
@@ -26,9 +26,9 @@
#include "config.h"
#include "gui/ui/gmplayer.h"
-#include "gui/ui/pixmaps/up.xpm"
-#include "gui/ui/pixmaps/dir.xpm"
-#include "gui/ui/pixmaps/file.xpm"
+#include "pixmaps/up.xpm"
+#include "pixmaps/dir.xpm"
+#include "pixmaps/file.xpm"
#include "gui/app/app.h"
#include "gui/app/gui.h"
Copied and modified: trunk/gui/dialog/menu.c (from r35619, trunk/gui/ui/gtk/menu.c)
==============================================================================
--- trunk/gui/ui/gtk/menu.c Thu Dec 6 14:47:47 2012 (r35619, copy source)
+++ trunk/gui/dialog/menu.c Thu Dec 6 15:23:28 2012 (r35620)
@@ -38,53 +38,53 @@
#include "libmpdemux/stheader.h"
#include "libavutil/avstring.h"
-#include "gui/ui/pixmaps/about.xpm"
-#include "gui/ui/pixmaps/half.xpm"
-#include "gui/ui/pixmaps/normal.xpm"
-#include "gui/ui/pixmaps/double.xpm"
-#include "gui/ui/pixmaps/full.xpm"
-#include "gui/ui/pixmaps/exit.xpm"
-#include "gui/ui/pixmaps/prefs.xpm"
-#include "gui/ui/pixmaps/equalizer.xpm"
-#include "gui/ui/pixmaps/playlist.xpm"
-#include "gui/ui/pixmaps/skin.xpm"
-#include "gui/ui/pixmaps/sound.xpm"
-#include "gui/ui/pixmaps/open.xpm"
-#include "gui/ui/pixmaps/play.xpm"
-#include "gui/ui/pixmaps/stop.xpm"
-#include "gui/ui/pixmaps/pause.xpm"
-#include "gui/ui/pixmaps/prev.xpm"
-#include "gui/ui/pixmaps/next.xpm"
-#include "gui/ui/pixmaps/aspect.xpm"
-#include "gui/ui/pixmaps/aspect11.xpm"
-#include "gui/ui/pixmaps/aspect169.xpm"
-#include "gui/ui/pixmaps/aspect235.xpm"
-#include "gui/ui/pixmaps/aspect43.xpm"
-#include "gui/ui/pixmaps/file2.xpm"
-#include "gui/ui/pixmaps/url.xpm"
-#include "gui/ui/pixmaps/sub.xpm"
-#include "gui/ui/pixmaps/nosub.xpm"
-#include "gui/ui/pixmaps/empty.xpm"
-#include "gui/ui/pixmaps/loadeaf.xpm"
-#include "gui/ui/pixmaps/title.xpm"
-#include "gui/ui/pixmaps/subtitle.xpm"
+#include "pixmaps/about.xpm"
+#include "pixmaps/half.xpm"
+#include "pixmaps/normal.xpm"
+#include "pixmaps/double.xpm"
+#include "pixmaps/full.xpm"
+#include "pixmaps/exit.xpm"
+#include "pixmaps/prefs.xpm"
+#include "pixmaps/equalizer.xpm"
+#include "pixmaps/playlist.xpm"
+#include "pixmaps/skin.xpm"
+#include "pixmaps/sound.xpm"
+#include "pixmaps/open.xpm"
+#include "pixmaps/play.xpm"
+#include "pixmaps/stop.xpm"
+#include "pixmaps/pause.xpm"
+#include "pixmaps/prev.xpm"
+#include "pixmaps/next.xpm"
+#include "pixmaps/aspect.xpm"
+#include "pixmaps/aspect11.xpm"
+#include "pixmaps/aspect169.xpm"
+#include "pixmaps/aspect235.xpm"
+#include "pixmaps/aspect43.xpm"
+#include "pixmaps/file2.xpm"
+#include "pixmaps/url.xpm"
+#include "pixmaps/sub.xpm"
+#include "pixmaps/nosub.xpm"
+#include "pixmaps/empty.xpm"
+#include "pixmaps/loadeaf.xpm"
+#include "pixmaps/title.xpm"
+#include "pixmaps/subtitle.xpm"
#ifdef CONFIG_CDDA
-#include "gui/ui/pixmaps/cd.xpm"
-#include "gui/ui/pixmaps/playcd.xpm"
+#include "pixmaps/cd.xpm"
+#include "pixmaps/playcd.xpm"
#endif
#ifdef CONFIG_VCD
-#include "gui/ui/pixmaps/vcd.xpm"
-#include "gui/ui/pixmaps/playvcd.xpm"
+#include "pixmaps/vcd.xpm"
+#include "pixmaps/playvcd.xpm"
#endif
#ifdef CONFIG_DVDREAD
-#include "gui/ui/pixmaps/dvd.xpm"
-#include "gui/ui/pixmaps/playdvd.xpm"
-#include "gui/ui/pixmaps/chapter.xpm"
-#include "gui/ui/pixmaps/dolby.xpm"
-#include "gui/ui/pixmaps/audiolang.xpm"
-#include "gui/ui/pixmaps/sublang.xpm"
+#include "pixmaps/dvd.xpm"
+#include "pixmaps/playdvd.xpm"
+#include "pixmaps/chapter.xpm"
+#include "pixmaps/dolby.xpm"
+#include "pixmaps/audiolang.xpm"
+#include "pixmaps/sublang.xpm"
#endif
-#include "gui/ui/pixmaps/empty1px.xpm"
+#include "pixmaps/empty1px.xpm"
static void ActivateMenuItem( int Item )
{
Copied and modified: trunk/gui/dialog/msgbox.c (from r35619, trunk/gui/ui/gtk/msgbox.c)
==============================================================================
--- trunk/gui/ui/gtk/msgbox.c Thu Dec 6 14:47:47 2012 (r35619, copy source)
+++ trunk/gui/dialog/msgbox.c Thu Dec 6 15:23:28 2012 (r35620)
@@ -21,8 +21,8 @@
#include "gui/app/app.h"
#include "help_mp.h"
-#include "gui/ui/pixmaps/error.xpm"
-#include "gui/ui/pixmaps/warning.xpm"
+#include "pixmaps/error.xpm"
+#include "pixmaps/warning.xpm"
#include "gui/ui/widgets.h"
#include "msgbox.h"
Copied and modified: trunk/gui/dialog/playlist.c (from r35619, trunk/gui/ui/gtk/playlist.c)
==============================================================================
--- trunk/gui/ui/gtk/playlist.c Thu Dec 6 14:47:47 2012 (r35619, copy source)
+++ trunk/gui/dialog/playlist.c Thu Dec 6 15:23:28 2012 (r35620)
@@ -40,8 +40,8 @@
#include "playlist.h"
#include "tools.h"
-#include "gui/ui/pixmaps/open2.xpm"
-#include "gui/ui/pixmaps/dir2.xpm"
+#include "pixmaps/open2.xpm"
+#include "pixmaps/dir2.xpm"
GtkWidget * PlayList = NULL;
static GtkWidget * CTDirTree;
Modified: trunk/gui/ui/widgets.c
==============================================================================
--- trunk/gui/ui/widgets.c Thu Dec 6 14:47:47 2012 (r35619)
+++ trunk/gui/ui/widgets.c Thu Dec 6 15:23:28 2012 (r35620)
@@ -46,7 +46,7 @@
#include "gui/wm/ws.h"
#include "actions.h"
-#include "gtk/fileselect.h"
+#include "gui/dialog/fileselect.h"
GtkWidget *PopUpMenu = NULL;
@@ -57,14 +57,14 @@ int gtkPopupMenu = 0;
int gtkPopupMenuParam = 0;
int gtkInitialized = False;
-#include "gtk/skinbrowser.h"
-#include "gtk/playlist.h"
-#include "gtk/msgbox.h"
-#include "gtk/about.h"
-#include "gtk/preferences.h"
-#include "gtk/menu.h"
-#include "gtk/url.h"
-#include "gtk/equalizer.h"
+#include "gui/dialog/skinbrowser.h"
+#include "gui/dialog/playlist.h"
+#include "gui/dialog/msgbox.h"
+#include "gui/dialog/about.h"
+#include "gui/dialog/preferences.h"
+#include "gui/dialog/menu.h"
+#include "gui/dialog/url.h"
+#include "gui/dialog/equalizer.h"
static const char gui_icon_name[] = "mplayer";
More information about the MPlayer-cvslog
mailing list