Changeset 2467


Ignore:
Timestamp:
Jul 23, 2007, 5:12:38 PM (15 years ago)
Author:
charles
Message:

for the time being, use xpm-based icons in the toolbar

Location:
trunk/wx
Files:
6 added
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/wx/images/Makefile.am

    r2433 r2467  
    11EXTRA_DIST = \
    22    exec.png \
     3    exec.xpm \
    34    fileopen.png \
     5    fileopen.xpm \
    46    gtk-properties.png \
     7    gtk-properties.xpm \
    58    gtk-remove.png \
     9    gtk-remove.xpm \
    610    stop.png \
    7     transmission.png
     11    stop.xpm \
     12    transmission.png \
     13    transmission.xpm
  • trunk/wx/xmission.cc

    r2466 r2467  
    2727#include <wx/aboutdlg.h>
    2828#endif
    29 extern "C" {
     29
     30extern "C"
     31{
    3032  #include <libtransmission/transmission.h>
    3133  #include <libtransmission/utils.h>
    32 }
     34
     35  #include <images/exec.xpm>
     36  #include <images/fileopen.xpm>
     37  #include <images/gtk-properties.xpm>
     38  #include <images/gtk-remove.xpm>
     39  #include <images/stop.xpm>
     40  #include <images/transmission.xpm>
     41}
     42
    3343#include "torrent-list.h"
    3444
     
    193203    myPulseTimer( this, ID_Pulse )
    194204{
    195     wxImage::AddHandler( new wxPNGHandler );
    196     wxImage transmission_logo ( _T("images/transmission.png"), wxBITMAP_TYPE_PNG );
     205    wxImage transmission_logo ( transmission_xpm );
    197206    myLogoIcon = new wxIcon;
    198207    myLogoIcon->CopyFromBitmap( wxBitmap( transmission_logo ) );
     
    243252    **/
    244253
    245     wxImage open_image( _T("images/fileopen.png"),        wxBITMAP_TYPE_PNG );
    246     wxImage exec_image( _T("images/exec.png"),            wxBITMAP_TYPE_PNG );
    247     wxImage stop_image( _T("images/stop.png"),            wxBITMAP_TYPE_PNG );
    248     wxImage drop_image( _T("images/gtk-remove.png"),      wxBITMAP_TYPE_PNG );
    249     wxImage info_image( _T("images/gtk-properties.png"),  wxBITMAP_TYPE_PNG );
     254    wxImage open_image( fileopen_xpm );
     255    wxImage exec_image( exec_xpm );
     256    wxImage stop_image( stop_xpm );
     257    wxImage drop_image( gtk_remove_xpm );
     258    wxImage info_image( gtk_properties_xpm );
    250259
    251260    wxToolBar* toolbar = CreateToolBar( wxNO_BORDER | wxTB_HORIZONTAL | wxTB_FLAT | wxTB_TEXT );
     
    338347void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
    339348{
    340     wxImage transmission_logo ( _T("images/transmission.png"), wxBITMAP_TYPE_PNG );
     349    wxImage transmission_logo ( transmission_xpm );
    341350    wxIcon ico;
    342351    ico.CopyFromBitmap( wxBitmap( transmission_logo ) );
Note: See TracChangeset for help on using the changeset viewer.