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 e5bbc5bfba5eadec7ec7c4b3dadf53ed19b431ec..0c83071398fcab892f2480fb7fac0cf064cd5cfc 100644 (file)
--- 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 29134af2ad56754b0555f3632885e6d0331275f2..e8ad7d37a6c1f4d43922c200266ba6935886afe3 100644 (file)
--- 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 01066bae2cb208b474de9fba146609d384de9537..ee34ac1a02bdc6d4b07eaf17791db9651f0378f1 100644 (file)
--- 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 972c4edb935ee819f3f7e88ac348cfdaabbccb04..4582025c6e4e7c68297a9f3f72ce767efcc9d63d 100644 (file)
--- 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 (file)
index 0000000..9866f7c
--- /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 edc02a5624be0d1556ad36242a7a191f8318868d..1e03b2306f81e66742f0b61d3c0dde34b8378a6d 100644 (file)
--- 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 91d4ce1525aa4c8a93f8bb5ac3c389278824becc..7994b8b582d56cbc7c97f53d78033a68cf3fdaae 100644 (file)
--- 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 a6634ac1ef03874a3e87507fdc3a6158aecf279d..7c0f52dab5d40cec83fac395269905ab023624e9 100644 (file)
--- 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 7abfbfa7af78fbb02b300cc28195299a0e4af1f5..daa2e428f79888991c0d4dd363dd7bf972cd006b 100644 (file)
--- 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 c3e0055c2d58321e318e01c68a0061693400328c..b82d687330eebff574f8940666b63501b44630cc 100644 (file)
--- 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 91d7a9fafc843a7cc1dfb2e2cc612a3ddae09be9..8517157ffa9b12baaeeb31160d7350c2fcebe4c6 100644 (file)
--- 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 43de54fdd869df3beca7741589975b31ce20f5d8..7506621c4f72e71875dd9119c8577ee900e06747 100644 (file)
--- 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 e976433ec7517bfa3ca93c099269d25b10a0536b..f84912ec10dbfb93eead1285bf4e21b970aeedb6 100644 (file)
--- 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 2a4675cff38163e6de9d35671dd1c6017eefce2d..744a5cf000d4420584a0284c4c77a75be9c1fb5b 100644 (file)
--- 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 ac11b64e9c113372a9a640f9d9ffab93c761202a..add7ff93d57ae3a9064bd8964be4b678e97bae81 100644 (file)
--- 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