← Back to branch summary

~ubuntu-branches/ubuntu/maverick/blender/maverick

« back to all changes in this revision

Viewing changes to source/blender/src/header_seq.c

  • Committer: Bazaar Package Importer
  • Author(s): Khashayar Naderehvandi, Khashayar Naderehvandi, Alessio Treglia
  • Date: 2009-01-22 16:53:59 UTC
  • mfrom: (14.1.1 experimental)
  • Revision ID: james.westby@ubuntu.com-20090122165359-v0996tn7fbit64ni
Tags: 2.48a+dfsg-1ubuntu1
https://launchpad.net/bugs/320045
[ Khashayar Naderehvandi ]
* Merge from debian experimental (LP: #320045), Ubuntu remaining changes:
  - Add patch correcting header file locations.
  - Add libvorbis-dev and libgsm1-dev to Build-Depends.
  - Use avcodec_decode_audio2() in source/blender/src/hddaudio.c

[ Alessio Treglia ]
* Add missing previous changelog entries.

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/blender/src/header_seq.c
4
4
 * Functions to draw the "Video Sequence Editor" window header
5
5
 * and handle user events sent to it.
6
6
 *
7
 
 * $Id: header_seq.c 14772 2008-05-09 20:08:28Z campbellbarton $
 
7
 * $Id: header_seq.c 16855 2008-10-01 00:02:06Z aligorith $
8
8
 *
9
9
 * ***** BEGIN GPL LICENSE BLOCK *****
10
10
 *
100
100
        case 6: /* Draw time/frames */
101
101
                sseq->flag ^= SEQ_DRAWFRAMES;
102
102
                break;
 
103
        case 7: /* Grease Pencil */
 
104
                add_blockhandler(curarea, SEQ_HANDLER_GREASEPENCIL, UI_PNL_UNSTOW);
 
105
                break;
103
106
        }
104
107
}
105
108
 
111
114
 
112
115
        block= uiNewBlock(&curarea->uiblocks, "seq_viewmenu", UI_EMBOSSP, UI_HELV, curarea->headwin);
113
116
        uiBlockSetButmFunc(block, do_seq_viewmenu, NULL);
114
 
 
 
117
        
 
118
        if (sseq->mainb) {
 
119
                uiDefIconTextBut(block, BUTM, 1, ICON_MENU_PANEL, 
 
120
                                 "Grease Pencil...", 0, yco-=20,
 
121
                                 menuwidth, 19, NULL, 0.0, 0.0, 1, 7, "");
 
122
                                 
 
123
                uiDefBut(block, SEPR, 0, "",        0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
 
124
        }
 
125
        
115
126
        if (sseq->mainb == 0) {
116
127
                uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, 
117
128
                                 "Play Back Animation "
589
600
                                         menuwidth, 19, NULL, 0.0, 0.0, 1, 1, "");
590
601
        uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Duplicate Marker|Ctrl Shift D", 0, yco-=20, 
591
602
                                         menuwidth, 19, NULL, 0.0, 0.0, 1, 2, "");
592
 
        uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Delete Marker", 0, yco-=20,
 
603
        uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Delete Marker|Shift X", 0, yco-=20,
593
604
                                         menuwidth, 19, NULL, 0.0, 0.0, 1, 3, "");
594
605
                                         
595
606
        uiDefBut(block, SEPR, 0, "",        0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");