Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Some tweaks to the temporary art images, added wxART_NEW

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34355 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2005-05-26 19:15:45 +00:00
parent 5c3a23e1f9
commit 406011a83d
15 changed files with 176 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
art/copy.xpm
View File

@@ -1,33 +1,26 @@
/* XPM */ /* XPM */
static char *copy_xpm[] = { static char *copy_xpm[] = {
/* columns rows colors chars-per-pixel */ /* columns rows colors chars-per-pixel */
"24 23 4 1", "16 16 4 1",
". c Black", ". c Black",
"X c #FFFFFF", "X c #FFFFFF",
"o c #000080", "o c #000080",
" c None", " c None",
/* pixels */ /* pixels */
" ", " ",
" ", "...... ",
" ......... ", ".XXXX.. ",
" .XXXXXXX.. ", ".XXXX.X. ",
" .XXXXXXX.X. ", ".X..X.oooooo ",
" .X....XX.XX. ", ".XXXXXoXXXXoo ",
" .XXXXXXX.ooooooooo ", ".X....oXXXXoXo ",
" .XXXXXXXXoXXXXXXXoo ", ".XXXXXoX..Xoooo ",
" .X......XoXXXXXXXoXo ", ".X....oXXXXXXXo ",
" .XXXXXXXXoX....XXoXXo ", ".XXXXXoX.....Xo ",
" .XXXXXXXXoXXXXXXXooooo ", "......oXXXXXXXo ",
" .X.......oXXXXXXXXXXXo ", " oX.....Xo ",
" .XXXXXXXXoX......XXXXo ", " oXXXXXXXo ",
" .XXXXXXXXoXXXXXXXXXXXo ", " ooooooooo ",
" .X.......oXXXXXXXXXXXo ", " ",
" .XXXXXXXXoX.........Xo ", " "
" .XXXXXXXXoXXXXXXXXXXXo ",
" .........oXXXXXXXXXXXo ",
" oX.........Xo ",
" oXXXXXXXXXXXo ",
" oXXXXXXXXXXXo ",
" ooooooooooooo ",
" "
}; };

41
art/cut.xpm
View File

@@ -1,32 +1,25 @@
/* XPM */ /* XPM */
static char *cut_xpm[] = { static char *cut_xpm[] = {
/* columns rows colors chars-per-pixel */ /* columns rows colors chars-per-pixel */
"24 23 3 1", "16 16 3 1",
". c Black", ". c Black",
"X c #000080", "X c #000080",
" c None", " c None",
/* pixels */ /* pixels */
" ", " ",
" . . ", " . . ",
" . . ", " . . ",
" . . ", " . . ",
" .. .. ", " .. .. ",
" .. .. ", " . . ",
" . . ", " ... ",
" .. .. ", " . ",
" .. .. ", " X.X ",
" ... ", " X XXX ",
" . ", " XXX X X ",
" . ", " X X X X ",
" X.X ", " X X X X ",
" X X ", " X X XX ",
" X XXXX ", " XX ",
" XXXX X .X ", " "
" X. X X X ",
" X X X X ",
" X X X X ",
" X X X X ",
" X X XXX ",
" XXX ",
" "
}; };

41
art/filesave.xpm
View File

@@ -1,32 +1,25 @@
/* XPM */ /* XPM */
static char *filesave_xpm[] = { static char *filesave_xpm[] = {
/* columns rows colors chars-per-pixel */ /* columns rows colors chars-per-pixel */
"24 23 3 1", "16 16 3 1",
". c Black", ". c Black",
"X c #808000", "X c #808000",
" c None", " c None",
/* pixels */ /* pixels */
" ", " ",
" .................... ", " .............. ",
" .XX. . . ", " .X. . . ",
" .XX. .... ", " .X. ... ",
" .XX. .XX. ", " .X. .X. ",
" .XX. .XX. ", " .X. .X. ",
" .XX. .XX. ", " .X. .X. ",
" .XX. .XX. ", " .X. .X. ",
" .XX. .XX. ", " .XX........XX. ",
" .XX. .XX. ", " .XXXXXXXXXXXX. ",
" .XX. .XX. ", " .XX.........X. ",
" .XXX............XXX. ", " .XX...... .X. ",
" .XXXXXXXXXXXXXXXXXX. ", " .XX...... .X. ",
" .XXXXXXXXXXXXXXXXXX. ", " .XX...... .X. ",
" .XXX.............XX. ", " ............. ",
" .XXX......... .XX. ", " "
" .XXX......... .XX. ",
" .XXX......... .XX. ",
" .XXX......... .XX. ",
" .XXX......... .XX. ",
" .XXX......... .XX. ",
" ................... ",
" "
}; };

41
art/filesaveas.xpm
View File

@@ -1,32 +1,25 @@
/* XPM */ /* XPM */
static char *filesaveas_xpm[] = { static char *filesaveas_xpm[] = {
/* columns rows colors chars-per-pixel */ /* columns rows colors chars-per-pixel */
"24 23 3 1", "16 16 3 1",
". c Black", ". c Black",
"X c #808000", "X c #808000",
" c None", " c None",
/* pixels */ /* pixels */
" ", " ",
" .................... ", " .............. ",
" .XX. . . ", " .X. . . ",
" .XX. .... ", " .X. ... ",
" .XX. .XX. ", " .X. .X. ",
" .XX. .XX. ", " .X. .X. ",
" .XX. .XX. ", " .X. .X. ",
" .XX. .XX. ", " .X. .X. ",
" .XX. .XX. ", " .XX........XX. ",
" .XX. .XX. ", " .XXXXXXXXXXXX. ",
" .XX. .XX. ", " .XX.........X. ",
" .XXX............XXX. ", " .XX...... .X. ",
" .XXXXXXXXXXXXXXXXXX. ", " .XX...... .X. ",
" .XXXXXXXXXXXXXXXXXX. ", " .XX...... .X. ",
" .XXX.............XX. ", " ............. ",
" .XXX......... .XX. ", " "
" .XXX......... .XX. ",
" .XXX......... .XX. ",
" .XXX......... .XX. ",
" .XXX......... .XX. ",
" .XXX......... .XX. ",
" ................... ",
" "
}; };

25
art/new.xpm Normal file
View File

@@ -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. ",
" ........... ",
" ",
" "
};

46
art/paste.xpm
View File

@@ -1,35 +1,29 @@
/* XPM */ /* XPM */
static char *paste_xpm[] = { static char *paste_xpm[] = {
/* columns rows colors chars-per-pixel */ /* columns rows colors chars-per-pixel */
"24 23 6 1", "16 16 7 1",
". c Black", ". c Black",
"+ c #FFFFFF", "@ c #FFFFFF",
"O c #000080", "O c #808080",
"+ c #000080",
"X c #FFFF00", "X c #FFFF00",
"o c #808000", "o c #808000",
" c None", " c None",
/* pixels */ /* pixels */
" ", " ",
" ..... ", " .... ",
" ........X.X........ ", " .....XX..... ",
"..o.o.o.X.X.X.o.o.o.. ", ".oOo.X..X.OoO. ",
".o.o.o.X.....X.o.o.o. ", ".OO. .Oo. ",
"..o.o. .o.o.. ", ".oO........OO. ",
".o.o.............o.o. ", ".OoOoOoOoOoOo. ",
"..o.o.o.o.o.o.o.o.o.. ", ".oOoOo+++++++. ",
".o.o.o.o.o.o.o.o.o.o. ", ".OoOoO+@@@@@++ ",
"..o.o.o.oOOOOOOOOOO.. ", ".oOoOo+@@@@@+@+ ",
".o.o.o.o.O++++++++OO. ", ".OoOoO+@+++@++++",
"..o.o.o.oO++++++++O+O ", ".oOoOo+@@@@@@@@+",
".o.o.o.o.O++OOOOO+O++O ", ".OoOoO+@++++++@+",
"..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",
" "
}; };

43
art/redo.xpm
View File

@@ -1,32 +1,25 @@
/* XPM */ /* XPM */
static char *redo_xpm[] = { static char *redo_xpm[] = {
/* columns rows colors chars-per-pixel */ /* columns rows colors chars-per-pixel */
"24 23 3 1", "16 16 3 1",
". c Black", ". c #808080",
"X c #000080", "X c #000080",
" c None", " c None",
/* pixels */ /* pixels */
" ", " ",
" ", " ",
" ", " ",
" ", " ",
" ", " .XXXX ",
" ", " .X XX X ",
" .XXXXX ", " X X XX ",
" .X. .XX ", " X XXX ",
" .X .X X ", " X XXXX ",
" X. .X XX ", " .X XXXXX ",
" X .X XXX ", " X. ",
" X .XXXX ", " ",
" X XXXXX ", " ",
" .. XXXXXX ", " ",
" X. XXXXXXX ", " ",
" X. ", " "
" X ",
" ",
" ",
" ",
" ",
" ",
" "
}; };

43
art/undo.xpm
View File

@@ -1,32 +1,25 @@
/* XPM */ /* XPM */
static char *undo_xpm[] = { static char *undo_xpm[] = {
/* columns rows colors chars-per-pixel */ /* columns rows colors chars-per-pixel */
"24 23 3 1", "16 16 3 1",
"X c Black", "X c #808080",
". c #000080", ". c #000080",
" c None", " c None",
/* pixels */ /* pixels */
" ", " ",
" ", " ",
" ", " ",
" ", " ",
" ", " ....X ",
" ", " . .. .X ",
" .....X ", " .. . . ",
" ..X X.X ", " ... . ",
" . .X .X ", " .... . ",
" .. .X X. ", " ..... .X ",
" ... .X . ", " X. ",
" ....X . ", " ",
" ..... . ", " ",
" ...... XX ", " ",
" ....... X. ", " ",
" X. ", " "
" . ",
" ",
" ",
" ",
" ",
" ",
" "
}; };

1
include/wx/artprov.h
View File

@@ -98,6 +98,7 @@ typedef wxString wxArtID;
#define wxART_CUT wxART_MAKE_ART_ID(wxART_CUT) #define wxART_CUT wxART_MAKE_ART_ID(wxART_CUT)
#define wxART_PASTE wxART_MAKE_ART_ID(wxART_PASTE) #define wxART_PASTE wxART_MAKE_ART_ID(wxART_PASTE)
#define wxART_DELETE wxART_MAKE_ART_ID(wxART_DELETE) #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_UNDO wxART_MAKE_ART_ID(wxART_UNDO)
#define wxART_REDO wxART_MAKE_ART_ID(wxART_REDO) #define wxART_REDO wxART_MAKE_ART_ID(wxART_REDO)

3
src/common/artstd.cpp
View File

@@ -148,6 +148,7 @@ protected:
#include "../../art/cut.xpm" #include "../../art/cut.xpm"
#include "../../art/paste.xpm" #include "../../art/paste.xpm"
#include "../../art/delete.xpm" #include "../../art/delete.xpm"
#include "../../art/new.xpm"
#include "../../art/undo.xpm" #include "../../art/undo.xpm"
#include "../../art/redo.xpm" #include "../../art/redo.xpm"
#include "../../art/quit.xpm" #include "../../art/quit.xpm"
@@ -212,6 +213,8 @@ wxBitmap wxDefaultArtProvider_CreateBitmap(const wxArtID& id)
ART(wxART_QUIT, quit) ART(wxART_QUIT, quit)
ART(wxART_FIND, find) ART(wxART_FIND, find)
ART(wxART_FIND_AND_REPLACE, findrepl) ART(wxART_FIND_AND_REPLACE, findrepl)
ART(wxART_NEW, new)
return wxNullBitmap; return wxNullBitmap;
} }

1
wxPython/demo/ArtProvider.py
View File

@@ -55,6 +55,7 @@ ArtIDs = [ "wx.ART_ADD_BOOKMARK",
"wx.ART_CUT", "wx.ART_CUT",
"wx.ART_PASTE", "wx.ART_PASTE",
"wx.ART_DELETE", "wx.ART_DELETE",
"wx.ART_NEW",
"wx.ART_UNDO", "wx.ART_UNDO",
"wx.ART_REDO", "wx.ART_REDO",
"wx.ART_QUIT", "wx.ART_QUIT",

2
wxPython/demo/FloatBar.py
View File

@@ -33,7 +33,7 @@ class TestFloatBar(wx.Frame):
self.CreateStatusBar() self.CreateStatusBar()
tsize = (16,16) 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) 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) copy_bmp = wx.ArtProvider.GetBitmap(wx.ART_COPY, wx.ART_TOOLBAR, tsize)
paste_bmp= wx.ArtProvider.GetBitmap(wx.ART_PASTE, wx.ART_TOOLBAR, tsize) paste_bmp= wx.ArtProvider.GetBitmap(wx.ART_PASTE, wx.ART_TOOLBAR, tsize)

2
wxPython/demo/StyledTextCtrl_2.py
View File

@@ -169,7 +169,7 @@ class PythonSTC(stc.StyledTextCtrl):
# register some images for use in the AutoComplete box. # register some images for use in the AutoComplete box.
self.RegisterImage(1, images.getSmilesBitmap()) self.RegisterImage(1, images.getSmilesBitmap())
self.RegisterImage(2, self._fix_image( 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( self.RegisterImage(3, self._fix_image(
wx.ArtProvider.GetBitmap(wx.ART_COPY, wx.ART_TOOLBAR, (16,16)))) wx.ArtProvider.GetBitmap(wx.ART_COPY, wx.ART_TOOLBAR, (16,16))))

2
wxPython/demo/ToolBar.py
View File

@@ -32,7 +32,7 @@ class TestToolBar(wx.Frame):
self.CreateStatusBar() self.CreateStatusBar()
tsize = (16,16) 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) 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) copy_bmp = wx.ArtProvider.GetBitmap(wx.ART_COPY, wx.ART_TOOLBAR, tsize)
paste_bmp= wx.ArtProvider.GetBitmap(wx.ART_PASTE, wx.ART_TOOLBAR, tsize) paste_bmp= wx.ArtProvider.GetBitmap(wx.ART_PASTE, wx.ART_TOOLBAR, tsize)

21
wxPython/src/_artprov.i
View File

@@ -76,6 +76,7 @@ MAKE_CONST_WXSTRING(ART_COPY);
MAKE_CONST_WXSTRING(ART_CUT); MAKE_CONST_WXSTRING(ART_CUT);
MAKE_CONST_WXSTRING(ART_PASTE); MAKE_CONST_WXSTRING(ART_PASTE);
MAKE_CONST_WXSTRING(ART_DELETE); MAKE_CONST_WXSTRING(ART_DELETE);
MAKE_CONST_WXSTRING(ART_NEW);
MAKE_CONST_WXSTRING(ART_UNDO); MAKE_CONST_WXSTRING(ART_UNDO);
MAKE_CONST_WXSTRING(ART_REDO); MAKE_CONST_WXSTRING(ART_REDO);
MAKE_CONST_WXSTRING(ART_QUIT); 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 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. or wx.NullIcon. The default theme is typically installed in /usr/share/icons/hicolor.
* wx.ART_ADD_BOOKMARK * wx.ART_ADD_BOOKMARK
* wx.ART_DEL_BOOKMARK * wx.ART_DEL_BOOKMARK
* wx.ART_HELP_SIDE_PANEL * 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_TO_PARENT
* wx.ART_GO_HOME * wx.ART_GO_HOME
* wx.ART_FILE_OPEN * wx.ART_FILE_OPEN
* wx.ART_FILE_SAVE
* wx.ART_FILE_SAVE_AS
* wx.ART_PRINT * wx.ART_PRINT
* wx.ART_HELP * wx.ART_HELP
* wx.ART_TIP * wx.ART_TIP
* wx.ART_REPORT_VIEW * wx.ART_REPORT_VIEW
* wx.ART_LIST_VIEW * wx.ART_LIST_VIEW
* wx.ART_NEW_DIR * wx.ART_NEW_DIR
* wx.ART_HARDDISK
* wx.ART_FLOPPY
* wx.ART_CDROM
* wx.ART_REMOVABLE
* wx.ART_FOLDER * wx.ART_FOLDER
* wx.ART_FOLDER_OPEN
* wx.ART_GO_DIR_UP * wx.ART_GO_DIR_UP
* wx.ART_EXECUTABLE_FILE * wx.ART_EXECUTABLE_FILE
* wx.ART_NORMAL_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_QUESTION
* wx.ART_WARNING * wx.ART_WARNING
* wx.ART_INFORMATION * 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 Clients