Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 473572 | Differences between
and this patch

Collapse All | Expand All

(-)file_not_specified_in_diff (-10 / +10 lines)
Line  Link Here
0
-- system.h
0
++ system.h
Lines 169-175 Link Here
169
169
170
    void LoadTut()
170
    void LoadTut()
171
    {
171
    {
172
        LoadDB(frame->exepath+L"/examples/tutorial.cts");
172
        LoadDB(L"/usr/share/treesheets/examples/tutorial.cts");
173
    }
173
    }
174
174
175
    Cell *&InitDB(int sizex, int sizey = 0)
175
    Cell *&InitDB(int sizex, int sizey = 0)
176
-- myframe.h
176
++ myframe.h
Lines 72-79 Link Here
72
72
73
        wxIconBundle icons;
73
        wxIconBundle icons;
74
        wxIcon iconbig;
74
        wxIcon iconbig;
75
        icon   .LoadFile(exepath+L"/images/icon16.png", wxBITMAP_TYPE_PNG);
75
        icon   .LoadFile(L"/usr/share/treesheets/images/icon16.png", wxBITMAP_TYPE_PNG);
76
        iconbig.LoadFile(exepath+L"/images/icon32.png", wxBITMAP_TYPE_PNG);
76
        iconbig.LoadFile(L"/usr/share/treesheets/images/icon32.png", wxBITMAP_TYPE_PNG);
77
        #ifdef WIN32
77
        #ifdef WIN32
78
            int iconsmall = ::GetSystemMetrics(SM_CXSMICON);
78
            int iconsmall = ::GetSystemMetrics(SM_CXSMICON);
79
            int iconlarge = ::GetSystemMetrics(SM_CXICON);
79
            int iconlarge = ::GetSystemMetrics(SM_CXICON);
Lines 84-92 Link Here
84
        icons.AddIcon(iconbig);
84
        icons.AddIcon(iconbig);
85
        SetIcons(icons);
85
        SetIcons(icons);
86
        
86
        
87
        if(!line_nw.LoadFile(exepath+L"/images/render/line_nw.png", wxBITMAP_TYPE_PNG) ||
87
        if(!line_nw.LoadFile(L"/usr/share/treesheets/images/render/line_nw.png", wxBITMAP_TYPE_PNG) ||
88
           !line_sw.LoadFile(exepath+L"/images/render/line_sw.png", wxBITMAP_TYPE_PNG) ||
88
           !line_sw.LoadFile(L"/usr/share/treesheets/images/render/line_sw.png", wxBITMAP_TYPE_PNG) ||
89
           !foldicon.LoadFile(exepath+L"/images/nuvola/fold.png"))
89
           !foldicon.LoadFile(L"/usr/share/treesheets/images/nuvola/fold.png"))
90
        {
90
        {
91
            wxMessageBox(L"Error loading core data file (TreeSheets not installed correctly?)", L"Initialization Error", wxOK, this);
91
            wxMessageBox(L"Error loading core data file (TreeSheets not installed correctly?)", L"Initialization Error", wxOK, this);
92
            // FIXME: what is the correct way to exit?
92
            // FIXME: what is the correct way to exit?
Lines 462-468 Link Here
462
            #define SEPARATOR tb->AddSeparator()
462
            #define SEPARATOR tb->AddSeparator()
463
            #endif
463
            #endif
464
464
465
            wxString iconpath = exepath + (iconset ? L"/images/webalys/toolbar/" : L"/images/nuvola/toolbar/");
465
            wxString iconpath = wxString(L"/usr/share/treesheets") + (iconset ? L"/images/webalys/toolbar/" : L"/images/nuvola/toolbar/");
466
            tb->SetToolBitmapSize(iconset ? wxSize(18, 18) : wxSize(22, 22));
466
            tb->SetToolBitmapSize(iconset ? wxSize(18, 18) : wxSize(22, 22));
467
467
468
            AddTBIcon(tb, L"New (CTRL+n)",           A_NEW,     iconpath+L"filenew.png");
468
            AddTBIcon(tb, L"New (CTRL+n)",           A_NEW,     iconpath+L"filenew.png");
Lines 498-504 Link Here
498
            tb->AddControl(new ColorDropdown(tb, A_BORDCOLOR, 6));
498
            tb->AddControl(new ColorDropdown(tb, A_BORDCOLOR, 6));
499
            tb->AddSeparator();
499
            tb->AddSeparator();
500
            tb->AddControl(new wxStaticText(tb, wxID_ANY, L"Image "));
500
            tb->AddControl(new wxStaticText(tb, wxID_ANY, L"Image "));
501
            wxString imagepath = exepath + L"/images/nuvola/dropdown/";
501
            wxString imagepath = L"/usr/share/treesheets/images/nuvola/dropdown/";
502
            idd = new ImageDropdown(tb, imagepath);
502
            idd = new ImageDropdown(tb, imagepath);
503
            tb->AddControl(idd);
503
            tb->AddControl(idd);
504
            tb->Realize();
504
            tb->Realize();

Return to bug 473572