From: Robin Dunn Date: Thu, 26 May 2005 19:15:45 +0000 (+0000) Subject: Some tweaks to the temporary art images, added wxART_NEW X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/406011a83dd46464cf615fb1988b5f6dee07366d?hp=5c3a23e1f977decb0bdf53782508e9cf418c1f1e Some tweaks to the temporary art images, added wxART_NEW git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34355 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/art/copy.xpm b/art/copy.xpm index e5bbc5bfba..0c83071398 100644 --- a/art/copy.xpm +++ b/art/copy.xpm @@ -1,33 +1,26 @@ /* XPM */ static char *copy_xpm[] = { /* columns rows colors chars-per-pixel */ -"24 23 4 1", +"16 16 4 1", ". c Black", "X c #FFFFFF", "o c #000080", " c None", /* pixels */ -" ", -" ", -" ......... ", -" .XXXXXXX.. ", -" .XXXXXXX.X. ", -" .X....XX.XX. ", -" .XXXXXXX.ooooooooo ", -" .XXXXXXXXoXXXXXXXoo ", -" .X......XoXXXXXXXoXo ", -" .XXXXXXXXoX....XXoXXo ", -" .XXXXXXXXoXXXXXXXooooo ", -" .X.......oXXXXXXXXXXXo ", -" .XXXXXXXXoX......XXXXo ", -" .XXXXXXXXoXXXXXXXXXXXo ", -" .X.......oXXXXXXXXXXXo ", -" .XXXXXXXXoX.........Xo ", -" .XXXXXXXXoXXXXXXXXXXXo ", -" .........oXXXXXXXXXXXo ", -" oX.........Xo ", -" oXXXXXXXXXXXo ", -" oXXXXXXXXXXXo ", -" ooooooooooooo ", -" " +" ", +"...... ", +".XXXX.. ", +".XXXX.X. ", +".X..X.oooooo ", +".XXXXXoXXXXoo ", +".X....oXXXXoXo ", +".XXXXXoX..Xoooo ", +".X....oXXXXXXXo ", +".XXXXXoX.....Xo ", +"......oXXXXXXXo ", +" oX.....Xo ", +" oXXXXXXXo ", +" ooooooooo ", +" ", +" " }; diff --git a/art/cut.xpm b/art/cut.xpm index 29134af2ad..e8ad7d37a6 100644 --- a/art/cut.xpm +++ b/art/cut.xpm @@ -1,32 +1,25 @@ /* XPM */ static char *cut_xpm[] = { /* columns rows colors chars-per-pixel */ -"24 23 3 1", +"16 16 3 1", ". c Black", "X c #000080", " c None", /* pixels */ -" ", -" . . ", -" . . ", -" . . ", -" .. .. ", -" .. .. ", -" . . ", -" .. .. ", -" .. .. ", -" ... ", -" . ", -" . ", -" X.X ", -" X X ", -" X XXXX ", -" XXXX X .X ", -" X. X X X ", -" X X X X ", -" X X X X ", -" X X X X ", -" X X XXX ", -" XXX ", -" " +" ", +" . . ", +" . . ", +" . . ", +" .. .. ", +" . . ", +" ... ", +" . ", +" X.X ", +" X XXX ", +" XXX X X ", +" X X X X ", +" X X X X ", +" X X XX ", +" XX ", +" " }; diff --git a/art/filesave.xpm b/art/filesave.xpm index 01066bae2c..ee34ac1a02 100644 --- a/art/filesave.xpm +++ b/art/filesave.xpm @@ -1,32 +1,25 @@ /* XPM */ static char *filesave_xpm[] = { /* columns rows colors chars-per-pixel */ -"24 23 3 1", +"16 16 3 1", ". c Black", "X c #808000", " c None", /* pixels */ -" ", -" .................... ", -" .XX. . . ", -" .XX. .... ", -" .XX. .XX. ", -" .XX. .XX. ", -" .XX. .XX. ", -" .XX. .XX. ", -" .XX. .XX. ", -" .XX. .XX. ", -" .XX. .XX. ", -" .XXX............XXX. ", -" .XXXXXXXXXXXXXXXXXX. ", -" .XXXXXXXXXXXXXXXXXX. ", -" .XXX.............XX. ", -" .XXX......... .XX. ", -" .XXX......... .XX. ", -" .XXX......... .XX. ", -" .XXX......... .XX. ", -" .XXX......... .XX. ", -" .XXX......... .XX. ", -" ................... ", -" " +" ", +" .............. ", +" .X. . . ", +" .X. ... ", +" .X. .X. ", +" .X. .X. ", +" .X. .X. ", +" .X. .X. ", +" .XX........XX. ", +" .XXXXXXXXXXXX. ", +" .XX.........X. ", +" .XX...... .X. ", +" .XX...... .X. ", +" .XX...... .X. ", +" ............. ", +" " }; diff --git a/art/filesaveas.xpm b/art/filesaveas.xpm index 972c4edb93..4582025c6e 100644 --- a/art/filesaveas.xpm +++ b/art/filesaveas.xpm @@ -1,32 +1,25 @@ /* XPM */ static char *filesaveas_xpm[] = { /* columns rows colors chars-per-pixel */ -"24 23 3 1", +"16 16 3 1", ". c Black", "X c #808000", " c None", /* pixels */ -" ", -" .................... ", -" .XX. . . ", -" .XX. .... ", -" .XX. .XX. ", -" .XX. .XX. ", -" .XX. .XX. ", -" .XX. .XX. ", -" .XX. .XX. ", -" .XX. .XX. ", -" .XX. .XX. ", -" .XXX............XXX. ", -" .XXXXXXXXXXXXXXXXXX. ", -" .XXXXXXXXXXXXXXXXXX. ", -" .XXX.............XX. ", -" .XXX......... .XX. ", -" .XXX......... .XX. ", -" .XXX......... .XX. ", -" .XXX......... .XX. ", -" .XXX......... .XX. ", -" .XXX......... .XX. ", -" ................... ", -" " +" ", +" .............. ", +" .X. . . ", +" .X. ... ", +" .X. .X. ", +" .X. .X. ", +" .X. .X. ", +" .X. .X. ", +" .XX........XX. ", +" .XXXXXXXXXXXX. ", +" .XX.........X. ", +" .XX...... .X. ", +" .XX...... .X. ", +" .XX...... .X. ", +" ............. ", +" " }; diff --git a/art/new.xpm b/art/new.xpm new file mode 100644 index 0000000000..9866f7cfef --- /dev/null +++ b/art/new.xpm @@ -0,0 +1,25 @@ +/* XPM */ +static char *new_xpm[] = { +/* columns rows colors chars-per-pixel */ +"16 16 3 1", +". c Black", +"X c #FFFFFF", +" c None", +/* pixels */ +" ", +" ........ ", +" .XXXXXX.. ", +" .XXXXXX.X. ", +" .XXXXXX.... ", +" .XXXXXXXXX. ", +" .XXXXXXXXX. ", +" .XXXXXXXXX. ", +" .XXXXXXXXX. ", +" .XXXXXXXXX. ", +" .XXXXXXXXX. ", +" .XXXXXXXXX. ", +" .XXXXXXXXX. ", +" ........... ", +" ", +" " +}; diff --git a/art/paste.xpm b/art/paste.xpm index edc02a5624..1e03b2306f 100644 --- a/art/paste.xpm +++ b/art/paste.xpm @@ -1,35 +1,29 @@ /* XPM */ static char *paste_xpm[] = { /* columns rows colors chars-per-pixel */ -"24 23 6 1", +"16 16 7 1", ". c Black", -"+ c #FFFFFF", -"O c #000080", +"@ c #FFFFFF", +"O c #808080", +"+ c #000080", "X c #FFFF00", "o c #808000", " c None", /* pixels */ -" ", -" ..... ", -" ........X.X........ ", -"..o.o.o.X.X.X.o.o.o.. ", -".o.o.o.X.....X.o.o.o. ", -"..o.o. .o.o.. ", -".o.o.............o.o. ", -"..o.o.o.o.o.o.o.o.o.. ", -".o.o.o.o.o.o.o.o.o.o. ", -"..o.o.o.oOOOOOOOOOO.. ", -".o.o.o.o.O++++++++OO. ", -"..o.o.o.oO++++++++O+O ", -".o.o.o.o.O++OOOOO+O++O ", -"..o.o.o.oO++++++++O+++O ", -".o.o.o.o.O++++++++OOOOOO", -"..o.o.o.oO++OOOOO++++++O", -".o.o.o.o.O+++++++++++++O", -"..o.o.o.oO+++++++++++++O", -".o.o.o.o.O++OOOOOOOOO++O", -" .o.o.o.oO+++++++++++++O", -" .......O+++++++++++++O", -" OOOOOOOOOOOOOOO", -" " +" ", +" .... ", +" .....XX..... ", +".oOo.X..X.OoO. ", +".OO. .Oo. ", +".oO........OO. ", +".OoOoOoOoOoOo. ", +".oOoOo+++++++. ", +".OoOoO+@@@@@++ ", +".oOoOo+@@@@@+@+ ", +".OoOoO+@+++@++++", +".oOoOo+@@@@@@@@+", +".OoOoO+@++++++@+", +" .....+@@@@@@@@+", +" ++++++++++", +" " }; diff --git a/art/redo.xpm b/art/redo.xpm index 91d4ce1525..7994b8b582 100644 --- a/art/redo.xpm +++ b/art/redo.xpm @@ -1,32 +1,25 @@ /* XPM */ static char *redo_xpm[] = { /* columns rows colors chars-per-pixel */ -"24 23 3 1", -". c Black", +"16 16 3 1", +". c #808080", "X c #000080", " c None", /* pixels */ -" ", -" ", -" ", -" ", -" ", -" ", -" .XXXXX ", -" .X. .XX ", -" .X .X X ", -" X. .X XX ", -" X .X XXX ", -" X .XXXX ", -" X XXXXX ", -" .. XXXXXX ", -" X. XXXXXXX ", -" X. ", -" X ", -" ", -" ", -" ", -" ", -" ", -" " +" ", +" ", +" ", +" ", +" .XXXX ", +" .X XX X ", +" X X XX ", +" X XXX ", +" X XXXX ", +" .X XXXXX ", +" X. ", +" ", +" ", +" ", +" ", +" " }; diff --git a/art/undo.xpm b/art/undo.xpm index a6634ac1ef..7c0f52dab5 100644 --- a/art/undo.xpm +++ b/art/undo.xpm @@ -1,32 +1,25 @@ /* XPM */ static char *undo_xpm[] = { /* columns rows colors chars-per-pixel */ -"24 23 3 1", -"X c Black", +"16 16 3 1", +"X c #808080", ". c #000080", " c None", /* pixels */ -" ", -" ", -" ", -" ", -" ", -" ", -" .....X ", -" ..X X.X ", -" . .X .X ", -" .. .X X. ", -" ... .X . ", -" ....X . ", -" ..... . ", -" ...... XX ", -" ....... X. ", -" X. ", -" . ", -" ", -" ", -" ", -" ", -" ", -" " +" ", +" ", +" ", +" ", +" ....X ", +" . .. .X ", +" .. . . ", +" ... . ", +" .... . ", +" ..... .X ", +" X. ", +" ", +" ", +" ", +" ", +" " }; diff --git a/include/wx/artprov.h b/include/wx/artprov.h index 7abfbfa7af..daa2e428f7 100644 --- a/include/wx/artprov.h +++ b/include/wx/artprov.h @@ -98,6 +98,7 @@ typedef wxString wxArtID; #define wxART_CUT wxART_MAKE_ART_ID(wxART_CUT) #define wxART_PASTE wxART_MAKE_ART_ID(wxART_PASTE) #define wxART_DELETE wxART_MAKE_ART_ID(wxART_DELETE) +#define wxART_NEW wxART_MAKE_ART_ID(wxART_NEW) #define wxART_UNDO wxART_MAKE_ART_ID(wxART_UNDO) #define wxART_REDO wxART_MAKE_ART_ID(wxART_REDO) diff --git a/src/common/artstd.cpp b/src/common/artstd.cpp index c3e0055c2d..b82d687330 100644 --- a/src/common/artstd.cpp +++ b/src/common/artstd.cpp @@ -148,6 +148,7 @@ protected: #include "../../art/cut.xpm" #include "../../art/paste.xpm" #include "../../art/delete.xpm" +#include "../../art/new.xpm" #include "../../art/undo.xpm" #include "../../art/redo.xpm" #include "../../art/quit.xpm" @@ -212,6 +213,8 @@ wxBitmap wxDefaultArtProvider_CreateBitmap(const wxArtID& id) ART(wxART_QUIT, quit) ART(wxART_FIND, find) ART(wxART_FIND_AND_REPLACE, findrepl) + ART(wxART_NEW, new) + return wxNullBitmap; } diff --git a/wxPython/demo/ArtProvider.py b/wxPython/demo/ArtProvider.py index 91d7a9fafc..8517157ffa 100644 --- a/wxPython/demo/ArtProvider.py +++ b/wxPython/demo/ArtProvider.py @@ -55,6 +55,7 @@ ArtIDs = [ "wx.ART_ADD_BOOKMARK", "wx.ART_CUT", "wx.ART_PASTE", "wx.ART_DELETE", + "wx.ART_NEW", "wx.ART_UNDO", "wx.ART_REDO", "wx.ART_QUIT", diff --git a/wxPython/demo/FloatBar.py b/wxPython/demo/FloatBar.py index 43de54fdd8..7506621c4f 100644 --- a/wxPython/demo/FloatBar.py +++ b/wxPython/demo/FloatBar.py @@ -33,7 +33,7 @@ class TestFloatBar(wx.Frame): self.CreateStatusBar() tsize = (16,16) - new_bmp = wx.ArtProvider.GetBitmap(wx.ART_NORMAL_FILE, wx.ART_TOOLBAR, tsize) + new_bmp = wx.ArtProvider.GetBitmap(wx.ART_NEW, wx.ART_TOOLBAR, tsize) open_bmp = wx.ArtProvider.GetBitmap(wx.ART_FILE_OPEN, wx.ART_TOOLBAR, tsize) copy_bmp = wx.ArtProvider.GetBitmap(wx.ART_COPY, wx.ART_TOOLBAR, tsize) paste_bmp= wx.ArtProvider.GetBitmap(wx.ART_PASTE, wx.ART_TOOLBAR, tsize) diff --git a/wxPython/demo/StyledTextCtrl_2.py b/wxPython/demo/StyledTextCtrl_2.py index e976433ec7..f84912ec10 100644 --- a/wxPython/demo/StyledTextCtrl_2.py +++ b/wxPython/demo/StyledTextCtrl_2.py @@ -169,7 +169,7 @@ class PythonSTC(stc.StyledTextCtrl): # register some images for use in the AutoComplete box. self.RegisterImage(1, images.getSmilesBitmap()) self.RegisterImage(2, self._fix_image( - wx.ArtProvider.GetBitmap(wx.ART_NORMAL_FILE, wx.ART_TOOLBAR, (16,16)))) + wx.ArtProvider.GetBitmap(wx.ART_NEW, wx.ART_TOOLBAR, (16,16)))) self.RegisterImage(3, self._fix_image( wx.ArtProvider.GetBitmap(wx.ART_COPY, wx.ART_TOOLBAR, (16,16)))) diff --git a/wxPython/demo/ToolBar.py b/wxPython/demo/ToolBar.py index 2a4675cff3..744a5cf000 100644 --- a/wxPython/demo/ToolBar.py +++ b/wxPython/demo/ToolBar.py @@ -32,7 +32,7 @@ class TestToolBar(wx.Frame): self.CreateStatusBar() tsize = (16,16) - new_bmp = wx.ArtProvider.GetBitmap(wx.ART_NORMAL_FILE, wx.ART_TOOLBAR, tsize) + new_bmp = wx.ArtProvider.GetBitmap(wx.ART_NEW, wx.ART_TOOLBAR, tsize) open_bmp = wx.ArtProvider.GetBitmap(wx.ART_FILE_OPEN, wx.ART_TOOLBAR, tsize) copy_bmp = wx.ArtProvider.GetBitmap(wx.ART_COPY, wx.ART_TOOLBAR, tsize) paste_bmp= wx.ArtProvider.GetBitmap(wx.ART_PASTE, wx.ART_TOOLBAR, tsize) diff --git a/wxPython/src/_artprov.i b/wxPython/src/_artprov.i index ac11b64e9c..add7ff93d5 100644 --- a/wxPython/src/_artprov.i +++ b/wxPython/src/_artprov.i @@ -76,6 +76,7 @@ MAKE_CONST_WXSTRING(ART_COPY); MAKE_CONST_WXSTRING(ART_CUT); MAKE_CONST_WXSTRING(ART_PASTE); MAKE_CONST_WXSTRING(ART_DELETE); +MAKE_CONST_WXSTRING(ART_NEW); MAKE_CONST_WXSTRING(ART_UNDO); MAKE_CONST_WXSTRING(ART_REDO); MAKE_CONST_WXSTRING(ART_QUIT); @@ -160,7 +161,6 @@ follow the freedesktop.org Icon Themes specification. Note that themes are not guaranteed to contain all icons, so wx.ArtProvider may return wx.NullBitmap or wx.NullIcon. The default theme is typically installed in /usr/share/icons/hicolor. - * wx.ART_ADD_BOOKMARK * wx.ART_DEL_BOOKMARK * wx.ART_HELP_SIDE_PANEL @@ -175,13 +175,20 @@ or wx.NullIcon. The default theme is typically installed in /usr/share/icons/hi * wx.ART_GO_TO_PARENT * wx.ART_GO_HOME * wx.ART_FILE_OPEN + * wx.ART_FILE_SAVE + * wx.ART_FILE_SAVE_AS * wx.ART_PRINT * wx.ART_HELP * wx.ART_TIP * wx.ART_REPORT_VIEW * wx.ART_LIST_VIEW * wx.ART_NEW_DIR + * wx.ART_HARDDISK + * wx.ART_FLOPPY + * wx.ART_CDROM + * wx.ART_REMOVABLE * wx.ART_FOLDER + * wx.ART_FOLDER_OPEN * wx.ART_GO_DIR_UP * wx.ART_EXECUTABLE_FILE * wx.ART_NORMAL_FILE @@ -191,7 +198,17 @@ or wx.NullIcon. The default theme is typically installed in /usr/share/icons/hi * wx.ART_QUESTION * wx.ART_WARNING * wx.ART_INFORMATION - * wx.ART_MISSING_IMAGE + * wx.ART_MISSING_IMAGE + * wx.ART_COPY + * wx.ART_CUT + * wx.ART_PASTE + * wx.ART_DELETE + * wx.ART_NEW + * wx.ART_UNDO + * wx.ART_REDO + * wx.ART_QUIT + * wx.ART_FIND + * wx.ART_FIND_AND_REPLACE Clients